From 5a639a9c60c9cb3ea3ca6bb3ae97b76750cf29da Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 3 Feb 2025 15:09:52 +0530
Subject: [PATCH 001/796] [mob] Upgrade dio

---
 .../core/error-reporting/super_logging.dart   |  2 +-
 mobile/lib/core/network/network.dart          |  7 ++---
 mobile/lib/gateways/cast_gw.dart              |  2 +-
 mobile/lib/gateways/entity_gw.dart            |  2 +-
 .../lib/module/upload/service/multipart.dart  |  4 +--
 mobile/lib/services/billing_service.dart      | 10 +++----
 mobile/lib/services/collections_service.dart  | 24 +++++++--------
 mobile/lib/services/file_magic_service.dart   |  4 +--
 mobile/lib/services/sync_service.dart         | 10 +++----
 mobile/lib/services/user_service.dart         | 30 +++++++++----------
 .../account/login_pwd_verification_page.dart  |  8 +++--
 .../lib/ui/account/verify_recovery_page.dart  |  2 +-
 .../lib/ui/growth/referral_code_widget.dart   |  2 +-
 mobile/lib/utils/dialog_util.dart             | 19 +++++++-----
 mobile/lib/utils/file_uploader.dart           | 12 ++++----
 mobile/lib/utils/thumbnail_util.dart          |  2 +-
 mobile/plugins/ente_cast/pubspec.yaml         |  2 +-
 mobile/plugins/ente_feature_flag/pubspec.lock | 22 ++++++++++++--
 mobile/plugins/ente_feature_flag/pubspec.yaml |  2 +-
 mobile/pubspec.lock                           | 12 ++++++--
 mobile/pubspec.yaml                           |  2 +-
 21 files changed, 104 insertions(+), 76 deletions(-)

diff --git a/mobile/lib/core/error-reporting/super_logging.dart b/mobile/lib/core/error-reporting/super_logging.dart
index 7c0bef58be..55e93c5947 100644
--- a/mobile/lib/core/error-reporting/super_logging.dart
+++ b/mobile/lib/core/error-reporting/super_logging.dart
@@ -236,7 +236,7 @@ class SuperLogging {
   }
 
   static _shouldSkipSentry(Object error) {
-    if (error is DioError) {
+    if (error is DioException) {
       return true;
     }
     final bool result = error is StorageLimitExceededError ||
diff --git a/mobile/lib/core/network/network.dart b/mobile/lib/core/network/network.dart
index a55a1a807e..9722a40f24 100644
--- a/mobile/lib/core/network/network.dart
+++ b/mobile/lib/core/network/network.dart
@@ -8,18 +8,17 @@ import 'package:photos/core/network/ente_interceptor.dart';
 import "package:photos/events/endpoint_updated_event.dart";
 import "package:ua_client_hints/ua_client_hints.dart";
 
-int kConnectTimeout = 15000;
-
 class NetworkClient {
   late Dio _dio;
   late Dio _enteDio;
+  static const kConnectTimeout = 15;
 
   Future<void> init(PackageInfo packageInfo) async {
     final String ua = await userAgent();
     final endpoint = Configuration.instance.getHttpEndpoint();
     _dio = Dio(
       BaseOptions(
-        connectTimeout: kConnectTimeout,
+        connectTimeout: const Duration(seconds: kConnectTimeout),
         headers: {
           HttpHeaders.userAgentHeader: ua,
           'X-Client-Version': packageInfo.version,
@@ -30,7 +29,7 @@ class NetworkClient {
     _enteDio = Dio(
       BaseOptions(
         baseUrl: endpoint,
-        connectTimeout: kConnectTimeout,
+        connectTimeout: const Duration(seconds: kConnectTimeout),
         headers: {
           HttpHeaders.userAgentHeader: ua,
           'X-Client-Version': packageInfo.version,
diff --git a/mobile/lib/gateways/cast_gw.dart b/mobile/lib/gateways/cast_gw.dart
index bc8af897ab..3db3894ad4 100644
--- a/mobile/lib/gateways/cast_gw.dart
+++ b/mobile/lib/gateways/cast_gw.dart
@@ -12,7 +12,7 @@ class CastGateway {
       );
       return response.data["publicKey"];
     } catch (e) {
-      if (e is DioError && e.response != null) {
+      if (e is DioException && e.response != null) {
         if (e.response!.statusCode == 404) {
           return null;
         } else if (e.response!.statusCode == 403) {
diff --git a/mobile/lib/gateways/entity_gw.dart b/mobile/lib/gateways/entity_gw.dart
index a88d31eeb9..0e4b8bb2bc 100644
--- a/mobile/lib/gateways/entity_gw.dart
+++ b/mobile/lib/gateways/entity_gw.dart
@@ -32,7 +32,7 @@ class EntityGateway {
         },
       );
       return EntityKey.fromMap(response.data);
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null && (e.response!.statusCode ?? 0) == 404) {
         throw EntityKeyNotFound();
       } else {
diff --git a/mobile/lib/module/upload/service/multipart.dart b/mobile/lib/module/upload/service/multipart.dart
index 163f055845..762d26301e 100644
--- a/mobile/lib/module/upload/service/multipart.dart
+++ b/mobile/lib/module/upload/service/multipart.dart
@@ -132,7 +132,7 @@ class MultiPartUploader {
       // upload individual parts and get their etags
       try {
         etags = await _uploadParts(multipartInfo, encryptedFile);
-      } on DioError catch (e) {
+      } on DioException catch (e) {
         if (e.response?.statusCode == 404) {
           _logger.severe(
             "Multipart upload not found for key ${multipartInfo.urls.objectKey}",
@@ -157,7 +157,7 @@ class MultiPartUploader {
           etags,
           multipartInfo.urls.completeURL,
         );
-      } on DioError catch (e) {
+      } on DioException catch (e) {
         if (e.response?.statusCode == 404) {
           _logger.severe(
             "Multipart upload not found for key ${multipartInfo.urls.objectKey}",
diff --git a/mobile/lib/services/billing_service.dart b/mobile/lib/services/billing_service.dart
index b26d4507a3..130a26241d 100644
--- a/mobile/lib/services/billing_service.dart
+++ b/mobile/lib/services/billing_service.dart
@@ -92,7 +92,7 @@ class BillingService {
         },
       );
       return Subscription.fromMap(response.data["subscription"]);
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null && e.response!.statusCode == 409) {
         throw SubscriptionAlreadyClaimedError();
       } else {
@@ -109,7 +109,7 @@ class BillingService {
       final response = await _enteDio.get("/billing/subscription");
       final subscription = Subscription.fromMap(response.data["subscription"]);
       return subscription;
-    } on DioError catch (e, s) {
+    } on DioException catch (e, s) {
       _logger.severe(e, s);
       rethrow;
     }
@@ -121,7 +121,7 @@ class BillingService {
           await _enteDio.post("/billing/stripe/cancel-subscription");
       final subscription = Subscription.fromMap(response.data["subscription"]);
       return subscription;
-    } on DioError catch (e, s) {
+    } on DioException catch (e, s) {
       _logger.severe(e, s);
       rethrow;
     }
@@ -133,7 +133,7 @@ class BillingService {
           await _enteDio.post("/billing/stripe/activate-subscription");
       final subscription = Subscription.fromMap(response.data["subscription"]);
       return subscription;
-    } on DioError catch (e, s) {
+    } on DioException catch (e, s) {
       _logger.severe(e, s);
       rethrow;
     }
@@ -150,7 +150,7 @@ class BillingService {
         },
       );
       return response.data["url"];
-    } on DioError catch (e, s) {
+    } on DioException catch (e, s) {
       _logger.severe(e, s);
       rethrow;
     }
diff --git a/mobile/lib/services/collections_service.dart b/mobile/lib/services/collections_service.dart
index 7c5de3985b..3bac9fe978 100644
--- a/mobile/lib/services/collections_service.dart
+++ b/mobile/lib/services/collections_service.dart
@@ -553,7 +553,7 @@ class CollectionsService {
       unawaited(_db.insert([_collectionIDToCollections[collectionID]!]));
       RemoteSyncService.instance.sync(silently: true).ignore();
       return sharees;
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response?.statusCode == 402) {
         throw SharingNotPermittedForFreeAccountsError();
       }
@@ -641,7 +641,7 @@ class CollectionsService {
       } else {
         await _handleCollectionDeletion(collection);
       }
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null) {
         debugPrint("Error " + e.response!.toString());
       }
@@ -808,7 +808,7 @@ class CollectionsService {
 
       // trigger sync to fetch the latest collection state from server
       sync().ignore();
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null && e.response?.statusCode == 409) {
         _logger.severe('collection magic data out of sync');
         sync().ignore();
@@ -867,7 +867,7 @@ class CollectionsService {
       _cacheLocalPathAndCollection(collection);
       // trigger sync to fetch the latest collection state from server
       sync().ignore();
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null && e.response?.statusCode == 409) {
         _logger.severe('collection magic data out of sync');
         sync().ignore();
@@ -927,7 +927,7 @@ class CollectionsService {
       _cacheLocalPathAndCollection(collection);
       // trigger sync to fetch the latest collection state from server
       sync().ignore();
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null && e.response?.statusCode == 409) {
         _logger.severe('collection magic data out of sync');
         sync().ignore();
@@ -958,7 +958,7 @@ class CollectionsService {
       Bus.instance.fire(
         CollectionUpdatedEvent(collection.id, <EnteFile>[], "shareUrL"),
       );
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response?.statusCode == 402) {
         throw SharingNotPermittedForFreeAccountsError();
       }
@@ -987,7 +987,7 @@ class CollectionsService {
       Bus.instance.fire(
         CollectionUpdatedEvent(collection.id, <EnteFile>[], "updateUrl"),
       );
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response?.statusCode == 402) {
         throw SharingNotPermittedForFreeAccountsError();
       }
@@ -1013,7 +1013,7 @@ class CollectionsService {
           "disableShareUrl",
         ),
       );
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       _logger.info(e);
       rethrow;
     }
@@ -1038,7 +1038,7 @@ class CollectionsService {
       return collections;
     } catch (e, s) {
       _logger.warning(e, s);
-      if (e is DioError && e.response?.statusCode == 401) {
+      if (e is DioException && e.response?.statusCode == 401) {
         throw UnauthorizedError();
       }
       rethrow;
@@ -1091,7 +1091,7 @@ class CollectionsService {
     } catch (e, s) {
       _logger.warning(e, s);
       _logger.severe("Failed to fetch public collection");
-      if (e is DioError && e.response?.statusCode == 410) {
+      if (e is DioException && e.response?.statusCode == 410) {
         await showInfoDialog(
           context,
           title: S.of(context).linkExpired,
@@ -1100,7 +1100,7 @@ class CollectionsService {
         throw UnauthorizedError();
       }
       await showGenericErrorDialog(context: context, error: e);
-      if (e is DioError && e.response?.statusCode == 401) {
+      if (e is DioException && e.response?.statusCode == 401) {
         throw UnauthorizedError();
       }
       rethrow;
@@ -1300,7 +1300,7 @@ class CollectionsService {
       _cacheLocalPathAndCollection(collection);
       return collection;
     } catch (e) {
-      if (e is DioError && e.response?.statusCode == 401) {
+      if (e is DioException && e.response?.statusCode == 401) {
         throw UnauthorizedError();
       }
       _logger.severe('failed to fetch collection: $collectionID', e);
diff --git a/mobile/lib/services/file_magic_service.dart b/mobile/lib/services/file_magic_service.dart
index 9fbbfb9760..30e74d9c73 100644
--- a/mobile/lib/services/file_magic_service.dart
+++ b/mobile/lib/services/file_magic_service.dart
@@ -117,7 +117,7 @@ class FileMagicService {
       // should be eventually synced after remote sync has completed
       await _filesDB.insertMultiple(files);
       RemoteSyncService.instance.sync(silently: true).ignore();
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null && e.response!.statusCode == 409) {
         RemoteSyncService.instance.sync(silently: true).ignore();
       }
@@ -185,7 +185,7 @@ class FileMagicService {
       // update the state of the selected file. Same file in other collection
       // should be eventually synced after remote sync has completed
       RemoteSyncService.instance.sync(silently: true).ignore();
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null && e.response!.statusCode == 409) {
         RemoteSyncService.instance.sync(silently: true).ignore();
       }
diff --git a/mobile/lib/services/sync_service.dart b/mobile/lib/services/sync_service.dart
index 873270f349..bf42fecf26 100644
--- a/mobile/lib/services/sync_service.dart
+++ b/mobile/lib/services/sync_service.dart
@@ -131,11 +131,11 @@ class SyncService {
         ),
       );
     } catch (e) {
-      if (e is DioError) {
-        if (e.type == DioErrorType.connectTimeout ||
-            e.type == DioErrorType.sendTimeout ||
-            e.type == DioErrorType.receiveTimeout ||
-            e.type == DioErrorType.other) {
+      if (e is DioException) {
+        if (e.type == DioExceptionType.connectionTimeout ||
+            e.type == DioExceptionType.sendTimeout ||
+            e.type == DioExceptionType.receiveTimeout ||
+            e.type == DioExceptionType.unknown) {
           Bus.instance.fire(
             SyncStatusUpdate(
               SyncStatus.paused,
diff --git a/mobile/lib/services/user_service.dart b/mobile/lib/services/user_service.dart
index 80d0cf1caa..7e6223476d 100644
--- a/mobile/lib/services/user_service.dart
+++ b/mobile/lib/services/user_service.dart
@@ -124,7 +124,7 @@ class UserService {
       } else {
         throw Exception("send-ott action failed, non-200");
       }
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       await dialog.hide();
       _logger.info(e);
       final String? enteErrCode = e.response?.data["code"];
@@ -185,7 +185,7 @@ class UserService {
       );
       final publicKey = response.data["publicKey"];
       return publicKey;
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null && e.response?.statusCode == 404) {
         return null;
       }
@@ -221,7 +221,7 @@ class UserService {
         }
       }
       return userDetails;
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       _logger.info(e);
       rethrow;
     }
@@ -231,7 +231,7 @@ class UserService {
     try {
       final response = await _enteDio.get("/users/sessions");
       return Sessions.fromMap(response.data);
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       _logger.info(e);
       rethrow;
     }
@@ -245,7 +245,7 @@ class UserService {
           "token": token,
         },
       );
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       _logger.info(e);
       rethrow;
     }
@@ -254,7 +254,7 @@ class UserService {
   Future<void> leaveFamilyPlan() async {
     try {
       await _enteDio.delete("/family/leave");
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       _logger.warning('failed to leave family plan', e);
       rethrow;
     }
@@ -271,7 +271,7 @@ class UserService {
       }
     } catch (e) {
       // check if token is already invalid
-      if (e is DioError && e.response?.statusCode == 401) {
+      if (e is DioException && e.response?.statusCode == 401) {
         await Configuration.instance.logout();
         Navigator.of(context).popUntil((route) => route.isFirst);
         return;
@@ -342,7 +342,7 @@ class UserService {
         },
       );
       return response.data;
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null) {
         if (e.response!.statusCode == 404 || e.response!.statusCode == 410) {
           throw PassKeySessionExpiredError();
@@ -460,7 +460,7 @@ class UserService {
         // should never reach here
         throw Exception("unexpected response during email verification");
       }
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       _logger.info(e);
       await dialog.hide();
       if (e.response != null && e.response!.statusCode == 410) {
@@ -532,7 +532,7 @@ class UserService {
         S.of(context).oops,
         S.of(context).verificationFailedPleaseTryAgain,
       );
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       await dialog.hide();
       if (e.response != null && e.response!.statusCode == 403) {
         // ignore: unawaited_futures
@@ -592,7 +592,7 @@ class UserService {
       } else {
         throw Exception("get-srp-attributes action failed");
       }
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null && e.response!.statusCode == 404) {
         throw SrpSetupNotCompleteError();
       }
@@ -865,7 +865,7 @@ class UserService {
           (route) => route.isFirst,
         );
       }
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       await dialog.hide();
       _logger.severe(e);
       if (e.response != null && e.response!.statusCode == 404) {
@@ -932,7 +932,7 @@ class UserService {
           (route) => route.isFirst,
         );
       }
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       await dialog.hide();
       _logger.severe('error while recovery 2fa', e);
       if (e.response != null && e.response!.statusCode == 404) {
@@ -1031,7 +1031,7 @@ class UserService {
           (route) => route.isFirst,
         );
       }
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       await dialog.hide();
       _logger.severe("error during recovery", e);
       if (e.response != null && e.response!.statusCode == 404) {
@@ -1126,7 +1126,7 @@ class UserService {
     } catch (e, s) {
       await dialog.hide();
       _logger.severe(e, s);
-      if (e is DioError) {
+      if (e is DioException) {
         if (e.response != null && e.response!.statusCode == 401) {
           // ignore: unawaited_futures
           showErrorDialog(
diff --git a/mobile/lib/ui/account/login_pwd_verification_page.dart b/mobile/lib/ui/account/login_pwd_verification_page.dart
index ac974c20da..2d5e9237ce 100644
--- a/mobile/lib/ui/account/login_pwd_verification_page.dart
+++ b/mobile/lib/ui/account/login_pwd_verification_page.dart
@@ -113,7 +113,7 @@ class _LoginPasswordVerificationPageState
         password,
         dialog,
       );
-    } on DioError catch (e, s) {
+    } on DioException catch (e, s) {
       await dialog.hide();
       if (e.response != null && e.response!.statusCode == 401) {
         _logger.severe('server reject, failed verify SRP login', e, s);
@@ -123,8 +123,10 @@ class _LoginPasswordVerificationPageState
           S.of(context).pleaseTryAgain,
         );
       } else {
-        _logger.severe('API failure during SRP login', e, s);
-        if (e.type == DioErrorType.other) {
+        _logger.severe('API failure during SRP login ${e.type}', e, s);
+        if (e.type == DioExceptionType.connectionTimeout ||
+            e.type == DioExceptionType.receiveTimeout ||
+            e.type == DioExceptionType.sendTimeout) {
           await _showContactSupportDialog(
             context,
             S.of(context).noInternetConnection,
diff --git a/mobile/lib/ui/account/verify_recovery_page.dart b/mobile/lib/ui/account/verify_recovery_page.dart
index 54c8595977..46585a734d 100644
--- a/mobile/lib/ui/account/verify_recovery_page.dart
+++ b/mobile/lib/ui/account/verify_recovery_page.dart
@@ -43,7 +43,7 @@ class _VerifyRecoveryPageState extends State<VerifyRecoveryPage> {
           await userRemoteFlagService.markRecoveryVerificationAsDone();
         } catch (e) {
           await dialog.hide();
-          if (e is DioError && e.type == DioErrorType.other) {
+          if (e is DioException && e.type == DioExceptionType.connectionError) {
             await showErrorDialog(
               context,
               S.of(context).noInternetConnection,
diff --git a/mobile/lib/ui/growth/referral_code_widget.dart b/mobile/lib/ui/growth/referral_code_widget.dart
index cb139c7263..7620aff22d 100644
--- a/mobile/lib/ui/growth/referral_code_widget.dart
+++ b/mobile/lib/ui/growth/referral_code_widget.dart
@@ -108,7 +108,7 @@ class ReferralCodeWidget extends StatelessWidget {
           notifyParent?.call();
         } catch (e, s) {
           Logger("ReferralCodeWidget").severe("Failed to update code", e, s);
-          if (e is DioError) {
+          if (e is DioException) {
             if (e.response?.statusCode == 400) {
               await showInfoDialog(
                 context,
diff --git a/mobile/lib/utils/dialog_util.dart b/mobile/lib/utils/dialog_util.dart
index 8d3f65e438..9fcadb2763 100644
--- a/mobile/lib/utils/dialog_util.dart
+++ b/mobile/lib/utils/dialog_util.dart
@@ -76,7 +76,7 @@ Future<ButtonResult?> showErrorDialogForException({
 }) async {
   String errorMessage =
       message ?? S.of(context).tempErrorContactSupportIfPersists;
-  if (exception is DioError &&
+  if (exception is DioException &&
       exception.response != null &&
       exception.response!.data["code"] != null) {
     errorMessage =
@@ -107,9 +107,12 @@ String parseErrorForUI(
   if (error == null) {
     return genericError;
   }
-  if (error is DioError) {
-    final DioError dioError = error;
-    if (dioError.type == DioErrorType.other) {
+  if (error is DioException) {
+    final DioException dioError = error;
+    if (dioError.type == DioExceptionType.receiveTimeout ||
+        dioError.type == DioExceptionType.connectionError ||
+        dioError.type == DioExceptionType.sendTimeout ||
+        dioError.type == DioExceptionType.cancel) {
       if (dioError.error.toString().contains('Failed host lookup')) {
         return S.of(context).networkHostLookUpErr;
       } else if (dioError.error.toString().contains('SocketException')) {
@@ -122,15 +125,15 @@ String parseErrorForUI(
     return genericError;
   }
   String errorInfo = "";
-  if (error is DioError) {
-    final DioError dioError = error;
-    if (dioError.type == DioErrorType.response) {
+  if (error is DioException) {
+    final DioException dioError = error;
+    if (dioError.type == DioExceptionType.badResponse) {
       if (dioError.response?.data["code"] != null) {
         errorInfo = "Reason: " + dioError.response!.data["code"];
       } else {
         errorInfo = "Reason: " + dioError.response!.data.toString();
       }
-    } else if (dioError.type == DioErrorType.other) {
+    } else if (dioError.type == DioExceptionType.badCertificate) {
       errorInfo = "Reason: " + dioError.error.toString();
     } else {
       errorInfo = "Reason: " + dioError.type.toString();
diff --git a/mobile/lib/utils/file_uploader.dart b/mobile/lib/utils/file_uploader.dart
index 049c0f6b8f..22f00f2f12 100644
--- a/mobile/lib/utils/file_uploader.dart
+++ b/mobile/lib/utils/file_uploader.dart
@@ -858,7 +858,7 @@ class FileUploader {
   }
 
   bool isPutOrUpdateFileError(Object e) {
-    if (e is DioError) {
+    if (e is DioException) {
       return e.requestOptions.path.contains("/files") ||
           e.requestOptions.path.contains("/files/update");
     }
@@ -1153,7 +1153,7 @@ class FileUploader {
       file.thumbnailDecryptionHeader = thumbnailDecryptionHeader;
       file.metadataDecryptionHeader = metadataDecryptionHeader;
       return file;
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response?.statusCode == 413) {
         throw FileTooLargeForPlanError();
       } else if (e.response?.statusCode == 426) {
@@ -1221,7 +1221,7 @@ class FileUploader {
       file.thumbnailDecryptionHeader = thumbnailDecryptionHeader;
       file.metadataDecryptionHeader = metadataDecryptionHeader;
       return file;
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response?.statusCode == 426) {
         _onStorageLimitExceeded();
       } else if (attempt < kMaximumUploadAttempts) {
@@ -1277,7 +1277,7 @@ class FileUploader {
             .map((e) => UploadURL.fromMap(e))
             .toList();
         _uploadURLs.addAll(urls);
-      } on DioError catch (e, s) {
+      } on DioException catch (e, s) {
         if (e.response != null) {
           if (e.response!.statusCode == 402) {
             final error = NoActiveSubscriptionError();
@@ -1327,8 +1327,8 @@ class FileUploader {
       );
 
       return uploadURL.objectKey;
-    } on DioError catch (e) {
-      if (e.message.startsWith("HttpException: Content size")) {
+    } on DioException catch (e) {
+      if (e.message?.startsWith("HttpException: Content size") ?? false) {
         rethrow;
       } else if (attempt < kMaximumUploadAttempts) {
         _logger.info("Upload failed for $fileName, retrying");
diff --git a/mobile/lib/utils/thumbnail_util.dart b/mobile/lib/utils/thumbnail_util.dart
index c8db830735..7769976888 100644
--- a/mobile/lib/utils/thumbnail_util.dart
+++ b/mobile/lib/utils/thumbnail_util.dart
@@ -192,7 +192,7 @@ Future<void> _downloadAndDecryptThumbnail(FileDownloadItem item) async {
           .data;
     }
   } catch (e) {
-    if (e is DioError && CancelToken.isCancel(e)) {
+    if (e is DioException && CancelToken.isCancel(e)) {
       return;
     }
     rethrow;
diff --git a/mobile/plugins/ente_cast/pubspec.yaml b/mobile/plugins/ente_cast/pubspec.yaml
index 967e147e91..6cc08a0849 100644
--- a/mobile/plugins/ente_cast/pubspec.yaml
+++ b/mobile/plugins/ente_cast/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
 
 dependencies:
   collection:
-  dio: ^4.0.6
+  dio: ^5.8.0+1
   flutter:
     sdk: flutter
   shared_preferences: ^2.0.5
diff --git a/mobile/plugins/ente_feature_flag/pubspec.lock b/mobile/plugins/ente_feature_flag/pubspec.lock
index 4f2db8cd08..e58ff1231c 100644
--- a/mobile/plugins/ente_feature_flag/pubspec.lock
+++ b/mobile/plugins/ente_feature_flag/pubspec.lock
@@ -1,6 +1,14 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  async:
+    dependency: transitive
+    description:
+      name: async
+      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.12.0"
   characters:
     dependency: transitive
     description:
@@ -21,10 +29,18 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: "7d328c4d898a61efc3cd93655a0955858e29a0aa647f0f9e02d59b3bb275e2e8"
+      sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.6"
+    version: "5.8.0+1"
+  dio_web_adapter:
+    dependency: transitive
+    description:
+      name: dio_web_adapter
+      sha256: e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   ffi:
     dependency: transitive
     description:
@@ -273,5 +289,5 @@ packages:
     source: hosted
     version: "1.0.4"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
+  dart: ">=3.4.0 <4.0.0"
   flutter: ">=3.19.0"
diff --git a/mobile/plugins/ente_feature_flag/pubspec.yaml b/mobile/plugins/ente_feature_flag/pubspec.yaml
index 7507d61f1c..6ad2c7626d 100644
--- a/mobile/plugins/ente_feature_flag/pubspec.yaml
+++ b/mobile/plugins/ente_feature_flag/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
 
 dependencies:
   collection:
-  dio: ^4.0.6
+  dio: ^5.8.0+1
   flutter:
     sdk: flutter
   shared_preferences: ^2.0.5
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index 28219c70d9..c5e9d6a0a1 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -413,10 +413,18 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: "7d328c4d898a61efc3cd93655a0955858e29a0aa647f0f9e02d59b3bb275e2e8"
+      sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.6"
+    version: "5.8.0+1"
+  dio_web_adapter:
+    dependency: transitive
+    description:
+      name: dio_web_adapter
+      sha256: e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   dots_indicator:
     dependency: "direct main"
     description:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 07b2938512..6caa8a8a0f 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -42,7 +42,7 @@ dependencies:
   dart_ui_isolate: ^1.1.1
   defer_pointer: ^0.0.2
   device_info_plus: ^9.0.3
-  dio: ^4.0.6
+  dio: ^5.8.0+1
   dots_indicator: ^2.0.0
   dotted_border: ^2.1.0
   dropdown_button2: ^2.0.0

From 1396ca57dbd4becd3e2a5e01a2315f215beef67b Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 3 Feb 2025 15:21:46 +0530
Subject: [PATCH 002/796] [mob] Use native dio adapter

---
 mobile/lib/core/network/network.dart |  5 +++
 mobile/pubspec.lock                  | 48 ++++++++++++++++++++++++++++
 mobile/pubspec.yaml                  |  1 +
 3 files changed, 54 insertions(+)

diff --git a/mobile/lib/core/network/network.dart b/mobile/lib/core/network/network.dart
index 9722a40f24..ba2540b401 100644
--- a/mobile/lib/core/network/network.dart
+++ b/mobile/lib/core/network/network.dart
@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:dio/dio.dart';
+import 'package:native_dio_adapter/native_dio_adapter.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import "package:photos/core/configuration.dart";
 import "package:photos/core/event_bus.dart";
@@ -37,6 +38,10 @@ class NetworkClient {
         },
       ),
     );
+
+    _dio.httpClientAdapter = NativeAdapter();
+    _enteDio.httpClientAdapter = NativeAdapter();
+
     _setupInterceptors(endpoint);
 
     Bus.instance.on<EndpointUpdatedEvent>().listen((event) {
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index c5e9d6a0a1..c0b535c7ea 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -329,6 +329,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.2"
+  cronet_http:
+    dependency: transitive
+    description:
+      name: cronet_http
+      sha256: "3af9c4d57bf07ef4b307e77b22be4ad61bea19ee6ff65e62184863f3a09f1415"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.2"
   cross_file:
     dependency: "direct main"
     description:
@@ -353,6 +361,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  cupertino_http:
+    dependency: transitive
+    description:
+      name: cupertino_http
+      sha256: "6fcf79586ad872ddcd6004d55c8c2aab3cdf0337436e8f99837b1b6c30665d0c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -1165,6 +1181,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
+  http_profile:
+    dependency: transitive
+    description:
+      name: http_profile
+      sha256: "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
   image:
     dependency: "direct main"
     description:
@@ -1330,6 +1354,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
+  jni:
+    dependency: transitive
+    description:
+      name: jni
+      sha256: f377c585ea9c08d48b427dc2e03780af2889d1bb094440da853c6883c1acba4b
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.1"
   js:
     dependency: transitive
     description:
@@ -1694,6 +1726,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  native_dio_adapter:
+    dependency: "direct main"
+    description:
+      name: native_dio_adapter
+      sha256: "7420bc9517b2abe09810199a19924617b45690a44ecfb0616ac9babc11875c03"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
   native_video_player:
     dependency: "direct main"
     description:
@@ -1727,6 +1767,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.2"
+  objective_c:
+    dependency: transitive
+    description:
+      name: objective_c
+      sha256: "62e79ab8c3ed6f6a340ea50dd48d65898f5d70425d404f0d99411f6e56e04584"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.0"
   octo_image:
     dependency: transitive
     description:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 6caa8a8a0f..d43492da27 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -128,6 +128,7 @@ dependencies:
     git: "https://github.com/ente-io/motionphoto.git"
   move_to_background: ^1.0.2
   nanoid: ^1.0.0
+  native_dio_adapter: ^1.4.0
   native_video_player:
     git:
       url: https://github.com/ashilkn/native_video_player.git

From 701b7b8f37924a0434e911c4f014bc05f53f03d7 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 4 Feb 2025 11:13:09 +0530
Subject: [PATCH 003/796] [mob] Set cronetHttpNoPlay=true while building apk
 for droid

---
 .github/workflows/mobile-internal-release.yml | 2 +-
 .github/workflows/mobile-release.yml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/mobile-internal-release.yml b/.github/workflows/mobile-internal-release.yml
index 6752fb1308..ae5535f655 100644
--- a/.github/workflows/mobile-internal-release.yml
+++ b/.github/workflows/mobile-internal-release.yml
@@ -40,7 +40,7 @@ jobs:
 
             - name: Build PlayStore AAB
               run: |
-                  flutter build appbundle --release --flavor playstore
+                  flutter build appbundle --dart-define=cronetHttpNoPlay=true --release --flavor playstore
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_photos_key.jks"
                   SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS_PHOTOS }}
diff --git a/.github/workflows/mobile-release.yml b/.github/workflows/mobile-release.yml
index ecf2c6d769..8997f0afbc 100644
--- a/.github/workflows/mobile-release.yml
+++ b/.github/workflows/mobile-release.yml
@@ -45,7 +45,7 @@ jobs:
 
             - name: Build independent APK
               run: |
-                flutter build apk --release --flavor independent
+                flutter build apk --dart-define=cronetHttpNoPlay=true --release --flavor independent
                 mv build/app/outputs/flutter-apk/app-independent-release.apk build/app/outputs/flutter-apk/ente-${{ github.ref_name }}.apk
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_photos_key.jks"

From 36c06d5501b183eef0fc88ae85227c331d0fdfc6 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 4 Feb 2025 11:24:02 +0530
Subject: [PATCH 004/796] [mob] keep keep class org.chromium.net in droid
 proguard

---
 mobile/android/app/proguard-rules.pro | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mobile/android/app/proguard-rules.pro b/mobile/android/app/proguard-rules.pro
index f35c179f30..066c0d1874 100644
--- a/mobile/android/app/proguard-rules.pro
+++ b/mobile/android/app/proguard-rules.pro
@@ -2,3 +2,5 @@
 # To ensure that stack traces is unambiguous
 # https://developer.android.com/studio/build/shrink-code#decode-stack-trace
 -keepattributes LineNumberTable,SourceFile
+
+-keep class org.chromium.net.** { *; }

From e54027c5ddea0896a389f6531dd94246bb8f6769 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Tue, 4 Feb 2025 11:30:47 +0530
Subject: [PATCH 005/796] [mob][photos] Basic structure

---
 mobile/lib/services/search_service.dart | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 7366ede9cc..e56229a0af 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1189,11 +1189,32 @@ class SearchService {
     return searchResults;
   }
 
+  Future<List<GenericSearchResult>> getTripsResults(
+    BuildContext context,
+    int? limit,
+  ) async {
+    final List<GenericSearchResult> searchResults = [];
+    final allFiles = await getAllFilesForSearch();
+    if (allFiles.isEmpty) return [];
+
+    // Identify base locations
+
+
+    // Identify trip locations
+
+
+    // Check if there are any trips to surface
+  }
+
   Future<List<GenericSearchResult>> onThisDayOrWeekResults(
     BuildContext context,
     int? limit,
   ) async {
     final List<GenericSearchResult> searchResults = [];
+    final trips = await getTripsResults(context, limit);
+    if (trips.isNotEmpty) {
+      searchResults.addAll(trips);
+    }
     final allFiles = await getAllFilesForSearch();
     if (allFiles.isEmpty) return [];
 

From 3478720cb3b49ef6b268276aa8ceaf858580ce24 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 5 Feb 2025 14:17:09 +0530
Subject: [PATCH 006/796] [mob][photos] Test trips selection

---
 mobile/lib/models/base/id.dart          |   4 +
 mobile/lib/services/search_service.dart | 222 +++++++++++++++++++++++-
 2 files changed, 224 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/models/base/id.dart b/mobile/lib/models/base/id.dart
index 2b095e0274..3fbae25e41 100644
--- a/mobile/lib/models/base/id.dart
+++ b/mobile/lib/models/base/id.dart
@@ -15,3 +15,7 @@ String newID(String prefix) {
 String newIsolateTaskID(String task) {
   return "${task}_${customAlphabet(enteWhiteListedAlphabet, clusterIDLength)}";
 }
+
+String newAutoLocationID() {
+  return "cluster_${customAlphabet(enteWhiteListedAlphabet, clusterIDLength)}";
+}
diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 4bf0929fa8..0b67a23f1b 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -15,6 +15,7 @@ import "package:photos/db/ml/db.dart";
 import 'package:photos/events/local_photos_updated_event.dart';
 import "package:photos/extensions/user_extension.dart";
 import "package:photos/models/api/collection/user.dart";
+import "package:photos/models/base/id.dart";
 import 'package:photos/models/collection/collection.dart';
 import 'package:photos/models/collection/collection_items.dart';
 import "package:photos/models/file/extensions/file_props.dart";
@@ -1195,15 +1196,232 @@ class SearchService {
   ) async {
     final List<GenericSearchResult> searchResults = [];
     final allFiles = await getAllFilesForSearch();
+    final Iterable<LocalEntity<LocationTag>> locationTagEntities =
+        (await locationService.getLocationTags());
     if (allFiles.isEmpty) return [];
 
-    // Identify base locations
+    final Map<LocalEntity<LocationTag>, List<EnteFile>> tagToItemsMap = {};
+    for (int i = 0; i < locationTagEntities.length; i++) {
+      tagToItemsMap[locationTagEntities.elementAt(i)] = [];
+    }
+    final Map<String, (List<EnteFile>, Location)> smallRadiusClusters = {};
+    final Map<String, (List<EnteFile>, Location)> wideRadiusClusters = {};
+    // Go through all files and cluster the ones not inside any location tag
+    for (EnteFile file in allFiles) {
+      if (file.hasLocation && file.uploadedFileID != null) {
+        // Check if the file is inside any location tag
+        bool hasLocationTag = false;
+        for (LocalEntity<LocationTag> tag in tagToItemsMap.keys) {
+          if (isFileInsideLocationTag(
+            tag.item.centerPoint,
+            file.location!,
+            tag.item.radius,
+          )) {
+            hasLocationTag = true;
+            tagToItemsMap[tag]!.add(file);
+          }
+        }
+        // Cluster the files not inside any location tag (incremental clustering)
+        if (!hasLocationTag) {
+          // Small radius clustering for base locations
+          bool foundSmallCluster = false;
+          for (final clusterID in smallRadiusClusters.keys) {
+            final clusterLocation = smallRadiusClusters[clusterID]!.$2;
+            if (isFileInsideLocationTag(
+              clusterLocation,
+              file.location!,
+              1.0,
+            )) {
+              smallRadiusClusters[clusterID]!.$1.add(file);
+              foundSmallCluster = true;
+              break;
+            }
+          }
+          if (!foundSmallCluster) {
+            smallRadiusClusters[newAutoLocationID()] = (
+              [
+                file,
+              ],
+              file.location!
+            );
+          }
+          // Wide radius clustering for trip locations
+          bool foundWideCluster = false;
+          for (final clusterID in wideRadiusClusters.keys) {
+            final clusterLocation = wideRadiusClusters[clusterID]!.$2;
+            if (isFileInsideLocationTag(
+              clusterLocation,
+              file.location!,
+              50.0,
+            )) {
+              wideRadiusClusters[clusterID]!.$1.add(file);
+              foundWideCluster = true;
+              break;
+            }
+            if (!foundWideCluster) {
+              wideRadiusClusters[newAutoLocationID()] = (
+                [
+                  file,
+                ],
+                file.location!
+              );
+            }
+          }
+        }
+      }
+    }
 
+    // Identify base locations
+    final Map<String, (List<EnteFile>, Location, bool)> baseLocations = {};
+    for (final clusterID in smallRadiusClusters.keys) {
+      final files = smallRadiusClusters[clusterID]!.$1;
+      final location = smallRadiusClusters[clusterID]!.$2;
+      // Check that the photos are distributed over a longer time range (3+ months)
+      final creationTimes = <int>[];
+      for (final file in files) {
+        if (file.creationTime != null) {
+          creationTimes.add(file.creationTime!);
+        }
+      }
+      creationTimes.sort();
+      if (creationTimes.length < 2) continue;
+      final firstCreationTime = DateTime.fromMicrosecondsSinceEpoch(
+        creationTimes.first,
+      );
+      final lastCreationTime = DateTime.fromMicrosecondsSinceEpoch(
+        creationTimes.last,
+      );
+      if (lastCreationTime.difference(firstCreationTime).inDays < 90) {
+        continue;
+      }
+      // Check if it's a current or old base location
+      final bool current = lastCreationTime.isAfter(
+        DateTime.now().subtract(
+          const Duration(days: 90),
+        ),
+      );
+      baseLocations[clusterID] = (files, location, current);
+    }
 
     // Identify trip locations
+    final Map<String, (List<EnteFile>, Location, int, int)> tripLocations = {};
+    for (final clusterID in wideRadiusClusters.keys) {
+      final files = wideRadiusClusters[clusterID]!.$1;
+      final location = wideRadiusClusters[clusterID]!.$2;
+      // Check that the photos are distributed over a short time range (2-30 days)
+      final creationTimes = <int>[];
+      for (final file in files) {
+        if (file.creationTime != null) {
+          creationTimes.add(file.creationTime!);
+        }
+      }
+      creationTimes.sort();
+      if (creationTimes.length < 2) continue;
+      final firstCreationTime = DateTime.fromMicrosecondsSinceEpoch(
+        creationTimes.first,
+      );
+      final lastCreationTime = DateTime.fromMicrosecondsSinceEpoch(
+        creationTimes.last,
+      );
+      final days = lastCreationTime.difference(firstCreationTime).inDays;
+      if (days < 2 || days > 30) {
+        continue;
+      }
+      // Check that it's at least 10km away from any base or tag location
+      bool tooClose = false;
+      for (final baseLocation in baseLocations.values) {
+        if (isFileInsideLocationTag(
+          baseLocation.$2,
+          location,
+          10.0,
+        )) {
+          tooClose = true;
+          break;
+        }
+      }
+      if (tooClose) continue;
+      for (final tag in tagToItemsMap.keys) {
+        if (isFileInsideLocationTag(
+          tag.item.centerPoint,
+          location,
+          10.0,
+        )) {
+          tooClose = true;
+          break;
+        }
+      }
+      if (tooClose) continue;
+      tripLocations[clusterID] = (
+        files,
+        location,
+        firstCreationTime.microsecondsSinceEpoch,
+        lastCreationTime.microsecondsSinceEpoch
+      );
+    }
 
+    // Check if any trip locations should be merged
+    // bool merged = false;
+    //   String? mergeID;
+    //   for (final tripLocation in tripLocations.values) {
+    //     final otherTripFirstTime = DateTime.fromMicrosecondsSinceEpoch(
+    //       tripLocation.$3,
+    //     );
+    //     final otherTripLastTime = DateTime.fromMicrosecondsSinceEpoch(
+    //       tripLocation.$4,
+    //     );
+    // final bool tripsMatch = firstCreationTime.isBefore(
+    //           otherTripLastTime.add(
+    //             const Duration(days: 1),
+    //           ),
+    //         ) ||
+    //         lastCreationTime.isAfter(
+    //           otherTripFirstTime.subtract(
+    //             const Duration(days: 1),
+    //           ),
+    //         );
 
-    // Check if there are any trips to surface
+    // TODO: lau: Check if there are any trips to surface
+    // For now for testing let's just surface all base and trip locations
+    for (final baseLocation in baseLocations.values) {
+      final files = baseLocation.$1; // TODO: lau: take best selection only
+      final location = baseLocation.$2;
+      final current = baseLocation.$3;
+      final name = "Base (${current ? 'current' : 'old'})";
+      searchResults.add(
+        GenericSearchResult(
+          ResultType.event,
+          name,
+          files,
+          hierarchicalSearchFilter: TopLevelGenericFilter(
+            filterName: name,
+            occurrence: kMostRelevantFilter,
+            filterResultType: ResultType.event,
+            matchedUploadedIDs: filesToUploadedFileIDs(files),
+            filterIcon: Icons.event_outlined,
+          ),
+        ),
+      );
+    }
+    for (final tripLocation in tripLocations.values) {
+      final files = tripLocation.$1; // TODO: lau: take best selection only
+      // final location = tripLocation.$2;
+      const name = "Trip!";
+      searchResults.add(
+        GenericSearchResult(
+          ResultType.event,
+          name,
+          files,
+          hierarchicalSearchFilter: TopLevelGenericFilter(
+            filterName: name,
+            occurrence: kMostRelevantFilter,
+            filterResultType: ResultType.event,
+            matchedUploadedIDs: filesToUploadedFileIDs(files),
+            filterIcon: Icons.event_outlined,
+          ),
+        ),
+      );
+    }
+    return searchResults; // TODO: lau: take [limit] into account
   }
 
   Future<List<GenericSearchResult>> onThisDayOrWeekResults(

From 252ae8169d4411a283ae3bad0019c3af3410a0f5 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 5 Feb 2025 15:15:35 +0530
Subject: [PATCH 007/796] [mob][photos] Improve base locations

---
 mobile/lib/services/search_service.dart | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 0b67a23f1b..4e73b2570a 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1230,7 +1230,7 @@ class SearchService {
             if (isFileInsideLocationTag(
               clusterLocation,
               file.location!,
-              1.0,
+              0.6,
             )) {
               smallRadiusClusters[clusterID]!.$1.add(file);
               foundSmallCluster = true;
@@ -1278,13 +1278,18 @@ class SearchService {
       final location = smallRadiusClusters[clusterID]!.$2;
       // Check that the photos are distributed over a longer time range (3+ months)
       final creationTimes = <int>[];
+      final Set<int> uniqueDays = {};
       for (final file in files) {
         if (file.creationTime != null) {
           creationTimes.add(file.creationTime!);
+          final date = DateTime.fromMicrosecondsSinceEpoch(file.creationTime!);
+          final dayStamp =
+              DateTime(date.year, date.month, date.day).microsecondsSinceEpoch;
+          uniqueDays.add(dayStamp);
         }
       }
       creationTimes.sort();
-      if (creationTimes.length < 2) continue;
+      if (creationTimes.length < 10) continue;
       final firstCreationTime = DateTime.fromMicrosecondsSinceEpoch(
         creationTimes.first,
       );
@@ -1294,6 +1299,9 @@ class SearchService {
       if (lastCreationTime.difference(firstCreationTime).inDays < 90) {
         continue;
       }
+      // Check for a minimum average number of days photos are clicked in range
+      final daysRange = lastCreationTime.difference(firstCreationTime).inDays;
+      if (uniqueDays.length < daysRange * 0.1) continue;
       // Check if it's a current or old base location
       final bool current = lastCreationTime.isAfter(
         DateTime.now().subtract(

From 99e5bc5050306cbed2f57f29b012884b5941392b Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 5 Feb 2025 16:00:43 +0530
Subject: [PATCH 008/796] [mob][photos] Simplify

---
 mobile/lib/services/search_service.dart | 95 +++++++++++++------------
 1 file changed, 48 insertions(+), 47 deletions(-)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 4e73b2570a..02096fccbb 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1208,65 +1208,66 @@ class SearchService {
     final Map<String, (List<EnteFile>, Location)> wideRadiusClusters = {};
     // Go through all files and cluster the ones not inside any location tag
     for (EnteFile file in allFiles) {
-      if (file.hasLocation && file.uploadedFileID != null) {
-        // Check if the file is inside any location tag
-        bool hasLocationTag = false;
-        for (LocalEntity<LocationTag> tag in tagToItemsMap.keys) {
+      if (!file.hasLocation || file.uploadedFileID == null || !file.isOwner) {
+        continue;
+      }
+      // Check if the file is inside any location tag
+      bool hasLocationTag = false;
+      for (LocalEntity<LocationTag> tag in tagToItemsMap.keys) {
+        if (isFileInsideLocationTag(
+          tag.item.centerPoint,
+          file.location!,
+          tag.item.radius,
+        )) {
+          hasLocationTag = true;
+          tagToItemsMap[tag]!.add(file);
+        }
+      }
+      // Cluster the files not inside any location tag (incremental clustering)
+      if (!hasLocationTag) {
+        // Small radius clustering for base locations
+        bool foundSmallCluster = false;
+        for (final clusterID in smallRadiusClusters.keys) {
+          final clusterLocation = smallRadiusClusters[clusterID]!.$2;
           if (isFileInsideLocationTag(
-            tag.item.centerPoint,
+            clusterLocation,
             file.location!,
-            tag.item.radius,
+            0.6,
           )) {
-            hasLocationTag = true;
-            tagToItemsMap[tag]!.add(file);
+            smallRadiusClusters[clusterID]!.$1.add(file);
+            foundSmallCluster = true;
+            break;
           }
         }
-        // Cluster the files not inside any location tag (incremental clustering)
-        if (!hasLocationTag) {
-          // Small radius clustering for base locations
-          bool foundSmallCluster = false;
-          for (final clusterID in smallRadiusClusters.keys) {
-            final clusterLocation = smallRadiusClusters[clusterID]!.$2;
-            if (isFileInsideLocationTag(
-              clusterLocation,
-              file.location!,
-              0.6,
-            )) {
-              smallRadiusClusters[clusterID]!.$1.add(file);
-              foundSmallCluster = true;
-              break;
-            }
+        if (!foundSmallCluster) {
+          smallRadiusClusters[newAutoLocationID()] = (
+            [
+              file,
+            ],
+            file.location!
+          );
+        }
+        // Wide radius clustering for trip locations
+        bool foundWideCluster = false;
+        for (final clusterID in wideRadiusClusters.keys) {
+          final clusterLocation = wideRadiusClusters[clusterID]!.$2;
+          if (isFileInsideLocationTag(
+            clusterLocation,
+            file.location!,
+            50.0,
+          )) {
+            wideRadiusClusters[clusterID]!.$1.add(file);
+            foundWideCluster = true;
+            break;
           }
-          if (!foundSmallCluster) {
-            smallRadiusClusters[newAutoLocationID()] = (
+          if (!foundWideCluster) {
+            wideRadiusClusters[newAutoLocationID()] = (
               [
                 file,
               ],
               file.location!
             );
           }
-          // Wide radius clustering for trip locations
-          bool foundWideCluster = false;
-          for (final clusterID in wideRadiusClusters.keys) {
-            final clusterLocation = wideRadiusClusters[clusterID]!.$2;
-            if (isFileInsideLocationTag(
-              clusterLocation,
-              file.location!,
-              50.0,
-            )) {
-              wideRadiusClusters[clusterID]!.$1.add(file);
-              foundWideCluster = true;
-              break;
-            }
-            if (!foundWideCluster) {
-              wideRadiusClusters[newAutoLocationID()] = (
-                [
-                  file,
-                ],
-                file.location!
-              );
-            }
-          }
         }
       }
     }

From edfd86628a12b3eef8d689d893fd6405d24e7161 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 5 Feb 2025 16:29:01 +0530
Subject: [PATCH 009/796] [mob][photos] Basic trips

---
 mobile/lib/services/search_service.dart | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 02096fccbb..16d881b3e2 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1260,14 +1260,14 @@ class SearchService {
             foundWideCluster = true;
             break;
           }
-          if (!foundWideCluster) {
-            wideRadiusClusters[newAutoLocationID()] = (
-              [
-                file,
-              ],
-              file.location!
-            );
-          }
+        }
+        if (!foundWideCluster) {
+          wideRadiusClusters[newAutoLocationID()] = (
+            [
+              file,
+            ],
+            file.location!
+          );
         }
       }
     }
@@ -1393,7 +1393,6 @@ class SearchService {
     // For now for testing let's just surface all base and trip locations
     for (final baseLocation in baseLocations.values) {
       final files = baseLocation.$1; // TODO: lau: take best selection only
-      final location = baseLocation.$2;
       final current = baseLocation.$3;
       final name = "Base (${current ? 'current' : 'old'})";
       searchResults.add(

From e3833044e98dc04e57202d8026809a6f9ffe80f1 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Wed, 5 Feb 2025 13:44:55 +0530
Subject: [PATCH 010/796] [mob] Avoid reloading all files from DB on Upload
 events

---
 mobile/lib/ui/viewer/gallery/gallery.dart | 50 ++++++++++++++++++++---
 mobile/lib/utils/file_uploader.dart       | 14 +++----
 2 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/mobile/lib/ui/viewer/gallery/gallery.dart b/mobile/lib/ui/viewer/gallery/gallery.dart
index 1788866697..a07f6a8c09 100644
--- a/mobile/lib/ui/viewer/gallery/gallery.dart
+++ b/mobile/lib/ui/viewer/gallery/gallery.dart
@@ -18,6 +18,7 @@ import 'package:photos/ui/viewer/gallery/empty_state.dart';
 import "package:photos/ui/viewer/gallery/state/gallery_context_state.dart";
 import "package:photos/ui/viewer/gallery/state/gallery_files_inherited_widget.dart";
 import "package:photos/ui/viewer/gallery/state/inherited_search_filter_data.dart";
+import "package:photos/utils/date_time_util.dart";
 import "package:photos/utils/debouncer.dart";
 import "package:photos/utils/hierarchical_search_util.dart";
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
@@ -130,19 +131,57 @@ class GalleryState extends State<Gallery> {
     _itemScroller = ItemScrollController();
     if (widget.reloadEvent != null) {
       _reloadEventSubscription = widget.reloadEvent!.listen((event) async {
+        bool shouldReloadFromDB = true;
+        if (event.source == 'uploadCompleted') {
+          final Map<int, EnteFile> genIDToUploadedFiles = {};
+          for (int i = 0; i < event.updatedFiles.length; i++) {
+            if (event.updatedFiles[i].generatedID == null) {
+              shouldReloadFromDB = true;
+              break;
+            }
+            genIDToUploadedFiles[event.updatedFiles[i].generatedID!] =
+                event.updatedFiles[i];
+          }
+          for (int i = 0; i < _allGalleryFiles.length; i++) {
+            final file = _allGalleryFiles[i];
+            if (file.generatedID == null) {
+              continue;
+            }
+            final updateFile = genIDToUploadedFiles[file.generatedID!];
+            if (updateFile != null &&
+                updateFile.localID == file.localID &&
+                areFromSameDay(
+                  updateFile.creationTime ?? 0,
+                  file.creationTime ?? 0,
+                )) {
+              _allGalleryFiles[i] = updateFile;
+              genIDToUploadedFiles.remove(file.generatedID!);
+            }
+          }
+          shouldReloadFromDB = genIDToUploadedFiles.isNotEmpty;
+        }
+        if (!shouldReloadFromDB) {
+          final bool hasCalledSetState = _onFilesLoaded(_allGalleryFiles);
+          _logger.info(
+            'Skip softRefresh from DB, processed updated in memory with setStateReload $hasCalledSetState',
+          );
+          return;
+        }
+
         _debouncer.run(() async {
           // In soft refresh, setState is called for entire gallery only when
           // number of child change
           _logger.finest("Soft refresh all files on ${event.reason} ");
           final result = await _loadFiles();
-          final bool hasReloaded = _onFilesLoaded(result.files);
-          if (hasReloaded && kDebugMode) {
+          final bool hasTriggeredSetState = _onFilesLoaded(result.files);
+          if (hasTriggeredSetState && kDebugMode) {
             _logger.finest(
               "Reloaded gallery on soft refresh all files on ${event.reason}",
             );
           }
-
-          setState(() {});
+          if (!hasTriggeredSetState && mounted) {
+            setState(() {});
+          }
         });
       });
     }
@@ -207,8 +246,9 @@ class GalleryState extends State<Gallery> {
           _hasLoadedFiles = true;
           currentGroupedFiles = updatedGroupedFiles;
         });
+        return true;
       }
-      return true;
+      return false;
     } else {
       currentGroupedFiles = updatedGroupedFiles;
       return false;
diff --git a/mobile/lib/utils/file_uploader.dart b/mobile/lib/utils/file_uploader.dart
index 05bf94a947..75b7cb08b8 100644
--- a/mobile/lib/utils/file_uploader.dart
+++ b/mobile/lib/utils/file_uploader.dart
@@ -823,14 +823,12 @@ class FileUploader {
       }
       await UploadLocksDB.instance.deleteMultipartTrack(lockKey);
 
-      if (!_isBackground) {
-        Bus.instance.fire(
-          LocalPhotosUpdatedEvent(
-            [remoteFile],
-            source: "downloadComplete",
-          ),
-        );
-      }
+      Bus.instance.fire(
+        LocalPhotosUpdatedEvent(
+          [remoteFile],
+          source: "uploadCompleted",
+        ),
+      );
       _logger.info("File upload complete for " + remoteFile.toString());
       uploadCompleted = true;
       Bus.instance.fire(FileUploadedEvent(remoteFile));

From f11803fd1f5db7eb7e3cd3f5608ca00527fe4262 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Wed, 5 Feb 2025 16:58:09 +0530
Subject: [PATCH 011/796] [mob] Lint fix

---
 mobile/lib/utils/file_uploader.dart | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mobile/lib/utils/file_uploader.dart b/mobile/lib/utils/file_uploader.dart
index 75b7cb08b8..ad2f7a1062 100644
--- a/mobile/lib/utils/file_uploader.dart
+++ b/mobile/lib/utils/file_uploader.dart
@@ -82,7 +82,6 @@ class FileUploader {
   int _uploadCounter = 0;
   int _videoUploadCounter = 0;
   late ProcessType _processType;
-  late bool _isBackground;
   late SharedPreferences _prefs;
 
   // _hasInitiatedForceUpload is used to track if user attempted force upload
@@ -104,7 +103,6 @@ class FileUploader {
 
   Future<void> init(SharedPreferences preferences, bool isBackground) async {
     _prefs = preferences;
-    _isBackground = isBackground;
     _processType =
         isBackground ? ProcessType.background : ProcessType.foreground;
     final currentTime = DateTime.now().microsecondsSinceEpoch;

From 8922d7e663c03ad66e90bfc87a4ea60881b4b0be Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 6 Feb 2025 14:38:05 +0530
Subject: [PATCH 012/796] [mob][photos] Merge trips

---
 mobile/lib/services/search_service.dart | 71 +++++++++++++++++--------
 1 file changed, 48 insertions(+), 23 deletions(-)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 16d881b3e2..421570dd59 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1369,25 +1369,50 @@ class SearchService {
     }
 
     // Check if any trip locations should be merged
-    // bool merged = false;
-    //   String? mergeID;
-    //   for (final tripLocation in tripLocations.values) {
-    //     final otherTripFirstTime = DateTime.fromMicrosecondsSinceEpoch(
-    //       tripLocation.$3,
-    //     );
-    //     final otherTripLastTime = DateTime.fromMicrosecondsSinceEpoch(
-    //       tripLocation.$4,
-    //     );
-    // final bool tripsMatch = firstCreationTime.isBefore(
-    //           otherTripLastTime.add(
-    //             const Duration(days: 1),
-    //           ),
-    //         ) ||
-    //         lastCreationTime.isAfter(
-    //           otherTripFirstTime.subtract(
-    //             const Duration(days: 1),
-    //           ),
-    //         );
+    final Map<String, (List<EnteFile>, int, int)> mergedTrips = {};
+    for (final tripID in tripLocations.keys) {
+      final trip = tripLocations[tripID]!;
+      final tripFirstTime = DateTime.fromMicrosecondsSinceEpoch(
+        trip.$3,
+      );
+      final tripLastTime = DateTime.fromMicrosecondsSinceEpoch(
+        trip.$4,
+      );
+      bool merged = false;
+      for (final otherTripID in mergedTrips.keys) {
+        final otherTrip = mergedTrips[otherTripID]!;
+        final otherTripFirstTime = DateTime.fromMicrosecondsSinceEpoch(
+          otherTrip.$2,
+        );
+        final otherTripLastTime = DateTime.fromMicrosecondsSinceEpoch(
+          otherTrip.$3,
+        );
+        final bool overlapBeginning = tripFirstTime.isBefore(
+              otherTripLastTime.add(
+                const Duration(days: 1),
+              ),
+            ) &&
+            tripFirstTime.isAfter(otherTripFirstTime);
+        final bool overlapEnd = tripLastTime.isAfter(
+              otherTripFirstTime.subtract(
+                const Duration(days: 1),
+              ),
+            ) &&
+            tripLastTime.isBefore(otherTripLastTime);
+        if (overlapBeginning || overlapEnd) {
+          mergedTrips[otherTripID] = (
+            otherTrip.$1 + trip.$1,
+            min(otherTrip.$2, trip.$3),
+            max(otherTrip.$3, trip.$4),
+          );
+          _logger.info('Merged two trip locations');
+          merged = true;
+          break;
+        }
+      }
+      if (merged) continue;
+      mergedTrips[tripID] = (trip.$1, trip.$3, trip.$4);
+    }
 
     // TODO: lau: Check if there are any trips to surface
     // For now for testing let's just surface all base and trip locations
@@ -1410,10 +1435,10 @@ class SearchService {
         ),
       );
     }
-    for (final tripLocation in tripLocations.values) {
-      final files = tripLocation.$1; // TODO: lau: take best selection only
-      // final location = tripLocation.$2;
-      const name = "Trip!";
+    for (final finalTrip in mergedTrips.values) {
+      final files = finalTrip.$1; // TODO: lau: take best selection only
+      final year = DateTime.fromMicrosecondsSinceEpoch((finalTrip.$2 + finalTrip.$2) ~/ 2).year;
+      final name = "Trip! ($year)";
       searchResults.add(
         GenericSearchResult(
           ResultType.event,

From d363f3759293f29a95b2fec62607d7e27696a371 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 7 Feb 2025 12:26:52 +0530
Subject: [PATCH 013/796] [mob] Fix creationTime parsing

---
 .../viewer/file_details/creation_time_item_widget.dart | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mobile/lib/ui/viewer/file_details/creation_time_item_widget.dart b/mobile/lib/ui/viewer/file_details/creation_time_item_widget.dart
index 90b6ab9d58..13c8800fa8 100644
--- a/mobile/lib/ui/viewer/file_details/creation_time_item_widget.dart
+++ b/mobile/lib/ui/viewer/file_details/creation_time_item_widget.dart
@@ -21,15 +21,15 @@ class CreationTimeItem extends StatefulWidget {
 class _CreationTimeItemState extends State<CreationTimeItem> {
   @override
   Widget build(BuildContext context) {
-    final dateTime =
-        DateTime.fromMicrosecondsSinceEpoch(widget.file.creationTime!);
+    final dateTime = DateTime.fromMicrosecondsSinceEpoch(
+      widget.file.creationTime!,
+      isUtc: true,
+    ).toLocal();
     return InfoItemWidget(
       key: const ValueKey("Creation time"),
       leadingIcon: Icons.calendar_today_outlined,
       title: DateFormat.yMMMEd(Localizations.localeOf(context).languageCode)
-          .format(
-        DateTime.fromMicrosecondsSinceEpoch(widget.file.creationTime!),
-      ),
+          .format(dateTime),
       subtitleSection: Future.value([
         Text(
           getTimeIn12hrFormat(dateTime) + "  " + dateTime.timeZoneName,

From 10079d4cb0edcf09a829f626eb64ffe541ae272b Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 7 Feb 2025 12:35:15 +0530
Subject: [PATCH 014/796] [mob] Fix handling of timezone

---
 mobile/lib/utils/exif_util.dart | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/mobile/lib/utils/exif_util.dart b/mobile/lib/utils/exif_util.dart
index 652336ebee..45741f07b6 100644
--- a/mobile/lib/utils/exif_util.dart
+++ b/mobile/lib/utils/exif_util.dart
@@ -154,24 +154,22 @@ Future<DateTime?> getCreationTimeFromEXIF(
 }
 
 DateTime getDateTimeInDeviceTimezone(String exifTime, String? offsetString) {
-  final DateTime result = DateFormat(kExifDateTimePattern).parse(exifTime);
+  final shouldParseDateInUTCTimeZone = offsetString != null;
+  final DateTime result = DateFormat(kExifDateTimePattern)
+      .parse(exifTime, shouldParseDateInUTCTimeZone);
   if (offsetString == null) {
     return result;
   }
   try {
     final List<String> splitHHMM = offsetString.split(":");
-    // Parse the offset from the photo's time zone
     final int offsetHours = int.parse(splitHHMM[0]);
     final int offsetMinutes =
         int.parse(splitHHMM[1]) * (offsetHours.isNegative ? -1 : 1);
     // Adjust the date for the offset to get the photo's correct UTC time
     final photoUtcDate =
         result.add(Duration(hours: -offsetHours, minutes: -offsetMinutes));
-    // Getting the current device's time zone offset from UTC
-    final now = DateTime.now();
-    final localOffset = now.timeZoneOffset;
-    // Adjusting the photo's UTC time to the device's local time
-    final deviceLocalTime = photoUtcDate.add(localOffset);
+    // Convert the UTC time to the device's local time
+    final deviceLocalTime = photoUtcDate.toLocal();
     return deviceLocalTime;
   } catch (e, s) {
     _logger.severe("tz offset adjust failed $offsetString", e, s);

From 602881ee2619bb8b45c7cb1d1070920ad1b5f96d Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 7 Feb 2025 13:54:44 +0530
Subject: [PATCH 015/796] [mob] Refactor

---
 mobile/lib/models/file/file.dart |  6 ++--
 mobile/lib/utils/exif_util.dart  | 55 +++++++++++++++++++++-----------
 mobile/lib/utils/share_util.dart |  6 ++--
 3 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/mobile/lib/models/file/file.dart b/mobile/lib/models/file/file.dart
index 937bee0cb1..9f3d561315 100644
--- a/mobile/lib/models/file/file.dart
+++ b/mobile/lib/models/file/file.dart
@@ -175,10 +175,10 @@ class EnteFile {
       final exifData = await getExifFromSourceFile(mediaUploadData.sourceFile!);
       if (exifData != null) {
         if (fileType == FileType.image) {
-          final exifTime = await getCreationTimeFromEXIF(null, exifData);
-          if (exifTime != null) {
+          final dateResult = await tryParseExifDateTime(null, exifData);
+          if (dateResult != null && dateResult.time != null) {
             hasExifTime = true;
-            creationTime = exifTime.microsecondsSinceEpoch;
+            creationTime = dateResult.time!.microsecondsSinceEpoch;
           }
           mediaUploadData.isPanorama = checkPanoramaFromEXIF(null, exifData);
 
diff --git a/mobile/lib/utils/exif_util.dart b/mobile/lib/utils/exif_util.dart
index 45741f07b6..940ffed644 100644
--- a/mobile/lib/utils/exif_util.dart
+++ b/mobile/lib/utils/exif_util.dart
@@ -125,7 +125,14 @@ bool? checkPanoramaFromEXIF(File? file, Map<String, IfdTag>? exifData) {
   return element?.printable == "6";
 }
 
-Future<DateTime?> getCreationTimeFromEXIF(
+class ParsedExifDateTime {
+  final DateTime? time;
+  final String? dateTime;
+  final String? offsetTime;
+  ParsedExifDateTime(this.time, this.dateTime, this.offsetTime);
+}
+
+Future<ParsedExifDateTime?> tryParseExifDateTime(
   File? file,
   Map<String, IfdTag>? exifData,
 ) async {
@@ -153,28 +160,38 @@ Future<DateTime?> getCreationTimeFromEXIF(
   return null;
 }
 
-DateTime getDateTimeInDeviceTimezone(String exifTime, String? offsetString) {
+ParsedExifDateTime getDateTimeInDeviceTimezone(
+  String exifTime,
+  String? offsetString,
+) {
   final shouldParseDateInUTCTimeZone = offsetString != null;
   final DateTime result = DateFormat(kExifDateTimePattern)
       .parse(exifTime, shouldParseDateInUTCTimeZone);
-  if (offsetString == null) {
-    return result;
+  if (offsetString != null && (offsetString ?? '').toUpperCase() != "Z") {
+    try {
+      final List<String> splitHHMM = offsetString.split(":");
+      final int offsetHours = int.parse(splitHHMM[0]);
+      final int offsetMinutes =
+          int.parse(splitHHMM[1]) * (offsetHours.isNegative ? -1 : 1);
+      // Adjust the date for the offset to get the photo's correct UTC time
+      final photoUtcDate =
+          result.add(Duration(hours: -offsetHours, minutes: -offsetMinutes));
+      // Convert the UTC time to the device's local time
+      final deviceLocalTime = photoUtcDate.toLocal();
+      return ParsedExifDateTime(
+        deviceLocalTime,
+        result.toIso8601String(),
+        offsetString,
+      );
+    } catch (e, s) {
+      _logger.severe("tz offset adjust failed $offsetString", e, s);
+    }
   }
-  try {
-    final List<String> splitHHMM = offsetString.split(":");
-    final int offsetHours = int.parse(splitHHMM[0]);
-    final int offsetMinutes =
-        int.parse(splitHHMM[1]) * (offsetHours.isNegative ? -1 : 1);
-    // Adjust the date for the offset to get the photo's correct UTC time
-    final photoUtcDate =
-        result.add(Duration(hours: -offsetHours, minutes: -offsetMinutes));
-    // Convert the UTC time to the device's local time
-    final deviceLocalTime = photoUtcDate.toLocal();
-    return deviceLocalTime;
-  } catch (e, s) {
-    _logger.severe("tz offset adjust failed $offsetString", e, s);
-  }
-  return result;
+  return ParsedExifDateTime(
+    result,
+    result.toIso8601String(),
+    (offsetString ?? '').toUpperCase() == 'Z' ? 'Z' : null,
+  );
 }
 
 Location? locationFromExif(Map<String, IfdTag> exif) {
diff --git a/mobile/lib/utils/share_util.dart b/mobile/lib/utils/share_util.dart
index c39d1733b9..3ec147798d 100644
--- a/mobile/lib/utils/share_util.dart
+++ b/mobile/lib/utils/share_util.dart
@@ -165,9 +165,9 @@ Future<List<EnteFile>> convertIncomingSharedMediaToFile(
     enteFile.fileType =
         media.type == SharedMediaType.image ? FileType.image : FileType.video;
     if (enteFile.fileType == FileType.image) {
-      final exifTime = await getCreationTimeFromEXIF(ioFile, null);
-      if (exifTime != null) {
-        enteFile.creationTime = exifTime.microsecondsSinceEpoch;
+      final dateResult = await tryParseExifDateTime(ioFile, null);
+      if (dateResult != null && dateResult.time != null) {
+        enteFile.creationTime = dateResult.time!.microsecondsSinceEpoch;
       }
     } else if (enteFile.fileType == FileType.video) {
       enteFile.duration = (media.duration ?? 0) ~/ 1000;

From 0a9e706b509e505743b2ea95619b4dd184409742 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 7 Feb 2025 14:36:16 +0530
Subject: [PATCH 016/796] [mob] Refactor

---
 mobile/lib/utils/exif_util.dart | 48 ++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/mobile/lib/utils/exif_util.dart b/mobile/lib/utils/exif_util.dart
index 940ffed644..beee7f61ef 100644
--- a/mobile/lib/utils/exif_util.dart
+++ b/mobile/lib/utils/exif_util.dart
@@ -126,10 +126,21 @@ bool? checkPanoramaFromEXIF(File? file, Map<String, IfdTag>? exifData) {
 }
 
 class ParsedExifDateTime {
-  final DateTime? time;
-  final String? dateTime;
-  final String? offsetTime;
-  ParsedExifDateTime(this.time, this.dateTime, this.offsetTime);
+  late final DateTime? time;
+  late final String? dateTime;
+  late final String? offsetTime;
+  ParsedExifDateTime(DateTime this.time, String? dateTime, this.offsetTime) {
+    if (dateTime != null && dateTime.endsWith('Z')) {
+      this.dateTime = dateTime.substring(0, dateTime.length - 1);
+    } else {
+      this.dateTime = dateTime;
+    }
+  }
+
+  @override
+  String toString() {
+    return "ParsedExifDateTime{time: $time, dateTime: $dateTime, offsetTime: $offsetTime}";
+  }
 }
 
 Future<ParsedExifDateTime?> tryParseExifDateTime(
@@ -144,16 +155,17 @@ Future<ParsedExifDateTime?> tryParseExifDateTime(
         : exif.containsKey(kImageDateTime)
             ? exif[kImageDateTime]!.printable
             : null;
-    if (exifTime != null && exifTime != kEmptyExifDateTime) {
-      String? exifOffsetTime;
-      for (final key in kExifOffSetKeys) {
-        if (exif.containsKey(key)) {
-          exifOffsetTime = exif[key]!.printable;
-          break;
-        }
-      }
-      return getDateTimeInDeviceTimezone(exifTime, exifOffsetTime);
+    if (exifTime == null || exifTime == kEmptyExifDateTime) {
+      return null;
     }
+    String? exifOffsetTime;
+    for (final key in kExifOffSetKeys) {
+      if (exif.containsKey(key)) {
+        exifOffsetTime = exif[key]!.printable;
+        break;
+      }
+    }
+    return getDateTimeInDeviceTimezone(exifTime, exifOffsetTime);
   } catch (e) {
     _logger.severe("failed to getCreationTimeFromEXIF", e);
   }
@@ -164,10 +176,10 @@ ParsedExifDateTime getDateTimeInDeviceTimezone(
   String exifTime,
   String? offsetString,
 ) {
-  final shouldParseDateInUTCTimeZone = offsetString != null;
-  final DateTime result = DateFormat(kExifDateTimePattern)
-      .parse(exifTime, shouldParseDateInUTCTimeZone);
-  if (offsetString != null && (offsetString ?? '').toUpperCase() != "Z") {
+  final hasOffset = (offsetString ?? '') != '';
+  final DateTime result =
+      DateFormat(kExifDateTimePattern).parse(exifTime, hasOffset);
+  if (hasOffset && offsetString!.toUpperCase() != "Z") {
     try {
       final List<String> splitHHMM = offsetString.split(":");
       final int offsetHours = int.parse(splitHHMM[0]);
@@ -184,7 +196,7 @@ ParsedExifDateTime getDateTimeInDeviceTimezone(
         offsetString,
       );
     } catch (e, s) {
-      _logger.severe("tz offset adjust failed $offsetString", e, s);
+      _logger.severe("offset parsing failed $exifTime &&  $offsetString", e, s);
     }
   }
   return ParsedExifDateTime(

From 5522121cf6ab36a7bfe547069c7f4f7d458657c7 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 7 Feb 2025 14:40:16 +0530
Subject: [PATCH 017/796] [mob] iOS podlock changes

---
 mobile/ios/Podfile.lock | 110 ++++++++++++++++++++--------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index 4fa0953533..87a17625ce 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -440,82 +440,82 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/wakelock_plus/ios"
 
 SPEC CHECKSUMS:
-  background_fetch: 94b36ee293e82972852dba8ede1fbcd3bd3d9d57
-  battery_info: a06b00c06a39bc94c92beebf600f1810cb6c8c87
-  connectivity_plus: 2256d3e20624a7749ed21653aafe291a46446fee
-  dart_ui_isolate: 46f6714abe6891313267153ef6f9748d8ecfcab1
-  device_info_plus: 335f3ce08d2e174b9fdc3db3db0f4e3b1f66bd89
+  background_fetch: 39f11371c0dce04b001c4bfd5e782bcccb0a85e2
+  battery_info: 09f5c9ee65394f2291c8c6227bedff345b8a730c
+  connectivity_plus: 18382e7311ba19efcaee94442b23b32507b20695
+  dart_ui_isolate: d5bcda83ca4b04f129d70eb90110b7a567aece14
+  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   ffmpeg-kit-ios-full-gpl: 80adc341962e55ef709e36baa8ed9a70cf4ea62b
-  ffmpeg_kit_flutter_full_gpl: ce18b888487c05c46ed252cd2e7956812f2e3bd1
-  file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
+  ffmpeg_kit_flutter_full_gpl: 8d15c14c0c3aba616fac04fe44b3d27d02e3c330
+  file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
   Firebase: 374a441a91ead896215703a674d58cdb3e9d772b
-  firebase_core: 2337982fb78ee4d8d91e608b0a3d4f44346a93c8
-  firebase_messaging: f3bddfa28c2cad70b3341bf461e987a24efd28d6
+  firebase_core: feb37e79f775c2bd08dd35e02d83678291317e10
+  firebase_messaging: e2f0ba891b1509668c07f5099761518a5af8fe3c
   FirebaseCore: 48b0dd707581cf9c1a1220da68223fb0a562afaa
   FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2
   FirebaseInstallations: efc0946fc756e4d22d8113f7c761948120322e8c
   FirebaseMessaging: e1aca1fcc23e8b9eddb0e33f375ff90944623021
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_email_sender: cd533cdc7ea5eda6fabb2c7f78521c71207778a4
-  flutter_image_compress: 4b058288a81f76e5e80340af37c709abafff34c4
-  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
-  flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100
-  flutter_native_splash: 6cad9122ea0fad137d23137dd14b937f3e90b145
-  flutter_secure_storage: 2c2ff13db9e0a5647389bff88b0ecac56e3f3418
-  flutter_sodium: 152647449ba89a157fd48d7e293dcd6d29c6ab0e
-  fluttertoast: 76fea30fcf04176325f6864c87306927bd7d2038
+  flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
+  flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433
+  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
+  flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
+  flutter_native_splash: f71420956eb811e6d310720fee915f1d42852e7a
+  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
+  flutter_sodium: c84426b4de738514b5b66cfdeb8a06634e72fe0b
+  fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
-  home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
-  image_editor_common: 3de87e7c4804f4ae24c8f8a998362b98c105cac1
-  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
-  in_app_purchase_storekit: e126ef1b89e4a9fdf07e28f005f82632b4609437
-  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
+  home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57
+  image_editor_common: d6f6644ae4a6de80481e89fe6d0a8c49e30b4b43
+  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
+  in_app_purchase_storekit: 8c3b0b3eb1b0f04efbff401c3de6266d4258d433
+  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
   libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
-  local_auth_darwin: 553ce4f9b16d3fdfeafce9cf042e7c9f77c1c391
-  local_auth_ios: f7a1841beef3151d140a967c2e46f30637cdf451
+  local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
+  local_auth_ios: 5046a18c018dd973247a0564496c8898dbb5adf9
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
-  maps_launcher: edf829809ba9e894d70e569bab11c16352dedb45
-  media_extension: a1fec16ee9c8241a6aef9613578ebf097d6c5e64
-  media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
-  media_kit_native_event_loop: 5fba1a849a6c87a34985f1e178a0de5bd444a0cf
-  media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
-  motion_sensors: 741e702c17467b9569a92165dda8d4d88c6167f1
-  motionphoto: 584b43031ead3060225cdff08fa49818879801d2
-  move_to_background: 155f7bfbd34d43ad847cb630d2d2d87c17199710
+  maps_launcher: 2e5b6a2d664ec6c27f82ffa81b74228d770ab203
+  media_extension: 6d30dc1431ebaa63f43c397c37917b1a0a597a4c
+  media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
+  media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
+  media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
+  motion_sensors: 03f55b7c637a7e365a0b5f9697a449f9059d5d91
+  motionphoto: d4a432b8c8f22fb3ad966258597c0103c9c5ff16
+  move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  native_video_player: b65c58951ede2f93d103a25366bdebca95081265
-  onnxruntime: f9b296392c96c42882be020a59dbeac6310d81b2
+  native_video_player: d12af78a1a4a8cf09775a5177d5b392def6fd23c
+  onnxruntime: e7c2ae44385191eaad5ae64c935a72debaddc997
   onnxruntime-c: a909204639a1f035f575127ac406f781ac797c9c
   onnxruntime-objc: b6fab0f1787aa6f7190c2013f03037df4718bd8b
-  open_mail_app: 06d5a4162866388a92b1df3deb96e56be20cf45c
+  open_mail_app: 794172f6a22cd16319d3ddaf45e945b2f74952b0
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: 566e1b7a2f3900e4b0020914ad3fc051dcc95596
-  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
-  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
-  photo_manager: d2fbcc0f2d82458700ee6256a15018210a81d413
-  privacy_screen: 3159a541f5d3a31bea916cfd4e58f9dc722b3fd4
+  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
+  photo_manager: ff695c7a1dd5bc379974953a2b5c0a293f7c4c8a
+  privacy_screen: 1a131c052ceb3c3659934b003b0d397c2381a24e
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00
-  screen_brightness_ios: 5ed898fa50fa82a26171c086ca5e28228f932576
+  receive_sharing_intent: 79c848f5b045674ad60b9fea3bafea59962ad2c1
+  screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
   SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
   Sentry: 38ed8bf38eab5812787274bf591e528074c19e02
-  sentry_flutter: a72ca0eb6e78335db7c4ddcddd1b9f6c8ed5b764
-  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
-  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
-  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
+  sentry_flutter: 7d1f1df30f3768c411603ed449519bbb90a7d87b
+  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
   sqlite3: 7559e33dae4c78538df563795af3a86fc887ee71
-  sqlite3_flutter_libs: 5235ce0546528db87927a3ef1baff8b7d5107f0e
-  system_info_plus: 555ce7047fbbf29154726db942ae785c29211740
+  sqlite3_flutter_libs: 58ae36c0dd086395d066b4fe4de9cdca83e717b3
+  system_info_plus: 5393c8da281d899950d751713575fbf91c7709aa
   Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
-  ua_client_hints: 92fe0d139619b73ec9fcb46cc7e079a26178f586
-  uni_links: ed8c961e47ed9ce42b6d91e1de8049e38a4b3152
-  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
-  video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
-  video_thumbnail: b637e0ad5f588ca9945f6e2c927f73a69a661140
-  volume_controller: ca1cde542ee70fad77d388f82e9616488110942b
-  wakelock_plus: 8c239121a007daa1d6759c6acdc507860273dd2f
+  ua_client_hints: aeabd123262c087f0ce151ef96fa3ab77bfc8b38
+  uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
+  video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1
+  volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
+  wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
 
 PODFILE CHECKSUM: 20e086e6008977d43a3d40260f3f9bffcac748dd
 

From c20dcdae76a632ef9e8ff88bb13a09e6f61919d6 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 7 Feb 2025 14:59:52 +0530
Subject: [PATCH 018/796] [mob] Add support for parsing dateTime & offsetTime
 from pubMagicMetadata

---
 mobile/lib/models/metadata/file_magic.dart | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mobile/lib/models/metadata/file_magic.dart b/mobile/lib/models/metadata/file_magic.dart
index 7599b7c82f..02f6188a9d 100644
--- a/mobile/lib/models/metadata/file_magic.dart
+++ b/mobile/lib/models/metadata/file_magic.dart
@@ -14,6 +14,8 @@ const latKey = "lat";
 const longKey = "long";
 const motionVideoIndexKey = "mvi";
 const noThumbKey = "noThumb";
+const dateTimeKey = 'dateTime';
+const offsetTimeKey = 'offsetTime';
 
 class MagicMetadata {
   // 0 -> visible
@@ -46,6 +48,11 @@ class PubMagicMetadata {
   double? lat;
   double? long;
 
+  // ISO 8601 datetime without timezone. This contains the date and time of the photo in the original tz
+  // where the photo was taken.
+  String? dateTime;
+  String? offsetTime;
+
   // Motion Video Index. Positive value (>0) indicates that the file is a motion
   // photo
   int? mvi;
@@ -74,6 +81,8 @@ class PubMagicMetadata {
     this.mvi,
     this.noThumb,
     this.mediaType,
+    this.dateTime,
+    this.offsetTime,
   });
 
   factory PubMagicMetadata.fromEncodedJson(String encodedJson) =>
@@ -96,6 +105,8 @@ class PubMagicMetadata {
       mvi: map[motionVideoIndexKey],
       noThumb: map[noThumbKey],
       mediaType: map[mediaTypeKey],
+      dateTime: map[dateTimeKey],
+      offsetTime: map[offsetTimeKey],
     );
   }
 

From b6b724f64fd09324c8f85a4bb046349db22eb055 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 7 Feb 2025 15:38:49 +0530
Subject: [PATCH 019/796] [mob] Parse exif as part of MediaUploadData

---
 mobile/lib/models/file/file.dart         |  2 +-
 mobile/lib/utils/exif_util.dart          |  2 +-
 mobile/lib/utils/file_uploader.dart      |  2 +-
 mobile/lib/utils/file_uploader_util.dart | 28 +++++++++++++++++++-----
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/mobile/lib/models/file/file.dart b/mobile/lib/models/file/file.dart
index 9f3d561315..44572632e1 100644
--- a/mobile/lib/models/file/file.dart
+++ b/mobile/lib/models/file/file.dart
@@ -172,7 +172,7 @@ class EnteFile {
     bool hasExifTime = false;
     if ((fileType == FileType.image || fileType == FileType.video) &&
         mediaUploadData.sourceFile != null) {
-      final exifData = await getExifFromSourceFile(mediaUploadData.sourceFile!);
+      final exifData = await tryExifFromFile(mediaUploadData.sourceFile!);
       if (exifData != null) {
         if (fileType == FileType.image) {
           final dateResult = await tryParseExifDateTime(null, exifData);
diff --git a/mobile/lib/utils/exif_util.dart b/mobile/lib/utils/exif_util.dart
index beee7f61ef..a94e02bece 100644
--- a/mobile/lib/utils/exif_util.dart
+++ b/mobile/lib/utils/exif_util.dart
@@ -47,7 +47,7 @@ Future<Map<String, IfdTag>> getExif(EnteFile file) async {
   }
 }
 
-Future<Map<String, IfdTag>?> getExifFromSourceFile(File originFile) async {
+Future<Map<String, IfdTag>?> tryExifFromFile(File originFile) async {
   try {
     final exif = await readExifAsync(originFile);
     return exif;
diff --git a/mobile/lib/utils/file_uploader.dart b/mobile/lib/utils/file_uploader.dart
index 05bf94a947..c9d36643aa 100644
--- a/mobile/lib/utils/file_uploader.dart
+++ b/mobile/lib/utils/file_uploader.dart
@@ -538,7 +538,7 @@ class FileUploader {
 
     MediaUploadData? mediaUploadData;
     try {
-      mediaUploadData = await getUploadDataFromEnteFile(file);
+      mediaUploadData = await getUploadDataFromEnteFile(file, parseExif: true);
     } catch (e) {
       // This additional try catch block is added because for resumable upload,
       // we need to compute the hash before the next step. Previously, this
diff --git a/mobile/lib/utils/file_uploader_util.dart b/mobile/lib/utils/file_uploader_util.dart
index 6ad6622f5f..63764a3066 100644
--- a/mobile/lib/utils/file_uploader_util.dart
+++ b/mobile/lib/utils/file_uploader_util.dart
@@ -6,6 +6,7 @@ import 'dart:ui' as ui;
 
 import "package:archive/archive_io.dart";
 import "package:computer/computer.dart";
+import "package:exif/exif.dart";
 import 'package:logging/logging.dart';
 import "package:motion_photos/motion_photos.dart";
 import 'package:motionphoto/motionphoto.dart';
@@ -44,6 +45,8 @@ class MediaUploadData {
   // For iOS, this value will be always null.
   final int? motionPhotoStartIndex;
 
+  final Map<String, IfdTag>? exifData;
+
   bool? isPanorama;
 
   MediaUploadData(
@@ -55,6 +58,7 @@ class MediaUploadData {
     this.width,
     this.motionPhotoStartIndex,
     this.isPanorama,
+    this.exifData,
   });
 }
 
@@ -69,20 +73,27 @@ class FileHashData {
   FileHashData(this.fileHash, {this.zipHash});
 }
 
-Future<MediaUploadData> getUploadDataFromEnteFile(EnteFile file) async {
+Future<MediaUploadData> getUploadDataFromEnteFile(
+  EnteFile file, {
+  bool parseExif = false,
+}) async {
   if (file.isSharedMediaToAppSandbox) {
-    return await _getMediaUploadDataFromAppCache(file);
+    return await _getMediaUploadDataFromAppCache(file, parseExif);
   } else {
-    return await _getMediaUploadDataFromAssetFile(file);
+    return await _getMediaUploadDataFromAssetFile(file, parseExif);
   }
 }
 
-Future<MediaUploadData> _getMediaUploadDataFromAssetFile(EnteFile file) async {
+Future<MediaUploadData> _getMediaUploadDataFromAssetFile(
+  EnteFile file,
+  bool parseExif,
+) async {
   File? sourceFile;
   Uint8List? thumbnailData;
   bool isDeleted;
   String? zipHash;
   String fileHash;
+  Map<String, IfdTag>? exifData;
 
   // The timeouts are to safeguard against https://github.com/CaiJingLong/flutter_photo_manager/issues/467
   final asset = await file.getAsset
@@ -115,6 +126,9 @@ Future<MediaUploadData> _getMediaUploadDataFromAssetFile(EnteFile file) async {
       InvalidReason.sourceFileMissing,
     );
   }
+  if (parseExif) {
+    exifData = await tryExifFromFile(sourceFile);
+  }
   // h4ck to fetch location data if missing (thank you Android Q+) lazily only during uploads
   await _decorateEnteFileData(file, asset, sourceFile);
   fileHash = CryptoUtil.bin2base64(await CryptoUtil.getHash(sourceFile));
@@ -177,6 +191,7 @@ Future<MediaUploadData> _getMediaUploadDataFromAssetFile(EnteFile file) async {
     height: h,
     width: w,
     motionPhotoStartIndex: motionPhotoStartingIndex,
+    exifData: exifData,
   );
 }
 
@@ -330,9 +345,11 @@ Future<MetadataRequest> getPubMetadataRequest(
   );
 }
 
-Future<MediaUploadData> _getMediaUploadDataFromAppCache(EnteFile file) async {
+Future<MediaUploadData> _getMediaUploadDataFromAppCache(
+    EnteFile file, bool parseExif) async {
   File sourceFile;
   Uint8List? thumbnailData;
+  Map<String, IfdTag>? exifData;
   const bool isDeleted = false;
   final localPath = getSharedMediaFilePath(file);
   sourceFile = File(localPath);
@@ -350,6 +367,7 @@ Future<MediaUploadData> _getMediaUploadDataFromAppCache(EnteFile file) async {
     Map<String, int>? dimensions;
     if (file.fileType == FileType.image) {
       dimensions = await getImageHeightAndWith(imagePath: localPath);
+      exifData = await tryExifFromFile(sourceFile);
     } else if (thumbnailData != null) {
       // the thumbnail null check is to ensure that we are able to generate thum
       // for video, we need to use the thumbnail data with any max width/height

From 8559dd8364c5ff584fae9bb4fa0fc2a81b286eb9 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 7 Feb 2025 16:09:57 +0530
Subject: [PATCH 020/796] [mob] Refactor

---
 mobile/lib/models/file/file.dart         | 47 +++++++++---------------
 mobile/lib/utils/file_uploader.dart      |  8 +++-
 mobile/lib/utils/file_uploader_util.dart | 10 ++++-
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/mobile/lib/models/file/file.dart b/mobile/lib/models/file/file.dart
index 44572632e1..705d740e82 100644
--- a/mobile/lib/models/file/file.dart
+++ b/mobile/lib/models/file/file.dart
@@ -160,6 +160,7 @@ class EnteFile {
 
   Future<Map<String, dynamic>> getMetadataForUpload(
     MediaUploadData mediaUploadData,
+    ParsedExifDateTime? exifTime,
   ) async {
     final asset = await getAsset;
     // asset can be null for files shared to app
@@ -170,36 +171,24 @@ class EnteFile {
       }
     }
     bool hasExifTime = false;
-    if ((fileType == FileType.image || fileType == FileType.video) &&
-        mediaUploadData.sourceFile != null) {
-      final exifData = await tryExifFromFile(mediaUploadData.sourceFile!);
-      if (exifData != null) {
-        if (fileType == FileType.image) {
-          final dateResult = await tryParseExifDateTime(null, exifData);
-          if (dateResult != null && dateResult.time != null) {
-            hasExifTime = true;
-            creationTime = dateResult.time!.microsecondsSinceEpoch;
-          }
-          mediaUploadData.isPanorama = checkPanoramaFromEXIF(null, exifData);
-
-          if (mediaUploadData.isPanorama != true) {
-            try {
-              final xmpData = await getXmp(mediaUploadData.sourceFile!);
-              mediaUploadData.isPanorama = checkPanoramaFromXMP(xmpData);
-            } catch (_) {}
-
-            mediaUploadData.isPanorama ??= false;
-          }
-        }
-        if (Platform.isAndroid) {
-          //Fix for missing location data in lower android versions.
-          final Location? exifLocation = locationFromExif(exifData);
-          if (Location.isValidLocation(exifLocation)) {
-            location = exifLocation;
-          }
-        }
-      }
+    if (exifTime != null && exifTime.time != null) {
+      hasExifTime = true;
+      creationTime = exifTime.time!.microsecondsSinceEpoch;
     }
+    if (mediaUploadData.exifData != null) {
+      mediaUploadData.isPanorama =
+          checkPanoramaFromEXIF(null, mediaUploadData.exifData);
+    }
+    if (mediaUploadData.isPanorama != true &&
+        fileType == FileType.image &&
+        mediaUploadData.sourceFile != null) {
+      try {
+        final xmpData = await getXmp(mediaUploadData.sourceFile!);
+        mediaUploadData.isPanorama = checkPanoramaFromXMP(xmpData);
+      } catch (_) {}
+      mediaUploadData.isPanorama ??= false;
+    }
+
     // Try to get the timestamp from fileName. In case of iOS, file names are
     // generic IMG_XXXX, so only parse it on Android devices
     if (!hasExifTime && Platform.isAndroid && title != null) {
diff --git a/mobile/lib/utils/file_uploader.dart b/mobile/lib/utils/file_uploader.dart
index c9d36643aa..4ed4497191 100644
--- a/mobile/lib/utils/file_uploader.dart
+++ b/mobile/lib/utils/file_uploader.dart
@@ -41,6 +41,7 @@ import 'package:photos/services/sync_service.dart';
 import "package:photos/services/user_service.dart";
 import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/data_util.dart';
+import "package:photos/utils/exif_util.dart";
 import "package:photos/utils/file_key.dart";
 import 'package:photos/utils/file_uploader_util.dart';
 import "package:photos/utils/file_util.dart";
@@ -730,8 +731,13 @@ class FileUploader {
           encThumbSize,
         );
       }
+      final ParsedExifDateTime? exifTime = await tryParseExifDateTime(
+        null,
+        mediaUploadData.exifData,
+      );
+      final metadata =
+          await file.getMetadataForUpload(mediaUploadData, exifTime);
 
-      final metadata = await file.getMetadataForUpload(mediaUploadData);
       final encryptedMetadataResult = await CryptoUtil.encryptChaCha(
         utf8.encode(jsonEncode(metadata)),
         fileAttributes.key!,
diff --git a/mobile/lib/utils/file_uploader_util.dart b/mobile/lib/utils/file_uploader_util.dart
index 63764a3066..4c9abab322 100644
--- a/mobile/lib/utils/file_uploader_util.dart
+++ b/mobile/lib/utils/file_uploader_util.dart
@@ -130,7 +130,7 @@ Future<MediaUploadData> _getMediaUploadDataFromAssetFile(
     exifData = await tryExifFromFile(sourceFile);
   }
   // h4ck to fetch location data if missing (thank you Android Q+) lazily only during uploads
-  await _decorateEnteFileData(file, asset, sourceFile);
+  await _decorateEnteFileData(file, asset, sourceFile, exifData);
   fileHash = CryptoUtil.bin2base64(await CryptoUtil.getHash(sourceFile));
 
   if (file.fileType == FileType.livePhoto && Platform.isIOS) {
@@ -299,6 +299,7 @@ Future<void> _decorateEnteFileData(
   EnteFile file,
   AssetEntity asset,
   File sourceFile,
+  Map<String, IfdTag>? exifData,
 ) async {
   // h4ck to fetch location data if missing (thank you Android Q+) lazily only during uploads
   if (file.location == null ||
@@ -313,6 +314,13 @@ Future<void> _decorateEnteFileData(
       file.location = props.location;
     }
   }
+  if (Platform.isAndroid && exifData != null) {
+    //Fix for missing location data in lower android versions.
+    final Location? exifLocation = locationFromExif(exifData);
+    if (Location.isValidLocation(exifLocation)) {
+      file.location = exifLocation;
+    }
+  }
   if (file.title == null || file.title!.isEmpty) {
     _logger.warning("Title was missing ${file.tag}");
     file.title = await asset.titleAsync;

From 5d0a15e9e5314b27dd49956283a9f2c49aa8281c Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 7 Feb 2025 16:32:02 +0530
Subject: [PATCH 021/796] [mob] Fill dateTime and offsetTime during upload

---
 mobile/lib/utils/file_uploader.dart | 45 +++++++++++++++++++----------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/mobile/lib/utils/file_uploader.dart b/mobile/lib/utils/file_uploader.dart
index 4ed4497191..1d21e51c72 100644
--- a/mobile/lib/utils/file_uploader.dart
+++ b/mobile/lib/utils/file_uploader.dart
@@ -779,22 +779,9 @@ class FileUploader {
             CryptoUtil.bin2base64(encryptedFileKeyData.encryptedData!);
         final keyDecryptionNonce =
             CryptoUtil.bin2base64(encryptedFileKeyData.nonce!);
-        final Map<String, dynamic> pubMetadata = {};
+        final Map<String, dynamic> pubMetadata =
+            _buildPublicMagicData(mediaUploadData, exifTime);
         MetadataRequest? pubMetadataRequest;
-        if ((mediaUploadData.height ?? 0) != 0 &&
-            (mediaUploadData.width ?? 0) != 0) {
-          pubMetadata[heightKey] = mediaUploadData.height;
-          pubMetadata[widthKey] = mediaUploadData.width;
-          pubMetadata[mediaTypeKey] =
-              mediaUploadData.isPanorama == true ? 1 : 0;
-        }
-        if (mediaUploadData.motionPhotoStartIndex != null) {
-          pubMetadata[motionVideoIndexKey] =
-              mediaUploadData.motionPhotoStartIndex;
-        }
-        if (mediaUploadData.thumbnail == null) {
-          pubMetadata[noThumbKey] = true;
-        }
         if (pubMetadata.isNotEmpty) {
           pubMetadataRequest = await getPubMetadataRequest(
             file,
@@ -878,6 +865,34 @@ class FileUploader {
     }
   }
 
+  Map<String, dynamic> _buildPublicMagicData(
+    MediaUploadData mediaUploadData,
+    ParsedExifDateTime? exifTime,
+  ) {
+    final Map<String, dynamic> pubMetadata = {};
+    if ((mediaUploadData.height ?? 0) != 0 &&
+        (mediaUploadData.width ?? 0) != 0) {
+      pubMetadata[heightKey] = mediaUploadData.height;
+      pubMetadata[widthKey] = mediaUploadData.width;
+      pubMetadata[mediaTypeKey] = mediaUploadData.isPanorama == true ? 1 : 0;
+    }
+    if (mediaUploadData.motionPhotoStartIndex != null) {
+      pubMetadata[motionVideoIndexKey] = mediaUploadData.motionPhotoStartIndex;
+    }
+    if (mediaUploadData.thumbnail == null) {
+      pubMetadata[noThumbKey] = true;
+    }
+    if (exifTime != null) {
+      if (exifTime.dateTime != null) {
+        pubMetadata[dateTimeKey] = exifTime.dateTime;
+      }
+      if (exifTime.offsetTime != null) {
+        pubMetadata[offsetTimeKey] = exifTime.offsetTime;
+      }
+    }
+    return pubMetadata;
+  }
+
   bool isPutOrUpdateFileError(Object e) {
     if (e is DioError) {
       return e.requestOptions.path.contains("/files") ||

From 726c6dc8e6f1ce9e58fc219f6bef01a701b186d4 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 10 Feb 2025 11:33:11 +0530
Subject: [PATCH 022/796] [mob][photos] Increase trip distance threshold

---
 mobile/lib/services/search_service.dart | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 421570dd59..f99713a8f2 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1254,7 +1254,7 @@ class SearchService {
           if (isFileInsideLocationTag(
             clusterLocation,
             file.location!,
-            50.0,
+            100.0,
           )) {
             wideRadiusClusters[clusterID]!.$1.add(file);
             foundWideCluster = true;
@@ -1437,7 +1437,9 @@ class SearchService {
     }
     for (final finalTrip in mergedTrips.values) {
       final files = finalTrip.$1; // TODO: lau: take best selection only
-      final year = DateTime.fromMicrosecondsSinceEpoch((finalTrip.$2 + finalTrip.$2) ~/ 2).year;
+      final year = DateTime.fromMicrosecondsSinceEpoch(
+        (finalTrip.$2 + finalTrip.$2) ~/ 2,
+      ).year;
       final name = "Trip! ($year)";
       searchResults.add(
         GenericSearchResult(

From 12c472ef01e5fad088f2b701e13eb31952aa15c7 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 10 Feb 2025 11:34:45 +0530
Subject: [PATCH 023/796] [mob] Fix lint & missing exif for files shared to
 ente

---
 mobile/lib/utils/file_uploader_util.dart | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/utils/file_uploader_util.dart b/mobile/lib/utils/file_uploader_util.dart
index 4c9abab322..6f37236b8e 100644
--- a/mobile/lib/utils/file_uploader_util.dart
+++ b/mobile/lib/utils/file_uploader_util.dart
@@ -354,7 +354,9 @@ Future<MetadataRequest> getPubMetadataRequest(
 }
 
 Future<MediaUploadData> _getMediaUploadDataFromAppCache(
-    EnteFile file, bool parseExif) async {
+  EnteFile file,
+  bool parseExif,
+) async {
   File sourceFile;
   Uint8List? thumbnailData;
   Map<String, IfdTag>? exifData;
@@ -394,6 +396,7 @@ Future<MediaUploadData> _getMediaUploadDataFromAppCache(
       FileHashData(fileHash),
       height: dimensions?['height'],
       width: dimensions?['width'],
+      exifData: exifData,
     );
   } catch (e, s) {
     _logger.warning("failed to generate thumbnail", e, s);

From b453ffef85ed493b9045676b8204d59abed63176 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 10 Feb 2025 13:29:17 +0530
Subject: [PATCH 024/796] [server] Speed up file deletion

---
 server/pkg/controller/file.go | 36 ++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/server/pkg/controller/file.go b/server/pkg/controller/file.go
index 7f871cc098..0b2568ff5c 100644
--- a/server/pkg/controller/file.go
+++ b/server/pkg/controller/file.go
@@ -6,11 +6,13 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/ente-io/museum/pkg/controller/discord"
-	"github.com/ente-io/museum/pkg/utils/network"
 	"runtime/debug"
 	"strconv"
 	"strings"
+	"sync"
+
+	"github.com/ente-io/museum/pkg/controller/discord"
+	"github.com/ente-io/museum/pkg/utils/network"
 
 	"github.com/ente-io/museum/pkg/controller/email"
 	"github.com/ente-io/museum/pkg/controller/lock"
@@ -695,14 +697,38 @@ func (c *FileController) CleanupDeletedFiles() {
 	defer func() {
 		c.LockController.ReleaseLock(DeletedObjectQueueLock)
 	}()
-	items, err := c.QueueRepo.GetItemsReadyForDeletion(repo.DeleteObjectQueue, 1500)
+	items, err := c.QueueRepo.GetItemsReadyForDeletion(repo.DeleteObjectQueue, 2500)
 	if err != nil {
 		log.WithError(err).Error("Failed to fetch items from queue")
 		return
 	}
-	for _, i := range items {
-		c.cleanupDeletedFile(i)
+	var wg sync.WaitGroup
+	itemChan := make(chan repo.QueueItem, len(items))
+
+	// Start worker goroutines
+	for w := 0; w < 4; w++ {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			for item := range itemChan {
+				func(item repo.QueueItem) {
+					defer func() {
+						if r := recover(); r != nil {
+							log.WithField("item", item.Item).Errorf("Recovered from panic: %v", r)
+						}
+					}()
+					c.cleanupDeletedFile(item)
+				}(item)
+			}
+		}()
 	}
+	// Send items to the channel
+	for _, item := range items {
+		itemChan <- item
+	}
+	close(itemChan)
+	// Wait for all workers to finish
+	wg.Wait()
 }
 
 func (c *FileController) GetTotalFileCount() (int64, error) {

From caf601b49bf20936cadfa45115f69ab3930f27a7 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 10 Feb 2025 13:55:59 +0530
Subject: [PATCH 025/796] [mob][photos] Switch order

---
 mobile/lib/services/search_service.dart | 43 +++++++++++++------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index f99713a8f2..0b6c4980d6 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1317,25 +1317,7 @@ class SearchService {
     for (final clusterID in wideRadiusClusters.keys) {
       final files = wideRadiusClusters[clusterID]!.$1;
       final location = wideRadiusClusters[clusterID]!.$2;
-      // Check that the photos are distributed over a short time range (2-30 days)
-      final creationTimes = <int>[];
-      for (final file in files) {
-        if (file.creationTime != null) {
-          creationTimes.add(file.creationTime!);
-        }
-      }
-      creationTimes.sort();
-      if (creationTimes.length < 2) continue;
-      final firstCreationTime = DateTime.fromMicrosecondsSinceEpoch(
-        creationTimes.first,
-      );
-      final lastCreationTime = DateTime.fromMicrosecondsSinceEpoch(
-        creationTimes.last,
-      );
-      final days = lastCreationTime.difference(firstCreationTime).inDays;
-      if (days < 2 || days > 30) {
-        continue;
-      }
+
       // Check that it's at least 10km away from any base or tag location
       bool tooClose = false;
       for (final baseLocation in baseLocations.values) {
@@ -1348,7 +1330,6 @@ class SearchService {
           break;
         }
       }
-      if (tooClose) continue;
       for (final tag in tagToItemsMap.keys) {
         if (isFileInsideLocationTag(
           tag.item.centerPoint,
@@ -1360,6 +1341,28 @@ class SearchService {
         }
       }
       if (tooClose) continue;
+      
+      // Check that the photos are distributed over a short time range (2-30 days)
+      final creationTimes = <int>[];
+      for (final file in files) {
+        if (file.creationTime != null) {
+          creationTimes.add(file.creationTime!);
+        }
+      }
+      if (creationTimes.length < 2) continue;
+      creationTimes.sort();
+      
+      final firstCreationTime = DateTime.fromMicrosecondsSinceEpoch(
+        creationTimes.first,
+      );
+      final lastCreationTime = DateTime.fromMicrosecondsSinceEpoch(
+        creationTimes.last,
+      );
+      final days = lastCreationTime.difference(firstCreationTime).inDays;
+      if (days < 2 || days > 30) {
+        continue;
+      }
+      
       tripLocations[clusterID] = (
         files,
         location,

From d99d08e8ae62c86c458218c0c2c947241721136e Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 10 Feb 2025 14:09:56 +0530
Subject: [PATCH 026/796] [mob][photos] creationTime check

---
 mobile/lib/services/search_service.dart | 28 ++++++++++++-------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 0b6c4980d6..4cddec7ba8 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1208,7 +1208,10 @@ class SearchService {
     final Map<String, (List<EnteFile>, Location)> wideRadiusClusters = {};
     // Go through all files and cluster the ones not inside any location tag
     for (EnteFile file in allFiles) {
-      if (!file.hasLocation || file.uploadedFileID == null || !file.isOwner) {
+      if (!file.hasLocation ||
+          file.uploadedFileID == null ||
+          !file.isOwner ||
+          file.creationTime == null) {
         continue;
       }
       // Check if the file is inside any location tag
@@ -1281,13 +1284,11 @@ class SearchService {
       final creationTimes = <int>[];
       final Set<int> uniqueDays = {};
       for (final file in files) {
-        if (file.creationTime != null) {
-          creationTimes.add(file.creationTime!);
-          final date = DateTime.fromMicrosecondsSinceEpoch(file.creationTime!);
-          final dayStamp =
-              DateTime(date.year, date.month, date.day).microsecondsSinceEpoch;
-          uniqueDays.add(dayStamp);
-        }
+        creationTimes.add(file.creationTime!);
+        final date = DateTime.fromMicrosecondsSinceEpoch(file.creationTime!);
+        final dayStamp =
+            DateTime(date.year, date.month, date.day).microsecondsSinceEpoch;
+        uniqueDays.add(dayStamp);
       }
       creationTimes.sort();
       if (creationTimes.length < 10) continue;
@@ -1341,17 +1342,14 @@ class SearchService {
         }
       }
       if (tooClose) continue;
-      
-      // Check that the photos are distributed over a short time range (2-30 days)
+
+      // Check that the photos are distributed over a short time range (2-30 days) or multiple short time ranges only
       final creationTimes = <int>[];
       for (final file in files) {
-        if (file.creationTime != null) {
-          creationTimes.add(file.creationTime!);
-        }
+        creationTimes.add(file.creationTime!);
       }
       if (creationTimes.length < 2) continue;
       creationTimes.sort();
-      
       final firstCreationTime = DateTime.fromMicrosecondsSinceEpoch(
         creationTimes.first,
       );
@@ -1362,7 +1360,7 @@ class SearchService {
       if (days < 2 || days > 30) {
         continue;
       }
-      
+
       tripLocations[clusterID] = (
         files,
         location,

From b0966e0cca0279e826a6b25f111f4c23b615bc76 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 10 Feb 2025 15:19:51 +0530
Subject: [PATCH 027/796] [server] Delete more items in single run

---
 server/pkg/controller/file.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/pkg/controller/file.go b/server/pkg/controller/file.go
index 0b2568ff5c..be9a553756 100644
--- a/server/pkg/controller/file.go
+++ b/server/pkg/controller/file.go
@@ -697,7 +697,7 @@ func (c *FileController) CleanupDeletedFiles() {
 	defer func() {
 		c.LockController.ReleaseLock(DeletedObjectQueueLock)
 	}()
-	items, err := c.QueueRepo.GetItemsReadyForDeletion(repo.DeleteObjectQueue, 2500)
+	items, err := c.QueueRepo.GetItemsReadyForDeletion(repo.DeleteObjectQueue, 5000)
 	if err != nil {
 		log.WithError(err).Error("Failed to fetch items from queue")
 		return

From 7509abd1a90fedc121e37503783ebb3c58ab655b Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 10 Feb 2025 15:21:31 +0530
Subject: [PATCH 028/796] [server] Increase cron freq

---
 server/cmd/museum/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go
index e1a3622011..9ddb958596 100644
--- a/server/cmd/museum/main.go
+++ b/server/cmd/museum/main.go
@@ -943,7 +943,7 @@ func setupAndStartCrons(userAuthRepo *repo.UserAuthRepository, publicCollectionR
 		}
 	})
 
-	schedule(c, "@every 10m", func() {
+	schedule(c, "@every 8m", func() {
 		fileController.CleanupDeletedFiles()
 	})
 	schedule(c, "@every 101s", func() {

From 8d7950afea9f2047400aeaab3387395848856bdc Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 10 Feb 2025 15:49:02 +0530
Subject: [PATCH 029/796] [mob][photos] Change logic for repeating trips

---
 mobile/lib/services/search_service.dart | 70 +++++++++++++++++--------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 4cddec7ba8..e35f347392 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1315,6 +1315,7 @@ class SearchService {
 
     // Identify trip locations
     final Map<String, (List<EnteFile>, Location, int, int)> tripLocations = {};
+    clusteredLocations:
     for (final clusterID in wideRadiusClusters.keys) {
       final files = wideRadiusClusters[clusterID]!.$1;
       final location = wideRadiusClusters[clusterID]!.$2;
@@ -1341,32 +1342,55 @@ class SearchService {
           break;
         }
       }
-      if (tooClose) continue;
+      if (tooClose) continue clusteredLocations;
 
       // Check that the photos are distributed over a short time range (2-30 days) or multiple short time ranges only
-      final creationTimes = <int>[];
-      for (final file in files) {
-        creationTimes.add(file.creationTime!);
-      }
-      if (creationTimes.length < 2) continue;
-      creationTimes.sort();
-      final firstCreationTime = DateTime.fromMicrosecondsSinceEpoch(
-        creationTimes.first,
-      );
-      final lastCreationTime = DateTime.fromMicrosecondsSinceEpoch(
-        creationTimes.last,
-      );
-      final days = lastCreationTime.difference(firstCreationTime).inDays;
-      if (days < 2 || days > 30) {
-        continue;
-      }
+      files.sort((a, b) => a.creationTime!.compareTo(b.creationTime!));
+      // Find distinct time blocks (potential trips)
+      List<EnteFile> currentBlockFiles = [files.first];
+      int blockStart = files.first.creationTime!;
+      int lastTime = files.first.creationTime!;
+      DateTime lastDateTime = DateTime.fromMicrosecondsSinceEpoch(lastTime);
 
-      tripLocations[clusterID] = (
-        files,
-        location,
-        firstCreationTime.microsecondsSinceEpoch,
-        lastCreationTime.microsecondsSinceEpoch
-      );
+      for (int i = 1; i < files.length; i++) {
+        final currentFile = files[i];
+        final currentTime = currentFile.creationTime!;
+        final gap = DateTime.fromMicrosecondsSinceEpoch(currentTime)
+            .difference(lastDateTime)
+            .inDays;
+
+        // If gap is too large, end current block and check if it's a valid trip
+        if (gap > 15) {
+          // 10 days gap to separate trips. If gap is small, it's likely not a trip
+          if (gap < 90) continue clusteredLocations;
+
+          final blockDuration = lastDateTime
+              .difference(DateTime.fromMicrosecondsSinceEpoch(blockStart))
+              .inDays;
+
+          // Check if current block is a valid trip (2-30 days)
+          if (blockDuration >= 2 && blockDuration <= 30) {
+            tripLocations[newAutoLocationID()] =
+                (List.from(currentBlockFiles), location, blockStart, lastTime);
+          }
+
+          // Start new block
+          currentBlockFiles = [];
+          blockStart = currentTime;
+        }
+
+        currentBlockFiles.add(currentFile);
+        lastTime = currentTime;
+        lastDateTime = DateTime.fromMicrosecondsSinceEpoch(lastTime);
+      }
+      // Check final block
+      final lastBlockDuration = lastDateTime
+          .difference(DateTime.fromMicrosecondsSinceEpoch(blockStart))
+          .inDays;
+      if (lastBlockDuration >= 2 && lastBlockDuration <= 30) {
+        tripLocations[newAutoLocationID()] =
+            (List.from(currentBlockFiles), location, blockStart, lastTime);
+      }
     }
 
     // Check if any trip locations should be merged

From d607d8a8516e24a40fa6f43bea1b04a5054492d3 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 10 Feb 2025 16:38:46 +0530
Subject: [PATCH 030/796] [mob][photos] Merge locations better

---
 mobile/lib/services/search_service.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index e35f347392..09fd29fbfd 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1414,13 +1414,13 @@ class SearchService {
         );
         final bool overlapBeginning = tripFirstTime.isBefore(
               otherTripLastTime.add(
-                const Duration(days: 1),
+                const Duration(days: 3),
               ),
             ) &&
             tripFirstTime.isAfter(otherTripFirstTime);
         final bool overlapEnd = tripLastTime.isAfter(
               otherTripFirstTime.subtract(
-                const Duration(days: 1),
+                const Duration(days: 3),
               ),
             ) &&
             tripLastTime.isBefore(otherTripLastTime);

From 5a0d2ba922d9d4bc106f5754afc883b616c3ebf7 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 10 Feb 2025 16:51:15 +0530
Subject: [PATCH 031/796] [mob][photos] Remove too small trips

---
 mobile/lib/services/search_service.dart | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 09fd29fbfd..3227f4b77b 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1439,6 +1439,14 @@ class SearchService {
       mergedTrips[tripID] = (trip.$1, trip.$3, trip.$4);
     }
 
+    // Remove too small trips
+    for (final tripID in mergedTrips.keys.toList()) {
+      final filesAmount = mergedTrips[tripID]!.$1.length;
+      if (filesAmount < 20) {
+        mergedTrips.remove(tripID);
+      }
+    }
+
     // TODO: lau: Check if there are any trips to surface
     // For now for testing let's just surface all base and trip locations
     for (final baseLocation in baseLocations.values) {

From 1358087ee794e6b6cbaa33b26f6dafd50f8c6f88 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Mon, 10 Feb 2025 19:22:04 +0530
Subject: [PATCH 032/796] photosd-v1.7.9

---
 desktop/CHANGELOG.md | 3 +--
 desktop/package.json | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/desktop/CHANGELOG.md b/desktop/CHANGELOG.md
index aa647dd8e6..768f7f8afe 100644
--- a/desktop/CHANGELOG.md
+++ b/desktop/CHANGELOG.md
@@ -1,11 +1,10 @@
 # CHANGELOG
 
-## v1.7.9 (Unreleased)
+## v1.7.9
 
 - Light mode.
 - Faster and more stable thumbnail generation.
 - Support `.supplemental-metadata` JSON files in Google Takeout.
-- .
 
 ## v1.7.8
 
diff --git a/desktop/package.json b/desktop/package.json
index 3859892503..13d8f80938 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ente",
-    "version": "1.7.9-beta",
+    "version": "1.7.9",
     "private": true,
     "description": "Desktop client for Ente Photos",
     "repository": "github:ente-io/photos-desktop",

From dda46c063984a89d0b00cc94822974d566bfea9a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Mon, 10 Feb 2025 19:29:49 +0530
Subject: [PATCH 033/796] [desktop] next

---
 desktop/CHANGELOG.md | 4 ++++
 desktop/package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/desktop/CHANGELOG.md b/desktop/CHANGELOG.md
index 768f7f8afe..4d7450cec9 100644
--- a/desktop/CHANGELOG.md
+++ b/desktop/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## v1.7.10 (Unreleased)
+
+- .
+
 ## v1.7.9
 
 - Light mode.
diff --git a/desktop/package.json b/desktop/package.json
index 13d8f80938..ccf8eff772 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ente",
-    "version": "1.7.9",
+    "version": "1.7.10-beta",
     "private": true,
     "description": "Desktop client for Ente Photos",
     "repository": "github:ente-io/photos-desktop",

From 59e26779b956d8e7247bf2e8908d76ad57e8e8b8 Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Mon, 10 Feb 2025 19:36:40 +0530
Subject: [PATCH 034/796] [server][WIP] functionality for modifying users
 storage limit

---
 server/cmd/museum/main.go             |  1 +
 server/pkg/api/family.go              | 15 +++++++++++++
 server/pkg/controller/family/admin.go | 31 +++++++++++++++++++++++++++
 server/pkg/repo/family.go             | 10 +++++++++
 4 files changed, 57 insertions(+)

diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go
index e1a3622011..62944cd004 100644
--- a/server/cmd/museum/main.go
+++ b/server/cmd/museum/main.go
@@ -621,6 +621,7 @@ func main() {
 	familiesJwtAuthAPI.GET("/family/members", familyHandler.FetchMembers)
 	familiesJwtAuthAPI.DELETE("/family/remove-member/:id", familyHandler.RemoveMember)
 	familiesJwtAuthAPI.DELETE("/family/revoke-invite/:id", familyHandler.RevokeInvite)
+	familiesJwtAuthAPI.POST("/family/modify-storage", familyHandler.ModifyStorageLimit)
 
 	emergencyHandler := &api.EmergencyHandler{
 		Controller: emergencyCtrl,
diff --git a/server/pkg/api/family.go b/server/pkg/api/family.go
index e4ca403ac4..82e352b80a 100644
--- a/server/pkg/api/family.go
+++ b/server/pkg/api/family.go
@@ -120,6 +120,21 @@ func (h *FamilyHandler) AcceptInvite(c *gin.Context) {
 	c.JSON(http.StatusOK, response)
 }
 
+// ModifyStorageLimit allows adminUser to Modify the storage for a member in the Family.
+func (h *FamilyHandler) ModifyStorageLimit(c *gin.Context) {
+	var request ente.FamilyMember
+	if err := c.ShouldBindJSON(&request); err != nil {
+		handler.Error(c, stacktrace.Propagate(err, "Could not bind request params"))
+		return
+	}
+
+	err := h.Controller.ModifyMemberStorage(c, auth.GetUserID(c.Request.Header), request.ID, request.StorageLimit)
+	if err != nil {
+		handler.Error(c, stacktrace.Propagate(err, ""))
+	}
+	c.JSON(http.StatusOK, nil)
+}
+
 // GetInviteInfo returns basic information about invitor/admin as long as the invite is valid
 func (h *FamilyHandler) GetInviteInfo(c *gin.Context) {
 	inviteToken := c.Param("token")
diff --git a/server/pkg/controller/family/admin.go b/server/pkg/controller/family/admin.go
index fbb3506b13..36caffbae8 100644
--- a/server/pkg/controller/family/admin.go
+++ b/server/pkg/controller/family/admin.go
@@ -190,6 +190,37 @@ func (c *Controller) CloseFamily(ctx context.Context, adminID int64) error {
 	return nil
 }
 
+// ModifyMemberStorage allows admin user to update the storageLimit for a member in the family
+func (c *Controller) ModifyMemberStorage(ctx context.Context, adminID int64, id uuid.UUID, storageLimit *int64) error {
+	familyAdminID, err := c.UserRepo.GetFamilyAdminID(adminID)
+	if err != nil {
+		stacktrace.Propagate(err, "Could not get family admin ID")
+	}
+
+	member, err := c.FamilyRepo.GetMemberById(ctx, id)
+	if err != nil {
+		stacktrace.Propagate(err, "Couldn't fetch Family Member")
+	}
+
+	// get admin subscription in order to get the size of total storage quota
+	// available in that family. and let the user chose storage of outw of the whole
+	// storage quota or maximum limit.
+	activeSub, err := c.BillingCtrl.GetActiveSubscription(adminID)
+	if err != nil {
+		stacktrace.Propagate(err, "couldn't get active subscription")
+	}
+
+	if adminID == *familyAdminID && id == member.ID {
+		if storageLimit != nil && *storageLimit > activeSub.Storage {
+			err := c.FamilyRepo.ModifyMemberStorage(ctx, adminID, member.ID, storageLimit)
+			if err != nil {
+				stacktrace.Propagate(err, "Couldn't Modify Members Storage")
+			}
+		}
+	}
+	return nil
+}
+
 func (c *Controller) sendNotification(ctx context.Context, adminUserID int64, memberUserID int64, newStatus ente.MemberStatus, inviteToken *string) error {
 	adminUser, err := c.UserRepo.Get(adminUserID)
 	if err != nil {
diff --git a/server/pkg/repo/family.go b/server/pkg/repo/family.go
index 8043ebab1b..f3130a8f74 100644
--- a/server/pkg/repo/family.go
+++ b/server/pkg/repo/family.go
@@ -196,6 +196,16 @@ func (repo *FamilyRepository) RemoveMember(ctx context.Context, adminID int64, m
 	return stacktrace.Propagate(tx.Commit(), "failed to commit")
 }
 
+// UpdateStorage is used to set Pre-existing Members Storage Limit.
+func (repo *FamilyRepository) ModifyMemberStorage(ctx context.Context, adminID int64, id uuid.UUID, storageLimit *int64) error {
+	_, err := repo.DB.Exec(`UPDATE families SET storage=$1 where token=$2`, *storageLimit, id)
+	if err != nil {
+		return stacktrace.Propagate(err, "Could not update Members Storage Limit")
+	}
+
+	return stacktrace.Propagate(err, "Failed to Modify Members Storage Limit")
+}
+
 // RevokeInvite revokes the invitation invite
 func (repo *FamilyRepository) RevokeInvite(ctx context.Context, adminID int64, memberID int64) error {
 	tx, err := repo.DB.BeginTx(ctx, nil)

From 77be0a18d43ddae07b690d5877eb11af6fc6bf99 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Mon, 10 Feb 2025 20:04:15 +0530
Subject: [PATCH 035/796] [docs] Update logs menu location

---
 .../docs/photos/troubleshooting/sharing-logs.md | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/docs/docs/photos/troubleshooting/sharing-logs.md b/docs/docs/photos/troubleshooting/sharing-logs.md
index cd9417fac3..0de78748a4 100644
--- a/docs/docs/photos/troubleshooting/sharing-logs.md
+++ b/docs/docs/photos/troubleshooting/sharing-logs.md
@@ -20,21 +20,14 @@ the logs just make the process a bit faster and easier.
 - Select for the option to _Report a Bug_.
 - Tap on _Report a bug_.
 
-## Desktop
-
-- Click on _Help_ menu at the top of your screen, and select the _View logs_
-  option.
-- Open settings (click on the three horizontal lines button located at the top
-  left corner of the screen).
-- Click on _Support_. This will open your email client where you can attach the
-  logs in the email and describe the issue.
-
-## Web
+## Desktop and Web
 
 - Open settings (click on the three horizontal lines button located at the top
   left corner of the screen).
-- Click on _Debug Logs_ towards the bottom of settings.
-- Click on _Download logs_
+- Click on the _Help_ option towards the bottom of settings.
+- Click on _View logs_. This will show you the location of the logs on your
+  system (desktop), or download them from the browser onto your computer (web).
+- Go back to settings.
 - Click on _Support_. This will open your email client where you can attach the
   logs in the email and describe the issue.
 

From 2947ca2e3c14c07b3b065867d740e011b1ca704d Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Tue, 11 Feb 2025 11:27:21 +0530
Subject: [PATCH 036/796] fix storagelimit column name in DB.Exec

---
 server/pkg/repo/family.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/pkg/repo/family.go b/server/pkg/repo/family.go
index f3130a8f74..79692a6122 100644
--- a/server/pkg/repo/family.go
+++ b/server/pkg/repo/family.go
@@ -198,7 +198,7 @@ func (repo *FamilyRepository) RemoveMember(ctx context.Context, adminID int64, m
 
 // UpdateStorage is used to set Pre-existing Members Storage Limit.
 func (repo *FamilyRepository) ModifyMemberStorage(ctx context.Context, adminID int64, id uuid.UUID, storageLimit *int64) error {
-	_, err := repo.DB.Exec(`UPDATE families SET storage=$1 where token=$2`, *storageLimit, id)
+	_, err := repo.DB.Exec(`UPDATE families SET storage_limit=$1 where token=$2`, *storageLimit, id)
 	if err != nil {
 		return stacktrace.Propagate(err, "Could not update Members Storage Limit")
 	}

From 8da160b834f3158876d64019484cdfe13506bea1 Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Tue, 11 Feb 2025 11:51:47 +0530
Subject: [PATCH 037/796] minor fix for db column names in DB.Exec

---
 server/pkg/repo/family.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/pkg/repo/family.go b/server/pkg/repo/family.go
index 79692a6122..ee0fe20b16 100644
--- a/server/pkg/repo/family.go
+++ b/server/pkg/repo/family.go
@@ -198,7 +198,7 @@ func (repo *FamilyRepository) RemoveMember(ctx context.Context, adminID int64, m
 
 // UpdateStorage is used to set Pre-existing Members Storage Limit.
 func (repo *FamilyRepository) ModifyMemberStorage(ctx context.Context, adminID int64, id uuid.UUID, storageLimit *int64) error {
-	_, err := repo.DB.Exec(`UPDATE families SET storage_limit=$1 where token=$2`, *storageLimit, id)
+	_, err := repo.DB.Exec(`UPDATE families SET storage_limi=$1 where id=$2`, *storageLimit, id)
 	if err != nil {
 		return stacktrace.Propagate(err, "Could not update Members Storage Limit")
 	}

From 01aa6796989517238a178f3b3eca1ea2f28e3807 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Tue, 11 Feb 2025 14:17:48 +0530
Subject: [PATCH 038/796] [mob][photos] Better merge

---
 mobile/lib/services/search_service.dart | 30 +++++++++----------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 3227f4b77b..dcb272aaa1 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1406,31 +1406,21 @@ class SearchService {
       bool merged = false;
       for (final otherTripID in mergedTrips.keys) {
         final otherTrip = mergedTrips[otherTripID]!;
-        final otherTripFirstTime = DateTime.fromMicrosecondsSinceEpoch(
-          otherTrip.$2,
-        );
-        final otherTripLastTime = DateTime.fromMicrosecondsSinceEpoch(
-          otherTrip.$3,
-        );
-        final bool overlapBeginning = tripFirstTime.isBefore(
-              otherTripLastTime.add(
-                const Duration(days: 3),
-              ),
-            ) &&
-            tripFirstTime.isAfter(otherTripFirstTime);
-        final bool overlapEnd = tripLastTime.isAfter(
-              otherTripFirstTime.subtract(
-                const Duration(days: 3),
-              ),
-            ) &&
-            tripLastTime.isBefore(otherTripLastTime);
-        if (overlapBeginning || overlapEnd) {
+        final otherTripFirstTime =
+            DateTime.fromMicrosecondsSinceEpoch(otherTrip.$2);
+        final otherTripLastTime =
+            DateTime.fromMicrosecondsSinceEpoch(otherTrip.$3);
+        if (tripFirstTime
+                .isBefore(otherTripLastTime.add(const Duration(days: 3))) &&
+            tripLastTime.isAfter(
+              otherTripFirstTime.subtract(const Duration(days: 3)),
+            )) {
           mergedTrips[otherTripID] = (
             otherTrip.$1 + trip.$1,
             min(otherTrip.$2, trip.$3),
             max(otherTrip.$3, trip.$4),
           );
-          _logger.info('Merged two trip locations');
+          _logger.finest('Merged two trip locations');
           merged = true;
           break;
         }

From 45f15490795fb3d26211651cae6bfb1ba0c57ca0 Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Tue, 11 Feb 2025 15:49:58 +0530
Subject: [PATCH 039/796] [mob][photos] Fix: FileAppbar buttons not working on
 some screens

---
 mobile/lib/ui/viewer/file/custom_app_bar.dart | 25 ---------
 mobile/lib/ui/viewer/file/detail_page.dart    |  1 -
 mobile/lib/ui/viewer/file/file_app_bar.dart   | 56 +++++++++----------
 3 files changed, 26 insertions(+), 56 deletions(-)
 delete mode 100644 mobile/lib/ui/viewer/file/custom_app_bar.dart

diff --git a/mobile/lib/ui/viewer/file/custom_app_bar.dart b/mobile/lib/ui/viewer/file/custom_app_bar.dart
deleted file mode 100644
index 1003e56af9..0000000000
--- a/mobile/lib/ui/viewer/file/custom_app_bar.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-import 'package:flutter/material.dart';
-
-class CustomAppBar extends PreferredSize {
-  @override
-  final Widget child;
-  @override
-  final Size preferredSize;
-  final double height;
-
-  const CustomAppBar(
-    this.child,
-    this.preferredSize, {
-    Key? key,
-    this.height = kToolbarHeight,
-  }) : super(key: key, child: child, preferredSize: preferredSize);
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      height: preferredSize.height,
-      alignment: Alignment.center,
-      child: child,
-    );
-  }
-}
diff --git a/mobile/lib/ui/viewer/file/detail_page.dart b/mobile/lib/ui/viewer/file/detail_page.dart
index 7e8795c978..3751e327f6 100644
--- a/mobile/lib/ui/viewer/file/detail_page.dart
+++ b/mobile/lib/ui/viewer/file/detail_page.dart
@@ -156,7 +156,6 @@ class _DetailPageState extends State<DetailPage> {
               return FileAppBar(
                 _files![selectedIndex],
                 _onFileRemoved,
-                100,
                 widget.config.mode == DetailPageMode.full,
                 enableFullScreenNotifier: _enableFullScreenNotifier,
               );
diff --git a/mobile/lib/ui/viewer/file/file_app_bar.dart b/mobile/lib/ui/viewer/file/file_app_bar.dart
index e763a174cc..46adbad5d4 100644
--- a/mobile/lib/ui/viewer/file/file_app_bar.dart
+++ b/mobile/lib/ui/viewer/file/file_app_bar.dart
@@ -23,7 +23,6 @@ import "package:photos/services/local_authentication_service.dart";
 import "package:photos/services/preview_video_store.dart";
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/collections/collection_action_sheet.dart';
-import 'package:photos/ui/viewer/file/custom_app_bar.dart';
 import "package:photos/ui/viewer/file_details/favorite_widget.dart";
 import "package:photos/ui/viewer/file_details/upload_icon_widget.dart";
 import 'package:photos/utils/dialog_util.dart';
@@ -35,14 +34,12 @@ import 'package:photos/utils/toast_util.dart';
 class FileAppBar extends StatefulWidget {
   final EnteFile file;
   final Function(EnteFile) onFileRemoved;
-  final double height;
   final bool shouldShowActions;
   final ValueNotifier<bool> enableFullScreenNotifier;
 
   const FileAppBar(
     this.file,
     this.onFileRemoved,
-    this.height,
     this.shouldShowActions, {
     required this.enableFullScreenNotifier,
     super.key,
@@ -98,8 +95,9 @@ class FileAppBarState extends State<FileAppBar> {
 
     final isTrashedFile = widget.file is TrashFile;
     final shouldShowActions = widget.shouldShowActions && !isTrashedFile;
-    return CustomAppBar(
-      ValueListenableBuilder(
+    return PreferredSize(
+      preferredSize: const Size.fromHeight(kToolbarHeight),
+      child: ValueListenableBuilder(
         valueListenable: widget.enableFullScreenNotifier,
         builder: (context, bool isFullScreen, child) {
           return IgnorePointer(
@@ -124,32 +122,33 @@ class FileAppBarState extends State<FileAppBar> {
               stops: const [0, 0.2, 1],
             ),
           ),
-          child: AnimatedSwitcher(
-            duration: const Duration(milliseconds: 250),
-            switchInCurve: Curves.easeInOut,
-            switchOutCurve: Curves.easeInOut,
-            child: AppBar(
-              clipBehavior: Clip.none,
-              key: ValueKey(isGuestView),
-              iconTheme: const IconThemeData(
-                color: Colors.white,
-              ), //same for both themes
-              leading: IconButton(
-                icon: const Icon(Icons.arrow_back),
-                onPressed: () {
-                  isGuestView
-                      ? _requestAuthentication()
-                      : Navigator.of(context).pop();
-                },
+          child: SafeArea(
+            child: AnimatedSwitcher(
+              duration: const Duration(milliseconds: 250),
+              switchInCurve: Curves.easeInOut,
+              switchOutCurve: Curves.easeInOut,
+              child: AppBar(
+                clipBehavior: Clip.none,
+                key: ValueKey(isGuestView),
+                iconTheme: const IconThemeData(
+                  color: Colors.white,
+                ), //same for both themes
+                leading: IconButton(
+                  icon: const Icon(Icons.arrow_back),
+                  onPressed: () {
+                    isGuestView
+                        ? _requestAuthentication()
+                        : Navigator.of(context).pop();
+                  },
+                ),
+                actions: shouldShowActions && !isGuestView ? _actions : [],
+                elevation: 0,
+                backgroundColor: const Color(0x00000000),
               ),
-              actions: shouldShowActions && !isGuestView ? _actions : [],
-              elevation: 0,
-              backgroundColor: const Color(0x00000000),
             ),
           ),
         ),
       ),
-      Size.fromHeight(Platform.isAndroid ? 84 : 96),
     );
   }
 
@@ -179,10 +178,7 @@ class FileAppBarState extends State<FileAppBar> {
     }
     if (!isFileHidden && isFileUploaded) {
       _actions.add(
-        Padding(
-          padding: const EdgeInsets.all(8),
-          child: FavoriteWidget(widget.file),
-        ),
+        Center(child: FavoriteWidget(widget.file)),
       );
     }
     if (!isFileUploaded) {

From 2282db780014fbcb72921655a368ce11aa6ed98b Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 11 Feb 2025 16:06:00 +0530
Subject: [PATCH 040/796] [mob] Build changes

---
 mobile/ios/Podfile.lock | 13 +++++++++
 mobile/pubspec.lock     | 60 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index 4a76000080..6769a1fcc8 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -6,6 +6,9 @@ PODS:
   - connectivity_plus (0.0.1):
     - Flutter
     - FlutterMacOS
+  - cupertino_http (0.0.1):
+    - Flutter
+    - FlutterMacOS
   - dart_ui_isolate (0.0.1):
     - Flutter
   - device_info_plus (0.0.1):
@@ -158,6 +161,8 @@ PODS:
   - nanopb/encode (3.30910.0)
   - native_video_player (1.0.0):
     - Flutter
+  - objective_c (0.0.1):
+    - Flutter
   - onnxruntime (0.0.1):
     - Flutter
     - onnxruntime-objc (= 1.18.0)
@@ -247,6 +252,7 @@ DEPENDENCIES:
   - background_fetch (from `.symlinks/plugins/background_fetch/ios`)
   - battery_info (from `.symlinks/plugins/battery_info/ios`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`)
+  - cupertino_http (from `.symlinks/plugins/cupertino_http/darwin`)
   - dart_ui_isolate (from `.symlinks/plugins/dart_ui_isolate/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - ffmpeg_kit_flutter_full_gpl (from `.symlinks/plugins/ffmpeg_kit_flutter_full_gpl/ios`)
@@ -278,6 +284,7 @@ DEPENDENCIES:
   - motionphoto (from `.symlinks/plugins/motionphoto/ios`)
   - move_to_background (from `.symlinks/plugins/move_to_background/ios`)
   - native_video_player (from `.symlinks/plugins/native_video_player/ios`)
+  - objective_c (from `.symlinks/plugins/objective_c/ios`)
   - onnxruntime (from `.symlinks/plugins/onnxruntime/ios`)
   - open_mail_app (from `.symlinks/plugins/open_mail_app/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
@@ -331,6 +338,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/battery_info/ios"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/darwin"
+  cupertino_http:
+    :path: ".symlinks/plugins/cupertino_http/darwin"
   dart_ui_isolate:
     :path: ".symlinks/plugins/dart_ui_isolate/ios"
   device_info_plus:
@@ -393,6 +402,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/move_to_background/ios"
   native_video_player:
     :path: ".symlinks/plugins/native_video_player/ios"
+  objective_c:
+    :path: ".symlinks/plugins/objective_c/ios"
   onnxruntime:
     :path: ".symlinks/plugins/onnxruntime/ios"
   open_mail_app:
@@ -442,6 +453,7 @@ SPEC CHECKSUMS:
   background_fetch: 39f11371c0dce04b001c4bfd5e782bcccb0a85e2
   battery_info: 09f5c9ee65394f2291c8c6227bedff345b8a730c
   connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
+  cupertino_http: 947a233f40cfea55167a49f2facc18434ea117ba
   dart_ui_isolate: d5bcda83ca4b04f129d70eb90110b7a567aece14
   device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   ffmpeg-kit-ios-full-gpl: 80adc341962e55ef709e36baa8ed9a70cf4ea62b
@@ -484,6 +496,7 @@ SPEC CHECKSUMS:
   move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
   native_video_player: d12af78a1a4a8cf09775a5177d5b392def6fd23c
+  objective_c: 77e887b5ba1827970907e10e832eec1683f3431d
   onnxruntime: e7c2ae44385191eaad5ae64c935a72debaddc997
   onnxruntime-c: a909204639a1f035f575127ac406f781ac797c9c
   onnxruntime-objc: b6fab0f1787aa6f7190c2013f03037df4718bd8b
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index e6776987fb..ab9c4cd2a4 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -337,6 +337,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.2"
+  cronet_http:
+    dependency: transitive
+    description:
+      name: cronet_http
+      sha256: "3af9c4d57bf07ef4b307e77b22be4ad61bea19ee6ff65e62184863f3a09f1415"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.2"
   cross_file:
     dependency: "direct main"
     description:
@@ -361,6 +369,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  cupertino_http:
+    dependency: transitive
+    description:
+      name: cupertino_http
+      sha256: "6fcf79586ad872ddcd6004d55c8c2aab3cdf0337436e8f99837b1b6c30665d0c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -421,10 +437,18 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: "7d328c4d898a61efc3cd93655a0955858e29a0aa647f0f9e02d59b3bb275e2e8"
+      sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.6"
+    version: "5.8.0+1"
+  dio_web_adapter:
+    dependency: transitive
+    description:
+      name: dio_web_adapter
+      sha256: e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   dots_indicator:
     dependency: "direct main"
     description:
@@ -1173,6 +1197,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
+  http_profile:
+    dependency: transitive
+    description:
+      name: http_profile
+      sha256: "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
   image:
     dependency: "direct main"
     description:
@@ -1338,6 +1370,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
+  jni:
+    dependency: transitive
+    description:
+      name: jni
+      sha256: f377c585ea9c08d48b427dc2e03780af2889d1bb094440da853c6883c1acba4b
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.1"
   js:
     dependency: transitive
     description:
@@ -1702,6 +1742,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  native_dio_adapter:
+    dependency: "direct main"
+    description:
+      name: native_dio_adapter
+      sha256: "7420bc9517b2abe09810199a19924617b45690a44ecfb0616ac9babc11875c03"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
   native_video_player:
     dependency: "direct main"
     description:
@@ -1735,6 +1783,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.2"
+  objective_c:
+    dependency: transitive
+    description:
+      name: objective_c
+      sha256: "62e79ab8c3ed6f6a340ea50dd48d65898f5d70425d404f0d99411f6e56e04584"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.0"
   octo_image:
     dependency: transitive
     description:

From 4a9bc84375bdd5169738728f95f2cde99db13329 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Tue, 11 Feb 2025 16:08:01 +0530
Subject: [PATCH 041/796] [mob][photos] Surface only relevant trips

---
 mobile/lib/services/search_service.dart | 124 +++++++++++++++++++-----
 1 file changed, 102 insertions(+), 22 deletions(-)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index dcb272aaa1..8c5e6fa5f7 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1199,6 +1199,9 @@ class SearchService {
     final Iterable<LocalEntity<LocationTag>> locationTagEntities =
         (await locationService.getLocationTags());
     if (allFiles.isEmpty) return [];
+    final currentTime = DateTime.now().toLocal();
+    final currentMonth = currentTime.month;
+    final cutOffTime = currentTime.subtract(const Duration(days: 365));
 
     final Map<LocalEntity<LocationTag>, List<EnteFile>> tagToItemsMap = {};
     for (int i = 0; i < locationTagEntities.length; i++) {
@@ -1211,6 +1214,7 @@ class SearchService {
       if (!file.hasLocation ||
           file.uploadedFileID == null ||
           !file.isOwner ||
+          file.creationTime! > cutOffTime.microsecondsSinceEpoch ||
           file.creationTime == null) {
         continue;
       }
@@ -1437,10 +1441,9 @@ class SearchService {
       }
     }
 
-    // TODO: lau: Check if there are any trips to surface
-    // For now for testing let's just surface all base and trip locations
+    // For now for testing let's just surface all base locations
     for (final baseLocation in baseLocations.values) {
-      final files = baseLocation.$1; // TODO: lau: take best selection only
+      final files = baseLocation.$1;
       final current = baseLocation.$3;
       final name = "Base (${current ? 'current' : 'old'})";
       searchResults.add(
@@ -1458,26 +1461,103 @@ class SearchService {
         ),
       );
     }
-    for (final finalTrip in mergedTrips.values) {
-      final files = finalTrip.$1; // TODO: lau: take best selection only
-      final year = DateTime.fromMicrosecondsSinceEpoch(
-        (finalTrip.$2 + finalTrip.$2) ~/ 2,
-      ).year;
-      final name = "Trip! ($year)";
-      searchResults.add(
-        GenericSearchResult(
-          ResultType.event,
-          name,
-          files,
-          hierarchicalSearchFilter: TopLevelGenericFilter(
-            filterName: name,
-            occurrence: kMostRelevantFilter,
-            filterResultType: ResultType.event,
-            matchedUploadedIDs: filesToUploadedFileIDs(files),
-            filterIcon: Icons.event_outlined,
+
+    // For now we surface the two most recent trips of current month, and if none, the earliest upcoming redundant trip
+    // Group the trips per month and then year
+    final Map<int, Map<int, List<(List<EnteFile>, int, int)>>>
+        tripsByMonthYear = {};
+    for (final trip in mergedTrips.values) {
+      final int avgMicros = (trip.$2 + trip.$3) ~/ 2;
+      final tripDate = DateTime.fromMicrosecondsSinceEpoch(avgMicros);
+      tripsByMonthYear
+          .putIfAbsent(tripDate.month, () => {})
+          .putIfAbsent(tripDate.year, () => [])
+          .add(trip);
+    }
+
+    // Flatten trips for the current month and annotate with their average date.
+    final List<(List<EnteFile>, int, int, DateTime)> currentMonthTrips = [];
+    if (tripsByMonthYear.containsKey(currentMonth)) {
+      for (final trips in tripsByMonthYear[currentMonth]!.values) {
+        for (final trip in trips) {
+          final int avgMicros = (trip.$2 + trip.$3) ~/ 2;
+          final tripDate = DateTime.fromMicrosecondsSinceEpoch(avgMicros);
+          currentMonthTrips.add((trip.$1, trip.$2, trip.$3, tripDate));
+        }
+      }
+    }
+
+    // If there are past trips this month, show the one or two most recent ones.
+    if (currentMonthTrips.isNotEmpty) {
+      currentMonthTrips.sort((a, b) => b.$4.compareTo(a.$4));
+      final tripsToShow = currentMonthTrips.take(2);
+      for (final trip in tripsToShow) {
+        final year = trip.$4.year;
+        String name = "Trip in $year!";
+        if (year == currentTime.year - 1) {
+          name = "Last year's trip!";
+        }
+        final photoSelection = await _bestSelection(trip.$1);
+        searchResults.add(
+          GenericSearchResult(
+            ResultType.event,
+            name,
+            photoSelection,
+            hierarchicalSearchFilter: TopLevelGenericFilter(
+              filterName: name,
+              occurrence: kMostRelevantFilter,
+              filterResultType: ResultType.event,
+              matchedUploadedIDs: filesToUploadedFileIDs(trip.$1),
+              filterIcon: Icons.event_outlined,
+            ),
           ),
-        ),
-      );
+        );
+      }
+    }
+    // Otherwise, if no trips happened in the current month,
+    // look for the earliest upcoming trip in another month that has 3+ trips.
+    else {
+      final sortedUpcomingMonths =
+          List<int>.generate(12, (i) => ((currentMonth + i) % 12) + 1);
+      checkUpcomingMonths:
+      for (final month in sortedUpcomingMonths) {
+        if (tripsByMonthYear.containsKey(month)) {
+          final List<(List<EnteFile>, int, int, DateTime)> thatMonthTrips = [];
+          for (final trips in tripsByMonthYear[month]!.values) {
+            for (final trip in trips) {
+              final int avgMicros = (trip.$2 + trip.$3) ~/ 2;
+              final tripDate = DateTime.fromMicrosecondsSinceEpoch(avgMicros);
+              thatMonthTrips.add((trip.$1, trip.$2, trip.$3, tripDate));
+            }
+          }
+          if (thatMonthTrips.length >= 3) {
+            // take and use the third earliest trip
+            thatMonthTrips.sort((a, b) => a.$4.compareTo(b.$4));
+            final trip = thatMonthTrips[2];
+            final year = trip.$4.year;
+            String name = "Trip in $year!";
+            if (year == currentTime.year - 1) {
+              name = "Last year's trip!";
+            }
+            final photoSelection = await _bestSelection(trip.$1);
+            searchResults.add(
+              GenericSearchResult(
+                ResultType.event,
+                name,
+                photoSelection,
+                hierarchicalSearchFilter: TopLevelGenericFilter(
+                  filterName: name,
+                  occurrence: kMostRelevantFilter,
+                  filterResultType: ResultType.event,
+                  matchedUploadedIDs: filesToUploadedFileIDs(trip.$1),
+                  filterIcon: Icons.event_outlined,
+                ),
+              ),
+            );
+            break checkUpcomingMonths;
+          }
+        }
+      }
     }
     return searchResults; // TODO: lau: take [limit] into account
   }

From 218c652ed116603032e56b1459d11fcdbed79123 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 11 Feb 2025 16:57:54 +0530
Subject: [PATCH 042/796] [server] Make new links joinable by default

---
 server/ente/public_collection.go     | 2 +-
 server/pkg/repo/public_collection.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/ente/public_collection.go b/server/ente/public_collection.go
index ef22302b89..eb1bd8c385 100644
--- a/server/ente/public_collection.go
+++ b/server/ente/public_collection.go
@@ -12,7 +12,7 @@ import (
 type CreatePublicAccessTokenRequest struct {
 	CollectionID  int64 `json:"collectionID" binding:"required"`
 	EnableCollect bool  `json:"enableCollect"`
-	// defaults to false
+	// defaults to true
 	EnableJoin  *bool `json:"enableJoin"`
 	ValidTill   int64 `json:"validTill"`
 	DeviceLimit int   `json:"deviceLimit"`
diff --git a/server/pkg/repo/public_collection.go b/server/pkg/repo/public_collection.go
index 3b5aa6dbce..f5ae8f2d72 100644
--- a/server/pkg/repo/public_collection.go
+++ b/server/pkg/repo/public_collection.go
@@ -38,7 +38,7 @@ func (pcr *PublicCollectionRepository) GetAlbumUrl(token string) string {
 func (pcr *PublicCollectionRepository) Insert(ctx context.Context,
 	cID int64, token string, validTill int64, deviceLimit int, enableCollect bool, enableJoin *bool) error {
 	// default value for enableJoin is true
-	join := false
+	join := true
 	if enableJoin != nil {
 		join = *enableJoin
 	}

From dc3f074588eed1b9ce27437e6a04ce1f70031ced Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 11 Feb 2025 17:14:20 +0530
Subject: [PATCH 043/796] fix: don't index unowned files

---
 mobile/lib/db/files_db.dart                  | 2 ++
 mobile/lib/services/preview_video_store.dart | 1 +
 2 files changed, 3 insertions(+)

diff --git a/mobile/lib/db/files_db.dart b/mobile/lib/db/files_db.dart
index 4452f12097..c734044c4c 100644
--- a/mobile/lib/db/files_db.dart
+++ b/mobile/lib/db/files_db.dart
@@ -1733,6 +1733,7 @@ class FilesDB {
   Future<List<EnteFile>> getAllFilesAfterDate({
     required FileType fileType,
     required DateTime beginDate,
+    required int userID,
   }) async {
     final db = await instance.sqliteAsyncDB;
     final results = await db.getAll(
@@ -1741,6 +1742,7 @@ class FilesDB {
       WHERE $columnFileType = ?
       AND $columnCreationTime > ?
       AND $columnUploadedFileID  != -1
+      AND $columnOwnerID = $userID
       ORDER BY $columnCreationTime DESC
     ''',
       [getInt(fileType), beginDate.microsecondsSinceEpoch],
diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 37baf778d6..b14fc8c707 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -601,6 +601,7 @@ class PreviewVideoStore {
     final files = await FilesDB.instance.getAllFilesAfterDate(
       fileType: FileType.video,
       beginDate: cutoff,
+      userID: Configuration.instance.getUserID()!,
     );
 
     final previewIds = FileDataService.instance.previewIds;

From bf4807da5bfdfd6fe58262915584642ebd6fa3e9 Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Tue, 11 Feb 2025 17:20:04 +0530
Subject: [PATCH 044/796] [server] use custom request struct for modifying
 functionality

---
 server/ente/family.go    | 5 +++++
 server/pkg/api/family.go | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/ente/family.go b/server/ente/family.go
index 004067007c..2911ca0b72 100644
--- a/server/ente/family.go
+++ b/server/ente/family.go
@@ -49,6 +49,11 @@ type FamilyMember struct {
 	AdminUserID  int64 `json:"-"` // for internal use only, ignore from json response
 }
 
+type ModifyMemberStorage struct {
+	ID           uuid.UUID `json:"id" binding:"required"`
+	StorageLimit *int64    `json:"storageLimit" binding:"required"`
+}
+
 type FamilyMemberResponse struct {
 	Members []FamilyMember `json:"members" binding:"required"`
 	// Family admin subscription storage capacity. This excludes add-on and any other bonus storage
diff --git a/server/pkg/api/family.go b/server/pkg/api/family.go
index 82e352b80a..0e27f0d999 100644
--- a/server/pkg/api/family.go
+++ b/server/pkg/api/family.go
@@ -122,7 +122,7 @@ func (h *FamilyHandler) AcceptInvite(c *gin.Context) {
 
 // ModifyStorageLimit allows adminUser to Modify the storage for a member in the Family.
 func (h *FamilyHandler) ModifyStorageLimit(c *gin.Context) {
-	var request ente.FamilyMember
+	var request ente.ModifyMemberStorage
 	if err := c.ShouldBindJSON(&request); err != nil {
 		handler.Error(c, stacktrace.Propagate(err, "Could not bind request params"))
 		return

From cea9fa84a11be90eec9fe043bded6c450a83dff1 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Tue, 11 Feb 2025 17:26:06 +0530
Subject: [PATCH 045/796] [mob][photos] Limit

---
 mobile/lib/services/search_service.dart | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 8c5e6fa5f7..0f2427fd6e 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1512,6 +1512,7 @@ class SearchService {
             ),
           ),
         );
+        if (limit != null && searchResults.length >= limit) return searchResults;
       }
     }
     // Otherwise, if no trips happened in the current month,
@@ -1559,7 +1560,7 @@ class SearchService {
         }
       }
     }
-    return searchResults; // TODO: lau: take [limit] into account
+    return searchResults;
   }
 
   Future<List<GenericSearchResult>> onThisDayOrWeekResults(

From 38a35696a34750238a3134999cf63d136c84bb0e Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Tue, 11 Feb 2025 17:28:30 +0530
Subject: [PATCH 046/796] fix column names in DB & include UsageCtrl in
 controllers

---
 server/pkg/controller/family/family.go | 2 ++
 server/pkg/repo/family.go              | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/pkg/controller/family/family.go b/server/pkg/controller/family/family.go
index 9cf2a768f0..c519e50692 100644
--- a/server/pkg/controller/family/family.go
+++ b/server/pkg/controller/family/family.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+
 	"github.com/ente-io/museum/pkg/controller/usercache"
 	"github.com/ente-io/museum/pkg/utils/time"
 
@@ -26,6 +27,7 @@ type Controller struct {
 	UserRepo      *repo.UserRepository
 	FamilyRepo    *repo.FamilyRepository
 	UserCacheCtrl *usercache.Controller
+	UsageRepo     *repo.UsageRepository
 }
 
 // FetchMembers return list of members who are part of a family plan
diff --git a/server/pkg/repo/family.go b/server/pkg/repo/family.go
index ee0fe20b16..c9e2d96673 100644
--- a/server/pkg/repo/family.go
+++ b/server/pkg/repo/family.go
@@ -198,7 +198,7 @@ func (repo *FamilyRepository) RemoveMember(ctx context.Context, adminID int64, m
 
 // UpdateStorage is used to set Pre-existing Members Storage Limit.
 func (repo *FamilyRepository) ModifyMemberStorage(ctx context.Context, adminID int64, id uuid.UUID, storageLimit *int64) error {
-	_, err := repo.DB.Exec(`UPDATE families SET storage_limi=$1 where id=$2`, *storageLimit, id)
+	_, err := repo.DB.Exec(`UPDATE families SET storage_limit=$1 where id=$2`, *storageLimit, id)
 	if err != nil {
 		return stacktrace.Propagate(err, "Could not update Members Storage Limit")
 	}

From 782688c1f74cd6891de905de8cd592e49925deea Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 7 Feb 2025 08:01:13 +0530
Subject: [PATCH 047/796] Scaffold

---
 web/apps/photos/src/pages/g2.tsx     | 1 +
 web/packages/new/photos/pages/g2.tsx | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 web/apps/photos/src/pages/g2.tsx
 create mode 100644 web/packages/new/photos/pages/g2.tsx

diff --git a/web/apps/photos/src/pages/g2.tsx b/web/apps/photos/src/pages/g2.tsx
new file mode 100644
index 0000000000..4a7e2042f1
--- /dev/null
+++ b/web/apps/photos/src/pages/g2.tsx
@@ -0,0 +1 @@
+export { default } from "@/new/photos/pages/g2";
diff --git a/web/packages/new/photos/pages/g2.tsx b/web/packages/new/photos/pages/g2.tsx
new file mode 100644
index 0000000000..f19704a60c
--- /dev/null
+++ b/web/packages/new/photos/pages/g2.tsx
@@ -0,0 +1,7 @@
+// TODO(PS): WIP gallery using upstream photoswipe
+//
+// Needs yarn workspace gallery add photoswipe@^5.4.4 (not committed yet).
+
+export const Page: React.FC = () => {
+    return <div>Hello</div>;
+};

From b87b68e9d4793a74c05198f53d880432253ab508 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 7 Feb 2025 09:25:27 +0530
Subject: [PATCH 048/796] Scaffold differently

---
 web/apps/photos/src/components/PhotoFrame.tsx      |  2 ++
 web/apps/photos/src/pages/g2.tsx                   |  1 -
 web/packages/new/photos/components/FileViewer5.tsx | 13 +++++++++++++
 web/packages/new/photos/components/PhotoViewer.tsx | 11 +++++++++++
 web/packages/new/photos/pages/g2.tsx               |  7 -------
 5 files changed, 26 insertions(+), 8 deletions(-)
 delete mode 100644 web/apps/photos/src/pages/g2.tsx
 create mode 100644 web/packages/new/photos/components/FileViewer5.tsx
 delete mode 100644 web/packages/new/photos/pages/g2.tsx

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index f197512807..af3b5aa8e7 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -7,6 +7,7 @@ import {
 } from "@/gallery/services/download";
 import { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
+import { FileViewer } from "@/new/photos/components/FileViewer";
 import type { GalleryBarMode } from "@/new/photos/components/gallery/reducer";
 import { TRASH_SECTION } from "@/new/photos/services/collection";
 import { styled } from "@mui/material";
@@ -517,6 +518,7 @@ const PhotoFrame = ({
                     />
                 )}
             </AutoSizer>
+            {process.env.NEXT_ENTE_WIP_PS5 && <FileViewer />}
             <PhotoViewer
                 isOpen={open}
                 items={displayFiles}
diff --git a/web/apps/photos/src/pages/g2.tsx b/web/apps/photos/src/pages/g2.tsx
deleted file mode 100644
index 4a7e2042f1..0000000000
--- a/web/apps/photos/src/pages/g2.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "@/new/photos/pages/g2";
diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
new file mode 100644
index 0000000000..fbd9959dbb
--- /dev/null
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -0,0 +1,13 @@
+// TODO(PS): WIP gallery using upstream photoswipe
+//
+// Needs yarn workspace gallery add photoswipe@^5.4.4 (not committed yet).
+
+import { Button } from "@mui/material";
+
+export const FileViewer: React.FC = () => {
+    return (
+        <div>
+            Hello<Button>Test</Button>
+        </div>
+    );
+};
diff --git a/web/packages/new/photos/components/PhotoViewer.tsx b/web/packages/new/photos/components/PhotoViewer.tsx
index 6734d9d900..82dd388e7b 100644
--- a/web/packages/new/photos/components/PhotoViewer.tsx
+++ b/web/packages/new/photos/components/PhotoViewer.tsx
@@ -9,6 +9,17 @@ import { t } from "i18next";
 import { useState } from "react";
 import { aboveGalleryContentZ } from "./utils/z-index";
 
+// TODO(PS)
+import dynamic from "next/dynamic";
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+const FV5 = dynamic(() => import("./FileViewer5"));
+const FVD = () => <></>;
+
+export const FileViewer: React.FC = (props) => {
+    return process.env.NEXT_ENTE_WIP_PS5 ? <FV5 {...props} /> : <FVD />;
+};
+
 type ConfirmDeleteFileDialogProps = ModalVisibilityProps & {
     /**
      * Called when the user confirms the deletion.
diff --git a/web/packages/new/photos/pages/g2.tsx b/web/packages/new/photos/pages/g2.tsx
deleted file mode 100644
index f19704a60c..0000000000
--- a/web/packages/new/photos/pages/g2.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-// TODO(PS): WIP gallery using upstream photoswipe
-//
-// Needs yarn workspace gallery add photoswipe@^5.4.4 (not committed yet).
-
-export const Page: React.FC = () => {
-    return <div>Hello</div>;
-};

From d322f5e1bcd2c778d7a7fe28055408ddff303b89 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 7 Feb 2025 09:31:30 +0530
Subject: [PATCH 049/796] Take 2

---
 web/apps/photos/src/components/PhotoFrame.tsx      |  2 +-
 web/packages/new/photos/components/FileViewer5.tsx | 10 +++++++++-
 web/packages/new/photos/components/PhotoViewer.tsx |  4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index af3b5aa8e7..49985f404a 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -518,7 +518,7 @@ const PhotoFrame = ({
                     />
                 )}
             </AutoSizer>
-            {process.env.NEXT_ENTE_WIP_PS5 && <FileViewer />}
+            {process.env.NEXT_PUBLIC_ENTE_WIP_PS5 && <FileViewer />}
             <PhotoViewer
                 isOpen={open}
                 items={displayFiles}
diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
index fbd9959dbb..f2cca4a5f7 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -2,12 +2,20 @@
 //
 // Needs yarn workspace gallery add photoswipe@^5.4.4 (not committed yet).
 
+if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
+    console.warn("Using WIP upstream photoswipe");
+} else {
+    throw new Error("Whoa");
+}
+
 import { Button } from "@mui/material";
 
-export const FileViewer: React.FC = () => {
+const FileViewer: React.FC = () => {
     return (
         <div>
             Hello<Button>Test</Button>
         </div>
     );
 };
+
+export default FileViewer;
diff --git a/web/packages/new/photos/components/PhotoViewer.tsx b/web/packages/new/photos/components/PhotoViewer.tsx
index 82dd388e7b..1f6806696e 100644
--- a/web/packages/new/photos/components/PhotoViewer.tsx
+++ b/web/packages/new/photos/components/PhotoViewer.tsx
@@ -13,11 +13,11 @@ import { aboveGalleryContentZ } from "./utils/z-index";
 import dynamic from "next/dynamic";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-const FV5 = dynamic(() => import("./FileViewer5"));
+const FV5 = dynamic(() => import("./FileViewer5"), { ssr: false });
 const FVD = () => <></>;
 
 export const FileViewer: React.FC = (props) => {
-    return process.env.NEXT_ENTE_WIP_PS5 ? <FV5 {...props} /> : <FVD />;
+    return process.env.NEXT_PUBLIC_ENTE_WIP_PS5 ? <FV5 {...props} /> : <FVD />;
 };
 
 type ConfirmDeleteFileDialogProps = ModalVisibilityProps & {

From 4881f0879036d93ac6f27582bf7726b00c0ab86e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 7 Feb 2025 09:49:48 +0530
Subject: [PATCH 050/796] Try import

---
 web/packages/new/photos/components/.gitignore      | 2 ++
 web/packages/new/photos/components/FileViewer5.tsx | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 web/packages/new/photos/components/.gitignore

diff --git a/web/packages/new/photos/components/.gitignore b/web/packages/new/photos/components/.gitignore
new file mode 100644
index 0000000000..cbf1262ae4
--- /dev/null
+++ b/web/packages/new/photos/components/.gitignore
@@ -0,0 +1,2 @@
+# TODO(PS): Remove me once PS5 is integrated
+ps5
diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
index f2cca4a5f7..ad2a3c4ef1 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -1,6 +1,8 @@
 // TODO(PS): WIP gallery using upstream photoswipe
 //
-// Needs yarn workspace gallery add photoswipe@^5.4.4 (not committed yet).
+// Needs (not committed yet):
+// yarn workspace gallery add photoswipe@^5.4.4
+// mv node_modules/photoswipe packages/new/photos/components/ps5
 
 if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     console.warn("Using WIP upstream photoswipe");
@@ -9,8 +11,12 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 }
 
 import { Button } from "@mui/material";
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+import PhotoSwipeLightBox from "./ps5/dist/photoswipe-lightbox.esm.js";
 
 const FileViewer: React.FC = () => {
+    console.log(PhotoSwipeLightBox);
     return (
         <div>
             Hello<Button>Test</Button>

From 97bdc9362a475e5819658f20b54c50123ca6059c Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Mon, 10 Feb 2025 14:57:47 +0530
Subject: [PATCH 051/796] Tinker

---
 web/apps/photos/src/components/PhotoFrame.tsx |  2 +-
 .../new/photos/components/FileViewer5.tsx     | 49 ++++++++++++++++---
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 49985f404a..1cd1bf5661 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -503,6 +503,7 @@ const PhotoFrame = ({
 
     return (
         <Container>
+            {process.env.NEXT_PUBLIC_ENTE_WIP_PS5 && <FileViewer />}
             <AutoSizer>
                 {({ height, width }) => (
                     <PhotoList
@@ -518,7 +519,6 @@ const PhotoFrame = ({
                     />
                 )}
             </AutoSizer>
-            {process.env.NEXT_PUBLIC_ENTE_WIP_PS5 && <FileViewer />}
             <PhotoViewer
                 isOpen={open}
                 items={displayFiles}
diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
index ad2a3c4ef1..81c0c87c5d 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -1,3 +1,6 @@
+/* eslint-disable */
+// @ts-nocheck
+
 // TODO(PS): WIP gallery using upstream photoswipe
 //
 // Needs (not committed yet):
@@ -10,18 +13,52 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     throw new Error("Whoa");
 }
 
-import { Button } from "@mui/material";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
+import { Button, styled } from "@mui/material";
+import { useEffect } from "react";
 import PhotoSwipeLightBox from "./ps5/dist/photoswipe-lightbox.esm.js";
+import PhotoSwipe from "./ps5/dist/photoswipe.esm.js";
 
 const FileViewer: React.FC = () => {
     console.log(PhotoSwipeLightBox);
+    useEffect(() => {
+        const lightbox = new PhotoSwipeLightBox({
+            gallery: "#test-gallery",
+            mainClass: "our-extra-pswp-main-class",
+            pswpModule: PhotoSwipe,
+        });
+        lightbox.init();
+
+        return () => {
+            lightbox.destroy();
+        };
+    }, []);
     return (
-        <div>
-            Hello<Button>Test</Button>
-        </div>
+        <Container>
+            <Button>Test</Button>
+            <div id="test-gallery">
+                <a
+                    href="https://cdn.photoswipe.com/photoswipe-demo-images/photos/2/img-2500.jpg"
+                    data-pswp-width="1669"
+                    data-pswp-height="2500"
+                    target="_blank"
+                >
+                    <img
+                        src="https://cdn.photoswipe.com/photoswipe-demo-images/photos/2/img-200.jpg"
+                        alt=""
+                    />
+                </a>
+            </div>
+        </Container>
     );
 };
 
+const Container = styled("div")`
+    border: 1px solid red;
+
+    #test-gallery {
+        border: 1px solid red;
+        min-height: 10px;
+    }
+`;
+
 export default FileViewer;

From 970da9f29c8bb6122da668ab233744f26c84baee Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Mon, 10 Feb 2025 15:41:01 +0530
Subject: [PATCH 052/796] Direct

---
 web/packages/new/photos/components/FileViewer5.tsx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
index 81c0c87c5d..5d0c64b7bb 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -19,17 +19,18 @@ import PhotoSwipeLightBox from "./ps5/dist/photoswipe-lightbox.esm.js";
 import PhotoSwipe from "./ps5/dist/photoswipe.esm.js";
 
 const FileViewer: React.FC = () => {
+    const pswpRef = useRef<PhotoSwipe | undefined>();
     console.log(PhotoSwipeLightBox);
     useEffect(() => {
-        const lightbox = new PhotoSwipeLightBox({
-            gallery: "#test-gallery",
-            mainClass: "our-extra-pswp-main-class",
-            pswpModule: PhotoSwipe,
+        const pswp = new PhotoSwipe({
+            // mainClass: "our-extra-pswp-main-class",
         });
-        lightbox.init();
+        pswp.init();
+        pswpRef.current = pswp;
 
         return () => {
-            lightbox.destroy();
+            pswp.destroy();
+            pswpRef.current = undefined;
         };
     }, []);
     return (

From 3bbfa71824c9423d9fcb3b3653f48d749d5691de Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Mon, 10 Feb 2025 15:56:11 +0530
Subject: [PATCH 053/796] Doc

---
 .../new/photos/components/FileViewer5.tsx     | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
index 5d0c64b7bb..e9cd961572 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -18,6 +18,26 @@ import { useEffect } from "react";
 import PhotoSwipeLightBox from "./ps5/dist/photoswipe-lightbox.esm.js";
 import PhotoSwipe from "./ps5/dist/photoswipe.esm.js";
 
+/**
+ * The {@link FileViewer} is our PhotoSwipe based image and video viewer.
+ *
+ * ---
+ *
+ * [Note: PhotoSwipe]
+ *
+ * PhotoSwipe is a library that behaves similarly to the OG "lightbox" image
+ * gallery JavaScript component from the middle ages.
+ *
+ * We don't need the lightbox functionality since we already have our own
+ * thumbnail list (the "gallery"), so we only use the "Core" PhotoSwipe module
+ * as our image viewer component.
+ *
+ * When the user clicks on one of the thumbnails in our gallery, we make the
+ * root PhotoSwipe component visible. Within the DOM this is a dialog that takes
+ * up the entire viewport, and shows the image etc, and various controls.
+ *
+ * The documentation for PhotoSwipe is at https://photoswipe.com/.
+ */
 const FileViewer: React.FC = () => {
     const pswpRef = useRef<PhotoSwipe | undefined>();
     console.log(PhotoSwipeLightBox);

From 44c64c06a78c9dcca3021135dd5803134b6e400e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Mon, 10 Feb 2025 16:17:56 +0530
Subject: [PATCH 054/796] idata

---
 .../new/photos/components/FileViewer5.tsx         | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
index e9cd961572..7327eb9884 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -14,7 +14,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 }
 
 import { Button, styled } from "@mui/material";
-import { useEffect } from "react";
+import { useEffect, useRef } from "react";
 import PhotoSwipeLightBox from "./ps5/dist/photoswipe-lightbox.esm.js";
 import PhotoSwipe from "./ps5/dist/photoswipe.esm.js";
 
@@ -45,6 +45,19 @@ const FileViewer: React.FC = () => {
         const pswp = new PhotoSwipe({
             // mainClass: "our-extra-pswp-main-class",
         });
+        // Provide data about slides to PhotoSwipe via callbacks
+        // https://photoswipe.com/data-sources/#dynamically-generated-data
+        pswp.addFilter("numItems", () => {
+            return 2;
+        });
+        pswp.addFilter("itemData", (itemData, index) => {
+            console.log({ itemData, index });
+            return {
+                src: `https://dummyimage.com/100/777/fff/?text=i${index}`,
+                width: 100,
+                height: 100,
+            };
+        });
         pswp.init();
         pswpRef.current = pswp;
 

From 5c16ce345914cb016168d76047525e7d41ed69da Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Mon, 10 Feb 2025 16:43:39 +0530
Subject: [PATCH 055/796] Prop

---
 web/apps/photos/src/components/PhotoFrame.tsx |  7 +++-
 .../new/photos/components/FileViewer5.tsx     | 38 +++++++++++++++++--
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 1cd1bf5661..8052fcb36c 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -123,7 +123,7 @@ export interface PhotoFrameProps {
 }
 
 /**
- * TODO: Rename me to FileListWithViewer
+ * TODO: Rename me to FileListWithViewer (or Gallery?)
  */
 const PhotoFrame = ({
     mode,
@@ -503,7 +503,10 @@ const PhotoFrame = ({
 
     return (
         <Container>
-            {process.env.NEXT_PUBLIC_ENTE_WIP_PS5 && <FileViewer />}
+            {process.env.NEXT_PUBLIC_ENTE_WIP_PS5 && (
+                /* @ts-expect-error TODO(PS): test */
+                <FileViewer files={files} index={currentIndex} />
+            )}
             <AutoSizer>
                 {({ height, width }) => (
                     <PhotoList
diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
index 7327eb9884..db5a68004a 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -13,11 +13,35 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     throw new Error("Whoa");
 }
 
+import type { EnteFile } from "@/media/file.js";
 import { Button, styled } from "@mui/material";
 import { useEffect, useRef } from "react";
-import PhotoSwipeLightBox from "./ps5/dist/photoswipe-lightbox.esm.js";
 import PhotoSwipe from "./ps5/dist/photoswipe.esm.js";
 
+interface FileViewerProps {
+    /**
+     * The list of files that are currently being displayed.
+     *
+     * Although the file viewer itself is called on to display a particular file
+     * (specified by the {@link index} prop), the viewer is always used in the
+     * context of a an album, or search results, or some other arbitrary list of
+     * files. The {@link files} prop sets this underlying list of files.
+     *
+     * The user can also navigate through them from within the viewer by using
+     * the arrow buttons.
+     */
+    files: EnteFile[];
+    /**
+     * The index from within {@link files} that should be, or is, currently
+     * being displayed.
+     *
+     * It is set externally when the user activates a particular thumbnail in
+     * the gallery. It is set internally (by the file viewer itself) when the
+     * user scrolls through the files by using the arrow buttons.
+     */
+    index: number;
+}
+
 /**
  * The {@link FileViewer} is our PhotoSwipe based image and video viewer.
  *
@@ -38,12 +62,16 @@ import PhotoSwipe from "./ps5/dist/photoswipe.esm.js";
  *
  * The documentation for PhotoSwipe is at https://photoswipe.com/.
  */
-const FileViewer: React.FC = () => {
+const FileViewer: React.FC<FileViewerProps> = ({ files, index }) => {
     const pswpRef = useRef<PhotoSwipe | undefined>();
-    console.log(PhotoSwipeLightBox);
+
     useEffect(() => {
         const pswp = new PhotoSwipe({
-            // mainClass: "our-extra-pswp-main-class",
+            // Opaque background.
+            bgOpacity: 1,
+            // TODO(PS): padding option? for handling custom title bar.
+            // TODO(PS): will we need this?
+            mainClass: "our-extra-pswp-main-class",
         });
         // Provide data about slides to PhotoSwipe via callbacks
         // https://photoswipe.com/data-sources/#dynamically-generated-data
@@ -58,6 +86,7 @@ const FileViewer: React.FC = () => {
                 height: 100,
             };
         });
+        // initializing PhotoSwipe Core adds it to the DOM.
         pswp.init();
         pswpRef.current = pswp;
 
@@ -66,6 +95,7 @@ const FileViewer: React.FC = () => {
             pswpRef.current = undefined;
         };
     }, []);
+
     return (
         <Container>
             <Button>Test</Button>

From a57232c34b1e6b335bdfd8ea9a6541bd91b536f6 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 08:03:45 +0530
Subject: [PATCH 056/796] Link

---
 web/apps/photos/src/components/PhotoFrame.tsx | 20 +++++++++++++----
 .../new/photos/components/FileViewer5.tsx     | 22 +++++++++++++++----
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 8052fcb36c..62a70d5a22 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -1,3 +1,4 @@
+import { useModalVisibility } from "@/base/components/utils/modal";
 import log from "@/base/log";
 import {
     downloadManager,
@@ -159,6 +160,9 @@ const PhotoFrame = ({
     const [isShiftKeyPressed, setIsShiftKeyPressed] = useState(false);
     const router = useRouter();
 
+    const { show: showPhotoSwipe, props: photoSwipeVisibilityProps } =
+        useModalVisibility();
+
     const [displayFiles, setDisplayFiles] = useState<DisplayFile[] | undefined>(
         undefined,
     );
@@ -262,8 +266,12 @@ const PhotoFrame = ({
 
     const onThumbnailClick = (index: number) => () => {
         setCurrentIndex(index);
-        setOpen(true);
-        setIsPhotoSwipeOpen?.(true);
+        if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
+            showPhotoSwipe();
+        } else {
+            setOpen(true);
+            setIsPhotoSwipeOpen?.(true);
+        }
     };
 
     const handleSelect = handleSelectCreator(
@@ -504,8 +512,12 @@ const PhotoFrame = ({
     return (
         <Container>
             {process.env.NEXT_PUBLIC_ENTE_WIP_PS5 && (
-                /* @ts-expect-error TODO(PS): test */
-                <FileViewer files={files} index={currentIndex} />
+                <FileViewer
+                    {...photoSwipeVisibilityProps}
+                    /* @ts-expect-error TODO(PS): test */
+                    files={files}
+                    index={currentIndex}
+                />
             )}
             <AutoSizer>
                 {({ height, width }) => (
diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
index db5a68004a..84b51da3cc 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -62,7 +62,7 @@ interface FileViewerProps {
  *
  * The documentation for PhotoSwipe is at https://photoswipe.com/.
  */
-const FileViewer: React.FC<FileViewerProps> = ({ files, index }) => {
+const FileViewer: React.FC<FileViewerProps> = ({ open, files, index }) => {
     const pswpRef = useRef<PhotoSwipe | undefined>();
 
     useEffect(() => {
@@ -86,16 +86,30 @@ const FileViewer: React.FC<FileViewerProps> = ({ files, index }) => {
                 height: 100,
             };
         });
-        // initializing PhotoSwipe Core adds it to the DOM.
-        pswp.init();
         pswpRef.current = pswp;
 
         return () => {
-            pswp.destroy();
+            if (pswpRef.current.isOpen) pswpRef.current.destroy();
             pswpRef.current = undefined;
         };
     }, []);
 
+    useEffect(() => {
+        const pswp = pswpRef.current!;
+        if (open) {
+            if (!pswp.isOpen) {
+                // Initializing PhotoSwipe adds it to the DOM as a "dialog" div
+                // with the class "pswp" (and others).
+                pswp.init();
+            }
+        } else {
+            if (pswp.isOpen) {
+                // Closing PhotoSwipe removes it from the DOM.
+                pswp.close();
+            }
+        }
+    }, [open]);
+
     return (
         <Container>
             <Button>Test</Button>

From f3d9595953d24c7bcb3e19f3d9a4f7f1afe98715 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 08:29:27 +0530
Subject: [PATCH 057/796] diversion: pswp doesn't reset isOpen

---
 web/apps/photos/src/components/PhotoFrame.tsx | 22 ++++++++++++-------
 .../new/photos/components/FileViewer5.tsx     | 18 ++++++++++++++-
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 62a70d5a22..61300576c3 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -1,4 +1,3 @@
-import { useModalVisibility } from "@/base/components/utils/modal";
 import log from "@/base/log";
 import {
     downloadManager,
@@ -160,8 +159,9 @@ const PhotoFrame = ({
     const [isShiftKeyPressed, setIsShiftKeyPressed] = useState(false);
     const router = useRouter();
 
-    const { show: showPhotoSwipe, props: photoSwipeVisibilityProps } =
-        useModalVisibility();
+    // const { show: showPhotoSwipe, props: photoSwipeVisibilityProps } =
+    //     useModalVisibility();
+    const [open5, setOpen5] = useState(false);
 
     const [displayFiles, setDisplayFiles] = useState<DisplayFile[] | undefined>(
         undefined,
@@ -259,15 +259,20 @@ const PhotoFrame = ({
         };
 
     const handleClose = (needUpdate) => {
-        setOpen(false);
-        needUpdate && syncWithRemote();
-        setIsPhotoSwipeOpen?.(false);
+        if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
+            setOpen5(false);
+        } else {
+            setOpen(false);
+            needUpdate && syncWithRemote();
+            setIsPhotoSwipeOpen?.(false);
+        }
     };
 
     const onThumbnailClick = (index: number) => () => {
         setCurrentIndex(index);
         if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
-            showPhotoSwipe();
+            // showPhotoSwipe();
+            setOpen5(true);
         } else {
             setOpen(true);
             setIsPhotoSwipeOpen?.(true);
@@ -513,8 +518,9 @@ const PhotoFrame = ({
         <Container>
             {process.env.NEXT_PUBLIC_ENTE_WIP_PS5 && (
                 <FileViewer
-                    {...photoSwipeVisibilityProps}
                     /* @ts-expect-error TODO(PS): test */
+                    open={open5}
+                    onClose={handleClose}
                     files={files}
                     index={currentIndex}
                 />
diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
index 84b51da3cc..c121cee102 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -62,7 +62,12 @@ interface FileViewerProps {
  *
  * The documentation for PhotoSwipe is at https://photoswipe.com/.
  */
-const FileViewer: React.FC<FileViewerProps> = ({ open, files, index }) => {
+const FileViewer: React.FC<FileViewerProps> = ({
+    open,
+    onClose,
+    files,
+    index,
+}) => {
     const pswpRef = useRef<PhotoSwipe | undefined>();
 
     useEffect(() => {
@@ -86,6 +91,10 @@ const FileViewer: React.FC<FileViewerProps> = ({ open, files, index }) => {
                 height: 100,
             };
         });
+        pswp.on("close", () => {
+            console.log("pswp.on(close)")
+            onClose();
+        });
         pswpRef.current = pswp;
 
         return () => {
@@ -94,6 +103,8 @@ const FileViewer: React.FC<FileViewerProps> = ({ open, files, index }) => {
         };
     }, []);
 
+    console.log({ open, pswpIsOpen: pswpRef.current?.isOpen });
+
     useEffect(() => {
         const pswp = pswpRef.current!;
         if (open) {
@@ -105,11 +116,16 @@ const FileViewer: React.FC<FileViewerProps> = ({ open, files, index }) => {
         } else {
             if (pswp.isOpen) {
                 // Closing PhotoSwipe removes it from the DOM.
+                //
+                // We get to this particular point if we're being closed
+                // externally.
                 pswp.close();
             }
         }
     }, [open]);
 
+    const handleClose = () => {};
+
     return (
         <Container>
             <Button>Test</Button>

From e952aa80a5b63a55130945bec54e78d552ecbf36 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 08:35:56 +0530
Subject: [PATCH 058/796] Don't reuse

(see prev diversion)
---
 .../new/photos/components/FileViewer5.tsx     | 35 ++++++-------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
index c121cee102..6a9962e4c9 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -71,6 +71,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
     const pswpRef = useRef<PhotoSwipe | undefined>();
 
     useEffect(() => {
+        if (!open) return;
+
         const pswp = new PhotoSwipe({
             // Opaque background.
             bgOpacity: 1,
@@ -92,39 +94,24 @@ const FileViewer: React.FC<FileViewerProps> = ({
             };
         });
         pswp.on("close", () => {
-            console.log("pswp.on(close)")
+            console.log("pswp.on(close)");
             onClose();
         });
         pswpRef.current = pswp;
+        // Initializing PhotoSwipe adds it to the DOM as a "dialog" div
+        // with the class "pswp" (and others).
+        pswp.init();
 
         return () => {
-            if (pswpRef.current.isOpen) pswpRef.current.destroy();
+            // Closing PhotoSwipe removes it from the DOM.
+            //
+            // This will only have an effect if we're being closed externally.
+            pswpRef.current?.close();
             pswpRef.current = undefined;
         };
-    }, []);
-
-    console.log({ open, pswpIsOpen: pswpRef.current?.isOpen });
-
-    useEffect(() => {
-        const pswp = pswpRef.current!;
-        if (open) {
-            if (!pswp.isOpen) {
-                // Initializing PhotoSwipe adds it to the DOM as a "dialog" div
-                // with the class "pswp" (and others).
-                pswp.init();
-            }
-        } else {
-            if (pswp.isOpen) {
-                // Closing PhotoSwipe removes it from the DOM.
-                //
-                // We get to this particular point if we're being closed
-                // externally.
-                pswp.close();
-            }
-        }
     }, [open]);
 
-    const handleClose = () => {};
+    console.log({ open, pswpIsOpen: pswpRef.current?.isOpen });
 
     return (
         <Container>

From f30e05389b22ec4eff270566e3c13edad0ce6895 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 09:16:24 +0530
Subject: [PATCH 059/796] Validate

---
 web/apps/photos/src/components/PhotoFrame.tsx | 16 ++++++++++
 .../new/photos/components/FileViewer5.tsx     | 31 ++++++++++++++++---
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 61300576c3..efbef014d4 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -235,6 +235,22 @@ const PhotoFrame = ({
         }
     }, [selected]);
 
+    console.log({ t: "PhotoFrame", open: open });
+
+    useEffect(() => {
+        if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
+            console.log({ t: "PhotoFrame UE", open: open5 });
+
+            setTimeout(() => {
+                setOpen5(false);
+            }, 5000);
+        }
+        return () => {
+            if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5)
+                console.log({ t: "PhotoFrame UE cleanup", open: open5 });
+        };
+    }, [open5]);
+
     if (!displayFiles) {
         return <div />;
     }
diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
index 6a9962e4c9..223c5108c8 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -94,19 +94,42 @@ const FileViewer: React.FC<FileViewerProps> = ({
             };
         });
         pswp.on("close", () => {
-            console.log("pswp.on(close)");
+            // The user did some action within the image viewer to close it. Let
+            // our parent component know that the image viewer is closing.
             onClose();
         });
         pswpRef.current = pswp;
-        // Initializing PhotoSwipe adds it to the DOM as a "dialog" div
-        // with the class "pswp" (and others).
+        // Initializing PhotoSwipe adds it to the DOM as a dialog-like div with
+        // the class "pswp".
         pswp.init();
 
         return () => {
             // Closing PhotoSwipe removes it from the DOM.
             //
-            // This will only have an effect if we're being closed externally.
+            // This will only have an effect if we're being closed externally
+            // (e.g. if the user selects an album in the file info). If this
+            // cleanup function is running because we were closed internally,
+            // then the PhotoSwipe code will no-op this extra close.
             pswpRef.current?.close();
+            console.log({
+                "pswpRef.current": pswpRef.current,
+                "pswpRef.current.isOpen": pswpRef.current.isOpen,
+                "pswpRef.current.opener": pswpRef.current.opener,
+                "pswpRef.current.opener.isOpen": pswpRef.current.opener.isOpen,
+                "pswpRef.current.opener.isClosed":
+                    pswpRef.current.opener.isClosed,
+            });
+            setTimeout(() => {
+                console.log({
+                    "pswpRef.current": pswpRef.current,
+                    "pswpRef.current.isOpen": pswpRef.current.isOpen,
+                    "pswpRef.current.opener": pswpRef.current.opener,
+                    "pswpRef.current.opener.isOpen":
+                        pswpRef.current.opener.isOpen,
+                    "pswpRef.current.opener.isClosed":
+                        pswpRef.current.opener.isClosed,
+                });
+            }, 1000);
             pswpRef.current = undefined;
         };
     }, [open]);

From 825a9df9faf52bea1c1002cf7dfda4ca85030f5b Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 09:18:28 +0530
Subject: [PATCH 060/796] Cleanup up scaffold

---
 web/apps/photos/src/components/PhotoFrame.tsx | 16 -------------
 .../new/photos/components/FileViewer5.tsx     | 23 +------------------
 2 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index efbef014d4..61300576c3 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -235,22 +235,6 @@ const PhotoFrame = ({
         }
     }, [selected]);
 
-    console.log({ t: "PhotoFrame", open: open });
-
-    useEffect(() => {
-        if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
-            console.log({ t: "PhotoFrame UE", open: open5 });
-
-            setTimeout(() => {
-                setOpen5(false);
-            }, 5000);
-        }
-        return () => {
-            if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5)
-                console.log({ t: "PhotoFrame UE cleanup", open: open5 });
-        };
-    }, [open5]);
-
     if (!displayFiles) {
         return <div />;
     }
diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
index 223c5108c8..8b7444931d 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -110,32 +110,11 @@ const FileViewer: React.FC<FileViewerProps> = ({
             // (e.g. if the user selects an album in the file info). If this
             // cleanup function is running because we were closed internally,
             // then the PhotoSwipe code will no-op this extra close.
-            pswpRef.current?.close();
-            console.log({
-                "pswpRef.current": pswpRef.current,
-                "pswpRef.current.isOpen": pswpRef.current.isOpen,
-                "pswpRef.current.opener": pswpRef.current.opener,
-                "pswpRef.current.opener.isOpen": pswpRef.current.opener.isOpen,
-                "pswpRef.current.opener.isClosed":
-                    pswpRef.current.opener.isClosed,
-            });
-            setTimeout(() => {
-                console.log({
-                    "pswpRef.current": pswpRef.current,
-                    "pswpRef.current.isOpen": pswpRef.current.isOpen,
-                    "pswpRef.current.opener": pswpRef.current.opener,
-                    "pswpRef.current.opener.isOpen":
-                        pswpRef.current.opener.isOpen,
-                    "pswpRef.current.opener.isClosed":
-                        pswpRef.current.opener.isClosed,
-                });
-            }, 1000);
+            pswpRef.current.close();
             pswpRef.current = undefined;
         };
     }, [open]);
 
-    console.log({ open, pswpIsOpen: pswpRef.current?.isOpen });
-
     return (
         <Container>
             <Button>Test</Button>

From 2e52efb15fe95e3d55d3bf07f340fd6a59fd0c7b Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 10:13:11 +0530
Subject: [PATCH 061/796] Class

---
 .../new/photos/components/FileViewer5.tsx     |  48 ++------
 .../photos/components/FileViewerPhotoSwipe.ts | 111 ++++++++++++++++++
 2 files changed, 122 insertions(+), 37 deletions(-)
 create mode 100644 web/packages/new/photos/components/FileViewerPhotoSwipe.ts

diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
index 8b7444931d..0ea5332034 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -16,7 +16,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 import type { EnteFile } from "@/media/file.js";
 import { Button, styled } from "@mui/material";
 import { useEffect, useRef } from "react";
-import PhotoSwipe from "./ps5/dist/photoswipe.esm.js";
+import { FileViewerPhotoSwipe } from "./FileViewerPhotoSwipe";
 
 interface FileViewerProps {
     /**
@@ -68,49 +68,23 @@ const FileViewer: React.FC<FileViewerProps> = ({
     files,
     index,
 }) => {
-    const pswpRef = useRef<PhotoSwipe | undefined>();
+    const pswpRef = useRef<FileViewerPhotoSwipe | undefined>();
 
     useEffect(() => {
-        if (!open) return;
+        if (!open) {
+            // The close state will be handled by the cleanup function.
+            return;
+        }
 
-        const pswp = new PhotoSwipe({
-            // Opaque background.
-            bgOpacity: 1,
-            // TODO(PS): padding option? for handling custom title bar.
-            // TODO(PS): will we need this?
-            mainClass: "our-extra-pswp-main-class",
-        });
-        // Provide data about slides to PhotoSwipe via callbacks
-        // https://photoswipe.com/data-sources/#dynamically-generated-data
-        pswp.addFilter("numItems", () => {
-            return 2;
-        });
-        pswp.addFilter("itemData", (itemData, index) => {
-            console.log({ itemData, index });
-            return {
-                src: `https://dummyimage.com/100/777/fff/?text=i${index}`,
-                width: 100,
-                height: 100,
-            };
-        });
-        pswp.on("close", () => {
-            // The user did some action within the image viewer to close it. Let
-            // our parent component know that the image viewer is closing.
-            onClose();
+        const pswp = new FileViewerPhotoSwipe({
+            files,
+            initialIndex: index,
+            onClose,
         });
         pswpRef.current = pswp;
-        // Initializing PhotoSwipe adds it to the DOM as a dialog-like div with
-        // the class "pswp".
-        pswp.init();
 
         return () => {
-            // Closing PhotoSwipe removes it from the DOM.
-            //
-            // This will only have an effect if we're being closed externally
-            // (e.g. if the user selects an album in the file info). If this
-            // cleanup function is running because we were closed internally,
-            // then the PhotoSwipe code will no-op this extra close.
-            pswpRef.current.close();
+            pswpRef.current?.closeIfNeeded();
             pswpRef.current = undefined;
         };
     }, [open]);
diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
new file mode 100644
index 0000000000..7183333079
--- /dev/null
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -0,0 +1,111 @@
+/* eslint-disable */
+// @ts-nocheck
+
+import type { EnteFile } from "@/media/file";
+
+// TODO(PS): WIP gallery using upstream photoswipe
+//
+// Needs (not committed yet):
+// yarn workspace gallery add photoswipe@^5.4.4
+// mv node_modules/photoswipe packages/new/photos/components/ps5
+
+if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
+    console.warn("Using WIP upstream photoswipe");
+} else {
+    throw new Error("Whoa");
+}
+
+let PhotoSwipe;
+if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
+    PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
+}
+
+interface FileViewerPhotoSwipeOptions {
+    files: EnteFile[];
+    initialIndex: number;
+    onClose: () => void;
+}
+
+/**
+ * A wrapper over {@link PhotoSwipe} to tailor its interface for use by our file
+ * viewer.
+ *
+ * This is somewhat akin to the {@link PhotoSwipeLightbox}, except this doesn't
+ * have any UI of its own, it only modifies PhotoSwipe Core's behaviour.
+ *
+ * [Note: PhotoSwipe]
+ *
+ * PhotoSwipe is a library that behaves similarly to the OG "lightbox" image
+ * gallery JavaScript component from the middle ages.
+ *
+ * We don't need the lightbox functionality since we already have our own
+ * thumbnail list (the "gallery"), so we only use the "Core" PhotoSwipe module
+ * as our image viewer component.
+ *
+ * When the user clicks on one of the thumbnails in our gallery, we make the
+ * root PhotoSwipe component visible. Within the DOM this is a dialog-like div
+ * that takes up the entire viewport, shows the image, various controls etc.
+ *
+ * Documentation: https://photoswipe.com/.
+ */
+export class FileViewerPhotoSwipe {
+    pswp: PhotoSwipe;
+
+    constructor({ files, initialIndex, onClose }: FileViewerPhotoSwipeOptions) {
+        this.files = files;
+
+        const pswp = new PhotoSwipe({
+            // Opaque background.
+            bgOpacity: 1,
+            // Set the index within files that we should open to. Subsequent
+            // updates to the index will be tracked by PhotoSwipe internally.
+            index: initialIndex,
+            // TODO(PS): padding option? for handling custom title bar.
+            // TODO(PS): will we need this?
+            mainClass: "our-extra-pswp-main-class",
+        });
+        // Provide data about slides to PhotoSwipe via callbacks
+        // https://photoswipe.com/data-sources/#dynamically-generated-data
+        pswp.addFilter("numItems", () => {
+            return files.length;
+        });
+        // const enqueueUpdates = index;
+        pswp.addFilter("itemData", (itemData, index) => {
+            const file = files[index];
+            console.log({ itemData, index, file });
+
+            return {
+                src: `https://dummyimage.com/100/777/fff/?text=i${index}`,
+                width: 100,
+                height: 100,
+            };
+        });
+        pswp.on("close", () => {
+            // The user did some action within the file viewer to close it. Let
+            // our parent know that we have been closed.
+            onClose();
+        });
+        // Initializing PhotoSwipe adds it to the DOM as a dialog-like div with
+        // the class "pswp".
+        pswp.init();
+
+        this.pswp = pswp;
+    }
+
+    closeIfNeeded() {
+        // Closing PhotoSwipe removes it from the DOM.
+        //
+        // This will only have an effect if we're being closed externally (e.g.
+        // if the user selects an album in the file info).
+        //
+        // If this cleanup function is running in the sequence where we were
+        // closed internally (e.g. the user activated the close button within
+        // the file viewer), then PhotoSwipe will ignore this extra close.
+        this.pswp.close();
+        this.pswp = undefined;
+    }
+
+    updateFiles(files: EnteFile[]) {
+        // TODO(PS)
+    }
+}

From 42ac508fe7abfbe855650fee034f62400a713ed9 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 10:39:41 +0530
Subject: [PATCH 062/796] enqueue 1

---
 .../photos/components/FileViewerPhotoSwipe.ts | 86 +++++++++++++++++--
 1 file changed, 81 insertions(+), 5 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 7183333079..d58d9d5b8e 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -1,6 +1,9 @@
 /* eslint-disable */
 // @ts-nocheck
 
+import { assertionFailed } from "@/base/assert";
+import log from "@/base/log";
+import { downloadManager } from "@/gallery/services/download";
 import type { EnteFile } from "@/media/file";
 
 // TODO(PS): WIP gallery using upstream photoswipe
@@ -19,6 +22,58 @@ let PhotoSwipe;
 if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
+// TODO(PS):
+//import { type SlideData } from "./ps5/dist/types/slide/"
+type SlideData = {
+    /**
+     * thumbnail element
+     */
+    element?: HTMLElement | undefined;
+    /**
+     * image URL
+     */
+    src?: string | undefined;
+    /**
+     * image srcset
+     */
+    srcset?: string | undefined;
+    /**
+     * image width (deprecated)
+     */
+    w?: number | undefined;
+    /**
+     * image height (deprecated)
+     */
+    h?: number | undefined;
+    /**
+     * image width
+     */
+    width?: number | undefined;
+    /**
+     * image height
+     */
+    height?: number | undefined;
+    /**
+     * placeholder image URL that's displayed before large image is loaded
+     */
+    msrc?: string | undefined;
+    /**
+     * image alt text
+     */
+    alt?: string | undefined;
+    /**
+     * whether thumbnail is cropped client-side or not
+     */
+    thumbCropped?: boolean | undefined;
+    /**
+     * html content of a slide
+     */
+    html?: string | undefined;
+    /**
+     * slide type
+     */
+    type?: string | undefined;
+};
 
 interface FileViewerPhotoSwipeOptions {
     files: EnteFile[];
@@ -49,7 +104,8 @@ interface FileViewerPhotoSwipeOptions {
  * Documentation: https://photoswipe.com/.
  */
 export class FileViewerPhotoSwipe {
-    pswp: PhotoSwipe;
+    private pswp: PhotoSwipe;
+    private itemDataByFileID: Map<number, SlideData> = new Map();
 
     constructor({ files, initialIndex, onClose }: FileViewerPhotoSwipeOptions) {
         this.files = files;
@@ -67,13 +123,22 @@ export class FileViewerPhotoSwipe {
         // Provide data about slides to PhotoSwipe via callbacks
         // https://photoswipe.com/data-sources/#dynamically-generated-data
         pswp.addFilter("numItems", () => {
-            return files.length;
+            return this.files.length;
         });
         // const enqueueUpdates = index;
-        pswp.addFilter("itemData", (itemData, index) => {
+        pswp.addFilter("itemData", (_, index) => {
             const file = files[index];
-            console.log({ itemData, index, file });
 
+            let itemData: SlideData | undefined;
+            if (file) {
+                itemData = this.itemDataByFileID.get(file.id);
+                if (!itemData) this.enqueueUpdates(index, file);
+            }
+
+            log.debug(() => ["[ps]", { itemData, index, file, itemData }]);
+            if (!file) assertionFailed();
+
+            if (itemData) return itemData;
             return {
                 src: `https://dummyimage.com/100/777/fff/?text=i${index}`,
                 width: 100,
@@ -92,6 +157,12 @@ export class FileViewerPhotoSwipe {
         this.pswp = pswp;
     }
 
+    /**
+     * Close this instance of {@link FileViewerPhotoSwipe} if it hasn't itself
+     * initiated the close.
+     *
+     * This instance **cannot** be used after this function has been called.
+     */
     closeIfNeeded() {
         // Closing PhotoSwipe removes it from the DOM.
         //
@@ -102,10 +173,15 @@ export class FileViewerPhotoSwipe {
         // closed internally (e.g. the user activated the close button within
         // the file viewer), then PhotoSwipe will ignore this extra close.
         this.pswp.close();
-        this.pswp = undefined;
     }
 
     updateFiles(files: EnteFile[]) {
         // TODO(PS)
     }
+
+    async enqueueUpdates(index: number, file: EnteFile) {
+        const thumbnailURL = await downloadManager.renderableThumbnailURL(file);
+        this.itemDataByFileID.set(file.id, { src: thumbnailURL });
+        this.pswp.refreshSlideContent(index);
+    }
 }

From 8c68af7772c553e2f9d1a387c74f83c96d1655f2 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 10:53:22 +0530
Subject: [PATCH 063/796] Empty seems to work

---
 .../photos/components/FileViewerPhotoSwipe.ts    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index d58d9d5b8e..53cc0bad2d 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -139,11 +139,13 @@ export class FileViewerPhotoSwipe {
             if (!file) assertionFailed();
 
             if (itemData) return itemData;
-            return {
-                src: `https://dummyimage.com/100/777/fff/?text=i${index}`,
-                width: 100,
-                height: 100,
-            };
+
+            // We don't have anything to show immediately, though in most cases
+            // a cached renderable thumbnail URL will be available shortly.
+            // Meanwhile return empty slide data: PhotoSwipe will not show
+            // anything in the image area but will otherwise render the
+            // surrounding UI properly.
+            return {};
         });
         pswp.on("close", () => {
             // The user did some action within the file viewer to close it. Let
@@ -181,6 +183,10 @@ export class FileViewerPhotoSwipe {
 
     async enqueueUpdates(index: number, file: EnteFile) {
         const thumbnailURL = await downloadManager.renderableThumbnailURL(file);
+        // We don't have the dimensions of the thumbnail. We could try to deduce
+        // something from the file's aspect ratio etc, but that's not needed:
+        // PhotoSwipe already correctly (for our purposes) handles just a source
+        // URL being present.
         this.itemDataByFileID.set(file.id, { src: thumbnailURL });
         this.pswp.refreshSlideContent(index);
     }

From ca31a422fa336cf4baed7138bb6d91d79a859e86 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 11:12:22 +0530
Subject: [PATCH 064/796] Multiple

---
 .../photos/components/FileViewerPhotoSwipe.ts | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 53cc0bad2d..1637b05cd9 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -5,6 +5,7 @@ import { assertionFailed } from "@/base/assert";
 import log from "@/base/log";
 import { downloadManager } from "@/gallery/services/download";
 import type { EnteFile } from "@/media/file";
+import { FileType } from "@/media/file-type";
 
 // TODO(PS): WIP gallery using upstream photoswipe
 //
@@ -132,20 +133,29 @@ export class FileViewerPhotoSwipe {
             let itemData: SlideData | undefined;
             if (file) {
                 itemData = this.itemDataByFileID.get(file.id);
-                if (!itemData) this.enqueueUpdates(index, file);
+                if (!itemData) {
+                    // We don't have anything to show immediately, though in
+                    // most cases a cached renderable thumbnail URL will be
+                    // available shortly.
+                    //
+                    // Meanwhile,
+                    //
+                    // 1. Return empty slide data; PhotoSwipe will not show
+                    //    anything in the image area but will otherwise render
+                    //    the surrounding UI properly.
+                    //
+                    // 2. Insert empty data so that we don't enqueue multiple
+                    //    updates.
+                    itemData = {};
+                    this.itemDataByFileID.set(file.id, itemData);
+                    this.enqueueUpdates(index, file);
+                }
             }
 
             log.debug(() => ["[ps]", { itemData, index, file, itemData }]);
             if (!file) assertionFailed();
 
-            if (itemData) return itemData;
-
-            // We don't have anything to show immediately, though in most cases
-            // a cached renderable thumbnail URL will be available shortly.
-            // Meanwhile return empty slide data: PhotoSwipe will not show
-            // anything in the image area but will otherwise render the
-            // surrounding UI properly.
-            return {};
+            return itemData ?? {};
         });
         pswp.on("close", () => {
             // The user did some action within the file viewer to close it. Let
@@ -189,5 +199,13 @@ export class FileViewerPhotoSwipe {
         // URL being present.
         this.itemDataByFileID.set(file.id, { src: thumbnailURL });
         this.pswp.refreshSlideContent(index);
+
+        switch (file.metadata.fileType) {
+            case FileType.image:
+                break;
+
+            default:
+                break;
+        }
     }
 }

From 6f0deba3edf35b283f8fefce97152649d0fc1166 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 11:33:55 +0530
Subject: [PATCH 065/796] full

---
 .../photos/components/FileViewerPhotoSwipe.ts  | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 1637b05cd9..91d3cd3ccf 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -192,17 +192,29 @@ export class FileViewerPhotoSwipe {
     }
 
     async enqueueUpdates(index: number, file: EnteFile) {
+        const update = (itemData: SlideData) => {
+            this.itemDataByFileID.set(file.id, itemData);
+            this.pswp.refreshSlideContent(index);
+        };
+
         const thumbnailURL = await downloadManager.renderableThumbnailURL(file);
         // We don't have the dimensions of the thumbnail. We could try to deduce
         // something from the file's aspect ratio etc, but that's not needed:
         // PhotoSwipe already correctly (for our purposes) handles just a source
         // URL being present.
-        this.itemDataByFileID.set(file.id, { src: thumbnailURL });
-        this.pswp.refreshSlideContent(index);
+        update({ src: thumbnailURL });
 
         switch (file.metadata.fileType) {
-            case FileType.image:
+            case FileType.image: {
+                const sourceURLs =
+                    await downloadManager.renderableSourceURLs(file);
+                update({
+                    src: sourceURLs.url,
+                    width: file.pubMagicMetadata?.data?.w,
+                    height: file.pubMagicMetadata?.data?.h,
+                });
                 break;
+            }
 
             default:
                 break;

From 96937041f184478ed570951a63492a0b2c00156e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 11:39:23 +0530
Subject: [PATCH 066/796] vid 1

---
 .../photos/components/FileViewerPhotoSwipe.ts | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 91d3cd3ccf..67156baece 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -3,7 +3,10 @@
 
 import { assertionFailed } from "@/base/assert";
 import log from "@/base/log";
-import { downloadManager } from "@/gallery/services/download";
+import {
+    downloadManager,
+    type RenderableSourceURLs,
+} from "@/gallery/services/download";
 import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 
@@ -216,8 +219,25 @@ export class FileViewerPhotoSwipe {
                 break;
             }
 
+            case FileType.video:
+                {
+                    const sourceURLs =
+                        await downloadManager.renderableSourceURLs(file);
+                    update({
+                        html: videoHTML(sourceURLs),
+                    });
+                    break;
+                }
+                break;
+
             default:
                 break;
         }
     }
 }
+
+const videoHTML = ({ url }: RenderableSourceURLs) => `
+<video controls>
+  <source src="${url}" />
+</video>
+`;

From 5b1130ab2475be257bfce5a1c06390e85725ccb0 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 11:57:23 +0530
Subject: [PATCH 067/796] dd

---
 .../photos/components/FileViewerPhotoSwipe.ts | 47 +++++++++++++++++--
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 67156baece..da1da8ceb0 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -80,9 +80,26 @@ type SlideData = {
 };
 
 interface FileViewerPhotoSwipeOptions {
+    /**
+     * The files that are being displayed in the context in which the file
+     * viewer was invoked.
+     */
     files: EnteFile[];
+    /**
+     * The index of the file that should be initially shown.
+     *
+     * Subsequently the user may navigate between files by using the controls
+     * provided within the file viewer itself.
+     */
     initialIndex: number;
+    /**
+     * Called when the file viewer is closed.
+     */
     onClose: () => void;
+    /**
+     * If true, then controls for downloading the file are not shown.
+     */
+    disableDownload?: boolean;
 }
 
 /**
@@ -108,11 +125,31 @@ interface FileViewerPhotoSwipeOptions {
  * Documentation: https://photoswipe.com/.
  */
 export class FileViewerPhotoSwipe {
+    /**
+     * The PhotoSwipe instance which we wrap.
+     */
     private pswp: PhotoSwipe;
+    /**
+     * The options with which we were initialized.
+     */
+    private opts: Pick<FileViewerPhotoSwipeOptions, "disableDownload">;
+    /**
+     * The best available SlideData for rendering the file with the given ID.
+     *
+     * If an entry does not exist for a particular fileID, then it is lazily
+     * added on demand. The same entry might get updated multiple times, as we
+     * start with the thumbnail but then also update this with the original etc.
+     */
     private itemDataByFileID: Map<number, SlideData> = new Map();
 
-    constructor({ files, initialIndex, onClose }: FileViewerPhotoSwipeOptions) {
+    constructor({
+        files,
+        initialIndex,
+        onClose,
+        disableDownload,
+    }: FileViewerPhotoSwipeOptions) {
         this.files = files;
+        this.opts = { disableDownload };
 
         const pswp = new PhotoSwipe({
             // Opaque background.
@@ -223,8 +260,9 @@ export class FileViewerPhotoSwipe {
                 {
                     const sourceURLs =
                         await downloadManager.renderableSourceURLs(file);
+                    const disableDownload = !!this.opts.disableDownload;
                     update({
-                        html: videoHTML(sourceURLs),
+                        html: videoHTML(sourceURLs, disableDownload),
                     });
                     break;
                 }
@@ -236,8 +274,9 @@ export class FileViewerPhotoSwipe {
     }
 }
 
-const videoHTML = ({ url }: RenderableSourceURLs) => `
-<video controls>
+const videoHTML = ({ url }: RenderableSourceURLs, disableDownload: boolean) => `
+<video controls ${disableDownload && "controlsList=nodownload"} oncontextmenu="return false;">
   <source src="${url}" />
+  Your browser does not support video playback.
 </video>
 `;

From 5c1d7a0315e6e0d40028d9da1cfe176c2fee7172 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 12:07:22 +0530
Subject: [PATCH 068/796] Cleanup

---
 web/apps/photos/src/components/PhotoFrame.tsx |  2 +-
 .../new/photos/components/FileViewer5.tsx     | 69 ++++++-------------
 .../photos/components/FileViewerPhotoSwipe.ts | 39 +++--------
 .../new/photos/components/PhotoViewer.tsx     |  2 +
 4 files changed, 36 insertions(+), 76 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 61300576c3..5f020f28bb 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -522,7 +522,7 @@ const PhotoFrame = ({
                     open={open5}
                     onClose={handleClose}
                     files={files}
-                    index={currentIndex}
+                    initialIndex={currentIndex}
                 />
             )}
             <AutoSizer>
diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
index 0ea5332034..727dcb54ed 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -18,55 +18,42 @@ import { Button, styled } from "@mui/material";
 import { useEffect, useRef } from "react";
 import { FileViewerPhotoSwipe } from "./FileViewerPhotoSwipe";
 
-interface FileViewerProps {
+export interface FileViewerProps {
     /**
-     * The list of files that are currently being displayed.
+     * The list of files that are currently being displayed in the context in
+     * which the file viewer was invoked.
      *
-     * Although the file viewer itself is called on to display a particular file
-     * (specified by the {@link index} prop), the viewer is always used in the
-     * context of a an album, or search results, or some other arbitrary list of
-     * files. The {@link files} prop sets this underlying list of files.
+     * Although the file viewer is called on to display a particular file
+     * (specified by the {@link initialIndex} prop), the viewer is always used
+     * in the context of a an album, or search results, or some other arbitrary
+     * list of files. The {@link files} prop sets this underlying list of files.
      *
-     * The user can also navigate through them from within the viewer by using
-     * the arrow buttons.
+     * After the initial file has been shown, the user can navigate through the
+     * other files from within the viewer by using the arrow buttons.
      */
     files: EnteFile[];
     /**
-     * The index from within {@link files} that should be, or is, currently
-     * being displayed.
+     * The index of the file that should be initially shown.
      *
-     * It is set externally when the user activates a particular thumbnail in
-     * the gallery. It is set internally (by the file viewer itself) when the
-     * user scrolls through the files by using the arrow buttons.
+     * Subsequently the user may navigate between files by using the controls
+     * provided within the file viewer itself.
      */
-    index: number;
+    initialIndex: number;
+    /**
+     * If true then the viewer does not show controls for downloading the file.
+     */
+    disableDownload?: boolean;
 }
 
 /**
- * The {@link FileViewer} is our PhotoSwipe based image and video viewer.
- *
- * ---
- *
- * [Note: PhotoSwipe]
- *
- * PhotoSwipe is a library that behaves similarly to the OG "lightbox" image
- * gallery JavaScript component from the middle ages.
- *
- * We don't need the lightbox functionality since we already have our own
- * thumbnail list (the "gallery"), so we only use the "Core" PhotoSwipe module
- * as our image viewer component.
- *
- * When the user clicks on one of the thumbnails in our gallery, we make the
- * root PhotoSwipe component visible. Within the DOM this is a dialog that takes
- * up the entire viewport, and shows the image etc, and various controls.
- *
- * The documentation for PhotoSwipe is at https://photoswipe.com/.
+ * A PhotoSwipe based image and video viewer.
  */
 const FileViewer: React.FC<FileViewerProps> = ({
     open,
     onClose,
     files,
-    index,
+    initialIndex,
+    disableDownload,
 }) => {
     const pswpRef = useRef<FileViewerPhotoSwipe | undefined>();
 
@@ -78,8 +65,9 @@ const FileViewer: React.FC<FileViewerProps> = ({
 
         const pswp = new FileViewerPhotoSwipe({
             files,
-            initialIndex: index,
+            initialIndex,
             onClose,
+            disableDownload,
         });
         pswpRef.current = pswp;
 
@@ -92,19 +80,6 @@ const FileViewer: React.FC<FileViewerProps> = ({
     return (
         <Container>
             <Button>Test</Button>
-            <div id="test-gallery">
-                <a
-                    href="https://cdn.photoswipe.com/photoswipe-demo-images/photos/2/img-2500.jpg"
-                    data-pswp-width="1669"
-                    data-pswp-height="2500"
-                    target="_blank"
-                >
-                    <img
-                        src="https://cdn.photoswipe.com/photoswipe-demo-images/photos/2/img-200.jpg"
-                        alt=""
-                    />
-                </a>
-            </div>
         </Container>
     );
 };
diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index da1da8ceb0..866a59bdfa 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -9,6 +9,7 @@ import {
 } from "@/gallery/services/download";
 import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
+import type { FileViewerProps } from "./FileViewer5";
 
 // TODO(PS): WIP gallery using upstream photoswipe
 //
@@ -79,28 +80,12 @@ type SlideData = {
     type?: string | undefined;
 };
 
-interface FileViewerPhotoSwipeOptions {
-    /**
-     * The files that are being displayed in the context in which the file
-     * viewer was invoked.
-     */
-    files: EnteFile[];
-    /**
-     * The index of the file that should be initially shown.
-     *
-     * Subsequently the user may navigate between files by using the controls
-     * provided within the file viewer itself.
-     */
-    initialIndex: number;
+type FileViewerPhotoSwipeOptions = FileViewerProps & {
     /**
      * Called when the file viewer is closed.
      */
     onClose: () => void;
-    /**
-     * If true, then controls for downloading the file are not shown.
-     */
-    disableDownload?: boolean;
-}
+};
 
 /**
  * A wrapper over {@link PhotoSwipe} to tailor its interface for use by our file
@@ -256,17 +241,15 @@ export class FileViewerPhotoSwipe {
                 break;
             }
 
-            case FileType.video:
-                {
-                    const sourceURLs =
-                        await downloadManager.renderableSourceURLs(file);
-                    const disableDownload = !!this.opts.disableDownload;
-                    update({
-                        html: videoHTML(sourceURLs, disableDownload),
-                    });
-                    break;
-                }
+            case FileType.video: {
+                const sourceURLs =
+                    await downloadManager.renderableSourceURLs(file);
+                const disableDownload = !!this.opts.disableDownload;
+                update({
+                    html: videoHTML(sourceURLs, disableDownload),
+                });
                 break;
+            }
 
             default:
                 break;
diff --git a/web/packages/new/photos/components/PhotoViewer.tsx b/web/packages/new/photos/components/PhotoViewer.tsx
index 1f6806696e..5777d2c507 100644
--- a/web/packages/new/photos/components/PhotoViewer.tsx
+++ b/web/packages/new/photos/components/PhotoViewer.tsx
@@ -17,6 +17,8 @@ const FV5 = dynamic(() => import("./FileViewer5"), { ssr: false });
 const FVD = () => <></>;
 
 export const FileViewer: React.FC = (props) => {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
     return process.env.NEXT_PUBLIC_ENTE_WIP_PS5 ? <FV5 {...props} /> : <FVD />;
 };
 

From 556a0d18147c1f71ee953e496b26a38f3d2e5aa7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 12:38:05 +0530
Subject: [PATCH 069/796] lp

---
 .../photos/components/FileViewerPhotoSwipe.ts | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 866a59bdfa..f5e0229f5b 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -5,7 +5,7 @@ import { assertionFailed } from "@/base/assert";
 import log from "@/base/log";
 import {
     downloadManager,
-    type RenderableSourceURLs,
+    type LivePhotoSourceURL,
 } from "@/gallery/services/download";
 import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
@@ -151,7 +151,6 @@ export class FileViewerPhotoSwipe {
         pswp.addFilter("numItems", () => {
             return this.files.length;
         });
-        // const enqueueUpdates = index;
         pswp.addFilter("itemData", (_, index) => {
             const file = files[index];
 
@@ -245,21 +244,39 @@ export class FileViewerPhotoSwipe {
                 const sourceURLs =
                     await downloadManager.renderableSourceURLs(file);
                 const disableDownload = !!this.opts.disableDownload;
-                update({
-                    html: videoHTML(sourceURLs, disableDownload),
-                });
+                update({ html: videoHTML(sourceURLs.url, disableDownload) });
                 break;
             }
 
-            default:
+            default: {
+                const sourceURLs =
+                    await downloadManager.renderableSourceURLs(file);
+                const livePhotoSourceURLs =
+                    sourceURLs.url as LivePhotoSourceURL;
+                const imageURL = await livePhotoSourceURLs.image();
+                update({
+                    src: imageURL,
+                    width: file.pubMagicMetadata?.data?.w,
+                    height: file.pubMagicMetadata?.data?.h,
+                });
+                const videoURL = await livePhotoSourceURLs.video();
+                console.log(videoURL);
+                update({ html: livePhotoVideoHTML(videoURL) });
                 break;
+            }
         }
     }
 }
 
-const videoHTML = ({ url }: RenderableSourceURLs, disableDownload: boolean) => `
+const videoHTML = (url: string, disableDownload: boolean) => `
 <video controls ${disableDownload && "controlsList=nodownload"} oncontextmenu="return false;">
   <source src="${url}" />
   Your browser does not support video playback.
 </video>
 `;
+
+const livePhotoVideoHTML = (videoURL: string) => `
+<video autoplay loop muted oncontextmenu="return false;">
+  <source src="${videoURL}" />
+</video>
+`;

From 27070bbe4ca86fc1d286e8a28b0067f01d36550b Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 13:57:24 +0530
Subject: [PATCH 070/796] Take 1

---
 .../photos/components/FileViewerPhotoSwipe.ts   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index f5e0229f5b..e1d8bf7f5c 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -181,6 +181,15 @@ export class FileViewerPhotoSwipe {
 
             return itemData ?? {};
         });
+        pswp.on("contentLoad", (e) => {
+            console.log(e);
+            if (e.content.data.videoURL) {
+                const holderEl = e.content.slide.holderElement;
+                const vid = document.createElement("h1");
+                vid.innerText = "Test";
+                holderEl.appendChild(vid);
+            }
+        });
         pswp.on("close", () => {
             // The user did some action within the file viewer to close it. Let
             // our parent know that we have been closed.
@@ -261,7 +270,13 @@ export class FileViewerPhotoSwipe {
                 });
                 const videoURL = await livePhotoSourceURLs.video();
                 console.log(videoURL);
-                update({ html: livePhotoVideoHTML(videoURL) });
+                // update({ html: livePhotoVideoHTML(videoURL) });
+                update({
+                    src: imageURL,
+                    width: file.pubMagicMetadata?.data?.w,
+                    height: file.pubMagicMetadata?.data?.h,
+                    videoURL,
+                });
                 break;
             }
         }

From 5d6cc892f372e7b4766b02d48597ce6546ea8289 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 14:59:45 +0530
Subject: [PATCH 071/796] Take 2

---
 .../photos/components/FileViewerPhotoSwipe.ts    | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index e1d8bf7f5c..38d1202cb5 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -182,14 +182,26 @@ export class FileViewerPhotoSwipe {
             return itemData ?? {};
         });
         pswp.on("contentLoad", (e) => {
-            console.log(e);
+            console.log("contentLoad", e);
             if (e.content.data.videoURL) {
                 const holderEl = e.content.slide.holderElement;
                 const vid = document.createElement("h1");
-                vid.innerText = "Test";
+                vid.innerText = "Test 1";
                 holderEl.appendChild(vid);
             }
         });
+        pswp.on("contentAppend", (e) => {
+            const containerEl = e.content.slide.container;
+            console.log("contentAppend", containerEl);
+            if (e.content.data.videoURL) {
+                const vid = document.createElement("div");
+                vid.innerHTML = livePhotoVideoHTML(e.content.data.videoURL);
+                // vid.innerText = "Test 2";
+                containerEl.appendChild(vid);
+                vid.style =
+                    "position: absolute; left: 0; right: 0; width: 50%; height: 50%; background-color: blue; z-index: 100;";
+            }
+        });
         pswp.on("close", () => {
             // The user did some action within the file viewer to close it. Let
             // our parent know that we have been closed.

From 1feb43d3d4a5922aad55eec9911ba3ced6505406 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 15:34:37 +0530
Subject: [PATCH 072/796] pass through pointer events

+ don't close if too small
---
 web/packages/new/photos/components/FileViewerPhotoSwipe.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 38d1202cb5..891d5a56d1 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -139,6 +139,10 @@ export class FileViewerPhotoSwipe {
         const pswp = new PhotoSwipe({
             // Opaque background.
             bgOpacity: 1,
+            // Don't close PhotoSwipe on click if the image is small and cannot
+            // be zoomed into further (this is common when just the thumbnail
+            // has been loaded).
+            clickToCloseNonZoomable: false,
             // Set the index within files that we should open to. Subsequent
             // updates to the index will be tracked by PhotoSwipe internally.
             index: initialIndex,
@@ -199,7 +203,7 @@ export class FileViewerPhotoSwipe {
                 // vid.innerText = "Test 2";
                 containerEl.appendChild(vid);
                 vid.style =
-                    "position: absolute; left: 0; right: 0; width: 50%; height: 50%; background-color: blue; z-index: 100;";
+                    "position: absolute; left: 0; right: 0; width: 100%; height: 100%; z-index: 1; pointer-events: none;";
             }
         });
         pswp.on("close", () => {

From 9496baaffc152004f06b41ee8ac9003c609f36d5 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 16:14:52 +0530
Subject: [PATCH 073/796] zoom and click improvements

---
 .../new/photos/components/FileViewerPhotoSwipe.ts         | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 891d5a56d1..52ad7c8463 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -143,6 +143,14 @@ export class FileViewerPhotoSwipe {
             // be zoomed into further (this is common when just the thumbnail
             // has been loaded).
             clickToCloseNonZoomable: false,
+            // Disable closing on background taps otherwise accidental closes
+            // are irritatingly easy.
+            bgClickAction: () => {
+                /* nop */
+            },
+            // The default (ctrl + zoom) is cumbersome, allow zooming just by
+            // using the wheel / trackpad zoom gesture.
+            wheelToZoom: true,
             // Set the index within files that we should open to. Subsequent
             // updates to the index will be tracked by PhotoSwipe internally.
             index: initialIndex,

From 78334d2e22689e12355569e92771f0344b84f222 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 16:28:30 +0530
Subject: [PATCH 074/796] Improve comments

---
 web/apps/photos/src/pages/_app.tsx            |  4 ++-
 .../photos/components/FileViewerPhotoSwipe.ts | 26 ++++++++++++++-----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index 6396830677..ca09fffaf1 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -51,11 +51,13 @@ import { useNotification } from "components/utils/hooks-app";
 import { t } from "i18next";
 import type { AppProps } from "next/app";
 import { useRouter } from "next/router";
-import "photoswipe/dist/photoswipe.css";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { resumeExportsIfNeeded } from "services/export";
 import { photosLogout } from "services/logout";
 
+import "photoswipe/dist/photoswipe.css";
+// import "../../../../packages/new/photos/components/ps5/dist/photoswipe.css";
+
 import "styles/global.css";
 
 const App: React.FC<AppProps> = ({ Component, pageProps }) => {
diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 52ad7c8463..2afc47a33a 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -139,17 +139,29 @@ export class FileViewerPhotoSwipe {
         const pswp = new PhotoSwipe({
             // Opaque background.
             bgOpacity: 1,
-            // Don't close PhotoSwipe on click if the image is small and cannot
-            // be zoomed into further (this is common when just the thumbnail
-            // has been loaded).
+            // The default imageClickAction is "zoom-or-close". When the image
+            // is small and cannot be zoomed into further (which is common when
+            // just the thumbnail has been loaded), this causes PhotoSwipe to
+            // close. Disable this behaviour.
             clickToCloseNonZoomable: false,
-            // Disable closing on background taps otherwise accidental closes
+            // The default bgClickAction is "close", but it is not always
+            // apparent where the background is and where the controls are,
+            // since everything is black, and so accidentally closing PhotoSwipe
+            // is easy. Disable this behaviour, instead
+            // accidental closes
             // are irritatingly easy.
             bgClickAction: () => {
-                /* nop */
+                /* no-op */
             },
-            // The default (ctrl + zoom) is cumbersome, allow zooming just by
-            // using the wheel / trackpad zoom gesture.
+            // At least on macOS, manual zooming with the trackpad is very
+            // cumbersome (possibly because of the small multiplier in the
+            // PhotoSwipe source, but I'm not sure). The other option to do a
+            // manual zoom is to scroll (e.g. with the trackpad) but with the
+            // CTRL key pressed, however on macOS this invokes the system zoom
+            // if enabled in accessibility settings.
+            //
+            // Taking a step back though, the PhotoSwipe viewport is fixed, so
+            // we can just directly map wheel / trackpad scrolls to zooming.
             wheelToZoom: true,
             // Set the index within files that we should open to. Subsequent
             // updates to the index will be tracked by PhotoSwipe internally.

From b4e01d5ab5e0f9430d9710bf101642d53b2f376f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 17:17:46 +0530
Subject: [PATCH 075/796] Auto hide

Needs the new CSS, but it'll work when that is enabled
---
 web/apps/photos/src/pages/_app.tsx            |  1 +
 .../photos/components/FileViewerPhotoSwipe.ts | 71 ++++++++++++++++++-
 2 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index ca09fffaf1..f2345ebdfe 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -56,6 +56,7 @@ import { resumeExportsIfNeeded } from "services/export";
 import { photosLogout } from "services/logout";
 
 import "photoswipe/dist/photoswipe.css";
+// TODO(PS): Note, auto hide only works with the new CSS.
 // import "../../../../packages/new/photos/components/ps5/dist/photoswipe.css";
 
 import "styles/global.css";
diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 2afc47a33a..d2ae35b793 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -126,6 +126,19 @@ export class FileViewerPhotoSwipe {
      * start with the thumbnail but then also update this with the original etc.
      */
     private itemDataByFileID: Map<number, SlideData> = new Map();
+    /**
+     * An interval that invokes a periodic check of whether we should the hide
+     * controls if the user does not perform any pointer events for a while.
+     */
+    private autoHideCheckIntervalId: ReturnType<typeof setTimeout> | undefined;
+    /**
+     * The time the last activity occurred. Used in tandem with
+     * {@link autoHideCheckIntervalId} to implement the auto hiding of controls
+     * when the user stops moving the pointer for a while.
+     *
+     * This will be "hidden" if controls have already been hidden.
+     */
+    private lastActivityDate: Date | "hidden";
 
     constructor({
         files,
@@ -170,11 +183,14 @@ export class FileViewerPhotoSwipe {
             // TODO(PS): will we need this?
             mainClass: "our-extra-pswp-main-class",
         });
+
         // Provide data about slides to PhotoSwipe via callbacks
         // https://photoswipe.com/data-sources/#dynamically-generated-data
+
         pswp.addFilter("numItems", () => {
             return this.files.length;
         });
+
         pswp.addFilter("itemData", (_, index) => {
             const file = files[index];
 
@@ -203,8 +219,19 @@ export class FileViewerPhotoSwipe {
             log.debug(() => ["[ps]", { itemData, index, file, itemData }]);
             if (!file) assertionFailed();
 
+            this.lastActivityDate = new Date();
+
             return itemData ?? {};
         });
+
+        pswp.addFilter("preventPointerEvent", (originalResult) => {
+            // There was a pointer event. We don't care which one, we just use
+            // this as a hook to show UI again (if needed) and update our last
+            // activity date.
+            this.onPointerActivity();
+            return originalResult;
+        });
+
         pswp.on("contentLoad", (e) => {
             console.log("contentLoad", e);
             if (e.content.data.videoURL) {
@@ -226,16 +253,25 @@ export class FileViewerPhotoSwipe {
                     "position: absolute; left: 0; right: 0; width: 100%; height: 100%; z-index: 1; pointer-events: none;";
             }
         });
+
         pswp.on("close", () => {
-            // The user did some action within the file viewer to close it. Let
-            // our parent know that we have been closed.
+            // The user did some action within the file viewer to close it.
+            //
+            // Clear intervals.
+            clearIntervals();
+            // Let our parent know that we have been closed.
             onClose();
         });
+
         // Initializing PhotoSwipe adds it to the DOM as a dialog-like div with
         // the class "pswp".
         pswp.init();
 
         this.pswp = pswp;
+
+        this.autoHideCheckIntervalId = setInterval(() => {
+            this.autoHideIfInactive();
+        }, 1000);
     }
 
     /**
@@ -254,13 +290,42 @@ export class FileViewerPhotoSwipe {
         // closed internally (e.g. the user activated the close button within
         // the file viewer), then PhotoSwipe will ignore this extra close.
         this.pswp.close();
+        this.clearAutoHideIntervalIfNeeded();
     }
 
     updateFiles(files: EnteFile[]) {
         // TODO(PS)
     }
 
-    async enqueueUpdates(index: number, file: EnteFile) {
+    private clearAutoHideIntervalIfNeeded() {
+        if (this.autoHideCheckIntervalId) {
+            clearInterval(this.autoHideCheckIntervalId);
+            this.autoHideCheckIntervalId = undefined;
+        }
+    }
+
+    private onPointerActivity() {
+        if (this.lastActivityDate == "hidden") this.showUIControls();
+        this.lastActivityDate = new Date();
+    }
+
+    private autoHideIfInactive() {
+        if (this.lastActivityDate == "hidden") return;
+        if (Date.now() - this.lastActivityDate.getTime() > 3000) {
+            this.hideUIControls();
+            this.lastActivityDate = "hidden";
+        }
+    }
+
+    private showUIControls() {
+        this.pswp.element.classList.add("pswp--ui-visible");
+    }
+
+    private hideUIControls() {
+        this.pswp.element.classList.remove("pswp--ui-visible");
+    }
+
+    private async enqueueUpdates(index: number, file: EnteFile) {
         const update = (itemData: SlideData) => {
             this.itemDataByFileID.set(file.id, itemData);
             this.pswp.refreshSlideContent(index);

From 021b6ec9b4f501a3af3f4d4dafb9ed8f073151ce Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 17:32:06 +0530
Subject: [PATCH 076/796] + bg click hide

---
 web/apps/photos/src/pages/_app.tsx            |  4 ++--
 .../photos/components/FileViewerPhotoSwipe.ts | 21 ++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index f2345ebdfe..e9452c163d 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -55,9 +55,9 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { resumeExportsIfNeeded } from "services/export";
 import { photosLogout } from "services/logout";
 
-import "photoswipe/dist/photoswipe.css";
+// import "photoswipe/dist/photoswipe.css";
 // TODO(PS): Note, auto hide only works with the new CSS.
-// import "../../../../packages/new/photos/components/ps5/dist/photoswipe.css";
+import "../../../../packages/new/photos/components/ps5/dist/photoswipe.css";
 
 import "styles/global.css";
 
diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index d2ae35b793..0956f7d9cb 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -157,15 +157,17 @@ export class FileViewerPhotoSwipe {
             // just the thumbnail has been loaded), this causes PhotoSwipe to
             // close. Disable this behaviour.
             clickToCloseNonZoomable: false,
-            // The default bgClickAction is "close", but it is not always
+            // The default `bgClickAction` is "close", but it is not always
             // apparent where the background is and where the controls are,
             // since everything is black, and so accidentally closing PhotoSwipe
-            // is easy. Disable this behaviour, instead
-            // accidental closes
-            // are irritatingly easy.
-            bgClickAction: () => {
-                /* no-op */
-            },
+            // is easy.
+            //
+            // Disable this behaviour, instead repurposing this action to behave
+            // the same as the `tapAction` ("tap on PhotoSwipe viewport
+            // content") and toggle the visibility of UI controls (We also have
+            // auto hide based on mouse activity, but that would not have any
+            // effect on touch devices)
+            bgClickAction: "toggle-controls",
             // At least on macOS, manual zooming with the trackpad is very
             // cumbersome (possibly because of the small multiplier in the
             // PhotoSwipe source, but I'm not sure). The other option to do a
@@ -232,6 +234,11 @@ export class FileViewerPhotoSwipe {
             return originalResult;
         });
 
+        // TODO(PS): Fix interaction between click hide and auto hide.
+        // pswp.on("bgClickAction", () => {
+        //     this.lastActivityDate == "hidden";
+        // });
+
         pswp.on("contentLoad", (e) => {
             console.log("contentLoad", e);
             if (e.content.data.videoURL) {

From 54da18125651481d7cb317617d9ad22456b07fbd Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 17:49:37 +0530
Subject: [PATCH 077/796] Handle both cases

---
 web/apps/photos/src/pages/_app.tsx            |  4 +--
 .../photos/components/FileViewerPhotoSwipe.ts | 35 ++++++++++++-------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index e9452c163d..f2345ebdfe 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -55,9 +55,9 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { resumeExportsIfNeeded } from "services/export";
 import { photosLogout } from "services/logout";
 
-// import "photoswipe/dist/photoswipe.css";
+import "photoswipe/dist/photoswipe.css";
 // TODO(PS): Note, auto hide only works with the new CSS.
-import "../../../../packages/new/photos/components/ps5/dist/photoswipe.css";
+// import "../../../../packages/new/photos/components/ps5/dist/photoswipe.css";
 
 import "styles/global.css";
 
diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 0956f7d9cb..83b1ca23ea 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -136,9 +136,14 @@ export class FileViewerPhotoSwipe {
      * {@link autoHideCheckIntervalId} to implement the auto hiding of controls
      * when the user stops moving the pointer for a while.
      *
-     * This will be "hidden" if controls have already been hidden.
+     * Apart from a date, this can also be:
+     *
+     * - "already-hidden" if controls have already been hidden, say by a
+     *   bgClickAction.
+     *
+     * - "auto-hidden" if controls were hidden by us because of inactivity.
      */
-    private lastActivityDate: Date | "hidden";
+    private lastActivityDate: Date | "auto-hidden" | "already-hidden";
 
     constructor({
         files,
@@ -221,7 +226,8 @@ export class FileViewerPhotoSwipe {
             log.debug(() => ["[ps]", { itemData, index, file, itemData }]);
             if (!file) assertionFailed();
 
-            this.lastActivityDate = new Date();
+            if (this.lastActivityDate != "already-hidden")
+                this.lastActivityDate = new Date();
 
             return itemData ?? {};
         });
@@ -234,11 +240,6 @@ export class FileViewerPhotoSwipe {
             return originalResult;
         });
 
-        // TODO(PS): Fix interaction between click hide and auto hide.
-        // pswp.on("bgClickAction", () => {
-        //     this.lastActivityDate == "hidden";
-        // });
-
         pswp.on("contentLoad", (e) => {
             console.log("contentLoad", e);
             if (e.content.data.videoURL) {
@@ -312,18 +313,28 @@ export class FileViewerPhotoSwipe {
     }
 
     private onPointerActivity() {
-        if (this.lastActivityDate == "hidden") this.showUIControls();
+        if (this.lastActivityDate == "already-hidden") return;
+        if (this.lastActivityDate == "auto-hidden") this.showUIControls();
         this.lastActivityDate = new Date();
     }
 
     private autoHideIfInactive() {
-        if (this.lastActivityDate == "hidden") return;
+        if (this.lastActivityDate == "already-hidden") return;
+        if (this.lastActivityDate == "auto-hidden") return;
         if (Date.now() - this.lastActivityDate.getTime() > 3000) {
-            this.hideUIControls();
-            this.lastActivityDate = "hidden";
+            if (this.areUIControlsVisible()) {
+                this.hideUIControls();
+                this.lastActivityDate = "auto-hidden";
+            } else {
+                this.lastActivityDate = "already-hidden";
+            }
         }
     }
 
+    private areUIControlsVisible() {
+        return this.pswp.element.classList.contains("pswp--ui-visible");
+    }
+
     private showUIControls() {
         this.pswp.element.classList.add("pswp--ui-visible");
     }

From 3484f81546a68c9d84559e763b26310a17ccd265 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 17:51:00 +0530
Subject: [PATCH 078/796] Prep for merge

---
 web/packages/new/photos/components/FileViewerPhotoSwipe.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 83b1ca23ea..658e837672 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -25,7 +25,8 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 
 let PhotoSwipe;
 if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
-    PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
+    // TODO(PS): Comment me before merging into main.
+    // PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
 // TODO(PS):
 //import { type SlideData } from "./ps5/dist/types/slide/"

From 2d4e53218614209d0373792cbde6c877e88e4e78 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 18:06:06 +0530
Subject: [PATCH 079/796] LF

---
 web/apps/photos/src/components/PhotoFrame.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 5f020f28bb..78f484990c 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -7,7 +7,7 @@ import {
 } from "@/gallery/services/download";
 import { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
-import { FileViewer } from "@/new/photos/components/FileViewer";
+import { FileViewer } from "@/new/photos/components/PhotoViewer";
 import type { GalleryBarMode } from "@/new/photos/components/gallery/reducer";
 import { TRASH_SECTION } from "@/new/photos/services/collection";
 import { styled } from "@mui/material";
@@ -518,7 +518,8 @@ const PhotoFrame = ({
         <Container>
             {process.env.NEXT_PUBLIC_ENTE_WIP_PS5 && (
                 <FileViewer
-                    /* @ts-expect-error TODO(PS): test */
+                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    /* @ts-ignore TODO(PS): test */
                     open={open5}
                     onClose={handleClose}
                     files={files}

From 7621041ce0a71a58364ce9c3452fdfc95ad9cff4 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 11 Feb 2025 18:27:17 +0530
Subject: [PATCH 080/796] Revert "[mob] Fix exif time parsing (#4985)"

This reverts commit 5b17711b55e9e8995454121e3a209ee5e8c9b3c1, reversing
changes made to 85bf3eebcb5ac197ce6a5901cbc8db1d03be0113.
---
 .github/workflows/mobile-internal-release.yml |    2 +-
 .github/workflows/mobile-release.yml          |    2 +-
 .../custom-icons/_data/custom-icons.json      |    5 +
 auth/assets/custom-icons/icons/aj_bell.svg    |    7 +
 auth/lib/l10n/arb/app_ar.arb                  |   19 +-
 auth/lib/l10n/arb/app_hi.arb                  |   30 +-
 auth/lib/l10n/arb/app_tr.arb                  |    6 +-
 desktop/CHANGELOG.md                          |    7 +-
 desktop/package.json                          |    4 +-
 desktop/src/main.ts                           |   12 +-
 desktop/src/main/ipc.ts                       |    5 +
 desktop/src/main/menu.ts                      |   61 +-
 desktop/src/preload.ts                        |    6 +
 desktop/yarn.lock                             |    8 +-
 .../photos/troubleshooting/sharing-logs.md    |   17 +-
 .../src/components/UpdateSubscription.tsx     |   20 +
 mobile/android/app/proguard-rules.pro         |    2 +
 mobile/ios/Podfile.lock                       |  106 +-
 mobile/ios/Runner.xcodeproj/project.pbxproj   |    4 +
 .../core/error-reporting/super_logging.dart   |    2 +-
 mobile/lib/core/network/network.dart          |   12 +-
 mobile/lib/db/files_db.dart                   |    6 +-
 mobile/lib/gateways/cast_gw.dart              |    2 +-
 mobile/lib/gateways/entity_gw.dart            |    2 +-
 mobile/lib/generated/intl/messages_en.dart    |   10 +-
 mobile/lib/generated/l10n.dart                |   68 +-
 mobile/lib/l10n/intl_en.arb                   |   12 +-
 mobile/lib/models/file/file.dart              |   45 +-
 mobile/lib/models/metadata/file_magic.dart    |   11 -
 .../lib/module/upload/service/multipart.dart  |    4 +-
 mobile/lib/services/billing_service.dart      |   10 +-
 mobile/lib/services/collections_service.dart  |   24 +-
 mobile/lib/services/file_magic_service.dart   |    4 +-
 mobile/lib/services/preview_video_store.dart  |   21 +-
 mobile/lib/services/sync_service.dart         |   10 +-
 mobile/lib/services/user_service.dart         |   30 +-
 .../states/all_sections_examples_state.dart   |   10 +-
 .../account/login_pwd_verification_page.dart  |    8 +-
 .../lib/ui/account/verify_recovery_page.dart  |    2 +-
 .../device/device_folders_grid_view.dart      |    8 +-
 .../device_folders_vertical_grid_view.dart    |    2 +-
 .../lib/ui/growth/referral_code_widget.dart   |    2 +-
 mobile/lib/ui/home/status_bar_widget.dart     |   98 +-
 mobile/lib/ui/map/map_view.dart               |    4 +-
 .../ui/settings/backup/backup_item_card.dart  |  357 +++---
 mobile/lib/ui/sharing/user_avator_widget.dart |    1 +
 .../lib/ui/tabs/shared_collections_tab.dart   |    1 +
 mobile/lib/ui/tabs/user_collections_tab.dart  |    1 +
 mobile/lib/ui/viewer/file/file_app_bar.dart   |   21 +-
 mobile/lib/ui/viewer/file/file_widget.dart    |    4 +-
 .../ui/viewer/file/preview_status_widget.dart |   23 +-
 mobile/lib/ui/viewer/file/video_control.dart  |   29 +-
 .../creation_time_item_widget.dart            |   10 +-
 .../preview_properties_item_widget.dart       |    2 +-
 mobile/lib/ui/viewer/gallery/gallery.dart     |   51 +-
 mobile/lib/utils/debouncer.dart               |   14 +-
 mobile/lib/utils/dialog_util.dart             |   19 +-
 mobile/lib/utils/exif_util.dart               |   93 +-
 mobile/lib/utils/file_uploader.dart           |   83 +-
 mobile/lib/utils/file_uploader_util.dart      |   41 +-
 mobile/lib/utils/share_util.dart              |    6 +-
 mobile/lib/utils/thumbnail_util.dart          |    2 +-
 mobile/plugins/ente_cast/pubspec.lock         |    8 +-
 mobile/plugins/ente_cast/pubspec.yaml         |    2 +-
 mobile/plugins/ente_cast_none/pubspec.lock    |    8 +-
 mobile/plugins/ente_cast_normal/pubspec.lock  |    8 +-
 mobile/plugins/ente_feature_flag/pubspec.lock |   22 +-
 mobile/plugins/ente_feature_flag/pubspec.yaml |    2 +-
 mobile/plugins/onnx_dart/pubspec.lock         |   24 +-
 mobile/pubspec.lock                           |  440 ++++---
 mobile/pubspec.yaml                           |    5 +-
 server/cmd/museum/main.go                     |    2 +-
 server/pkg/controller/file.go                 |   36 +-
 web/.gitignore                                |    1 +
 web/apps/accounts/src/pages/_app.tsx          |    4 +-
 .../accounts/src/pages/passkeys/index.tsx     |    7 +-
 web/apps/auth/src/pages/_app.tsx              |    4 +-
 web/apps/auth/src/pages/auth.tsx              |   20 +-
 web/apps/auth/src/pages/share.tsx             |    2 +-
 .../Collections/AlbumCastDialog.tsx           |    4 +-
 .../Collections/CollectionHeader.tsx          |    6 +-
 .../Collections/CollectionShare.tsx           |   15 +-
 .../src/components/FilesDownloadProgress.tsx  |    4 +-
 .../photos/src/components/FixCreationTime.tsx |    8 +-
 .../src/components/PhotoViewer/FileInfo.tsx   |   11 +-
 .../PhotoViewer/ImageEditorOverlay.tsx        |    5 +-
 .../src/components/PhotoViewer/index.tsx      |   43 +-
 web/apps/photos/src/components/Sidebar.tsx    | 1137 +++++++++++++++++
 .../src/components/Sidebar/Preferences.tsx    |  303 -----
 .../photos/src/components/Sidebar/index.tsx   |  717 -----------
 .../{Sidebar => }/SubscriptionCard.tsx        |    0
 .../components/Upload/UploadTypeSelector.tsx  |   10 +-
 .../photos/src/components/WatchFolder.tsx     |   56 +-
 .../components/pages/gallery/PreviewCard.tsx  |    4 +-
 .../pages/gallery/SelectedFileOptions.tsx     |  446 ++++---
 web/apps/photos/src/pages/_app.tsx            |   28 +-
 web/apps/photos/src/pages/gallery.tsx         |  128 +-
 web/apps/photos/src/pages/index.tsx           |    4 +-
 web/apps/photos/src/pages/shared-albums.tsx   |  111 +-
 web/apps/photos/src/services/export/index.ts  |   15 +-
 web/apps/photos/src/styles/global.css         |   19 +
 .../accounts/components/CodeBlock.tsx         |   43 +-
 .../accounts/components/RecoveryKey.tsx       |    6 +-
 .../components/layouts/centered-paper.tsx     |    6 +-
 web/packages/base/app.ts                      |    3 -
 web/packages/base/components/CopyButton.tsx   |   65 -
 web/packages/base/components/MiniDialog.tsx   |    2 +-
 web/packages/base/components/Navbar.tsx       |   45 +-
 web/packages/base/components/OverflowMenu.tsx |    2 +-
 web/packages/base/components/RowButton.tsx    |   18 +-
 .../base/components/SingleInputDialog.tsx     |    4 +-
 web/packages/base/components/containers.tsx   |   13 +-
 web/packages/base/components/loaders.tsx      |   32 +-
 .../base/components/mui/SidebarDrawer.tsx     |   12 +-
 .../base/locales/ar-SA/translation.json       |   10 +-
 .../base/locales/be-BY/translation.json       |   10 +-
 .../base/locales/bg-BG/translation.json       |   10 +-
 .../base/locales/ca-ES/translation.json       |   10 +-
 .../base/locales/da-DK/translation.json       |   10 +-
 .../base/locales/de-DE/translation.json       |   10 +-
 .../base/locales/el-GR/translation.json       |   10 +-
 .../base/locales/en-US/translation.json       |   10 +-
 .../base/locales/es-ES/translation.json       |   10 +-
 .../base/locales/et-EE/translation.json       |   10 +-
 .../base/locales/fa-IR/translation.json       |   10 +-
 .../base/locales/fi-FI/translation.json       |   10 +-
 .../base/locales/fr-FR/translation.json       |   20 +-
 .../base/locales/gu-IN/translation.json       |   10 +-
 .../base/locales/hi-IN/translation.json       |   10 +-
 .../base/locales/hu-HU/translation.json       |   10 +-
 .../base/locales/id-ID/translation.json       |   10 +-
 .../base/locales/is-IS/translation.json       |   10 +-
 .../base/locales/it-IT/translation.json       |   10 +-
 .../base/locales/ja-JP/translation.json       |   10 +-
 .../base/locales/km-KH/translation.json       |   10 +-
 .../base/locales/ko-KR/translation.json       |   10 +-
 .../base/locales/lt-LT/translation.json       |   18 +-
 .../base/locales/ml-IN/translation.json       |   10 +-
 .../base/locales/nl-NL/translation.json       |   10 +-
 .../base/locales/pl-PL/translation.json       |   10 +-
 .../base/locales/pt-BR/translation.json       |   18 +-
 .../base/locales/pt-PT/translation.json       |   10 +-
 .../base/locales/ro-RO/translation.json       |   10 +-
 .../base/locales/ru-RU/translation.json       |   10 +-
 .../base/locales/sl-SI/translation.json       |   10 +-
 .../base/locales/sv-SE/translation.json       |   10 +-
 .../base/locales/ta-IN/translation.json       |   10 +-
 .../base/locales/te-IN/translation.json       |   10 +-
 .../base/locales/th-TH/translation.json       |   10 +-
 .../base/locales/ti-ER/translation.json       |   10 +-
 .../base/locales/tr-TR/translation.json       |   10 +-
 .../base/locales/uk-UA/translation.json       |   10 +-
 .../base/locales/vi-VN/translation.json       |   10 +-
 .../base/locales/zh-CN/translation.json       |   10 +-
 .../base/locales/zh-HK/translation.json       |   10 +-
 web/packages/base/next.config.base.js         |    7 +
 web/packages/base/types/ipc.ts                |   46 +-
 .../gallery/components/FullScreenDropZone.tsx |    2 +-
 .../components/CollectionMappingChoice.tsx    |    6 +-
 .../photos/components/CollectionSelector.tsx  |    6 +-
 .../new/photos/components/FileInfo.tsx        |   42 +
 .../{PhotoViewer.tsx => FileViewer.tsx}       |    7 +-
 .../photos/components/PhotoDateTimePicker.tsx |    9 +-
 .../new/photos/components/PlanSelector.tsx    |    4 +-
 .../components/gallery/PeopleHeader.tsx       |   20 +-
 .../new/photos/components/utils/z-index.tsx   |    6 +-
 web/packages/new/photos/pages/duplicates.tsx  |   11 +-
 web/packages/shared/components/Container.tsx  |    6 +-
 168 files changed, 3264 insertions(+), 2752 deletions(-)
 create mode 100644 auth/assets/custom-icons/icons/aj_bell.svg
 create mode 100644 web/apps/photos/src/components/Sidebar.tsx
 delete mode 100644 web/apps/photos/src/components/Sidebar/Preferences.tsx
 delete mode 100644 web/apps/photos/src/components/Sidebar/index.tsx
 rename web/apps/photos/src/components/{Sidebar => }/SubscriptionCard.tsx (100%)
 delete mode 100644 web/packages/base/components/CopyButton.tsx
 create mode 100644 web/packages/new/photos/components/FileInfo.tsx
 rename web/packages/new/photos/components/{PhotoViewer.tsx => FileViewer.tsx} (95%)

diff --git a/.github/workflows/mobile-internal-release.yml b/.github/workflows/mobile-internal-release.yml
index 6752fb1308..ae5535f655 100644
--- a/.github/workflows/mobile-internal-release.yml
+++ b/.github/workflows/mobile-internal-release.yml
@@ -40,7 +40,7 @@ jobs:
 
             - name: Build PlayStore AAB
               run: |
-                  flutter build appbundle --release --flavor playstore
+                  flutter build appbundle --dart-define=cronetHttpNoPlay=true --release --flavor playstore
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_photos_key.jks"
                   SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS_PHOTOS }}
diff --git a/.github/workflows/mobile-release.yml b/.github/workflows/mobile-release.yml
index ecf2c6d769..8997f0afbc 100644
--- a/.github/workflows/mobile-release.yml
+++ b/.github/workflows/mobile-release.yml
@@ -45,7 +45,7 @@ jobs:
 
             - name: Build independent APK
               run: |
-                flutter build apk --release --flavor independent
+                flutter build apk --dart-define=cronetHttpNoPlay=true --release --flavor independent
                 mv build/app/outputs/flutter-apk/app-independent-release.apk build/app/outputs/flutter-apk/ente-${{ github.ref_name }}.apk
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_photos_key.jks"
diff --git a/auth/assets/custom-icons/_data/custom-icons.json b/auth/assets/custom-icons/_data/custom-icons.json
index 684399cf4a..702c0dcd9e 100644
--- a/auth/assets/custom-icons/_data/custom-icons.json
+++ b/auth/assets/custom-icons/_data/custom-icons.json
@@ -21,6 +21,11 @@
       "title": "airtm",
       "hex": "000000"
     },
+    {
+      "title": "AJ Bell",
+      "slug": "aj_bell",
+      "hex": "c41230"
+    },
     {
       "title": "aliyun",
       "altNames": [
diff --git a/auth/assets/custom-icons/icons/aj_bell.svg b/auth/assets/custom-icons/icons/aj_bell.svg
new file mode 100644
index 0000000000..f8787b5b24
--- /dev/null
+++ b/auth/assets/custom-icons/icons/aj_bell.svg
@@ -0,0 +1,7 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1507 1556" width="1507" height="1556">
+	<title>logo_grey-svg</title>
+	<style>
+		.s0 { fill: #c41230 } 
+	</style>
+	<path id="Layer" class="s0" d="m759.6 651c10.6 63.6 7.5 126.3-6.8 185.3-0.6-3.5-0.8-7-1.5-10.6-51.7-311.8-346.3-522.7-657.7-470.8-32.4 5.3-63.6 13.5-93.6 23.9 62.4-54.7 140.3-93.4 228.3-108.1 251.6-41.9 489.5 128.4 531.3 380.3zm84.2 340c-48.7 59.8-107.3 106.4-171.5 140 2.8-3.3 5.7-6.4 8.4-9.7 238.7-292.4 195.6-723.2-96.4-962.3-30.4-24.8-62.2-46.4-95.3-65.2 98.4 12.9 194.5 52.4 276.9 119.9 236 193.2 270.9 541.2 77.9 777.3zm409.3-532.7c66.8 402.8-204.2 783.4-605.6 852.1 313.4-230.6 489-625.2 420.9-1035.7-16.2-97.3-45.1-189.3-84.7-274.7 138.4 110.2 238.1 269.9 269.4 458.3zm241.5 84.5c78.6 473.9-241.4 921.9-714.8 1000.6-195.5 32.6-386.6-3.2-549.2-89.5 98.5 11.2 200.2 9.2 302.8-7.9 537.8-89.4 917.1-559.8 908.4-1089.5 23.9 58.8 41.9 121 52.8 186.3z"/>
+</svg>
\ No newline at end of file
diff --git a/auth/lib/l10n/arb/app_ar.arb b/auth/lib/l10n/arb/app_ar.arb
index ea45ddd788..d2a3985d20 100644
--- a/auth/lib/l10n/arb/app_ar.arb
+++ b/auth/lib/l10n/arb/app_ar.arb
@@ -48,6 +48,7 @@
   "nextTotpTitle": "التالي",
   "deleteCodeTitle": "حذف الرمز؟",
   "deleteCodeMessage": "هل أنت متأكد من أنك تريد حذف هذه الشيفرة؟ هذا الإجراء لا رجعة فيه.",
+  "trash": "سلة المهملات",
   "viewLogsAction": "عرض السجلات",
   "sendLogsDescription": "سوف يُرسل هذا السجلات لنا لمساعدتنا على تصحيح مشكلتك. بينما نتخذ الاحتياطات لضمان عدم تسجيل المعلومات الحساسة، نشجعك على رؤية هذه السجلات قبل مشاركتها.",
   "preparingLogsTitle": "جارٍ إعداد السجلات...",
@@ -197,6 +198,8 @@
   "enterDetailsManually": "أدخل التفاصيل يدوياً",
   "edit": "تعديل",
   "share": "مشاركة",
+  "shareCodes": "شارك الرموز",
+  "restore": "استعادة",
   "copiedToClipboard": "تم النسخ إلى الحافظة",
   "copiedNextToClipboard": "تم نسخ الرموز التالية إلى الحافظة",
   "error": "خطأ",
@@ -248,6 +251,10 @@
   "areYouSureYouWantToLogout": "هل أنت متأكد من أنك تريد تسجيل الخروج؟",
   "yesLogout": "نعم، تسجيل الخروج",
   "exit": "خروج",
+  "theme": "السمة",
+  "lightTheme": "فاتح",
+  "darkTheme": "داكن",
+  "systemTheme": "النظام",
   "verifyingRecoveryKey": "التحقق من مفتاح الاسترداد...",
   "recoveryKeyVerified": "تم التحقق من مفتاح الاسترداد",
   "recoveryKeySuccessBody": "رائع! مفتاح الاسترداد الخاص بك صالح. شكرا لك على التحقق.\n\nيرجى تذكر الاحتفاظ بنسخة احتياطية من مفتاح الاسترداد بشكل آمن.",
@@ -318,6 +325,9 @@
       }
     }
   },
+  "manualSort": "مخصّص",
+  "mostFrequentlyUsed": "مستخدم بكثرة",
+  "mostRecentlyUsed": "مستخدمة مؤخراً",
   "activeSessions": "الجلسات النشطة",
   "somethingWentWrongPleaseTryAgain": "حدث خطأ ما، يرجى المحاولة مرة أخرى",
   "thisWillLogYouOutOfThisDevice": "سيؤدي هذا إلى تسجيل خروجك من هذا الجهاز!",
@@ -350,6 +360,7 @@
   "sigInBackupReminder": "يرجى تصدير الرموز الخاصة بك للتأكد من أن لديك نسخة احتياطية يمكنك استعادتها منها.",
   "offlineModeWarning": "لقد اخترت المضي قدما بدون نسخ احتياطية. يرجى أخذ نسخ احتياطية يدوية للتأكد من سلامة الرموز الخاصة بك.",
   "showLargeIcons": "إظهار أيقونات كبيرة",
+  "compactMode": "الوضع المضغوط",
   "shouldHideCode": "إخفاء الرموز",
   "doubleTapToViewHiddenCode": "يمكنك النقر مرتين على أي عنصر لعرض الرمز",
   "focusOnSearchBar": "التركيز على البحث عند بدء التطبيق",
@@ -468,5 +479,11 @@
   "pinLock": "قفل رقم التعريف الشخصي",
   "enterPin": "أدخل رقم التعريف الشخصي",
   "setNewPin": "عين رقم تعريف شخصي جديد",
-  "importFailureDescNew": "تعذر إعراب الملف المنتقى."
+  "importFailureDescNew": "تعذر إعراب الملف المنتقى.",
+  "duplicateCodes": "رموز مكررة",
+  "noDuplicates": "✨ لا تكرارات",
+  "youveNoDuplicateCodesThatCanBeCleared": "ليس لديك رموز مكررة يمكن مسحها",
+  "deselectAll": "ألغِ تحديد الكل",
+  "selectAll": "حدد الكل",
+  "deleteDuplicates": "احذف التكرار"
 }
\ No newline at end of file
diff --git a/auth/lib/l10n/arb/app_hi.arb b/auth/lib/l10n/arb/app_hi.arb
index 7f393a2ca1..6f311b95d5 100644
--- a/auth/lib/l10n/arb/app_hi.arb
+++ b/auth/lib/l10n/arb/app_hi.arb
@@ -8,13 +8,13 @@
   },
   "onBoardingGetStarted": "प्रारंभ करें",
   "setupFirstAccount": "अपना पहला अकाउंट सेटअप करें",
-  "importScanQrCode": "QR कोड स्कैन करें",
+  "importScanQrCode": "एक QR कोड स्कैन करें",
   "qrCode": "QR कोड",
   "importEnterSetupKey": "",
   "importAccountPageTitle": "अकाउंट विवरण डालें",
   "incorrectDetails": "ग़लत विवरण",
   "pleaseVerifyDetails": "कृपया विवरण सत्यापित करें और पुनः प्रयास करें",
-  "codeIssuerHint": "जारीकर्ता",
+  "codeIssuerHint": "ज़ारीकर्ता",
   "codeSecretKeyHint": "सीक्रेट कुंजी",
   "secret": "सीक्रेट",
   "all": "सभी",
@@ -39,6 +39,10 @@
   "pleaseLoginAgain": "कृपया फिर से लॉगिन करें",
   "loggingOut": "लॉग आउट हो रहा है...",
   "saveAction": "सेव करें",
+  "deleteCodeMessage": "क्या आप वाकई इस कोड को हटाना चाहते हैं? इस क्रिया को वापस नहीं किया जा सकता",
+  "trashCode": "?",
+  "trashCodeMessage": "क्या आप वाकई {account} के लिए कोड नष्ट करना चाहते हैं?",
+  "trash": "नष्ट करें",
   "viewLogsAction": "लॉग देखें",
   "preparingLogsTitle": "लॉग तैयार किये जा रहे हैं...",
   "emailLogsTitle": "लॉग ईमेल करें",
@@ -50,6 +54,7 @@
       }
     }
   },
+  "copyEmailAction": "ईमेल कॉपी करें",
   "exportLogsAction": "लॉग एक्सपोर्ट करें",
   "reportABug": "बग रिपोर्ट करें",
   "reportBug": "बग रिपोर्ट करें",
@@ -79,5 +84,24 @@
   "cancel": "रद्द करें",
   "yes": "हाँ",
   "no": "नहीं",
-  "settings": "सेटिंग"
+  "settings": "सेटिंग",
+  "pleaseTryAgain": "कृपया पुन: प्रयास करें",
+  "newUser": "एंटे में नए उपयोगकर्ता",
+  "delete": "हटाएं",
+  "enterYourPasswordHint": "अपना पासवर्ड दर्ज करें",
+  "forgotPassword": "पासवर्ड भूल गए",
+  "oops": "ओह",
+  "suggestFeatures": "विशेषताएं सुझाएं",
+  "faq": "अक्सर किये गए सवाल",
+  "somethingWentWrongMessage": "कुछ गड़बड़ हुई है, कृपया दोबारा प्रयास करें",
+  "leaveFamily": "परिवार छोड़ें",
+  "leaveFamilyMessage": "क्या आप सच में परिवार प्लान छोड़ना चाहते हैं?",
+  "inFamilyPlanMessage": "आप परिवार प्लान पर हैं!",
+  "hintForMobile": "कोड को संपादित करने या हटाने के लिए उसे लंबी देर तक दबाए।",
+  "hintForDesktop": "कोड को संपादित करने या हटाने के लिए उस पर राइट क्लिक करें।",
+  "scan": "स्कैन करें",
+  "scanACode": "कोड स्कैन करें",
+  "verify": "सत्यापित करें",
+  "verifyEmail": "ईमेल सत्यापित करें",
+  "twoFactorAuthTitle": "दो-चरणीय प्रमाणीकरण |"
 }
\ No newline at end of file
diff --git a/auth/lib/l10n/arb/app_tr.arb b/auth/lib/l10n/arb/app_tr.arb
index 6be05c7d77..965689a53d 100644
--- a/auth/lib/l10n/arb/app_tr.arb
+++ b/auth/lib/l10n/arb/app_tr.arb
@@ -88,6 +88,8 @@
   "useRecoveryKey": "Kurtarma anahtarını kullan",
   "incorrectPasswordTitle": "Yanlış şifre",
   "welcomeBack": "Tekrar hoş geldiniz!",
+  "emailAlreadyRegistered": "E-posta zaten kayıtlı.",
+  "emailNotRegistered": "E-posta kayıtlı değil.",
   "madeWithLoveAtPrefix": "❤️ ile şurada yapılmıştır ",
   "supportDevs": "Bu projeyi desteklemek için <bold-green>ente</bold-green> kanalına abone olun",
   "supportDiscount": "İlk yılda %10 indirim için \"AUTH\" kupon kodunu kullanın",
@@ -333,6 +335,7 @@
     }
   },
   "manualSort": "Özel",
+  "editOrder": "Sıralamayı düzenle",
   "mostFrequentlyUsed": "Sık kullanılan",
   "mostRecentlyUsed": "Son kullanılan",
   "activeSessions": "Aktif oturumlar",
@@ -501,5 +504,6 @@
   "deselectAll": "Tümünün seçimini kaldır",
   "selectAll": "Tümünü seç",
   "deleteDuplicates": "Yinelenenleri sil",
-  "plainHTML": "Sade HTML"
+  "plainHTML": "Sade HTML",
+  "supportEnte": "<bold-Green>Ente</bold-Green>'yi destekle"
 }
\ No newline at end of file
diff --git a/desktop/CHANGELOG.md b/desktop/CHANGELOG.md
index aa647dd8e6..4d7450cec9 100644
--- a/desktop/CHANGELOG.md
+++ b/desktop/CHANGELOG.md
@@ -1,11 +1,14 @@
 # CHANGELOG
 
-## v1.7.9 (Unreleased)
+## v1.7.10 (Unreleased)
+
+- .
+
+## v1.7.9
 
 - Light mode.
 - Faster and more stable thumbnail generation.
 - Support `.supplemental-metadata` JSON files in Google Takeout.
-- .
 
 ## v1.7.8
 
diff --git a/desktop/package.json b/desktop/package.json
index e4f5104f31..ccf8eff772 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ente",
-    "version": "1.7.9-beta",
+    "version": "1.7.10-beta",
     "private": true,
     "description": "Desktop client for Ente Photos",
     "repository": "github:ente-io/photos-desktop",
@@ -49,7 +49,7 @@
         "ajv": "^8.17.1",
         "concurrently": "^9.1.2",
         "cross-env": "^7.0.3",
-        "electron": "^34.0.2",
+        "electron": "^34.1.1",
         "electron-builder": "^26.0.0",
         "eslint": "^9",
         "prettier": "3.4.2",
diff --git a/desktop/src/main.ts b/desktop/src/main.ts
index 3ea105ef8b..8aa32169b1 100644
--- a/desktop/src/main.ts
+++ b/desktop/src/main.ts
@@ -152,7 +152,7 @@ const main = () => {
             void mainWindow.loadURL(rendererURL);
 
             // Continue on with the rest of the startup sequence.
-            Menu.setApplicationMenu(await createApplicationMenu(mainWindow));
+            Menu.setApplicationMenu(createApplicationMenu(mainWindow));
             setupTrayItem(mainWindow);
             setupAutoUpdater(mainWindow);
 
@@ -326,8 +326,6 @@ const attachProcessHandlers = () => {
  */
 const waitForRendererDevServer = () => wait(1000);
 
-const wipDesktopCustomTitlebar = process.env.ENTE_WIP_TITLEBAR == "1";
-
 /**
  * Create an return the {@link BrowserWindow} that will form our app's UI.
  *
@@ -364,12 +362,8 @@ const createMainWindow = () => {
         // do it (Step 2) unconditionally (i.e., on macOS too).
         //
         // https://www.electronjs.org/docs/latest/tutorial/custom-title-bar#create-a-custom-title-bar
-        ...(wipDesktopCustomTitlebar
-            ? {
-                  titleBarStyle: "hidden",
-                  titleBarOverlay: true,
-              }
-            : {}),
+        titleBarStyle: "hidden",
+        titleBarOverlay: true,
         // The color to show in the window until the web content gets loaded.
         // https://www.electronjs.org/docs/latest/api/browser-window#setting-the-backgroundcolor-property
         //
diff --git a/desktop/src/main/ipc.ts b/desktop/src/main/ipc.ts
index cca4f0a0ff..ff98e2ec88 100644
--- a/desktop/src/main/ipc.ts
+++ b/desktop/src/main/ipc.ts
@@ -24,6 +24,7 @@ import {
     updateAndRestart,
     updateOnNextRestart,
 } from "./services/app-update";
+import autoLauncher from "./services/auto-launcher";
 import {
     openDirectory,
     openLogDirectory,
@@ -117,6 +118,10 @@ export const attachIPCHandlers = () => {
         setLastShownChangelogVersion(version),
     );
 
+    ipcMain.handle("isAutoLaunchEnabled", () => autoLauncher.isEnabled());
+
+    ipcMain.handle("toggleAutoLaunch", () => autoLauncher.toggleAutoLaunch());
+
     // - App update
 
     ipcMain.on("updateAndRestart", () => updateAndRestart());
diff --git a/desktop/src/main/menu.ts b/desktop/src/main/menu.ts
index 188b195f82..d402da1516 100644
--- a/desktop/src/main/menu.ts
+++ b/desktop/src/main/menu.ts
@@ -7,17 +7,14 @@ import {
 } from "electron";
 import { allowWindowClose } from "../main";
 import { forceCheckForAppUpdates } from "./services/app-update";
-import autoLauncher from "./services/auto-launcher";
-import { openLogDirectory } from "./services/dir";
 import { userPreferences } from "./stores/user-preferences";
 
 /** Create and return the entries in the app's main menu bar */
-export const createApplicationMenu = async (mainWindow: BrowserWindow) => {
+export const createApplicationMenu = (mainWindow: BrowserWindow) => {
     // The state of checkboxes
     //
     // Whenever the menu is redrawn the current value of these variables is used
     // to set the checked state for the various settings checkboxes.
-    let isAutoLaunchEnabled = await autoLauncher.isEnabled();
     let shouldHideDockIcon = !!userPreferences.get("hideDockIcon");
 
     const macOSOnly = (options: MenuItemConstructorOptions[]) =>
@@ -25,16 +22,6 @@ export const createApplicationMenu = async (mainWindow: BrowserWindow) => {
 
     const handleCheckForUpdates = () => forceCheckForAppUpdates(mainWindow);
 
-    const handleViewChangelog = () =>
-        void shell.openExternal(
-            "https://github.com/ente-io/ente/blob/main/desktop/CHANGELOG.md",
-        );
-
-    const toggleAutoLaunch = () => {
-        void autoLauncher.toggleAutoLaunch();
-        isAutoLaunchEnabled = !isAutoLaunchEnabled;
-    };
-
     const toggleHideDockIcon = () => {
         // Persist
         userPreferences.set("hideDockIcon", !shouldHideDockIcon);
@@ -45,13 +32,6 @@ export const createApplicationMenu = async (mainWindow: BrowserWindow) => {
     const handleHelp = () =>
         void shell.openExternal("https://help.ente.io/photos/");
 
-    const handleSupport = () =>
-        void shell.openExternal("mailto:support@ente.io");
-
-    const handleBlog = () => void shell.openExternal("https://ente.io/blog/");
-
-    const handleViewLogs = () => void openLogDirectory();
-
     return Menu.buildFromTemplate([
         {
             label: "Ente Photos",
@@ -67,31 +47,21 @@ export const createApplicationMenu = async (mainWindow: BrowserWindow) => {
                     label: "Check for Updates...",
                     click: handleCheckForUpdates,
                 },
-                {
-                    label: "View Changelog",
-                    click: handleViewChangelog,
-                },
                 { type: "separator" },
 
-                {
-                    label: "Preferences",
-                    submenu: [
-                        {
-                            label: "Open Ente on Startup",
-                            type: "checkbox",
-                            checked: isAutoLaunchEnabled,
-                            click: toggleAutoLaunch,
-                        },
-                        ...macOSOnly([
+                ...macOSOnly([
+                    {
+                        label: "Preferences",
+                        submenu: [
                             {
                                 label: "Hide Dock Icon",
                                 type: "checkbox",
                                 checked: shouldHideDockIcon,
                                 click: toggleHideDockIcon,
                             },
-                        ]),
-                    ],
-                },
+                        ],
+                    },
+                ]),
 
                 { type: "separator" },
                 ...macOSOnly([
@@ -169,20 +139,6 @@ export const createApplicationMenu = async (mainWindow: BrowserWindow) => {
                     label: "Ente Help",
                     click: handleHelp,
                 },
-                { type: "separator" },
-                {
-                    label: "Support",
-                    click: handleSupport,
-                },
-                {
-                    label: "Product Updates",
-                    click: handleBlog,
-                },
-                { type: "separator" },
-                {
-                    label: "View Logs",
-                    click: handleViewLogs,
-                },
             ],
         },
     ]);
@@ -194,7 +150,6 @@ export const createApplicationMenu = async (mainWindow: BrowserWindow) => {
  */
 export const createTrayContextMenu = (mainWindow: BrowserWindow) => {
     const handleOpen = () => {
-        mainWindow.maximize();
         mainWindow.show();
     };
 
diff --git a/desktop/src/preload.ts b/desktop/src/preload.ts
index 131ea0b574..cb9d594511 100644
--- a/desktop/src/preload.ts
+++ b/desktop/src/preload.ts
@@ -122,6 +122,10 @@ const lastShownChangelogVersion = () =>
 const setLastShownChangelogVersion = (version: number) =>
     ipcRenderer.invoke("setLastShownChangelogVersion", version);
 
+const isAutoLaunchEnabled = () => ipcRenderer.invoke("isAutoLaunchEnabled");
+
+const toggleAutoLaunch = () => ipcRenderer.invoke("toggleAutoLaunch");
+
 const onMainWindowFocus = (cb: (() => void) | undefined) => {
     ipcRenderer.removeAllListeners("mainWindowFocus");
     if (cb) ipcRenderer.on("mainWindowFocus", cb);
@@ -347,6 +351,8 @@ contextBridge.exposeInMainWorld("electron", {
     saveMasterKeyB64,
     lastShownChangelogVersion,
     setLastShownChangelogVersion,
+    isAutoLaunchEnabled,
+    toggleAutoLaunch,
     onMainWindowFocus,
     onOpenEnteURL,
 
diff --git a/desktop/yarn.lock b/desktop/yarn.lock
index b5b9a62e63..491fa2261e 100644
--- a/desktop/yarn.lock
+++ b/desktop/yarn.lock
@@ -1289,10 +1289,10 @@ electron-updater@^6.4.0:
     semver "^7.6.3"
     tiny-typed-emitter "^2.1.0"
 
-electron@^34.0.2:
-  version "34.0.2"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-34.0.2.tgz#84432ab1efa165e260ce943c472879228b620573"
-  integrity sha512-u3F+DSUlg9NaGS+9qnYmSRN8VjAnc3LJDDk1ye1uISJnh4gjG76y3681qLowsPMx4obvCP2eBINnmbLo0yT5WA==
+electron@^34.1.1:
+  version "34.1.1"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-34.1.1.tgz#1fc766e406401834fedb9747c4ca58671d9a1e46"
+  integrity sha512-1aDYk9Gsv1/fFeClMrxWGoVMl7uCUgl1pe26BiTnLXmAoqEXCa3f3sCKFWV+cuDzUjQGAZcpkWhGYTgWUSQrLA==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^20.9.0"
diff --git a/docs/docs/photos/troubleshooting/sharing-logs.md b/docs/docs/photos/troubleshooting/sharing-logs.md
index cd9417fac3..0de78748a4 100644
--- a/docs/docs/photos/troubleshooting/sharing-logs.md
+++ b/docs/docs/photos/troubleshooting/sharing-logs.md
@@ -20,21 +20,14 @@ the logs just make the process a bit faster and easier.
 - Select for the option to _Report a Bug_.
 - Tap on _Report a bug_.
 
-## Desktop
-
-- Click on _Help_ menu at the top of your screen, and select the _View logs_
-  option.
-- Open settings (click on the three horizontal lines button located at the top
-  left corner of the screen).
-- Click on _Support_. This will open your email client where you can attach the
-  logs in the email and describe the issue.
-
-## Web
+## Desktop and Web
 
 - Open settings (click on the three horizontal lines button located at the top
   left corner of the screen).
-- Click on _Debug Logs_ towards the bottom of settings.
-- Click on _Download logs_
+- Click on the _Help_ option towards the bottom of settings.
+- Click on _View logs_. This will show you the location of the logs on your
+  system (desktop), or download them from the browser onto your computer (web).
+- Go back to settings.
 - Click on _Support_. This will open your email client where you can attach the
   logs in the email and describe the issue.
 
diff --git a/infra/staff/src/components/UpdateSubscription.tsx b/infra/staff/src/components/UpdateSubscription.tsx
index 9a640646be..b1bf7dfea1 100644
--- a/infra/staff/src/components/UpdateSubscription.tsx
+++ b/infra/staff/src/components/UpdateSubscription.tsx
@@ -22,6 +22,10 @@ interface Subscription {
     originalTransactionID: string;
     expiryTime: number;
     userID: string;
+    attributes: {
+        customerID: string;
+        stripeAccountCountry: string;
+    };
 }
 
 interface UserDataResponse {
@@ -40,6 +44,10 @@ interface FormValues {
     transactionId: string;
     expiryTime: string | Date | null;
     userId: string;
+    attributes: {
+        customerID: string;
+        stripeAccountCountry: string;
+    };
 }
 
 const UpdateSubscription: React.FC<UpdateSubscriptionProps> = ({
@@ -53,6 +61,10 @@ const UpdateSubscription: React.FC<UpdateSubscriptionProps> = ({
         transactionId: "",
         expiryTime: "",
         userId: "",
+        attributes: {
+            "customerID": "",
+            "stripeAccountCountry": ""
+        },
     });
 
     const [isDatePickerOpen, setIsDatePickerOpen] = useState(false);
@@ -95,6 +107,10 @@ const UpdateSubscription: React.FC<UpdateSubscriptionProps> = ({
                         "",
                     expiryTime: expiryTime,
                     userId: userDataResponse.subscription.userID || "",
+                    attributes: {
+                        customerID: userDataResponse.subscription.attributes.customerID || "",
+                        stripeAccountCountry: userDataResponse.subscription.attributes.stripeAccountCountry || ""
+                    }
                 });
             } catch (error) {
                 console.error("Error fetching data:", error);
@@ -156,6 +172,10 @@ const UpdateSubscription: React.FC<UpdateSubscriptionProps> = ({
                 productId: values.productId,
                 paymentProvider: values.provider,
                 transactionId: values.transactionId,
+                attributes: {
+                    customerID: values.attributes.customerID,
+                    stripeAccountCountry: values.attributes.stripeAccountCountry
+                }
             };
 
             try {
diff --git a/mobile/android/app/proguard-rules.pro b/mobile/android/app/proguard-rules.pro
index f35c179f30..066c0d1874 100644
--- a/mobile/android/app/proguard-rules.pro
+++ b/mobile/android/app/proguard-rules.pro
@@ -2,3 +2,5 @@
 # To ensure that stack traces is unambiguous
 # https://developer.android.com/studio/build/shrink-code#decode-stack-trace
 -keepattributes LineNumberTable,SourceFile
+
+-keep class org.chromium.net.** { *; }
diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index 87a17625ce..6769a1fcc8 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -6,6 +6,9 @@ PODS:
   - connectivity_plus (0.0.1):
     - Flutter
     - FlutterMacOS
+  - cupertino_http (0.0.1):
+    - Flutter
+    - FlutterMacOS
   - dart_ui_isolate (0.0.1):
     - Flutter
   - device_info_plus (0.0.1):
@@ -19,31 +22,31 @@ PODS:
     - Flutter
   - file_saver (0.0.1):
     - Flutter
-  - Firebase/CoreOnly (11.6.0):
-    - FirebaseCore (~> 11.6.0)
-  - Firebase/Messaging (11.6.0):
+  - Firebase/CoreOnly (11.2.0):
+    - FirebaseCore (= 11.2.0)
+  - Firebase/Messaging (11.2.0):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 11.6.0)
-  - firebase_core (3.10.0):
-    - Firebase/CoreOnly (= 11.6.0)
+    - FirebaseMessaging (~> 11.2.0)
+  - firebase_core (3.6.0):
+    - Firebase/CoreOnly (= 11.2.0)
     - Flutter
-  - firebase_messaging (15.2.0):
-    - Firebase/Messaging (= 11.6.0)
+  - firebase_messaging (15.1.3):
+    - Firebase/Messaging (= 11.2.0)
     - firebase_core
     - Flutter
-  - FirebaseCore (11.6.0):
-    - FirebaseCoreInternal (~> 11.6.0)
+  - FirebaseCore (11.2.0):
+    - FirebaseCoreInternal (~> 11.0)
     - GoogleUtilities/Environment (~> 8.0)
     - GoogleUtilities/Logger (~> 8.0)
   - FirebaseCoreInternal (11.6.0):
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
-  - FirebaseInstallations (11.6.0):
-    - FirebaseCore (~> 11.6.0)
+  - FirebaseInstallations (11.4.0):
+    - FirebaseCore (~> 11.0)
     - GoogleUtilities/Environment (~> 8.0)
     - GoogleUtilities/UserDefaults (~> 8.0)
     - PromisesObjC (~> 2.4)
-  - FirebaseMessaging (11.6.0):
-    - FirebaseCore (~> 11.6.0)
+  - FirebaseMessaging (11.2.0):
+    - FirebaseCore (~> 11.0)
     - FirebaseInstallations (~> 11.0)
     - GoogleDataTransport (~> 10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
@@ -68,7 +71,7 @@ PODS:
     - OrderedSet (~> 6.0.3)
   - flutter_local_notifications (0.0.1):
     - Flutter
-  - flutter_native_splash (2.4.3):
+  - flutter_native_splash (0.0.1):
     - Flutter
   - flutter_secure_storage (6.0.0):
     - Flutter
@@ -158,6 +161,8 @@ PODS:
   - nanopb/encode (3.30910.0)
   - native_video_player (1.0.0):
     - Flutter
+  - objective_c (0.0.1):
+    - Flutter
   - onnxruntime (0.0.1):
     - Flutter
     - onnxruntime-objc (= 1.18.0)
@@ -182,7 +187,7 @@ PODS:
   - privacy_screen (0.0.1):
     - Flutter
   - PromisesObjC (2.4.0)
-  - receive_sharing_intent (1.8.1):
+  - receive_sharing_intent (1.8.0):
     - Flutter
   - screen_brightness_ios (0.1.0):
     - Flutter
@@ -192,11 +197,11 @@ PODS:
   - SDWebImageWebPCoder (0.14.6):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.17)
-  - Sentry/HybridSDK (8.42.0)
-  - sentry_flutter (8.12.0):
+  - Sentry/HybridSDK (8.36.0)
+  - sentry_flutter (8.9.0):
     - Flutter
     - FlutterMacOS
-    - Sentry/HybridSDK (= 8.42.0)
+    - Sentry/HybridSDK (= 8.36.0)
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
@@ -205,21 +210,20 @@ PODS:
   - sqflite_darwin (0.0.4):
     - Flutter
     - FlutterMacOS
-  - sqlite3 (3.47.2):
-    - sqlite3/common (= 3.47.2)
-  - sqlite3/common (3.47.2)
-  - sqlite3/dbstatvtab (3.47.2):
+  - "sqlite3 (3.46.1+1)":
+    - "sqlite3/common (= 3.46.1+1)"
+  - "sqlite3/common (3.46.1+1)"
+  - "sqlite3/dbstatvtab (3.46.1+1)":
     - sqlite3/common
-  - sqlite3/fts5 (3.47.2):
+  - "sqlite3/fts5 (3.46.1+1)":
     - sqlite3/common
-  - sqlite3/perf-threadsafe (3.47.2):
+  - "sqlite3/perf-threadsafe (3.46.1+1)":
     - sqlite3/common
-  - sqlite3/rtree (3.47.2):
+  - "sqlite3/rtree (3.46.1+1)":
     - sqlite3/common
   - sqlite3_flutter_libs (0.0.1):
     - Flutter
-    - FlutterMacOS
-    - sqlite3 (~> 3.47.2)
+    - "sqlite3 (~> 3.46.0+1)"
     - sqlite3/dbstatvtab
     - sqlite3/fts5
     - sqlite3/perf-threadsafe
@@ -227,7 +231,7 @@ PODS:
   - system_info_plus (0.0.1):
     - Flutter
   - Toast (4.1.1)
-  - ua_client_hints (1.4.1):
+  - ua_client_hints (1.4.0):
     - Flutter
   - uni_links (0.0.1):
     - Flutter
@@ -248,6 +252,7 @@ DEPENDENCIES:
   - background_fetch (from `.symlinks/plugins/background_fetch/ios`)
   - battery_info (from `.symlinks/plugins/battery_info/ios`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`)
+  - cupertino_http (from `.symlinks/plugins/cupertino_http/darwin`)
   - dart_ui_isolate (from `.symlinks/plugins/dart_ui_isolate/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - ffmpeg_kit_flutter_full_gpl (from `.symlinks/plugins/ffmpeg_kit_flutter_full_gpl/ios`)
@@ -279,6 +284,7 @@ DEPENDENCIES:
   - motionphoto (from `.symlinks/plugins/motionphoto/ios`)
   - move_to_background (from `.symlinks/plugins/move_to_background/ios`)
   - native_video_player (from `.symlinks/plugins/native_video_player/ios`)
+  - objective_c (from `.symlinks/plugins/objective_c/ios`)
   - onnxruntime (from `.symlinks/plugins/onnxruntime/ios`)
   - open_mail_app (from `.symlinks/plugins/open_mail_app/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
@@ -292,7 +298,7 @@ DEPENDENCIES:
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
-  - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/darwin`)
+  - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/ios`)
   - system_info_plus (from `.symlinks/plugins/system_info_plus/ios`)
   - ua_client_hints (from `.symlinks/plugins/ua_client_hints/ios`)
   - uni_links (from `.symlinks/plugins/uni_links/ios`)
@@ -332,6 +338,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/battery_info/ios"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/darwin"
+  cupertino_http:
+    :path: ".symlinks/plugins/cupertino_http/darwin"
   dart_ui_isolate:
     :path: ".symlinks/plugins/dart_ui_isolate/ios"
   device_info_plus:
@@ -394,6 +402,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/move_to_background/ios"
   native_video_player:
     :path: ".symlinks/plugins/native_video_player/ios"
+  objective_c:
+    :path: ".symlinks/plugins/objective_c/ios"
   onnxruntime:
     :path: ".symlinks/plugins/onnxruntime/ios"
   open_mail_app:
@@ -421,7 +431,7 @@ EXTERNAL SOURCES:
   sqflite_darwin:
     :path: ".symlinks/plugins/sqflite_darwin/darwin"
   sqlite3_flutter_libs:
-    :path: ".symlinks/plugins/sqlite3_flutter_libs/darwin"
+    :path: ".symlinks/plugins/sqlite3_flutter_libs/ios"
   system_info_plus:
     :path: ".symlinks/plugins/system_info_plus/ios"
   ua_client_hints:
@@ -442,25 +452,26 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   background_fetch: 39f11371c0dce04b001c4bfd5e782bcccb0a85e2
   battery_info: 09f5c9ee65394f2291c8c6227bedff345b8a730c
-  connectivity_plus: 18382e7311ba19efcaee94442b23b32507b20695
+  connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
+  cupertino_http: 947a233f40cfea55167a49f2facc18434ea117ba
   dart_ui_isolate: d5bcda83ca4b04f129d70eb90110b7a567aece14
   device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   ffmpeg-kit-ios-full-gpl: 80adc341962e55ef709e36baa8ed9a70cf4ea62b
   ffmpeg_kit_flutter_full_gpl: 8d15c14c0c3aba616fac04fe44b3d27d02e3c330
   file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
-  Firebase: 374a441a91ead896215703a674d58cdb3e9d772b
-  firebase_core: feb37e79f775c2bd08dd35e02d83678291317e10
-  firebase_messaging: e2f0ba891b1509668c07f5099761518a5af8fe3c
-  FirebaseCore: 48b0dd707581cf9c1a1220da68223fb0a562afaa
+  Firebase: 98e6bf5278170668a7983e12971a66b2cd57fc8c
+  firebase_core: 2bedc3136ec7c7b8561c6123ed0239387b53f2af
+  firebase_messaging: 15d114e1a41fc31e4fbabcd48d765a19eec94a38
+  FirebaseCore: a282032ae9295c795714ded2ec9c522fc237f8da
   FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2
-  FirebaseInstallations: efc0946fc756e4d22d8113f7c761948120322e8c
-  FirebaseMessaging: e1aca1fcc23e8b9eddb0e33f375ff90944623021
+  FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414
+  FirebaseMessaging: c9ec7b90c399c7a6100297e9d16f8a27fc7f7152
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
   flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433
   flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
   flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
-  flutter_native_splash: f71420956eb811e6d310720fee915f1d42852e7a
+  flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
   flutter_sodium: c84426b4de738514b5b66cfdeb8a06634e72fe0b
   fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c
@@ -485,6 +496,7 @@ SPEC CHECKSUMS:
   move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
   native_video_player: d12af78a1a4a8cf09775a5177d5b392def6fd23c
+  objective_c: 77e887b5ba1827970907e10e832eec1683f3431d
   onnxruntime: e7c2ae44385191eaad5ae64c935a72debaddc997
   onnxruntime-c: a909204639a1f035f575127ac406f781ac797c9c
   onnxruntime-objc: b6fab0f1787aa6f7190c2013f03037df4718bd8b
@@ -496,20 +508,20 @@ SPEC CHECKSUMS:
   photo_manager: ff695c7a1dd5bc379974953a2b5c0a293f7c4c8a
   privacy_screen: 1a131c052ceb3c3659934b003b0d397c2381a24e
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  receive_sharing_intent: 79c848f5b045674ad60b9fea3bafea59962ad2c1
+  receive_sharing_intent: df9c334dc9feadcbd3266e5cb49c8443405e1c9f
   screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
   SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
-  Sentry: 38ed8bf38eab5812787274bf591e528074c19e02
-  sentry_flutter: 7d1f1df30f3768c411603ed449519bbb90a7d87b
-  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
+  Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
+  sentry_flutter: 0eb93e5279eb41e2392212afe1ccd2fecb4f8cbe
+  share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
-  sqlite3: 7559e33dae4c78538df563795af3a86fc887ee71
-  sqlite3_flutter_libs: 58ae36c0dd086395d066b4fe4de9cdca83e717b3
+  sqflite_darwin: a553b1fd6fe66f53bbb0fe5b4f5bab93f08d7a13
+  sqlite3: 0bb0e6389d824e40296f531b858a2a0b71c0d2fb
+  sqlite3_flutter_libs: c00457ebd31e59fa6bb830380ddba24d44fbcd3b
   system_info_plus: 5393c8da281d899950d751713575fbf91c7709aa
   Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
-  ua_client_hints: aeabd123262c087f0ce151ef96fa3ab77bfc8b38
+  ua_client_hints: 46bb5817a868f9e397c0ba7e3f2f5c5d90c35156
   uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
   video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj
index 65b1ae54d5..de19bf899f 100644
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -292,6 +292,7 @@
 				"${BUILT_PRODUCTS_DIR}/background_fetch/background_fetch.framework",
 				"${BUILT_PRODUCTS_DIR}/battery_info/battery_info.framework",
 				"${BUILT_PRODUCTS_DIR}/connectivity_plus/connectivity_plus.framework",
+				"${BUILT_PRODUCTS_DIR}/cupertino_http/cupertino_http.framework",
 				"${BUILT_PRODUCTS_DIR}/dart_ui_isolate/dart_ui_isolate.framework",
 				"${BUILT_PRODUCTS_DIR}/device_info_plus/device_info_plus.framework",
 				"${BUILT_PRODUCTS_DIR}/file_saver/file_saver.framework",
@@ -321,6 +322,7 @@
 				"${BUILT_PRODUCTS_DIR}/move_to_background/move_to_background.framework",
 				"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
 				"${BUILT_PRODUCTS_DIR}/native_video_player/native_video_player.framework",
+				"${BUILT_PRODUCTS_DIR}/objective_c/objective_c.framework",
 				"${BUILT_PRODUCTS_DIR}/open_mail_app/open_mail_app.framework",
 				"${BUILT_PRODUCTS_DIR}/package_info_plus/package_info_plus.framework",
 				"${BUILT_PRODUCTS_DIR}/path_provider_foundation/path_provider_foundation.framework",
@@ -387,6 +389,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/background_fetch.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/battery_info.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity_plus.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/cupertino_http.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/dart_ui_isolate.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info_plus.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_saver.framework",
@@ -416,6 +419,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/move_to_background.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/native_video_player.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/objective_c.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/open_mail_app.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info_plus.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_foundation.framework",
diff --git a/mobile/lib/core/error-reporting/super_logging.dart b/mobile/lib/core/error-reporting/super_logging.dart
index 7c0bef58be..55e93c5947 100644
--- a/mobile/lib/core/error-reporting/super_logging.dart
+++ b/mobile/lib/core/error-reporting/super_logging.dart
@@ -236,7 +236,7 @@ class SuperLogging {
   }
 
   static _shouldSkipSentry(Object error) {
-    if (error is DioError) {
+    if (error is DioException) {
       return true;
     }
     final bool result = error is StorageLimitExceededError ||
diff --git a/mobile/lib/core/network/network.dart b/mobile/lib/core/network/network.dart
index a55a1a807e..ba2540b401 100644
--- a/mobile/lib/core/network/network.dart
+++ b/mobile/lib/core/network/network.dart
@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:dio/dio.dart';
+import 'package:native_dio_adapter/native_dio_adapter.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import "package:photos/core/configuration.dart";
 import "package:photos/core/event_bus.dart";
@@ -8,18 +9,17 @@ import 'package:photos/core/network/ente_interceptor.dart';
 import "package:photos/events/endpoint_updated_event.dart";
 import "package:ua_client_hints/ua_client_hints.dart";
 
-int kConnectTimeout = 15000;
-
 class NetworkClient {
   late Dio _dio;
   late Dio _enteDio;
+  static const kConnectTimeout = 15;
 
   Future<void> init(PackageInfo packageInfo) async {
     final String ua = await userAgent();
     final endpoint = Configuration.instance.getHttpEndpoint();
     _dio = Dio(
       BaseOptions(
-        connectTimeout: kConnectTimeout,
+        connectTimeout: const Duration(seconds: kConnectTimeout),
         headers: {
           HttpHeaders.userAgentHeader: ua,
           'X-Client-Version': packageInfo.version,
@@ -30,7 +30,7 @@ class NetworkClient {
     _enteDio = Dio(
       BaseOptions(
         baseUrl: endpoint,
-        connectTimeout: kConnectTimeout,
+        connectTimeout: const Duration(seconds: kConnectTimeout),
         headers: {
           HttpHeaders.userAgentHeader: ua,
           'X-Client-Version': packageInfo.version,
@@ -38,6 +38,10 @@ class NetworkClient {
         },
       ),
     );
+
+    _dio.httpClientAdapter = NativeAdapter();
+    _enteDio.httpClientAdapter = NativeAdapter();
+
     _setupInterceptors(endpoint);
 
     Bus.instance.on<EndpointUpdatedEvent>().listen((event) {
diff --git a/mobile/lib/db/files_db.dart b/mobile/lib/db/files_db.dart
index 3baaa06e17..4452f12097 100644
--- a/mobile/lib/db/files_db.dart
+++ b/mobile/lib/db/files_db.dart
@@ -1737,7 +1737,11 @@ class FilesDB {
     final db = await instance.sqliteAsyncDB;
     final results = await db.getAll(
       '''
-      SELECT * FROM $filesTable WHERE $columnFileType = ? AND $columnCreationTime > ? AND $columnUploadedFileID  != -1 
+      SELECT * FROM $filesTable
+      WHERE $columnFileType = ?
+      AND $columnCreationTime > ?
+      AND $columnUploadedFileID  != -1
+      ORDER BY $columnCreationTime DESC
     ''',
       [getInt(fileType), beginDate.microsecondsSinceEpoch],
     );
diff --git a/mobile/lib/gateways/cast_gw.dart b/mobile/lib/gateways/cast_gw.dart
index bc8af897ab..3db3894ad4 100644
--- a/mobile/lib/gateways/cast_gw.dart
+++ b/mobile/lib/gateways/cast_gw.dart
@@ -12,7 +12,7 @@ class CastGateway {
       );
       return response.data["publicKey"];
     } catch (e) {
-      if (e is DioError && e.response != null) {
+      if (e is DioException && e.response != null) {
         if (e.response!.statusCode == 404) {
           return null;
         } else if (e.response!.statusCode == 403) {
diff --git a/mobile/lib/gateways/entity_gw.dart b/mobile/lib/gateways/entity_gw.dart
index a88d31eeb9..0e4b8bb2bc 100644
--- a/mobile/lib/gateways/entity_gw.dart
+++ b/mobile/lib/gateways/entity_gw.dart
@@ -32,7 +32,7 @@ class EntityGateway {
         },
       );
       return EntityKey.fromMap(response.data);
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null && (e.response!.statusCode ?? 0) == 404) {
         throw EntityKeyNotFound();
       } else {
diff --git a/mobile/lib/generated/intl/messages_en.dart b/mobile/lib/generated/intl/messages_en.dart
index a737afaa2d..16f84068f9 100644
--- a/mobile/lib/generated/intl/messages_en.dart
+++ b/mobile/lib/generated/intl/messages_en.dart
@@ -894,6 +894,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "faceRecognition":
             MessageLookupByLibrary.simpleMessage("Face recognition"),
         "faces": MessageLookupByLibrary.simpleMessage("Faces"),
+        "failed": MessageLookupByLibrary.simpleMessage("Failed"),
         "failedToApplyCode":
             MessageLookupByLibrary.simpleMessage("Failed to apply code"),
         "failedToCancel":
@@ -1030,6 +1031,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "indexedItems": MessageLookupByLibrary.simpleMessage("Indexed items"),
         "indexingIsPaused": MessageLookupByLibrary.simpleMessage(
             "Indexing is paused. It will automatically resume when device is ready."),
+        "ineligible": MessageLookupByLibrary.simpleMessage("Ineligible"),
         "info": MessageLookupByLibrary.simpleMessage("Info"),
         "insecureDevice":
             MessageLookupByLibrary.simpleMessage("Insecure device"),
@@ -1363,7 +1365,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "pinAlbum": MessageLookupByLibrary.simpleMessage("Pin album"),
         "pinLock": MessageLookupByLibrary.simpleMessage("PIN lock"),
         "playOnTv": MessageLookupByLibrary.simpleMessage("Play album on TV"),
+        "playOriginal": MessageLookupByLibrary.simpleMessage("Play original"),
         "playStoreFreeTrialValidTill": m52,
+        "playStream": MessageLookupByLibrary.simpleMessage("Play stream"),
         "playstoreSubscription":
             MessageLookupByLibrary.simpleMessage("PlayStore subscription"),
         "pleaseCheckYourInternetConnectionAndTryAgain":
@@ -1410,13 +1414,15 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Private sharing"),
         "proceed": MessageLookupByLibrary.simpleMessage("Proceed"),
         "processed": MessageLookupByLibrary.simpleMessage("Processed"),
+        "processing": MessageLookupByLibrary.simpleMessage("Processing"),
         "processingImport": m55,
         "processingVideos":
-            MessageLookupByLibrary.simpleMessage("Processing Videos"),
+            MessageLookupByLibrary.simpleMessage("Processing videos"),
         "publicLinkCreated":
             MessageLookupByLibrary.simpleMessage("Public link created"),
         "publicLinkEnabled":
             MessageLookupByLibrary.simpleMessage("Public link enabled"),
+        "queued": MessageLookupByLibrary.simpleMessage("Queued"),
         "quickLinks": MessageLookupByLibrary.simpleMessage("Quick links"),
         "radius": MessageLookupByLibrary.simpleMessage("Radius"),
         "raiseTicket": MessageLookupByLibrary.simpleMessage("Raise ticket"),
@@ -1932,7 +1938,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "videoInfo": MessageLookupByLibrary.simpleMessage("Video Info"),
         "videoSmallCase": MessageLookupByLibrary.simpleMessage("video"),
         "videoStreaming":
-            MessageLookupByLibrary.simpleMessage("Video Streaming"),
+            MessageLookupByLibrary.simpleMessage("Video streaming"),
         "videos": MessageLookupByLibrary.simpleMessage("Videos"),
         "viewActiveSessions":
             MessageLookupByLibrary.simpleMessage("View active sessions"),
diff --git a/mobile/lib/generated/l10n.dart b/mobile/lib/generated/l10n.dart
index 0856be15a4..7096abda62 100644
--- a/mobile/lib/generated/l10n.dart
+++ b/mobile/lib/generated/l10n.dart
@@ -11131,20 +11131,20 @@ class S {
     );
   }
 
-  /// `Video Streaming`
+  /// `Video streaming`
   String get videoStreaming {
     return Intl.message(
-      'Video Streaming',
+      'Video streaming',
       name: 'videoStreaming',
       desc: '',
       args: [],
     );
   }
 
-  /// `Processing Videos`
+  /// `Processing videos`
   String get processingVideos {
     return Intl.message(
-      'Processing Videos',
+      'Processing videos',
       name: 'processingVideos',
       desc: '',
       args: [],
@@ -11160,6 +11160,66 @@ class S {
       args: [],
     );
   }
+
+  /// `Processing`
+  String get processing {
+    return Intl.message(
+      'Processing',
+      name: 'processing',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Queued`
+  String get queued {
+    return Intl.message(
+      'Queued',
+      name: 'queued',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Ineligible`
+  String get ineligible {
+    return Intl.message(
+      'Ineligible',
+      name: 'ineligible',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Failed`
+  String get failed {
+    return Intl.message(
+      'Failed',
+      name: 'failed',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Play stream`
+  String get playStream {
+    return Intl.message(
+      'Play stream',
+      name: 'playStream',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Play original`
+  String get playOriginal {
+    return Intl.message(
+      'Play original',
+      name: 'playOriginal',
+      desc: '',
+      args: [],
+    );
+  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<S> {
diff --git a/mobile/lib/l10n/intl_en.arb b/mobile/lib/l10n/intl_en.arb
index 17d7364cf1..46b814c91e 100644
--- a/mobile/lib/l10n/intl_en.arb
+++ b/mobile/lib/l10n/intl_en.arb
@@ -1665,7 +1665,13 @@
   "@linkPersonCaption": {
     "description": "Caption for the 'Link person' title. It should be a continuation of the 'Link person' title. Just like how 'Link person' + 'for better sharing experience' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
   },
-  "videoStreaming": "Video Streaming",
-  "processingVideos": "Processing Videos",
-  "streamDetails": "Stream details"
+  "videoStreaming": "Video streaming",
+  "processingVideos": "Processing videos",
+  "streamDetails": "Stream details",
+  "processing": "Processing",
+  "queued": "Queued",
+  "ineligible": "Ineligible",
+  "failed": "Failed",
+  "playStream": "Play stream",
+  "playOriginal": "Play original"
 }
\ No newline at end of file
diff --git a/mobile/lib/models/file/file.dart b/mobile/lib/models/file/file.dart
index 705d740e82..937bee0cb1 100644
--- a/mobile/lib/models/file/file.dart
+++ b/mobile/lib/models/file/file.dart
@@ -160,7 +160,6 @@ class EnteFile {
 
   Future<Map<String, dynamic>> getMetadataForUpload(
     MediaUploadData mediaUploadData,
-    ParsedExifDateTime? exifTime,
   ) async {
     final asset = await getAsset;
     // asset can be null for files shared to app
@@ -171,24 +170,36 @@ class EnteFile {
       }
     }
     bool hasExifTime = false;
-    if (exifTime != null && exifTime.time != null) {
-      hasExifTime = true;
-      creationTime = exifTime.time!.microsecondsSinceEpoch;
-    }
-    if (mediaUploadData.exifData != null) {
-      mediaUploadData.isPanorama =
-          checkPanoramaFromEXIF(null, mediaUploadData.exifData);
-    }
-    if (mediaUploadData.isPanorama != true &&
-        fileType == FileType.image &&
+    if ((fileType == FileType.image || fileType == FileType.video) &&
         mediaUploadData.sourceFile != null) {
-      try {
-        final xmpData = await getXmp(mediaUploadData.sourceFile!);
-        mediaUploadData.isPanorama = checkPanoramaFromXMP(xmpData);
-      } catch (_) {}
-      mediaUploadData.isPanorama ??= false;
-    }
+      final exifData = await getExifFromSourceFile(mediaUploadData.sourceFile!);
+      if (exifData != null) {
+        if (fileType == FileType.image) {
+          final exifTime = await getCreationTimeFromEXIF(null, exifData);
+          if (exifTime != null) {
+            hasExifTime = true;
+            creationTime = exifTime.microsecondsSinceEpoch;
+          }
+          mediaUploadData.isPanorama = checkPanoramaFromEXIF(null, exifData);
 
+          if (mediaUploadData.isPanorama != true) {
+            try {
+              final xmpData = await getXmp(mediaUploadData.sourceFile!);
+              mediaUploadData.isPanorama = checkPanoramaFromXMP(xmpData);
+            } catch (_) {}
+
+            mediaUploadData.isPanorama ??= false;
+          }
+        }
+        if (Platform.isAndroid) {
+          //Fix for missing location data in lower android versions.
+          final Location? exifLocation = locationFromExif(exifData);
+          if (Location.isValidLocation(exifLocation)) {
+            location = exifLocation;
+          }
+        }
+      }
+    }
     // Try to get the timestamp from fileName. In case of iOS, file names are
     // generic IMG_XXXX, so only parse it on Android devices
     if (!hasExifTime && Platform.isAndroid && title != null) {
diff --git a/mobile/lib/models/metadata/file_magic.dart b/mobile/lib/models/metadata/file_magic.dart
index 02f6188a9d..7599b7c82f 100644
--- a/mobile/lib/models/metadata/file_magic.dart
+++ b/mobile/lib/models/metadata/file_magic.dart
@@ -14,8 +14,6 @@ const latKey = "lat";
 const longKey = "long";
 const motionVideoIndexKey = "mvi";
 const noThumbKey = "noThumb";
-const dateTimeKey = 'dateTime';
-const offsetTimeKey = 'offsetTime';
 
 class MagicMetadata {
   // 0 -> visible
@@ -48,11 +46,6 @@ class PubMagicMetadata {
   double? lat;
   double? long;
 
-  // ISO 8601 datetime without timezone. This contains the date and time of the photo in the original tz
-  // where the photo was taken.
-  String? dateTime;
-  String? offsetTime;
-
   // Motion Video Index. Positive value (>0) indicates that the file is a motion
   // photo
   int? mvi;
@@ -81,8 +74,6 @@ class PubMagicMetadata {
     this.mvi,
     this.noThumb,
     this.mediaType,
-    this.dateTime,
-    this.offsetTime,
   });
 
   factory PubMagicMetadata.fromEncodedJson(String encodedJson) =>
@@ -105,8 +96,6 @@ class PubMagicMetadata {
       mvi: map[motionVideoIndexKey],
       noThumb: map[noThumbKey],
       mediaType: map[mediaTypeKey],
-      dateTime: map[dateTimeKey],
-      offsetTime: map[offsetTimeKey],
     );
   }
 
diff --git a/mobile/lib/module/upload/service/multipart.dart b/mobile/lib/module/upload/service/multipart.dart
index 163f055845..762d26301e 100644
--- a/mobile/lib/module/upload/service/multipart.dart
+++ b/mobile/lib/module/upload/service/multipart.dart
@@ -132,7 +132,7 @@ class MultiPartUploader {
       // upload individual parts and get their etags
       try {
         etags = await _uploadParts(multipartInfo, encryptedFile);
-      } on DioError catch (e) {
+      } on DioException catch (e) {
         if (e.response?.statusCode == 404) {
           _logger.severe(
             "Multipart upload not found for key ${multipartInfo.urls.objectKey}",
@@ -157,7 +157,7 @@ class MultiPartUploader {
           etags,
           multipartInfo.urls.completeURL,
         );
-      } on DioError catch (e) {
+      } on DioException catch (e) {
         if (e.response?.statusCode == 404) {
           _logger.severe(
             "Multipart upload not found for key ${multipartInfo.urls.objectKey}",
diff --git a/mobile/lib/services/billing_service.dart b/mobile/lib/services/billing_service.dart
index b26d4507a3..130a26241d 100644
--- a/mobile/lib/services/billing_service.dart
+++ b/mobile/lib/services/billing_service.dart
@@ -92,7 +92,7 @@ class BillingService {
         },
       );
       return Subscription.fromMap(response.data["subscription"]);
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null && e.response!.statusCode == 409) {
         throw SubscriptionAlreadyClaimedError();
       } else {
@@ -109,7 +109,7 @@ class BillingService {
       final response = await _enteDio.get("/billing/subscription");
       final subscription = Subscription.fromMap(response.data["subscription"]);
       return subscription;
-    } on DioError catch (e, s) {
+    } on DioException catch (e, s) {
       _logger.severe(e, s);
       rethrow;
     }
@@ -121,7 +121,7 @@ class BillingService {
           await _enteDio.post("/billing/stripe/cancel-subscription");
       final subscription = Subscription.fromMap(response.data["subscription"]);
       return subscription;
-    } on DioError catch (e, s) {
+    } on DioException catch (e, s) {
       _logger.severe(e, s);
       rethrow;
     }
@@ -133,7 +133,7 @@ class BillingService {
           await _enteDio.post("/billing/stripe/activate-subscription");
       final subscription = Subscription.fromMap(response.data["subscription"]);
       return subscription;
-    } on DioError catch (e, s) {
+    } on DioException catch (e, s) {
       _logger.severe(e, s);
       rethrow;
     }
@@ -150,7 +150,7 @@ class BillingService {
         },
       );
       return response.data["url"];
-    } on DioError catch (e, s) {
+    } on DioException catch (e, s) {
       _logger.severe(e, s);
       rethrow;
     }
diff --git a/mobile/lib/services/collections_service.dart b/mobile/lib/services/collections_service.dart
index 7c5de3985b..3bac9fe978 100644
--- a/mobile/lib/services/collections_service.dart
+++ b/mobile/lib/services/collections_service.dart
@@ -553,7 +553,7 @@ class CollectionsService {
       unawaited(_db.insert([_collectionIDToCollections[collectionID]!]));
       RemoteSyncService.instance.sync(silently: true).ignore();
       return sharees;
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response?.statusCode == 402) {
         throw SharingNotPermittedForFreeAccountsError();
       }
@@ -641,7 +641,7 @@ class CollectionsService {
       } else {
         await _handleCollectionDeletion(collection);
       }
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null) {
         debugPrint("Error " + e.response!.toString());
       }
@@ -808,7 +808,7 @@ class CollectionsService {
 
       // trigger sync to fetch the latest collection state from server
       sync().ignore();
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null && e.response?.statusCode == 409) {
         _logger.severe('collection magic data out of sync');
         sync().ignore();
@@ -867,7 +867,7 @@ class CollectionsService {
       _cacheLocalPathAndCollection(collection);
       // trigger sync to fetch the latest collection state from server
       sync().ignore();
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null && e.response?.statusCode == 409) {
         _logger.severe('collection magic data out of sync');
         sync().ignore();
@@ -927,7 +927,7 @@ class CollectionsService {
       _cacheLocalPathAndCollection(collection);
       // trigger sync to fetch the latest collection state from server
       sync().ignore();
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null && e.response?.statusCode == 409) {
         _logger.severe('collection magic data out of sync');
         sync().ignore();
@@ -958,7 +958,7 @@ class CollectionsService {
       Bus.instance.fire(
         CollectionUpdatedEvent(collection.id, <EnteFile>[], "shareUrL"),
       );
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response?.statusCode == 402) {
         throw SharingNotPermittedForFreeAccountsError();
       }
@@ -987,7 +987,7 @@ class CollectionsService {
       Bus.instance.fire(
         CollectionUpdatedEvent(collection.id, <EnteFile>[], "updateUrl"),
       );
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response?.statusCode == 402) {
         throw SharingNotPermittedForFreeAccountsError();
       }
@@ -1013,7 +1013,7 @@ class CollectionsService {
           "disableShareUrl",
         ),
       );
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       _logger.info(e);
       rethrow;
     }
@@ -1038,7 +1038,7 @@ class CollectionsService {
       return collections;
     } catch (e, s) {
       _logger.warning(e, s);
-      if (e is DioError && e.response?.statusCode == 401) {
+      if (e is DioException && e.response?.statusCode == 401) {
         throw UnauthorizedError();
       }
       rethrow;
@@ -1091,7 +1091,7 @@ class CollectionsService {
     } catch (e, s) {
       _logger.warning(e, s);
       _logger.severe("Failed to fetch public collection");
-      if (e is DioError && e.response?.statusCode == 410) {
+      if (e is DioException && e.response?.statusCode == 410) {
         await showInfoDialog(
           context,
           title: S.of(context).linkExpired,
@@ -1100,7 +1100,7 @@ class CollectionsService {
         throw UnauthorizedError();
       }
       await showGenericErrorDialog(context: context, error: e);
-      if (e is DioError && e.response?.statusCode == 401) {
+      if (e is DioException && e.response?.statusCode == 401) {
         throw UnauthorizedError();
       }
       rethrow;
@@ -1300,7 +1300,7 @@ class CollectionsService {
       _cacheLocalPathAndCollection(collection);
       return collection;
     } catch (e) {
-      if (e is DioError && e.response?.statusCode == 401) {
+      if (e is DioException && e.response?.statusCode == 401) {
         throw UnauthorizedError();
       }
       _logger.severe('failed to fetch collection: $collectionID', e);
diff --git a/mobile/lib/services/file_magic_service.dart b/mobile/lib/services/file_magic_service.dart
index 9fbbfb9760..30e74d9c73 100644
--- a/mobile/lib/services/file_magic_service.dart
+++ b/mobile/lib/services/file_magic_service.dart
@@ -117,7 +117,7 @@ class FileMagicService {
       // should be eventually synced after remote sync has completed
       await _filesDB.insertMultiple(files);
       RemoteSyncService.instance.sync(silently: true).ignore();
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null && e.response!.statusCode == 409) {
         RemoteSyncService.instance.sync(silently: true).ignore();
       }
@@ -185,7 +185,7 @@ class FileMagicService {
       // update the state of the selected file. Same file in other collection
       // should be eventually synced after remote sync has completed
       RemoteSyncService.instance.sync(silently: true).ignore();
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null && e.response!.statusCode == 409) {
         RemoteSyncService.instance.sync(silently: true).ignore();
       }
diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index e231e14d18..37baf778d6 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -82,7 +82,7 @@ class PreviewVideoStore {
     Bus.instance.fire(VideoStreamingChanged());
 
     if (isVideoStreamingEnabled) {
-      await putFilesForPreviewCreation();
+      putFilesForPreviewCreation().ignore();
     } else {
       clearQueue();
     }
@@ -202,7 +202,10 @@ class PreviewVideoStore {
       );
 
       FFmpegSession? session;
+      final colorSpace = videoData["color_space"]?.toString().toLowerCase();
+      final isColorGood = colorSpace == "bt709";
       final codecIsH264 = codec?.contains("h264") ?? false;
+
       if (bitrate != null && bitrate <= 4000 * 1000 && codecIsH264) {
         // create playlist without compression, as is
         session = await FFmpegKit.execute(
@@ -233,6 +236,18 @@ class PreviewVideoStore {
         );
       }
 
+      if (colorSpace != null && isColorGood) {
+        session ??= await FFmpegKit.execute(
+          '-i "${file.path}" '
+          '-metadata:s:v:0 rotate=0 '
+          '-vf "scale=-2:720,fps=30" '
+          '-c:v libx264 -b:v 2000k -preset medium '
+          '-c:a aac -b:a 128k -f hls -hls_time 10 -hls_flags single_file '
+          '-hls_list_size 0 -hls_key_info_file ${keyinfo.path} '
+          '$prefix/output.m3u8',
+        );
+      }
+
       session ??= await FFmpegKit.execute(
         '-i "${file.path}" '
         '-metadata:s:v:0 rotate=0 '
@@ -316,6 +331,7 @@ class PreviewVideoStore {
       }
 
       if (error == null) {
+        FileDataService.instance.syncFDStatus().ignore();
         _items[enteFile.uploadedFileID!] = PreviewItem(
           status: PreviewItemStatus.uploaded,
           file: enteFile,
@@ -372,6 +388,7 @@ class PreviewVideoStore {
           'type': 'hls_video',
           'width': width,
           'height': height,
+          'size': objectSize,
         },
         encryptionKey,
       );
@@ -479,7 +496,7 @@ class PreviewVideoStore {
 
         width = playlistData["width"];
         height = playlistData["height"];
-        size = response.data["data"]["objectSize"];
+        size = playlistData["size"];
 
         if (objectKey != null) {
           unawaited(
diff --git a/mobile/lib/services/sync_service.dart b/mobile/lib/services/sync_service.dart
index 2eaafe2545..f015c9a82c 100644
--- a/mobile/lib/services/sync_service.dart
+++ b/mobile/lib/services/sync_service.dart
@@ -133,11 +133,11 @@ class SyncService {
         ),
       );
     } catch (e) {
-      if (e is DioError) {
-        if (e.type == DioErrorType.connectTimeout ||
-            e.type == DioErrorType.sendTimeout ||
-            e.type == DioErrorType.receiveTimeout ||
-            e.type == DioErrorType.other) {
+      if (e is DioException) {
+        if (e.type == DioExceptionType.connectionTimeout ||
+            e.type == DioExceptionType.sendTimeout ||
+            e.type == DioExceptionType.receiveTimeout ||
+            e.type == DioExceptionType.unknown) {
           Bus.instance.fire(
             SyncStatusUpdate(
               SyncStatus.paused,
diff --git a/mobile/lib/services/user_service.dart b/mobile/lib/services/user_service.dart
index 60b2ad04f0..1098005f45 100644
--- a/mobile/lib/services/user_service.dart
+++ b/mobile/lib/services/user_service.dart
@@ -124,7 +124,7 @@ class UserService {
       } else {
         throw Exception("send-ott action failed, non-200");
       }
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       await dialog.hide();
       _logger.info(e);
       final String? enteErrCode = e.response?.data["code"];
@@ -185,7 +185,7 @@ class UserService {
       );
       final publicKey = response.data["publicKey"];
       return publicKey;
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null && e.response?.statusCode == 404) {
         return null;
       }
@@ -221,7 +221,7 @@ class UserService {
         }
       }
       return userDetails;
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       _logger.info(e);
       rethrow;
     }
@@ -231,7 +231,7 @@ class UserService {
     try {
       final response = await _enteDio.get("/users/sessions");
       return Sessions.fromMap(response.data);
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       _logger.info(e);
       rethrow;
     }
@@ -245,7 +245,7 @@ class UserService {
           "token": token,
         },
       );
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       _logger.info(e);
       rethrow;
     }
@@ -254,7 +254,7 @@ class UserService {
   Future<void> leaveFamilyPlan() async {
     try {
       await _enteDio.delete("/family/leave");
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       _logger.warning('failed to leave family plan', e);
       rethrow;
     }
@@ -271,7 +271,7 @@ class UserService {
       }
     } catch (e) {
       // check if token is already invalid
-      if (e is DioError && e.response?.statusCode == 401) {
+      if (e is DioException && e.response?.statusCode == 401) {
         await Configuration.instance.logout();
         Navigator.of(context).popUntil((route) => route.isFirst);
         return;
@@ -342,7 +342,7 @@ class UserService {
         },
       );
       return response.data;
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null) {
         if (e.response!.statusCode == 404 || e.response!.statusCode == 410) {
           throw PassKeySessionExpiredError();
@@ -460,7 +460,7 @@ class UserService {
         // should never reach here
         throw Exception("unexpected response during email verification");
       }
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       _logger.info(e);
       await dialog.hide();
       if (e.response != null && e.response!.statusCode == 410) {
@@ -532,7 +532,7 @@ class UserService {
         S.of(context).oops,
         S.of(context).verificationFailedPleaseTryAgain,
       );
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       await dialog.hide();
       if (e.response != null && e.response!.statusCode == 403) {
         // ignore: unawaited_futures
@@ -592,7 +592,7 @@ class UserService {
       } else {
         throw Exception("get-srp-attributes action failed");
       }
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response != null && e.response!.statusCode == 404) {
         throw SrpSetupNotCompleteError();
       }
@@ -865,7 +865,7 @@ class UserService {
           (route) => route.isFirst,
         );
       }
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       await dialog.hide();
       _logger.severe(e);
       if (e.response != null && e.response!.statusCode == 404) {
@@ -932,7 +932,7 @@ class UserService {
           (route) => route.isFirst,
         );
       }
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       await dialog.hide();
       _logger.severe('error while recovery 2fa', e);
       if (e.response != null && e.response!.statusCode == 404) {
@@ -1031,7 +1031,7 @@ class UserService {
           (route) => route.isFirst,
         );
       }
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       await dialog.hide();
       _logger.severe("error during recovery", e);
       if (e.response != null && e.response!.statusCode == 404) {
@@ -1126,7 +1126,7 @@ class UserService {
     } catch (e, s) {
       await dialog.hide();
       _logger.severe(e, s);
-      if (e is DioError) {
+      if (e is DioException) {
         if (e.response != null && e.response!.statusCode == 401) {
           // ignore: unawaited_futures
           showErrorDialog(
diff --git a/mobile/lib/states/all_sections_examples_state.dart b/mobile/lib/states/all_sections_examples_state.dart
index 9feb3d96bd..abb0077ef3 100644
--- a/mobile/lib/states/all_sections_examples_state.dart
+++ b/mobile/lib/states/all_sections_examples_state.dart
@@ -36,11 +36,13 @@ class _AllSectionsExamplesProviderState
   late StreamSubscription<TabChangedEvent> _tabChangeEvent;
   bool hasPendingUpdate = false;
   bool isOnSearchTab = false;
+  bool _firstLoadInProgressOrComplete = false;
   final _logger = Logger("AllSectionsExamplesProvider");
 
   final _debouncer = Debouncer(
     const Duration(seconds: 3),
     executionInterval: const Duration(seconds: 12),
+    leading: true,
   );
 
   @override
@@ -66,7 +68,12 @@ class _AllSectionsExamplesProviderState
         isOnSearchTab = false;
       }
     });
-    reloadAllSections();
+
+    Future.delayed(const Duration(seconds: 3), () {
+      if (!_firstLoadInProgressOrComplete) {
+        reloadAllSections();
+      }
+    });
   }
 
   void onDataUpdate() {
@@ -82,6 +89,7 @@ class _AllSectionsExamplesProviderState
   }
 
   void reloadAllSections() {
+    _firstLoadInProgressOrComplete = true;
     _logger.info('queue reload all sections');
     _debouncer.run(() async {
       setState(() {
diff --git a/mobile/lib/ui/account/login_pwd_verification_page.dart b/mobile/lib/ui/account/login_pwd_verification_page.dart
index ac974c20da..2d5e9237ce 100644
--- a/mobile/lib/ui/account/login_pwd_verification_page.dart
+++ b/mobile/lib/ui/account/login_pwd_verification_page.dart
@@ -113,7 +113,7 @@ class _LoginPasswordVerificationPageState
         password,
         dialog,
       );
-    } on DioError catch (e, s) {
+    } on DioException catch (e, s) {
       await dialog.hide();
       if (e.response != null && e.response!.statusCode == 401) {
         _logger.severe('server reject, failed verify SRP login', e, s);
@@ -123,8 +123,10 @@ class _LoginPasswordVerificationPageState
           S.of(context).pleaseTryAgain,
         );
       } else {
-        _logger.severe('API failure during SRP login', e, s);
-        if (e.type == DioErrorType.other) {
+        _logger.severe('API failure during SRP login ${e.type}', e, s);
+        if (e.type == DioExceptionType.connectionTimeout ||
+            e.type == DioExceptionType.receiveTimeout ||
+            e.type == DioExceptionType.sendTimeout) {
           await _showContactSupportDialog(
             context,
             S.of(context).noInternetConnection,
diff --git a/mobile/lib/ui/account/verify_recovery_page.dart b/mobile/lib/ui/account/verify_recovery_page.dart
index 54c8595977..46585a734d 100644
--- a/mobile/lib/ui/account/verify_recovery_page.dart
+++ b/mobile/lib/ui/account/verify_recovery_page.dart
@@ -43,7 +43,7 @@ class _VerifyRecoveryPageState extends State<VerifyRecoveryPage> {
           await userRemoteFlagService.markRecoveryVerificationAsDone();
         } catch (e) {
           await dialog.hide();
-          if (e is DioError && e.type == DioErrorType.other) {
+          if (e is DioException && e.type == DioExceptionType.connectionError) {
             await showErrorDialog(
               context,
               S.of(context).noInternetConnection,
diff --git a/mobile/lib/ui/collections/device/device_folders_grid_view.dart b/mobile/lib/ui/collections/device/device_folders_grid_view.dart
index b9c2588613..6f4ac30f0f 100644
--- a/mobile/lib/ui/collections/device/device_folders_grid_view.dart
+++ b/mobile/lib/ui/collections/device/device_folders_grid_view.dart
@@ -16,8 +16,8 @@ import "package:photos/utils/debouncer.dart";
 
 class DeviceFoldersGridView extends StatefulWidget {
   const DeviceFoldersGridView({
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<DeviceFoldersGridView> createState() => _DeviceFoldersGridViewState();
@@ -31,10 +31,12 @@ class _DeviceFoldersGridViewState extends State<DeviceFoldersGridView> {
   final _debouncer = Debouncer(
     const Duration(seconds: 2),
     executionInterval: const Duration(seconds: 5),
+    leading: true,
   );
 
   @override
   void initState() {
+    super.initState();
     _backupFoldersUpdatedEvent =
         Bus.instance.on<BackupFoldersUpdatedEvent>().listen((event) {
       _loadReason = event.reason;
@@ -51,8 +53,6 @@ class _DeviceFoldersGridViewState extends State<DeviceFoldersGridView> {
         }
       });
     });
-
-    super.initState();
   }
 
   @override
diff --git a/mobile/lib/ui/collections/device/device_folders_vertical_grid_view.dart b/mobile/lib/ui/collections/device/device_folders_vertical_grid_view.dart
index f465878ff5..d5ac85e0ea 100644
--- a/mobile/lib/ui/collections/device/device_folders_vertical_grid_view.dart
+++ b/mobile/lib/ui/collections/device/device_folders_vertical_grid_view.dart
@@ -74,6 +74,7 @@ class _DeviceFolderVerticalGridViewBodyState
 
   @override
   void initState() {
+    super.initState();
     _backupFoldersUpdatedEvent =
         Bus.instance.on<BackupFoldersUpdatedEvent>().listen((event) {
       _loadReason = event.reason;
@@ -90,7 +91,6 @@ class _DeviceFolderVerticalGridViewBodyState
         }
       });
     });
-    super.initState();
   }
 
   @override
diff --git a/mobile/lib/ui/growth/referral_code_widget.dart b/mobile/lib/ui/growth/referral_code_widget.dart
index cb139c7263..7620aff22d 100644
--- a/mobile/lib/ui/growth/referral_code_widget.dart
+++ b/mobile/lib/ui/growth/referral_code_widget.dart
@@ -108,7 +108,7 @@ class ReferralCodeWidget extends StatelessWidget {
           notifyParent?.call();
         } catch (e, s) {
           Logger("ReferralCodeWidget").severe("Failed to update code", e, s);
-          if (e is DioError) {
+          if (e is DioException) {
             if (e.response?.statusCode == 400) {
               await showInfoDialog(
                 context,
diff --git a/mobile/lib/ui/home/status_bar_widget.dart b/mobile/lib/ui/home/status_bar_widget.dart
index 1705cece1e..e967d7b0b5 100644
--- a/mobile/lib/ui/home/status_bar_widget.dart
+++ b/mobile/lib/ui/home/status_bar_widget.dart
@@ -144,7 +144,9 @@ class _StatusBarWidgetState extends State<StatusBarWidget> {
                           forceCustomPageRoute: true,
                         ).ignore();
                       },
-                      child: Text(S.of(context).processingVideos),
+                      child: RefreshIndicatorWidget(
+                        S.of(context).processingVideos,
+                      ),
                     )
                   : const Text("ente", style: brandStyleMedium),
         ),
@@ -249,7 +251,50 @@ class _SyncStatusWidgetState extends State<SyncStatusWidget> {
     if (_event!.status == SyncStatus.completedBackup) {
       return const SyncStatusCompletedWidget();
     }
-    return RefreshIndicatorWidget(_event);
+    return RefreshIndicatorWidget(_getRefreshingText(context));
+  }
+
+  String _getRefreshingText(BuildContext context) {
+    if (_event == null) {
+      return S.of(context).loadingGallery;
+    }
+    if (_event!.status == SyncStatus.startedFirstGalleryImport ||
+        _event!.status == SyncStatus.completedFirstGalleryImport) {
+      return S.of(context).loadingGallery;
+    }
+    if (_event!.status == SyncStatus.applyingRemoteDiff) {
+      return S.of(context).syncing;
+    }
+    if (_event!.status == SyncStatus.preparingForUpload) {
+      if (_event!.total == null || _event!.total! <= 0) {
+        return S.of(context).encryptingBackup;
+      } else if (_event!.total == 1) {
+        return S.of(context).uploadingSingleMemory;
+      } else {
+        return S
+            .of(context)
+            .uploadingMultipleMemories(NumberFormat().format(_event!.total!));
+      }
+    }
+    if (_event!.status == SyncStatus.inProgress) {
+      final format = NumberFormat();
+      return S.of(context).syncProgress(
+            format.format(_event!.completed!),
+            format.format(_event!.total!),
+          );
+    }
+    if (_event!.status == SyncStatus.paused) {
+      return _event!.reason;
+    }
+    if (_event!.status == SyncStatus.error) {
+      return _event!.reason;
+    }
+    if (_event!.status == SyncStatus.completedBackup) {
+      if (_event!.wasStopped) {
+        return S.of(context).syncStopped;
+      }
+    }
+    return S.of(context).allMemoriesPreserved;
   }
 }
 
@@ -259,9 +304,9 @@ class RefreshIndicatorWidget extends StatelessWidget {
     valueColor: AlwaysStoppedAnimation<Color>(Color.fromRGBO(45, 194, 98, 1.0)),
   );
 
-  final SyncStatusUpdate? event;
+  final String text;
 
-  const RefreshIndicatorWidget(this.event, {super.key});
+  const RefreshIndicatorWidget(this.text, {super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -286,7 +331,7 @@ class RefreshIndicatorWidget extends StatelessWidget {
                 ),
                 Padding(
                   padding: const EdgeInsets.fromLTRB(12, 4, 0, 0),
-                  child: Text(_getRefreshingText(context)),
+                  child: Text(text),
                 ),
               ],
             ),
@@ -295,49 +340,6 @@ class RefreshIndicatorWidget extends StatelessWidget {
       ),
     );
   }
-
-  String _getRefreshingText(BuildContext context) {
-    if (event == null) {
-      return S.of(context).loadingGallery;
-    }
-    if (event!.status == SyncStatus.startedFirstGalleryImport ||
-        event!.status == SyncStatus.completedFirstGalleryImport) {
-      return S.of(context).loadingGallery;
-    }
-    if (event!.status == SyncStatus.applyingRemoteDiff) {
-      return S.of(context).syncing;
-    }
-    if (event!.status == SyncStatus.preparingForUpload) {
-      if (event!.total == null || event!.total! <= 0) {
-        return S.of(context).encryptingBackup;
-      } else if (event!.total == 1) {
-        return S.of(context).uploadingSingleMemory;
-      } else {
-        return S
-            .of(context)
-            .uploadingMultipleMemories(NumberFormat().format(event!.total!));
-      }
-    }
-    if (event!.status == SyncStatus.inProgress) {
-      final format = NumberFormat();
-      return S.of(context).syncProgress(
-            format.format(event!.completed!),
-            format.format(event!.total!),
-          );
-    }
-    if (event!.status == SyncStatus.paused) {
-      return event!.reason;
-    }
-    if (event!.status == SyncStatus.error) {
-      return event!.reason;
-    }
-    if (event!.status == SyncStatus.completedBackup) {
-      if (event!.wasStopped) {
-        return S.of(context).syncStopped;
-      }
-    }
-    return S.of(context).allMemoriesPreserved;
-  }
 }
 
 class SyncStatusCompletedWidget extends StatelessWidget {
diff --git a/mobile/lib/ui/map/map_view.dart b/mobile/lib/ui/map/map_view.dart
index 8804774223..3629da7e96 100644
--- a/mobile/lib/ui/map/map_view.dart
+++ b/mobile/lib/ui/map/map_view.dart
@@ -28,7 +28,7 @@ class MapView extends StatefulWidget {
   static const defaultMarkerSize = Size(75, 75);
 
   const MapView({
-    Key? key,
+    super.key,
     required this.updateVisibleImages,
     required this.imageMarkers,
     required this.controller,
@@ -42,7 +42,7 @@ class MapView extends StatefulWidget {
     this.onTap,
     this.interactiveFlags = InteractiveFlag.all,
     this.showControls = true,
-  }) : super(key: key);
+  });
 
   @override
   State<StatefulWidget> createState() => _MapViewState();
diff --git a/mobile/lib/ui/settings/backup/backup_item_card.dart b/mobile/lib/ui/settings/backup/backup_item_card.dart
index a17cdcfd40..da00498ca3 100644
--- a/mobile/lib/ui/settings/backup/backup_item_card.dart
+++ b/mobile/lib/ui/settings/backup/backup_item_card.dart
@@ -7,9 +7,11 @@ import "package:photos/models/preview/preview_item.dart";
 import "package:photos/models/preview/preview_item_status.dart";
 import "package:photos/services/preview_video_store.dart";
 import 'package:photos/theme/ente_theme.dart';
+import "package:photos/ui/viewer/file/detail_page.dart";
 import "package:photos/ui/viewer/file/thumbnail_widget.dart";
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/file_uploader.dart";
+import "package:photos/utils/navigation_util.dart";
 
 class BackupItemCard extends StatefulWidget {
   const BackupItemCard({
@@ -55,199 +57,214 @@ class _BackupItemCardState extends State<BackupItemCard> {
     final hasError = widget.item.error != null ||
         widget.preview?.status == PreviewItemStatus.failed;
 
-    return Container(
-      height: 60,
-      margin: const EdgeInsets.symmetric(vertical: 10),
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(4),
-        border: Border.all(
-          color: colorScheme.fillFaint.withOpacity(0.08),
-          width: 1,
+    return GestureDetector(
+      onTap: () {
+        routeToPage(
+          context,
+          DetailPage(
+            DetailPageConfiguration(
+              List.unmodifiable([widget.item.file]),
+              0,
+              "collection",
+            ),
+          ),
+          forceCustomPageRoute: true,
+        );
+      },
+      child: Container(
+        height: 60,
+        margin: const EdgeInsets.symmetric(vertical: 10),
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(4),
+          border: Border.all(
+            color: colorScheme.fillFaint.withOpacity(0.08),
+            width: 1,
+          ),
         ),
-      ),
-      child: Row(
-        children: [
-          SizedBox(
-            width: 60,
-            height: 60,
-            child: ClipRRect(
-              borderRadius: BorderRadius.circular(4),
-              child: showThumbnail
-                  ? ThumbnailWidget(
-                      widget.item.file,
-                      shouldShowSyncStatus: false,
-                    )
-                  : Container(
-                      color: colorScheme.fillFaint, // Placeholder color
+        child: Row(
+          children: [
+            SizedBox(
+              width: 60,
+              height: 60,
+              child: ClipRRect(
+                borderRadius: BorderRadius.circular(4),
+                child: showThumbnail
+                    ? ThumbnailWidget(
+                        widget.item.file,
+                        shouldShowSyncStatus: false,
+                      )
+                    : Container(
+                        color: colorScheme.fillFaint, // Placeholder color
+                      ),
+              ),
+            ),
+            const SizedBox(width: 12),
+            Expanded(
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    widget.item.file.displayName,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: TextStyle(
+                      fontSize: 16,
+                      height: 20 / 16,
+                      color: Theme.of(context).brightness == Brightness.light
+                          ? const Color(0xFF000000)
+                          : const Color(0xFFFFFFFF),
                     ),
-            ),
-          ),
-          const SizedBox(width: 12),
-          Expanded(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  widget.item.file.displayName,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  style: TextStyle(
-                    fontSize: 16,
-                    height: 20 / 16,
-                    color: Theme.of(context).brightness == Brightness.light
-                        ? const Color(0xFF000000)
-                        : const Color(0xFFFFFFFF),
                   ),
-                ),
-                const SizedBox(height: 4),
-                Text(
-                  folderName ?? "",
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  style: TextStyle(
-                    fontSize: 14,
-                    height: 17 / 14,
-                    color: Theme.of(context).brightness == Brightness.light
-                        ? const Color.fromRGBO(0, 0, 0, 0.7)
-                        : const Color.fromRGBO(255, 255, 255, 0.7),
+                  const SizedBox(height: 4),
+                  Text(
+                    folderName ?? "",
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: TextStyle(
+                      fontSize: 14,
+                      height: 17 / 14,
+                      color: Theme.of(context).brightness == Brightness.light
+                          ? const Color.fromRGBO(0, 0, 0, 0.7)
+                          : const Color.fromRGBO(255, 255, 255, 0.7),
+                    ),
                   ),
-                ),
-              ],
+                ],
+              ),
             ),
-          ),
-          if (hasError) const SizedBox(width: 12),
-          if (hasError)
+            if (hasError) const SizedBox(width: 12),
+            if (hasError)
+              SizedBox(
+                height: 48,
+                width: 48,
+                child: IconButton(
+                  icon: Icon(
+                    Icons.error_outline,
+                    color: getEnteColorScheme(context).fillBase,
+                  ),
+                  onPressed: () {
+                    String errorMessage = "";
+                    if (widget.item.error is Exception) {
+                      final Exception ex = widget.item.error as Exception;
+                      errorMessage = "Error: " +
+                          ex.runtimeType.toString() +
+                          " - " +
+                          ex.toString();
+                    } else if (widget.item.error != null) {
+                      errorMessage = widget.item.error.toString();
+                    } else if (widget.preview?.error != null) {
+                      errorMessage = widget.preview!.error!.toString();
+                    }
+                    showErrorDialog(
+                      context,
+                      'Upload failed',
+                      errorMessage,
+                    );
+                  },
+                ),
+              ),
+            if (hasError) const SizedBox(width: 12),
             SizedBox(
               height: 48,
               width: 48,
-              child: IconButton(
-                icon: Icon(
-                  Icons.error_outline,
-                  color: getEnteColorScheme(context).fillBase,
-                ),
-                onPressed: () {
-                  String errorMessage = "";
-                  if (widget.item.error is Exception) {
-                    final Exception ex = widget.item.error as Exception;
-                    errorMessage = "Error: " +
-                        ex.runtimeType.toString() +
-                        " - " +
-                        ex.toString();
-                  } else if (widget.item.error != null) {
-                    errorMessage = widget.item.error.toString();
-                  } else if (widget.preview?.error != null) {
-                    errorMessage = widget.preview!.error!.toString();
-                  }
-                  showErrorDialog(
-                    context,
-                    'Upload failed',
-                    errorMessage,
-                  );
-                },
-              ),
-            ),
-          if (hasError) const SizedBox(width: 12),
-          SizedBox(
-            height: 48,
-            width: 48,
-            child: Center(
-              child: switch (widget.item.status) {
-                BackupItemStatus.uploading => SizedBox(
-                    width: 16,
-                    height: 16,
-                    child: CircularProgressIndicator(
-                      strokeWidth: 2.0,
-                      color: colorScheme.primary700,
+              child: Center(
+                child: switch (widget.item.status) {
+                  BackupItemStatus.uploading => SizedBox(
+                      width: 16,
+                      height: 16,
+                      child: CircularProgressIndicator(
+                        strokeWidth: 2.0,
+                        color: colorScheme.primary700,
+                      ),
                     ),
-                  ),
-                BackupItemStatus.uploaded => widget.preview != null
-                    ? switch (widget.preview!.status) {
-                        PreviewItemStatus.uploading ||
-                        PreviewItemStatus.compressing =>
-                          SizedBox(
-                            width: 24,
-                            height: 24,
-                            child: Image.asset(
-                              "assets/processing-video.png",
-                            ),
-                          ),
-                        PreviewItemStatus.failed => GestureDetector(
-                            onTap: () =>
-                                PreviewVideoStore.instance.chunkAndUploadVideo(
-                              context,
-                              widget.item.file,
-                              true,
-                            ),
-                            child: SizedBox(
+                  BackupItemStatus.uploaded => widget.preview != null
+                      ? switch (widget.preview!.status) {
+                          PreviewItemStatus.uploading ||
+                          PreviewItemStatus.compressing =>
+                            SizedBox(
                               width: 24,
                               height: 24,
                               child: Image.asset(
-                                "assets/processing-video-failed.png",
+                                "assets/processing-video.png",
                               ),
                             ),
-                          ),
-                        PreviewItemStatus.retry ||
-                        PreviewItemStatus.inQueue =>
-                          SizedBox(
-                            width: 24,
-                            height: 24,
-                            child: Image.asset(
-                              "assets/video-processing-queued.png",
+                          PreviewItemStatus.failed => GestureDetector(
+                              onTap: () => PreviewVideoStore.instance
+                                  .chunkAndUploadVideo(
+                                context,
+                                widget.item.file,
+                                true,
+                              ),
+                              child: SizedBox(
+                                width: 24,
+                                height: 24,
+                                child: Image.asset(
+                                  "assets/processing-video-failed.png",
+                                ),
+                              ),
                             ),
-                          ),
-                        PreviewItemStatus.uploaded => SizedBox(
-                            width: 24,
-                            height: 24,
-                            child: Image.asset(
-                              "assets/processing-video-success.png",
+                          PreviewItemStatus.retry ||
+                          PreviewItemStatus.inQueue =>
+                            SizedBox(
+                              width: 24,
+                              height: 24,
+                              child: Image.asset(
+                                "assets/video-processing-queued.png",
+                              ),
                             ),
+                          PreviewItemStatus.uploaded => SizedBox(
+                              width: 24,
+                              height: 24,
+                              child: Image.asset(
+                                "assets/processing-video-success.png",
+                              ),
+                            ),
+                        }
+                      : const SizedBox(
+                          width: 24,
+                          height: 24,
+                          child: Icon(
+                            Icons.check,
+                            color: Color(0xFF00B33C),
                           ),
-                      }
-                    : const SizedBox(
-                        width: 24,
-                        height: 24,
-                        child: Icon(
-                          Icons.check,
-                          color: Color(0xFF00B33C),
                         ),
+                  BackupItemStatus.inQueue => SizedBox(
+                      width: 24,
+                      height: 24,
+                      child: Icon(
+                        Icons.history,
+                        color: Theme.of(context).brightness == Brightness.light
+                            ? const Color.fromRGBO(0, 0, 0, .6)
+                            : const Color.fromRGBO(255, 255, 255, .6),
                       ),
-                BackupItemStatus.inQueue => SizedBox(
-                    width: 24,
-                    height: 24,
-                    child: Icon(
-                      Icons.history,
-                      color: Theme.of(context).brightness == Brightness.light
-                          ? const Color.fromRGBO(0, 0, 0, .6)
-                          : const Color.fromRGBO(255, 255, 255, .6),
                     ),
-                  ),
-                BackupItemStatus.retry => IconButton(
-                    icon: const Icon(
-                      Icons.sync,
-                      color: Color(0xFFFDB816),
+                  BackupItemStatus.retry => IconButton(
+                      icon: const Icon(
+                        Icons.sync,
+                        color: Color(0xFFFDB816),
+                      ),
+                      onPressed: () async {
+                        await FileUploader.instance.upload(
+                          widget.item.file,
+                          widget.item.collectionID,
+                        );
+                      },
                     ),
-                    onPressed: () async {
-                      await FileUploader.instance.upload(
-                        widget.item.file,
-                        widget.item.collectionID,
-                      );
-                    },
-                  ),
-                BackupItemStatus.inBackground => SizedBox(
-                    width: 16,
-                    height: 16,
-                    child: CircularProgressIndicator(
-                      strokeWidth: 2.0,
-                      color: Theme.of(context).brightness == Brightness.light
-                          ? const Color.fromRGBO(0, 0, 0, .6)
-                          : const Color.fromRGBO(255, 255, 255, .6),
+                  BackupItemStatus.inBackground => SizedBox(
+                      width: 16,
+                      height: 16,
+                      child: CircularProgressIndicator(
+                        strokeWidth: 2.0,
+                        color: Theme.of(context).brightness == Brightness.light
+                            ? const Color.fromRGBO(0, 0, 0, .6)
+                            : const Color.fromRGBO(255, 255, 255, .6),
+                      ),
                     ),
-                  ),
-              },
+                },
+              ),
             ),
-          ),
-        ],
+          ],
+        ),
       ),
     );
   }
diff --git a/mobile/lib/ui/sharing/user_avator_widget.dart b/mobile/lib/ui/sharing/user_avator_widget.dart
index 8b06f09ede..a69430a953 100644
--- a/mobile/lib/ui/sharing/user_avator_widget.dart
+++ b/mobile/lib/ui/sharing/user_avator_widget.dart
@@ -45,6 +45,7 @@ class _UserAvatarWidgetState extends State<UserAvatarWidget> {
   final _debouncer = Debouncer(
     const Duration(milliseconds: 250),
     executionInterval: const Duration(seconds: 20),
+    leading: true,
   );
 
   @override
diff --git a/mobile/lib/ui/tabs/shared_collections_tab.dart b/mobile/lib/ui/tabs/shared_collections_tab.dart
index 7e93abca39..a6e7f3c679 100644
--- a/mobile/lib/ui/tabs/shared_collections_tab.dart
+++ b/mobile/lib/ui/tabs/shared_collections_tab.dart
@@ -40,6 +40,7 @@ class _SharedCollectionsTabState extends State<SharedCollectionsTab>
   final _debouncer = Debouncer(
     const Duration(seconds: 2),
     executionInterval: const Duration(seconds: 5),
+    leading: true,
   );
   static const heroTagPrefix = "outgoing_collection";
 
diff --git a/mobile/lib/ui/tabs/user_collections_tab.dart b/mobile/lib/ui/tabs/user_collections_tab.dart
index b7b1b74829..5e8431a5a9 100644
--- a/mobile/lib/ui/tabs/user_collections_tab.dart
+++ b/mobile/lib/ui/tabs/user_collections_tab.dart
@@ -54,6 +54,7 @@ class _UserCollectionsTabState extends State<UserCollectionsTab>
   final _debouncer = Debouncer(
     const Duration(seconds: 2),
     executionInterval: const Duration(seconds: 5),
+    leading: true,
   );
 
   static const int _kOnEnteItemLimitCount = 10;
diff --git a/mobile/lib/ui/viewer/file/file_app_bar.dart b/mobile/lib/ui/viewer/file/file_app_bar.dart
index 220c47c0bd..46adbad5d4 100644
--- a/mobile/lib/ui/viewer/file/file_app_bar.dart
+++ b/mobile/lib/ui/viewer/file/file_app_bar.dart
@@ -296,26 +296,7 @@ class FileAppBarState extends State<FileAppBar> {
         );
       }
     }
-    if (flagService.internalUser &&
-        PreviewVideoStore.instance.isVideoStreamingEnabled) {
-      items.add(
-        PopupMenuItem(
-          value: 99,
-          child: Row(
-            children: [
-              Icon(
-                Icons.video_collection,
-                color: Theme.of(context).iconTheme.color,
-              ),
-              const Padding(
-                padding: EdgeInsets.all(8),
-              ),
-              const Text("Cache Preview"),
-            ],
-          ),
-        ),
-      );
-    }
+
     items.add(
       PopupMenuItem(
         value: 6,
diff --git a/mobile/lib/ui/viewer/file/file_widget.dart b/mobile/lib/ui/viewer/file/file_widget.dart
index 4926b76b36..a38f576c37 100644
--- a/mobile/lib/ui/viewer/file/file_widget.dart
+++ b/mobile/lib/ui/viewer/file/file_widget.dart
@@ -7,7 +7,7 @@ import "package:photos/ui/viewer/file/zoomable_live_image_new.dart";
 
 class FileWidget extends StatelessWidget {
   final EnteFile file;
-  final String? tagPrefix;
+  final String tagPrefix;
   final Function(bool)? shouldDisableScroll;
   final Function(bool)? playbackCallback;
   final BoxDecoration? backgroundDecoration;
@@ -18,7 +18,7 @@ class FileWidget extends StatelessWidget {
     this.autoPlay,
     this.shouldDisableScroll,
     this.playbackCallback,
-    this.tagPrefix,
+    required this.tagPrefix,
     this.backgroundDecoration,
     super.key,
   });
diff --git a/mobile/lib/ui/viewer/file/preview_status_widget.dart b/mobile/lib/ui/viewer/file/preview_status_widget.dart
index d5a4bf53ee..375790a6b4 100644
--- a/mobile/lib/ui/viewer/file/preview_status_widget.dart
+++ b/mobile/lib/ui/viewer/file/preview_status_widget.dart
@@ -3,12 +3,14 @@ import "dart:async";
 import "package:flutter/material.dart";
 import "package:photos/core/event_bus.dart";
 import "package:photos/events/preview_updated_event.dart";
+import "package:photos/generated/l10n.dart";
 import "package:photos/models/file/file.dart";
 import "package:photos/models/preview/preview_item.dart";
 import "package:photos/models/preview/preview_item_status.dart";
 import "package:photos/services/filedata/filedata_service.dart";
 import "package:photos/services/preview_video_store.dart";
 import "package:photos/theme/colors.dart";
+import "package:photos/ui/settings/backup/backup_status_screen.dart";
 
 class PreviewStatusWidget extends StatefulWidget {
   const PreviewStatusWidget({
@@ -108,7 +110,14 @@ class _PreviewStatusWidgetState extends State<PreviewStatusWidget> {
             onTap:
                 preview == null || preview!.status == PreviewItemStatus.uploaded
                     ? widget.onStreamChange
-                    : null,
+                    : () {
+                        Navigator.pushReplacement(
+                          context,
+                          MaterialPageRoute(
+                            builder: (_) => const BackupStatusScreen(),
+                          ),
+                        );
+                      },
             child: Container(
               padding: const EdgeInsets.symmetric(
                 horizontal: 8,
@@ -157,16 +166,16 @@ class _PreviewStatusWidgetState extends State<PreviewStatusWidget> {
                   ),
                   Text(
                     isInProgress
-                        ? "Processing"
+                        ? S.of(context).processing
                         : isInQueue
-                            ? "Queued"
+                            ? S.of(context).queued
                             : isBeforeCutoffDate
-                                ? "Ineligible"
+                                ? S.of(context).ineligible
                                 : isFailed
-                                    ? "Failed"
+                                    ? S.of(context).failed
                                     : widget.isPreviewPlayer
-                                        ? "Play original"
-                                        : "Play stream",
+                                        ? S.of(context).playOriginal
+                                        : S.of(context).playStream,
                     style: const TextStyle(
                       fontSize: 12,
                       fontWeight: FontWeight.w600,
diff --git a/mobile/lib/ui/viewer/file/video_control.dart b/mobile/lib/ui/viewer/file/video_control.dart
index e89e583dd9..d662819003 100644
--- a/mobile/lib/ui/viewer/file/video_control.dart
+++ b/mobile/lib/ui/viewer/file/video_control.dart
@@ -33,6 +33,8 @@ class _VideoControlsState extends State<VideoControls> {
   Timer? _showAfterExpandCollapseTimer;
   bool _dragging = false;
   bool _displayTapped = false;
+  Timer? _bufferingDisplayTimer;
+  bool _displayBufferingIndicator = false;
 
   final barHeight = 120.0;
   final marginSize = 5.0;
@@ -40,6 +42,13 @@ class _VideoControlsState extends State<VideoControls> {
   late VideoPlayerController controller;
   ChewieController? chewieController;
 
+  void _bufferingTimerTimeout() {
+    _displayBufferingIndicator = true;
+    if (mounted) {
+      setState(() {});
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     if (_latestValue!.hasError) {
@@ -68,8 +77,9 @@ class _VideoControlsState extends State<VideoControls> {
           child: Stack(
             children: <Widget>[
               if (_latestValue != null &&
-                  !_latestValue!.isPlaying &&
-                  _latestValue!.isBuffering)
+                      !_latestValue!.isPlaying &&
+                      _latestValue!.isBuffering ||
+                  _displayBufferingIndicator)
                 const Align(
                   alignment: Alignment.center,
                   child: Center(
@@ -253,6 +263,21 @@ class _VideoControlsState extends State<VideoControls> {
   }
 
   void _updateState() {
+    // display the progress bar indicator only after the buffering delay if it has been set
+    if (chewieController?.progressIndicatorDelay != null) {
+      if (controller.value.isBuffering) {
+        _bufferingDisplayTimer ??= Timer(
+          chewieController!.progressIndicatorDelay!,
+          _bufferingTimerTimeout,
+        );
+      } else {
+        _bufferingDisplayTimer?.cancel();
+        _bufferingDisplayTimer = null;
+        _displayBufferingIndicator = false;
+      }
+    } else {
+      _displayBufferingIndicator = controller.value.isBuffering;
+    }
     setState(() {
       _latestValue = controller.value;
     });
diff --git a/mobile/lib/ui/viewer/file_details/creation_time_item_widget.dart b/mobile/lib/ui/viewer/file_details/creation_time_item_widget.dart
index 13c8800fa8..90b6ab9d58 100644
--- a/mobile/lib/ui/viewer/file_details/creation_time_item_widget.dart
+++ b/mobile/lib/ui/viewer/file_details/creation_time_item_widget.dart
@@ -21,15 +21,15 @@ class CreationTimeItem extends StatefulWidget {
 class _CreationTimeItemState extends State<CreationTimeItem> {
   @override
   Widget build(BuildContext context) {
-    final dateTime = DateTime.fromMicrosecondsSinceEpoch(
-      widget.file.creationTime!,
-      isUtc: true,
-    ).toLocal();
+    final dateTime =
+        DateTime.fromMicrosecondsSinceEpoch(widget.file.creationTime!);
     return InfoItemWidget(
       key: const ValueKey("Creation time"),
       leadingIcon: Icons.calendar_today_outlined,
       title: DateFormat.yMMMEd(Localizations.localeOf(context).languageCode)
-          .format(dateTime),
+          .format(
+        DateTime.fromMicrosecondsSinceEpoch(widget.file.creationTime!),
+      ),
       subtitleSection: Future.value([
         Text(
           getTimeIn12hrFormat(dateTime) + "  " + dateTime.timeZoneName,
diff --git a/mobile/lib/ui/viewer/file_details/preview_properties_item_widget.dart b/mobile/lib/ui/viewer/file_details/preview_properties_item_widget.dart
index cf3e05fe11..aec1b9fa3d 100644
--- a/mobile/lib/ui/viewer/file_details/preview_properties_item_widget.dart
+++ b/mobile/lib/ui/viewer/file_details/preview_properties_item_widget.dart
@@ -32,7 +32,7 @@ class _PreviewPropertiesItemWidgetState
   @override
   void initState() {
     super.initState();
-    _getSection();
+    Future.microtask(() => _getSection());
   }
 
   @override
diff --git a/mobile/lib/ui/viewer/gallery/gallery.dart b/mobile/lib/ui/viewer/gallery/gallery.dart
index 1788866697..970992a91e 100644
--- a/mobile/lib/ui/viewer/gallery/gallery.dart
+++ b/mobile/lib/ui/viewer/gallery/gallery.dart
@@ -18,6 +18,7 @@ import 'package:photos/ui/viewer/gallery/empty_state.dart';
 import "package:photos/ui/viewer/gallery/state/gallery_context_state.dart";
 import "package:photos/ui/viewer/gallery/state/gallery_files_inherited_widget.dart";
 import "package:photos/ui/viewer/gallery/state/inherited_search_filter_data.dart";
+import "package:photos/utils/date_time_util.dart";
 import "package:photos/utils/debouncer.dart";
 import "package:photos/utils/hierarchical_search_util.dart";
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
@@ -125,24 +126,63 @@ class GalleryState extends State<Gallery> {
     _debouncer = Debouncer(
       widget.reloadDebounceTime,
       executionInterval: widget.reloadDebounceExecutionInterval,
+      leading: true,
     );
     _sortOrderAsc = widget.sortAsyncFn != null ? widget.sortAsyncFn!() : false;
     _itemScroller = ItemScrollController();
     if (widget.reloadEvent != null) {
       _reloadEventSubscription = widget.reloadEvent!.listen((event) async {
+        bool shouldReloadFromDB = true;
+        if (event.source == 'uploadCompleted') {
+          final Map<int, EnteFile> genIDToUploadedFiles = {};
+          for (int i = 0; i < event.updatedFiles.length; i++) {
+            if (event.updatedFiles[i].generatedID == null) {
+              shouldReloadFromDB = true;
+              break;
+            }
+            genIDToUploadedFiles[event.updatedFiles[i].generatedID!] =
+                event.updatedFiles[i];
+          }
+          for (int i = 0; i < _allGalleryFiles.length; i++) {
+            final file = _allGalleryFiles[i];
+            if (file.generatedID == null) {
+              continue;
+            }
+            final updateFile = genIDToUploadedFiles[file.generatedID!];
+            if (updateFile != null &&
+                updateFile.localID == file.localID &&
+                areFromSameDay(
+                  updateFile.creationTime ?? 0,
+                  file.creationTime ?? 0,
+                )) {
+              _allGalleryFiles[i] = updateFile;
+              genIDToUploadedFiles.remove(file.generatedID!);
+            }
+          }
+          shouldReloadFromDB = genIDToUploadedFiles.isNotEmpty;
+        }
+        if (!shouldReloadFromDB) {
+          final bool hasCalledSetState = _onFilesLoaded(_allGalleryFiles);
+          _logger.info(
+            'Skip softRefresh from DB, processed updated in memory with setStateReload $hasCalledSetState',
+          );
+          return;
+        }
+
         _debouncer.run(() async {
           // In soft refresh, setState is called for entire gallery only when
           // number of child change
           _logger.finest("Soft refresh all files on ${event.reason} ");
           final result = await _loadFiles();
-          final bool hasReloaded = _onFilesLoaded(result.files);
-          if (hasReloaded && kDebugMode) {
+          final bool hasTriggeredSetState = _onFilesLoaded(result.files);
+          if (hasTriggeredSetState && kDebugMode) {
             _logger.finest(
               "Reloaded gallery on soft refresh all files on ${event.reason}",
             );
           }
-
-          setState(() {});
+          if (!hasTriggeredSetState && mounted) {
+            setState(() {});
+          }
         });
       });
     }
@@ -207,8 +247,9 @@ class GalleryState extends State<Gallery> {
           _hasLoadedFiles = true;
           currentGroupedFiles = updatedGroupedFiles;
         });
+        return true;
       }
-      return true;
+      return false;
     } else {
       currentGroupedFiles = updatedGroupedFiles;
       return false;
diff --git a/mobile/lib/utils/debouncer.dart b/mobile/lib/utils/debouncer.dart
index 31e9709521..07097440f0 100644
--- a/mobile/lib/utils/debouncer.dart
+++ b/mobile/lib/utils/debouncer.dart
@@ -15,12 +15,24 @@ class Debouncer {
   /// This is useful for example when you want to execute a callback every 5 seconds
   final Duration? executionInterval;
   Timer? _debounceTimer;
+  final bool leading;
 
-  Debouncer(this._duration, {this.executionInterval});
+  Debouncer(this._duration, {this.executionInterval, this.leading = false});
 
   final Stopwatch _stopwatch = Stopwatch();
 
   void run(FutureVoidCallback fn) {
+    if (leading && !isActive()) {
+      _stopwatch.stop();
+      _stopwatch.reset();
+      fn();
+      _debounceTimer = Timer(_duration, () {
+        _debounceActiveNotifier.value = false;
+      });
+      _debounceActiveNotifier.value = true;
+      return;
+    }
+
     bool shouldRunImmediately = false;
     if (executionInterval != null) {
       // ensure the stop watch is running
diff --git a/mobile/lib/utils/dialog_util.dart b/mobile/lib/utils/dialog_util.dart
index 8d3f65e438..9fcadb2763 100644
--- a/mobile/lib/utils/dialog_util.dart
+++ b/mobile/lib/utils/dialog_util.dart
@@ -76,7 +76,7 @@ Future<ButtonResult?> showErrorDialogForException({
 }) async {
   String errorMessage =
       message ?? S.of(context).tempErrorContactSupportIfPersists;
-  if (exception is DioError &&
+  if (exception is DioException &&
       exception.response != null &&
       exception.response!.data["code"] != null) {
     errorMessage =
@@ -107,9 +107,12 @@ String parseErrorForUI(
   if (error == null) {
     return genericError;
   }
-  if (error is DioError) {
-    final DioError dioError = error;
-    if (dioError.type == DioErrorType.other) {
+  if (error is DioException) {
+    final DioException dioError = error;
+    if (dioError.type == DioExceptionType.receiveTimeout ||
+        dioError.type == DioExceptionType.connectionError ||
+        dioError.type == DioExceptionType.sendTimeout ||
+        dioError.type == DioExceptionType.cancel) {
       if (dioError.error.toString().contains('Failed host lookup')) {
         return S.of(context).networkHostLookUpErr;
       } else if (dioError.error.toString().contains('SocketException')) {
@@ -122,15 +125,15 @@ String parseErrorForUI(
     return genericError;
   }
   String errorInfo = "";
-  if (error is DioError) {
-    final DioError dioError = error;
-    if (dioError.type == DioErrorType.response) {
+  if (error is DioException) {
+    final DioException dioError = error;
+    if (dioError.type == DioExceptionType.badResponse) {
       if (dioError.response?.data["code"] != null) {
         errorInfo = "Reason: " + dioError.response!.data["code"];
       } else {
         errorInfo = "Reason: " + dioError.response!.data.toString();
       }
-    } else if (dioError.type == DioErrorType.other) {
+    } else if (dioError.type == DioExceptionType.badCertificate) {
       errorInfo = "Reason: " + dioError.error.toString();
     } else {
       errorInfo = "Reason: " + dioError.type.toString();
diff --git a/mobile/lib/utils/exif_util.dart b/mobile/lib/utils/exif_util.dart
index a94e02bece..652336ebee 100644
--- a/mobile/lib/utils/exif_util.dart
+++ b/mobile/lib/utils/exif_util.dart
@@ -47,7 +47,7 @@ Future<Map<String, IfdTag>> getExif(EnteFile file) async {
   }
 }
 
-Future<Map<String, IfdTag>?> tryExifFromFile(File originFile) async {
+Future<Map<String, IfdTag>?> getExifFromSourceFile(File originFile) async {
   try {
     final exif = await readExifAsync(originFile);
     return exif;
@@ -125,25 +125,7 @@ bool? checkPanoramaFromEXIF(File? file, Map<String, IfdTag>? exifData) {
   return element?.printable == "6";
 }
 
-class ParsedExifDateTime {
-  late final DateTime? time;
-  late final String? dateTime;
-  late final String? offsetTime;
-  ParsedExifDateTime(DateTime this.time, String? dateTime, this.offsetTime) {
-    if (dateTime != null && dateTime.endsWith('Z')) {
-      this.dateTime = dateTime.substring(0, dateTime.length - 1);
-    } else {
-      this.dateTime = dateTime;
-    }
-  }
-
-  @override
-  String toString() {
-    return "ParsedExifDateTime{time: $time, dateTime: $dateTime, offsetTime: $offsetTime}";
-  }
-}
-
-Future<ParsedExifDateTime?> tryParseExifDateTime(
+Future<DateTime?> getCreationTimeFromEXIF(
   File? file,
   Map<String, IfdTag>? exifData,
 ) async {
@@ -155,55 +137,46 @@ Future<ParsedExifDateTime?> tryParseExifDateTime(
         : exif.containsKey(kImageDateTime)
             ? exif[kImageDateTime]!.printable
             : null;
-    if (exifTime == null || exifTime == kEmptyExifDateTime) {
-      return null;
-    }
-    String? exifOffsetTime;
-    for (final key in kExifOffSetKeys) {
-      if (exif.containsKey(key)) {
-        exifOffsetTime = exif[key]!.printable;
-        break;
+    if (exifTime != null && exifTime != kEmptyExifDateTime) {
+      String? exifOffsetTime;
+      for (final key in kExifOffSetKeys) {
+        if (exif.containsKey(key)) {
+          exifOffsetTime = exif[key]!.printable;
+          break;
+        }
       }
+      return getDateTimeInDeviceTimezone(exifTime, exifOffsetTime);
     }
-    return getDateTimeInDeviceTimezone(exifTime, exifOffsetTime);
   } catch (e) {
     _logger.severe("failed to getCreationTimeFromEXIF", e);
   }
   return null;
 }
 
-ParsedExifDateTime getDateTimeInDeviceTimezone(
-  String exifTime,
-  String? offsetString,
-) {
-  final hasOffset = (offsetString ?? '') != '';
-  final DateTime result =
-      DateFormat(kExifDateTimePattern).parse(exifTime, hasOffset);
-  if (hasOffset && offsetString!.toUpperCase() != "Z") {
-    try {
-      final List<String> splitHHMM = offsetString.split(":");
-      final int offsetHours = int.parse(splitHHMM[0]);
-      final int offsetMinutes =
-          int.parse(splitHHMM[1]) * (offsetHours.isNegative ? -1 : 1);
-      // Adjust the date for the offset to get the photo's correct UTC time
-      final photoUtcDate =
-          result.add(Duration(hours: -offsetHours, minutes: -offsetMinutes));
-      // Convert the UTC time to the device's local time
-      final deviceLocalTime = photoUtcDate.toLocal();
-      return ParsedExifDateTime(
-        deviceLocalTime,
-        result.toIso8601String(),
-        offsetString,
-      );
-    } catch (e, s) {
-      _logger.severe("offset parsing failed $exifTime &&  $offsetString", e, s);
-    }
+DateTime getDateTimeInDeviceTimezone(String exifTime, String? offsetString) {
+  final DateTime result = DateFormat(kExifDateTimePattern).parse(exifTime);
+  if (offsetString == null) {
+    return result;
   }
-  return ParsedExifDateTime(
-    result,
-    result.toIso8601String(),
-    (offsetString ?? '').toUpperCase() == 'Z' ? 'Z' : null,
-  );
+  try {
+    final List<String> splitHHMM = offsetString.split(":");
+    // Parse the offset from the photo's time zone
+    final int offsetHours = int.parse(splitHHMM[0]);
+    final int offsetMinutes =
+        int.parse(splitHHMM[1]) * (offsetHours.isNegative ? -1 : 1);
+    // Adjust the date for the offset to get the photo's correct UTC time
+    final photoUtcDate =
+        result.add(Duration(hours: -offsetHours, minutes: -offsetMinutes));
+    // Getting the current device's time zone offset from UTC
+    final now = DateTime.now();
+    final localOffset = now.timeZoneOffset;
+    // Adjusting the photo's UTC time to the device's local time
+    final deviceLocalTime = photoUtcDate.add(localOffset);
+    return deviceLocalTime;
+  } catch (e, s) {
+    _logger.severe("tz offset adjust failed $offsetString", e, s);
+  }
+  return result;
 }
 
 Location? locationFromExif(Map<String, IfdTag> exif) {
diff --git a/mobile/lib/utils/file_uploader.dart b/mobile/lib/utils/file_uploader.dart
index 1d21e51c72..9290772910 100644
--- a/mobile/lib/utils/file_uploader.dart
+++ b/mobile/lib/utils/file_uploader.dart
@@ -41,7 +41,6 @@ import 'package:photos/services/sync_service.dart';
 import "package:photos/services/user_service.dart";
 import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/data_util.dart';
-import "package:photos/utils/exif_util.dart";
 import "package:photos/utils/file_key.dart";
 import 'package:photos/utils/file_uploader_util.dart';
 import "package:photos/utils/file_util.dart";
@@ -83,7 +82,6 @@ class FileUploader {
   int _uploadCounter = 0;
   int _videoUploadCounter = 0;
   late ProcessType _processType;
-  late bool _isBackground;
   late SharedPreferences _prefs;
 
   // _hasInitiatedForceUpload is used to track if user attempted force upload
@@ -105,7 +103,6 @@ class FileUploader {
 
   Future<void> init(SharedPreferences preferences, bool isBackground) async {
     _prefs = preferences;
-    _isBackground = isBackground;
     _processType =
         isBackground ? ProcessType.background : ProcessType.foreground;
     final currentTime = DateTime.now().microsecondsSinceEpoch;
@@ -539,7 +536,7 @@ class FileUploader {
 
     MediaUploadData? mediaUploadData;
     try {
-      mediaUploadData = await getUploadDataFromEnteFile(file, parseExif: true);
+      mediaUploadData = await getUploadDataFromEnteFile(file);
     } catch (e) {
       // This additional try catch block is added because for resumable upload,
       // we need to compute the hash before the next step. Previously, this
@@ -731,13 +728,8 @@ class FileUploader {
           encThumbSize,
         );
       }
-      final ParsedExifDateTime? exifTime = await tryParseExifDateTime(
-        null,
-        mediaUploadData.exifData,
-      );
-      final metadata =
-          await file.getMetadataForUpload(mediaUploadData, exifTime);
 
+      final metadata = await file.getMetadataForUpload(mediaUploadData);
       final encryptedMetadataResult = await CryptoUtil.encryptChaCha(
         utf8.encode(jsonEncode(metadata)),
         fileAttributes.key!,
@@ -779,9 +771,22 @@ class FileUploader {
             CryptoUtil.bin2base64(encryptedFileKeyData.encryptedData!);
         final keyDecryptionNonce =
             CryptoUtil.bin2base64(encryptedFileKeyData.nonce!);
-        final Map<String, dynamic> pubMetadata =
-            _buildPublicMagicData(mediaUploadData, exifTime);
+        final Map<String, dynamic> pubMetadata = {};
         MetadataRequest? pubMetadataRequest;
+        if ((mediaUploadData.height ?? 0) != 0 &&
+            (mediaUploadData.width ?? 0) != 0) {
+          pubMetadata[heightKey] = mediaUploadData.height;
+          pubMetadata[widthKey] = mediaUploadData.width;
+          pubMetadata[mediaTypeKey] =
+              mediaUploadData.isPanorama == true ? 1 : 0;
+        }
+        if (mediaUploadData.motionPhotoStartIndex != null) {
+          pubMetadata[motionVideoIndexKey] =
+              mediaUploadData.motionPhotoStartIndex;
+        }
+        if (mediaUploadData.thumbnail == null) {
+          pubMetadata[noThumbKey] = true;
+        }
         if (pubMetadata.isNotEmpty) {
           pubMetadataRequest = await getPubMetadataRequest(
             file,
@@ -816,14 +821,12 @@ class FileUploader {
       }
       await UploadLocksDB.instance.deleteMultipartTrack(lockKey);
 
-      if (!_isBackground) {
-        Bus.instance.fire(
-          LocalPhotosUpdatedEvent(
-            [remoteFile],
-            source: "downloadComplete",
-          ),
-        );
-      }
+      Bus.instance.fire(
+        LocalPhotosUpdatedEvent(
+          [remoteFile],
+          source: "uploadCompleted",
+        ),
+      );
       _logger.info("File upload complete for " + remoteFile.toString());
       uploadCompleted = true;
       Bus.instance.fire(FileUploadedEvent(remoteFile));
@@ -865,36 +868,8 @@ class FileUploader {
     }
   }
 
-  Map<String, dynamic> _buildPublicMagicData(
-    MediaUploadData mediaUploadData,
-    ParsedExifDateTime? exifTime,
-  ) {
-    final Map<String, dynamic> pubMetadata = {};
-    if ((mediaUploadData.height ?? 0) != 0 &&
-        (mediaUploadData.width ?? 0) != 0) {
-      pubMetadata[heightKey] = mediaUploadData.height;
-      pubMetadata[widthKey] = mediaUploadData.width;
-      pubMetadata[mediaTypeKey] = mediaUploadData.isPanorama == true ? 1 : 0;
-    }
-    if (mediaUploadData.motionPhotoStartIndex != null) {
-      pubMetadata[motionVideoIndexKey] = mediaUploadData.motionPhotoStartIndex;
-    }
-    if (mediaUploadData.thumbnail == null) {
-      pubMetadata[noThumbKey] = true;
-    }
-    if (exifTime != null) {
-      if (exifTime.dateTime != null) {
-        pubMetadata[dateTimeKey] = exifTime.dateTime;
-      }
-      if (exifTime.offsetTime != null) {
-        pubMetadata[offsetTimeKey] = exifTime.offsetTime;
-      }
-    }
-    return pubMetadata;
-  }
-
   bool isPutOrUpdateFileError(Object e) {
-    if (e is DioError) {
+    if (e is DioException) {
       return e.requestOptions.path.contains("/files") ||
           e.requestOptions.path.contains("/files/update");
     }
@@ -1189,7 +1164,7 @@ class FileUploader {
       file.thumbnailDecryptionHeader = thumbnailDecryptionHeader;
       file.metadataDecryptionHeader = metadataDecryptionHeader;
       return file;
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response?.statusCode == 413) {
         throw FileTooLargeForPlanError();
       } else if (e.response?.statusCode == 426) {
@@ -1257,7 +1232,7 @@ class FileUploader {
       file.thumbnailDecryptionHeader = thumbnailDecryptionHeader;
       file.metadataDecryptionHeader = metadataDecryptionHeader;
       return file;
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response?.statusCode == 426) {
         _onStorageLimitExceeded();
       } else if (attempt < kMaximumUploadAttempts) {
@@ -1313,7 +1288,7 @@ class FileUploader {
             .map((e) => UploadURL.fromMap(e))
             .toList();
         _uploadURLs.addAll(urls);
-      } on DioError catch (e, s) {
+      } on DioException catch (e, s) {
         if (e.response != null) {
           if (e.response!.statusCode == 402) {
             final error = NoActiveSubscriptionError();
@@ -1363,8 +1338,8 @@ class FileUploader {
       );
 
       return uploadURL.objectKey;
-    } on DioError catch (e) {
-      if (e.message.startsWith("HttpException: Content size")) {
+    } on DioException catch (e) {
+      if (e.message?.startsWith("HttpException: Content size") ?? false) {
         rethrow;
       } else if (attempt < kMaximumUploadAttempts) {
         _logger.info("Upload failed for $fileName, retrying");
diff --git a/mobile/lib/utils/file_uploader_util.dart b/mobile/lib/utils/file_uploader_util.dart
index 6f37236b8e..6ad6622f5f 100644
--- a/mobile/lib/utils/file_uploader_util.dart
+++ b/mobile/lib/utils/file_uploader_util.dart
@@ -6,7 +6,6 @@ import 'dart:ui' as ui;
 
 import "package:archive/archive_io.dart";
 import "package:computer/computer.dart";
-import "package:exif/exif.dart";
 import 'package:logging/logging.dart';
 import "package:motion_photos/motion_photos.dart";
 import 'package:motionphoto/motionphoto.dart';
@@ -45,8 +44,6 @@ class MediaUploadData {
   // For iOS, this value will be always null.
   final int? motionPhotoStartIndex;
 
-  final Map<String, IfdTag>? exifData;
-
   bool? isPanorama;
 
   MediaUploadData(
@@ -58,7 +55,6 @@ class MediaUploadData {
     this.width,
     this.motionPhotoStartIndex,
     this.isPanorama,
-    this.exifData,
   });
 }
 
@@ -73,27 +69,20 @@ class FileHashData {
   FileHashData(this.fileHash, {this.zipHash});
 }
 
-Future<MediaUploadData> getUploadDataFromEnteFile(
-  EnteFile file, {
-  bool parseExif = false,
-}) async {
+Future<MediaUploadData> getUploadDataFromEnteFile(EnteFile file) async {
   if (file.isSharedMediaToAppSandbox) {
-    return await _getMediaUploadDataFromAppCache(file, parseExif);
+    return await _getMediaUploadDataFromAppCache(file);
   } else {
-    return await _getMediaUploadDataFromAssetFile(file, parseExif);
+    return await _getMediaUploadDataFromAssetFile(file);
   }
 }
 
-Future<MediaUploadData> _getMediaUploadDataFromAssetFile(
-  EnteFile file,
-  bool parseExif,
-) async {
+Future<MediaUploadData> _getMediaUploadDataFromAssetFile(EnteFile file) async {
   File? sourceFile;
   Uint8List? thumbnailData;
   bool isDeleted;
   String? zipHash;
   String fileHash;
-  Map<String, IfdTag>? exifData;
 
   // The timeouts are to safeguard against https://github.com/CaiJingLong/flutter_photo_manager/issues/467
   final asset = await file.getAsset
@@ -126,11 +115,8 @@ Future<MediaUploadData> _getMediaUploadDataFromAssetFile(
       InvalidReason.sourceFileMissing,
     );
   }
-  if (parseExif) {
-    exifData = await tryExifFromFile(sourceFile);
-  }
   // h4ck to fetch location data if missing (thank you Android Q+) lazily only during uploads
-  await _decorateEnteFileData(file, asset, sourceFile, exifData);
+  await _decorateEnteFileData(file, asset, sourceFile);
   fileHash = CryptoUtil.bin2base64(await CryptoUtil.getHash(sourceFile));
 
   if (file.fileType == FileType.livePhoto && Platform.isIOS) {
@@ -191,7 +177,6 @@ Future<MediaUploadData> _getMediaUploadDataFromAssetFile(
     height: h,
     width: w,
     motionPhotoStartIndex: motionPhotoStartingIndex,
-    exifData: exifData,
   );
 }
 
@@ -299,7 +284,6 @@ Future<void> _decorateEnteFileData(
   EnteFile file,
   AssetEntity asset,
   File sourceFile,
-  Map<String, IfdTag>? exifData,
 ) async {
   // h4ck to fetch location data if missing (thank you Android Q+) lazily only during uploads
   if (file.location == null ||
@@ -314,13 +298,6 @@ Future<void> _decorateEnteFileData(
       file.location = props.location;
     }
   }
-  if (Platform.isAndroid && exifData != null) {
-    //Fix for missing location data in lower android versions.
-    final Location? exifLocation = locationFromExif(exifData);
-    if (Location.isValidLocation(exifLocation)) {
-      file.location = exifLocation;
-    }
-  }
   if (file.title == null || file.title!.isEmpty) {
     _logger.warning("Title was missing ${file.tag}");
     file.title = await asset.titleAsync;
@@ -353,13 +330,9 @@ Future<MetadataRequest> getPubMetadataRequest(
   );
 }
 
-Future<MediaUploadData> _getMediaUploadDataFromAppCache(
-  EnteFile file,
-  bool parseExif,
-) async {
+Future<MediaUploadData> _getMediaUploadDataFromAppCache(EnteFile file) async {
   File sourceFile;
   Uint8List? thumbnailData;
-  Map<String, IfdTag>? exifData;
   const bool isDeleted = false;
   final localPath = getSharedMediaFilePath(file);
   sourceFile = File(localPath);
@@ -377,7 +350,6 @@ Future<MediaUploadData> _getMediaUploadDataFromAppCache(
     Map<String, int>? dimensions;
     if (file.fileType == FileType.image) {
       dimensions = await getImageHeightAndWith(imagePath: localPath);
-      exifData = await tryExifFromFile(sourceFile);
     } else if (thumbnailData != null) {
       // the thumbnail null check is to ensure that we are able to generate thum
       // for video, we need to use the thumbnail data with any max width/height
@@ -396,7 +368,6 @@ Future<MediaUploadData> _getMediaUploadDataFromAppCache(
       FileHashData(fileHash),
       height: dimensions?['height'],
       width: dimensions?['width'],
-      exifData: exifData,
     );
   } catch (e, s) {
     _logger.warning("failed to generate thumbnail", e, s);
diff --git a/mobile/lib/utils/share_util.dart b/mobile/lib/utils/share_util.dart
index 3ec147798d..c39d1733b9 100644
--- a/mobile/lib/utils/share_util.dart
+++ b/mobile/lib/utils/share_util.dart
@@ -165,9 +165,9 @@ Future<List<EnteFile>> convertIncomingSharedMediaToFile(
     enteFile.fileType =
         media.type == SharedMediaType.image ? FileType.image : FileType.video;
     if (enteFile.fileType == FileType.image) {
-      final dateResult = await tryParseExifDateTime(ioFile, null);
-      if (dateResult != null && dateResult.time != null) {
-        enteFile.creationTime = dateResult.time!.microsecondsSinceEpoch;
+      final exifTime = await getCreationTimeFromEXIF(ioFile, null);
+      if (exifTime != null) {
+        enteFile.creationTime = exifTime.microsecondsSinceEpoch;
       }
     } else if (enteFile.fileType == FileType.video) {
       enteFile.duration = (media.duration ?? 0) ~/ 1000;
diff --git a/mobile/lib/utils/thumbnail_util.dart b/mobile/lib/utils/thumbnail_util.dart
index c8db830735..7769976888 100644
--- a/mobile/lib/utils/thumbnail_util.dart
+++ b/mobile/lib/utils/thumbnail_util.dart
@@ -192,7 +192,7 @@ Future<void> _downloadAndDecryptThumbnail(FileDownloadItem item) async {
           .data;
     }
   } catch (e) {
-    if (e is DioError && CancelToken.isCancel(e)) {
+    if (e is DioException && CancelToken.isCancel(e)) {
       return;
     }
     rethrow;
diff --git a/mobile/plugins/ente_cast/pubspec.lock b/mobile/plugins/ente_cast/pubspec.lock
index 6cd4bf68b4..8de07d1e38 100644
--- a/mobile/plugins/ente_cast/pubspec.lock
+++ b/mobile/plugins/ente_cast/pubspec.lock
@@ -79,18 +79,18 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.15.0"
   path:
     dependency: transitive
     description:
diff --git a/mobile/plugins/ente_cast/pubspec.yaml b/mobile/plugins/ente_cast/pubspec.yaml
index 967e147e91..6cc08a0849 100644
--- a/mobile/plugins/ente_cast/pubspec.yaml
+++ b/mobile/plugins/ente_cast/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
 
 dependencies:
   collection:
-  dio: ^4.0.6
+  dio: ^5.8.0+1
   flutter:
     sdk: flutter
   shared_preferences: ^2.0.5
diff --git a/mobile/plugins/ente_cast_none/pubspec.lock b/mobile/plugins/ente_cast_none/pubspec.lock
index 57a80587b0..ee83b2bd96 100644
--- a/mobile/plugins/ente_cast_none/pubspec.lock
+++ b/mobile/plugins/ente_cast_none/pubspec.lock
@@ -86,18 +86,18 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.15.0"
   path:
     dependency: transitive
     description:
diff --git a/mobile/plugins/ente_cast_normal/pubspec.lock b/mobile/plugins/ente_cast_normal/pubspec.lock
index b65fe49c94..2d37f86c87 100644
--- a/mobile/plugins/ente_cast_normal/pubspec.lock
+++ b/mobile/plugins/ente_cast_normal/pubspec.lock
@@ -119,18 +119,18 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.15.0"
   multicast_dns:
     dependency: transitive
     description:
diff --git a/mobile/plugins/ente_feature_flag/pubspec.lock b/mobile/plugins/ente_feature_flag/pubspec.lock
index 4f2db8cd08..e58ff1231c 100644
--- a/mobile/plugins/ente_feature_flag/pubspec.lock
+++ b/mobile/plugins/ente_feature_flag/pubspec.lock
@@ -1,6 +1,14 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  async:
+    dependency: transitive
+    description:
+      name: async
+      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.12.0"
   characters:
     dependency: transitive
     description:
@@ -21,10 +29,18 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: "7d328c4d898a61efc3cd93655a0955858e29a0aa647f0f9e02d59b3bb275e2e8"
+      sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.6"
+    version: "5.8.0+1"
+  dio_web_adapter:
+    dependency: transitive
+    description:
+      name: dio_web_adapter
+      sha256: e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   ffi:
     dependency: transitive
     description:
@@ -273,5 +289,5 @@ packages:
     source: hosted
     version: "1.0.4"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
+  dart: ">=3.4.0 <4.0.0"
   flutter: ">=3.19.0"
diff --git a/mobile/plugins/ente_feature_flag/pubspec.yaml b/mobile/plugins/ente_feature_flag/pubspec.yaml
index 7507d61f1c..6ad2c7626d 100644
--- a/mobile/plugins/ente_feature_flag/pubspec.yaml
+++ b/mobile/plugins/ente_feature_flag/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
 
 dependencies:
   collection:
-  dio: ^4.0.6
+  dio: ^5.8.0+1
   flutter:
     sdk: flutter
   shared_preferences: ^2.0.5
diff --git a/mobile/plugins/onnx_dart/pubspec.lock b/mobile/plugins/onnx_dart/pubspec.lock
index c14d3ed876..72000bb8f1 100644
--- a/mobile/plugins/onnx_dart/pubspec.lock
+++ b/mobile/plugins/onnx_dart/pubspec.lock
@@ -71,18 +71,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.4"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.5"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -111,18 +111,18 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.15.0"
   path:
     dependency: transitive
     description:
@@ -188,10 +188,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.0"
+    version: "0.7.2"
   vector_math:
     dependency: transitive
     description:
@@ -204,10 +204,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.1"
+    version: "14.2.5"
 sdks:
   dart: ">=3.4.3 <4.0.0"
   flutter: ">=3.18.0-18.0.pre.54"
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index cc25b6a214..ab9c4cd2a4 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -13,10 +13,10 @@ packages:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: "27899c95f9e7ec06c8310e6e0eac967707714b9f1450c4a58fa00ca011a4a8ae"
+      sha256: "5534e701a2c505fed1f0799e652dd6ae23bd4d2c4cf797220e5ced5764a7c1c2"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.49"
+    version: "1.3.44"
   _macros:
     dependency: transitive
     description: dart
@@ -42,10 +42,10 @@ packages:
     dependency: "direct main"
     description:
       name: android_intent_plus
-      sha256: "53136214d506d3128c9f4e5bfce3d026abe7e8038958629811a8d3223b1757c1"
+      sha256: "38921ec22ebb3b9a7eb678792cf6fab0b6f458b61b9d327688573449c9b47db3"
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.1"
+    version: "5.2.0"
   animate_do:
     dependency: "direct main"
     description:
@@ -90,10 +90,10 @@ packages:
     dependency: transitive
     description:
       name: args
-      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
+      sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.0"
+    version: "2.5.0"
   asn1lib:
     dependency: transitive
     description:
@@ -202,10 +202,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2"
+      sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb
       url: "https://pub.dev"
     source: hosted
-    version: "8.9.3"
+    version: "8.9.2"
   cached_network_image:
     dependency: "direct main"
     description:
@@ -268,10 +268,10 @@ packages:
     dependency: transitive
     description:
       name: cli_util
-      sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
+      sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.2"
+    version: "0.4.1"
   clock:
     dependency: transitive
     description:
@@ -284,10 +284,10 @@ packages:
     dependency: transitive
     description:
       name: code_builder
-      sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
+      sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37
       url: "https://pub.dev"
     source: hosted
-    version: "4.10.1"
+    version: "4.10.0"
   collection:
     dependency: "direct main"
     description:
@@ -309,10 +309,10 @@ packages:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: e0817759ec6d2d8e57eb234e6e57d2173931367a865850c7acea40d4b4f9c27d
+      sha256: "2056db5241f96cdc0126bd94459fc4cdc13876753768fc7a31c425e50a7177d0"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.1"
+    version: "6.0.5"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -325,18 +325,26 @@ packages:
     dependency: transitive
     description:
       name: convert
-      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
+      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.1"
   coverage:
     dependency: transitive
     description:
       name: coverage
-      sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43
+      sha256: c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.9.2"
+  cronet_http:
+    dependency: transitive
+    description:
+      name: cronet_http
+      sha256: "3af9c4d57bf07ef4b307e77b22be4ad61bea19ee6ff65e62184863f3a09f1415"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.2"
   cross_file:
     dependency: "direct main"
     description:
@@ -349,18 +357,26 @@ packages:
     dependency: "direct main"
     description:
       name: crypto
-      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
+      sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.6"
+    version: "3.0.5"
   csslib:
     dependency: transitive
     description:
       name: csslib
-      sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
+      sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.0"
+  cupertino_http:
+    dependency: transitive
+    description:
+      name: cupertino_http
+      sha256: "6fcf79586ad872ddcd6004d55c8c2aab3cdf0337436e8f99837b1b6c30665d0c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -413,18 +429,26 @@ packages:
     dependency: transitive
     description:
       name: device_info_plus_platform_interface
-      sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2"
+      sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.2"
+    version: "7.0.1"
   dio:
     dependency: "direct main"
     description:
       name: dio
-      sha256: "7d328c4d898a61efc3cd93655a0955858e29a0aa647f0f9e02d59b3bb275e2e8"
+      sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.6"
+    version: "5.8.0+1"
+  dio_web_adapter:
+    dependency: transitive
+    description:
+      name: dio_web_adapter
+      sha256: e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   dots_indicator:
     dependency: "direct main"
     description:
@@ -498,10 +522,10 @@ packages:
     dependency: "direct main"
     description:
       name: equatable
-      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
+      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.7"
+    version: "2.0.5"
   event_bus:
     dependency: "direct main"
     description:
@@ -627,10 +651,10 @@ packages:
     dependency: transitive
     description:
       name: file_selector_linux
-      sha256: "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33"
+      sha256: "712ce7fab537ba532c8febdb1a8f167b32441e74acd68c3ccb2e36dcb52c4ab2"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.3+2"
+    version: "0.9.3"
   file_selector_macos:
     dependency: transitive
     description:
@@ -659,58 +683,58 @@ packages:
     dependency: "direct main"
     description:
       name: firebase_core
-      sha256: "0307c1fde82e2b8b97e0be2dab93612aff9a72f31ebe9bfac66ed8b37ef7c568"
+      sha256: "51dfe2fbf3a984787a2e7b8592f2f05c986bfedd6fdacea3f9e0a7beb334de96"
       url: "https://pub.dev"
     source: hosted
-    version: "3.10.0"
+    version: "3.6.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
       name: firebase_core_platform_interface
-      sha256: d7253d255ff10f85cfd2adaba9ac17bae878fa3ba577462451163bd9f1d1f0bf
+      sha256: e30da58198a6d4b49d5bce4e852f985c32cb10db329ebef9473db2b9f09ce810
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "5.3.0"
   firebase_core_web:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: fbc008cf390d909b823763064b63afefe9f02d8afdb13eb3f485b871afee956b
+      sha256: f967a7138f5d2ffb1ce15950e2a382924239eaa521150a8f144af34e68b3b3e5
       url: "https://pub.dev"
     source: hosted
-    version: "2.19.0"
+    version: "2.18.1"
   firebase_messaging:
     dependency: "direct main"
     description:
       name: firebase_messaging
-      sha256: "48a8a59197c1c5174060ba9aa1e0036e9b5a0d28a0cc22d19c1fcabc67fafe3c"
+      sha256: eb6e28a3a35deda61fe8634967c84215efc19133ba58d8e0fc6c9a2af2cba05e
       url: "https://pub.dev"
     source: hosted
-    version: "15.2.0"
+    version: "15.1.3"
   firebase_messaging_platform_interface:
     dependency: transitive
     description:
       name: firebase_messaging_platform_interface
-      sha256: "9770a8e91f54296829dcaa61ce9b7c2f9ae9abbf99976dd3103a60470d5264dd"
+      sha256: b316c4ee10d93d32c033644207afc282d9b2b4372f3cf9c6022f3558b3873d2d
       url: "https://pub.dev"
     source: hosted
-    version: "4.6.0"
+    version: "4.5.46"
   firebase_messaging_web:
     dependency: transitive
     description:
       name: firebase_messaging_web
-      sha256: "329ca4ef45ec616abe6f1d5e58feed0934a50840a65aa327052354ad3c64ed77"
+      sha256: d7f0147a1a9fe4313168e20154a01fd5cf332898de1527d3930ff77b8c7f5387
       url: "https://pub.dev"
     source: hosted
-    version: "3.10.0"
+    version: "3.9.2"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
+      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -720,10 +744,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_animate
-      sha256: "7befe2d3252728afb77aecaaea1dec88a89d35b9b1d2eea6d04479e8af9117b5"
+      sha256: "7c8a6594a9252dad30cc2ef16e33270b6248c4dedc3b3d06c86c4f3f4dc05ae5"
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.2"
+    version: "4.5.0"
   flutter_cache_manager:
     dependency: "direct main"
     description:
@@ -789,10 +813,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_inappwebview
-      sha256: "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5"
+      sha256: "93cfcca02bdda4b26cd700cf70d9ddba09d8348e3e8f2857638c23ed23a4fcb4"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.5"
+    version: "6.1.4"
   flutter_inappwebview_android:
     dependency: transitive
     description:
@@ -805,10 +829,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_inappwebview_internal_annotations
-      sha256: "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd"
+      sha256: "5f80fd30e208ddded7dbbcd0d569e7995f9f63d45ea3f548d8dd4c0b473fb4c8"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.1.1"
   flutter_inappwebview_ios:
     dependency: transitive
     description:
@@ -845,10 +869,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_inappwebview_windows
-      sha256: "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055"
+      sha256: "95ebc65aecfa63b2084c822aec6ba0545f0a0afaa3899f2c752ec96c09108db5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.5.0+2"
   flutter_launcher_icons:
     dependency: "direct main"
     description:
@@ -869,10 +893,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: "674173fd3c9eda9d4c8528da2ce0ea69f161577495a9cc835a2a4ecd7eadeb35"
+      sha256: "49eeef364fddb71515bc78d5a8c51435a68bccd6e4d68e25a942c5e47761ae71"
       url: "https://pub.dev"
     source: hosted
-    version: "17.2.4"
+    version: "17.2.3"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
@@ -922,10 +946,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_native_splash
-      sha256: "7062602e0dbd29141fb8eb19220b5871ca650be5197ab9c1f193a28b17537bc7"
+      sha256: aa06fec78de2190f3db4319dd60fdc8d12b2626e93ef9828633928c2dcaea840
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.4"
+    version: "2.4.1"
   flutter_password_strength:
     dependency: "direct main"
     description:
@@ -938,10 +962,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e"
+      sha256: "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.24"
+    version: "2.0.23"
   flutter_secure_storage:
     dependency: "direct main"
     description:
@@ -954,18 +978,18 @@ packages:
     dependency: transitive
     description:
       name: flutter_secure_storage_linux
-      sha256: bf7404619d7ab5c0a1151d7c4e802edad8f33535abfbeff2f9e1fe1274e2d705
+      sha256: "4d91bfc23047422cbcd73ac684bc169859ee766482517c22172c86596bf1464b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.2.1"
   flutter_secure_storage_macos:
     dependency: transitive
     description:
       name: flutter_secure_storage_macos
-      sha256: "6c0a2795a2d1de26ae202a0d78527d163f4acbb11cde4c75c670f3a0fc064247"
+      sha256: "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.3"
+    version: "3.1.2"
   flutter_secure_storage_platform_interface:
     dependency: transitive
     description:
@@ -1026,10 +1050,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_svg
-      sha256: "54900a1a1243f3c4a5506d853a2b5c2dbc38d5f27e52a52618a8054401431123"
+      sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.16"
+    version: "2.0.10+1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -1044,10 +1068,10 @@ packages:
     dependency: "direct main"
     description:
       name: fluttertoast
-      sha256: "24467dc20bbe49fd63e57d8e190798c4d22cbbdac30e54209d153a15273721d1"
+      sha256: "95f349437aeebe524ef7d6c9bde3e6b4772717cf46a0eb6a3ceaddc740b297cc"
       url: "https://pub.dev"
     source: hosted
-    version: "8.2.10"
+    version: "8.2.8"
   fraction:
     dependency: "direct main"
     description:
@@ -1097,10 +1121,10 @@ packages:
     dependency: "direct main"
     description:
       name: google_nav_bar
-      sha256: bb12dd21514ee1b041ab3127673e2fd85e693337df308f7f2b75cd1e8e92eaf4
+      sha256: "1c8e3882fa66ee7b74c24320668276ca23affbd58f0b14a24c1e5590f4d07ab0"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.7"
+    version: "5.0.6"
   graphs:
     dependency: transitive
     description:
@@ -1129,10 +1153,10 @@ packages:
     dependency: transitive
     description:
       name: html
-      sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec"
+      sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.5"
+    version: "0.15.4"
   html_unescape:
     dependency: "direct main"
     description:
@@ -1161,10 +1185,10 @@ packages:
     dependency: transitive
     description:
       name: http_multi_server
-      sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8
+      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.2"
+    version: "3.2.1"
   http_parser:
     dependency: transitive
     description:
@@ -1173,14 +1197,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
+  http_profile:
+    dependency: transitive
+    description:
+      name: http_profile
+      sha256: "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
   image:
     dependency: "direct main"
     description:
       name: image
-      sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d
+      sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
       url: "https://pub.dev"
     source: hosted
-    version: "4.3.0"
+    version: "4.2.0"
   image_editor:
     dependency: "direct main"
     description:
@@ -1225,26 +1257,26 @@ packages:
     dependency: transitive
     description:
       name: image_picker_android
-      sha256: aa6f1280b670861ac45220cc95adc59bb6ae130259d36f980ccb62220dc5e59f
+      sha256: d3e5e00fdfeca8fd4ffb3227001264d449cc8950414c2ff70b0e06b9c628e643
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.12+19"
+    version: "0.8.12+15"
   image_picker_for_web:
     dependency: transitive
     description:
       name: image_picker_for_web
-      sha256: "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83"
+      sha256: "65d94623e15372c5c51bebbcb820848d7bcb323836e12dfdba60b5d3a8b39e50"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.6"
+    version: "3.0.5"
   image_picker_ios:
     dependency: transitive
     description:
       name: image_picker_ios
-      sha256: "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100"
+      sha256: "6703696ad49f5c3c8356d576d7ace84d1faf459afb07accbb0fae780753ff447"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.12+2"
+    version: "0.8.12"
   image_picker_linux:
     dependency: transitive
     description:
@@ -1265,10 +1297,10 @@ packages:
     dependency: transitive
     description:
       name: image_picker_platform_interface
-      sha256: "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0"
+      sha256: "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.1"
+    version: "2.10.0"
   image_picker_windows:
     dependency: transitive
     description:
@@ -1289,10 +1321,10 @@ packages:
     dependency: transitive
     description:
       name: in_app_purchase_android
-      sha256: fa1befc0e25374d16ca532154546503f25a865ed6e7ea5641f4f2b75b092d669
+      sha256: bee60266e443d4ae0e4809bae7f9cd4d6be75ab5ec6bb3d2ca737774a274a3bd
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.6+12"
+    version: "0.3.6+9"
   in_app_purchase_platform_interface:
     dependency: transitive
     description:
@@ -1305,10 +1337,10 @@ packages:
     dependency: transitive
     description:
       name: in_app_purchase_storekit
-      sha256: d3187532f20ae4aca3bb65e3adaf09f9a870294b1709d2971bb8485f1825d472
+      sha256: e9a408da11d055f9af9849859e1251b2b0a2f84f256fa3bf1285c5614a397079
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.20+3"
+    version: "0.3.18+1"
   integration_test:
     dependency: "direct dev"
     description: flutter
@@ -1334,10 +1366,18 @@ packages:
     dependency: transitive
     description:
       name: io
-      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
+      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.5"
+    version: "1.0.4"
+  jni:
+    dependency: transitive
+    description:
+      name: jni
+      sha256: f377c585ea9c08d48b427dc2e03780af2889d1bb094440da853c6883c1acba4b
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.1"
   js:
     dependency: transitive
     description:
@@ -1358,10 +1398,10 @@ packages:
     dependency: "direct dev"
     description:
       name: json_serializable
-      sha256: c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c
+      sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b
       url: "https://pub.dev"
     source: hosted
-    version: "6.9.0"
+    version: "6.8.0"
   latlong2:
     dependency: "direct main"
     description:
@@ -1446,10 +1486,10 @@ packages:
     dependency: transitive
     description:
       name: local_auth_darwin
-      sha256: "5c5127061107278ab4cafa1ac51b3b6760282bf1a2abf011270908a429d1634b"
+      sha256: "6d2950da311d26d492a89aeb247c72b4653ddc93601ea36a84924a396806d49c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.2"
+    version: "1.4.1"
   local_auth_ios:
     dependency: "direct main"
     description:
@@ -1478,18 +1518,18 @@ packages:
     dependency: transitive
     description:
       name: logger
-      sha256: be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1
+      sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.4.0"
   logging:
     dependency: "direct main"
     description:
       name: logging
-      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
+      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.2.0"
   lottie:
     dependency: "direct main"
     description:
@@ -1631,10 +1671,10 @@ packages:
     dependency: transitive
     description:
       name: mime
-      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
+      sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "1.0.6"
   ml_linalg:
     dependency: "direct main"
     description:
@@ -1702,6 +1742,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  native_dio_adapter:
+    dependency: "direct main"
+    description:
+      name: native_dio_adapter
+      sha256: "7420bc9517b2abe09810199a19924617b45690a44ecfb0616ac9babc11875c03"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
   native_video_player:
     dependency: "direct main"
     description:
@@ -1735,6 +1783,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.2"
+  objective_c:
+    dependency: transitive
+    description:
+      name: objective_c
+      sha256: "62e79ab8c3ed6f6a340ea50dd48d65898f5d70425d404f0d99411f6e56e04584"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.0"
   octo_image:
     dependency: transitive
     description:
@@ -1771,10 +1827,10 @@ packages:
     dependency: transitive
     description:
       name: package_config
-      sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
+      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.0"
   package_info_plus:
     dependency: "direct main"
     description:
@@ -1795,10 +1851,10 @@ packages:
     dependency: "direct main"
     description:
       name: page_transition
-      sha256: "9d2a780d7d68b53ae82fbcc43e06a16195e6775e9aae40e55dc0cbb593460f9d"
+      sha256: dee976b1f23de9bbef5cd512fe567e9f6278caee11f5eaca9a2115c19dc49ef6
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.1.0"
   panorama:
     dependency: "direct main"
     description:
@@ -1836,34 +1892,34 @@ packages:
     dependency: transitive
     description:
       name: path_parsing
-      sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca"
+      sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.0.1"
   path_provider:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
+      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.4"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
+      sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.15"
+    version: "2.2.12"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -1908,10 +1964,10 @@ packages:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1"
+      sha256: "76e4ab092c1b240d31177bb64d2b0bea43f43d0e23541ec866151b9f7b2490fa"
       url: "https://pub.dev"
     source: hosted
-    version: "12.0.13"
+    version: "12.0.12"
   permission_handler_apple:
     dependency: transitive
     description:
@@ -1924,10 +1980,10 @@ packages:
     dependency: transitive
     description:
       name: permission_handler_html
-      sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24"
+      sha256: af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.3+5"
+    version: "0.1.3+2"
   permission_handler_platform_interface:
     dependency: transitive
     description:
@@ -1956,10 +2012,10 @@ packages:
     dependency: "direct main"
     description:
       name: photo_manager
-      sha256: dc26184676b26d722d656073ca8fe29203d7631ec613aed1a9679de3aa1f52c2
+      sha256: "0bc7548fd3111eb93a3b0abf1c57364e40aeda32512c100085a48dade60e574f"
       url: "https://pub.dev"
     source: hosted
-    version: "3.6.3"
+    version: "3.6.4"
   photo_manager_image_provider:
     dependency: transitive
     description:
@@ -2068,18 +2124,18 @@ packages:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
+      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.4"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0"
+      sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.3.0"
   quiver:
     dependency: "direct main"
     description:
@@ -2092,10 +2148,10 @@ packages:
     dependency: "direct main"
     description:
       name: receive_sharing_intent
-      sha256: ec76056e4d258ad708e76d85591d933678625318e411564dcb9059048ca3a593
+      sha256: f127989f8662ea15e193bd1e10605e5a0ab6bb92dffd51f3ce002feb0ce24c93
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.0"
   rxdart:
     dependency: transitive
     description:
@@ -2180,58 +2236,58 @@ packages:
     dependency: "direct main"
     description:
       name: sentry
-      sha256: "576ad83415102ba2060142a6701611abc6e67a55af1d7ab339cedd3ba1b0f84c"
+      sha256: "033287044a6644a93498969449d57c37907e56f5cedb17b88a3ff20a882261dd"
       url: "https://pub.dev"
     source: hosted
-    version: "8.12.0"
+    version: "8.9.0"
   sentry_flutter:
     dependency: "direct main"
     description:
       name: sentry_flutter
-      sha256: dc3761e8659839cc67a18432d9f12e5531affb7ff68e196dbb56846909b5dfdc
+      sha256: "3780b5a0bb6afd476857cfbc6c7444d969c29a4d9bd1aa5b6960aa76c65b737a"
       url: "https://pub.dev"
     source: hosted
-    version: "8.12.0"
+    version: "8.9.0"
   share_plus:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: "6327c3f233729374d0abaafd61f6846115b2a481b4feddd8534211dc10659400"
+      sha256: "468c43f285207c84bcabf5737f33b914ceb8eb38398b91e5e3ad1698d1b72a52"
       url: "https://pub.dev"
     source: hosted
-    version: "10.1.3"
+    version: "10.0.2"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b
+      sha256: "6ababf341050edff57da8b6990f11f4e99eaba837865e2e6defe16d039619db5"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.2"
+    version: "5.0.0"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a
+      sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.5"
+    version: "2.3.2"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d"
+      sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.3.3"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03"
+      sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.4"
+    version: "2.5.3"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -2292,10 +2348,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
+      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.0"
   simple_cluster:
     dependency: "direct main"
     description:
@@ -2321,10 +2377,10 @@ packages:
     dependency: transitive
     description:
       name: source_helper
-      sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c"
+      sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.5"
+    version: "1.3.4"
   source_map_stack_trace:
     dependency: transitive
     description:
@@ -2337,10 +2393,10 @@ packages:
     dependency: transitive
     description:
       name: source_maps
-      sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812"
+      sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703"
       url: "https://pub.dev"
     source: hosted
-    version: "0.10.13"
+    version: "0.10.12"
   source_span:
     dependency: transitive
     description:
@@ -2361,10 +2417,10 @@ packages:
     dependency: "direct main"
     description:
       name: sqflite
-      sha256: "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb"
+      sha256: "79a297dc3cc137e758c6a4baf83342b039e5a6d2436fcdf3f96a00adaaf2ad62"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.0"
   sqflite_android:
     dependency: transitive
     description:
@@ -2377,18 +2433,18 @@ packages:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709"
+      sha256: "4468b24876d673418a7b7147e5a08a715b4998a7ae69227acafaab762e0e5490"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.4+6"
+    version: "2.5.4+5"
   sqflite_darwin:
     dependency: transitive
     description:
       name: sqflite_darwin
-      sha256: "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c"
+      sha256: "769733dddf94622d5541c73e4ddc6aa7b252d865285914b6fcd54a63c4b4f027"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1+1"
+    version: "2.4.1-1"
   sqflite_migration:
     dependency: "direct main"
     description:
@@ -2409,18 +2465,18 @@ packages:
     dependency: transitive
     description:
       name: sqlite3
-      sha256: cb7f4e9dc1b52b1fa350f7b3d41c662e75fc3d399555fa4e5efcf267e9a4fbb5
+      sha256: "45f168ae2213201b54e09429ed0c593dc2c88c924a1488d6f9c523a255d567cb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.4.6"
   sqlite3_flutter_libs:
     dependency: "direct main"
     description:
       name: sqlite3_flutter_libs
-      sha256: "73016db8419f019e807b7a5e5fbf2a7bd45c165fed403b8e7681230f3a102785"
+      sha256: "62bbb4073edbcdf53f40c80775f33eea01d301b7b81417e5b3fb7395416258c1"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.28"
+    version: "0.5.24"
   sqlite_async:
     dependency: "direct main"
     description:
@@ -2457,10 +2513,10 @@ packages:
     dependency: transitive
     description:
       name: stream_transform
-      sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871
+      sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
@@ -2561,10 +2617,10 @@ packages:
     dependency: transitive
     description:
       name: timing
-      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
+      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.1"
   transparent_image:
     dependency: transitive
     description:
@@ -2585,18 +2641,18 @@ packages:
     dependency: transitive
     description:
       name: typed_data
-      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
+      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.3.2"
   ua_client_hints:
     dependency: "direct main"
     description:
       name: ua_client_hints
-      sha256: "1b8759a46bfeab355252881df27f2604c01bded86aa2b578869fb1b638b23118"
+      sha256: dfea54a1b4d259c057d0f33f198094cf4e09e1a21d347baadbe6dbd3d820c0d4
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.0"
   uni_links:
     dependency: "direct main"
     description:
@@ -2657,42 +2713,42 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
+      sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.1"
+    version: "6.3.0"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193"
+      sha256: "8fc3bae0b68c02c47c5c86fa8bfa74471d42687b0eded01b78de87872db745e2"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.14"
+    version: "6.3.12"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626"
+      sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.2"
+    version: "6.3.1"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935"
+      sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.1"
+    version: "3.2.0"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2"
+      sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.2"
+    version: "3.2.1"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -2713,10 +2769,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_windows
-      sha256: "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4"
+      sha256: "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.3"
+    version: "3.1.2"
   utility:
     dependency: transitive
     description:
@@ -2737,26 +2793,26 @@ packages:
     dependency: transitive
     description:
       name: vector_graphics
-      sha256: "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7"
+      sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.15"
+    version: "1.1.11+1"
   vector_graphics_codec:
     dependency: transitive
     description:
       name: vector_graphics_codec
-      sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146"
+      sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.13"
+    version: "1.1.11+1"
   vector_graphics_compiler:
     dependency: transitive
     description:
       name: vector_graphics_compiler
-      sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad"
+      sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.16"
+    version: "1.1.11+1"
   vector_math:
     dependency: transitive
     description:
@@ -2787,18 +2843,18 @@ packages:
     dependency: transitive
     description:
       name: video_player_android
-      sha256: "391e092ba4abe2f93b3e625bd6b6a6ec7d7414279462c1c0ee42b5ab8d0a0898"
+      sha256: ae5287ca367e206eb74d7b3dc1ce0b8912ab9a3fc0597b6a101a0a5239f229d3
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.16"
+    version: "2.7.9"
   video_player_avfoundation:
     dependency: transitive
     description:
       name: video_player_avfoundation
-      sha256: "33224c19775fd244be2d6e3dbd8e1826ab162877bd61123bf71890772119a2b7"
+      sha256: cd5ab8a8bc0eab65ab0cea40304097edc46da574c8c1ecdee96f28cd8ef3792f
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.5"
+    version: "2.6.2"
   video_player_media_kit:
     dependency: "direct main"
     description:
@@ -2819,10 +2875,10 @@ packages:
     dependency: transitive
     description:
       name: video_player_web
-      sha256: "881b375a934d8ebf868c7fb1423b2bfaa393a0a265fa3f733079a86536064a10"
+      sha256: "6dcdd298136523eaf7dfc31abaf0dfba9aa8a8dbc96670e87e9d42b6f2caf774"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.3"
+    version: "2.3.2"
   video_thumbnail:
     dependency: "direct main"
     description:
@@ -2867,10 +2923,10 @@ packages:
     dependency: transitive
     description:
       name: wakelock_plus_platform_interface
-      sha256: "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a"
+      sha256: "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.2.1"
   wallpaper_manager_flutter:
     dependency: "direct main"
     description:
@@ -2883,10 +2939,10 @@ packages:
     dependency: "direct overridden"
     description:
       name: watcher
-      sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104"
+      sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.0"
   web:
     dependency: transitive
     description:
@@ -2947,10 +3003,10 @@ packages:
     dependency: "direct overridden"
     description:
       name: win32
-      sha256: "154360849a56b7b67331c21f09a386562d88903f90a1099c5987afc1912e1f29"
+      sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec"
       url: "https://pub.dev"
     source: hosted
-    version: "5.10.0"
+    version: "5.5.5"
   win32_registry:
     dependency: transitive
     description:
@@ -3003,10 +3059,10 @@ packages:
     dependency: transitive
     description:
       name: yaml
-      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
+      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.3"
+    version: "3.1.2"
 sdks:
   dart: ">=3.5.0 <4.0.0"
   flutter: ">=3.24.0"
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index a838e76747..cd577e5099 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.94+994
+version: 0.9.95+995
 publish_to: none
 
 environment:
@@ -42,7 +42,7 @@ dependencies:
   dart_ui_isolate: ^1.1.1
   defer_pointer: ^0.0.2
   device_info_plus: ^9.0.3
-  dio: ^4.0.6
+  dio: ^5.8.0+1
   dots_indicator: ^2.0.0
   dotted_border: ^2.1.0
   dropdown_button2: ^2.0.0
@@ -130,6 +130,7 @@ dependencies:
     git: "https://github.com/ente-io/motionphoto.git"
   move_to_background: ^1.0.2
   nanoid: ^1.0.0
+  native_dio_adapter: ^1.4.0
   native_video_player:
     git:
       url: https://github.com/ashilkn/native_video_player.git
diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go
index e1a3622011..9ddb958596 100644
--- a/server/cmd/museum/main.go
+++ b/server/cmd/museum/main.go
@@ -943,7 +943,7 @@ func setupAndStartCrons(userAuthRepo *repo.UserAuthRepository, publicCollectionR
 		}
 	})
 
-	schedule(c, "@every 10m", func() {
+	schedule(c, "@every 8m", func() {
 		fileController.CleanupDeletedFiles()
 	})
 	schedule(c, "@every 101s", func() {
diff --git a/server/pkg/controller/file.go b/server/pkg/controller/file.go
index 7f871cc098..be9a553756 100644
--- a/server/pkg/controller/file.go
+++ b/server/pkg/controller/file.go
@@ -6,11 +6,13 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/ente-io/museum/pkg/controller/discord"
-	"github.com/ente-io/museum/pkg/utils/network"
 	"runtime/debug"
 	"strconv"
 	"strings"
+	"sync"
+
+	"github.com/ente-io/museum/pkg/controller/discord"
+	"github.com/ente-io/museum/pkg/utils/network"
 
 	"github.com/ente-io/museum/pkg/controller/email"
 	"github.com/ente-io/museum/pkg/controller/lock"
@@ -695,14 +697,38 @@ func (c *FileController) CleanupDeletedFiles() {
 	defer func() {
 		c.LockController.ReleaseLock(DeletedObjectQueueLock)
 	}()
-	items, err := c.QueueRepo.GetItemsReadyForDeletion(repo.DeleteObjectQueue, 1500)
+	items, err := c.QueueRepo.GetItemsReadyForDeletion(repo.DeleteObjectQueue, 5000)
 	if err != nil {
 		log.WithError(err).Error("Failed to fetch items from queue")
 		return
 	}
-	for _, i := range items {
-		c.cleanupDeletedFile(i)
+	var wg sync.WaitGroup
+	itemChan := make(chan repo.QueueItem, len(items))
+
+	// Start worker goroutines
+	for w := 0; w < 4; w++ {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			for item := range itemChan {
+				func(item repo.QueueItem) {
+					defer func() {
+						if r := recover(); r != nil {
+							log.WithField("item", item.Item).Errorf("Recovered from panic: %v", r)
+						}
+					}()
+					c.cleanupDeletedFile(item)
+				}(item)
+			}
+		}()
 	}
+	// Send items to the channel
+	for _, item := range items {
+		itemChan <- item
+	}
+	close(itemChan)
+	// Wait for all workers to finish
+	wg.Wait()
 }
 
 func (c *FileController) GetTotalFileCount() (int64, error) {
diff --git a/web/.gitignore b/web/.gitignore
index 68554d3aef..c84e88f833 100644
--- a/web/.gitignore
+++ b/web/.gitignore
@@ -18,5 +18,6 @@ dist
 
 # Next.js
 .next/
+.next-desktop/
 out/
 next-env.d.ts
diff --git a/web/apps/accounts/src/pages/_app.tsx b/web/apps/accounts/src/pages/_app.tsx
index 4d099c0c67..e510a5d75d 100644
--- a/web/apps/accounts/src/pages/_app.tsx
+++ b/web/apps/accounts/src/pages/_app.tsx
@@ -1,6 +1,6 @@
 import { staticAppTitle } from "@/base/app";
 import { CustomHead } from "@/base/components/Head";
-import { LoadingOverlay } from "@/base/components/loaders";
+import { LoadingIndicator } from "@/base/components/loaders";
 import { AttributedMiniDialog } from "@/base/components/MiniDialog";
 import { useAttributedMiniDialog } from "@/base/components/utils/dialog";
 import { useSetupI18n, useSetupLogs } from "@/base/components/utils/hooks-app";
@@ -32,7 +32,7 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
                 <AttributedMiniDialog {...miniDialogProps} />
 
                 <AppContext.Provider value={appContext}>
-                    {!isI18nReady && <LoadingOverlay />}
+                    {!isI18nReady && <LoadingIndicator />}
                     {isI18nReady && <Component {...pageProps} />}
                 </AppContext.Provider>
             </ThemeProvider>
diff --git a/web/apps/accounts/src/pages/passkeys/index.tsx b/web/apps/accounts/src/pages/passkeys/index.tsx
index d5927f30cd..597c319527 100644
--- a/web/apps/accounts/src/pages/passkeys/index.tsx
+++ b/web/apps/accounts/src/pages/passkeys/index.tsx
@@ -1,5 +1,6 @@
+import { EnteLogo } from "@/base/components/EnteLogo";
 import { SidebarDrawer } from "@/base/components/mui/SidebarDrawer";
-import { AppNavbarNormalFlow } from "@/base/components/Navbar";
+import { NavbarBase } from "@/base/components/Navbar";
 import {
     RowButton,
     RowButtonDivider,
@@ -116,7 +117,9 @@ const Page: React.FC = () => {
 
     return (
         <Stack sx={{ minHeight: "100svh" }}>
-            <AppNavbarNormalFlow />
+            <NavbarBase>
+                <EnteLogo />
+            </NavbarBase>
             <Stack
                 sx={{ alignSelf: "center", m: 3, maxWidth: "375px", gap: 3 }}
             >
diff --git a/web/apps/auth/src/pages/_app.tsx b/web/apps/auth/src/pages/_app.tsx
index a090d47d79..e3c92a117a 100644
--- a/web/apps/auth/src/pages/_app.tsx
+++ b/web/apps/auth/src/pages/_app.tsx
@@ -2,7 +2,7 @@ import { accountLogout } from "@/accounts/services/logout";
 import { clientPackageName, staticAppTitle } from "@/base/app";
 import { CustomHead } from "@/base/components/Head";
 import {
-    LoadingOverlay,
+    LoadingIndicator,
     TranslucentLoadingOverlay,
 } from "@/base/components/loaders";
 import { AttributedMiniDialog } from "@/base/components/MiniDialog";
@@ -68,7 +68,7 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
 
                 <AppContext.Provider value={appContext}>
                     {!isI18nReady ? (
-                        <LoadingOverlay />
+                        <LoadingIndicator />
                     ) : (
                         <>
                             {isChangingRoute && <TranslucentLoadingOverlay />}
diff --git a/web/apps/auth/src/pages/auth.tsx b/web/apps/auth/src/pages/auth.tsx
index 1562bae3e8..cdf2195439 100644
--- a/web/apps/auth/src/pages/auth.tsx
+++ b/web/apps/auth/src/pages/auth.tsx
@@ -134,11 +134,19 @@ const AuthNavbar: React.FC = () => {
     const { logout } = useAppContext();
 
     return (
-        <NavbarBase>
-            <Stack direction="row" sx={{ flex: 1, justifyContent: "center" }}>
-                <EnteLogo />
-            </Stack>
-            <Stack direction="row" sx={{ position: "absolute", right: "24px" }}>
+        <NavbarBase
+            sx={{
+                position: "sticky",
+                top: 0,
+                left: 0,
+                mb: 2,
+                zIndex: 1,
+                backgroundColor: "backdrop.muted",
+                backdropFilter: "blur(7px)",
+            }}
+        >
+            <EnteLogo />
+            <Box sx={{ position: "absolute", right: "24px" }}>
                 <OverflowMenu ariaID="auth-options">
                     <OverflowMenuOption
                         color="critical"
@@ -148,7 +156,7 @@ const AuthNavbar: React.FC = () => {
                         {t("logout")}
                     </OverflowMenuOption>
                 </OverflowMenu>
-            </Stack>
+            </Box>
         </NavbarBase>
     );
 };
diff --git a/web/apps/auth/src/pages/share.tsx b/web/apps/auth/src/pages/share.tsx
index 5f542394ce..e2bba39bfd 100644
--- a/web/apps/auth/src/pages/share.tsx
+++ b/web/apps/auth/src/pages/share.tsx
@@ -147,7 +147,7 @@ const Page: React.FC = () => {
                                 backgroundColor: "#1c1c1e",
                             }),
                             borderRadius: "10px",
-                            paddingBottom: "20px",
+                            pb: "20px",
                             position: "relative",
                         })}
                     >
diff --git a/web/apps/photos/src/components/Collections/AlbumCastDialog.tsx b/web/apps/photos/src/components/Collections/AlbumCastDialog.tsx
index 4f74d5699d..6618280209 100644
--- a/web/apps/photos/src/components/Collections/AlbumCastDialog.tsx
+++ b/web/apps/photos/src/components/Collections/AlbumCastDialog.tsx
@@ -4,7 +4,7 @@ import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import log from "@/base/log";
 import type { Collection } from "@/media/collection";
 import { useSettingsSnapshot } from "@/new/photos/components/utils/use-snapshot";
-import { aboveGalleryContentZ } from "@/new/photos/components/utils/z-index";
+import { aboveFileViewerContentZ } from "@/new/photos/components/utils/z-index";
 import {
     publishCastPayload,
     revokeAllCastTokens,
@@ -134,7 +134,7 @@ export const AlbumCastDialog: React.FC<AlbumCastDialogProps> = ({
             open={open}
             onClose={onClose}
             title={t("cast_album_to_tv")}
-            sx={{ zIndex: aboveGalleryContentZ }}
+            sx={{ zIndex: aboveFileViewerContentZ }}
         >
             {view == "choose" && (
                 <Stack sx={{ py: 1, gap: 4 }}>
diff --git a/web/apps/photos/src/components/Collections/CollectionHeader.tsx b/web/apps/photos/src/components/Collections/CollectionHeader.tsx
index 0b2bc87a06..86f3c61070 100644
--- a/web/apps/photos/src/components/Collections/CollectionHeader.tsx
+++ b/web/apps/photos/src/components/Collections/CollectionHeader.tsx
@@ -1,5 +1,5 @@
 import { assertionFailed } from "@/base/assert";
-import { SpaceBetweenFlex } from "@/base/components/containers";
+import { SpacedRow } from "@/base/components/containers";
 import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
 import {
     OverflowMenu,
@@ -103,14 +103,14 @@ export const CollectionHeader: React.FC<CollectionHeaderProps> = (props) => {
 
     return (
         <GalleryItemsHeaderAdapter>
-            <SpaceBetweenFlex>
+            <SpacedRow>
                 <GalleryItemsSummary
                     name={name}
                     fileCount={fileCount}
                     endIcon={<EndIcon type={type} />}
                 />
                 {shouldShowOptions(type) && <CollectionOptions {...props} />}
-            </SpaceBetweenFlex>
+            </SpacedRow>
         </GalleryItemsHeaderAdapter>
     );
 };
diff --git a/web/apps/photos/src/components/Collections/CollectionShare.tsx b/web/apps/photos/src/components/Collections/CollectionShare.tsx
index 75bff3a74e..69c0518212 100644
--- a/web/apps/photos/src/components/Collections/CollectionShare.tsx
+++ b/web/apps/photos/src/components/Collections/CollectionShare.tsx
@@ -287,7 +287,7 @@ const EnablePublicShareOptions: React.FC<EnablePublicShareOptionsProps> = ({
                     startIcon={<LinkIcon />}
                     onClick={createSharableURLHelper}
                 />
-                <RowButtonDivider hasIcon />
+                <RowButtonDivider />
                 <RowButton
                     label={t("collect_photos")}
                     startIcon={<DownloadSharpIcon />}
@@ -382,7 +382,7 @@ const EmailShare: React.FC<EmailShareProps> = ({ collection, onRootClose }) => {
                                 endIcon={<ChevronRightIcon />}
                                 onClick={openManageEmailShare}
                             />
-                            <RowButtonDivider hasIcon />
+                            <RowButtonDivider />
                         </>
                     ) : null}
                     <RowButton
@@ -390,7 +390,7 @@ const EmailShare: React.FC<EmailShareProps> = ({ collection, onRootClose }) => {
                         onClick={openAddViewer}
                         label={t("add_viewers")}
                     />
-                    <RowButtonDivider hasIcon />
+                    <RowButtonDivider />
                     <RowButton
                         startIcon={<AddIcon />}
                         onClick={openAddCollab}
@@ -923,7 +923,7 @@ const ManageEmailShare: React.FC<ManageEmailShareProps> = ({
                                             startIcon={<Avatar email={item} />}
                                             endIcon={<ChevronRightIcon />}
                                         />
-                                        <RowButtonDivider hasIcon />
+                                        <RowButtonDivider />
                                     </React.Fragment>
                                 ))}
 
@@ -954,7 +954,7 @@ const ManageEmailShare: React.FC<ManageEmailShareProps> = ({
                                             startIcon={<Avatar email={item} />}
                                             endIcon={<ChevronRightIcon />}
                                         />
-                                        <RowButtonDivider hasIcon />
+                                        <RowButtonDivider />
                                     </React.Fragment>
                                 ))}
                                 <RowButton
@@ -1124,7 +1124,7 @@ const ManageParticipant: React.FC<ManageParticipantProps> = ({
                                         "COLLABORATOR" && <DoneIcon />
                                 }
                             />
-                            <RowButtonDivider hasIcon />
+                            <RowButtonDivider />
 
                             <RowButton
                                 fontWeight="regular"
@@ -1281,8 +1281,7 @@ const ManagePublicShare: React.FC<ManagePublicShareProps> = ({
                             label={t("copy_link")}
                         />
                     )}
-
-                    <RowButtonDivider hasIcon={true} />
+                    <RowButtonDivider />
                     <RowButton
                         startIcon={<LinkIcon />}
                         endIcon={<ChevronRightIcon />}
diff --git a/web/apps/photos/src/components/FilesDownloadProgress.tsx b/web/apps/photos/src/components/FilesDownloadProgress.tsx
index ae53eee4f8..568741c8bc 100644
--- a/web/apps/photos/src/components/FilesDownloadProgress.tsx
+++ b/web/apps/photos/src/components/FilesDownloadProgress.tsx
@@ -1,5 +1,5 @@
 import { Notification } from "@/new/photos/components/Notification";
-import { aboveGalleryContentZ } from "@/new/photos/components/utils/z-index";
+import { aboveFileViewerContentZ } from "@/new/photos/components/utils/z-index";
 import { useAppContext } from "@/new/photos/types/context";
 import { t } from "i18next";
 import { GalleryContext } from "pages/gallery";
@@ -120,7 +120,7 @@ export const FilesDownloadProgress: React.FC<FilesDownloadProgressProps> = ({
                     horizontal="left"
                     sx={{
                         "&&": { bottom: `${index * 80 + 20}px` },
-                        zIndex: aboveGalleryContentZ,
+                        zIndex: aboveFileViewerContentZ,
                     }}
                     open={isFilesDownloadStarted(attributes)}
                     onClose={handleClose(attributes)}
diff --git a/web/apps/photos/src/components/FixCreationTime.tsx b/web/apps/photos/src/components/FixCreationTime.tsx
index dde6106276..878a9d1c60 100644
--- a/web/apps/photos/src/components/FixCreationTime.tsx
+++ b/web/apps/photos/src/components/FixCreationTime.tsx
@@ -82,11 +82,11 @@ export const FixCreationTime: React.FC<FixCreationTimeProps> = ({
                 onClose();
             }}
         >
-            <DialogTitle sx={{ marginBlockStart: "4px" }}>{title}</DialogTitle>
+            <DialogTitle sx={{ mt: "4px" }}>{title}</DialogTitle>
             <DialogContent
-                style={{
+                sx={{
                     minWidth: "310px",
-                    paddingBlockStart: "6px",
+                    pt: "6px",
                     display: "flex",
                     flexDirection: "column",
                     ...(step == "running" ? { alignItems: "center" } : {}),
@@ -181,7 +181,7 @@ const OptionsForm: React.FC<OptionsFormProps> = ({
                         name={"option"}
                         value={values.option}
                         onChange={handleChange}
-                        sx={{ paddingBlockStart: 1 }}
+                        sx={{ pt: 1 }}
                     >
                         <FormControlLabel
                             value={"date-time-original"}
diff --git a/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx b/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx
index eed436d312..d79f55eec1 100644
--- a/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx
@@ -1,4 +1,3 @@
-import { CopyButton } from "@/base/components/CopyButton";
 import { LinkButtonUndecorated } from "@/base/components/LinkButton";
 import { TitledMiniDialog } from "@/base/components/MiniDialog";
 import { type ButtonishProps } from "@/base/components/mui";
@@ -20,6 +19,7 @@ import {
     type ParsedMetadataDate,
 } from "@/media/file-metadata";
 import { FileType } from "@/media/file-type";
+import { CopyButton } from "@/new/photos/components/FileInfo";
 import { ChipButton } from "@/new/photos/components/mui/ChipButton";
 import { FilePeopleList } from "@/new/photos/components/PeopleList";
 import { PhotoDateTimePicker } from "@/new/photos/components/PhotoDateTimePicker";
@@ -29,7 +29,7 @@ import {
 } from "@/new/photos/components/utils/dialog";
 import { useSettingsSnapshot } from "@/new/photos/components/utils/use-snapshot";
 import {
-    aboveGalleryContentZ,
+    aboveFileViewerContentZ,
     fileInfoDrawerZ,
 } from "@/new/photos/components/utils/z-index";
 import { tagNumericValue, type RawExifTags } from "@/new/photos/services/exif";
@@ -259,9 +259,8 @@ export const FileInfo: React.FC<FileInfoProps> = ({
                             }
                             trailingButton={
                                 <CopyButton
-                                    code={openStreetMapLink(location)}
-                                    color="secondary"
                                     size="medium"
+                                    text={openStreetMapLink(location)}
                                 />
                             }
                         />
@@ -816,7 +815,7 @@ const FileNameEditDialog = ({
     };
     return (
         <TitledMiniDialog
-            sx={{ zIndex: aboveGalleryContentZ }}
+            sx={{ zIndex: aboveFileViewerContentZ }}
             open={isInEditMode}
             onClose={closeEditMode}
             title={t("rename_file")}
@@ -976,7 +975,7 @@ const RawExif: React.FC<RawExifProps> = ({
                 caption={fileName}
                 onRootClose={handleRootClose}
                 actionButton={
-                    <CopyButton code={JSON.stringify(tags)} color="secondary" />
+                    <CopyButton size="small" text={JSON.stringify(tags)} />
                 }
             />
             <Stack sx={{ gap: 2, py: 3, px: 1 }}>
diff --git a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
index 656eb9a7ac..4ee4ab91f2 100644
--- a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
@@ -12,7 +12,7 @@ import log from "@/base/log";
 import { downloadAndRevokeObjectURL } from "@/base/utils/web";
 import { downloadManager } from "@/gallery/services/download";
 import { EnteFile } from "@/media/file";
-import { aboveGalleryContentZ } from "@/new/photos/components/utils/z-index";
+import { aboveFileViewerContentZ } from "@/new/photos/components/utils/z-index";
 import { getLocalCollections } from "@/new/photos/services/collections";
 import { AppContext } from "@/new/photos/types/context";
 import { CenteredFlex } from "@ente/shared/components/Container";
@@ -525,7 +525,7 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = (
         <Backdrop
             sx={{
                 backgroundColor: "background.default" /* Opaque */,
-                zIndex: aboveGalleryContentZ,
+                zIndex: aboveFileViewerContentZ,
                 width: "100%",
             }}
             open
@@ -990,7 +990,6 @@ const FreehandCropRegion = forwardRef(
                         gridTemplateColumns: "1fr 1fr 1fr",
                         gridTemplateRows: "1fr 1fr 1fr",
                         gap: "0px",
-                        zIndex: 30, // make sure the crop box is above the overlays
                     }}
                     ref={ref}
                 >
diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index 5a95b8337e..16d04eb195 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -13,11 +13,10 @@ import { downloadManager } from "@/gallery/services/download";
 import { fileLogID, type EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import { isHEICExtension, needsJPEGConversion } from "@/media/formats";
-import { ConfirmDeleteFileDialog } from "@/new/photos/components/PhotoViewer";
+import { ConfirmDeleteFileDialog } from "@/new/photos/components/FileViewer";
 import { moveToTrash } from "@/new/photos/services/collection";
 import { extractRawExif, parseExif } from "@/new/photos/services/exif";
 import { AppContext } from "@/new/photos/types/context";
-import { FlexWrapper } from "@ente/shared/components/Container";
 import AlbumOutlinedIcon from "@mui/icons-material/AlbumOutlined";
 import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
 import ChevronRightIcon from "@mui/icons-material/ChevronRight";
@@ -39,6 +38,7 @@ import {
     CircularProgress,
     Paper,
     Snackbar,
+    Stack,
     styled,
     Typography,
     type ButtonProps,
@@ -744,16 +744,26 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
                     {livePhotoBtnOptions.visible && (
                         <LivePhotoBtnContainer>
                             <Button
-                                color="secondary"
+                                variant="text"
                                 onClick={livePhotoBtnOptions.click}
                                 onMouseEnter={livePhotoBtnOptions.show}
                                 onMouseLeave={livePhotoBtnOptions.hide}
                                 disabled={livePhotoBtnOptions.loading}
+                                sx={{
+                                    color: "white",
+                                    "&.Mui-disabled": {
+                                        color: "white",
+                                        opacity: 0.4,
+                                    },
+                                }}
                             >
-                                <FlexWrapper gap={"4px"}>
-                                    {<AlbumOutlinedIcon />}{" "}
+                                <Stack
+                                    direction="row"
+                                    sx={{ alignItems: "center", gap: "6px" }}
+                                >
+                                    <AlbumOutlinedIcon />
                                     {t("live_photo_indicator")}
-                                </FlexWrapper>
+                                </Stack>
                             </Button>
                         </LivePhotoBtnContainer>
                     )}
@@ -772,7 +782,8 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
                             position: "absolute",
                             top: "10vh",
                             right: "2vh",
-                            zIndex: 10,
+                            // Position atop the viewer contents
+                            zIndex: 1,
                         }}
                     >
                         {fileDownloadProgress.has(
@@ -794,7 +805,17 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
                         <div className="pswp__item" />
                     </div>
                     <div className="pswp__ui pswp__ui--hidden">
-                        <div className="pswp__top-bar">
+                        <div
+                            className="pswp__top-bar"
+                            style={
+                                isDesktop
+                                    ? ({
+                                          "--ente-pswp-top-bar-top":
+                                              "env(titlebar-area-height, 30px)",
+                                      } as React.CSSProperties)
+                                    : {}
+                            }
+                        >
                             <div className="pswp__counter" />
 
                             <button
@@ -1063,12 +1084,14 @@ const ConversionFailedNotification: React.FC<
     );
 };
 
-const LivePhotoBtnContainer = styled(Paper)`
+const LivePhotoBtnContainer = styled("div")`
     border-radius: 4px;
     position: absolute;
     bottom: 10vh;
     right: 6vh;
-    z-index: 10;
+    background-color: rgba(255 255 255 / 0.15);
+    backdrop-filter: blur(3px);
+    z-index: 1;
 `;
 
 export async function playVideo(livePhotoVideo, livePhotoImage) {
diff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsx
new file mode 100644
index 0000000000..583a9b1443
--- /dev/null
+++ b/web/apps/photos/src/components/Sidebar.tsx
@@ -0,0 +1,1137 @@
+import { RecoveryKey } from "@/accounts/components/RecoveryKey";
+import { openAccountsManagePasskeysPage } from "@/accounts/services/passkey";
+import { isDesktop } from "@/base/app";
+import { EnteLogo } from "@/base/components/EnteLogo";
+import { LinkButton } from "@/base/components/LinkButton";
+import {
+    RowButton,
+    RowButtonDivider,
+    RowButtonGroup,
+    RowButtonGroupHint,
+    RowSwitch,
+} from "@/base/components/RowButton";
+import { SpacedRow } from "@/base/components/containers";
+import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
+import {
+    NestedSidebarDrawer,
+    SidebarDrawer,
+    SidebarDrawerTitlebar,
+    type NestedSidebarDrawerVisibilityProps,
+} from "@/base/components/mui/SidebarDrawer";
+import { useIsSmallWidth } from "@/base/components/utils/hooks";
+import { useModalVisibility } from "@/base/components/utils/modal";
+import { isDevBuild } from "@/base/env";
+import {
+    getLocaleInUse,
+    setLocaleInUse,
+    supportedLocales,
+    ut,
+    type SupportedLocale,
+} from "@/base/i18n";
+import log from "@/base/log";
+import { savedLogs } from "@/base/log-web";
+import { customAPIHost } from "@/base/origins";
+import { downloadString } from "@/base/utils/web";
+import { DropdownInput } from "@/new/photos/components/DropdownInput";
+import { DialogCloseIconButton } from "@/new/photos/components/mui/Dialog";
+import { MLSettings } from "@/new/photos/components/sidebar/MLSettings";
+import { TwoFactorSettings } from "@/new/photos/components/sidebar/TwoFactorSettings";
+import {
+    confirmDisableMapsDialogAttributes,
+    confirmEnableMapsDialogAttributes,
+} from "@/new/photos/components/utils/dialog";
+import { downloadAppDialogAttributes } from "@/new/photos/components/utils/download";
+import {
+    useSettingsSnapshot,
+    useUserDetailsSnapshot,
+} from "@/new/photos/components/utils/use-snapshot";
+import {
+    ARCHIVE_SECTION,
+    DUMMY_UNCATEGORIZED_COLLECTION,
+    TRASH_SECTION,
+} from "@/new/photos/services/collection";
+import type { CollectionSummaries } from "@/new/photos/services/collection/ui";
+import { isMLSupported } from "@/new/photos/services/ml";
+import {
+    isInternalUser,
+    syncSettings,
+    updateCFProxyDisabledPreference,
+    updateMapEnabled,
+} from "@/new/photos/services/settings";
+import {
+    familyAdminEmail,
+    hasExceededStorageQuota,
+    isFamilyAdmin,
+    isPartOfFamily,
+    isSubscriptionActive,
+    isSubscriptionActivePaid,
+    isSubscriptionCancelled,
+    isSubscriptionFree,
+    isSubscriptionPastDue,
+    isSubscriptionStripe,
+    leaveFamily,
+    redirectToCustomerPortal,
+    syncUserDetails,
+    userDetailsAddOnBonuses,
+    type UserDetails,
+} from "@/new/photos/services/user-details";
+import { AppContext, useAppContext } from "@/new/photos/types/context";
+import { initiateEmail, openURL } from "@/new/photos/utils/web";
+import {
+    FlexWrapper,
+    VerticallyCentered,
+} from "@ente/shared/components/Container";
+import ArchiveOutlinedIcon from "@mui/icons-material/ArchiveOutlined";
+import CategoryIcon from "@mui/icons-material/Category";
+import ChevronRightIcon from "@mui/icons-material/ChevronRight";
+import CloseIcon from "@mui/icons-material/Close";
+import DeleteOutlineIcon from "@mui/icons-material/DeleteOutline";
+import HealthAndSafetyIcon from "@mui/icons-material/HealthAndSafety";
+import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
+import LockOutlinedIcon from "@mui/icons-material/LockOutlined";
+import NorthEastIcon from "@mui/icons-material/NorthEast";
+import VisibilityOffIcon from "@mui/icons-material/VisibilityOff";
+import {
+    Box,
+    Button,
+    Dialog,
+    DialogContent,
+    Divider,
+    IconButton,
+    Skeleton,
+    Stack,
+    styled,
+    Tooltip,
+    useColorScheme,
+} from "@mui/material";
+import Typography from "@mui/material/Typography";
+import DeleteAccountModal from "components/DeleteAccountModal";
+import { WatchFolder } from "components/WatchFolder";
+import { t } from "i18next";
+import { useRouter } from "next/router";
+import { GalleryContext } from "pages/gallery";
+import React, {
+    MouseEventHandler,
+    useCallback,
+    useContext,
+    useEffect,
+    useMemo,
+    useState,
+} from "react";
+import { Trans } from "react-i18next";
+import { getUncategorizedCollection } from "services/collectionService";
+import exportService from "services/export";
+import { testUpload } from "../../tests/upload.test";
+import { SubscriptionCard } from "./SubscriptionCard";
+
+interface SidebarProps {
+    collectionSummaries: CollectionSummaries;
+    sidebarView: boolean;
+    closeSidebar: () => void;
+}
+
+export const Sidebar: React.FC<SidebarProps> = ({
+    collectionSummaries,
+    sidebarView,
+    closeSidebar,
+}) => (
+    <RootSidebarDrawer open={sidebarView} onClose={closeSidebar}>
+        <HeaderSection closeSidebar={closeSidebar} />
+        <UserDetailsSection sidebarView={sidebarView} />
+        <Stack sx={{ gap: 0.5, mb: 3 }}>
+            <ShortcutSection
+                closeSidebar={closeSidebar}
+                collectionSummaries={collectionSummaries}
+            />
+            <UtilitySection closeSidebar={closeSidebar} />
+            <HelpSection closeSidebar={closeSidebar} />
+            <Divider sx={{ my: "2px" }} />
+            <ExitSection />
+            <InfoSection />
+        </Stack>
+    </RootSidebarDrawer>
+);
+
+const RootSidebarDrawer = styled(SidebarDrawer)(({ theme }) => ({
+    "& .MuiPaper-root": {
+        padding: theme.spacing(1.5),
+    },
+}));
+
+interface HeaderSectionProps {
+    closeSidebar: () => void;
+}
+
+const HeaderSection: React.FC<HeaderSectionProps> = ({ closeSidebar }) => {
+    return (
+        <SpacedRow sx={{ my: "4px 4px", pl: "12px" }}>
+            <EnteLogo />
+            <IconButton
+                aria-label={t("close")}
+                onClick={closeSidebar}
+                color="secondary"
+            >
+                <CloseIcon fontSize="small" />
+            </IconButton>
+        </SpacedRow>
+    );
+};
+
+interface UserDetailsSectionProps {
+    sidebarView: boolean;
+}
+
+const UserDetailsSection: React.FC<UserDetailsSectionProps> = ({
+    sidebarView,
+}) => {
+    const galleryContext = useContext(GalleryContext);
+    const userDetails = useUserDetailsSnapshot();
+    const [memberSubscriptionManageView, setMemberSubscriptionManageView] =
+        useState(false);
+
+    const openMemberSubscriptionManage = () =>
+        setMemberSubscriptionManageView(true);
+    const closeMemberSubscriptionManage = () =>
+        setMemberSubscriptionManageView(false);
+
+    useEffect(() => {
+        if (sidebarView) void syncUserDetails();
+    }, [sidebarView]);
+
+    const isNonAdminFamilyMember = useMemo(
+        () =>
+            userDetails &&
+            isPartOfFamily(userDetails) &&
+            !isFamilyAdmin(userDetails),
+        [userDetails],
+    );
+
+    const handleSubscriptionCardClick = () => {
+        if (isNonAdminFamilyMember) {
+            openMemberSubscriptionManage();
+        } else {
+            if (
+                userDetails &&
+                isSubscriptionStripe(userDetails.subscription) &&
+                isSubscriptionPastDue(userDetails.subscription)
+            ) {
+                redirectToCustomerPortal();
+            } else {
+                galleryContext.showPlanSelectorModal();
+            }
+        }
+    };
+
+    return (
+        <>
+            <Box sx={{ px: 0.5, mt: 2, pb: 1.5, mb: 1 }}>
+                <Typography sx={{ px: 1, pb: 1, color: "text.muted" }}>
+                    {userDetails ? (
+                        userDetails.email
+                    ) : (
+                        <Skeleton animation="wave" />
+                    )}
+                </Typography>
+
+                <SubscriptionCard
+                    userDetails={userDetails}
+                    onClick={handleSubscriptionCardClick}
+                />
+                {userDetails && (
+                    <SubscriptionStatus userDetails={userDetails} />
+                )}
+            </Box>
+            {isNonAdminFamilyMember && (
+                <MemberSubscriptionManage
+                    userDetails={userDetails}
+                    open={memberSubscriptionManageView}
+                    onClose={closeMemberSubscriptionManage}
+                />
+            )}
+        </>
+    );
+};
+
+interface SubscriptionStatusProps {
+    userDetails: UserDetails;
+}
+
+const SubscriptionStatus: React.FC<SubscriptionStatusProps> = ({
+    userDetails,
+}) => {
+    const { showPlanSelectorModal } = useContext(GalleryContext);
+
+    const hasAMessage = useMemo(() => {
+        if (isPartOfFamily(userDetails) && !isFamilyAdmin(userDetails)) {
+            return false;
+        }
+        if (
+            isSubscriptionActivePaid(userDetails.subscription) &&
+            !isSubscriptionCancelled(userDetails.subscription)
+        ) {
+            return false;
+        }
+        return true;
+    }, [userDetails]);
+
+    const handleClick = useMemo(() => {
+        const eventHandler: MouseEventHandler<HTMLSpanElement> = (e) => {
+            e.stopPropagation();
+
+            if (isSubscriptionActive(userDetails.subscription)) {
+                if (hasExceededStorageQuota(userDetails)) {
+                    showPlanSelectorModal();
+                }
+            } else {
+                if (
+                    isSubscriptionStripe(userDetails.subscription) &&
+                    isSubscriptionPastDue(userDetails.subscription)
+                ) {
+                    redirectToCustomerPortal();
+                } else {
+                    showPlanSelectorModal();
+                }
+            }
+        };
+        return eventHandler;
+    }, [userDetails]);
+
+    if (!hasAMessage) {
+        return <></>;
+    }
+
+    const hasAddOnBonus = userDetailsAddOnBonuses(userDetails).length > 0;
+
+    let message: React.ReactNode;
+    if (!hasAddOnBonus) {
+        if (isSubscriptionActive(userDetails.subscription)) {
+            if (isSubscriptionFree(userDetails.subscription)) {
+                message = t("subscription_info_free");
+            } else if (isSubscriptionCancelled(userDetails.subscription)) {
+                message = t("subscription_info_renewal_cancelled", {
+                    date: userDetails.subscription?.expiryTime,
+                });
+            }
+        } else {
+            message = (
+                <Trans
+                    i18nKey={"subscription_info_expired"}
+                    components={{
+                        a: <LinkButton onClick={handleClick} />,
+                    }}
+                />
+            );
+        }
+    }
+
+    if (!message && hasExceededStorageQuota(userDetails)) {
+        message = (
+            <Trans
+                i18nKey={"subscription_info_storage_quota_exceeded"}
+                components={{
+                    a: <LinkButton onClick={handleClick} />,
+                }}
+            />
+        );
+    }
+
+    if (!message) return <></>;
+
+    return (
+        <Box sx={{ px: 1, pt: 0.5 }}>
+            <Typography
+                variant="small"
+                onClick={handleClick && handleClick}
+                sx={{
+                    color: "text.muted",
+                    cursor: handleClick && "pointer",
+                }}
+            >
+                {message}
+            </Typography>
+        </Box>
+    );
+};
+
+function MemberSubscriptionManage({ open, userDetails, onClose }) {
+    const { showMiniDialog } = useAppContext();
+    const fullScreen = useIsSmallWidth();
+
+    const confirmLeaveFamily = () =>
+        showMiniDialog({
+            title: t("leave_family_plan"),
+            message: t("leave_family_plan_confirm"),
+            continue: {
+                text: t("leave"),
+                color: "critical",
+                action: leaveFamily,
+            },
+        });
+
+    if (!userDetails) {
+        return <></>;
+    }
+
+    return (
+        <Dialog {...{ open, onClose, fullScreen }} maxWidth="xs" fullWidth>
+            <SpacedRow sx={{ p: "20px 8px 12px 16px" }}>
+                <Stack>
+                    <Typography variant="h3">{t("subscription")}</Typography>
+                    <Typography sx={{ color: "text.muted" }}>
+                        {t("family_plan")}
+                    </Typography>
+                </Stack>
+                <DialogCloseIconButton {...{ onClose }} />
+            </SpacedRow>
+            <DialogContent>
+                <VerticallyCentered>
+                    <Box sx={{ mb: 4 }}>
+                        <Typography sx={{ color: "text.muted" }}>
+                            {t("subscription_info_family")}
+                        </Typography>
+                        <Typography>
+                            {familyAdminEmail(userDetails) ?? ""}
+                        </Typography>
+                    </Box>
+
+                    <img
+                        height={256}
+                        src="/images/family-plan/1x.png"
+                        srcSet="/images/family-plan/2x.png 2x, /images/family-plan/3x.png 3x"
+                    />
+                    <FlexWrapper px={2}>
+                        <Button
+                            fullWidth
+                            variant="outlined"
+                            color="critical"
+                            onClick={confirmLeaveFamily}
+                        >
+                            {t("leave_family_plan")}
+                        </Button>
+                    </FlexWrapper>
+                </VerticallyCentered>
+            </DialogContent>
+        </Dialog>
+    );
+}
+
+interface ShortcutSectionProps {
+    closeSidebar: () => void;
+    collectionSummaries: CollectionSummaries;
+}
+
+const ShortcutSection: React.FC<ShortcutSectionProps> = ({
+    closeSidebar,
+    collectionSummaries,
+}) => {
+    const galleryContext = useContext(GalleryContext);
+    const [uncategorizedCollectionId, setUncategorizedCollectionID] =
+        useState<number>();
+
+    useEffect(() => {
+        const main = async () => {
+            const unCategorizedCollection = await getUncategorizedCollection();
+            if (unCategorizedCollection) {
+                setUncategorizedCollectionID(unCategorizedCollection.id);
+            } else {
+                setUncategorizedCollectionID(DUMMY_UNCATEGORIZED_COLLECTION);
+            }
+        };
+        main();
+    }, []);
+
+    const openUncategorizedSection = () => {
+        galleryContext.setActiveCollectionID(uncategorizedCollectionId);
+        closeSidebar();
+    };
+
+    const openTrashSection = () => {
+        galleryContext.setActiveCollectionID(TRASH_SECTION);
+        closeSidebar();
+    };
+
+    const openArchiveSection = () => {
+        galleryContext.setActiveCollectionID(ARCHIVE_SECTION);
+        closeSidebar();
+    };
+
+    const openHiddenSection = () => {
+        galleryContext.openHiddenSection(() => {
+            closeSidebar();
+        });
+    };
+
+    return (
+        <>
+            <RowButton
+                startIcon={<CategoryIcon />}
+                label={t("section_uncategorized")}
+                caption={collectionSummaries
+                    .get(uncategorizedCollectionId)
+                    ?.fileCount.toString()}
+                onClick={openUncategorizedSection}
+            />
+            <RowButton
+                startIcon={<ArchiveOutlinedIcon />}
+                label={t("section_archive")}
+                caption={collectionSummaries
+                    .get(ARCHIVE_SECTION)
+                    ?.fileCount.toString()}
+                onClick={openArchiveSection}
+            />
+            <RowButton
+                startIcon={<VisibilityOffIcon />}
+                label={t("section_hidden")}
+                caption={
+                    <LockOutlinedIcon
+                        sx={{
+                            verticalAlign: "middle",
+                            fontSize: "19px !important",
+                        }}
+                    />
+                }
+                onClick={openHiddenSection}
+            />
+            <RowButton
+                startIcon={<DeleteOutlineIcon />}
+                label={t("section_trash")}
+                caption={collectionSummaries
+                    .get(TRASH_SECTION)
+                    ?.fileCount.toString()}
+                onClick={openTrashSection}
+            />
+        </>
+    );
+};
+
+const UtilitySection: React.FC<Pick<SidebarProps, "closeSidebar">> = ({
+    closeSidebar,
+}) => {
+    const router = useRouter();
+    const { watchFolderView, setWatchFolderView } = useAppContext();
+
+    const { show: showAccount, props: accountVisibilityProps } =
+        useModalVisibility();
+    const { show: showPreferences, props: preferencesVisibilityProps } =
+        useModalVisibility();
+
+    const showWatchFolder = () => setWatchFolderView(true);
+    const handleCloseWatchFolder = () => setWatchFolderView(false);
+
+    const handleDeduplicate = () => router.push("/duplicates");
+
+    return (
+        <>
+            <RowButton
+                variant="secondary"
+                label={t("account")}
+                onClick={showAccount}
+            />
+            {isDesktop && (
+                <RowButton
+                    variant="secondary"
+                    label={t("watch_folders")}
+                    onClick={showWatchFolder}
+                />
+            )}
+            <RowButton
+                variant="secondary"
+                label={t("deduplicate_files")}
+                onClick={handleDeduplicate}
+            />
+            <RowButton
+                variant="secondary"
+                label={t("preferences")}
+                onClick={showPreferences}
+            />
+            {isDesktop && (
+                <WatchFolder
+                    open={watchFolderView}
+                    onClose={handleCloseWatchFolder}
+                />
+            )}
+            <Account {...accountVisibilityProps} onRootClose={closeSidebar} />
+            <Preferences
+                {...preferencesVisibilityProps}
+                onRootClose={closeSidebar}
+            />
+        </>
+    );
+};
+
+const HelpSection: React.FC<Pick<SidebarProps, "closeSidebar">> = ({
+    closeSidebar,
+}) => {
+    const { showMiniDialog } = useContext(AppContext);
+    const { openExportModal } = useContext(GalleryContext);
+
+    const { show: showHelp, props: helpVisibilityProps } = useModalVisibility();
+
+    const handleExport = () =>
+        isDesktop
+            ? openExportModal()
+            : showMiniDialog(downloadAppDialogAttributes());
+
+    return (
+        <>
+            <RowButton
+                variant="secondary"
+                label={t("Help")}
+                onClick={showHelp}
+            />
+            <RowButton
+                variant="secondary"
+                label={t("export_data")}
+                endIcon={
+                    exportService.isExportInProgress() && (
+                        <ActivityIndicator size="20px" />
+                    )
+                }
+                onClick={handleExport}
+            />
+            <Help {...helpVisibilityProps} onRootClose={closeSidebar} />
+        </>
+    );
+};
+
+const ExitSection: React.FC = () => {
+    const { showMiniDialog, logout } = useContext(AppContext);
+
+    const handleLogout = () =>
+        showMiniDialog({
+            message: t("logout_message"),
+            continue: { text: t("logout"), color: "critical", action: logout },
+            buttonDirection: "row",
+        });
+
+    return (
+        <>
+            <RowButton
+                variant="secondary"
+                color="critical"
+                label={t("logout")}
+                onClick={handleLogout}
+            />
+        </>
+    );
+};
+
+const InfoSection: React.FC = () => {
+    const [appVersion, setAppVersion] = useState<string | undefined>();
+    const [host, setHost] = useState<string | undefined>();
+
+    useEffect(() => {
+        void globalThis.electron?.appVersion().then(setAppVersion);
+        void customAPIHost().then(setHost);
+    });
+
+    return (
+        <>
+            <Stack
+                sx={{
+                    p: "24px 18px 16px 18px",
+                    gap: "24px",
+                    color: "text.muted",
+                }}
+            >
+                {appVersion && (
+                    <Typography variant="mini">{appVersion}</Typography>
+                )}
+                {host && <Typography variant="mini">{host}</Typography>}
+            </Stack>
+        </>
+    );
+};
+
+const Account: React.FC<NestedSidebarDrawerVisibilityProps> = ({
+    open,
+    onClose,
+    onRootClose,
+}) => {
+    const { showMiniDialog } = useAppContext();
+
+    const router = useRouter();
+
+    const { show: showRecoveryKey, props: recoveryKeyVisibilityProps } =
+        useModalVisibility();
+    const { show: showTwoFactor, props: twoFactorVisibilityProps } =
+        useModalVisibility();
+    const { show: showDeleteAccount, props: deleteAccountVisibilityProps } =
+        useModalVisibility();
+
+    const handleRootClose = () => {
+        onClose();
+        onRootClose();
+    };
+
+    const handleChangePassword = () => router.push("/change-password");
+    const handleChangeEmail = () => router.push("/change-email");
+
+    const handlePasskeys = async () => {
+        onRootClose();
+        await openAccountsManagePasskeysPage();
+    };
+
+    return (
+        <NestedSidebarDrawer {...{ open, onClose }} onRootClose={onRootClose}>
+            <Stack sx={{ gap: "4px", py: "12px" }}>
+                <SidebarDrawerTitlebar
+                    onClose={onClose}
+                    title={t("account")}
+                    onRootClose={handleRootClose}
+                />
+                <Stack sx={{ px: "16px", py: "8px", gap: "24px" }}>
+                    <RowButtonGroup>
+                        <RowButton
+                            endIcon={
+                                <HealthAndSafetyIcon
+                                    sx={{ color: "accent.main" }}
+                                />
+                            }
+                            label={t("recovery_key")}
+                            onClick={showRecoveryKey}
+                        />
+                    </RowButtonGroup>
+                    <RowButtonGroup>
+                        <RowButton
+                            label={t("two_factor")}
+                            onClick={showTwoFactor}
+                        />
+                        <RowButtonDivider />
+                        <RowButton
+                            label={t("passkeys")}
+                            onClick={handlePasskeys}
+                        />
+                    </RowButtonGroup>
+                    <RowButtonGroup>
+                        <RowButton
+                            label={t("change_password")}
+                            onClick={handleChangePassword}
+                        />
+                        <RowButtonDivider />
+                        <RowButton
+                            label={t("change_email")}
+                            onClick={handleChangeEmail}
+                        />
+                    </RowButtonGroup>
+                    <RowButtonGroup>
+                        <RowButton
+                            color="critical"
+                            label={t("delete_account")}
+                            onClick={showDeleteAccount}
+                        />
+                    </RowButtonGroup>
+                </Stack>
+            </Stack>
+            <RecoveryKey
+                {...recoveryKeyVisibilityProps}
+                {...{ showMiniDialog }}
+            />
+            <TwoFactorSettings
+                {...twoFactorVisibilityProps}
+                onRootClose={onRootClose}
+            />
+            <DeleteAccountModal {...deleteAccountVisibilityProps} />
+        </NestedSidebarDrawer>
+    );
+};
+
+const Preferences: React.FC<NestedSidebarDrawerVisibilityProps> = ({
+    open,
+    onClose,
+    onRootClose,
+}) => {
+    const { show: showMapSettings, props: mapSettingsVisibilityProps } =
+        useModalVisibility();
+    const {
+        show: showAdvancedSettings,
+        props: advancedSettingsVisibilityProps,
+    } = useModalVisibility();
+    const { show: showMLSettings, props: mlSettingsVisibilityProps } =
+        useModalVisibility();
+
+    useEffect(() => {
+        if (open) void syncSettings();
+    }, [open]);
+
+    const handleRootClose = () => {
+        onClose();
+        onRootClose();
+    };
+
+    return (
+        <NestedSidebarDrawer {...{ open, onClose }} onRootClose={onRootClose}>
+            <Stack sx={{ gap: "4px", py: "12px" }}>
+                <SidebarDrawerTitlebar
+                    onClose={onClose}
+                    title={t("preferences")}
+                    onRootClose={handleRootClose}
+                />
+                <Stack sx={{ px: "16px", py: "8px", gap: "24px" }}>
+                    <LanguageSelector />
+                    <ThemeSelector />
+                    <Divider sx={{ my: "2px", opacity: 0.1 }} />
+                    {isMLSupported && (
+                        <RowButtonGroup>
+                            <RowButton
+                                endIcon={<ChevronRightIcon />}
+                                label={t("ml_search")}
+                                onClick={showMLSettings}
+                            />
+                        </RowButtonGroup>
+                    )}
+                    <RowButton
+                        endIcon={<ChevronRightIcon />}
+                        label={t("map")}
+                        onClick={showMapSettings}
+                    />
+                    <RowButton
+                        endIcon={<ChevronRightIcon />}
+                        label={t("advanced")}
+                        onClick={showAdvancedSettings}
+                    />
+                </Stack>
+            </Stack>
+            <MapSettings
+                {...mapSettingsVisibilityProps}
+                onRootClose={onRootClose}
+            />
+            <AdvancedSettings
+                {...advancedSettingsVisibilityProps}
+                onRootClose={onRootClose}
+            />
+            <MLSettings
+                {...mlSettingsVisibilityProps}
+                onRootClose={handleRootClose}
+            />
+        </NestedSidebarDrawer>
+    );
+};
+
+const LanguageSelector = () => {
+    const locale = getLocaleInUse();
+
+    const updateCurrentLocale = (newLocale: SupportedLocale) => {
+        setLocaleInUse(newLocale);
+        // [Note: Changing locale causes a full reload]
+        //
+        // A full reload is needed because we use the global `t` instance
+        // instead of the useTranslation hook.
+        //
+        // We also rely on this behaviour by caching various formatters in
+        // module static variables that not get updated if the i18n.language
+        // changes unless there is a full reload.
+        window.location.reload();
+    };
+
+    const options = supportedLocales.map((locale) => ({
+        label: localeName(locale),
+        value: locale,
+    }));
+
+    return (
+        <Stack sx={{ gap: 1 }}>
+            <Typography variant="small" sx={{ px: 1, color: "text.muted" }}>
+                {t("language")}
+            </Typography>
+            <DropdownInput
+                options={options}
+                selected={locale}
+                onSelect={updateCurrentLocale}
+            />
+        </Stack>
+    );
+};
+
+/**
+ * Human readable name for each supported locale.
+ */
+const localeName = (locale: SupportedLocale) => {
+    switch (locale) {
+        case "en-US":
+            return "English";
+        case "fr-FR":
+            return "Français";
+        case "de-DE":
+            return "Deutsch";
+        case "zh-CN":
+            return "中文";
+        case "nl-NL":
+            return "Nederlands";
+        case "es-ES":
+            return "Español";
+        case "pt-PT":
+            return "Português";
+        case "pt-BR":
+            return "Português Brasileiro";
+        case "ru-RU":
+            return "Русский";
+        case "pl-PL":
+            return "Polski";
+        case "it-IT":
+            return "Italiano";
+        case "lt-LT":
+            return "Lietuvių kalba";
+        case "uk-UA":
+            return "Українська";
+        case "vi-VN":
+            return "Tiếng Việt";
+    }
+};
+
+const ThemeSelector = () => {
+    const { mode, setMode } = useColorScheme();
+
+    // During SSR, mode is always undefined.
+    if (!mode) return null;
+
+    return (
+        <Stack sx={{ gap: 1 }}>
+            <Typography variant="small" sx={{ px: 1, color: "text.muted" }}>
+                {t("theme")}
+            </Typography>
+            <DropdownInput
+                options={[
+                    { label: t("system"), value: "system" },
+                    { label: t("light"), value: "light" },
+                    { label: t("dark"), value: "dark" },
+                ]}
+                selected={mode}
+                onSelect={setMode}
+            />
+        </Stack>
+    );
+};
+
+const MapSettings: React.FC<NestedSidebarDrawerVisibilityProps> = ({
+    open,
+    onClose,
+    onRootClose,
+}) => {
+    const { showMiniDialog } = useAppContext();
+
+    const { mapEnabled } = useSettingsSnapshot();
+
+    const confirmToggle = useCallback(
+        () =>
+            showMiniDialog(
+                mapEnabled
+                    ? confirmDisableMapsDialogAttributes(() =>
+                          updateMapEnabled(false),
+                      )
+                    : confirmEnableMapsDialogAttributes(() =>
+                          updateMapEnabled(true),
+                      ),
+            ),
+        [showMiniDialog, mapEnabled],
+    );
+
+    const handleRootClose = () => {
+        onClose();
+        onRootClose();
+    };
+
+    return (
+        <NestedSidebarDrawer
+            {...{ open, onClose }}
+            onRootClose={handleRootClose}
+        >
+            <Stack sx={{ gap: "4px", py: "12px" }}>
+                <SidebarDrawerTitlebar
+                    onClose={onClose}
+                    onRootClose={handleRootClose}
+                    title={t("map")}
+                />
+
+                <Stack sx={{ px: "16px", py: "20px" }}>
+                    <RowButtonGroup>
+                        <RowSwitch
+                            label={t("enabled")}
+                            checked={mapEnabled}
+                            onClick={confirmToggle}
+                        />
+                    </RowButtonGroup>
+                </Stack>
+            </Stack>
+        </NestedSidebarDrawer>
+    );
+};
+
+const AdvancedSettings: React.FC<NestedSidebarDrawerVisibilityProps> = ({
+    open,
+    onClose,
+    onRootClose,
+}) => {
+    const { cfUploadProxyDisabled } = useSettingsSnapshot();
+    const [isAutoLaunchEnabled, setIsAutoLaunchEnabled] = useState(false);
+
+    const electron = globalThis.electron;
+
+    const refreshAutoLaunchEnabled = useCallback(async () => {
+        return electron
+            ?.isAutoLaunchEnabled()
+            .then((enabled) => setIsAutoLaunchEnabled(enabled));
+    }, [electron]);
+
+    useEffect(
+        () => void refreshAutoLaunchEnabled(),
+        [refreshAutoLaunchEnabled],
+    );
+
+    const handleRootClose = () => {
+        onClose();
+        onRootClose();
+    };
+
+    const toggleProxy = () =>
+        void updateCFProxyDisabledPreference(!cfUploadProxyDisabled);
+
+    const toggleAutoLaunch = () =>
+        void electron?.toggleAutoLaunch().then(refreshAutoLaunchEnabled);
+
+    return (
+        <NestedSidebarDrawer
+            {...{ open, onClose }}
+            onRootClose={handleRootClose}
+        >
+            <Stack sx={{ gap: "4px", py: "12px" }}>
+                <SidebarDrawerTitlebar
+                    onClose={onClose}
+                    onRootClose={handleRootClose}
+                    title={t("advanced")}
+                />
+                <Stack sx={{ px: "16px", py: "20px", gap: "24px" }}>
+                    <Stack>
+                        <RowButtonGroup>
+                            <RowSwitch
+                                label={t("faster_upload")}
+                                checked={!cfUploadProxyDisabled}
+                                onClick={toggleProxy}
+                            />
+                        </RowButtonGroup>
+                        <RowButtonGroupHint>
+                            {t("faster_upload_description")}
+                        </RowButtonGroupHint>
+                    </Stack>
+                    {electron && (
+                        <RowButtonGroup>
+                            <RowSwitch
+                                label={t("open_ente_on_startup")}
+                                checked={isAutoLaunchEnabled}
+                                onClick={toggleAutoLaunch}
+                            />
+                        </RowButtonGroup>
+                    )}
+                </Stack>
+            </Stack>
+        </NestedSidebarDrawer>
+    );
+};
+
+const Help: React.FC<NestedSidebarDrawerVisibilityProps> = ({
+    open,
+    onClose,
+    onRootClose,
+}) => {
+    const { showMiniDialog } = useAppContext();
+
+    const handleRootClose = () => {
+        onClose();
+        onRootClose();
+    };
+
+    const handleHelp = () => openURL("https://help.ente.io/photos/");
+
+    const handleBlog = () => openURL("https://ente.io/blog/");
+
+    const handleRequestFeature = () =>
+        openURL("https://github.com/ente-io/ente/discussions");
+
+    const handleSupport = () => initiateEmail("support@ente.io");
+
+    const confirmViewLogs = () =>
+        showMiniDialog({
+            title: t("view_logs"),
+            message: <Trans i18nKey={"view_logs_message"} />,
+            continue: {
+                text: t("view_logs"),
+                action: viewLogs,
+            },
+        });
+
+    const viewLogs = () => {
+        log.info("Viewing logs");
+        const electron = globalThis.electron;
+        if (electron) electron.openLogDirectory();
+        else downloadString(savedLogs(), `ente-web-logs-${Date.now()}.txt`);
+    };
+
+    return (
+        <NestedSidebarDrawer {...{ open, onClose }} onRootClose={onRootClose}>
+            <Stack sx={{ gap: "4px", py: "12px" }}>
+                <SidebarDrawerTitlebar
+                    onClose={onClose}
+                    title={t("help")}
+                    onRootClose={handleRootClose}
+                />
+                <Stack sx={{ px: "16px", py: "8px", gap: "24px" }}>
+                    <RowButtonGroup>
+                        <RowButton
+                            endIcon={<InfoOutlinedIcon />}
+                            label={t("ente_help")}
+                            onClick={handleHelp}
+                        />
+                    </RowButtonGroup>
+                    <RowButtonGroup>
+                        <RowButton
+                            endIcon={<NorthEastIcon />}
+                            label={t("blog")}
+                            onClick={handleBlog}
+                        />
+                        <RowButtonDivider />
+                        <RowButton
+                            endIcon={<NorthEastIcon />}
+                            label={t("request_feature")}
+                            onClick={handleRequestFeature}
+                        />
+                    </RowButtonGroup>
+                    <RowButtonGroup>
+                        <RowButton
+                            endIcon={<ChevronRightIcon />}
+                            label={
+                                <Tooltip title="support@ente.io">
+                                    <Typography sx={{ fontWeight: "medium" }}>
+                                        {t("support")}
+                                    </Typography>
+                                </Tooltip>
+                            }
+                            onClick={handleSupport}
+                        />
+                    </RowButtonGroup>
+                </Stack>
+                <Stack sx={{ px: "16px" }}>
+                    <RowButton
+                        variant="secondary"
+                        label={
+                            <Typography variant="mini" color="text.muted">
+                                {t("view_logs")}
+                            </Typography>
+                        }
+                        onClick={confirmViewLogs}
+                    />
+                    {isInternalUser() && isDevBuild && (
+                        <RowButton
+                            variant="secondary"
+                            label={
+                                <Typography variant="mini" color="text.muted">
+                                    {ut("Test upload")}
+                                </Typography>
+                            }
+                            onClick={testUpload}
+                        />
+                    )}
+                </Stack>
+            </Stack>
+        </NestedSidebarDrawer>
+    );
+};
diff --git a/web/apps/photos/src/components/Sidebar/Preferences.tsx b/web/apps/photos/src/components/Sidebar/Preferences.tsx
deleted file mode 100644
index 282a4aa873..0000000000
--- a/web/apps/photos/src/components/Sidebar/Preferences.tsx
+++ /dev/null
@@ -1,303 +0,0 @@
-import {
-    RowButton,
-    RowButtonGroup,
-    RowButtonGroupHint,
-    RowSwitch,
-} from "@/base/components/RowButton";
-import {
-    NestedSidebarDrawer,
-    SidebarDrawerTitlebar,
-    type NestedSidebarDrawerVisibilityProps,
-} from "@/base/components/mui/SidebarDrawer";
-import { useModalVisibility } from "@/base/components/utils/modal";
-import {
-    getLocaleInUse,
-    setLocaleInUse,
-    supportedLocales,
-    type SupportedLocale,
-} from "@/base/i18n";
-import { DropdownInput } from "@/new/photos/components/DropdownInput";
-import { MLSettings } from "@/new/photos/components/sidebar/MLSettings";
-import {
-    confirmDisableMapsDialogAttributes,
-    confirmEnableMapsDialogAttributes,
-} from "@/new/photos/components/utils/dialog";
-import { useSettingsSnapshot } from "@/new/photos/components/utils/use-snapshot";
-import { isMLSupported } from "@/new/photos/services/ml";
-import {
-    syncSettings,
-    updateCFProxyDisabledPreference,
-    updateMapEnabled,
-} from "@/new/photos/services/settings";
-import { useAppContext } from "@/new/photos/types/context";
-import ChevronRightIcon from "@mui/icons-material/ChevronRight";
-import { Divider, Stack, Typography, useColorScheme } from "@mui/material";
-import { t } from "i18next";
-import React, { useCallback, useEffect } from "react";
-
-export const Preferences: React.FC<NestedSidebarDrawerVisibilityProps> = ({
-    open,
-    onClose,
-    onRootClose,
-}) => {
-    const { show: showMapSettings, props: mapSettingsVisibilityProps } =
-        useModalVisibility();
-    const {
-        show: showAdvancedSettings,
-        props: advancedSettingsVisibilityProps,
-    } = useModalVisibility();
-    const { show: showMLSettings, props: mlSettingsVisibilityProps } =
-        useModalVisibility();
-
-    useEffect(() => {
-        if (open) void syncSettings();
-    }, [open]);
-
-    const handleRootClose = () => {
-        onClose();
-        onRootClose();
-    };
-
-    return (
-        <NestedSidebarDrawer {...{ open, onClose }} onRootClose={onRootClose}>
-            <Stack sx={{ gap: "4px", py: "12px" }}>
-                <SidebarDrawerTitlebar
-                    onClose={onClose}
-                    title={t("preferences")}
-                    onRootClose={handleRootClose}
-                />
-                <Stack sx={{ px: "16px", py: "8px", gap: "24px" }}>
-                    <LanguageSelector />
-                    <ThemeSelector />
-                    <Divider sx={{ my: "2px", opacity: 0.1 }} />
-                    {isMLSupported && (
-                        <RowButtonGroup>
-                            <RowButton
-                                endIcon={<ChevronRightIcon />}
-                                label={t("ml_search")}
-                                onClick={showMLSettings}
-                            />
-                        </RowButtonGroup>
-                    )}
-                    <RowButton
-                        endIcon={<ChevronRightIcon />}
-                        label={t("map")}
-                        onClick={showMapSettings}
-                    />
-                    <RowButton
-                        endIcon={<ChevronRightIcon />}
-                        label={t("advanced")}
-                        onClick={showAdvancedSettings}
-                    />
-                </Stack>
-            </Stack>
-            <MapSettings
-                {...mapSettingsVisibilityProps}
-                onRootClose={onRootClose}
-            />
-            <AdvancedSettings
-                {...advancedSettingsVisibilityProps}
-                onRootClose={onRootClose}
-            />
-            <MLSettings
-                {...mlSettingsVisibilityProps}
-                onRootClose={handleRootClose}
-            />
-        </NestedSidebarDrawer>
-    );
-};
-
-const LanguageSelector = () => {
-    const locale = getLocaleInUse();
-
-    const updateCurrentLocale = (newLocale: SupportedLocale) => {
-        setLocaleInUse(newLocale);
-        // [Note: Changing locale causes a full reload]
-        //
-        // A full reload is needed because we use the global `t` instance
-        // instead of the useTranslation hook.
-        //
-        // We also rely on this behaviour by caching various formatters in
-        // module static variables that not get updated if the i18n.language
-        // changes unless there is a full reload.
-        window.location.reload();
-    };
-
-    const options = supportedLocales.map((locale) => ({
-        label: localeName(locale),
-        value: locale,
-    }));
-
-    return (
-        <Stack sx={{ gap: 1 }}>
-            <Typography variant="small" sx={{ px: 1, color: "text.muted" }}>
-                {t("language")}
-            </Typography>
-            <DropdownInput
-                options={options}
-                selected={locale}
-                onSelect={updateCurrentLocale}
-            />
-        </Stack>
-    );
-};
-
-/**
- * Human readable name for each supported locale.
- */
-const localeName = (locale: SupportedLocale) => {
-    switch (locale) {
-        case "en-US":
-            return "English";
-        case "fr-FR":
-            return "Français";
-        case "de-DE":
-            return "Deutsch";
-        case "zh-CN":
-            return "中文";
-        case "nl-NL":
-            return "Nederlands";
-        case "es-ES":
-            return "Español";
-        case "pt-PT":
-            return "Português";
-        case "pt-BR":
-            return "Português Brasileiro";
-        case "ru-RU":
-            return "Русский";
-        case "pl-PL":
-            return "Polski";
-        case "it-IT":
-            return "Italiano";
-        case "lt-LT":
-            return "Lietuvių kalba";
-        case "uk-UA":
-            return "Українська";
-        case "vi-VN":
-            return "Tiếng Việt";
-    }
-};
-
-const ThemeSelector = () => {
-    const { mode, setMode } = useColorScheme();
-
-    // During SSR, mode is always undefined.
-    if (!mode) return null;
-
-    return (
-        <Stack sx={{ gap: 1 }}>
-            <Typography variant="small" sx={{ px: 1, color: "text.muted" }}>
-                {t("theme")}
-            </Typography>
-            <DropdownInput
-                options={[
-                    { label: t("system"), value: "system" },
-                    { label: t("light"), value: "light" },
-                    { label: t("dark"), value: "dark" },
-                ]}
-                selected={mode}
-                onSelect={setMode}
-            />
-        </Stack>
-    );
-};
-
-export const MapSettings: React.FC<NestedSidebarDrawerVisibilityProps> = ({
-    open,
-    onClose,
-    onRootClose,
-}) => {
-    const { showMiniDialog } = useAppContext();
-
-    const { mapEnabled } = useSettingsSnapshot();
-
-    const confirmToggle = useCallback(
-        () =>
-            showMiniDialog(
-                mapEnabled
-                    ? confirmDisableMapsDialogAttributes(() =>
-                          updateMapEnabled(false),
-                      )
-                    : confirmEnableMapsDialogAttributes(() =>
-                          updateMapEnabled(true),
-                      ),
-            ),
-        [showMiniDialog, mapEnabled],
-    );
-
-    const handleRootClose = () => {
-        onClose();
-        onRootClose();
-    };
-
-    return (
-        <NestedSidebarDrawer
-            {...{ open, onClose }}
-            onRootClose={handleRootClose}
-        >
-            <Stack sx={{ gap: "4px", py: "12px" }}>
-                <SidebarDrawerTitlebar
-                    onClose={onClose}
-                    onRootClose={handleRootClose}
-                    title={t("map")}
-                />
-
-                <Stack sx={{ px: "16px", py: "20px" }}>
-                    <RowButtonGroup>
-                        <RowSwitch
-                            label={t("enabled")}
-                            checked={mapEnabled}
-                            onClick={confirmToggle}
-                        />
-                    </RowButtonGroup>
-                </Stack>
-            </Stack>
-        </NestedSidebarDrawer>
-    );
-};
-
-export const AdvancedSettings: React.FC<NestedSidebarDrawerVisibilityProps> = ({
-    open,
-    onClose,
-    onRootClose,
-}) => {
-    const { cfUploadProxyDisabled } = useSettingsSnapshot();
-
-    const handleRootClose = () => {
-        onClose();
-        onRootClose();
-    };
-
-    const toggle = () =>
-        void updateCFProxyDisabledPreference(!cfUploadProxyDisabled);
-
-    return (
-        <NestedSidebarDrawer
-            {...{ open, onClose }}
-            onRootClose={handleRootClose}
-        >
-            <Stack sx={{ gap: "4px", py: "12px" }}>
-                <SidebarDrawerTitlebar
-                    onClose={onClose}
-                    onRootClose={handleRootClose}
-                    title={t("advanced")}
-                />
-
-                <Stack sx={{ px: "16px", py: "20px" }}>
-                    <Stack sx={{ gap: "4px" }}>
-                        <RowButtonGroup>
-                            <RowSwitch
-                                label={t("faster_upload")}
-                                checked={!cfUploadProxyDisabled}
-                                onClick={toggle}
-                            />
-                        </RowButtonGroup>
-                        <RowButtonGroupHint>
-                            {t("faster_upload_description")}
-                        </RowButtonGroupHint>
-                    </Stack>
-                </Stack>
-            </Stack>
-        </NestedSidebarDrawer>
-    );
-};
diff --git a/web/apps/photos/src/components/Sidebar/index.tsx b/web/apps/photos/src/components/Sidebar/index.tsx
deleted file mode 100644
index c47507d2b3..0000000000
--- a/web/apps/photos/src/components/Sidebar/index.tsx
+++ /dev/null
@@ -1,717 +0,0 @@
-import { RecoveryKey } from "@/accounts/components/RecoveryKey";
-import { openAccountsManagePasskeysPage } from "@/accounts/services/passkey";
-import { isDesktop } from "@/base/app";
-import { EnteLogo } from "@/base/components/EnteLogo";
-import { LinkButton } from "@/base/components/LinkButton";
-import { RowButton } from "@/base/components/RowButton";
-import { SpaceBetweenFlex } from "@/base/components/containers";
-import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
-import { SidebarDrawer } from "@/base/components/mui/SidebarDrawer";
-import { useIsSmallWidth } from "@/base/components/utils/hooks";
-import { useModalVisibility } from "@/base/components/utils/modal";
-import { isDevBuild } from "@/base/env";
-import { ut } from "@/base/i18n";
-import log from "@/base/log";
-import { savedLogs } from "@/base/log-web";
-import { customAPIHost } from "@/base/origins";
-import { downloadString } from "@/base/utils/web";
-import { DialogCloseIconButton } from "@/new/photos/components/mui/Dialog";
-import { TwoFactorSettings } from "@/new/photos/components/sidebar/TwoFactorSettings";
-import { downloadAppDialogAttributes } from "@/new/photos/components/utils/download";
-import { useUserDetailsSnapshot } from "@/new/photos/components/utils/use-snapshot";
-import {
-    ARCHIVE_SECTION,
-    DUMMY_UNCATEGORIZED_COLLECTION,
-    TRASH_SECTION,
-} from "@/new/photos/services/collection";
-import type { CollectionSummaries } from "@/new/photos/services/collection/ui";
-import { isInternalUser } from "@/new/photos/services/settings";
-import {
-    familyAdminEmail,
-    hasExceededStorageQuota,
-    isFamilyAdmin,
-    isPartOfFamily,
-    isSubscriptionActive,
-    isSubscriptionActivePaid,
-    isSubscriptionCancelled,
-    isSubscriptionFree,
-    isSubscriptionPastDue,
-    isSubscriptionStripe,
-    leaveFamily,
-    redirectToCustomerPortal,
-    syncUserDetails,
-    userDetailsAddOnBonuses,
-    type UserDetails,
-} from "@/new/photos/services/user-details";
-import { AppContext, useAppContext } from "@/new/photos/types/context";
-import { initiateEmail, openURL } from "@/new/photos/utils/web";
-import {
-    FlexWrapper,
-    VerticallyCentered,
-} from "@ente/shared/components/Container";
-import { PHOTOS_PAGES as PAGES } from "@ente/shared/constants/pages";
-import ArchiveOutlinedIcon from "@mui/icons-material/ArchiveOutlined";
-import CategoryIcon from "@mui/icons-material/Category";
-import CloseIcon from "@mui/icons-material/Close";
-import DeleteOutlineIcon from "@mui/icons-material/DeleteOutline";
-import LockOutlinedIcon from "@mui/icons-material/LockOutlined";
-import VisibilityOffIcon from "@mui/icons-material/VisibilityOff";
-import {
-    Box,
-    Button,
-    Dialog,
-    DialogContent,
-    Divider,
-    IconButton,
-    Skeleton,
-    Stack,
-    styled,
-    Tooltip,
-} from "@mui/material";
-import Typography from "@mui/material/Typography";
-import DeleteAccountModal from "components/DeleteAccountModal";
-import { WatchFolder } from "components/WatchFolder";
-import { t } from "i18next";
-import { useRouter } from "next/router";
-import { GalleryContext } from "pages/gallery";
-import React, {
-    MouseEventHandler,
-    useContext,
-    useEffect,
-    useMemo,
-    useState,
-} from "react";
-import { Trans } from "react-i18next";
-import { getUncategorizedCollection } from "services/collectionService";
-import exportService from "services/export";
-import { testUpload } from "../../../tests/upload.test";
-import { Preferences } from "./Preferences";
-import { SubscriptionCard } from "./SubscriptionCard";
-
-interface Iprops {
-    collectionSummaries: CollectionSummaries;
-    sidebarView: boolean;
-    closeSidebar: () => void;
-}
-
-export default function Sidebar({
-    collectionSummaries,
-    sidebarView,
-    closeSidebar,
-}: Iprops) {
-    return (
-        <RootSidebarDrawer open={sidebarView} onClose={closeSidebar}>
-            <HeaderSection closeSidebar={closeSidebar} />
-            <Divider />
-            <UserDetailsSection sidebarView={sidebarView} />
-            <Stack sx={{ gap: 0.5, mb: 3 }}>
-                <ShortcutSection
-                    closeSidebar={closeSidebar}
-                    collectionSummaries={collectionSummaries}
-                />
-                <UtilitySection closeSidebar={closeSidebar} />
-                <Divider />
-                <HelpSection />
-                <Divider />
-                <ExitSection />
-                <Divider />
-                <DebugSection />
-            </Stack>
-        </RootSidebarDrawer>
-    );
-}
-
-const RootSidebarDrawer = styled(SidebarDrawer)(({ theme }) => ({
-    "& .MuiPaper-root": {
-        padding: theme.spacing(1.5),
-    },
-}));
-
-interface HeaderSectionProps {
-    closeSidebar: () => void;
-}
-
-const HeaderSection: React.FC<HeaderSectionProps> = ({ closeSidebar }) => {
-    return (
-        <SpaceBetweenFlex
-            sx={{ marginBlock: "4px 4px", paddingInlineStart: "12px" }}
-        >
-            <EnteLogo />
-            <IconButton
-                aria-label={t("close")}
-                onClick={closeSidebar}
-                color="secondary"
-            >
-                <CloseIcon fontSize="small" />
-            </IconButton>
-        </SpaceBetweenFlex>
-    );
-};
-
-interface UserDetailsSectionProps {
-    sidebarView: boolean;
-}
-
-const UserDetailsSection: React.FC<UserDetailsSectionProps> = ({
-    sidebarView,
-}) => {
-    const galleryContext = useContext(GalleryContext);
-    const userDetails = useUserDetailsSnapshot();
-    const [memberSubscriptionManageView, setMemberSubscriptionManageView] =
-        useState(false);
-
-    const openMemberSubscriptionManage = () =>
-        setMemberSubscriptionManageView(true);
-    const closeMemberSubscriptionManage = () =>
-        setMemberSubscriptionManageView(false);
-
-    useEffect(() => {
-        if (sidebarView) void syncUserDetails();
-    }, [sidebarView]);
-
-    const isNonAdminFamilyMember = useMemo(
-        () =>
-            userDetails &&
-            isPartOfFamily(userDetails) &&
-            !isFamilyAdmin(userDetails),
-        [userDetails],
-    );
-
-    const handleSubscriptionCardClick = () => {
-        if (isNonAdminFamilyMember) {
-            openMemberSubscriptionManage();
-        } else {
-            if (
-                userDetails &&
-                isSubscriptionStripe(userDetails.subscription) &&
-                isSubscriptionPastDue(userDetails.subscription)
-            ) {
-                redirectToCustomerPortal();
-            } else {
-                galleryContext.showPlanSelectorModal();
-            }
-        }
-    };
-
-    return (
-        <>
-            <Box sx={{ px: 0.5, mt: 2, pb: 1.5, mb: 1 }}>
-                <Typography sx={{ px: 1, pb: 1, color: "text.muted" }}>
-                    {userDetails ? (
-                        userDetails.email
-                    ) : (
-                        <Skeleton animation="wave" />
-                    )}
-                </Typography>
-
-                <SubscriptionCard
-                    userDetails={userDetails}
-                    onClick={handleSubscriptionCardClick}
-                />
-                {userDetails && (
-                    <SubscriptionStatus userDetails={userDetails} />
-                )}
-            </Box>
-            {isNonAdminFamilyMember && (
-                <MemberSubscriptionManage
-                    userDetails={userDetails}
-                    open={memberSubscriptionManageView}
-                    onClose={closeMemberSubscriptionManage}
-                />
-            )}
-        </>
-    );
-};
-
-interface SubscriptionStatusProps {
-    userDetails: UserDetails;
-}
-
-const SubscriptionStatus: React.FC<SubscriptionStatusProps> = ({
-    userDetails,
-}) => {
-    const { showPlanSelectorModal } = useContext(GalleryContext);
-
-    const hasAMessage = useMemo(() => {
-        if (isPartOfFamily(userDetails) && !isFamilyAdmin(userDetails)) {
-            return false;
-        }
-        if (
-            isSubscriptionActivePaid(userDetails.subscription) &&
-            !isSubscriptionCancelled(userDetails.subscription)
-        ) {
-            return false;
-        }
-        return true;
-    }, [userDetails]);
-
-    const handleClick = useMemo(() => {
-        const eventHandler: MouseEventHandler<HTMLSpanElement> = (e) => {
-            e.stopPropagation();
-
-            if (isSubscriptionActive(userDetails.subscription)) {
-                if (hasExceededStorageQuota(userDetails)) {
-                    showPlanSelectorModal();
-                }
-            } else {
-                if (
-                    isSubscriptionStripe(userDetails.subscription) &&
-                    isSubscriptionPastDue(userDetails.subscription)
-                ) {
-                    redirectToCustomerPortal();
-                } else {
-                    showPlanSelectorModal();
-                }
-            }
-        };
-        return eventHandler;
-    }, [userDetails]);
-
-    if (!hasAMessage) {
-        return <></>;
-    }
-
-    const hasAddOnBonus = userDetailsAddOnBonuses(userDetails).length > 0;
-
-    let message: React.ReactNode;
-    if (!hasAddOnBonus) {
-        if (isSubscriptionActive(userDetails.subscription)) {
-            if (isSubscriptionFree(userDetails.subscription)) {
-                message = t("subscription_info_free");
-            } else if (isSubscriptionCancelled(userDetails.subscription)) {
-                message = t("subscription_info_renewal_cancelled", {
-                    date: userDetails.subscription?.expiryTime,
-                });
-            }
-        } else {
-            message = (
-                <Trans
-                    i18nKey={"subscription_info_expired"}
-                    components={{
-                        a: <LinkButton onClick={handleClick} />,
-                    }}
-                />
-            );
-        }
-    }
-
-    if (!message && hasExceededStorageQuota(userDetails)) {
-        message = (
-            <Trans
-                i18nKey={"subscription_info_storage_quota_exceeded"}
-                components={{
-                    a: <LinkButton onClick={handleClick} />,
-                }}
-            />
-        );
-    }
-
-    if (!message) return <></>;
-
-    return (
-        <Box sx={{ px: 1, pt: 0.5 }}>
-            <Typography
-                variant="small"
-                onClick={handleClick && handleClick}
-                sx={{
-                    color: "text.muted",
-                    cursor: handleClick && "pointer",
-                }}
-            >
-                {message}
-            </Typography>
-        </Box>
-    );
-};
-
-function MemberSubscriptionManage({ open, userDetails, onClose }) {
-    const { showMiniDialog } = useAppContext();
-    const fullScreen = useIsSmallWidth();
-
-    const confirmLeaveFamily = () =>
-        showMiniDialog({
-            title: t("leave_family_plan"),
-            message: t("leave_family_plan_confirm"),
-            continue: {
-                text: t("leave"),
-                color: "critical",
-                action: leaveFamily,
-            },
-        });
-
-    if (!userDetails) {
-        return <></>;
-    }
-
-    return (
-        <Dialog {...{ open, onClose, fullScreen }} maxWidth="xs" fullWidth>
-            <SpaceBetweenFlex sx={{ p: "20px 8px 12px 16px" }}>
-                <Stack>
-                    <Typography variant="h3">{t("subscription")}</Typography>
-                    <Typography sx={{ color: "text.muted" }}>
-                        {t("family_plan")}
-                    </Typography>
-                </Stack>
-                <DialogCloseIconButton {...{ onClose }} />
-            </SpaceBetweenFlex>
-            <DialogContent>
-                <VerticallyCentered>
-                    <Box sx={{ mb: 4 }}>
-                        <Typography sx={{ color: "text.muted" }}>
-                            {t("subscription_info_family")}
-                        </Typography>
-                        <Typography>
-                            {familyAdminEmail(userDetails) ?? ""}
-                        </Typography>
-                    </Box>
-
-                    <img
-                        height={256}
-                        src="/images/family-plan/1x.png"
-                        srcSet="/images/family-plan/2x.png 2x, /images/family-plan/3x.png 3x"
-                    />
-                    <FlexWrapper px={2}>
-                        <Button
-                            fullWidth
-                            variant="outlined"
-                            color="critical"
-                            onClick={confirmLeaveFamily}
-                        >
-                            {t("leave_family_plan")}
-                        </Button>
-                    </FlexWrapper>
-                </VerticallyCentered>
-            </DialogContent>
-        </Dialog>
-    );
-}
-
-interface ShortcutSectionProps {
-    closeSidebar: () => void;
-    collectionSummaries: CollectionSummaries;
-}
-
-const ShortcutSection: React.FC<ShortcutSectionProps> = ({
-    closeSidebar,
-    collectionSummaries,
-}) => {
-    const galleryContext = useContext(GalleryContext);
-    const [uncategorizedCollectionId, setUncategorizedCollectionID] =
-        useState<number>();
-
-    useEffect(() => {
-        const main = async () => {
-            const unCategorizedCollection = await getUncategorizedCollection();
-            if (unCategorizedCollection) {
-                setUncategorizedCollectionID(unCategorizedCollection.id);
-            } else {
-                setUncategorizedCollectionID(DUMMY_UNCATEGORIZED_COLLECTION);
-            }
-        };
-        main();
-    }, []);
-
-    const openUncategorizedSection = () => {
-        galleryContext.setActiveCollectionID(uncategorizedCollectionId);
-        closeSidebar();
-    };
-
-    const openTrashSection = () => {
-        galleryContext.setActiveCollectionID(TRASH_SECTION);
-        closeSidebar();
-    };
-
-    const openArchiveSection = () => {
-        galleryContext.setActiveCollectionID(ARCHIVE_SECTION);
-        closeSidebar();
-    };
-
-    const openHiddenSection = () => {
-        galleryContext.openHiddenSection(() => {
-            closeSidebar();
-        });
-    };
-
-    return (
-        <>
-            <RowButton
-                startIcon={<CategoryIcon />}
-                label={t("section_uncategorized")}
-                caption={collectionSummaries
-                    .get(uncategorizedCollectionId)
-                    ?.fileCount.toString()}
-                onClick={openUncategorizedSection}
-            />
-            <RowButton
-                startIcon={<ArchiveOutlinedIcon />}
-                label={t("section_archive")}
-                caption={collectionSummaries
-                    .get(ARCHIVE_SECTION)
-                    ?.fileCount.toString()}
-                onClick={openArchiveSection}
-            />
-            <RowButton
-                startIcon={<VisibilityOffIcon />}
-                label={t("section_hidden")}
-                caption={
-                    <LockOutlinedIcon
-                        sx={{
-                            verticalAlign: "middle",
-                            fontSize: "19px !important",
-                        }}
-                    />
-                }
-                onClick={openHiddenSection}
-            />
-            <RowButton
-                startIcon={<DeleteOutlineIcon />}
-                label={t("section_trash")}
-                caption={collectionSummaries
-                    .get(TRASH_SECTION)
-                    ?.fileCount.toString()}
-                onClick={openTrashSection}
-            />
-        </>
-    );
-};
-
-interface UtilitySectionProps {
-    closeSidebar: () => void;
-}
-
-const UtilitySection: React.FC<UtilitySectionProps> = ({ closeSidebar }) => {
-    const router = useRouter();
-    const { watchFolderView, setWatchFolderView, showMiniDialog } =
-        useAppContext();
-
-    const { show: showRecoveryKey, props: recoveryKeyVisibilityProps } =
-        useModalVisibility();
-    const { show: showTwoFactor, props: twoFactorVisibilityProps } =
-        useModalVisibility();
-    const { show: showPreferences, props: preferencesVisibilityProps } =
-        useModalVisibility();
-
-    const showWatchFolder = () => setWatchFolderView(true);
-    const handleCloseWatchFolder = () => setWatchFolderView(false);
-
-    const redirectToChangePasswordPage = () => {
-        closeSidebar();
-        router.push(PAGES.CHANGE_PASSWORD);
-    };
-
-    const handleChangeEmail = () => router.push("/change-email");
-
-    const redirectToAccountsPage = async () => {
-        closeSidebar();
-        await openAccountsManagePasskeysPage();
-    };
-
-    const handleDeduplicate = () => router.push("/duplicates");
-
-    return (
-        <>
-            {isDesktop && (
-                <RowButton
-                    variant="secondary"
-                    label={t("watch_folders")}
-                    onClick={showWatchFolder}
-                />
-            )}
-            <RowButton
-                variant="secondary"
-                label={t("recovery_key")}
-                onClick={showRecoveryKey}
-            />
-            <RowButton
-                variant="secondary"
-                label={t("two_factor")}
-                onClick={showTwoFactor}
-            />
-            <RowButton
-                variant="secondary"
-                label={t("passkeys")}
-                onClick={redirectToAccountsPage}
-            />
-            <RowButton
-                variant="secondary"
-                label={t("change_password")}
-                onClick={redirectToChangePasswordPage}
-            />
-            <RowButton
-                variant="secondary"
-                label={t("change_email")}
-                onClick={handleChangeEmail}
-            />
-            <RowButton
-                variant="secondary"
-                label={t("deduplicate_files")}
-                onClick={handleDeduplicate}
-            />
-            <RowButton
-                variant="secondary"
-                label={t("preferences")}
-                onClick={showPreferences}
-            />
-
-            <RecoveryKey
-                {...recoveryKeyVisibilityProps}
-                {...{ showMiniDialog }}
-            />
-            <TwoFactorSettings
-                {...twoFactorVisibilityProps}
-                onRootClose={closeSidebar}
-            />
-            {isDesktop && (
-                <WatchFolder
-                    open={watchFolderView}
-                    onClose={handleCloseWatchFolder}
-                />
-            )}
-            <Preferences
-                {...preferencesVisibilityProps}
-                onRootClose={closeSidebar}
-            />
-        </>
-    );
-};
-
-const HelpSection: React.FC = () => {
-    const { showMiniDialog } = useContext(AppContext);
-    const { openExportModal } = useContext(GalleryContext);
-
-    const requestFeature = () =>
-        openURL("https://github.com/ente-io/ente/discussions");
-
-    const contactSupport = () => initiateEmail("support@ente.io");
-
-    const handleExport = () =>
-        isDesktop
-            ? openExportModal()
-            : showMiniDialog(downloadAppDialogAttributes());
-
-    return (
-        <>
-            <RowButton
-                variant="secondary"
-                label={t("request_feature")}
-                onClick={requestFeature}
-            />
-            <RowButton
-                variant="secondary"
-                label={
-                    <Tooltip title="support@ente.io">
-                        <Typography sx={{ fontWeight: "medium" }}>
-                            {t("support")}
-                        </Typography>
-                    </Tooltip>
-                }
-                onClick={contactSupport}
-            />
-            <RowButton
-                variant="secondary"
-                label={t("export_data")}
-                endIcon={
-                    exportService.isExportInProgress() && (
-                        <ActivityIndicator size="20px" />
-                    )
-                }
-                onClick={handleExport}
-            />
-        </>
-    );
-};
-
-const ExitSection: React.FC = () => {
-    const { showMiniDialog, logout } = useContext(AppContext);
-
-    const { show: showDeleteAccount, props: deleteAccountVisibilityProps } =
-        useModalVisibility();
-
-    const handleLogout = () =>
-        showMiniDialog({
-            message: t("logout_message"),
-            continue: { text: t("logout"), color: "critical", action: logout },
-            buttonDirection: "row",
-        });
-
-    return (
-        <>
-            <RowButton
-                variant="secondary"
-                color="critical"
-                label={t("logout")}
-                onClick={handleLogout}
-            />
-            <RowButton
-                variant="secondary"
-                color="critical"
-                onClick={showDeleteAccount}
-                label={t("delete_account")}
-            />
-            <DeleteAccountModal {...deleteAccountVisibilityProps} />
-        </>
-    );
-};
-
-const DebugSection: React.FC = () => {
-    const { showMiniDialog } = useAppContext();
-    const [appVersion, setAppVersion] = useState<string | undefined>();
-    const [host, setHost] = useState<string | undefined>();
-
-    const electron = globalThis.electron;
-
-    useEffect(() => {
-        void electron?.appVersion().then(setAppVersion);
-        void customAPIHost().then(setHost);
-    });
-
-    const confirmLogDownload = () =>
-        showMiniDialog({
-            title: t("download_logs"),
-            message: <Trans i18nKey={"download_logs_message"} />,
-            continue: {
-                text: t("download"),
-                action: downloadLogs,
-            },
-        });
-
-    const downloadLogs = () => {
-        log.info("Downloading logs");
-        if (electron) electron.openLogDirectory();
-        else downloadString(savedLogs(), `debug_logs_${Date.now()}.txt`);
-    };
-
-    return (
-        <>
-            {isInternalUser() && isDevBuild && (
-                <RowButton
-                    variant="secondary"
-                    label={ut("Test Upload")}
-                    onClick={testUpload}
-                />
-            )}
-            <RowButton
-                variant="secondary"
-                label={
-                    <Typography variant="mini" color="text.muted">
-                        {t("debug_logs")}
-                    </Typography>
-                }
-                onClick={confirmLogDownload}
-            />
-            <Stack
-                sx={{
-                    py: "14px",
-                    px: "16px",
-                    gap: "24px",
-                    color: "text.muted",
-                }}
-            >
-                {appVersion && (
-                    <Typography variant="mini">{appVersion}</Typography>
-                )}
-                {host && <Typography variant="mini">{host}</Typography>}
-            </Stack>
-        </>
-    );
-};
diff --git a/web/apps/photos/src/components/Sidebar/SubscriptionCard.tsx b/web/apps/photos/src/components/SubscriptionCard.tsx
similarity index 100%
rename from web/apps/photos/src/components/Sidebar/SubscriptionCard.tsx
rename to web/apps/photos/src/components/SubscriptionCard.tsx
diff --git a/web/apps/photos/src/components/Upload/UploadTypeSelector.tsx b/web/apps/photos/src/components/Upload/UploadTypeSelector.tsx
index ec27a27ad5..065cea33b0 100644
--- a/web/apps/photos/src/components/Upload/UploadTypeSelector.tsx
+++ b/web/apps/photos/src/components/Upload/UploadTypeSelector.tsx
@@ -1,4 +1,4 @@
-import { SpaceBetweenFlex } from "@/base/components/containers";
+import { SpacedRow } from "@/base/components/containers";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import { RowButton } from "@/base/components/RowButton";
 import { useIsTouchscreen } from "@/base/components/utils/hooks";
@@ -165,7 +165,7 @@ const DefaultOptions: React.FC<OptionsProps> = ({
 }) => {
     return (
         <>
-            <SpaceBetweenFlex>
+            <SpacedRow>
                 <DialogTitle variant="h5">
                     {intent == "collect"
                         ? t("select_photos")
@@ -174,7 +174,7 @@ const DefaultOptions: React.FC<OptionsProps> = ({
                           : t("upload")}
                 </DialogTitle>
                 <DialogCloseIconButton {...{ onClose }} />
-            </SpaceBetweenFlex>
+            </SpacedRow>
             <Box sx={{ p: "12px", pt: "16px" }}>
                 <Stack sx={{ gap: 0.5 }}>
                     {intent != "import" && (
@@ -221,10 +221,10 @@ const TakeoutOptions: React.FC<Omit<OptionsProps, "intent">> = ({
 }) => {
     return (
         <>
-            <SpaceBetweenFlex>
+            <SpacedRow>
                 <DialogTitle variant="h5">{t("google_takeout")}</DialogTitle>
                 <DialogCloseIconButton {...{ onClose }} />
-            </SpaceBetweenFlex>
+            </SpacedRow>
             <Stack sx={{ padding: "18px 12px 20px 12px", gap: "16px" }}>
                 <Stack sx={{ gap: "8px" }}>
                     <FocusVisibleButton
diff --git a/web/apps/photos/src/components/WatchFolder.tsx b/web/apps/photos/src/components/WatchFolder.tsx
index 1ab106082a..985cf61224 100644
--- a/web/apps/photos/src/components/WatchFolder.tsx
+++ b/web/apps/photos/src/components/WatchFolder.tsx
@@ -1,4 +1,4 @@
-import { CenteredFlex, SpaceBetweenFlex } from "@/base/components/containers";
+import { CenteredFill, SpacedRow } from "@/base/components/containers";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import {
     OverflowMenu,
@@ -122,12 +122,12 @@ export const WatchFolder: React.FC<ModalVisibilityProps> = ({
                     paper: { sx: { height: "448px", maxWidth: "444px" } },
                 }}
             >
-                <SpaceBetweenFlex sx={{ p: "16px 8px 0px 8px" }}>
+                <SpacedRow sx={{ p: "16px 8px 0px 8px" }}>
                     <DialogTitle variant="h3">
                         {t("watched_folders")}
                     </DialogTitle>
                     <DialogCloseIconButton {...{ onClose }} />
-                </SpaceBetweenFlex>
+                </SpacedRow>
                 <DialogContent sx={{ flex: 1 }}>
                     <Stack sx={{ gap: 1, p: 1.5, height: "100%" }}>
                         <WatchList {...{ watches, removeWatch }} />
@@ -170,30 +170,28 @@ const WatchList: React.FC<WatchList> = ({ watches, removeWatch }) =>
         </Stack>
     );
 
-const NoWatches: React.FC = () => {
-    return (
-        <CenteredFlex sx={{ flex: 1, mb: 4 }}>
-            <Stack sx={{ gap: 1.5 }}>
-                <Typography variant="h6">{t("no_folders_added")}</Typography>
-                <Typography variant="small" sx={{ py: 1, color: "text.muted" }}>
-                    {t("watch_folders_hint_1")}
-                </Typography>
-                <Typography variant="small" sx={{ color: "text.muted" }}>
-                    <Stack direction="row" sx={{ gap: 1 }}>
-                        <Check />
-                        {t("watch_folders_hint_2")}
-                    </Stack>
-                </Typography>
-                <Typography variant="small" sx={{ color: "text.muted" }}>
-                    <Stack direction="row" sx={{ gap: 1 }}>
-                        <Check />
-                        {t("watch_folders_hint_3")}
-                    </Stack>
-                </Typography>
-            </Stack>
-        </CenteredFlex>
-    );
-};
+const NoWatches: React.FC = () => (
+    <CenteredFill sx={{ mb: 4 }}>
+        <Stack sx={{ gap: 1.5 }}>
+            <Typography variant="h6">{t("no_folders_added")}</Typography>
+            <Typography variant="small" sx={{ py: 1, color: "text.muted" }}>
+                {t("watch_folders_hint_1")}
+            </Typography>
+            <Typography variant="small" sx={{ color: "text.muted" }}>
+                <Stack direction="row" sx={{ gap: 1 }}>
+                    <Check />
+                    {t("watch_folders_hint_2")}
+                </Stack>
+            </Typography>
+            <Typography variant="small" sx={{ color: "text.muted" }}>
+                <Stack direction="row" sx={{ gap: 1 }}>
+                    <Check />
+                    {t("watch_folders_hint_3")}
+                </Stack>
+            </Typography>
+        </Stack>
+    </CenteredFill>
+);
 
 const Check: React.FC = () => (
     <CheckIcon
@@ -222,7 +220,7 @@ const WatchEntry: React.FC<WatchEntryProps> = ({ watch, removeWatch }) => {
     };
 
     return (
-        <SpaceBetweenFlex sx={{ overflow: "hidden", flexShrink: 0 }}>
+        <SpacedRow sx={{ overflow: "hidden", flexShrink: 0 }}>
             <Stack direction="row" sx={{ overflow: "hidden", gap: 1.5 }}>
                 {watch.collectionMapping === "root" ? (
                     <Tooltip title={t("uploaded_to_single_collection")}>
@@ -239,7 +237,7 @@ const WatchEntry: React.FC<WatchEntryProps> = ({ watch, removeWatch }) => {
                 </Stack>
             </Stack>
             <EntryOptions {...{ confirmStopWatching }} />
-        </SpaceBetweenFlex>
+        </SpacedRow>
     );
 };
 
diff --git a/web/apps/photos/src/components/pages/gallery/PreviewCard.tsx b/web/apps/photos/src/components/pages/gallery/PreviewCard.tsx
index a1b2c0a758..79ca1d167a 100644
--- a/web/apps/photos/src/components/pages/gallery/PreviewCard.tsx
+++ b/web/apps/photos/src/components/pages/gallery/PreviewCard.tsx
@@ -43,7 +43,8 @@ const Check = styled("input")<{ $active: boolean }>(
     ({ theme, $active }) => `
     appearance: none;
     position: absolute;
-    z-index: 10;
+    /* Increase z-index in stacking order to capture clicks */
+    z-index: 1;
     left: 0;
     outline: none;
     cursor: pointer;
@@ -162,7 +163,6 @@ const InSelectRangeOverlay = styled(Overlay)(
 
 const SelectedOverlay = styled(Overlay)(
     ({ theme }) => `
-    z-index: 5;
     border: 2px solid ${theme.vars.palette.accent.main};
     border-radius: 4px;
 `,
diff --git a/web/apps/photos/src/components/pages/gallery/SelectedFileOptions.tsx b/web/apps/photos/src/components/pages/gallery/SelectedFileOptions.tsx
index 12fbd1cbf3..35f97b7387 100644
--- a/web/apps/photos/src/components/pages/gallery/SelectedFileOptions.tsx
+++ b/web/apps/photos/src/components/pages/gallery/SelectedFileOptions.tsx
@@ -1,4 +1,4 @@
-import { SelectionBar } from "@/base/components/Navbar";
+import { SpacedRow } from "@/base/components/containers";
 import type { Collection } from "@/media/collection";
 import type { CollectionSelectorAttributes } from "@/new/photos/components/CollectionSelector";
 import type { GalleryBarMode } from "@/new/photos/components/gallery/reducer";
@@ -8,7 +8,6 @@ import {
     TRASH_SECTION,
 } from "@/new/photos/services/collection";
 import { useAppContext } from "@/new/photos/types/context";
-import { FluidContainer } from "@ente/shared/components/Container";
 import ClockIcon from "@mui/icons-material/AccessTime";
 import AddIcon from "@mui/icons-material/Add";
 import ArchiveIcon from "@mui/icons-material/ArchiveOutlined";
@@ -22,7 +21,7 @@ import RestoreIcon from "@mui/icons-material/Restore";
 import UnArchiveIcon from "@mui/icons-material/Unarchive";
 import VisibilityOffOutlinedIcon from "@mui/icons-material/VisibilityOffOutlined";
 import VisibilityOutlinedIcon from "@mui/icons-material/VisibilityOutlined";
-import { Box, IconButton, Stack, Tooltip } from "@mui/material";
+import { IconButton, Tooltip, Typography } from "@mui/material";
 import { t } from "i18next";
 import { COLLECTION_OPS_TYPE } from "utils/collection";
 import { FILE_OPS_TYPE } from "utils/file";
@@ -174,130 +173,136 @@ const SelectedFileOptions = ({
     };
 
     return (
-        <SelectionBar>
-            <FluidContainer>
-                <IconButton onClick={clearSelection}>
-                    <CloseIcon />
-                </IconButton>
-                <Box sx={{ ml: 1.5 }}>
-                    {ownCount === count
-                        ? t("selected_count", { selected: count })
-                        : t("selected_and_yours_count", {
-                              selected: count,
-                              yours: ownCount,
-                          })}
-                </Box>
-            </FluidContainer>
-            <Stack direction="row" sx={{ gap: 2, mr: 2 }}>
-                {isInSearchMode ? (
-                    <>
-                        <Tooltip title={t("fix_creation_time")}>
-                            <IconButton
-                                onClick={handleFileOps(FILE_OPS_TYPE.FIX_TIME)}
-                            >
-                                <ClockIcon />
-                            </IconButton>
-                        </Tooltip>
-                        <Tooltip title={t("download")}>
-                            <IconButton
-                                onClick={handleFileOps(FILE_OPS_TYPE.DOWNLOAD)}
-                            >
-                                <DownloadIcon />
-                            </IconButton>
-                        </Tooltip>
-                        <Tooltip title={t("add")}>
-                            <IconButton onClick={addToCollection}>
-                                <AddIcon />
-                            </IconButton>
-                        </Tooltip>
-                        <Tooltip title={t("archive")}>
-                            <IconButton
-                                onClick={handleFileOps(FILE_OPS_TYPE.ARCHIVE)}
-                            >
-                                <ArchiveIcon />
-                            </IconButton>
-                        </Tooltip>
-                        <Tooltip title={t("hide")}>
-                            <IconButton
-                                onClick={handleFileOps(FILE_OPS_TYPE.HIDE)}
-                            >
-                                <VisibilityOffOutlinedIcon />
-                            </IconButton>
-                        </Tooltip>
-                        <Tooltip title={t("delete")}>
-                            <IconButton onClick={trashHandler}>
-                                <DeleteIcon />
-                            </IconButton>
-                        </Tooltip>
-                    </>
-                ) : peopleMode ? (
-                    <>
-                        <Tooltip title={t("download")}>
-                            <IconButton
-                                onClick={handleFileOps(FILE_OPS_TYPE.DOWNLOAD)}
-                            >
-                                <DownloadIcon />
-                            </IconButton>
-                        </Tooltip>
-                        <Tooltip title={t("add")}>
-                            <IconButton onClick={addToCollection}>
-                                <AddIcon />
-                            </IconButton>
-                        </Tooltip>
-                        <Tooltip title={t("archive")}>
-                            <IconButton
-                                onClick={handleFileOps(FILE_OPS_TYPE.ARCHIVE)}
-                            >
-                                <ArchiveIcon />
-                            </IconButton>
-                        </Tooltip>
-                        <Tooltip title={t("hide")}>
-                            <IconButton
-                                onClick={handleFileOps(FILE_OPS_TYPE.HIDE)}
-                            >
-                                <VisibilityOffOutlinedIcon />
-                            </IconButton>
-                        </Tooltip>
-                        <Tooltip title={t("delete")}>
-                            <IconButton onClick={trashHandler}>
-                                <DeleteIcon />
-                            </IconButton>
-                        </Tooltip>
-                    </>
-                ) : activeCollectionID === TRASH_SECTION ? (
-                    <>
-                        <Tooltip title={t("restore")}>
-                            <IconButton onClick={restoreHandler}>
-                                <RestoreIcon />
-                            </IconButton>
-                        </Tooltip>
-                        <Tooltip title={t("delete_permanently")}>
-                            <IconButton onClick={permanentlyDeleteHandler}>
-                                <DeleteIcon />
-                            </IconButton>
-                        </Tooltip>
-                    </>
-                ) : isUncategorizedCollection ? (
-                    <>
-                        <Tooltip title={t("download")}>
-                            <IconButton
-                                onClick={handleFileOps(FILE_OPS_TYPE.DOWNLOAD)}
-                            >
-                                <DownloadIcon />
-                            </IconButton>
-                        </Tooltip>
-                        <Tooltip title={t("move")}>
-                            <IconButton onClick={moveToCollection}>
-                                <MoveIcon />
-                            </IconButton>
-                        </Tooltip>
-                        <Tooltip title={t("delete")}>
-                            <IconButton onClick={trashHandler}>
-                                <DeleteIcon />
-                            </IconButton>
-                        </Tooltip>
-                    </>
-                ) : isIncomingSharedCollection ? (
+        <SpacedRow sx={{ flex: 1, gap: 1, flexWrap: "wrap" }}>
+            <IconButton onClick={clearSelection}>
+                <CloseIcon />
+            </IconButton>
+            <Typography sx={{ mr: "auto" }}>
+                {ownCount === count
+                    ? t("selected_count", { selected: count })
+                    : t("selected_and_yours_count", {
+                          selected: count,
+                          yours: ownCount,
+                      })}
+            </Typography>
+
+            {isInSearchMode ? (
+                <>
+                    <Tooltip title={t("fix_creation_time")}>
+                        <IconButton
+                            onClick={handleFileOps(FILE_OPS_TYPE.FIX_TIME)}
+                        >
+                            <ClockIcon />
+                        </IconButton>
+                    </Tooltip>
+                    <Tooltip title={t("download")}>
+                        <IconButton
+                            onClick={handleFileOps(FILE_OPS_TYPE.DOWNLOAD)}
+                        >
+                            <DownloadIcon />
+                        </IconButton>
+                    </Tooltip>
+                    <Tooltip title={t("add")}>
+                        <IconButton onClick={addToCollection}>
+                            <AddIcon />
+                        </IconButton>
+                    </Tooltip>
+                    <Tooltip title={t("archive")}>
+                        <IconButton
+                            onClick={handleFileOps(FILE_OPS_TYPE.ARCHIVE)}
+                        >
+                            <ArchiveIcon />
+                        </IconButton>
+                    </Tooltip>
+                    <Tooltip title={t("hide")}>
+                        <IconButton onClick={handleFileOps(FILE_OPS_TYPE.HIDE)}>
+                            <VisibilityOffOutlinedIcon />
+                        </IconButton>
+                    </Tooltip>
+                    <Tooltip title={t("delete")}>
+                        <IconButton onClick={trashHandler}>
+                            <DeleteIcon />
+                        </IconButton>
+                    </Tooltip>
+                </>
+            ) : peopleMode ? (
+                <>
+                    <Tooltip title={t("download")}>
+                        <IconButton
+                            onClick={handleFileOps(FILE_OPS_TYPE.DOWNLOAD)}
+                        >
+                            <DownloadIcon />
+                        </IconButton>
+                    </Tooltip>
+                    <Tooltip title={t("add")}>
+                        <IconButton onClick={addToCollection}>
+                            <AddIcon />
+                        </IconButton>
+                    </Tooltip>
+                    <Tooltip title={t("archive")}>
+                        <IconButton
+                            onClick={handleFileOps(FILE_OPS_TYPE.ARCHIVE)}
+                        >
+                            <ArchiveIcon />
+                        </IconButton>
+                    </Tooltip>
+                    <Tooltip title={t("hide")}>
+                        <IconButton onClick={handleFileOps(FILE_OPS_TYPE.HIDE)}>
+                            <VisibilityOffOutlinedIcon />
+                        </IconButton>
+                    </Tooltip>
+                    <Tooltip title={t("delete")}>
+                        <IconButton onClick={trashHandler}>
+                            <DeleteIcon />
+                        </IconButton>
+                    </Tooltip>
+                </>
+            ) : activeCollectionID === TRASH_SECTION ? (
+                <>
+                    <Tooltip title={t("restore")}>
+                        <IconButton onClick={restoreHandler}>
+                            <RestoreIcon />
+                        </IconButton>
+                    </Tooltip>
+                    <Tooltip title={t("delete_permanently")}>
+                        <IconButton onClick={permanentlyDeleteHandler}>
+                            <DeleteIcon />
+                        </IconButton>
+                    </Tooltip>
+                </>
+            ) : isUncategorizedCollection ? (
+                <>
+                    <Tooltip title={t("download")}>
+                        <IconButton
+                            onClick={handleFileOps(FILE_OPS_TYPE.DOWNLOAD)}
+                        >
+                            <DownloadIcon />
+                        </IconButton>
+                    </Tooltip>
+                    <Tooltip title={t("move")}>
+                        <IconButton onClick={moveToCollection}>
+                            <MoveIcon />
+                        </IconButton>
+                    </Tooltip>
+                    <Tooltip title={t("delete")}>
+                        <IconButton onClick={trashHandler}>
+                            <DeleteIcon />
+                        </IconButton>
+                    </Tooltip>
+                </>
+            ) : isIncomingSharedCollection ? (
+                <Tooltip title={t("download")}>
+                    <IconButton onClick={handleFileOps(FILE_OPS_TYPE.DOWNLOAD)}>
+                        <DownloadIcon />
+                    </IconButton>
+                </Tooltip>
+            ) : isInHiddenSection ? (
+                <>
+                    <Tooltip title={t("unhide")}>
+                        <IconButton onClick={unhideToCollection}>
+                            <VisibilityOutlinedIcon />
+                        </IconButton>
+                    </Tooltip>
                     <Tooltip title={t("download")}>
                         <IconButton
                             onClick={handleFileOps(FILE_OPS_TYPE.DOWNLOAD)}
@@ -305,119 +310,96 @@ const SelectedFileOptions = ({
                             <DownloadIcon />
                         </IconButton>
                     </Tooltip>
-                ) : isInHiddenSection ? (
-                    <>
-                        <Tooltip title={t("unhide")}>
-                            <IconButton onClick={unhideToCollection}>
-                                <VisibilityOutlinedIcon />
-                            </IconButton>
-                        </Tooltip>
-                        <Tooltip title={t("download")}>
-                            <IconButton
-                                onClick={handleFileOps(FILE_OPS_TYPE.DOWNLOAD)}
-                            >
-                                <DownloadIcon />
-                            </IconButton>
-                        </Tooltip>
 
-                        <Tooltip title={t("delete")}>
-                            <IconButton onClick={trashHandler}>
-                                <DeleteIcon />
-                            </IconButton>
-                        </Tooltip>
-                    </>
-                ) : (
-                    <>
-                        <Tooltip title={t("fix_creation_time")}>
+                    <Tooltip title={t("delete")}>
+                        <IconButton onClick={trashHandler}>
+                            <DeleteIcon />
+                        </IconButton>
+                    </Tooltip>
+                </>
+            ) : (
+                <>
+                    <Tooltip title={t("fix_creation_time")}>
+                        <IconButton
+                            onClick={handleFileOps(FILE_OPS_TYPE.FIX_TIME)}
+                        >
+                            <ClockIcon />
+                        </IconButton>
+                    </Tooltip>
+                    {!isFavoriteCollection &&
+                        activeCollectionID != ARCHIVE_SECTION && (
+                            <Tooltip title={t("favorite")}>
+                                <IconButton
+                                    onClick={handleFileOps(
+                                        FILE_OPS_TYPE.SET_FAVORITE,
+                                    )}
+                                >
+                                    <FavoriteBorderIcon />
+                                </IconButton>
+                            </Tooltip>
+                        )}
+                    <Tooltip title={t("download")}>
+                        <IconButton
+                            onClick={handleFileOps(FILE_OPS_TYPE.DOWNLOAD)}
+                        >
+                            <DownloadIcon />
+                        </IconButton>
+                    </Tooltip>
+                    <Tooltip title={t("add")}>
+                        <IconButton onClick={addToCollection}>
+                            <AddIcon />
+                        </IconButton>
+                    </Tooltip>
+                    {activeCollectionID === ARCHIVE_SECTION && (
+                        <Tooltip title={t("unarchive")}>
                             <IconButton
-                                onClick={handleFileOps(FILE_OPS_TYPE.FIX_TIME)}
+                                onClick={handleFileOps(FILE_OPS_TYPE.UNARCHIVE)}
                             >
-                                <ClockIcon />
+                                <UnArchiveIcon />
                             </IconButton>
                         </Tooltip>
-                        {!isFavoriteCollection &&
-                            activeCollectionID != ARCHIVE_SECTION && (
-                                <Tooltip title={t("favorite")}>
-                                    <IconButton
-                                        onClick={handleFileOps(
-                                            FILE_OPS_TYPE.SET_FAVORITE,
-                                        )}
-                                    >
-                                        <FavoriteBorderIcon />
+                    )}
+                    {activeCollectionID === ALL_SECTION && (
+                        <Tooltip title={t("archive")}>
+                            <IconButton
+                                onClick={handleFileOps(FILE_OPS_TYPE.ARCHIVE)}
+                            >
+                                <ArchiveIcon />
+                            </IconButton>
+                        </Tooltip>
+                    )}
+                    {activeCollectionID !== ALL_SECTION &&
+                        activeCollectionID !== ARCHIVE_SECTION &&
+                        !isFavoriteCollection && (
+                            <>
+                                <Tooltip title={t("move")}>
+                                    <IconButton onClick={moveToCollection}>
+                                        <MoveIcon />
                                     </IconButton>
                                 </Tooltip>
-                            )}
-                        <Tooltip title={t("download")}>
-                            <IconButton
-                                onClick={handleFileOps(FILE_OPS_TYPE.DOWNLOAD)}
-                            >
-                                <DownloadIcon />
-                            </IconButton>
-                        </Tooltip>
-                        <Tooltip title={t("add")}>
-                            <IconButton onClick={addToCollection}>
-                                <AddIcon />
-                            </IconButton>
-                        </Tooltip>
-                        {activeCollectionID === ARCHIVE_SECTION && (
-                            <Tooltip title={t("unarchive")}>
-                                <IconButton
-                                    onClick={handleFileOps(
-                                        FILE_OPS_TYPE.UNARCHIVE,
-                                    )}
-                                >
-                                    <UnArchiveIcon />
-                                </IconButton>
-                            </Tooltip>
-                        )}
-                        {activeCollectionID === ALL_SECTION && (
-                            <Tooltip title={t("archive")}>
-                                <IconButton
-                                    onClick={handleFileOps(
-                                        FILE_OPS_TYPE.ARCHIVE,
-                                    )}
-                                >
-                                    <ArchiveIcon />
-                                </IconButton>
-                            </Tooltip>
-                        )}
-                        {activeCollectionID !== ALL_SECTION &&
-                            activeCollectionID !== ARCHIVE_SECTION &&
-                            !isFavoriteCollection && (
-                                <>
-                                    <Tooltip title={t("move")}>
-                                        <IconButton onClick={moveToCollection}>
-                                            <MoveIcon />
-                                        </IconButton>
-                                    </Tooltip>
 
-                                    <Tooltip title={t("remove")}>
-                                        <IconButton
-                                            onClick={
-                                                removeFromCollectionHandler
-                                            }
-                                        >
-                                            <RemoveIcon />
-                                        </IconButton>
-                                    </Tooltip>
-                                </>
-                            )}
-                        <Tooltip title={t("hide")}>
-                            <IconButton
-                                onClick={handleFileOps(FILE_OPS_TYPE.HIDE)}
-                            >
-                                <VisibilityOffOutlinedIcon />
-                            </IconButton>
-                        </Tooltip>
-                        <Tooltip title={t("delete")}>
-                            <IconButton onClick={trashHandler}>
-                                <DeleteIcon />
-                            </IconButton>
-                        </Tooltip>
-                    </>
-                )}
-            </Stack>
-        </SelectionBar>
+                                <Tooltip title={t("remove")}>
+                                    <IconButton
+                                        onClick={removeFromCollectionHandler}
+                                    >
+                                        <RemoveIcon />
+                                    </IconButton>
+                                </Tooltip>
+                            </>
+                        )}
+                    <Tooltip title={t("hide")}>
+                        <IconButton onClick={handleFileOps(FILE_OPS_TYPE.HIDE)}>
+                            <VisibilityOffOutlinedIcon />
+                        </IconButton>
+                    </Tooltip>
+                    <Tooltip title={t("delete")}>
+                        <IconButton onClick={trashHandler}>
+                            <DeleteIcon />
+                        </IconButton>
+                    </Tooltip>
+                </>
+            )}
+        </SpacedRow>
     );
 };
 
diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index f2345ebdfe..d551c03017 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -1,13 +1,8 @@
-import {
-    clientPackageName,
-    isDesktop,
-    staticAppTitle,
-    wipDesktopCustomTitlebar,
-} from "@/base/app";
-import { CenteredFlex } from "@/base/components/containers";
+import { clientPackageName, isDesktop, staticAppTitle } from "@/base/app";
+import { CenteredRow } from "@/base/components/containers";
 import { CustomHead } from "@/base/components/Head";
 import {
-    LoadingOverlay,
+    LoadingIndicator,
     TranslucentLoadingOverlay,
 } from "@/base/components/loaders";
 import { AttributedMiniDialog } from "@/base/components/MiniDialog";
@@ -31,7 +26,7 @@ import {
     updateReadyToInstallDialogAttributes,
 } from "@/new/photos/components/utils/download";
 import { useLoadingBar } from "@/new/photos/components/utils/use-loading-bar";
-import { aboveGalleryContentZ } from "@/new/photos/components/utils/z-index";
+import { aboveFileViewerContentZ } from "@/new/photos/components/utils/z-index";
 import { runMigrations } from "@/new/photos/services/migration";
 import { initML, isMLSupported } from "@/new/photos/services/ml";
 import { getFamilyPortalRedirectURL } from "@/new/photos/services/user-details";
@@ -189,18 +184,16 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
                 <ThemedLoadingBar ref={loadingBarRef} />
 
                 <AttributedMiniDialog
-                    sx={{ zIndex: aboveGalleryContentZ }}
+                    sx={{ zIndex: aboveFileViewerContentZ }}
                     {...miniDialogProps}
                 />
 
                 <Notification {...notificationProps} />
 
-                {wipDesktopCustomTitlebar && (
-                    <WindowTitlebar>{title}</WindowTitlebar>
-                )}
+                {isDesktop && <WindowTitlebar>{title}</WindowTitlebar>}
                 <AppContext.Provider value={appContext}>
                     {!isI18nReady ? (
-                        <LoadingOverlay />
+                        <LoadingIndicator />
                     ) : (
                         <>
                             {isChangingRoute && <TranslucentLoadingOverlay />}
@@ -229,10 +222,11 @@ const WindowTitlebar: React.FC<React.PropsWithChildren> = ({ children }) => (
 );
 
 // See: [Note: Customize the desktop title bar]
-const WindowTitlebarArea = styled(CenteredFlex)`
+const WindowTitlebarArea = styled(CenteredRow)`
     width: 100%;
     height: env(titlebar-area-height, 30px /* fallback */);
-    display: flex;
-    /* Allow using the titlebar to drag the window */
+    /* LoadingIndicator is 100vh, so resist shrinking when shown with it. */
+    flex-shrink: 0;
+    /* Allow using the titlebar to drag the window. */
     app-region: drag;
 `;
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 8463813a1a..4aaf841a5f 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -1,7 +1,8 @@
 import { sessionExpiredDialogAttributes } from "@/accounts/components/utils/dialog";
 import { stashRedirect } from "@/accounts/services/redirect";
 import type { MiniDialogAttributes } from "@/base/components/MiniDialog";
-import { NavbarBaseNormalFlow } from "@/base/components/Navbar";
+import { NavbarBase } from "@/base/components/Navbar";
+import { CenteredRow } from "@/base/components/containers";
 import { TranslucentLoadingOverlay } from "@/base/components/loaders";
 import type { ButtonishProps } from "@/base/components/mui";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
@@ -66,7 +67,7 @@ import {
 } from "@/new/photos/services/user-details";
 import { useAppContext } from "@/new/photos/types/context";
 import { splitByPredicate } from "@/utils/array";
-import { CenteredFlex, FlexWrapper } from "@ente/shared/components/Container";
+import { FlexWrapper } from "@ente/shared/components/Container";
 import { PHOTOS_PAGES as PAGES } from "@ente/shared/constants/pages";
 import { getRecoveryKey } from "@ente/shared/crypto/helpers";
 import { CustomError } from "@ente/shared/error";
@@ -101,7 +102,7 @@ import { FixCreationTime } from "components/FixCreationTime";
 import GalleryEmptyState from "components/GalleryEmptyState";
 import PhotoFrame from "components/PhotoFrame";
 import { ITEM_TYPE, TimeStampListItem } from "components/PhotoList";
-import Sidebar from "components/Sidebar";
+import { Sidebar } from "components/Sidebar";
 import { type UploadTypeSelectorIntent } from "components/Upload/UploadTypeSelector";
 import Uploader from "components/Upload/Uploader";
 import { UploadSelectorInputs } from "components/UploadSelectorInputs";
@@ -854,6 +855,9 @@ const Page: React.FC = () => {
         [],
     );
 
+    const showSelectionBar =
+        selected.count > 0 && selected.collectionID === activeCollectionID;
+
     if (!user) {
         // Don't render until we dispatch "mount" with the logged in user.
         return <div></div>;
@@ -901,16 +905,6 @@ const Page: React.FC = () => {
                     }}
                 />
                 {blockingLoad && <TranslucentLoadingOverlay />}
-                {isFirstLoad && (
-                    <CenteredFlex>
-                        <Typography
-                            variant="small"
-                            sx={{ color: "text.muted" }}
-                        >
-                            {t("initial_load_delay_warning")}
-                        </Typography>
-                    </CenteredFlex>
-                )}
                 <PlanSelector
                     {...planSelectorVisibilityProps}
                     setLoading={(v) => setBlockingLoad(v)}
@@ -940,15 +934,53 @@ const Page: React.FC = () => {
                     {...fixCreationTimeVisibilityProps}
                     files={fixCreationTimeFiles}
                 />
-
-                <NavbarBaseNormalFlow
-                    sx={{
-                        mb: "12px",
-                        px: "24px",
-                        "@media (width < 720px)": { px: "4px" },
-                    }}
+                <NavbarBase
+                    sx={[
+                        {
+                            mb: "12px",
+                            px: "24px",
+                            "@media (width < 720px)": { px: "4px" },
+                        },
+                        showSelectionBar && { borderColor: "accent.main" },
+                    ]}
                 >
-                    {barMode == "hidden-albums" ? (
+                    {showSelectionBar ? (
+                        <SelectedFileOptions
+                            handleCollectionOps={collectionOpsHelper}
+                            handleFileOps={fileOpsHelper}
+                            showCreateCollectionModal={
+                                showCreateCollectionModal
+                            }
+                            onOpenCollectionSelector={
+                                handleOpenCollectionSelector
+                            }
+                            count={selected.count}
+                            ownCount={selected.ownCount}
+                            clearSelection={clearSelection}
+                            barMode={barMode}
+                            activeCollectionID={activeCollectionID}
+                            selectedCollection={getSelectedCollection(
+                                selected.collectionID,
+                                collections,
+                            )}
+                            isFavoriteCollection={
+                                collectionSummaries.get(activeCollectionID)
+                                    ?.type == "favorites"
+                            }
+                            isUncategorizedCollection={
+                                collectionSummaries.get(activeCollectionID)
+                                    ?.type == "uncategorized"
+                            }
+                            isIncomingSharedCollection={
+                                collectionSummaries.get(activeCollectionID)
+                                    ?.type == "incomingShareCollaborator" ||
+                                collectionSummaries.get(activeCollectionID)
+                                    ?.type == "incomingShareViewer"
+                            }
+                            isInSearchMode={isInSearchMode}
+                            isInHiddenSection={barMode == "hidden-albums"}
+                        />
+                    ) : barMode == "hidden-albums" ? (
                         <HiddenSectionNavbarContents
                             onBack={() => dispatch({ type: "showAlbums" })}
                         />
@@ -964,11 +996,15 @@ const Page: React.FC = () => {
                                 onSelectPeople: () =>
                                     dispatch({ type: "showPeople" }),
                                 onSelectPerson: (personID) =>
-                                    dispatch({ type: "showPerson", personID }),
+                                    dispatch({
+                                        type: "showPerson",
+                                        personID,
+                                    }),
                             }}
                         />
                     )}
-                </NavbarBaseNormalFlow>
+                </NavbarBase>
+                {isFirstLoad && <FirstLoadMessage />}
                 {isOffline && <OfflineMessage />}
 
                 <GalleryBarAndListHeader
@@ -1085,44 +1121,6 @@ const Page: React.FC = () => {
                         }}
                     />
                 )}
-                {selected.count > 0 &&
-                    selected.collectionID === activeCollectionID && (
-                        <SelectedFileOptions
-                            handleCollectionOps={collectionOpsHelper}
-                            handleFileOps={fileOpsHelper}
-                            showCreateCollectionModal={
-                                showCreateCollectionModal
-                            }
-                            onOpenCollectionSelector={
-                                handleOpenCollectionSelector
-                            }
-                            count={selected.count}
-                            ownCount={selected.ownCount}
-                            clearSelection={clearSelection}
-                            barMode={barMode}
-                            activeCollectionID={activeCollectionID}
-                            selectedCollection={getSelectedCollection(
-                                selected.collectionID,
-                                collections,
-                            )}
-                            isFavoriteCollection={
-                                collectionSummaries.get(activeCollectionID)
-                                    ?.type == "favorites"
-                            }
-                            isUncategorizedCollection={
-                                collectionSummaries.get(activeCollectionID)
-                                    ?.type == "uncategorized"
-                            }
-                            isIncomingSharedCollection={
-                                collectionSummaries.get(activeCollectionID)
-                                    ?.type == "incomingShareCollaborator" ||
-                                collectionSummaries.get(activeCollectionID)
-                                    ?.type == "incomingShareViewer"
-                            }
-                            isInSearchMode={isInSearchMode}
-                            isInHiddenSection={barMode == "hidden-albums"}
-                        />
-                    )}
                 <Export
                     {...exportVisibilityProps}
                     collectionNameMap={state.allCollectionNameByID}
@@ -1139,6 +1137,14 @@ const Page: React.FC = () => {
 
 export default Page;
 
+const FirstLoadMessage: React.FC = () => (
+    <CenteredRow>
+        <Typography variant="small" sx={{ color: "text.muted" }}>
+            {t("initial_load_delay_warning")}
+        </Typography>
+    </CenteredRow>
+);
+
 const OfflineMessage: React.FC = () => (
     <Typography
         variant="small"
diff --git a/web/apps/photos/src/pages/index.tsx b/web/apps/photos/src/pages/index.tsx
index 5888827b9e..695fdec9d6 100644
--- a/web/apps/photos/src/pages/index.tsx
+++ b/web/apps/photos/src/pages/index.tsx
@@ -1,6 +1,6 @@
 import { LoginContents } from "@/accounts/components/LoginContents";
 import { SignUpContents } from "@/accounts/components/SignUpContents";
-import { CenteredFill, CenteredFlex } from "@/base/components/containers";
+import { CenteredFill, CenteredRow } from "@/base/components/containers";
 import { EnteLogo } from "@/base/components/EnteLogo";
 import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
@@ -300,7 +300,7 @@ const MobileBoxFooter: React.FC<MobileBoxFooterProps> = ({ host }) => {
     );
 };
 
-const DesktopBox = styled(CenteredFlex)`
+const DesktopBox = styled(CenteredRow)`
     flex-shrink: 0;
     flex-grow: 2;
     flex-basis: auto;
diff --git a/web/apps/photos/src/pages/shared-albums.tsx b/web/apps/photos/src/pages/shared-albums.tsx
index 84db7a957a..8923448ce8 100644
--- a/web/apps/photos/src/pages/shared-albums.tsx
+++ b/web/apps/photos/src/pages/shared-albums.tsx
@@ -2,10 +2,7 @@ import {
     AccountsPageContents,
     AccountsPageTitle,
 } from "@/accounts/components/layouts/centered-paper";
-import {
-    SpaceBetweenFlex,
-    Stack100vhCenter,
-} from "@/base/components/containers";
+import { SpacedRow, Stack100vhCenter } from "@/base/components/containers";
 import { EnteLogo } from "@/base/components/EnteLogo";
 import {
     LoadingIndicator,
@@ -13,7 +10,7 @@ import {
 } from "@/base/components/loaders";
 import type { ButtonishProps } from "@/base/components/mui";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
-import { NavbarBase, SelectionBar } from "@/base/components/Navbar";
+import { NavbarBase } from "@/base/components/Navbar";
 import {
     OverflowMenu,
     OverflowMenuOption,
@@ -42,10 +39,7 @@ import {
 } from "@/new/photos/services/collection";
 import { sortFiles } from "@/new/photos/services/files";
 import { useAppContext } from "@/new/photos/types/context";
-import {
-    CenteredFlex,
-    FluidContainer,
-} from "@ente/shared/components/Container";
+import { CenteredFlex } from "@ente/shared/components/Container";
 import SingleInputForm, {
     type SingleInputFormProps,
 } from "@ente/shared/components/SingleInputForm";
@@ -518,7 +512,33 @@ export default function PublicCollectionGallery() {
                         getFolderSelectorInputProps,
                     }}
                 />
-                <SharedAlbumNavbar onAddPhotos={onAddPhotos} />
+                <NavbarBase
+                    sx={{
+                        mb: "16px",
+                        px: "24px",
+                        "@media (width < 720px)": { px: "4px" },
+                    }}
+                >
+                    {selected.count > 0 ? (
+                        <SelectedFileOptions
+                            downloadFilesHelper={downloadFilesHelper}
+                            clearSelection={clearSelection}
+                            count={selected.count}
+                        />
+                    ) : (
+                        <SpacedRow sx={{ flex: 1 }}>
+                            <EnteLogoLink href="https://ente.io">
+                                <EnteLogo height={15} />
+                            </EnteLogoLink>
+                            {onAddPhotos ? (
+                                <AddPhotosButton onClick={onAddPhotos} />
+                            ) : (
+                                <GoToEnte />
+                            )}
+                        </SpacedRow>
+                    )}
+                </NavbarBase>
+
                 <PhotoFrame
                     files={publicFiles}
                     syncWithRemote={syncWithRemote}
@@ -558,39 +578,11 @@ export default function PublicCollectionGallery() {
                     attributesList={filesDownloadProgressAttributesList}
                     setAttributesList={setFilesDownloadProgressAttributesList}
                 />
-                {selected.count > 0 && (
-                    <SelectedFileOptions
-                        downloadFilesHelper={downloadFilesHelper}
-                        clearSelection={clearSelection}
-                        count={selected.count}
-                    />
-                )}
             </FullScreenDropZone>
         </PublicCollectionGalleryContext.Provider>
     );
 }
 
-interface SharedAlbumNavbarProps {
-    /**
-     * If provided, then an "Add Photos" button will be shown in the navbar, and
-     * this function will be called when it is clicked.
-     */
-    onAddPhotos: (() => void) | undefined;
-}
-
-const SharedAlbumNavbar: React.FC<SharedAlbumNavbarProps> = ({
-    onAddPhotos,
-}) => (
-    <NavbarBase>
-        <FluidContainer>
-            <EnteLogoLink href="https://ente.io">
-                <EnteLogo height={15} />
-            </EnteLogoLink>
-        </FluidContainer>
-        {onAddPhotos ? <AddPhotosButton onClick={onAddPhotos} /> : <GoToEnte />}
-    </NavbarBase>
-);
-
 const EnteLogoLink = styled("a")(({ theme }) => ({
     // Remove the excess space at the top.
     svg: { verticalAlign: "middle" },
@@ -662,27 +654,24 @@ const SelectedFileOptions: React.FC<SelectedFileOptionsProps> = ({
     downloadFilesHelper,
     count,
     clearSelection,
-}) => {
-    return (
-        <SelectionBar>
-            <FluidContainer>
-                <IconButton onClick={clearSelection}>
-                    <CloseIcon />
-                </IconButton>
-                <Box sx={{ ml: 1.5 }}>
-                    {t("selected_count", { selected: count })}
-                </Box>
-            </FluidContainer>
-            <Stack direction="row" sx={{ gap: 2, mr: 2 }}>
-                <Tooltip title={t("download")}>
-                    <IconButton onClick={downloadFilesHelper}>
-                        <DownloadIcon />
-                    </IconButton>
-                </Tooltip>
-            </Stack>
-        </SelectionBar>
-    );
-};
+}) => (
+    <Stack
+        direction="row"
+        sx={{ flex: 1, gap: 2, alignItems: "center", mr: 1 }}
+    >
+        <IconButton onClick={clearSelection}>
+            <CloseIcon />
+        </IconButton>
+        <Typography sx={{ mr: "auto" }}>
+            {t("selected_count", { selected: count })}
+        </Typography>
+        <Tooltip title={t("download")}>
+            <IconButton onClick={downloadFilesHelper}>
+                <DownloadIcon />
+            </IconButton>
+        </Tooltip>
+    </Stack>
+);
 
 interface ListHeaderProps {
     publicCollection: Collection;
@@ -714,7 +703,7 @@ const ListHeader: React.FC<ListHeaderProps> = ({
 
     return (
         <GalleryItemsHeaderAdapter>
-            <SpaceBetweenFlex>
+            <SpacedRow>
                 <GalleryItemsSummary
                     name={publicCollection.name}
                     fileCount={publicFiles.length}
@@ -729,7 +718,7 @@ const ListHeader: React.FC<ListHeaderProps> = ({
                         </OverflowMenuOption>
                     </OverflowMenu>
                 )}
-            </SpaceBetweenFlex>
+            </SpacedRow>
         </GalleryItemsHeaderAdapter>
     );
 };
diff --git a/web/apps/photos/src/services/export/index.ts b/web/apps/photos/src/services/export/index.ts
index ee9c15941b..bd5394c792 100644
--- a/web/apps/photos/src/services/export/index.ts
+++ b/web/apps/photos/src/services/export/index.ts
@@ -5,11 +5,7 @@ import { downloadManager } from "@/gallery/services/download";
 import { writeStream } from "@/gallery/utils/native-stream";
 import type { Collection } from "@/media/collection";
 import { mergeMetadata, type EnteFile } from "@/media/file";
-import {
-    fileCreationPhotoDate,
-    fileLocation,
-    type Metadata,
-} from "@/media/file-metadata";
+import { fileLocation, type Metadata } from "@/media/file-metadata";
 import { FileType } from "@/media/file-type";
 import { decodeLivePhoto } from "@/media/live-photo";
 import {
@@ -1392,7 +1388,10 @@ const getGoogleLikeMetadataFile = (
     dateTimeFormatter: Intl.DateTimeFormat,
 ) => {
     const metadata: Metadata = file.metadata;
-    const creationTime = Math.floor(metadata.creationTime / 1e6);
+    const publicMagicMetadata = file.pubMagicMetadata?.data;
+    const creationTime = Math.floor(
+        (publicMagicMetadata?.editedTime ?? metadata.creationTime) / 1e6,
+    );
     const modificationTime = Math.floor(
         (metadata.modificationTime ?? metadata.creationTime) / 1e6,
     );
@@ -1400,9 +1399,7 @@ const getGoogleLikeMetadataFile = (
         title: fileExportName,
         creationTime: {
             timestamp: creationTime,
-            formatted: dateTimeFormatter.format(
-                fileCreationPhotoDate(file, file.pubMagicMetadata?.data),
-            ),
+            formatted: dateTimeFormatter.format(creationTime * 1000),
         },
         modificationTime: {
             timestamp: modificationTime,
diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 9c4f6354fc..d480d0dc6b 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -35,6 +35,25 @@ body {
     object-fit: contain;
 }
 
+/* Need this in CSS instead of as an inline style to increase specificity. */
+.pswp__top-bar.pswp__top-bar {
+    top: var(--ente-pswp-top-bar-top, 0px);
+}
+
+/* Shift the top bar by --ente-pswp-top-bar-top, and add a before pseudo element
+   with the same color to fill in the custom app title bar.
+
+   See: [Note: Customize the desktop title bar] */
+.pswp__top-bar::before {
+    content: "";
+    position: absolute;
+    top: calc(-1 * var(--ente-pswp-top-bar-top, 0px));
+    left: 0;
+    height: var(--ente-pswp-top-bar-top, 0px);
+    width: 100%;
+    background-color: rgba(0 0 0 / 0.3);
+}
+
 .pswp-item-container > * {
     position: absolute;
     transition: opacity 1s ease;
diff --git a/web/packages/accounts/components/CodeBlock.tsx b/web/packages/accounts/components/CodeBlock.tsx
index 291503d073..955312b964 100644
--- a/web/packages/accounts/components/CodeBlock.tsx
+++ b/web/packages/accounts/components/CodeBlock.tsx
@@ -1,8 +1,10 @@
-import { CenteredFlex } from "@/base/components/containers";
-import { CopyButton } from "@/base/components/CopyButton";
+import { CenteredRow } from "@/base/components/containers";
 import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
-import { Box, Typography } from "@mui/material";
-import React from "react";
+import ContentCopyIcon from "@mui/icons-material/ContentCopy";
+import DoneIcon from "@mui/icons-material/Done";
+import { Box, IconButton, Tooltip, Typography } from "@mui/material";
+import { t } from "i18next";
+import React, { useState } from "react";
 
 interface CodeBlockProps {
     /**
@@ -20,9 +22,9 @@ interface CodeBlockProps {
 export const CodeBlock: React.FC<CodeBlockProps> = ({ code }) => {
     if (!code) {
         return (
-            <CenteredFlex sx={{ minHeight: "80px" }}>
+            <CenteredRow sx={{ minHeight: "80px" }}>
                 <ActivityIndicator />
-            </CenteredFlex>
+            </CenteredRow>
         );
     }
 
@@ -46,8 +48,35 @@ export const CodeBlock: React.FC<CodeBlockProps> = ({ code }) => {
                 {code}
             </Typography>
             <Box sx={{ position: "absolute", top: 0, right: 0, mt: 1 }}>
-                <CopyButton color="accentContrastText" code={code} />
+                <CopyButton code={code} />
             </Box>
         </Box>
     );
 };
+
+interface CopyButtonProps {
+    /**
+     * The code to copy when the button is clicked.
+     */
+    code: string;
+}
+
+export const CopyButton: React.FC<CopyButtonProps> = ({ code }) => {
+    const [copied, setCopied] = useState(false);
+
+    const handleClick = () =>
+        void navigator.clipboard.writeText(code).then(() => {
+            setCopied(true);
+            setTimeout(() => setCopied(false), 1000);
+        });
+
+    const Icon = copied ? DoneIcon : ContentCopyIcon;
+
+    return (
+        <Tooltip arrow open={copied} title={t("copied")}>
+            <IconButton onClick={handleClick}>
+                <Icon sx={{ color: "accent.contrastText" }} fontSize="small" />
+            </IconButton>
+        </Tooltip>
+    );
+};
diff --git a/web/packages/accounts/components/RecoveryKey.tsx b/web/packages/accounts/components/RecoveryKey.tsx
index 82d441d3cc..67f69f1675 100644
--- a/web/packages/accounts/components/RecoveryKey.tsx
+++ b/web/packages/accounts/components/RecoveryKey.tsx
@@ -1,5 +1,5 @@
 import { type MiniDialogAttributes } from "@/base/components/MiniDialog";
-import { SpaceBetweenFlex } from "@/base/components/containers";
+import { SpacedRow } from "@/base/components/containers";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import { errorDialogAttributes } from "@/base/components/utils/dialog";
 import { useIsSmallWidth } from "@/base/components/utils/hooks";
@@ -74,10 +74,10 @@ export const RecoveryKey: React.FC<RecoveryKeyProps> = ({
             maxWidth="xs"
             fullWidth
         >
-            <SpaceBetweenFlex sx={{ p: "8px 4px 8px 0" }}>
+            <SpacedRow sx={{ p: "8px 4px 8px 0" }}>
                 <DialogTitle variant="h3">{t("recovery_key")}</DialogTitle>
                 <DialogCloseIconButton {...{ onClose }} />
-            </SpaceBetweenFlex>
+            </SpacedRow>
             <DialogContent>
                 <Typography sx={{ mb: 3 }}>
                     {t("recovery_key_description")}
diff --git a/web/packages/accounts/components/layouts/centered-paper.tsx b/web/packages/accounts/components/layouts/centered-paper.tsx
index b61143098e..434c553143 100644
--- a/web/packages/accounts/components/layouts/centered-paper.tsx
+++ b/web/packages/accounts/components/layouts/centered-paper.tsx
@@ -1,6 +1,6 @@
 import { CenteredFill } from "@/base/components/containers";
 import { EnteLogo } from "@/base/components/EnteLogo";
-import { NavbarBaseNormalFlow } from "@/base/components/Navbar";
+import { NavbarBase } from "@/base/components/Navbar";
 import { Paper, Stack, styled, Typography } from "@mui/material";
 
 /**
@@ -20,7 +20,7 @@ export const AccountsPageContents: React.FC<React.PropsWithChildren> = ({
     children,
 }) => (
     <Stack sx={{ minHeight: "100svh" }}>
-        <NavbarBaseNormalFlow
+        <NavbarBase
             sx={[
                 (theme) =>
                     theme.applyStyles("light", {
@@ -29,7 +29,7 @@ export const AccountsPageContents: React.FC<React.PropsWithChildren> = ({
             ]}
         >
             <EnteLogo />
-        </NavbarBaseNormalFlow>
+        </NavbarBase>
         <CenteredFill
             sx={[
                 { bgcolor: "accent.main" },
diff --git a/web/packages/base/app.ts b/web/packages/base/app.ts
index 9dd56c1f35..74b891a9c0 100644
--- a/web/packages/base/app.ts
+++ b/web/packages/base/app.ts
@@ -40,9 +40,6 @@ export const appName: AppName = process.env.appName as AppName;
  */
 export const isDesktop = process.env.isDesktop == "1";
 
-export const wipDesktopCustomTitlebar =
-    isDesktop && process.env.NEXT_PUBLIC_ENTE_WIP_TITLEBAR == "1";
-
 /**
  * Version of the desktop app.
  *
diff --git a/web/packages/base/components/CopyButton.tsx b/web/packages/base/components/CopyButton.tsx
deleted file mode 100644
index a86fb79273..0000000000
--- a/web/packages/base/components/CopyButton.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import ContentCopyIcon from "@mui/icons-material/ContentCopy";
-import DoneIcon from "@mui/icons-material/Done";
-import { IconButton, Tooltip, type SvgIconProps } from "@mui/material";
-import { t } from "i18next";
-import { useCallback, useState } from "react";
-
-interface CopyButtonProps {
-    /**
-     * The code to copy when the button is clicked.
-     */
-    code: string;
-    /**
-     * The button color.
-     *
-     * - "secondary" maps to the normal "secondary" for icon buttons.
-     * - "accentContrastText" is for use over an accented background.
-     */
-    color: "secondary" | "accentContrastText";
-    /**
-     * The size of the icon.
-     *
-     * Default: "small"
-     */
-    size?: SvgIconProps["fontSize"];
-}
-
-export const CopyButton: React.FC<CopyButtonProps> = ({
-    code,
-    color,
-    size = "small",
-}) => {
-    const [copied, setCopied] = useState(false);
-
-    const handleClick = useCallback(() => {
-        void navigator.clipboard.writeText(code).then(() => {
-            setCopied(true);
-            setTimeout(() => setCopied(false), 1000);
-        });
-    }, [code]);
-
-    const Icon = copied ? DoneIcon : ContentCopyIcon;
-
-    return (
-        <Tooltip
-            arrow
-            open={copied}
-            title={t("copied")}
-            slotProps={{ popper: { sx: { zIndex: 2000 } } }}
-        >
-            <IconButton
-                onClick={handleClick}
-                {...(color == "secondary" ? { color } : {})}
-            >
-                <Icon
-                    sx={[
-                        color == "accentContrastText" && {
-                            color: "accent.contrastText",
-                        },
-                    ]}
-                    fontSize={size}
-                />
-            </IconButton>
-        </Tooltip>
-    );
-};
diff --git a/web/packages/base/components/MiniDialog.tsx b/web/packages/base/components/MiniDialog.tsx
index b2df458311..c9ffd04692 100644
--- a/web/packages/base/components/MiniDialog.tsx
+++ b/web/packages/base/components/MiniDialog.tsx
@@ -316,7 +316,7 @@ export const AttributedMiniDialog: React.FC<
                 )}
                 {children}
                 <Stack
-                    sx={{ paddingBlockStart: "24px", gap: "8px" }}
+                    sx={{ pt: 3, gap: 1 }}
                     direction={attributes.buttonDirection ?? "column"}
                 >
                     {phase == "failed" && <InlineErrorIndicator />}
diff --git a/web/packages/base/components/Navbar.tsx b/web/packages/base/components/Navbar.tsx
index b1ba7c5710..75edd810d5 100644
--- a/web/packages/base/components/Navbar.tsx
+++ b/web/packages/base/components/Navbar.tsx
@@ -1,34 +1,6 @@
-import { EnteLogo } from "@/base/components/EnteLogo";
-import { FlexWrapper } from "@ente/shared/components/Container";
 import { styled } from "@mui/material";
-import React from "react";
 
-/**
- * The "bar" at the top of the screen.
- *
- * Usually this area contains the App's main navigation bar ({@link AppNavbar}),
- * but depending on the context it can also show the {@link SelectionBar}.
- *
- * TODO: Deprecated. Use NavbarBaseNormalFlow instead.
- */
-export const NavbarBase = styled(FlexWrapper)(
-    ({ theme }) => `
-    min-height: 64px;
-    position: sticky;
-    top: 0;
-    left: 0;
-    z-index: 10;
-    border-bottom: 1px solid ${theme.vars.palette.divider};
-    background-color: ${theme.vars.palette.background.default};
-    margin-bottom: 16px;
-    padding: 0 24px;
-    @media (max-width: 720px) {
-        padding: 0 4px;
-    }
-`,
-);
-
-export const NavbarBaseNormalFlow = styled("div")(
+export const NavbarBase = styled("div")(
     ({ theme }) => `
     flex: 0 0 64px;
     display: flex;
@@ -37,18 +9,3 @@ export const NavbarBaseNormalFlow = styled("div")(
     border-bottom: 1px solid ${theme.vars.palette.divider};
 `,
 );
-
-/**
- * A variant of AppNavbar that places itself normally in the document flow
- * instead of using a fixed positioning.
- */
-export const AppNavbarNormalFlow: React.FC = () => (
-    <NavbarBaseNormalFlow>
-        <EnteLogo />
-    </NavbarBaseNormalFlow>
-);
-
-export const SelectionBar = styled(NavbarBase)`
-    position: fixed;
-    z-index: 12;
-`;
diff --git a/web/packages/base/components/OverflowMenu.tsx b/web/packages/base/components/OverflowMenu.tsx
index 0fceb02240..99b7692b1f 100644
--- a/web/packages/base/components/OverflowMenu.tsx
+++ b/web/packages/base/components/OverflowMenu.tsx
@@ -144,7 +144,7 @@ export const OverflowMenuOption: React.FC<
                     // Fill our container.
                     width: "100%",
                     // MUI has responsive padding, use a static value instead.
-                    paddingBlock: 1,
+                    py: 1,
                 }}
             >
                 {startIcon}
diff --git a/web/packages/base/components/RowButton.tsx b/web/packages/base/components/RowButton.tsx
index 08e822c6ad..d596058efc 100644
--- a/web/packages/base/components/RowButton.tsx
+++ b/web/packages/base/components/RowButton.tsx
@@ -51,29 +51,17 @@ export const RowButtonGroupHint: React.FC<React.PropsWithChildren> = ({
 }) => (
     <Typography
         variant="small"
-        sx={{ color: "text.muted", px: "8px", py: "6px" }}
+        sx={{ color: "text.faint", px: "16px", py: "6px" }}
     >
         {children}
     </Typography>
 );
 
-interface RowButtonDividerProps {
-    /**
-     * If true, then the divider leaves the leading edge hanging which visually
-     * looks better when used to separate buttons which have leading icons.
-     */
-    hasIcon?: boolean;
-}
-
 /**
  * A divider for buttons in a {@link RowButtonGroup}.
  */
-export const RowButtonDivider: React.FC<RowButtonDividerProps> = ({
-    hasIcon,
-}) => (
-    <Divider
-        sx={[{ "&&&": { my: 0 } }, hasIcon ? { ml: "48px" } : { ml: "16px" }]}
-    />
+export const RowButtonDivider = () => (
+    <Divider sx={{ "&&&": { mttty: 0 }, opacity: 0.4 }} />
 );
 
 /**
diff --git a/web/packages/base/components/SingleInputDialog.tsx b/web/packages/base/components/SingleInputDialog.tsx
index d769d3427c..aa45ab65ad 100644
--- a/web/packages/base/components/SingleInputDialog.tsx
+++ b/web/packages/base/components/SingleInputDialog.tsx
@@ -36,10 +36,10 @@ export const SingleInputDialog: React.FC<SingleInputDialogProps> = ({
             onClose={onClose}
             maxWidth="xs"
             fullWidth
-            slotProps={{ paper: { sx: { padding: "8px 4px 4px 4px" } } }}
+            slotProps={{ paper: { sx: { p: "8px 4px 4px 4px" } } }}
         >
             <DialogTitle>{title}</DialogTitle>
-            <DialogContent sx={{ "&&&": { paddingBlockStart: 0 } }}>
+            <DialogContent sx={{ "&&&": { pt: 0 } }}>
                 <SingleInputForm
                     onCancel={onClose}
                     onSubmit={handleSubmit}
diff --git a/web/packages/base/components/containers.tsx b/web/packages/base/components/containers.tsx
index d3aaa0558c..d2ae57d3ad 100644
--- a/web/packages/base/components/containers.tsx
+++ b/web/packages/base/components/containers.tsx
@@ -11,32 +11,33 @@ export const Stack100vhCenter = styled(Stack)`
 `;
 
 /**
- * A flexbox with justify content set to space-between and center alignment.
+ * A flexbox with justify content set to space-between and item alignment set to
+ * center.
  *
  * There is also another SpaceBetweenFlex in the old shared package, but that
  * one also sets width: 100%. As such, that one should be considered deprecated
  * and its uses moved to this one when possible (so that we can then see where
  * the width: 100% is essential).
  */
-export const SpaceBetweenFlex = styled("div")`
+export const SpacedRow = styled("div")`
     display: flex;
     justify-content: space-between;
     align-items: center;
 `;
 
 /**
- * A flex child that shows its children after centering them both vertically and
+ * A flexbox that shows its children after centering them both vertically and
  * horizontally.
  */
-export const CenteredFlex = styled("div")`
+export const CenteredRow = styled("div")`
     display: flex;
     justify-content: center;
     align-items: center;
 `;
 
 /**
- * A flex child that fills the entire flex direction, and shows its children
- * after centering them both vertically and horizontally.
+ * A flexbox that fills the entire flex direction, and shows its children after
+ * centering them both vertically and horizontally.
  */
 export const CenteredFill = styled("div")`
     flex: 1;
diff --git a/web/packages/base/components/loaders.tsx b/web/packages/base/components/loaders.tsx
index ef657bd0fc..64584009d9 100644
--- a/web/packages/base/components/loaders.tsx
+++ b/web/packages/base/components/loaders.tsx
@@ -1,4 +1,4 @@
-import { Overlay, Stack100vhCenter } from "@/base/components/containers";
+import { Stack100vhCenter } from "@/base/components/containers";
 import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
 import { Backdrop } from "@mui/material";
 import React from "react";
@@ -15,32 +15,12 @@ export const LoadingIndicator: React.FC = () => (
     </Stack100vhCenter>
 );
 
-/**
- * An opaque overlay that covers the entire viewport and shows an activity
- * indicator in its center.
- *
- * Useful as a top level "blocking" overscreen while the app is being loaded.
- */
-export const LoadingOverlay: React.FC = () => (
-    <Overlay
-        sx={{
-            display: "flex",
-            justifyContent: "center",
-            alignItems: "center",
-            zIndex: 2000,
-            backgroundColor: "background.default",
-        }}
-    >
-        <ActivityIndicator />
-    </Overlay>
-);
-
 /**
  * An translucent overlay that covers the entire viewport and shows an activity
  * indicator in its center.
  *
- * Used as a overscreen during blocking actions. The use of this component is
- * not recommended for new code.
+ * Used as a overlay during blocking actions. The use of this component is not
+ * recommended for new code.
  */
 export const TranslucentLoadingOverlay: React.FC = () => (
     <Backdrop
@@ -52,8 +32,10 @@ export const TranslucentLoadingOverlay: React.FC = () => (
         sx={{
             backgroundColor: "var(--mui-palette-backdrop-muted)",
             backdropFilter: "blur(30px) opacity(95%)",
-            // TODO: Why is this zIndex override required? + use a constant.
-            zIndex: 9000,
+            // This is `aboveFileViewerContentZ + delta`. Cannot use a constant
+            // here since this is used outside photos too. Eventually just get
+            // rid of this component, merging it to specific uses.
+            zIndex: 2000 /* aboveFileViewerContentZ + delta */,
         }}
     >
         <ActivityIndicator />
diff --git a/web/packages/base/components/mui/SidebarDrawer.tsx b/web/packages/base/components/mui/SidebarDrawer.tsx
index fdbb609fbf..6c96b47859 100644
--- a/web/packages/base/components/mui/SidebarDrawer.tsx
+++ b/web/packages/base/components/mui/SidebarDrawer.tsx
@@ -1,3 +1,5 @@
+import { isDesktop } from "@/base/app";
+import type { ModalVisibilityProps } from "@/base/components/utils/modal";
 import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import CloseIcon from "@mui/icons-material/Close";
 import {
@@ -10,8 +12,6 @@ import {
     type DrawerProps,
 } from "@mui/material";
 import React from "react";
-import { wipDesktopCustomTitlebar } from "../../app";
-import type { ModalVisibilityProps } from "../utils/modal";
 
 /**
  * A MUI {@link Drawer} with a standard set of styling that we use for our left
@@ -36,7 +36,7 @@ export const SidebarDrawer: React.FC<DrawerProps> = ({ children, ...rest }) => (
             },
         }}
     >
-        {wipDesktopCustomTitlebar && <AppTitlebarBackdrop />}
+        {isDesktop && <AppTitlebarBackdrop />}
         <Box sx={{ p: 1 }}>{children}</Box>
     </Drawer>
 );
@@ -56,9 +56,9 @@ const AppTitlebarBackdrop = styled("div")(({ theme }) => ({
     left: 0,
     width: "100%",
     minHeight: "env(titlebar-area-height, 30px)",
-    bgcolor: theme.vars.palette.backdrop.muted,
-    backdropFilter: "blur(3px)",
-    zIndex: 10000,
+    zIndex: 1,
+    backgroundColor: theme.vars.palette.backdrop.muted,
+    backdropFilter: "blur(12px)",
 }));
 
 /**
diff --git a/web/packages/base/locales/ar-SA/translation.json b/web/packages/base/locales/ar-SA/translation.json
index 957dd62f93..89b4e7dcd1 100644
--- a/web/packages/base/locales/ar-SA/translation.json
+++ b/web/packages/base/locales/ar-SA/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "تم تغيير كلمة المرور في مكان آخر",
     "password_changed_elsewhere_message": "يرجى تسجيل الدخول مرة أخرى على هذا الجهاز لاستخدام كلمة المرور الجديدة للمصادقة.",
     "go_back": "رجوع",
+    "account": "",
     "recovery_key": "مفتاح الاستعادة",
     "do_this_later": "قم بهذا لاحقا",
     "save_key": "حفظ المفتاح",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "بسبب طبيعة نظام التشفير التام بين الطرفين، لا يمكن فك تشفير بياناتك دون كلمة المرور أو مفتاح الاسترداد الخاص بك",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "الاتصال بالدعم",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "طلب ميزة",
     "support": "الدعم",
     "cancel": "إلغاء",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/be-BY/translation.json b/web/packages/base/locales/be-BY/translation.json
index 3c43a66236..933199338a 100644
--- a/web/packages/base/locales/be-BY/translation.json
+++ b/web/packages/base/locales/be-BY/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "",
     "save_key": "",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/bg-BG/translation.json b/web/packages/base/locales/bg-BG/translation.json
index e45dee6afc..b484e2c955 100644
--- a/web/packages/base/locales/bg-BG/translation.json
+++ b/web/packages/base/locales/bg-BG/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "",
     "save_key": "",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/ca-ES/translation.json b/web/packages/base/locales/ca-ES/translation.json
index b58cc7f07d..e6f4c65fd6 100644
--- a/web/packages/base/locales/ca-ES/translation.json
+++ b/web/packages/base/locales/ca-ES/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "",
     "save_key": "",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/da-DK/translation.json b/web/packages/base/locales/da-DK/translation.json
index 994ce10d5a..aaf64f342b 100644
--- a/web/packages/base/locales/da-DK/translation.json
+++ b/web/packages/base/locales/da-DK/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "",
     "save_key": "",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/de-DE/translation.json b/web/packages/base/locales/de-DE/translation.json
index 73c5075f7c..c57b16b41e 100644
--- a/web/packages/base/locales/de-DE/translation.json
+++ b/web/packages/base/locales/de-DE/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "Passwort anderswo geändert",
     "password_changed_elsewhere_message": "Bitte melde dich erneut auf diesem Gerät an, um dein neues Passwort zur Authentifizierung zu verwenden.",
     "go_back": "Zurück",
+    "account": "",
     "recovery_key": "Wiederherstellungsschlüssel",
     "do_this_later": "Auf später verschieben",
     "save_key": "Schlüssel speichern",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "Aufgrund unseres Ende-zu-Ende-Verschlüsselungsprotokolls können Ihre Daten nicht ohne Ihr Passwort oder Ihren Wiederherstellungsschlüssel entschlüsselt werden",
     "no_two_factor_recovery_key_message": "Bitte sende eine E-Mail an <a>{{emailID}}</a> von deiner registrierten E-Mail-Adresse",
     "contact_support": "Support kontaktieren",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "Feature anfragen",
     "support": "Support",
     "cancel": "Abbrechen",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "Deine bestehenden Dateien werden nicht gelöscht, aber das verknüpfte Ente-Album wird bei Änderungen in diesem Ordner nicht mehr aktualisiert.",
     "yes_stop": "Ja, Stopp",
     "change_folder": "Ordner ändern",
-    "debug_logs": "Debug-Logs",
-    "download_logs": "Logs herunterladen",
-    "download_logs_message": "<p>Hier kannst du Debug-Logs herunterladen, die du uns zur Fehleranalyse zusenden kannst.</p><p>Beachte bitte, dass die Logs Dateinamen enthalten, um Probleme mit bestimmten Dateien nachvollziehen zu können.</p>",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "Dein Browser ist nicht leistungsstark genug, um deine Bilder zu verschlüsseln. Versuche, dich an einem Computer bei Ente anzumelden, oder lade dir die Ente-App für dein Gerät (Handy oder Desktop) herunter.",
     "drag_and_drop_hint": "Oder ziehe Dateien per Drag-and-Drop in das Ente-Fenster",
     "authenticate": "Authentifizieren",
@@ -602,6 +605,7 @@
     "reset": "Zurücksetzen",
     "faster_upload": "Schnelleres Hochladen",
     "faster_upload_description": "Uploads über nahegelegene Server leiten",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "Album auf Fernseher wiedergeben",
     "enter_cast_pin_code": "Gib den Code auf dem Fernseher unten ein, um dieses Gerät zu koppeln.",
     "code": "",
diff --git a/web/packages/base/locales/el-GR/translation.json b/web/packages/base/locales/el-GR/translation.json
index 1ae6dbbfd0..85f3ac1af4 100644
--- a/web/packages/base/locales/el-GR/translation.json
+++ b/web/packages/base/locales/el-GR/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "Παρακαλώ συνδεθείτε ξανά σε αυτήν τη συσκευή για να χρησιμοποιήσετε το νέο σας κωδικό πρόσβασης για αυθεντικοποίηση.",
     "go_back": "Επιστροφή",
+    "account": "",
     "recovery_key": "Κλειδί ανάκτησης",
     "do_this_later": "Κάντε το αργότερα",
     "save_key": "Αποθήκευση Κλειδιού",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "Παρακαλώ αφήστε ένα μήνυμα ηλ. ταχυδρομείου στο <a>{{emailID}}</a> από την καταχωρημένη διεύθυνση σας",
     "contact_support": "Επικοινωνήστε με την υποστήριξη",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "Αίτηση λειτουργίας",
     "support": "Υποστήριξη",
     "cancel": "Ακύρωση",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "Επαναφορά",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "Αναπαραγωγή άλμπουμ στην τηλεόραση",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/en-US/translation.json b/web/packages/base/locales/en-US/translation.json
index 7ec3dabeef..5def46e704 100644
--- a/web/packages/base/locales/en-US/translation.json
+++ b/web/packages/base/locales/en-US/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "Password changed elsewhere",
     "password_changed_elsewhere_message": "Please login again on this device to use your new password to authenticate.",
     "go_back": "Go back",
+    "account": "Account",
     "recovery_key": "Recovery key",
     "do_this_later": "Do this later",
     "save_key": "Save Key",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "Due to the nature of our end-to-end encryption protocol, your data cannot be decrypted without your password or recovery key",
     "no_two_factor_recovery_key_message": "Please drop an email to <a>{{emailID}}</a> from your registered email address",
     "contact_support": "Contact support",
+    "help": "Help",
+    "ente_help": "Ente Help",
+    "blog": "Blog",
     "request_feature": "Request feature",
     "support": "Support",
     "cancel": "Cancel",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "Your existing files will not be deleted, but Ente will stop automatically updating the linked Ente album on changes in this folder.",
     "yes_stop": "Yes, stop",
     "change_folder": "Change Folder",
-    "debug_logs": "Debug logs",
-    "download_logs": "Download logs",
-    "download_logs_message": "<p>This will download debug logs, which you can email to us to help debug your issue.</p><p>Please note that file names will be included to help track issues with specific files.</p>",
+    "view_logs": "View logs",
+    "view_logs_message": "<p>This will show debug logs, which you can email to us to help debug your issue.</p><p>Note that file names will be included to help track issues with specific files.</p>",
     "weak_device_hint": "The web browser you're using is not powerful enough to encrypt your photos. Please try to log in to Ente on your computer, or download the Ente mobile/desktop app.",
     "drag_and_drop_hint": "Or drag and drop into the Ente window",
     "authenticate": "Authenticate",
@@ -602,6 +605,7 @@
     "reset": "Reset",
     "faster_upload": "Faster uploads",
     "faster_upload_description": "Route uploads through nearby servers",
+    "open_ente_on_startup": "Open Ente on startup",
     "cast_album_to_tv": "Play album on TV",
     "enter_cast_pin_code": "Enter the code you see on the TV below to pair this device.",
     "code": "Code",
diff --git a/web/packages/base/locales/es-ES/translation.json b/web/packages/base/locales/es-ES/translation.json
index 5c51eb15bf..625e2d4883 100644
--- a/web/packages/base/locales/es-ES/translation.json
+++ b/web/packages/base/locales/es-ES/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "Contraseña cambiada en otro sitio",
     "password_changed_elsewhere_message": "Por favor, inicia sesión de nuevo en este dispositivo para usar tu nueva contraseña.",
     "go_back": "Retroceder",
+    "account": "",
     "recovery_key": "Clave de recuperación",
     "do_this_later": "Hacer más tarde",
     "save_key": "Guardar Clave",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "Debido a la naturaleza de nuestro protocolo de cifrado de extremo a extremo, sus datos no pueden ser descifrados sin su contraseña o clave de recuperación",
     "no_two_factor_recovery_key_message": "Por favor, envíe un correo electrónico a <a>{{emailID}}</a> desde la dirección de correo electrónico que usó para registrarse",
     "contact_support": "Contacta con soporte",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "Solicitar una función",
     "support": "Soporte",
     "cancel": "Cancelar",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "Tus archivos existentes no serán eliminados, pero ente dejará de actualizar automáticamente el álbum enlazado en caso de cambios en esta carpeta.",
     "yes_stop": "Sí, detener",
     "change_folder": "Cambiar carpeta",
-    "debug_logs": "Logs de depuración",
-    "download_logs": "Descargar logs",
-    "download_logs_message": "<p>Esto descargará los registros de depuración, que puede enviarnos por correo electrónico para ayudarnos a depurar su problema.</p><p>Tenga en cuenta que los nombres de los archivos se incluirán para ayudar al seguimiento de problemas con archivos específicos.</p>",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "El navegador web que está utilizando no es lo suficientemente poderoso para cifrar sus fotos. Por favor, intente iniciar sesión en ente en su computadora, o descargue la aplicación ente para móvil/escritorio.",
     "drag_and_drop_hint": "O arrastre y suelte en la ventana ente",
     "authenticate": "Autenticado",
@@ -602,6 +605,7 @@
     "reset": "Restablecer",
     "faster_upload": "Subidas más rápidas",
     "faster_upload_description": "Enrutar subidas a través de servidores cercanos",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "Reproducir álbum en TV",
     "enter_cast_pin_code": "Introduce el código que ves en el televisor para emparejar este dispositivo.",
     "code": "Código",
diff --git a/web/packages/base/locales/et-EE/translation.json b/web/packages/base/locales/et-EE/translation.json
index b58cc7f07d..e6f4c65fd6 100644
--- a/web/packages/base/locales/et-EE/translation.json
+++ b/web/packages/base/locales/et-EE/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "",
     "save_key": "",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/fa-IR/translation.json b/web/packages/base/locales/fa-IR/translation.json
index 913e3edb7a..9fa96168e8 100644
--- a/web/packages/base/locales/fa-IR/translation.json
+++ b/web/packages/base/locales/fa-IR/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "",
     "save_key": "",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/fi-FI/translation.json b/web/packages/base/locales/fi-FI/translation.json
index 5a55de6fd6..31688b3bf6 100644
--- a/web/packages/base/locales/fi-FI/translation.json
+++ b/web/packages/base/locales/fi-FI/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "Salasana vaihdettu muualla",
     "password_changed_elsewhere_message": "Ole hyvä ja kirjaudu uudelleen tähän laitteeseen käyttääksesi uutta salasanaasi tunnistautumiseen.",
     "go_back": "Palaa",
+    "account": "",
     "recovery_key": "Palautusavain",
     "do_this_later": "Tee tämä myöhemmin",
     "save_key": "Tallenna avain",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "Päästä päähän -salausprotokollamme vuoksi tietojasi ei voida purkaa ilman salasanaa tai palautusavainta",
     "no_two_factor_recovery_key_message": "Ole hyvä ja lähetä sähköpostia osoitteeseen <a>{{emailID}}</a> omasta rekisteröidystä sähköpostiosoitteestasi",
     "contact_support": "Ota yhteyttä tukeen",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "Pyydä ominaisuutta",
     "support": "Tuki",
     "cancel": "Peruuta",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/fr-FR/translation.json b/web/packages/base/locales/fr-FR/translation.json
index 9941678803..4f49c9e60c 100644
--- a/web/packages/base/locales/fr-FR/translation.json
+++ b/web/packages/base/locales/fr-FR/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "Mot de passe modifié ailleurs",
     "password_changed_elsewhere_message": "Veuillez vous reconnecter sur cet appareil pour utiliser votre nouveau mot de passe pour vous authentifier.",
     "go_back": "Retour",
+    "account": "Compte",
     "recovery_key": "Clé de récupération",
     "do_this_later": "Plus tard",
     "save_key": "Sauvegarder la clé",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "En raison de notre protocole de chiffrement de bout en bout, vos données ne peuvent être décryptées sans votre mot de passe ou clé de récupération",
     "no_two_factor_recovery_key_message": "Veuillez envoyer un e-mail à <a>{{emailID}}</a> depuis votre adresse enregistrée",
     "contact_support": "Contacter le support",
+    "help": "Aide",
+    "ente_help": "Aide Ente",
+    "blog": "Blog",
     "request_feature": "Soumettre une idée",
     "support": "Support",
     "cancel": "Annuler",
@@ -430,7 +434,7 @@
     "deduplicate_files": "Déduplication de fichiers",
     "remove_duplicates": "Supprimer les doublons",
     "total_size": "Poids total",
-    "count": "",
+    "count": "Total",
     "deselect_all": "Tout déselectionner",
     "no_duplicates": "Aucun doublon",
     "duplicate_group_description": "{{count}} éléments, {{itemSize}} chacun",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "Vos fichiers existants ne seront pas supprimés, mais Ente arrêtera automatiquement de mettre à jour le lien de l'album à chaque changement sur ce dossier.",
     "yes_stop": "Oui, arrêter",
     "change_folder": "Modifier le dossier",
-    "debug_logs": "Journaux de débugs",
-    "download_logs": "Télécharger les logs",
-    "download_logs_message": "<p>Cela va télécharger les journaux de débug, que vous pourrez nosu envoyer par e-mail pour nous aider à résoudre votre problàme .</p><p>Veuillez noter que les noms de fichiers seront inclus .</p>",
+    "view_logs": "Afficher les journaux",
+    "view_logs_message": "<p>Cela va afficher les journaux de débug, que vous pourrez ensuite nous envoyer par e-mail afin de nous aider à résoudre votre problème .</p><p>Veuillez noter que les noms de fichiers seront inclus à notre gestion de tickets.</p>",
     "weak_device_hint": "Le navigateur que vous utilisez n'est pas assez puissant pour chiffrer vos photos. Veuillez essayer de vous connecter à Ente sur votre ordinateur, ou télécharger l'appli Ente mobile/ordinateur.",
     "drag_and_drop_hint": "Sinon glissez déposez dans la fenêtre Ente",
     "authenticate": "Authentification",
@@ -602,6 +605,7 @@
     "reset": "Réinitialiser",
     "faster_upload": "Chargements plus rapides",
     "faster_upload_description": "Router les chargements vers les serveurs à proximité",
+    "open_ente_on_startup": "Ouvrir Ente au démarrage",
     "cast_album_to_tv": "Jouer l'album sur la TV",
     "enter_cast_pin_code": "Entrez le code que vous voyez sur la TV ci-dessous pour appairer cet appareil.",
     "code": "Code",
@@ -650,8 +654,8 @@
     "server_endpoint": "Point de terminaison serveur",
     "more_information": "Plus d'informations",
     "save": "Sauvegarder",
-    "theme": "",
-    "system": "",
-    "light": "",
-    "dark": ""
+    "theme": "Thème",
+    "system": "Système",
+    "light": "Clair",
+    "dark": "Sombre"
 }
diff --git a/web/packages/base/locales/gu-IN/translation.json b/web/packages/base/locales/gu-IN/translation.json
index b58cc7f07d..e6f4c65fd6 100644
--- a/web/packages/base/locales/gu-IN/translation.json
+++ b/web/packages/base/locales/gu-IN/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "",
     "save_key": "",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/hi-IN/translation.json b/web/packages/base/locales/hi-IN/translation.json
index b58cc7f07d..e6f4c65fd6 100644
--- a/web/packages/base/locales/hi-IN/translation.json
+++ b/web/packages/base/locales/hi-IN/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "",
     "save_key": "",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/hu-HU/translation.json b/web/packages/base/locales/hu-HU/translation.json
index b58cc7f07d..e6f4c65fd6 100644
--- a/web/packages/base/locales/hu-HU/translation.json
+++ b/web/packages/base/locales/hu-HU/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "",
     "save_key": "",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/id-ID/translation.json b/web/packages/base/locales/id-ID/translation.json
index c6c8127351..e05baf1b6b 100644
--- a/web/packages/base/locales/id-ID/translation.json
+++ b/web/packages/base/locales/id-ID/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "Kembali",
+    "account": "",
     "recovery_key": "Kunci pemulihan",
     "do_this_later": "Lakukan lain kali",
     "save_key": "Simpan Kunci",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "Karena sifat protokol enkripsi ujung ke ujung kami, data kamu tidak dapat didekripsi tanpa sandi atau kunci pemulihan kamu",
     "no_two_factor_recovery_key_message": "Silakan kirimkan email ke <a>{{emailID}}</a> dari alamat email terdaftar kamu",
     "contact_support": "Hubungi dukungan",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "Minta fitur",
     "support": "Dukungan",
     "cancel": "Batal",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "Ubah Folder",
-    "debug_logs": "Log debug",
-    "download_logs": "Unduh log",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "Browser yang saat ini kamu gunakan tidak cukup kuat untuk mengenkripsi fotomu. Silakan coba gunakan Ente di komputer lain, atau unduh app seluler/desktop Ente.",
     "drag_and_drop_hint": "Atau seret ke jendela Ente",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "Pengunggahan lebih cepat",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "Putar album di TV",
     "enter_cast_pin_code": "Masukkan kode yang ditampilkan TV di bawah untuk menautkan perangkat ini.",
     "code": "",
diff --git a/web/packages/base/locales/is-IS/translation.json b/web/packages/base/locales/is-IS/translation.json
index 54ae33b7cb..b914a48c6d 100644
--- a/web/packages/base/locales/is-IS/translation.json
+++ b/web/packages/base/locales/is-IS/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "Fara til baka",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "Gera þetta seinna",
     "save_key": "Vista Lykil",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "Hætta við",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/it-IT/translation.json b/web/packages/base/locales/it-IT/translation.json
index 341379d345..f951e472b5 100644
--- a/web/packages/base/locales/it-IT/translation.json
+++ b/web/packages/base/locales/it-IT/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "Password cambiata altrove",
     "password_changed_elsewhere_message": "Effettua nuovamente il login su questo dispositivo per utilizzare la nuova password per autenticarti.",
     "go_back": "Torna indietro",
+    "account": "",
     "recovery_key": "Chiave di recupero",
     "do_this_later": "Fallo più tardi",
     "save_key": "Salva Chiave",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "A causa della natura del nostro protocollo di crittografia end-to-end, i tuoi dati non possono essere decifrati senza la tua password o chiave di ripristino",
     "no_two_factor_recovery_key_message": "Per favore invia un'email a <a>{{emailID}}</a> dal tuo indirizzo email registrato",
     "contact_support": "Contatta il supporto",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "Richiedi una funzionalità",
     "support": "Supporto",
     "cancel": "Annulla",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "I tuoi file esistenti non verranno eliminati, ma Ente smetterà di aggiornare automaticamente l'album Ente collegato a questa cartella.",
     "yes_stop": "Sì, interrompi",
     "change_folder": "Cambia Cartella",
-    "debug_logs": "Log di debug",
-    "download_logs": "Scarica i log",
-    "download_logs_message": "<p>Questo scaricherà il log di debug che puoi inviare via email a noi per aiutare a capire il tuo problema.</p><p>Nota che i nomi dei file saranno inclusi per aiutare a tenere traccia dei problemi con i file specifici.</p>",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "Il browser web che stai usando non è abbastanza potente per crittografare le foto. Prova ad accedere a Ente sul tuo computer o scarica l'app mobile/desktop Ente.",
     "drag_and_drop_hint": "Oppure trascina nella finestra di Ente",
     "authenticate": "Autenticati",
@@ -602,6 +605,7 @@
     "reset": "Reimposta",
     "faster_upload": "Upload più veloci",
     "faster_upload_description": "Effettua l'upload attraverso i server vicini",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "Riproduci album sulla TV",
     "enter_cast_pin_code": "Inserisci il codice che vedi sulla TV qui sotto per associare questo dispositivo.",
     "code": "",
diff --git a/web/packages/base/locales/ja-JP/translation.json b/web/packages/base/locales/ja-JP/translation.json
index 7e581a5841..2be62cb46b 100644
--- a/web/packages/base/locales/ja-JP/translation.json
+++ b/web/packages/base/locales/ja-JP/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "パスワードが他の場所で変更されました",
     "password_changed_elsewhere_message": "",
     "go_back": "戻る",
+    "account": "",
     "recovery_key": "リカバリーキー",
     "do_this_later": "あとで行う",
     "save_key": "キーを保存",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "お問い合わせ",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "機能をリクエスト",
     "support": "サポート",
     "cancel": "キャンセル",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "はい、停止します",
     "change_folder": "フォルダを変更",
-    "debug_logs": "デバッグログ",
-    "download_logs": "ログをダウンロード",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "認証",
@@ -602,6 +605,7 @@
     "reset": "リセット",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "コード",
diff --git a/web/packages/base/locales/km-KH/translation.json b/web/packages/base/locales/km-KH/translation.json
index b58cc7f07d..e6f4c65fd6 100644
--- a/web/packages/base/locales/km-KH/translation.json
+++ b/web/packages/base/locales/km-KH/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "",
     "save_key": "",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/ko-KR/translation.json b/web/packages/base/locales/ko-KR/translation.json
index 505bcb9c54..62a75eba4a 100644
--- a/web/packages/base/locales/ko-KR/translation.json
+++ b/web/packages/base/locales/ko-KR/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "뒤로 가기",
+    "account": "",
     "recovery_key": "키 복구하기",
     "do_this_later": "나중에 저장하기",
     "save_key": "키 저장하기",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "취소",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/lt-LT/translation.json b/web/packages/base/locales/lt-LT/translation.json
index cd69539d45..06a2e30217 100644
--- a/web/packages/base/locales/lt-LT/translation.json
+++ b/web/packages/base/locales/lt-LT/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "Slaptažodis pakeistas kitur",
     "password_changed_elsewhere_message": "Prisijunkite iš naujo šiame įrenginyje, kad naudotumėte naują slaptažodį tapatybės nustatymui.",
     "go_back": "Eiti atgal",
+    "account": "",
     "recovery_key": "Atkūrimo raktas",
     "do_this_later": "Daryti tai vėliau",
     "save_key": "Išsaugoti raktą",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "Dėl mūsų visapusio šifravimo protokolo pobūdžio jūsų duomenų negalima iššifruoti be slaptažodžio arba atkūrimo rakto",
     "no_two_factor_recovery_key_message": "Iš savo registruoto el. pašto adreso parašykite el. laišką adresu <a>{{{emailID}}</a>",
     "contact_support": "Susisiekti su palaikymo komanda",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "Prašyti funkcijos",
     "support": "Palaikymas",
     "cancel": "Atšaukti",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "Jūsų esami failai nebus ištrinti, bet „Ente“ nebeatnaujins automatiškai susieto „Ente“ albumo, kai šiame aplanke bus atliekami pakeitimai.",
     "yes_stop": "Taip, stabdyti",
     "change_folder": "Keisti aplanką",
-    "debug_logs": "Derinimo žurnalai",
-    "download_logs": "Atsisiųsti žurnalus",
-    "download_logs_message": "<p>Tai atsisiųs derinimo žurnalus, kuriuos galėsite išsiųsti mums el. laišku, kad padėtume išspręsti problemą.</p><p>Atkreipkite dėmesį, kad failų pavadinimai bus įtraukti, kad būtų lengviau atsekti problemas su konkrečiais failais.</p>",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "Interneto naršyklė, kurią naudojate, nėra pakankamai galinga, kad užšifruotų nuotraukas. Bandykite prisijungti prie „Ente“ kompiuteryje arba atsisiųskite „Ente“ mobiliąją / darbalaukio programą.",
     "drag_and_drop_hint": "Arba nutempkite į „Ente“ langą",
     "authenticate": "Nustatyti tapatybę",
@@ -602,6 +605,7 @@
     "reset": "Atkurti",
     "faster_upload": "Spartesni įkėlimai",
     "faster_upload_description": "Nukreipkite įkėlimus per netoliese esančius serverius",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "Paleisti albumą televizoriuje",
     "enter_cast_pin_code": "Įveskite žemiau esančiame televizoriuje matomą kodą, kad susietumėte šį įrenginį.",
     "code": "Kodas",
@@ -650,8 +654,8 @@
     "server_endpoint": "Serverio galutinis taškas",
     "more_information": "Daugiau informacijos",
     "save": "Išsaugoti",
-    "theme": "",
-    "system": "",
-    "light": "",
-    "dark": ""
+    "theme": "Tema",
+    "system": "Sistemos",
+    "light": "Šviesi",
+    "dark": "Tamsi"
 }
diff --git a/web/packages/base/locales/ml-IN/translation.json b/web/packages/base/locales/ml-IN/translation.json
index b58cc7f07d..e6f4c65fd6 100644
--- a/web/packages/base/locales/ml-IN/translation.json
+++ b/web/packages/base/locales/ml-IN/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "",
     "save_key": "",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/nl-NL/translation.json b/web/packages/base/locales/nl-NL/translation.json
index 58d381319f..4bbe05b76d 100644
--- a/web/packages/base/locales/nl-NL/translation.json
+++ b/web/packages/base/locales/nl-NL/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "Wachtwoord elders gewijzigd",
     "password_changed_elsewhere_message": "Log opnieuw in op dit apparaat om uw nieuwe wachtwoord te gebruiken om te verifiëren.",
     "go_back": "Ga terug",
+    "account": "",
     "recovery_key": "Herstelsleutel",
     "do_this_later": "Doe dit later",
     "save_key": "Sleutel opslaan",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "Door de aard van ons end-to-end encryptieprotocol kunnen je gegevens niet worden ontsleuteld zonder je wachtwoord of herstelsleutel",
     "no_two_factor_recovery_key_message": "Stuur een e-mail naar <a>{{emailID}}</a> vanaf het door jou geregistreerde e-mailadres",
     "contact_support": "Klantenservice",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "Vraag nieuwe functie aan",
     "support": "Ondersteuning",
     "cancel": "Annuleren",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "Uw bestaande bestanden zullen niet worden verwijderd, maar Ente stopt met het automatisch bijwerken van het gekoppelde Ente album bij wijzigingen in deze map.",
     "yes_stop": "Ja, stop",
     "change_folder": "Map wijzigen",
-    "debug_logs": "Logboeken voor foutmeldingen",
-    "download_logs": "Logboek downloaden",
-    "download_logs_message": "<p>Dit zal logboeken downloaden, die u ons kunt e-mailen om te helpen bij het debuggen van uw probleem.</p><p>Houd er rekening mee dat bestandsnamen worden opgenomen om problemen met specifieke bestanden bij te houden.</p>",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "De webbrowser die u gebruikt is niet krachtig genoeg om uw foto's te versleutelen. Probeer in te loggen op uw computer, of download de Ente mobiel/desktop app.",
     "drag_and_drop_hint": "Of sleep en plaats in het Ente venster",
     "authenticate": "Verifiëren",
@@ -602,6 +605,7 @@
     "reset": "Herstellen",
     "faster_upload": "Snellere uploads",
     "faster_upload_description": "Uploaden door nabije servers",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "Album afspelen op TV",
     "enter_cast_pin_code": "Voer de code in die u op de TV ziet om dit apparaat te koppelen.",
     "code": "Code",
diff --git a/web/packages/base/locales/pl-PL/translation.json b/web/packages/base/locales/pl-PL/translation.json
index bb0025ef72..7c4e388db7 100644
--- a/web/packages/base/locales/pl-PL/translation.json
+++ b/web/packages/base/locales/pl-PL/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "Hasło zostało zmienione gdzie indziej",
     "password_changed_elsewhere_message": "Zaloguj się ponownie na tym urządzeniu, aby użyć nowego hasła, aby się uwierzytelnić.",
     "go_back": "Cofnij się",
+    "account": "",
     "recovery_key": "Klucz odzyskiwania",
     "do_this_later": "Zrób to później",
     "save_key": "Zapisz Klucz",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "Ze względu na charakter naszego protokołu szyfrowania end-to-end, Twoje dane nie mogą być odszyfrowane bez hasła lub klucza odzyskiwania",
     "no_two_factor_recovery_key_message": "Wyślij wiadomość e-mail na <a>{{emailID}}</a> z zarejestrowanego adresu e-mail",
     "contact_support": "Skontaktuj się z pomocą techniczną",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "Zaproponuj funkcję",
     "support": "Wsparcie Techniczne",
     "cancel": "Anuluj",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "Twoje istniejące pliki nie zostaną usunięte, ale Ente przestanie automatycznie aktualizować połączony album Ente przy zmianach w tym folderze.",
     "yes_stop": "Tak, zatrzymaj",
     "change_folder": "Zmień Folder",
-    "debug_logs": "Logi debugowania",
-    "download_logs": "Pobierz logi",
-    "download_logs_message": "<p>Spowoduje to pobranie logów debugowania, które możesz wysłać do nas na e-maila, aby pomóc w debugowaniu Twojego problemu.</p><p>Należy pamiętać, że nazwy plików będą dołączone, aby pomóc w śledzeniu problemów z konkretnymi plikami.</p>",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "Przeglądarka, której używasz nie jest wystarczająco silna, aby zaszyfrować Twoje zdjęcia. Prosimy zalogować się do Ente na Twoim komputerze lub pobierz aplikacje mobilną/komputerową Ente.",
     "drag_and_drop_hint": "Lub przeciągnij i upuść do okna Ente",
     "authenticate": "Uwierzytelnij się",
@@ -602,6 +605,7 @@
     "reset": "Zresetuj",
     "faster_upload": "Szybsze przesłania",
     "faster_upload_description": "Kieruj przesłania przez pobliskie serwery",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "Odtwórz album na telewizorze",
     "enter_cast_pin_code": "Wprowadź kod, który widzisz na telewizorze poniżej, aby sparować to urządzenie.",
     "code": "Kod",
diff --git a/web/packages/base/locales/pt-BR/translation.json b/web/packages/base/locales/pt-BR/translation.json
index 4a0afd2695..62bd0e65e5 100644
--- a/web/packages/base/locales/pt-BR/translation.json
+++ b/web/packages/base/locales/pt-BR/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "Senha alterada em outro lugar",
     "password_changed_elsewhere_message": "Registre-se novamente neste dispositivo e use sua nova senha para autenticar.",
     "go_back": "Voltar",
+    "account": "Conta",
     "recovery_key": "Chave de recuperação",
     "do_this_later": "Mais tarde",
     "save_key": "Salvar chave",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "Devido à natureza de nosso protocolo de criptografia ponta a ponta, seus dados não podem ser descriptografados sem sua senha ou chave de recuperação",
     "no_two_factor_recovery_key_message": "Envie um e-mail a <a>{{emailID}}</a> do endereço de e-mail registrado",
     "contact_support": "Entrar em contato conosco",
+    "help": "Ajuda",
+    "ente_help": "Ajuda Ente",
+    "blog": "Blog",
     "request_feature": "Solicitar recurso",
     "support": "Suporte",
     "cancel": "Cancelar",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "Seus arquivos existentes não serão excluídos, porém, Ente irá parar de atualizar o álbum sincronizado nesta página.",
     "yes_stop": "Sim, parar",
     "change_folder": "Alterar pasta",
-    "debug_logs": "Logs de depuração",
-    "download_logs": "Baixar logs",
-    "download_logs_message": "<p>Isto irá baixar os logs de depuração, que você pode enviar para nós para ajudar a depurar seu problema.</p><p>Por favor, note que os nomes de arquivos serão incluídos para ajudar a rastrear problemas com arquivos específicos.</p>",
+    "view_logs": "Ver registros",
+    "view_logs_message": "<p>Isso exibirá registros de depuração, que você pode contatar-nos para ajudar a resolver sue problema.</p><p>Saiba que nomes de arquivo serão incluídos para rastrear problemas com certos arquivos.</p>",
     "weak_device_hint": "O navegador web que você está usando não é poderoso o suficiente para criptografar suas fotos. Tente registrar no Ente no computador, ou baixe o aplicativo móvel do Ente, ou do desktop.",
     "drag_and_drop_hint": "Ou arraste e solte na janela ente",
     "authenticate": "Autenticar",
@@ -602,6 +605,7 @@
     "reset": "Redefinir",
     "faster_upload": "Envios mais rápidos",
     "faster_upload_description": "Rotas enviam em servidores próximos",
+    "open_ente_on_startup": "Abrir Ente no Início",
     "cast_album_to_tv": "Reproduzir álbum na TV",
     "enter_cast_pin_code": "Digite o código que você vê na TV abaixo para parear este dispositivo.",
     "code": "Código",
@@ -650,8 +654,8 @@
     "server_endpoint": "Endpoint do servidor",
     "more_information": "Mais informações",
     "save": "Salvar",
-    "theme": "",
-    "system": "",
-    "light": "",
-    "dark": ""
+    "theme": "Tema",
+    "system": "Automático",
+    "light": "Claro",
+    "dark": "Escuro"
 }
diff --git a/web/packages/base/locales/pt-PT/translation.json b/web/packages/base/locales/pt-PT/translation.json
index 0f673cde22..9de71e0551 100644
--- a/web/packages/base/locales/pt-PT/translation.json
+++ b/web/packages/base/locales/pt-PT/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "Palavra-passe alterada noutro lugar",
     "password_changed_elsewhere_message": "Inicie sessão novamente neste dispositivo para utilizar a sua nova palavra-passe para autenticação.",
     "go_back": "Voltar",
+    "account": "",
     "recovery_key": "Chave de recuperação",
     "do_this_later": "Fazer isso mais tarde",
     "save_key": "Guardar chave",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "Devido à natureza do nosso protocolo de encriptação de ponta a ponta, os seus dados não podem ser desencriptados sem a sua palavra-passe ou chave de recuperação",
     "no_two_factor_recovery_key_message": "Envie uma mensagem de correio eletrónico para <a>{{emailID}}</a> a partir do seu endereço de correio eletrónico registado",
     "contact_support": "Contactar o suporte",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "Solicitar recurso",
     "support": "Suporte",
     "cancel": "Cancelar",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "Os seus ficheiros existentes não serão eliminados, mas o Ente deixará de atualizar automaticamente o álbum Ente associado às alterações nesta pasta.",
     "yes_stop": "Sim, parar",
     "change_folder": "Alterar pasta",
-    "debug_logs": "Logs de depuração",
-    "download_logs": "Descarregar logs",
-    "download_logs_message": "<p>Isto irá descarregar registos de depuração, que pode enviar-nos por correio eletrónico para ajudar a depurar o seu problema.</p><p>Por favor, note que os nomes dos ficheiros serão incluídos para ajudar a localizar problemas com ficheiros específicos.</p>",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "O navegador Web que está a utilizar não é suficientemente potente para encriptar as suas fotografias. Tente iniciar sessão no Ente no seu computador ou descarregue a aplicação móvel/desktop do Ente.",
     "drag_and_drop_hint": "Ou arrastar e largar na janela Ente",
     "authenticate": "Autenticar",
@@ -602,6 +605,7 @@
     "reset": "Restaurar",
     "faster_upload": "Upload mais rápido",
     "faster_upload_description": "Rotas enviam em servidores próximos",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "Reproduzir álbum na TV",
     "enter_cast_pin_code": "Introduza o código que vê na TV abaixo para emparelhar este dispositivo.",
     "code": "",
diff --git a/web/packages/base/locales/ro-RO/translation.json b/web/packages/base/locales/ro-RO/translation.json
index b58cc7f07d..e6f4c65fd6 100644
--- a/web/packages/base/locales/ro-RO/translation.json
+++ b/web/packages/base/locales/ro-RO/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "",
     "save_key": "",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/ru-RU/translation.json b/web/packages/base/locales/ru-RU/translation.json
index 5be80337eb..32ea0ccd82 100644
--- a/web/packages/base/locales/ru-RU/translation.json
+++ b/web/packages/base/locales/ru-RU/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "Пароль изменен в другом месте",
     "password_changed_elsewhere_message": "Пожалуйста, войдите снова на этом устройстве, чтобы использовать новый пароль для аутентификации.",
     "go_back": "Вернуться назад",
+    "account": "",
     "recovery_key": "Ключ восстановления",
     "do_this_later": "Сделать позже",
     "save_key": "Сохранить ключ",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "Из-за природы нашего сквозного протокола шифрования ваши данные не могут быть расшифрованы без вашего пароля или ключа восстановления",
     "no_two_factor_recovery_key_message": "Пожалуйста, отправьте электронное письмо на адрес <a>{{emailID}}</a> с вашего зарегистрированного адреса электронной почты",
     "contact_support": "Связаться с поддержкой",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "Запросить функцию",
     "support": "Поддержка",
     "cancel": "Отменить",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "Ваши существующие файлы не будут удалены, но Ente прекратит автоматическое обновление связанного альбома Ente при внесении изменений в эту папку.",
     "yes_stop": "Да, остановись",
     "change_folder": "Изменить папку",
-    "debug_logs": "Журналы отладки",
-    "download_logs": "Загрузка журналов",
-    "download_logs_message": "<p>При этом будут загружены журналы отладки, которые вы можете отправить нам по электронной почте, чтобы помочь в устранении вашей проблемы.</p><p>Пожалуйста, обратите внимание, что будут указаны имена файлов, которые помогут отслеживать проблемы с конкретными файлами.</p>",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "Используемый вами веб-браузер недостаточно мощный, чтобы зашифровать ваши фотографии. Пожалуйста, попробуйте войти в Ente на своем компьютере или загрузить мобильное/настольное приложение Ente.",
     "drag_and_drop_hint": "Или перетащите в основное окно",
     "authenticate": "Проверка подлинности",
@@ -602,6 +605,7 @@
     "reset": "Сбросить",
     "faster_upload": "Более быстрая загрузка данных",
     "faster_upload_description": "Загрузка маршрута через близлежащие серверы",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "Воспроизвести альбом на ТВ",
     "enter_cast_pin_code": "Введите код, который вы видите на экране телевизора ниже, чтобы выполнить сопряжение с этим устройством.",
     "code": "Код",
diff --git a/web/packages/base/locales/sl-SI/translation.json b/web/packages/base/locales/sl-SI/translation.json
index b58cc7f07d..e6f4c65fd6 100644
--- a/web/packages/base/locales/sl-SI/translation.json
+++ b/web/packages/base/locales/sl-SI/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "",
     "save_key": "",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/sv-SE/translation.json b/web/packages/base/locales/sv-SE/translation.json
index de0a5a2ab1..cd4e2a4ef6 100644
--- a/web/packages/base/locales/sv-SE/translation.json
+++ b/web/packages/base/locales/sv-SE/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "Gå tillbaka",
+    "account": "",
     "recovery_key": "Återställningsnyckel",
     "do_this_later": "Gör detta senare",
     "save_key": "Spara nyckel",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "Skicka ett mail till <a>{{emailID}}</a> från din registrerade e-postadress",
     "contact_support": "Kontakta support",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "Support",
     "cancel": "Avbryt",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "Ändra mapp",
-    "debug_logs": "",
-    "download_logs": "Ladda ner loggar",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "Återställ",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "Spela album på TV",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/ta-IN/translation.json b/web/packages/base/locales/ta-IN/translation.json
index b58cc7f07d..e6f4c65fd6 100644
--- a/web/packages/base/locales/ta-IN/translation.json
+++ b/web/packages/base/locales/ta-IN/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "",
     "save_key": "",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/te-IN/translation.json b/web/packages/base/locales/te-IN/translation.json
index b58cc7f07d..e6f4c65fd6 100644
--- a/web/packages/base/locales/te-IN/translation.json
+++ b/web/packages/base/locales/te-IN/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "",
     "save_key": "",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/th-TH/translation.json b/web/packages/base/locales/th-TH/translation.json
index b58cc7f07d..e6f4c65fd6 100644
--- a/web/packages/base/locales/th-TH/translation.json
+++ b/web/packages/base/locales/th-TH/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "",
     "save_key": "",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/ti-ER/translation.json b/web/packages/base/locales/ti-ER/translation.json
index b58cc7f07d..e6f4c65fd6 100644
--- a/web/packages/base/locales/ti-ER/translation.json
+++ b/web/packages/base/locales/ti-ER/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "",
     "save_key": "",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/tr-TR/translation.json b/web/packages/base/locales/tr-TR/translation.json
index 005f37d8fc..30926580d7 100644
--- a/web/packages/base/locales/tr-TR/translation.json
+++ b/web/packages/base/locales/tr-TR/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "Parola başka bir yerde değiştirildi",
     "password_changed_elsewhere_message": "Lütfen yeni parolanı kullanarak kimlik doğrulaması yapmak için bu cihazda tekrar oturum aç.",
     "go_back": "Geri dön",
+    "account": "",
     "recovery_key": "Kurtarma anahtarı",
     "do_this_later": "Sonra yap",
     "save_key": "Anahtarı kaydet",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "Uçtan uca şifreleme protokolümüzün doğası gereği, verilerin parolan veya kurtarma anahtarın olmadan çözülemez",
     "no_two_factor_recovery_key_message": "Lütfen kaydolduğun e-posta adresinden <a>{{emailID}}</a> adresine bir e-posta bırak",
     "contact_support": "Destek ile iletişime geç",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "Özellik İste",
     "support": "Destek",
     "cancel": "İptal",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/locales/uk-UA/translation.json b/web/packages/base/locales/uk-UA/translation.json
index f2a952d846..4c40eeab63 100644
--- a/web/packages/base/locales/uk-UA/translation.json
+++ b/web/packages/base/locales/uk-UA/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "Пароль змінено в іншому місці",
     "password_changed_elsewhere_message": "Увійдіть ще раз на цьому пристрої, щоби використати новий пароль для автентифікації.",
     "go_back": "Повернутися",
+    "account": "",
     "recovery_key": "Ключ відновлення",
     "do_this_later": "Зробити це пізніше",
     "save_key": "Зберегти ключ",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "Через природу нашого кінцевого протоколу шифрування, ваші дані не можуть бути розшифровані без вашого пароля або ключа відновлення",
     "no_two_factor_recovery_key_message": "Надішліть листа на <a>{{emailID}}</a> з вашої зареєстрованої поштової адреси",
     "contact_support": "Звернутися до служби підтримки",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "Запропонувати функцію",
     "support": "Підтримка",
     "cancel": "Скасувати",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "Ваші наявні файли не будуть видалені, але Ente перестане автоматично оновлювати пов'язаний альбом Ente після змін в цій теці.",
     "yes_stop": "Так, зупинити",
     "change_folder": "Змінити теку",
-    "debug_logs": "Налагоджувальні журнали",
-    "download_logs": "Завантажити журнали",
-    "download_logs_message": "<p>Це призведе до завантаження журналів налагодження, які ви можете надіслати нам, щоб допомогти виправити вашу проблему.</p><p>Зверніть увагу, що імена файлів будуть включені, щоб допомогти відстежувати проблеми з конкретними файлами.</p>",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "Веббраузер, який ви використовуєте, недостатньо потужний для шифрування ваших фотографій. Спробуйте ввійти до Ente на комп'ютері або завантажте мобільний / настільний застосунок Ente.",
     "drag_and_drop_hint": "Або перетягніть у вікно Ente",
     "authenticate": "Підтвердити",
@@ -602,6 +605,7 @@
     "reset": "Скинути",
     "faster_upload": "Швидші завантаження",
     "faster_upload_description": "Завантаження маршрутів через найближчі сервери",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "Відтворення альбому на ТБ",
     "enter_cast_pin_code": "Введіть код, який ви бачите на телевізорі нижче, щоб з'єднатися з цим пристроєм.",
     "code": "Код",
diff --git a/web/packages/base/locales/vi-VN/translation.json b/web/packages/base/locales/vi-VN/translation.json
index 4d261dc128..e69dd0fc9f 100644
--- a/web/packages/base/locales/vi-VN/translation.json
+++ b/web/packages/base/locales/vi-VN/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "Mật khẩu đã được thay đổi ở nơi khác",
     "password_changed_elsewhere_message": "Vui lòng đăng nhập lại trên thiết bị này để sử dụng mật khẩu mới của bạn để xác thực.",
     "go_back": "Quay lại",
+    "account": "",
     "recovery_key": "Khóa khôi phục",
     "do_this_later": "Làm điều này sau",
     "save_key": "Lưu khóa",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "Do tính chất của giao thức mã hóa đầu cuối của chúng tôi, dữ liệu của bạn không thể được giải mã mà không có mật khẩu hoặc khóa khôi phục của bạn",
     "no_two_factor_recovery_key_message": "Vui lòng gửi email đến <a>{{emailID}}</a> từ địa chỉ email đã đăng ký của bạn",
     "contact_support": "Liên hệ hỗ trợ",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "Yêu cầu tính năng",
     "support": "Hỗ trợ",
     "cancel": "Hủy",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "Các tệp hiện có của bạn sẽ không bị xóa, nhưng Ente sẽ ngừng tự động cập nhật album Ente liên kết khi có thay đổi trong thư mục này.",
     "yes_stop": "Có, dừng lại",
     "change_folder": "Thay đổi Thư mục",
-    "debug_logs": "Nhật ký gỡ lỗi",
-    "download_logs": "Tải xuống nhật ký",
-    "download_logs_message": "<p>Điều này sẽ tải xuống nhật ký gỡ lỗi, mà bạn có thể gửi qua email cho chúng tôi để giúp gỡ lỗi vấn đề của bạn.</p><p>Xin lưu ý rằng tên tệp sẽ được bao gồm để giúp theo dõi các vấn đề với các tệp cụ thể.</p>",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "Trình duyệt web bạn đang sử dụng không đủ mạnh để mã hóa ảnh của bạn. Vui lòng thử đăng nhập vào Ente trên máy tính của bạn, hoặc tải xuống ứng dụng di động/desktop của Ente.",
     "drag_and_drop_hint": "Hoặc kéo và thả vào cửa sổ Ente",
     "authenticate": "Xác thực",
@@ -602,6 +605,7 @@
     "reset": "Đặt lại",
     "faster_upload": "Tải lên nhanh hơn",
     "faster_upload_description": "Định tuyến tải lên qua các máy chủ gần đó",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "Phát album trên TV",
     "enter_cast_pin_code": "Nhập mã bạn thấy trên TV bên dưới để ghép nối thiết bị này.",
     "code": "Mã",
diff --git a/web/packages/base/locales/zh-CN/translation.json b/web/packages/base/locales/zh-CN/translation.json
index 0c5c89b814..4d23a25fe3 100644
--- a/web/packages/base/locales/zh-CN/translation.json
+++ b/web/packages/base/locales/zh-CN/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "密码已在别处更改",
     "password_changed_elsewhere_message": "请在此设备上再次登录以使用您的新密码进行身份验证。",
     "go_back": "返回",
+    "account": "",
     "recovery_key": "恢复密钥",
     "do_this_later": "稍后再做",
     "save_key": "保存密钥",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "由于我们端到端加密协议的性质，如果没有您的密码或恢复密钥，您的数据将无法解密",
     "no_two_factor_recovery_key_message": "请用您注册Ente账户的电子邮箱发一封邮件给 <a>{{emailID}}</a>",
     "contact_support": "联系支持",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "功能建议",
     "support": "支持",
     "cancel": "取消",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "您现有的文件不会被删除，但 Ente 将停止自动更新链接的 Ente 相册在此文件夹中的更改。",
     "yes_stop": "是的，停止",
     "change_folder": "更改文件夹",
-    "debug_logs": "调试日志",
-    "download_logs": "下载日志",
-    "download_logs_message": "<p>这将下载调试日志，您可以发送电子邮件给我们来帮助调试您的问题。</p><p>请注意文件名将被包含，以帮助跟踪特定文件中的问题。</p>",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "您使用的网络浏览器功能不够强大，无法加密您的照片。 请尝试在电脑上登录Ente，或下载Ente移动/桌面应用程序。",
     "drag_and_drop_hint": "或者拖动并拖动到 Ente 窗口",
     "authenticate": "身份认证",
@@ -602,6 +605,7 @@
     "reset": "重设",
     "faster_upload": "更快上传",
     "faster_upload_description": "通过附近的服务器路由上传",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "在电视上播放相册",
     "enter_cast_pin_code": "输入您在下面的电视上看到的代码来配对此设备。",
     "code": "代码",
diff --git a/web/packages/base/locales/zh-HK/translation.json b/web/packages/base/locales/zh-HK/translation.json
index b58cc7f07d..e6f4c65fd6 100644
--- a/web/packages/base/locales/zh-HK/translation.json
+++ b/web/packages/base/locales/zh-HK/translation.json
@@ -112,6 +112,7 @@
     "password_changed_elsewhere": "",
     "password_changed_elsewhere_message": "",
     "go_back": "",
+    "account": "",
     "recovery_key": "",
     "do_this_later": "",
     "save_key": "",
@@ -127,6 +128,9 @@
     "no_recovery_key_message": "",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
     "request_feature": "",
     "support": "",
     "cancel": "",
@@ -471,9 +475,8 @@
     "stop_watching_folder_message": "",
     "yes_stop": "",
     "change_folder": "",
-    "debug_logs": "",
-    "download_logs": "",
-    "download_logs_message": "",
+    "view_logs": "",
+    "view_logs_message": "",
     "weak_device_hint": "",
     "drag_and_drop_hint": "",
     "authenticate": "",
@@ -602,6 +605,7 @@
     "reset": "",
     "faster_upload": "",
     "faster_upload_description": "",
+    "open_ente_on_startup": "",
     "cast_album_to_tv": "",
     "enter_cast_pin_code": "",
     "code": "",
diff --git a/web/packages/base/next.config.base.js b/web/packages/base/next.config.base.js
index 909c9d8217..2c8155bf7a 100644
--- a/web/packages/base/next.config.base.js
+++ b/web/packages/base/next.config.base.js
@@ -119,6 +119,13 @@ const nextConfig = {
         desktopAppVersion,
     },
 
+    // Ask Next to use a separate dist directory for the desktop during
+    // development. This allows us run dev servers simulataneously for both web
+    // and desktop code without them stepping on each others toes.
+    ...(process.env.NODE_ENV != "production" && isDesktop
+        ? { distDir: ".next-desktop" }
+        : {}),
+
     // Customize the webpack configuration used by Next.js.
     webpack: (config, { isServer }) => {
         // https://dev.to/marcinwosinek/how-to-add-resolve-fallback-to-webpack-5-in-nextjs-10-i6j
diff --git a/web/packages/base/types/ipc.ts b/web/packages/base/types/ipc.ts
index 810a244020..5a1e39bddb 100644
--- a/web/packages/base/types/ipc.ts
+++ b/web/packages/base/types/ipc.ts
@@ -129,6 +129,35 @@ export interface Electron {
      */
     onOpenEnteURL: (cb: ((url: string) => void) | undefined) => void;
 
+    /**
+     * Get the persisted version for the last shown changelog.
+     *
+     * See: [Note: Conditions for showing "What's new"]
+     */
+    lastShownChangelogVersion: () => Promise<number | undefined>;
+
+    /**
+     * Save the given {@link version} to disk as the version of the last shown
+     * changelog.
+     *
+     * The value is saved to a store which is not cleared during logout.
+     *
+     * @see {@link lastShownChangelogVersion}
+     */
+    setLastShownChangelogVersion: (version: number) => Promise<void>;
+
+    /**
+     * Return true if the auto launch on system startup is enabled.
+     */
+    isAutoLaunchEnabled: () => Promise<boolean>;
+
+    /**
+     * Toggle the auto launch on system startup behaviour.
+     *
+     * @see {@link isAutoLaunchEnabled}
+     */
+    toggleAutoLaunch: () => Promise<void>;
+
     // - App update
 
     /**
@@ -166,23 +195,6 @@ export interface Electron {
      */
     skipAppUpdate: (version: string) => void;
 
-    /**
-     * Get the persisted version for the last shown changelog.
-     *
-     * See: [Note: Conditions for showing "What's new"]
-     */
-    lastShownChangelogVersion: () => Promise<number | undefined>;
-
-    /**
-     * Save the given {@link version} to disk as the version of the last shown
-     * changelog.
-     *
-     * The value is saved to a store which is not cleared during logout.
-     *
-     * @see {@link lastShownChangelogVersion}
-     */
-    setLastShownChangelogVersion: (version: number) => Promise<void>;
-
     // - FS
 
     /**
diff --git a/web/packages/gallery/components/FullScreenDropZone.tsx b/web/packages/gallery/components/FullScreenDropZone.tsx
index e6cab2479c..e66409181b 100644
--- a/web/packages/gallery/components/FullScreenDropZone.tsx
+++ b/web/packages/gallery/components/FullScreenDropZone.tsx
@@ -80,7 +80,7 @@ const DropZoneOverlay = styled(Stack)(
     border-style: solid;
     border-color: ${theme.vars.palette.accent.light};
     background-color: ${theme.vars.palette.backdrop.base};
-    z-index: 3000;
+    z-index: 2000; /* aboveFileViewerContentZ + delta */
 `,
 );
 
diff --git a/web/packages/new/photos/components/CollectionMappingChoice.tsx b/web/packages/new/photos/components/CollectionMappingChoice.tsx
index c18c8e1f75..fdcda398c1 100644
--- a/web/packages/new/photos/components/CollectionMappingChoice.tsx
+++ b/web/packages/new/photos/components/CollectionMappingChoice.tsx
@@ -1,4 +1,4 @@
-import { SpaceBetweenFlex } from "@/base/components/containers";
+import { SpacedRow } from "@/base/components/containers";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import type { ModalVisibilityProps } from "@/base/components/utils/modal";
 import type { CollectionMapping } from "@/base/types/ipc";
@@ -36,10 +36,10 @@ export const CollectionMappingChoice: React.FC<
         fullWidth
         slotProps={{ paper: { sx: { maxWidth: "360px", padding: "12px" } } }}
     >
-        <SpaceBetweenFlex sx={{ paddingInlineEnd: "4px" }}>
+        <SpacedRow sx={{ pr: "4px" }}>
             <DialogTitle>{t("multi_folder_upload")}</DialogTitle>
             <DialogCloseIconButton {...{ onClose }} />
-        </SpaceBetweenFlex>
+        </SpacedRow>
 
         <DialogContent
             sx={{
diff --git a/web/packages/new/photos/components/CollectionSelector.tsx b/web/packages/new/photos/components/CollectionSelector.tsx
index ed0eb489a0..af8b0b13fd 100644
--- a/web/packages/new/photos/components/CollectionSelector.tsx
+++ b/web/packages/new/photos/components/CollectionSelector.tsx
@@ -1,4 +1,4 @@
-import { SpaceBetweenFlex } from "@/base/components/containers";
+import { SpacedRow } from "@/base/components/containers";
 import type { ModalVisibilityProps } from "@/base/components/utils/modal";
 import type { Collection } from "@/media/collection";
 import {
@@ -166,10 +166,10 @@ export const CollectionSelector: React.FC<CollectionSelectorProps> = ({
             fullScreen={isFullScreen}
             slotProps={{ paper: { sx: { maxWidth: "490px" } } }}
         >
-            <SpaceBetweenFlex sx={{ padding: "10px 8px 6px 0" }}>
+            <SpacedRow sx={{ padding: "10px 8px 6px 0" }}>
                 <DialogTitle variant="h3">{titleForAction(action)}</DialogTitle>
                 <DialogCloseIconButton onClose={handleClose} />
-            </SpaceBetweenFlex>
+            </SpacedRow>
 
             <DialogContent_>
                 <LargeTileCreateNewButton onClick={onCreateCollection}>
diff --git a/web/packages/new/photos/components/FileInfo.tsx b/web/packages/new/photos/components/FileInfo.tsx
new file mode 100644
index 0000000000..57a9277cea
--- /dev/null
+++ b/web/packages/new/photos/components/FileInfo.tsx
@@ -0,0 +1,42 @@
+import ContentCopyIcon from "@mui/icons-material/ContentCopy";
+import DoneIcon from "@mui/icons-material/Done";
+import { IconButton, Tooltip, type SvgIconProps } from "@mui/material";
+import { t } from "i18next";
+import { useState } from "react";
+import { aboveFileViewerContentZ } from "./utils/z-index";
+
+interface CopyButtonProps {
+    /**
+     * The text to copy when the button is clicked.
+     */
+    text: string;
+    /**
+     * The size of the icon.
+     */
+    size?: SvgIconProps["fontSize"];
+}
+
+export const CopyButton: React.FC<CopyButtonProps> = ({ text, size }) => {
+    const [copied, setCopied] = useState(false);
+
+    const handleClick = () =>
+        void navigator.clipboard.writeText(text).then(() => {
+            setCopied(true);
+            setTimeout(() => setCopied(false), 1000);
+        });
+
+    const Icon = copied ? DoneIcon : ContentCopyIcon;
+
+    return (
+        <Tooltip
+            arrow
+            open={copied}
+            title={t("copied")}
+            slotProps={{ popper: { sx: { zIndex: aboveFileViewerContentZ } } }}
+        >
+            <IconButton onClick={handleClick} color="secondary">
+                <Icon fontSize={size} />
+            </IconButton>
+        </Tooltip>
+    );
+};
diff --git a/web/packages/new/photos/components/PhotoViewer.tsx b/web/packages/new/photos/components/FileViewer.tsx
similarity index 95%
rename from web/packages/new/photos/components/PhotoViewer.tsx
rename to web/packages/new/photos/components/FileViewer.tsx
index 5777d2c507..3835fae56a 100644
--- a/web/packages/new/photos/components/PhotoViewer.tsx
+++ b/web/packages/new/photos/components/FileViewer.tsx
@@ -7,7 +7,7 @@ import log from "@/base/log";
 import { Stack, Typography, type ModalProps } from "@mui/material";
 import { t } from "i18next";
 import { useState } from "react";
-import { aboveGalleryContentZ } from "./utils/z-index";
+import { aboveFileViewerContentZ } from "./utils/z-index";
 
 // TODO(PS)
 import dynamic from "next/dynamic";
@@ -59,6 +59,7 @@ export const ConfirmDeleteFileDialog: React.FC<
             setPhase("failed");
         }
     };
+
     const handleClose: ModalProps["onClose"] = (_, reason) => {
         // Ignore backdrop clicks when we're processing the user request.
         if (reason == "backdropClick" && phase == "loading") return;
@@ -71,7 +72,7 @@ export const ConfirmDeleteFileDialog: React.FC<
             onClose={handleClose}
             title={t("trash_file_title")}
             sx={(theme) => ({
-                zIndex: aboveGalleryContentZ,
+                zIndex: aboveFileViewerContentZ,
                 // See: [Note: Lighter backdrop for overlays on photo viewer]
                 ...theme.applyStyles("light", {
                     ".MuiBackdrop-root": {
@@ -83,7 +84,7 @@ export const ConfirmDeleteFileDialog: React.FC<
             <Typography sx={{ color: "text.muted" }}>
                 {t("trash_file_message")}
             </Typography>
-            <Stack sx={{ paddingBlockStart: "24px", gap: "8px" }}>
+            <Stack sx={{ pt: 3, gap: 1 }}>
                 {phase == "failed" && <InlineErrorIndicator />}
                 <LoadingButton
                     loading={phase == "loading"}
diff --git a/web/packages/new/photos/components/PhotoDateTimePicker.tsx b/web/packages/new/photos/components/PhotoDateTimePicker.tsx
index a2dabd4cae..e035ba11c4 100644
--- a/web/packages/new/photos/components/PhotoDateTimePicker.tsx
+++ b/web/packages/new/photos/components/PhotoDateTimePicker.tsx
@@ -6,7 +6,7 @@ import {
 import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
 import dayjs, { Dayjs } from "dayjs";
 import React, { useState } from "react";
-import { fileInfoDrawerZ } from "./utils/z-index";
+import { aboveFileViewerContentZ } from "./utils/z-index";
 
 interface PhotoDateTimePickerProps {
     /**
@@ -100,14 +100,11 @@ export const PhotoDateTimePicker: React.FC<PhotoDateTimePickerProps> = ({
                             },
                         },
                     },
+
                     /* We also get opened from the info drawer in the photo
                        viewer, so give our dialog a higher z-index than both the
                        photo viewer and the info drawer */
-                    dialog: {
-                        sx: {
-                            zIndex: fileInfoDrawerZ + 1,
-                        },
-                    },
+                    dialog: { sx: { zIndex: aboveFileViewerContentZ } },
                 }}
             />
         </LocalizationProvider>
diff --git a/web/packages/new/photos/components/PlanSelector.tsx b/web/packages/new/photos/components/PlanSelector.tsx
index e8342bd6c7..de5224e883 100644
--- a/web/packages/new/photos/components/PlanSelector.tsx
+++ b/web/packages/new/photos/components/PlanSelector.tsx
@@ -1,4 +1,4 @@
-import { SpaceBetweenFlex } from "@/base/components/containers";
+import { SpacedRow } from "@/base/components/containers";
 import type { ButtonishProps } from "@/base/components/mui";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import {
@@ -641,7 +641,7 @@ const FreePlanRow: React.FC<FreePlanRowProps> = ({ onClose, storage }) => (
     </FreePlanRow_>
 );
 
-const FreePlanRow_ = styled(SpaceBetweenFlex)(({ theme }) => ({
+const FreePlanRow_ = styled(SpacedRow)(({ theme }) => ({
     gap: theme.spacing(1.5),
     padding: theme.spacing(1.5, 1),
     cursor: "pointer",
diff --git a/web/packages/new/photos/components/gallery/PeopleHeader.tsx b/web/packages/new/photos/components/gallery/PeopleHeader.tsx
index 8e4e19fda8..40e24cd74f 100644
--- a/web/packages/new/photos/components/gallery/PeopleHeader.tsx
+++ b/web/packages/new/photos/components/gallery/PeopleHeader.tsx
@@ -1,4 +1,4 @@
-import { CenteredFill, SpaceBetweenFlex } from "@/base/components/containers";
+import { CenteredFill, SpacedRow } from "@/base/components/containers";
 import { ActivityErrorIndicator } from "@/base/components/ErrorIndicator";
 import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
@@ -85,7 +85,7 @@ export const PeopleHeader: React.FC<PeopleHeaderProps> = ({
 }) => {
     return (
         <GalleryItemsHeaderAdapter>
-            <SpaceBetweenFlex>
+            <SpacedRow>
                 {person.type == "cgroup" ? (
                     person.isHidden ? (
                         <IgnoredPersonHeader person={person} />
@@ -98,7 +98,7 @@ export const PeopleHeader: React.FC<PeopleHeaderProps> = ({
                         {...{ people, onSelectPerson }}
                     />
                 )}
-            </SpaceBetweenFlex>
+            </SpacedRow>
         </GalleryItemsHeaderAdapter>
     );
 };
@@ -351,10 +351,10 @@ const AddPersonDialog: React.FC<AddPersonDialogProps> = ({
                 fullScreen={isFullScreen}
                 slotProps={{ paper: { sx: { maxWidth: "490px" } } }}
             >
-                <SpaceBetweenFlex sx={{ padding: "10px 8px 6px 0" }}>
+                <SpacedRow sx={{ padding: "10px 8px 6px 0" }}>
                     <DialogTitle variant="h3">{t("add_name")}</DialogTitle>
                     <DialogCloseIconButton {...{ onClose }} />
-                </SpaceBetweenFlex>
+                </SpacedRow>
                 <DialogContent_>
                     <LargeTileCreateNewButton onClick={handleAddPerson}>
                         {t("new_person")}
@@ -626,7 +626,7 @@ const SuggestionsDialog: React.FC<SuggestionsDialogProps> = ({
             fullScreen={isSmallWidth}
             slotProps={{ paper: { sx: { minHeight: "80svh" } } }}
         >
-            <SpaceBetweenFlex
+            <SpacedRow
                 sx={[
                     { padding: "20px 16px 16px 16px" },
                     state.showChoices
@@ -662,7 +662,7 @@ const SuggestionsDialog: React.FC<SuggestionsDialogProps> = ({
                         <RestoreIcon />
                     </IconButton>
                 )}
-            </SpaceBetweenFlex>
+            </SpacedRow>
             <DialogContent
                 /* Reset scroll position on switching view */
                 key={`${state.showChoices}`}
@@ -744,11 +744,7 @@ const SuggestionOrChoiceList: React.FC<SuggestionOrChoiceListProps> = ({
         {items.map((item) => (
             <ListItem
                 key={item.id}
-                sx={{
-                    paddingInline: 0,
-                    paddingBlockEnd: "24px",
-                    justifyContent: "space-between",
-                }}
+                sx={{ px: 0, pb: "24px", justifyContent: "space-between" }}
             >
                 <Stack sx={{ gap: "10px" }}>
                     <Typography variant="small" sx={{ color: "text.muted" }}>
diff --git a/web/packages/new/photos/components/utils/z-index.tsx b/web/packages/new/photos/components/utils/z-index.tsx
index bf6190824c..e96154e5c0 100644
--- a/web/packages/new/photos/components/utils/z-index.tsx
+++ b/web/packages/new/photos/components/utils/z-index.tsx
@@ -33,7 +33,7 @@ export const fileInfoDrawerZ = photoSwipeZ + 1;
 
 /**
  * Dialogs (not necessarily always) need to be higher still so to ensure they
- * are visible above the drawer in case they are shown in response to some
- * action taken in the file info drawer.
+ * are visible above the file info drawer in case they are shown in response to
+ * some action taken in the file info drawer.
  */
-export const aboveGalleryContentZ = fileInfoDrawerZ + 1;
+export const aboveFileViewerContentZ = fileInfoDrawerZ + 1;
diff --git a/web/packages/new/photos/pages/duplicates.tsx b/web/packages/new/photos/pages/duplicates.tsx
index c939dcfdef..29c2067367 100644
--- a/web/packages/new/photos/pages/duplicates.tsx
+++ b/web/packages/new/photos/pages/duplicates.tsx
@@ -1,5 +1,5 @@
 import { useRedirectIfNeedsCredentials } from "@/accounts/components/utils/use-redirect";
-import { CenteredFill } from "@/base/components/containers";
+import { CenteredFill, SpacedRow } from "@/base/components/containers";
 import { ActivityErrorIndicator } from "@/base/components/ErrorIndicator";
 import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
@@ -570,12 +570,9 @@ const ListItem: React.FC<ListChildComponentProps<DuplicatesListItemData>> =
                     checked ? { opacity: 1 } : { opacity: 0.8 },
                 ]}
             >
-                <Stack
-                    direction="row"
+                <SpacedRow
                     sx={{
-                        justifyContent: "space-between",
-                        alignItems: "center",
-                        marginInline: 1,
+                        mx: 1,
                         paddingInline: "var(--et-padding-inline)",
                         paddingBlock: "24px 0px",
                     }}
@@ -585,7 +582,7 @@ const ListItem: React.FC<ListChildComponentProps<DuplicatesListItemData>> =
                     </Typography>
                     {/* The size of this Checkbox is 42px. */}
                     <Checkbox {...{ checked, onChange }} />
-                </Stack>
+                </SpacedRow>
                 <Divider
                     variant="middle"
                     sx={[
diff --git a/web/packages/shared/components/Container.tsx b/web/packages/shared/components/Container.tsx
index a8cf054ac2..7d84d9e7d5 100644
--- a/web/packages/shared/components/Container.tsx
+++ b/web/packages/shared/components/Container.tsx
@@ -16,12 +16,16 @@ export const FlexWrapper = styled(Box)`
     align-items: center;
 `;
 
+/**
+ * Deprecated, use {@link SpacedRow} from @/base/components/mui/container
+ * instead
+ */
 export const SpaceBetweenFlex = styled(FlexWrapper)`
     justify-content: space-between;
 `;
 
 /**
- * Deprecated, use {@link CenteredFlex} from @/base/components/mui/container
+ * Deprecated, use {@link CenteredRow} from @/base/components/mui/container
  * instead
  */
 export const CenteredFlex = styled(FlexWrapper)`

From 79712182af689e927e8050b43797dd896ff3b7be Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Tue, 11 Feb 2025 18:34:41 +0530
Subject: [PATCH 081/796] [server] include usageRepo inside family controller

---
 server/cmd/museum/main.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go
index 62944cd004..d16a435173 100644
--- a/server/cmd/museum/main.go
+++ b/server/cmd/museum/main.go
@@ -293,6 +293,7 @@ func main() {
 		BillingCtrl:   billingController,
 		UserRepo:      userRepo,
 		UserCacheCtrl: userCacheCtrl,
+		UsageRepo:     usageRepo,
 	}
 
 	publicCollectionCtrl := &controller.PublicCollectionController{

From 17b213e3802dc20ebee51ae989a126368369ed48 Mon Sep 17 00:00:00 2001
From: Crowdin Bot <support+bot@crowdin.com>
Date: Tue, 11 Feb 2025 13:09:21 +0000
Subject: [PATCH 082/796] New Crowdin translations by GitHub Action

---
 .../base/locales/cs-CZ/translation.json       | 661 ++++++++++++++++++
 1 file changed, 661 insertions(+)
 create mode 100644 web/packages/base/locales/cs-CZ/translation.json

diff --git a/web/packages/base/locales/cs-CZ/translation.json b/web/packages/base/locales/cs-CZ/translation.json
new file mode 100644
index 0000000000..e6f4c65fd6
--- /dev/null
+++ b/web/packages/base/locales/cs-CZ/translation.json
@@ -0,0 +1,661 @@
+{
+    "intro_slide_1_title": "",
+    "intro_slide_1": "",
+    "intro_slide_2_title": "",
+    "intro_slide_2": "",
+    "intro_slide_3_title": "",
+    "intro_slide_3": "",
+    "login": "",
+    "sign_up": "",
+    "new_to_ente": "",
+    "existing_user": "",
+    "enter_email": "",
+    "invalid_email_error": "",
+    "required": "",
+    "email_not_registered": "",
+    "email_already_registered": "",
+    "email_sent": "",
+    "check_inbox_hint": "",
+    "verification_code": "",
+    "resend_code": "",
+    "verify": "",
+    "send_otp": "",
+    "generic_error": "",
+    "generic_error_retry": "",
+    "invalid_code_error": "",
+    "expired_code_error": "",
+    "status_sending": "",
+    "status_sent": "",
+    "password": "",
+    "link_password_description": "",
+    "unlock": "",
+    "set_password": "",
+    "sign_in": "",
+    "incorrect_password": "",
+    "pick_password_hint": "",
+    "pick_password_caution": "",
+    "key_generation_in_progress": "",
+    "confirm_password": "",
+    "referral_source_hint": "",
+    "referral_source_info": "",
+    "password_mismatch_error": "",
+    "welcome_to_ente_title": "",
+    "welcome_to_ente_subtitle": "",
+    "new_album": "",
+    "create_albums": "",
+    "enter_album_name": "",
+    "close_key": "",
+    "enter_file_name": "",
+    "close": "",
+    "yes": "",
+    "no": "",
+    "nothing_here": "",
+    "upload": "",
+    "import": "",
+    "add_photos": "",
+    "add_more_photos": "",
+    "add_photos_count_one": "",
+    "add_photos_count": "",
+    "select_photos": "",
+    "FILE_UPLOAD": "",
+    "UPLOAD_STAGE_MESSAGE": {
+        "0": "",
+        "1": "",
+        "3": "",
+        "4": "",
+        "5": ""
+    },
+    "FILE_NOT_UPLOADED_LIST": "",
+    "initial_load_delay_warning": "",
+    "no_account": "",
+    "existing_account": "",
+    "create": "",
+    "files_count": "",
+    "download": "",
+    "download_album": "",
+    "download_favorites": "",
+    "download_uncategorized": "",
+    "download_hidden_items": "",
+    "download_key": "",
+    "copy_key": "",
+    "toggle_fullscreen_key": "",
+    "zoom_in_out_key": "",
+    "previous_key": "",
+    "next_key": "",
+    "title_photos": "",
+    "title_auth": "",
+    "title_accounts": "",
+    "upload_first_photo": "",
+    "import_your_folders": "",
+    "upload_dropzone_hint": "",
+    "watch_folder_dropzone_hint": "",
+    "trash_files_title": "",
+    "trash_file_title": "",
+    "delete_files_title": "",
+    "delete_files_message": "",
+    "selected_count": "",
+    "selected_and_yours_count": "",
+    "delete": "",
+    "delete_key": "",
+    "favorite": "",
+    "favorite_key": "",
+    "unfavorite_key": "",
+    "convert": "",
+    "multi_folder_upload": "",
+    "upload_to_choice": "",
+    "upload_to_single_album": "",
+    "upload_to_album_per_folder": "",
+    "session_expired": "",
+    "session_expired_message": "",
+    "password_generation_failed": "",
+    "change_password": "",
+    "password_changed_elsewhere": "",
+    "password_changed_elsewhere_message": "",
+    "go_back": "",
+    "account": "",
+    "recovery_key": "",
+    "do_this_later": "",
+    "save_key": "",
+    "recovery_key_description": "",
+    "key_not_stored_note": "",
+    "recovery_key_generation_failed": "",
+    "forgot_password": "",
+    "recover_account": "",
+    "recover": "",
+    "no_recovery_key_title": "",
+    "incorrect_recovery_key": "",
+    "sorry": "",
+    "no_recovery_key_message": "",
+    "no_two_factor_recovery_key_message": "",
+    "contact_support": "",
+    "help": "",
+    "ente_help": "",
+    "blog": "",
+    "request_feature": "",
+    "support": "",
+    "cancel": "",
+    "logout": "",
+    "logout_message": "",
+    "delete_account": "",
+    "delete_account_manually_message": "",
+    "change_email": "",
+    "ok": "",
+    "success": "",
+    "error": "",
+    "offline_message": "",
+    "install": "",
+    "install_mobile_app": "",
+    "download_app": "",
+    "download_app_message": "",
+    "subscription": "",
+    "manage_payment_method": "",
+    "manage_family": "",
+    "family_plan": "",
+    "leave_family_plan": "",
+    "leave": "",
+    "leave_family_plan_confirm": "",
+    "choose_plan": "",
+    "manage_plan": "",
+    "current_usage": "",
+    "two_months_free": "",
+    "free_plan_option": "",
+    "free_plan_description": "",
+    "active": "",
+    "subscription_info_free": "",
+    "subscription_info_family": "",
+    "subscription_info_expired": "",
+    "subscription_info_renewal_cancelled": "",
+    "subscription_info_storage_quota_exceeded": "",
+    "subscription_status_renewal_active": "",
+    "subscription_status_renewal_cancelled": "",
+    "add_on_valid_till": "",
+    "subscription_expired": "",
+    "storage_quota_exceeded": "",
+    "subscription_purchase_success": "",
+    "subscription_purchase_cancelled": "",
+    "subscription_purchase_failed": "",
+    "subscription_verification_error": "",
+    "update_payment_method_message": "",
+    "payment_method_authentication_failed": "",
+    "update_payment_method": "",
+    "monthly": "",
+    "yearly": "",
+    "month_short": "",
+    "year": "",
+    "update_subscription": "",
+    "update_subscription_title": "",
+    "update_subscription_message": "",
+    "cancel_subscription": "",
+    "cancel_subscription_message": "",
+    "cancel_subscription_with_addon_message": "",
+    "subscription_cancel_success": "",
+    "reactivate_subscription": "",
+    "reactivate_subscription_message": "",
+    "subscription_activate_success": "",
+    "thank_you": "",
+    "cancel_subscription_on_mobile": "",
+    "cancel_subscription_on_mobile_message": "",
+    "mail_to_manage_subscription": "",
+    "rename": "",
+    "rename_file": "",
+    "rename_album": "",
+    "delete_album": "",
+    "delete_album_title": "",
+    "delete_album_message": "",
+    "delete_photos": "",
+    "keep_photos": "",
+    "share_album": "",
+    "sharing_with_self": "",
+    "sharing_already_shared": "",
+    "sharing_album_not_allowed": "",
+    "sharing_disabled_for_free_accounts": "",
+    "sharing_user_does_not_exist": "",
+    "search": "",
+    "search_results": "",
+    "no_results": "",
+    "search_hint": "",
+    "album": "",
+    "date": "",
+    "description": "",
+    "file_type": "",
+    "magic": "",
+    "photos_count_zero": "",
+    "photos_count_one": "",
+    "photos_count": "",
+    "terms_and_conditions": "",
+    "people": "",
+    "indexing_scheduled": "",
+    "indexing_photos": "",
+    "indexing_fetching": "",
+    "indexing_people": "",
+    "syncing_wait": "",
+    "people_empty_too_few": "",
+    "unnamed_person": "",
+    "add_a_name": "",
+    "new_person": "",
+    "add_name": "",
+    "rename_person": "",
+    "reset_person_confirm": "",
+    "reset_person_confirm_message": "",
+    "ignore": "",
+    "ignore_person_confirm": "",
+    "ignore_person_confirm_message": "",
+    "ignored": "",
+    "show_person": "",
+    "review_suggestions": "",
+    "saved_choices": "",
+    "discard_changes": "",
+    "discard_changes_confirm_message": "",
+    "people_suggestions_finding": "",
+    "people_suggestions_empty": "",
+    "info": "",
+    "info_key": "",
+    "file_name": "",
+    "caption_placeholder": "",
+    "location": "",
+    "view_on_map": "",
+    "map": "",
+    "enable_map": "",
+    "enable_maps_confirm": "",
+    "enable_maps_confirm_message": "",
+    "disable_map": "",
+    "disable_maps_confirm": "",
+    "disable_maps_confirm_message": "",
+    "details": "",
+    "view_exif": "",
+    "no_exif": "",
+    "exif": "",
+    "two_factor": "",
+    "two_factor_authentication": "",
+    "two_factor_qr_help": "",
+    "two_factor_manual_entry_title": "",
+    "two_factor_manual_entry_message": "",
+    "scan_qr_title": "",
+    "enable_two_factor": "",
+    "enable": "",
+    "enabled": "",
+    "lost_2fa_device": "",
+    "incorrect_code": "",
+    "two_factor_info": "",
+    "disable": "",
+    "reconfigure": "",
+    "reconfigure_two_factor_hint": "",
+    "update_two_factor": "",
+    "update_two_factor_message": "",
+    "update": "",
+    "disable_two_factor": "",
+    "disable_two_factor_message": "",
+    "export_data": "",
+    "select_folder": "",
+    "select_zips": "",
+    "faq": "",
+    "takeout_hint": "",
+    "destination": "",
+    "start": "",
+    "last_export_time": "",
+    "export_again": "",
+    "LOCAL_STORAGE_NOT_ACCESSIBLE_MESSAGE": "",
+    "email_already_taken": "",
+    "ETAGS_BLOCKED": "",
+    "LIVE_PHOTOS_DETECTED": "",
+    "RETRY_FAILED": "",
+    "FAILED_UPLOADS": "",
+    "failed_uploads_hint": "",
+    "SKIPPED_FILES": "",
+    "THUMBNAIL_GENERATION_FAILED_UPLOADS": "",
+    "UNSUPPORTED_FILES": "",
+    "SUCCESSFUL_UPLOADS": "",
+    "SKIPPED_INFO": "",
+    "UNSUPPORTED_INFO": "",
+    "BLOCKED_UPLOADS": "",
+    "INPROGRESS_UPLOADS": "",
+    "TOO_LARGE_UPLOADS": "",
+    "LARGER_THAN_AVAILABLE_STORAGE_UPLOADS": "",
+    "LARGER_THAN_AVAILABLE_STORAGE_INFO": "",
+    "TOO_LARGE_INFO": "",
+    "THUMBNAIL_GENERATION_FAILED_INFO": "",
+    "upload_to_album": "",
+    "add_to_album": "",
+    "move_to_album": "",
+    "unhide_to_album": "",
+    "restore_to_album": "",
+    "section_all": "",
+    "section_uncategorized": "",
+    "section_archive": "",
+    "section_hidden": "",
+    "section_trash": "",
+    "favorites": "",
+    "archive": "",
+    "archive_album": "",
+    "unarchive": "",
+    "unarchive_album": "",
+    "hide_collection": "",
+    "unhide_collection": "",
+    "move": "",
+    "add": "",
+    "remove": "",
+    "yes_remove": "",
+    "remove_from_album": "",
+    "move_to_trash": "",
+    "trash_files_message": "",
+    "trash_file_message": "",
+    "delete_permanently": "",
+    "restore": "",
+    "empty_trash": "",
+    "empty_trash_title": "",
+    "empty_trash_message": "",
+    "leave_album": "",
+    "leave_shared_album_title": "",
+    "leave_shared_album_message": "",
+    "leave_shared_album": "",
+    "confirm_remove_message": "",
+    "confirm_remove_incl_others_message": "",
+    "oldest": "",
+    "last_updated": "",
+    "name": "",
+    "fix_creation_time": "",
+    "fix_creation_time_in_progress": "",
+    "fix_creation_time_file_updated": "",
+    "fix_creation_time_completed": "",
+    "fix_creation_time_completed_with_errors": "",
+    "fix_creation_time_options": "",
+    "exif_date_time_original": "",
+    "exif_date_time_digitized": "",
+    "exif_metadata_date": "",
+    "custom_time": "",
+    "caption_character_limit": "",
+    "sharing_details": "",
+    "modify_sharing": "",
+    "add_collaborators": "",
+    "add_new_email": "",
+    "shared_with_people_count_zero": "",
+    "shared_with_people_count_one": "",
+    "shared_with_people_count": "",
+    "participants_count_zero": "",
+    "participants_count_one": "",
+    "participants_count": "",
+    "add_viewers": "",
+    "change_permission_to_viewer": "",
+    "change_permission_to_collaborator": "",
+    "change_permission_title": "",
+    "confirm_convert_to_viewer": "",
+    "confirm_convert_to_collaborator": "",
+    "manage": "",
+    "added_as": "",
+    "collaborator_hint": "",
+    "remove_participant": "",
+    "remove_participant_title": "",
+    "remove_participant_message": "",
+    "confirm_remove": "",
+    "owner": "",
+    "collaborators": "",
+    "viewers": "",
+    "add_more": "",
+    "or_add_existing": "",
+    "NOT_FOUND": "",
+    "link_expired": "",
+    "link_expired_message": "",
+    "manage_link": "",
+    "link_request_limit_exceeded": "",
+    "allow_downloads": "",
+    "allow_adding_photos": "",
+    "allow_adding_photos_hint": "",
+    "device_limit": "",
+    "none": "",
+    "link_expiry": "",
+    "never": "",
+    "after_time": {
+        "hour": "",
+        "day": "",
+        "week": "",
+        "month": "",
+        "year": ""
+    },
+    "copy_link": "",
+    "done": "",
+    "share_link_section_title": "",
+    "remove_link": "",
+    "create_public_link": "",
+    "public_link_created": "",
+    "public_link_enabled": "",
+    "collect_photos": "",
+    "disable_file_download": "",
+    "disable_file_download_message": "",
+    "shared_using": "",
+    "sharing_referral_code": "",
+    "live_photo_indicator": "",
+    "disable_password": "",
+    "disable_password_message": "",
+    "password_lock": "",
+    "lock": "",
+    "file": "",
+    "folder": "",
+    "google_takeout": "",
+    "deduplicate_files": "",
+    "remove_duplicates": "",
+    "total_size": "",
+    "count": "",
+    "deselect_all": "",
+    "no_duplicates": "",
+    "duplicate_group_description": "",
+    "remove_duplicates_button_count": "",
+    "stop_uploads_title": "",
+    "stop_uploads_message": "",
+    "yes_stop_uploads": "",
+    "stop_downloads_title": "",
+    "stop_downloads_message": "",
+    "yes_stop_downloads": "",
+    "albums": "",
+    "albums_count_one": "",
+    "albums_count": "",
+    "all_albums": "",
+    "all_hidden_albums": "",
+    "hidden_albums": "",
+    "hidden_items": "",
+    "enter_two_factor_otp": "",
+    "create_account": "",
+    "copied": "",
+    "upgrade_now": "",
+    "renew_now": "",
+    "storage": "",
+    "used": "",
+    "you": "",
+    "family": "",
+    "free": "",
+    "of": "",
+    "watch_folders": "",
+    "watched_folders": "",
+    "no_folders_added": "",
+    "watch_folders_hint_1": "",
+    "watch_folders_hint_2": "",
+    "watch_folders_hint_3": "",
+    "add_folder": "",
+    "stop_watching": "",
+    "stop_watching_folder_title": "",
+    "stop_watching_folder_message": "",
+    "yes_stop": "",
+    "change_folder": "",
+    "view_logs": "",
+    "view_logs_message": "",
+    "weak_device_hint": "",
+    "drag_and_drop_hint": "",
+    "authenticate": "",
+    "uploaded_to_single_collection": "",
+    "uploaded_to_separate_collections": "",
+    "nevermind": "",
+    "update_available": "",
+    "update_installable_message": "",
+    "install_now": "",
+    "install_on_next_launch": "",
+    "update_available_message": "",
+    "download_and_install": "",
+    "ignore_this_version": "",
+    "TODAY": "",
+    "YESTERDAY": "",
+    "enter_name": "",
+    "uploader_name_hint": "",
+    "name_placeholder": "",
+    "root_level_file_with_folder_not_allowed": "",
+    "root_level_file_with_folder_not_allowed_message": "",
+    "more_details": "",
+    "ml_search": "",
+    "ml_search_description": "",
+    "ml_search_footnote": "",
+    "indexing": "",
+    "processed": "",
+    "indexing_status_running": "",
+    "indexing_status_fetching": "",
+    "indexing_status_scheduled": "",
+    "indexing_status_done": "",
+    "ml_search_disable": "",
+    "ml_search_disable_confirm": "",
+    "ml_consent": "",
+    "ml_consent_title": "",
+    "ml_consent_description": "",
+    "ml_consent_confirmation": "",
+    "labs": "",
+    "passphrase_strength_weak": "",
+    "passphrase_strength_moderate": "",
+    "passphrase_strength_strong": "",
+    "preferences": "",
+    "language": "",
+    "advanced": "",
+    "export_directory_does_not_exist": "",
+    "export_directory_does_not_exist_message": "",
+    "storage_unit": {
+        "b": "",
+        "kb": "",
+        "mb": "",
+        "gb": "",
+        "tb": ""
+    },
+    "STOP_EXPORT": "",
+    "EXPORT_PROGRESS": "",
+    "MIGRATING_EXPORT": "",
+    "RENAMING_COLLECTION_FOLDERS": "",
+    "TRASHING_DELETED_FILES": "",
+    "TRASHING_DELETED_COLLECTIONS": "",
+    "CONTINUOUS_EXPORT": "",
+    "PENDING_ITEMS": "",
+    "EXPORT_STARTING": "",
+    "delete_account_reason_label": "",
+    "delete_account_reason_placeholder": "",
+    "delete_reason": {
+        "missing_feature": "",
+        "behaviour": "",
+        "found_another_service": "",
+        "not_listed": ""
+    },
+    "delete_account_feedback_label": "",
+    "delete_account_feedback_placeholder": "",
+    "delete_account_confirm_checkbox_label": "",
+    "delete_account_confirm": "",
+    "delete_account_confirm_message": "",
+    "feedback_required": "",
+    "feedback_required_found_another_service": "",
+    "recover_two_factor": "",
+    "at": "",
+    "auth_next": "",
+    "auth_download_mobile_app": "",
+    "no_codes_added_yet": "",
+    "hide": "",
+    "unhide": "",
+    "sort_by": "",
+    "newest_first": "",
+    "oldest_first": "",
+    "pin_album": "",
+    "unpin_album": "",
+    "unpreviewable_file_notification": "",
+    "download_complete": "",
+    "downloading_album": "",
+    "download_failed": "",
+    "download_progress": "",
+    "CHRISTMAS": "",
+    "CHRISTMAS_EVE": "",
+    "NEW_YEAR": "",
+    "NEW_YEAR_EVE": "",
+    "image": "",
+    "video": "",
+    "live_photo": "",
+    "photo_editor": "",
+    "confirm_editor_close": "",
+    "confirm_editor_close_message": "",
+    "brightness": "",
+    "contrast": "",
+    "saturation": "",
+    "blur": "",
+    "transform": "",
+    "crop": "",
+    "aspect_ratio": "",
+    "square": "",
+    "freehand": "",
+    "apply_crop": "",
+    "rotation": "",
+    "rotate_left": "",
+    "rotate_right": "",
+    "flip": "",
+    "flip_vertically": "",
+    "flip_horizontally": "",
+    "download_edited": "",
+    "save_a_copy_to_ente": "",
+    "restore_original": "",
+    "photo_edit_required_to_save": "",
+    "colors": "",
+    "invert_colors": "",
+    "reset": "",
+    "faster_upload": "",
+    "faster_upload_description": "",
+    "open_ente_on_startup": "",
+    "cast_album_to_tv": "",
+    "enter_cast_pin_code": "",
+    "code": "",
+    "pair_device_to_tv": "",
+    "tv_not_found": "",
+    "cast_auto_pair": "",
+    "cast_auto_pair_description": "",
+    "choose_device_from_browser": "",
+    "cast_auto_pair_failed": "",
+    "pair_with_pin": "",
+    "pair_with_pin_description": "",
+    "visit_cast_url": "",
+    "passkeys": "",
+    "passkey_fetch_failed": "",
+    "manage_passkey": "",
+    "delete_passkey": "",
+    "delete_passkey_confirmation": "",
+    "rename_passkey": "",
+    "add_passkey": "",
+    "enter_passkey_name": "",
+    "passkeys_description": "",
+    "created_at": "",
+    "passkey_add_failed": "",
+    "passkey_login_failed": "",
+    "passkey_login_invalid_url": "",
+    "passkey_login_already_claimed_session": "",
+    "passkey_login_generic_error": "",
+    "passkey_login_credential_hint": "",
+    "passkeys_not_supported": "",
+    "try_again": "",
+    "check_status": "",
+    "passkey_login_instructions": "",
+    "passkey_login": "",
+    "totp_login": "",
+    "passkey": "",
+    "passkey_verify_description": "",
+    "waiting_for_verification": "",
+    "verification_still_pending": "",
+    "passkey_verified": "",
+    "redirecting_back_to_app": "",
+    "redirect_close_instructions": "",
+    "redirect_again": "",
+    "autogenerated_first_album_name": "",
+    "autogenerated_default_album_name": "",
+    "developer_settings": "",
+    "server_endpoint": "",
+    "more_information": "",
+    "save": "",
+    "theme": "",
+    "system": "",
+    "light": "",
+    "dark": ""
+}

From 5dd5f7e9c55dd610bf178af22f6acb77afe269cf Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 11 Feb 2025 18:44:22 +0530
Subject: [PATCH 083/796] [web] Post revert fix

---
 web/apps/photos/src/components/PhotoFrame.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 78f484990c..9a1f42374f 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -7,7 +7,7 @@ import {
 } from "@/gallery/services/download";
 import { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
-import { FileViewer } from "@/new/photos/components/PhotoViewer";
+import { FileViewer } from "@/new/photos/components/FileViewer";
 import type { GalleryBarMode } from "@/new/photos/components/gallery/reducer";
 import { TRASH_SECTION } from "@/new/photos/services/collection";
 import { styled } from "@mui/material";

From 4ee6ef408e73909bbd12ee534cde3f283eeeaa83 Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Tue, 11 Feb 2025 19:07:19 +0530
Subject: [PATCH 084/796] [server] error handling if memberUsage is more than
 potential modified storagelimit

some more additional checks for the adminUser
---
 server/pkg/controller/family/admin.go | 34 ++++++++++++++++++---------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/server/pkg/controller/family/admin.go b/server/pkg/controller/family/admin.go
index 36caffbae8..45fc6c4252 100644
--- a/server/pkg/controller/family/admin.go
+++ b/server/pkg/controller/family/admin.go
@@ -194,28 +194,40 @@ func (c *Controller) CloseFamily(ctx context.Context, adminID int64) error {
 func (c *Controller) ModifyMemberStorage(ctx context.Context, adminID int64, id uuid.UUID, storageLimit *int64) error {
 	familyAdminID, err := c.UserRepo.GetFamilyAdminID(adminID)
 	if err != nil {
-		stacktrace.Propagate(err, "Could not get family admin ID")
+		return stacktrace.Propagate(err, "Could not get family admin ID")
 	}
 
 	member, err := c.FamilyRepo.GetMemberById(ctx, id)
 	if err != nil {
-		stacktrace.Propagate(err, "Couldn't fetch Family Member")
+		return stacktrace.Propagate(err, "Couldn't fetch Family Member")
 	}
 
-	// get admin subscription in order to get the size of total storage quota
-	// available in that family. and let the user chose storage of outw of the whole
-	// storage quota or maximum limit.
+	// gets admin subscription in order to get the size of total storage quota
 	activeSub, err := c.BillingCtrl.GetActiveSubscription(adminID)
 	if err != nil {
-		stacktrace.Propagate(err, "couldn't get active subscription")
+		return stacktrace.Propagate(err, "couldn't get active subscription")
 	}
 
-	if adminID == *familyAdminID && id == member.ID {
-		if storageLimit != nil && *storageLimit > activeSub.Storage {
-			err := c.FamilyRepo.ModifyMemberStorage(ctx, adminID, member.ID, storageLimit)
-			if err != nil {
-				stacktrace.Propagate(err, "Couldn't Modify Members Storage")
+	if adminID == *familyAdminID {
+		if id == member.ID && member.Status == "ACCEPTED" && member.Status != "SELF" {
+			// Handle if the admin user tries reducing the storage Limit
+			// and the members Usage is more than the potential storage Limit
+			memberUsage, memUsageErr := c.UsageRepo.GetUsage(member.MemberUserID)
+			if memUsageErr != nil {
+				return stacktrace.Propagate(memUsageErr, "Couldn't find members storage usage")
 			}
+			if storageLimit != nil && *storageLimit < activeSub.Storage {
+				if *storageLimit > memberUsage {
+					err := c.FamilyRepo.ModifyMemberStorage(ctx, adminID, member.ID, storageLimit)
+					if err != nil {
+						return stacktrace.Propagate(err, "Cannot Modify Members Storage")
+					}
+				} else {
+					return stacktrace.Propagate(fmt.Errorf("storage reduction not allowed"), "Cannot reduce storage, current usage is more.")
+				}
+			}
+		} else {
+			return stacktrace.Propagate(fmt.Errorf("could not modify storage"), "user is either admin or not part of family")
 		}
 	}
 	return nil

From 1b0d481b457fb42972d4dbadc4862151fc027a39 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 7 Feb 2025 12:26:52 +0530
Subject: [PATCH 085/796] [mob] Fix creationTime parsing

---
 .../viewer/file_details/creation_time_item_widget.dart | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mobile/lib/ui/viewer/file_details/creation_time_item_widget.dart b/mobile/lib/ui/viewer/file_details/creation_time_item_widget.dart
index 90b6ab9d58..13c8800fa8 100644
--- a/mobile/lib/ui/viewer/file_details/creation_time_item_widget.dart
+++ b/mobile/lib/ui/viewer/file_details/creation_time_item_widget.dart
@@ -21,15 +21,15 @@ class CreationTimeItem extends StatefulWidget {
 class _CreationTimeItemState extends State<CreationTimeItem> {
   @override
   Widget build(BuildContext context) {
-    final dateTime =
-        DateTime.fromMicrosecondsSinceEpoch(widget.file.creationTime!);
+    final dateTime = DateTime.fromMicrosecondsSinceEpoch(
+      widget.file.creationTime!,
+      isUtc: true,
+    ).toLocal();
     return InfoItemWidget(
       key: const ValueKey("Creation time"),
       leadingIcon: Icons.calendar_today_outlined,
       title: DateFormat.yMMMEd(Localizations.localeOf(context).languageCode)
-          .format(
-        DateTime.fromMicrosecondsSinceEpoch(widget.file.creationTime!),
-      ),
+          .format(dateTime),
       subtitleSection: Future.value([
         Text(
           getTimeIn12hrFormat(dateTime) + "  " + dateTime.timeZoneName,

From be7cbc2ba0acae688067978c9b42911cac51c85d Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 7 Feb 2025 12:35:15 +0530
Subject: [PATCH 086/796] [mob] Fix handling of timezone

---
 mobile/lib/utils/exif_util.dart | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/mobile/lib/utils/exif_util.dart b/mobile/lib/utils/exif_util.dart
index 652336ebee..45741f07b6 100644
--- a/mobile/lib/utils/exif_util.dart
+++ b/mobile/lib/utils/exif_util.dart
@@ -154,24 +154,22 @@ Future<DateTime?> getCreationTimeFromEXIF(
 }
 
 DateTime getDateTimeInDeviceTimezone(String exifTime, String? offsetString) {
-  final DateTime result = DateFormat(kExifDateTimePattern).parse(exifTime);
+  final shouldParseDateInUTCTimeZone = offsetString != null;
+  final DateTime result = DateFormat(kExifDateTimePattern)
+      .parse(exifTime, shouldParseDateInUTCTimeZone);
   if (offsetString == null) {
     return result;
   }
   try {
     final List<String> splitHHMM = offsetString.split(":");
-    // Parse the offset from the photo's time zone
     final int offsetHours = int.parse(splitHHMM[0]);
     final int offsetMinutes =
         int.parse(splitHHMM[1]) * (offsetHours.isNegative ? -1 : 1);
     // Adjust the date for the offset to get the photo's correct UTC time
     final photoUtcDate =
         result.add(Duration(hours: -offsetHours, minutes: -offsetMinutes));
-    // Getting the current device's time zone offset from UTC
-    final now = DateTime.now();
-    final localOffset = now.timeZoneOffset;
-    // Adjusting the photo's UTC time to the device's local time
-    final deviceLocalTime = photoUtcDate.add(localOffset);
+    // Convert the UTC time to the device's local time
+    final deviceLocalTime = photoUtcDate.toLocal();
     return deviceLocalTime;
   } catch (e, s) {
     _logger.severe("tz offset adjust failed $offsetString", e, s);

From ff72dae40808b9d59721836843417fb9808ff8a1 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 7 Feb 2025 13:54:44 +0530
Subject: [PATCH 087/796] [mob] Refactor

---
 mobile/lib/models/file/file.dart |  6 ++--
 mobile/lib/utils/exif_util.dart  | 55 +++++++++++++++++++++-----------
 mobile/lib/utils/share_util.dart |  6 ++--
 3 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/mobile/lib/models/file/file.dart b/mobile/lib/models/file/file.dart
index 937bee0cb1..9f3d561315 100644
--- a/mobile/lib/models/file/file.dart
+++ b/mobile/lib/models/file/file.dart
@@ -175,10 +175,10 @@ class EnteFile {
       final exifData = await getExifFromSourceFile(mediaUploadData.sourceFile!);
       if (exifData != null) {
         if (fileType == FileType.image) {
-          final exifTime = await getCreationTimeFromEXIF(null, exifData);
-          if (exifTime != null) {
+          final dateResult = await tryParseExifDateTime(null, exifData);
+          if (dateResult != null && dateResult.time != null) {
             hasExifTime = true;
-            creationTime = exifTime.microsecondsSinceEpoch;
+            creationTime = dateResult.time!.microsecondsSinceEpoch;
           }
           mediaUploadData.isPanorama = checkPanoramaFromEXIF(null, exifData);
 
diff --git a/mobile/lib/utils/exif_util.dart b/mobile/lib/utils/exif_util.dart
index 45741f07b6..940ffed644 100644
--- a/mobile/lib/utils/exif_util.dart
+++ b/mobile/lib/utils/exif_util.dart
@@ -125,7 +125,14 @@ bool? checkPanoramaFromEXIF(File? file, Map<String, IfdTag>? exifData) {
   return element?.printable == "6";
 }
 
-Future<DateTime?> getCreationTimeFromEXIF(
+class ParsedExifDateTime {
+  final DateTime? time;
+  final String? dateTime;
+  final String? offsetTime;
+  ParsedExifDateTime(this.time, this.dateTime, this.offsetTime);
+}
+
+Future<ParsedExifDateTime?> tryParseExifDateTime(
   File? file,
   Map<String, IfdTag>? exifData,
 ) async {
@@ -153,28 +160,38 @@ Future<DateTime?> getCreationTimeFromEXIF(
   return null;
 }
 
-DateTime getDateTimeInDeviceTimezone(String exifTime, String? offsetString) {
+ParsedExifDateTime getDateTimeInDeviceTimezone(
+  String exifTime,
+  String? offsetString,
+) {
   final shouldParseDateInUTCTimeZone = offsetString != null;
   final DateTime result = DateFormat(kExifDateTimePattern)
       .parse(exifTime, shouldParseDateInUTCTimeZone);
-  if (offsetString == null) {
-    return result;
+  if (offsetString != null && (offsetString ?? '').toUpperCase() != "Z") {
+    try {
+      final List<String> splitHHMM = offsetString.split(":");
+      final int offsetHours = int.parse(splitHHMM[0]);
+      final int offsetMinutes =
+          int.parse(splitHHMM[1]) * (offsetHours.isNegative ? -1 : 1);
+      // Adjust the date for the offset to get the photo's correct UTC time
+      final photoUtcDate =
+          result.add(Duration(hours: -offsetHours, minutes: -offsetMinutes));
+      // Convert the UTC time to the device's local time
+      final deviceLocalTime = photoUtcDate.toLocal();
+      return ParsedExifDateTime(
+        deviceLocalTime,
+        result.toIso8601String(),
+        offsetString,
+      );
+    } catch (e, s) {
+      _logger.severe("tz offset adjust failed $offsetString", e, s);
+    }
   }
-  try {
-    final List<String> splitHHMM = offsetString.split(":");
-    final int offsetHours = int.parse(splitHHMM[0]);
-    final int offsetMinutes =
-        int.parse(splitHHMM[1]) * (offsetHours.isNegative ? -1 : 1);
-    // Adjust the date for the offset to get the photo's correct UTC time
-    final photoUtcDate =
-        result.add(Duration(hours: -offsetHours, minutes: -offsetMinutes));
-    // Convert the UTC time to the device's local time
-    final deviceLocalTime = photoUtcDate.toLocal();
-    return deviceLocalTime;
-  } catch (e, s) {
-    _logger.severe("tz offset adjust failed $offsetString", e, s);
-  }
-  return result;
+  return ParsedExifDateTime(
+    result,
+    result.toIso8601String(),
+    (offsetString ?? '').toUpperCase() == 'Z' ? 'Z' : null,
+  );
 }
 
 Location? locationFromExif(Map<String, IfdTag> exif) {
diff --git a/mobile/lib/utils/share_util.dart b/mobile/lib/utils/share_util.dart
index c39d1733b9..3ec147798d 100644
--- a/mobile/lib/utils/share_util.dart
+++ b/mobile/lib/utils/share_util.dart
@@ -165,9 +165,9 @@ Future<List<EnteFile>> convertIncomingSharedMediaToFile(
     enteFile.fileType =
         media.type == SharedMediaType.image ? FileType.image : FileType.video;
     if (enteFile.fileType == FileType.image) {
-      final exifTime = await getCreationTimeFromEXIF(ioFile, null);
-      if (exifTime != null) {
-        enteFile.creationTime = exifTime.microsecondsSinceEpoch;
+      final dateResult = await tryParseExifDateTime(ioFile, null);
+      if (dateResult != null && dateResult.time != null) {
+        enteFile.creationTime = dateResult.time!.microsecondsSinceEpoch;
       }
     } else if (enteFile.fileType == FileType.video) {
       enteFile.duration = (media.duration ?? 0) ~/ 1000;

From 0380a30705a59659a1ec82e23b8f70a4b3544170 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 7 Feb 2025 14:36:16 +0530
Subject: [PATCH 088/796] [mob] Refactor

---
 mobile/lib/utils/exif_util.dart | 48 ++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/mobile/lib/utils/exif_util.dart b/mobile/lib/utils/exif_util.dart
index 940ffed644..beee7f61ef 100644
--- a/mobile/lib/utils/exif_util.dart
+++ b/mobile/lib/utils/exif_util.dart
@@ -126,10 +126,21 @@ bool? checkPanoramaFromEXIF(File? file, Map<String, IfdTag>? exifData) {
 }
 
 class ParsedExifDateTime {
-  final DateTime? time;
-  final String? dateTime;
-  final String? offsetTime;
-  ParsedExifDateTime(this.time, this.dateTime, this.offsetTime);
+  late final DateTime? time;
+  late final String? dateTime;
+  late final String? offsetTime;
+  ParsedExifDateTime(DateTime this.time, String? dateTime, this.offsetTime) {
+    if (dateTime != null && dateTime.endsWith('Z')) {
+      this.dateTime = dateTime.substring(0, dateTime.length - 1);
+    } else {
+      this.dateTime = dateTime;
+    }
+  }
+
+  @override
+  String toString() {
+    return "ParsedExifDateTime{time: $time, dateTime: $dateTime, offsetTime: $offsetTime}";
+  }
 }
 
 Future<ParsedExifDateTime?> tryParseExifDateTime(
@@ -144,16 +155,17 @@ Future<ParsedExifDateTime?> tryParseExifDateTime(
         : exif.containsKey(kImageDateTime)
             ? exif[kImageDateTime]!.printable
             : null;
-    if (exifTime != null && exifTime != kEmptyExifDateTime) {
-      String? exifOffsetTime;
-      for (final key in kExifOffSetKeys) {
-        if (exif.containsKey(key)) {
-          exifOffsetTime = exif[key]!.printable;
-          break;
-        }
-      }
-      return getDateTimeInDeviceTimezone(exifTime, exifOffsetTime);
+    if (exifTime == null || exifTime == kEmptyExifDateTime) {
+      return null;
     }
+    String? exifOffsetTime;
+    for (final key in kExifOffSetKeys) {
+      if (exif.containsKey(key)) {
+        exifOffsetTime = exif[key]!.printable;
+        break;
+      }
+    }
+    return getDateTimeInDeviceTimezone(exifTime, exifOffsetTime);
   } catch (e) {
     _logger.severe("failed to getCreationTimeFromEXIF", e);
   }
@@ -164,10 +176,10 @@ ParsedExifDateTime getDateTimeInDeviceTimezone(
   String exifTime,
   String? offsetString,
 ) {
-  final shouldParseDateInUTCTimeZone = offsetString != null;
-  final DateTime result = DateFormat(kExifDateTimePattern)
-      .parse(exifTime, shouldParseDateInUTCTimeZone);
-  if (offsetString != null && (offsetString ?? '').toUpperCase() != "Z") {
+  final hasOffset = (offsetString ?? '') != '';
+  final DateTime result =
+      DateFormat(kExifDateTimePattern).parse(exifTime, hasOffset);
+  if (hasOffset && offsetString!.toUpperCase() != "Z") {
     try {
       final List<String> splitHHMM = offsetString.split(":");
       final int offsetHours = int.parse(splitHHMM[0]);
@@ -184,7 +196,7 @@ ParsedExifDateTime getDateTimeInDeviceTimezone(
         offsetString,
       );
     } catch (e, s) {
-      _logger.severe("tz offset adjust failed $offsetString", e, s);
+      _logger.severe("offset parsing failed $exifTime &&  $offsetString", e, s);
     }
   }
   return ParsedExifDateTime(

From 0b7b4b72f36d31f589b8984db453a6a352713a3d Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 7 Feb 2025 14:59:52 +0530
Subject: [PATCH 089/796] [mob] Add support for parsing dateTime & offsetTime
 from pubMagicMetadata

---
 mobile/lib/models/metadata/file_magic.dart | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mobile/lib/models/metadata/file_magic.dart b/mobile/lib/models/metadata/file_magic.dart
index 7599b7c82f..02f6188a9d 100644
--- a/mobile/lib/models/metadata/file_magic.dart
+++ b/mobile/lib/models/metadata/file_magic.dart
@@ -14,6 +14,8 @@ const latKey = "lat";
 const longKey = "long";
 const motionVideoIndexKey = "mvi";
 const noThumbKey = "noThumb";
+const dateTimeKey = 'dateTime';
+const offsetTimeKey = 'offsetTime';
 
 class MagicMetadata {
   // 0 -> visible
@@ -46,6 +48,11 @@ class PubMagicMetadata {
   double? lat;
   double? long;
 
+  // ISO 8601 datetime without timezone. This contains the date and time of the photo in the original tz
+  // where the photo was taken.
+  String? dateTime;
+  String? offsetTime;
+
   // Motion Video Index. Positive value (>0) indicates that the file is a motion
   // photo
   int? mvi;
@@ -74,6 +81,8 @@ class PubMagicMetadata {
     this.mvi,
     this.noThumb,
     this.mediaType,
+    this.dateTime,
+    this.offsetTime,
   });
 
   factory PubMagicMetadata.fromEncodedJson(String encodedJson) =>
@@ -96,6 +105,8 @@ class PubMagicMetadata {
       mvi: map[motionVideoIndexKey],
       noThumb: map[noThumbKey],
       mediaType: map[mediaTypeKey],
+      dateTime: map[dateTimeKey],
+      offsetTime: map[offsetTimeKey],
     );
   }
 

From f3feb4cddacdbee5b1fd6553fd2f9a048b6eb6ba Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 7 Feb 2025 15:38:49 +0530
Subject: [PATCH 090/796] [mob] Parse exif as part of MediaUploadData

---
 mobile/lib/models/file/file.dart         |  2 +-
 mobile/lib/utils/exif_util.dart          |  2 +-
 mobile/lib/utils/file_uploader.dart      |  2 +-
 mobile/lib/utils/file_uploader_util.dart | 28 +++++++++++++++++++-----
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/mobile/lib/models/file/file.dart b/mobile/lib/models/file/file.dart
index 9f3d561315..44572632e1 100644
--- a/mobile/lib/models/file/file.dart
+++ b/mobile/lib/models/file/file.dart
@@ -172,7 +172,7 @@ class EnteFile {
     bool hasExifTime = false;
     if ((fileType == FileType.image || fileType == FileType.video) &&
         mediaUploadData.sourceFile != null) {
-      final exifData = await getExifFromSourceFile(mediaUploadData.sourceFile!);
+      final exifData = await tryExifFromFile(mediaUploadData.sourceFile!);
       if (exifData != null) {
         if (fileType == FileType.image) {
           final dateResult = await tryParseExifDateTime(null, exifData);
diff --git a/mobile/lib/utils/exif_util.dart b/mobile/lib/utils/exif_util.dart
index beee7f61ef..a94e02bece 100644
--- a/mobile/lib/utils/exif_util.dart
+++ b/mobile/lib/utils/exif_util.dart
@@ -47,7 +47,7 @@ Future<Map<String, IfdTag>> getExif(EnteFile file) async {
   }
 }
 
-Future<Map<String, IfdTag>?> getExifFromSourceFile(File originFile) async {
+Future<Map<String, IfdTag>?> tryExifFromFile(File originFile) async {
   try {
     final exif = await readExifAsync(originFile);
     return exif;
diff --git a/mobile/lib/utils/file_uploader.dart b/mobile/lib/utils/file_uploader.dart
index 9290772910..5d47f159af 100644
--- a/mobile/lib/utils/file_uploader.dart
+++ b/mobile/lib/utils/file_uploader.dart
@@ -536,7 +536,7 @@ class FileUploader {
 
     MediaUploadData? mediaUploadData;
     try {
-      mediaUploadData = await getUploadDataFromEnteFile(file);
+      mediaUploadData = await getUploadDataFromEnteFile(file, parseExif: true);
     } catch (e) {
       // This additional try catch block is added because for resumable upload,
       // we need to compute the hash before the next step. Previously, this
diff --git a/mobile/lib/utils/file_uploader_util.dart b/mobile/lib/utils/file_uploader_util.dart
index 6ad6622f5f..63764a3066 100644
--- a/mobile/lib/utils/file_uploader_util.dart
+++ b/mobile/lib/utils/file_uploader_util.dart
@@ -6,6 +6,7 @@ import 'dart:ui' as ui;
 
 import "package:archive/archive_io.dart";
 import "package:computer/computer.dart";
+import "package:exif/exif.dart";
 import 'package:logging/logging.dart';
 import "package:motion_photos/motion_photos.dart";
 import 'package:motionphoto/motionphoto.dart';
@@ -44,6 +45,8 @@ class MediaUploadData {
   // For iOS, this value will be always null.
   final int? motionPhotoStartIndex;
 
+  final Map<String, IfdTag>? exifData;
+
   bool? isPanorama;
 
   MediaUploadData(
@@ -55,6 +58,7 @@ class MediaUploadData {
     this.width,
     this.motionPhotoStartIndex,
     this.isPanorama,
+    this.exifData,
   });
 }
 
@@ -69,20 +73,27 @@ class FileHashData {
   FileHashData(this.fileHash, {this.zipHash});
 }
 
-Future<MediaUploadData> getUploadDataFromEnteFile(EnteFile file) async {
+Future<MediaUploadData> getUploadDataFromEnteFile(
+  EnteFile file, {
+  bool parseExif = false,
+}) async {
   if (file.isSharedMediaToAppSandbox) {
-    return await _getMediaUploadDataFromAppCache(file);
+    return await _getMediaUploadDataFromAppCache(file, parseExif);
   } else {
-    return await _getMediaUploadDataFromAssetFile(file);
+    return await _getMediaUploadDataFromAssetFile(file, parseExif);
   }
 }
 
-Future<MediaUploadData> _getMediaUploadDataFromAssetFile(EnteFile file) async {
+Future<MediaUploadData> _getMediaUploadDataFromAssetFile(
+  EnteFile file,
+  bool parseExif,
+) async {
   File? sourceFile;
   Uint8List? thumbnailData;
   bool isDeleted;
   String? zipHash;
   String fileHash;
+  Map<String, IfdTag>? exifData;
 
   // The timeouts are to safeguard against https://github.com/CaiJingLong/flutter_photo_manager/issues/467
   final asset = await file.getAsset
@@ -115,6 +126,9 @@ Future<MediaUploadData> _getMediaUploadDataFromAssetFile(EnteFile file) async {
       InvalidReason.sourceFileMissing,
     );
   }
+  if (parseExif) {
+    exifData = await tryExifFromFile(sourceFile);
+  }
   // h4ck to fetch location data if missing (thank you Android Q+) lazily only during uploads
   await _decorateEnteFileData(file, asset, sourceFile);
   fileHash = CryptoUtil.bin2base64(await CryptoUtil.getHash(sourceFile));
@@ -177,6 +191,7 @@ Future<MediaUploadData> _getMediaUploadDataFromAssetFile(EnteFile file) async {
     height: h,
     width: w,
     motionPhotoStartIndex: motionPhotoStartingIndex,
+    exifData: exifData,
   );
 }
 
@@ -330,9 +345,11 @@ Future<MetadataRequest> getPubMetadataRequest(
   );
 }
 
-Future<MediaUploadData> _getMediaUploadDataFromAppCache(EnteFile file) async {
+Future<MediaUploadData> _getMediaUploadDataFromAppCache(
+    EnteFile file, bool parseExif) async {
   File sourceFile;
   Uint8List? thumbnailData;
+  Map<String, IfdTag>? exifData;
   const bool isDeleted = false;
   final localPath = getSharedMediaFilePath(file);
   sourceFile = File(localPath);
@@ -350,6 +367,7 @@ Future<MediaUploadData> _getMediaUploadDataFromAppCache(EnteFile file) async {
     Map<String, int>? dimensions;
     if (file.fileType == FileType.image) {
       dimensions = await getImageHeightAndWith(imagePath: localPath);
+      exifData = await tryExifFromFile(sourceFile);
     } else if (thumbnailData != null) {
       // the thumbnail null check is to ensure that we are able to generate thum
       // for video, we need to use the thumbnail data with any max width/height

From 9f1b4fc23c10943f71e4d8b73af176227d5a7c57 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 7 Feb 2025 16:09:57 +0530
Subject: [PATCH 091/796] [mob] Refactor

---
 mobile/lib/models/file/file.dart         | 47 +++++++++---------------
 mobile/lib/utils/file_uploader.dart      |  8 +++-
 mobile/lib/utils/file_uploader_util.dart | 10 ++++-
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/mobile/lib/models/file/file.dart b/mobile/lib/models/file/file.dart
index 44572632e1..705d740e82 100644
--- a/mobile/lib/models/file/file.dart
+++ b/mobile/lib/models/file/file.dart
@@ -160,6 +160,7 @@ class EnteFile {
 
   Future<Map<String, dynamic>> getMetadataForUpload(
     MediaUploadData mediaUploadData,
+    ParsedExifDateTime? exifTime,
   ) async {
     final asset = await getAsset;
     // asset can be null for files shared to app
@@ -170,36 +171,24 @@ class EnteFile {
       }
     }
     bool hasExifTime = false;
-    if ((fileType == FileType.image || fileType == FileType.video) &&
-        mediaUploadData.sourceFile != null) {
-      final exifData = await tryExifFromFile(mediaUploadData.sourceFile!);
-      if (exifData != null) {
-        if (fileType == FileType.image) {
-          final dateResult = await tryParseExifDateTime(null, exifData);
-          if (dateResult != null && dateResult.time != null) {
-            hasExifTime = true;
-            creationTime = dateResult.time!.microsecondsSinceEpoch;
-          }
-          mediaUploadData.isPanorama = checkPanoramaFromEXIF(null, exifData);
-
-          if (mediaUploadData.isPanorama != true) {
-            try {
-              final xmpData = await getXmp(mediaUploadData.sourceFile!);
-              mediaUploadData.isPanorama = checkPanoramaFromXMP(xmpData);
-            } catch (_) {}
-
-            mediaUploadData.isPanorama ??= false;
-          }
-        }
-        if (Platform.isAndroid) {
-          //Fix for missing location data in lower android versions.
-          final Location? exifLocation = locationFromExif(exifData);
-          if (Location.isValidLocation(exifLocation)) {
-            location = exifLocation;
-          }
-        }
-      }
+    if (exifTime != null && exifTime.time != null) {
+      hasExifTime = true;
+      creationTime = exifTime.time!.microsecondsSinceEpoch;
     }
+    if (mediaUploadData.exifData != null) {
+      mediaUploadData.isPanorama =
+          checkPanoramaFromEXIF(null, mediaUploadData.exifData);
+    }
+    if (mediaUploadData.isPanorama != true &&
+        fileType == FileType.image &&
+        mediaUploadData.sourceFile != null) {
+      try {
+        final xmpData = await getXmp(mediaUploadData.sourceFile!);
+        mediaUploadData.isPanorama = checkPanoramaFromXMP(xmpData);
+      } catch (_) {}
+      mediaUploadData.isPanorama ??= false;
+    }
+
     // Try to get the timestamp from fileName. In case of iOS, file names are
     // generic IMG_XXXX, so only parse it on Android devices
     if (!hasExifTime && Platform.isAndroid && title != null) {
diff --git a/mobile/lib/utils/file_uploader.dart b/mobile/lib/utils/file_uploader.dart
index 5d47f159af..8f6dbe2e1b 100644
--- a/mobile/lib/utils/file_uploader.dart
+++ b/mobile/lib/utils/file_uploader.dart
@@ -41,6 +41,7 @@ import 'package:photos/services/sync_service.dart';
 import "package:photos/services/user_service.dart";
 import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/data_util.dart';
+import "package:photos/utils/exif_util.dart";
 import "package:photos/utils/file_key.dart";
 import 'package:photos/utils/file_uploader_util.dart';
 import "package:photos/utils/file_util.dart";
@@ -728,8 +729,13 @@ class FileUploader {
           encThumbSize,
         );
       }
+      final ParsedExifDateTime? exifTime = await tryParseExifDateTime(
+        null,
+        mediaUploadData.exifData,
+      );
+      final metadata =
+          await file.getMetadataForUpload(mediaUploadData, exifTime);
 
-      final metadata = await file.getMetadataForUpload(mediaUploadData);
       final encryptedMetadataResult = await CryptoUtil.encryptChaCha(
         utf8.encode(jsonEncode(metadata)),
         fileAttributes.key!,
diff --git a/mobile/lib/utils/file_uploader_util.dart b/mobile/lib/utils/file_uploader_util.dart
index 63764a3066..4c9abab322 100644
--- a/mobile/lib/utils/file_uploader_util.dart
+++ b/mobile/lib/utils/file_uploader_util.dart
@@ -130,7 +130,7 @@ Future<MediaUploadData> _getMediaUploadDataFromAssetFile(
     exifData = await tryExifFromFile(sourceFile);
   }
   // h4ck to fetch location data if missing (thank you Android Q+) lazily only during uploads
-  await _decorateEnteFileData(file, asset, sourceFile);
+  await _decorateEnteFileData(file, asset, sourceFile, exifData);
   fileHash = CryptoUtil.bin2base64(await CryptoUtil.getHash(sourceFile));
 
   if (file.fileType == FileType.livePhoto && Platform.isIOS) {
@@ -299,6 +299,7 @@ Future<void> _decorateEnteFileData(
   EnteFile file,
   AssetEntity asset,
   File sourceFile,
+  Map<String, IfdTag>? exifData,
 ) async {
   // h4ck to fetch location data if missing (thank you Android Q+) lazily only during uploads
   if (file.location == null ||
@@ -313,6 +314,13 @@ Future<void> _decorateEnteFileData(
       file.location = props.location;
     }
   }
+  if (Platform.isAndroid && exifData != null) {
+    //Fix for missing location data in lower android versions.
+    final Location? exifLocation = locationFromExif(exifData);
+    if (Location.isValidLocation(exifLocation)) {
+      file.location = exifLocation;
+    }
+  }
   if (file.title == null || file.title!.isEmpty) {
     _logger.warning("Title was missing ${file.tag}");
     file.title = await asset.titleAsync;

From bf89a0ca9e5df7350b99ac6af74015519f02f6a7 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 7 Feb 2025 16:32:02 +0530
Subject: [PATCH 092/796] [mob] Fill dateTime and offsetTime during upload

---
 mobile/lib/utils/file_uploader.dart | 45 +++++++++++++++++++----------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/mobile/lib/utils/file_uploader.dart b/mobile/lib/utils/file_uploader.dart
index 8f6dbe2e1b..e36779ead1 100644
--- a/mobile/lib/utils/file_uploader.dart
+++ b/mobile/lib/utils/file_uploader.dart
@@ -777,22 +777,9 @@ class FileUploader {
             CryptoUtil.bin2base64(encryptedFileKeyData.encryptedData!);
         final keyDecryptionNonce =
             CryptoUtil.bin2base64(encryptedFileKeyData.nonce!);
-        final Map<String, dynamic> pubMetadata = {};
+        final Map<String, dynamic> pubMetadata =
+            _buildPublicMagicData(mediaUploadData, exifTime);
         MetadataRequest? pubMetadataRequest;
-        if ((mediaUploadData.height ?? 0) != 0 &&
-            (mediaUploadData.width ?? 0) != 0) {
-          pubMetadata[heightKey] = mediaUploadData.height;
-          pubMetadata[widthKey] = mediaUploadData.width;
-          pubMetadata[mediaTypeKey] =
-              mediaUploadData.isPanorama == true ? 1 : 0;
-        }
-        if (mediaUploadData.motionPhotoStartIndex != null) {
-          pubMetadata[motionVideoIndexKey] =
-              mediaUploadData.motionPhotoStartIndex;
-        }
-        if (mediaUploadData.thumbnail == null) {
-          pubMetadata[noThumbKey] = true;
-        }
         if (pubMetadata.isNotEmpty) {
           pubMetadataRequest = await getPubMetadataRequest(
             file,
@@ -874,6 +861,34 @@ class FileUploader {
     }
   }
 
+  Map<String, dynamic> _buildPublicMagicData(
+    MediaUploadData mediaUploadData,
+    ParsedExifDateTime? exifTime,
+  ) {
+    final Map<String, dynamic> pubMetadata = {};
+    if ((mediaUploadData.height ?? 0) != 0 &&
+        (mediaUploadData.width ?? 0) != 0) {
+      pubMetadata[heightKey] = mediaUploadData.height;
+      pubMetadata[widthKey] = mediaUploadData.width;
+      pubMetadata[mediaTypeKey] = mediaUploadData.isPanorama == true ? 1 : 0;
+    }
+    if (mediaUploadData.motionPhotoStartIndex != null) {
+      pubMetadata[motionVideoIndexKey] = mediaUploadData.motionPhotoStartIndex;
+    }
+    if (mediaUploadData.thumbnail == null) {
+      pubMetadata[noThumbKey] = true;
+    }
+    if (exifTime != null) {
+      if (exifTime.dateTime != null) {
+        pubMetadata[dateTimeKey] = exifTime.dateTime;
+      }
+      if (exifTime.offsetTime != null) {
+        pubMetadata[offsetTimeKey] = exifTime.offsetTime;
+      }
+    }
+    return pubMetadata;
+  }
+
   bool isPutOrUpdateFileError(Object e) {
     if (e is DioException) {
       return e.requestOptions.path.contains("/files") ||

From d7ee9615b7b01bd0a3615d11737860d4ebc71f7e Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 10 Feb 2025 11:34:45 +0530
Subject: [PATCH 093/796] [mob] Fix lint & missing exif for files shared to
 ente

---
 mobile/lib/utils/file_uploader_util.dart | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/utils/file_uploader_util.dart b/mobile/lib/utils/file_uploader_util.dart
index 4c9abab322..6f37236b8e 100644
--- a/mobile/lib/utils/file_uploader_util.dart
+++ b/mobile/lib/utils/file_uploader_util.dart
@@ -354,7 +354,9 @@ Future<MetadataRequest> getPubMetadataRequest(
 }
 
 Future<MediaUploadData> _getMediaUploadDataFromAppCache(
-    EnteFile file, bool parseExif) async {
+  EnteFile file,
+  bool parseExif,
+) async {
   File sourceFile;
   Uint8List? thumbnailData;
   Map<String, IfdTag>? exifData;
@@ -394,6 +396,7 @@ Future<MediaUploadData> _getMediaUploadDataFromAppCache(
       FileHashData(fileHash),
       height: dimensions?['height'],
       width: dimensions?['width'],
+      exifData: exifData,
     );
   } catch (e, s) {
     _logger.warning("failed to generate thumbnail", e, s);

From 016a47689529311a63b9ed7a474dc7510a9be7a4 Mon Sep 17 00:00:00 2001
From: Yannick <yannick.b443@gmail.com>
Date: Tue, 11 Feb 2025 16:58:19 +0100
Subject: [PATCH 094/796] [auth] Add icon for Ankama

---
 auth/assets/custom-icons/_data/custom-icons.json | 4 ++++
 auth/assets/custom-icons/icons/ankama.svg        | 5 +++++
 2 files changed, 9 insertions(+)
 create mode 100644 auth/assets/custom-icons/icons/ankama.svg

diff --git a/auth/assets/custom-icons/_data/custom-icons.json b/auth/assets/custom-icons/_data/custom-icons.json
index 702c0dcd9e..62420cf67c 100644
--- a/auth/assets/custom-icons/_data/custom-icons.json
+++ b/auth/assets/custom-icons/_data/custom-icons.json
@@ -35,6 +35,10 @@
     {
       "title": "Amazon"
     },
+    {
+      "title": "Ankama",
+      "slug": "ankama"
+    },
     {
       "title": "Anycoin Direct",
       "slug": "anycoindirect"
diff --git a/auth/assets/custom-icons/icons/ankama.svg b/auth/assets/custom-icons/icons/ankama.svg
new file mode 100644
index 0000000000..5e21c7c4e8
--- /dev/null
+++ b/auth/assets/custom-icons/icons/ankama.svg
@@ -0,0 +1,5 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 720 720" width="720" height="720">
+	<title>ankama</title>
+	<path class="s0" d="m572.3 253.3c-0.3-1.4-0.5-3-1.1-4.4-15.1-46-59.7-76.2-107.9-71.5-31.2 3-55.6 18.9-73.4 44.7-3.8 5.7-7.1 12-10.1 18.4-9.4 19.5-19.5 38.7-24.7 59.7-0.5 1.6-1.1 3.5-1.9 4.9-2.5 4.6-5.5 6.3-10.1 4.1-11.7-5.7-23.8-5.2-36.1-4.4-20.3 1.1-37.9-5.7-52.9-19.5-36.1-33.1-35.3-91 1.9-123 26.8-23.3 43.3-52.1 49.3-86.8 3-16.5 3.3-33.4 0-49.9-0.5-2.7-0.8-5.5-1.4-8.7 7.4-1.4 14.3 0 20.8 2.2 42.8 12.4 69.3 40.6 81.6 82.7 0.5 2.2 1.1 4.4 1.6 6.8 0.8 3 2.7 4.9 5.7 5.5 3.3 0.5 6.3-0.5 7.9-3.5 3-6.3 5.7-12.7 8.2-19.2 3.3-9.7 3.8-10.5 14.3-10.6 58.3-0.8 111.7 15.4 159.4 49 60.5 42.9 98.4 101.4 115.7 173.4 0.8 3.5 0.8 7.6 0.5 11.6-4.6 68-26.8 129.6-68.8 183.5-49 63.1-112.4 104.4-190.7 121.4-72.6 15.8-141.7 4.9-207.1-30.1-1.4-0.8-2.7-1.6-3.8-2.5-0.3 0-0.5-0.8-1.6-2.2 8.7 3 17 5.5 24.7 8.6 13.9 5.7 28.5 8.7 43.6 8.6 14.3 0 28.2 0.8 42.5 0 63.9-3.8 119.5-27.4 166.2-70.7 23.6-21.9 32.8-50.7 30.7-82.4-1.9-32.3-16.5-58.6-42.2-78.3-18.9-14.6-32-33.1-38-56.4-4.1-15.8-4.6-32-0.8-48.2 5.7-24.7 27.7-41.7 52.3-40.6 17 0.8 29.6 9 39.5 22.5 1.4 1.9 2.7 4.1 4.1 6.3 0.5 0 0.8-0.5 1.4-0.8l0.8 0.3v-0.5zm-263.5-55.1c-14.7 0-26.3 12.4-26.3 27.7 0 15.3 11.6 27.4 26.6 27.4 15 0 26-12.4 26-27.1 0-14.7-12-27.9-26.3-27.9v-0.2z"/>
+	<path class="s0" d="m168.2 314.5c7.4 1.6 14.7 3.3 22.5 4.9 10.9 2.2 14.3 6.8 12 18.1-1.6 8.2-3 16.2-4.9 24.1-0.8 3.5 0 5.7 2.5 8.2 22.8 23.6 50.1 38.4 83.8 43.6-2.2-1.4-3-2.2-4.1-2.7-19.5-10.1-27.7-25.2-25.2-46.6 1.1-9.8 0-19.2-6-27.4-3.8-5.5-9-9.7-13.9-14.3-1.6-1.6-3.8-2.5-6-4.1 5.2-3.3 10.5-3.3 15.4-3 7.4 0.3 14.7 1.4 22.2 3 11.6 2.5 21.7 8.2 30.4 16.2 6.5 6 12.4 12.4 18.7 18.4 13.9 13.6 25.2 12.8 37.2-2.7 7.6-9.8 12.4-21.4 15.8-33.1 3.8-12.7 8.2-24.9 15.4-36.1 7.4-11.6 16.5-21.7 27.4-30.1 9.7-7.4 19.7-6.8 30.7-3.3v9.7c-1.1 27.1 5.2 52.6 19.5 75.9 1.1 1.9 2.2 4.1 3.5 6 4.1 6.3 3.3 12-0.5 18.1-5.5 8.7-13.5 13.2-23.8 13.5h-6.3c-12.7 0-23.3 8.2-26.8 20.6-3 10.9 1.9 23.3 11.7 29.6 10.9 6.8 24.1 5.7 33.4-3 10.1-9.8 16.5-21.7 18.9-35.7 0.3-1.9 0.8-4.1 1.1-6 17.3-0.3 39.8 16.6 48.2 37.2 10.1 24.1 6.3 46.6-10.1 68.8-0.8-5.2-1.4-9.4-2.2-12.8-2.2-9.7-8.6-15.7-18.1-17.7-6.8-1.6-9.8 0-13.6 5.7-1.9 3-3.5 6.3-5.2 9.7-2.5 4.9-4.6 9.8-7.1 14.6-13.6 27.1-34.9 45.8-63.2 55.6-27.1 9.7-55.2 13.2-83.5 10.1-16.5-1.6-29.3-10.5-39.8-23.6 1.9-1.4 3.3-2.7 4.9-3.8 7.4-5.5 12.8-12.7 16.6-20.8 1.1-2.2 1.6-4.9 1.9-7.4 0.5-5.2-2.7-9.4-7.6-9.8-4.6-0.5-8.7 2.5-10.1 7.6-0.8 3.3-1.1 6.5-2.5 9.7-3.8 7.1-9.7 12.8-16.5 17-7.4 4.4-14.6 3.8-20-1.4-5.5-5.5-6-11.7-1.9-19.7 0.3-0.5 0.5-1.4 1.4-3-2.5 1.1-4.1 1.4-5.5 2.2-17.7 10.6-25.8 31.5-19.2 51.5 18.7 56.7-6 119.5-54 151-3.3 2.2-7.1 4.1-11.6 6.8 0-3-0.5-5.2-0.5-7.4-2.5-57.8-30.1-98.9-82.4-122.8-32.8-14.7-53.7-39.5-62.1-74-12.4-50.1 13.9-102.2 61.2-122.8 1.9-0.8 4.1-1.4 7.6-2.7-15.1 28.8-18.7 57.2-9.4 86.8 5.5 17.3 14.7 32 29 45.5 0.3-12.4-0.8-23.6 7.6-33.4 2.7 6.3 5.5 12 8.2 17.7 4.9 10.9 12.7 19.5 23.3 24.9 12 6.3 24.1 6.8 36.5 1.1 8.6-3.8 15.8-9.4 22.2-16.2 8.6-9 8.6-24.9 0.3-35.7-5.5-7.1-8.6-14.7-7.4-23.6 1.9-15.4 15.1-26.8 32-28.2 4.6-0.3 9.4 0 13.6 0.5 4.1 0.8 8.2 2.5 12.7 3.3-3.5-3.8-7.9-6.5-12.7-8.2-8.2-2.7-16.6-3.3-25.2-1.6-14.7 3.3-24.9 16.2-26.3 33.4-0.5 6.3 0 12.8 1.1 19.2 3 16.5-0.8 30.4-13.2 42.8-1.9-1.6-3.8-2.7-5.7-4.4-43.9-37.6-69.6-84.6-75.6-142.2-10.1-95.9 42.5-184.9 130.9-223 28.5-12.4 46-33.8 53.4-63.9 0.3-1.4 0.8-2.7 1.9-3.8 1.9 10.1 1.4 20.3-1.1 30.1-6 24.1-19.5 42.8-41.4 55.3-21.4 12.4-38.4 29-51.5 50.1-2.5 4.1-2.7 7.1 0 10.9 2.7 3.5 5.2 7.6 7.6 11.6 4.4 7.4 3 13.9-4.1 18.9-6.3 4.4-13.2 8.2-19.5 12.7-1.6 1.1-3.5 3.3-3.8 5.2-1.6 18.7-0.5 36.9 5.5 55.3l1.4-0.3-0.2-0.2zm192.8 132c14.3 0 25.8-11.3 25.5-25.2 0-13.6-12-25.8-25.5-25.8-13.5 0-25.2 11.3-25.5 25.5 0 14.3 11.3 25.5 25.2 25.5z"/>
+</svg>
\ No newline at end of file

From b933a893362f504959954eeeab0066a471e3a900 Mon Sep 17 00:00:00 2001
From: Yannick <yannick.b443@gmail.com>
Date: Tue, 11 Feb 2025 18:32:40 +0100
Subject: [PATCH 095/796] [auth] Add icon for Seafile

---
 auth/assets/custom-icons/_data/custom-icons.json |  4 ++++
 auth/assets/custom-icons/icons/seafile.svg       | 13 +++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 auth/assets/custom-icons/icons/seafile.svg

diff --git a/auth/assets/custom-icons/_data/custom-icons.json b/auth/assets/custom-icons/_data/custom-icons.json
index 62420cf67c..5c4c589815 100644
--- a/auth/assets/custom-icons/_data/custom-icons.json
+++ b/auth/assets/custom-icons/_data/custom-icons.json
@@ -905,6 +905,10 @@
     {
       "title": "Samsung"
     },
+    {
+      "title": "Seafile",
+      "slug": "seafile"
+    },
     {
       "title": "Sendgrid"
     },
diff --git a/auth/assets/custom-icons/icons/seafile.svg b/auth/assets/custom-icons/icons/seafile.svg
new file mode 100644
index 0000000000..0794ace85e
--- /dev/null
+++ b/auth/assets/custom-icons/icons/seafile.svg
@@ -0,0 +1,13 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 180 120" width="180" height="120">
+	<title>seafile</title>
+	<defs>
+		<linearGradient id="g1" x2="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,114.369,-177.525,0,89.989,2.834)">
+			<stop offset="0" stop-color="#fad956"/>
+			<stop offset="1" stop-color="#ffa10f"/>
+		</linearGradient>
+	</defs>
+	<style>
+		.s0 { fill: url(#g1) } 
+	</style>
+	<path class="s0" d="m1.2 52.8c0-3 2.4-5.4 5.4-5.4 1.4 0 2.7 0.6 3.6 1.5q0-0.7 0-1.4c0-9.9 8-17.9 17.9-17.9 2.5 0 4.9 0.5 7.1 1.5q0-0.8 0-1.5c0-14.8 12-26.8 26.8-26.8 14.7 0 26.6 11.9 26.8 26.6-4.8 4.2-8.7 9.6-11.2 15.7-4.8-3-10.4-4.8-16.5-4.8-12.4 0-23.2 7.1-28.3 17.8h-19.1-7.1c-3 0-5.4-2.4-5.4-5.3zm141.2-16c-6.6-6.7-15.8-10.8-25.9-10.8-18.5 0-33.8 13.7-36.3 31.5-4.5-6.1-11.8-10-20-10-13.8 0-25 11.2-25 25 0 4 0.9 7.8 2.6 11.2-8.7 1.7-15.1 8.5-15.1 16.5 0 9.4 8.8 17 19.7 17 4.7 0 9.1-1.5 12.6-4l40.2-39.5c4.4-4.1 10.3-6.6 16.8-6.6 13.6 0 24.7 10.9 25.1 24.4q0 0-0.1-0.1c0.2 4-1.8 8.1-5.7 10.3-5.3 3.1-12 1.4-15-3.7-2.9-5.1-1-11.7 4.4-14.8q1.9-1.1 3.9-1.4-1.8-0.4-3.6-0.4c-9.9 0-17.9 8-17.9 17.9 0 9.9 8 17.9 17.9 17.9q0.6 0 1.3-0.1l0.5-0.1h35.1v0.2c10.7-0.5 20.9-10.4 20.9-22.5 0-12.3-10.6-22.4-22.9-22.4q-0.1 0-0.1 0c-2 3.6-4.4 5.7-7.1 7.9 2.8-5.2 4.5-11.2 4.5-17.6-0.1-10.1-4.2-19.2-10.8-25.8z"/>
+</svg>
\ No newline at end of file

From f003b4f8ace16ebaf0032974c51e79ee3b79f42b Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 06:51:53 +0530
Subject: [PATCH 096/796] [desktop] Update version and link

---
 desktop/build/io.ente.photos.appdata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/desktop/build/io.ente.photos.appdata.xml b/desktop/build/io.ente.photos.appdata.xml
index 40ff45176d..591f51232f 100644
--- a/desktop/build/io.ente.photos.appdata.xml
+++ b/desktop/build/io.ente.photos.appdata.xml
@@ -38,8 +38,8 @@
   </branding>
 
   <releases>
-    <release version="1.7.8" date="2025-01-13">
-      <url type="details">https://github.com/ente-io/photos-desktop/releases/tag/v1.7.8</url>
+    <release version="1.7" date="2025-01-13">
+      <url type="details">https://github.com/ente-io/photos-desktop/releases</url>
     </release>
   </releases>
 </component>

From 5f5632aac515df20bba875a1a50c07cd8228ed83 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 07:22:03 +0530
Subject: [PATCH 097/796] [web] Allow marking certain dialogs as critical /
 non-replacable

---
 web/packages/base/components/MiniDialog.tsx   | 16 ++++++++++++++++
 web/packages/base/components/utils/dialog.tsx | 17 +++++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/web/packages/base/components/MiniDialog.tsx b/web/packages/base/components/MiniDialog.tsx
index c9ffd04692..4da3333613 100644
--- a/web/packages/base/components/MiniDialog.tsx
+++ b/web/packages/base/components/MiniDialog.tsx
@@ -43,6 +43,22 @@ export interface MiniDialogAttributes {
      * actions.
      */
     nonClosable?: boolean;
+    /**
+     * If `true`, then the dialog cannot be replaced by another dialog while it
+     * is being displayed.
+     *
+     * The app uses a single component to render mini dialogs, and it is
+     * possible that new dialog contents might preempt and replace contents in a
+     * dialog that is already being shown. Usually if such preemption is
+     * expected then both dialogs use differing mechanisms, but it can happen in
+     * rare unforeseen cases.
+     *
+     * This flag allow a dialog to indicate that it should not be preempted, as
+     * it contains some critical information.
+     *
+     * Use this flag sparingly.
+     */
+    disablePreemption?: boolean;
     /**
      * Customize the primary action button shown in the dialog.
      *
diff --git a/web/packages/base/components/utils/dialog.tsx b/web/packages/base/components/utils/dialog.tsx
index 0232b6fba3..0a4237a8a0 100644
--- a/web/packages/base/components/utils/dialog.tsx
+++ b/web/packages/base/components/utils/dialog.tsx
@@ -15,10 +15,19 @@ export const useAttributedMiniDialog = () => {
 
     const [open, setOpen] = useState(false);
 
-    const showMiniDialog = useCallback((attributes: MiniDialogAttributes) => {
-        setAttributes(attributes);
-        setOpen(true);
-    }, []);
+    const showMiniDialog = useCallback(
+        (newAttributes: MiniDialogAttributes) => {
+            setAttributes((attributes) => {
+                if (attributes?.disablePreemption) {
+                    // Don't replace a dialog that set the disablePreemption flag.
+                    return attributes;
+                }
+                return newAttributes;
+            });
+            setOpen(true);
+        },
+        [],
+    );
 
     const handleClose = useCallback(() => setOpen(false), []);
 

From ee8ce506490814fdab5093f4192a40eb67f1ab0c Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 07:23:32 +0530
Subject: [PATCH 098/796] Rename

---
 web/packages/base/components/MiniDialog.tsx   |  2 +-
 web/packages/base/components/utils/dialog.tsx | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/web/packages/base/components/MiniDialog.tsx b/web/packages/base/components/MiniDialog.tsx
index 4da3333613..b6b920126f 100644
--- a/web/packages/base/components/MiniDialog.tsx
+++ b/web/packages/base/components/MiniDialog.tsx
@@ -58,7 +58,7 @@ export interface MiniDialogAttributes {
      *
      * Use this flag sparingly.
      */
-    disablePreemption?: boolean;
+    nonReplaceable?: boolean;
     /**
      * Customize the primary action button shown in the dialog.
      *
diff --git a/web/packages/base/components/utils/dialog.tsx b/web/packages/base/components/utils/dialog.tsx
index 0a4237a8a0..04cdc48711 100644
--- a/web/packages/base/components/utils/dialog.tsx
+++ b/web/packages/base/components/utils/dialog.tsx
@@ -17,13 +17,9 @@ export const useAttributedMiniDialog = () => {
 
     const showMiniDialog = useCallback(
         (newAttributes: MiniDialogAttributes) => {
-            setAttributes((attributes) => {
-                if (attributes?.disablePreemption) {
-                    // Don't replace a dialog that set the disablePreemption flag.
-                    return attributes;
-                }
-                return newAttributes;
-            });
+            setAttributes((attributes) =>
+                attributes?.nonReplaceable ? attributes : newAttributes,
+            );
             setOpen(true);
         },
         [],

From 244599ba674696f12bc50c33ac8f68e54c001d86 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 07:24:02 +0530
Subject: [PATCH 099/796] Use

---
 web/packages/accounts/components/utils/dialog.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/packages/accounts/components/utils/dialog.ts b/web/packages/accounts/components/utils/dialog.ts
index c17c171219..75036947a2 100644
--- a/web/packages/accounts/components/utils/dialog.ts
+++ b/web/packages/accounts/components/utils/dialog.ts
@@ -16,6 +16,7 @@ export const sessionExpiredDialogAttributes = (
     title: t("session_expired"),
     message: t("session_expired_message"),
     nonClosable: true,
+    nonReplaceable: true,
     continue: {
         text: t("login"),
         action: onLogin,

From db308fa199f9c37dbd973b13f5983e54b9b16243 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 07:26:10 +0530
Subject: [PATCH 100/796] Fix key

---
 web/apps/photos/src/components/Sidebar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsx
index 583a9b1443..bfd0d6e8e0 100644
--- a/web/apps/photos/src/components/Sidebar.tsx
+++ b/web/apps/photos/src/components/Sidebar.tsx
@@ -576,7 +576,7 @@ const HelpSection: React.FC<Pick<SidebarProps, "closeSidebar">> = ({
         <>
             <RowButton
                 variant="secondary"
-                label={t("Help")}
+                label={t("help")}
                 onClick={showHelp}
             />
             <RowButton

From 84c00d0d31d966887e72dca5f65e3ffbbb691ae1 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 12 Feb 2025 09:03:15 +0530
Subject: [PATCH 101/796] [mob][photos] todo

---
 mobile/lib/services/search_service.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 0f2427fd6e..fb6b6f7373 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1517,7 +1517,7 @@ class SearchService {
     }
     // Otherwise, if no trips happened in the current month,
     // look for the earliest upcoming trip in another month that has 3+ trips.
-    else {
+    else { // TODO lau: make sure the same upcoming trip isn't shown multiple times over multiple months
       final sortedUpcomingMonths =
           List<int>.generate(12, (i) => ((currentMonth + i) % 12) + 1);
       checkUpcomingMonths:

From de8fb95477d2594690b3e467a375f4811e588d29 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 10:03:02 +0530
Subject: [PATCH 102/796] [desktop] Fix drag and drop

https://github.com/react-dropzone/react-dropzone/issues/1411
---
 web/apps/photos/package.json |  2 +-
 web/yarn.lock                | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/web/apps/photos/package.json b/web/apps/photos/package.json
index f8040461b7..7f72d2b0fb 100644
--- a/web/apps/photos/package.json
+++ b/web/apps/photos/package.json
@@ -24,7 +24,7 @@
         "photoswipe": "file:./thirdparty/photoswipe",
         "react": "^19.0.0",
         "react-dom": "^19.0.0",
-        "react-dropzone": "14.3.5",
+        "react-dropzone": "14.2.10",
         "react-select": "^5.10.0",
         "react-top-loading-bar": "^3.0.2",
         "react-virtualized-auto-sizer": "^1.0.25",
diff --git a/web/yarn.lock b/web/yarn.lock
index 09db23087b..519abed926 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -1367,7 +1367,7 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
-attr-accept@^2.2.4:
+attr-accept@^2.2.2:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.5.tgz#d7061d958e6d4f97bf8665c68b75851a0713ab5e"
   integrity sha512-0bDNnY/u6pPwHDMoF0FieU354oBi0a8rD9FcsLwzcGWbc8KS8KPIi7y+s13OlVY+gMWc/9xEMUgNE6Qm8ZllYQ==
@@ -2106,12 +2106,12 @@ file-entry-cache@^8.0.0:
   dependencies:
     flat-cache "^4.0.0"
 
-file-selector@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-2.1.2.tgz#fe7c7ee9e550952dfbc863d73b14dc740d7de8b4"
-  integrity sha512-QgXo+mXTe8ljeqUFaX3QVHc5osSItJ/Km+xpocx0aSqWGMSCf6qYs/VnzZgS864Pjn5iceMRFigeAV7AfTlaig==
+file-selector@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.6.0.tgz#fa0a8d9007b829504db4d07dd4de0310b65287dc"
+  integrity sha512-QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw==
   dependencies:
-    tslib "^2.7.0"
+    tslib "^2.4.0"
 
 file-type@16.5.4:
   version "16.5.4"
@@ -3275,13 +3275,13 @@ react-dom@^19.0.0:
   dependencies:
     scheduler "^0.25.0"
 
-react-dropzone@14.3.5:
-  version "14.3.5"
-  resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-14.3.5.tgz#1a8bd312c8a353ec78ef402842ccb3589c225add"
-  integrity sha512-9nDUaEEpqZLOz5v5SUcFA0CjM4vq8YbqO0WRls+EYT7+DvxUdzDPKNCPLqGfj3YL9MsniCLCD4RFA6M95V6KMQ==
+react-dropzone@14.2.10:
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-14.2.10.tgz#b8d86775c616534b44a30bd9c962044d2925c1a2"
+  integrity sha512-Y98LOCYxGO2jOFWREeKJlL7gbrHcOlTBp+9DCM1dh9XQ8+P/8ThhZT7kFb05C+bPcTXq/rixpU+5+LzwYrFLUw==
   dependencies:
-    attr-accept "^2.2.4"
-    file-selector "^2.1.0"
+    attr-accept "^2.2.2"
+    file-selector "^0.6.0"
     prop-types "^15.8.1"
 
 react-fast-compare@^2.0.1:
@@ -3929,7 +3929,7 @@ ts-api-utils@^2.0.1:
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.0.1.tgz#660729385b625b939aaa58054f45c058f33f10cd"
   integrity sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==
 
-tslib@^2.0.0, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.6.2, tslib@^2.7.0, tslib@^2.8.0:
+tslib@^2.0.0, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.6.2, tslib@^2.8.0:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==

From c1dccf438bac5879d7467211b755c7aafcb31a69 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 12 Feb 2025 10:16:46 +0530
Subject: [PATCH 103/796] [mob][photos] Simplify with BaseLocation

---
 mobile/lib/models/base_location.dart    | 51 ++++++++++++++++++++++++
 mobile/lib/services/search_service.dart | 53 ++++++++++++-------------
 2 files changed, 76 insertions(+), 28 deletions(-)
 create mode 100644 mobile/lib/models/base_location.dart

diff --git a/mobile/lib/models/base_location.dart b/mobile/lib/models/base_location.dart
new file mode 100644
index 0000000000..38b7847c64
--- /dev/null
+++ b/mobile/lib/models/base_location.dart
@@ -0,0 +1,51 @@
+import "package:photos/models/file/file.dart";
+import "package:photos/models/location/location.dart";
+
+class BaseLocation {
+  final List<EnteFile> files;
+  int? firstCreationTime;
+  int? lastCreationTime;
+  final Location location;
+  final bool isCurrentBase;
+
+  BaseLocation(
+    this.files,
+    this.location,
+    this.isCurrentBase, {
+    this.firstCreationTime,
+    this.lastCreationTime,
+  });
+
+  int averageCreationTime() {
+    if (firstCreationTime != null && lastCreationTime != null) {
+      return (firstCreationTime! + lastCreationTime!) ~/ 2;
+    }
+    final List<int> creationTimes = files
+        .where((file) => file.creationTime != null)
+        .map((file) => file.creationTime!)
+        .toList();
+    if (creationTimes.length < 2) {
+      return creationTimes.isEmpty ? 0 : creationTimes.first;
+    }
+    creationTimes.sort();
+    firstCreationTime ??= creationTimes.first;
+    lastCreationTime ??= creationTimes.last;
+    return (firstCreationTime! + lastCreationTime!) ~/ 2;
+  }
+
+  BaseLocation copyWith({
+    List<EnteFile>? files,
+    int? firstCreationTime,
+    int? lastCreationTime,
+    Location? location,
+    bool? isCurrentBase,
+  }) {
+    return BaseLocation(
+      files ?? this.files,
+      location ?? this.location,
+      isCurrentBase ?? this.isCurrentBase,
+      firstCreationTime: firstCreationTime ?? this.firstCreationTime,
+      lastCreationTime: lastCreationTime ?? this.lastCreationTime,
+    );
+  }
+}
diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index fb6b6f7373..a87e6e7be0 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -16,6 +16,7 @@ import 'package:photos/events/local_photos_updated_event.dart';
 import "package:photos/extensions/user_extension.dart";
 import "package:photos/models/api/collection/user.dart";
 import "package:photos/models/base/id.dart";
+import "package:photos/models/base_location.dart";
 import 'package:photos/models/collection/collection.dart';
 import 'package:photos/models/collection/collection_items.dart';
 import "package:photos/models/file/extensions/file_props.dart";
@@ -1207,15 +1208,15 @@ class SearchService {
     for (int i = 0; i < locationTagEntities.length; i++) {
       tagToItemsMap[locationTagEntities.elementAt(i)] = [];
     }
-    final Map<String, (List<EnteFile>, Location)> smallRadiusClusters = {};
+    final List<(List<EnteFile>, Location)> smallRadiusClusters = [];
     final Map<String, (List<EnteFile>, Location)> wideRadiusClusters = {};
     // Go through all files and cluster the ones not inside any location tag
     for (EnteFile file in allFiles) {
       if (!file.hasLocation ||
           file.uploadedFileID == null ||
           !file.isOwner ||
-          file.creationTime! > cutOffTime.microsecondsSinceEpoch ||
-          file.creationTime == null) {
+          file.creationTime == null ||
+          file.creationTime! > cutOffTime.microsecondsSinceEpoch) {
         continue;
       }
       // Check if the file is inside any location tag
@@ -1234,25 +1235,20 @@ class SearchService {
       if (!hasLocationTag) {
         // Small radius clustering for base locations
         bool foundSmallCluster = false;
-        for (final clusterID in smallRadiusClusters.keys) {
-          final clusterLocation = smallRadiusClusters[clusterID]!.$2;
+        for (final cluster in smallRadiusClusters) {
+          final clusterLocation = cluster.$2;
           if (isFileInsideLocationTag(
             clusterLocation,
             file.location!,
             0.6,
           )) {
-            smallRadiusClusters[clusterID]!.$1.add(file);
+            cluster.$1.add(file);
             foundSmallCluster = true;
             break;
           }
         }
         if (!foundSmallCluster) {
-          smallRadiusClusters[newAutoLocationID()] = (
-            [
-              file,
-            ],
-            file.location!
-          );
+          smallRadiusClusters.add(([file], file.location!));
         }
         // Wide radius clustering for trip locations
         bool foundWideCluster = false;
@@ -1280,10 +1276,10 @@ class SearchService {
     }
 
     // Identify base locations
-    final Map<String, (List<EnteFile>, Location, bool)> baseLocations = {};
-    for (final clusterID in smallRadiusClusters.keys) {
-      final files = smallRadiusClusters[clusterID]!.$1;
-      final location = smallRadiusClusters[clusterID]!.$2;
+    final List<BaseLocation> baseLocations = [];
+    for (final cluster in smallRadiusClusters) {
+      final files = cluster.$1;
+      final location = cluster.$2;
       // Check that the photos are distributed over a longer time range (3+ months)
       final creationTimes = <int>[];
       final Set<int> uniqueDays = {};
@@ -1309,12 +1305,12 @@ class SearchService {
       final daysRange = lastCreationTime.difference(firstCreationTime).inDays;
       if (uniqueDays.length < daysRange * 0.1) continue;
       // Check if it's a current or old base location
-      final bool current = lastCreationTime.isAfter(
+      final bool isCurrent = lastCreationTime.isAfter(
         DateTime.now().subtract(
           const Duration(days: 90),
         ),
       );
-      baseLocations[clusterID] = (files, location, current);
+      baseLocations.add(BaseLocation(files, location, isCurrent));
     }
 
     // Identify trip locations
@@ -1326,9 +1322,9 @@ class SearchService {
 
       // Check that it's at least 10km away from any base or tag location
       bool tooClose = false;
-      for (final baseLocation in baseLocations.values) {
+      for (final baseLocation in baseLocations) {
         if (isFileInsideLocationTag(
-          baseLocation.$2,
+          baseLocation.location,
           location,
           10.0,
         )) {
@@ -1442,20 +1438,18 @@ class SearchService {
     }
 
     // For now for testing let's just surface all base locations
-    for (final baseLocation in baseLocations.values) {
-      final files = baseLocation.$1;
-      final current = baseLocation.$3;
-      final name = "Base (${current ? 'current' : 'old'})";
+    for (final baseLocation in baseLocations) {
+      final name = "Base (${baseLocation.isCurrentBase ? 'current' : 'old'})";
       searchResults.add(
         GenericSearchResult(
           ResultType.event,
           name,
-          files,
+          baseLocation.files,
           hierarchicalSearchFilter: TopLevelGenericFilter(
             filterName: name,
             occurrence: kMostRelevantFilter,
             filterResultType: ResultType.event,
-            matchedUploadedIDs: filesToUploadedFileIDs(files),
+            matchedUploadedIDs: filesToUploadedFileIDs(baseLocation.files),
             filterIcon: Icons.event_outlined,
           ),
         ),
@@ -1512,12 +1506,15 @@ class SearchService {
             ),
           ),
         );
-        if (limit != null && searchResults.length >= limit) return searchResults;
+        if (limit != null && searchResults.length >= limit) {
+          return searchResults;
+        }
       }
     }
     // Otherwise, if no trips happened in the current month,
     // look for the earliest upcoming trip in another month that has 3+ trips.
-    else { // TODO lau: make sure the same upcoming trip isn't shown multiple times over multiple months
+    else {
+      // TODO lau: make sure the same upcoming trip isn't shown multiple times over multiple months
       final sortedUpcomingMonths =
           List<int>.generate(12, (i) => ((currentMonth + i) % 12) + 1);
       checkUpcomingMonths:

From 566364191da8dadc8029682f3f995f0003622c8a Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 12 Feb 2025 10:20:38 +0530
Subject: [PATCH 104/796] [mob][photos] Simplify

---
 mobile/lib/services/search_service.dart | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index a87e6e7be0..5b8344025f 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1209,7 +1209,7 @@ class SearchService {
       tagToItemsMap[locationTagEntities.elementAt(i)] = [];
     }
     final List<(List<EnteFile>, Location)> smallRadiusClusters = [];
-    final Map<String, (List<EnteFile>, Location)> wideRadiusClusters = {};
+    final List<(List<EnteFile>, Location)> wideRadiusClusters = [];
     // Go through all files and cluster the ones not inside any location tag
     for (EnteFile file in allFiles) {
       if (!file.hasLocation ||
@@ -1252,25 +1252,20 @@ class SearchService {
         }
         // Wide radius clustering for trip locations
         bool foundWideCluster = false;
-        for (final clusterID in wideRadiusClusters.keys) {
-          final clusterLocation = wideRadiusClusters[clusterID]!.$2;
+        for (final cluster in wideRadiusClusters) {
+          final clusterLocation = cluster.$2;
           if (isFileInsideLocationTag(
             clusterLocation,
             file.location!,
             100.0,
           )) {
-            wideRadiusClusters[clusterID]!.$1.add(file);
+            cluster.$1.add(file);
             foundWideCluster = true;
             break;
           }
         }
         if (!foundWideCluster) {
-          wideRadiusClusters[newAutoLocationID()] = (
-            [
-              file,
-            ],
-            file.location!
-          );
+          wideRadiusClusters.add(([file], file.location!));
         }
       }
     }
@@ -1316,10 +1311,9 @@ class SearchService {
     // Identify trip locations
     final Map<String, (List<EnteFile>, Location, int, int)> tripLocations = {};
     clusteredLocations:
-    for (final clusterID in wideRadiusClusters.keys) {
-      final files = wideRadiusClusters[clusterID]!.$1;
-      final location = wideRadiusClusters[clusterID]!.$2;
-
+    for (final cluster in wideRadiusClusters) {
+      final files = cluster.$1;
+      final location = cluster.$2;
       // Check that it's at least 10km away from any base or tag location
       bool tooClose = false;
       for (final baseLocation in baseLocations) {

From fe4b0ded71ef985f2af8062d7f4e04e323d47db2 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 10:54:56 +0530
Subject: [PATCH 105/796] [web] Tweak large tile gradient to work better in
 light mode

When no thumbnail is shown, e.g. for empty uncat
---
 web/packages/new/photos/components/Tiles.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/packages/new/photos/components/Tiles.tsx b/web/packages/new/photos/components/Tiles.tsx
index 5a6d88dff0..06d0ed96bc 100644
--- a/web/packages/new/photos/components/Tiles.tsx
+++ b/web/packages/new/photos/components/Tiles.tsx
@@ -201,9 +201,11 @@ export const LargeTileTextOverlay = styled(Overlay)`
     padding: 8px;
     color: white;
     background: linear-gradient(
-        0deg,
+        -10deg,
         rgba(0, 0, 0, 0.1) 0%,
-        rgba(0, 0, 0, 0.5) 86%
+        rgba(0, 0, 0, 0.2) 50%,
+        rgba(0, 0, 0, 0.4) 60%,
+        rgba(0, 0, 0, 0.6) 100%
     );
 `;
 

From b729b8f0ea0006ffaac81bb335c1124b338d6cbd Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Wed, 12 Feb 2025 11:08:19 +0530
Subject: [PATCH 106/796] [server]refactor: make code more readable with guard
 clause

---
 server/pkg/controller/family/admin.go | 45 +++++++++++++++------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/server/pkg/controller/family/admin.go b/server/pkg/controller/family/admin.go
index 45fc6c4252..e6bef578c1 100644
--- a/server/pkg/controller/family/admin.go
+++ b/server/pkg/controller/family/admin.go
@@ -208,27 +208,32 @@ func (c *Controller) ModifyMemberStorage(ctx context.Context, adminID int64, id
 		return stacktrace.Propagate(err, "couldn't get active subscription")
 	}
 
-	if adminID == *familyAdminID {
-		if id == member.ID && member.Status == "ACCEPTED" && member.Status != "SELF" {
-			// Handle if the admin user tries reducing the storage Limit
-			// and the members Usage is more than the potential storage Limit
-			memberUsage, memUsageErr := c.UsageRepo.GetUsage(member.MemberUserID)
-			if memUsageErr != nil {
-				return stacktrace.Propagate(memUsageErr, "Couldn't find members storage usage")
-			}
-			if storageLimit != nil && *storageLimit < activeSub.Storage {
-				if *storageLimit > memberUsage {
-					err := c.FamilyRepo.ModifyMemberStorage(ctx, adminID, member.ID, storageLimit)
-					if err != nil {
-						return stacktrace.Propagate(err, "Cannot Modify Members Storage")
-					}
-				} else {
-					return stacktrace.Propagate(fmt.Errorf("storage reduction not allowed"), "Cannot reduce storage, current usage is more.")
-				}
-			}
-		} else {
-			return stacktrace.Propagate(fmt.Errorf("could not modify storage"), "user is either admin or not part of family")
+	if storageLimit != nil && *storageLimit > activeSub.Storage {
+		return stacktrace.Propagate(fmt.Errorf("cannot set storage limit"), "potential storage limit is more than subscription storage")
+	}
+
+	// Handle if the admin user tries reducing the storage Limit
+	// and the members Usage is more than the potential storage Limit
+	memberUsage, memUsageErr := c.UsageRepo.GetUsage(member.MemberUserID)
+	if memUsageErr != nil {
+		return stacktrace.Propagate(memUsageErr, "Couldn't find members storage usage")
+	}
+
+	if adminID == *familyAdminID && member.IsAdmin {
+		return stacktrace.Propagate(fmt.Errorf("cannot modify storage"), "cannot modify admin storage limit")
+	}
+
+	if memberUsage > *storageLimit {
+		return stacktrace.Propagate(fmt.Errorf("storage reduction not allowed"), "Cannot reduce storage, current usage is more.")
+	}
+
+	if id == member.ID && member.Status == "ACCEPTED" {
+		err := c.FamilyRepo.ModifyMemberStorage(ctx, adminID, member.ID, storageLimit)
+		if err != nil {
+			return stacktrace.Propagate(err, "Cannot Modify Members Storage")
 		}
+	} else {
+		return stacktrace.Propagate(fmt.Errorf("could not modify storage"), "user is not a part of family")
 	}
 	return nil
 }

From 967d8c0f3b56793535fdf30a29e701bf09d463f7 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 12 Feb 2025 11:15:56 +0530
Subject: [PATCH 107/796] [mob][photos] Trip class

---
 mobile/lib/models/trip_memory.dart      | 32 +++++++++
 mobile/lib/services/search_service.dart | 89 +++++++++++++++----------
 2 files changed, 85 insertions(+), 36 deletions(-)
 create mode 100644 mobile/lib/models/trip_memory.dart

diff --git a/mobile/lib/models/trip_memory.dart b/mobile/lib/models/trip_memory.dart
new file mode 100644
index 0000000000..fb6aa044fe
--- /dev/null
+++ b/mobile/lib/models/trip_memory.dart
@@ -0,0 +1,32 @@
+import "package:photos/models/file/file.dart";
+import "package:photos/models/location/location.dart";
+
+class TripMemory {
+  final List<EnteFile> files;
+  final Location location;
+  final int firstCreationTime;
+  final int lastCreationTime;
+
+  TripMemory(
+    this.files,
+    this.location,
+    this.firstCreationTime,
+    this.lastCreationTime,
+  );
+
+  int get averageCreationTime => (firstCreationTime + lastCreationTime) ~/ 2;
+
+  TripMemory copyWith({
+    List<EnteFile>? files,
+    Location? location,
+    int? firstCreationTime,
+    int? lastCreationTime,
+  }) {
+    return TripMemory(
+      files ?? this.files,
+      location ?? this.location,
+      firstCreationTime ?? this.firstCreationTime,
+      lastCreationTime ?? this.lastCreationTime,
+    );
+  }
+}
diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 5b8344025f..16743faf7b 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -37,6 +37,7 @@ import "package:photos/models/search/hierarchical/magic_filter.dart";
 import "package:photos/models/search/hierarchical/top_level_generic_filter.dart";
 import "package:photos/models/search/search_constants.dart";
 import "package:photos/models/search/search_types.dart";
+import "package:photos/models/trip_memory.dart";
 import "package:photos/service_locator.dart";
 import 'package:photos/services/collections_service.dart';
 import "package:photos/services/filter/db_filters.dart";
@@ -1309,7 +1310,7 @@ class SearchService {
     }
 
     // Identify trip locations
-    final Map<String, (List<EnteFile>, Location, int, int)> tripLocations = {};
+    final Map<String, TripMemory> tripLocations = {};
     clusteredLocations:
     for (final cluster in wideRadiusClusters) {
       final files = cluster.$1;
@@ -1364,8 +1365,12 @@ class SearchService {
 
           // Check if current block is a valid trip (2-30 days)
           if (blockDuration >= 2 && blockDuration <= 30) {
-            tripLocations[newAutoLocationID()] =
-                (List.from(currentBlockFiles), location, blockStart, lastTime);
+            tripLocations[newAutoLocationID()] = TripMemory(
+              List.from(currentBlockFiles),
+              location,
+              blockStart,
+              lastTime,
+            );
           }
 
           // Start new block
@@ -1382,37 +1387,42 @@ class SearchService {
           .difference(DateTime.fromMicrosecondsSinceEpoch(blockStart))
           .inDays;
       if (lastBlockDuration >= 2 && lastBlockDuration <= 30) {
-        tripLocations[newAutoLocationID()] =
-            (List.from(currentBlockFiles), location, blockStart, lastTime);
+        tripLocations[newAutoLocationID()] = TripMemory(
+          List.from(currentBlockFiles),
+          location,
+          blockStart,
+          lastTime,
+        );
       }
     }
 
     // Check if any trip locations should be merged
-    final Map<String, (List<EnteFile>, int, int)> mergedTrips = {};
+    final Map<String, TripMemory> mergedTrips = {};
     for (final tripID in tripLocations.keys) {
       final trip = tripLocations[tripID]!;
       final tripFirstTime = DateTime.fromMicrosecondsSinceEpoch(
-        trip.$3,
+        trip.firstCreationTime,
       );
       final tripLastTime = DateTime.fromMicrosecondsSinceEpoch(
-        trip.$4,
+        trip.lastCreationTime,
       );
       bool merged = false;
       for (final otherTripID in mergedTrips.keys) {
         final otherTrip = mergedTrips[otherTripID]!;
         final otherTripFirstTime =
-            DateTime.fromMicrosecondsSinceEpoch(otherTrip.$2);
+            DateTime.fromMicrosecondsSinceEpoch(otherTrip.firstCreationTime);
         final otherTripLastTime =
-            DateTime.fromMicrosecondsSinceEpoch(otherTrip.$3);
+            DateTime.fromMicrosecondsSinceEpoch(otherTrip.lastCreationTime);
         if (tripFirstTime
                 .isBefore(otherTripLastTime.add(const Duration(days: 3))) &&
             tripLastTime.isAfter(
               otherTripFirstTime.subtract(const Duration(days: 3)),
             )) {
-          mergedTrips[otherTripID] = (
-            otherTrip.$1 + trip.$1,
-            min(otherTrip.$2, trip.$3),
-            max(otherTrip.$3, trip.$4),
+          mergedTrips[otherTripID] = TripMemory(
+            otherTrip.files + trip.files,
+            otherTrip.location,
+            min(otherTrip.firstCreationTime, trip.firstCreationTime),
+            max(otherTrip.lastCreationTime, trip.lastCreationTime),
           );
           _logger.finest('Merged two trip locations');
           merged = true;
@@ -1420,12 +1430,17 @@ class SearchService {
         }
       }
       if (merged) continue;
-      mergedTrips[tripID] = (trip.$1, trip.$3, trip.$4);
+      mergedTrips[tripID] = TripMemory(
+        trip.files,
+        trip.location,
+        trip.firstCreationTime,
+        trip.lastCreationTime,
+      );
     }
 
     // Remove too small trips
     for (final tripID in mergedTrips.keys.toList()) {
-      final filesAmount = mergedTrips[tripID]!.$1.length;
+      final filesAmount = mergedTrips[tripID]!.files.length;
       if (filesAmount < 20) {
         mergedTrips.remove(tripID);
       }
@@ -1452,11 +1467,10 @@ class SearchService {
 
     // For now we surface the two most recent trips of current month, and if none, the earliest upcoming redundant trip
     // Group the trips per month and then year
-    final Map<int, Map<int, List<(List<EnteFile>, int, int)>>>
-        tripsByMonthYear = {};
+    final Map<int, Map<int, List<TripMemory>>> tripsByMonthYear = {};
     for (final trip in mergedTrips.values) {
-      final int avgMicros = (trip.$2 + trip.$3) ~/ 2;
-      final tripDate = DateTime.fromMicrosecondsSinceEpoch(avgMicros);
+      final tripDate =
+          DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime);
       tripsByMonthYear
           .putIfAbsent(tripDate.month, () => {})
           .putIfAbsent(tripDate.year, () => [])
@@ -1464,28 +1478,29 @@ class SearchService {
     }
 
     // Flatten trips for the current month and annotate with their average date.
-    final List<(List<EnteFile>, int, int, DateTime)> currentMonthTrips = [];
+    final List<TripMemory> currentMonthTrips = [];
     if (tripsByMonthYear.containsKey(currentMonth)) {
       for (final trips in tripsByMonthYear[currentMonth]!.values) {
         for (final trip in trips) {
-          final int avgMicros = (trip.$2 + trip.$3) ~/ 2;
-          final tripDate = DateTime.fromMicrosecondsSinceEpoch(avgMicros);
-          currentMonthTrips.add((trip.$1, trip.$2, trip.$3, tripDate));
+          currentMonthTrips.add(trip);
         }
       }
     }
 
     // If there are past trips this month, show the one or two most recent ones.
     if (currentMonthTrips.isNotEmpty) {
-      currentMonthTrips.sort((a, b) => b.$4.compareTo(a.$4));
+      currentMonthTrips.sort(
+        (a, b) => b.averageCreationTime.compareTo(a.averageCreationTime),
+      );
       final tripsToShow = currentMonthTrips.take(2);
       for (final trip in tripsToShow) {
-        final year = trip.$4.year;
+        final year =
+            DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime).year;
         String name = "Trip in $year!";
         if (year == currentTime.year - 1) {
           name = "Last year's trip!";
         }
-        final photoSelection = await _bestSelection(trip.$1);
+        final photoSelection = await _bestSelection(trip.files);
         searchResults.add(
           GenericSearchResult(
             ResultType.event,
@@ -1495,7 +1510,7 @@ class SearchService {
               filterName: name,
               occurrence: kMostRelevantFilter,
               filterResultType: ResultType.event,
-              matchedUploadedIDs: filesToUploadedFileIDs(trip.$1),
+              matchedUploadedIDs: filesToUploadedFileIDs(photoSelection),
               filterIcon: Icons.event_outlined,
             ),
           ),
@@ -1514,24 +1529,26 @@ class SearchService {
       checkUpcomingMonths:
       for (final month in sortedUpcomingMonths) {
         if (tripsByMonthYear.containsKey(month)) {
-          final List<(List<EnteFile>, int, int, DateTime)> thatMonthTrips = [];
+          final List<TripMemory> thatMonthTrips = [];
           for (final trips in tripsByMonthYear[month]!.values) {
             for (final trip in trips) {
-              final int avgMicros = (trip.$2 + trip.$3) ~/ 2;
-              final tripDate = DateTime.fromMicrosecondsSinceEpoch(avgMicros);
-              thatMonthTrips.add((trip.$1, trip.$2, trip.$3, tripDate));
+              thatMonthTrips.add(trip);
             }
           }
           if (thatMonthTrips.length >= 3) {
             // take and use the third earliest trip
-            thatMonthTrips.sort((a, b) => a.$4.compareTo(b.$4));
+            thatMonthTrips.sort(
+              (a, b) => a.averageCreationTime.compareTo(b.averageCreationTime),
+            );
             final trip = thatMonthTrips[2];
-            final year = trip.$4.year;
+            final year =
+                DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime)
+                    .year;
             String name = "Trip in $year!";
             if (year == currentTime.year - 1) {
               name = "Last year's trip!";
             }
-            final photoSelection = await _bestSelection(trip.$1);
+            final photoSelection = await _bestSelection(trip.files);
             searchResults.add(
               GenericSearchResult(
                 ResultType.event,
@@ -1541,7 +1558,7 @@ class SearchService {
                   filterName: name,
                   occurrence: kMostRelevantFilter,
                   filterResultType: ResultType.event,
-                  matchedUploadedIDs: filesToUploadedFileIDs(trip.$1),
+                  matchedUploadedIDs: filesToUploadedFileIDs(photoSelection),
                   filterIcon: Icons.event_outlined,
                 ),
               ),

From e6f72ea1c353b3f374c93f594117f17e350fabf5 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 12 Feb 2025 11:38:33 +0530
Subject: [PATCH 108/796] [mob][photos] Simplify

---
 mobile/lib/models/base/id.dart          |  4 --
 mobile/lib/services/search_service.dart | 60 +++++++++++++------------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/mobile/lib/models/base/id.dart b/mobile/lib/models/base/id.dart
index 3fbae25e41..2b095e0274 100644
--- a/mobile/lib/models/base/id.dart
+++ b/mobile/lib/models/base/id.dart
@@ -15,7 +15,3 @@ String newID(String prefix) {
 String newIsolateTaskID(String task) {
   return "${task}_${customAlphabet(enteWhiteListedAlphabet, clusterIDLength)}";
 }
-
-String newAutoLocationID() {
-  return "cluster_${customAlphabet(enteWhiteListedAlphabet, clusterIDLength)}";
-}
diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 16743faf7b..7a2fc0ebea 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -15,7 +15,6 @@ import "package:photos/db/ml/db.dart";
 import 'package:photos/events/local_photos_updated_event.dart';
 import "package:photos/extensions/user_extension.dart";
 import "package:photos/models/api/collection/user.dart";
-import "package:photos/models/base/id.dart";
 import "package:photos/models/base_location.dart";
 import 'package:photos/models/collection/collection.dart';
 import 'package:photos/models/collection/collection_items.dart';
@@ -1310,7 +1309,7 @@ class SearchService {
     }
 
     // Identify trip locations
-    final Map<String, TripMemory> tripLocations = {};
+    final List<TripMemory> tripLocations = [];
     clusteredLocations:
     for (final cluster in wideRadiusClusters) {
       final files = cluster.$1;
@@ -1365,11 +1364,13 @@ class SearchService {
 
           // Check if current block is a valid trip (2-30 days)
           if (blockDuration >= 2 && blockDuration <= 30) {
-            tripLocations[newAutoLocationID()] = TripMemory(
-              List.from(currentBlockFiles),
-              location,
-              blockStart,
-              lastTime,
+            tripLocations.add(
+              TripMemory(
+                List.from(currentBlockFiles),
+                location,
+                blockStart,
+                lastTime,
+              ),
             );
           }
 
@@ -1387,19 +1388,20 @@ class SearchService {
           .difference(DateTime.fromMicrosecondsSinceEpoch(blockStart))
           .inDays;
       if (lastBlockDuration >= 2 && lastBlockDuration <= 30) {
-        tripLocations[newAutoLocationID()] = TripMemory(
-          List.from(currentBlockFiles),
-          location,
-          blockStart,
-          lastTime,
+        tripLocations.add(
+          TripMemory(
+            List.from(currentBlockFiles),
+            location,
+            blockStart,
+            lastTime,
+          ),
         );
       }
     }
 
     // Check if any trip locations should be merged
-    final Map<String, TripMemory> mergedTrips = {};
-    for (final tripID in tripLocations.keys) {
-      final trip = tripLocations[tripID]!;
+    final List<TripMemory> mergedTrips = [];
+    for (final trip in tripLocations) {
       final tripFirstTime = DateTime.fromMicrosecondsSinceEpoch(
         trip.firstCreationTime,
       );
@@ -1407,8 +1409,8 @@ class SearchService {
         trip.lastCreationTime,
       );
       bool merged = false;
-      for (final otherTripID in mergedTrips.keys) {
-        final otherTrip = mergedTrips[otherTripID]!;
+      for (int idx = 0; idx < mergedTrips.length; idx++) {
+        final otherTrip = mergedTrips[idx];
         final otherTripFirstTime =
             DateTime.fromMicrosecondsSinceEpoch(otherTrip.firstCreationTime);
         final otherTripLastTime =
@@ -1418,7 +1420,7 @@ class SearchService {
             tripLastTime.isAfter(
               otherTripFirstTime.subtract(const Duration(days: 3)),
             )) {
-          mergedTrips[otherTripID] = TripMemory(
+          mergedTrips[idx] = TripMemory(
             otherTrip.files + trip.files,
             otherTrip.location,
             min(otherTrip.firstCreationTime, trip.firstCreationTime),
@@ -1430,20 +1432,20 @@ class SearchService {
         }
       }
       if (merged) continue;
-      mergedTrips[tripID] = TripMemory(
-        trip.files,
-        trip.location,
-        trip.firstCreationTime,
-        trip.lastCreationTime,
+      mergedTrips.add(
+        TripMemory(
+          trip.files,
+          trip.location,
+          trip.firstCreationTime,
+          trip.lastCreationTime,
+        ),
       );
     }
 
     // Remove too small trips
-    for (final tripID in mergedTrips.keys.toList()) {
-      final filesAmount = mergedTrips[tripID]!.files.length;
-      if (filesAmount < 20) {
-        mergedTrips.remove(tripID);
-      }
+    final List<TripMemory> validTrips = [];
+    for (final trip in mergedTrips) {
+      if (trip.files.length >= 20) validTrips.add(trip);
     }
 
     // For now for testing let's just surface all base locations
@@ -1468,7 +1470,7 @@ class SearchService {
     // For now we surface the two most recent trips of current month, and if none, the earliest upcoming redundant trip
     // Group the trips per month and then year
     final Map<int, Map<int, List<TripMemory>>> tripsByMonthYear = {};
-    for (final trip in mergedTrips.values) {
+    for (final trip in validTrips) {
       final tripDate =
           DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime);
       tripsByMonthYear

From 60b7ed52b82202ac6d7219168f010125a2a49da7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 12:56:53 +0530
Subject: [PATCH 109/796] [web] Account for Exif orientation when extracting
 width and height

---
 web/packages/new/photos/services/exif.ts | 52 +++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/web/packages/new/photos/services/exif.ts b/web/packages/new/photos/services/exif.ts
index b880ebb7b0..9e7185e5bf 100644
--- a/web/packages/new/photos/services/exif.ts
+++ b/web/packages/new/photos/services/exif.ts
@@ -362,9 +362,59 @@ const parseIPTCDate = (
 
 /**
  * Parse the width and height of the image from the metadata embedded in the
- * file.
+ * file, taking into account any orientation tags that are also present.
  */
 const parseDimensions = (tags: RawExifTags) => {
+    const wh = parseWidthAndHeight(tags);
+    if (!wh) return wh;
+
+    // The Orientation can be present in both Exif and XMP (as a TIFF tag).
+    //
+    // Prefer the Exif orientation, and fallback to the XMP only if it not
+    // present. This matches the behaviour of common tools, e.g.
+    // https://github.com/mattiasw/ExifReader/issues/27
+    //
+    // Both Exif and XMP use the same constants to mean the same things. Ref:
+    // - https://exiftool.org/TagNames/EXIF.html
+    // - https://exiftool.org/TagNames/XMP.html
+    //
+    //     1 = Horizontal (normal)
+    //     2 = Mirror horizontal
+    //     3 = Rotate 180
+    //     4 = Mirror vertical
+    //     5 = Mirror horizontal and rotate 270 CW
+    //     6 = Rotate 90 CW
+    //     7 = Mirror horizontal and rotate 90 CW
+    //     8 = Rotate 270 CW
+
+    let swap = false;
+
+    switch (tags.exif?.Orientation?.value) {
+        case 5:
+        case 6:
+        case 7:
+        case 8:
+            swap = true;
+            break;
+        case undefined:
+            switch (tags.xmp?.Orientation?.value) {
+                case "5":
+                case "6":
+                case "7":
+                case "8":
+                    swap = true;
+            }
+            break;
+    }
+
+    return swap ? { width: wh.height, height: wh.width } : wh;
+};
+
+/**
+ * Parse the width and height of the image from the metadata embedded in the
+ * file.
+ */
+const parseWidthAndHeight = (tags: RawExifTags) => {
     // Go through all possiblities in order, returning the first pair with both
     // the width and height defined, and non-zero.
     const pair = (w: number | undefined, h: number | undefined) =>

From 115c2c7fb364a67ffbeeab4f5292220caba681b1 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 13:42:57 +0530
Subject: [PATCH 110/796] Prefer file tag over exif, and use both dim/orient
 from same source

---
 web/packages/new/photos/services/exif.ts | 153 ++++++++++++-----------
 1 file changed, 82 insertions(+), 71 deletions(-)

diff --git a/web/packages/new/photos/services/exif.ts b/web/packages/new/photos/services/exif.ts
index 9e7185e5bf..6ed42a4159 100644
--- a/web/packages/new/photos/services/exif.ts
+++ b/web/packages/new/photos/services/exif.ts
@@ -365,78 +365,18 @@ const parseIPTCDate = (
  * file, taking into account any orientation tags that are also present.
  */
 const parseDimensions = (tags: RawExifTags) => {
-    const wh = parseWidthAndHeight(tags);
-    if (!wh) return wh;
-
-    // The Orientation can be present in both Exif and XMP (as a TIFF tag).
-    //
-    // Prefer the Exif orientation, and fallback to the XMP only if it not
-    // present. This matches the behaviour of common tools, e.g.
-    // https://github.com/mattiasw/ExifReader/issues/27
-    //
-    // Both Exif and XMP use the same constants to mean the same things. Ref:
-    // - https://exiftool.org/TagNames/EXIF.html
-    // - https://exiftool.org/TagNames/XMP.html
-    //
-    //     1 = Horizontal (normal)
-    //     2 = Mirror horizontal
-    //     3 = Rotate 180
-    //     4 = Mirror vertical
-    //     5 = Mirror horizontal and rotate 270 CW
-    //     6 = Rotate 90 CW
-    //     7 = Mirror horizontal and rotate 90 CW
-    //     8 = Rotate 270 CW
-
-    let swap = false;
-
-    switch (tags.exif?.Orientation?.value) {
-        case 5:
-        case 6:
-        case 7:
-        case 8:
-            swap = true;
-            break;
-        case undefined:
-            switch (tags.xmp?.Orientation?.value) {
-                case "5":
-                case "6":
-                case "7":
-                case "8":
-                    swap = true;
-            }
-            break;
-    }
-
-    return swap ? { width: wh.height, height: wh.width } : wh;
-};
-
-/**
- * Parse the width and height of the image from the metadata embedded in the
- * file.
- */
-const parseWidthAndHeight = (tags: RawExifTags) => {
     // Go through all possiblities in order, returning the first pair with both
     // the width and height defined, and non-zero.
+
     const pair = (w: number | undefined, h: number | undefined) =>
         w && h ? { width: w, height: h } : undefined;
 
-    return (
+    // 1. Use the width and height from the file itself (e.g. JPEG data).
+
+    let wh =
         pair(
-            tags.exif?.ImageWidth?.value,
-            /* The Exif spec calls it ImageLength, not ImageHeight. */
-            tags.exif?.ImageLength?.value,
-        ) ??
-        pair(
-            tags.exif?.PixelXDimension?.value,
-            tags.exif?.PixelYDimension?.value,
-        ) ??
-        pair(
-            parseXMPNum(tags.xmp?.ImageWidth),
-            parseXMPNum(tags.xmp?.ImageLength),
-        ) ??
-        pair(
-            parseXMPNum(tags.xmp?.PixelXDimension),
-            parseXMPNum(tags.xmp?.PixelYDimension),
+            tags.file?.["Image Width"]?.value,
+            tags.file?.["Image Height"]?.value,
         ) ??
         pair(
             tags.pngFile?.["Image Width"]?.value,
@@ -446,12 +386,83 @@ const parseWidthAndHeight = (tags: RawExifTags) => {
             tags.gif?.["Image Width"]?.value,
             tags.gif?.["Image Height"]?.value,
         ) ??
-        pair(tags.riff?.ImageWidth?.value, tags.riff?.ImageHeight?.value) ??
+        pair(tags.riff?.ImageWidth?.value, tags.riff?.ImageHeight?.value);
+    if (wh) {
+        return wh;
+    }
+
+    // 2. Exif dimensions, taking Orientation also into account if needed.
+
+    wh =
         pair(
-            tags.file?.["Image Width"]?.value,
-            tags.file?.["Image Height"]?.value,
-        )
-    );
+            tags.exif?.ImageWidth?.value,
+            /* The Exif spec calls it ImageLength, not ImageHeight. */
+            tags.exif?.ImageLength?.value,
+        ) ??
+        pair(
+            tags.exif?.PixelXDimension?.value,
+            tags.exif?.PixelYDimension?.value,
+        );
+    if (wh) {
+        // Exif Orientation tags can have the following values:
+        //
+        //     1 = Horizontal (normal)
+        //     2 = Mirror horizontal
+        //     3 = Rotate 180
+        //     4 = Mirror vertical
+        //     5 = Mirror horizontal and rotate 270 CW
+        //     6 = Rotate 90 CW
+        //     7 = Mirror horizontal and rotate 90 CW
+        //     8 = Rotate 270 CW
+        //
+        // Ref: https://exiftool.org/TagNames/EXIF.html
+
+        let swap = false;
+
+        switch (tags.exif?.Orientation?.value) {
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+                swap = true;
+                break;
+        }
+
+        return swap ? { width: wh.height, height: wh.width } : wh;
+    }
+
+    // 3. XMP dimensions, taking Orientation also into account if needed.
+
+    wh =
+        pair(
+            parseXMPNum(tags.xmp?.ImageWidth),
+            parseXMPNum(tags.xmp?.ImageLength),
+        ) ??
+        pair(
+            parseXMPNum(tags.xmp?.PixelXDimension),
+            parseXMPNum(tags.xmp?.PixelYDimension),
+        );
+
+    if (wh) {
+        // The Orientation present in XMP (as a TIFF tag) also uses the same
+        // constants as Exif above.
+        //
+        // Ref: https://exiftool.org/TagNames/XMP.html
+
+        let swap = false;
+
+        switch (tags.xmp?.Orientation?.value) {
+            case "5":
+            case "6":
+            case "7":
+            case "8":
+                swap = true;
+        }
+
+        return swap ? { width: wh.height, height: wh.width } : wh;
+    }
+
+    return undefined;
 };
 
 /**

From 69f9bf35ac65d58ba0d54a97ae66a1e3b07d9857 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 14:43:27 +0530
Subject: [PATCH 111/796] Mention paths

---
 docs/docs/photos/troubleshooting/sharing-logs.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/docs/photos/troubleshooting/sharing-logs.md b/docs/docs/photos/troubleshooting/sharing-logs.md
index 0de78748a4..4e2eb2d2d3 100644
--- a/docs/docs/photos/troubleshooting/sharing-logs.md
+++ b/docs/docs/photos/troubleshooting/sharing-logs.md
@@ -31,6 +31,15 @@ the logs just make the process a bit faster and easier.
 - Click on _Support_. This will open your email client where you can attach the
   logs in the email and describe the issue.
 
+## Desktop
+
+On the desktop app, you can also directly view the logs on your computer at the
+following locations:
+
+- macOS: `~/Library/Logs/ente/ente.log`
+- Linux: `~/.config/ente/logs/ente.log`
+- Windows: `%USERPROFILE%\AppData\Roaming\ente\logs\ente.log`
+
 ## Send email manually
 
 If _Report a bug_ or _Support_ doesn't automatically open your email client, you

From 40959cae09c321e353fdbcf052954be7fdca823a Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Wed, 12 Feb 2025 14:46:01 +0530
Subject: [PATCH 112/796] [auth] Increase default  window height

---
 auth/flutter                                   | 2 +-
 auth/lib/services/window_listener_service.dart | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/auth/flutter b/auth/flutter
index 68415ad1d9..2663184aa7 160000
--- a/auth/flutter
+++ b/auth/flutter
@@ -1 +1 @@
-Subproject commit 68415ad1d920f6fe5ec284f5c2febf7c4dd5b0b3
+Subproject commit 2663184aa79047d0a33a14a3b607954f8fdd8730
diff --git a/auth/lib/services/window_listener_service.dart b/auth/lib/services/window_listener_service.dart
index 73f431116f..bb5d1cbcfa 100644
--- a/auth/lib/services/window_listener_service.dart
+++ b/auth/lib/services/window_listener_service.dart
@@ -6,7 +6,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:window_manager/window_manager.dart';
 
 class WindowListenerService {
-  static const double minWindowHeight = 320.0;
+  static const double minWindowHeight = 600.0;
   static const double minWindowWidth = 800.0;
   static const double maxWindowHeight = 8192.0;
   static const double maxWindowWidth = 8192.0;

From a7f31119fe3dfa665b655038462af107b753a9bb Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Wed, 12 Feb 2025 14:47:09 +0530
Subject: [PATCH 113/796] [server]fix: use proper Error causes

---
 server/ente/errors.go                 |  7 +++++++
 server/pkg/controller/family/admin.go | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/server/ente/errors.go b/server/ente/errors.go
index aac78f6f73..b629674277 100644
--- a/server/ente/errors.go
+++ b/server/ente/errors.go
@@ -94,6 +94,13 @@ var ErrLockUnavailable = errors.New("could not acquire lock")
 // ErrActiveLinkAlreadyExists is thrown when the collection already has active public link
 var ErrActiveLinkAlreadyExists = errors.New("Collection already has active public link")
 
+// ErrCannotModifyAdminStoragLimit is thrown when the admin is modifying their own storage limit
+var ErrCannotModifyAdminStoragLimit = errors.New("Cannot modify admin storage limit")
+
+// ErrFailedReducingStorageLimit is thrown when the admin is setting storage limit lesser than
+// members pre-consumed storage
+var ErrFailedReducingStorageLimit = errors.New("Members Usage is more than potential storage limit")
+
 // ErrNotImplemented indicates that the action that we tried to perform is not
 // available at this museum instance. e.g. this could be something that is not
 // enabled on this particular instance of museum.
diff --git a/server/pkg/controller/family/admin.go b/server/pkg/controller/family/admin.go
index e6bef578c1..228d16f0c4 100644
--- a/server/pkg/controller/family/admin.go
+++ b/server/pkg/controller/family/admin.go
@@ -194,7 +194,7 @@ func (c *Controller) CloseFamily(ctx context.Context, adminID int64) error {
 func (c *Controller) ModifyMemberStorage(ctx context.Context, adminID int64, id uuid.UUID, storageLimit *int64) error {
 	familyAdminID, err := c.UserRepo.GetFamilyAdminID(adminID)
 	if err != nil {
-		return stacktrace.Propagate(err, "Could not get family admin ID")
+		return stacktrace.Propagate(ente.ErrBadRequest, "Could not get family admin ID")
 	}
 
 	member, err := c.FamilyRepo.GetMemberById(ctx, id)
@@ -205,11 +205,11 @@ func (c *Controller) ModifyMemberStorage(ctx context.Context, adminID int64, id
 	// gets admin subscription in order to get the size of total storage quota
 	activeSub, err := c.BillingCtrl.GetActiveSubscription(adminID)
 	if err != nil {
-		return stacktrace.Propagate(err, "couldn't get active subscription")
+		return stacktrace.Propagate(ente.ErrNoActiveSubscription, "couldn't get active subscription")
 	}
 
 	if storageLimit != nil && *storageLimit > activeSub.Storage {
-		return stacktrace.Propagate(fmt.Errorf("cannot set storage limit"), "potential storage limit is more than subscription storage")
+		return stacktrace.Propagate(ente.ErrStorageLimitExceeded, "potential storage limit is more than subscription storage")
 	}
 
 	// Handle if the admin user tries reducing the storage Limit
@@ -220,11 +220,11 @@ func (c *Controller) ModifyMemberStorage(ctx context.Context, adminID int64, id
 	}
 
 	if adminID == *familyAdminID && member.IsAdmin {
-		return stacktrace.Propagate(fmt.Errorf("cannot modify storage"), "cannot modify admin storage limit")
+		return stacktrace.Propagate(ente.ErrCannotModifyAdminStoragLimit, "cannot modify admin storage limit")
 	}
 
 	if memberUsage > *storageLimit {
-		return stacktrace.Propagate(fmt.Errorf("storage reduction not allowed"), "Cannot reduce storage, current usage is more.")
+		return stacktrace.Propagate(ente.ErrFailedReducingStorageLimit, "Cannot reduce storage, current usage is more.")
 	}
 
 	if id == member.ID && member.Status == "ACCEPTED" {
@@ -233,7 +233,7 @@ func (c *Controller) ModifyMemberStorage(ctx context.Context, adminID int64, id
 			return stacktrace.Propagate(err, "Cannot Modify Members Storage")
 		}
 	} else {
-		return stacktrace.Propagate(fmt.Errorf("could not modify storage"), "user is not a part of family")
+		return stacktrace.Propagate(ente.ErrBadRequest, "user is not a part of family")
 	}
 	return nil
 }

From 9e12f356502c964cd31e0db7fd96f91fac0b47fc Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Wed, 12 Feb 2025 14:49:23 +0530
Subject: [PATCH 114/796] fix: check before file size and chunk size

---
 mobile/lib/services/preview_video_store.dart | 55 +++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index b14fc8c707..ee2abb5596 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -135,22 +135,6 @@ class PreviewVideoStore {
         }
       }
 
-      final fileSize = file.lengthSync();
-      FFProbeProps? props;
-
-      if (fileSize <= 10 * 1024 * 1024) {
-        props = await getVideoPropsAsync(file);
-        final videoData = List.from(props?.propData?["streams"] ?? [])
-            .firstWhereOrNull((e) => e["type"] == "video");
-
-        final codec = videoData["codec_name"]?.toString().toLowerCase();
-        final codecIsH264 = codec?.contains("h264") ?? false;
-        if (codecIsH264) {
-          _items.removeWhere((key, value) => value.file == enteFile);
-          Bus.instance.fire(PreviewUpdatedEvent(_items));
-          return;
-        }
-      }
       if (uploadingFileId >= 0) {
         _items[enteFile.uploadedFileID!] = PreviewItem(
           status: PreviewItemStatus.inQueue,
@@ -174,7 +158,8 @@ class PreviewVideoStore {
       );
       Bus.instance.fire(PreviewUpdatedEvent(_items));
 
-      props ??= await getVideoPropsAsync(file);
+      final props = await getVideoPropsAsync(file);
+      final fileSize = enteFile.fileSize ?? file.lengthSync();
 
       final videoData = List.from(props?.propData?["streams"] ?? [])
           .firstWhereOrNull((e) => e["type"] == "video");
@@ -213,7 +198,7 @@ class PreviewVideoStore {
           '-metadata:s:v:0 rotate=0 ' // Adjust metadata if needed
           '-c:v copy ' // Copy the original video codec
           '-c:a copy ' // Copy the original audio codec
-          '-f hls -hls_time 10 -hls_flags single_file '
+          '-f hls -hls_time 2 -hls_flags single_file '
           '-hls_list_size 0 -hls_key_info_file ${keyinfo.path} '
           '$prefix/output.m3u8',
         );
@@ -230,7 +215,7 @@ class PreviewVideoStore {
           '-color_primaries bt709 -color_trc bt709 -colorspace bt709 ' // Set color profile to BT.709
           '-c:v libx264 -crf 21 -preset medium ' // Compress with CRF=21 using H.264
           '-c:a copy ' // Keep original audio
-          '-f hls -hls_time 10 -hls_flags single_file '
+          '-f hls -hls_time 2 -hls_flags single_file '
           '-hls_list_size 0 -hls_key_info_file ${keyinfo.path} '
           '$prefix/output.m3u8',
         );
@@ -242,7 +227,7 @@ class PreviewVideoStore {
           '-metadata:s:v:0 rotate=0 '
           '-vf "scale=-2:720,fps=30" '
           '-c:v libx264 -b:v 2000k -preset medium '
-          '-c:a aac -b:a 128k -f hls -hls_time 10 -hls_flags single_file '
+          '-c:a aac -b:a 128k -f hls -hls_time 2 -hls_flags single_file '
           '-hls_list_size 0 -hls_key_info_file ${keyinfo.path} '
           '$prefix/output.m3u8',
         );
@@ -255,7 +240,7 @@ class PreviewVideoStore {
         '-color_primaries bt709 -color_trc bt709 -colorspace bt709 '
         '-x264-params "colorprim=bt709:transfer=bt709:colormatrix=bt709" '
         '-c:v libx264 -b:v 2000k -preset medium '
-        '-c:a aac -b:a 128k -f hls -hls_time 10 -hls_flags single_file '
+        '-c:a aac -b:a 128k -f hls -hls_time 2 -hls_flags single_file '
         '-hls_list_size 0 -hls_key_info_file ${keyinfo.path} '
         '$prefix/output.m3u8',
       );
@@ -610,11 +595,31 @@ class PreviewVideoStore {
         .toList();
 
     // set all video status to be in queue
-    for (final file in allFiles) {
-      _items[file.uploadedFileID!] = PreviewItem(
+    for (final enteFile in allFiles) {
+      final fileSize = enteFile.fileSize;
+      FFProbeProps? props;
+
+      if (fileSize != null && fileSize <= 10 * 1024 * 1024) {
+        final file = await getFile(enteFile, isOrigin: true);
+        if (file != null) {
+          props = await getVideoPropsAsync(file);
+          final videoData = List.from(props?.propData?["streams"] ?? [])
+              .firstWhereOrNull((e) => e["type"] == "video");
+
+          final codec = videoData["codec_name"]?.toString().toLowerCase();
+          final codecIsH264 = codec?.contains("h264") ?? false;
+
+          if (codecIsH264) {
+            _items.removeWhere((key, value) => value.file == enteFile);
+            Bus.instance.fire(PreviewUpdatedEvent(_items));
+            continue;
+          }
+        }
+      }
+      _items[enteFile.uploadedFileID!] = PreviewItem(
         status: PreviewItemStatus.inQueue,
-        file: file,
-        collectionID: file.collectionID ?? 0,
+        file: enteFile,
+        collectionID: enteFile.collectionID ?? 0,
       );
     }
     Bus.instance.fire(PreviewUpdatedEvent(_items));

From defd88050d69639ca064c003156fda78c85ad90d Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Wed, 12 Feb 2025 19:36:58 +0530
Subject: [PATCH 115/796] [mobile][photos] Fix: show account owner's email in
 'Link email' screen if it's not assigned to any person yet

---
 mobile/lib/ui/viewer/people/link_email_screen.dart   | 3 +++
 mobile/lib/ui/viewer/people/save_or_edit_person.dart | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/mobile/lib/ui/viewer/people/link_email_screen.dart b/mobile/lib/ui/viewer/people/link_email_screen.dart
index bec48b4399..9a23c2ccb4 100644
--- a/mobile/lib/ui/viewer/people/link_email_screen.dart
+++ b/mobile/lib/ui/viewer/people/link_email_screen.dart
@@ -3,6 +3,7 @@ import "dart:async";
 import "package:email_validator/email_validator.dart";
 import 'package:flutter/material.dart';
 import "package:logging/logging.dart";
+import "package:photos/core/configuration.dart";
 import "package:photos/core/event_bus.dart";
 import "package:photos/events/people_changed_event.dart";
 import "package:photos/generated/l10n.dart";
@@ -247,7 +248,9 @@ class _LinkEmailScreen extends State<LinkEmailScreen> {
   List<User> _getContacts() {
     final usersEmailsToAviod =
         PersonService.instance.emailToPartialPersonDataMapCache.keys.toSet();
+    final ownerEmail = Configuration.instance.getEmail();
     final relevantUsers = UserService.instance.getRelevantContacts()
+      ..add(User(email: ownerEmail!))
       ..removeWhere(
         (user) => usersEmailsToAviod.contains(user.email),
       );
diff --git a/mobile/lib/ui/viewer/people/save_or_edit_person.dart b/mobile/lib/ui/viewer/people/save_or_edit_person.dart
index 40e346af38..9a3a158d34 100644
--- a/mobile/lib/ui/viewer/people/save_or_edit_person.dart
+++ b/mobile/lib/ui/viewer/people/save_or_edit_person.dart
@@ -988,7 +988,9 @@ class _EmailSectionState extends State<_EmailSection> {
   List<User> _getContacts() {
     final usersEmailsToAviod =
         PersonService.instance.emailToPartialPersonDataMapCache.keys;
+    final ownerEmail = Configuration.instance.getEmail();
     final relevantUsers = UserService.instance.getRelevantContacts()
+      ..add(User(email: ownerEmail!))
       ..removeWhere(
         (user) => usersEmailsToAviod.contains(user.email),
       );

From 1c6efd4985590e3c1e7771f425b7a387e4fb7266 Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Wed, 12 Feb 2025 19:42:21 +0530
Subject: [PATCH 116/796] [mob][photos] Use better names

---
 mobile/lib/ui/viewer/people/link_email_screen.dart   | 4 ++--
 mobile/lib/ui/viewer/people/save_or_edit_person.dart | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mobile/lib/ui/viewer/people/link_email_screen.dart b/mobile/lib/ui/viewer/people/link_email_screen.dart
index 9a23c2ccb4..bf610d0542 100644
--- a/mobile/lib/ui/viewer/people/link_email_screen.dart
+++ b/mobile/lib/ui/viewer/people/link_email_screen.dart
@@ -246,13 +246,13 @@ class _LinkEmailScreen extends State<LinkEmailScreen> {
   }
 
   List<User> _getContacts() {
-    final usersEmailsToAviod =
+    final userEmailsToAviod =
         PersonService.instance.emailToPartialPersonDataMapCache.keys.toSet();
     final ownerEmail = Configuration.instance.getEmail();
     final relevantUsers = UserService.instance.getRelevantContacts()
       ..add(User(email: ownerEmail!))
       ..removeWhere(
-        (user) => usersEmailsToAviod.contains(user.email),
+        (user) => userEmailsToAviod.contains(user.email),
       );
 
     relevantUsers.sort(
diff --git a/mobile/lib/ui/viewer/people/save_or_edit_person.dart b/mobile/lib/ui/viewer/people/save_or_edit_person.dart
index 9a3a158d34..9216801a20 100644
--- a/mobile/lib/ui/viewer/people/save_or_edit_person.dart
+++ b/mobile/lib/ui/viewer/people/save_or_edit_person.dart
@@ -986,13 +986,13 @@ class _EmailSectionState extends State<_EmailSection> {
   }
 
   List<User> _getContacts() {
-    final usersEmailsToAviod =
+    final userEmailsToAviod =
         PersonService.instance.emailToPartialPersonDataMapCache.keys;
     final ownerEmail = Configuration.instance.getEmail();
     final relevantUsers = UserService.instance.getRelevantContacts()
       ..add(User(email: ownerEmail!))
       ..removeWhere(
-        (user) => usersEmailsToAviod.contains(user.email),
+        (user) => userEmailsToAviod.contains(user.email),
       );
 
     relevantUsers.sort(

From b1d2de712b825736d10d9e106dd8627881defc7c Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Wed, 12 Feb 2025 20:08:12 +0530
Subject: [PATCH 117/796] [mob][photos] Show confirmation dialog before joining
 public link

---
 mobile/lib/generated/intl/messages_en.dart    |  2 +
 mobile/lib/generated/l10n.dart                | 10 +++++
 mobile/lib/l10n/intl_en.arb                   |  3 +-
 .../shared_public_collection_page.dart        | 42 +++++++++++--------
 4 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/mobile/lib/generated/intl/messages_en.dart b/mobile/lib/generated/intl/messages_en.dart
index 16f84068f9..41537dd1ec 100644
--- a/mobile/lib/generated/intl/messages_en.dart
+++ b/mobile/lib/generated/intl/messages_en.dart
@@ -1063,6 +1063,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Selected items will be removed from this album"),
         "join": MessageLookupByLibrary.simpleMessage("Join"),
         "joinAlbum": MessageLookupByLibrary.simpleMessage("Join album"),
+        "joinAlbumConfirmationDialogBody": MessageLookupByLibrary.simpleMessage(
+            "Joining an album will make your email visible to its participants."),
         "joinAlbumSubtext":
             MessageLookupByLibrary.simpleMessage("to view and add your photos"),
         "joinAlbumSubtextViewer": MessageLookupByLibrary.simpleMessage(
diff --git a/mobile/lib/generated/l10n.dart b/mobile/lib/generated/l10n.dart
index 7096abda62..c7f32203dd 100644
--- a/mobile/lib/generated/l10n.dart
+++ b/mobile/lib/generated/l10n.dart
@@ -11220,6 +11220,16 @@ class S {
       args: [],
     );
   }
+
+  /// `Joining an album will make your email visible to its participants.`
+  String get joinAlbumConfirmationDialogBody {
+    return Intl.message(
+      'Joining an album will make your email visible to its participants.',
+      name: 'joinAlbumConfirmationDialogBody',
+      desc: '',
+      args: [],
+    );
+  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<S> {
diff --git a/mobile/lib/l10n/intl_en.arb b/mobile/lib/l10n/intl_en.arb
index 46b814c91e..9c29390b16 100644
--- a/mobile/lib/l10n/intl_en.arb
+++ b/mobile/lib/l10n/intl_en.arb
@@ -1673,5 +1673,6 @@
   "ineligible": "Ineligible",
   "failed": "Failed",
   "playStream": "Play stream",
-  "playOriginal": "Play original"
+  "playOriginal": "Play original",
+  "joinAlbumConfirmationDialogBody" : "Joining an album will make your email visible to its participants."
 }
\ No newline at end of file
diff --git a/mobile/lib/ui/viewer/gallery/shared_public_collection_page.dart b/mobile/lib/ui/viewer/gallery/shared_public_collection_page.dart
index 05ad027206..f4905eb4c7 100644
--- a/mobile/lib/ui/viewer/gallery/shared_public_collection_page.dart
+++ b/mobile/lib/ui/viewer/gallery/shared_public_collection_page.dart
@@ -151,27 +151,35 @@ class _SharedPublicCollectionPageState
   }
 
   Future<void> _joinAlbum() async {
-    final dialog = createProgressDialog(
+    final result = await showChoiceDialog(
       context,
-      S.of(context).pleaseWait,
-      isDismissible: true,
+      title: context.l10n.joinAlbum,
+      body: context.l10n.joinAlbumConfirmationDialogBody,
+      firstButtonLabel: context.l10n.join,
     );
-    await dialog.show();
-    try {
-      await RemoteSyncService.instance
-          .joinAndSyncCollection(context, widget.c.collection.id);
-      final c =
-          CollectionsService.instance.getCollectionByID(widget.c.collection.id);
-      await dialog.hide();
-      Navigator.of(context).pop();
-      await routeToPage(
+    if (result != null && result.action == ButtonAction.first) {
+      final dialog = createProgressDialog(
         context,
-        CollectionPage(CollectionWithThumbnail(c!, null)),
+        S.of(context).pleaseWait,
+        isDismissible: true,
       );
-    } catch (e, s) {
-      logger.severe("Failed to join collection", e, s);
-      await dialog.hide();
-      showToast(context, S.of(context).somethingWentWrong);
+      await dialog.show();
+      try {
+        await RemoteSyncService.instance
+            .joinAndSyncCollection(context, widget.c.collection.id);
+        final c = CollectionsService.instance
+            .getCollectionByID(widget.c.collection.id);
+        await dialog.hide();
+        Navigator.of(context).pop();
+        await routeToPage(
+          context,
+          CollectionPage(CollectionWithThumbnail(c!, null)),
+        );
+      } catch (e, s) {
+        logger.severe("Failed to join collection", e, s);
+        await dialog.hide();
+        showToast(context, S.of(context).somethingWentWrong);
+      }
     }
   }
 }

From bc4aa85eb19179106ceeaec0f41e3428831513de Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Wed, 12 Feb 2025 20:12:07 +0530
Subject: [PATCH 118/796] [mob][photos] Bump up to v0.9.96

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index cd577e5099..6e9d45966d 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.95+995
+version: 0.9.96+996
 publish_to: none
 
 environment:

From 677a473d7dab3c8b54e0fcc8e129768757a5df64 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Wed, 12 Feb 2025 20:39:54 +0530
Subject: [PATCH 119/796] fix: use crf 23 for all the compressions for better
 results

---
 mobile/lib/services/preview_video_store.dart | 22 ++++++++------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index ee2abb5596..39b1fe134d 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -192,12 +192,10 @@ class PreviewVideoStore {
       final codecIsH264 = codec?.contains("h264") ?? false;
 
       if (bitrate != null && bitrate <= 4000 * 1000 && codecIsH264) {
-        // create playlist without compression, as is
         session = await FFmpegKit.execute(
           '-i "${file.path}" '
-          '-metadata:s:v:0 rotate=0 ' // Adjust metadata if needed
-          '-c:v copy ' // Copy the original video codec
-          '-c:a copy ' // Copy the original audio codec
+          '-metadata:s:v:0 rotate=0 '
+          '-c:v copy -c:a copy '
           '-f hls -hls_time 2 -hls_flags single_file '
           '-hls_list_size 0 -hls_key_info_file ${keyinfo.path} '
           '$prefix/output.m3u8',
@@ -206,15 +204,13 @@ class PreviewVideoStore {
           codec != null &&
           bitrate <= 2000 * 1000 &&
           !codecIsH264) {
-        // compress video with crf=21, h264 no change in resolution or frame rate,
-        // just change color scheme
         session = await FFmpegKit.execute(
           '-i "${file.path}" '
-          '-metadata:s:v:0 rotate=0 ' // Keep rotation metadata
-          '-vf "format=yuv420p10le,zscale=transfer=linear,tonemap=tonemap=hable:desat=0:peak=10,zscale=transfer=bt709:matrix=bt709:primaries=bt709,format=yuv420p" ' // Adjust color scheme
-          '-color_primaries bt709 -color_trc bt709 -colorspace bt709 ' // Set color profile to BT.709
-          '-c:v libx264 -crf 21 -preset medium ' // Compress with CRF=21 using H.264
-          '-c:a copy ' // Keep original audio
+          '-metadata:s:v:0 rotate=0 '
+          '-vf "format=yuv420p10le,zscale=transfer=linear,tonemap=tonemap=hable:desat=0:peak=10,zscale=transfer=bt709:matrix=bt709:primaries=bt709,format=yuv420p" '
+          '-color_primaries bt709 -color_trc bt709 -colorspace bt709 '
+          '-c:v libx264 -crf 23 -preset medium '
+          '-c:a copy '
           '-f hls -hls_time 2 -hls_flags single_file '
           '-hls_list_size 0 -hls_key_info_file ${keyinfo.path} '
           '$prefix/output.m3u8',
@@ -226,7 +222,7 @@ class PreviewVideoStore {
           '-i "${file.path}" '
           '-metadata:s:v:0 rotate=0 '
           '-vf "scale=-2:720,fps=30" '
-          '-c:v libx264 -b:v 2000k -preset medium '
+          '-c:v libx264 -b:v 2000k -crf 23 -preset medium '
           '-c:a aac -b:a 128k -f hls -hls_time 2 -hls_flags single_file '
           '-hls_list_size 0 -hls_key_info_file ${keyinfo.path} '
           '$prefix/output.m3u8',
@@ -239,7 +235,7 @@ class PreviewVideoStore {
         '-vf "scale=-2:720,fps=30,format=yuv420p10le,zscale=transfer=linear,tonemap=tonemap=hable:desat=0:peak=10,zscale=transfer=bt709:matrix=bt709:primaries=bt709,format=yuv420p" '
         '-color_primaries bt709 -color_trc bt709 -colorspace bt709 '
         '-x264-params "colorprim=bt709:transfer=bt709:colormatrix=bt709" '
-        '-c:v libx264 -b:v 2000k -preset medium '
+        '-c:v libx264 -b:v 2000k -crf 23 -preset medium '
         '-c:a aac -b:a 128k -f hls -hls_time 2 -hls_flags single_file '
         '-hls_list_size 0 -hls_key_info_file ${keyinfo.path} '
         '$prefix/output.m3u8',

From 15d58e3446deb707bc4e7e1dd2e7b04778051f38 Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Wed, 12 Feb 2025 22:23:04 +0530
Subject: [PATCH 120/796] make linters happy

---
 server/ente/errors.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/ente/errors.go b/server/ente/errors.go
index b629674277..79398f755f 100644
--- a/server/ente/errors.go
+++ b/server/ente/errors.go
@@ -95,11 +95,11 @@ var ErrLockUnavailable = errors.New("could not acquire lock")
 var ErrActiveLinkAlreadyExists = errors.New("Collection already has active public link")
 
 // ErrCannotModifyAdminStoragLimit is thrown when the admin is modifying their own storage limit
-var ErrCannotModifyAdminStoragLimit = errors.New("Cannot modify admin storage limit")
+var ErrCannotModifyAdminStoragLimit = errors.New("cannot modify admin storage limit")
 
 // ErrFailedReducingStorageLimit is thrown when the admin is setting storage limit lesser than
 // members pre-consumed storage
-var ErrFailedReducingStorageLimit = errors.New("Members Usage is more than potential storage limit")
+var ErrFailedReducingStorageLimit = errors.New("members usage is more than potential storage limit")
 
 // ErrNotImplemented indicates that the action that we tried to perform is not
 // available at this museum instance. e.g. this could be something that is not

From 2fd5c703c92a8dac9da314bf5e7f4c0dcf7c6b84 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 13 Feb 2025 09:33:15 +0530
Subject: [PATCH 121/796] [mob][photos] Add trip location names

---
 mobile/lib/services/search_service.dart | 26 +++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 7a2fc0ebea..5267d4cb0a 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1498,8 +1498,11 @@ class SearchService {
       for (final trip in tripsToShow) {
         final year =
             DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime).year;
+        final String? locationName = await _tryFindLocationName(trip.files);
         String name = "Trip in $year!";
-        if (year == currentTime.year - 1) {
+        if (locationName != null) {
+          name = "Trip to $locationName!";
+        } else if (year == currentTime.year - 1) {
           name = "Last year's trip!";
         }
         final photoSelection = await _bestSelection(trip.files);
@@ -1546,8 +1549,11 @@ class SearchService {
             final year =
                 DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime)
                     .year;
+            final String? locationName = await _tryFindLocationName(trip.files);
             String name = "Trip in $year!";
-            if (year == currentTime.year - 1) {
+            if (locationName != null) {
+              name = "Trip to $locationName!";
+            } else if (year == currentTime.year - 1) {
               name = "Last year's trip!";
             }
             final photoSelection = await _bestSelection(trip.files);
@@ -1843,6 +1849,22 @@ class SearchService {
     return ((dayOfYear - 1) ~/ 7) + 1;
   }
 
+  Future<String?> _tryFindLocationName(List<EnteFile> files) async {
+    final results = await locationService.getFilesInCity(files, '');
+    final List<City> sortedByResultCount = results.keys.toList()
+      ..sort((a, b) => results[b]!.length.compareTo(results[a]!.length));
+    if (sortedByResultCount.isEmpty) return null;
+    final biggestPlace = sortedByResultCount.first;
+    if (results[biggestPlace]!.length > files.length / 2) {
+      return biggestPlace.city;
+    }
+    if (results.length > 2 &&
+        results.keys.map((city) => city.country).toSet().length == 1) {
+      return biggestPlace.country;
+    }
+    return null;
+  }
+
   /// Returns the best selection of files from the given list.
   /// Makes sure that the selection is not more than [prefferedSize] or 10 files,
   /// and that each year of the original list is represented.

From 2c92411596e148631c0004ee2091aa1ae71919ee Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 13 Feb 2025 09:38:41 +0530
Subject: [PATCH 122/796] [mob][photos] name

---
 mobile/lib/services/search_service.dart | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 5267d4cb0a..8fb765e801 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1499,11 +1499,11 @@ class SearchService {
         final year =
             DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime).year;
         final String? locationName = await _tryFindLocationName(trip.files);
-        String name = "Trip in $year!";
+        String name = "Trip in $year";
         if (locationName != null) {
-          name = "Trip to $locationName!";
+          name = "Trip to $locationName";
         } else if (year == currentTime.year - 1) {
-          name = "Last year's trip!";
+          name = "Last year's trip";
         }
         final photoSelection = await _bestSelection(trip.files);
         searchResults.add(
@@ -1550,11 +1550,11 @@ class SearchService {
                 DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime)
                     .year;
             final String? locationName = await _tryFindLocationName(trip.files);
-            String name = "Trip in $year!";
+            String name = "Trip in $year";
             if (locationName != null) {
-              name = "Trip to $locationName!";
+              name = "Trip to $locationName";
             } else if (year == currentTime.year - 1) {
-              name = "Last year's trip!";
+              name = "Last year's trip";
             }
             final photoSelection = await _bestSelection(trip.files);
             searchResults.add(

From 562ead3202a6b568ce2a86d6f23e89141bb4dd2c Mon Sep 17 00:00:00 2001
From: vishnukvmd <vishnu@ente.io>
Date: Thu, 13 Feb 2025 09:56:25 +0530
Subject: [PATCH 123/796] [mob] Notify Discord when internal releases are ready

---
 .github/workflows/auth-internal-release.yml   | 8 ++++++++
 .github/workflows/mobile-internal-release.yml | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/.github/workflows/auth-internal-release.yml b/.github/workflows/auth-internal-release.yml
index 0a3d192856..5cefedae3b 100644
--- a/.github/workflows/auth-internal-release.yml
+++ b/.github/workflows/auth-internal-release.yml
@@ -54,3 +54,11 @@ jobs:
                   packageName: io.ente.auth
                   releaseFiles: auth/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
                   track: internal
+
+            - name: Notify Discord
+              uses: sarisia/actions-status-discord@v1
+              with:
+                  nodetail: true
+                  title: "🏆 Internal release available for Auth"
+                  description: "[Download](https://play.google.com/store/apps/details?id=io.ente.auth)"
+                  color: 0x800080
diff --git a/.github/workflows/mobile-internal-release.yml b/.github/workflows/mobile-internal-release.yml
index ae5535f655..a18d3d89b6 100644
--- a/.github/workflows/mobile-internal-release.yml
+++ b/.github/workflows/mobile-internal-release.yml
@@ -54,3 +54,11 @@ jobs:
                   packageName: io.ente.photos
                   releaseFiles: mobile/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
                   track: internal
+            
+            - name: Notify Discord
+              uses: sarisia/actions-status-discord@v1
+              with:
+                  nodetail: true
+                  title: "🏆 Internal release available for Photos"
+                  description: "[Download](https://play.google.com/store/apps/details?id=io.ente.photos)"
+                  color: 0x00ff00

From 8a90eba39a369437b0509e5880356ca80bdc7ded Mon Sep 17 00:00:00 2001
From: vishnukvmd <vishnu@ente.io>
Date: Thu, 13 Feb 2025 09:58:36 +0530
Subject: [PATCH 124/796] Add webhook

---
 .github/workflows/auth-internal-release.yml   | 1 +
 .github/workflows/mobile-internal-release.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/auth-internal-release.yml b/.github/workflows/auth-internal-release.yml
index 5cefedae3b..b83ea10ee8 100644
--- a/.github/workflows/auth-internal-release.yml
+++ b/.github/workflows/auth-internal-release.yml
@@ -58,6 +58,7 @@ jobs:
             - name: Notify Discord
               uses: sarisia/actions-status-discord@v1
               with:
+                  webhook: ${{ secrets.DISCORD_INTERNAL_RELEASE_WEBHOOK }}
                   nodetail: true
                   title: "🏆 Internal release available for Auth"
                   description: "[Download](https://play.google.com/store/apps/details?id=io.ente.auth)"
diff --git a/.github/workflows/mobile-internal-release.yml b/.github/workflows/mobile-internal-release.yml
index a18d3d89b6..cbba50064f 100644
--- a/.github/workflows/mobile-internal-release.yml
+++ b/.github/workflows/mobile-internal-release.yml
@@ -58,6 +58,7 @@ jobs:
             - name: Notify Discord
               uses: sarisia/actions-status-discord@v1
               with:
+                  webhook: ${{ secrets.DISCORD_INTERNAL_RELEASE_WEBHOOK }}
                   nodetail: true
                   title: "🏆 Internal release available for Photos"
                   description: "[Download](https://play.google.com/store/apps/details?id=io.ente.photos)"

From 1200dbb6a990b9103d18a8ad2548d170e2e5a73a Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 13 Feb 2025 10:05:40 +0530
Subject: [PATCH 125/796] [mob][photos] base names

---
 mobile/lib/services/search_service.dart | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 8fb765e801..3a4d16a879 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1450,7 +1450,15 @@ class SearchService {
 
     // For now for testing let's just surface all base locations
     for (final baseLocation in baseLocations) {
-      final name = "Base (${baseLocation.isCurrentBase ? 'current' : 'old'})";
+      String name = "Base (${baseLocation.isCurrentBase ? 'current' : 'old'})";
+      final String? locationName = await _tryFindLocationName(
+        baseLocation.files,
+        base: true,
+      );
+      if (locationName != null) {
+        name =
+            "$locationName (Base, ${baseLocation.isCurrentBase ? 'current' : 'old'})";
+      }
       searchResults.add(
         GenericSearchResult(
           ResultType.event,
@@ -1849,7 +1857,8 @@ class SearchService {
     return ((dayOfYear - 1) ~/ 7) + 1;
   }
 
-  Future<String?> _tryFindLocationName(List<EnteFile> files) async {
+  Future<String?> _tryFindLocationName(List<EnteFile> files,
+      {bool base = false,}) async {
     final results = await locationService.getFilesInCity(files, '');
     final List<City> sortedByResultCount = results.keys.toList()
       ..sort((a, b) => results[b]!.length.compareTo(results[a]!.length));
@@ -1859,7 +1868,8 @@ class SearchService {
       return biggestPlace.city;
     }
     if (results.length > 2 &&
-        results.keys.map((city) => city.country).toSet().length == 1) {
+        results.keys.map((city) => city.country).toSet().length == 1 &&
+        !base) {
       return biggestPlace.country;
     }
     return null;

From 74db8767a2d878c1eda072f08df7da1831b4859b Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 13 Feb 2025 10:35:54 +0530
Subject: [PATCH 126/796] [mob][photos] Fix base location regression

---
 mobile/lib/services/search_service.dart | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 3a4d16a879..dbe18c14d9 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1215,8 +1215,7 @@ class SearchService {
       if (!file.hasLocation ||
           file.uploadedFileID == null ||
           !file.isOwner ||
-          file.creationTime == null ||
-          file.creationTime! > cutOffTime.microsecondsSinceEpoch) {
+          file.creationTime == null) {
         continue;
       }
       // Check if the file is inside any location tag
@@ -1442,10 +1441,13 @@ class SearchService {
       );
     }
 
-    // Remove too small trips
+    // Remove too small and too recent trips
     final List<TripMemory> validTrips = [];
     for (final trip in mergedTrips) {
-      if (trip.files.length >= 20) validTrips.add(trip);
+      if (trip.files.length >= 20 &&
+          trip.averageCreationTime < cutOffTime.microsecondsSinceEpoch) {
+        validTrips.add(trip);
+      }
     }
 
     // For now for testing let's just surface all base locations
@@ -1857,8 +1859,10 @@ class SearchService {
     return ((dayOfYear - 1) ~/ 7) + 1;
   }
 
-  Future<String?> _tryFindLocationName(List<EnteFile> files,
-      {bool base = false,}) async {
+  Future<String?> _tryFindLocationName(
+    List<EnteFile> files, {
+    bool base = false,
+  }) async {
     final results = await locationService.getFilesInCity(files, '');
     final List<City> sortedByResultCount = results.keys.toList()
       ..sort((a, b) => results[b]!.length.compareTo(results[a]!.length));

From 33b56a22575bcdc07ae29a7481caf128002fa928 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 13 Feb 2025 11:11:21 +0530
Subject: [PATCH 127/796] [cli] Skip cli init for version,docs & help

---
 cli/main.go | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/cli/main.go b/cli/main.go
index 990d751b01..44ea65aef8 100644
--- a/cli/main.go
+++ b/cli/main.go
@@ -50,18 +50,21 @@ func main() {
 		}
 	}
 
-	// Define a set of commands that do not require KeyHolder initialisation.
-	skipKeyHolderCommands := map[string]struct{}{"version": {}, "docs": {}, "help": {}}
+	// Define a set of commands that do not require KeyHolder or cli initialisation.
+	skipInitCommands := map[string]struct{}{"version": {}, "docs": {}, "help": {}}
 
 	var keyHolder *secrets.KeyHolder
-
 	// Only initialise KeyHolder if the command isn't in the skip list.
+	shouldInit := len(os.Args) > 1
 	if len(os.Args) > 1 {
-		if _, skip := skipKeyHolderCommands[os.Args[1]]; !skip {
-			keyHolder = secrets.NewKeyHolder(secrets.GetOrCreateClISecret())
+		if _, skip := skipInitCommands[os.Args[1]]; skip {
+			shouldInit = false
 		}
 	}
 
+	if shouldInit {
+		keyHolder = secrets.NewKeyHolder(secrets.GetOrCreateClISecret())
+	}
 	ctrl := pkg.ClICtrl{
 		Client: api.NewClient(api.Params{
 			Debug: viper.GetBool("log.http"),
@@ -71,16 +74,10 @@ func main() {
 		KeyHolder: keyHolder,
 	}
 
-	err = ctrl.Init()
-	if err != nil {
-		panic(err)
+	if len(os.Args) == 1 {
+		// If no arguments are passed, show help
+		os.Args = append(os.Args, "help")
 	}
-	defer func() {
-		if err := db.Close(); err != nil {
-			panic(err)
-		}
-	}()
-
 	if len(os.Args) == 2 && os.Args[1] == "docs" {
 		log.Println("Generating docs")
 		err = cmd.GenerateDocs()
@@ -89,9 +86,16 @@ func main() {
 		}
 		return
 	}
-	if len(os.Args) == 1 {
-		// If no arguments are passed, show help
-		os.Args = append(os.Args, "help")
+	if shouldInit {
+		err = ctrl.Init()
+		if err != nil {
+			panic(err)
+		}
+		defer func() {
+			if err := db.Close(); err != nil {
+				panic(err)
+			}
+		}()
 	}
 	if os.Args[1] == "version" && viper.GetString("endpoint.api") != constants.EnteApiUrl {
 		log.Printf("Custom endpoint: %s\n", viper.GetString("endpoint.api"))
@@ -120,10 +124,10 @@ func initConfig(cliConfigDir string) {
 func GetCLIConfigDir() (string, error) {
 	var configDir = os.Getenv("ENTE_CLI_CONFIG_DIR")
 
-  if configDir == "" {
-    // for backward compatibility, check for ENTE_CLI_CONFIG_PATH
-    configDir = os.Getenv("ENTE_CLI_CONFIG_PATH")
-  }
+	if configDir == "" {
+		// for backward compatibility, check for ENTE_CLI_CONFIG_PATH
+		configDir = os.Getenv("ENTE_CLI_CONFIG_PATH")
+	}
 
 	if configDir != "" {
 		// remove trailing slash (for all OS)

From a5efee1ae3302ed038eb4b23a896c676115c4d34 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 13 Feb 2025 11:16:15 +0530
Subject: [PATCH 128/796] [cli] Update version v0.2.3

---
 cli/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/main.go b/cli/main.go
index 44ea65aef8..15dc6ac5a3 100644
--- a/cli/main.go
+++ b/cli/main.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 )
 
-var AppVersion = "0.2.2"
+var AppVersion = "0.2.3"
 
 func main() {
 	cliConfigDir, err := GetCLIConfigDir()

From b1ce7b6edbe697cc3e65698c982c736babe33188 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 13 Feb 2025 11:16:32 +0530
Subject: [PATCH 129/796] [mob][photos] Fix empty facethumbnail due to decoding
 issue

---
 mobile/lib/utils/face/face_box_crop.dart | 2 +-
 mobile/lib/utils/image_ml_util.dart      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/utils/face/face_box_crop.dart b/mobile/lib/utils/face/face_box_crop.dart
index c39e164977..c75be4a533 100644
--- a/mobile/lib/utils/face/face_box_crop.dart
+++ b/mobile/lib/utils/face/face_box_crop.dart
@@ -216,7 +216,7 @@ Future<Map<String, Uint8List>?> _getFaceCrops(
     faceBoxes,
   );
   final Map<String, Uint8List> result = {};
-  for (int i = 0; i < faceIds.length; i++) {
+  for (int i = 0; i < faceCrop.length; i++) {
     result[faceIds[i]] = faceCrop[i];
   }
   return result;
diff --git a/mobile/lib/utils/image_ml_util.dart b/mobile/lib/utils/image_ml_util.dart
index dd1e4512bc..bdd84d96f1 100644
--- a/mobile/lib/utils/image_ml_util.dart
+++ b/mobile/lib/utils/image_ml_util.dart
@@ -170,7 +170,7 @@ Future<List<Uint8List>> generateFaceThumbnailsUsingCanvas(
     return faceThumbnails;
   } catch (e, s) {
     _logger.severe(
-      'Error generating face thumbnails. cropImage problematic input argument: ${faceBoxes[i]}',
+      'Error generating face thumbnails. cropImage problematic input argument: ${i}th facebox: ${faceBoxes[i].toString()}',
       e,
       s,
     );

From a41c359ae4ac62c0a81acb0d60974dd63c4bfe7a Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Thu, 13 Feb 2025 11:57:36 +0530
Subject: [PATCH 130/796] use FetchMembersForAdminID to get storage including
 bonuses

remove unneeded api calls

omit unnecessary checks
---
 server/pkg/controller/family/admin.go | 35 +++++++++++++--------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/server/pkg/controller/family/admin.go b/server/pkg/controller/family/admin.go
index 228d16f0c4..056bc92835 100644
--- a/server/pkg/controller/family/admin.go
+++ b/server/pkg/controller/family/admin.go
@@ -192,18 +192,25 @@ func (c *Controller) CloseFamily(ctx context.Context, adminID int64) error {
 
 // ModifyMemberStorage allows admin user to update the storageLimit for a member in the family
 func (c *Controller) ModifyMemberStorage(ctx context.Context, adminID int64, id uuid.UUID, storageLimit *int64) error {
-	familyAdminID, err := c.UserRepo.GetFamilyAdminID(adminID)
-	if err != nil {
-		return stacktrace.Propagate(ente.ErrBadRequest, "Could not get family admin ID")
-	}
-
 	member, err := c.FamilyRepo.GetMemberById(ctx, id)
 	if err != nil {
 		return stacktrace.Propagate(err, "Couldn't fetch Family Member")
 	}
 
-	// gets admin subscription in order to get the size of total storage quota
-	activeSub, err := c.BillingCtrl.GetActiveSubscription(adminID)
+	if member.AdminUserID != adminID {
+		return stacktrace.Propagate(ente.ErrBadRequest, "you do not have sufficient permission")
+	}
+
+	if member.IsAdmin {
+		return stacktrace.Propagate(ente.ErrCannotModifyAdminStoragLimit, "cannot modify admin storage limit")
+	}
+
+	if member.Status != ente.ACCEPTED {
+		return stacktrace.Propagate(ente.ErrBadRequest, "user is not a part of family")
+	}
+
+	// gets admin subscription in order to get the size of total storage quota (including bonus)
+	activeSub, err := c.FetchMembersForAdminID(ctx, member.AdminUserID)
 	if err != nil {
 		return stacktrace.Propagate(ente.ErrNoActiveSubscription, "couldn't get active subscription")
 	}
@@ -219,21 +226,13 @@ func (c *Controller) ModifyMemberStorage(ctx context.Context, adminID int64, id
 		return stacktrace.Propagate(memUsageErr, "Couldn't find members storage usage")
 	}
 
-	if adminID == *familyAdminID && member.IsAdmin {
-		return stacktrace.Propagate(ente.ErrCannotModifyAdminStoragLimit, "cannot modify admin storage limit")
-	}
-
 	if memberUsage > *storageLimit {
 		return stacktrace.Propagate(ente.ErrFailedReducingStorageLimit, "Cannot reduce storage, current usage is more.")
 	}
 
-	if id == member.ID && member.Status == "ACCEPTED" {
-		err := c.FamilyRepo.ModifyMemberStorage(ctx, adminID, member.ID, storageLimit)
-		if err != nil {
-			return stacktrace.Propagate(err, "Cannot Modify Members Storage")
-		}
-	} else {
-		return stacktrace.Propagate(ente.ErrBadRequest, "user is not a part of family")
+	modifyStorageErr := c.FamilyRepo.ModifyMemberStorage(ctx, adminID, member.ID, storageLimit)
+	if modifyStorageErr != nil {
+		return stacktrace.Propagate(modifyStorageErr, "Cannot Modify Members Storage")
 	}
 	return nil
 }

From c2ca87d3afad91b6b69d46a295bc78fcb264194d Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 13 Feb 2025 12:13:14 +0530
Subject: [PATCH 131/796] [mob][photos] log device ram

---
 mobile/lib/core/error-reporting/super_logging.dart | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mobile/lib/core/error-reporting/super_logging.dart b/mobile/lib/core/error-reporting/super_logging.dart
index 55e93c5947..dbe2258098 100644
--- a/mobile/lib/core/error-reporting/super_logging.dart
+++ b/mobile/lib/core/error-reporting/super_logging.dart
@@ -18,6 +18,7 @@ import 'package:photos/core/error-reporting/tunneled_transport.dart';
 import "package:photos/core/errors.dart";
 import 'package:photos/models/typedefs.dart';
 import "package:photos/utils/device_info.dart";
+import "package:photos/utils/ram_check_util.dart";
 import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -205,6 +206,12 @@ class SuperLogging {
       }),
     );
 
+    unawaited(
+      checkDeviceTotalRAM().then((ram) {
+        if (ram != null) $.info("Device RAM: ${ram}MB");
+      }),
+    );
+
     if (appConfig.body == null) return;
 
     if (enable && sentryIsEnabled) {

From d35975b26e13055ca144abbd9f9c2dd5c2d6513c Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Thu, 13 Feb 2025 12:13:52 +0530
Subject: [PATCH 132/796] fix(preview-queue): put higher duration videos at
 last

---
 mobile/lib/services/preview_video_store.dart | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 39b1fe134d..65227aad53 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -588,7 +588,12 @@ class PreviewVideoStore {
     final previewIds = FileDataService.instance.previewIds;
     final allFiles = files
         .where((file) => previewIds?[file.uploadedFileID] == null)
-        .toList();
+        .sorted((a, b) {
+      // put higher duration videos first
+      final first = a.duration == null || a.duration! >= 20 * 60 * 60 ? 1 : 0;
+      final second = b.duration == null || b.duration! >= 20 * 60 * 60 ? 1 : 0;
+      return first.compareTo(second);
+    }).toList();
 
     // set all video status to be in queue
     for (final enteFile in allFiles) {
@@ -612,12 +617,14 @@ class PreviewVideoStore {
           }
         }
       }
+
       _items[enteFile.uploadedFileID!] = PreviewItem(
         status: PreviewItemStatus.inQueue,
         file: enteFile,
         collectionID: enteFile.collectionID ?? 0,
       );
     }
+
     Bus.instance.fire(PreviewUpdatedEvent(_items));
 
     final file = allFiles.first;

From b8de2bf7361d40ae528d3ae1974caa768263a6c8 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Thu, 13 Feb 2025 12:41:06 +0530
Subject: [PATCH 133/796] chore: update locks

---
 mobile/ios/Podfile.lock | 110 ++++++++++++++++++++--------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index 4a76000080..2c68051fd3 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -439,82 +439,82 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/wakelock_plus/ios"
 
 SPEC CHECKSUMS:
-  background_fetch: 39f11371c0dce04b001c4bfd5e782bcccb0a85e2
-  battery_info: 09f5c9ee65394f2291c8c6227bedff345b8a730c
-  connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
-  dart_ui_isolate: d5bcda83ca4b04f129d70eb90110b7a567aece14
-  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
+  background_fetch: 94b36ee293e82972852dba8ede1fbcd3bd3d9d57
+  battery_info: a06b00c06a39bc94c92beebf600f1810cb6c8c87
+  connectivity_plus: 3f6c9057f4cd64198dc826edfb0542892f825343
+  dart_ui_isolate: 46f6714abe6891313267153ef6f9748d8ecfcab1
+  device_info_plus: 335f3ce08d2e174b9fdc3db3db0f4e3b1f66bd89
   ffmpeg-kit-ios-full-gpl: 80adc341962e55ef709e36baa8ed9a70cf4ea62b
-  ffmpeg_kit_flutter_full_gpl: 8d15c14c0c3aba616fac04fe44b3d27d02e3c330
-  file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
+  ffmpeg_kit_flutter_full_gpl: ce18b888487c05c46ed252cd2e7956812f2e3bd1
+  file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
   Firebase: 98e6bf5278170668a7983e12971a66b2cd57fc8c
-  firebase_core: 2bedc3136ec7c7b8561c6123ed0239387b53f2af
-  firebase_messaging: 15d114e1a41fc31e4fbabcd48d765a19eec94a38
+  firebase_core: 085320ddfaacb80d1a96eac3a87857afcc150db1
+  firebase_messaging: d398edc15fe825f832836e74f6ac61e8cd2f3ad3
   FirebaseCore: a282032ae9295c795714ded2ec9c522fc237f8da
   FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2
   FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414
   FirebaseMessaging: c9ec7b90c399c7a6100297e9d16f8a27fc7f7152
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
-  flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433
-  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
-  flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
-  flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
-  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
-  flutter_sodium: c84426b4de738514b5b66cfdeb8a06634e72fe0b
-  fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c
+  flutter_email_sender: cd533cdc7ea5eda6fabb2c7f78521c71207778a4
+  flutter_image_compress: 4b058288a81f76e5e80340af37c709abafff34c4
+  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
+  flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100
+  flutter_native_splash: 35ddbc7228eafcb3969dcc5f1fbbe27c1145a4f0
+  flutter_secure_storage: 2c2ff13db9e0a5647389bff88b0ecac56e3f3418
+  flutter_sodium: 152647449ba89a157fd48d7e293dcd6d29c6ab0e
+  fluttertoast: 76fea30fcf04176325f6864c87306927bd7d2038
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
-  home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57
-  image_editor_common: d6f6644ae4a6de80481e89fe6d0a8c49e30b4b43
-  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
-  in_app_purchase_storekit: 8c3b0b3eb1b0f04efbff401c3de6266d4258d433
-  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
+  home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
+  image_editor_common: 3de87e7c4804f4ae24c8f8a998362b98c105cac1
+  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
+  in_app_purchase_storekit: e126ef1b89e4a9fdf07e28f005f82632b4609437
+  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
   libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
-  local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
-  local_auth_ios: 5046a18c018dd973247a0564496c8898dbb5adf9
+  local_auth_darwin: 553ce4f9b16d3fdfeafce9cf042e7c9f77c1c391
+  local_auth_ios: f7a1841beef3151d140a967c2e46f30637cdf451
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
-  maps_launcher: 2e5b6a2d664ec6c27f82ffa81b74228d770ab203
-  media_extension: 6d30dc1431ebaa63f43c397c37917b1a0a597a4c
-  media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
-  media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
-  media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
-  motion_sensors: 03f55b7c637a7e365a0b5f9697a449f9059d5d91
-  motionphoto: d4a432b8c8f22fb3ad966258597c0103c9c5ff16
-  move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d
+  maps_launcher: edf829809ba9e894d70e569bab11c16352dedb45
+  media_extension: a1fec16ee9c8241a6aef9613578ebf097d6c5e64
+  media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
+  media_kit_native_event_loop: 5fba1a849a6c87a34985f1e178a0de5bd444a0cf
+  media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
+  motion_sensors: 741e702c17467b9569a92165dda8d4d88c6167f1
+  motionphoto: 584b43031ead3060225cdff08fa49818879801d2
+  move_to_background: 155f7bfbd34d43ad847cb630d2d2d87c17199710
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  native_video_player: d12af78a1a4a8cf09775a5177d5b392def6fd23c
-  onnxruntime: e7c2ae44385191eaad5ae64c935a72debaddc997
+  native_video_player: b65c58951ede2f93d103a25366bdebca95081265
+  onnxruntime: f9b296392c96c42882be020a59dbeac6310d81b2
   onnxruntime-c: a909204639a1f035f575127ac406f781ac797c9c
   onnxruntime-objc: b6fab0f1787aa6f7190c2013f03037df4718bd8b
-  open_mail_app: 794172f6a22cd16319d3ddaf45e945b2f74952b0
+  open_mail_app: 06d5a4162866388a92b1df3deb96e56be20cf45c
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
-  photo_manager: ff695c7a1dd5bc379974953a2b5c0a293f7c4c8a
-  privacy_screen: 1a131c052ceb3c3659934b003b0d397c2381a24e
+  package_info_plus: 566e1b7a2f3900e4b0020914ad3fc051dcc95596
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
+  photo_manager: d2fbcc0f2d82458700ee6256a15018210a81d413
+  privacy_screen: 3159a541f5d3a31bea916cfd4e58f9dc722b3fd4
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  receive_sharing_intent: df9c334dc9feadcbd3266e5cb49c8443405e1c9f
-  screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
+  receive_sharing_intent: f6a12b7e8f7ed745f61c982de8a65de88db44a44
+  screen_brightness_ios: 5ed898fa50fa82a26171c086ca5e28228f932576
   SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
   Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
-  sentry_flutter: 0eb93e5279eb41e2392212afe1ccd2fecb4f8cbe
-  share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sqflite_darwin: a553b1fd6fe66f53bbb0fe5b4f5bab93f08d7a13
+  sentry_flutter: 0a211008f52553ba5dd81ceb71f48d78f0f1f6ab
+  share_plus: 011d6fb4f9d2576b83179a3a5c5e323202cdabcf
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sqflite_darwin: 44bb54cc302bff1fbe5752293aba1820b157cf1c
   sqlite3: 0bb0e6389d824e40296f531b858a2a0b71c0d2fb
-  sqlite3_flutter_libs: c00457ebd31e59fa6bb830380ddba24d44fbcd3b
-  system_info_plus: 5393c8da281d899950d751713575fbf91c7709aa
+  sqlite3_flutter_libs: 9379996d65aa23dcda7585a5b58766cebe0aa042
+  system_info_plus: 555ce7047fbbf29154726db942ae785c29211740
   Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
-  ua_client_hints: 46bb5817a868f9e397c0ba7e3f2f5c5d90c35156
-  uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
-  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
-  video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1
-  volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
-  wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
+  ua_client_hints: 0b48eae1134283f5b131ee0871fa878377f07a01
+  uni_links: ed8c961e47ed9ce42b6d91e1de8049e38a4b3152
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
+  video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
+  video_thumbnail: b637e0ad5f588ca9945f6e2c927f73a69a661140
+  volume_controller: ca1cde542ee70fad77d388f82e9616488110942b
+  wakelock_plus: 8c239121a007daa1d6759c6acdc507860273dd2f
 
 PODFILE CHECKSUM: 20e086e6008977d43a3d40260f3f9bffcac748dd
 

From ac9f4e31810e646ddf9b8e33c38294259d27ecac Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Thu, 13 Feb 2025 12:46:43 +0530
Subject: [PATCH 134/796] fix: behavior

---
 mobile/lib/services/preview_video_store.dart | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 65227aad53..2598025f5e 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -589,9 +589,9 @@ class PreviewVideoStore {
     final allFiles = files
         .where((file) => previewIds?[file.uploadedFileID] == null)
         .sorted((a, b) {
-      // put higher duration videos first
-      final first = a.duration == null || a.duration! >= 20 * 60 * 60 ? 1 : 0;
-      final second = b.duration == null || b.duration! >= 20 * 60 * 60 ? 1 : 0;
+      // put higher duration videos last
+      final first = a.duration == null || a.duration! >= 10 * 60 * 60 ? 1 : 0;
+      final second = b.duration == null || b.duration! >= 10 * 60 * 60 ? 1 : 0;
       return first.compareTo(second);
     }).toList();
 

From f902b7e75c114b7f85ad65104ebdb2516f545161 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 13 Feb 2025 12:51:38 +0530
Subject: [PATCH 135/796] [mob][photos] ML dev options

---
 .../machine_learning/ml_indexing_isolate.dart | 22 +++++
 .../ui/settings/ml/ml_user_dev_screen.dart    | 86 +++++++++++++++++++
 2 files changed, 108 insertions(+)

diff --git a/mobile/lib/services/machine_learning/ml_indexing_isolate.dart b/mobile/lib/services/machine_learning/ml_indexing_isolate.dart
index 11e5375a61..52da789eb7 100644
--- a/mobile/lib/services/machine_learning/ml_indexing_isolate.dart
+++ b/mobile/lib/services/machine_learning/ml_indexing_isolate.dart
@@ -193,6 +193,28 @@ class MLIndexingIsolate extends SuperIsolate {
     }
   }
 
+  /// WARNING: This method is only for debugging purposes. It should not be used in production.
+  Future<void> debugLoadSingleModel(MLModels model) {
+    return _initModelLock.synchronized(() async {
+      final modelInstance = model.model;
+      if (modelInstance.isInitialized) {
+        _logger.info("Model ${model.name} already loaded");
+        return;
+      }
+      final modelName = modelInstance.modelName;
+      final modelPath = await modelInstance.downloadModelSafe();
+      if (modelPath == null) {
+        _logger.severe("Could not download model, no wifi");
+        return;
+      }
+      final address = await runInIsolate(IsolateOperation.loadModel, {
+        "modelName": modelName,
+        "modelPath": modelPath,
+      }) as int;
+      modelInstance.storeSessionAddress(address);
+    });
+  }
+
   Future<void> cleanupLocalIndexingModels({bool delete = false}) async {
     if (!areModelsDownloaded) return;
     await _releaseModels();
diff --git a/mobile/lib/ui/settings/ml/ml_user_dev_screen.dart b/mobile/lib/ui/settings/ml/ml_user_dev_screen.dart
index f295d4b202..e68ec6d295 100644
--- a/mobile/lib/ui/settings/ml/ml_user_dev_screen.dart
+++ b/mobile/lib/ui/settings/ml/ml_user_dev_screen.dart
@@ -5,6 +5,8 @@ import "package:photos/db/ml/base.dart";
 import "package:photos/db/ml/db.dart";
 import "package:photos/events/people_changed_event.dart";
 import "package:photos/service_locator.dart";
+import "package:photos/services/machine_learning/ml_indexing_isolate.dart";
+import "package:photos/services/machine_learning/ml_models_overview.dart";
 import "package:photos/services/machine_learning/semantic_search/semantic_search_service.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/components/buttons/button_widget.dart";
@@ -104,6 +106,90 @@ class _MLUserDeveloperOptionsState extends State<MLUserDeveloperOptions> {
                       isBottomBorderRadiusRemoved: true,
                       isGestureDetectorDisabled: true,
                     ),
+                    const SizedBox(height: 24),
+                    ButtonWidget(
+                      buttonType: ButtonType.neutral,
+                      labelText: "Load face detection model",
+                      onTap: () async {
+                        try {
+                          await MLIndexingIsolate.instance
+                              .debugLoadSingleModel(MLModels.faceDetection);
+                        } catch (e, s) {
+                          _logger.severe(
+                            "Could not load face detection model",
+                            e,
+                            s,
+                          );
+                          await showGenericErrorDialog(
+                            context: context,
+                            error: e,
+                          );
+                        }
+                      },
+                    ),
+                    const SizedBox(height: 24),
+                    ButtonWidget(
+                      buttonType: ButtonType.neutral,
+                      labelText: "Load face recognition model",
+                      onTap: () async {
+                        try {
+                          await MLIndexingIsolate.instance
+                              .debugLoadSingleModel(MLModels.faceEmbedding);
+                        } catch (e, s) {
+                          _logger.severe(
+                            "Could not load face detection model",
+                            e,
+                            s,
+                          );
+                          await showGenericErrorDialog(
+                            context: context,
+                            error: e,
+                          );
+                        }
+                      },
+                    ),
+                    const SizedBox(height: 24),
+                    ButtonWidget(
+                      buttonType: ButtonType.neutral,
+                      labelText: "Load clip image model",
+                      onTap: () async {
+                        try {
+                          await MLIndexingIsolate.instance
+                              .debugLoadSingleModel(MLModels.clipImageEncoder);
+                        } catch (e, s) {
+                          _logger.severe(
+                            "Could not load face detection model",
+                            e,
+                            s,
+                          );
+                          await showGenericErrorDialog(
+                            context: context,
+                            error: e,
+                          );
+                        }
+                      },
+                    ),
+                    const SizedBox(height: 24),
+                    ButtonWidget(
+                      buttonType: ButtonType.neutral,
+                      labelText: "Load clip text model",
+                      onTap: () async {
+                        try {
+                          await MLIndexingIsolate.instance
+                              .debugLoadSingleModel(MLModels.clipTextEncoder);
+                        } catch (e, s) {
+                          _logger.severe(
+                            "Could not load face detection model",
+                            e,
+                            s,
+                          );
+                          await showGenericErrorDialog(
+                            context: context,
+                            error: e,
+                          );
+                        }
+                      },
+                    ),
                     const SafeArea(
                       child: SizedBox(
                         height: 12,

From 0e9153f4ab88c787da93f31f7cf6ba6b2c83c299 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Thu, 13 Feb 2025 13:06:26 +0530
Subject: [PATCH 136/796] [web] Improve logging of new HTTP errors

...to match how the old HTTPService ones would've behaved.
---
 .../components/two-factor/VerifyTwoFactor.tsx |  2 +-
 web/packages/accounts/services/srp-remote.ts  | 23 ++++++++-----------
 web/packages/base/http.ts                     | 15 ++++++++----
 .../components/VerifyMasterPasswordForm.tsx   |  4 +---
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/web/packages/accounts/components/two-factor/VerifyTwoFactor.tsx b/web/packages/accounts/components/two-factor/VerifyTwoFactor.tsx
index 9f37cc52a3..0633a35060 100644
--- a/web/packages/accounts/components/two-factor/VerifyTwoFactor.tsx
+++ b/web/packages/accounts/components/two-factor/VerifyTwoFactor.tsx
@@ -38,7 +38,7 @@ export function VerifyTwoFactor(props: Props) {
         } catch (e) {
             resetForm();
             const message = e instanceof Error ? e.message : "";
-            setFieldError("otp", `${t("generic_error_retry")} ${message}`);
+            setFieldError("otp", `${t("generic_error_retry")} (${message})`);
             // Workaround (toggling shouldAutoFocus) to reset the focus back to
             // the first input field in case of errors.
             // https://github.com/devfolioco/react-otp-input/issues/420
diff --git a/web/packages/accounts/services/srp-remote.ts b/web/packages/accounts/services/srp-remote.ts
index 1aad4ddb2a..4d860d2de3 100644
--- a/web/packages/accounts/services/srp-remote.ts
+++ b/web/packages/accounts/services/srp-remote.ts
@@ -1,3 +1,4 @@
+import { ensureOk, publicRequestHeaders } from "@/base/http";
 import log from "@/base/log";
 import { apiURL } from "@/base/origins";
 import { ApiError, CustomError } from "@ente/shared/error";
@@ -131,19 +132,15 @@ export const completeSRPSetup = async (
 };
 
 export const createSRPSession = async (srpUserID: string, srpA: string) => {
-    try {
-        const resp = await HTTPService.post(
-            await apiURL("/users/srp/create-session"),
-            {
-                srpUserID,
-                srpA,
-            },
-        );
-        return resp.data as CreateSRPSessionResponse;
-    } catch (e) {
-        log.error("createSRPSession failed", e);
-        throw e;
-    }
+    const res = await fetch(await apiURL("/users/srp/create-session"), {
+        method: "POST",
+        headers: publicRequestHeaders(),
+        body: JSON.stringify({ srpUserID, srpA }),
+    });
+    ensureOk(res);
+    const data = await res.json();
+    // TODO: Use zod
+    return data as CreateSRPSessionResponse;
 };
 
 export const verifySRPSession = async (
diff --git a/web/packages/base/http.ts b/web/packages/base/http.ts
index 91f9b412dd..3eb98d9bae 100644
--- a/web/packages/base/http.ts
+++ b/web/packages/base/http.ts
@@ -72,6 +72,7 @@ export const authenticatedPublicAlbumsRequestHeaders = ({
  */
 export class HTTPError extends Error {
     res: Response;
+    details: Record<string, string>;
 
     constructor(res: Response) {
         // Trim off any query parameters from the URL before logging, it may
@@ -81,9 +82,10 @@ export class HTTPError extends Error {
         // necessarily the same as the request's URL.
         const url = new URL(res.url);
         url.search = "";
-        super(
-            `Fetch failed: ${url.href}: HTTP ${res.status} ${res.statusText}`,
-        );
+        super(`HTTP ${res.status} ${res.statusText} (${url.pathname})`);
+
+        const requestID = res.headers.get("x-request-id");
+        const details = { url: url.href, ...(requestID ? { requestID } : {}) };
 
         // Cargo culted from
         // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error#custom_error_types
@@ -92,6 +94,7 @@ export class HTTPError extends Error {
 
         this.name = this.constructor.name;
         this.res = res;
+        this.details = details;
     }
 }
 
@@ -100,7 +103,11 @@ export class HTTPError extends Error {
  * {@link Response} does not have a HTTP 2xx status.
  */
 export const ensureOk = (res: Response) => {
-    if (!res.ok) throw new HTTPError(res);
+    if (!res.ok) {
+        const e = new HTTPError(res);
+        log.error(`${e.message} ${JSON.stringify(e.details)}`);
+        throw e;
+    }
 };
 
 /**
diff --git a/web/packages/shared/components/VerifyMasterPasswordForm.tsx b/web/packages/shared/components/VerifyMasterPasswordForm.tsx
index 7e07cffa1d..76c52ee2fe 100644
--- a/web/packages/shared/components/VerifyMasterPasswordForm.tsx
+++ b/web/packages/shared/components/VerifyMasterPasswordForm.tsx
@@ -100,9 +100,7 @@ export default function VerifyMasterPasswordForm({
                         setFieldError(t("incorrect_password"));
                         break;
                     default:
-                        setFieldError(
-                            `${t("generic_error_retry")} ${e.message}`,
-                        );
+                        setFieldError(t("generic_error"));
                 }
             }
         }

From 17c713d3de51bc1ba8519fa47628a2b59dfae15e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Thu, 13 Feb 2025 13:11:09 +0530
Subject: [PATCH 137/796] Ignore the temporary desktop build folder

---
 web/apps/photos/eslint.config.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/apps/photos/eslint.config.mjs b/web/apps/photos/eslint.config.mjs
index 2a735f1efe..c735044bf5 100644
--- a/web/apps/photos/eslint.config.mjs
+++ b/web/apps/photos/eslint.config.mjs
@@ -3,7 +3,7 @@ import config from "@/build-config/eslintrc-next-app.mjs";
 export default [
     ...config,
     {
-        ignores: ["thirdparty"],
+        ignores: ["thirdparty", ".next-desktop"],
     },
     {
         rules: {

From 3b3ba721a295aba406e714e97b723f5f4f8bc142 Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Thu, 13 Feb 2025 14:17:19 +0530
Subject: [PATCH 138/796] revert errors.go

---
 server/ente/errors.go | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/server/ente/errors.go b/server/ente/errors.go
index 79398f755f..aac78f6f73 100644
--- a/server/ente/errors.go
+++ b/server/ente/errors.go
@@ -94,13 +94,6 @@ var ErrLockUnavailable = errors.New("could not acquire lock")
 // ErrActiveLinkAlreadyExists is thrown when the collection already has active public link
 var ErrActiveLinkAlreadyExists = errors.New("Collection already has active public link")
 
-// ErrCannotModifyAdminStoragLimit is thrown when the admin is modifying their own storage limit
-var ErrCannotModifyAdminStoragLimit = errors.New("cannot modify admin storage limit")
-
-// ErrFailedReducingStorageLimit is thrown when the admin is setting storage limit lesser than
-// members pre-consumed storage
-var ErrFailedReducingStorageLimit = errors.New("members usage is more than potential storage limit")
-
 // ErrNotImplemented indicates that the action that we tried to perform is not
 // available at this museum instance. e.g. this could be something that is not
 // enabled on this particular instance of museum.

From 0cef0656f31c1d9435dca3151c4759906be06fd7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Thu, 13 Feb 2025 14:19:04 +0530
Subject: [PATCH 139/796] [desktop] Add IndexedDB circuit breaker

From one customer's logs (Windows):

[rndr] [error] Unhandled promise rejection: Error: The user's token was present in local storage but not in IndexedDB

And thereafter the app started behaving erratically. Restarting fixed it. This
sequence happened during an app update.

This sequence is not reproducible, but adding as a extra precaution adding a
circuit breaker to prevent execution if IndexedDB is not readable.
---
 web/apps/auth/src/pages/_app.tsx               |  1 -
 web/apps/photos/src/pages/_app.tsx             | 18 ++++++++++++------
 .../shared/storage/localStorage/index.ts       | 17 +++++++++++++++++
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/web/apps/auth/src/pages/_app.tsx b/web/apps/auth/src/pages/_app.tsx
index e3c92a117a..187f28c706 100644
--- a/web/apps/auth/src/pages/_app.tsx
+++ b/web/apps/auth/src/pages/_app.tsx
@@ -38,7 +38,6 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
 
     useEffect(() => {
         const user = getData(LS_KEYS.USER) as User | undefined | null;
-        void migrateKVToken(user);
         logStartupBanner(user?.id);
         HTTPService.setHeaders({ "X-Client-Package": clientPackageName });
     }, []);
diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index d551c03017..98bbec1235 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -34,8 +34,8 @@ import { AppContext } from "@/new/photos/types/context";
 import HTTPService from "@ente/shared/network/HTTPService";
 import {
     getData,
+    isLocalStorageAndIndexedDBMismatch,
     LS_KEYS,
-    migrateKVToken,
 } from "@ente/shared/storage/localStorage";
 import type { User } from "@ente/shared/user/types";
 import "@fontsource-variable/inter";
@@ -68,13 +68,21 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
 
     const [watchFolderView, setWatchFolderView] = useState(false);
 
+    const logout = useCallback(() => void photosLogout(), []);
+
     useEffect(() => {
         const user = getData(LS_KEYS.USER) as User | undefined | null;
-        void migrateKVToken(user);
         logStartupBanner(user?.id);
         HTTPService.setHeaders({ "X-Client-Package": clientPackageName });
-        void runMigrations();
-    }, []);
+        void isLocalStorageAndIndexedDBMismatch().then((mismatch) => {
+            if (mismatch) {
+                log.error("Logging out (IndexedDB and local storage mismatch)");
+                return logout();
+            } else {
+                return runMigrations();
+            }
+        });
+    }, [logout]);
 
     useEffect(() => {
         const electron = globalThis.electron;
@@ -149,8 +157,6 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
         }, 0);
     }, []);
 
-    const logout = useCallback(() => void photosLogout(), []);
-
     const appContext = useMemo(
         () => ({
             showLoadingBar,
diff --git a/web/packages/shared/storage/localStorage/index.ts b/web/packages/shared/storage/localStorage/index.ts
index c11f3d2d60..56baa1ab0b 100644
--- a/web/packages/shared/storage/localStorage/index.ts
+++ b/web/packages/shared/storage/localStorage/index.ts
@@ -95,3 +95,20 @@ export const migrateKVToken = async (user: unknown) => {
             "The user's token was present in local storage but not in IndexedDB",
         );
 };
+
+/**
+ * Return true if the user's data is in local storage but not in IndexedDB.
+ *
+ * This acts a sanity check on IndexedDB by ensuring that if the user has a
+ * token in local storage, then it should also be present in IndexedDB.
+ */
+export const isLocalStorageAndIndexedDBMismatch = async () => {
+    const oldLSUser = getData(LS_KEYS.USER);
+    return (
+        oldLSUser &&
+        typeof oldLSUser == "object" &&
+        "token" in oldLSUser &&
+        typeof oldLSUser.token == "string" &&
+        !(await getKVS("token"))
+    );
+};

From 3589cc5bbfeb706fb4f92a31fdc60ebb6b11a9c4 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Thu, 13 Feb 2025 14:35:08 +0530
Subject: [PATCH 140/796] Lint

---
 web/apps/auth/src/pages/_app.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/web/apps/auth/src/pages/_app.tsx b/web/apps/auth/src/pages/_app.tsx
index 187f28c706..68a94d7fb1 100644
--- a/web/apps/auth/src/pages/_app.tsx
+++ b/web/apps/auth/src/pages/_app.tsx
@@ -15,11 +15,7 @@ import {
 import { authTheme } from "@/base/components/utils/theme";
 import { logStartupBanner } from "@/base/log-web";
 import HTTPService from "@ente/shared/network/HTTPService";
-import {
-    LS_KEYS,
-    getData,
-    migrateKVToken,
-} from "@ente/shared/storage/localStorage";
+import { LS_KEYS, getData } from "@ente/shared/storage/localStorage";
 import type { User } from "@ente/shared/user/types";
 import "@fontsource-variable/inter";
 import { CssBaseline } from "@mui/material";

From a407b1baadb677724401ad517be8f1d26c3cbb15 Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Thu, 13 Feb 2025 14:36:46 +0530
Subject: [PATCH 141/796] fix: allow modification for invited user

fix: adds bonus + storage to get total storage

fix: var name changes, use NewBadRequestWithmessage
---
 server/pkg/controller/family/admin.go | 30 ++++++++++++++-------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/server/pkg/controller/family/admin.go b/server/pkg/controller/family/admin.go
index 056bc92835..f0b27e2bca 100644
--- a/server/pkg/controller/family/admin.go
+++ b/server/pkg/controller/family/admin.go
@@ -191,32 +191,34 @@ func (c *Controller) CloseFamily(ctx context.Context, adminID int64) error {
 }
 
 // ModifyMemberStorage allows admin user to update the storageLimit for a member in the family
-func (c *Controller) ModifyMemberStorage(ctx context.Context, adminID int64, id uuid.UUID, storageLimit *int64) error {
+func (c *Controller) ModifyMemberStorage(ctx context.Context, actorUserID int64, id uuid.UUID, storageLimit *int64) error {
 	member, err := c.FamilyRepo.GetMemberById(ctx, id)
 	if err != nil {
 		return stacktrace.Propagate(err, "Couldn't fetch Family Member")
 	}
 
-	if member.AdminUserID != adminID {
+	if member.AdminUserID != actorUserID {
 		return stacktrace.Propagate(ente.ErrBadRequest, "you do not have sufficient permission")
 	}
 
 	if member.IsAdmin {
-		return stacktrace.Propagate(ente.ErrCannotModifyAdminStoragLimit, "cannot modify admin storage limit")
+		return stacktrace.Propagate(ente.NewBadRequestWithMessage("failed to modify storage"), "cannot modify admin storage limit")
 	}
 
-	if member.Status != ente.ACCEPTED {
+	if member.Status != ente.ACCEPTED && member.Status != ente.INVITED {
 		return stacktrace.Propagate(ente.ErrBadRequest, "user is not a part of family")
 	}
 
 	// gets admin subscription in order to get the size of total storage quota (including bonus)
-	activeSub, err := c.FetchMembersForAdminID(ctx, member.AdminUserID)
-	if err != nil {
-		return stacktrace.Propagate(ente.ErrNoActiveSubscription, "couldn't get active subscription")
-	}
-
-	if storageLimit != nil && *storageLimit > activeSub.Storage {
-		return stacktrace.Propagate(ente.ErrStorageLimitExceeded, "potential storage limit is more than subscription storage")
+	if storageLimit != nil {
+		familyMembersData, err := c.FetchMembersForAdminID(ctx, member.AdminUserID)
+		if err != nil {
+			return stacktrace.Propagate(ente.ErrBadRequest, "couldn't get active subscription")
+		}
+		totalFamilyStorage := familyMembersData.Storage + familyMembersData.AdminBonus
+		if *storageLimit > totalFamilyStorage {
+			return stacktrace.Propagate(ente.ErrStorageLimitExceeded, "potential storage limit is more than subscription storage")
+		}
 	}
 
 	// Handle if the admin user tries reducing the storage Limit
@@ -227,12 +229,12 @@ func (c *Controller) ModifyMemberStorage(ctx context.Context, adminID int64, id
 	}
 
 	if memberUsage > *storageLimit {
-		return stacktrace.Propagate(ente.ErrFailedReducingStorageLimit, "Cannot reduce storage, current usage is more.")
+		return stacktrace.Propagate(ente.NewBadRequestWithMessage("Failed to reduce storage"), "User's current usage is more")
 	}
 
-	modifyStorageErr := c.FamilyRepo.ModifyMemberStorage(ctx, adminID, member.ID, storageLimit)
+	modifyStorageErr := c.FamilyRepo.ModifyMemberStorage(ctx, actorUserID, member.ID, storageLimit)
 	if modifyStorageErr != nil {
-		return stacktrace.Propagate(modifyStorageErr, "Cannot Modify Members Storage")
+		return stacktrace.Propagate(modifyStorageErr, "Failed to modify members storage")
 	}
 	return nil
 }

From 7aa8f6f00f4cc4aaad32c8a3acfc9560f345e044 Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Thu, 13 Feb 2025 14:59:52 +0530
Subject: [PATCH 142/796] chore: wrap everything inside nil check for
 storageLimit

---
 server/pkg/controller/family/admin.go | 35 ++++++++++++++-------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/server/pkg/controller/family/admin.go b/server/pkg/controller/family/admin.go
index f0b27e2bca..ae729fd97f 100644
--- a/server/pkg/controller/family/admin.go
+++ b/server/pkg/controller/family/admin.go
@@ -198,11 +198,11 @@ func (c *Controller) ModifyMemberStorage(ctx context.Context, actorUserID int64,
 	}
 
 	if member.AdminUserID != actorUserID {
-		return stacktrace.Propagate(ente.ErrBadRequest, "you do not have sufficient permission")
+		return stacktrace.Propagate(ente.ErrPermissionDenied, "you do not have sufficient permission")
 	}
 
 	if member.IsAdmin {
-		return stacktrace.Propagate(ente.NewBadRequestWithMessage("failed to modify storage"), "cannot modify admin storage limit")
+		return stacktrace.Propagate(ente.NewBadRequestWithMessage("can not limit admin storage"), "cannot modify admin storage limit")
 	}
 
 	if member.Status != ente.ACCEPTED && member.Status != ente.INVITED {
@@ -219,23 +219,24 @@ func (c *Controller) ModifyMemberStorage(ctx context.Context, actorUserID int64,
 		if *storageLimit > totalFamilyStorage {
 			return stacktrace.Propagate(ente.ErrStorageLimitExceeded, "potential storage limit is more than subscription storage")
 		}
+
+		// Handle if the admin user tries reducing the storage Limit
+		// and the members Usage is more than the potential storage Limit
+		memberUsage, memUsageErr := c.UsageRepo.GetUsage(member.MemberUserID)
+		if memUsageErr != nil {
+			return stacktrace.Propagate(memUsageErr, "Couldn't find members storage usage")
+		}
+
+		if memberUsage > *storageLimit {
+			return stacktrace.Propagate(ente.NewBadRequestWithMessage("Failed to reduce storage"), "User's current usage is more")
+		}
+
+		modifyStorageErr := c.FamilyRepo.ModifyMemberStorage(ctx, actorUserID, member.ID, storageLimit)
+		if modifyStorageErr != nil {
+			return stacktrace.Propagate(modifyStorageErr, "Failed to modify members storage")
+		}
 	}
 
-	// Handle if the admin user tries reducing the storage Limit
-	// and the members Usage is more than the potential storage Limit
-	memberUsage, memUsageErr := c.UsageRepo.GetUsage(member.MemberUserID)
-	if memUsageErr != nil {
-		return stacktrace.Propagate(memUsageErr, "Couldn't find members storage usage")
-	}
-
-	if memberUsage > *storageLimit {
-		return stacktrace.Propagate(ente.NewBadRequestWithMessage("Failed to reduce storage"), "User's current usage is more")
-	}
-
-	modifyStorageErr := c.FamilyRepo.ModifyMemberStorage(ctx, actorUserID, member.ID, storageLimit)
-	if modifyStorageErr != nil {
-		return stacktrace.Propagate(modifyStorageErr, "Failed to modify members storage")
-	}
 	return nil
 }
 

From 5a72d6255501bdf240d48c527cd8f839432f44b6 Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Thu, 13 Feb 2025 15:08:18 +0530
Subject: [PATCH 143/796] chore: validate memberUsage check inside
 *storageLimit nil check

---
 server/pkg/controller/family/admin.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/pkg/controller/family/admin.go b/server/pkg/controller/family/admin.go
index ae729fd97f..c944c0cfc4 100644
--- a/server/pkg/controller/family/admin.go
+++ b/server/pkg/controller/family/admin.go
@@ -230,11 +230,11 @@ func (c *Controller) ModifyMemberStorage(ctx context.Context, actorUserID int64,
 		if memberUsage > *storageLimit {
 			return stacktrace.Propagate(ente.NewBadRequestWithMessage("Failed to reduce storage"), "User's current usage is more")
 		}
+	}
 
-		modifyStorageErr := c.FamilyRepo.ModifyMemberStorage(ctx, actorUserID, member.ID, storageLimit)
-		if modifyStorageErr != nil {
-			return stacktrace.Propagate(modifyStorageErr, "Failed to modify members storage")
-		}
+	modifyStorageErr := c.FamilyRepo.ModifyMemberStorage(ctx, actorUserID, member.ID, storageLimit)
+	if modifyStorageErr != nil {
+		return stacktrace.Propagate(modifyStorageErr, "Failed to modify members storage")
 	}
 
 	return nil

From 9f06de38896fedc0b3bfc6203de9747dc6d0403b Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 13 Feb 2025 15:16:58 +0530
Subject: [PATCH 144/796] [mob][photos] enum

---
 mobile/lib/services/smart_memories_service.dart | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 mobile/lib/services/smart_memories_service.dart

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
new file mode 100644
index 0000000000..3da40f8d34
--- /dev/null
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -0,0 +1,6 @@
+enum MemoryType {
+  people,
+  trips,
+  time,
+  filler,
+}

From 239e6a31581f809b3e0b1518cdaab884f2ca118b Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 13 Feb 2025 15:21:35 +0530
Subject: [PATCH 145/796] [mob][photos] bump for internal release

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 6e9d45966d..2af747b753 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.96+996
+version: 0.9.98+998
 publish_to: none
 
 environment:

From a447d615e0cbdaae7ab9352028dbec368c7d4f62 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Thu, 13 Feb 2025 15:20:35 +0530
Subject: [PATCH 146/796] [desktop] Dark WCO title bar overlay

---
 desktop/src/main.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/desktop/src/main.ts b/desktop/src/main.ts
index 8aa32169b1..46aab1bfc1 100644
--- a/desktop/src/main.ts
+++ b/desktop/src/main.ts
@@ -362,8 +362,18 @@ const createMainWindow = () => {
         // do it (Step 2) unconditionally (i.e., on macOS too).
         //
         // https://www.electronjs.org/docs/latest/tutorial/custom-title-bar#create-a-custom-title-bar
+        //
+        // Note that by default on Windows, the color of the WCO title bar
+        // overlay (three buttons - minimize, maximize, close - on the top
+        // right) is static, and unlike Linux, doesn't adapt to the theme /
+        // content. Explicitly choosing a dark background, while it won't work
+        // always (if the user's theme is light), is better than picking a light
+        // background since the main image viewer is always dark.
         titleBarStyle: "hidden",
-        titleBarOverlay: true,
+        titleBarOverlay:
+            process.platform == "win32"
+                ? { color: "black", symbolColor: "#cdcdcd" }
+                : true,
         // The color to show in the window until the web content gets loaded.
         // https://www.electronjs.org/docs/latest/api/browser-window#setting-the-backgroundcolor-property
         //

From 437eb246b032148bd6422d72f73866b8f146ac90 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Thu, 13 Feb 2025 15:35:32 +0530
Subject: [PATCH 147/796] fix: reduce it to 10 minutes minimum

---
 mobile/lib/services/preview_video_store.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 2598025f5e..97145056e1 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -590,8 +590,8 @@ class PreviewVideoStore {
         .where((file) => previewIds?[file.uploadedFileID] == null)
         .sorted((a, b) {
       // put higher duration videos last
-      final first = a.duration == null || a.duration! >= 10 * 60 * 60 ? 1 : 0;
-      final second = b.duration == null || b.duration! >= 10 * 60 * 60 ? 1 : 0;
+      final first = a.duration == null || a.duration! >= 10 * 60 ? 1 : 0;
+      final second = b.duration == null || b.duration! >= 10 * 60 ? 1 : 0;
       return first.compareTo(second);
     }).toList();
 

From 3ff8d04d7b18a1130c633abe47cc072045ceaa56 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 13 Feb 2025 15:31:29 +0530
Subject: [PATCH 148/796] [mob] Mark collection owner, sharee and publicUrls as
 non-nullable field

---
 mobile/lib/db/collections_db.dart             |  6 +--
 mobile/lib/emergency/select_contact_page.dart | 18 +++----
 mobile/lib/models/collection/collection.dart  | 45 +++++++----------
 mobile/lib/services/collections_service.dart  | 24 ++++-----
 mobile/lib/services/favorites_service.dart    |  2 +-
 mobile/lib/services/hidden_service.dart       |  8 +--
 mobile/lib/services/user_service.dart         | 50 ++++++++-----------
 .../collection/collection_file_actions.dart   |  2 +-
 .../collection_sharing_actions.dart           |  6 +--
 mobile/lib/ui/collections/album/row_item.dart |  4 +-
 .../ui/collections/album/vertical_list.dart   |  8 +--
 .../lib/ui/sharing/add_participant_page.dart  |  4 +-
 .../ui/sharing/album_participants_page.dart   | 12 ++---
 .../lib/ui/sharing/manage_links_widget.dart   |  8 +--
 .../pickers/device_limit_picker_page.dart     |  2 +-
 .../lib/ui/sharing/share_collection_page.dart |  6 +--
 mobile/lib/ui/tabs/home_widget.dart           |  6 +--
 .../ui/tabs/shared/quick_link_album_item.dart |  2 +-
 .../file_selection_actions_widget.dart        |  2 +-
 .../collect_photos_bottom_buttons.dart        |  2 +-
 .../gallery/gallery_app_bar_widget.dart       |  2 +-
 21 files changed, 100 insertions(+), 119 deletions(-)

diff --git a/mobile/lib/db/collections_db.dart b/mobile/lib/db/collections_db.dart
index 178e81302e..e9597c62ca 100644
--- a/mobile/lib/db/collections_db.dart
+++ b/mobile/lib/db/collections_db.dart
@@ -251,7 +251,7 @@ class CollectionsDB {
   Map<String, dynamic> _getRowForCollection(Collection collection) {
     final row = <String, dynamic>{};
     row[columnID] = collection.id;
-    row[columnOwner] = collection.owner!.toJson();
+    row[columnOwner] = collection.owner.toJson();
     row[columnEncryptedKey] = collection.encryptedKey;
     row[columnKeyDecryptionNonce] = collection.keyDecryptionNonce;
     row[columnName] = collection.name;
@@ -262,9 +262,9 @@ class CollectionsDB {
     row[columnPathDecryptionNonce] = collection.attributes.pathDecryptionNonce;
     row[columnVersion] = collection.attributes.version;
     row[columnSharees] =
-        json.encode(collection.sharees?.map((x) => x?.toMap()).toList());
+        json.encode(collection.sharees.map((x) => x.toMap()).toList());
     row[columnPublicURLs] =
-        json.encode(collection.publicURLs?.map((x) => x?.toMap()).toList());
+        json.encode(collection.publicURLs.map((x) => x.toMap()).toList());
     row[columnUpdationTime] = collection.updationTime;
     if (collection.isDeleted) {
       row[columnIsDeleted] = _sqlBoolTrue;
diff --git a/mobile/lib/emergency/select_contact_page.dart b/mobile/lib/emergency/select_contact_page.dart
index c12be89bbd..a61828f3b1 100644
--- a/mobile/lib/emergency/select_contact_page.dart
+++ b/mobile/lib/emergency/select_contact_page.dart
@@ -322,22 +322,20 @@ class _AddContactPage extends State<AddContactPage> {
     final int ownerID = Configuration.instance.getUserID()!;
     existingEmails.add(Configuration.instance.getEmail()!);
     for (final c in CollectionsService.instance.getActiveCollections()) {
-      if (c.owner?.id == ownerID) {
-        for (final User? u in c.sharees ?? []) {
-          if (u != null &&
-              u.id != null &&
+      if (c.owner.id == ownerID) {
+        for (final User u in c.sharees) {
+          if (u.id != null &&
               u.email.isNotEmpty &&
               !existingEmails.contains(u.email)) {
             existingEmails.add(u.email);
             suggestedUsers.add(u);
           }
         }
-      } else if (c.owner != null &&
-          c.owner!.id != null &&
-          c.owner!.email.isNotEmpty &&
-          !existingEmails.contains(c.owner!.email)) {
-        existingEmails.add(c.owner!.email);
-        suggestedUsers.add(c.owner!);
+      } else if (c.owner.id != null &&
+          c.owner.email.isNotEmpty &&
+          !existingEmails.contains(c.owner.email)) {
+        existingEmails.add(c.owner.email);
+        suggestedUsers.add(c.owner);
       }
     }
     final cachedUserDetails = UserService.instance.getCachedUserDetails();
diff --git a/mobile/lib/models/collection/collection.dart b/mobile/lib/models/collection/collection.dart
index df15f47840..2330da3aa9 100644
--- a/mobile/lib/models/collection/collection.dart
+++ b/mobile/lib/models/collection/collection.dart
@@ -8,7 +8,7 @@ import "package:photos/models/metadata/common_keys.dart";
 
 class Collection {
   final int id;
-  final User? owner;
+  final User owner;
   final String encryptedKey;
   final String? keyDecryptionNonce;
   @Deprecated("Use collectionName instead")
@@ -20,8 +20,8 @@ class Collection {
   final String? nameDecryptionNonce;
   final CollectionType type;
   final CollectionAttributes attributes;
-  final List<User?>? sharees;
-  final List<PublicURL?>? publicURLs;
+  final List<User> sharees;
+  final List<PublicURL> publicURLs;
   final int updationTime;
   final bool isDeleted;
 
@@ -95,12 +95,12 @@ class Collection {
 
   // hasLink returns true if there's any link attached to the collection
   // including expired links
-  bool get hasLink => publicURLs != null && publicURLs!.isNotEmpty;
+  bool get hasLink => publicURLs.isNotEmpty;
 
   bool get hasCover => (pubMagicMetadata.coverID ?? 0) > 0;
 
   // hasSharees returns true if the collection is shared with other ente users
-  bool get hasSharees => sharees != null && sharees!.isNotEmpty;
+  bool get hasSharees => sharees.isNotEmpty;
 
   bool get isPinned => (magicMetadata.order ?? 0) != 0;
 
@@ -121,52 +121,43 @@ class Collection {
   }
 
   List<User> getSharees() {
-    final List<User> result = [];
-    if (sharees == null) {
-      return result;
-    }
-    for (final User? u in sharees!) {
-      if (u != null) {
-        result.add(u);
-      }
-    }
-    return result;
+    return sharees;
   }
 
   bool isOwner(int userID) {
-    return (owner?.id ?? 0) == userID;
+    return (owner.id ?? -100) == userID;
   }
 
   bool isDownloadEnabledForPublicLink() {
-    if (publicURLs == null || publicURLs!.isEmpty) {
+    if (publicURLs.isEmpty) {
       return false;
     }
-    return publicURLs?.first?.enableDownload ?? true;
+    return publicURLs.first.enableDownload;
   }
 
   bool isCollectEnabledForPublicLink() {
-    if (publicURLs == null || publicURLs!.isEmpty) {
+    if (publicURLs.isEmpty) {
       return false;
     }
-    return publicURLs?.first?.enableCollect ?? false;
+    return publicURLs.first.enableCollect;
   }
 
   bool get isJoinEnabled {
-    if (publicURLs == null || publicURLs!.isEmpty) {
+    if (publicURLs.isEmpty) {
       return false;
     }
-    return publicURLs?.first?.enableJoin ?? false;
+    return publicURLs.first.enableJoin;
   }
 
   CollectionParticipantRole getRole(int userID) {
     if (isOwner(userID)) {
       return CollectionParticipantRole.owner;
     }
-    if (sharees == null) {
+    if (sharees.isEmpty) {
       return CollectionParticipantRole.unknown;
     }
-    for (final User? u in sharees!) {
-      if (u != null && u.id == userID) {
+    for (final User u in sharees) {
+      if (u.id == userID) {
         if (u.isViewer) {
           return CollectionParticipantRole.viewer;
         } else if (u.isCollaborator) {
@@ -185,8 +176,8 @@ class Collection {
   }
 
   void updateSharees(List<User> newSharees) {
-    sharees?.clear();
-    sharees?.addAll(newSharees);
+    sharees.clear();
+    sharees.addAll(newSharees);
   }
 
   static CollectionType typeFromString(String type) {
diff --git a/mobile/lib/services/collections_service.dart b/mobile/lib/services/collections_service.dart
index 3bac9fe978..941f874d38 100644
--- a/mobile/lib/services/collections_service.dart
+++ b/mobile/lib/services/collections_service.dart
@@ -139,7 +139,7 @@ class CollectionsService {
         }
       }
       // remove reference for incoming collections when unshared/deleted
-      if (collection.isDeleted && ownerID != collection.owner?.id) {
+      if (collection.isDeleted && ownerID != collection.owner.id) {
         await _db.deleteCollection(collection.id);
       } else {
         // keep entry for deletedCollection as collectionKey may be used during
@@ -394,7 +394,7 @@ class CollectionsService {
     final List<Collection> collections =
         getCollectionsForUI(includedShared: true);
     for (final c in collections) {
-      if (c.owner!.id == Configuration.instance.getUserID()) {
+      if (c.owner.id == Configuration.instance.getUserID()) {
         if (c.hasSharees || c.hasLink && !c.isQuickLinkCollection()) {
           outgoing.add(c);
         } else if (c.isQuickLinkCollection()) {
@@ -472,8 +472,8 @@ class CollectionsService {
     if (collectionID != null) {
       final Collection? collection = getCollectionByID(collectionID);
       if (collection != null) {
-        if (collection.owner?.id == userID) {
-          _cachedUserIdToUser[userID] = collection.owner!;
+        if (collection.owner.id == userID) {
+          _cachedUserIdToUser[userID] = collection.owner;
         } else {
           final matchingUser = collection.getSharees().firstWhereOrNull(
                 (u) => u.id == userID,
@@ -698,7 +698,7 @@ class CollectionsService {
     );
     final encryptedKey = CryptoUtil.base642bin(collection.encryptedKey);
     Uint8List? collectionKey;
-    if (collection.owner?.id == _config.getUserID()) {
+    if (collection.owner.id == _config.getUserID()) {
       // If the collection is owned by the user, decrypt with the master key
       if (_config.getKey() == null) {
         // Possible during AppStore account migration, where SecureStorage
@@ -767,7 +767,7 @@ class CollectionsService {
   ) async {
     final int ownerID = Configuration.instance.getUserID()!;
     try {
-      if (collection.owner?.id != ownerID) {
+      if (collection.owner.id != ownerID) {
         throw AssertionError("cannot modify albums not owned by you");
       }
       // read the existing magic metadata and apply new updates to existing data
@@ -826,7 +826,7 @@ class CollectionsService {
   ) async {
     final int ownerID = Configuration.instance.getUserID()!;
     try {
-      if (collection.owner?.id != ownerID) {
+      if (collection.owner.id != ownerID) {
         throw AssertionError("cannot modify albums not owned by you");
       }
       // read the existing magic metadata and apply new updates to existing data
@@ -885,7 +885,7 @@ class CollectionsService {
   ) async {
     final int ownerID = Configuration.instance.getUserID()!;
     try {
-      if (collection.owner?.id == ownerID) {
+      if (collection.owner.id == ownerID) {
         throw AssertionError("cannot modify sharee settings for albums owned "
             "by you");
       }
@@ -952,7 +952,7 @@ class CollectionsService {
           "enableJoin": true,
         },
       );
-      collection.publicURLs?.add(PublicURL.fromMap(response.data["result"]));
+      collection.publicURLs.add(PublicURL.fromMap(response.data["result"]));
       await _db.insert(List.from([collection]));
       _collectionIDToCollections[collection.id] = collection;
       Bus.instance.fire(
@@ -980,8 +980,8 @@ class CollectionsService {
         data: json.encode(prop),
       );
       // remove existing url information
-      collection.publicURLs?.clear();
-      collection.publicURLs?.add(PublicURL.fromMap(response.data["result"]));
+      collection.publicURLs.clear();
+      collection.publicURLs.add(PublicURL.fromMap(response.data["result"]));
       await _db.insert(List.from([collection]));
       _collectionIDToCollections[collection.id] = collection;
       Bus.instance.fire(
@@ -1003,7 +1003,7 @@ class CollectionsService {
       await _enteDio.delete(
         "/collections/share-url/" + collection.id.toString(),
       );
-      collection.publicURLs?.clear();
+      collection.publicURLs.clear();
       await _db.insert(List.from([collection]));
       _collectionIDToCollections[collection.id] = collection;
       Bus.instance.fire(
diff --git a/mobile/lib/services/favorites_service.dart b/mobile/lib/services/favorites_service.dart
index 42a1252cf6..8623066247 100644
--- a/mobile/lib/services/favorites_service.dart
+++ b/mobile/lib/services/favorites_service.dart
@@ -230,7 +230,7 @@ class FavoritesService {
     if (_cachedFavoritesCollectionID == null) {
       final collections = _collectionsService.getActiveCollections();
       for (final collection in collections) {
-        if (collection.owner!.id == _config.getUserID() &&
+        if (collection.owner.id == _config.getUserID() &&
             collection.type == CollectionType.favorites) {
           _cachedFavoritesCollectionID = collection.id;
           return collection;
diff --git a/mobile/lib/services/hidden_service.dart b/mobile/lib/services/hidden_service.dart
index 53aeb24621..8705ab7afa 100644
--- a/mobile/lib/services/hidden_service.dart
+++ b/mobile/lib/services/hidden_service.dart
@@ -32,7 +32,7 @@ extension HiddenService on CollectionsService {
     final int userID = config.getUserID()!;
     final allDefaultHidden = collectionIDToCollections.values
         .where(
-          (element) => element.isDefaultHidden() && element.owner!.id == userID,
+          (element) => element.isDefaultHidden() && element.owner.id == userID,
         )
         .toList();
 
@@ -101,7 +101,7 @@ extension HiddenService on CollectionsService {
         collectionIDToCollections.values.firstWhereOrNull(
       (element) =>
           element.type == CollectionType.uncategorized &&
-          element.owner!.id == userID,
+          element.owner.id == userID,
     );
     if (matchedCollection != null) {
       cachedUncategorizedCollection = matchedCollection;
@@ -166,7 +166,9 @@ extension HiddenService on CollectionsService {
       await dialog.hide();
     } on AssertionError catch (e) {
       await dialog.hide();
-      unawaited(showErrorDialog(context, S.of(context).oops, e.message as String));
+      unawaited(
+        showErrorDialog(context, S.of(context).oops, e.message as String),
+      );
       return false;
     } catch (e, s) {
       _logger.severe("Could not hide", e, s);
diff --git a/mobile/lib/services/user_service.dart b/mobile/lib/services/user_service.dart
index 1098005f45..e33d088b26 100644
--- a/mobile/lib/services/user_service.dart
+++ b/mobile/lib/services/user_service.dart
@@ -1311,34 +1311,30 @@ class UserService {
 
     for (final c in CollectionsService.instance.getActiveCollections()) {
       // Add collaborators and viewers of collections owned by user
-      if (c.owner?.id == ownerID) {
-        for (final User? u in c.sharees ?? []) {
-          if (u != null && u.id != null && u.email.isNotEmpty) {
+      if (c.owner.id == ownerID) {
+        for (final User u in c.sharees) {
+          if (u.id != null && u.email.isNotEmpty) {
             if (!existingEmails.contains(u.email)) {
               relevantUsers.add(u);
               existingEmails.add(u.email);
             }
           }
         }
-      } else if (c.owner?.id != null && c.owner!.email.isNotEmpty) {
+      } else if (c.owner.id != null && c.owner.email.isNotEmpty) {
         // Add owners of collections shared with user
-        if (!existingEmails.contains(c.owner!.email)) {
-          relevantUsers.add(c.owner!);
-          existingEmails.add(c.owner!.email);
+        if (!existingEmails.contains(c.owner.email)) {
+          relevantUsers.add(c.owner);
+          existingEmails.add(c.owner.email);
         }
         // Add collaborators of collections shared with user where user is a
         // viewer or a collaborator
-        for (final User? u in c.sharees ?? []) {
-          if (u != null &&
-              u.id != null &&
+        for (final User u in c.sharees) {
+          if (u.id != null &&
               u.email.isNotEmpty &&
               u.email == ownerEmail &&
               (u.isCollaborator || u.isViewer)) {
-            for (final User? u in c.sharees ?? []) {
-              if (u != null &&
-                  u.id != null &&
-                  u.email.isNotEmpty &&
-                  u.isCollaborator) {
+            for (final User u in c.sharees) {
+              if (u.id != null && u.email.isNotEmpty && u.isCollaborator) {
                 if (!existingEmails.contains(u.email)) {
                   relevantUsers.add(u);
                   existingEmails.add(u.email);
@@ -1392,32 +1388,28 @@ class UserService {
 
     for (final c in CollectionsService.instance.getActiveCollections()) {
       // Add collaborators and viewers of collections owned by user
-      if (c.owner?.id == ownerID) {
-        for (final User? u in c.sharees ?? []) {
-          if (u != null && u.id != null && u.email.isNotEmpty) {
+      if (c.owner.id == ownerID) {
+        for (final User u in c.sharees) {
+          if (u.id != null && u.email.isNotEmpty) {
             if (!emailIDs.contains(u.email)) {
               emailIDs.add(u.email);
             }
           }
         }
-      } else if (c.owner?.id != null && c.owner!.email.isNotEmpty) {
+      } else if (c.owner.id != null && c.owner.email.isNotEmpty) {
         // Add owners of collections shared with user
-        if (!emailIDs.contains(c.owner!.email)) {
-          emailIDs.add(c.owner!.email);
+        if (!emailIDs.contains(c.owner.email)) {
+          emailIDs.add(c.owner.email);
         }
         // Add collaborators of collections shared with user where user is a
         // viewer or a collaborator
-        for (final User? u in c.sharees ?? []) {
-          if (u != null &&
-              u.id != null &&
+        for (final User u in c.sharees) {
+          if (u.id != null &&
               u.email.isNotEmpty &&
               u.email == ownerEmail &&
               (u.isCollaborator || u.isViewer)) {
-            for (final User? u in c.sharees ?? []) {
-              if (u != null &&
-                  u.id != null &&
-                  u.email.isNotEmpty &&
-                  u.isCollaborator) {
+            for (final User u in c.sharees) {
+              if (u.id != null && u.email.isNotEmpty && u.isCollaborator) {
                 if (!emailIDs.contains(u.email)) {
                   emailIDs.add(u.email);
                 }
diff --git a/mobile/lib/ui/actions/collection/collection_file_actions.dart b/mobile/lib/ui/actions/collection/collection_file_actions.dart
index 81b79825ac..81bdcefb3b 100644
--- a/mobile/lib/ui/actions/collection/collection_file_actions.dart
+++ b/mobile/lib/ui/actions/collection/collection_file_actions.dart
@@ -147,7 +147,7 @@ extension CollectionFileActions on CollectionActions {
         // Newly created collection might not be cached
         final Collection? c =
             CollectionsService.instance.getCollectionByID(collectionID);
-        if (c != null && c.owner!.id != currentUserID) {
+        if (c != null && c.owner.id != currentUserID) {
           if (!showProgressDialog) {
             dialog = createProgressDialog(
               context,
diff --git a/mobile/lib/ui/actions/collection/collection_sharing_actions.dart b/mobile/lib/ui/actions/collection/collection_sharing_actions.dart
index c2c354cf77..1cf642dff0 100644
--- a/mobile/lib/ui/actions/collection/collection_sharing_actions.dart
+++ b/mobile/lib/ui/actions/collection/collection_sharing_actions.dart
@@ -340,7 +340,7 @@ class CollectionActions {
   ) async {
     final textTheme = getEnteTextTheme(bContext);
     final currentUserID = Configuration.instance.getUserID()!;
-    if (collection.owner!.id != currentUserID) {
+    if (collection.owner.id != currentUserID) {
       throw AssertionError("Can not delete album owned by others");
     }
     if (collection.hasSharees) {
@@ -495,7 +495,7 @@ class CollectionActions {
     bool isHidden = false,
   }) async {
     final int currentUserID = Configuration.instance.getUserID()!;
-    final isCollectionOwner = collection.owner!.id == currentUserID;
+    final isCollectionOwner = collection.owner.id == currentUserID;
     final FilesSplit split = FilesSplit.split(
       files,
       Configuration.instance.getUserID()!,
@@ -631,7 +631,7 @@ class CollectionActions {
     if (targetCollection == null ||
         (CollectionType.uncategorized == targetCollection.type ||
             targetCollection.type == CollectionType.favorites) ||
-        targetCollection.owner!.id != userID) {
+        targetCollection.owner.id != userID) {
       return false;
     }
     return true;
diff --git a/mobile/lib/ui/collections/album/row_item.dart b/mobile/lib/ui/collections/album/row_item.dart
index 50b96420ef..5f684d3780 100644
--- a/mobile/lib/ui/collections/album/row_item.dart
+++ b/mobile/lib/ui/collections/album/row_item.dart
@@ -41,7 +41,7 @@ class AlbumRowItemWidget extends StatelessWidget {
     final Widget? linkIcon = c.hasLink && isOwner
         ? Icon(
             Icons.link,
-            color: c.publicURLs!.first!.isExpired ? warning500 : strokeBaseDark,
+            color: c.publicURLs.first.isExpired ? warning500 : strokeBaseDark,
           )
         : null;
     return GestureDetector(
@@ -115,7 +115,7 @@ class AlbumRowItemWidget extends StatelessWidget {
                                 bottom: 8.0,
                               ),
                               child: UserAvatarWidget(
-                                c.owner!,
+                                c.owner,
                                 thumbnailView: true,
                               ),
                             ),
diff --git a/mobile/lib/ui/collections/album/vertical_list.dart b/mobile/lib/ui/collections/album/vertical_list.dart
index 17a0308ce0..d6d4a4c07c 100644
--- a/mobile/lib/ui/collections/album/vertical_list.dart
+++ b/mobile/lib/ui/collections/album/vertical_list.dart
@@ -287,8 +287,8 @@ class AlbumVerticalListWidget extends StatelessWidget {
         CollectionActions(CollectionsService.instance);
 
     if (collection.hasLink) {
-      if (collection.publicURLs!.first!.enableCollect) {
-        if (Configuration.instance.getUserID() == collection.owner!.id) {
+      if (collection.publicURLs.first.enableCollect) {
+        if (Configuration.instance.getUserID() == collection.owner.id) {
           unawaited(
             routeToPage(
               context,
@@ -334,7 +334,7 @@ class AlbumVerticalListWidget extends StatelessWidget {
         context,
         S.of(context).collaborativeLinkCreatedFor(collection.displayName),
       );
-      if (Configuration.instance.getUserID() == collection.owner!.id) {
+      if (Configuration.instance.getUserID() == collection.owner.id) {
         unawaited(
           routeToPage(
             context,
@@ -353,7 +353,7 @@ class AlbumVerticalListWidget extends StatelessWidget {
     BuildContext context,
     Collection collection,
   ) {
-    if (Configuration.instance.getUserID() == collection.owner!.id) {
+    if (Configuration.instance.getUserID() == collection.owner.id) {
       unawaited(
         routeToPage(
           context,
diff --git a/mobile/lib/ui/sharing/add_participant_page.dart b/mobile/lib/ui/sharing/add_participant_page.dart
index cfa48d037a..6c7b064014 100644
--- a/mobile/lib/ui/sharing/add_participant_page.dart
+++ b/mobile/lib/ui/sharing/add_participant_page.dart
@@ -363,8 +363,8 @@ class _AddParticipantPage extends State<AddParticipantPage> {
 
   List<User> _getSuggestedUser() {
     final Set<String> existingEmails = {};
-    for (final User? u in widget.collection.sharees ?? []) {
-      if (u != null && u.id != null && u.email.isNotEmpty) {
+    for (final User u in widget.collection.sharees) {
+      if (u.id != null && u.email.isNotEmpty) {
         existingEmails.add(u.email);
       }
     }
diff --git a/mobile/lib/ui/sharing/album_participants_page.dart b/mobile/lib/ui/sharing/album_participants_page.dart
index 656f9a0076..e27fe92478 100644
--- a/mobile/lib/ui/sharing/album_participants_page.dart
+++ b/mobile/lib/ui/sharing/album_participants_page.dart
@@ -64,11 +64,11 @@ class _AlbumParticipantsPageState extends State<AlbumParticipantsPage> {
   @override
   Widget build(BuildContext context) {
     final isOwner =
-        widget.collection.owner?.id == Configuration.instance.getUserID();
+        widget.collection.owner.id == Configuration.instance.getUserID();
     final colorScheme = getEnteColorScheme(context);
     final currentUserID = Configuration.instance.getUserID()!;
     final int participants = 1 + widget.collection.getSharees().length;
-    final User owner = widget.collection.owner!;
+    final User owner = widget.collection.owner;
     if (owner.id == currentUserID && owner.email == "") {
       owner.email = Configuration.instance.getEmail()!;
     }
@@ -107,11 +107,9 @@ class _AlbumParticipantsPageState extends State<AlbumParticipantsPage> {
                             captionedTextWidget: CaptionedTextWidget(
                               title: isOwner
                                   ? S.of(context).you
-                                  : widget.collection.owner != null
-                                      ? _nameIfAvailableElseEmail(
-                                          widget.collection.owner!,
-                                        )
-                                      : '',
+                                  : _nameIfAvailableElseEmail(
+                                      widget.collection.owner,
+                                    ),
                               makeTextBold: isOwner,
                             ),
                             leadingIconWidget: UserAvatarWidget(
diff --git a/mobile/lib/ui/sharing/manage_links_widget.dart b/mobile/lib/ui/sharing/manage_links_widget.dart
index 5b389fab82..6e55fbfbb9 100644
--- a/mobile/lib/ui/sharing/manage_links_widget.dart
+++ b/mobile/lib/ui/sharing/manage_links_widget.dart
@@ -47,13 +47,13 @@ class _ManageSharedLinkWidgetState extends State<ManageSharedLinkWidget> {
   @override
   Widget build(BuildContext context) {
     final isCollectEnabled =
-        widget.collection!.publicURLs?.firstOrNull?.enableCollect ?? false;
+        widget.collection!.publicURLs.firstOrNull?.enableCollect ?? false;
     final isDownloadEnabled =
-        widget.collection!.publicURLs?.firstOrNull?.enableDownload ?? true;
+        widget.collection!.publicURLs.firstOrNull?.enableDownload ?? true;
     final isPasswordEnabled =
-        widget.collection!.publicURLs?.firstOrNull?.passwordEnabled ?? false;
+        widget.collection!.publicURLs.firstOrNull?.passwordEnabled ?? false;
     final enteColorScheme = getEnteColorScheme(context);
-    final PublicURL url = widget.collection!.publicURLs!.firstOrNull!;
+    final PublicURL url = widget.collection!.publicURLs.firstOrNull!;
     final String collectionKey = Base58Encode(
       CollectionsService.instance.getCollectionKey(widget.collection!.id),
     );
diff --git a/mobile/lib/ui/sharing/pickers/device_limit_picker_page.dart b/mobile/lib/ui/sharing/pickers/device_limit_picker_page.dart
index 66c08bde74..3d83b4d8af 100644
--- a/mobile/lib/ui/sharing/pickers/device_limit_picker_page.dart
+++ b/mobile/lib/ui/sharing/pickers/device_limit_picker_page.dart
@@ -72,7 +72,7 @@ class _ItemsWidgetState extends State<ItemsWidget> {
   bool isCustomLimit = false;
   @override
   void initState() {
-    currentDeviceLimit = widget.collection.publicURLs!.first!.deviceLimit;
+    currentDeviceLimit = widget.collection.publicURLs.first.deviceLimit;
     initialDeviceLimit = currentDeviceLimit;
     if (!publicLinkDeviceLimits.contains(currentDeviceLimit)) {
       isCustomLimit = true;
diff --git a/mobile/lib/ui/sharing/share_collection_page.dart b/mobile/lib/ui/sharing/share_collection_page.dart
index 42ba9f417c..430935071a 100644
--- a/mobile/lib/ui/sharing/share_collection_page.dart
+++ b/mobile/lib/ui/sharing/share_collection_page.dart
@@ -61,7 +61,7 @@ class _ShareCollectionPageState extends State<ShareCollectionPage> {
 
   @override
   Widget build(BuildContext context) {
-    _sharees = widget.collection.sharees ?? [];
+    _sharees = widget.collection.sharees;
     final bool hasUrl = widget.collection.hasLink;
     final children = <Widget>[];
     children.add(
@@ -136,7 +136,7 @@ class _ShareCollectionPageState extends State<ShareCollectionPage> {
     }
 
     final bool hasExpired =
-        widget.collection.publicURLs?.firstOrNull?.isExpired ?? false;
+        widget.collection.publicURLs.firstOrNull?.isExpired ?? false;
     children.addAll([
       const SizedBox(
         height: 24,
@@ -166,7 +166,7 @@ class _ShareCollectionPageState extends State<ShareCollectionPage> {
           CollectionsService.instance.getCollectionKey(widget.collection.id),
         );
         final String url =
-            "${widget.collection.publicURLs!.first!.url}#$collectionKey";
+            "${widget.collection.publicURLs.first.url}#$collectionKey";
         children.addAll(
           [
             MenuItemWidget(
diff --git a/mobile/lib/ui/tabs/home_widget.dart b/mobile/lib/ui/tabs/home_widget.dart
index 0528c0d167..28165ddd4f 100644
--- a/mobile/lib/ui/tabs/home_widget.dart
+++ b/mobile/lib/ui/tabs/home_widget.dart
@@ -275,7 +275,7 @@ class _HomeWidgetState extends State<HomeWidget> {
       final existingCollection =
           CollectionsService.instance.getCollectionByID(collection.id);
 
-      if (collection.owner!.id! == Configuration.instance.getUserID() ||
+      if (collection.isOwner(Configuration.instance.getUserID() ?? -1) ||
           (existingCollection != null && !existingCollection.isDeleted)) {
         await routeToPage(
           context,
@@ -286,8 +286,8 @@ class _HomeWidgetState extends State<HomeWidget> {
         return;
       }
       final dialog = createProgressDialog(context, "Loading...");
-      final publicUrl = collection.publicURLs![0];
-      if (!publicUrl!.enableDownload) {
+      final publicUrl = collection.publicURLs[0];
+      if (!publicUrl.enableDownload) {
         await showErrorDialog(
           context,
           context.l10n.canNotOpenTitle,
diff --git a/mobile/lib/ui/tabs/shared/quick_link_album_item.dart b/mobile/lib/ui/tabs/shared/quick_link_album_item.dart
index 5c6b7c4c5f..db84df9083 100644
--- a/mobile/lib/ui/tabs/shared/quick_link_album_item.dart
+++ b/mobile/lib/ui/tabs/shared/quick_link_album_item.dart
@@ -109,7 +109,7 @@ class QuickLinkAlbumItem extends StatelessWidget {
                                     style: textTheme.smallMuted,
                                   ),
                                   c.hasLink
-                                      ? (c.publicURLs!.first!.isExpired
+                                      ? (c.publicURLs.first.isExpired
                                           ? Icon(
                                               Icons.link_outlined,
                                               color: colorScheme.warning500,
diff --git a/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart b/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
index ab6cbf315a..97708bfbac 100644
--- a/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
+++ b/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
@@ -804,7 +804,7 @@ class _FileSelectionActionsWidgetState
             .getCollectionKey(_cachedCollectionForSharedLink!.id),
       );
       final String url =
-          "${_cachedCollectionForSharedLink!.publicURLs?.first?.url}#$collectionKey";
+          "${_cachedCollectionForSharedLink!.publicURLs.first.url}#$collectionKey";
       unawaited(Clipboard.setData(ClipboardData(text: url)));
       await shareImageAndUrl(
         placeholderBytes,
diff --git a/mobile/lib/ui/viewer/gallery/collect_photos_bottom_buttons.dart b/mobile/lib/ui/viewer/gallery/collect_photos_bottom_buttons.dart
index 5cb6f6c876..0d6b633040 100644
--- a/mobile/lib/ui/viewer/gallery/collect_photos_bottom_buttons.dart
+++ b/mobile/lib/ui/viewer/gallery/collect_photos_bottom_buttons.dart
@@ -48,7 +48,7 @@ class _EmptyAlbumStateNewState extends State<CollectPhotosBottomButtons> {
     final String collectionKey = Base58Encode(
       CollectionsService.instance.getCollectionKey(widget.c.id),
     );
-    final String url = "${widget.c.publicURLs!.first!.url}#$collectionKey";
+    final String url = "${widget.c.publicURLs.first.url}#$collectionKey";
     await shareAlbumLinkWithPlaceholder(
       context,
       widget.c,
diff --git a/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart b/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
index d6ae1db26f..34c3c04b77 100644
--- a/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
+++ b/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
@@ -820,7 +820,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
           "Cannot share empty collection of type $galleryType",
         );
       }
-      if (Configuration.instance.getUserID() == widget.collection!.owner!.id) {
+      if (Configuration.instance.getUserID() == widget.collection!.owner.id) {
         unawaited(
           routeToPage(
             context,

From c46c27d21daeb8abd32b217c72ad8ff40e58bf3c Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Thu, 13 Feb 2025 16:03:20 +0530
Subject: [PATCH 149/796] if storageLimit == null, set no limit for member

---
 server/ente/family.go     | 2 +-
 server/pkg/repo/family.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/ente/family.go b/server/ente/family.go
index 2911ca0b72..b02b6cab7b 100644
--- a/server/ente/family.go
+++ b/server/ente/family.go
@@ -51,7 +51,7 @@ type FamilyMember struct {
 
 type ModifyMemberStorage struct {
 	ID           uuid.UUID `json:"id" binding:"required"`
-	StorageLimit *int64    `json:"storageLimit" binding:"required"`
+	StorageLimit *int64    `json:"storageLimit"`
 }
 
 type FamilyMemberResponse struct {
diff --git a/server/pkg/repo/family.go b/server/pkg/repo/family.go
index c9e2d96673..fad14d89aa 100644
--- a/server/pkg/repo/family.go
+++ b/server/pkg/repo/family.go
@@ -198,7 +198,7 @@ func (repo *FamilyRepository) RemoveMember(ctx context.Context, adminID int64, m
 
 // UpdateStorage is used to set Pre-existing Members Storage Limit.
 func (repo *FamilyRepository) ModifyMemberStorage(ctx context.Context, adminID int64, id uuid.UUID, storageLimit *int64) error {
-	_, err := repo.DB.Exec(`UPDATE families SET storage_limit=$1 where id=$2`, *storageLimit, id)
+	_, err := repo.DB.Exec(`UPDATE families SET storage_limit=$1 where id=$2`, storageLimit, id)
 	if err != nil {
 		return stacktrace.Propagate(err, "Could not update Members Storage Limit")
 	}

From eb2f6aec689dfd4d8b2e90fb1ee008c725838720 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 13 Feb 2025 16:12:56 +0530
Subject: [PATCH 150/796] [mob] refactor

---
 mobile/lib/db/collections_db.dart             |  4 +-
 .../models/api/collection/create_request.dart |  2 +-
 mobile/lib/models/collection/collection.dart  | 64 +++++++++----------
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/mobile/lib/db/collections_db.dart b/mobile/lib/db/collections_db.dart
index e9597c62ca..c73b9a8e35 100644
--- a/mobile/lib/db/collections_db.dart
+++ b/mobile/lib/db/collections_db.dart
@@ -257,7 +257,7 @@ class CollectionsDB {
     row[columnName] = collection.name;
     row[columnEncryptedName] = collection.encryptedName;
     row[columnNameDecryptionNonce] = collection.nameDecryptionNonce;
-    row[columnType] = Collection.typeToString(collection.type);
+    row[columnType] = typeToString(collection.type);
     row[columnEncryptedPath] = collection.attributes.encryptedPath;
     row[columnPathDecryptionNonce] = collection.attributes.pathDecryptionNonce;
     row[columnVersion] = collection.attributes.version;
@@ -290,7 +290,7 @@ class CollectionsDB {
       row[columnName],
       row[columnEncryptedName],
       row[columnNameDecryptionNonce],
-      Collection.typeFromString(row[columnType]),
+      typeFromString(row[columnType]),
       CollectionAttributes(
         encryptedPath: row[columnEncryptedPath],
         pathDecryptionNonce: row[columnPathDecryptionNonce],
diff --git a/mobile/lib/models/api/collection/create_request.dart b/mobile/lib/models/api/collection/create_request.dart
index 24bf0a9b0f..0fc5866383 100644
--- a/mobile/lib/models/api/collection/create_request.dart
+++ b/mobile/lib/models/api/collection/create_request.dart
@@ -45,7 +45,7 @@ class CreateRequest {
     map['keyDecryptionNonce'] = keyDecryptionNonce;
     map['encryptedName'] = encryptedName;
     map['nameDecryptionNonce'] = nameDecryptionNonce;
-    map['type'] = Collection.typeToString(type);
+    map['type'] = typeToString(type);
     if (attributes != null) {
       map['attributes'] = attributes!.toMap();
     }
diff --git a/mobile/lib/models/collection/collection.dart b/mobile/lib/models/collection/collection.dart
index 2330da3aa9..c62c9432d5 100644
--- a/mobile/lib/models/collection/collection.dart
+++ b/mobile/lib/models/collection/collection.dart
@@ -180,38 +180,6 @@ class Collection {
     sharees.addAll(newSharees);
   }
 
-  static CollectionType typeFromString(String type) {
-    switch (type) {
-      case "folder":
-        return CollectionType.folder;
-      case "favorites":
-        return CollectionType.favorites;
-      case "uncategorized":
-        return CollectionType.uncategorized;
-      case "album":
-        return CollectionType.album;
-      case "unknown":
-        return CollectionType.unknown;
-    }
-    debugPrint("unexpected collection type $type");
-    return CollectionType.unknown;
-  }
-
-  static String typeToString(CollectionType type) {
-    switch (type) {
-      case CollectionType.folder:
-        return "folder";
-      case CollectionType.favorites:
-        return "favorites";
-      case CollectionType.album:
-        return "album";
-      case CollectionType.uncategorized:
-        return "uncategorized";
-      case CollectionType.unknown:
-        return "unknown";
-    }
-  }
-
   Collection copyWith({
     int? id,
     User? owner,
@@ -294,6 +262,38 @@ enum CollectionType {
   unknown,
 }
 
+CollectionType typeFromString(String type) {
+  switch (type) {
+    case "folder":
+      return CollectionType.folder;
+    case "favorites":
+      return CollectionType.favorites;
+    case "uncategorized":
+      return CollectionType.uncategorized;
+    case "album":
+      return CollectionType.album;
+    case "unknown":
+      return CollectionType.unknown;
+  }
+  debugPrint("unexpected collection type $type");
+  return CollectionType.unknown;
+}
+
+String typeToString(CollectionType type) {
+  switch (type) {
+    case CollectionType.folder:
+      return "folder";
+    case CollectionType.favorites:
+      return "favorites";
+    case CollectionType.album:
+      return "album";
+    case CollectionType.uncategorized:
+      return "uncategorized";
+    case CollectionType.unknown:
+      return "unknown";
+  }
+}
+
 extension CollectionTypeExtn on CollectionType {
   bool get canDelete =>
       this != CollectionType.favorites && this != CollectionType.uncategorized;

From 4736ec7e0a01a5bb045b9f1e0e5c571db78c0e6a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 08:31:40 +0530
Subject: [PATCH 151/796] Workbench

---
 web/apps/photos/src/pages/_app.tsx                         | 4 ++--
 web/apps/photos/src/styles/global.css                      | 3 ++-
 web/packages/new/photos/components/FileViewerPhotoSwipe.ts | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index 98bbec1235..62800fc6fe 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -50,9 +50,9 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { resumeExportsIfNeeded } from "services/export";
 import { photosLogout } from "services/logout";
 
-import "photoswipe/dist/photoswipe.css";
+// import "photoswipe/dist/photoswipe.css";
 // TODO(PS): Note, auto hide only works with the new CSS.
-// import "../../../../packages/new/photos/components/ps5/dist/photoswipe.css";
+import "../../../../packages/new/photos/components/ps5/dist/photoswipe.css";
 
 import "styles/global.css";
 
diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index d480d0dc6b..a83e359b88 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -12,7 +12,7 @@ body {
     flex-direction: column;
     height: 100%;
 }
-
+@media DISABLED {
 .pswp__button--custom {
     width: 48px;
     height: 48px;
@@ -114,3 +114,4 @@ body {
 .pswp__caption--empty {
     display: none;
 }
+}
diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 658e837672..8f0218f3ad 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -26,7 +26,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 let PhotoSwipe;
 if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     // TODO(PS): Comment me before merging into main.
-    // PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
+    PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
 // TODO(PS):
 //import { type SlideData } from "./ps5/dist/types/slide/"

From d4ddc0f91995ffbbca9558cfd7164bfd06d06677 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 08:59:26 +0530
Subject: [PATCH 152/796] The dimensions are necessary

the CSS was masking the issue
---
 .../photos/components/FileViewerPhotoSwipe.ts | 40 +++++++++++--------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 8f0218f3ad..8569a07f2f 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -202,22 +202,21 @@ export class FileViewerPhotoSwipe {
         pswp.addFilter("itemData", (_, index) => {
             const file = files[index];
 
+            // We might not have anything to show immediately, though in most
+            // cases a cached renderable thumbnail URL will be available
+            // shortly.
+            //
+            // Meanwhile,
+            //
+            // 1. Return empty slide data; PhotoSwipe will not show anything in
+            //    the image area but will otherwise render UI controls properly.
+            //
+            // 2. Insert empty data so that we don't enqueue multiple updates.
+
             let itemData: SlideData | undefined;
             if (file) {
                 itemData = this.itemDataByFileID.get(file.id);
                 if (!itemData) {
-                    // We don't have anything to show immediately, though in
-                    // most cases a cached renderable thumbnail URL will be
-                    // available shortly.
-                    //
-                    // Meanwhile,
-                    //
-                    // 1. Return empty slide data; PhotoSwipe will not show
-                    //    anything in the image area but will otherwise render
-                    //    the surrounding UI properly.
-                    //
-                    // 2. Insert empty data so that we don't enqueue multiple
-                    //    updates.
                     itemData = {};
                     this.itemDataByFileID.set(file.id, itemData);
                     this.enqueueUpdates(index, file);
@@ -351,11 +350,18 @@ export class FileViewerPhotoSwipe {
         };
 
         const thumbnailURL = await downloadManager.renderableThumbnailURL(file);
-        // We don't have the dimensions of the thumbnail. We could try to deduce
-        // something from the file's aspect ratio etc, but that's not needed:
-        // PhotoSwipe already correctly (for our purposes) handles just a source
-        // URL being present.
-        update({ src: thumbnailURL });
+        const thumbnailURLWithDimensions = await new Promise((resolve) => {
+            let image = new Image();
+            image.onload = () => {
+                resolve({
+                    src: thumbnailURL,
+                    width: image.naturalWidth,
+                    height: image.naturalHeight,
+                });
+            };
+            image.src = thumbnailURL;
+        });
+        update(thumbnailURLWithDimensions);
 
         switch (file.metadata.fileType) {
             case FileType.image: {

From 6ef3c01030218d12e84a6494aac1e7d87cee53ee Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 11:07:18 +0530
Subject: [PATCH 153/796] Fix

---
 web/packages/new/photos/components/FileViewerPhotoSwipe.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 8569a07f2f..fdb9cf3a70 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -266,7 +266,7 @@ export class FileViewerPhotoSwipe {
             // The user did some action within the file viewer to close it.
             //
             // Clear intervals.
-            clearIntervals();
+            this.clearAutoHideIntervalIfNeeded();
             // Let our parent know that we have been closed.
             onClose();
         });

From 57881f34c3e1077bd6851e5f84b9124783b450a9 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 14:55:21 +0530
Subject: [PATCH 154/796] Image dims

---
 .../photos/components/FileViewerPhotoSwipe.ts | 48 +++++++++----------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index fdb9cf3a70..b3363b04ea 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -350,28 +350,13 @@ export class FileViewerPhotoSwipe {
         };
 
         const thumbnailURL = await downloadManager.renderableThumbnailURL(file);
-        const thumbnailURLWithDimensions = await new Promise((resolve) => {
-            let image = new Image();
-            image.onload = () => {
-                resolve({
-                    src: thumbnailURL,
-                    width: image.naturalWidth,
-                    height: image.naturalHeight,
-                });
-            };
-            image.src = thumbnailURL;
-        });
-        update(thumbnailURLWithDimensions);
+        update(await augmentedWithDimensions(thumbnailURL));
 
         switch (file.metadata.fileType) {
             case FileType.image: {
                 const sourceURLs =
                     await downloadManager.renderableSourceURLs(file);
-                update({
-                    src: sourceURLs.url,
-                    width: file.pubMagicMetadata?.data?.w,
-                    height: file.pubMagicMetadata?.data?.h,
-                });
+                update(await augmentedWithDimensions(sourceURLs.url));
                 break;
             }
 
@@ -389,18 +374,13 @@ export class FileViewerPhotoSwipe {
                 const livePhotoSourceURLs =
                     sourceURLs.url as LivePhotoSourceURL;
                 const imageURL = await livePhotoSourceURLs.image();
-                update({
-                    src: imageURL,
-                    width: file.pubMagicMetadata?.data?.w,
-                    height: file.pubMagicMetadata?.data?.h,
-                });
+                const imageData = await augmentedWithDimensions(imageURL);
+                update(imageData);
                 const videoURL = await livePhotoSourceURLs.video();
                 console.log(videoURL);
                 // update({ html: livePhotoVideoHTML(videoURL) });
                 update({
-                    src: imageURL,
-                    width: file.pubMagicMetadata?.data?.w,
-                    height: file.pubMagicMetadata?.data?.h,
+                    ...imageData,
                     videoURL,
                 });
                 break;
@@ -421,3 +401,21 @@ const livePhotoVideoHTML = (videoURL: string) => `
   <source src="${videoURL}" />
 </video>
 `;
+
+/**
+ * Take a image URL, determine its dimensions using browser APIs, and return the URL
+ * and its dimensions in a form that can directly be passed to PhotoSwipe as
+ * {@link SlideData}.
+ */
+const augmentedWithDimensions = (imageURL: string): Promise<SlideData> =>
+    new Promise((resolve) => {
+        let image = new Image();
+        image.onload = () => {
+            resolve({
+                src: imageURL,
+                width: image.naturalWidth,
+                height: image.naturalHeight,
+            });
+        };
+        image.src = imageURL;
+    });

From bdb30d64f032ff9dedda6888349a2e7f1637a16f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 15:11:27 +0530
Subject: [PATCH 155/796] Note diversion that didn't work

---
 .../new/photos/components/FileViewerPhotoSwipe.ts      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index b3363b04ea..b39dfdbe51 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -161,8 +161,14 @@ export class FileViewerPhotoSwipe {
             // The default imageClickAction is "zoom-or-close". When the image
             // is small and cannot be zoomed into further (which is common when
             // just the thumbnail has been loaded), this causes PhotoSwipe to
-            // close. Disable this behaviour.
-            clickToCloseNonZoomable: false,
+            // close.
+            //
+            // This can be disabled by setting `clickToCloseNonZoomable` to
+            // false, but we also want to disable zooming into the thumbnails
+            // (it's not useful, and further, the user's zoom will be lost when
+            // the full res is loaded). Setting `imageClickAction` to "zoom"
+            // achieves both these ends.
+            imageClickAction: "zoom",
             // The default `bgClickAction` is "close", but it is not always
             // apparent where the background is and where the controls are,
             // since everything is black, and so accidentally closing PhotoSwipe

From 17e59de59c5f6dbba3e7e142bd521cc366b7f413 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 15:11:42 +0530
Subject: [PATCH 156/796] Revert "Note diversion that didn't work"

This reverts commit 0791a8f659e7aad48ff69c53f07c7894db663345.
---
 .../new/photos/components/FileViewerPhotoSwipe.ts      | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index b39dfdbe51..b3363b04ea 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -161,14 +161,8 @@ export class FileViewerPhotoSwipe {
             // The default imageClickAction is "zoom-or-close". When the image
             // is small and cannot be zoomed into further (which is common when
             // just the thumbnail has been loaded), this causes PhotoSwipe to
-            // close.
-            //
-            // This can be disabled by setting `clickToCloseNonZoomable` to
-            // false, but we also want to disable zooming into the thumbnails
-            // (it's not useful, and further, the user's zoom will be lost when
-            // the full res is loaded). Setting `imageClickAction` to "zoom"
-            // achieves both these ends.
-            imageClickAction: "zoom",
+            // close. Disable this behaviour.
+            clickToCloseNonZoomable: false,
             // The default `bgClickAction` is "close", but it is not always
             // apparent where the background is and where the controls are,
             // since everything is black, and so accidentally closing PhotoSwipe

From 0883fe1d05c5c86f9d85f8d771dcd1d9c78512d2 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 15:44:00 +0530
Subject: [PATCH 157/796] Take 2 disable thumb zoom

---
 web/packages/new/photos/components/FileViewerPhotoSwipe.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index b3363b04ea..8f0b464351 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -232,6 +232,10 @@ export class FileViewerPhotoSwipe {
             return itemData ?? {};
         });
 
+        pswp.addFilter("isContentZoomable", (originalResult, content) => {
+            return content.data.isContentZoomable ?? originalResult;
+        });
+
         pswp.addFilter("preventPointerEvent", (originalResult) => {
             // There was a pointer event. We don't care which one, we just use
             // this as a hook to show UI again (if needed) and update our last
@@ -350,7 +354,8 @@ export class FileViewerPhotoSwipe {
         };
 
         const thumbnailURL = await downloadManager.renderableThumbnailURL(file);
-        update(await augmentedWithDimensions(thumbnailURL));
+        const thumbnailData = await augmentedWithDimensions(thumbnailURL);
+        update({ ...thumbnailData, isContentZoomable: false });
 
         switch (file.metadata.fileType) {
             case FileType.image: {

From aa27191ddcc7c9a544f74da1678129c02408b71e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 15:55:46 +0530
Subject: [PATCH 158/796] CSS for vids

---
 web/apps/photos/src/styles/global.css                    | 9 +++++++++
 .../new/photos/components/FileViewerPhotoSwipe.ts        | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index a83e359b88..77583e306f 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -115,3 +115,12 @@ body {
     display: none;
 }
 }
+
+/*
+  Make the controllable video elements we render as custom PhotoSwipe content
+  take up the entire container.
+ */
+.pswp-ente video[controls] {
+    width: 100%;
+    height: 100%;
+}
diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 8f0b464351..278259509e 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -189,7 +189,7 @@ export class FileViewerPhotoSwipe {
             index: initialIndex,
             // TODO(PS): padding option? for handling custom title bar.
             // TODO(PS): will we need this?
-            mainClass: "our-extra-pswp-main-class",
+            mainClass: "pswp-ente",
         });
 
         // Provide data about slides to PhotoSwipe via callbacks

From 18ee3b19f7b44aaaa14b12aaf853dbaaafaa2130 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 16:05:07 +0530
Subject: [PATCH 159/796] Set

---
 web/packages/new/photos/components/FileViewerPhotoSwipe.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 278259509e..496b0db7f8 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -158,6 +158,10 @@ export class FileViewerPhotoSwipe {
         const pswp = new PhotoSwipe({
             // Opaque background.
             bgOpacity: 1,
+            // The default, "zoom", cannot be used since we're not animating
+            // from a thumbnail, so effectively "fade" is in effect anyway. Set
+            // it still, just for and explicitness and documentation.
+            showHideAnimationType: "fade",
             // The default imageClickAction is "zoom-or-close". When the image
             // is small and cannot be zoomed into further (which is common when
             // just the thumbnail has been loaded), this causes PhotoSwipe to

From 981c74d3f17bbde6e02825856b84ef1501698c01 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 16:16:57 +0530
Subject: [PATCH 160/796] Don't auto load vids

Ref: https://github.com/dimsemenov/photoswipe-video-plugin/blob/5e32d6589df53df2887900bcd55267d72aee57a6/dist/photoswipe-video-plugin.esm.js#L77
---
 web/packages/new/photos/components/FileViewerPhotoSwipe.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 496b0db7f8..99909ae55e 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -248,6 +248,13 @@ export class FileViewerPhotoSwipe {
             return originalResult;
         });
 
+        pswp.on("appendHeavy", (e) => {
+            // Do not append video elements on nearby slides.
+            if (e.slide.content.type == "html" && !e.slide.isActive) {
+                e.preventDefault();
+            }
+        });
+
         pswp.on("contentLoad", (e) => {
             console.log("contentLoad", e);
             if (e.content.data.videoURL) {

From 6e774d675832d735f6618e0ac82cd38dc0ace9d0 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 17:10:26 +0530
Subject: [PATCH 161/796] Pause on changing video slide

---
 .../photos/components/FileViewerPhotoSwipe.ts | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 99909ae55e..8440837a6e 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -236,8 +236,8 @@ export class FileViewerPhotoSwipe {
             return itemData ?? {};
         });
 
-        pswp.addFilter("isContentZoomable", (originalResult, content) => {
-            return content.data.isContentZoomable ?? originalResult;
+        pswp.addFilter("isContentZoomable", (isZoomable, content) => {
+            return content.data.isContentZoomable ?? isZoomable;
         });
 
         pswp.addFilter("preventPointerEvent", (originalResult) => {
@@ -248,15 +248,11 @@ export class FileViewerPhotoSwipe {
             return originalResult;
         });
 
-        pswp.on("appendHeavy", (e) => {
-            // Do not append video elements on nearby slides.
-            if (e.slide.content.type == "html" && !e.slide.isActive) {
-                e.preventDefault();
-            }
-        });
-
         pswp.on("contentLoad", (e) => {
             console.log("contentLoad", e);
+            // if (content.type == "video") {
+            // content.
+            // }
             if (e.content.data.videoURL) {
                 const holderEl = e.content.slide.holderElement;
                 const vid = document.createElement("h1");
@@ -277,9 +273,14 @@ export class FileViewerPhotoSwipe {
             }
         });
 
+        pswp.on("contentDeactivate", (e) => {
+            // Pause the video tag (if any) for a slide when we move away from it.
+            const video = e.content?.element?.getElementsByTagName("video")[0];
+            video?.pause();
+        });
+
+        // The user did some action within the file viewer to close it.
         pswp.on("close", () => {
-            // The user did some action within the file viewer to close it.
-            //
             // Clear intervals.
             this.clearAutoHideIntervalIfNeeded();
             // Let our parent know that we have been closed.

From 8df58319442d977f6f14ff5a341f3f9ef3cf614f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 12 Feb 2025 17:53:53 +0530
Subject: [PATCH 162/796] Some overlay

---
 .../photos/components/FileViewerPhotoSwipe.ts | 47 ++++++++++---------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 8440837a6e..e1f44f5342 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -248,28 +248,36 @@ export class FileViewerPhotoSwipe {
             return originalResult;
         });
 
-        pswp.on("contentLoad", (e) => {
-            console.log("contentLoad", e);
-            // if (content.type == "video") {
-            // content.
-            // }
-            if (e.content.data.videoURL) {
-                const holderEl = e.content.slide.holderElement;
-                const vid = document.createElement("h1");
-                vid.innerText = "Test 1";
-                holderEl.appendChild(vid);
-            }
-        });
         pswp.on("contentAppend", (e) => {
             const containerEl = e.content.slide.container;
-            console.log("contentAppend", containerEl);
             if (e.content.data.videoURL) {
-                const vid = document.createElement("div");
-                vid.innerHTML = livePhotoVideoHTML(e.content.data.videoURL);
+                const img = e.content.element;
+                console.log(
+                    img,
+                    img.width,
+                    img.height,
+                    containerEl.width,
+                    containerEl.height,
+                );
+
+                const vidT = document.createElement("template");
+                vidT.innerHTML = livePhotoVideoHTML(
+                    e.content.data.videoURL,
+                ).trim();
+                const vid = vidT.content.firstChild;
                 // vid.innerText = "Test 2";
+                containerEl.style = "position: relative";
                 containerEl.appendChild(vid);
+                // vid.style = `position: absolute; width: ${img.width}px; height: ${img.height}px; top: 0, left: 0, z-index: 1; pointer-events: none;`;
+                // console.log(vid.style);
+                // vid.style = `position: absolute; width: 200px; height: 200px;
+                // top: 0, left: 0, z-index: 1; pointer-events: none;`;
                 vid.style =
-                    "position: absolute; left: 0; right: 0; width: 100%; height: 100%; z-index: 1; pointer-events: none;";
+                    //img.style +
+                    `width: 200px; height: 100px; ` +
+                    `; position: absolute; top: 0; left: 0; z-index: 1; pointer-events: none;`;
+                // vid.style.width = img.width + "px";
+                // vid.style.height = img.height + "px";
             }
         });
 
@@ -394,12 +402,7 @@ export class FileViewerPhotoSwipe {
                 const imageData = await augmentedWithDimensions(imageURL);
                 update(imageData);
                 const videoURL = await livePhotoSourceURLs.video();
-                console.log(videoURL);
-                // update({ html: livePhotoVideoHTML(videoURL) });
-                update({
-                    ...imageData,
-                    videoURL,
-                });
+                update({ ...imageData, videoURL });
                 break;
             }
         }

From 8218bfba04423cd302a6efc7f79c1a2e6ce35a2b Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Thu, 13 Feb 2025 07:59:06 +0530
Subject: [PATCH 163/796] Try and alternative event to resize

---
 .../photos/components/FileViewerPhotoSwipe.ts | 71 +++++++++++--------
 1 file changed, 41 insertions(+), 30 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index e1f44f5342..614ccca693 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -249,36 +249,38 @@ export class FileViewerPhotoSwipe {
         });
 
         pswp.on("contentAppend", (e) => {
-            const containerEl = e.content.slide.container;
-            if (e.content.data.videoURL) {
-                const img = e.content.element;
-                console.log(
-                    img,
-                    img.width,
-                    img.height,
-                    containerEl.width,
-                    containerEl.height,
-                );
+            const videoURL = e.content.data.livePhotoVideoURL;
+            if (!videoURL) return;
 
-                const vidT = document.createElement("template");
-                vidT.innerHTML = livePhotoVideoHTML(
-                    e.content.data.videoURL,
-                ).trim();
-                const vid = vidT.content.firstChild;
-                // vid.innerText = "Test 2";
-                containerEl.style = "position: relative";
-                containerEl.appendChild(vid);
-                // vid.style = `position: absolute; width: ${img.width}px; height: ${img.height}px; top: 0, left: 0, z-index: 1; pointer-events: none;`;
-                // console.log(vid.style);
-                // vid.style = `position: absolute; width: 200px; height: 200px;
-                // top: 0, left: 0, z-index: 1; pointer-events: none;`;
-                vid.style =
-                    //img.style +
-                    `width: 200px; height: 100px; ` +
-                    `; position: absolute; top: 0; left: 0; z-index: 1; pointer-events: none;`;
-                // vid.style.width = img.width + "px";
-                // vid.style.height = img.height + "px";
+            // This slide is displaying a live photo. Append a video element
+            // into the mix.
+
+            const img = e.content.element;
+            const video = createElementFromHTMLString(
+                livePhotoVideoHTML(videoURL),
+            );
+            const containerEl = e.content.slide.container;
+            containerEl.style = "position: relative";
+            containerEl.appendChild(video);
+            video.style =
+                `width: 200px; height: 100px; ` +
+                `position: absolute; top: 0; left: 0; z-index: 1; pointer-events: none;`;
+        });
+
+        pswp.on("imageSizeChange", ({ content, width, height }) => {
+            if (!content.data.livePhotoVideoURL) return;
+
+            // This slide is displaying a live photo. Modify the size of the
+            // video element to match that of the image.
+
+            const video = content?.element?.getElementsByTagName("video")[0];
+            if (!video) {
+                assertionFailed();
+                return;
             }
+
+            video.style.width = `${width}px`;
+            video.style.height = `${height}px`;
         });
 
         pswp.on("contentDeactivate", (e) => {
@@ -401,8 +403,8 @@ export class FileViewerPhotoSwipe {
                 const imageURL = await livePhotoSourceURLs.image();
                 const imageData = await augmentedWithDimensions(imageURL);
                 update(imageData);
-                const videoURL = await livePhotoSourceURLs.video();
-                update({ ...imageData, videoURL });
+                const livePhotoVideoURL = await livePhotoSourceURLs.video();
+                update({ ...imageData, livePhotoVideoURL });
                 break;
             }
         }
@@ -422,6 +424,14 @@ const livePhotoVideoHTML = (videoURL: string) => `
 </video>
 `;
 
+const createElementFromHTMLString = (htmlString: string) => {
+    const template = document.createElement("template");
+    // Excess whitespace causes excess DOM nodes, causing our firstChild to not
+    // be what we wanted them to be.
+    template.innerHTML = htmlString.trim();
+    return vidT.content.firstChild;
+};
+
 /**
  * Take a image URL, determine its dimensions using browser APIs, and return the URL
  * and its dimensions in a form that can directly be passed to PhotoSwipe as
@@ -437,5 +447,6 @@ const augmentedWithDimensions = (imageURL: string): Promise<SlideData> =>
                 height: image.naturalHeight,
             });
         };
+        // TODO(PS): Handle imageElement.onerror
         image.src = imageURL;
     });

From e06b20a56629204c6be7b460a59249174f3e948a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Thu, 13 Feb 2025 08:09:25 +0530
Subject: [PATCH 164/796] Fix

---
 .../photos/components/FileViewerPhotoSwipe.ts | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 614ccca693..5365977f0d 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -262,20 +262,36 @@ export class FileViewerPhotoSwipe {
             const containerEl = e.content.slide.container;
             containerEl.style = "position: relative";
             containerEl.appendChild(video);
-            video.style =
-                `width: 200px; height: 100px; ` +
-                `position: absolute; top: 0; left: 0; z-index: 1; pointer-events: none;`;
+            video.style = `position: absolute; top: 0; left: 0; z-index: 1; pointer-events: none;`;
+
+            video.style.width = img.style.width;
+            video.style.height = img.style.height;
+
+            console.log(
+                "contentAppend",
+                e.content,
+                e.content.slide.container,
+                video,
+                img.style.width,
+                img.style.height,
+            );
         });
 
         pswp.on("imageSizeChange", ({ content, width, height }) => {
             if (!content.data.livePhotoVideoURL) return;
-
             // This slide is displaying a live photo. Modify the size of the
             // video element to match that of the image.
 
-            const video = content?.element?.getElementsByTagName("video")[0];
+            const video =
+                content.slide.container.getElementsByTagName("video")[0];
+            console.log(
+                "imageSizeChange",
+                content,
+                content.slide.container,
+                video,
+            );
+
             if (!video) {
-                assertionFailed();
                 return;
             }
 
@@ -429,7 +445,7 @@ const createElementFromHTMLString = (htmlString: string) => {
     // Excess whitespace causes excess DOM nodes, causing our firstChild to not
     // be what we wanted them to be.
     template.innerHTML = htmlString.trim();
-    return vidT.content.firstChild;
+    return template.content.firstChild;
 };
 
 /**

From b823a8d6a121c29e345b193c95091bc9633d752e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Thu, 13 Feb 2025 08:17:12 +0530
Subject: [PATCH 165/796] Cleanup

---
 .../photos/components/FileViewerPhotoSwipe.ts | 80 ++++++++-----------
 1 file changed, 35 insertions(+), 45 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 5365977f0d..24e1ddb98a 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -227,7 +227,7 @@ export class FileViewerPhotoSwipe {
                 }
             }
 
-            log.debug(() => ["[ps]", { itemData, index, file, itemData }]);
+            log.debug(() => ["[viewer]", { index, itemData, file }]);
             if (!file) assertionFailed();
 
             if (this.lastActivityDate != "already-hidden")
@@ -242,8 +242,8 @@ export class FileViewerPhotoSwipe {
 
         pswp.addFilter("preventPointerEvent", (originalResult) => {
             // There was a pointer event. We don't care which one, we just use
-            // this as a hook to show UI again (if needed) and update our last
-            // activity date.
+            // this as a hook to show the UI again (if needed), and update our
+            // last activity date.
             this.onPointerActivity();
             return originalResult;
         });
@@ -252,46 +252,36 @@ export class FileViewerPhotoSwipe {
             const videoURL = e.content.data.livePhotoVideoURL;
             if (!videoURL) return;
 
-            // This slide is displaying a live photo. Append a video element
-            // into the mix.
+            // This slide is displaying a live photo. Append a video element to
+            // show its video part.
 
             const img = e.content.element;
             const video = createElementFromHTMLString(
                 livePhotoVideoHTML(videoURL),
             );
-            const containerEl = e.content.slide.container;
-            containerEl.style = "position: relative";
-            containerEl.appendChild(video);
-            video.style = `position: absolute; top: 0; left: 0; z-index: 1; pointer-events: none;`;
+            const container = e.content.slide.container;
+            container.style = "position: relative";
+            container.appendChild(video);
+            // Set z-index to 1 to keep it on top, and set pointer-events to
+            // none to pass the clicks through.
+            video.style =
+                "position: absolute; top: 0; left: 0; z-index: 1; pointer-events: none;";
 
+            // Size it to the underlying image.
             video.style.width = img.style.width;
             video.style.height = img.style.height;
-
-            console.log(
-                "contentAppend",
-                e.content,
-                e.content.slide.container,
-                video,
-                img.style.width,
-                img.style.height,
-            );
         });
 
         pswp.on("imageSizeChange", ({ content, width, height }) => {
             if (!content.data.livePhotoVideoURL) return;
-            // This slide is displaying a live photo. Modify the size of the
+
+            // This slide is displaying a live photo. Resize the size of the
             // video element to match that of the image.
 
             const video =
                 content.slide.container.getElementsByTagName("video")[0];
-            console.log(
-                "imageSizeChange",
-                content,
-                content.slide.container,
-                video,
-            );
-
             if (!video) {
+                // We might have been called before "contentAppend".
                 return;
             }
 
@@ -427,6 +417,25 @@ export class FileViewerPhotoSwipe {
     }
 }
 
+/**
+ * Take a image URL, determine its dimensions using browser APIs, and return the URL
+ * and its dimensions in a form that can directly be passed to PhotoSwipe as
+ * {@link SlideData}.
+ */
+const augmentedWithDimensions = (imageURL: string): Promise<SlideData> =>
+    new Promise((resolve) => {
+        let image = new Image();
+        image.onload = () => {
+            resolve({
+                src: imageURL,
+                width: image.naturalWidth,
+                height: image.naturalHeight,
+            });
+        };
+        // TODO(PS): Handle imageElement.onerror
+        image.src = imageURL;
+    });
+
 const videoHTML = (url: string, disableDownload: boolean) => `
 <video controls ${disableDownload && "controlsList=nodownload"} oncontextmenu="return false;">
   <source src="${url}" />
@@ -447,22 +456,3 @@ const createElementFromHTMLString = (htmlString: string) => {
     template.innerHTML = htmlString.trim();
     return template.content.firstChild;
 };
-
-/**
- * Take a image URL, determine its dimensions using browser APIs, and return the URL
- * and its dimensions in a form that can directly be passed to PhotoSwipe as
- * {@link SlideData}.
- */
-const augmentedWithDimensions = (imageURL: string): Promise<SlideData> =>
-    new Promise((resolve) => {
-        let image = new Image();
-        image.onload = () => {
-            resolve({
-                src: imageURL,
-                width: image.naturalWidth,
-                height: image.naturalHeight,
-            });
-        };
-        // TODO(PS): Handle imageElement.onerror
-        image.src = imageURL;
-    });

From c17d0d00877cc514adb3ab82429bac0e772b89db Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Thu, 13 Feb 2025 09:50:49 +0530
Subject: [PATCH 166/796] Handle keyboard focus when auto hiding

---
 .../photos/components/FileViewerPhotoSwipe.ts | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 24e1ddb98a..58f7c68296 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -303,6 +303,20 @@ export class FileViewerPhotoSwipe {
             onClose();
         });
 
+        // Add our custom UI elements to inside the PhotoSwipe dialog.
+        pswp.on("uiRegister", () => {
+            pswp.ui.registerElement({
+                name: "info-button",
+                ariaLabel: "File info",
+                // order:
+                isButton: true,
+                html: "Info",
+                onClick: (e) => {
+                    console.log("click", e);
+                },
+            });
+        });
+
         // Initializing PhotoSwipe adds it to the DOM as a dialog-like div with
         // the class "pswp".
         pswp.init();
@@ -355,7 +369,7 @@ export class FileViewerPhotoSwipe {
         if (this.lastActivityDate == "auto-hidden") return;
         if (Date.now() - this.lastActivityDate.getTime() > 3000) {
             if (this.areUIControlsVisible()) {
-                this.hideUIControls();
+                this.hideUIControlsIfNotFocused();
                 this.lastActivityDate = "auto-hidden";
             } else {
                 this.lastActivityDate = "already-hidden";
@@ -371,7 +385,21 @@ export class FileViewerPhotoSwipe {
         this.pswp.element.classList.add("pswp--ui-visible");
     }
 
-    private hideUIControls() {
+    private hideUIControlsIfNotFocused() {
+        // Check if the current keyboard focus is on any of the UI controls.
+        //
+        // By default, the pswp root element takes up the keyboard focus, so we
+        // check if the currently focused element is still the PhotoSwipe dialog
+        // (if so, this means we're not focused on a specific control).
+        const isDefaultFocus = document
+            .querySelector(":focus-visible")
+            ?.classList.contains("pswp");
+        if (!isDefaultFocus) {
+            // The user focused (e.g. via keyboard tabs) to a specific UI
+            // element. Skip auto hiding.
+            return;
+        }
+
         this.pswp.element.classList.remove("pswp--ui-visible");
     }
 

From 6653b36764d13fbfe77c2a5129c35f70ab09ca45 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Thu, 13 Feb 2025 09:56:42 +0530
Subject: [PATCH 167/796] Use order to position it

---
 .../new/photos/components/FileViewerPhotoSwipe.ts      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
index 58f7c68296..28e88c825a 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
@@ -304,11 +304,19 @@ export class FileViewerPhotoSwipe {
         });
 
         // Add our custom UI elements to inside the PhotoSwipe dialog.
+        //
+        // API docs for registerElement:
+        // https://photoswipe.com/adding-ui-elements/#uiregisterelement-api
+        //
+        // The "order" prop is used to position items. Some landmarks:
+        // - counter: 5
+        // - zoom: 10
+        // - close: 20
         pswp.on("uiRegister", () => {
             pswp.ui.registerElement({
                 name: "info-button",
                 ariaLabel: "File info",
-                // order:
+                order: 15,
                 isButton: true,
                 html: "Info",
                 onClick: (e) => {

From 46658a26f3e89b4937aedec35581a131ae50f119 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Thu, 13 Feb 2025 10:35:45 +0530
Subject: [PATCH 168/796] Icon 1

---
 ...erPhotoSwipe.ts => FileViewerPhotoSwipe.tsx} | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
 rename web/packages/new/photos/components/{FileViewerPhotoSwipe.ts => FileViewerPhotoSwipe.tsx} (95%)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
similarity index 95%
rename from web/packages/new/photos/components/FileViewerPhotoSwipe.ts
rename to web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
index 28e88c825a..0821e6ec8d 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.ts
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
@@ -9,6 +9,8 @@ import {
 } from "@/gallery/services/download";
 import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
+import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
+import { renderToString } from "react-dom/server";
 import type { FileViewerProps } from "./FileViewer5";
 
 // TODO(PS): WIP gallery using upstream photoswipe
@@ -313,12 +315,22 @@ export class FileViewerPhotoSwipe {
         // - zoom: 10
         // - close: 20
         pswp.on("uiRegister", () => {
+            const html = <InfoOutlinedIcon />;
+            console.log(renderToString(html));
+            const path =
+                '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8"></path>';
+            const pathWithID =
+                '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8" id="pswp__icn-info"/>';
             pswp.ui.registerElement({
                 name: "info-button",
                 ariaLabel: "File info",
                 order: 15,
                 isButton: true,
-                html: "Info",
+                html: {
+                    isCustomSVG: true,
+                    inner: path,
+                    outlineID: "pswp__icn-info",
+                },
                 onClick: (e) => {
                     console.log("click", e);
                 },
@@ -408,7 +420,8 @@ export class FileViewerPhotoSwipe {
             return;
         }
 
-        this.pswp.element.classList.remove("pswp--ui-visible");
+        // TODO(PS): Commented during testing
+        // this.pswp.element.classList.remove("pswp--ui-visible");
     }
 
     private async enqueueUpdates(index: number, file: EnteFile) {

From baa72202b25a270c829a14552cc13de0052666aa Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Thu, 13 Feb 2025 10:50:28 +0530
Subject: [PATCH 169/796] Icon 2

---
 .../components/FileViewerPhotoSwipe.tsx       | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
index 0821e6ec8d..ebe4815dac 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
@@ -9,10 +9,10 @@ import {
 } from "@/gallery/services/download";
 import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
-import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
-import { renderToString } from "react-dom/server";
 import type { FileViewerProps } from "./FileViewer5";
 
+// import { renderToString } from "react-dom/server";
+
 // TODO(PS): WIP gallery using upstream photoswipe
 //
 // Needs (not committed yet):
@@ -315,20 +315,21 @@ export class FileViewerPhotoSwipe {
         // - zoom: 10
         // - close: 20
         pswp.on("uiRegister", () => {
-            const html = <InfoOutlinedIcon />;
-            console.log(renderToString(html));
-            const path =
-                '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8"></path>';
-            const pathWithID =
-                '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8" id="pswp__icn-info"/>';
+            // const html = <InfoOutlinedIcon fontSize="32" />;
+            // console.log(renderToString(html));
+            // const path =
+            //     '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8"></path>';
+            const pathWithIDAndTransform =
+                '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8" transform="translate(3.5, 3.5)" id="pswp__icn-info" />';
             pswp.ui.registerElement({
-                name: "info-button",
-                ariaLabel: "File info",
+                name: "info",
+                title: "Info",
+                ariaLabel: "Info",
                 order: 15,
                 isButton: true,
                 html: {
                     isCustomSVG: true,
-                    inner: path,
+                    inner: pathWithIDAndTransform,
                     outlineID: "pswp__icn-info",
                 },
                 onClick: (e) => {

From e8fa86e2ad7c2d0b01eda63d2170d0be3c231c25 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Thu, 13 Feb 2025 11:05:51 +0530
Subject: [PATCH 170/796] Loader

---
 .../new/photos/components/FileViewerPhotoSwipe.tsx     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
index ebe4815dac..a5ca0f4f80 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
@@ -238,6 +238,10 @@ export class FileViewerPhotoSwipe {
             return itemData ?? {};
         });
 
+        pswp.addFilter("isContentLoading", (isLoading, content) => {
+            return content.data.isContentLoading ?? isLoading;
+        });
+
         pswp.addFilter("isContentZoomable", (isZoomable, content) => {
             return content.data.isContentZoomable ?? isZoomable;
         });
@@ -433,7 +437,11 @@ export class FileViewerPhotoSwipe {
 
         const thumbnailURL = await downloadManager.renderableThumbnailURL(file);
         const thumbnailData = await augmentedWithDimensions(thumbnailURL);
-        update({ ...thumbnailData, isContentZoomable: false });
+        update({
+            ...thumbnailData,
+            isContentLoading: true,
+            isContentZoomable: false,
+        });
 
         switch (file.metadata.fileType) {
             case FileType.image: {

From bd00c27dc63691e0d374d379890a395a5718bb96 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Thu, 13 Feb 2025 11:41:43 +0530
Subject: [PATCH 171/796] Same name as docs

---
 web/packages/new/photos/components/FileViewerPhotoSwipe.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
index a5ca0f4f80..c2f6f4fb0d 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
@@ -246,12 +246,12 @@ export class FileViewerPhotoSwipe {
             return content.data.isContentZoomable ?? isZoomable;
         });
 
-        pswp.addFilter("preventPointerEvent", (originalResult) => {
+        pswp.addFilter("preventPointerEvent", (preventPointerEvent) => {
             // There was a pointer event. We don't care which one, we just use
             // this as a hook to show the UI again (if needed), and update our
             // last activity date.
             this.onPointerActivity();
-            return originalResult;
+            return preventPointerEvent;
         });
 
         pswp.on("contentAppend", (e) => {

From 1980cb035e9ff7dc849cd74e737e3dfef87b08a9 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Thu, 13 Feb 2025 11:56:39 +0530
Subject: [PATCH 172/796] Add example

---
 web/apps/photos/src/styles/global.css                    | 4 ++++
 .../new/photos/components/FileViewerPhotoSwipe.tsx       | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 77583e306f..60f4b22151 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -124,3 +124,7 @@ body {
     width: 100%;
     height: 100%;
 }
+
+.pswp-ente .pswp__preloader--active .pswp__icn {
+  opacity: 0.4;
+}
diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
index c2f6f4fb0d..5196d2f6dd 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
@@ -342,6 +342,15 @@ export class FileViewerPhotoSwipe {
             });
         });
 
+        // Modify the default UI elements.
+        pswp.addFilter("uiElement", (element, data) => {
+            if (element.name == "preloader") {
+                // TODO(PS): Left as an example. For now, this is customized in
+                // the CSS.
+            }
+            return element;
+        });
+
         // Initializing PhotoSwipe adds it to the DOM as a dialog-like div with
         // the class "pswp".
         pswp.init();

From 20bbdb131dfa5f9b52fb09bd3e34aec5c35bfa8f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Thu, 13 Feb 2025 12:02:55 +0530
Subject: [PATCH 173/796] Get file

---
 .../new/photos/components/FileViewerPhotoSwipe.tsx     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
index 5196d2f6dd..ae4b21efcb 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
@@ -336,8 +336,14 @@ export class FileViewerPhotoSwipe {
                     inner: pathWithIDAndTransform,
                     outlineID: "pswp__icn-info",
                 },
-                onClick: (e) => {
-                    console.log("click", e);
+                onClick: (e, element, pswp) => {
+                    const file = this.files[pswp.currIndex];
+                    if (!file) {
+                        assertionFailed();
+                        return;
+                    }
+
+                    console.log("info", file);
                 },
             });
         });

From 0d32bd55dddbda7a54756cb799f7bb4e48ed8c96 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 08:34:11 +0530
Subject: [PATCH 174/796] Plumb

---
 web/packages/new/photos/components/FileViewer5.tsx       | 9 +++++++--
 .../new/photos/components/FileViewerPhotoSwipe.tsx       | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
index 727dcb54ed..0b678f881d 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -15,7 +15,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 
 import type { EnteFile } from "@/media/file.js";
 import { Button, styled } from "@mui/material";
-import { useEffect, useRef } from "react";
+import { useCallback, useEffect, useRef } from "react";
 import { FileViewerPhotoSwipe } from "./FileViewerPhotoSwipe";
 
 export interface FileViewerProps {
@@ -57,6 +57,10 @@ const FileViewer: React.FC<FileViewerProps> = ({
 }) => {
     const pswpRef = useRef<FileViewerPhotoSwipe | undefined>();
 
+    const handleViewInfo = useCallback((file: EnteFile) => {
+        console.log("view-info", file);
+    }, []);
+
     useEffect(() => {
         if (!open) {
             // The close state will be handled by the cleanup function.
@@ -66,8 +70,9 @@ const FileViewer: React.FC<FileViewerProps> = ({
         const pswp = new FileViewerPhotoSwipe({
             files,
             initialIndex,
-            onClose,
             disableDownload,
+            onClose,
+            onViewInfo: handleViewInfo,
         });
         pswpRef.current = pswp;
 
diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
index ae4b21efcb..22b37ca2fd 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
@@ -88,6 +88,10 @@ type FileViewerPhotoSwipeOptions = FileViewerProps & {
      * Called when the file viewer is closed.
      */
     onClose: () => void;
+    /**
+     * Called when the user activates the info action on a file.
+     */
+    onViewInfo: (file: EnteFile) => void;
 };
 
 /**
@@ -151,8 +155,9 @@ export class FileViewerPhotoSwipe {
     constructor({
         files,
         initialIndex,
-        onClose,
         disableDownload,
+        onClose,
+        onViewInfo,
     }: FileViewerPhotoSwipeOptions) {
         this.files = files;
         this.opts = { disableDownload };
@@ -343,7 +348,7 @@ export class FileViewerPhotoSwipe {
                         return;
                     }
 
-                    console.log("info", file);
+                    onViewInfo(file);
                 },
             });
         });

From 20fea517cecefc236f88bc4e7e77bccca88c9ce6 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 08:46:13 +0530
Subject: [PATCH 175/796] Revert "Workbench"

This reverts commit 4736ec7e0a01a5bb045b9f1e0e5c571db78c0e6a.
---
 web/apps/photos/src/pages/_app.tsx                          | 4 ++--
 web/apps/photos/src/styles/global.css                       | 3 +--
 web/packages/new/photos/components/FileViewerPhotoSwipe.tsx | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index 62800fc6fe..98bbec1235 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -50,9 +50,9 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { resumeExportsIfNeeded } from "services/export";
 import { photosLogout } from "services/logout";
 
-// import "photoswipe/dist/photoswipe.css";
+import "photoswipe/dist/photoswipe.css";
 // TODO(PS): Note, auto hide only works with the new CSS.
-import "../../../../packages/new/photos/components/ps5/dist/photoswipe.css";
+// import "../../../../packages/new/photos/components/ps5/dist/photoswipe.css";
 
 import "styles/global.css";
 
diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 60f4b22151..1abd2df3c4 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -12,7 +12,7 @@ body {
     flex-direction: column;
     height: 100%;
 }
-@media DISABLED {
+
 .pswp__button--custom {
     width: 48px;
     height: 48px;
@@ -114,7 +114,6 @@ body {
 .pswp__caption--empty {
     display: none;
 }
-}
 
 /*
   Make the controllable video elements we render as custom PhotoSwipe content
diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
index 22b37ca2fd..db1771f379 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
@@ -28,7 +28,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 let PhotoSwipe;
 if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     // TODO(PS): Comment me before merging into main.
-    PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
+    // PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
 // TODO(PS):
 //import { type SlideData } from "./ps5/dist/types/slide/"

From 8a8934eacd2b571d75f15a3dabd70a988b605ae5 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 08:48:54 +0530
Subject: [PATCH 176/796] LF

---
 web/apps/photos/src/styles/global.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 1abd2df3c4..38d9241ba2 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -125,5 +125,5 @@ body {
 }
 
 .pswp-ente .pswp__preloader--active .pswp__icn {
-  opacity: 0.4;
+    opacity: 0.4;
 }

From 43a7cb122310613448d3e097f4ca1feafd9bdabf Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 10:48:38 +0530
Subject: [PATCH 177/796] Move

---
 web/apps/photos/src/services/collectionService.ts    |  2 +-
 web/apps/photos/src/utils/file/index.ts              |  8 ++++----
 .../gallery/services/file.ts}                        | 12 +++++++++---
 3 files changed, 14 insertions(+), 8 deletions(-)
 rename web/{apps/photos/src/services/fileService.ts => packages/gallery/services/file.ts} (93%)

diff --git a/web/apps/photos/src/services/collectionService.ts b/web/apps/photos/src/services/collectionService.ts
index a8dc225337..4f994d697f 100644
--- a/web/apps/photos/src/services/collectionService.ts
+++ b/web/apps/photos/src/services/collectionService.ts
@@ -1,6 +1,7 @@
 import { encryptMetadataJSON, sharedCryptoWorker } from "@/base/crypto";
 import log from "@/base/log";
 import { apiURL } from "@/base/origins";
+import { UpdateMagicMetadataRequest } from "@/gallery/services/file";
 import {
     Collection,
     CollectionMagicMetadata,
@@ -48,7 +49,6 @@ import {
     isQuickLinkCollection,
     isValidMoveTarget,
 } from "utils/collection";
-import { UpdateMagicMetadataRequest } from "./fileService";
 import { getPublicKey } from "./userService";
 
 const UNCATEGORIZED_COLLECTION_NAME = "Uncategorized";
diff --git a/web/apps/photos/src/utils/file/index.ts b/web/apps/photos/src/utils/file/index.ts
index 1c2bdc2826..27f07ea696 100644
--- a/web/apps/photos/src/utils/file/index.ts
+++ b/web/apps/photos/src/utils/file/index.ts
@@ -3,6 +3,10 @@ import log from "@/base/log";
 import { type Electron } from "@/base/types/ipc";
 import { downloadAndRevokeObjectURL } from "@/base/utils/web";
 import { downloadManager } from "@/gallery/services/download";
+import {
+    updateFileMagicMetadata,
+    updateFilePublicMagicMetadata,
+} from "@/gallery/services/file";
 import { detectFileTypeInfo } from "@/gallery/utils/detect-type";
 import { writeStream } from "@/gallery/utils/native-stream";
 import {
@@ -30,10 +34,6 @@ import {
     addMultipleToFavorites,
     moveToHiddenCollection,
 } from "services/collectionService";
-import {
-    updateFileMagicMetadata,
-    updateFilePublicMagicMetadata,
-} from "services/fileService";
 import {
     SelectedState,
     SetFilesDownloadProgressAttributes,
diff --git a/web/apps/photos/src/services/fileService.ts b/web/packages/gallery/services/file.ts
similarity index 93%
rename from web/apps/photos/src/services/fileService.ts
rename to web/packages/gallery/services/file.ts
index f948e45067..08f54ac7b2 100644
--- a/web/apps/photos/src/services/fileService.ts
+++ b/web/packages/gallery/services/file.ts
@@ -1,7 +1,10 @@
+/* TODO: Audit this file */
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+
 import { encryptMetadataJSON } from "@/base/crypto";
 import { apiURL } from "@/base/origins";
-import {
-    type EncryptedMagicMetadata,
+import type {
+    EncryptedMagicMetadata,
     EnteFile,
     FileWithUpdatedMagicMetadata,
     FileWithUpdatedPublicMagicMetadata,
@@ -14,7 +17,7 @@ export interface UpdateMagicMetadataRequest {
     magicMetadata: EncryptedMagicMetadata;
 }
 
-export interface BulkUpdateMagicMetadataRequest {
+interface BulkUpdateMagicMetadataRequest {
     metadataList: UpdateMagicMetadataRequest[];
 }
 
@@ -48,6 +51,7 @@ export const updateFileMagicMetadata = async (
     await HTTPService.put(
         await apiURL("/files/magic-metadata"),
         reqBody,
+        // @ts-ignore
         null,
         {
             "X-Auth-Token": token,
@@ -69,6 +73,7 @@ export const updateFilePublicMagicMetadata = async (
 ): Promise<EnteFile[]> => {
     const token = getToken();
     if (!token) {
+        // @ts-ignore
         return;
     }
     const reqBody: BulkUpdateMagicMetadataRequest = { metadataList: [] };
@@ -94,6 +99,7 @@ export const updateFilePublicMagicMetadata = async (
     await HTTPService.put(
         await apiURL("/files/public-magic-metadata"),
         reqBody,
+        // @ts-ignore
         null,
         {
             "X-Auth-Token": token,

From f18bcc71d329a841bd0338c7964a9090426abe50 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 11:03:16 +0530
Subject: [PATCH 178/796] Move

---
 .../src/components/PhotoViewer/FileInfo.tsx   |  2 +-
 web/apps/photos/src/utils/file/index.ts       | 56 +------------------
 web/packages/gallery/services/file.ts         | 56 +++++++++++++++++++
 3 files changed, 58 insertions(+), 56 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx b/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx
index d79f55eec1..eff1f90632 100644
--- a/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx
@@ -78,7 +78,7 @@ import {
     changeCaption,
     changeFileName,
     updateExistingFilePubMetadata,
-} from "utils/file";
+} from "@/gallery/services/file";
 import { PublicCollectionGalleryContext } from "utils/publicCollectionGallery";
 import * as Yup from "yup";
 
diff --git a/web/apps/photos/src/utils/file/index.ts b/web/apps/photos/src/utils/file/index.ts
index 27f07ea696..dd961f4400 100644
--- a/web/apps/photos/src/utils/file/index.ts
+++ b/web/apps/photos/src/utils/file/index.ts
@@ -3,19 +3,13 @@ import log from "@/base/log";
 import { type Electron } from "@/base/types/ipc";
 import { downloadAndRevokeObjectURL } from "@/base/utils/web";
 import { downloadManager } from "@/gallery/services/download";
-import {
-    updateFileMagicMetadata,
-    updateFilePublicMagicMetadata,
-} from "@/gallery/services/file";
+import { updateFileMagicMetadata } from "@/gallery/services/file";
 import { detectFileTypeInfo } from "@/gallery/utils/detect-type";
 import { writeStream } from "@/gallery/utils/native-stream";
 import {
     EnteFile,
     FileMagicMetadataProps,
-    FilePublicMagicMetadata,
-    FilePublicMagicMetadataProps,
     FileWithUpdatedMagicMetadata,
-    mergeMetadata,
 } from "@/media/file";
 import { ItemVisibility } from "@/media/file-metadata";
 import { FileType } from "@/media/file-type";
@@ -122,46 +116,6 @@ export async function changeFilesVisibility(
     return await updateFileMagicMetadata(fileWithUpdatedMagicMetadataList);
 }
 
-export async function changeFileName(
-    file: EnteFile,
-    editedName: string,
-): Promise<EnteFile> {
-    const updatedPublicMagicMetadataProps: FilePublicMagicMetadataProps = {
-        editedName,
-    };
-
-    const updatedPublicMagicMetadata: FilePublicMagicMetadata =
-        await updateMagicMetadata(
-            updatedPublicMagicMetadataProps,
-            file.pubMagicMetadata,
-            file.key,
-        );
-    const updateResult = await updateFilePublicMagicMetadata([
-        { file, updatedPublicMagicMetadata },
-    ]);
-    return updateResult[0];
-}
-
-export async function changeCaption(
-    file: EnteFile,
-    caption: string,
-): Promise<EnteFile> {
-    const updatedPublicMagicMetadataProps: FilePublicMagicMetadataProps = {
-        caption,
-    };
-
-    const updatedPublicMagicMetadata: FilePublicMagicMetadata =
-        await updateMagicMetadata(
-            updatedPublicMagicMetadataProps,
-            file.pubMagicMetadata,
-            file.key,
-        );
-    const updateResult = await updateFilePublicMagicMetadata([
-        { file, updatedPublicMagicMetadata },
-    ]);
-    return updateResult[0];
-}
-
 export function isSharedFile(user: User, file: EnteFile) {
     if (!user?.id || !file?.ownerID) {
         return false;
@@ -169,14 +123,6 @@ export function isSharedFile(user: User, file: EnteFile) {
     return file.ownerID !== user.id;
 }
 
-export function updateExistingFilePubMetadata(
-    existingFile: EnteFile,
-    updatedFile: EnteFile,
-) {
-    existingFile.pubMagicMetadata = updatedFile.pubMagicMetadata;
-    existingFile.metadata = mergeMetadata([existingFile])[0].metadata;
-}
-
 export async function getFileFromURL(fileURL: string, name: string) {
     const fileBlob = await (await fetch(fileURL)).blob();
     const fileFile = new File([fileBlob], name);
diff --git a/web/packages/gallery/services/file.ts b/web/packages/gallery/services/file.ts
index 08f54ac7b2..eaab3449b8 100644
--- a/web/packages/gallery/services/file.ts
+++ b/web/packages/gallery/services/file.ts
@@ -6,9 +6,13 @@ import { apiURL } from "@/base/origins";
 import type {
     EncryptedMagicMetadata,
     EnteFile,
+    FilePublicMagicMetadata,
+    FilePublicMagicMetadataProps,
     FileWithUpdatedMagicMetadata,
     FileWithUpdatedPublicMagicMetadata,
 } from "@/media/file";
+import { mergeMetadata } from "@/media/file";
+import { updateMagicMetadata } from "@/new/photos/services/magic-metadata";
 import HTTPService from "@ente/shared/network/HTTPService";
 import { getToken } from "@ente/shared/storage/localStorage/helpers";
 
@@ -115,3 +119,55 @@ export const updateFilePublicMagicMetadata = async (
         }),
     );
 };
+
+export async function changeFileName(
+    file: EnteFile,
+    editedName: string,
+): Promise<EnteFile> {
+    const updatedPublicMagicMetadataProps: FilePublicMagicMetadataProps = {
+        editedName,
+    };
+
+    const updatedPublicMagicMetadata: FilePublicMagicMetadata =
+        await updateMagicMetadata(
+            updatedPublicMagicMetadataProps,
+            file.pubMagicMetadata,
+            file.key,
+        );
+    const updateResult = await updateFilePublicMagicMetadata([
+        { file, updatedPublicMagicMetadata },
+    ]);
+    // @ts-ignore
+    return updateResult[0];
+}
+
+export async function changeCaption(
+    file: EnteFile,
+    caption: string,
+): Promise<EnteFile> {
+    const updatedPublicMagicMetadataProps: FilePublicMagicMetadataProps = {
+        caption,
+    };
+
+    const updatedPublicMagicMetadata: FilePublicMagicMetadata =
+        await updateMagicMetadata(
+            updatedPublicMagicMetadataProps,
+            file.pubMagicMetadata,
+            file.key,
+        );
+    const updateResult = await updateFilePublicMagicMetadata([
+        { file, updatedPublicMagicMetadata },
+    ]);
+    // @ts-ignore
+    return updateResult[0];
+}
+
+export function updateExistingFilePubMetadata(
+    existingFile: EnteFile,
+    updatedFile: EnteFile,
+) {
+    // @ts-ignore
+    existingFile.pubMagicMetadata = updatedFile.pubMagicMetadata;
+    // @ts-ignore
+    existingFile.metadata = mergeMetadata([existingFile])[0].metadata;
+}

From e66ee5bcb125a4fe48f46e2d2953a8bdb2073bdd Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 11:06:06 +0530
Subject: [PATCH 179/796] to-base

---
 web/packages/base/package.json  | 2 ++
 web/packages/new/package.json   | 1 -
 web/packages/utils/package.json | 4 +---
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/packages/base/package.json b/web/packages/base/package.json
index 6fea597abd..a700cab88b 100644
--- a/web/packages/base/package.json
+++ b/web/packages/base/package.json
@@ -10,6 +10,7 @@
         "@mui/icons-material": "^6.4.3",
         "@mui/material": "^6.4.3",
         "comlink": "^4.4.2",
+        "formik": "^2.4.6",
         "get-user-locale": "^2.3.2",
         "i18next": "^24.2.2",
         "i18next-resources-to-backend": "^1.2.1",
@@ -20,6 +21,7 @@
         "react": "^19.0.0",
         "react-dom": "^19.0.0",
         "react-i18next": "^15.4.0",
+        "yup": "^1.6.1",
         "zod": "^3.24.1"
     },
     "devDependencies": {
diff --git a/web/packages/new/package.json b/web/packages/new/package.json
index 86c25694a8..860c93a9a9 100644
--- a/web/packages/new/package.json
+++ b/web/packages/new/package.json
@@ -11,7 +11,6 @@
         "@mui/system": "^6.4.3",
         "@mui/x-date-pickers": "^7.25.0",
         "dayjs": "^1.11.13",
-        "formik": "^2.4.6",
         "react": "^19.0.0",
         "react-dom": "^19.0.0"
     },
diff --git a/web/packages/utils/package.json b/web/packages/utils/package.json
index 6a1323c93d..23c310ab20 100644
--- a/web/packages/utils/package.json
+++ b/web/packages/utils/package.json
@@ -2,9 +2,7 @@
     "name": "@/utils",
     "version": "0.0.0",
     "private": true,
-    "dependencies": {
-        "yup": "^1.6.1"
-    },
+    "dependencies": {},
     "devDependencies": {
         "@/build-config": "*"
     }

From 2b52616ba59e385f2ed15d1734ccca16c7c4a03d Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 11:11:57 +0530
Subject: [PATCH 180/796] Undep

---
 .../src/components/PhotoViewer/FileInfo.tsx      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx b/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx
index eff1f90632..3f27dc44c0 100644
--- a/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx
@@ -10,6 +10,11 @@ import { haveWindow } from "@/base/env";
 import { nameAndExtension } from "@/base/file-name";
 import log from "@/base/log";
 import type { Location } from "@/base/types";
+import {
+    changeCaption,
+    changeFileName,
+    updateExistingFilePubMetadata,
+} from "@/gallery/services/file";
 import { EnteFile } from "@/media/file";
 import type { ParsedMetadata } from "@/media/file-metadata";
 import {
@@ -69,16 +74,10 @@ import {
     TextField,
     Typography,
 } from "@mui/material";
-import type { DisplayFile } from "components/PhotoFrame";
 import { Formik } from "formik";
 import { t } from "i18next";
 import { GalleryContext } from "pages/gallery";
 import React, { useContext, useEffect, useMemo, useRef, useState } from "react";
-import {
-    changeCaption,
-    changeFileName,
-    updateExistingFilePubMetadata,
-} from "@/gallery/services/file";
 import { PublicCollectionGalleryContext } from "utils/publicCollectionGallery";
 import * as Yup from "yup";
 
@@ -511,7 +510,10 @@ function RenderCaption({
     shouldDisableEdits,
 }: {
     shouldDisableEdits: boolean;
-    file: DisplayFile;
+    /* TODO: This is DisplayFile, but that's meant to be deprecated */
+    file: EnteFile & {
+        title?: string;
+    };
     scheduleUpdate: () => void;
     refreshPhotoswipe: () => void;
 }) {

From b931dac18b64433eb3778dacd47fd6790fa9c44e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 11:30:32 +0530
Subject: [PATCH 181/796] Doc

---
 web/packages/media/collection.ts | 7 +++++++
 web/packages/media/file.ts       | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/web/packages/media/collection.ts b/web/packages/media/collection.ts
index e658ec1767..a813afaed3 100644
--- a/web/packages/media/collection.ts
+++ b/web/packages/media/collection.ts
@@ -27,6 +27,13 @@ export interface CollectionUser {
 }
 
 export interface EncryptedCollection {
+    /**
+     * The collection's globally unique ID.
+     *
+     * The collection's ID is a integer assigned by remote as the identifier for
+     * an {@link Collection} when it is created. It is globally unique across
+     * all collections on an Ente instance (i.e., it is not scoped to a user).
+     */
     id: number;
     owner: CollectionUser;
     // collection name was unencrypted in the past, so we need to keep it as optional
diff --git a/web/packages/media/file.ts b/web/packages/media/file.ts
index 767c86f5ef..f087dbb17e 100644
--- a/web/packages/media/file.ts
+++ b/web/packages/media/file.ts
@@ -66,11 +66,11 @@ export type EncryptedMagicMetadata = MagicMetadataCore<string>;
 
 export interface EncryptedEnteFile {
     /**
-     * The file's ID.
+     * The file's globally unique ID.
      *
-     * The file's ID is a integer assigned by remote that is unique across all
-     * files stored by an Ente instance. That is, the file ID is a global unique
-     * identifier for this {@link EnteFile}.
+     * The file's ID is a integer assigned by remote as the identifier for an
+     * {@link EnteFile} when it is created. It is globally unique across all
+     * files stored by an Ente instance, and is not scoped to the current user.
      */
     id: number;
     /**

From 87ff5c5c0b2eae2b53e286e2201867f5b7975d2b Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 11:37:41 +0530
Subject: [PATCH 182/796] Undep

---
 .../photos/src/components/PhotoViewer/FileInfo.tsx     | 10 +++++++---
 web/apps/photos/src/components/PhotoViewer/index.tsx   |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx b/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx
index 3f27dc44c0..e5b79af4d6 100644
--- a/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx
@@ -76,7 +76,6 @@ import {
 } from "@mui/material";
 import { Formik } from "formik";
 import { t } from "i18next";
-import { GalleryContext } from "pages/gallery";
 import React, { useContext, useEffect, useMemo, useRef, useState } from "react";
 import { PublicCollectionGalleryContext } from "utils/publicCollectionGallery";
 import * as Yup from "yup";
@@ -108,6 +107,11 @@ export interface FileInfoProps {
     fileToCollectionsMap?: Map<number, number[]>;
     collectionNameMap?: Map<number, string>;
     showCollectionChips: boolean;
+    /**
+     * Called when the user selects a collection from among the collections that
+     * the file belongs to.
+     */
+    onSelectCollection: (collectionID: number) => void;
     /**
      * Called when the user selects a person in the file info panel.
      */
@@ -126,12 +130,12 @@ export const FileInfo: React.FC<FileInfoProps> = ({
     collectionNameMap,
     showCollectionChips,
     closePhotoViewer,
+    onSelectCollection,
     onSelectPerson,
 }) => {
     const { mapEnabled } = useSettingsSnapshot();
 
     const { showMiniDialog } = useContext(AppContext);
-    const galleryContext = useContext(GalleryContext);
     const publicCollectionGalleryContext = useContext(
         PublicCollectionGalleryContext,
     );
@@ -173,7 +177,7 @@ export const FileInfo: React.FC<FileInfoProps> = ({
     }
 
     const onCollectionChipClick = (collectionID) => {
-        galleryContext.onShowCollection(collectionID);
+        onSelectCollection(collectionID);
         closePhotoViewer();
     };
 
diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index 16d04eb195..6d47486512 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -975,6 +975,7 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
                 refreshPhotoswipe={refreshPhotoswipe}
                 fileToCollectionsMap={fileToCollectionsMap}
                 collectionNameMap={collectionNameMap}
+                onSelectCollection={galleryContext.onShowCollection}
                 onSelectPerson={onSelectPerson}
             />
             <ImageEditorOverlay

From d0f206741f50512457bc42e92e043f223d247114 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 11:51:25 +0530
Subject: [PATCH 183/796] Undep

---
 .../src/components/PhotoViewer/FileInfo.tsx    | 18 +++++++++++-------
 .../src/components/PhotoViewer/index.tsx       |  3 ++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx b/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx
index e5b79af4d6..c6bef09278 100644
--- a/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx
@@ -77,7 +77,6 @@ import {
 import { Formik } from "formik";
 import { t } from "i18next";
 import React, { useContext, useEffect, useMemo, useRef, useState } from "react";
-import { PublicCollectionGalleryContext } from "utils/publicCollectionGallery";
 import * as Yup from "yup";
 
 // Re-uses images from ~leaflet package.
@@ -101,7 +100,15 @@ export interface FileInfoProps {
     closePhotoViewer: () => void;
     file: EnteFile | undefined;
     exif: FileInfoExif | undefined;
+    /**
+     * TODO: Rename and flip to allowEdits.
+     */
     shouldDisableEdits?: boolean;
+    /**
+     * If `true`, an inline map will be shown (if the user has enabled it) using
+     * the file's location.
+     */
+    allowMap: boolean;
     scheduleUpdate: () => void;
     refreshPhotoswipe: () => void;
     fileToCollectionsMap?: Map<number, number[]>;
@@ -120,6 +127,7 @@ export interface FileInfoProps {
 
 export const FileInfo: React.FC<FileInfoProps> = ({
     shouldDisableEdits,
+    allowMap,
     showInfo,
     handleCloseInfo,
     file,
@@ -136,9 +144,6 @@ export const FileInfo: React.FC<FileInfoProps> = ({
     const { mapEnabled } = useSettingsSnapshot();
 
     const { showMiniDialog } = useContext(AppContext);
-    const publicCollectionGalleryContext = useContext(
-        PublicCollectionGalleryContext,
-    );
 
     const [exifInfo, setExifInfo] = useState<ExifInfo | undefined>();
     const { show: showRawExif, props: rawExifVisibilityProps } =
@@ -240,8 +245,7 @@ export const FileInfo: React.FC<FileInfoProps> = ({
                             icon={<LocationOnOutlinedIcon />}
                             title={t("location")}
                             caption={
-                                !mapEnabled ||
-                                publicCollectionGalleryContext.credentials ? (
+                                !mapEnabled || !allowMap ? (
                                     <Link
                                         href={openStreetMapLink(location)}
                                         target="_blank"
@@ -267,7 +271,7 @@ export const FileInfo: React.FC<FileInfoProps> = ({
                                 />
                             }
                         />
-                        {!publicCollectionGalleryContext.credentials && (
+                        {allowMap && (
                             <MapBox
                                 location={location}
                                 mapEnabled={mapEnabled}
diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index 6d47486512..5a8b8ae5e4 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -137,8 +137,8 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
     collectionNameMap,
     onSelectPerson,
 }) => {
-    const galleryContext = useContext(GalleryContext);
     const { showLoadingBar, hideLoadingBar } = useContext(AppContext);
+    const galleryContext = useContext(GalleryContext);
     const publicCollectionGalleryContext = useContext(
         PublicCollectionGalleryContext,
     );
@@ -968,6 +968,7 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
                 file={photoSwipe?.currItem as EnteFile}
                 exif={exif?.value}
                 shouldDisableEdits={!isOwnFile}
+                allowMap={!publicCollectionGalleryContext.credentials}
                 showCollectionChips={
                     !isTrashCollection && isOwnFile && !isInHiddenSection
                 }

From f49ece10e66303292103d07141a71039bcd62c43 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 11:57:03 +0530
Subject: [PATCH 184/796] Move

---
 web/apps/photos/src/components/PhotoViewer/index.tsx      | 6 +++++-
 .../gallery/components}/FileInfo.tsx                      | 8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)
 rename web/{apps/photos/src/components/PhotoViewer => packages/gallery/components}/FileInfo.tsx (99%)

diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index 5a8b8ae5e4..ac906b262b 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -9,6 +9,11 @@ import {
 } from "@/base/components/utils/modal";
 import { lowercaseExtension } from "@/base/file-name";
 import log from "@/base/log";
+import {
+    FileInfo,
+    type FileInfoExif,
+    type FileInfoProps,
+} from "@/gallery/components/FileInfo";
 import { downloadManager } from "@/gallery/services/download";
 import { fileLogID, type EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
@@ -68,7 +73,6 @@ import {
     getFileFromURL,
 } from "utils/file";
 import { PublicCollectionGalleryContext } from "utils/publicCollectionGallery";
-import { FileInfo, type FileInfoExif, type FileInfoProps } from "./FileInfo";
 import { ImageEditorOverlay } from "./ImageEditorOverlay";
 
 export type PhotoViewerProps = Pick<
diff --git a/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
similarity index 99%
rename from web/apps/photos/src/components/PhotoViewer/FileInfo.tsx
rename to web/packages/gallery/components/FileInfo.tsx
index c6bef09278..8110187692 100644
--- a/web/apps/photos/src/components/PhotoViewer/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -1,3 +1,7 @@
+/* TODO: Audit this file */
+/* eslint-disable */
+/* @ts-nocheck */
+
 import { LinkButtonUndecorated } from "@/base/components/LinkButton";
 import { TitledMiniDialog } from "@/base/components/MiniDialog";
 import { type ButtonishProps } from "@/base/components/mui";
@@ -15,7 +19,7 @@ import {
     changeFileName,
     updateExistingFilePubMetadata,
 } from "@/gallery/services/file";
-import { EnteFile } from "@/media/file";
+import { type EnteFile } from "@/media/file";
 import type { ParsedMetadata } from "@/media/file-metadata";
 import {
     fileCreationPhotoDate,
@@ -66,13 +70,13 @@ import VideocamOutlinedIcon from "@mui/icons-material/VideocamOutlined";
 import {
     Box,
     CircularProgress,
-    DialogProps,
     IconButton,
     Link,
     Stack,
     styled,
     TextField,
     Typography,
+    type DialogProps,
 } from "@mui/material";
 import { Formik } from "formik";
 import { t } from "i18next";

From c6f6041d24ef01b3509f8f8a716e4879207ba896 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 12:07:31 +0530
Subject: [PATCH 185/796] Pass context method

---
 .../src/components/PhotoViewer/index.tsx      |  4 +++-
 web/packages/gallery/components/FileInfo.tsx  | 21 +++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index ac906b262b..37f84ca94c 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -141,7 +141,8 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
     collectionNameMap,
     onSelectPerson,
 }) => {
-    const { showLoadingBar, hideLoadingBar } = useContext(AppContext);
+    const { showLoadingBar, hideLoadingBar, showMiniDialog } =
+        useContext(AppContext);
     const galleryContext = useContext(GalleryContext);
     const publicCollectionGalleryContext = useContext(
         PublicCollectionGalleryContext,
@@ -971,6 +972,7 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
                 closePhotoViewer={handleClose}
                 file={photoSwipe?.currItem as EnteFile}
                 exif={exif?.value}
+                showMiniDialog={showMiniDialog}
                 shouldDisableEdits={!isOwnFile}
                 allowMap={!publicCollectionGalleryContext.credentials}
                 showCollectionChips={
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 8110187692..1119401917 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -1,5 +1,6 @@
+/* eslint-disable @typescript-eslint/no-unnecessary-condition */
+/* eslint-disable @typescript-eslint/no-unused-expressions */
 /* TODO: Audit this file */
-/* eslint-disable */
 /* @ts-nocheck */
 
 import { LinkButtonUndecorated } from "@/base/components/LinkButton";
@@ -80,10 +81,11 @@ import {
 } from "@mui/material";
 import { Formik } from "formik";
 import { t } from "i18next";
-import React, { useContext, useEffect, useMemo, useRef, useState } from "react";
+import React, { useEffect, useMemo, useRef, useState } from "react";
 import * as Yup from "yup";
 
 // Re-uses images from ~leaflet package.
+import type { AccountsContextT } from "@/accounts/types/context";
 import "leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css";
 import "leaflet/dist/leaflet.css";
 // eslint-disable-next-line @typescript-eslint/no-require-imports
@@ -99,11 +101,19 @@ export interface FileInfoExif {
 }
 
 export interface FileInfoProps {
+    /**
+     * The file whose information we are showing.
+     */
+    file: EnteFile | undefined;
     showInfo: boolean;
     handleCloseInfo: () => void;
     closePhotoViewer: () => void;
-    file: EnteFile | undefined;
     exif: FileInfoExif | undefined;
+    /**
+     * This is the same as the {@link showMiniDialog} prop in the top level
+     * {@link AppContext} of the app which we're currently being shown in.
+     */
+    showMiniDialog: AccountsContextT["showMiniDialog"];
     /**
      * TODO: Rename and flip to allowEdits.
      */
@@ -130,11 +140,12 @@ export interface FileInfoProps {
 }
 
 export const FileInfo: React.FC<FileInfoProps> = ({
+    file,
+    showMiniDialog,
     shouldDisableEdits,
     allowMap,
     showInfo,
     handleCloseInfo,
-    file,
     exif,
     scheduleUpdate,
     refreshPhotoswipe,
@@ -147,8 +158,6 @@ export const FileInfo: React.FC<FileInfoProps> = ({
 }) => {
     const { mapEnabled } = useSettingsSnapshot();
 
-    const { showMiniDialog } = useContext(AppContext);
-
     const [exifInfo, setExifInfo] = useState<ExifInfo | undefined>();
     const { show: showRawExif, props: rawExifVisibilityProps } =
         useModalVisibility();

From 8d701d4fd58fbd17ef3d0c293a377ca0e14983f0 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 12:12:02 +0530
Subject: [PATCH 186/796] Match reality

---
 web/apps/photos/src/components/PhotoFrame.tsx        | 4 ++--
 web/apps/photos/src/components/PhotoViewer/index.tsx | 4 ++--
 web/apps/photos/src/pages/shared-albums.tsx          | 4 ++--
 web/packages/gallery/components/FileInfo.tsx         | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 9a1f42374f..25576c0be6 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -112,8 +112,8 @@ export interface PhotoFrameProps {
     /** This will be set if mode is "people". */
     activePersonID?: string | undefined;
     enableDownload?: boolean;
-    fileToCollectionsMap: Map<number, number[]>;
-    collectionNameMap: Map<number, string>;
+    fileToCollectionsMap?: Map<number, number[]>;
+    collectionNameMap?: Map<number, string>;
     showAppDownloadBanner?: boolean;
     setIsPhotoSwipeOpen?: (value: boolean) => void;
     isInHiddenSection?: boolean;
diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index 37f84ca94c..b934e68f23 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -103,8 +103,8 @@ export type PhotoViewerProps = Pick<
     isInHiddenSection: boolean;
     enableDownload: boolean;
     setFilesDownloadProgressAttributesCreator: SetFilesDownloadProgressAttributesCreator;
-    fileToCollectionsMap: Map<number, number[]>;
-    collectionNameMap: Map<number, string>;
+    fileToCollectionsMap?: Map<number, number[]>;
+    collectionNameMap?: Map<number, string>;
     onSelectPerson?: FileInfoProps["onSelectPerson"];
 };
 
diff --git a/web/apps/photos/src/pages/shared-albums.tsx b/web/apps/photos/src/pages/shared-albums.tsx
index 8923448ce8..07677d11ab 100644
--- a/web/apps/photos/src/pages/shared-albums.tsx
+++ b/web/apps/photos/src/pages/shared-albums.tsx
@@ -546,8 +546,8 @@ export default function PublicCollectionGallery() {
                     selected={selected}
                     activeCollectionID={ALL_SECTION}
                     enableDownload={downloadEnabled}
-                    fileToCollectionsMap={null}
-                    collectionNameMap={null}
+                    fileToCollectionsMap={undefined}
+                    collectionNameMap={undefined}
                     setFilesDownloadProgressAttributesCreator={
                         setFilesDownloadProgressAttributesCreator
                     }
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 1119401917..ed12d2f662 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
 /* eslint-disable @typescript-eslint/no-unused-expressions */
 /* TODO: Audit this file */
@@ -319,7 +320,7 @@ export const FileInfo: React.FC<FileInfoProps> = ({
                         />
                     </InfoItem>
                 )}
-                {showCollectionChips && (
+                {showCollectionChips && collectionNameMap && (
                     <InfoItem icon={<FolderOutlinedIcon />}>
                         <Stack
                             direction="row"

From 183bbdd145b585d3ddc21502532868628136b8e7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 12:15:21 +0530
Subject: [PATCH 187/796] Fix

---
 web/packages/gallery/components/FileInfo.tsx | 27 +++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index ed12d2f662..07988fe954 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
 /* eslint-disable @typescript-eslint/no-unused-expressions */
@@ -50,7 +51,6 @@ import {
     type AnnotatedFaceID,
 } from "@/new/photos/services/ml";
 import { updateMapEnabled } from "@/new/photos/services/settings";
-import { AppContext } from "@/new/photos/types/context";
 import { formattedByteSize } from "@/new/photos/utils/units";
 import { FlexWrapper } from "@ente/shared/components/Container";
 import SingleInputForm, {
@@ -118,7 +118,7 @@ export interface FileInfoProps {
     /**
      * TODO: Rename and flip to allowEdits.
      */
-    shouldDisableEdits?: boolean;
+    shouldDisableEdits: boolean;
     /**
      * If `true`, an inline map will be shown (if the user has enabled it) using
      * the file's location.
@@ -195,7 +195,7 @@ export const FileInfo: React.FC<FileInfoProps> = ({
         return <></>;
     }
 
-    const onCollectionChipClick = (collectionID) => {
+    const onCollectionChipClick = (collectionID: number) => {
         onSelectCollection(collectionID);
         closePhotoViewer();
     };
@@ -512,7 +512,7 @@ type EditButtonProps = ButtonishProps & {
 };
 
 const EditButton: React.FC<EditButtonProps> = ({ onClick, loading }) => (
-    <IconButton onClick={onClick} disabled={loading} color="secondary">
+    <IconButton onClick={onClick} disabled={!!loading} color="secondary">
         {!loading ? (
             <EditIcon />
         ) : (
@@ -555,6 +555,7 @@ function RenderCaption({
 
                 const updatedFile = await changeCaption(file, newCaption);
                 updateExistingFilePubMetadata(file, updatedFile);
+                // @ts-ignore
                 file.title = file.pubMagicMetadata.data.caption;
                 refreshPhotoswipe();
                 scheduleUpdate();
@@ -578,6 +579,7 @@ function RenderCaption({
     return (
         <Box sx={{ p: 1 }}>
             <Formik<RenderCaptionFormValues>
+                // @ts-ignore
                 initialValues={{ caption }}
                 validationSchema={Yup.object().shape({
                     caption: Yup.string().max(
@@ -786,7 +788,7 @@ const RenderFileName: React.FC<RenderFileNameProps> = ({
             <FileNameEditDialog
                 isInEditMode={isInEditMode}
                 closeEditMode={closeEditMode}
-                filename={fileName}
+                filename={fileName!}
                 extension={extension}
                 saveEdits={saveEdits}
             />
@@ -818,7 +820,15 @@ const getCaption = (file: EnteFile, exifInfo: ExifInfo | undefined) => {
     );
 };
 
-const FileNameEditDialog = ({
+interface FileNameEditDialogProps {
+    isInEditMode: boolean;
+    closeEditMode: () => void;
+    filename: string;
+    extension: string | undefined;
+    saveEdits: (name: string) => Promise<void>;
+}
+
+const FileNameEditDialog: React.FC<FileNameEditDialogProps> = ({
     isInEditMode,
     closeEditMode,
     filename,
@@ -899,12 +909,15 @@ const MapBox: React.FC<MapBoxProps> = ({
                 location.longitude,
             ];
             if (mapContainer && !mapContainer.hasChildNodes()) {
+                // @ts-ignore
                 const map = leaflet.map(mapContainer).setView(position, zoom);
+                // @ts-ignore
                 leaflet
                     .tileLayer(urlTemplate, {
                         attribution,
                     })
                     .addTo(map);
+                // @ts-ignore
                 leaflet.marker(position).addTo(map).openPopup();
             }
         } else {
@@ -981,8 +994,10 @@ const RawExif: React.FC<RawExifProps> = ({
                     tag &&
                     typeof tag == "object" &&
                     "description" in tag &&
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                     typeof tag.description == "string"
                 ) {
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
                     description = tag.description;
                 }
                 return [key, namespace, tagName, description] as const;

From 0aeb9f0c829bed7039e0a71dd05b0070abe0e3da Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 12:59:43 +0530
Subject: [PATCH 188/796] Up

---
 .../photos/src/components/PhotoViewer/index.tsx | 17 ++++++++++++++---
 web/packages/gallery/components/FileInfo.tsx    | 17 +++--------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index b934e68f23..e740effc31 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -722,6 +722,18 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
         }
     };
 
+    const handleSelectCollection = (collectionID: number) => {
+        galleryContext.onShowCollection(collectionID);
+        handleClose();
+    };
+
+    const handleSelectPerson = onSelectPerson
+        ? (personID: string) => {
+              onSelectPerson(personID);
+              handleClose();
+          }
+        : undefined;
+
     const handleForceConvert = () =>
         forceConvertItem(
             photoSwipe,
@@ -969,7 +981,6 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
             <FileInfo
                 showInfo={showInfo}
                 handleCloseInfo={handleCloseInfo}
-                closePhotoViewer={handleClose}
                 file={photoSwipe?.currItem as EnteFile}
                 exif={exif?.value}
                 showMiniDialog={showMiniDialog}
@@ -982,8 +993,8 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
                 refreshPhotoswipe={refreshPhotoswipe}
                 fileToCollectionsMap={fileToCollectionsMap}
                 collectionNameMap={collectionNameMap}
-                onSelectCollection={galleryContext.onShowCollection}
-                onSelectPerson={onSelectPerson}
+                onSelectCollection={handleSelectCollection}
+                onSelectPerson={handleSelectPerson}
             />
             <ImageEditorOverlay
                 show={showImageEditorOverlay}
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 07988fe954..7bc39b364c 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -108,7 +108,6 @@ export interface FileInfoProps {
     file: EnteFile | undefined;
     showInfo: boolean;
     handleCloseInfo: () => void;
-    closePhotoViewer: () => void;
     exif: FileInfoExif | undefined;
     /**
      * This is the same as the {@link showMiniDialog} prop in the top level
@@ -153,7 +152,6 @@ export const FileInfo: React.FC<FileInfoProps> = ({
     fileToCollectionsMap,
     collectionNameMap,
     showCollectionChips,
-    closePhotoViewer,
     onSelectCollection,
     onSelectPerson,
 }) => {
@@ -195,11 +193,6 @@ export const FileInfo: React.FC<FileInfoProps> = ({
         return <></>;
     }
 
-    const onCollectionChipClick = (collectionID: number) => {
-        onSelectCollection(collectionID);
-        closePhotoViewer();
-    };
-
     const openEnableMapConfirmationDialog = () =>
         showMiniDialog(
             confirmEnableMapsDialogAttributes(() => updateMapEnabled(true)),
@@ -210,12 +203,8 @@ export const FileInfo: React.FC<FileInfoProps> = ({
             confirmDisableMapsDialogAttributes(() => updateMapEnabled(false)),
         );
 
-    const handleSelectFace = (annotatedFaceID: AnnotatedFaceID) => {
-        if (onSelectPerson) {
-            onSelectPerson(annotatedFaceID.personID);
-            closePhotoViewer();
-        }
-    };
+    const handleSelectFace = ({ personID }: AnnotatedFaceID) =>
+        onSelectPerson?.(personID);
 
     return (
         <FileInfoSidebar open={showInfo} onClose={handleCloseInfo}>
@@ -340,7 +329,7 @@ export const FileInfo: React.FC<FileInfoProps> = ({
                                     <ChipButton
                                         key={collectionID}
                                         onClick={() =>
-                                            onCollectionChipClick(collectionID)
+                                            onSelectCollection(collectionID)
                                         }
                                     >
                                         {collectionNameMap.get(collectionID)}

From e13b88881e48ee02a46491452b56ed32820f9996 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Fri, 14 Feb 2025 13:10:28 +0530
Subject: [PATCH 189/796] [mob][photos] Separate memory types

---
 mobile/lib/models/smart_memory.dart           | 45 +++++++++++++++++++
 mobile/lib/models/trip_memory.dart            | 25 +++++------
 mobile/lib/services/search_service.dart       | 36 +++++++--------
 .../lib/services/smart_memories_service.dart  |  7 +--
 4 files changed, 75 insertions(+), 38 deletions(-)
 create mode 100644 mobile/lib/models/smart_memory.dart

diff --git a/mobile/lib/models/smart_memory.dart b/mobile/lib/models/smart_memory.dart
new file mode 100644
index 0000000000..a1e0ce0ebf
--- /dev/null
+++ b/mobile/lib/models/smart_memory.dart
@@ -0,0 +1,45 @@
+import "package:photos/models/file/file.dart";
+
+enum MemoryType {
+  people,
+  trips,
+  time,
+  filler,
+}
+
+abstract class SmartMemory {
+  final List<EnteFile> files;
+  final MemoryType type;
+  int? firstCreationTime;
+  int? lastCreationTime;
+
+  SmartMemory(
+    this.files,
+    this.type, {
+    this.firstCreationTime,
+    this.lastCreationTime,
+  });
+
+  int averageCreationTime() {
+    if (firstCreationTime != null && lastCreationTime != null) {
+      return (firstCreationTime! + lastCreationTime!) ~/ 2;
+    }
+    final List<int> creationTimes = files
+        .where((file) => file.creationTime != null)
+        .map((file) => file.creationTime!)
+        .toList();
+    if (creationTimes.length < 2) {
+      return creationTimes.isEmpty ? 0 : creationTimes.first;
+    }
+    creationTimes.sort();
+    firstCreationTime ??= creationTimes.first;
+    lastCreationTime ??= creationTimes.last;
+    return (firstCreationTime! + lastCreationTime!) ~/ 2;
+  }
+
+  SmartMemory copyWith({
+    List<EnteFile>? files,
+    int? firstCreationTime,
+    int? lastCreationTime,
+  });
+}
diff --git a/mobile/lib/models/trip_memory.dart b/mobile/lib/models/trip_memory.dart
index fb6aa044fe..5315faa82a 100644
--- a/mobile/lib/models/trip_memory.dart
+++ b/mobile/lib/models/trip_memory.dart
@@ -1,22 +1,19 @@
 import "package:photos/models/file/file.dart";
 import "package:photos/models/location/location.dart";
+import "package:photos/models/smart_memory.dart";
 
-class TripMemory {
-  final List<EnteFile> files;
+class TripMemory extends SmartMemory {
   final Location location;
-  final int firstCreationTime;
-  final int lastCreationTime;
 
   TripMemory(
-    this.files,
-    this.location,
-    this.firstCreationTime,
-    this.lastCreationTime,
-  );
+    files,
+    this.location, {
+    super.firstCreationTime,
+    super.lastCreationTime,
+  }) : super(files, MemoryType.trips);
 
-  int get averageCreationTime => (firstCreationTime + lastCreationTime) ~/ 2;
-
-  TripMemory copyWith({
+  @override
+  SmartMemory copyWith({
     List<EnteFile>? files,
     Location? location,
     int? firstCreationTime,
@@ -25,8 +22,8 @@ class TripMemory {
     return TripMemory(
       files ?? this.files,
       location ?? this.location,
-      firstCreationTime ?? this.firstCreationTime,
-      lastCreationTime ?? this.lastCreationTime,
+      firstCreationTime: firstCreationTime ?? super.firstCreationTime,
+      lastCreationTime: lastCreationTime ?? super.lastCreationTime,
     );
   }
 }
diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 62576eae03..3257f8f6d7 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1367,8 +1367,8 @@ class SearchService {
               TripMemory(
                 List.from(currentBlockFiles),
                 location,
-                blockStart,
-                lastTime,
+                firstCreationTime: blockStart,
+                lastCreationTime: lastTime,
               ),
             );
           }
@@ -1391,8 +1391,8 @@ class SearchService {
           TripMemory(
             List.from(currentBlockFiles),
             location,
-            blockStart,
-            lastTime,
+            firstCreationTime: blockStart,
+            lastCreationTime: lastTime,
           ),
         );
       }
@@ -1402,18 +1402,18 @@ class SearchService {
     final List<TripMemory> mergedTrips = [];
     for (final trip in tripLocations) {
       final tripFirstTime = DateTime.fromMicrosecondsSinceEpoch(
-        trip.firstCreationTime,
+        trip.firstCreationTime!,
       );
       final tripLastTime = DateTime.fromMicrosecondsSinceEpoch(
-        trip.lastCreationTime,
+        trip.lastCreationTime!,
       );
       bool merged = false;
       for (int idx = 0; idx < mergedTrips.length; idx++) {
         final otherTrip = mergedTrips[idx];
         final otherTripFirstTime =
-            DateTime.fromMicrosecondsSinceEpoch(otherTrip.firstCreationTime);
+            DateTime.fromMicrosecondsSinceEpoch(otherTrip.firstCreationTime!);
         final otherTripLastTime =
-            DateTime.fromMicrosecondsSinceEpoch(otherTrip.lastCreationTime);
+            DateTime.fromMicrosecondsSinceEpoch(otherTrip.lastCreationTime!);
         if (tripFirstTime
                 .isBefore(otherTripLastTime.add(const Duration(days: 3))) &&
             tripLastTime.isAfter(
@@ -1422,8 +1422,8 @@ class SearchService {
           mergedTrips[idx] = TripMemory(
             otherTrip.files + trip.files,
             otherTrip.location,
-            min(otherTrip.firstCreationTime, trip.firstCreationTime),
-            max(otherTrip.lastCreationTime, trip.lastCreationTime),
+            firstCreationTime: min(otherTrip.firstCreationTime!, trip.firstCreationTime!),
+            lastCreationTime: max(otherTrip.lastCreationTime!, trip.lastCreationTime!),
           );
           _logger.finest('Merged two trip locations');
           merged = true;
@@ -1435,8 +1435,8 @@ class SearchService {
         TripMemory(
           trip.files,
           trip.location,
-          trip.firstCreationTime,
-          trip.lastCreationTime,
+          firstCreationTime: trip.firstCreationTime,
+          lastCreationTime: trip.lastCreationTime,
         ),
       );
     }
@@ -1445,7 +1445,7 @@ class SearchService {
     final List<TripMemory> validTrips = [];
     for (final trip in mergedTrips) {
       if (trip.files.length >= 20 &&
-          trip.averageCreationTime < cutOffTime.microsecondsSinceEpoch) {
+          trip.averageCreationTime() < cutOffTime.microsecondsSinceEpoch) {
         validTrips.add(trip);
       }
     }
@@ -1482,7 +1482,7 @@ class SearchService {
     final Map<int, Map<int, List<TripMemory>>> tripsByMonthYear = {};
     for (final trip in validTrips) {
       final tripDate =
-          DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime);
+          DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime());
       tripsByMonthYear
           .putIfAbsent(tripDate.month, () => {})
           .putIfAbsent(tripDate.year, () => [])
@@ -1502,12 +1502,12 @@ class SearchService {
     // If there are past trips this month, show the one or two most recent ones.
     if (currentMonthTrips.isNotEmpty) {
       currentMonthTrips.sort(
-        (a, b) => b.averageCreationTime.compareTo(a.averageCreationTime),
+        (a, b) => b.averageCreationTime().compareTo(a.averageCreationTime()),
       );
       final tripsToShow = currentMonthTrips.take(2);
       for (final trip in tripsToShow) {
         final year =
-            DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime).year;
+            DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime()).year;
         final String? locationName = await _tryFindLocationName(trip.files);
         String name = "Trip in $year";
         if (locationName != null) {
@@ -1553,11 +1553,11 @@ class SearchService {
           if (thatMonthTrips.length >= 3) {
             // take and use the third earliest trip
             thatMonthTrips.sort(
-              (a, b) => a.averageCreationTime.compareTo(b.averageCreationTime),
+              (a, b) => a.averageCreationTime().compareTo(b.averageCreationTime()),
             );
             final trip = thatMonthTrips[2];
             final year =
-                DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime)
+                DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime())
                     .year;
             final String? locationName = await _tryFindLocationName(trip.files);
             String name = "Trip in $year";
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 3da40f8d34..8b13789179 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -1,6 +1 @@
-enum MemoryType {
-  people,
-  trips,
-  time,
-  filler,
-}
+

From 1d93d44180ce5bd1e55af2939c2bb7ef1f45dc8f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 13:10:43 +0530
Subject: [PATCH 190/796] ud

---
 .../components/PhotoViewer/ImageEditorOverlay.tsx    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
index 4ee4ab91f2..ac3b36bc28 100644
--- a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
@@ -88,11 +88,11 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = (
     const originalSizeCanvasRef = useRef<HTMLCanvasElement | null>(null);
     const parentRef = useRef<HTMLDivElement | null>(null);
 
-    const [fileURL, setFileURL] = useState<string>("");
+    const [fileURL, setFileURL] = useState<string | undefined>(undefined);
     // The MIME type of the original file that we are editing.
     //
     // It should generally be present, but it is not guaranteed to be.
-    const [mimeType, setMIMEType] = useState<string | undefined>();
+    const [mimeType, setMIMEType] = useState<string | undefined>(undefined);
 
     const [currentRotationAngle, setCurrentRotationAngle] = useState(0);
 
@@ -438,7 +438,7 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = (
     }, [props.show, props.file]);
 
     const handleClose = () => {
-        setFileURL(null);
+        setFileURL(undefined);
         props.onClose();
     };
 
@@ -481,7 +481,7 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = (
             uploadManager.prepareForNewUpload();
             uploadManager.showUploadProgressDialog();
             uploadManager.uploadFile(editedFile, collection, props.file);
-            setFileURL(null);
+            setFileURL(undefined);
             props.onClose();
             props.closePhotoViewer();
         } catch (e) {
@@ -588,7 +588,7 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = (
                                 position: "relative",
                             }}
                         >
-                            {(fileURL === null || canvasLoading) && (
+                            {(!fileURL || canvasLoading) && (
                                 <CircularProgress />
                             )}
 
@@ -597,7 +597,7 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = (
                                 style={{
                                     objectFit: "contain",
                                     display:
-                                        fileURL === null || canvasLoading
+                                        !fileURL || canvasLoading
                                             ? "none"
                                             : "block",
                                     position: "absolute",

From 2d5dc734aa7c85b3a4edcdd4982ea7fe6a3f4819 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 13:17:44 +0530
Subject: [PATCH 191/796] Up

---
 .../PhotoViewer/ImageEditorOverlay.tsx        | 23 +++++++++++++------
 .../src/components/PhotoViewer/index.tsx      | 16 ++++++++++++-
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
index ac3b36bc28..f4e3e40af8 100644
--- a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
@@ -11,6 +11,7 @@ import { nameAndExtension } from "@/base/file-name";
 import log from "@/base/log";
 import { downloadAndRevokeObjectURL } from "@/base/utils/web";
 import { downloadManager } from "@/gallery/services/download";
+import type { Collection } from "@/media/collection";
 import { EnteFile } from "@/media/file";
 import { aboveFileViewerContentZ } from "@/new/photos/components/utils/z-index";
 import { getLocalCollections } from "@/new/photos/services/collections";
@@ -53,13 +54,25 @@ import React, {
     type Ref,
     type RefObject,
 } from "react";
-import uploadManager from "services/upload/uploadManager";
 
 interface ImageEditorOverlayProps {
     file: EnteFile;
     show: boolean;
     onClose: () => void;
-    closePhotoViewer: () => void;
+    /**
+     * Called when the user activates the button to save a copy of the given
+     * {@link enteFile} to their Ente account with the edits they have made.
+     *
+     * @param editedFile A Web {@link File} containing the edited contents.
+     * @param collection The collection to which the edited file should be
+     * added.
+     * @param enteFile The original {@link EnteFile}.
+     */
+    onSaveEditedCopy: (
+        editedFile: File,
+        collection: Collection,
+        enteFile: EnteFile,
+    ) => void;
 }
 
 const filterDefaultValues = {
@@ -478,12 +491,8 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = (
 
             const editedFile = await getEditedFile();
 
-            uploadManager.prepareForNewUpload();
-            uploadManager.showUploadProgressDialog();
-            uploadManager.uploadFile(editedFile, collection, props.file);
+            props.onSaveEditedCopy(editedFile, collection, props.file);
             setFileURL(undefined);
-            props.onClose();
-            props.closePhotoViewer();
         } catch (e) {
             log.error("Error saving copy to ente", e);
         }
diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index e740effc31..015ea73137 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -15,6 +15,7 @@ import {
     type FileInfoProps,
 } from "@/gallery/components/FileInfo";
 import { downloadManager } from "@/gallery/services/download";
+import type { Collection } from "@/media/collection";
 import { fileLogID, type EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import { isHEICExtension, needsJPEGConversion } from "@/media/formats";
@@ -66,6 +67,7 @@ import {
     addToFavorites,
     removeFromFavorites,
 } from "services/collectionService";
+import uploadManager from "services/upload/uploadManager";
 import { SetFilesDownloadProgressAttributesCreator } from "types/gallery";
 import {
     copyFileToClipboard,
@@ -655,6 +657,18 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
         setShowImageEditorOverlay(false);
     };
 
+    const handleSaveEditedCopy = (
+        editedFile: File,
+        collection: Collection,
+        enteFile: EnteFile,
+    ) => {
+        uploadManager.prepareForNewUpload();
+        uploadManager.showUploadProgressDialog();
+        uploadManager.uploadFile(editedFile, collection, enteFile);
+        handleCloseEditor();
+        handleClose();
+    };
+
     const downloadFileHelper = async (file: EnteFile) => {
         if (
             file &&
@@ -1000,7 +1014,7 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
                 show={showImageEditorOverlay}
                 file={photoSwipe?.currItem as EnteFile}
                 onClose={handleCloseEditor}
-                closePhotoViewer={handleClose}
+                onSaveEditedCopy={handleSaveEditedCopy}
             />
         </>
     );

From 9dcced260fbcfdca0b4122a98ee9de9d58ec9011 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 13:21:12 +0530
Subject: [PATCH 192/796] Same nomenclature

---
 .../PhotoViewer/ImageEditorOverlay.tsx           | 16 +++++++++-------
 .../photos/src/components/PhotoViewer/index.tsx  |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
index f4e3e40af8..e2805f6594 100644
--- a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
@@ -7,6 +7,7 @@ import {
     RowButtonGroupTitle,
     RowSwitch,
 } from "@/base/components/RowButton";
+import type { ModalVisibilityProps } from "@/base/components/utils/modal";
 import { nameAndExtension } from "@/base/file-name";
 import log from "@/base/log";
 import { downloadAndRevokeObjectURL } from "@/base/utils/web";
@@ -55,10 +56,11 @@ import React, {
     type RefObject,
 } from "react";
 
-interface ImageEditorOverlayProps {
+type ImageEditorOverlayProps = ModalVisibilityProps & {
+    /**
+     * The (Ente) file to edit.
+     */
     file: EnteFile;
-    show: boolean;
-    onClose: () => void;
     /**
      * Called when the user activates the button to save a copy of the given
      * {@link enteFile} to their Ente account with the edits they have made.
@@ -73,7 +75,7 @@ interface ImageEditorOverlayProps {
         collection: Collection,
         enteFile: EnteFile,
     ) => void;
-}
+};
 
 const filterDefaultValues = {
     brightness: 100,
@@ -446,9 +448,9 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = (
     };
 
     useEffect(() => {
-        if (!props.show || !props.file) return;
+        if (!props.open || !props.file) return;
         loadCanvas();
-    }, [props.show, props.file]);
+    }, [props.open, props.file]);
 
     const handleClose = () => {
         setFileURL(undefined);
@@ -463,7 +465,7 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = (
         }
     };
 
-    if (!props.show) {
+    if (!props.open) {
         return <></>;
     }
 
diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index 015ea73137..a875819696 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -1011,9 +1011,9 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
                 onSelectPerson={handleSelectPerson}
             />
             <ImageEditorOverlay
-                show={showImageEditorOverlay}
-                file={photoSwipe?.currItem as EnteFile}
+                open={showImageEditorOverlay}
                 onClose={handleCloseEditor}
+                file={photoSwipe?.currItem as EnteFile}
                 onSaveEditedCopy={handleSaveEditedCopy}
             />
         </>

From 15e7e0ae9d7a71bd7627a55fb5051b70e762c391 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 13:58:43 +0530
Subject: [PATCH 193/796] Move

---
 web/apps/accounts/src/types/context.ts             | 2 +-
 web/apps/auth/src/types/context.ts                 | 2 +-
 web/packages/accounts/pages/two-factor/recover.tsx | 2 +-
 web/packages/accounts/types/page.ts                | 2 +-
 web/packages/{accounts/types => base}/context.ts   | 0
 web/packages/gallery/components/FileInfo.tsx       | 2 +-
 web/packages/new/photos/types/context.ts           | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename web/packages/{accounts/types => base}/context.ts (100%)

diff --git a/web/apps/accounts/src/types/context.ts b/web/apps/accounts/src/types/context.ts
index 5218ae033f..73617d92f6 100644
--- a/web/apps/accounts/src/types/context.ts
+++ b/web/apps/accounts/src/types/context.ts
@@ -1,4 +1,4 @@
-import type { AccountsContextT } from "@/accounts/types/context";
+import type { AccountsContextT } from "@/base/context";
 import { createContext, useContext } from "react";
 
 /**
diff --git a/web/apps/auth/src/types/context.ts b/web/apps/auth/src/types/context.ts
index e4cb892adf..1072c514f0 100644
--- a/web/apps/auth/src/types/context.ts
+++ b/web/apps/auth/src/types/context.ts
@@ -1,4 +1,4 @@
-import type { AccountsContextT } from "@/accounts/types/context";
+import type { AccountsContextT } from "@/base/context";
 import { createContext, useContext } from "react";
 
 /**
diff --git a/web/packages/accounts/pages/two-factor/recover.tsx b/web/packages/accounts/pages/two-factor/recover.tsx
index 071c713623..61d8421ca3 100644
--- a/web/packages/accounts/pages/two-factor/recover.tsx
+++ b/web/packages/accounts/pages/two-factor/recover.tsx
@@ -9,9 +9,9 @@ import {
     removeTwoFactor,
     type TwoFactorType,
 } from "@/accounts/services/user";
-import type { AccountsContextT } from "@/accounts/types/context";
 import { LinkButton } from "@/base/components/LinkButton";
 import type { MiniDialogAttributes } from "@/base/components/MiniDialog";
+import type { AccountsContextT } from "@/base/context";
 import { sharedCryptoWorker } from "@/base/crypto";
 import type { B64EncryptionResult } from "@/base/crypto/libsodium";
 import log from "@/base/log";
diff --git a/web/packages/accounts/types/page.ts b/web/packages/accounts/types/page.ts
index 92a5096562..7f772bd66f 100644
--- a/web/packages/accounts/types/page.ts
+++ b/web/packages/accounts/types/page.ts
@@ -1,4 +1,4 @@
-import type { AccountsContextT } from "./context";
+import type { AccountsContextT } from "@/base/context";
 
 /**
  * The default type for pages exposed by this package.
diff --git a/web/packages/accounts/types/context.ts b/web/packages/base/context.ts
similarity index 100%
rename from web/packages/accounts/types/context.ts
rename to web/packages/base/context.ts
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 7bc39b364c..1c1a4aabee 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -13,6 +13,7 @@ import { SidebarDrawer } from "@/base/components/mui/SidebarDrawer";
 import { Titlebar } from "@/base/components/Titlebar";
 import { EllipsizedTypography } from "@/base/components/Typography";
 import { useModalVisibility } from "@/base/components/utils/modal";
+import type { AccountsContextT } from "@/base/context";
 import { haveWindow } from "@/base/env";
 import { nameAndExtension } from "@/base/file-name";
 import log from "@/base/log";
@@ -86,7 +87,6 @@ import React, { useEffect, useMemo, useRef, useState } from "react";
 import * as Yup from "yup";
 
 // Re-uses images from ~leaflet package.
-import type { AccountsContextT } from "@/accounts/types/context";
 import "leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css";
 import "leaflet/dist/leaflet.css";
 // eslint-disable-next-line @typescript-eslint/no-require-imports
diff --git a/web/packages/new/photos/types/context.ts b/web/packages/new/photos/types/context.ts
index 28d6ce7aa5..dd9cab7c0b 100644
--- a/web/packages/new/photos/types/context.ts
+++ b/web/packages/new/photos/types/context.ts
@@ -1,4 +1,4 @@
-import type { AccountsContextT } from "@/accounts/types/context";
+import type { AccountsContextT } from "@/base/context";
 import { type NotificationAttributes } from "@/new/photos/components/Notification";
 import { createContext, useContext } from "react";
 

From 7138510e4811b701f55259fa0cda4e888787de29 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 14:01:56 +0530
Subject: [PATCH 194/796] Rename

---
 web/apps/accounts/src/types/context.ts             | 4 ++--
 web/apps/auth/src/types/context.ts                 | 4 ++--
 web/packages/accounts/pages/two-factor/recover.tsx | 4 ++--
 web/packages/accounts/types/page.ts                | 4 ++--
 web/packages/base/context.ts                       | 6 +++---
 web/packages/gallery/components/FileInfo.tsx       | 4 ++--
 web/packages/new/photos/types/context.ts           | 4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/web/apps/accounts/src/types/context.ts b/web/apps/accounts/src/types/context.ts
index 73617d92f6..d18bda6e9f 100644
--- a/web/apps/accounts/src/types/context.ts
+++ b/web/apps/accounts/src/types/context.ts
@@ -1,10 +1,10 @@
-import type { AccountsContextT } from "@/base/context";
+import type { BaseContextT } from "@/base/context";
 import { createContext, useContext } from "react";
 
 /**
  * The type of the context for pages in the accounts app.
  */
-type AppContextT = Omit<AccountsContextT, "logout">;
+type AppContextT = Omit<BaseContextT, "logout">;
 
 /**
  * The React {@link Context} available to all nodes in the React tree.
diff --git a/web/apps/auth/src/types/context.ts b/web/apps/auth/src/types/context.ts
index 1072c514f0..d1a6eedfc2 100644
--- a/web/apps/auth/src/types/context.ts
+++ b/web/apps/auth/src/types/context.ts
@@ -1,10 +1,10 @@
-import type { AccountsContextT } from "@/base/context";
+import type { BaseContextT } from "@/base/context";
 import { createContext, useContext } from "react";
 
 /**
  * Properties available via {@link AppContext} to the Auth app's React tree.
  */
-type AppContextT = AccountsContextT;
+type AppContextT = BaseContextT;
 
 /** The React {@link Context} available to all pages. */
 export const AppContext = createContext<AppContextT | undefined>(undefined);
diff --git a/web/packages/accounts/pages/two-factor/recover.tsx b/web/packages/accounts/pages/two-factor/recover.tsx
index 61d8421ca3..da73c38866 100644
--- a/web/packages/accounts/pages/two-factor/recover.tsx
+++ b/web/packages/accounts/pages/two-factor/recover.tsx
@@ -11,7 +11,7 @@ import {
 } from "@/accounts/services/user";
 import { LinkButton } from "@/base/components/LinkButton";
 import type { MiniDialogAttributes } from "@/base/components/MiniDialog";
-import type { AccountsContextT } from "@/base/context";
+import type { BaseContextT } from "@/base/context";
 import { sharedCryptoWorker } from "@/base/crypto";
 import type { B64EncryptionResult } from "@/base/crypto/libsodium";
 import log from "@/base/log";
@@ -38,7 +38,7 @@ const bip39 = require("bip39");
 bip39.setDefaultWordlist("english");
 
 export interface RecoverPageProps {
-    appContext: AccountsContextT;
+    appContext: BaseContextT;
     twoFactorType: TwoFactorType;
 }
 
diff --git a/web/packages/accounts/types/page.ts b/web/packages/accounts/types/page.ts
index 7f772bd66f..ffb7a27126 100644
--- a/web/packages/accounts/types/page.ts
+++ b/web/packages/accounts/types/page.ts
@@ -1,4 +1,4 @@
-import type { AccountsContextT } from "@/base/context";
+import type { BaseContextT } from "@/base/context";
 
 /**
  * The default type for pages exposed by this package.
@@ -12,5 +12,5 @@ export interface PageProps {
      * Within this package we do not have access to the context object declared
      * with the app's code, so we need to take the context as a parameter.
      */
-    appContext: AccountsContextT;
+    appContext: BaseContextT;
 }
diff --git a/web/packages/base/context.ts b/web/packages/base/context.ts
index 12f9584802..aa01858b3c 100644
--- a/web/packages/base/context.ts
+++ b/web/packages/base/context.ts
@@ -1,10 +1,10 @@
 import type { MiniDialogAttributes } from "@/base/components/MiniDialog";
 
 /**
- * Properties expected to be present in the AppContext types for pages that
- * defer to the pages provided by the accounts package.
+ * The type of the context expected to be present in the React tree for all apps
+ * that use the base package.
  */
-export interface AccountsContextT {
+export interface BaseContextT {
     /**
      * Perform the (possibly app specific) logout sequence.
      */
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 1c1a4aabee..3a4ad8fccc 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -13,7 +13,7 @@ import { SidebarDrawer } from "@/base/components/mui/SidebarDrawer";
 import { Titlebar } from "@/base/components/Titlebar";
 import { EllipsizedTypography } from "@/base/components/Typography";
 import { useModalVisibility } from "@/base/components/utils/modal";
-import type { AccountsContextT } from "@/base/context";
+import type { BaseContextT } from "@/base/context";
 import { haveWindow } from "@/base/env";
 import { nameAndExtension } from "@/base/file-name";
 import log from "@/base/log";
@@ -113,7 +113,7 @@ export interface FileInfoProps {
      * This is the same as the {@link showMiniDialog} prop in the top level
      * {@link AppContext} of the app which we're currently being shown in.
      */
-    showMiniDialog: AccountsContextT["showMiniDialog"];
+    showMiniDialog: BaseContextT["showMiniDialog"];
     /**
      * TODO: Rename and flip to allowEdits.
      */
diff --git a/web/packages/new/photos/types/context.ts b/web/packages/new/photos/types/context.ts
index dd9cab7c0b..fc3d285956 100644
--- a/web/packages/new/photos/types/context.ts
+++ b/web/packages/new/photos/types/context.ts
@@ -1,11 +1,11 @@
-import type { AccountsContextT } from "@/base/context";
+import type { BaseContextT } from "@/base/context";
 import { type NotificationAttributes } from "@/new/photos/components/Notification";
 import { createContext, useContext } from "react";
 
 /**
  * The type of the React context available to all pages in the photos app.
  */
-export type AppContextT = AccountsContextT & {
+export type AppContextT = BaseContextT & {
     /**
      * Show the global activity indicator (a loading bar at the top of the
      * page).

From cf25cc40e42964e0639148c84b8d91e3ddc3b47b Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 14:09:42 +0530
Subject: [PATCH 195/796] Extra

---
 web/packages/base/context.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/web/packages/base/context.ts b/web/packages/base/context.ts
index aa01858b3c..96e1fe302b 100644
--- a/web/packages/base/context.ts
+++ b/web/packages/base/context.ts
@@ -1,8 +1,11 @@
 import type { MiniDialogAttributes } from "@/base/components/MiniDialog";
+import { createContext, useContext } from "react";
 
 /**
  * The type of the context expected to be present in the React tree for all apps
  * that use the base package.
+ *
+ * It is usually provided by the _app.tsx for the corresponding app.
  */
 export interface BaseContextT {
     /**
@@ -18,3 +21,15 @@ export interface BaseContextT {
      */
     showMiniDialog: (attributes: MiniDialogAttributes) => void;
 }
+
+/**
+ * The React {@link Context} of type {@link BaseContextT} available to all React
+ * components that refer to the base package.
+ */
+export const BaseContext = createContext<BaseContextT | undefined>(undefined);
+
+/**
+ * Utility hook to get the required {@link BaseContextT} that is expected to be
+ * available to all React components that refer to the base package.
+ */
+export const useBaseContext = (): BaseContextT => useContext(BaseContext)!;

From 884246d2ab5ff131432efce95c5a87cfa5712502 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 14:17:29 +0530
Subject: [PATCH 196/796] Provide

---
 web/apps/accounts/src/pages/_app.tsx | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/web/apps/accounts/src/pages/_app.tsx b/web/apps/accounts/src/pages/_app.tsx
index e510a5d75d..2cbd5b488d 100644
--- a/web/apps/accounts/src/pages/_app.tsx
+++ b/web/apps/accounts/src/pages/_app.tsx
@@ -1,16 +1,18 @@
 import { staticAppTitle } from "@/base/app";
+import { assertionFailed } from "@/base/assert";
 import { CustomHead } from "@/base/components/Head";
 import { LoadingIndicator } from "@/base/components/loaders";
 import { AttributedMiniDialog } from "@/base/components/MiniDialog";
 import { useAttributedMiniDialog } from "@/base/components/utils/dialog";
 import { useSetupI18n, useSetupLogs } from "@/base/components/utils/hooks-app";
 import { photosTheme } from "@/base/components/utils/theme";
+import { BaseContext } from "@/base/context";
 import "@fontsource-variable/inter";
 import { CssBaseline } from "@mui/material";
 import { ThemeProvider } from "@mui/material/styles";
 import { t } from "i18next";
 import type { AppProps } from "next/app";
-import React, { useMemo } from "react";
+import React, { useCallback, useMemo } from "react";
 import { AppContext } from "../types/context";
 
 const App: React.FC<AppProps> = ({ Component, pageProps }) => {
@@ -19,6 +21,18 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
     const isI18nReady = useSetupI18n();
     const { showMiniDialog, miniDialogProps } = useAttributedMiniDialog();
 
+    const logout = useCallback(() => {
+        // No code in the accounts app is currently expected to reach a code
+        // path where they would need to "logout". In any case, the accounts app
+        // doesn't store any user specific persistent state that'd need to be
+        // cleared, so there really isn't anything to do here.
+        assertionFailed();
+    }, []);
+
+    const baseContext = useMemo(
+        () => ({ showMiniDialog, logout }),
+        [showMiniDialog, logout],
+    );
     const appContext = useMemo(() => ({ showMiniDialog }), [showMiniDialog]);
 
     const title = isI18nReady ? t("title_accounts") : staticAppTitle;
@@ -31,10 +45,12 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
                 <CssBaseline enableColorScheme />
                 <AttributedMiniDialog {...miniDialogProps} />
 
-                <AppContext.Provider value={appContext}>
-                    {!isI18nReady && <LoadingIndicator />}
-                    {isI18nReady && <Component {...pageProps} />}
-                </AppContext.Provider>
+                <BaseContext value={baseContext}>
+                    <AppContext.Provider value={appContext}>
+                        {!isI18nReady && <LoadingIndicator />}
+                        {isI18nReady && <Component {...pageProps} />}
+                    </AppContext.Provider>
+                </BaseContext>
             </ThemeProvider>
         </>
     );

From 3d2d0cc3454f06720e30767ff55a0492d4280bf7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 14:19:16 +0530
Subject: [PATCH 197/796] More

---
 web/apps/auth/src/pages/_app.tsx | 30 ++++++++++++++++++++----------
 web/packages/base/context.ts     |  8 ++++----
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/web/apps/auth/src/pages/_app.tsx b/web/apps/auth/src/pages/_app.tsx
index 68a94d7fb1..9879b4709e 100644
--- a/web/apps/auth/src/pages/_app.tsx
+++ b/web/apps/auth/src/pages/_app.tsx
@@ -13,6 +13,7 @@ import {
     useSetupLogs,
 } from "@/base/components/utils/hooks-app";
 import { authTheme } from "@/base/components/utils/theme";
+import { BaseContext } from "@/base/context";
 import { logStartupBanner } from "@/base/log-web";
 import HTTPService from "@ente/shared/network/HTTPService";
 import { LS_KEYS, getData } from "@ente/shared/storage/localStorage";
@@ -42,6 +43,11 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
         void accountLogout().then(() => window.location.replace("/"));
     }, []);
 
+    const baseContext = useMemo(
+        () => ({ showMiniDialog, logout }),
+        [showMiniDialog, logout],
+    );
+
     const appContext = useMemo(
         () => ({
             logout,
@@ -61,16 +67,20 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
 
                 <AttributedMiniDialog {...miniDialogProps} />
 
-                <AppContext.Provider value={appContext}>
-                    {!isI18nReady ? (
-                        <LoadingIndicator />
-                    ) : (
-                        <>
-                            {isChangingRoute && <TranslucentLoadingOverlay />}
-                            <Component {...pageProps} />
-                        </>
-                    )}
-                </AppContext.Provider>
+                <BaseContext value={baseContext}>
+                    <AppContext.Provider value={appContext}>
+                        {!isI18nReady ? (
+                            <LoadingIndicator />
+                        ) : (
+                            <>
+                                {isChangingRoute && (
+                                    <TranslucentLoadingOverlay />
+                                )}
+                                <Component {...pageProps} />
+                            </>
+                        )}
+                    </AppContext.Provider>
+                </BaseContext>
             </ThemeProvider>
         </>
     );
diff --git a/web/packages/base/context.ts b/web/packages/base/context.ts
index 96e1fe302b..07eea8b982 100644
--- a/web/packages/base/context.ts
+++ b/web/packages/base/context.ts
@@ -8,10 +8,6 @@ import { createContext, useContext } from "react";
  * It is usually provided by the _app.tsx for the corresponding app.
  */
 export interface BaseContextT {
-    /**
-     * Perform the (possibly app specific) logout sequence.
-     */
-    logout: () => void;
     /**
      * Show a "mini dialog" with the given attributes.
      *
@@ -20,6 +16,10 @@ export interface BaseContextT {
      * customized by providing appropriate {@link MiniDialogAttributes}.
      */
     showMiniDialog: (attributes: MiniDialogAttributes) => void;
+    /**
+     * Perform the (possibly app specific) logout sequence.
+     */
+    logout: () => void;
 }
 
 /**

From 72d67897391f5e3462d40a8335f0991e27e1c9b2 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 14:22:53 +0530
Subject: [PATCH 198/796] In photos

---
 web/apps/photos/src/pages/_app.tsx | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index 98bbec1235..2b4f753a07 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -16,6 +16,7 @@ import {
     useSetupLogs,
 } from "@/base/components/utils/hooks-app";
 import { photosTheme } from "@/base/components/utils/theme";
+import { BaseContext } from "@/base/context";
 import log from "@/base/log";
 import { logStartupBanner } from "@/base/log-web";
 import { AppUpdate } from "@/base/types/ipc";
@@ -157,6 +158,10 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
         }, 0);
     }, []);
 
+    const baseContext = useMemo(
+        () => ({ showMiniDialog, logout }),
+        [showMiniDialog, logout],
+    );
     const appContext = useMemo(
         () => ({
             showLoadingBar,
@@ -197,16 +202,20 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
                 <Notification {...notificationProps} />
 
                 {isDesktop && <WindowTitlebar>{title}</WindowTitlebar>}
-                <AppContext.Provider value={appContext}>
-                    {!isI18nReady ? (
-                        <LoadingIndicator />
-                    ) : (
-                        <>
-                            {isChangingRoute && <TranslucentLoadingOverlay />}
-                            <Component {...pageProps} />
-                        </>
-                    )}
-                </AppContext.Provider>
+                <BaseContext value={baseContext}>
+                    <AppContext.Provider value={appContext}>
+                        {!isI18nReady ? (
+                            <LoadingIndicator />
+                        ) : (
+                            <>
+                                {isChangingRoute && (
+                                    <TranslucentLoadingOverlay />
+                                )}
+                                <Component {...pageProps} />
+                            </>
+                        )}
+                    </AppContext.Provider>
+                </BaseContext>
             </ThemeProvider>
         </>
     );

From 06450a0ce0a68200208826279cbd5429d68702a3 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 14:23:56 +0530
Subject: [PATCH 199/796] Tweak

---
 web/packages/base/components/Head.tsx | 29 +++++++++++----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/web/packages/base/components/Head.tsx b/web/packages/base/components/Head.tsx
index 0373bd3aea..3ada4645a5 100644
--- a/web/packages/base/components/Head.tsx
+++ b/web/packages/base/components/Head.tsx
@@ -11,20 +11,15 @@ interface CustomHeadProps {
  *
  * This assumes the existence of `public/images/favicon.png`.
  */
-export const CustomHead: React.FC<CustomHeadProps> = ({ title }) => {
-    return (
-        <Head>
-            <title>{title}</title>
-            <link rel="icon" href="/images/favicon.png" type="image/png" />
-            <meta
-                name="description"
-                content="Ente - end-to-end encrypted cloud with open-source apps"
-            />
-            <meta
-                name="viewport"
-                content="width=device-width, initial-scale=1"
-            />
-            <meta name="referrer" content="strict-origin-when-cross-origin" />
-        </Head>
-    );
-};
+export const CustomHead: React.FC<CustomHeadProps> = ({ title }) => (
+    <Head>
+        <title>{title}</title>
+        <link rel="icon" href="/images/favicon.png" type="image/png" />
+        <meta
+            name="description"
+            content="Ente - end-to-end encrypted cloud with open-source apps"
+        />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <meta name="referrer" content="strict-origin-when-cross-origin" />
+    </Head>
+);

From 6d552f5190171d7241eadf6a10e9eeb3bf4cb233 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 14:29:43 +0530
Subject: [PATCH 200/796] Unnest

---
 web/apps/accounts/src/pages/_app.tsx | 23 ++++++-------
 web/apps/auth/src/pages/_app.tsx     | 38 +++++++++------------
 web/apps/cast/src/pages/_app.tsx     | 15 ++++-----
 web/apps/photos/src/pages/_app.tsx   | 49 +++++++++++++---------------
 4 files changed, 55 insertions(+), 70 deletions(-)

diff --git a/web/apps/accounts/src/pages/_app.tsx b/web/apps/accounts/src/pages/_app.tsx
index 2cbd5b488d..4a7bcc4416 100644
--- a/web/apps/accounts/src/pages/_app.tsx
+++ b/web/apps/accounts/src/pages/_app.tsx
@@ -38,21 +38,18 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
     const title = isI18nReady ? t("title_accounts") : staticAppTitle;
 
     return (
-        <>
+        <ThemeProvider theme={photosTheme}>
             <CustomHead {...{ title }} />
+            <CssBaseline enableColorScheme />
+            <AttributedMiniDialog {...miniDialogProps} />
 
-            <ThemeProvider theme={photosTheme}>
-                <CssBaseline enableColorScheme />
-                <AttributedMiniDialog {...miniDialogProps} />
-
-                <BaseContext value={baseContext}>
-                    <AppContext.Provider value={appContext}>
-                        {!isI18nReady && <LoadingIndicator />}
-                        {isI18nReady && <Component {...pageProps} />}
-                    </AppContext.Provider>
-                </BaseContext>
-            </ThemeProvider>
-        </>
+            <BaseContext value={baseContext}>
+                <AppContext.Provider value={appContext}>
+                    {!isI18nReady && <LoadingIndicator />}
+                    {isI18nReady && <Component {...pageProps} />}
+                </AppContext.Provider>
+            </BaseContext>
+        </ThemeProvider>
     );
 };
 
diff --git a/web/apps/auth/src/pages/_app.tsx b/web/apps/auth/src/pages/_app.tsx
index 9879b4709e..143292aa67 100644
--- a/web/apps/auth/src/pages/_app.tsx
+++ b/web/apps/auth/src/pages/_app.tsx
@@ -59,30 +59,24 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
     const title = isI18nReady ? t("title_auth") : staticAppTitle;
 
     return (
-        <>
+        <ThemeProvider theme={authTheme}>
             <CustomHead {...{ title }} />
+            <CssBaseline enableColorScheme />
+            <AttributedMiniDialog {...miniDialogProps} />
 
-            <ThemeProvider theme={authTheme}>
-                <CssBaseline enableColorScheme />
-
-                <AttributedMiniDialog {...miniDialogProps} />
-
-                <BaseContext value={baseContext}>
-                    <AppContext.Provider value={appContext}>
-                        {!isI18nReady ? (
-                            <LoadingIndicator />
-                        ) : (
-                            <>
-                                {isChangingRoute && (
-                                    <TranslucentLoadingOverlay />
-                                )}
-                                <Component {...pageProps} />
-                            </>
-                        )}
-                    </AppContext.Provider>
-                </BaseContext>
-            </ThemeProvider>
-        </>
+            <BaseContext value={baseContext}>
+                <AppContext.Provider value={appContext}>
+                    {!isI18nReady ? (
+                        <LoadingIndicator />
+                    ) : (
+                        <>
+                            {isChangingRoute && <TranslucentLoadingOverlay />}
+                            <Component {...pageProps} />
+                        </>
+                    )}
+                </AppContext.Provider>
+            </BaseContext>
+        </ThemeProvider>
     );
 };
 
diff --git a/web/apps/cast/src/pages/_app.tsx b/web/apps/cast/src/pages/_app.tsx
index 61c0af1341..3f3b8198e6 100644
--- a/web/apps/cast/src/pages/_app.tsx
+++ b/web/apps/cast/src/pages/_app.tsx
@@ -10,15 +10,14 @@ import React from "react";
 const App: React.FC<AppProps> = ({ Component, pageProps }) => {
     useSetupLogs({ disableDiskLogs: true });
 
-    return (
-        <>
-            <CustomHead title={staticAppTitle} />
+    // We don't provide BaseContext. Nothing in the cast app needs it yet.
 
-            <ThemeProvider theme={castTheme}>
-                <CssBaseline enableColorScheme />
-                <Component {...pageProps} />
-            </ThemeProvider>
-        </>
+    return (
+        <ThemeProvider theme={castTheme}>
+            <CustomHead title={staticAppTitle} />
+            <CssBaseline enableColorScheme />
+            <Component {...pageProps} />
+        </ThemeProvider>
     );
 };
 
diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index 2b4f753a07..3d1c8c47d8 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -187,37 +187,32 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
     const title = isI18nReady ? t("title_photos") : staticAppTitle;
 
     return (
-        <>
+        <ThemeProvider theme={photosTheme}>
             <CustomHead {...{ title }} />
+            <CssBaseline enableColorScheme />
+            <ThemedLoadingBar ref={loadingBarRef} />
 
-            <ThemeProvider theme={photosTheme}>
-                <CssBaseline enableColorScheme />
-                <ThemedLoadingBar ref={loadingBarRef} />
+            <AttributedMiniDialog
+                sx={{ zIndex: aboveFileViewerContentZ }}
+                {...miniDialogProps}
+            />
 
-                <AttributedMiniDialog
-                    sx={{ zIndex: aboveFileViewerContentZ }}
-                    {...miniDialogProps}
-                />
+            <Notification {...notificationProps} />
 
-                <Notification {...notificationProps} />
-
-                {isDesktop && <WindowTitlebar>{title}</WindowTitlebar>}
-                <BaseContext value={baseContext}>
-                    <AppContext.Provider value={appContext}>
-                        {!isI18nReady ? (
-                            <LoadingIndicator />
-                        ) : (
-                            <>
-                                {isChangingRoute && (
-                                    <TranslucentLoadingOverlay />
-                                )}
-                                <Component {...pageProps} />
-                            </>
-                        )}
-                    </AppContext.Provider>
-                </BaseContext>
-            </ThemeProvider>
-        </>
+            {isDesktop && <WindowTitlebar>{title}</WindowTitlebar>}
+            <BaseContext value={baseContext}>
+                <AppContext.Provider value={appContext}>
+                    {!isI18nReady ? (
+                        <LoadingIndicator />
+                    ) : (
+                        <>
+                            {isChangingRoute && <TranslucentLoadingOverlay />}
+                            <Component {...pageProps} />
+                        </>
+                    )}
+                </AppContext.Provider>
+            </BaseContext>
+        </ThemeProvider>
     );
 };
 

From 0d7c319903ad06ffb6b0c1ebf2035d1bd3942ecf Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 14:35:51 +0530
Subject: [PATCH 201/796] Swap

---
 web/apps/accounts/src/pages/passkeys/index.tsx       |  6 +++---
 web/apps/auth/src/pages/auth.tsx                     |  6 +++---
 .../src/components/Collections/CollectionHeader.tsx  |  5 +++--
 .../src/components/Collections/CollectionShare.tsx   |  9 +++++----
 web/apps/photos/src/components/Export.tsx            |  4 ++--
 .../photos/src/components/FilesDownloadProgress.tsx  |  4 ++--
 web/apps/photos/src/components/Sidebar.tsx           |  9 +++++----
 .../photos/src/components/Upload/UploadProgress.tsx  |  5 +++--
 web/apps/photos/src/components/Upload/Uploader.tsx   | 10 ++++------
 web/apps/photos/src/components/WatchFolder.tsx       |  4 ++--
 .../components/pages/gallery/SelectedFileOptions.tsx |  4 ++--
 web/apps/photos/src/pages/gallery.tsx                | 12 ++++--------
 web/apps/photos/src/pages/index.tsx                  |  4 ++--
 web/apps/photos/src/pages/shared-albums.tsx          |  4 +++-
 web/packages/new/photos/components/PlanSelector.tsx  |  5 +++--
 .../new/photos/components/gallery/PeopleHeader.tsx   |  8 +++++---
 .../new/photos/components/sidebar/MLSettings.tsx     |  4 ++--
 .../photos/components/sidebar/TwoFactorSettings.tsx  |  4 ++--
 18 files changed, 55 insertions(+), 52 deletions(-)

diff --git a/web/apps/accounts/src/pages/passkeys/index.tsx b/web/apps/accounts/src/pages/passkeys/index.tsx
index 597c319527..629b824135 100644
--- a/web/apps/accounts/src/pages/passkeys/index.tsx
+++ b/web/apps/accounts/src/pages/passkeys/index.tsx
@@ -10,6 +10,7 @@ import { SingleInputDialog } from "@/base/components/SingleInputDialog";
 import { Titlebar } from "@/base/components/Titlebar";
 import { errorDialogAttributes } from "@/base/components/utils/dialog";
 import { useModalVisibility } from "@/base/components/utils/modal";
+import { useBaseContext } from "@/base/context";
 import log from "@/base/log";
 import SingleInputForm from "@ente/shared/components/SingleInputForm";
 import { formatDateTimeFull } from "@ente/shared/time/format";
@@ -28,10 +29,9 @@ import {
     renamePasskey,
     type Passkey,
 } from "services/passkey";
-import { useAppContext } from "../../types/context";
 
 const Page: React.FC = () => {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
 
     const [token, setToken] = useState<string | undefined>();
     const [passkeys, setPasskeys] = useState<Passkey[]>([]);
@@ -252,7 +252,7 @@ const ManagePasskeyDrawer: React.FC<ManagePasskeyDrawerProps> = ({
     passkey,
     onUpdateOrDeletePasskey,
 }) => {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
 
     const { show: showRenameDialog, props: renameDialogVisibilityProps } =
         useModalVisibility();
diff --git a/web/apps/auth/src/pages/auth.tsx b/web/apps/auth/src/pages/auth.tsx
index cdf2195439..1c654c9ae2 100644
--- a/web/apps/auth/src/pages/auth.tsx
+++ b/web/apps/auth/src/pages/auth.tsx
@@ -8,6 +8,7 @@ import {
     OverflowMenu,
     OverflowMenuOption,
 } from "@/base/components/OverflowMenu";
+import { useBaseContext } from "@/base/context";
 import { isHTTP401Error } from "@/base/http";
 import log from "@/base/log";
 import { masterKeyFromSessionIfLoggedIn } from "@/base/session-store";
@@ -28,10 +29,9 @@ import { useRouter } from "next/router";
 import React, { useCallback, useEffect, useState } from "react";
 import { generateOTPs, type Code } from "services/code";
 import { getAuthCodes } from "services/remote";
-import { useAppContext } from "types/context";
 
 const Page: React.FC = () => {
-    const { logout, showMiniDialog } = useAppContext();
+    const { showMiniDialog, logout } = useBaseContext();
 
     const router = useRouter();
     const [codes, setCodes] = useState<Code[]>([]);
@@ -131,7 +131,7 @@ const Page: React.FC = () => {
 export default Page;
 
 const AuthNavbar: React.FC = () => {
-    const { logout } = useAppContext();
+    const { logout } = useBaseContext();
 
     return (
         <NavbarBase
diff --git a/web/apps/photos/src/components/Collections/CollectionHeader.tsx b/web/apps/photos/src/components/Collections/CollectionHeader.tsx
index 86f3c61070..9b136ed181 100644
--- a/web/apps/photos/src/components/Collections/CollectionHeader.tsx
+++ b/web/apps/photos/src/components/Collections/CollectionHeader.tsx
@@ -6,6 +6,7 @@ import {
     OverflowMenuOption,
 } from "@/base/components/OverflowMenu";
 import { useModalVisibility } from "@/base/components/utils/modal";
+import { useBaseContext } from "@/base/context";
 import type { Collection } from "@/media/collection";
 import { ItemVisibility } from "@/media/file-metadata";
 import {
@@ -128,8 +129,8 @@ const CollectionOptions: React.FC<CollectionHeaderProps> = ({
     setFilesDownloadProgressAttributesCreator,
     isActiveCollectionDownloadInProgress,
 }) => {
-    const { showLoadingBar, hideLoadingBar, onGenericError, showMiniDialog } =
-        useAppContext();
+    const { showMiniDialog } = useBaseContext();
+    const { showLoadingBar, hideLoadingBar, onGenericError } = useAppContext();
     const { syncWithRemote } = useContext(GalleryContext);
     const overFlowMenuIconRef = useRef<SVGSVGElement>(null);
 
diff --git a/web/apps/photos/src/components/Collections/CollectionShare.tsx b/web/apps/photos/src/components/Collections/CollectionShare.tsx
index 69c0518212..444bebb3d1 100644
--- a/web/apps/photos/src/components/Collections/CollectionShare.tsx
+++ b/web/apps/photos/src/components/Collections/CollectionShare.tsx
@@ -15,6 +15,7 @@ import {
 } from "@/base/components/RowButton";
 import { Titlebar } from "@/base/components/Titlebar";
 import { useModalVisibility } from "@/base/components/utils/modal";
+import { useBaseContext } from "@/base/context";
 import { sharedCryptoWorker } from "@/base/crypto";
 import log from "@/base/log";
 import { appendCollectionKeyToShareURL } from "@/gallery/services/share";
@@ -27,7 +28,7 @@ import { COLLECTION_ROLE, type CollectionUser } from "@/media/collection";
 import { PublicLinkCreated } from "@/new/photos/components/share/PublicLinkCreated";
 import { avatarTextColor } from "@/new/photos/services/avatar";
 import type { CollectionSummary } from "@/new/photos/services/collection/ui";
-import { AppContext, useAppContext } from "@/new/photos/types/context";
+import { AppContext } from "@/new/photos/types/context";
 import { FlexWrapper } from "@ente/shared/components/Container";
 import SingleInputForm, {
     type SingleInputFormProps,
@@ -1007,7 +1008,7 @@ const ManageParticipant: React.FC<ManageParticipantProps> = ({
     selectedParticipant,
     collectionUnshare,
 }) => {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
     const galleryContext = useContext(GalleryContext);
 
     const handleRootClose = () => {
@@ -1710,7 +1711,7 @@ const ManageDownloadAccess: React.FC<ManageDownloadAccessProps> = ({
     updatePublicShareURLHelper,
     collection,
 }) => {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
 
     const handleFileDownloadSetting = () => {
         if (publicShareProp.enableDownload) {
@@ -1758,7 +1759,7 @@ const ManageLinkPassword: React.FC<ManageLinkPasswordProps> = ({
     publicShareProp,
     updatePublicShareURLHelper,
 }) => {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
     const [changePasswordView, setChangePasswordView] = useState(false);
 
     const closeConfigurePassword = () => setChangePasswordView(false);
diff --git a/web/apps/photos/src/components/Export.tsx b/web/apps/photos/src/components/Export.tsx
index a10e855fad..85623d5b93 100644
--- a/web/apps/photos/src/components/Export.tsx
+++ b/web/apps/photos/src/components/Export.tsx
@@ -8,11 +8,11 @@ import {
 import { EllipsizedTypography } from "@/base/components/Typography";
 import type { ButtonishProps } from "@/base/components/mui";
 import type { ModalVisibilityProps } from "@/base/components/utils/modal";
+import { useBaseContext } from "@/base/context";
 import { ensureElectron } from "@/base/electron";
 import log from "@/base/log";
 import { EnteFile } from "@/media/file";
 import { DialogCloseIconButton } from "@/new/photos/components/mui/Dialog";
-import { useAppContext } from "@/new/photos/types/context";
 import { SpaceBetweenFlex } from "@ente/shared/components/Container";
 import { CustomError } from "@ente/shared/error";
 import FolderIcon from "@mui/icons-material/Folder";
@@ -50,7 +50,7 @@ export const Export: React.FC<ExportProps> = ({
     onClose,
     collectionNameMap,
 }) => {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
     const [exportStage, setExportStage] = useState(ExportStage.INIT);
     const [exportFolder, setExportFolder] = useState("");
     const [continuousExport, setContinuousExport] = useState(false);
diff --git a/web/apps/photos/src/components/FilesDownloadProgress.tsx b/web/apps/photos/src/components/FilesDownloadProgress.tsx
index 568741c8bc..fa015e482d 100644
--- a/web/apps/photos/src/components/FilesDownloadProgress.tsx
+++ b/web/apps/photos/src/components/FilesDownloadProgress.tsx
@@ -1,6 +1,6 @@
+import { useBaseContext } from "@/base/context";
 import { Notification } from "@/new/photos/components/Notification";
 import { aboveFileViewerContentZ } from "@/new/photos/components/utils/z-index";
-import { useAppContext } from "@/new/photos/types/context";
 import { t } from "i18next";
 import { GalleryContext } from "pages/gallery";
 import { useContext } from "react";
@@ -57,7 +57,7 @@ export const FilesDownloadProgress: React.FC<FilesDownloadProgressProps> = ({
     attributesList,
     setAttributesList,
 }) => {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
     const galleryContext = useContext(GalleryContext);
 
     if (!attributesList) {
diff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsx
index bfd0d6e8e0..4214e0172d 100644
--- a/web/apps/photos/src/components/Sidebar.tsx
+++ b/web/apps/photos/src/components/Sidebar.tsx
@@ -20,6 +20,7 @@ import {
 } from "@/base/components/mui/SidebarDrawer";
 import { useIsSmallWidth } from "@/base/components/utils/hooks";
 import { useModalVisibility } from "@/base/components/utils/modal";
+import { useBaseContext } from "@/base/context";
 import { isDevBuild } from "@/base/env";
 import {
     getLocaleInUse,
@@ -354,7 +355,7 @@ const SubscriptionStatus: React.FC<SubscriptionStatusProps> = ({
 };
 
 function MemberSubscriptionManage({ open, userDetails, onClose }) {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
     const fullScreen = useIsSmallWidth();
 
     const confirmLeaveFamily = () =>
@@ -648,7 +649,7 @@ const Account: React.FC<NestedSidebarDrawerVisibilityProps> = ({
     onClose,
     onRootClose,
 }) => {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
 
     const router = useRouter();
 
@@ -908,7 +909,7 @@ const MapSettings: React.FC<NestedSidebarDrawerVisibilityProps> = ({
     onClose,
     onRootClose,
 }) => {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
 
     const { mapEnabled } = useSettingsSnapshot();
 
@@ -1033,7 +1034,7 @@ const Help: React.FC<NestedSidebarDrawerVisibilityProps> = ({
     onClose,
     onRootClose,
 }) => {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
 
     const handleRootClose = () => {
         onClose();
diff --git a/web/apps/photos/src/components/Upload/UploadProgress.tsx b/web/apps/photos/src/components/Upload/UploadProgress.tsx
index b96d00cb34..592ec8fce5 100644
--- a/web/apps/photos/src/components/Upload/UploadProgress.tsx
+++ b/web/apps/photos/src/components/Upload/UploadProgress.tsx
@@ -1,9 +1,9 @@
 import { FilledIconButton } from "@/base/components/mui";
+import { useBaseContext } from "@/base/context";
 import {
     UPLOAD_RESULT,
     type UploadPhase,
 } from "@/new/photos/services/upload/types";
-import { useAppContext } from "@/new/photos/types/context";
 import { SpaceBetweenFlex } from "@ente/shared/components/Container";
 import CloseIcon from "@mui/icons-material/Close";
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
@@ -67,7 +67,8 @@ export const UploadProgress: React.FC<UploadProgressProps> = ({
     finishedUploads,
     cancelUploads,
 }) => {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
+
     const [expanded, setExpanded] = useState(false);
 
     useEffect(() => {
diff --git a/web/apps/photos/src/components/Upload/Uploader.tsx b/web/apps/photos/src/components/Upload/Uploader.tsx
index 67498b49d1..ef65ef2717 100644
--- a/web/apps/photos/src/components/Upload/Uploader.tsx
+++ b/web/apps/photos/src/components/Upload/Uploader.tsx
@@ -1,5 +1,6 @@
 import { isDesktop } from "@/base/app";
 import { useModalVisibility } from "@/base/components/utils/modal";
+import { useBaseContext } from "@/base/context";
 import { basename } from "@/base/file-name";
 import log from "@/base/log";
 import type { CollectionMapping, Electron, ZipItem } from "@/base/types/ipc";
@@ -108,12 +109,9 @@ export default function Uploader({
     showSessionExpiredMessage,
     ...props
 }: Props) {
-    const {
-        showMiniDialog,
-        showNotification,
-        onGenericError,
-        watchFolderView,
-    } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
+    const { showNotification, onGenericError, watchFolderView } =
+        useAppContext();
     const galleryContext = useContext(GalleryContext);
     const publicCollectionGalleryContext = useContext(
         PublicCollectionGalleryContext,
diff --git a/web/apps/photos/src/components/WatchFolder.tsx b/web/apps/photos/src/components/WatchFolder.tsx
index 985cf61224..bc916eca9d 100644
--- a/web/apps/photos/src/components/WatchFolder.tsx
+++ b/web/apps/photos/src/components/WatchFolder.tsx
@@ -9,12 +9,12 @@ import {
     useModalVisibility,
     type ModalVisibilityProps,
 } from "@/base/components/utils/modal";
+import { useBaseContext } from "@/base/context";
 import { ensureElectron } from "@/base/electron";
 import { basename, dirname } from "@/base/file-name";
 import type { CollectionMapping, FolderWatch } from "@/base/types/ipc";
 import { CollectionMappingChoice } from "@/new/photos/components/CollectionMappingChoice";
 import { DialogCloseIconButton } from "@/new/photos/components/mui/Dialog";
-import { useAppContext } from "@/new/photos/types/context";
 import AddIcon from "@mui/icons-material/Add";
 import CheckIcon from "@mui/icons-material/Check";
 import DoNotDisturbOutlinedIcon from "@mui/icons-material/DoNotDisturbOutlined";
@@ -205,7 +205,7 @@ interface WatchEntryProps {
 }
 
 const WatchEntry: React.FC<WatchEntryProps> = ({ watch, removeWatch }) => {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
 
     const confirmStopWatching = () => {
         showMiniDialog({
diff --git a/web/apps/photos/src/components/pages/gallery/SelectedFileOptions.tsx b/web/apps/photos/src/components/pages/gallery/SelectedFileOptions.tsx
index 35f97b7387..fcf1d5c452 100644
--- a/web/apps/photos/src/components/pages/gallery/SelectedFileOptions.tsx
+++ b/web/apps/photos/src/components/pages/gallery/SelectedFileOptions.tsx
@@ -1,4 +1,5 @@
 import { SpacedRow } from "@/base/components/containers";
+import { useBaseContext } from "@/base/context";
 import type { Collection } from "@/media/collection";
 import type { CollectionSelectorAttributes } from "@/new/photos/components/CollectionSelector";
 import type { GalleryBarMode } from "@/new/photos/components/gallery/reducer";
@@ -7,7 +8,6 @@ import {
     ARCHIVE_SECTION,
     TRASH_SECTION,
 } from "@/new/photos/services/collection";
-import { useAppContext } from "@/new/photos/types/context";
 import ClockIcon from "@mui/icons-material/AccessTime";
 import AddIcon from "@mui/icons-material/Add";
 import ArchiveIcon from "@mui/icons-material/ArchiveOutlined";
@@ -71,7 +71,7 @@ const SelectedFileOptions = ({
     isInSearchMode,
     isInHiddenSection,
 }: Props) => {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
 
     const peopleMode = barMode == "people";
 
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 4aaf841a5f..aec02437fe 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -9,6 +9,7 @@ import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import { errorDialogAttributes } from "@/base/components/utils/dialog";
 import { useIsSmallWidth } from "@/base/components/utils/hooks";
 import { useModalVisibility } from "@/base/components/utils/modal";
+import { useBaseContext } from "@/base/context";
 import log from "@/base/log";
 import { FullScreenDropZone } from "@/gallery/components/FullScreenDropZone";
 import { useFileInput } from "@/gallery/components/utils/use-file-input";
@@ -177,14 +178,9 @@ export const GalleryContext = createContext<GalleryContextType>(
  *           Photo List           v
  */
 const Page: React.FC = () => {
-    const {
-        showLoadingBar,
-        hideLoadingBar,
-        showMiniDialog,
-        onGenericError,
-        watchFolderView,
-        logout,
-    } = useAppContext();
+    const { showMiniDialog, logout } = useBaseContext();
+    const { showLoadingBar, hideLoadingBar, onGenericError, watchFolderView } =
+        useAppContext();
 
     const isOffline = useIsOffline();
     const [state, dispatch] = useGalleryReducer();
diff --git a/web/apps/photos/src/pages/index.tsx b/web/apps/photos/src/pages/index.tsx
index 695fdec9d6..e223425a18 100644
--- a/web/apps/photos/src/pages/index.tsx
+++ b/web/apps/photos/src/pages/index.tsx
@@ -4,10 +4,10 @@ import { CenteredFill, CenteredRow } from "@/base/components/containers";
 import { EnteLogo } from "@/base/components/EnteLogo";
 import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
+import { useBaseContext } from "@/base/context";
 import log from "@/base/log";
 import { albumsAppOrigin, customAPIHost } from "@/base/origins";
 import { DevSettings } from "@/new/photos/components/DevSettings";
-import { useAppContext } from "@/new/photos/types/context";
 import { PHOTOS_PAGES as PAGES } from "@ente/shared/constants/pages";
 import { saveKeyInSessionStore } from "@ente/shared/crypto/helpers";
 import localForage from "@ente/shared/storage/localForage";
@@ -21,7 +21,7 @@ import React, { useCallback, useEffect, useRef, useState } from "react";
 import { Trans } from "react-i18next";
 
 const Page: React.FC = () => {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
 
     const [loading, setLoading] = useState(true);
     const [showLogin, setShowLogin] = useState(true);
diff --git a/web/apps/photos/src/pages/shared-albums.tsx b/web/apps/photos/src/pages/shared-albums.tsx
index 07677d11ab..c843a1af82 100644
--- a/web/apps/photos/src/pages/shared-albums.tsx
+++ b/web/apps/photos/src/pages/shared-albums.tsx
@@ -19,6 +19,7 @@ import {
     useIsSmallWidth,
     useIsTouchscreen,
 } from "@/base/components/utils/hooks";
+import { useBaseContext } from "@/base/context";
 import { isHTTP401Error, PublicAlbumsCredentials } from "@/base/http";
 import log from "@/base/log";
 import { FullScreenDropZone } from "@/gallery/components/FullScreenDropZone";
@@ -93,7 +94,8 @@ export default function PublicCollectionGallery() {
     const [publicFiles, setPublicFiles] = useState<EnteFile[]>(null);
     const [publicCollection, setPublicCollection] = useState<Collection>(null);
     const [errorMessage, setErrorMessage] = useState<string>(null);
-    const { showLoadingBar, hideLoadingBar, showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
+    const { showLoadingBar, hideLoadingBar } = useAppContext();
     const [loading, setLoading] = useState(true);
     const router = useRouter();
     const [isPasswordProtected, setIsPasswordProtected] =
diff --git a/web/packages/new/photos/components/PlanSelector.tsx b/web/packages/new/photos/components/PlanSelector.tsx
index de5224e883..acd1d548a9 100644
--- a/web/packages/new/photos/components/PlanSelector.tsx
+++ b/web/packages/new/photos/components/PlanSelector.tsx
@@ -6,6 +6,7 @@ import {
     genericRetriableErrorDialogAttributes,
 } from "@/base/components/utils/dialog";
 import type { ModalVisibilityProps } from "@/base/components/utils/modal";
+import { useBaseContext } from "@/base/context";
 import log from "@/base/log";
 import { useUserDetailsSnapshot } from "@/new/photos/components/utils/use-snapshot";
 import { useWrapAsyncOperation } from "@/new/photos/components/utils/use-wrap-async";
@@ -111,7 +112,7 @@ const PlanSelectorCard: React.FC<PlanSelectorCardProps> = ({
     onClose,
     setLoading,
 }) => {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
 
     const userDetails = useUserDetailsSnapshot();
 
@@ -717,7 +718,7 @@ const StripeSubscriptionOptions: React.FC<StripeSubscriptionOptionsProps> = ({
     subscription,
     hasAddOnBonus,
 }) => {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
 
     const confirmReactivation = () =>
         showMiniDialog({
diff --git a/web/packages/new/photos/components/gallery/PeopleHeader.tsx b/web/packages/new/photos/components/gallery/PeopleHeader.tsx
index 40e24cd74f..7ffae9517e 100644
--- a/web/packages/new/photos/components/gallery/PeopleHeader.tsx
+++ b/web/packages/new/photos/components/gallery/PeopleHeader.tsx
@@ -13,6 +13,7 @@ import {
     useModalVisibility,
     type ModalVisibilityProps,
 } from "@/base/components/utils/modal";
+import { useBaseContext } from "@/base/context";
 import log from "@/base/log";
 import {
     addCGroup,
@@ -110,7 +111,7 @@ interface CGroupPersonHeaderProps {
 const CGroupPersonHeader: React.FC<CGroupPersonHeaderProps> = ({ person }) => {
     const cgroup = person.cgroup;
 
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
 
     const { show: showNameInput, props: nameInputVisibilityProps } =
         useModalVisibility();
@@ -225,7 +226,7 @@ const ClusterPersonHeader: React.FC<ClusterPersonHeaderProps> = ({
 }) => {
     const cluster = person.cluster;
 
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
 
     const { show: showAddPerson, props: addPersonVisibilityProps } =
         useModalVisibility();
@@ -545,7 +546,8 @@ const SuggestionsDialog: React.FC<SuggestionsDialogProps> = ({
     onClose,
     person,
 }) => {
-    const { showMiniDialog, onGenericError } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
+    const { onGenericError } = useAppContext();
 
     const [state, dispatch] = useReducer(
         suggestionsDialogReducer,
diff --git a/web/packages/new/photos/components/sidebar/MLSettings.tsx b/web/packages/new/photos/components/sidebar/MLSettings.tsx
index fb60a63b33..aadea1c373 100644
--- a/web/packages/new/photos/components/sidebar/MLSettings.tsx
+++ b/web/packages/new/photos/components/sidebar/MLSettings.tsx
@@ -6,6 +6,7 @@ import {
     SidebarDrawerTitlebar,
     type NestedSidebarDrawerVisibilityProps,
 } from "@/base/components/mui/SidebarDrawer";
+import { useBaseContext } from "@/base/context";
 import { disableML, enableML, type MLStatus } from "@/new/photos/services/ml";
 import {
     Box,
@@ -22,7 +23,6 @@ import {
 import { t } from "i18next";
 import React, { useEffect, useState } from "react";
 import { Trans } from "react-i18next";
-import { useAppContext } from "../../types/context";
 import { openURL } from "../../utils/web";
 import { useMLStatusSnapshot } from "../utils/use-snapshot";
 import { useWrapAsyncOperation } from "../utils/use-wrap-async";
@@ -240,7 +240,7 @@ interface ManageMLProps {
 }
 
 const ManageML: React.FC<ManageMLProps> = ({ mlStatus, onDisableML }) => {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
 
     const { phase, nSyncedFiles, nTotalFiles } = mlStatus;
 
diff --git a/web/packages/new/photos/components/sidebar/TwoFactorSettings.tsx b/web/packages/new/photos/components/sidebar/TwoFactorSettings.tsx
index 5deabff34d..a1958d5460 100644
--- a/web/packages/new/photos/components/sidebar/TwoFactorSettings.tsx
+++ b/web/packages/new/photos/components/sidebar/TwoFactorSettings.tsx
@@ -10,8 +10,8 @@ import {
     SidebarDrawerTitlebar,
     type NestedSidebarDrawerVisibilityProps,
 } from "@/base/components/mui/SidebarDrawer";
+import { useBaseContext } from "@/base/context";
 import { disable2FA, get2FAStatus } from "@/new/photos/services/user";
-import { useAppContext } from "@/new/photos/types/context";
 import { PHOTOS_PAGES as PAGES } from "@ente/shared/constants/pages";
 import { LS_KEYS, getData, setLSUser } from "@ente/shared/storage/localStorage";
 import LockIcon from "@mui/icons-material/Lock";
@@ -106,7 +106,7 @@ const SetupDrawerContents: React.FC<ContentsProps> = ({ onRootClose }) => {
 };
 
 const ManageDrawerContents: React.FC<ContentsProps> = ({ onRootClose }) => {
-    const { showMiniDialog } = useAppContext();
+    const { showMiniDialog } = useBaseContext();
 
     const confirmDisable = () =>
         showMiniDialog({

From 6f729c01e1492bb9cc42b38775755adb09fefa22 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 14:43:42 +0530
Subject: [PATCH 202/796] Direct

---
 web/apps/accounts/src/pages/_app.tsx                     | 4 ++--
 web/apps/auth/src/pages/_app.tsx                         | 4 ++--
 web/apps/auth/src/pages/auth.tsx                         | 4 ++--
 web/apps/photos/src/components/AuthenticateUserModal.tsx | 2 +-
 web/apps/photos/src/components/Sidebar.tsx               | 2 +-
 web/apps/photos/src/pages/_app.tsx                       | 4 ++--
 web/apps/photos/src/pages/gallery.tsx                    | 2 +-
 web/packages/accounts/pages/credentials.tsx              | 8 ++++----
 web/packages/accounts/pages/generate.tsx                 | 6 +++---
 web/packages/accounts/pages/recover.tsx                  | 6 +++---
 web/packages/accounts/pages/two-factor/recover.tsx       | 2 +-
 web/packages/accounts/pages/two-factor/verify.tsx        | 6 +++---
 web/packages/accounts/pages/verify.tsx                   | 6 +++---
 web/packages/base/context.ts                             | 8 ++++----
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/web/apps/accounts/src/pages/_app.tsx b/web/apps/accounts/src/pages/_app.tsx
index 4a7bcc4416..103a92c2f1 100644
--- a/web/apps/accounts/src/pages/_app.tsx
+++ b/web/apps/accounts/src/pages/_app.tsx
@@ -30,8 +30,8 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
     }, []);
 
     const baseContext = useMemo(
-        () => ({ showMiniDialog, logout }),
-        [showMiniDialog, logout],
+        () => ({ logout, showMiniDialog }),
+        [logout, showMiniDialog],
     );
     const appContext = useMemo(() => ({ showMiniDialog }), [showMiniDialog]);
 
diff --git a/web/apps/auth/src/pages/_app.tsx b/web/apps/auth/src/pages/_app.tsx
index 143292aa67..55af8d5d7c 100644
--- a/web/apps/auth/src/pages/_app.tsx
+++ b/web/apps/auth/src/pages/_app.tsx
@@ -44,8 +44,8 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
     }, []);
 
     const baseContext = useMemo(
-        () => ({ showMiniDialog, logout }),
-        [showMiniDialog, logout],
+        () => ({ logout, showMiniDialog }),
+        [logout, showMiniDialog],
     );
 
     const appContext = useMemo(
diff --git a/web/apps/auth/src/pages/auth.tsx b/web/apps/auth/src/pages/auth.tsx
index 1c654c9ae2..1e40413c17 100644
--- a/web/apps/auth/src/pages/auth.tsx
+++ b/web/apps/auth/src/pages/auth.tsx
@@ -31,7 +31,7 @@ import { generateOTPs, type Code } from "services/code";
 import { getAuthCodes } from "services/remote";
 
 const Page: React.FC = () => {
-    const { showMiniDialog, logout } = useBaseContext();
+    const { logout, showMiniDialog } = useBaseContext();
 
     const router = useRouter();
     const [codes, setCodes] = useState<Code[]>([]);
@@ -57,7 +57,7 @@ const Page: React.FC = () => {
             setHasFetched(true);
         };
         void fetchCodes();
-    }, [router, showMiniDialog, logout]);
+    }, [router, logout, showMiniDialog]);
 
     const lcSearch = searchTerm.toLowerCase();
     const filteredCodes = codes.filter(
diff --git a/web/apps/photos/src/components/AuthenticateUserModal.tsx b/web/apps/photos/src/components/AuthenticateUserModal.tsx
index 28e20a839f..e81bed170c 100644
--- a/web/apps/photos/src/components/AuthenticateUserModal.tsx
+++ b/web/apps/photos/src/components/AuthenticateUserModal.tsx
@@ -47,7 +47,7 @@ export default function AuthenticateUserModal({
             // potentially transient issues.
             log.warn("Ignoring error when determining session validity", e);
         }
-    }, [showMiniDialog, logout]);
+    }, [logout, showMiniDialog]);
 
     useEffect(() => {
         const main = async () => {
diff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsx
index 4214e0172d..5815a887c1 100644
--- a/web/apps/photos/src/components/Sidebar.tsx
+++ b/web/apps/photos/src/components/Sidebar.tsx
@@ -596,7 +596,7 @@ const HelpSection: React.FC<Pick<SidebarProps, "closeSidebar">> = ({
 };
 
 const ExitSection: React.FC = () => {
-    const { showMiniDialog, logout } = useContext(AppContext);
+    const { logout, showMiniDialog } = useContext(AppContext);
 
     const handleLogout = () =>
         showMiniDialog({
diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index 3d1c8c47d8..70e6e9e51b 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -159,8 +159,8 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
     }, []);
 
     const baseContext = useMemo(
-        () => ({ showMiniDialog, logout }),
-        [showMiniDialog, logout],
+        () => ({ logout, showMiniDialog }),
+        [logout, showMiniDialog],
     );
     const appContext = useMemo(
         () => ({
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index aec02437fe..4111a47c95 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -178,7 +178,7 @@ export const GalleryContext = createContext<GalleryContextType>(
  *           Photo List           v
  */
 const Page: React.FC = () => {
-    const { showMiniDialog, logout } = useBaseContext();
+    const { logout, showMiniDialog } = useBaseContext();
     const { showLoadingBar, hideLoadingBar, onGenericError, watchFolderView } =
         useAppContext();
 
diff --git a/web/packages/accounts/pages/credentials.tsx b/web/packages/accounts/pages/credentials.tsx
index 4b92b116ad..76c2b50829 100644
--- a/web/packages/accounts/pages/credentials.tsx
+++ b/web/packages/accounts/pages/credentials.tsx
@@ -25,9 +25,9 @@ import {
 } from "@/accounts/services/srp";
 import type { SRPAttributes } from "@/accounts/services/srp-remote";
 import { getSRPAttributes } from "@/accounts/services/srp-remote";
-import type { PageProps } from "@/accounts/types/page";
 import { LinkButton } from "@/base/components/LinkButton";
 import { LoadingIndicator } from "@/base/components/loaders";
+import { useBaseContext } from "@/base/context";
 import { sharedCryptoWorker } from "@/base/crypto";
 import type { B64EncryptionResult } from "@/base/crypto/libsodium";
 import { clearLocalStorage } from "@/base/local-storage";
@@ -64,8 +64,8 @@ import { t } from "i18next";
 import { useRouter } from "next/router";
 import { useCallback, useEffect, useState } from "react";
 
-const Page: React.FC<PageProps> = ({ appContext }) => {
-    const { logout, showMiniDialog } = appContext;
+const Page: React.FC = () => {
+    const { logout, showMiniDialog } = useBaseContext();
 
     const [srpAttributes, setSrpAttributes] = useState<SRPAttributes>();
     const [keyAttributes, setKeyAttributes] = useState<KeyAttributes>();
@@ -117,7 +117,7 @@ const Page: React.FC<PageProps> = ({ appContext }) => {
             // potentially transient issues.
             log.warn("Ignoring error when determining session validity", e);
         }
-    }, [showMiniDialog, logout]);
+    }, [logout, showMiniDialog]);
 
     useEffect(() => {
         const main = async () => {
diff --git a/web/packages/accounts/pages/generate.tsx b/web/packages/accounts/pages/generate.tsx
index 17056805d8..5794a98171 100644
--- a/web/packages/accounts/pages/generate.tsx
+++ b/web/packages/accounts/pages/generate.tsx
@@ -14,9 +14,9 @@ import {
     generateKeyAndSRPAttributes,
 } from "@/accounts/services/srp";
 import { putAttributes } from "@/accounts/services/user";
-import type { PageProps } from "@/accounts/types/page";
 import { LinkButton } from "@/base/components/LinkButton";
 import { LoadingIndicator } from "@/base/components/loaders";
+import { useBaseContext } from "@/base/context";
 import log from "@/base/log";
 import {
     generateAndSaveIntermediateKeyAttributes,
@@ -33,8 +33,8 @@ import { t } from "i18next";
 import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
 
-const Page: React.FC<PageProps> = ({ appContext }) => {
-    const { logout, showMiniDialog } = appContext;
+const Page: React.FC = () => {
+    const { logout, showMiniDialog } = useBaseContext();
 
     const [token, setToken] = useState<string>();
     const [user, setUser] = useState<User>();
diff --git a/web/packages/accounts/pages/recover.tsx b/web/packages/accounts/pages/recover.tsx
index 9c5c2a7540..29c92dcb02 100644
--- a/web/packages/accounts/pages/recover.tsx
+++ b/web/packages/accounts/pages/recover.tsx
@@ -6,8 +6,8 @@ import {
 import { PAGES } from "@/accounts/constants/pages";
 import { appHomeRoute, stashRedirect } from "@/accounts/services/redirect";
 import { sendOTT } from "@/accounts/services/user";
-import type { PageProps } from "@/accounts/types/page";
 import { LinkButton } from "@/base/components/LinkButton";
+import { useBaseContext } from "@/base/context";
 import { sharedCryptoWorker } from "@/base/crypto";
 import log from "@/base/log";
 import SingleInputForm, {
@@ -29,8 +29,8 @@ const bip39 = require("bip39");
 // mobile client library only supports english.
 bip39.setDefaultWordlist("english");
 
-const Page: React.FC<PageProps> = ({ appContext }) => {
-    const { showMiniDialog } = appContext;
+const Page: React.FC = () => {
+    const { showMiniDialog } = useBaseContext();
 
     const [keyAttributes, setKeyAttributes] = useState<
         KeyAttributes | undefined
diff --git a/web/packages/accounts/pages/two-factor/recover.tsx b/web/packages/accounts/pages/two-factor/recover.tsx
index da73c38866..8992e7933b 100644
--- a/web/packages/accounts/pages/two-factor/recover.tsx
+++ b/web/packages/accounts/pages/two-factor/recover.tsx
@@ -43,7 +43,7 @@ export interface RecoverPageProps {
 }
 
 const Page: React.FC<RecoverPageProps> = ({ appContext, twoFactorType }) => {
-    const { showMiniDialog, logout } = appContext;
+    const { logout, showMiniDialog } = appContext;
 
     const [encryptedTwoFactorSecret, setEncryptedTwoFactorSecret] =
         useState<Omit<B64EncryptionResult, "key"> | null>(null);
diff --git a/web/packages/accounts/pages/two-factor/verify.tsx b/web/packages/accounts/pages/two-factor/verify.tsx
index 796187424a..3ea0ad6a6b 100644
--- a/web/packages/accounts/pages/two-factor/verify.tsx
+++ b/web/packages/accounts/pages/two-factor/verify.tsx
@@ -1,6 +1,7 @@
 import { PAGES } from "@/accounts/constants/pages";
 import { verifyTwoFactor } from "@/accounts/services/user";
 import { LinkButton } from "@/base/components/LinkButton";
+import { useBaseContext } from "@/base/context";
 import { ApiError } from "@ente/shared/error";
 import {
     LS_KEYS,
@@ -23,10 +24,9 @@ import {
     type VerifyTwoFactorCallback,
 } from "../../components/two-factor/VerifyTwoFactor";
 import { unstashRedirect } from "../../services/redirect";
-import type { PageProps } from "../../types/page";
 
-const Page: React.FC<PageProps> = ({ appContext }) => {
-    const { logout } = appContext;
+const Page: React.FC = () => {
+    const { logout } = useBaseContext();
 
     const [sessionID, setSessionID] = useState("");
 
diff --git a/web/packages/accounts/pages/verify.tsx b/web/packages/accounts/pages/verify.tsx
index 83a00e63bb..3c1f0047ba 100644
--- a/web/packages/accounts/pages/verify.tsx
+++ b/web/packages/accounts/pages/verify.tsx
@@ -19,9 +19,9 @@ import type {
 } from "@/accounts/services/srp-remote";
 import { getSRPAttributes } from "@/accounts/services/srp-remote";
 import { putAttributes, sendOTT, verifyEmail } from "@/accounts/services/user";
-import type { PageProps } from "@/accounts/types/page";
 import { LinkButton } from "@/base/components/LinkButton";
 import { LoadingIndicator } from "@/base/components/loaders";
+import { useBaseContext } from "@/base/context";
 import log from "@/base/log";
 import SingleInputForm, {
     type SingleInputFormProps,
@@ -47,8 +47,8 @@ import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
 import { Trans } from "react-i18next";
 
-const Page: React.FC<PageProps> = ({ appContext }) => {
-    const { logout, showMiniDialog } = appContext;
+const Page: React.FC = () => {
+    const { logout, showMiniDialog } = useBaseContext();
 
     const [email, setEmail] = useState("");
     const [resend, setResend] = useState(0);
diff --git a/web/packages/base/context.ts b/web/packages/base/context.ts
index 07eea8b982..96e1fe302b 100644
--- a/web/packages/base/context.ts
+++ b/web/packages/base/context.ts
@@ -8,6 +8,10 @@ import { createContext, useContext } from "react";
  * It is usually provided by the _app.tsx for the corresponding app.
  */
 export interface BaseContextT {
+    /**
+     * Perform the (possibly app specific) logout sequence.
+     */
+    logout: () => void;
     /**
      * Show a "mini dialog" with the given attributes.
      *
@@ -16,10 +20,6 @@ export interface BaseContextT {
      * customized by providing appropriate {@link MiniDialogAttributes}.
      */
     showMiniDialog: (attributes: MiniDialogAttributes) => void;
-    /**
-     * Perform the (possibly app specific) logout sequence.
-     */
-    logout: () => void;
 }
 
 /**

From e4427d76054840cdf1baf55c67e2c36af1dcd775 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 14:49:46 +0530
Subject: [PATCH 203/796] Direct

---
 web/apps/auth/src/pages/404.tsx                 | 4 +---
 web/apps/auth/src/pages/change-password.tsx     | 4 +---
 web/apps/auth/src/pages/credentials.tsx         | 7 +------
 web/apps/auth/src/pages/generate.tsx            | 7 +------
 web/apps/auth/src/pages/login.tsx               | 4 +---
 web/apps/auth/src/pages/passkeys/finish.tsx     | 4 +---
 web/apps/auth/src/pages/recover.tsx             | 7 +------
 web/apps/auth/src/pages/signup.tsx              | 4 +---
 web/apps/auth/src/pages/two-factor/setup.tsx    | 4 +---
 web/apps/auth/src/pages/two-factor/verify.tsx   | 7 +------
 web/apps/auth/src/pages/verify.tsx              | 7 +------
 web/apps/photos/src/pages/404.tsx               | 4 +---
 web/apps/photos/src/pages/change-email.tsx      | 4 +---
 web/apps/photos/src/pages/change-password.tsx   | 4 +---
 web/apps/photos/src/pages/credentials.tsx       | 7 +------
 web/apps/photos/src/pages/generate.tsx          | 7 +------
 web/apps/photos/src/pages/login.tsx             | 4 +---
 web/apps/photos/src/pages/passkeys/finish.tsx   | 4 +---
 web/apps/photos/src/pages/recover.tsx           | 7 +------
 web/apps/photos/src/pages/signup.tsx            | 4 +---
 web/apps/photos/src/pages/two-factor/setup.tsx  | 4 +---
 web/apps/photos/src/pages/two-factor/verify.tsx | 7 +------
 web/apps/photos/src/pages/verify.tsx            | 7 +------
 23 files changed, 23 insertions(+), 99 deletions(-)

diff --git a/web/apps/auth/src/pages/404.tsx b/web/apps/auth/src/pages/404.tsx
index 55b8b0b860..201a7b79ff 100644
--- a/web/apps/auth/src/pages/404.tsx
+++ b/web/apps/auth/src/pages/404.tsx
@@ -1,3 +1 @@
-import Page from "@/base/components/pages/404";
-
-export default Page;
+export { default } from "@/base/components/pages/404";
diff --git a/web/apps/auth/src/pages/change-password.tsx b/web/apps/auth/src/pages/change-password.tsx
index 3402664eb7..bea6b02df4 100644
--- a/web/apps/auth/src/pages/change-password.tsx
+++ b/web/apps/auth/src/pages/change-password.tsx
@@ -1,3 +1 @@
-import Page from "@/accounts/pages/change-password";
-
-export default Page;
+export { default } from "@/accounts/pages/change-password";
diff --git a/web/apps/auth/src/pages/credentials.tsx b/web/apps/auth/src/pages/credentials.tsx
index 17dd9fef70..9bb9307c79 100644
--- a/web/apps/auth/src/pages/credentials.tsx
+++ b/web/apps/auth/src/pages/credentials.tsx
@@ -1,6 +1 @@
-import Page_ from "@/accounts/pages/credentials";
-import { useAppContext } from "types/context";
-
-const Page = () => <Page_ appContext={useAppContext()} />;
-
-export default Page;
+export { default } from "@/accounts/pages/credentials";
diff --git a/web/apps/auth/src/pages/generate.tsx b/web/apps/auth/src/pages/generate.tsx
index 12723d0b0a..bf45ab3f5a 100644
--- a/web/apps/auth/src/pages/generate.tsx
+++ b/web/apps/auth/src/pages/generate.tsx
@@ -1,6 +1 @@
-import Page_ from "@/accounts/pages/generate";
-import { useAppContext } from "types/context";
-
-const Page = () => <Page_ appContext={useAppContext()} />;
-
-export default Page;
+export { default } from "@/accounts/pages/generate";
diff --git a/web/apps/auth/src/pages/login.tsx b/web/apps/auth/src/pages/login.tsx
index 46a8d69531..91d1d3fd41 100644
--- a/web/apps/auth/src/pages/login.tsx
+++ b/web/apps/auth/src/pages/login.tsx
@@ -1,3 +1 @@
-import Page from "@/accounts/pages/login";
-
-export default Page;
+export { default } from "@/accounts/pages/login";
diff --git a/web/apps/auth/src/pages/passkeys/finish.tsx b/web/apps/auth/src/pages/passkeys/finish.tsx
index cc9baa5214..0601be631e 100644
--- a/web/apps/auth/src/pages/passkeys/finish.tsx
+++ b/web/apps/auth/src/pages/passkeys/finish.tsx
@@ -1,3 +1 @@
-import Page from "@/accounts/pages/passkeys/finish";
-
-export default Page;
+export { default } from "@/accounts/pages/passkeys/finish";
diff --git a/web/apps/auth/src/pages/recover.tsx b/web/apps/auth/src/pages/recover.tsx
index 62ceb6a63a..e1398fabb4 100644
--- a/web/apps/auth/src/pages/recover.tsx
+++ b/web/apps/auth/src/pages/recover.tsx
@@ -1,6 +1 @@
-import Page_ from "@/accounts/pages/recover";
-import { useAppContext } from "types/context";
-
-const Page = () => <Page_ appContext={useAppContext()} />;
-
-export default Page;
+export { default } from "@/accounts/pages/recover";
diff --git a/web/apps/auth/src/pages/signup.tsx b/web/apps/auth/src/pages/signup.tsx
index 23ed3fa02b..7ec71524d5 100644
--- a/web/apps/auth/src/pages/signup.tsx
+++ b/web/apps/auth/src/pages/signup.tsx
@@ -1,3 +1 @@
-import Page from "@/accounts/pages/signup";
-
-export default Page;
+export { default } from "@/accounts/pages/signup";
diff --git a/web/apps/auth/src/pages/two-factor/setup.tsx b/web/apps/auth/src/pages/two-factor/setup.tsx
index bab74ddd4b..ee74c573b6 100644
--- a/web/apps/auth/src/pages/two-factor/setup.tsx
+++ b/web/apps/auth/src/pages/two-factor/setup.tsx
@@ -1,3 +1 @@
-import Page from "@/accounts/pages/two-factor/setup";
-
-export default Page;
+export { default } from "@/accounts/pages/two-factor/setup";
diff --git a/web/apps/auth/src/pages/two-factor/verify.tsx b/web/apps/auth/src/pages/two-factor/verify.tsx
index 0a449ad470..5f3fbef9ce 100644
--- a/web/apps/auth/src/pages/two-factor/verify.tsx
+++ b/web/apps/auth/src/pages/two-factor/verify.tsx
@@ -1,6 +1 @@
-import Page_ from "@/accounts/pages/two-factor/verify";
-import { useAppContext } from "types/context";
-
-const Page = () => <Page_ appContext={useAppContext()} />;
-
-export default Page;
+export { default } from "@/accounts/pages/two-factor/verify";
diff --git a/web/apps/auth/src/pages/verify.tsx b/web/apps/auth/src/pages/verify.tsx
index 572f40aa99..b5860d3a53 100644
--- a/web/apps/auth/src/pages/verify.tsx
+++ b/web/apps/auth/src/pages/verify.tsx
@@ -1,6 +1 @@
-import Page_ from "@/accounts/pages/verify";
-import { useAppContext } from "types/context";
-
-const Page = () => <Page_ appContext={useAppContext()} />;
-
-export default Page;
+export { default } from "@/accounts/pages/verify";
diff --git a/web/apps/photos/src/pages/404.tsx b/web/apps/photos/src/pages/404.tsx
index 55b8b0b860..201a7b79ff 100644
--- a/web/apps/photos/src/pages/404.tsx
+++ b/web/apps/photos/src/pages/404.tsx
@@ -1,3 +1 @@
-import Page from "@/base/components/pages/404";
-
-export default Page;
+export { default } from "@/base/components/pages/404";
diff --git a/web/apps/photos/src/pages/change-email.tsx b/web/apps/photos/src/pages/change-email.tsx
index d36a2a3555..4db0816a91 100644
--- a/web/apps/photos/src/pages/change-email.tsx
+++ b/web/apps/photos/src/pages/change-email.tsx
@@ -1,3 +1 @@
-import Page from "@/accounts/pages/change-email";
-
-export default Page;
+export { default } from "@/accounts/pages/change-email";
diff --git a/web/apps/photos/src/pages/change-password.tsx b/web/apps/photos/src/pages/change-password.tsx
index 3402664eb7..bea6b02df4 100644
--- a/web/apps/photos/src/pages/change-password.tsx
+++ b/web/apps/photos/src/pages/change-password.tsx
@@ -1,3 +1 @@
-import Page from "@/accounts/pages/change-password";
-
-export default Page;
+export { default } from "@/accounts/pages/change-password";
diff --git a/web/apps/photos/src/pages/credentials.tsx b/web/apps/photos/src/pages/credentials.tsx
index a737676b33..9bb9307c79 100644
--- a/web/apps/photos/src/pages/credentials.tsx
+++ b/web/apps/photos/src/pages/credentials.tsx
@@ -1,6 +1 @@
-import Page_ from "@/accounts/pages/credentials";
-import { useAppContext } from "@/new/photos/types/context";
-
-const Page = () => <Page_ appContext={useAppContext()} />;
-
-export default Page;
+export { default } from "@/accounts/pages/credentials";
diff --git a/web/apps/photos/src/pages/generate.tsx b/web/apps/photos/src/pages/generate.tsx
index 244da239bb..bf45ab3f5a 100644
--- a/web/apps/photos/src/pages/generate.tsx
+++ b/web/apps/photos/src/pages/generate.tsx
@@ -1,6 +1 @@
-import Page_ from "@/accounts/pages/generate";
-import { useAppContext } from "@/new/photos/types/context";
-
-const Page = () => <Page_ appContext={useAppContext()} />;
-
-export default Page;
+export { default } from "@/accounts/pages/generate";
diff --git a/web/apps/photos/src/pages/login.tsx b/web/apps/photos/src/pages/login.tsx
index 46a8d69531..91d1d3fd41 100644
--- a/web/apps/photos/src/pages/login.tsx
+++ b/web/apps/photos/src/pages/login.tsx
@@ -1,3 +1 @@
-import Page from "@/accounts/pages/login";
-
-export default Page;
+export { default } from "@/accounts/pages/login";
diff --git a/web/apps/photos/src/pages/passkeys/finish.tsx b/web/apps/photos/src/pages/passkeys/finish.tsx
index cc9baa5214..0601be631e 100644
--- a/web/apps/photos/src/pages/passkeys/finish.tsx
+++ b/web/apps/photos/src/pages/passkeys/finish.tsx
@@ -1,3 +1 @@
-import Page from "@/accounts/pages/passkeys/finish";
-
-export default Page;
+export { default } from "@/accounts/pages/passkeys/finish";
diff --git a/web/apps/photos/src/pages/recover.tsx b/web/apps/photos/src/pages/recover.tsx
index 1bb15511cb..e1398fabb4 100644
--- a/web/apps/photos/src/pages/recover.tsx
+++ b/web/apps/photos/src/pages/recover.tsx
@@ -1,6 +1 @@
-import Page_ from "@/accounts/pages/recover";
-import { useAppContext } from "@/new/photos/types/context";
-
-const Page = () => <Page_ appContext={useAppContext()} />;
-
-export default Page;
+export { default } from "@/accounts/pages/recover";
diff --git a/web/apps/photos/src/pages/signup.tsx b/web/apps/photos/src/pages/signup.tsx
index 23ed3fa02b..7ec71524d5 100644
--- a/web/apps/photos/src/pages/signup.tsx
+++ b/web/apps/photos/src/pages/signup.tsx
@@ -1,3 +1 @@
-import Page from "@/accounts/pages/signup";
-
-export default Page;
+export { default } from "@/accounts/pages/signup";
diff --git a/web/apps/photos/src/pages/two-factor/setup.tsx b/web/apps/photos/src/pages/two-factor/setup.tsx
index bab74ddd4b..ee74c573b6 100644
--- a/web/apps/photos/src/pages/two-factor/setup.tsx
+++ b/web/apps/photos/src/pages/two-factor/setup.tsx
@@ -1,3 +1 @@
-import Page from "@/accounts/pages/two-factor/setup";
-
-export default Page;
+export { default } from "@/accounts/pages/two-factor/setup";
diff --git a/web/apps/photos/src/pages/two-factor/verify.tsx b/web/apps/photos/src/pages/two-factor/verify.tsx
index f6c9b6a494..5f3fbef9ce 100644
--- a/web/apps/photos/src/pages/two-factor/verify.tsx
+++ b/web/apps/photos/src/pages/two-factor/verify.tsx
@@ -1,6 +1 @@
-import Page_ from "@/accounts/pages/two-factor/verify";
-import { useAppContext } from "@/new/photos/types/context";
-
-const Page = () => <Page_ appContext={useAppContext()} />;
-
-export default Page;
+export { default } from "@/accounts/pages/two-factor/verify";
diff --git a/web/apps/photos/src/pages/verify.tsx b/web/apps/photos/src/pages/verify.tsx
index c778bab6e8..b5860d3a53 100644
--- a/web/apps/photos/src/pages/verify.tsx
+++ b/web/apps/photos/src/pages/verify.tsx
@@ -1,6 +1 @@
-import Page_ from "@/accounts/pages/verify";
-import { useAppContext } from "@/new/photos/types/context";
-
-const Page = () => <Page_ appContext={useAppContext()} />;
-
-export default Page;
+export { default } from "@/accounts/pages/verify";

From 342ac3258a70ff4894d751a3406cd695f1ebe94b Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 14:55:26 +0530
Subject: [PATCH 204/796] Direct

---
 web/apps/auth/src/pages/passkeys/recover.tsx       | 5 +----
 web/apps/auth/src/pages/two-factor/recover.tsx     | 3 +--
 web/apps/photos/src/pages/passkeys/recover.tsx     | 5 +----
 web/apps/photos/src/pages/two-factor/recover.tsx   | 3 +--
 web/packages/accounts/pages/passkeys/recover.tsx   | 8 ++------
 web/packages/accounts/pages/two-factor/recover.tsx | 7 +++----
 6 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/web/apps/auth/src/pages/passkeys/recover.tsx b/web/apps/auth/src/pages/passkeys/recover.tsx
index a156314ed5..647a9d4aa2 100644
--- a/web/apps/auth/src/pages/passkeys/recover.tsx
+++ b/web/apps/auth/src/pages/passkeys/recover.tsx
@@ -1,8 +1,5 @@
 import Page_ from "@/accounts/pages/two-factor/recover";
-import { useAppContext } from "types/context";
 
-const Page = () => (
-    <Page_ appContext={useAppContext()} twoFactorType="passkey" />
-);
+const Page = () => <Page_ twoFactorType="passkey" />;
 
 export default Page;
diff --git a/web/apps/auth/src/pages/two-factor/recover.tsx b/web/apps/auth/src/pages/two-factor/recover.tsx
index dbf10270fb..fdda173088 100644
--- a/web/apps/auth/src/pages/two-factor/recover.tsx
+++ b/web/apps/auth/src/pages/two-factor/recover.tsx
@@ -1,6 +1,5 @@
 import Page_ from "@/accounts/pages/two-factor/recover";
-import { useAppContext } from "types/context";
 
-const Page = () => <Page_ appContext={useAppContext()} twoFactorType="totp" />;
+const Page = () => <Page_ twoFactorType="totp" />;
 
 export default Page;
diff --git a/web/apps/photos/src/pages/passkeys/recover.tsx b/web/apps/photos/src/pages/passkeys/recover.tsx
index 6584f5bacc..647a9d4aa2 100644
--- a/web/apps/photos/src/pages/passkeys/recover.tsx
+++ b/web/apps/photos/src/pages/passkeys/recover.tsx
@@ -1,8 +1,5 @@
 import Page_ from "@/accounts/pages/two-factor/recover";
-import { useAppContext } from "@/new/photos/types/context";
 
-const Page = () => (
-    <Page_ appContext={useAppContext()} twoFactorType="passkey" />
-);
+const Page = () => <Page_ twoFactorType="passkey" />;
 
 export default Page;
diff --git a/web/apps/photos/src/pages/two-factor/recover.tsx b/web/apps/photos/src/pages/two-factor/recover.tsx
index effd30bb5b..fdda173088 100644
--- a/web/apps/photos/src/pages/two-factor/recover.tsx
+++ b/web/apps/photos/src/pages/two-factor/recover.tsx
@@ -1,6 +1,5 @@
 import Page_ from "@/accounts/pages/two-factor/recover";
-import { useAppContext } from "@/new/photos/types/context";
 
-const Page = () => <Page_ appContext={useAppContext()} twoFactorType="totp" />;
+const Page = () => <Page_ twoFactorType="totp" />;
 
 export default Page;
diff --git a/web/packages/accounts/pages/passkeys/recover.tsx b/web/packages/accounts/pages/passkeys/recover.tsx
index d36df9c557..6d29d53c6a 100644
--- a/web/packages/accounts/pages/passkeys/recover.tsx
+++ b/web/packages/accounts/pages/passkeys/recover.tsx
@@ -1,9 +1,5 @@
-import React from "react";
-import type { PageProps } from "../../types/page";
-import TwoFactorRecoverPage from "../two-factor/recover";
+import Page_ from "../two-factor/recover";
 
-const Page: React.FC<PageProps> = ({ appContext }) => (
-    <TwoFactorRecoverPage appContext={appContext} twoFactorType="passkey" />
-);
+const Page = () => <Page_ twoFactorType="passkey" />;
 
 export default Page;
diff --git a/web/packages/accounts/pages/two-factor/recover.tsx b/web/packages/accounts/pages/two-factor/recover.tsx
index 8992e7933b..6c6925a84d 100644
--- a/web/packages/accounts/pages/two-factor/recover.tsx
+++ b/web/packages/accounts/pages/two-factor/recover.tsx
@@ -11,7 +11,7 @@ import {
 } from "@/accounts/services/user";
 import { LinkButton } from "@/base/components/LinkButton";
 import type { MiniDialogAttributes } from "@/base/components/MiniDialog";
-import type { BaseContextT } from "@/base/context";
+import { useBaseContext } from "@/base/context";
 import { sharedCryptoWorker } from "@/base/crypto";
 import type { B64EncryptionResult } from "@/base/crypto/libsodium";
 import log from "@/base/log";
@@ -38,12 +38,11 @@ const bip39 = require("bip39");
 bip39.setDefaultWordlist("english");
 
 export interface RecoverPageProps {
-    appContext: BaseContextT;
     twoFactorType: TwoFactorType;
 }
 
-const Page: React.FC<RecoverPageProps> = ({ appContext, twoFactorType }) => {
-    const { logout, showMiniDialog } = appContext;
+const Page: React.FC<RecoverPageProps> = ({ twoFactorType }) => {
+    const { logout, showMiniDialog } = useBaseContext();
 
     const [encryptedTwoFactorSecret, setEncryptedTwoFactorSecret] =
         useState<Omit<B64EncryptionResult, "key"> | null>(null);

From 92a9698df515a694f9a93f52b5eede3290917647 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 14:58:22 +0530
Subject: [PATCH 205/796] Prune

---
 web/apps/accounts/src/pages/_app.tsx   |  8 ++------
 web/apps/accounts/src/types/context.ts | 18 -----------------
 web/apps/auth/src/pages/_app.tsx       | 27 ++++++++------------------
 web/apps/auth/src/types/context.ts     | 13 -------------
 4 files changed, 10 insertions(+), 56 deletions(-)
 delete mode 100644 web/apps/accounts/src/types/context.ts
 delete mode 100644 web/apps/auth/src/types/context.ts

diff --git a/web/apps/accounts/src/pages/_app.tsx b/web/apps/accounts/src/pages/_app.tsx
index 103a92c2f1..d7203ba239 100644
--- a/web/apps/accounts/src/pages/_app.tsx
+++ b/web/apps/accounts/src/pages/_app.tsx
@@ -13,7 +13,6 @@ import { ThemeProvider } from "@mui/material/styles";
 import { t } from "i18next";
 import type { AppProps } from "next/app";
 import React, { useCallback, useMemo } from "react";
-import { AppContext } from "../types/context";
 
 const App: React.FC<AppProps> = ({ Component, pageProps }) => {
     useSetupLogs({ disableDiskLogs: true });
@@ -33,7 +32,6 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
         () => ({ logout, showMiniDialog }),
         [logout, showMiniDialog],
     );
-    const appContext = useMemo(() => ({ showMiniDialog }), [showMiniDialog]);
 
     const title = isI18nReady ? t("title_accounts") : staticAppTitle;
 
@@ -44,10 +42,8 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
             <AttributedMiniDialog {...miniDialogProps} />
 
             <BaseContext value={baseContext}>
-                <AppContext.Provider value={appContext}>
-                    {!isI18nReady && <LoadingIndicator />}
-                    {isI18nReady && <Component {...pageProps} />}
-                </AppContext.Provider>
+                {!isI18nReady && <LoadingIndicator />}
+                {isI18nReady && <Component {...pageProps} />}
             </BaseContext>
         </ThemeProvider>
     );
diff --git a/web/apps/accounts/src/types/context.ts b/web/apps/accounts/src/types/context.ts
deleted file mode 100644
index d18bda6e9f..0000000000
--- a/web/apps/accounts/src/types/context.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type { BaseContextT } from "@/base/context";
-import { createContext, useContext } from "react";
-
-/**
- * The type of the context for pages in the accounts app.
- */
-type AppContextT = Omit<BaseContextT, "logout">;
-
-/**
- * The React {@link Context} available to all nodes in the React tree.
- */
-export const AppContext = createContext<AppContextT | undefined>(undefined);
-
-/**
- * Utility hook to get the {@link AppContextT} expected to be available to all
- * React components in the Accounts app's React tree.
- */
-export const useAppContext = (): AppContextT => useContext(AppContext)!;
diff --git a/web/apps/auth/src/pages/_app.tsx b/web/apps/auth/src/pages/_app.tsx
index 55af8d5d7c..fb135bde64 100644
--- a/web/apps/auth/src/pages/_app.tsx
+++ b/web/apps/auth/src/pages/_app.tsx
@@ -24,7 +24,6 @@ import { ThemeProvider } from "@mui/material/styles";
 import { t } from "i18next";
 import type { AppProps } from "next/app";
 import React, { useCallback, useEffect, useMemo } from "react";
-import { AppContext } from "types/context";
 
 const App: React.FC<AppProps> = ({ Component, pageProps }) => {
     useSetupLogs();
@@ -48,14 +47,6 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
         [logout, showMiniDialog],
     );
 
-    const appContext = useMemo(
-        () => ({
-            logout,
-            showMiniDialog,
-        }),
-        [logout, showMiniDialog],
-    );
-
     const title = isI18nReady ? t("title_auth") : staticAppTitle;
 
     return (
@@ -65,16 +56,14 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
             <AttributedMiniDialog {...miniDialogProps} />
 
             <BaseContext value={baseContext}>
-                <AppContext.Provider value={appContext}>
-                    {!isI18nReady ? (
-                        <LoadingIndicator />
-                    ) : (
-                        <>
-                            {isChangingRoute && <TranslucentLoadingOverlay />}
-                            <Component {...pageProps} />
-                        </>
-                    )}
-                </AppContext.Provider>
+                {!isI18nReady ? (
+                    <LoadingIndicator />
+                ) : (
+                    <>
+                        {isChangingRoute && <TranslucentLoadingOverlay />}
+                        <Component {...pageProps} />
+                    </>
+                )}
             </BaseContext>
         </ThemeProvider>
     );
diff --git a/web/apps/auth/src/types/context.ts b/web/apps/auth/src/types/context.ts
deleted file mode 100644
index d1a6eedfc2..0000000000
--- a/web/apps/auth/src/types/context.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { BaseContextT } from "@/base/context";
-import { createContext, useContext } from "react";
-
-/**
- * Properties available via {@link AppContext} to the Auth app's React tree.
- */
-type AppContextT = BaseContextT;
-
-/** The React {@link Context} available to all pages. */
-export const AppContext = createContext<AppContextT | undefined>(undefined);
-
-/** Utility hook to reduce amount of boilerplate in account related pages. */
-export const useAppContext = () => useContext(AppContext)!;

From bf3ed6f478746c75e20c6b2f3f9bd5801c4bc006 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 15:02:20 +0530
Subject: [PATCH 206/796] Namespace

---
 .../components/Collections/CollectionHeader.tsx |  5 +++--
 web/apps/photos/src/components/Sidebar.tsx      |  8 ++++----
 .../photos/src/components/Upload/Uploader.tsx   |  4 ++--
 web/apps/photos/src/pages/gallery.tsx           |  4 ++--
 web/apps/photos/src/pages/shared-albums.tsx     |  4 ++--
 .../new/photos/components/PlanSelector.tsx      |  4 ++--
 .../photos/components/gallery/PeopleHeader.tsx  |  4 ++--
 .../photos/components/utils/use-wrap-async.ts   |  5 +++--
 web/packages/new/photos/pages/duplicates.tsx    |  4 ++--
 web/packages/new/photos/types/context.ts        | 17 ++++++++++-------
 10 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/web/apps/photos/src/components/Collections/CollectionHeader.tsx b/web/apps/photos/src/components/Collections/CollectionHeader.tsx
index 9b136ed181..1860becba0 100644
--- a/web/apps/photos/src/components/Collections/CollectionHeader.tsx
+++ b/web/apps/photos/src/components/Collections/CollectionHeader.tsx
@@ -27,7 +27,7 @@ import {
     isArchivedCollection,
     isPinnedCollection,
 } from "@/new/photos/services/magic-metadata";
-import { useAppContext } from "@/new/photos/types/context";
+import { usePhotosAppContext } from "@/new/photos/types/context";
 import ArchiveOutlinedIcon from "@mui/icons-material/ArchiveOutlined";
 import DeleteOutlinedIcon from "@mui/icons-material/DeleteOutlined";
 import EditIcon from "@mui/icons-material/Edit";
@@ -130,7 +130,8 @@ const CollectionOptions: React.FC<CollectionHeaderProps> = ({
     isActiveCollectionDownloadInProgress,
 }) => {
     const { showMiniDialog } = useBaseContext();
-    const { showLoadingBar, hideLoadingBar, onGenericError } = useAppContext();
+    const { showLoadingBar, hideLoadingBar, onGenericError } =
+        usePhotosAppContext();
     const { syncWithRemote } = useContext(GalleryContext);
     const overFlowMenuIconRef = useRef<SVGSVGElement>(null);
 
diff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsx
index 5815a887c1..b65af1a5bb 100644
--- a/web/apps/photos/src/components/Sidebar.tsx
+++ b/web/apps/photos/src/components/Sidebar.tsx
@@ -76,7 +76,7 @@ import {
     userDetailsAddOnBonuses,
     type UserDetails,
 } from "@/new/photos/services/user-details";
-import { AppContext, useAppContext } from "@/new/photos/types/context";
+import { usePhotosAppContext } from "@/new/photos/types/context";
 import { initiateEmail, openURL } from "@/new/photos/utils/web";
 import {
     FlexWrapper,
@@ -509,7 +509,7 @@ const UtilitySection: React.FC<Pick<SidebarProps, "closeSidebar">> = ({
     closeSidebar,
 }) => {
     const router = useRouter();
-    const { watchFolderView, setWatchFolderView } = useAppContext();
+    const { watchFolderView, setWatchFolderView } = usePhotosAppContext();
 
     const { show: showAccount, props: accountVisibilityProps } =
         useModalVisibility();
@@ -563,7 +563,7 @@ const UtilitySection: React.FC<Pick<SidebarProps, "closeSidebar">> = ({
 const HelpSection: React.FC<Pick<SidebarProps, "closeSidebar">> = ({
     closeSidebar,
 }) => {
-    const { showMiniDialog } = useContext(AppContext);
+    const { showMiniDialog } = useBaseContext();
     const { openExportModal } = useContext(GalleryContext);
 
     const { show: showHelp, props: helpVisibilityProps } = useModalVisibility();
@@ -596,7 +596,7 @@ const HelpSection: React.FC<Pick<SidebarProps, "closeSidebar">> = ({
 };
 
 const ExitSection: React.FC = () => {
-    const { logout, showMiniDialog } = useContext(AppContext);
+    const { logout, showMiniDialog } = useBaseContext();
 
     const handleLogout = () =>
         showMiniDialog({
diff --git a/web/apps/photos/src/components/Upload/Uploader.tsx b/web/apps/photos/src/components/Upload/Uploader.tsx
index ef65ef2717..fc967da7a3 100644
--- a/web/apps/photos/src/components/Upload/Uploader.tsx
+++ b/web/apps/photos/src/components/Upload/Uploader.tsx
@@ -18,7 +18,7 @@ import type {
     UploadPhase,
 } from "@/new/photos/services/upload/types";
 import { redirectToCustomerPortal } from "@/new/photos/services/user-details";
-import { useAppContext } from "@/new/photos/types/context";
+import { usePhotosAppContext } from "@/new/photos/types/context";
 import { firstNonEmpty } from "@/utils/array";
 import { CustomError } from "@ente/shared/error";
 import DiscFullIcon from "@mui/icons-material/DiscFull";
@@ -111,7 +111,7 @@ export default function Uploader({
 }: Props) {
     const { showMiniDialog } = useBaseContext();
     const { showNotification, onGenericError, watchFolderView } =
-        useAppContext();
+        usePhotosAppContext();
     const galleryContext = useContext(GalleryContext);
     const publicCollectionGalleryContext = useContext(
         PublicCollectionGalleryContext,
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 4111a47c95..0956a25690 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -66,7 +66,7 @@ import {
     userDetailsSnapshot,
     verifyStripeSubscription,
 } from "@/new/photos/services/user-details";
-import { useAppContext } from "@/new/photos/types/context";
+import { usePhotosAppContext } from "@/new/photos/types/context";
 import { splitByPredicate } from "@/utils/array";
 import { FlexWrapper } from "@ente/shared/components/Container";
 import { PHOTOS_PAGES as PAGES } from "@ente/shared/constants/pages";
@@ -180,7 +180,7 @@ export const GalleryContext = createContext<GalleryContextType>(
 const Page: React.FC = () => {
     const { logout, showMiniDialog } = useBaseContext();
     const { showLoadingBar, hideLoadingBar, onGenericError, watchFolderView } =
-        useAppContext();
+        usePhotosAppContext();
 
     const isOffline = useIsOffline();
     const [state, dispatch] = useGalleryReducer();
diff --git a/web/apps/photos/src/pages/shared-albums.tsx b/web/apps/photos/src/pages/shared-albums.tsx
index c843a1af82..856c230a59 100644
--- a/web/apps/photos/src/pages/shared-albums.tsx
+++ b/web/apps/photos/src/pages/shared-albums.tsx
@@ -39,7 +39,7 @@ import {
     isHiddenCollection,
 } from "@/new/photos/services/collection";
 import { sortFiles } from "@/new/photos/services/files";
-import { useAppContext } from "@/new/photos/types/context";
+import { usePhotosAppContext } from "@/new/photos/types/context";
 import { CenteredFlex } from "@ente/shared/components/Container";
 import SingleInputForm, {
     type SingleInputFormProps,
@@ -95,7 +95,7 @@ export default function PublicCollectionGallery() {
     const [publicCollection, setPublicCollection] = useState<Collection>(null);
     const [errorMessage, setErrorMessage] = useState<string>(null);
     const { showMiniDialog } = useBaseContext();
-    const { showLoadingBar, hideLoadingBar } = useAppContext();
+    const { showLoadingBar, hideLoadingBar } = usePhotosAppContext();
     const [loading, setLoading] = useState(true);
     const router = useRouter();
     const [isPasswordProtected, setIsPasswordProtected] =
diff --git a/web/packages/new/photos/components/PlanSelector.tsx b/web/packages/new/photos/components/PlanSelector.tsx
index acd1d548a9..e9194cdfb7 100644
--- a/web/packages/new/photos/components/PlanSelector.tsx
+++ b/web/packages/new/photos/components/PlanSelector.tsx
@@ -33,7 +33,6 @@ import {
     redirectToPaymentsApp,
     userDetailsAddOnBonuses,
 } from "@/new/photos/services/user-details";
-import { useAppContext } from "@/new/photos/types/context";
 import { bytesInGB, formattedStorageByteSize } from "@/new/photos/utils/units";
 import { openURL } from "@/new/photos/utils/web";
 import ArrowForwardIcon from "@mui/icons-material/ArrowForward";
@@ -58,6 +57,7 @@ import Typography from "@mui/material/Typography";
 import { t } from "i18next";
 import React, { useCallback, useEffect, useState } from "react";
 import { Trans } from "react-i18next";
+import { usePhotosAppContext } from "../types/context";
 
 type PlanSelectorProps = ModalVisibilityProps & {
     setLoading: (loading: boolean) => void;
@@ -682,7 +682,7 @@ function ManageSubscription({
     subscription,
     hasAddOnBonus,
 }: ManageSubscriptionProps) {
-    const { onGenericError } = useAppContext();
+    const { onGenericError } = usePhotosAppContext();
 
     const openFamilyPortal = async () => {
         setLoading(true);
diff --git a/web/packages/new/photos/components/gallery/PeopleHeader.tsx b/web/packages/new/photos/components/gallery/PeopleHeader.tsx
index 7ffae9517e..464aa44919 100644
--- a/web/packages/new/photos/components/gallery/PeopleHeader.tsx
+++ b/web/packages/new/photos/components/gallery/PeopleHeader.tsx
@@ -59,7 +59,7 @@ import {
 import { t } from "i18next";
 import React, { useEffect, useReducer, useState } from "react";
 import type { FaceCluster } from "../../services/ml/cluster";
-import { useAppContext } from "../../types/context";
+import { usePhotosAppContext } from "../../types/context";
 import { DialogCloseIconButton } from "../mui/Dialog";
 import { SuggestionFaceList } from "../PeopleList";
 import {
@@ -547,7 +547,7 @@ const SuggestionsDialog: React.FC<SuggestionsDialogProps> = ({
     person,
 }) => {
     const { showMiniDialog } = useBaseContext();
-    const { onGenericError } = useAppContext();
+    const { onGenericError } = usePhotosAppContext();
 
     const [state, dispatch] = useReducer(
         suggestionsDialogReducer,
diff --git a/web/packages/new/photos/components/utils/use-wrap-async.ts b/web/packages/new/photos/components/utils/use-wrap-async.ts
index a55c38280c..05852ec084 100644
--- a/web/packages/new/photos/components/utils/use-wrap-async.ts
+++ b/web/packages/new/photos/components/utils/use-wrap-async.ts
@@ -1,5 +1,5 @@
 import { useCallback } from "react";
-import { useAppContext } from "../../types/context";
+import { usePhotosAppContext } from "../../types/context";
 
 /**
  * Wrap a function returning a promise in a loading bar and error handler.
@@ -19,7 +19,8 @@ import { useAppContext } from "../../types/context";
 export const useWrapAsyncOperation = <T extends unknown[]>(
     f: (...args: T) => Promise<void>,
 ) => {
-    const { showLoadingBar, hideLoadingBar, onGenericError } = useAppContext();
+    const { showLoadingBar, hideLoadingBar, onGenericError } =
+        usePhotosAppContext();
     return useCallback(
         async (...args: T) => {
             showLoadingBar();
diff --git a/web/packages/new/photos/pages/duplicates.tsx b/web/packages/new/photos/pages/duplicates.tsx
index 29c2067367..491281e01f 100644
--- a/web/packages/new/photos/pages/duplicates.tsx
+++ b/web/packages/new/photos/pages/duplicates.tsx
@@ -54,10 +54,10 @@ import {
     removeSelectedDuplicateGroups,
     type DuplicateGroup,
 } from "../services/dedup";
-import { useAppContext } from "../types/context";
+import { usePhotosAppContext } from "../types/context";
 
 const Page: React.FC = () => {
-    const { onGenericError } = useAppContext();
+    const { onGenericError } = usePhotosAppContext();
 
     const [state, dispatch] = useReducer(dedupReducer, initialDedupState);
 
diff --git a/web/packages/new/photos/types/context.ts b/web/packages/new/photos/types/context.ts
index fc3d285956..85d78cbadc 100644
--- a/web/packages/new/photos/types/context.ts
+++ b/web/packages/new/photos/types/context.ts
@@ -1,11 +1,10 @@
-import type { BaseContextT } from "@/base/context";
 import { type NotificationAttributes } from "@/new/photos/components/Notification";
 import { createContext, useContext } from "react";
 
 /**
  * The type of the React context available to all pages in the photos app.
  */
-export type AppContextT = BaseContextT & {
+export interface PhotosAppContextT {
     /**
      * Show the global activity indicator (a loading bar at the top of the
      * page).
@@ -26,17 +25,21 @@ export type AppContextT = BaseContextT & {
     onGenericError: (error: unknown) => void;
     watchFolderView: boolean;
     setWatchFolderView: (isOpen: boolean) => void;
-};
+}
 
 /**
- * The React {@link Context} available to all nodes in the React tree.
+ * The React {@link Context} available to all nodes in the React tree of photos
+ * app pages.
  */
-export const AppContext = createContext<AppContextT | undefined>(undefined);
+export const PhotosAppContext = createContext<PhotosAppContextT | undefined>(
+    undefined,
+);
 
 /**
- * Utility hook to get the photos {@link AppContextT}.
+ * Utility hook to get the photos {@link PhotosAppContextT}.
  *
  * This context is provided at the top level _app component for the photos app,
  * and thus is available to all React components in the Photos app's React tree.
  */
-export const useAppContext = (): AppContextT => useContext(AppContext)!;
+export const usePhotosAppContext = (): PhotosAppContextT =>
+    useContext(PhotosAppContext)!;

From 578a92d4bc4a22d843e3e804da91d4606653b6d0 Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Fri, 14 Feb 2025 15:18:26 +0530
Subject: [PATCH 207/796] [docs] Upgrade background sync doc: Mention how
 background sync won't work if app is in private space on android 15 and later

---
 docs/docs/photos/features/background.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/docs/photos/features/background.md b/docs/docs/photos/features/background.md
index e64939fd6a..ffed413f74 100644
--- a/docs/docs/photos/features/background.md
+++ b/docs/docs/photos/features/background.md
@@ -43,6 +43,10 @@ need to disable this "Optimize battery usage" mode in the system settings for
 Ente if you wish for Ente to automatically back up your photos in the
 background.
 
+On Android versions 15 and later, if an app is in private space and the private 
+space is locked, Android doesn’t allow the app to run any background processes. 
+As a result, background sync will not work.
+
 ### Desktop
 
 In addition to our mobile apps, the background sync also works on our desktop

From 1605b44c6e9249a957cbc5de27671db230f81323 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 15:28:06 +0530
Subject: [PATCH 208/796] Fin

---
 .../src/components/AuthenticateUserModal.tsx    |  8 +++++---
 .../components/Collections/CollectionShare.tsx  |  4 ++--
 .../src/components/DeleteAccountModal.tsx       | 17 +++++++++--------
 .../PhotoViewer/ImageEditorOverlay.tsx          |  5 ++---
 .../photos/src/components/PhotoViewer/index.tsx |  6 ++----
 web/apps/photos/src/pages/_app.tsx              |  6 +++---
 web/packages/accounts/types/page.ts             | 16 ----------------
 web/packages/base/components/OverflowMenu.tsx   |  4 ++--
 web/packages/gallery/components/FileInfo.tsx    | 11 ++++-------
 9 files changed, 29 insertions(+), 48 deletions(-)
 delete mode 100644 web/packages/accounts/types/page.ts

diff --git a/web/apps/photos/src/components/AuthenticateUserModal.tsx b/web/apps/photos/src/components/AuthenticateUserModal.tsx
index e81bed170c..972dd33d68 100644
--- a/web/apps/photos/src/components/AuthenticateUserModal.tsx
+++ b/web/apps/photos/src/components/AuthenticateUserModal.tsx
@@ -3,15 +3,16 @@ import {
     TitledMiniDialog,
     type MiniDialogAttributes,
 } from "@/base/components/MiniDialog";
+import { useBaseContext } from "@/base/context";
 import log from "@/base/log";
-import { AppContext } from "@/new/photos/types/context";
+import { usePhotosAppContext } from "@/new/photos/types/context";
 import VerifyMasterPasswordForm, {
     type VerifyMasterPasswordFormProps,
 } from "@ente/shared/components/VerifyMasterPasswordForm";
 import { LS_KEYS, getData } from "@ente/shared/storage/localStorage";
 import type { KeyAttributes, User } from "@ente/shared/user/types";
 import { t } from "i18next";
-import { useCallback, useContext, useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 
 interface Iprops {
     open: boolean;
@@ -24,7 +25,8 @@ export default function AuthenticateUserModal({
     onClose,
     onAuthenticate,
 }: Iprops) {
-    const { showMiniDialog, onGenericError, logout } = useContext(AppContext);
+    const { logout, showMiniDialog } = useBaseContext();
+    const { onGenericError } = usePhotosAppContext();
     const [user, setUser] = useState<User>();
     const [keyAttributes, setKeyAttributes] = useState<KeyAttributes>();
 
diff --git a/web/apps/photos/src/components/Collections/CollectionShare.tsx b/web/apps/photos/src/components/Collections/CollectionShare.tsx
index 444bebb3d1..583dd8b6da 100644
--- a/web/apps/photos/src/components/Collections/CollectionShare.tsx
+++ b/web/apps/photos/src/components/Collections/CollectionShare.tsx
@@ -28,7 +28,7 @@ import { COLLECTION_ROLE, type CollectionUser } from "@/media/collection";
 import { PublicLinkCreated } from "@/new/photos/components/share/PublicLinkCreated";
 import { avatarTextColor } from "@/new/photos/services/avatar";
 import type { CollectionSummary } from "@/new/photos/services/collection/ui";
-import { AppContext } from "@/new/photos/types/context";
+import { usePhotosAppContext } from "@/new/photos/types/context";
 import { FlexWrapper } from "@ente/shared/components/Container";
 import SingleInputForm, {
     type SingleInputFormProps,
@@ -812,7 +812,7 @@ const ManageEmailShare: React.FC<ManageEmailShareProps> = ({
     onRootClose,
     peopleCount,
 }) => {
-    const { showLoadingBar, hideLoadingBar } = useContext(AppContext);
+    const { showLoadingBar, hideLoadingBar } = usePhotosAppContext();
     const galleryContext = useContext(GalleryContext);
 
     const [addParticipantView, setAddParticipantView] = useState(false);
diff --git a/web/apps/photos/src/components/DeleteAccountModal.tsx b/web/apps/photos/src/components/DeleteAccountModal.tsx
index 896acee7c8..8e195fe649 100644
--- a/web/apps/photos/src/components/DeleteAccountModal.tsx
+++ b/web/apps/photos/src/components/DeleteAccountModal.tsx
@@ -2,12 +2,14 @@ import { assertionFailed } from "@/base/assert";
 import { TitledMiniDialog } from "@/base/components/MiniDialog";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import { LoadingButton } from "@/base/components/mui/LoadingButton";
+import type { ModalVisibilityProps } from "@/base/components/utils/modal";
+import { useBaseContext } from "@/base/context";
 import { sharedCryptoWorker } from "@/base/crypto";
 import {
     DropdownInput,
     type DropdownOption,
 } from "@/new/photos/components/DropdownInput";
-import { AppContext } from "@/new/photos/types/context";
+import { usePhotosAppContext } from "@/new/photos/types/context";
 import { initiateEmail } from "@/new/photos/utils/web";
 import { getData, LS_KEYS } from "@ente/shared/storage/localStorage";
 import { getActualKey } from "@ente/shared/user";
@@ -28,18 +30,17 @@ import { Trans } from "react-i18next";
 import { deleteAccount, getAccountDeleteChallenge } from "services/userService";
 import * as Yup from "yup";
 
-interface Iprops {
-    onClose: () => void;
-    open: boolean;
-}
-
 interface FormValues {
     reason: string;
     feedback: string;
 }
 
-const DeleteAccountModal = ({ open, onClose }: Iprops) => {
-    const { showMiniDialog, onGenericError, logout } = useContext(AppContext);
+const DeleteAccountModal: React.FC<ModalVisibilityProps> = ({
+    open,
+    onClose,
+}) => {
+    const { logout, showMiniDialog } = useBaseContext();
+    const { onGenericError } = usePhotosAppContext();
     const { authenticateUser } = useContext(GalleryContext);
 
     const [loading, setLoading] = useState(false);
diff --git a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
index e2805f6594..dc9fd24e3d 100644
--- a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
@@ -8,6 +8,7 @@ import {
     RowSwitch,
 } from "@/base/components/RowButton";
 import type { ModalVisibilityProps } from "@/base/components/utils/modal";
+import { useBaseContext } from "@/base/context";
 import { nameAndExtension } from "@/base/file-name";
 import log from "@/base/log";
 import { downloadAndRevokeObjectURL } from "@/base/utils/web";
@@ -16,7 +17,6 @@ import type { Collection } from "@/media/collection";
 import { EnteFile } from "@/media/file";
 import { aboveFileViewerContentZ } from "@/new/photos/components/utils/z-index";
 import { getLocalCollections } from "@/new/photos/services/collections";
-import { AppContext } from "@/new/photos/types/context";
 import { CenteredFlex } from "@ente/shared/components/Container";
 import ChevronRightIcon from "@mui/icons-material/ChevronRight";
 import CloseIcon from "@mui/icons-material/Close";
@@ -48,7 +48,6 @@ import { t } from "i18next";
 import React, {
     forwardRef,
     Fragment,
-    useContext,
     useEffect,
     useRef,
     useState,
@@ -97,7 +96,7 @@ interface CropBoxProps {
 export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = (
     props,
 ) => {
-    const { showMiniDialog } = useContext(AppContext);
+    const { showMiniDialog } = useBaseContext();
 
     const canvasRef = useRef<HTMLCanvasElement | null>(null);
     const originalSizeCanvasRef = useRef<HTMLCanvasElement | null>(null);
diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index a875819696..73aff4a6ad 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -22,7 +22,7 @@ import { isHEICExtension, needsJPEGConversion } from "@/media/formats";
 import { ConfirmDeleteFileDialog } from "@/new/photos/components/FileViewer";
 import { moveToTrash } from "@/new/photos/services/collection";
 import { extractRawExif, parseExif } from "@/new/photos/services/exif";
-import { AppContext } from "@/new/photos/types/context";
+import { usePhotosAppContext } from "@/new/photos/types/context";
 import AlbumOutlinedIcon from "@mui/icons-material/AlbumOutlined";
 import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
 import ChevronRightIcon from "@mui/icons-material/ChevronRight";
@@ -143,8 +143,7 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
     collectionNameMap,
     onSelectPerson,
 }) => {
-    const { showLoadingBar, hideLoadingBar, showMiniDialog } =
-        useContext(AppContext);
+    const { showLoadingBar, hideLoadingBar } = usePhotosAppContext();
     const galleryContext = useContext(GalleryContext);
     const publicCollectionGalleryContext = useContext(
         PublicCollectionGalleryContext,
@@ -997,7 +996,6 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
                 handleCloseInfo={handleCloseInfo}
                 file={photoSwipe?.currItem as EnteFile}
                 exif={exif?.value}
-                showMiniDialog={showMiniDialog}
                 shouldDisableEdits={!isOwnFile}
                 allowMap={!publicCollectionGalleryContext.credentials}
                 showCollectionChips={
diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index 70e6e9e51b..e5b919e622 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -31,7 +31,7 @@ import { aboveFileViewerContentZ } from "@/new/photos/components/utils/z-index";
 import { runMigrations } from "@/new/photos/services/migration";
 import { initML, isMLSupported } from "@/new/photos/services/ml";
 import { getFamilyPortalRedirectURL } from "@/new/photos/services/user-details";
-import { AppContext } from "@/new/photos/types/context";
+import { PhotosAppContext } from "@/new/photos/types/context";
 import HTTPService from "@ente/shared/network/HTTPService";
 import {
     getData,
@@ -201,7 +201,7 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
 
             {isDesktop && <WindowTitlebar>{title}</WindowTitlebar>}
             <BaseContext value={baseContext}>
-                <AppContext.Provider value={appContext}>
+                <PhotosAppContext value={appContext}>
                     {!isI18nReady ? (
                         <LoadingIndicator />
                     ) : (
@@ -210,7 +210,7 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
                             <Component {...pageProps} />
                         </>
                     )}
-                </AppContext.Provider>
+                </PhotosAppContext>
             </BaseContext>
         </ThemeProvider>
     );
diff --git a/web/packages/accounts/types/page.ts b/web/packages/accounts/types/page.ts
deleted file mode 100644
index ffb7a27126..0000000000
--- a/web/packages/accounts/types/page.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import type { BaseContextT } from "@/base/context";
-
-/**
- * The default type for pages exposed by this package.
- *
- * Some specific pages might extend this further (e.g. the two-factor/recover).
- */
-export interface PageProps {
-    /**
-     * The common denominator AppContext.
-     *
-     * Within this package we do not have access to the context object declared
-     * with the app's code, so we need to take the context as a parameter.
-     */
-    appContext: BaseContextT;
-}
diff --git a/web/packages/base/components/OverflowMenu.tsx b/web/packages/base/components/OverflowMenu.tsx
index 99b7692b1f..b3a474c92b 100644
--- a/web/packages/base/components/OverflowMenu.tsx
+++ b/web/packages/base/components/OverflowMenu.tsx
@@ -59,7 +59,7 @@ export const OverflowMenu: React.FC<
         [],
     );
     return (
-        <OverflowMenuContext.Provider value={context}>
+        <OverflowMenuContext value={context}>
             <IconButton
                 onClick={(event) => setAnchorEl(event.currentTarget)}
                 aria-controls={anchorEl ? ariaID : undefined}
@@ -85,7 +85,7 @@ export const OverflowMenu: React.FC<
             >
                 {children}
             </Menu>
-        </OverflowMenuContext.Provider>
+        </OverflowMenuContext>
     );
 };
 
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 3a4ad8fccc..0e28b39e37 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -13,7 +13,7 @@ import { SidebarDrawer } from "@/base/components/mui/SidebarDrawer";
 import { Titlebar } from "@/base/components/Titlebar";
 import { EllipsizedTypography } from "@/base/components/Typography";
 import { useModalVisibility } from "@/base/components/utils/modal";
-import type { BaseContextT } from "@/base/context";
+import { useBaseContext } from "@/base/context";
 import { haveWindow } from "@/base/env";
 import { nameAndExtension } from "@/base/file-name";
 import log from "@/base/log";
@@ -109,11 +109,6 @@ export interface FileInfoProps {
     showInfo: boolean;
     handleCloseInfo: () => void;
     exif: FileInfoExif | undefined;
-    /**
-     * This is the same as the {@link showMiniDialog} prop in the top level
-     * {@link AppContext} of the app which we're currently being shown in.
-     */
-    showMiniDialog: BaseContextT["showMiniDialog"];
     /**
      * TODO: Rename and flip to allowEdits.
      */
@@ -141,7 +136,6 @@ export interface FileInfoProps {
 
 export const FileInfo: React.FC<FileInfoProps> = ({
     file,
-    showMiniDialog,
     shouldDisableEdits,
     allowMap,
     showInfo,
@@ -155,6 +149,8 @@ export const FileInfo: React.FC<FileInfoProps> = ({
     onSelectCollection,
     onSelectPerson,
 }) => {
+    const { showMiniDialog } = useBaseContext();
+
     const { mapEnabled } = useSettingsSnapshot();
 
     const [exifInfo, setExifInfo] = useState<ExifInfo | undefined>();
@@ -916,6 +912,7 @@ const MapBox: React.FC<MapBoxProps> = ({
                 }
             }
         }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [mapEnabled]);
 
     return mapEnabled ? (

From 8d7eef99adb1218e2e124cd8827c9311e69910d9 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 14 Feb 2025 15:54:14 +0530
Subject: [PATCH 209/796] [mob] Fix collection attribute motification

---
 mobile/lib/services/collections_service.dart | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mobile/lib/services/collections_service.dart b/mobile/lib/services/collections_service.dart
index 941f874d38..75ada90f20 100644
--- a/mobile/lib/services/collections_service.dart
+++ b/mobile/lib/services/collections_service.dart
@@ -798,7 +798,7 @@ class CollectionsService {
       );
       await _enteDio.put(
         "/collections/magic-metadata",
-        data: params,
+        data: params.toJson(),
       );
       // update the local information so that it's reflected on UI
       collection.mMdEncodedJson = jsonEncode(jsonToUpdate);
@@ -857,7 +857,7 @@ class CollectionsService {
       );
       await _enteDio.put(
         "/collections/public-magic-metadata",
-        data: params,
+        data: params.toJson(),
       );
       // update the local information so that it's reflected on UI
       collection.mMdPubEncodedJson = jsonEncode(jsonToUpdate);
@@ -917,7 +917,7 @@ class CollectionsService {
       );
       await _enteDio.put(
         "/collections/sharee-magic-metadata",
-        data: params,
+        data: params.toJson(),
       );
       // update the local information so that it's reflected on UI
       collection.sharedMmdJson = jsonEncode(jsonToUpdate);

From 2a73de848c6c90449316c5d00920c3bff7657d04 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 16:01:39 +0530
Subject: [PATCH 210/796] Lint

---
 web/apps/accounts/tsconfig.json              | 4 +---
 web/apps/auth/tsconfig.json                  | 4 +---
 web/apps/cast/tsconfig.json                  | 4 +---
 web/apps/photos/tsconfig.json                | 5 +----
 web/packages/base/tsconfig.json              | 4 ----
 web/packages/build-config/tsconfig-next.json | 4 +++-
 web/packages/shared/tsconfig.json            | 5 +----
 7 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/web/apps/accounts/tsconfig.json b/web/apps/accounts/tsconfig.json
index 81071f5376..8e6cbbeecf 100644
--- a/web/apps/accounts/tsconfig.json
+++ b/web/apps/accounts/tsconfig.json
@@ -2,9 +2,7 @@
     "extends": "@/build-config/tsconfig-next.json",
     "compilerOptions": {
         /* Set the base directory from which to resolve bare module names. */
-        "baseUrl": "./src",
-        /* MUI doesn't work with exactOptionalPropertyTypes yet. */
-        "exactOptionalPropertyTypes": false
+        "baseUrl": "./src"
     },
     "include": [
         "src",
diff --git a/web/apps/auth/tsconfig.json b/web/apps/auth/tsconfig.json
index 81071f5376..8e6cbbeecf 100644
--- a/web/apps/auth/tsconfig.json
+++ b/web/apps/auth/tsconfig.json
@@ -2,9 +2,7 @@
     "extends": "@/build-config/tsconfig-next.json",
     "compilerOptions": {
         /* Set the base directory from which to resolve bare module names. */
-        "baseUrl": "./src",
-        /* MUI doesn't work with exactOptionalPropertyTypes yet. */
-        "exactOptionalPropertyTypes": false
+        "baseUrl": "./src"
     },
     "include": [
         "src",
diff --git a/web/apps/cast/tsconfig.json b/web/apps/cast/tsconfig.json
index 81071f5376..8e6cbbeecf 100644
--- a/web/apps/cast/tsconfig.json
+++ b/web/apps/cast/tsconfig.json
@@ -2,9 +2,7 @@
     "extends": "@/build-config/tsconfig-next.json",
     "compilerOptions": {
         /* Set the base directory from which to resolve bare module names. */
-        "baseUrl": "./src",
-        /* MUI doesn't work with exactOptionalPropertyTypes yet. */
-        "exactOptionalPropertyTypes": false
+        "baseUrl": "./src"
     },
     "include": [
         "src",
diff --git a/web/apps/photos/tsconfig.json b/web/apps/photos/tsconfig.json
index 2866412ee5..b56ff75f1b 100644
--- a/web/apps/photos/tsconfig.json
+++ b/web/apps/photos/tsconfig.json
@@ -3,12 +3,9 @@
     "compilerOptions": {
         /* Set the base directory from which to resolve bare module names. */
         "baseUrl": "./src",
-        /* MUI doesn't work with exactOptionalPropertyTypes yet. */
-        "exactOptionalPropertyTypes": false,
 
-        /* Override tsconfig-next.json (TODO: Remove me) */
+        /* Override tsconfig-next.json (TODO: Remove all of us) */
         "verbatimModuleSyntax": false,
-        /* Override tsconfig-next.json (TODO: Remove me) */
         "noImplicitAny": false,
         "noUnusedLocals": false,
         "noUnusedParameters": false,
diff --git a/web/packages/base/tsconfig.json b/web/packages/base/tsconfig.json
index bff3b51d3a..649d10a907 100644
--- a/web/packages/base/tsconfig.json
+++ b/web/packages/base/tsconfig.json
@@ -1,9 +1,5 @@
 {
     "extends": "@/build-config/tsconfig-next.json",
-    "compilerOptions": {
-        /* MUI doesn't work with exactOptionalPropertyTypes yet. */
-        "exactOptionalPropertyTypes": false
-    },
     "include": [
         ".",
         "../base/global-electron.d.ts",
diff --git a/web/packages/build-config/tsconfig-next.json b/web/packages/build-config/tsconfig-next.json
index f06e08e7f4..a8257b0bba 100644
--- a/web/packages/build-config/tsconfig-next.json
+++ b/web/packages/build-config/tsconfig-next.json
@@ -4,7 +4,9 @@
     "compilerOptions": {
         /* Next.js insists on adding these. Sigh. */
         "allowJs": true,
-        "incremental": true
+        "incremental": true,
+        /* MUI doesn't work with exactOptionalPropertyTypes yet. */
+        "exactOptionalPropertyTypes": false
     },
     /* Next.js insists on adding this, even though we don't need it. */
     "exclude": ["node_modules"]
diff --git a/web/packages/shared/tsconfig.json b/web/packages/shared/tsconfig.json
index 9cfe521bb4..61ef0a3e46 100644
--- a/web/packages/shared/tsconfig.json
+++ b/web/packages/shared/tsconfig.json
@@ -3,12 +3,9 @@
     "compilerOptions": {
         /* Set the base directory from which to resolve bare module names. */
         "baseUrl": ".",
-        /* MUI doesn't work with exactOptionalPropertyTypes yet. */
-        "exactOptionalPropertyTypes": false,
 
-        /* Override tsconfig-next.json (TODO: Remove me) */
+        /* Override tsconfig-next.json (TODO: Remove all of us) */
         "verbatimModuleSyntax": false,
-        /* Override tsconfig-next.json (TODO: Remove me) */
         "noImplicitAny": false,
         "noUnusedLocals": false,
         "noUnusedParameters": false,

From 286a968f650e633aad42bc93ae5b1dfd4bec95f9 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 17:03:39 +0530
Subject: [PATCH 211/796] Props

---
 .../PhotoViewer/ImageEditorOverlay.tsx        | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
index dc9fd24e3d..446846db6d 100644
--- a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
@@ -93,9 +93,12 @@ interface CropBoxProps {
     height: number;
 }
 
-export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = (
-    props,
-) => {
+export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = ({
+    open,
+    onClose,
+    file,
+    onSaveEditedCopy,
+}) => {
     const { showMiniDialog } = useBaseContext();
 
     const canvasRef = useRef<HTMLCanvasElement | null>(null);
@@ -384,9 +387,8 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = (
             const ctx = canvasRef.current.getContext("2d");
             ctx.imageSmoothingEnabled = false;
             if (!fileURL) {
-                const srcURLs = await downloadManager.renderableSourceURLs(
-                    props.file,
-                );
+                const srcURLs =
+                    await downloadManager.renderableSourceURLs(file);
                 img.src = srcURLs.url as string;
                 setFileURL(srcURLs.url as string);
                 // The image editing works for images (not live photos or
@@ -447,13 +449,13 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = (
     };
 
     useEffect(() => {
-        if (!props.open || !props.file) return;
+        if (!open || !file) return;
         loadCanvas();
-    }, [props.open, props.file]);
+    }, [open, file]);
 
     const handleClose = () => {
         setFileURL(undefined);
-        props.onClose();
+        onClose();
     };
 
     const handleCloseWithConfirmation = () => {
@@ -464,13 +466,13 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = (
         }
     };
 
-    if (!props.open) {
+    if (!open) {
         return <></>;
     }
 
     const getEditedFile = async () => {
         const originalSizeCanvas = originalSizeCanvasRef.current!;
-        const originalFileName = props.file.metadata.title;
+        const originalFileName = file.metadata.title;
         return canvasToFile(originalSizeCanvas, originalFileName, mimeType);
     };
 
@@ -485,14 +487,10 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = (
         if (!canvasRef.current) return;
         try {
             const collections = await getLocalCollections();
-
             const collection = collections.find(
-                (c) => c.id === props.file.collectionID,
+                (c) => c.id == file.collectionID,
             );
-
-            const editedFile = await getEditedFile();
-
-            props.onSaveEditedCopy(editedFile, collection, props.file);
+            onSaveEditedCopy(await getEditedFile(), collection, file);
             setFileURL(undefined);
         } catch (e) {
             log.error("Error saving copy to ente", e);

From 5a755d851a4dabe6612ca6d96caf4066f7d144ee Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 17:12:17 +0530
Subject: [PATCH 212/796] Move

---
 web/apps/photos/src/components/Export.tsx                       | 2 +-
 web/apps/photos/src/components/Sidebar.tsx                      | 2 +-
 web/apps/photos/src/components/Upload/UploadTypeSelector.tsx    | 2 +-
 web/apps/photos/src/components/WatchFolder.tsx                  | 2 +-
 web/packages/accounts/components/RecoveryKey.tsx                | 2 +-
 .../components/mui/DialogCloseIconButton.tsx}                   | 0
 web/packages/new/photos/components/CollectionMappingChoice.tsx  | 2 +-
 web/packages/new/photos/components/CollectionSelector.tsx       | 2 +-
 web/packages/new/photos/components/gallery/PeopleHeader.tsx     | 2 +-
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename web/packages/{new/photos/components/mui/Dialog.tsx => base/components/mui/DialogCloseIconButton.tsx} (100%)

diff --git a/web/apps/photos/src/components/Export.tsx b/web/apps/photos/src/components/Export.tsx
index 85623d5b93..a3feaae4af 100644
--- a/web/apps/photos/src/components/Export.tsx
+++ b/web/apps/photos/src/components/Export.tsx
@@ -7,12 +7,12 @@ import {
 } from "@/base/components/OverflowMenu";
 import { EllipsizedTypography } from "@/base/components/Typography";
 import type { ButtonishProps } from "@/base/components/mui";
+import { DialogCloseIconButton } from "@/base/components/mui/DialogCloseIconButton";
 import type { ModalVisibilityProps } from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
 import { ensureElectron } from "@/base/electron";
 import log from "@/base/log";
 import { EnteFile } from "@/media/file";
-import { DialogCloseIconButton } from "@/new/photos/components/mui/Dialog";
 import { SpaceBetweenFlex } from "@ente/shared/components/Container";
 import { CustomError } from "@ente/shared/error";
 import FolderIcon from "@mui/icons-material/Folder";
diff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsx
index b65af1a5bb..65d0741edf 100644
--- a/web/apps/photos/src/components/Sidebar.tsx
+++ b/web/apps/photos/src/components/Sidebar.tsx
@@ -12,6 +12,7 @@ import {
 } from "@/base/components/RowButton";
 import { SpacedRow } from "@/base/components/containers";
 import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
+import { DialogCloseIconButton } from "@/base/components/mui/DialogCloseIconButton";
 import {
     NestedSidebarDrawer,
     SidebarDrawer,
@@ -34,7 +35,6 @@ import { savedLogs } from "@/base/log-web";
 import { customAPIHost } from "@/base/origins";
 import { downloadString } from "@/base/utils/web";
 import { DropdownInput } from "@/new/photos/components/DropdownInput";
-import { DialogCloseIconButton } from "@/new/photos/components/mui/Dialog";
 import { MLSettings } from "@/new/photos/components/sidebar/MLSettings";
 import { TwoFactorSettings } from "@/new/photos/components/sidebar/TwoFactorSettings";
 import {
diff --git a/web/apps/photos/src/components/Upload/UploadTypeSelector.tsx b/web/apps/photos/src/components/Upload/UploadTypeSelector.tsx
index 065cea33b0..fdf6f7f070 100644
--- a/web/apps/photos/src/components/Upload/UploadTypeSelector.tsx
+++ b/web/apps/photos/src/components/Upload/UploadTypeSelector.tsx
@@ -1,8 +1,8 @@
 import { SpacedRow } from "@/base/components/containers";
+import { DialogCloseIconButton } from "@/base/components/mui/DialogCloseIconButton";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import { RowButton } from "@/base/components/RowButton";
 import { useIsTouchscreen } from "@/base/components/utils/hooks";
-import { DialogCloseIconButton } from "@/new/photos/components/mui/Dialog";
 import ChevronRightIcon from "@mui/icons-material/ChevronRight";
 import GoogleIcon from "@mui/icons-material/Google";
 import ImageOutlinedIcon from "@mui/icons-material/ImageOutlined";
diff --git a/web/apps/photos/src/components/WatchFolder.tsx b/web/apps/photos/src/components/WatchFolder.tsx
index bc916eca9d..9f781e7af9 100644
--- a/web/apps/photos/src/components/WatchFolder.tsx
+++ b/web/apps/photos/src/components/WatchFolder.tsx
@@ -1,4 +1,5 @@
 import { CenteredFill, SpacedRow } from "@/base/components/containers";
+import { DialogCloseIconButton } from "@/base/components/mui/DialogCloseIconButton";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import {
     OverflowMenu,
@@ -14,7 +15,6 @@ import { ensureElectron } from "@/base/electron";
 import { basename, dirname } from "@/base/file-name";
 import type { CollectionMapping, FolderWatch } from "@/base/types/ipc";
 import { CollectionMappingChoice } from "@/new/photos/components/CollectionMappingChoice";
-import { DialogCloseIconButton } from "@/new/photos/components/mui/Dialog";
 import AddIcon from "@mui/icons-material/Add";
 import CheckIcon from "@mui/icons-material/Check";
 import DoNotDisturbOutlinedIcon from "@mui/icons-material/DoNotDisturbOutlined";
diff --git a/web/packages/accounts/components/RecoveryKey.tsx b/web/packages/accounts/components/RecoveryKey.tsx
index 67f69f1675..94deda54f0 100644
--- a/web/packages/accounts/components/RecoveryKey.tsx
+++ b/web/packages/accounts/components/RecoveryKey.tsx
@@ -1,12 +1,12 @@
 import { type MiniDialogAttributes } from "@/base/components/MiniDialog";
 import { SpacedRow } from "@/base/components/containers";
+import { DialogCloseIconButton } from "@/base/components/mui/DialogCloseIconButton";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import { errorDialogAttributes } from "@/base/components/utils/dialog";
 import { useIsSmallWidth } from "@/base/components/utils/hooks";
 import type { ModalVisibilityProps } from "@/base/components/utils/modal";
 import log from "@/base/log";
 import { downloadString } from "@/base/utils/web";
-import { DialogCloseIconButton } from "@/new/photos/components/mui/Dialog";
 import { getRecoveryKey } from "@ente/shared/crypto/helpers";
 import {
     Dialog,
diff --git a/web/packages/new/photos/components/mui/Dialog.tsx b/web/packages/base/components/mui/DialogCloseIconButton.tsx
similarity index 100%
rename from web/packages/new/photos/components/mui/Dialog.tsx
rename to web/packages/base/components/mui/DialogCloseIconButton.tsx
diff --git a/web/packages/new/photos/components/CollectionMappingChoice.tsx b/web/packages/new/photos/components/CollectionMappingChoice.tsx
index fdcda398c1..6917b60a25 100644
--- a/web/packages/new/photos/components/CollectionMappingChoice.tsx
+++ b/web/packages/new/photos/components/CollectionMappingChoice.tsx
@@ -1,4 +1,5 @@
 import { SpacedRow } from "@/base/components/containers";
+import { DialogCloseIconButton } from "@/base/components/mui/DialogCloseIconButton";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import type { ModalVisibilityProps } from "@/base/components/utils/modal";
 import type { CollectionMapping } from "@/base/types/ipc";
@@ -13,7 +14,6 @@ import {
 } from "@mui/material";
 import { t } from "i18next";
 import React from "react";
-import { DialogCloseIconButton } from "./mui/Dialog";
 
 type CollectionMappingChoiceProps = ModalVisibilityProps & {
     /**
diff --git a/web/packages/new/photos/components/CollectionSelector.tsx b/web/packages/new/photos/components/CollectionSelector.tsx
index af8b0b13fd..e0b10c0a5c 100644
--- a/web/packages/new/photos/components/CollectionSelector.tsx
+++ b/web/packages/new/photos/components/CollectionSelector.tsx
@@ -1,4 +1,5 @@
 import { SpacedRow } from "@/base/components/containers";
+import { DialogCloseIconButton } from "@/base/components/mui/DialogCloseIconButton";
 import type { ModalVisibilityProps } from "@/base/components/utils/modal";
 import type { Collection } from "@/media/collection";
 import {
@@ -24,7 +25,6 @@ import {
 } from "@mui/material";
 import { t } from "i18next";
 import React, { useEffect, useState } from "react";
-import { DialogCloseIconButton } from "./mui/Dialog";
 
 export type CollectionSelectorAction =
     | "upload"
diff --git a/web/packages/new/photos/components/gallery/PeopleHeader.tsx b/web/packages/new/photos/components/gallery/PeopleHeader.tsx
index 464aa44919..e9df72dea7 100644
--- a/web/packages/new/photos/components/gallery/PeopleHeader.tsx
+++ b/web/packages/new/photos/components/gallery/PeopleHeader.tsx
@@ -1,6 +1,7 @@
 import { CenteredFill, SpacedRow } from "@/base/components/containers";
 import { ActivityErrorIndicator } from "@/base/components/ErrorIndicator";
 import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
+import { DialogCloseIconButton } from "@/base/components/mui/DialogCloseIconButton";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import { LoadingButton } from "@/base/components/mui/LoadingButton";
 import {
@@ -60,7 +61,6 @@ import { t } from "i18next";
 import React, { useEffect, useReducer, useState } from "react";
 import type { FaceCluster } from "../../services/ml/cluster";
 import { usePhotosAppContext } from "../../types/context";
-import { DialogCloseIconButton } from "../mui/Dialog";
 import { SuggestionFaceList } from "../PeopleList";
 import {
     ItemCard,

From 396065e80cbae1770bccd6f20661283a574336e1 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 17:30:03 +0530
Subject: [PATCH 213/796] Move

---
 .../src/components/Collections/CollectionHeader.tsx       | 8 ++++----
 web/apps/photos/src/services/collectionService.ts         | 2 +-
 web/apps/photos/src/services/upload/upload-service.ts     | 8 ++++----
 web/apps/photos/src/utils/collection.ts                   | 2 +-
 web/apps/photos/src/utils/file/index.ts                   | 8 ++++----
 web/packages/gallery/services/file.ts                     | 2 +-
 .../{new/photos => gallery}/services/magic-metadata.ts    | 0
 7 files changed, 15 insertions(+), 15 deletions(-)
 rename web/packages/{new/photos => gallery}/services/magic-metadata.ts (100%)

diff --git a/web/apps/photos/src/components/Collections/CollectionHeader.tsx b/web/apps/photos/src/components/Collections/CollectionHeader.tsx
index 1860becba0..6ef5ab400d 100644
--- a/web/apps/photos/src/components/Collections/CollectionHeader.tsx
+++ b/web/apps/photos/src/components/Collections/CollectionHeader.tsx
@@ -7,6 +7,10 @@ import {
 } from "@/base/components/OverflowMenu";
 import { useModalVisibility } from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
+import {
+    isArchivedCollection,
+    isPinnedCollection,
+} from "@/gallery/services/magic-metadata";
 import type { Collection } from "@/media/collection";
 import { ItemVisibility } from "@/media/file-metadata";
 import {
@@ -23,10 +27,6 @@ import type {
     CollectionSummaryType,
 } from "@/new/photos/services/collection/ui";
 import { clearLocalTrash, emptyTrash } from "@/new/photos/services/collections";
-import {
-    isArchivedCollection,
-    isPinnedCollection,
-} from "@/new/photos/services/magic-metadata";
 import { usePhotosAppContext } from "@/new/photos/types/context";
 import ArchiveOutlinedIcon from "@mui/icons-material/ArchiveOutlined";
 import DeleteOutlinedIcon from "@mui/icons-material/DeleteOutlined";
diff --git a/web/apps/photos/src/services/collectionService.ts b/web/apps/photos/src/services/collectionService.ts
index 4f994d697f..2e9250b67a 100644
--- a/web/apps/photos/src/services/collectionService.ts
+++ b/web/apps/photos/src/services/collectionService.ts
@@ -2,6 +2,7 @@ import { encryptMetadataJSON, sharedCryptoWorker } from "@/base/crypto";
 import log from "@/base/log";
 import { apiURL } from "@/base/origins";
 import { UpdateMagicMetadataRequest } from "@/gallery/services/file";
+import { updateMagicMetadata } from "@/gallery/services/magic-metadata";
 import {
     Collection,
     CollectionMagicMetadata,
@@ -36,7 +37,6 @@ import {
     groupFilesByCollectionID,
     sortFiles,
 } from "@/new/photos/services/files";
-import { updateMagicMetadata } from "@/new/photos/services/magic-metadata";
 import type { FamilyData } from "@/new/photos/services/user-details";
 import { batch } from "@/utils/array";
 import HTTPService from "@ente/shared/network/HTTPService";
diff --git a/web/apps/photos/src/services/upload/upload-service.ts b/web/apps/photos/src/services/upload/upload-service.ts
index dc8208cbdb..0ac2d066c5 100644
--- a/web/apps/photos/src/services/upload/upload-service.ts
+++ b/web/apps/photos/src/services/upload/upload-service.ts
@@ -6,6 +6,10 @@ import { basename, nameAndExtension } from "@/base/file-name";
 import type { PublicAlbumsCredentials } from "@/base/http";
 import log from "@/base/log";
 import { extractVideoMetadata } from "@/gallery/services/ffmpeg";
+import {
+    getNonEmptyMagicMetadataProps,
+    updateMagicMetadata,
+} from "@/gallery/services/magic-metadata";
 import {
     detectFileTypeInfoFromChunk,
     isFileTypeNotSupportedError,
@@ -30,10 +34,6 @@ import { FileType, type FileTypeInfo } from "@/media/file-type";
 import { encodeLivePhoto } from "@/media/live-photo";
 import { addToCollection } from "@/new/photos/services/collection";
 import { extractExif } from "@/new/photos/services/exif";
-import {
-    getNonEmptyMagicMetadataProps,
-    updateMagicMetadata,
-} from "@/new/photos/services/magic-metadata";
 import type { UploadItem } from "@/new/photos/services/upload/types";
 import {
     RANDOM_PERCENTAGE_PROGRESS_FOR_PUT,
diff --git a/web/apps/photos/src/utils/collection.ts b/web/apps/photos/src/utils/collection.ts
index f2e64d0b90..aa46ab4a88 100644
--- a/web/apps/photos/src/utils/collection.ts
+++ b/web/apps/photos/src/utils/collection.ts
@@ -1,6 +1,7 @@
 import { ensureElectron } from "@/base/electron";
 import { joinPath } from "@/base/file-name";
 import log from "@/base/log";
+import { updateMagicMetadata } from "@/gallery/services/magic-metadata";
 import {
     COLLECTION_ROLE,
     type Collection,
@@ -26,7 +27,6 @@ import {
     getLocalCollections,
 } from "@/new/photos/services/collections";
 import { getAllLocalFiles, getLocalFiles } from "@/new/photos/services/files";
-import { updateMagicMetadata } from "@/new/photos/services/magic-metadata";
 import { safeDirectoryName } from "@/new/photos/utils/native-fs";
 import { LS_KEYS, getData } from "@ente/shared/storage/localStorage";
 import type { User } from "@ente/shared/user/types";
diff --git a/web/apps/photos/src/utils/file/index.ts b/web/apps/photos/src/utils/file/index.ts
index dd961f4400..d3aa10b471 100644
--- a/web/apps/photos/src/utils/file/index.ts
+++ b/web/apps/photos/src/utils/file/index.ts
@@ -4,6 +4,10 @@ import { type Electron } from "@/base/types/ipc";
 import { downloadAndRevokeObjectURL } from "@/base/utils/web";
 import { downloadManager } from "@/gallery/services/download";
 import { updateFileMagicMetadata } from "@/gallery/services/file";
+import {
+    isArchivedFile,
+    updateMagicMetadata,
+} from "@/gallery/services/magic-metadata";
 import { detectFileTypeInfo } from "@/gallery/utils/detect-type";
 import { writeStream } from "@/gallery/utils/native-stream";
 import {
@@ -15,10 +19,6 @@ import { ItemVisibility } from "@/media/file-metadata";
 import { FileType } from "@/media/file-type";
 import { decodeLivePhoto } from "@/media/live-photo";
 import { deleteFromTrash, moveToTrash } from "@/new/photos/services/collection";
-import {
-    isArchivedFile,
-    updateMagicMetadata,
-} from "@/new/photos/services/magic-metadata";
 import { safeFileName } from "@/new/photos/utils/native-fs";
 import { withTimeout } from "@/utils/promise";
 import { LS_KEYS, getData } from "@ente/shared/storage/localStorage";
diff --git a/web/packages/gallery/services/file.ts b/web/packages/gallery/services/file.ts
index eaab3449b8..ac2a7a30b2 100644
--- a/web/packages/gallery/services/file.ts
+++ b/web/packages/gallery/services/file.ts
@@ -3,6 +3,7 @@
 
 import { encryptMetadataJSON } from "@/base/crypto";
 import { apiURL } from "@/base/origins";
+import { updateMagicMetadata } from "@/gallery/services/magic-metadata";
 import type {
     EncryptedMagicMetadata,
     EnteFile,
@@ -12,7 +13,6 @@ import type {
     FileWithUpdatedPublicMagicMetadata,
 } from "@/media/file";
 import { mergeMetadata } from "@/media/file";
-import { updateMagicMetadata } from "@/new/photos/services/magic-metadata";
 import HTTPService from "@ente/shared/network/HTTPService";
 import { getToken } from "@ente/shared/storage/localStorage/helpers";
 
diff --git a/web/packages/new/photos/services/magic-metadata.ts b/web/packages/gallery/services/magic-metadata.ts
similarity index 100%
rename from web/packages/new/photos/services/magic-metadata.ts
rename to web/packages/gallery/services/magic-metadata.ts

From f8c2f4b9dd5bb09a46afaca76c800232daa70a40 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 17:38:28 +0530
Subject: [PATCH 214/796] Move

---
 .../src/components/Upload/UploadProgress.tsx  |  5 +-
 .../photos/src/components/Upload/Uploader.tsx | 10 +--
 .../photos/src/services/upload/takeout.ts     |  2 +-
 .../photos/src/services/upload/thumbnail.ts   |  8 +-
 .../src/services/upload/upload-service.ts     | 10 +--
 .../src/services/upload/uploadManager.ts      | 14 ++--
 web/apps/photos/src/services/watch.ts         |  2 +-
 web/packages/gallery/services/ffmpeg/index.ts | 10 +--
 web/packages/gallery/services/upload.ts       | 78 +++++++++++++++++++
 .../new/photos/services/upload/types.ts       | 78 -------------------
 10 files changed, 107 insertions(+), 110 deletions(-)

diff --git a/web/apps/photos/src/components/Upload/UploadProgress.tsx b/web/apps/photos/src/components/Upload/UploadProgress.tsx
index 592ec8fce5..451d19ba54 100644
--- a/web/apps/photos/src/components/Upload/UploadProgress.tsx
+++ b/web/apps/photos/src/components/Upload/UploadProgress.tsx
@@ -1,9 +1,6 @@
 import { FilledIconButton } from "@/base/components/mui";
 import { useBaseContext } from "@/base/context";
-import {
-    UPLOAD_RESULT,
-    type UploadPhase,
-} from "@/new/photos/services/upload/types";
+import { UPLOAD_RESULT, type UploadPhase } from "@/gallery/services/upload";
 import { SpaceBetweenFlex } from "@ente/shared/components/Container";
 import CloseIcon from "@mui/icons-material/Close";
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
diff --git a/web/apps/photos/src/components/Upload/Uploader.tsx b/web/apps/photos/src/components/Upload/Uploader.tsx
index fc967da7a3..9c8f1f0005 100644
--- a/web/apps/photos/src/components/Upload/Uploader.tsx
+++ b/web/apps/photos/src/components/Upload/Uploader.tsx
@@ -4,6 +4,11 @@ import { useBaseContext } from "@/base/context";
 import { basename } from "@/base/file-name";
 import log from "@/base/log";
 import type { CollectionMapping, Electron, ZipItem } from "@/base/types/ipc";
+import type {
+    FileAndPath,
+    UploadItem,
+    UploadPhase,
+} from "@/gallery/services/upload";
 import type { Collection } from "@/media/collection";
 import type { EnteFile } from "@/media/file";
 import { UploaderNameInput } from "@/new/albums/components/UploaderNameInput";
@@ -12,11 +17,6 @@ import type { CollectionSelectorAttributes } from "@/new/photos/components/Colle
 import { downloadAppDialogAttributes } from "@/new/photos/components/utils/download";
 import { getLatestCollections } from "@/new/photos/services/collections";
 import { exportMetadataDirectoryName } from "@/new/photos/services/export";
-import type {
-    FileAndPath,
-    UploadItem,
-    UploadPhase,
-} from "@/new/photos/services/upload/types";
 import { redirectToCustomerPortal } from "@/new/photos/services/user-details";
 import { usePhotosAppContext } from "@/new/photos/types/context";
 import { firstNonEmpty } from "@/utils/array";
diff --git a/web/apps/photos/src/services/upload/takeout.ts b/web/apps/photos/src/services/upload/takeout.ts
index 78527f9325..4d8c740832 100644
--- a/web/apps/photos/src/services/upload/takeout.ts
+++ b/web/apps/photos/src/services/upload/takeout.ts
@@ -5,8 +5,8 @@ import { ensureElectron } from "@/base/electron";
 import { nameAndExtension } from "@/base/file-name";
 import log from "@/base/log";
 import { type Location } from "@/base/types";
+import type { UploadItem } from "@/gallery/services/upload";
 import { readStream } from "@/gallery/utils/native-stream";
-import type { UploadItem } from "@/new/photos/services/upload/types";
 import { maybeParseInt } from "@/utils/parse";
 
 /**
diff --git a/web/apps/photos/src/services/upload/thumbnail.ts b/web/apps/photos/src/services/upload/thumbnail.ts
index fd7c81e852..943d724b38 100644
--- a/web/apps/photos/src/services/upload/thumbnail.ts
+++ b/web/apps/photos/src/services/upload/thumbnail.ts
@@ -1,14 +1,14 @@
 import log from "@/base/log";
 import { type Electron } from "@/base/types/ipc";
 import * as ffmpeg from "@/gallery/services/ffmpeg";
+import {
+    toDataOrPathOrZipEntry,
+    type DesktopUploadItem,
+} from "@/gallery/services/upload";
 import { FileType, type FileTypeInfo } from "@/media/file-type";
 import { isHEICExtension } from "@/media/formats";
 import { heicToJPEG } from "@/media/heic-convert";
 import { scaledImageDimensions } from "@/media/image";
-import {
-    toDataOrPathOrZipEntry,
-    type DesktopUploadItem,
-} from "@/new/photos/services/upload/types";
 import { withTimeout } from "@/utils/promise";
 
 /** Maximum width or height of the generated thumbnail */
diff --git a/web/apps/photos/src/services/upload/upload-service.ts b/web/apps/photos/src/services/upload/upload-service.ts
index 0ac2d066c5..c26f14b23b 100644
--- a/web/apps/photos/src/services/upload/upload-service.ts
+++ b/web/apps/photos/src/services/upload/upload-service.ts
@@ -10,6 +10,11 @@ import {
     getNonEmptyMagicMetadataProps,
     updateMagicMetadata,
 } from "@/gallery/services/magic-metadata";
+import type { UploadItem } from "@/gallery/services/upload";
+import {
+    RANDOM_PERCENTAGE_PROGRESS_FOR_PUT,
+    UPLOAD_RESULT,
+} from "@/gallery/services/upload";
 import {
     detectFileTypeInfoFromChunk,
     isFileTypeNotSupportedError,
@@ -34,11 +39,6 @@ import { FileType, type FileTypeInfo } from "@/media/file-type";
 import { encodeLivePhoto } from "@/media/live-photo";
 import { addToCollection } from "@/new/photos/services/collection";
 import { extractExif } from "@/new/photos/services/exif";
-import type { UploadItem } from "@/new/photos/services/upload/types";
-import {
-    RANDOM_PERCENTAGE_PROGRESS_FOR_PUT,
-    UPLOAD_RESULT,
-} from "@/new/photos/services/upload/types";
 import { mergeUint8Arrays } from "@/utils/array";
 import { ensureInteger, ensureNumber } from "@/utils/ensure";
 import { CustomError, handleUploadError } from "@ente/shared/error";
diff --git a/web/apps/photos/src/services/upload/uploadManager.ts b/web/apps/photos/src/services/upload/uploadManager.ts
index 6e006797ac..46e72fa316 100644
--- a/web/apps/photos/src/services/upload/uploadManager.ts
+++ b/web/apps/photos/src/services/upload/uploadManager.ts
@@ -6,7 +6,13 @@ import type { PublicAlbumsCredentials } from "@/base/http";
 import log from "@/base/log";
 import type { Electron } from "@/base/types/ipc";
 import { ComlinkWorker } from "@/base/worker/comlink-worker";
-import { shouldDisableCFUploadProxy } from "@/gallery/services/upload";
+import type { UploadItem } from "@/gallery/services/upload";
+import {
+    RANDOM_PERCENTAGE_PROGRESS_FOR_PUT,
+    UPLOAD_RESULT,
+    shouldDisableCFUploadProxy,
+    type UploadPhase,
+} from "@/gallery/services/upload";
 import type { Collection } from "@/media/collection";
 import {
     decryptFile,
@@ -18,12 +24,6 @@ import { FileType } from "@/media/file-type";
 import { potentialFileTypeFromExtension } from "@/media/live-photo";
 import { getLocalFiles } from "@/new/photos/services/files";
 import { indexNewUpload } from "@/new/photos/services/ml";
-import type { UploadItem } from "@/new/photos/services/upload/types";
-import {
-    RANDOM_PERCENTAGE_PROGRESS_FOR_PUT,
-    UPLOAD_RESULT,
-    type UploadPhase,
-} from "@/new/photos/services/upload/types";
 import { wait } from "@/utils/promise";
 import { CustomError } from "@ente/shared/error";
 import { Canceler } from "axios";
diff --git a/web/apps/photos/src/services/watch.ts b/web/apps/photos/src/services/watch.ts
index af090d347f..8266a5e0f3 100644
--- a/web/apps/photos/src/services/watch.ts
+++ b/web/apps/photos/src/services/watch.ts
@@ -11,13 +11,13 @@ import type {
     FolderWatch,
     FolderWatchSyncedFile,
 } from "@/base/types/ipc";
+import { UPLOAD_RESULT } from "@/gallery/services/upload";
 import type { Collection } from "@/media/collection";
 import { EncryptedEnteFile } from "@/media/file";
 import {
     getLocalFiles,
     groupFilesByCollectionID,
 } from "@/new/photos/services/files";
-import { UPLOAD_RESULT } from "@/new/photos/services/upload/types";
 import { ensureString } from "@/utils/ensure";
 import debounce from "debounce";
 import uploadManager, {
diff --git a/web/packages/gallery/services/ffmpeg/index.ts b/web/packages/gallery/services/ffmpeg/index.ts
index 2141dfec23..18303461c3 100644
--- a/web/packages/gallery/services/ffmpeg/index.ts
+++ b/web/packages/gallery/services/ffmpeg/index.ts
@@ -1,17 +1,17 @@
 import { ensureElectron } from "@/base/electron";
 import log from "@/base/log";
 import type { Electron } from "@/base/types/ipc";
+import {
+    toDataOrPathOrZipEntry,
+    type DesktopUploadItem,
+    type UploadItem,
+} from "@/gallery/services/upload";
 import {
     readConvertToMP4Done,
     readConvertToMP4Stream,
     writeConvertToMP4Stream,
 } from "@/gallery/utils/native-stream";
 import { parseMetadataDate, type ParsedMetadata } from "@/media/file-metadata";
-import {
-    toDataOrPathOrZipEntry,
-    type DesktopUploadItem,
-    type UploadItem,
-} from "@/new/photos/services/upload/types";
 import {
     ffmpegPathPlaceholder,
     inputPathPlaceholder,
diff --git a/web/packages/gallery/services/upload.ts b/web/packages/gallery/services/upload.ts
index 868b9caf3d..e6b1040d73 100644
--- a/web/packages/gallery/services/upload.ts
+++ b/web/packages/gallery/services/upload.ts
@@ -1,5 +1,6 @@
 import log from "@/base/log";
 import { customAPIOrigin } from "@/base/origins";
+import type { ZipItem } from "@/base/types/ipc";
 import { nullToUndefined } from "@/utils/transform";
 import { z } from "zod";
 
@@ -28,6 +29,83 @@ export const resetUploadState = () => {
     _state = new UploadState();
 };
 
+/**
+ * An item to upload is one of the following:
+ *
+ * 1. A file drag-and-dropped or selected by the user when we are running in the
+ *    web browser. These is the {@link File} case.
+ *
+ * 2. A file drag-and-dropped or selected by the user when we are running in the
+ *    context of our desktop app. In such cases, we also have the absolute path
+ *    of the file in the user's local file system. This is the
+ *    {@link FileAndPath} case.
+ *
+ * 3. A file path programmatically requested by the desktop app. For example, we
+ *    might be resuming a previously interrupted upload after an app restart
+ *    (thus we no longer have access to the {@link File} from case 2). Or we
+ *    could be uploading a file this is in one of the folders the user has asked
+ *    us to watch for changes. This is the `string` case.
+ *
+ * 4. A file within a zip file on the user's local file system. This too is only
+ *    possible when we are running in the context of our desktop app. The user
+ *    might have drag-and-dropped or selected a zip file, or it might be a zip
+ *    file that they'd previously selected but we now are resuming an
+ *    interrupted upload of. Either ways, what we have is a tuple containing the
+ *    (path to zip file, and the name of an entry within that zip file). This is
+ *    the {@link ZipItem} case.
+ *
+ * Also see: [Note: Reading a UploadItem].
+ */
+export type UploadItem = File | FileAndPath | string | ZipItem;
+
+/**
+ * When we are running in the context of our desktop app, we have access to the
+ * absolute path of {@link File} objects. This convenience type clubs these two
+ * bits of information, saving us the need to query the path again and again
+ * using the {@link getPathForFile} method of {@link Electron}.
+ */
+export interface FileAndPath {
+    file: File;
+    path: string;
+}
+
+/**
+ * The of cases of {@link UploadItem} that apply when we're running in the
+ * context of our desktop app.
+ */
+export type DesktopUploadItem = Exclude<UploadItem, File>;
+
+/**
+ * For each of cases of {@link UploadItem} that apply when we're running in the
+ * context of our desktop app, return a value that can be passed to
+ * {@link Electron} functions over IPC.
+ */
+export const toDataOrPathOrZipEntry = (desktopUploadItem: DesktopUploadItem) =>
+    typeof desktopUploadItem == "string" || Array.isArray(desktopUploadItem)
+        ? desktopUploadItem
+        : desktopUploadItem.path;
+
+export const RANDOM_PERCENTAGE_PROGRESS_FOR_PUT = () => 90 + 10 * Math.random();
+
+export type UploadPhase =
+    | "preparing"
+    | "readingMetadata"
+    | "uploading"
+    | "cancelling"
+    | "done";
+
+export enum UPLOAD_RESULT {
+    FAILED,
+    ALREADY_UPLOADED,
+    UNSUPPORTED,
+    BLOCKED,
+    TOO_LARGE,
+    LARGER_THAN_AVAILABLE_STORAGE,
+    UPLOADED,
+    UPLOADED_WITH_STATIC_THUMBNAIL,
+    ADDED_SYMLINK,
+}
+
 /**
  * Return true to disable the upload of files via Cloudflare Workers.
  *
diff --git a/web/packages/new/photos/services/upload/types.ts b/web/packages/new/photos/services/upload/types.ts
index 8055bd9dfd..e69de29bb2 100644
--- a/web/packages/new/photos/services/upload/types.ts
+++ b/web/packages/new/photos/services/upload/types.ts
@@ -1,78 +0,0 @@
-import type { ZipItem } from "@/base/types/ipc";
-
-/**
- * An item to upload is one of the following:
- *
- * 1. A file drag-and-dropped or selected by the user when we are running in the
- *    web browser. These is the {@link File} case.
- *
- * 2. A file drag-and-dropped or selected by the user when we are running in the
- *    context of our desktop app. In such cases, we also have the absolute path
- *    of the file in the user's local file system. This is the
- *    {@link FileAndPath} case.
- *
- * 3. A file path programmatically requested by the desktop app. For example, we
- *    might be resuming a previously interrupted upload after an app restart
- *    (thus we no longer have access to the {@link File} from case 2). Or we
- *    could be uploading a file this is in one of the folders the user has asked
- *    us to watch for changes. This is the `string` case.
- *
- * 4. A file within a zip file on the user's local file system. This too is only
- *    possible when we are running in the context of our desktop app. The user
- *    might have drag-and-dropped or selected a zip file, or it might be a zip
- *    file that they'd previously selected but we now are resuming an
- *    interrupted upload of. Either ways, what we have is a tuple containing the
- *    (path to zip file, and the name of an entry within that zip file). This is
- *    the {@link ZipItem} case.
- *
- * Also see: [Note: Reading a UploadItem].
- */
-export type UploadItem = File | FileAndPath | string | ZipItem;
-
-/**
- * When we are running in the context of our desktop app, we have access to the
- * absolute path of {@link File} objects. This convenience type clubs these two
- * bits of information, saving us the need to query the path again and again
- * using the {@link getPathForFile} method of {@link Electron}.
- */
-export interface FileAndPath {
-    file: File;
-    path: string;
-}
-
-/**
- * The of cases of {@link UploadItem} that apply when we're running in the
- * context of our desktop app.
- */
-export type DesktopUploadItem = Exclude<UploadItem, File>;
-
-/**
- * For each of cases of {@link UploadItem} that apply when we're running in the
- * context of our desktop app, return a value that can be passed to
- * {@link Electron} functions over IPC.
- */
-export const toDataOrPathOrZipEntry = (desktopUploadItem: DesktopUploadItem) =>
-    typeof desktopUploadItem == "string" || Array.isArray(desktopUploadItem)
-        ? desktopUploadItem
-        : desktopUploadItem.path;
-
-export const RANDOM_PERCENTAGE_PROGRESS_FOR_PUT = () => 90 + 10 * Math.random();
-
-export type UploadPhase =
-    | "preparing"
-    | "readingMetadata"
-    | "uploading"
-    | "cancelling"
-    | "done";
-
-export enum UPLOAD_RESULT {
-    FAILED,
-    ALREADY_UPLOADED,
-    UNSUPPORTED,
-    BLOCKED,
-    TOO_LARGE,
-    LARGER_THAN_AVAILABLE_STORAGE,
-    UPLOADED,
-    UPLOADED_WITH_STATIC_THUMBNAIL,
-    ADDED_SYMLINK,
-}

From 4670be9bba6eaccdf373206cf17da88f198dc6bf Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 17:48:18 +0530
Subject: [PATCH 215/796] Move

---
 web/packages/gallery/components/FileInfo.tsx           | 10 ++++++++--
 .../components/FileInfoComponents.tsx}                 |  2 +-
 web/packages/new/photos/components/gallery/reducer.ts  | 10 +++++-----
 web/packages/new/photos/services/ml/blob.ts            |  2 +-
 web/packages/new/photos/services/ml/index.ts           |  2 +-
 web/packages/new/photos/services/ml/worker.ts          |  2 +-
 6 files changed, 17 insertions(+), 11 deletions(-)
 rename web/packages/{new/photos/components/FileInfo.tsx => gallery/components/FileInfoComponents.tsx} (93%)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 0e28b39e37..120f81517d 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -2,7 +2,13 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
 /* eslint-disable @typescript-eslint/no-unused-expressions */
-/* TODO: Audit this file */
+/* TODO: Audit this file
+Plan of action:
+- Move common components into FileInfoComponents.tsx
+
+- Move the rest out to files in the apps themeselves: albums/SharedFileInfo
+  and photos/FileInfo to deal with the @/new/photos imports here.
+*/
 /* @ts-nocheck */
 
 import { LinkButtonUndecorated } from "@/base/components/LinkButton";
@@ -18,6 +24,7 @@ import { haveWindow } from "@/base/env";
 import { nameAndExtension } from "@/base/file-name";
 import log from "@/base/log";
 import type { Location } from "@/base/types";
+import { CopyButton } from "@/gallery/components/FileInfoComponents";
 import {
     changeCaption,
     changeFileName,
@@ -32,7 +39,6 @@ import {
     type ParsedMetadataDate,
 } from "@/media/file-metadata";
 import { FileType } from "@/media/file-type";
-import { CopyButton } from "@/new/photos/components/FileInfo";
 import { ChipButton } from "@/new/photos/components/mui/ChipButton";
 import { FilePeopleList } from "@/new/photos/components/PeopleList";
 import { PhotoDateTimePicker } from "@/new/photos/components/PhotoDateTimePicker";
diff --git a/web/packages/new/photos/components/FileInfo.tsx b/web/packages/gallery/components/FileInfoComponents.tsx
similarity index 93%
rename from web/packages/new/photos/components/FileInfo.tsx
rename to web/packages/gallery/components/FileInfoComponents.tsx
index 57a9277cea..fda2bc286e 100644
--- a/web/packages/new/photos/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfoComponents.tsx
@@ -1,9 +1,9 @@
+import { aboveFileViewerContentZ } from "@/new/photos/components/utils/z-index";
 import ContentCopyIcon from "@mui/icons-material/ContentCopy";
 import DoneIcon from "@mui/icons-material/Done";
 import { IconButton, Tooltip, type SvgIconProps } from "@mui/material";
 import { t } from "i18next";
 import { useState } from "react";
-import { aboveFileViewerContentZ } from "./utils/z-index";
 
 interface CopyButtonProps {
     /**
diff --git a/web/packages/new/photos/components/gallery/reducer.ts b/web/packages/new/photos/components/gallery/reducer.ts
index 72c6d31b4f..8c4f9c3b27 100644
--- a/web/packages/new/photos/components/gallery/reducer.ts
+++ b/web/packages/new/photos/components/gallery/reducer.ts
@@ -1,3 +1,8 @@
+import {
+    isArchivedCollection,
+    isArchivedFile,
+    isPinnedCollection,
+} from "@/gallery/services/magic-metadata";
 import {
     COLLECTION_ROLE,
     CollectionType,
@@ -34,11 +39,6 @@ import {
     sortFiles,
     uniqueFilesByID,
 } from "../../services/files";
-import {
-    isArchivedCollection,
-    isArchivedFile,
-    isPinnedCollection,
-} from "../../services/magic-metadata";
 import type { PeopleState, Person } from "../../services/ml/people";
 import type { SearchSuggestion } from "../../services/search/types";
 import type { FamilyData } from "../../services/user-details";
diff --git a/web/packages/new/photos/services/ml/blob.ts b/web/packages/new/photos/services/ml/blob.ts
index cfab9eea1d..57634e995c 100644
--- a/web/packages/new/photos/services/ml/blob.ts
+++ b/web/packages/new/photos/services/ml/blob.ts
@@ -1,12 +1,12 @@
 import { basename } from "@/base/file-name";
 import type { ElectronMLWorker } from "@/base/types/ipc";
 import { downloadManager } from "@/gallery/services/download";
+import type { UploadItem } from "@/gallery/services/upload";
 import { renderableImageBlob } from "@/gallery/utils/convert";
 import { readStream } from "@/gallery/utils/native-stream";
 import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import { decodeLivePhoto } from "@/media/live-photo";
-import type { UploadItem } from "../upload/types";
 
 /**
  * An image bitmap and its RGBA data.
diff --git a/web/packages/new/photos/services/ml/index.ts b/web/packages/new/photos/services/ml/index.ts
index 9d40315ff1..207a02d863 100644
--- a/web/packages/new/photos/services/ml/index.ts
+++ b/web/packages/new/photos/services/ml/index.ts
@@ -9,13 +9,13 @@ import log from "@/base/log";
 import { masterKeyFromSession } from "@/base/session-store";
 import type { Electron } from "@/base/types/ipc";
 import { ComlinkWorker } from "@/base/worker/comlink-worker";
+import type { UploadItem } from "@/gallery/services/upload";
 import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import { throttled } from "@/utils/promise";
 import { proxy, transfer } from "comlink";
 import { getRemoteFlag, updateRemoteFlag } from "../remote-store";
 import { setSearchPeople } from "../search";
-import type { UploadItem } from "../upload/types";
 import {
     addUserEntity,
     pullUserEntities,
diff --git a/web/packages/new/photos/services/ml/worker.ts b/web/packages/new/photos/services/ml/worker.ts
index 1b76ed7df8..48f6213677 100644
--- a/web/packages/new/photos/services/ml/worker.ts
+++ b/web/packages/new/photos/services/ml/worker.ts
@@ -3,11 +3,11 @@ import { assertionFailed } from "@/base/assert";
 import { isHTTP4xxError } from "@/base/http";
 import log from "@/base/log";
 import type { ElectronMLWorker } from "@/base/types/ipc";
+import type { UploadItem } from "@/gallery/services/upload";
 import { fileLogID, type EnteFile } from "@/media/file";
 import { wait } from "@/utils/promise";
 import { expose, wrap } from "comlink";
 import { getAllLocalFiles, getLocalTrashedFiles } from "../files";
-import type { UploadItem } from "../upload/types";
 import {
     createImageBitmapAndData,
     fetchRenderableBlob,

From db26923d68222928e2211d2bbde0c0c68b35a2d1 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 17:56:38 +0530
Subject: [PATCH 216/796] Move

---
 web/apps/photos/src/components/PhotoViewer/index.tsx            | 2 +-
 .../new/photos/components}/ImageEditorOverlay.tsx               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename web/{apps/photos/src/components/PhotoViewer => packages/new/photos/components}/ImageEditorOverlay.tsx (99%)

diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index 73aff4a6ad..48b484bb7e 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -20,6 +20,7 @@ import { fileLogID, type EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import { isHEICExtension, needsJPEGConversion } from "@/media/formats";
 import { ConfirmDeleteFileDialog } from "@/new/photos/components/FileViewer";
+import { ImageEditorOverlay } from "@/new/photos/components/ImageEditorOverlay";
 import { moveToTrash } from "@/new/photos/services/collection";
 import { extractRawExif, parseExif } from "@/new/photos/services/exif";
 import { usePhotosAppContext } from "@/new/photos/types/context";
@@ -75,7 +76,6 @@ import {
     getFileFromURL,
 } from "utils/file";
 import { PublicCollectionGalleryContext } from "utils/publicCollectionGallery";
-import { ImageEditorOverlay } from "./ImageEditorOverlay";
 
 export type PhotoViewerProps = Pick<
     PhotoFrameProps,
diff --git a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx b/web/packages/new/photos/components/ImageEditorOverlay.tsx
similarity index 99%
rename from web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
rename to web/packages/new/photos/components/ImageEditorOverlay.tsx
index 446846db6d..ea54eea504 100644
--- a/web/apps/photos/src/components/PhotoViewer/ImageEditorOverlay.tsx
+++ b/web/packages/new/photos/components/ImageEditorOverlay.tsx
@@ -14,7 +14,7 @@ import log from "@/base/log";
 import { downloadAndRevokeObjectURL } from "@/base/utils/web";
 import { downloadManager } from "@/gallery/services/download";
 import type { Collection } from "@/media/collection";
-import { EnteFile } from "@/media/file";
+import type { EnteFile } from "@/media/file";
 import { aboveFileViewerContentZ } from "@/new/photos/components/utils/z-index";
 import { getLocalCollections } from "@/new/photos/services/collections";
 import { CenteredFlex } from "@ente/shared/components/Container";

From 17d76e50daa8134a8a6ac37fb72c21e114e9f4ed Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 18:00:25 +0530
Subject: [PATCH 217/796] Fix lints

---
 .../photos/components/ImageEditorOverlay.tsx  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/packages/new/photos/components/ImageEditorOverlay.tsx b/web/packages/new/photos/components/ImageEditorOverlay.tsx
index ea54eea504..b5757fb12c 100644
--- a/web/packages/new/photos/components/ImageEditorOverlay.tsx
+++ b/web/packages/new/photos/components/ImageEditorOverlay.tsx
@@ -946,7 +946,7 @@ const FreehandCropRegion = forwardRef(
                 {/* Top overlay */}
                 <CropOverlayRegionTemplate
                     // Height up to the top of the crop box.
-                    sx={{ top: 0, left: 0, right: 0, height: cropBox.y + "px" }}
+                    sx={{ top: 0, left: 0, right: 0, height: `${cropBox.y}px` }}
                 />
 
                 {/* Bottom overlay */}
@@ -964,25 +964,25 @@ const FreehandCropRegion = forwardRef(
                 {/* Left overlay */}
                 <CropOverlayRegionTemplate
                     sx={{
-                        top: cropBox.y + "px",
+                        top: `${cropBox.y}px`,
                         left: 0,
                         // Width up to the left side of the crop box.
-                        width: cropBox.x + "px",
+                        width: `${cropBox.x}px`,
                         // Same height as the crop box.
-                        height: cropBox.height + "px",
+                        height: `${cropBox.height}px`,
                     }}
                 />
 
                 {/* Right overlay */}
                 <CropOverlayRegionTemplate
                     sx={{
-                        top: cropBox.y + "px",
+                        top: `${cropBox.y}px`,
                         right: 0,
                         // Width from the right side of the crop box to the
                         // right side of the canvas.
                         width: `calc(100% - ${cropBox.x + cropBox.width}px)`,
                         // Same height as the crop box.
-                        height: cropBox.height + "px",
+                        height: `${cropBox.height}px`,
                     }}
                 />
 
@@ -990,10 +990,10 @@ const FreehandCropRegion = forwardRef(
                     style={{
                         display: "grid",
                         position: "absolute",
-                        left: cropBox.x + "px",
-                        top: cropBox.y + "px",
-                        width: cropBox.width + "px",
-                        height: cropBox.height + "px",
+                        left: `${cropBox.x}px`,
+                        top: `${cropBox.y}px`,
+                        width: `${cropBox.width}px`,
+                        height: `${cropBox.height}px`,
                         border: "1px solid white",
                         gridTemplateColumns: "1fr 1fr 1fr",
                         gridTemplateRows: "1fr 1fr 1fr",

From 8f540f23dc0083c3bd447a1cf64516766dc9b392 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 18:03:02 +0530
Subject: [PATCH 218/796] Types

---
 web/packages/new/photos/components/ImageEditorOverlay.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/packages/new/photos/components/ImageEditorOverlay.tsx b/web/packages/new/photos/components/ImageEditorOverlay.tsx
index b5757fb12c..47464044ff 100644
--- a/web/packages/new/photos/components/ImageEditorOverlay.tsx
+++ b/web/packages/new/photos/components/ImageEditorOverlay.tsx
@@ -172,7 +172,7 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = ({
         };
     };
 
-    const handleDragStart = (e) => {
+    const handleDragStart: React.MouseEventHandler = (e) => {
         if (currentTab !== "crop") return;
 
         const rect = cropBoxRef.current.getBoundingClientRect();
@@ -206,7 +206,7 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = ({
         setStartY(e.pageY - offsetY);
     };
 
-    const handleDrag = (e) => {
+    const handleDrag: React.MouseEventHandler = (e) => {
         if (!isDragging && !isGrowing) return;
 
         // d- variables are the delta change between start and now
@@ -258,7 +258,7 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = ({
         }
     };
 
-    const handleDragEnd = () => {
+    const handleDragEnd: React.MouseEventHandler = () => {
         setStartX(0);
         setStartY(0);
 
@@ -566,7 +566,7 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = ({
                 <Stack
                     direction="row"
                     onMouseUp={handleDragEnd}
-                    onMouseMove={isDragging ? handleDrag : null}
+                    onMouseMove={isDragging ? handleDrag : undefined}
                     onMouseDown={handleDragStart}
                     sx={{
                         width: "100%",

From cacf4212c7949b2a9755da0236f5fd028f866df5 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 18:05:16 +0530
Subject: [PATCH 219/796] Silence some

---
 web/packages/new/photos/components/ImageEditorOverlay.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/web/packages/new/photos/components/ImageEditorOverlay.tsx b/web/packages/new/photos/components/ImageEditorOverlay.tsx
index 47464044ff..089794a944 100644
--- a/web/packages/new/photos/components/ImageEditorOverlay.tsx
+++ b/web/packages/new/photos/components/ImageEditorOverlay.tsx
@@ -1,3 +1,9 @@
+/* TODO: Audit this file */
+/* eslint-disable @typescript-eslint/no-floating-promises */
+/* eslint-disable @typescript-eslint/no-unnecessary-condition */
+/* eslint-disable react-hooks/exhaustive-deps */
+/* eslint-disable @typescript-eslint/prefer-promise-reject-errors */
+
 import type { MiniDialogAttributes } from "@/base/components/MiniDialog";
 import { SidebarDrawer } from "@/base/components/mui/SidebarDrawer";
 import {
@@ -450,7 +456,7 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = ({
 
     useEffect(() => {
         if (!open || !file) return;
-        loadCanvas();
+        void loadCanvas();
     }, [open, file]);
 
     const handleClose = () => {

From 1bdbfe058069a08f3dc3bad15de97b59f718d8d4 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 18:06:13 +0530
Subject: [PATCH 220/796] More

---
 .../photos/components/ImageEditorOverlay.tsx  | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/web/packages/new/photos/components/ImageEditorOverlay.tsx b/web/packages/new/photos/components/ImageEditorOverlay.tsx
index 089794a944..427f37e497 100644
--- a/web/packages/new/photos/components/ImageEditorOverlay.tsx
+++ b/web/packages/new/photos/components/ImageEditorOverlay.tsx
@@ -320,32 +320,27 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = ({
                 const filterString = `brightness(${brightness}%) contrast(${contrast}%) blur(${blurRadius}px) saturate(${saturation}%) invert(${
                     invert ? 1 : 0
                 })`;
-                const context = canvas.getContext("2d");
-                context.imageSmoothingEnabled = false;
+                const ctx = canvas.getContext("2d")!;
+                ctx.imageSmoothingEnabled = false;
 
-                context.filter = filterString;
+                ctx.filter = filterString;
 
                 const image = new Image();
-                image.src = fileURL;
+                image.src = fileURL!;
 
                 await new Promise((resolve, reject) => {
                     image.onload = () => {
                         try {
-                            context.clearRect(
-                                0,
-                                0,
-                                canvas.width,
-                                canvas.height,
-                            );
-                            context.save();
-                            context.drawImage(
+                            ctx.clearRect(0, 0, canvas.width, canvas.height);
+                            ctx.save();
+                            ctx.drawImage(
                                 image,
                                 0,
                                 0,
                                 canvas.width,
                                 canvas.height,
                             );
-                            context.restore();
+                            ctx.restore();
                             resolve(true);
                         } catch (e) {
                             reject(e);

From aa74948f4a795f7762f8279255fc4bc7d896862e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 18:10:51 +0530
Subject: [PATCH 221/796] Workaround bad types is file

---
 .../photos/components/ImageEditorOverlay.tsx  | 64 +++++++++++--------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/web/packages/new/photos/components/ImageEditorOverlay.tsx b/web/packages/new/photos/components/ImageEditorOverlay.tsx
index 427f37e497..3f5afc3e81 100644
--- a/web/packages/new/photos/components/ImageEditorOverlay.tsx
+++ b/web/packages/new/photos/components/ImageEditorOverlay.tsx
@@ -1,4 +1,5 @@
-/* TODO: Audit this file */
+/* TODO: Audit this file.
+   All the bangs shouldn't be needed with better types / restructuring. */
 /* eslint-disable @typescript-eslint/no-floating-promises */
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
 /* eslint-disable react-hooks/exhaustive-deps */
@@ -161,10 +162,10 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = ({
 
     const getCanvasBoundsOffsets = () => {
         const canvasBounds = {
-            height: canvasRef.current.height,
-            width: canvasRef.current.width,
+            height: canvasRef.current!.height,
+            width: canvasRef.current!.width,
         };
-        const parentBounds = parentRef.current.getBoundingClientRect();
+        const parentBounds = parentRef.current!.getBoundingClientRect();
 
         // calculate the offset created by centering the canvas in its parent
         const offsetX = (parentBounds.width - canvasBounds.width) / 2;
@@ -181,7 +182,7 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = ({
     const handleDragStart: React.MouseEventHandler = (e) => {
         if (currentTab !== "crop") return;
 
-        const rect = cropBoxRef.current.getBoundingClientRect();
+        const rect = cropBoxRef.current!.getBoundingClientRect();
         const offsetX = e.pageX - rect.left - rect.width / 2;
         const offsetY = e.pageY - rect.top - rect.height / 2;
 
@@ -291,7 +292,7 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = ({
             return;
         }
         try {
-            applyFilters([canvasRef.current, originalSizeCanvasRef.current]);
+            applyFilters([canvasRef.current, originalSizeCanvasRef.current!]);
             setColoursAdjusted(
                 brightness !== filterDefaultValues.brightness ||
                     contrast !== filterDefaultValues.contrast ||
@@ -315,7 +316,10 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = ({
             for (const canvas of canvases) {
                 const blurSizeRatio =
                     Math.min(canvas.width, canvas.height) /
-                    Math.min(canvasRef.current.width, canvasRef.current.height);
+                    Math.min(
+                        canvasRef.current!.width,
+                        canvasRef.current!.height,
+                    );
                 const blurRadius = blurSizeRatio * blur;
                 const filterString = `brightness(${brightness}%) contrast(${contrast}%) blur(${blurRadius}px) saturate(${saturation}%) invert(${
                     invert ? 1 : 0
@@ -385,7 +389,7 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = ({
             setCurrentRotationAngle(0);
 
             const img = new Image();
-            const ctx = canvasRef.current.getContext("2d");
+            const ctx = canvasRef.current.getContext("2d")!;
             ctx.imageSmoothingEnabled = false;
             if (!fileURL) {
                 const srcURLs =
@@ -404,23 +408,23 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = ({
                 img.onload = () => {
                     try {
                         const scale = Math.min(
-                            parentRef.current.clientWidth / img.width,
-                            parentRef.current.clientHeight / img.height,
+                            parentRef.current!.clientWidth / img.width,
+                            parentRef.current!.clientHeight / img.height,
                         );
                         setPreviewCanvasScale(scale);
 
                         const width = img.width * scale;
                         const height = img.height * scale;
-                        canvasRef.current.width = width;
-                        canvasRef.current.height = height;
+                        canvasRef.current!.width = width;
+                        canvasRef.current!.height = height;
 
                         ctx?.drawImage(img, 0, 0, width, height);
 
-                        originalSizeCanvasRef.current.width = img.width;
-                        originalSizeCanvasRef.current.height = img.height;
+                        originalSizeCanvasRef.current!.width = img.width;
+                        originalSizeCanvasRef.current!.height = img.height;
 
                         const oSCtx =
-                            originalSizeCanvasRef.current.getContext("2d");
+                            originalSizeCanvasRef.current!.getContext("2d");
 
                         oSCtx?.drawImage(img, 0, 0, img.width, img.height);
 
@@ -491,7 +495,7 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = ({
             const collection = collections.find(
                 (c) => c.id == file.collectionID,
             );
-            onSaveEditedCopy(await getEditedFile(), collection, file);
+            onSaveEditedCopy(await getEditedFile(), collection!, file);
             setFileURL(undefined);
         } catch (e) {
             log.error("Error saving copy to ente", e);
@@ -509,7 +513,7 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = ({
         setTransformationPerformed(true);
         cropRegionOfCanvas(canvasRef.current, x1, y1, x2, y2);
         cropRegionOfCanvas(
-            originalSizeCanvasRef.current,
+            originalSizeCanvasRef.current!,
             x1 / previewCanvasScale,
             y1 / previewCanvasScale,
             x2 / previewCanvasScale,
@@ -669,6 +673,7 @@ export const ImageEditorOverlay: React.FC<ImageEditorOverlayProps> = ({
                     <Tabs
                         value={currentTab}
                         onChange={(_, value) => {
+                            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                             setCurrentTab(value);
                         }}
                     >
@@ -792,7 +797,10 @@ const canvasToFile = async (
             break;
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
     const blob = (await new Promise<Blob>((resolve) =>
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
         canvas.toBlob(resolve, mimeType),
     ))!;
 
@@ -805,8 +813,8 @@ const canvasToFile = async (
 };
 
 interface CommonMenuProps {
-    canvasRef: RefObject<HTMLCanvasElement>;
-    originalSizeCanvasRef: RefObject<HTMLCanvasElement>;
+    canvasRef: RefObject<HTMLCanvasElement | null>;
+    originalSizeCanvasRef: RefObject<HTMLCanvasElement | null>;
     setTransformationPerformed: (v: boolean) => void;
     canvasLoading: boolean;
     setCanvasLoading: (v: boolean) => void;
@@ -816,7 +824,7 @@ interface CommonMenuProps {
 type CropMenuProps = CommonMenuProps & {
     previewScale: number;
     cropBoxProps: CropBoxProps;
-    cropBoxRef: RefObject<HTMLDivElement>;
+    cropBoxRef: RefObject<HTMLDivElement | null>;
     resetCropBox: () => void;
 };
 
@@ -850,7 +858,7 @@ const CropMenu: React.FC<CropMenuProps> = (props) => {
                         setTransformationPerformed(true);
                         cropRegionOfCanvas(canvasRef.current, x1, y1, x2, y2);
                         cropRegionOfCanvas(
-                            originalSizeCanvasRef.current,
+                            originalSizeCanvasRef.current!,
                             x1 / props.previewScale,
                             y1 / props.previewScale,
                             x2 / props.previewScale,
@@ -873,7 +881,7 @@ const cropRegionOfCanvas = (
     topLeftY: number,
     bottomRightX: number,
     bottomRightY: number,
-    scale: number = 1,
+    scale = 1,
 ) => {
     const context = canvas.getContext("2d");
     if (!context || !canvas) return;
@@ -1191,9 +1199,9 @@ const TransformMenu: React.FC<CommonMenuProps> = ({
         (widthRatio: number, heightRatio: number) => () => {
             try {
                 setCanvasLoading(true);
-                cropCanvas(canvasRef.current, widthRatio, heightRatio);
+                cropCanvas(canvasRef.current!, widthRatio, heightRatio);
                 cropCanvas(
-                    originalSizeCanvasRef.current,
+                    originalSizeCanvasRef.current!,
                     widthRatio,
                     heightRatio,
                 );
@@ -1212,9 +1220,9 @@ const TransformMenu: React.FC<CommonMenuProps> = ({
     const createRotationHandler = (rotation: "left" | "right") => () => {
         try {
             setCanvasLoading(true);
-            rotateCanvas(canvasRef.current, rotation === "left" ? -90 : 90);
+            rotateCanvas(canvasRef.current!, rotation === "left" ? -90 : 90);
             rotateCanvas(
-                originalSizeCanvasRef.current,
+                originalSizeCanvasRef.current!,
                 rotation === "left" ? -90 : 90,
             );
             setCanvasLoading(false);
@@ -1228,8 +1236,8 @@ const TransformMenu: React.FC<CommonMenuProps> = ({
         (direction: "vertical" | "horizontal") => () => {
             try {
                 setCanvasLoading(true);
-                flipCanvas(canvasRef.current, direction);
-                flipCanvas(originalSizeCanvasRef.current, direction);
+                flipCanvas(canvasRef.current!, direction);
+                flipCanvas(originalSizeCanvasRef.current!, direction);
                 setCanvasLoading(false);
                 setTransformationPerformed(true);
             } catch (e) {

From 30ed06cfdaf68fca896e3b439736db2bf4eba792 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 14 Feb 2025 19:30:41 +0530
Subject: [PATCH 222/796] [mob] Remove internal flag

---
 .../ui/settings/advanced_settings_screen.dart | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/mobile/lib/ui/settings/advanced_settings_screen.dart b/mobile/lib/ui/settings/advanced_settings_screen.dart
index 7969980cbf..0da7aab7ca 100644
--- a/mobile/lib/ui/settings/advanced_settings_screen.dart
+++ b/mobile/lib/ui/settings/advanced_settings_screen.dart
@@ -117,28 +117,26 @@ class AdvancedSettingsScreen extends StatelessWidget {
                           },
                         ),
                       ),
-                      if (flagService.internalUser) ...[
-                        const SizedBox(height: 24),
-                        MenuItemWidget(
-                          captionedTextWidget: CaptionedTextWidget(
-                            title: S.of(context).videoStreaming,
-                          ),
-                          menuItemColor: colorScheme.fillFaint,
-                          singleBorderRadius: 8,
-                          alignCaptionedTextToLeft: true,
-                          trailingWidget: ToggleSwitchWidget(
-                            value: () => PreviewVideoStore
-                                .instance.isVideoStreamingEnabled,
-                            onChanged: () async {
-                              final isEnabled = PreviewVideoStore
-                                  .instance.isVideoStreamingEnabled;
-
-                              await PreviewVideoStore.instance
-                                  .setIsVideoStreamingEnabled(!isEnabled);
-                            },
-                          ),
+                      const SizedBox(height: 24),
+                      MenuItemWidget(
+                        captionedTextWidget: CaptionedTextWidget(
+                          title: S.of(context).videoStreaming,
                         ),
-                      ],
+                        menuItemColor: colorScheme.fillFaint,
+                        singleBorderRadius: 8,
+                        alignCaptionedTextToLeft: true,
+                        trailingWidget: ToggleSwitchWidget(
+                          value: () => PreviewVideoStore
+                              .instance.isVideoStreamingEnabled,
+                          onChanged: () async {
+                            final isEnabled = PreviewVideoStore
+                                .instance.isVideoStreamingEnabled;
+
+                            await PreviewVideoStore.instance
+                                .setIsVideoStreamingEnabled(!isEnabled);
+                          },
+                        ),
+                      ),
                       const SizedBox(
                         height: 24,
                       ),

From 7302f1d4abbeb2f2c39f759e8ae36a92e1817ffd Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Sun, 16 Feb 2025 19:54:53 +0530
Subject: [PATCH 223/796] feat: create video-streaming.md

---
 docs/docs/photos/faq/video-streaming.md | 35 +++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 docs/docs/photos/faq/video-streaming.md

diff --git a/docs/docs/photos/faq/video-streaming.md b/docs/docs/photos/faq/video-streaming.md
new file mode 100644
index 0000000000..5ef25150f7
--- /dev/null
+++ b/docs/docs/photos/faq/video-streaming.md
@@ -0,0 +1,35 @@
+---
+title: Video Streaming FAQ
+description:
+    Frequently asked questions about Ente's Video Streaming feature
+---
+
+# Video Streaming
+
+## Mobile
+
+### How to enable Video Streaming?
+
+- Open the Drawer.
+- In that Go to General -> Advanced
+- Switch on the Toggle for `Video Streaming`
+
+### What happens when I enable Video Streaming
+
+It adds all the past 30 days videos to a queue and begin creation of a preview file for both local and remote videos.
+
+This may consume bandwidth for downloading of remote files and uploading of the generated preview files.
+
+### What is the Preview file
+
+The preview file is a HLS Encrypted video file with a .m3u8 playlist that will help us play the video with support of random seeking without downloading the complete video. Currently it converts video into 720p with 2mbps bitrate H.264 format.
+
+The preview video file (.ts) is single file which is AES encrypted whereas the playlist file (.m3u8) is encrypted using the ChaCha20 Encryption method so even we can't read the duration and number of chunks of the video file.
+
+### Will the previews consume space in my storage?
+
+No, as of today we are not counting the preview files in your storage consumption, but this might change in future.
+
+### Something doesn't seem right, what to do?
+
+As Video Streaming is still in beta, some things might not working correctly. For that you can either use the #feedback channel in discord or send a ticket to support at ente.io with the relevant title and message regarding the issue.

From d1d8144fd155287d9224e9719e3ba961fd7caf26 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Sun, 16 Feb 2025 19:59:12 +0530
Subject: [PATCH 224/796] Update sidebar.ts

---
 docs/docs/.vitepress/sidebar.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/docs/.vitepress/sidebar.ts b/docs/docs/.vitepress/sidebar.ts
index 361811638a..64fb76b8d5 100644
--- a/docs/docs/.vitepress/sidebar.ts
+++ b/docs/docs/.vitepress/sidebar.ts
@@ -138,6 +138,10 @@ export const sidebar = [
                         text: "Machine Learning",
                         link: "/photos/faq/machine-learning",
                     },
+                    {
+                        text: "Video Streaming",
+                        link: "/photos/faq/video-streaming",
+                    },
                 ],
             },
             {

From 9d421e79a770b76879e44561bc56264a27ee1d1b Mon Sep 17 00:00:00 2001
From: vishnukvmd <vishnu@ente.io>
Date: Sun, 16 Feb 2025 21:30:25 +0530
Subject: [PATCH 225/796] Cosmetic changes

---
 docs/docs/photos/faq/video-streaming.md | 56 ++++++++++++++++++-------
 1 file changed, 42 insertions(+), 14 deletions(-)

diff --git a/docs/docs/photos/faq/video-streaming.md b/docs/docs/photos/faq/video-streaming.md
index 5ef25150f7..81018b30b9 100644
--- a/docs/docs/photos/faq/video-streaming.md
+++ b/docs/docs/photos/faq/video-streaming.md
@@ -6,30 +6,58 @@ description:
 
 # Video Streaming
 
-## Mobile
+> [!NOTE]
+>
+> Video streaming is available in beta on mobile apps starting v0.9.98.
 
-### How to enable Video Streaming?
+### How to enable video streaming?
 
-- Open the Drawer.
-- In that Go to General -> Advanced
-- Switch on the Toggle for `Video Streaming`
+- Open Settings -> General -> Advanced
+- Switch on the toggle for `Video streaming`
 
-### What happens when I enable Video Streaming
+### What happens when I enable video streaming?
 
-It adds all the past 30 days videos to a queue and begin creation of a preview file for both local and remote videos.
+Enabling video streaming will start processing videos captured in the last 30
+days, generating streams for each. Both local and remote videos will be
+processed, so this may consume bandwidth for downloading of remote files and
+uploading of the generated streams.
 
-This may consume bandwidth for downloading of remote files and uploading of the generated preview files.
+### How can I view video streams?
 
-### What is the Preview file
+Settings -> Backup > Backup status will show details regarding the processing
+status for videos. Processed videos will have a green play button next to them.
+You can open these videos by tapping on them.
 
-The preview file is a HLS Encrypted video file with a .m3u8 playlist that will help us play the video with support of random seeking without downloading the complete video. Currently it converts video into 720p with 2mbps bitrate H.264 format.
+Processed videos will show a `Play stream` button, clicking which will load and
+play the stream.
 
-The preview video file (.ts) is single file which is AES encrypted whereas the playlist file (.m3u8) is encrypted using the ChaCha20 Encryption method so even we can't read the duration and number of chunks of the video file.
+Clicking on the `Info` icon within the original video will show details
+about the generated stream.
 
-### Will the previews consume space in my storage?
+### What is a stream?
 
-No, as of today we are not counting the preview files in your storage consumption, but this might change in future.
+Stream is an encrypted HLS file with an `.m3u8` playlist that helps play a video
+with support for seeking **without** downloading the full file.
+
+Currently it converts videos into `720p` with `2mbps` bitrate in `H.264` format.
+The generated stream is single blob (encrypted with AES) while the playlist file
+(`.m3u8`) is another blob (encrypted using XChaCha20).
+
+We cannot read the contents, duration or the number of chunks within the
+generated stream.
+
+### Will streams consume space in my storage?
+
+While this feature is in beta, we will not count the storage consumed by your
+streams against your storage quota. This may change in the future. If it does,
+we will provide an option to opt-in to one of the following:
+1. Original videos only
+2. Compressed streams only
+3. Both
 
 ### Something doesn't seem right, what to do?
 
-As Video Streaming is still in beta, some things might not working correctly. For that you can either use the #feedback channel in discord or send a ticket to support at ente.io with the relevant title and message regarding the issue.
+As video streaming is still in beta, some things might not work correctly.
+Please create a thread within the `#feedback` channel on
+[Discord](https://discord.com/channels/948937918347608085/1121126215995113552)
+or reach out to [support@ente.io](mailto:support@ente.io).

From a9df48ea5d8319b8cf601224320788a5b4f084ec Mon Sep 17 00:00:00 2001
From: Crowdin Bot <support+bot@crowdin.com>
Date: Mon, 17 Feb 2025 00:36:04 +0000
Subject: [PATCH 226/796] New Crowdin translations by GitHub Action

---
 .../base/locales/ja-JP/translation.json       | 32 +++++++++----------
 .../base/locales/lt-LT/translation.json       | 14 ++++----
 .../base/locales/nl-NL/translation.json       | 28 ++++++++--------
 .../base/locales/pt-BR/translation.json       | 10 +++---
 .../base/locales/zh-CN/translation.json       | 28 ++++++++--------
 5 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/web/packages/base/locales/ja-JP/translation.json b/web/packages/base/locales/ja-JP/translation.json
index 2be62cb46b..9c99e5f0b4 100644
--- a/web/packages/base/locales/ja-JP/translation.json
+++ b/web/packages/base/locales/ja-JP/translation.json
@@ -102,7 +102,7 @@
     "unfavorite_key": "",
     "convert": "変換する",
     "multi_folder_upload": "複数のフォルダが検出されました",
-    "upload_to_choice": "",
+    "upload_to_choice": "アップロードしますか",
     "upload_to_single_album": "1つのアルバム",
     "upload_to_album_per_folder": "アルバムを分割",
     "session_expired": "セッション切れ",
@@ -110,14 +110,14 @@
     "password_generation_failed": "お使いのブラウザはEnteの暗号化基準を満たす強力なキーを生成できませんでした。モバイルアプリまたは別のブラウザを使用してみてください",
     "change_password": "パスワードを変更",
     "password_changed_elsewhere": "パスワードが他の場所で変更されました",
-    "password_changed_elsewhere_message": "",
+    "password_changed_elsewhere_message": "新しいパスワードを使用して認証するには、このデバイスで再度ログインしてください。",
     "go_back": "戻る",
-    "account": "",
+    "account": "アカウント",
     "recovery_key": "リカバリーキー",
     "do_this_later": "あとで行う",
     "save_key": "キーを保存",
     "recovery_key_description": "パスワードを忘れた場合、データを回復できる唯一の方法がこのキーです。",
-    "key_not_stored_note": "",
+    "key_not_stored_note": "私たちはこのキーを保持しません。そのためキーを安全な場所に保存してください",
     "recovery_key_generation_failed": "リカバリコードを生成できませんでした。もう一度やり直してください",
     "forgot_password": "パスワードを忘れた場合",
     "recover_account": "アカウントの復旧",
@@ -125,12 +125,12 @@
     "no_recovery_key_title": "リカバリーキーがありませんか？",
     "incorrect_recovery_key": "リカバリーキーが正しくありません",
     "sorry": "申し訳ありません",
-    "no_recovery_key_message": "",
+    "no_recovery_key_message": "エンドツーエンドの暗号化プロトコルの性質上、あなたのデータはパスワードやリカバリキーなしで復号できません",
     "no_two_factor_recovery_key_message": "",
     "contact_support": "お問い合わせ",
-    "help": "",
-    "ente_help": "",
-    "blog": "",
+    "help": "Help",
+    "ente_help": "Ente Help",
+    "blog": "ブログ",
     "request_feature": "機能をリクエスト",
     "support": "サポート",
     "cancel": "キャンセル",
@@ -189,7 +189,7 @@
     "cancel_subscription_message": "",
     "cancel_subscription_with_addon_message": "",
     "subscription_cancel_success": "",
-    "reactivate_subscription": "",
+    "reactivate_subscription": "サブスクリプションを再有効化",
     "reactivate_subscription_message": "再有効化すると、{{date, date}} に請求されます",
     "subscription_activate_success": "サブスクリプションが正常に有効になりました ",
     "thank_you": "Thank you",
@@ -205,11 +205,11 @@
     "delete_photos": "写真を削除",
     "keep_photos": "写真を残す",
     "share_album": "アルバムを共有",
-    "sharing_with_self": "",
-    "sharing_already_shared": "",
+    "sharing_with_self": "自分自身と共有することはできません",
+    "sharing_already_shared": "既に {{email}} と共有しています",
     "sharing_album_not_allowed": "アルバムの共有は許可されていません",
     "sharing_disabled_for_free_accounts": "無料アカウントでは共有は無効です",
-    "sharing_user_does_not_exist": "",
+    "sharing_user_does_not_exist": "そのメールアドレスのユーザーが見つかりませんでした",
     "search": "検索",
     "search_results": "検索結果",
     "no_results": "一致する結果が見つかりませんでした",
@@ -268,9 +268,9 @@
     "two_factor": "二要素",
     "two_factor_authentication": "二要素認証",
     "two_factor_qr_help": "",
-    "two_factor_manual_entry_title": "",
-    "two_factor_manual_entry_message": "",
-    "scan_qr_title": "",
+    "two_factor_manual_entry_title": "コードを手動で入力",
+    "two_factor_manual_entry_message": "このコードをお気に入りの認証アプリに入力してください",
+    "scan_qr_title": "代わりにQRコードをスキャン",
     "enable_two_factor": "二要素を有効化",
     "enable": "有効化",
     "enabled": "有効",
@@ -306,7 +306,7 @@
     "UNSUPPORTED_FILES": "",
     "SUCCESSFUL_UPLOADS": "",
     "SKIPPED_INFO": "",
-    "UNSUPPORTED_INFO": "",
+    "UNSUPPORTED_INFO": "Enteはこれらのファイル形式をサポートしていません",
     "BLOCKED_UPLOADS": "",
     "INPROGRESS_UPLOADS": "",
     "TOO_LARGE_UPLOADS": "",
diff --git a/web/packages/base/locales/lt-LT/translation.json b/web/packages/base/locales/lt-LT/translation.json
index 06a2e30217..b08dd943c7 100644
--- a/web/packages/base/locales/lt-LT/translation.json
+++ b/web/packages/base/locales/lt-LT/translation.json
@@ -112,7 +112,7 @@
     "password_changed_elsewhere": "Slaptažodis pakeistas kitur",
     "password_changed_elsewhere_message": "Prisijunkite iš naujo šiame įrenginyje, kad naudotumėte naują slaptažodį tapatybės nustatymui.",
     "go_back": "Eiti atgal",
-    "account": "",
+    "account": "Paskyra",
     "recovery_key": "Atkūrimo raktas",
     "do_this_later": "Daryti tai vėliau",
     "save_key": "Išsaugoti raktą",
@@ -128,9 +128,9 @@
     "no_recovery_key_message": "Dėl mūsų visapusio šifravimo protokolo pobūdžio jūsų duomenų negalima iššifruoti be slaptažodžio arba atkūrimo rakto",
     "no_two_factor_recovery_key_message": "Iš savo registruoto el. pašto adreso parašykite el. laišką adresu <a>{{{emailID}}</a>",
     "contact_support": "Susisiekti su palaikymo komanda",
-    "help": "",
-    "ente_help": "",
-    "blog": "",
+    "help": "Pagalba",
+    "ente_help": "„Ente“ pagalba",
+    "blog": "Tinklaraštis",
     "request_feature": "Prašyti funkcijos",
     "support": "Palaikymas",
     "cancel": "Atšaukti",
@@ -475,8 +475,8 @@
     "stop_watching_folder_message": "Jūsų esami failai nebus ištrinti, bet „Ente“ nebeatnaujins automatiškai susieto „Ente“ albumo, kai šiame aplanke bus atliekami pakeitimai.",
     "yes_stop": "Taip, stabdyti",
     "change_folder": "Keisti aplanką",
-    "view_logs": "",
-    "view_logs_message": "",
+    "view_logs": "Peržiūrėti žurnalus",
+    "view_logs_message": "<p>Tai parodys derinimo žurnalus, kuriuos galėsite išsiųsti mums el. laišku, kad padėtume išspręsti problemą.</p><p>Atkreipkite dėmesį, kad failų pavadinimai bus įtraukti, kad būtų lengviau atsekti problemas su konkrečiais failais.</p>",
     "weak_device_hint": "Interneto naršyklė, kurią naudojate, nėra pakankamai galinga, kad užšifruotų nuotraukas. Bandykite prisijungti prie „Ente“ kompiuteryje arba atsisiųskite „Ente“ mobiliąją / darbalaukio programą.",
     "drag_and_drop_hint": "Arba nutempkite į „Ente“ langą",
     "authenticate": "Nustatyti tapatybę",
@@ -605,7 +605,7 @@
     "reset": "Atkurti",
     "faster_upload": "Spartesni įkėlimai",
     "faster_upload_description": "Nukreipkite įkėlimus per netoliese esančius serverius",
-    "open_ente_on_startup": "",
+    "open_ente_on_startup": "Atverti „Ente“ paleidžiant",
     "cast_album_to_tv": "Paleisti albumą televizoriuje",
     "enter_cast_pin_code": "Įveskite žemiau esančiame televizoriuje matomą kodą, kad susietumėte šį įrenginį.",
     "code": "Kodas",
diff --git a/web/packages/base/locales/nl-NL/translation.json b/web/packages/base/locales/nl-NL/translation.json
index 4bbe05b76d..fcacb5b9e5 100644
--- a/web/packages/base/locales/nl-NL/translation.json
+++ b/web/packages/base/locales/nl-NL/translation.json
@@ -112,7 +112,7 @@
     "password_changed_elsewhere": "Wachtwoord elders gewijzigd",
     "password_changed_elsewhere_message": "Log opnieuw in op dit apparaat om uw nieuwe wachtwoord te gebruiken om te verifiëren.",
     "go_back": "Ga terug",
-    "account": "",
+    "account": "Account",
     "recovery_key": "Herstelsleutel",
     "do_this_later": "Doe dit later",
     "save_key": "Sleutel opslaan",
@@ -128,9 +128,9 @@
     "no_recovery_key_message": "Door de aard van ons end-to-end encryptieprotocol kunnen je gegevens niet worden ontsleuteld zonder je wachtwoord of herstelsleutel",
     "no_two_factor_recovery_key_message": "Stuur een e-mail naar <a>{{emailID}}</a> vanaf het door jou geregistreerde e-mailadres",
     "contact_support": "Klantenservice",
-    "help": "",
-    "ente_help": "",
-    "blog": "",
+    "help": "Hulp",
+    "ente_help": "Ente Hulp",
+    "blog": "Blog",
     "request_feature": "Vraag nieuwe functie aan",
     "support": "Ondersteuning",
     "cancel": "Annuleren",
@@ -205,11 +205,11 @@
     "delete_photos": "Foto's verwijderen",
     "keep_photos": "Foto's behouden",
     "share_album": "Album delen",
-    "sharing_with_self": "",
-    "sharing_already_shared": "",
+    "sharing_with_self": "Je kunt niet met jezelf delen",
+    "sharing_already_shared": "Je deelt dit al met {{email}}",
     "sharing_album_not_allowed": "Album delen niet toegestaan",
     "sharing_disabled_for_free_accounts": "Delen is uitgeschakeld voor gratis accounts",
-    "sharing_user_does_not_exist": "",
+    "sharing_user_does_not_exist": "Kan geen gebruiker met dat e-mailadres vinden",
     "search": "Zoeken",
     "search_results": "Zoekresultaten",
     "no_results": "Geen resultaten gevonden",
@@ -475,8 +475,8 @@
     "stop_watching_folder_message": "Uw bestaande bestanden zullen niet worden verwijderd, maar Ente stopt met het automatisch bijwerken van het gekoppelde Ente album bij wijzigingen in deze map.",
     "yes_stop": "Ja, stop",
     "change_folder": "Map wijzigen",
-    "view_logs": "",
-    "view_logs_message": "",
+    "view_logs": "Bekijk logs",
+    "view_logs_message": "<p>Dit zal logboeken tonen, die je ons kunt e-mailen om te helpen bij jouw probleem.</p><p>Hou er rekening mee dat bestandsnamen worden inbegrepen om problemen met specifieke bestanden bij te houden.</p>",
     "weak_device_hint": "De webbrowser die u gebruikt is niet krachtig genoeg om uw foto's te versleutelen. Probeer in te loggen op uw computer, of download de Ente mobiel/desktop app.",
     "drag_and_drop_hint": "Of sleep en plaats in het Ente venster",
     "authenticate": "Verifiëren",
@@ -605,7 +605,7 @@
     "reset": "Herstellen",
     "faster_upload": "Snellere uploads",
     "faster_upload_description": "Uploaden door nabije servers",
-    "open_ente_on_startup": "",
+    "open_ente_on_startup": "Open Ente tijdens opstarten",
     "cast_album_to_tv": "Album afspelen op TV",
     "enter_cast_pin_code": "Voer de code in die u op de TV ziet om dit apparaat te koppelen.",
     "code": "Code",
@@ -654,8 +654,8 @@
     "server_endpoint": "Server eindpunt",
     "more_information": "Meer informatie",
     "save": "Opslaan",
-    "theme": "",
-    "system": "",
-    "light": "",
-    "dark": ""
+    "theme": "Thema",
+    "system": "Systeem",
+    "light": "Licht",
+    "dark": "Donker"
 }
diff --git a/web/packages/base/locales/pt-BR/translation.json b/web/packages/base/locales/pt-BR/translation.json
index 62bd0e65e5..ddcba909b7 100644
--- a/web/packages/base/locales/pt-BR/translation.json
+++ b/web/packages/base/locales/pt-BR/translation.json
@@ -129,7 +129,7 @@
     "no_two_factor_recovery_key_message": "Envie um e-mail a <a>{{emailID}}</a> do endereço de e-mail registrado",
     "contact_support": "Entrar em contato conosco",
     "help": "Ajuda",
-    "ente_help": "Ajuda Ente",
+    "ente_help": "Ente Ajuda",
     "blog": "Blog",
     "request_feature": "Solicitar recurso",
     "support": "Suporte",
@@ -364,7 +364,7 @@
     "exif_metadata_date": "Exif:DataMetadados",
     "custom_time": "Horário personalizado",
     "caption_character_limit": "Máximo de 5.000 caracteres",
-    "sharing_details": "Detalhes de compartilhamento",
+    "sharing_details": "Detalhes do compartilhamento",
     "modify_sharing": "Modificar compartilhamento",
     "add_collaborators": "Adicionar colaboradores",
     "add_new_email": "Adicionar um novo e-mail",
@@ -392,7 +392,7 @@
     "viewers": "Visualizadores",
     "add_more": "Adicionar mais",
     "or_add_existing": "Ou escolher existente",
-    "NOT_FOUND": "404 Página não encontrada",
+    "NOT_FOUND": "404 - Não encontrado",
     "link_expired": "Link expirado",
     "link_expired_message": "Este link expirou-se ou foi desativado",
     "manage_link": "Gerenciar link",
@@ -430,7 +430,7 @@
     "lock": "Bloquear",
     "file": "Arquivo",
     "folder": "Pasta",
-    "google_takeout": "Google Takeout",
+    "google_takeout": "Google takeout",
     "deduplicate_files": "Desduplicar arquivos",
     "remove_duplicates": "Excluir duplicados",
     "total_size": "Tamanho total",
@@ -455,7 +455,7 @@
     "enter_two_factor_otp": "Insira o código de 6 dígitos do aplicativo de autenticação.",
     "create_account": "Criar conta",
     "copied": "Copiado",
-    "upgrade_now": "Aprimorar agora",
+    "upgrade_now": "Melhorar agora",
     "renew_now": "Renovar agora",
     "storage": "Armazenamento",
     "used": "usado",
diff --git a/web/packages/base/locales/zh-CN/translation.json b/web/packages/base/locales/zh-CN/translation.json
index 4d23a25fe3..3125b800f1 100644
--- a/web/packages/base/locales/zh-CN/translation.json
+++ b/web/packages/base/locales/zh-CN/translation.json
@@ -112,7 +112,7 @@
     "password_changed_elsewhere": "密码已在别处更改",
     "password_changed_elsewhere_message": "请在此设备上再次登录以使用您的新密码进行身份验证。",
     "go_back": "返回",
-    "account": "",
+    "account": "账户",
     "recovery_key": "恢复密钥",
     "do_this_later": "稍后再做",
     "save_key": "保存密钥",
@@ -128,9 +128,9 @@
     "no_recovery_key_message": "由于我们端到端加密协议的性质，如果没有您的密码或恢复密钥，您的数据将无法解密",
     "no_two_factor_recovery_key_message": "请用您注册Ente账户的电子邮箱发一封邮件给 <a>{{emailID}}</a>",
     "contact_support": "联系支持",
-    "help": "",
-    "ente_help": "",
-    "blog": "",
+    "help": "帮助",
+    "ente_help": "Ente 帮助",
+    "blog": "博客",
     "request_feature": "功能建议",
     "support": "支持",
     "cancel": "取消",
@@ -205,11 +205,11 @@
     "delete_photos": "删除照片",
     "keep_photos": "保留照片",
     "share_album": "分享相册",
-    "sharing_with_self": "",
-    "sharing_already_shared": "",
+    "sharing_with_self": "您不能与自己共享",
+    "sharing_already_shared": "您已经与 {{email}} 共享了",
     "sharing_album_not_allowed": "不允许分享相册",
     "sharing_disabled_for_free_accounts": "免费账户禁用共享",
-    "sharing_user_does_not_exist": "",
+    "sharing_user_does_not_exist": "找不到拥有该电子邮件的用户",
     "search": "搜索",
     "search_results": "搜索结果",
     "no_results": "未找到任何结果",
@@ -475,8 +475,8 @@
     "stop_watching_folder_message": "您现有的文件不会被删除，但 Ente 将停止自动更新链接的 Ente 相册在此文件夹中的更改。",
     "yes_stop": "是的，停止",
     "change_folder": "更改文件夹",
-    "view_logs": "",
-    "view_logs_message": "",
+    "view_logs": "查看日志",
+    "view_logs_message": "<p>这将显示调试日志，您可以通过电子邮件将其发送给我们以帮助调试您的问题。</p><p>请注意，将包含文件名以帮助跟踪特定文件的问题。</p>",
     "weak_device_hint": "您使用的网络浏览器功能不够强大，无法加密您的照片。 请尝试在电脑上登录Ente，或下载Ente移动/桌面应用程序。",
     "drag_and_drop_hint": "或者拖动并拖动到 Ente 窗口",
     "authenticate": "身份认证",
@@ -605,7 +605,7 @@
     "reset": "重设",
     "faster_upload": "更快上传",
     "faster_upload_description": "通过附近的服务器路由上传",
-    "open_ente_on_startup": "",
+    "open_ente_on_startup": "启动时打开 Ente",
     "cast_album_to_tv": "在电视上播放相册",
     "enter_cast_pin_code": "输入您在下面的电视上看到的代码来配对此设备。",
     "code": "代码",
@@ -654,8 +654,8 @@
     "server_endpoint": "服务器端点",
     "more_information": "更多信息",
     "save": "保存",
-    "theme": "",
-    "system": "",
-    "light": "",
-    "dark": ""
+    "theme": "主题",
+    "system": "系统",
+    "light": "浅色",
+    "dark": "深色"
 }

From 91f356ceda4144b0a4273b84d62660a00da67fe6 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 10:51:23 +0530
Subject: [PATCH 227/796] [server] Publish Docker image automatically on 15th
 of every month

---
 .github/workflows/server-publish.yml | 21 +++++++++------------
 server/docs/publish.md               | 27 ++++++++++++---------------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/server-publish.yml b/.github/workflows/server-publish.yml
index a1d259480f..9f76b5c8ff 100644
--- a/.github/workflows/server-publish.yml
+++ b/.github/workflows/server-publish.yml
@@ -1,27 +1,24 @@
 name: "Publish ghcr (server)"
 
 on:
-    # Run manually, providing it the commit.
-    #
-    # To obtain the commit from the currently deployed museum, do:
-    # curl -s https://api.ente.io/ping | jq -r '.id'
-    #
-    # See server/docs/publish.md for more details.
+    # Run automatically on 15th of every month, at 05:00 UTC.
+    schedule:
+        - cron: '0 5 15 * *'
+    # Run manually if needed to publish out of schedule.
     workflow_dispatch:
-        inputs:
-            commit:
-                description: "Commit to publish the image from"
-                type: string
-                required: true
 
 jobs:
     publish:
         runs-on: ubuntu-latest
         steps:
+            - name: Determine commit from prod museum
+              run: |
+                  echo "museum_commit=$(curl -s https://api.ente.io/ping | jq -r .id)" >> $GITHUB_ENV
+
             - name: Checkout code
               uses: actions/checkout@v4
               with:
-                  ref: ${{ inputs.commit }}
+                  ref: ${{ env.museum_commit }}
 
             - name: Build and push
               uses: mr-smithers-excellent/docker-build-push@v6
diff --git a/server/docs/publish.md b/server/docs/publish.md
index 7da3b27c60..0c6ee2e4f5 100644
--- a/server/docs/publish.md
+++ b/server/docs/publish.md
@@ -21,26 +21,23 @@ commit to the GitHub Container Registry (GHCR) so that it can be used by folks
 without needing to clone our repository just for building an image. For more
 details about the use case, see [docker.md](docker.md).
 
-To publish such an external image, firstly find the commit of the currently
-running production instance.
+These images are published automatically by the "Publish (server)" workflow on
+the 15th of every month. If needed, the workflow can also be manually triggered
+invoked to publish out of schedule. It can be triggered on the GitHub UI, or by
 
-    curl -s https://api.ente.io/ping | jq -r '.id'
+```sh
+gh workflow run server-publish.yml
+```
 
-> We can publish from any arbitrary commit really, but by using the commit
-> that's already seen production for a few days, we avoid externally publishing
-> images with issues.
-
-Then, trigger the "Publish (server)" workflow, providing it the commit. You can
-trigger it either from GitHub's UI or using the `gh cli`. With the CLI, we can
-combine both these steps too.
-
-    gh workflow run server-publish.yml -F commit=`curl -s https://api.ente.io/ping | jq -r '.id'`
+> It uses the commit that is deployed on production museum instances. We can
+> publish from any arbitrary commit really, but by using the commit that's
+> already seen production, we avoid externally publishing images with issues.
 
 Once the workflow completes, the resultant image will be available at
 `ghcr.io/ente-io/server`. The image will be tagged by the commit SHA. The latest
 image will also be tagged, well, "latest".
 
 The workflow will also update the branch `server/ghcr` to point to the commit it
-used to build the image. This branch will be overwritten on each publish, and
-thus it `server/ghcr` points to the code from which the most recent ghcr docker
-image for museum has been built.
+used to build the image. This branch will be overwritten on each publish; thus
+`server/ghcr` will always points to the code from which the most recent ghcr
+docker image for museum has been built.

From b8304f0ec5046d5f2c0474e3443f69b59a0352cf Mon Sep 17 00:00:00 2001
From: Rflew33 <Firstliteseen@gmail.com>
Date: Mon, 17 Feb 2025 00:29:39 -0500
Subject: [PATCH 228/796] Additional Icons (#5072)

## Description
Added Aruba. OnShape, RealVNC icons
## Tests
---
 auth/assets/custom-icons/_data/custom-icons.json | 15 +++++++++++++++
 auth/assets/custom-icons/icons/aruba.svg         |  4 ++++
 auth/assets/custom-icons/icons/onshape.svg       |  1 +
 auth/assets/custom-icons/icons/realvnc.svg       |  1 +
 4 files changed, 21 insertions(+)
 create mode 100644 auth/assets/custom-icons/icons/aruba.svg
 create mode 100644 auth/assets/custom-icons/icons/onshape.svg
 create mode 100644 auth/assets/custom-icons/icons/realvnc.svg

diff --git a/auth/assets/custom-icons/_data/custom-icons.json b/auth/assets/custom-icons/_data/custom-icons.json
index 5c4c589815..f3fcbd9dfe 100644
--- a/auth/assets/custom-icons/_data/custom-icons.json
+++ b/auth/assets/custom-icons/_data/custom-icons.json
@@ -42,6 +42,11 @@
     {
       "title": "Anycoin Direct",
       "slug": "anycoindirect"
+    },
+     {
+      "title": "Aruba",
+      "slug": "aruba",
+      "hex": "ef8a33"
     },
     {
       "title": "AscendEX"
@@ -764,6 +769,11 @@
       "altNames": [
         "欧易"
       ]
+    },
+     {
+      "title": "OnShape",
+      "slug": "onshape",
+      "hex": "7abb5e"
     },
     {
       "title": "Parqet",
@@ -861,6 +871,11 @@
     {
       "title": "RealMe",
       "slug": "realme"
+    },
+     {
+      "title": "RealVNC",
+      "slug": "realvnc",
+      "hex": "488aec"
     },
     {
       "title": "Registro br",
diff --git a/auth/assets/custom-icons/icons/aruba.svg b/auth/assets/custom-icons/icons/aruba.svg
new file mode 100644
index 0000000000..c078116929
--- /dev/null
+++ b/auth/assets/custom-icons/icons/aruba.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#FF8300" fill-rule="evenodd" d="M12.1099561,17.3015551 C9.03598293,17.3015551 6.50849391,14.8423766 6.50849391,11.836714 C6.50849391,8.83105139 9.03598293,6.37187289 12.1099561,6.37187289 C15.1839292,6.37187289 17.7114182,8.83105139 17.7114182,11.836714 C17.7114182,14.8423766 15.1839292,17.3015551 12.1099561,17.3015551 L12.1099561,17.3015551 Z M12.1099561,2 C6.50849391,2 2,6.4401834 2,11.836714 C2,17.3015551 6.50849391,21.673428 12.1099561,21.673428 C14.4325135,21.673428 16.5501395,20.9220123 18.2579023,19.6241126 C19.28256,21.3318754 22.2199121,21.673428 22.2199121,21.673428 L22.2199121,11.836714 C22.2199121,6.4401834 17.7114182,2 12.1099561,2 L12.1099561,2 Z"/>
+</svg>
\ No newline at end of file
diff --git a/auth/assets/custom-icons/icons/onshape.svg b/auth/assets/custom-icons/icons/onshape.svg
new file mode 100644
index 0000000000..fa92df6eba
--- /dev/null
+++ b/auth/assets/custom-icons/icons/onshape.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 1452 1446" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><rect id="Artboard1" x="0" y="0" width="1451.76" height="1445.83" style="fill:none;"/><clipPath id="_clip1"><rect x="0" y="0" width="1451.76" height="1445.83"/></clipPath><g clip-path="url(#_clip1)"><use id="Background" xlink:href="#_Image2" x="1791" y="511" width="1557px" height="348px" transform="matrix(4.16667,0,0,4.16667,-7362.5,-2133.33)"/></g><defs><image id="_Image2" width="1557px" height="348px" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABhUAAAFcCAYAAADPgj/FAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAgAElEQVR4nOzdT2hcR773/0+ibtRm6OletRdRg2GCvAo/yOpC4r8kutwhgrvJkIH7ZGwiZxEY8DbEGctjh2wNA1lcO9gJAzPMLBWykHMtO3Z4drMJzyJN8sMPUhbuVfdPPKh9W/3Mb3HqWMftltR/TlWdOuf9gpBMJj5dlqvrVNW36vuVAAAAAAAAAAAAxvCCJP3rxbd8twM5UZ2vNmpLO7+XdELSJ1tru3d8twkAAAAAAAAAkI6S7wYgPxaWS29KO3+W1DD/6tTCcul+d/3Ib7afbLd9tg0AAAAAAAAAMLsXfTcA4VtYLr25sFy6J2ldewGF2Kna0s73C8ulq9X56vD/BwAAAAAAAAAICEEFTK06X20sLJeuKgomnDrgP21IumSCC2+6aR0AAAAAAAAAIG2kP8JUomDCzvt6/mbCQRqS1heWS/dFvQUAAAAAAAAACM6cJL38L4u+24FALCyX3vzl8Rf/p6R/k/SLKR9zTNL/+OXxF0v//N+/+F//Pfjv/5NaAwEAAAAAAAAA1pD+CGMxqY7uaXTdhGnFKZGupvQ8AAAAAAAAAIBFBBVwoLhuQm1p57EOrpswrYakSwvLpcfUWwAAAAAAAACAbCOogH0tLJferC3tfC/pkoOPi+st3KvOV9O6CQEAAAAAAAAASBFBBTxnYbn0poVUR+M6VVvaebywXLpKcAEAAAAAAAAAsoWgAp6KUx0pCibYSHU0ibjeAimRAAAAAAAAACAjSr4bgGyIggk778v9zYSDxCmR7kv6ZGtt947vBgEAAAAAAABAkc1J0sv/sui7HfBkYbn05i+Pv/g/Jf2bpF/4bs8+jkn6H788/mLpn//7F//rvwf//X98NwgAAAAAAAAAioj0RwVlUh3dk5+6CdOKUyJd9d0QAAAAAAAAACgiggoFE9dNqC3tPJb/ugnTaEi6tLBceky9BQAAAAAAAABwi6BCgSwsl96sLe18L+mS77akIK63cK86Xw3lpgUAAAAAAAAABI2gQgEsLJfeDDDV0bhO1ZZ2Hi8sl64SXAAAAAAAAAAAuwgq5Fic6khRMCHEVEeToN4CAAAAAAAAAFg2J0kv/8ui73YgZQvLpauVX+1+LunffLfFoV9IOvnL4y+e+eXxF3/+/1r/9//13SAAAAAAAAAAyBNuKuSMSXX0WFHdhKKmAzol6i0AAAAAAAAAQOoIKuSESXV0T/msmzCtU3FKJIILAAAAAAAAADA7ggqBi+sm1JZ2Hiv/dROm0dBevYU3fTcGAAAAAAAAAEJW8t0ATC/aJN/5s7iZMI6GopRI9yV9srW2e8d3gwAAAAAAAAAgNNxUCJCpm3BPpDqaRlxvgZRIAAAAAAAAADAhggoBiVMdKQomkOpoNnFKpKu+GwIAAAAAAAAAoXhBkv714lu+24FDmM3v98XNBBvakv6DlEgAAAAAAAAAcDBuKmScSXX0WNIlEVCwJa63cI+USAAAAAAAAACwP4IKGWVSHd0TdRNcOlVb2nlMvQUAAAAAAAAAGI2gQsbEdRNqSzuPRd0EX+J6C2/6bggAAAAAAAAAZEnJdwOwJ9rE3vmzuJmQBXFKpPuSPqHeAgAAAAAAAABwUyETTN2EeyLVURadUhRcICUSAAAAAAAAgMIjqOBRnOpIUTCBVEfZFqdEuuq7IQAAAAAAAADgywuS9K8X3/LdjsIxm9Pvi5sJIWpL+g9SIgEAAAAAAAAoGm4qOGZSHT2WdEkEFEIV11u457shAAAAAAAAAOASQQVHTKqje6JuQl5c664f+Y3vRgAAAAAAAACASyXfDci76ny1UVva+b20c8l3W5CK+5I+iVIfbftuCwAAAAAAAAA4RVDBooXl0pvSzp/FzYQ8oI4CAAAAAAAAgMIjqGBBFEzQR5JO+W4LUnGtu37kT9tPttu+GwIAAAAAAAAAPhFUSNFeqiOR6igf7nfXj/wmCiaQ6ggAAAAAAAAACCqkZGG5dFXaeV+kOsqDRKojggkAAAAAAAAAECOoMCOT6oi6CfnQlvSfW2u7H/tuCAAAAAAAAABkEUGFKZlUR38TdRPyIpHqCAAAAAAAAAAwCkGFCe3VTdihbkI+kOoIAAAAAAAAAMZEUGECUaqjHVId5QOpjgAAAAAAAABgQgQVxmDqJnwkUh3lxbXu+pE/keoIAAAAAAAAACZDUOEAe6mORKqjfLgv6RNSHQEAAAAAAADAdAgq7GNhuXRV2nlfpDrKg0TdBAAAAAAAAADAtAgqDDGpjqibkB9BpjpKpNz6hGAIAAAAAAAAgKwgqGCYVEd/E3UT8iLIVEcj6necWlgu3e+uH/lNaIERAAAAAAAAAPlT+KDCXt2EHeom5EOQqY4Oqd9xqra087imUpC3LgAAAAAAAADkxwuS9K8X3/LdDi9IdZQ7QW66R/U7NG79jrak/9xa2/3YbqsAAACQRZV2/fW0n1luDlqhzaEBAADgTyFvKoxIMYOwJdIDBZfqaNKgVkPSpYXl0glRbwEAAKCI/ijpTJoP7G/OnVBDBBUAAAAwlhd9N8Cl6ny1YU6Fr4uAQh60JS1tre2eDulklemH9xT1w2lvyZyStL6wXLpXna9y0wYAAAAAAACAE4W5qRAFE3bGTTGDbAsyBZCl+h3UWwAAAAAAAADgTO6DCtRNyJ1EqqNwOAhqXaot7bxfUym4ItUAAAAAAAAAwpHboII5Ff43keYoL9qSzIZ57usmTKuhKCXSfVFvAQAAAAAAAIAFuQsqWEoxA39CTnXkK6h1StKphWVSIgEAAAAAAABIV66CCtGp8B1SHeVHcJviGQtqxSmRggvKAAAAAAAAAMimXAQVTIqZj0Sqo7xIpO8JLdVR5oJaDUmXFpZL7+tp+igAAAAAAAAAmE7QQYW9U+HKwqlwpGMptI3vQIJa1FsAAAAAAAAAMLNggwoLy6Wr0s77ytapcEwv1FRHoRUDp94CAAAAAAAAgKkFF1Qwp8KzlmIG0wsu1VHG6iZMi3oLAAAAAAAAACYWTFAh0FPh2F9bAeb4z2jdhGlRbwEAAAAAAADARDIfVMjJqXA8K7jUO4HUTZjW03oL3fUjvwnpzwUAAAAAAACAW5kOKuTsVDikxKZ1aKmOClEM/FRtaedxTdRbAAAAAAAAADBaJoMKOT8VXkSJVEehBRMKWQz8Um1p51JNpSVSIgEAAAAAAABIylRQoWCnwougLSm4QsDckHlqfWG5lCikDQAAAAAAAKDoMhNUWFguXS3oqfC8Ci4/PzdkRjol6RT1FgAAAAAAAABIGQgqmI1cToXnR8CpjrghcwDqLQAAAAAAAADwF1QwG7l/E6fC8yLUVEfckJnMpdrSzvs1lf6DlEgAAAAAAABA8TgPKhS8AG5eBXd6nRsyM2mIegsAAAAAAABAITkNKlAAN3cSm8phpDqibkKq4noLwQWVAAAAAAAAAEzHSVCBjdzcSdRNCAN1E6yKUyIFl/4KAAAAAAAAwGSsBhXYyM2l4E6lUzfBiYakSwvLpfcVWMAJAAAAAAAAwPisBRXYyM2dUFMdkW7LLeotAAAAAAAAADmWelCBVEe5E2qqo7+JPugT9RYAAAAAAACAHEotqMBGbi4FtSG8l25rh3Rb2UG9BQAAAAAAACBHZg4qJDZySXWUH/e760d+EwUTQkp1tEOqo2yi3gIAAAAAAACQEzMFFdjIzZ1EqqOQggmk2wrE03oLe0ErAAAAAAAAACGZKqjARm7utCUFlZ6GdFtBO1Vb2nlcE/UWAAAAAAAAgNBMFFTYS3UkctbnR3CnxheWS1epm5ALcb0FUiIBAAAAAAAAgXhx3P9wYbl0tba0870IKOTFfUlLW2u7p0MKKBjfKmo/whenRLpnbkABAAAAAAAAyLBDbyqQ6ih3gkt1NMycar9j+iY1PfLhlKRT1FsAAAAAAAAAsm3fmwrV+WpjYbl0T9K6CCjkxbXu+pFXQg4oJG2t7d7prh95RdI1321Bak7Vlna+X1guXa3OVwkWAQAAAAAAABnzXFDBBBPiVEcEE/IhTnX0cd5OgG8/2W5vre1+3F0/clSkRMqLhqJ6C9+TEgkAAAAAAADIlmfSH0UbeDukk8mXpSIUwd1+st3eXtNpUiLlSlxv4b6kT4rQjwEAAAAAAICse1GKggmJVEdsxubDte76kaNF24jdWtu9s7W2e1RRSqRc3coosFOKggukRAIAAAAAAAA8i9MfnRSpjvIit6mOJmFSIlFvIV8u1ZZ2fu+7EQAAAAAAAECR7VuoGcFpKwomnC7a7YT9xPUWJC2JegsAAAAAAAAAMDOCCvlwrbt+5BWCCaOZlEinFQUXCnt7AwAAAAAAAABmVTr8P0GG3e+uH/lNlOZo23dbMm9rbfdOdb76ikmhc8l3ewAAAAAAAAAgNNxUCNPTVEdFrpswjTglUnf9yFGREgkAAAAAAAAAJkJQISxtSde21naPkupoNia4cFqkRAIAAAAAAACAsZH+KByJVEdIiwnOHF1YLl2V9L6khucmAQAAAAAAAEBmcVMh++4rsFRHlXb99Uq7fqPSrr/uuy3jMimRXpF0zXdbAAAAAAAAACCrCCpkV5zq6HQoqY6q89VGpV2/IemBpBVJDyrt+o3qfDWI0/9xvQVFKZGotwAAAAAAAAAAQwgqZNO17vqRV8wGdxAq7fq5/uZcS1EwIWmlvznXqrTr5zw0aypba7t3qLcAAAAAAAAAAM8jqJAtcaqjjwNLdfSDpFuSavv8ZzVJtyrt+t3AUiLdISUSAAAAAAAAAOwhqJANbZm6CYGlOrqrKNXR4pi/7IyilEiroaVE6q4fOSpSIgEAAAAAAAAoOIIK/sWpjkIKJqz2N+ceKwoSTONyf3PuQUgpkUxw4bRIiQQAAAAAAACgwAgq+BNiqqNz/c25B5Iup/C4RZmUSKHcWpCeS4kUxJ8bAAAAAAAAAKSFoIJ7waU6MnUT7iqqmzBuqqNxnTGFnFdTfq41iZRIr4iUSAAAAAAAAAAKhKCCWyGmOrqhqG7CtKmOxlGTdLnSrv8QUiHnoZRIBBcAAAAAAAAA5F7JdwMK4n53/chvojRH277bMpZKu36uL11XtOHvyqKiQs43y83BR6GkhTJBojsLy6Wrkt6XFEw6JwBhqM5XG/3Nuac3xcrNQSuUMRL5MBz07zU6D321Bdk3PGZJjFuYHe9C2Ma7DqFifIQrjJNIIqhgV1vSf0SbzsEEE16X9LnST3M0iZX+5tzbFdUv9hqd2x7bMZGttd2Pq/PVP9WWdn4v6ZLv9gDItsSE7A3z95Pm7y9paAzuD/3a/uacKqoPP7Ir6R/mn3+S9LOkR5J+ZLKHg5i++LKkY9rrhwfeUKy06X9FkRir4j7ykqRfmX/33HglPT9mSfuOWy1FfUWi3xRaYkPsDe31sWf615jvwmSf+lamP7HBVkyJfjVq/Dr0Jv4h7zr6F6wa0X9nXSswPuI5FsZJSdpI/DN9zSEzb0/OpUb5SdJ35ebg61n/PF6QpPf+69+vik3QNLUl/efW2u7HvhsyLjOQ/FV20xxNY0PSH0JbWC4sl96U9JGkU77bkjPXQvpeAbHEpu1ril7uPsbaeCHxraRvQhtXkR7zzv+1pHclvSo3txJbivred2LDOJOGNnVPap+AgWOMWyOYWmdpv0dOuP75mnfj7xT1Nxd9Ld4Q/lbSozQW08iOxLvtmKI+5er9Fkv2L8YrTGTEO9hn/2V8zKkMjJMSfS11lXb9nKJ9hrc1+Z9nS9Jfys3BZ9P8ORBUSF8i1VH2mUHlA0mXfbflEEGlRIqZ4MKfRUqktBBUQBA8bdpOY0PSl2KTdyxmA+xByo/d6DU6Z1N+5nMS7/vfyv9GsRQtKP6ulE7JYHKJceo1udvUTcOGCr5pF3JQYcaFrw0tSX9RgftTyBL9Katj2IakL12/50IeI8ZVadf/mfYze43OC2k/8yCJE8Unlb3DndLegZAvsvRnj8kEME5KicNHIWUr8c382X6o/f9cN0b8u4MODU2870pQIT33JX0SShFmaawOmDUtSZ+GNshU56sNUiKlhqACMiuxQRfSuJrEwuEQIQYVzLv+XWVzsZp0UywkrMvBODWskONWaBuGGQxq7qcl6VMCndkV0KGNUZwFGEIbI6YRalDB9OFPlO0N3lHiwyCFet+GaGiczPr8fz9eArKhMGvSP+r5P9+WpE91yIHBMQ4WXRn35gJBhdkFl+rogA4Yio1yc/BOaIOLCS78TaREmgVBBWRKDjfoYjNdg8yrkIIKAR4ciLGpl7Icj1PDCjNuhbJhmNg8W0nzuY4EmYI1rxKpsrJyw2UWXUl/t3kLP5QxYhahBRUCnpeNUpj3bUhyNk4m3RTBrKfMWHJr6F/PlNlln0NoLUnvHfZzf3GaD8RT17rrR14JZZOzOl9tVNr1G4o2REINKEjSmf7mXGu46nzWbT/Zbm+t7Z6WtKQoGAUgUPF42t+cayl6qedhgZC0KOlyf3PucaVdvxvaeFtklXb99Uq7/oPC7ZeLkm6Z9/xqdb5K+sApFWCcGpYct27Qd/wxfW/V9L0QAwpStFZ6wDvQr0q7fs680x4o6kt52CirSVphjpV/8VhYadc7ytd7+Jn3LX3YH9PH8jhOJq0oeh//UGnXzxV5fmf2c5MBhY1yc3C01+hcmCXA12t0bptDbucVBROk6Hv+lQk47IugwnTuS1raWtv9OJTIbKVdPxf4xD6pK+liqJHKrbXdO1tru0clXRPBBSAoZsP2Rn9z7rHyOWkbJd5Y+eGwSQX8MYuKu4oWFHlYtNYULVgJLkwoEUwo0jg1bIXggh9mzfFAUb22PPQ9gguO5XgjdpSn/YuxKj+GAqt5GQv3E2/4MkY6NNTH8j5Oxgp98MgEFOL93K6k871G52yae9K9Rud2uTk4ob1aDDVJtw7aAyCoMLmlrbXd06HUThg6sZiHl9nNcnOwmIecy1trux9314+8oii4ACDDhjZs8xCcncaioknFDywasiVxcCDkW4j7iYMLDwhqHWxEMAEEF5xJvCfzurkRb/7Slywq0EbssDOMVfmQmJMVrg+LAJl1BQtY7adwB49GBBTesrUnuv1ku524tRDbN7BAUGF817rrR46GEkzI4YnFVK71ZI1JifSxopRI9323B8Czhjbp8rhhO41FcSIpE4Y28fK+qIiDWixWR8jZjVQbVszi85zvhuRRzgObw+hLFiTSdxR1kyxG/wpUDg9zTosAmSUFDljtJxlcOOe7MbZU2vVVPR9QsJ61xQQtkoGF66PW/gQVDhdUqqNE5DIvG2AtWbjWkzUmJdJpUW8ByAw26Q7FqU2PKu366wXaxEs6k/fFwyQKFliaVXyFm8BUShL12orW/+hLKSnADZdp0L8CYzb98nKYMy0EyFJCwOpQ8ZiZu9v05vdz2fxPZwGFmAksXDH/sybp8+H/hqDC/toKL9VRModp6LqSrvQaneN5SHU0rq213TukRAL8YuI2MRYNjiUWr0Xtn/HiYdV3Q3wygaUHKl5gaVYEplJQna82TP8rcuD9jEnNlqtNDFcKdsNlGvFYRf/KqMSaIQ/7LzYQIJtBInBPwGo88W36XBx4M7+H5Ca+04BCrNforGqvxsLi8PqLoMJo17rrR14JKJjwes5OeMR1E1Z9N8SHOCVSd/3IUZESCXDKbDIxcZsciwYHEic6WbxGLhe1zzFWzSwes274bkiIEpvB9L+9TYxzvhsSCm5YTaSmqH+t+m4InmW+81+JcXAcBMgmlDg4UuTA/bRW8hDw72/OfaC98eXmQQEFk5b4nxP+9cO4AZhyc/COooPfknQ5+WsIKjzrvqmbEFKqozhymYcTHi1JJ/JWN2FaJrhwWqREAqwbWuBiepzatCRxKjgP7/s0Fa7PmY0Mxqp0rFTa9R+KGJiaVqL/sRn8LIJUY+B2wtQu5+X0bR4UNO3brAiQjYmDI6mIA/6rvhsyDTPWXzT/s1tuDj6y8DGLigIwjw87GGH2Z+P2qL8590n8zwQVIk9THYWymZ2zXN9dRXUTjvu4zpN1pt7CUUUpkYLon0BICpyb3hZObaYs0UdZXIy2KOmrIgQWEhsZSM9if3PuAZt1h6P/HWqFwML+2Iid2QpjlV+JQ5152IPxpbC3TA/DITcrguxv5pZC/K68OOE+dUtRuqKD/uoO/Zpbh63dTVr6lvmfK/HPtOhBhbaka1tru0cDS3WUp1zfcaqj264+sNKunwvxpIdJiUS9BSBFiZMgeRhPs+ZWiGNt1piN8q9EHz1MTTkPLJjxio0MOwgsHIKNtLERWBiS2Cij/8yOscoT6sikqnC3TA9DnSyrQuxvvzV/706xV/qXXqNz9pC/6pLOD/2662M8+9P4H/qbc7+Wih1UuG/qJnzsuyHjSEzG8nINakOOUx0NBWTiwqKrIU3K4noLilIiUW8BmAEnLp3gVN0MCHpNLLeBBVIeOXGU8ep5bAhPhcCCQeo+KxbJT+9Woh/nYR8mKwpzy/QwiQNE9C974v52zndDDmP6Q9wX/m7rc0yw4kriX9UO+z6aXxPfcvhQKmZQ4b4CSnVkJvKrOUrN0VKU6uisq1RHQ7UnkgN1TdJlE7U856ItaTEpkU6LegvAxLi67NxigKdDvGMTeWq5CyyY3wt9wb6aOAX8DDaEZ1L4wAKp+6yqSfqKsco+AgpW5W7ONikOEDlV0xhpfjLgjcQ/f2Hzg8rNwWdD/+rlMX5ZHOhYrM5XG0UKKsSpjk4HlOronHmBXVb4g0xX0pVyc3DCcaqj1TFqTywqGlzuhvZC21rbvUNKJGB8XF32htNIEyCgMLPcLFLNhtHnvtsxoeG8ra2D//PMWUwWoCuy/ubcX8VG2iwKG1ggdZ8TNYKgdhFQcCKes53z3RDXmO97k/XAwknz967tg9hTHrT/Lv6H/ubcr0sptifLrnXXj/wphJsJ0tNJ2B+Vn1NBG+Xm4J3tJ9vt3hM3H2h+hp9rsgnAGUXFRW+Wm4OPQukv20+229tr+nhhuXTJd1uALGNh4F28aHjL1U21EJn31zg5LXGwmqTPq/PVE6G8z0fJ0KZuV9I/JP0k6WdJ30hSuTloTfPzTQR8XpZ0TNJLkn6l7Mx9Vyrt+ncuD8JkjdkMz8qfR8hWKu36z71GZ9V3Q1whoOBUdLuqGfa7LqtMgDkL7+C8i0+Q/1iUNQIBBe9uVdr113qNzgXfDRnhVfP3f9j+oBEHsH487NeUm4Ov+5tz8f88VoSgwv0oB/2273Ycymx4faL8nKBtSXqv1+g8dBVMMD/Dv2q2RdBKf3Pu7YrqF4u8mATyJICAQkvRRt23kh7JvNDH2bALYHMuicDCATxuxLQU9b2fZfrfYX3PfKcWtdfvTirqe1n6jgW92WL6g6/vcdwnvis3B1/v9/Obdn6X+P4/Nw6Y3/fLkt5VtLDytTFZqA2OJE8pAuPA1TPvwcN+/kPvwNcUvf989ptRLlfa9UdFWFcEElAYOeca57s+Ys6VhXdfdLuqoSxujgUrI6lSi7I+iBVijRBAQGFDe4dIHmnMMXLE2iDrfW6l0q4rg4GF+P35rYPPeibdUbk5aB02t99+st2uqB7/z5NFCCoEodKun+tHJxOzPAEbV1eS0w15M4B90I9SRaUhjpZ/KBMYSem5ABzLaEChJekvkr45aGEwzoZdIJtzSQQWRqjOVxv96Iadiz+jeMP4i/3+DMaZUKqhtob6nfm+/VrR5t5J+f/ehbzZ4jrtUUvSX8rNwWfJMcnVwZCnnxf1yYeSbktPF9+vSXpb7sewzyUdd/yZXpmft4uNtDiI8OVBgavDDL0Db8f/fuj9l4UNjet5D1KZ91gWAwobit5538z68x9jzvWGonef6z5XuBsxNjkcB4elFtAPcH0gFWCNkMGAwtN3saSZ3lH7rQ2kTPe5TN1MdZm6dURfvDnBXGxD5j1HUMGzKdP0ZJnz1EGWAzKLilIiPU3hZOEzAFiUofQhGxqxeWJzwy5jm3NJuUhNkyYHga+WpE9n2bwbh1lQ3NZen3td0u/kt89lasEwDvNddTVubUj6Q7yQdB1EOIz5c7tdna9+ZAJWH8rdz2ax0q6vFmWjzlFR8JuSnvk+2uhzyfdfItjpsu8My/V7L3GAIysbRSPnXDYl+txwgN3V5nRhbsTY5CEN5cj5meP1QTxXy8JhkLgI+WLexsoMBRS6iortOpsbH9DnfK9JpegwsTI4dj6a8tedrLTrqwf8/y/p+e96t9wcfDTNuPOCJL33X/9+VVJe87Hf31rbPe27EcNSStOTJc8sSF3wUHuiK+n68Am+rFhYLv3TdxscuBalMwPGk4GryyNP/maBmdj63GCRpFa5OQhmg8W8dx6k/Nj4irGtfur8/TxKfKNQ0kX5Wzyc8P1zGFelXe/I/s/paZpKy5+TOtfjV7k5OJqlcarSrt9V+vPf87J3SCczc+gM1K7b6DU6Zz19tjWW+uSknATPJ+U4qNUtNweLlvYZMvUOrbTrqa99y83BUUe3m7uS/p7FOo7m/ZqFG15BrREOY2kNMakNSV9mbfM8Q33O+xg31E/Gbs+M7+CJD4YnPm/jxSk/FFOqzlcblXZ9tb8515L/L00aWpLO9xqds66+gOZneEPRl83lz7Am6XJ/c+5BxqvFA5DXq8vS3th4vNforGZxQtxrdG73Gp3jkk4ommT6cNQsfIvsVdnppxvl5uCoy/fzQbafbLd7jc5quTlYlHRF0YLaNdfphKZixi7bAYWbZnzy3jem0Wt0bpebgxOKTr1bZ2qe5Z2NgEJX0buwnpV3Ya/ReWg29X29+87kbR2RgaLeG9qbc93OQj9LMu8/V3OuGvOq6TkozNyVdKXcHCz2Gp0LWeur0tP1wdlyc3BUjt6x+8jNGqE6X20oSg3ny01FG9RnsxZQkDLV575ymX5oDG/4bsA4uKngUEZOhabpiusTR+ZnmJXaE5k4/Zb5B7IAACAASURBVBnjpgKwx+NpkJakT7M4YTuM59ObV0JIL5KRU0aHCeL0uccbm5nva5V2/QfZmys6r3tlm8PCsN5PsMUycir8MM7XCdPwtLbolpuDXKT28JzOI4j33SiBpkDOzBgo2bmpYFFmbmtNyszXPpG/g1qZn7cdxHNtvyBTeHvO6uL9hkxibBu77w/NC+M6Qgf5rZ7tky0T+B63jfGNam4quFBp1183f8i3FNbEYT/x6UdnJ47Mz/AHRT/DLAQUpOhL+6DSrt8w0WcAGeDxNMiVcnNwItTNusTpzfNyf4r8csZOhoQoPhEcxOlzc3LTR3/LdF8zbbMZUHgr1DFqP71G56G5AdOy/FG/s/z8vHC+TpiFufWyKLe3FnJxmtxD7vlYUO+7Ucyc67j8zLng1oa5mRDEmDjMzNcuKLplY/s9O0qm522HcXD7ZZSWzM2EgPtcfKPQdZ9bzNDt1JNT/rpve43O6iF/HVd0czy2OO4tSrPXEu/JfktQwSKPaXpscT44mZ/hXUU/w6wGZFb6m3OtvF1lBkJlFuoug4/x2BjkYmGYpw0WKSrKRoB2Oi2zYL3tuyGTSvQ3l4uGPzr8rEnZ3Li+GOoG3GG2n2y3TTokm/1ohTHqUOdD3MTwFOQMOg2S+S58LveHvTZCfd+N4nHOBfvi4FdwY+IongNhQa4RPKXivWkOuQU/30v0uSuH/sfpWvH8fo7fBy/Z/BBzCyI5b353nF/X35xL7ss+IqhgSaVdP2fqJvgsEJoW56dBErUnHiuMgExNUdX4H0KOpAOhq7Trq3I7ZuRm4pbkaYMlFyc3PbjZa3SOh7xgNf3tuNzlUc3yZt60p5IOcyUvm3D7cRFYyNDptayJg+u3fTdkFqb9b8nde+9DR5+TOg+nb3O1QZuUmHO53jiDPbkKfiUlxkmXh0GCWyOYIIjLm1zxeziTtTpmYTa/Xd9auO5xX+8n8/dFB8G0v0zxa54egCo3B18TVEhZRtP0zOKm6xeiCcg8kHTZ1WemaFFRSqS7IUbTgZCZF7/LceN8HiduSR4WDlne7M2aeIPlgu+GpMX8XlxtqnyYtfe0aY+NTbpWyPmIJ2HG4/dkb1P4bUvPDdlGnoLrDtNpSVG6gVUHn5MqM99yeXCupRymbhuW2DgjHVLYbuYx+JWUOEHusqhuUGsExzfnc/UeHsW8m20Xuk+qKbqN58N38T/0N+d+bfmzHiX++dUxf018AKq1/WS7TVAhJYGk6ZnEhjxEOs2C+l2F/zM8Y1IirWZt0wLIMVcv/q5ycCJzXIlJnKvAwnXGzUPlMje+9HRT5byDj1rsb8594OBzxmZx4fCppedmkllUX7T0+FpImxoO5HLzzFE6rdjFkN55ibRHruR+syzJ/D5dnwJHenJ12OMw5vfqYs4WC2KNYOYJrm7O5/I9PIqHW11eAv9mfRcHl23faPwx8c+HBsGGar99K0kEFWaUSNPTUhhpeg7z9Gqpj8nbUMqN0CdTNUmX+5tzD1iAAnaZF76LYGS8mVuIxW0sscHi4nRIcFecHct9HzSTaReL1Kxt5r1m4ZmtPAafDmN+z7bmkTb+nEJ0M8+bZw4DC7WsBTgP4jjtUWE2y5I8HObA7OI9lNu+G+Ka+T27umGT+TWC47RHhQpixRweQJL8rRX+bv6+aDMNU7k5mPQ987QuXbk5+EgiqDAzMwm8rHykOrqSldx/pmjVCUVRyNCvgC4qSocFwALzord1KjUp95u5B0kEfV1cdQ7qirNDhemDZi5iu6/VHFwrnsSvLDzzWwvPDMV7lp5rq+5FSHIdUIg5SKcVy1qAcyTHaY+uFKGP7cfxbRnMJre3R8eVuGHjYt8m02sEh2mPChnEijk8gOQlkBVv2BvWbgcOB+0PCmCY/y8+SL8R/1qCCpCia6VHe43OapZOgpgNrFWT19RV7jQAgTGn5mxP3gqzmXsYs8h3scjNXM57zwrXB01fs/3+z1KhVBs3Xr+w8MwgmO+Kjf5j9dRYAAoRUIglNstsylqAcz9/PPw/ScX5otSBOQiBhWAUam62H8eBhUymQRradLWp0AGFmMPAgvNAltmXjQ9XLTr8/JcP+P+SwY0/xP9AUKHY4grxmb5Wmjgdy6QKwDMcnZor3GbuYRwtcjOX896zQvbBcnPwjuz2NZcT9X3ZWhwXsc8M+dLScw9adOXZRpECCjHzPbK9cZGlAOdzHOYIv8Jm2R4CC5l3nvfsHoeBhaymjXNRb4aAQoLDwILzd7S5rRB/l65bPNCSfL+M/H0OpZreSI57BBWKqatownY8pJdgr9F52Gt0jisaNEJPiQQgHS5OzRVyM/cgiUUuKSHcKOyiNZF+xKZ3LT//UP3NORs5ygt/y7PcHHxt6dHe+4wHLRPkKySzcWHzO5X1GzAuNlRuckPheQ7TcGEybO6O4Oh2lyRdztIawQRebdebIeg6gqPAgvNDSGbsj+tz1CR9fkCf/4OiQ9gnys3BZ5N8jlnTx3+9N/wZ5vd92fzP7vBckKBC8dw0dRNWfTdkWqbewqLc5PUGkFGOrpgWdjP3MGaiY/s0UlZPIrl0s+gLCPMdvGLxI85kaWGK9JhxysZG8EsWnpl172X5ZrMLZiFt8533O4vPnpqjzbJC3oIZl3kPuqgfhvEUfm52EEe3u+IUuFlhO/BK0PUAjmqxOU+7Zf7M43nsYn9z7sGoNpgD2A97jc7DSedqJjPMyF9v9luShccvDj+foEJxxKmOLuRhQWA6/gVF0bTCn8QDCsr2LQUWDIdwtMgt8m2F1lChrsIyp26spX/IQPDqDQvPLHKR5iQbKZBsb7BmDQF2PQ1S2XznvW3x2bOwvVlW6Fsw4zJzUpsBdoyHudkYHG3yrmRhjeAg8EqfG4ODun9e6h8NpYLdN7CQNhNQ+Ep7tStH3pQhqJB/XUULgaBSHY3LRNPOKoqEk2sSKAgHtxSYvI3JwaKhyLcVCn8yOGZ+Dp9a/IjfWnw2/PrRxkMznqomTRsE2PdYToNUy0KNlyQHm2Vd8a4b29CpVbhHf52A2eS12l8zclvBZuCVPjcBB+l5nddWGFFbZ7G/OffA5jzUvPsfaC+gsO9NGYIK+RanOrrtuyG2mZRIJxSd3iDfJJB/tm8pMHmbgAnA2AzsFvG2ws08HgaYheXNvMUC9rFCsPg9Kkqx5j/4bkAG2fyZvGbx2dOwvYFykXfdZByk4cL+6K8TctBfvd5WcBB4pc9NwMGNQue1FaTRgQVJX6Xdlup8tVFp1+9KupX41zcPSk9YSrMByIyNcnPwzvaT7Xbvie+muLP9ZLuthlar89XP+ptzf5X9XOsAPKjOVxt9u9/vK0zeJrP9ZLtdUf09RScabIiumzZ029Lzs6Zbbg4+KtI7fAJ/kKV+lsM+dtJ3AzLERsoQKzcgMobg5gi9RudhpV3fkJ25yNuSMlFbwJyCtLlZxi2YKZg510U9u+kD++ivU3DRX/ubcx+ooVVbzz/EuxafTZ+bQq/RuV1p19+Vvf2CDyX364XtJ9vtarN6IrHXWZN0q9Kufyjp01n6SnW+2uhvzn3QjwIy8e2ErqKg1oHPJaiQLy2ZzlTkjQgTXDhrJsKfq3h5b4Fcs3zNtUURrOmYTZabklYsfYSXCZwn17kpM5rpZy3Zebe/q+L0sUJhXJ8Kwc2D2Qpw1irt+usZCebYvBXaLTcH79C/puNg0wzPor/OwEF/vSi5DypYTsdLn5tBuTl4p78519LeBnmaFn29pxN7necUFVCuKVoTxcGFbyV9MU7bTCDh15Je6z+/ft+Q9IdxnkNQIR+6kq6zYHqW+QIcH/rCAQiYuaVgs5DhexafnXvl5uCj/ubc28rZBM6xbrk5+IxFxIE+lZ0Tb3nbnMnb7wduEdw8gOUA5xuSvL7rHNwKvUj/mo3ZNHvsux0FwXg4I8ubvLVKu37Ow6n+31l8Nn1uBuaGzHVJly19xO/k8T3da3RuV+erX5vDlnFAYNH8tVJp17uS/iHpJ0k/D/3ylySd7I+evzw9qD5uW6ipEL64bsKq74Zklam3sCi7hUQBOGCi6bYChBsF2LC2ykEeS5uT96xgEXEIM9G1kp83b8V3s1b0FcHolpuDz3w3IgC2isd7T13W35z7wOLjSemRAjNXYH1rX4vxcHYO1gg20xDtx9ZBN/pcCsweqa2af15reUjRd6rX6FwoNwdHFb0Lkr/XmqKDASuKAivJv1b0fEBhQ9L5XqNzfNL3M0GFcLUkneg1OhfYfDhc/IWTdEL2ijwCsM/ahNEUEsOMzETE1gTubd8TONtYRIzt75ae+4al5x7mG0vPzVrRV4Th76wvDlduDr629Ogs3DL6rcVnU/w7JeXm4CNRtNm2TxkP02F5jXDG5RrBHNqwddCNPpceW8H/+LCjd/FeZ6/ROa5ov/OKoj3Pg75rLUWBiPPl5uBor9E5O22wn6BCeLraiyBxonZCvUbnYa/ROSvpvOy90ABYYCaKthbaN5m8pcrWBK6WlQmcJfTD8X1h6bneTwinzPtJKgTJ1vcrV8x4beWwks9bU5YLNHMrNEWmD1733Y4ca3GrJnU2N3lt3rAaZuugG30uRZYDWT5uxxzI7HeumiDB8V6j88I+fx03gYjbs649CSqEJU51dNt3Q0JnUiLFUTxOdwABsLmZbE56ISVFm8Cl6DvfDQiF2ZSy8f5+ycIzD1VuDqwddLBc3B7502LTdyJfWnruy5aeOw6bqQa5pZAyc8OR9awd1jbAi8ryGsHmDaunLB90o8+lz9bP1OntmKwiqBCOK6Q6Spe5JrRq6i0AyD5bm8kbjK1WWJvAWXqub10ODUzMRgqkRR8LBMtj0Aq1FTABNjQmYDEFks/UZbZubHFLwQLz/rCVErDIODFuj633zKKLW14WD7p1Lb5TCstmICvnN+jHQlABhcdmIpB9lk+E2DplWGhmUmyrmO45G8/1jA2ByVm52dHfnPN12MBmzafreStCDTvY0JiMWUfY2Kz4lYVnHspy6iNuKVjCjVsr/uK7AXll+baCi1tetoK+1DOyx9b3Oc836MdCUAEAkHkWTwFwCskSyyfnjll6rk+kPpqQxc1PX2lHfrL47Jqkrwgs4BAtNjSm8q2FZ75q4ZnjsDX+kVbLIpv1PYrKpJWCPbY2eT+09Nykt208lOCgPRa/z77e1ZlBUAEAEIJjlp7LKSS7bBX7dJIz1SVOB0/ObKLYuA1zzMIzx2E7sBQHFs5Z/hyEy8bmeBHY+O7WLDxzHLZOXZJWyz5u3qaH1KiWWdzktZrG0hzOsDE+E9S3yGLgtVb0AzsEFQAAIbCyicwpJLvMqUQb15u95L23iIXE9P5h4Zm28okfyNyasl1ssybpVqVdv5uz7xDSwY2p6fxo46GeNiqspJokcG6fo3dIURCgsczm7RrLee5t3eYi8Gqfre/1G5aeGwSCCgCATDMbXzby+7KR64aVk685K4zF6eDp5e1n56q2xpn+5tzjSru+SnABCVY2x/MuL2l9LAYxOPXtDvWZZtclNaoztjZ5j1l6rmTpNheBV/ss/oy9HEbKCoIKAIBMs7h5zIkQN2ylQLJVJM2Hn303IGCPLDzzJQvPHJet78t+Lvc351oEFyDlZ3PcExu38lzXd7F12pJT3+5w22h2Nm5AYgSLm7w206TayKHPQTcHLN6OsXLDLxQEFQAAWXfM0nM5kemAxRRIv7LwTF++8d2AgNn4Htu4GTUWi9+Xg9S0F1y4QXChsCjyOhsbweFjFp55ECunLTmB6w4/61QQBHPE4iavlXmcmR/ZqKdAjT93rHy/i1xXgaACACDrbCxyW5zIdMpGippCnwpBrvm6RVWTtGLSIt2loDMwkZ98NyAFNm5pcQLXIZt56ouCwIxzwWzyWrw9z+Eid2wdKnR9szAzCCoAALLOxiI3b3nYs87Kdfy8nAohwDW9PP7sTC5n17cVhp1RVNC5U2nXb+Tlu4YD8V6cjY2bCs5SsVmsX8UJXPf4Lk+PIJhjFoM4NjZ5j1l4Zi7nslllftY2Ctofs/DMIBBUAABklsVFLjlnHeLUF0KTgU309zx/fqwmaUXSg0q7/oMJMJzz3CagKJyl+etvztlK+8YJXPf4mU+PgIxjJohj4yCFjdprNm7Pc7PIPRt1UwpbrJmgAgAgsywucqmn4JBZMNg4FWKrqKRLvk+kI4PMSaorvtsxZFFRgOFWpV3/Z5wiKQMBGKTjke8GwCsrqRs4geseP/OZcOjIDxs3vWwEZW3cHstD6rzQ2AgeOrtZmDUEFQAAWcYiNz84FTKajYVU0eQyMNNrdFaV7RNsZyTdUnSLoUOQIXgE22cT+unwYxaemcuxORD87KfDOOiHjU3eVy08k9vz+fDIwjNtHYTMPIIKAIAsO2bhmVnepMszrpTDltwGZsrNwTsKY3OoptFBhlWCDEAQbATpee/7k9v3ok0cOvLGRlC2lubDTEpeGwhkOWYrLW9R57sl3w0AAOAAXDPNj0cWnmnjFBKQGdtPttvVZvVEf3PugcI6BRUHGc5Iulxp16UooPuTpO/KzcHXFMMEMsXGfIuNbX++VTT+YnwhBPBzqdwctPqbc6k/t9Kuv55WoMhiSt4/mjkSHOn7bkDOEFQAAGSZjXyYLHL9sHESJ9VTSEAWBRxYGBYHGVb6m3OqqN5SNB5/K+mbcnPQItAAeGNjbAk9JVTIHvluQIBYH3iy/WS7XVHmN9atpOQVwb88eVlS4W47kf4IAFA0j3w3oIjKzYGVE2AWryMDmbH9ZLtdbg5OKF8nKRdlbjJIetDfnHtcadd/SKZN4vsNAFMhpcrkSNfll430tGkGAo6l+Czk0zHfDfCBoAIAIMtsnN5goeWBrRPIFq8jA5my/WS73Wt0jku66bstFu0XaLhRadfPEWQA0mcrDzT56f2xdZADCMwx3w0A8i4OKnwrievG03kkqeu7EQCA8bDQ8oqfPTCjXqNzQdJ5FWf+uShpRdItggwAcDhSyU2FdF1+Zf2miI26M8iXk74b4MOLkrS1tnunu37kFUnXPLcnOL1G53a5OVhUvk+NAUBusNDyiny1QAp6jc5tSW+pmIG64SDDXQIMQObYSGWCyRQl8AzsJ81NXht1/oDgPU1/tP1ku721tvuxpCVJ9/01KTzmOvoFSSfEBCo4LEKBbOK7iTG94bsBgA+9RuehSYd0xXdbPDujZ28xEGAAAOkfvhsATOCR7wYAmNxzNRW21nbvbK3tnlYUXOA05wTM4u6soivpRTw5FqQ85ONm8Yw8ysN3EwBs6zU6q+Xm4Kg42CJFtxi4wQBMJs1ipkCQSI/qHTXvgADtW6h5KCUSwYUJ9Bqd24mTY1w7hHW1pZ3/x3cbgECwYPAr6/lSgSCZW7NnFd2aZZyLxDcYWqYGg5VitEAOHPPdAMA30qMCwOT2DSpIeymRTHCBlEgTMifHqLcAANlBTn8AuZVIicSt2T01RTUYHsS3Fzy3BygCDhEAAIrkVd8N8OHAoELMBBdOi3oLE6PeAgAAAFxK3Jpl/vmsM5JuxbUXfDcGAAAAuVDz3QAfxgoqxKi3MD3qLQAAAMCleP5pai7cFHPQ2KIILgAAAABTmyioEBuqt4AJ9Bqd2+Xm4ISotwAAAAAH4puzidRIpOaMxMGFuxR0BgAAAMY3VVBBeqbewlGREmkiZmFHvQUAAAA4ZVIjXTC3F86L9EiSdKa/Ofe40q6v+m4IAAAAEIKpgwqxoXoLpESaAPUWAMC5l3w3AACywMxDb/canbO9RucF7d1gKHKKpMsmJdLrvhsCBO6k7wYAAAC7Zg4qxEy9haOKUiIRXJgA9RYAwJlF3w0oODYZgIyKbzAkCjwX9RbDoqSvqLWAAnnkuwGAb6TAA4DJpRZUiJmUSNRbmMJQvQUAKLRyc0CQFeN45LsBQN6YAy/JWwzx/HRDxagJVlNUa+GG74YADvzouwGAb/3NOQ4e+fWy7wYAmFzqQQVpr96CopRI1FuYQKLewlEV83QYAEiKxkPfbUAQ2AwBLDNBhlUTZKgn6jHcVL4DDSuVdv0GJ1gBBOhV3w0AJnDMdwMATM5KUCFmUiKdFvUWJmaCC2cVnQzjtC4ApITNIa+oaQHkQKIew4U40KC9lElxoCEvVvqbcw94dwATOeO7AVDNdwMAz75N8Vk/pfgsIDdKLj5ka233TnW++kptaef3ki65+My86DU6DyUdr85XG70nvlsDAOHrb84tqkGg2xOulgM5ZeasDyXdjv+dKXj8sqR3FQUVQx0DFvubcw+qzeoJbtEByLrqfLXR992I8Lyh6B0GP7Jed+1n3w0AsshJUEGKTjRtr+nj6nz1T7Wlnb9JOuXqs/OABQyAgtpQ+qfdXhaLBudsLXDLzUGLoDuQTcOBhup8tdHfnPu1pNcUbSCEFGQgsIBc6jU6DyvteurPrbTrr5sxAI5RHwCQlP26a61eo3PcdyOAWVhNfzSKqbdwWjlJiVRp11/nOjQABOWY7wYUka0FLpt7QDiG0iYdH6rNEEK6z8X+5twnvhsBAIeg6O3ksn5SPu9spExLs+7aNyk+K0bwD8FzHlSImXoLRyVdU9jBhTf6m3OtSru+SnABAFJnI38lef39sLHAzWtxWKAQhoMM2qvLkOWaDCuVdn3VdyOAlNkI6r1h4ZkYzzHfDQgQ6wNPiryPVuTfO/LBW1AhtrW2+3F3/cgrioILoapJutzfnHtQadfP+W4MAOSIjfyVv7LwTBzumIVn/sPCMwF40mt0Hpogw9leo/OC9m4xZC2AeNnUiwDywsZ8i01afzh1PzlOjXti6zZzmunXys2BlduUpCpD6LwHFaSnKZE+VpQS6b7v9sxgUdKtSrt+l4UGAKTikYVn2rhei8OxwAUwkcQthrqyF2D43HcDgBR9a+GZvPf9IaAzBfZwvLFxqynVuYLFdKvc6ELQMhFUiJmUSKcVfr2FM5IeVNr1G1xnAoCZpJkL8ykWDV68auGZNjZBAGRQHGAoNweLigIMvmswLHJDGTnyyMIzOYHrDz/76VCLwg8bAUgbt5ltpGYk+IqgZSqoENta272Tg5RIkrQS11vw3RAACJGtq6Zi0eCUCbDXLDz6kYVnAsiwRB2GuAaDz/oLH3r8bCBNHOLICX7mM3nNdwMKysbNGht1+Ww808ahK8CZTAYVpL2USN31I0cVdkqkmqK8qz/wggeAyZirpjYCCywaHOpvzv3a0qOtbIIACIOpwXC23BwcVZQayTVuKyAXLB7iILWHe/zMp8epccfMwSMbN2u+C+SZNfYJEbLMBhViJrhwWuGnRFpUlBLpLimRAGAiNooHsmhwy0oQJ80CbADCZW4vXJCfmwvvOv48IHUWD3H81sIzcTDmuNNbZK/Grf7m3AeWHm3j4JGtw0zcoEewMh9UiJl6C0cVpUQKObhwpr8597jSrq/ywgKAsdjIm7/IqRCnbCxwfaY8AZBB8c0FRTUXXBV0PsOcHjlh4xAHm7QOmZ/1Gd/tCJnF27UYzUoQzMbBI4uHmTicgGAFE1SImZRIeai3cNnUWzjnuyEAkHGPLD2XUyEOmOCNjWvNNvKaAsiBXqNz2xR0dhJ8tHjSEnDJxiEONmkd4medCjZ4HbEYBLOVzs3WszmcgGAFF1SQ9uotKEqJFHq9hVvUWwCA/ZWbg68tPZoCm278ztJzbeQ1BZATJiVSfGvBNtKNIA++sfRcNmndoWbY7Cic64jFIJiVAKnNZxMQRKhelKSF5dKbIUbGTEqk08pPvYUbIf45AIBNFvP8ciXfDSubbRaDTQBypNfo3Jb9wAKbUAiexdQenMJ1523fDciBGtkknLEVcPzC0nNtPpvgK4IU31Q4WVva+X5huXTVa2umtLW2eycnKZFWTEqkVd8NAYCMsXUqhJQVFllMfdQywSYAOJSDwEKNW8fICSspwziFa5/ZCK/5bkdOsMFrmc36H+XmwFr6I4vPJviKICXTHzUkXVpYLj1eWC696atB04pTInXXjxxV+CmRLpuUSOd8NwYAMsLWqZDfWnouIrZSH9m81gwgh0xggQLvwMG+tPRcUk7ax0Z4etjgtcziwS6rB4/Ms20FXznshuCMqqnQkLS+sFy6F+JAaoILp5WPlEi3Ku36XU4+ASg6i6dCFhlj7TBzCFvX8KmnAGBi5ebgHYuPf8PiswFXfrT0XOZbFtk89V1UbPBaZ+tg16eWnptkK/jKYTcE56BCzadqSzuPF5ZLV0MMLph6C0clfeK7LTM6I+otACg4m6dCJP3R0nMLzaQ6sHIN35w4BoCJmHfJTUuPf8nScwFnTF0FWwc5mG9Z0t+cC33PI4vY4LXEZOSwkR5VshcYfcpiXbdFspUgNKUx/ptLtaWd92sq/efW2u7H1luUsq213Tu+25CSlf7m3NsV1S+ymQKgoL6UnVNYZ6rz1QY5+lNnK9UB6UuQC5V2/a6Fx/7Ua3QuWHhunnwhacXCc39l4ZmAD9/KzoYf8y0LqvPVRp8CzTYsVtr1c+y9WGFrjdCyWHD+qe0n2+2K6i3ZGSc/lHTbwnMBK8YJKkh79Rbel/QfOdqoD01NUUqkDyW952LABICsKDcHX/c356w8u78594kaYiMuJZZPINm6cgy4ZiVIKjGWHaTX6DystK1tBgB5YCvwpv7m3F/V0Fkbzy4qk6aHAs12sMGbMstrhL9Yeu4on0q6ZeG5BLMQlIPSH40SdL2FHFlUlBLpLn8OAIrCcgqkFcbTVNk6gdS1eOUYyAXGsrFQ7B3Yh+UUSGeorZAeM95f9N2OHCMdTfqsFW0vNwef2Xr2iM+yuR6hsD2CMe5NhWGnaks7j2sqXeuuH/kTVxi9OdPfnHtcUf1KuTn4jD8HAAVgKwUSp+dSYvkE0t951yFHNmRhPOtvzi2qIb4nB/tOlk5iAznxF0mXLT37jxLzrTRwS8GJD6vz1a+Zf87O8hqhCfr6+AAAIABJREFU5fLPyKRAsjKPE7cVUlOdrzb6m3PWbqaSPWbymwrDLtWWdr5fWC5dTaU1mNbl/ubcA6LoAPLOnArpWno8p+dmZE7MXbf4EV9YfDaQF2/4bkAArBdyBEJm+cTvGdatszNzLluBH+xZNMEbzMDBGuFTi8/ej82UrNe5eTo7U8T+gaW/fufwt5JZswYVpL16C48XlktvpvA8TGdRUb2Fu2yKAcgrcwLl7xY/4nOLz849M3GzdWLOSfE1wCFbKXhOWnougIKwnHJSYsNsZv3Nub/6bkOBXKS/zsb0V1trhK6PU/3mM22liqvxHZ+N2Re1diu13Bx8ZOvZIUkjqBCj3kI2nFFUb+EGfw4A8sjyC3yx0q6vWnx+btmeuMnPCSTApkeWnmslRRyAwvmDxWezYTYDc9ODsd4d+usMHPRXmzcgDmNzfcKtrtn80eKzN0iJFkkzqBA7VVvaebywXLrKprZXK/3NuVZRNseq89UG/Q0oBgen5y5z42syZvy1ecuDAs3II2speFiEApiV5YLNEhtmU3GQRgaj0V+n4KK/uizQPOKzbabmlbjVNRUHgSybqa+CYiOoEKPegn81RZtjP+R1g6w6X21U2vXV/ubcY5sFWABkjs3Tc5L0ORO48Zm0RzbH4OucBkHeWE7n9a7FZwMoDtu3BK/ndZ1qi+U0MjgY/XVCDvrrTZ9rBPPZNoMmtf7m3AOLz88dB4GsFkW099gMKkjUW8iKRUUpke7maZOs0q6f62/OtUSBKqBwzGaczdsKi2ajHIcwJ0Fspj3q+jyBBFhmaxw7k6c5nwUvW3jmTxaeCXhlOWe4FG02cpBjTCYLAWmP/KG/TqDSrt+Q5f6ahbz2Zp1i87bCovlZYgwOAlmk5E2wHVSIUW8hG870N+ceh15vodKuv15p1+9KuiVOaQBFZvu2wgrXnA9mTmvZvoLPLQXkma1izepvzn1g69k58JqFZ/5s4ZlAFtjeQDlKvvrDmTkph+n84+DRGBwcOpI831KIObitILEuHYuDtEfcUhjiKqgQo95CNsT1Fs75bsgkTKqjG5IeiBMaQOE5uK0gSbe45jyaeY9/JbvBXW4pIO++sfjsi8y393XSwjMfWXgm4J2j2wpnOIm7P0eHODA+NngPYPrrLdufk4VbCjGzXrE5TkrRuvSc5c8IlqN+xy2FIa6DCjHqLfhXUzQoBVFvIZHqyHa02xab1+GAIrN9W0GSvgphnHSpOl9tmPyetm+LcUsBuWa5EGqN05TPM4EWGzVgrBXeBjLAxUbKiknvgwQzZn0ubuhnDRu8I5g101cOPupKltYIpi0uxknqeoyQOOxmE7cURvAVVJByUm/BRCSv+G7HDDJdb8GkOvpBYac6ulluDigiDVhgNuRuWv6YmggsPMMEFGyPay1uKaAgrKVAUrRJx9iVYCstlOXC24BXZiPF9u1QSbrMRu2exCEO1pLZxI3mhERAwfa+TSZvMjsaJ1mXDnF42I1bCiP4DCrEgq63sP1ku91rdFbLzcFRuZlo2XLGpERazcKfg0l1dFdRqqNQJ1Ebkk70Gp0LWYqiA3ljrr7avg3EBM4w6QlcjMufMnaiCBxc36eo5LN+a+GZtlMeAFng4naoxAlwSQQUAsL6QE4DCpJ0McNrBBfjJOtSw+E4ucEthdGyEFSIBV1vwQQXzko6oXAXFjVJl/ubcw98TeRMMGG1vzn3WOHWTWhJOt9rdM5yag2wz1FxLKngE7hEsNdFGjombigMM4bZPJhCUUnDzG9tLDxt3jYBMsHR7dDYrSLXWCCgEJRCrw8k5wGFTK8RzDjpIpNJTVHGkXMOPiuTHI+TroLqwclSUCEWdL2FXqPzsNfoHJd0XuHm0V9UNJG76/LlaOomPJB02dVnWnCl3BycyPKLDsijXqOzKjcB3UIuHBKTNhfB3m65OXjHwecAWfKl5ecXvqikObRkKwD9haXnAplibla5OkC3ktUUvTZV2vXXCSgEp7AbvOb37CL1jBTIGsHhulQq6M0uxwGFmxwW3l8WgwpSDuot9Bqd2yaPvqvTHDacUfRyvGFzMmfqJtxVVDch1MnTRrk5ONprdFYzfBUPyLv3HH1OoRYOHha3Wb7SDFhhDiPYXoAWcuEZs5lvt9wchHpLGZiIeT+7mm9JUYreB0U5zJE48R3qmrjoCnXDxvxebzn8yJDWCC7HyVu29+yyxPHatOUgTWnQshpUiOWh3sKFHNRbWDH1Fs6l+VCTSuOGosh2yKmOTvQanbMBveCAXHJ43TSW+wmcGfddLm4zfaUZsMxFAbhCBhYs14LZYA6IInGcBkmKvrtf5X3sqrTrq3J34hv25P6GjdnH+UFuUqLGglojmHHyvMOPXClCANbD2vQ95ngHy3pQIUa9Bf9qihaiP6QxUJlURy25fRGlqSvpSq/ROc5VKCA7zHVTl0HcXE7gEvUTbsnd4jaIK82ALY5uK0jRfG7Vwedkggko2JxvkmcXheM4DZK0txbN3WZtYs4VcgpgPOuMjUOZWZDYx3F5mybINYKZ17lcly4quk2/6vAznUgcSHa5NiXt0RhCCSrE8lJv4YrCrrfwYNoJnUl19IPcDgZpu1luDhbN5iWAjDGTTpdj7NMJXB4WuonFgusbZG9xEgRwdl3+ch4355IcFZdvseBEESXSILle0+Zqs9bjnAv25SoQNpSy2vU+Tkhpj55h1qWuDxZfTuswcBYkaq+6PJDc6jU6Fxx+XrBCCypI+ai3sJqHegv9zbnH426iJRZ2IRedilMdXQj1pQYUgfl+vuXhoy+bWwvnPHz2zDwvFq6wMQc8vS7v6lRbbnOVJ/Lt2t6o+4vl5wOZZcarix4+OtUb9D7k5KBdHtkIksWBsCAPH2UgZfWVkNIeDfMYgJ3pMHAWDN2cd30z5oTDzwtaiEGFWC7qLShKiRRyvYXLB50WMQPBauAnMLqSzpPqCAiHhzyWsUXtLXTPefj8iSWCCb4WCxvc/AL2OL5tFfyiM2lo88P2ArRbbg4+s/wZQKaZzT5fB+Wejl+hBBeG5ly2xqiuwk257JutIFlNe/smQQQX4vdpf3PusfylrM7FGsFjAFbaOwx8I5Rxcqjv+VibBnszxoeQgwqxoOstmJRIZxVtfoX68n96tS85UCWuKV1WuCcw4lRHt303BMBkMrDQjYMLmVw8VNr1c56DCZLUCjFHKmCTWci4Xnzm4iSl482P6yw6AckclPN5SO6MouDCD5V2/VzWxjAzPp0zNxNczLnekvSz5c/IJQc58JPBhRtZ66vS3vrAczBBytkawfQtHwfeYivaC8JmbpyUMtP3gr4Z40MeggqxSya4EGpKpNvmik3I9RbiCd0NT9eU0rQhUh0BwcvAQndR0eLhcRYmcWaydqPSrncUjdE+b5B1y83BCcZY4HmegqKZ3+wY5nEB2uKWArDHU97wYYuSbmVtzmXGJ1frYtJJzshRX65JWjF91XswzNyguZFIyeU7w0Qu1wieD7zFzigaJ1vmz/ycz8ZkrO/dzMPNGNdKvhtgwfrCcum+pE+21nbv+G7MJLafbLfV0Gp1vvpZf3PuE/mNDM8i1HZL0QTiU6KTQH6Um4N3zK0p30HOM4pOA6ui+oakbyV9Y3PxZ26PvSzpXUmvKju3xrqiMDNwoF6jc6HSrp+U+7Er3uxYMWPVl+Xm4OssfF+r89VGf3Pu1/I/pn2ahZ8HkBXbT7bb1Wb1hEl5m4W5hu85F+kkA7X9ZLtdUf09SV/JTV+Og2GqqN5S1Fe/s/neTfTV1yS9rWx8Z2O5XiOYuZ3kf8+sZtqwUmnXbyk6hOdynMxa36Mw85TyGFSQpFOSTi0sl+5314/8JrQByQQXLlTa9S8k/VH+I8VF0JV0vdwcfBZafwFwsMRCNwuBhdgZ89dlM7FsKbqq/q2kR5J+lJ7m4DxQIu3cy5KOSXpJ0q+U3XdHV9JbnKQDDlduDnxv0g1vzH0p6UdX39+hxefJfjbG8A0OnwDPM5uxb8ndZuy4bM65Tiqad/kem1rl5uCd3hPPrciJXqPzsNKuX1R0ctqlRfPXSiLI8FxfLTcHrcP2LAJcH0gFWSNkKLCQVOS1aavcHJxg/JxOXoMKsVO1pZ3HNZWuddeP/Cm0zWLzhT1rriRdV7YmZ7lRbg5akha3n2y3GUiAfMpoYCEpXkQ8M9kyk7o8KcRiAUhLxjbp4gVnPDZtSPpJ0neSfhxnk2PYUNHAN8zfTyY+L2vYuAMOYDZjszJm7Sdvc66upPdC2+vIul6jc9v0CdeBhaSRfdUEHPy0yK7CrBEyGlhIyts4uZ9WHlNtuZT3oELsUm1p51JNpaXQUiJJ0QutOl/9ur8594GiosdIEQMIUAwBBBbyjoACMIUMb9LFQYYVaeQmx3A9myylYJsGG3fAGDI8ZuURcyuLTGDhNWV34zcvupIuFq0fBxBYyDsCCinIU6HmcawvLJfuhVjMefvJdrvX6KyWm4Oj8lt0FACCtf1ku11uDk7If5GsommJRS8wNfPdeUvRwjsUZ4b+Cn1zsXAbHsC0Ah2zQkNAwQGTZ511gz1xP77tuyE+mP513nc7CoiAQkqKFlSQonoL6wvLpXvV+WrDd2MmZYILZyWdULRJAwCYgBlHWSC4E+WpZNELzIRNOq/OF3XDA5hWr9F5WG4OFsWa1QYCCg6xbrCGfqzoRoyiwALzOzc2CCikp4hBhdip2tLO44Xl0tUQgwu9Rudhr9E5LgYfAJgKJ0OcuMmkDUgPm3ReEFAAppS4IcqYlR42Yj0gsJC6Vrk5WKQfR8w8g4Mj9t3sNTpnWZump8hBhdglE1wILiWSFA0+ZnHJCw4AJmQmcCfEBM6G871G5wKTNiBdiU060mHaR0ABmJG5IXpcrFfTQEDBIwILqeGk+AiJgyPM7+w4b77DSBFBhT2h11u4QL0FAJgcE7jUtSSdYCMOsCeRDvOK77bkVFeMY0CqEjdEOcgxHU52ZwA3nWd2npPi+2N+ZwVzOosIKjwrL/UWzosrpgAwNiZwqdmgfgLgTq/RWRWbdGlj4w6wJJHig7XqZEgnmSHcdJ4Kh44mYOZ3pI6b3QZzOrsIKowWer2F2+aK6RXxogOAsTGBm1pXnDwCvEikwuS21exu9hqd44xjgD2J2oAc5DhcPL8inWTGcNN5Ijc5dDQ508dOiJRb07rC2tQ+ggoHC73ewmqB6i1slJsDNgEBzCyx2OX073humhMgt303BCiqoduqjFuTi09QkmsXcISDHIfaYH6Vbdx0PtTTdysbu9OJU50rGisJYI0n7nervhtSBAQVxhN8vQXldxDidCwAKxKnf4sQmJ3GhlgoAJnCuDWxrqKTbMc5QQm4x0GOkVjfBiYRIMvjfss0eLemzIyVpDo/WDx20u8cIqgwvqDrLeR0EOJ0LACr4sBsuTk4KhYKsZbMYpcJG5A9jFtji+eRq74bAhQdAdGnWN8Gami/pcgBMt6tFpmx8oRIdT7sCmOnHwQVJhd8vYUcDELBnY4Nsa8A2JO43lzkvJZxMOE4EzYg+4bGLYILe26Wm4OjIc0jgSIYCogWba61wbiUD4kAWcj7LdPg3eqIGStXE/0sL4eGpxH3u1X6nR8EFaYXbL2FoUEopEVmkKdjF5ZLV2tLO9/7bgeA2ZlTSMkFbxEWC3Egl2ACEKD49GTBxq1hLUWn2NjwADJuKLiQ943ZeEOMVEc5MmLTN699uCverd7E/SyRQq4owQX6XYYQVJhd6PUW4hNsWR+ArpSbgxMhbWgtLJfeXFgu3ZN0SRI3FYAcSSx4F5XPSVxyAy6oQC6A0Qowbo2yob0bVpxiAwIytDGbpzGLIGdB5LgPx+/WOu/WbOg1OrdNcCG+VZ/HQBb9LoNKvhuQE6cknVpYLt3vrh/5TWid22wWHa+06+ckXZdU89uiZ2yUm4N3tp9st3tPfDdlPNX5aqO2tPN7RcEEADm2/WS7rYZuS7pdna82+ptzv5b0oaRFvy2bSkvSt5K+iIMIoYy7AMaXs3FrWFfSPyR9WW4Ovg5tTg7geSPGrA8k/VZhjVldSX+X9F18SI45VnEk+3ClXX9d0u8kva1s7bscpiXpU96t2WbWcA8lXTD7e68pvL6WRL/LOIIK6TpVW9p5XFPpWnf9yJ9C6/S9Rud2db76dX9z7hNJK56b05L0aa/RuR3ShGthuXRV2nlf3EwACmefjbp3Jb2q7E7kNhQFEr7hNgJQPPuMW69JOqlwNuxGjmMhzR8BjMeMWauSVofmWmf8tmyk+LDGdyHdtodd+2z6ZvGdOzJIz7s1HGbcua2or8XBrCz2taSn4yb9LgwvSNJ7//XvV8WpahuWttZ27/huxDTMJO2vcj9B60q6Xm4OPgspKGPSX32k6NbKSFtruy9Y/vx1W8/PkGtba7sf+24EMCkzkXtZfhcOLUk/iyACgDEkNuyOKRq3shAg3ZD0k6TvJP3IOAYgZuZabygar16S+7nW0/GJU7X2Vdr1f6b9zF6jY229fpgMrBV4vxaEmd8tyu94Ke0Frhg3A0ZQwb77kj4JNbhgXm6fy80g8zTVkYPPSsUkqY4IKqSCoAJyw4yvUjShk6JJnTT9xC6emEnR5OxnSY/EwgBAShIL0ZcVBRtekvQr83/PuiiNA5/S0BhWbg5aIc0PAWRDYqP2mJ4dr6Y5ODdqnvWN9PT0ORzKW1BhlKH+O+s6IfmO/db8/Rver4gdMF7Ocqhkw/ydeV1Okf7IPuotHK4l6b1eo/MwpGtNpDoCMIvEAvTQhWhiI2/UrwcAJ0zqkbbGGLfSFNL8EEB2JFLNHIh5FrJo3P6bOKgkSZpkw5b3K2Lj9jfp+T6X+PXjfRb9LjcIKrhDvYXndSVd7zU6qyk9z4lxUh0BQJoSG3kAAABIEfMshGx4M5cNW9hG0BWxF303oIAu1ZZ2HpuN6aBsP9lu9xqdC5JOaO8a07Q2ys3BYkgBhep8tRHdTtC6CCgAAAAAAAAAKCCCCv6sLyyX7oUYXOg1Og97jc5ZSecVpS6aREvSiV6jczak2xoLy6WrtaWd70XtEQAAAAAAAAAFRlDBr1MywYXqfDW4vPy9Rud2uTk4IemKolRGB+lKOt9rdI6HdFVqYbn05sJy6bGiYEJwf0YAAAAAAAAAkCaCCtlwyqREuhpacMGkRFotNweLkm7u85/dNKmObjts2kxMqqN7ilIdBfVnAgAAAAAAAAC2EFTIlrzVW4hTHV0INNURdRMAAAAAAAAAIKHkuwEYaX1huXRf0idba7t3fDdmEia10dlKu/56SGmOpCjVkaQ/i5sJAAAAAAAAADASNxWyK/R6C8EEFEh1BAAAAAAAAADjIaiQfcHWWwgBqY4AAAAAAAAAYHwEFcIRbL2FLFpYLr25sFx6LOmSuJ0AAAAAAAAAAGMhqBCe9YXl0j2CC9Mh1REAAAAAAAAATI+gQpiCrrfggwkmkOoobPe760f+5LsRAAAAAAAAQJG9KElmo+6+57ZgctRbGMPCculNE0wg1VGY2pKWttZ2T28/2W77bgwAAAAAAABQZC9K0vaT7fbW2u5pSUuKNvAQFuotjECqo+C1JV3bWts9urW2e8d3YwAAAAAAAAAMpT/aWtu9s7W2e1TSNRFcCBH1FvRMqqPHItVRqK5114+8srW2+7HvhgAAAAAAAADYM7Kmwtba7sfd9SOvKAouICyFrrcwlOoI4bmvKNXRx6Q6AgAAAAAAALJn30LNJiXSx931I0dFvYUQFareAqmOghenOjpNqiMAAAAAAAAgu/YNKsSotxC8XNdbINVRLpDqCAAAAAAAAAjEoUGFGPUWgpe7egukOgoeqY4AAAAAAACAwIwdVIhRbyFouai3QKqjXFgi1REAAAAAAAAQnomDCtJevQVFKZGotxCeU7Wlne9Dq7dAqqNcuNZdP3KUYAIAAAAAAAAQpqmCCjGTEum0qLcQoob+//bu2DWOOw0D8JfLgj0YnTptI44Dh9w14sqkisWBFQhR6ypwqdwF0idbea9Okc5cZVylHVezhdkr7h8wuFBhMEy1uLjRYmSJsXzF7uRkJ7ZlaXdnZ+Z56lj6wK7mze99Z3sLj5pQidSGqqMmBThLoOoIAAAAAFrgUqFCxd5Co23FGu8tbO/3bral6mhz7+hvdd9Qg0moOgIAAACA1lhIqFCxt9Boa7W3UFUdxSxMUHXUTMMiS3aECQAAAADQHr1F/8Dp8XQyTWOwvd/7d0T8ED4IN82Nzb2jR5vRu1tkyc91VNXMXkwc3Y+Gv0zosHGRJbdm/3amdd8CAAAAACzQQl8qnGVvodFq2VtoU9VRR/1adWQ3AQAAAADaaWmhQsXeQqOtZG9B1VErqDoCAAAAgA5YeqhQsbfQaEvbW9je793c3Dt6FBE/LvLnsjLjIkv6eVoOvE4AAAAAgPZbWagQMdtbyNNyELNKpPEqfzcLcWNeiXTnsuGCqqPGU3UEAAAAAB200lChYm+h0S61t6DqqPEmETHM07Kv6ggAAAAAuqdX5y/P03K0cWVjZ3Pv6LuIuB3+j/UmqfYWxhHxz/N8YJ6FEEf3w99zU42LLLnlZQIAAAAAdFctLxXOqiqR7C001nv3FlQdNZ6qIwAAAAAgItYgVKjYW2i83+wtqDpqPFVHAAAAAMBraq0/+j3zj5ejeV+/qpxmqfYWbm9G727EkUqr5lJ1BAAAAAD8xtq8VHhTnpYjlUiNtRURP4ZAoYnGoeoIAAAAAHiLtQ0VIl7bW+iHSiRYpqrqaFfVEQAAAADwNmsdKlTm4cJu2FuAZRgWWbIz3zQBAAAAAHirRoQKlTwtR2fCBdUscDlV1dFA1REAAAAAcB6NChUq9hbgUlQdAQAAAAAX0shQIcLeAlyQqiMAAAAA4MIaGypU7C3Auag6AgAAAAAurVf3AYsyr3EZbe/37kTE7YjYqvkkWBd7ao4AAAAAgEVo/EuFN80rkewtwKzqqC9QAAAAAAAWpXWhQoS9BTpP1REAAAAAsBStDBUqb+wt+LhK201iFibsep0AAAAAACxDazYV3mX+gbVvb4G2ytNytHFlY8fLBAAAAABgmVr9UuFN9hZoM4ECAAAAALBsnQoVIuwtAAAAAADARXUuVKjYWwAAAAAAgA/T2VChkqflKE/LfswqkYQLAAAAAADwFp0PFSr2FgAAAAAA4N16dR+wTqbH08k0jcH2fu/fEfFDRNyo+yYAAAAAfvWw7gMAuk6o8DvytBxFxGh7v3czIu5HxFbNJwEAAAB03out//697hsAuk790TvYWwAAAAAAgP8TKpyDvQUAAAAAABAqnNv0eDrJ03IQEXsRMa77HgAAAAAAWDWhwgeaVyLtxixcUIkEAAAAAEBnCBUuKE/L0ZlKJOECAAAAAACtJ1S4hKoSyd4CAAAAAABdIFRYAHsLvMckIoZ5Wo7qPgQAAAAA4DJ6dR/QJvOPxqPt/d7NiLgfEVs1n0T9hkWW/Dw9nqrIAgAAAAAa7+OIiE8+/7TuO1rl8OD0yaun1+5dvV4eR8RfI+Ja3TexcuOIuJ2n5b9OXp48r/sYAAAAAIBF+Cgi4svvv677jtbauLKxtbl39EtE3Kj7FlZiEhHfqDoCAAAAANrIpsKSzfcWdsPeQhcMiyzZESgAAAAAAG3lpcKK2VtopXGRJbfsJgAAAAAAbeelworlaTkqsmQnIoZ138KlTSJiL0/LXYECAAAAANAFQoUazCuRBkWW9EMlUlOpOgIAAAAAOkeoUCN7C400LrKkn6flwOsEAAAAAKBrhAprIE/L0ZlwwYfq9aTqCAAAAADovI8jIj75/NO67yAiDg9On7x6eu3e1evlcUR8Ufc9RMQsTPgpT8uvDg9On9R9DAAAAABAnT6KiPjy+6/rvoM3bFzZ2NrcO/olIm7UfUuHDYss+dnLBAAAAACAGfVHa+qNvQUftVdrHLOqI7sJAAAAAABn9Oo+gHfL03IUEf3t/d6diLgdEVs1n9Rmk4i4m6floO5DAAAAAADWkU2Fhjg8OH1ob2GphkWWfPvs8YsHdR8CAAAAALCu1B81yLwSaVBkST9mFT1cnqojAAAAAIBzEio0kL2FhdnL03J3XjEFAAAAAMB7CBUaLE/LUZ6W/YgYhnDhQwyLLOkLEwAAAAAAPoxNhRawt3Bu4yJLPnv2+MWDk5cnz+s+BgAAAACgabxUaIlqbyFmlUj2Fl43iXnVkd0EAAAAAICLEyq0zLwSaTfsLVSGRZbsqDoCAAAAALi8Xt0HsBzzj+j97f3enYi4HRFbNZ+0auMiS27NXiZM674FAAAAAKAVvFRouTwtB0WW7MRszLkLVB0BAAAAACyJoeYOOHl58vzw4PThH//yh/9ExJ8i4s81n7QMk4j4KU/Lrw4PTp/UfQwAAAAAQBupP+qQeSXSaHu/dzMi7kd7KpHOVB0BAAAAALAs6o86aD7m3I9ZJVKTP8SPQ9URAAAAAMDKqD/qsMOD04evnl67d/V6eRwRX9R9zweoqo7+oeoIAAAAAGB1hAod18C9hWGRJd8+e/ziQd2HAAAAAAB0jfojIuLXSqTdiNiL9axEqqqOBqqOAAAAAADqYaiZ1+RpOdq4srGzuXf0XUTcjvrHnCcR8c18ZBoAAAAAgBqpP+I3qkqkNdhbqKqOHtX0+wEAAAAAOEOowFvVuLcwLrLks2ePXzw4eXnyfEW/EwAAAACA97CpwHutcG9hErPdhF27CQAAAAAA60eowLnlaTkqsmQnIoZL+PHDIkt2bCcAAAAAAKyvjyIivvz+67rvoGE2rmxsbe4d/RIRNy75o8ZFltzyMgEAAAAAYP15qcCFTI+nkzOVSOML/AhVRwAAAAAADdOr+wCabV5XNNre792MiPsRsfWePzKJiLt5Wg6WfhwAAAAAAAv1cUTEJ59/WvcdNNzhwemTV0+v3bt6vTyOiC/e8p8Niyz59tn1elhiAAAARklEQVTjFw9WeRsAAAAAAIuh/oiFmVciDYos6cfrlUjjmFUdDVQdAQAAAAA0l/ojFm56PJ1M09idVyJVFUkAAAAAADTc/wDSFw/+yqNRiAAAAABJRU5ErkJggg=="/></defs></svg>
\ No newline at end of file
diff --git a/auth/assets/custom-icons/icons/realvnc.svg b/auth/assets/custom-icons/icons/realvnc.svg
new file mode 100644
index 0000000000..07bcac774a
--- /dev/null
+++ b/auth/assets/custom-icons/icons/realvnc.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 960 960" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><use id="Background" xlink:href="#_Image1" x="0" y="0" width="307px" height="307px" transform="matrix(3.125,0,0,3.125,0,0)"/><defs><image id="_Image1" width="307px" height="307px" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAATMAAAEzCAYAAABdWOReAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAADIOSURBVHhe7Z0HgFTluf7fc6bv0qQpICBIWbBBLFii2ABbFGLBbnJTNKaYRJIY/Sdqrhq9IblJLDE3zRIN5iaKBo0iWOLfEsWoUWEFRAQE6X136jn3e76ZBVnKntmdcr4zz89M2D2zsDNn5jzz9teSCtNwy8YebjQy3LKcA1xXRoprDbHE6e+K9BZLulquJMSyKv64CCFF4Cosq0l9sdkSa5X6ZolY7kL19Txxsm9LVuY3Xtt1beGnK0JFRGPorZtG2JHQOHGcCerb0Uqr+lgRpVnqP1ccESenzo36U9+UrBFC/A9sDstWf9gidkhdzba6ntV/mWZ1p7tcXclv2GI/nZPcU/OndGnM/6XyUTYxGzZ1U0/bsSep53ehemJH2pG6OJ6o5LJKr3IULUKCihI5ywqJhMLaYHEyTUl18BX15YPZpDN94XVdVhd+sqSUXMwOmNrUP+vmrlTP51JlffWFaLm5TN7qIoTUHrDeQhEtcm4muVxc656QZd397pS6pYWfKAklE7OG2zf2kGT420q6rgjF6rq72bTSr2zhXkIIga4pay0clVyqaZ1lWXdJOvvzUsXWSiJmI36y5RLXkh/Z0br93GxKiZhyIwkhZDdYiLGFY+KkmxaLI9c3frfTfYW72k2HxKzgUv7SjsQmbnMnCSHEI3n30xYnk5oeytlXzb2mbknhrqJpt5g1TN14hoj9aztS39fJZy/ydxBCSFFYYkcTykrbulzEubxxStcZhTuKwi78WRQNP9n0ffVXH7NCUSVkTeoIhYwQ0l5cuJvKSov1ha6MmLrlu4U7iqI4y8x1rYafbb3TCse/ggA/M5SEkJKiM59RcbLJu96b0umrhaOe8CxmI693o7lOW+8LRROT1S+CsBXuIYSQEmIptzMcl1ymeVpoc/1lc2+0lOXUNp7dzFznrfeGYvWTnQyFjBBSRpS+QGdC0frzYUDBIyzcs0c8idnwqVvuDEUS58OvVb8pf5AQQspGPo4GTxChrcLBPdKmmCEYp0y+K7VrSSEjhFQMJWhKdxCjzycd98wezbdC+cVjYoUsBvsJIVUBjexuTllSzpl7KtvYrZiNvLVpgBN2XrJC0X5uzlP8jRBCygKKa5UOLQ9J6Mjd9XTu1s3MhZxf2NE6ChkhpOqguwgF+ug4KhzaiV2K2Yifbr4YLUpOGpX9hBBSfdBpBF1CL3jh0A7s5Gbq6Rcpe45yL/djryUhxE/k3c3MYonlDmv8+o7TNna2zFLhb9rRegoZIcR3aHcT03ma7asLh7axg2WWn4LhvGmHQt05xocQ4kcwPsjJ5daFLXvUJ5MBO1hmObcwWJFCRgjxKdAn6BQmWhcOabZZZkNu3tQrHLPftOxwX06IJYT4GUysdZ3MckfcQ+ZP6bIGx7ZZZuG4PdGKxClkhBDfA53CjhG9NKnAdjfTlQvZQE4IMQZMt7bciwrf5cVs2NRkg7rnSGYwCSGmAL2yLBmDvbz4XouZJbkJ2GvJ/ktCiDEovYJu2WFrPL4tuJnOOL2glxBCDELrlitazKyGWzb2kKj9b8uOMPhPCDEKZDWdXGaFlXEOsiUsw9Shvq7L2jJCiFlAtyzL6uNGI8NtscMHWZEEjhbuJoQQQ1C6Bf2yJHugbYk7wtq535wQQowA+uWKPcJ2XGuIK8xiEkLMROuX0jHbstwBwl5MQoipKP2yxOlvZzev7O2yvowQYijQL+iYbcc6d2axLCHEWFA8m+jS1bYjiTpmMgkhxqL0yw4nEjaKNAqHCCHETJSObZ+aQQghBkMxI4QEAooZISQQUMwIIYGAYkYICQQUM0JIIKCYEUICAcWMEBIIKGaEkEBAMSOEBAKrYeoWYxsz0zkRp8baSlt6z9CEhq/1n5/8Wt9LyklGve9yHt53IfViREKFb6oIHisec1vgvRMNm/seMlbM0Bt//OCQ9O1ieXpjmU7LBZTOijRnXNmaEWlSf25JiWxOqe/TriTVffi5ltOBi8nGTdnfpr5B/QY+PD+9X0gG7qXed3sYNhNS53zRWlde+jCnv64WeIy4Ro7fP7THeRJ4f2TUzz75Xla9l9T3Br5hjBQzPGBHnfgHzo/L4f198NFXJfBGTSmFSyph25B0Zc1WVz5WL+fSDa4sWufIh+sdWbHZlXVNeaEDEDhcXBA5Ujw4j5ePicg1x0cLR3YPzv9Z9zWrD5/qnW/87u+OjcqVR0UKR3bP3JWOnPdgs2TVByLFrEK0iNk958Xl6IG1K2ZtAStifXNe3BpX5+Ttjx15V71hF6uLbFMyfx7DStggbtQ2b2TV+65/V0sevSwhnWNtn7Uv/CUpz76fk5hy3yoNXv+4+r1/uTghQ3u2bR7++Nm0/PqfGUm0rXu+pIoGcMcxToUrDKyBHnWWjOpry/mHROTmCTH9xn7kkoT87IyYTD44LPspdwknEp/gn3RRya6B+H+oPhzgPnrhtIYqqFgBCO8hfUOehAxhitnvZ30R42svRosZKR5cjIO62zLxgLDcempMpl+akPsmx+VrR0dk5N7qzoKw4UIguwYWz9/f8yZmxw0KyT6dqxPXxeM8fbg3dXptGcISrn5/mArFrMapj1pyRP+QTDkuKn9VVtv958flS0dEtCuFbHEqq/SN5toOwHp5eUlOPt7c9onpVW/JMfuFPGUTSwnEc+9Olhw32JtlOGNe1vgPMIoZ2QYu0sP3Dcl1J0Zl+mUJ+flnYjoLhk9rJBlqIWvsBSRRVm1x5blFhaxKG5w6PFzxjCbEc8yAkPRRVmFbrN6ad5sjhqsBxYzski4xSz4zIiy/Pycu0y5MyKWHhqVb3NIu6J5KEmoFxCO9uppj+tsyaC+ropYPBPeMBm8u5j8+yFuZ1SwhKQUUM9ImB+5jy43jYvLXSxJy1acjOgakLbUaFjVYq28sz8mCNW2fBLjyJ+4frpirCdEc0M3SlpkXnmj0ZmH6HYoZ8QziaN/6dFQeuTQhU8ZGpGd93lJDoLnWgGWG8paZC7wp1CnDQ7rkoRLxR9SJoaAc1nVboB7x9Y+Ui+lN93wNxYwUDco9vnpUVJd5oIC0Tl2kKCatNU2Ddfb0gqwni+vgfUIysrdddlcTr0FMvR6neiwJmb0wJxua8+JsOhQz0m7QJvP9E6I6pnbGiJAuZK501q6ahJU107jKkbdWtP2kEY+aMCxcdtccVtnwnraM6tO2qYXH8tT8rNHlGJ+EYkY6zPBettx+ZlzumhTXX9eK6wljJqXEw2si4OShIemaKO+5geU3fljIk9v49sc53cJEMSOkFScPCclDF+ULcNG+gzq1oAMhQIkGmv3bYnB3Ww7tV76aM4hkl7jIuKHeXMwn5+ekSX3wmNiHuSsoZqSkdIpaugD3nnPjytXJW2lBLrqFmKFy/pUl3hQKNWflAlYZ3MthHtuXnllodvtSayhmpCx8Slkgfzw/nyAAlayxqjQoJn6i0ZuYob1p7zK1N8EyO81jbRnalz4wvH2pNRQzUjZQioAEwR0TY7oSvWUMUdAopr2pdydLjhlYelcTQta73lJi6c3ye7zR/Pal1lDMSNk5eUhY/nRBQsYqqwTFtkFzO4ttbzoN7U0ljlMhPnnkgPyw0rZA+9KLi81vX2oNxYxUhH5dLfnNOXH54hERySoxC1yfp9IQBNS9MGaALYO6l7a9CeLo1cX8/0rIgtC+1BqKGakYsATQxH7T+JjE1XWHMc1BAc/tjY9ysnBt208K7U0n7B/WNWGlAKLYv5slR3lsX3p8XjD9fYoZqTjnHxKWOybGpVddfsxQEEAF/Ua0N3m0zk4ZFpJ4idqb8u1LYekSb9vF/CBA7UutoZiRqoCs3u+U24lpEpiZFgSQGUR7kxf38ZA+IRlRgvYmaKFuX/I4hHH2+zlZH5D2pdZQzEjVwGRb7HE4QP0ZhEwn2pvmrXbkreVtW2eIV40vQXsTrDLUlY3q27aYIU6J7UtBKsf4JBQzUlX27WrL/5ydL7A1XdBg7MDKfMJje9O4ISFdsd+R9iZYduOHhiTqwTDDQpu5q4LTvtQaihmpOqhB+/Vn4zK6r/mCBqHw2t60f4+OtTch3tYl5r196SlllTUZuhPTCxQz4gtQTHr3pLgcvI/ZggYxQ3vTPyvQ3oRsMLYvobm/LbAw+hnDty+1BcWM+AYI2q+UoCGGZnJSQLc3eXQ1xw4O6cUj7am70+1LXrcvLXVk0bpgtS+1hmJGfAUq2H95ZkzXTZk6Gw3WDxaErPSwXxsCfnQ7tjdByLD5aazH7UtBbF9qDcWM+A6MyvnFmXHZK1HZJSCloqW96flF3hSqPe1N+fYl21P70hq0LwVg+1JbUMyIL0F28+ZTotot6ki2r5r8/T1vvjLam7BZvhjhRp3Y6R5HY6N9acWm4LUvtYZiRnzL+KFhufq4qL7ITdMzuJr/8tjehBlwx6O9yaOYoTYNy2XQWO6FGQHZvtQWFDPia754eETOOzisp22YREt709MetzchkB9XhpYX0UZ8DcuZu3poX/pwvaNFNchZzBYoZsT3/ODEqBy6r3kZTrjIMz22Nx3c0t7UhvZB7DCS3GtJx6yFOVnXlBfXoEMxI76nTrlht0yI6RV3Ji0e1u1NHrc3QfhQ/NqW8EHshva0ZbTH9iVsXwp6rKwFihkxAhSGfu/4qOBaNyV+BmMopdzjJz3WnKEtqWsb7U0QO2xf8tK+9O7Hjry70gl8FrMFihkxhnMOCsvEkWbFz2CdPft+Vrak25ZgtDdhd8LurDO0L3Uuon3p78oq2xrg9qXWUMyIUcA6G9zDMmawI9zHxUW2N+1uxpluX+oTkgZP7UsizyysjcB/CxQzYhSoev/e2Kh24UxxN3V7k8ftTWhvQlfArtqb4H56nVs2Z1lOFq0L7oSMXWH0U43V0KcO2c6EYWE5S7mbpmQ3W9qb0BXQFujTPHoX25sgZD2VkKMezQtP1ED7UmushqkezrAPgSk+bmhI+nezxQnwi4YXB9koXBAR29Ixk24JS1so+qbe/N081BsFjeWbXDnnj826VceEbB2E97ZTY3LuwW2L0ayFWbni4dQOLiImiZzREJLbz4oXjuyetU2unHVvsxbPWslkAmPFDKA/zaRUfUdoHcRFhgoz5CFk6M9r6G3LwfuE5OA+aI2xa8K9uPf1jNw4K63rrvwOxAwu5B/ObVuMMAtt0n3N8uGG7VMuYKndflbMU33Z9Hez8u0ZKSPOSykxWsxqHVincD8QX8Gf0DtYbmjUPma/kJywf0gHjIMqbPgwu+DBZnlzheOpVKGa4PVJKHH56yUJnbVsi/+cnZbfz8norgB8YOMD69HLEp6q/r/8cFJmLcjVnJjVwOd3cIG1BjcCFzLe9Hjzwh3BeOQ7XsrIRdOScq5yxX77WsbTtm3TwPP+2tFRPXHC788OFfgbkvmKfC9gByZeTzwv3b6krDqv7UsI/tdSFrMFilnAwEWDN3JCuaAAwnbzM2k5S7kt+LR/30Pjs0nA+sQtbUAyABYyKvK9hEYQMhjRy9ZCFlWiNsFj+5LevlQj7UutoZgFGLyfIWyw2tY3u/I7ZaEhaP4jJWrLNgbHUrt8TCTfpO3zpwQx89rehNcNxbGprKvbl7AroC3gymLOv12jVzXFrEaAKwZrDcWUvy+I2m9ezRjXvL0rUDUP6yzlzYOrGggLoHvhSY+LgtG2VBex5OQhHtuXVjryTg21L7WGYlZjwP2AqK1rcuUW5X5eNK1Zj4gxnS8cHtHPy/fWmRKlZxaizajtBzqkh60zoCd4rC3DTsxaal9qDcWsRkHiAKUdbyx35LI/J+XuVzK+F4I9Aets7KCQznD6GbiaaG96ZYm32CWGU3ppX2pWFh/iZbUY+G+BYlbjwH2BANz2fFq+Mj2pCy5N5cJREW35+P0ZoJTG60htCJmXEos5yrpGcqeWimRbQzEj2vVEAB2jai6ZlpTG1WZmPFFbh90BrVuB/AasJywY8dLe5JXH5+Xbl2rUw9RQzMg2EHNqXOPI55Tb+c+l5sXRIMrnHBTxvbuMZMzKza7844PSnON1zbWxfaktKGZkB9C8j37HK6en9FYf08j365oxkdarq9kWGC+EXtVadjEBxYzsBNygjUlXvvFYUk97MAns2hw3JOz7RABila8ty+m6s46CXkyTkzelgmJGdglclk1JkW/+LaUzniZxekPI92UaKJ/YkhL51SsdG5v73KKcXjaMLoFah2JGdgssNGQ3r56RlKUbzRG0bZuOfP6QIUBwNR98s32CtmKzKzfNTklWiXYtB/5boJiRPQJ36IP1rnz3iZSuZTIBxI7QCrSraa1+AgKEpMUtz6blb/OKi59hcMBVjyVl0Tq35gP/LfA0kDZB2cbLHzryk+fThSP+B+1NnaL+7wiAmKFJHh8WU/+RVq592w949sKcXDytWeYsc2puzM+e4Dwz4gmIAhqZf/6ZmJzW4P8rCNnMcx9oln+vcIyoisf5RW/p4O6WfPaAsBw7KKxnmOGDBBYmBgW8udyRR+dmdVIGx2iR7QjFjHgGMShcYP97UUIv3fA7P30hLbe/mNHJAFPAOcYNgxz3qrP0Y4cwb1BitimV/xmIM2NkO0NtJ55BX+GH61355YtmuJufHrh9wKEp4BzDGoMVvFrZGTjfGNeEaSeIX+JGIds1FDNSFLjQHn4nK68a0CGAjGafzpaRC29apghD3HBDbI3sGYoZKQo9kysryjrz/5SNLnFLDtzH/yUapDRQzEjRoD4KvZsYOeN3Dts3ZJSbSdoPxYwUDTwexHT+MMf/1tlByjIzLW5G2gfFjLQLZNSwBcjv0zUG7WVLzzoz42akOChmpF3AOkMz95//XZrJD+WiuxKyQd1t33cDkI5DMSPtBmUCGBOE8TN+ZkgPZZlRzAIPxYy0G5QLrN7qyvOL/G2dNfRSqmsI0FwILzKwmJjbcsP3sC79HqOsJhQz0iHgbqJX0M/s193SVqQfdQCPCUKFches/cP5xOby/l0tOWBvWw7pY8tI9SdcZcT+EKuEe4+VdRA5WpzbYTsT6RC4mHDxPXpZQheo+pGlGxy90R1r2PxSfIrzBlGCyA7cy5LRfUNyWL+QXvi7tzqPXePovbR0XR+sMbQ0bc242hL+cL2j+zSRgJm/xtFz57DIBcW1tQzFjHQYWAh3TozJhGHhwhF/sSXlysT7m3VrULUveIgYLLBe9ZacuH9IzjogLKP62nrZb7FA5BaudWTmgpxuQMd2JvwrJjTWlwO6maTDwE16/SP1fz6lU8yS7onqJgHwq+FKYizR5WMi8vAlcbnttJgcPTC/tbw9wGqDJffVoyLyiPr3pp4ek+G9bf17ajF7SzEjHQY9hO+u9K+YAUz5qFbwHC5iVlmvGOf954sT8v0TotK/W2kvvfqoJZOUlfe/F8XlO2Oj0lmJJizAWoJiRjoMVqchjoOZW36lV71dFTFDXKybsgphhd1xVlz2717eSw5W3pVHRuTBCxJyRP+8lVYrRhrFjHQYBNU3JF09ytmv9Kir/EUNIUFG8r7JcTn7wMrGE4f3suXe8xJy6afCNZP1pJiRDqMnaWREVvo4l4QVdJXMZELIxg4KyT3nxqVBCUs1QE/qjeNics3xyudUBF3QKGakJOBCWbnZv3GzzrF8mUMlgJCNHxqSX02K6XaqavOlIyJy7QlRbZkGWdAoZqQk4CJBDZRfQYC8ErKCoPuY/rb87IyYJNqZpSwHlx0akSnHRnXmOah6RjEjJWNzYUa9H9F7AMqsLYhN7d/Dkp9/Jq7F0298eUxELh4dDmyWk2JGSgJcuOaMfz/zUSxbTnmBZVoXFfnxKTHZx6edEODaE2Jy5AA7kIJGMSMlA2UIfqVljn655BZW2VePiurJtqUARa/YoblGue7rmlwdhysFSArccHJM9koEr7CW7UykJOBiu2hUWG6aECsc8Rdvf+zI5Aeb9ZDGUicCdJxMWTv3T050qF0KMccXF+fklSX5nkusl8N5RVFyJ+W29utiyeh+thw3KKwn6HaE37+WkZueSQdqiTDFjJQElGZ87rCwXK8+9f0IlgFDzPBmL6WWoRDXVrqCEowj+rfPKvtokyv3zMnIjMasrNzs6seIQmSIrhZedQDH0EnQ4s4e2i8knz8sovs72wMSAReo8/Gv5Y5udg8CHZN3QgrgYvNj0LuFrFKBcpQlYAv5acPD7RayB9/MyDn3N8tvXs3IWmWZwVLCOj80i8PKg6i1rJzDfUhkwLqEBXf5w0n52qNJWdGO4Zj4976i3OJyut6VhmJGSgIsCBSm+hXE8yBmpXyE+Pc6K0P0P5SFVCxwH6/5e0r+31NpWdPkapGCaHkB5xrChp+fMS8nF05rbtce0xOUVTdmQEjH+4IAxYyUBHzCo5nbrzQrN7jUvZkQyOMGhfTwxGJAjO3bM5Lyp7eyem1fe+NsONsQwSUbXG2lvfBBcaqEv3/J6HBZs7yVhGJGOgw0Ahdk3y7+vSw2p/KxqFKBfyuinvN5BxdvlV37VEoeb8xJnfqrpThjiHmhxu/qx1Myt8jpJWMHhWVYr2AsSqaYkQ4DiwftQnt38u/baWOytDEzBOOH9LCLjpX99tWMPPxONl/EW0IQY0MZxzVPpmRL2vsTjavHgdarILiaFDPSYSASeysX089uJsYTldLNhCVz3OCQDtZ7pXG1I3e8nNbCU44zhTgasrZ3vKR86iI4aUhY6qOld8MrDcWMdJgWK8XPKX5YLaWqL8M1DxcT8bJiuOOltLIQ8xnKcgFB+9ObGV2n5hVM9Rjc3XxXk2JGOgw+0Q/p6++3EsYTlUpDUBqBlqViAv//Wp7TW6xiZRZ8JGKw4OSe171bZ7AUD+1n/qJkihnpEBAyxF0+1de/Zhku0lVKzEo1zwwWzJCetnSLe/8H//LvrC4sLpV1uCciyjqbtSBXVP3Z6H4h47OaFDPSISAUA7rZerKpX0GP49qm0okZBHxkb+/PF/G6FxbnKrY1CW4sWqP+sThbONI2w5Q4o7PA5LgZxYx0CCzqOGqgXfLsXCmBkKHPsVRiBhOmmFn+6AvFSHGvRbGl4iUloF6B2wxLsxxdEpWCYkbaDd73sDbGDy0ipVcFlqx3pKlELh6eM+Jefbt6/8feWJ6reOkD6v4aV7u6WNgLKK3pWU8xIzVKS+zoU/38Gy8D769zS5epUxc7srY9ixiHvWCNUzqr0CP4fau3OvrmBYhftXeLdhSKGWk3cDFPG15crVU1mLfKKWlZRixsFdVUrzOpFRYz/D5Yo+uaCwc80LWIhIYfoZiRdoFPcLglZ470t5JllGHy/lqnZLVdCJCjn9JrMB99mE3pymQxW4MSEiQ/vKITAIWvTYRiRtoFLlJs6EYm0898vMmRZRuVmJXwYcIl8+o2Qhwg/JXWMvw+/O5MEcVjlXaFSw3FjBQNLs5uCZGLRvs4hVngvTWOrrov5YVabPmC4RphDBQzUjSwys5S7iVqk/zO68sc49t0iDcoZqQo0IfZp7OlF8v6HVhQaCOqdH0XqQ58mUlRIKD+RSVk+3b1/1tn2UZXFio3s73DD4lZ8GUmntFbiPrbcumn/G+VAVhl65tLGy8j/oViRjyBpFiXuMh1J8Yq1mPYUZ5flDO61IAUB8WMeAIFslcdE+3wvsZKgV7MOctyeu4YqQ34UpM2QX8fimOxp9EU5nyUk+WbKt/cTaoHX2qyRxAnwxbtH42LFo6Ywcz5OeOHDZLioJiR3YJVav27WfLfZ8Ski0F9exiRjSW5dDFrC77cZJdgZA0WlPziMzHZby+z3ibPLcrJiirMDyPVhS832QkIWY96S24/MyajfDwOe3c8OjdblcZuUl0oZmQHECODRXb3pJgctq95Qoaprv/6iC5mLcKXnGwjqYQM/Za/Oycuow20yMBf386UbKosMQuKGdE9jCi/OH5wSO6dHJcRRSzr8BOYs//k/MotDiH+gmJW4yA+hgqGK46MyP98Nq43k5vKI+9m84tDaJXVJBSzGqXFGhvQzZI7zorJNcdHjbZoUPH/0L8ztMpqGIpZjQErDEF+xJQuHh2WP1+UkHE+367khenKKluy3uWEjBqGL32NABFDESx6LI8eGJI/nBuXmybE9Bx/09mYdOWPb2RYV1bj8OUPOBhxDUsMQxVH9bHlF2fG5P7JcTlyQHD8sWlvZWXhWlpltQ5f/gCCeBgC+4iJxZQHeeKQkNw9KS4PKZfy9IZwoMoWVm3JW2WMlRGKWQCAeMHyggUGAbPVqzpyb1u+dWxEx8R+e3ZcTlKCFkTL5XevZWTpBlplxHAxgwuFi7gWbljKgRssLsS+UOAK4YKAQbz6dLG0BXbdiVF56MKE/OXihJ4/1tAruFf53FWOcjEz2vokxGqYqux0Q+kSs/RCVlgmQQduVCRkSV0k/7wRuMdECzSBD+lh6xIL0zdSF8uX/pqU2QtzFRUzfLDs09mSRy9LyF6Jts83PnQ+e1+zLFhb+V0E+PBDW9pJQ7ydoB/MTCmXPev7DfW7w0gxwwPGtua7Jsbk2EFhSQV8cBUuGcyxty1LXxCMD+Wbya+ekZKwOheVlHCKmX8x2gepVxYKPpVhqQT51lnd6qOWJJRVRiETWak+f3/2QlonMiopZMTfGC1miJmR2gNC9iELZEkr+HYgRjFjXlYeeUe5QuasIyAVgmJGjAFLfW99Lq1jpnQvSWsoZsQIEFK4cVZKPtpE95LsGr4tiBHc+XJaZi3MGZtpI+WHYkZ8zzPv5+SulzMSZSaX7AGKGfE17691dP0TaqZQa0fI7qCYEd+C0T5THk/JCsbJiAf4FiG+BJX2338yJW8sd3zXe4liXa+z07QIq5+vVkkkuka8Yvo0FYoZ8SU/mp2SJxpzuuvBb0BoYS1i/BB2Duzuhvs/2ugoF9mtWinJ2iZX1jXv+vF98rZO/VxT2uySF6N7M/9wXlyOGciocND46QtpufOljB4i4MeLCxZMXcTy/NiaMm7VulWQ/cWAgraGMeA5JbOunspiKhQz4iswn+zHz6a1e+Znt6cYcapm4qKYx4nz7eNT3iZ0M4lvuOf1jNz2XFrHo/wev8lPMfF2qya7ejy7u6n/GQ3FjPiCP8zJyC3P5Cdh4MIipFgoZqTq/M8/864lhYx0BIoZqSpwK297nkJGOg7FjFQF7DG45u8p+bWyyiLqXUghIx2FYkYqDmqfrng4qfdd6vILCtluQUkFMpKfXGZTzlsRyU/fwdIMUlHeXenId55IybxVDidg7IIW4cL7GyKPouG6KJbViHRSf8bU2x3Z3lJftPg8we9uXO1IMmPmBwzFjFSMx+Zm5T9np3VFOidgbAci0lKs2qPekmE9bTmkjy0H7G3LwG629OpkKSETdc4sLWTlcslhmX3mnmZZtK7yy1dKAcWMlB3s9kRV/z1z1Ee+wmtfY9BpcR2714mM6R+S8cPC+s++XapjFuGxnGGwmPFtRcrKe8ptuezPzbr8AhYFhSzf24kVdP27WvLtYyPy8CUJ+dWkuEw6IFw1IQPGWTWt4FuLlI0H3sjIhdOS8upSR8d+aj3Qj2A+RAwLnL9/QlQevjQh3zgmqhc5k47Ds0hKDtyUyx9Oyg+fTsvmpOu7ET7VoCUmduGosLbEvnxERLrV2Ab6ckMxIyUDAeTfvpaR8x5IyswFOR3kp1uZt8YG7GVpV/LmCTG9EZ2UHr7VSEl4YXFOLniwWW5+Ji2bUi7LLhQtbuX4oSGZdkFCTtifyapyQjEjHWL+Gke+9beUfOkvSXlzRb52LETDY1u92OVjItoi692JJ6XcUMxIu1iywZGblBV23gPNMn2uMj8UrB3LAyHD7erjonLN8VG2alUIihkpig/WOdqVPPv+pPz21Yw0Z/LTTNmSlAeuJUovpigh+8qRPpz5HWAoZsQzuFBveTYtd7ycj4uh3IJWx3bU6dFJkK8fE9HupWmYvgGLHQCkKN5XltllDyXlY/W2wbQLsh30NE4+JCy3nhorHCkd2COwNS3q5mrLr9TAsoYQX/lIUpZuNHO1H8WMFM1zi3Ly1elJHeCmZZYHLVuH9rPl3slxveyko8B9f/vjnLyyJCdvrXBkmRKYDc2upHKutpDLBerhjBOEAhQz0i5+82p+OqxfNyhVEqUv0jkq8sfzEzKid8dMmhWbXXn4nYw83pjT29whki1tYOX+4MA/b3Lsk44CaRdfOiIiZx8U1q5VrZOFe3ZUtENCBvfxjpcyMum+ZvnJ8xld8gJhQVwSHRRw+yBm5byZnsShmJF2c/3JUTlsX1tbD7UK4kyHqnNw6aHtD/i//lFOzn8wKVP/kdbLeCFgiEcari0Vx2gxMz37YjoYFnjbqfn2HMTPag2EO/AevOqYaLuTIWjG//yfkzJ3Vb4Zn+1f7cfImBlAUeKN46JyeP/QtiZek0AQF9MS8AY2ndkLc/L1R5M6dgR3pVaARYoWpd+dEy8cKY5fvJjWriVOGUWs4xgrZgBtM6b6+Xqq54iwTD299Gn8anD3Kxn5r+fTNTMhQ1806v9+f25cjm5HEgrz3W59Li0R9Vdr6QOgnIR6jr/2hsLXxgHPBlnNlvYRk24A8/CjYUsO39f8jOxh6jks3uDK2x87+gINOvAGEC/85qejRce2ZjRm5fpZ+c3tFLLSYbRxi/cBLDMTb3gT46K/Xbkas5SbFgTg9o/uWxsJAYQJJo4MFy1kaAe7aXZa/30KWWmhp15F8GbOKMvyBzNTsnCt+RH0LjFLbjstpidEBDkhAMu6V70lYwcX71Nj4fHKLWZW2PsdntIqgzf1ys2ufPeJlGxOFfxPg8FmIVhoiGe2uNNBAy7mp/rZRQ9ZnLkgK7MW5Dh5t0xQzHwA3tz/+siRG55OF46YzYRhYfna0RGd5Agi0OhjBxUXGESm9/evZfTfpXdZHihmPiEeEXnk3azOCgaBrx0dlTNGhHSPYZBArKtevVaj+hYnZnOW5uSN5bWRHKkWFDOfgE9rvNFRexSUhMBN42NycJ9gJQRgYe2t3MsB3Yqzr/42L6stVVpl5YNi5iOQEEDgPCgJga7xfIcAtnQHJSGAOCC2jKP7wSvou/ynsswY9C8vPL0+I2gJATRf33ByfnR0EBICqGvcb6/i7Kv317p6hA+r/MsLT68PaUkIXB+QhMDpDWG54siAJASUjvXtWtxl07g6p7c0FSeBpFgoZj4FPZtICNz1cjAi6N88JiqnDg8ZPzIIFmaPuuJkafH68g5UJHkoZj4G245ufyktTy8w36RB1wMSAiP3to220CBjnYtsp12z1dXPn5QXipmP+WRCYMEa8yPo3ZVFg4TAXgmrLHPsK4J6TeLh4pRpS1qJWeFrUj4oZj4HCYFVW4KTEDhwH1t+cFJUf10rrhc9zMpAMTMAJARQcPnDgCQEzhoZli+PiUjKRHdTKVOxbnJ9xKKgVQCKmSEgITD93az8KiAdAt86NirjhpqXEIAobSnSQoZ7zQRA+aGYGQQSAr98EQkB80vq0Yh+y4SYDO9tVkIAtXJrm4pTpoHdLCYAKgDFzCC2JwTSgUgI9Ky35NZTYtI1LsYkBGBhYYRPMQzrZesPIhpn5YViZhhBSwiM6mvLdSfG9IVugiuGD5QP1xenvEN62HrGG7oHSPmgmBlI0BICZx8Ylv84zIyEAFqSUASLin6voBTl0H4hPYiTlA+KmaG0JASC0iHwnbFROXH/UFEiUQ1gmS3f5MhHG4tTptMbQjpOSMoHxcxggtQhAPf5x6fElEtm+TohADHbnBK9uKUYPr1fWMfOTFyLaAoUM4MJWocA4kq3nhrT7UJ+TgggtPfi4uJUCZb0JaPDeh4aKQ8UM8MJWkIAsaXvnxDTawT9mhDA9vJXl+VkY7K4B3jOQRE5rF9tbK+qBhSzABC0hMDkg8PyuUMjvo2fIQnw0Ua3aOsMk4S/d3xU6qLBXfZSTShmAQFuzKNICASkQ+B7Y6MydrB/EwIQo0fnFv/gsCz5qmOiOi5IPSstFLMA0bJUOAgdAnguiJ8N7m75MmiO5MtLH+Zk7srig3tfOiIiF44KGz/bzW9QzAJE0DoE+nS25JZTYlKv3DK/Bc7RnrRFefX3vN4+RbpxXEzOPiist1exb7M0UMwCRtASAmP6h3ScCdlNvz0bWGdPvpeVd9thneF1+slpMW2l4QMIN9IxQj3HX3tD4WsSEHChLN3oysdK1E4ZFi4cNZeD9gnJ+iZX5izz195JWGewrNapx3bGiOLPM/7+cYNC0q+rLW+ucGR9c/61Y1N6+6CYBRRc9LAYIiFLDlfWjekcNTAsby535IP1rr7g/QIym9i+NLi7rYti28PI3raMHxqSjUn8W45OeiBkQFErDopZgMEF8dqynAzvFZL9e/hIAdoBBOwIJcrPLMzKBmXB+GVtG/QGmU10BJw6PCydYu1TIOwYnaCs6KP3C+ke1Y83u7rTYIfiYQhc4UuyM1bD1CLnmRCjQCwG24TunxyXoT3NFjSADOLlDyd1aQPE2i/AmjpteEjunBgvHOkY2LP5wuKsvPyhI++tdmTVlrzFhteznN0RiAOaahFSzGoAVJwf0seW+5SgdW6n5eAn7vtXRm6cldautJ+eDc7zt4+NyNeOzu84KBWIy63e6ugtT1vT+bHdrk6Blu7ZQ8CyysS87bm0sQuLKWY1Ai6ISQeG5b/PKHJPmk+57qmUPPBGVhcL+4WWqn40zH9WnWsTOfPeZl0756dEi1fM9zuIJ7Z1CARkZNAPTorJUQNtX3UIwO2FwXTDrJQ8+74PK33bAC6syTVvFLMaAp+2+ZFBPlKAdhJXhg86BPp39VeHANwzWMHfnpGUWQvNEzSToZjVEEHrEBjYzZabJ8S0sPmpcRuZV3QHXPVYUqa9FQxL2AQoZjUGLrQgdQgcOyik19bBOvPTs8F5xpjsH6oPjv96Pq0/REh5oZjVIEEbGfSFwyNy3sH+a9zGmGxYw9h1+vn/TQbCGvYzFLMaJWgJgR+eFJUj+vtv8CFKHuAGY/bZhX9Kyh/mZIzaE2oSFLMaZntCwPyrqy5qyW2nxqRPF8uXLh2sYUym/c/ZabngT80ye2GW0zJKDMWshtmeEAjGDoFB3W25aXxMi7SfEgItINMJUUOP6RWPpOTiac3y5PysNGWoaqWAvZk1DgRtUzLfW3h6Q1hdbOqAwUDQIupJ/eODnK8a0j8JRA3u55INrvy9MSczlWW8equrrcvudVbVqu/xAfDQW1ndaWBiBwDFjOiLPkgjgw7dNySr1AX57xWOby9KfGTgseG2tsnVPZiPzctqYWtc5cimVF5c8NqElThX4nngg22aEjMIq4lixnYmsg00MJ80JCT7dLZ86aZ5BRciZoPNVC4cJtSaYmsihpZVN7wOeMxYfNItbknPeku6JSw9WaMukm8GLwd4zRE/Xd/samEzDYoZ2QFk2kwWshZwMZbroq8UEDe8FvqmD5S/li6mzhmnZhBCSBUx0DMmhJCdoZgRQgIBxYwQEggoZoSQQEAxI4QEAooZISQQUMwIIYGAYkYICQQUM0JIIKCYEUICgS35baKEEGIuSsds15JmYztLCSFE6ZdrWU3KMpONYtHbJIQYitYvdzMmpayyKGaEEEOBfllirbJd214qtuGDnwghtYvSL9e1liABsNBiUpMQYihavyx3oXIznXmur3ZBE0KId6Bfys2cZ7sSfsfNNOuMACGEGAUymdAvJ/u2baUz77muu8KyGDcjhJhFXrfc5ZKV+XbjtV3Xqu/ekJD5K8YIITWG0i1X6Rd0LB/5t2Sm8jn1l4QQYgrQLVvsp/G1FjMn6850Mk1JFs8SQoxB6RV0Kyehp/CtVq8F13SZ57ryTysUwbeEEOJ78nplvTJ/SrwR328zxSzXeoAZTUKIMUCvLHmw8N12MXNs5xE307zcspkIIIT4G+iUm0kuzyad6YVD28Vs/pQua5SreZ8VjhaOEEKIP9E65Vr3LLyuy+rCoe1iBsJW6K5cqmmdxV5NQohPgT5Bp0KWdXfhkGYHMXt3St1Scd1fW+FY4QghhPgL6JNlWXdpvfoEO4gZsBLOT51002JmNgkhfgO6BH2SdPbnhUPb2EnMGr/eda3lyg/zmU1mNwkhfgHZSyVZjlxf6Fzagd2q1fCfbH4kFK2f6GSaCkcIIaR62NE6xMqmv/edTpMKh3ZgJ8ushbAV+oaT2bqc7iYhpNpYoahyL7cuD+XsqwqHdmK3YpYPrjmXu7m0yzYnQkjVUPrj5lIu9GjuNXVLCkd3Yo8q1Til6wxx3et0TQe7AwghlUbpDqwy9f/XaD3aA54UqmHq5l/ZkbornExSfceptISQSqAkLBIXJ9N813tTOn21cHC3eDO3XNdqmLr1T3asfrKTRkKAgkYIKSdWPuCf3jpNCdkFhYN7xFswzLJce0v9pfiHoZR0OQkhZUPpi610Jpfa+lBoc/1lhaNtUrQqDZ+65U47HL/SzaWVgeYUjhJCSAmwbN136Waa7268utOVMKQK97RJ0WlK7btmk98TN+ciMEcIIaVAl4EpXXHTTdc2Tun8lWKEDLTbX2yYuvEMpYW/tqP1fZ10szrCOBohpD3ArUwI6lpRftFW1nJ3dCj4NfLWpgG5kPMLOxKbCJfTzWUK9xBCSNtoa8yylJClpqNQv3XzeDGUJJLf8F9bLlUO6412tG4/N5tSupYr3EMIITuDMT6YfqGHWrjyw3nf6XR/4a52U7K0ZMMtG3tINPxN13WvDMXqurvZtBK1bOFeQgiBiIV1gB/zyPS4sYTzUwy3KNzdIUomZi0cMLWpf851r3DF+bwdTfRRDzjvfjLzSUhtggxlwZ3EaH5MtMYg2I64lLui5GLWwpCbN/UKx+2J4sqFSsmOtCN1cSVrIrms0jflhqpnRAgJIGhBwqbxkLLC1H9YB6e3v7nWA9g1ghH9hZ8sKWUTs08ybOqmBtuxTnFtOVn9wtHq1/a1Ign9RJUFJ+LklLapP/WNIkeIEaB4HlYXBlEgBia2up7Vf5lmdRm7K9RPvKFuT7mWO1MJmF4HV04qImafRMfWwjJM7PBB6mmPENcaYlnuAPV1b/VwOluuW6fOTsUfFyGkCJRauZYo1ZKN6mJd5Yq9VCx3obLD5rkSfsdKZ97b1QDF8iHyf/R9132spGtPAAAAAElFTkSuQmCC"/></defs></svg>
\ No newline at end of file

From 00a04f18e4ae877ef45e21cf90413274b2ac78db Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 11:00:21 +0530
Subject: [PATCH 229/796] [server] Fix publish workflow

Fixes for https://github.com/ente-io/ente/pull/5088
---
 .github/workflows/server-publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/server-publish.yml b/.github/workflows/server-publish.yml
index 9f76b5c8ff..a677fd9eac 100644
--- a/.github/workflows/server-publish.yml
+++ b/.github/workflows/server-publish.yml
@@ -31,8 +31,8 @@ jobs:
                   enableBuildKit: true
                   multiPlatform: true
                   platform: linux/amd64,linux/arm64
-                  buildArgs: GIT_COMMIT=${{ inputs.commit }}
-                  tags: ${{ inputs.commit }}, latest
+                  buildArgs: GIT_COMMIT=${{ env.museum_commit }}
+                  tags: ${{ env.museum_commit }}, latest
                   username: ${{ github.actor }}
                   password: ${{ secrets.GITHUB_TOKEN }}
 

From 098ff4e6643fe3b00507fc6fb9c767847446af53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Ignacio=20Torres?= <andresitorresm@gmail.com>
Date: Sun, 16 Feb 2025 21:31:21 -0800
Subject: [PATCH 230/796] [auth] Add custom icon for EVE Online (#5078)

## Description

Added an Ente Auth custom icon for the EVE Online game service. I
followed the guidance
[here](https://github.com/ente-io/ente/blob/main/auth/docs/adding-icons.md)
to add the entry for EVE Online.

The icon itself comes from [Wikimedia
Commons](https://commons.wikimedia.org/wiki/File:EVE_online_logo.svg)
and was adapted to a square. I also added a custom hex color code to
ensure the logo is visible when using dark mode.

Noting that this is my first contribution as I've recently started using
Ente Auth, any feedback or suggestions would be appreciated :-)

## Tests

Visual change, no code changes.
---
 auth/assets/custom-icons/_data/custom-icons.json | 8 ++++++++
 auth/assets/custom-icons/icons/eve_online.svg    | 3 +++
 2 files changed, 11 insertions(+)
 create mode 100644 auth/assets/custom-icons/icons/eve_online.svg

diff --git a/auth/assets/custom-icons/_data/custom-icons.json b/auth/assets/custom-icons/_data/custom-icons.json
index f3fcbd9dfe..bffe8b165f 100644
--- a/auth/assets/custom-icons/_data/custom-icons.json
+++ b/auth/assets/custom-icons/_data/custom-icons.json
@@ -361,6 +361,14 @@
     {
       "title": "Estateguru"
     },
+    {
+      "title": "EVEOnline",
+      "slug": "eve_online",
+      "altNames": [
+        "EVE Online"
+      ],
+      "hex": "858585"
+    },
     {
       "title": "Fastmail"
     },
diff --git a/auth/assets/custom-icons/icons/eve_online.svg b/auth/assets/custom-icons/icons/eve_online.svg
new file mode 100644
index 0000000000..816807454d
--- /dev/null
+++ b/auth/assets/custom-icons/icons/eve_online.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="198.4" height="198.4" xml:space="preserve">
+<path transform="translate(0, 60)"  d="M 0,0 0,13.88 10.97,13.88 10.97,10.31 60.69,10.31 60.69,0 0,0 z M 65.84,0 99.22,58.09 132.6,0 120.7,0 C 120.7,0 100.5,34.91 99.22,37.16 97.92,34.91 77.75,0 77.75,0 L 65.84,0 z M 137.8,0 137.8,13.88 148.7,13.88 148.7,10.31 198.4,10.31 198.4,0 137.8,0 z M 0,19.12 0,29.47 60.69,29.47 60.69,19.12 0,19.12 z M 137.8,19.12 137.8,29.47 198.4,29.47 198.4,19.12 137.8,19.12 z M 0,34.66 0,48.59 60.69,48.59 60.69,38.25 10.97,38.25 10.97,34.66 0,34.66 z M 137.8,34.66 137.8,48.59 198.4,48.59 198.4,38.25 148.7,38.25 148.7,34.66 137.8,34.66 z M 42.19,69.72 C 41.32,69.72 40.71,69.89 40.41,70.19 40.1,70.49 39.97,71.03 39.97,71.84 L 39.97,76.56 C 39.97,77.38 40.1,77.93 40.41,78.22 40.71,78.52 41.32,78.66 42.19,78.66 L 48.72,78.66 C 49.59,78.66 50.19,78.52 50.5,78.22 50.8,77.93 50.97,77.38 50.97,76.56 L 50.97,71.84 C 50.97,71.03 50.8,70.49 50.5,70.19 50.19,69.89 49.59,69.72 48.72,69.72 L 42.19,69.72 z M 64.37,69.72 64.37,78.66 66.25,78.66 66.25,73.84 C 66.25,73.66 66.23,73.43 66.22,73.19 66.2,72.94 66.18,72.69 66.16,72.41 66.26,72.53 66.38,72.67 66.5,72.78 66.62,72.89 66.75,73.01 66.91,73.16 L 73.47,78.66 74.88,78.66 74.88,69.72 73.03,69.72 73.03,74.41 C 73.03,74.52 73.05,74.7 73.06,74.91 73.07,75.11 73.09,75.47 73.12,75.97 72.99,75.81 72.82,75.66 72.66,75.5 72.49,75.35 72.31,75.18 72.09,75 L 65.81,69.72 64.37,69.72 z M 88.53,69.72 88.53,78.66 97.31,78.66 97.31,77 90.59,77 90.59,69.72 88.53,69.72 z M 109.4,69.72 109.4,78.66 111.5,78.66 111.5,69.72 109.4,69.72 z M 125.1,69.72 125.1,78.66 127,78.66 127,73.84 C 127,73.66 127,73.43 126.9,73.19 126.9,72.94 126.9,72.69 126.9,72.41 127,72.53 127.1,72.67 127.2,72.78 127.3,72.89 127.5,73.01 127.6,73.16 L 134.2,78.66 135.6,78.66 135.6,69.72 133.8,69.72 133.8,74.41 C 133.8,74.52 133.8,74.7 133.8,74.91 133.8,75.11 133.8,75.47 133.8,75.97 133.7,75.81 133.6,75.66 133.4,75.5 133.2,75.35 133,75.18 132.8,75 L 126.5,69.72 125.1,69.72 z M 149.3,69.72 149.3,78.66 158.5,78.66 158.5,77 151.3,77 151.3,74.78 155.4,74.78 155.4,73.25 151.3,73.25 151.3,71.25 158.4,71.25 158.4,69.72 149.3,69.72 z M 42.03,71.31 48.87,71.31 48.87,77 42.03,77 42.03,71.31 z" /></svg>

From dd52ee77631034aed536d29723aef69fe3db0b2a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 17 Feb 2025 11:02:52 +0530
Subject: [PATCH 231/796] [auth] New translations (#5085)

New translations from
[Crowdin](https://crowdin.com/project/ente-authenticator-app)

Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
---
 auth/lib/l10n/arb/app_ca.arb | 12 +++++++++++-
 auth/lib/l10n/arb/app_de.arb | 11 ++++++++++-
 auth/lib/l10n/arb/app_es.arb |  9 ++++++++-
 auth/lib/l10n/arb/app_hu.arb | 10 +++++++++-
 auth/lib/l10n/arb/app_ja.arb | 13 ++++++++++++-
 auth/lib/l10n/arb/app_ml.arb | 29 ++++++++++++++++++++++++++++-
 6 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/auth/lib/l10n/arb/app_ca.arb b/auth/lib/l10n/arb/app_ca.arb
index adef48b36e..b091cc5e8a 100644
--- a/auth/lib/l10n/arb/app_ca.arb
+++ b/auth/lib/l10n/arb/app_ca.arb
@@ -88,6 +88,8 @@
   "useRecoveryKey": "Usa la clau de recuperació",
   "incorrectPasswordTitle": "Contrasenya incorrecta",
   "welcomeBack": "Benvingut de nou!",
+  "emailAlreadyRegistered": "El correu electrònic ja està registrat.",
+  "emailNotRegistered": "El correu electrònic no està registrat.",
   "madeWithLoveAtPrefix": "fet amb ❤️ a ",
   "supportDevs": "Subscriu-te a <bold-green>ente</bold-green> per donar-nos suport",
   "supportDiscount": "Usa el codi de descompte \"AUTH\" per obtenir un 10% de descompte el primer any",
@@ -502,5 +504,13 @@
   "deselectAll": "Desselecciona-ho tot",
   "selectAll": "Seleccionar-ho tot",
   "deleteDuplicates": "Elimina duplicats",
-  "plainHTML": "HTML pla"
+  "plainHTML": "HTML pla",
+  "tellUsWhatYouThink": "Digueu-nos què us sembla",
+  "dropReview": "Deixa una ressenya a l'App/Play Store",
+  "supportEnte": "Donar suport a <bold-green>ente</bold-green>",
+  "giveUsAStarOnGithub": "Dona'ns una estrella a Github",
+  "free5GB": "5 GB gratuïts a <bold-green>ente</bold-green> Photos",
+  "loginWithAuthAccount": "Inicieu sessió amb el vostre compte Auth",
+  "freeStorageOffer": "10% de descompte a <bold-green>ente</bold-green> photos",
+  "freeStorageOfferDescription": "Utilitzeu el codi \"AUTH\" per obtenir un 10% de descompte el primer any"
 }
\ No newline at end of file
diff --git a/auth/lib/l10n/arb/app_de.arb b/auth/lib/l10n/arb/app_de.arb
index 8bce3046c8..9a10ff5be5 100644
--- a/auth/lib/l10n/arb/app_de.arb
+++ b/auth/lib/l10n/arb/app_de.arb
@@ -88,6 +88,8 @@
   "useRecoveryKey": "Wiederherstellungsschlüssel verwenden",
   "incorrectPasswordTitle": "Falsches Passwort",
   "welcomeBack": "Willkommen zurück!",
+  "emailAlreadyRegistered": "E-Mail ist bereits registriert.",
+  "emailNotRegistered": "E-Mail-Adresse nicht registriert.",
   "madeWithLoveAtPrefix": "gemacht mit ❤️ bei ",
   "supportDevs": "Bei <bold-green>ente</bold-green> registrieren, um das Projekt zu unterstützen",
   "supportDiscount": "Benutzen Sie den Rabattcode \"AUTH\" für 10 % Rabatt im ersten Jahr",
@@ -255,6 +257,8 @@
   "areYouSureYouWantToLogout": "Sind sie sicher, dass sie sich ausloggen möchten?",
   "yesLogout": "Ja ausloggen",
   "exit": "Schließen",
+  "theme": "Theme",
+  "systemTheme": "System",
   "verifyingRecoveryKey": "Verifiziere Wiederherstellungsschlüssel...",
   "recoveryKeyVerified": "Wiederherstellungsschlüssel verifiziert",
   "recoveryKeySuccessBody": "Großartig! Ihr Wiederherstellungsschlüssel ist gültig. Vielen Dank für die Verifizierung.\n\nBitte denken sie daran, dass sie ihren Wiederherstellungsschlüssel sicher aufbewahren.",
@@ -325,6 +329,7 @@
       }
     }
   },
+  "manualSort": "Benutzerdefiniert",
   "activeSessions": "Aktive Sitzungen",
   "somethingWentWrongPleaseTryAgain": "Ein Fehler ist aufgetreten, bitte versuche es erneut",
   "thisWillLogYouOutOfThisDevice": "Dadurch wirst du von diesem Gerät abgemeldet!",
@@ -478,5 +483,9 @@
   "setNewPin": "Neue PIN festlegen",
   "importFailureDescNew": "Die ausgewählte Datei konnte nicht verarbeitet werden.",
   "appLockNotEnabled": "App-Sperre nicht aktiviert",
-  "appLockNotEnabledDescription": "Bitte aktivieren Sie die App-Sperre über Security > App-Sperre"
+  "appLockNotEnabledDescription": "Bitte aktivieren Sie die App-Sperre über Security > App-Sperre",
+  "duplicateCodes": "Doppelte Codes",
+  "noDuplicates": "✨ Keine Duplikate",
+  "deselectAll": "Alle abwählen",
+  "selectAll": "Alles auswählen"
 }
\ No newline at end of file
diff --git a/auth/lib/l10n/arb/app_es.arb b/auth/lib/l10n/arb/app_es.arb
index 9ae3c65aae..bf851a3ca0 100644
--- a/auth/lib/l10n/arb/app_es.arb
+++ b/auth/lib/l10n/arb/app_es.arb
@@ -504,5 +504,12 @@
   "deselectAll": "Deseleccionar todo",
   "selectAll": "Seleccionar todo",
   "deleteDuplicates": "Eliminar duplicados",
-  "plainHTML": "HTML plano"
+  "plainHTML": "HTML plano",
+  "tellUsWhatYouThink": "Cuéntanos cuál es su opinión",
+  "dropReview": "Danos una reseña en la App/Play Store",
+  "supportEnte": "Apoya a <bold-green>ente</bold-green>",
+  "giveUsAStarOnGithub": "Danos una estrella en GitHub",
+  "free5GB": "5 GB gratis en <bold-green>ente</bold-green> Fotos",
+  "freeStorageOffer": "10% de descuento en <bold-green>ente</bold-green> fotos",
+  "freeStorageOfferDescription": "Usa el cupón \"AUTH\" para obtener un 10% de descuento en el primer año"
 }
\ No newline at end of file
diff --git a/auth/lib/l10n/arb/app_hu.arb b/auth/lib/l10n/arb/app_hu.arb
index 10fcee33ec..f2b917e09b 100644
--- a/auth/lib/l10n/arb/app_hu.arb
+++ b/auth/lib/l10n/arb/app_hu.arb
@@ -504,5 +504,13 @@
   "deselectAll": "Összes kijelölés megszüntetése",
   "selectAll": "Összes kijelölése",
   "deleteDuplicates": "Ismétlődések törlése",
-  "plainHTML": "Sima HTML kód"
+  "plainHTML": "Sima HTML kód",
+  "tellUsWhatYouThink": "Mondja el mit gondol",
+  "dropReview": "Írjon véleményt az App/Play Store-ban",
+  "supportEnte": "Támogassa <bold-green>ente <bold-green>",
+  "giveUsAStarOnGithub": "Adj nekünk egy csillagot a Githubon",
+  "free5GB": "5GB ingyen <bold-green>ente <bold-green> Photos",
+  "loginWithAuthAccount": "Jelentkezzen be Auth fiókjával",
+  "freeStorageOffer": "10% kedvezmény on <bold-green>ente<bold-green> photos",
+  "freeStorageOfferDescription": "Használja az \"AUTH\" kódot, hogy 10% kedvezményt kapjon az első évben"
 }
\ No newline at end of file
diff --git a/auth/lib/l10n/arb/app_ja.arb b/auth/lib/l10n/arb/app_ja.arb
index 3ad6e048ef..086d8afe32 100644
--- a/auth/lib/l10n/arb/app_ja.arb
+++ b/auth/lib/l10n/arb/app_ja.arb
@@ -499,7 +499,18 @@
   "appLockOfflineModeWarning": "バックアップなしで進むことを選択しました。アプリロックを忘れると、データにアクセスできなくなります。",
   "duplicateCodes": "重複コード",
   "noDuplicates": "✨ 重複なし",
+  "youveNoDuplicateCodesThatCanBeCleared": "削除できる重複コードはありません",
+  "deduplicateCodes": "重複コード",
+  "deselectAll": "すべての選択を解除",
+  "selectAll": "すべて選択",
+  "deleteDuplicates": "重複を削除",
   "plainHTML": "Plain HTML",
   "tellUsWhatYouThink": "ご意見をお聞かせください",
-  "loginWithAuthAccount": "認証アカウントでログイン"
+  "dropReview": "App/Playストアにレビューを投稿する",
+  "supportEnte": "<bold-green>ente</bold-green>をサポートする",
+  "giveUsAStarOnGithub": "Githubで星をつける",
+  "free5GB": "<bold-green>ente</bold-green>フォトで5GB無料",
+  "loginWithAuthAccount": "認証アカウントでログイン",
+  "freeStorageOffer": "<bold-green>ente</bold-green>の写真が10%オフ",
+  "freeStorageOfferDescription": "クーポンコード \"AUTH\" の使用で初年度が10%オフになります"
 }
\ No newline at end of file
diff --git a/auth/lib/l10n/arb/app_ml.arb b/auth/lib/l10n/arb/app_ml.arb
index 9e26dfeeb6..ed441ead94 100644
--- a/auth/lib/l10n/arb/app_ml.arb
+++ b/auth/lib/l10n/arb/app_ml.arb
@@ -1 +1,28 @@
-{}
\ No newline at end of file
+{
+  "blog": "ബ്ലോഗ്",
+  "verifyPassword": "പാസ്‌വേഡ് സ്ഥിരീകരിക്കുക",
+  "recreatePassword": "പാസ്‌വേഡ് പുനഃസൃഷ്ടിക്കുക",
+  "incorrectPasswordTitle": "തെറ്റായ പാസ്‌വേഡ്",
+  "welcomeBack": "വീണ്ടും സ്വാഗതം!",
+  "emailAlreadyRegistered": "ഇമെയിൽ ഇതിനകം രജിസ്റ്റർ ചെയ്തിട്ടുണ്ട്.",
+  "emailNotRegistered": "ഇമെയിൽ രജിസ്റ്റർ ചെയ്തിട്ടില്ല.",
+  "changeEmail": "ഇമെയിൽ മാറ്റുക",
+  "changePassword": "പാസ്സ്‌വേർഡ് മാറ്റുക",
+  "ok": "ശരി",
+  "cancel": "റദ്ദാക്കുക",
+  "yes": "അതെ",
+  "no": "അല്ല",
+  "email": "ഇമെയിൽ",
+  "somethingWentWrongMessage": "എന്തോ കുഴപ്പമുണ്ടായി, ദയവായി വീണ്ടും ശ്രമിക്കുക",
+  "inFamilyPlanMessage": "നിങ്ങൾ ഒരു ഫാമിലി പ്ലാനിലാണ്!",
+  "scan": "സ്കാൻ ചെയ്യുക",
+  "scanACode": "കോഡ് സ്കാൻ ചെയ്യുക",
+  "verify": "പരിശോധിക്കുക",
+  "verifyEmail": "ഇമെയിൽ സ്ഥിരീകരിക്കുക",
+  "enterCodeHint": "നിങ്ങളുടെ ഓതന്റിക്കേറ്റർ ആപ്പിൽ നിന്നുള്ള 6 അക്ക കോഡ് നൽകുക",
+  "twoFactorAuthTitle": "ടു-ഫാക്ടർ ആധികാരികത",
+  "createNewAccount": "പുതിയ അക്കൗണ്ട് സൃഷ്ടിക്കുക",
+  "confirmPassword": "പാസ്വേഡ് സ്ഥിരീകരിക്കുക",
+  "language": "ഭാഷ",
+  "security": "സുരക്ഷ"
+}
\ No newline at end of file

From 1fe6987acf7f245df9f8a8fb84e0fb14319c1695 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 17 Feb 2025 11:39:13 +0530
Subject: [PATCH 232/796] [mob][photos] Move to home gallery

---
 mobile/lib/models/memory.dart                 |  18 +
 mobile/lib/models/smart_memory.dart           |  17 +-
 mobile/lib/models/time_memory.dart            |  32 +
 mobile/lib/models/trip_memory.dart            |  15 +-
 .../lib/services/smart_memories_service.dart  | 905 ++++++++++++++++++
 .../lib/ui/home/memories/memories_widget.dart |  67 ++
 .../ui/home/memories/memory_cover_widget.dart |   4 +-
 .../ente_feature_flag/lib/src/service.dart    |   2 +
 8 files changed, 1046 insertions(+), 14 deletions(-)
 create mode 100644 mobile/lib/models/time_memory.dart

diff --git a/mobile/lib/models/memory.dart b/mobile/lib/models/memory.dart
index 32bc40e13c..3ba9e57026 100644
--- a/mobile/lib/models/memory.dart
+++ b/mobile/lib/models/memory.dart
@@ -17,4 +17,22 @@ class Memory {
   void markSeen() {
     _seenTime = DateTime.now().microsecondsSinceEpoch;
   }
+
+  Memory.fromUnseenFile(this.file) : _seenTime = -1;
+
+  static List<Memory> fromFiles(List<EnteFile> files) {
+    final memories = <Memory>[];
+    for (final file in files) {
+      memories.add(Memory.fromUnseenFile(file));
+    }
+    return memories;
+  }
+
+  static List<EnteFile> filesFromMemories(List<Memory> memories) {
+    final List<EnteFile> files = [];
+    for (final memory in memories) {
+      files.add(memory.file);
+    }
+    return files;
+  }
 }
diff --git a/mobile/lib/models/smart_memory.dart b/mobile/lib/models/smart_memory.dart
index a1e0ce0ebf..0c16b64c16 100644
--- a/mobile/lib/models/smart_memory.dart
+++ b/mobile/lib/models/smart_memory.dart
@@ -1,4 +1,4 @@
-import "package:photos/models/file/file.dart";
+import "package:photos/models/memory.dart";
 
 enum MemoryType {
   people,
@@ -8,14 +8,16 @@ enum MemoryType {
 }
 
 abstract class SmartMemory {
-  final List<EnteFile> files;
+  final List<Memory> memories;
   final MemoryType type;
+  String? name;
   int? firstCreationTime;
   int? lastCreationTime;
 
   SmartMemory(
-    this.files,
+    this.memories,
     this.type, {
+    this.name,
     this.firstCreationTime,
     this.lastCreationTime,
   });
@@ -24,9 +26,9 @@ abstract class SmartMemory {
     if (firstCreationTime != null && lastCreationTime != null) {
       return (firstCreationTime! + lastCreationTime!) ~/ 2;
     }
-    final List<int> creationTimes = files
-        .where((file) => file.creationTime != null)
-        .map((file) => file.creationTime!)
+    final List<int> creationTimes = memories
+        .where((memory) => memory.file.creationTime != null)
+        .map((memory) => memory.file.creationTime!)
         .toList();
     if (creationTimes.length < 2) {
       return creationTimes.isEmpty ? 0 : creationTimes.first;
@@ -38,7 +40,8 @@ abstract class SmartMemory {
   }
 
   SmartMemory copyWith({
-    List<EnteFile>? files,
+    List<Memory>? memories,
+    String? name,
     int? firstCreationTime,
     int? lastCreationTime,
   });
diff --git a/mobile/lib/models/time_memory.dart b/mobile/lib/models/time_memory.dart
new file mode 100644
index 0000000000..e90dabe187
--- /dev/null
+++ b/mobile/lib/models/time_memory.dart
@@ -0,0 +1,32 @@
+import "package:photos/models/memory.dart";
+import "package:photos/models/smart_memory.dart";
+
+class TimeMemory extends SmartMemory {
+  TimeMemory(
+    List<Memory> memories, {
+    String? name,
+    int? firstCreationTime,
+    int? lastCreationTime,
+  }) : super(
+          memories,
+          MemoryType.time,
+          name: name,
+          firstCreationTime: firstCreationTime,
+          lastCreationTime: lastCreationTime,
+        );
+
+  @override
+  TimeMemory copyWith({
+    List<Memory>? memories,
+    String? name,
+    int? firstCreationTime,
+    int? lastCreationTime,
+  }) {
+    return TimeMemory(
+      memories ?? this.memories,
+      name: name ?? this.name,
+      firstCreationTime: firstCreationTime ?? super.firstCreationTime,
+      lastCreationTime: lastCreationTime ?? super.lastCreationTime,
+    );
+  }
+}
diff --git a/mobile/lib/models/trip_memory.dart b/mobile/lib/models/trip_memory.dart
index 5315faa82a..2ff4e339e0 100644
--- a/mobile/lib/models/trip_memory.dart
+++ b/mobile/lib/models/trip_memory.dart
@@ -1,27 +1,30 @@
-import "package:photos/models/file/file.dart";
 import "package:photos/models/location/location.dart";
+import "package:photos/models/memory.dart";
 import "package:photos/models/smart_memory.dart";
 
 class TripMemory extends SmartMemory {
   final Location location;
 
   TripMemory(
-    files,
+    List<Memory> memories,
     this.location, {
+    super.name,
     super.firstCreationTime,
     super.lastCreationTime,
-  }) : super(files, MemoryType.trips);
+  }) : super(memories, MemoryType.trips);
 
   @override
-  SmartMemory copyWith({
-    List<EnteFile>? files,
+  TripMemory copyWith({
+    List<Memory>? memories,
     Location? location,
+    String? name,
     int? firstCreationTime,
     int? lastCreationTime,
   }) {
     return TripMemory(
-      files ?? this.files,
+      memories ?? super.memories,
       location ?? this.location,
+      name: name ?? super.name,
       firstCreationTime: firstCreationTime ?? super.firstCreationTime,
       lastCreationTime: lastCreationTime ?? super.lastCreationTime,
     );
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 8b13789179..c49400e884 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -1 +1,906 @@
+import "dart:math" show min, max;
 
+import "package:flutter/material.dart";
+import "package:intl/intl.dart";
+import "package:logging/logging.dart";
+import "package:ml_linalg/vector.dart";
+import "package:photos/db/ml/db.dart";
+import "package:photos/models/base_location.dart";
+import "package:photos/models/file/extensions/file_props.dart";
+import "package:photos/models/file/file.dart";
+import "package:photos/models/local_entity_data.dart";
+import "package:photos/models/location/location.dart";
+import "package:photos/models/location_tag/location_tag.dart";
+import "package:photos/models/memory.dart";
+import "package:photos/models/smart_memory.dart";
+import "package:photos/models/time_memory.dart";
+import "package:photos/models/trip_memory.dart";
+import "package:photos/service_locator.dart";
+import "package:photos/services/location_service.dart";
+import "package:photos/services/machine_learning/ml_computer.dart";
+import "package:photos/services/memories_service.dart";
+import "package:photos/services/search_service.dart";
+
+class SmartMemoriesService {
+  final _logger = Logger("SmartMemoriesService");
+
+  bool _isInit = false;
+
+  late Locale _locale;
+
+  List<SmartMemory>? _cachedMemories;
+  Future<List<SmartMemory>>? _future;
+
+  // Singleton pattern
+  SmartMemoriesService._privateConstructor();
+  static final instance = SmartMemoriesService._privateConstructor();
+  factory SmartMemoriesService() => instance;
+
+  void init(BuildContext context) {
+    if (_isInit) return;
+    _locale = Localizations.localeOf(context);
+    _isInit = true;
+    _logger.info("Smart memories service initialized");
+  }
+
+  Future<List<SmartMemory>> getMemories(int? limit) async {
+    if (!MemoriesService.instance.showMemories) {
+      return [];
+    }
+    if (_cachedMemories != null) {
+      return _cachedMemories!;
+    }
+    if (_future != null) {
+      return _future!;
+    }
+    _future = _calcMemories();
+    return _future!;
+  }
+
+  // One general method to get all memories, which calls on internal methods for each separate memory type
+  Future<List<SmartMemory>> _calcMemories() async {
+    try {
+      final List<SmartMemory> memories = [];
+      final allFiles = Set<EnteFile>.from(
+        await SearchService.instance.getAllFilesForSearch(),
+      );
+      _logger.finest("All files length: ${allFiles.length}");
+
+      // Pause 10 seconds TODO: lau: remove this later
+      await Future.delayed(const Duration(seconds: 10));
+
+      // // People memories TODO: lau: add people
+      // final peopleMemories = await _getPeopleResults(allFiles, limit);
+      // _deductUsedMemories(allFiles, peopleMemories);
+      // memories.addAll(peopleMemories);
+      // _logger.finest("All files length: ${allFiles.length}");
+
+      // Trip memories
+      final tripMemories = await _getTripsResults(allFiles, null);
+      _deductUsedMemories(allFiles, tripMemories);
+      memories.addAll(tripMemories);
+      _logger.finest("All files length: ${allFiles.length}");
+
+      // Time memories
+      final timeMemories = await _onThisDayOrWeekResults(allFiles, null);
+      _deductUsedMemories(allFiles, timeMemories);
+      memories.addAll(timeMemories);
+      _logger.finest("All files length: ${allFiles.length}");
+
+      // // Filler memories TODO: lau: add filler results
+      // final fillerMemories = await _getFillerResults(limit);
+      // _deductUsedMemories(allFiles, fillerMemories);
+      // memories.addAll(fillerMemories);
+      // _logger.finest("All files length: ${allFiles.length}");
+
+      return memories;
+    } catch (e, s) {
+      _logger.severe("Error calculating smart memories", e, s);
+      return [];
+    }
+  }
+
+  void _deductUsedMemories(
+    Set<EnteFile> files,
+    List<SmartMemory> memories,
+  ) {
+    final usedFiles = <EnteFile>{};
+    for (final memory in memories) {
+      usedFiles.addAll(memory.memories.map((m) => m.file));
+    }
+    files.removeAll(usedFiles);
+  }
+
+  Future<List<TripMemory>> _getTripsResults(
+    Iterable<EnteFile> allFiles,
+    int? limit,
+  ) async {
+    final List<TripMemory> memoryResults = [];
+    final Iterable<LocalEntity<LocationTag>> locationTagEntities =
+        (await locationService.getLocationTags());
+    if (allFiles.isEmpty) return [];
+    final currentTime = DateTime.now().toLocal();
+    final currentMonth = currentTime.month;
+    final cutOffTime = currentTime.subtract(const Duration(days: 365));
+
+    final Map<LocalEntity<LocationTag>, List<EnteFile>> tagToItemsMap = {};
+    for (int i = 0; i < locationTagEntities.length; i++) {
+      tagToItemsMap[locationTagEntities.elementAt(i)] = [];
+    }
+    final List<(List<EnteFile>, Location)> smallRadiusClusters = [];
+    final List<(List<EnteFile>, Location)> wideRadiusClusters = [];
+    // Go through all files and cluster the ones not inside any location tag
+    for (EnteFile file in allFiles) {
+      if (!file.hasLocation ||
+          file.uploadedFileID == null ||
+          !file.isOwner ||
+          file.creationTime == null) {
+        continue;
+      }
+      // Check if the file is inside any location tag
+      bool hasLocationTag = false;
+      for (LocalEntity<LocationTag> tag in tagToItemsMap.keys) {
+        if (isFileInsideLocationTag(
+          tag.item.centerPoint,
+          file.location!,
+          tag.item.radius,
+        )) {
+          hasLocationTag = true;
+          tagToItemsMap[tag]!.add(file);
+        }
+      }
+      // Cluster the files not inside any location tag (incremental clustering)
+      if (!hasLocationTag) {
+        // Small radius clustering for base locations
+        bool foundSmallCluster = false;
+        for (final cluster in smallRadiusClusters) {
+          final clusterLocation = cluster.$2;
+          if (isFileInsideLocationTag(
+            clusterLocation,
+            file.location!,
+            0.6,
+          )) {
+            cluster.$1.add(file);
+            foundSmallCluster = true;
+            break;
+          }
+        }
+        if (!foundSmallCluster) {
+          smallRadiusClusters.add(([file], file.location!));
+        }
+        // Wide radius clustering for trip locations
+        bool foundWideCluster = false;
+        for (final cluster in wideRadiusClusters) {
+          final clusterLocation = cluster.$2;
+          if (isFileInsideLocationTag(
+            clusterLocation,
+            file.location!,
+            100.0,
+          )) {
+            cluster.$1.add(file);
+            foundWideCluster = true;
+            break;
+          }
+        }
+        if (!foundWideCluster) {
+          wideRadiusClusters.add(([file], file.location!));
+        }
+      }
+    }
+
+    // Identify base locations
+    final List<BaseLocation> baseLocations = [];
+    for (final cluster in smallRadiusClusters) {
+      final files = cluster.$1;
+      final location = cluster.$2;
+      // Check that the photos are distributed over a longer time range (3+ months)
+      final creationTimes = <int>[];
+      final Set<int> uniqueDays = {};
+      for (final file in files) {
+        creationTimes.add(file.creationTime!);
+        final date = DateTime.fromMicrosecondsSinceEpoch(file.creationTime!);
+        final dayStamp =
+            DateTime(date.year, date.month, date.day).microsecondsSinceEpoch;
+        uniqueDays.add(dayStamp);
+      }
+      creationTimes.sort();
+      if (creationTimes.length < 10) continue;
+      final firstCreationTime = DateTime.fromMicrosecondsSinceEpoch(
+        creationTimes.first,
+      );
+      final lastCreationTime = DateTime.fromMicrosecondsSinceEpoch(
+        creationTimes.last,
+      );
+      if (lastCreationTime.difference(firstCreationTime).inDays < 90) {
+        continue;
+      }
+      // Check for a minimum average number of days photos are clicked in range
+      final daysRange = lastCreationTime.difference(firstCreationTime).inDays;
+      if (uniqueDays.length < daysRange * 0.1) continue;
+      // Check if it's a current or old base location
+      final bool isCurrent = lastCreationTime.isAfter(
+        DateTime.now().subtract(
+          const Duration(days: 90),
+        ),
+      );
+      baseLocations.add(BaseLocation(files, location, isCurrent));
+    }
+
+    // Identify trip locations
+    final List<TripMemory> tripLocations = [];
+    clusteredLocations:
+    for (final cluster in wideRadiusClusters) {
+      final files = cluster.$1;
+      final location = cluster.$2;
+      // Check that it's at least 10km away from any base or tag location
+      bool tooClose = false;
+      for (final baseLocation in baseLocations) {
+        if (isFileInsideLocationTag(
+          baseLocation.location,
+          location,
+          10.0,
+        )) {
+          tooClose = true;
+          break;
+        }
+      }
+      for (final tag in tagToItemsMap.keys) {
+        if (isFileInsideLocationTag(
+          tag.item.centerPoint,
+          location,
+          10.0,
+        )) {
+          tooClose = true;
+          break;
+        }
+      }
+      if (tooClose) continue clusteredLocations;
+
+      // Check that the photos are distributed over a short time range (2-30 days) or multiple short time ranges only
+      files.sort((a, b) => a.creationTime!.compareTo(b.creationTime!));
+      // Find distinct time blocks (potential trips)
+      List<EnteFile> currentBlockFiles = [files.first];
+      int blockStart = files.first.creationTime!;
+      int lastTime = files.first.creationTime!;
+      DateTime lastDateTime = DateTime.fromMicrosecondsSinceEpoch(lastTime);
+
+      for (int i = 1; i < files.length; i++) {
+        final currentFile = files[i];
+        final currentTime = currentFile.creationTime!;
+        final gap = DateTime.fromMicrosecondsSinceEpoch(currentTime)
+            .difference(lastDateTime)
+            .inDays;
+
+        // If gap is too large, end current block and check if it's a valid trip
+        if (gap > 15) {
+          // 10 days gap to separate trips. If gap is small, it's likely not a trip
+          if (gap < 90) continue clusteredLocations;
+
+          final blockDuration = lastDateTime
+              .difference(DateTime.fromMicrosecondsSinceEpoch(blockStart))
+              .inDays;
+
+          // Check if current block is a valid trip (2-30 days)
+          if (blockDuration >= 2 && blockDuration <= 30) {
+            tripLocations.add(
+              TripMemory(
+                Memory.fromFiles(
+                  currentBlockFiles,
+                ), // TODO: lau: properly check last seen times
+                location,
+                firstCreationTime: blockStart,
+                lastCreationTime: lastTime,
+              ),
+            );
+          }
+
+          // Start new block
+          currentBlockFiles = [];
+          blockStart = currentTime;
+        }
+
+        currentBlockFiles.add(currentFile);
+        lastTime = currentTime;
+        lastDateTime = DateTime.fromMicrosecondsSinceEpoch(lastTime);
+      }
+      // Check final block
+      final lastBlockDuration = lastDateTime
+          .difference(DateTime.fromMicrosecondsSinceEpoch(blockStart))
+          .inDays;
+      if (lastBlockDuration >= 2 && lastBlockDuration <= 30) {
+        tripLocations.add(
+          TripMemory(
+            Memory.fromFiles(currentBlockFiles),
+            location,
+            firstCreationTime: blockStart,
+            lastCreationTime: lastTime,
+          ),
+        );
+      }
+    }
+
+    // Check if any trip locations should be merged
+    final List<TripMemory> mergedTrips = [];
+    for (final trip in tripLocations) {
+      final tripFirstTime = DateTime.fromMicrosecondsSinceEpoch(
+        trip.firstCreationTime!,
+      );
+      final tripLastTime = DateTime.fromMicrosecondsSinceEpoch(
+        trip.lastCreationTime!,
+      );
+      bool merged = false;
+      for (int idx = 0; idx < mergedTrips.length; idx++) {
+        final otherTrip = mergedTrips[idx];
+        final otherTripFirstTime =
+            DateTime.fromMicrosecondsSinceEpoch(otherTrip.firstCreationTime!);
+        final otherTripLastTime =
+            DateTime.fromMicrosecondsSinceEpoch(otherTrip.lastCreationTime!);
+        if (tripFirstTime
+                .isBefore(otherTripLastTime.add(const Duration(days: 3))) &&
+            tripLastTime.isAfter(
+              otherTripFirstTime.subtract(const Duration(days: 3)),
+            )) {
+          mergedTrips[idx] = TripMemory(
+            otherTrip.memories + trip.memories,
+            otherTrip.location,
+            firstCreationTime:
+                min(otherTrip.firstCreationTime!, trip.firstCreationTime!),
+            lastCreationTime:
+                max(otherTrip.lastCreationTime!, trip.lastCreationTime!),
+          );
+          _logger.finest('Merged two trip locations');
+          merged = true;
+          break;
+        }
+      }
+      if (merged) continue;
+      mergedTrips.add(
+        TripMemory(
+          trip.memories,
+          trip.location,
+          firstCreationTime: trip.firstCreationTime,
+          lastCreationTime: trip.lastCreationTime,
+        ),
+      );
+    }
+
+    // Remove too small and too recent trips
+    final List<TripMemory> validTrips = [];
+    for (final trip in mergedTrips) {
+      if (trip.memories.length >= 20 &&
+          trip.averageCreationTime() < cutOffTime.microsecondsSinceEpoch) {
+        validTrips.add(trip);
+      }
+    }
+
+    // For now for testing let's just surface all base locations
+    for (final baseLocation in baseLocations) {
+      String name = "Base (${baseLocation.isCurrentBase ? 'current' : 'old'})";
+      final String? locationName = await _tryFindLocationName(
+        Memory.fromFiles(baseLocation.files),
+        base: true,
+      );
+      if (locationName != null) {
+        name =
+            "$locationName (Base, ${baseLocation.isCurrentBase ? 'current' : 'old'})";
+      }
+      memoryResults.add(
+        TripMemory(
+          Memory.fromFiles(baseLocation.files),
+          baseLocation.location,
+          name: name,
+        ),
+      );
+    }
+
+    // For now we surface the two most recent trips of current month, and if none, the earliest upcoming redundant trip
+    // Group the trips per month and then year
+    final Map<int, Map<int, List<TripMemory>>> tripsByMonthYear = {};
+    for (final trip in validTrips) {
+      final tripDate =
+          DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime());
+      tripsByMonthYear
+          .putIfAbsent(tripDate.month, () => {})
+          .putIfAbsent(tripDate.year, () => [])
+          .add(trip);
+    }
+
+    // Flatten trips for the current month and annotate with their average date.
+    final List<TripMemory> currentMonthTrips = [];
+    if (tripsByMonthYear.containsKey(currentMonth)) {
+      for (final trips in tripsByMonthYear[currentMonth]!.values) {
+        for (final trip in trips) {
+          currentMonthTrips.add(trip);
+        }
+      }
+    }
+
+    // If there are past trips this month, show the one or two most recent ones.
+    if (currentMonthTrips.isNotEmpty) {
+      currentMonthTrips.sort(
+        (a, b) => b.averageCreationTime().compareTo(a.averageCreationTime()),
+      );
+      final tripsToShow = currentMonthTrips.take(2);
+      for (final trip in tripsToShow) {
+        final year =
+            DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime())
+                .year;
+        final String? locationName = await _tryFindLocationName(trip.memories);
+        String name = "Trip in $year";
+        if (locationName != null) {
+          name = "Trip to $locationName";
+        } else if (year == currentTime.year - 1) {
+          name = "Last year's trip";
+        }
+        final photoSelection = await _bestSelection(trip.memories);
+        memoryResults.add(
+          trip.copyWith(
+            memories: photoSelection,
+            name: name,
+          ),
+        );
+        if (limit != null && memoryResults.length >= limit) {
+          return memoryResults;
+        }
+      }
+    }
+    // Otherwise, if no trips happened in the current month,
+    // look for the earliest upcoming trip in another month that has 3+ trips.
+    else {
+      // TODO lau: make sure the same upcoming trip isn't shown multiple times over multiple months
+      final sortedUpcomingMonths =
+          List<int>.generate(12, (i) => ((currentMonth + i) % 12) + 1);
+      checkUpcomingMonths:
+      for (final month in sortedUpcomingMonths) {
+        if (tripsByMonthYear.containsKey(month)) {
+          final List<TripMemory> thatMonthTrips = [];
+          for (final trips in tripsByMonthYear[month]!.values) {
+            for (final trip in trips) {
+              thatMonthTrips.add(trip);
+            }
+          }
+          if (thatMonthTrips.length >= 3) {
+            // take and use the third earliest trip
+            thatMonthTrips.sort(
+              (a, b) =>
+                  a.averageCreationTime().compareTo(b.averageCreationTime()),
+            );
+            final trip = thatMonthTrips[2];
+            final year =
+                DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime())
+                    .year;
+            final String? locationName =
+                await _tryFindLocationName(trip.memories);
+            String name = "Trip in $year";
+            if (locationName != null) {
+              name = "Trip to $locationName";
+            } else if (year == currentTime.year - 1) {
+              name = "Last year's trip";
+            }
+            final photoSelection = await _bestSelection(trip.memories);
+            memoryResults.add(
+              trip.copyWith(
+                memories: photoSelection,
+                name: name,
+              ),
+            );
+            break checkUpcomingMonths;
+          }
+        }
+      }
+    }
+    return memoryResults;
+  }
+
+  Future<List<TimeMemory>> _onThisDayOrWeekResults(
+    Iterable<EnteFile> allFiles,
+    int? limit,
+  ) async {
+    final List<TimeMemory> memoryResult = [];
+    if (allFiles.isEmpty) return [];
+
+    final currentTime = DateTime.now().toLocal();
+    final currentDayMonth = currentTime.month * 100 + currentTime.day;
+    final currentWeek = _getWeekNumber(currentTime);
+    final currentMonth = currentTime.month;
+    final cutOffTime = currentTime.subtract(const Duration(days: 365));
+    final averageDailyPhotos = allFiles.length / 365;
+    final significantDayThreshold = averageDailyPhotos * 0.25;
+    final significantWeekThreshold = averageDailyPhotos * 0.40;
+
+    // Group files by day-month and year
+    final dayMonthYearGroups = <int, Map<int, List<Memory>>>{};
+
+    for (final file in allFiles) {
+      if (file.creationTime! > cutOffTime.microsecondsSinceEpoch) continue;
+
+      final creationTime =
+          DateTime.fromMicrosecondsSinceEpoch(file.creationTime!);
+      final dayMonth = creationTime.month * 100 + creationTime.day;
+      final year = creationTime.year;
+
+      dayMonthYearGroups
+          .putIfAbsent(dayMonth, () => {})
+          .putIfAbsent(year, () => [])
+          .add(Memory.fromUnseenFile(file));
+    }
+
+    // Process each nearby day-month to find significant days
+    for (final dayMonth in dayMonthYearGroups.keys) {
+      final dayDiff = dayMonth - currentDayMonth;
+      if (dayDiff < 0 || dayDiff > 2) continue;
+      // TODO: lau: this doesn't cover month changes properly
+
+      final yearGroups = dayMonthYearGroups[dayMonth]!;
+      final significantDays = yearGroups.entries
+          .where((e) => e.value.length > significantDayThreshold)
+          .map((e) => e.key)
+          .toList();
+
+      if (significantDays.length >= 3) {
+        // THE ISSUE IS HERE, MOST LIKELY IN THE SELECTION!
+        // Combine all years for this day-month
+        final date =
+            DateTime(currentTime.year, dayMonth ~/ 100, dayMonth % 100);
+        final allPhotos = yearGroups.values.expand((x) => x).toList();
+        final photoSelection = await _bestSelection(allPhotos);
+
+        memoryResult.add(
+          TimeMemory(
+            photoSelection,
+            name: "${DateFormat('MMMM d').format(date)} through the years",
+          ),
+        );
+      } else {
+        // Individual entries for significant years
+        for (final year in significantDays) {
+          final date = DateTime(year, dayMonth ~/ 100, dayMonth % 100);
+          final files = yearGroups[year]!;
+          final photoSelection = await _bestSelection(files);
+          String name = DateFormat.yMMMd(_locale.languageCode).format(date);
+          if (date.day == currentTime.day && date.month == currentTime.month) {
+            name = "This day, ${currentTime.year - date.year} years back";
+          }
+
+          memoryResult.add(
+            TimeMemory(
+              photoSelection,
+              name: name,
+            ),
+          );
+        }
+      }
+
+      if (limit != null && memoryResult.length >= limit) return memoryResult;
+    }
+
+    // process to find significant weeks (only if there are no significant days)
+    if (memoryResult.isEmpty) {
+      // Group files by week and year
+      final currentWeekYearGroups = <int, List<Memory>>{};
+      for (final file in allFiles) {
+        if (file.creationTime! > cutOffTime.microsecondsSinceEpoch) continue;
+
+        final creationTime =
+            DateTime.fromMicrosecondsSinceEpoch(file.creationTime!);
+        final week = _getWeekNumber(creationTime);
+        if (week != currentWeek) continue;
+        final year = creationTime.year;
+
+        currentWeekYearGroups
+            .putIfAbsent(year, () => [])
+            .add(Memory.fromUnseenFile(file));
+      }
+
+      // Process the week and see if it's significant
+      if (currentWeekYearGroups.isNotEmpty) {
+        final significantWeeks = currentWeekYearGroups.entries
+            .where((e) => e.value.length > significantWeekThreshold)
+            .map((e) => e.key)
+            .toList();
+        if (significantWeeks.length >= 3) {
+          // Combine all years for this week
+          final allPhotos =
+              currentWeekYearGroups.values.expand((x) => x).toList();
+          final photoSelection = await _bestSelection(allPhotos);
+          const name = "This week through the years";
+          memoryResult.add(
+            TimeMemory(
+              photoSelection,
+              name: name,
+            ),
+          );
+        } else {
+          // Individual entries for significant years
+          for (final year in significantWeeks) {
+            final date = DateTime(year, 1, 1).add(
+              Duration(days: (currentWeek - 1) * 7),
+            );
+            final files = currentWeekYearGroups[year]!;
+            final photoSelection = await _bestSelection(files);
+            final name =
+                "This week, ${currentTime.year - date.year} years back";
+
+            memoryResult.add(
+              TimeMemory(
+                photoSelection,
+                name: name,
+              ),
+            );
+          }
+        }
+      }
+    }
+
+    if (limit != null && memoryResult.length >= limit) return memoryResult;
+
+    // process to find fillers (months)
+    const wantedMemories = 3;
+    final neededMemories = wantedMemories - memoryResult.length;
+    if (neededMemories <= 0) return memoryResult;
+    const monthSelectionSize = 20;
+
+    // Group files by month and year
+    final currentMonthYearGroups = <int, List<Memory>>{};
+    for (final file in allFiles) {
+      if (file.creationTime! > cutOffTime.microsecondsSinceEpoch) continue;
+
+      final creationTime =
+          DateTime.fromMicrosecondsSinceEpoch(file.creationTime!);
+      final month = creationTime.month;
+      if (month != currentMonth) continue;
+      final year = creationTime.year;
+
+      currentMonthYearGroups
+          .putIfAbsent(year, () => [])
+          .add(Memory.fromUnseenFile(file));
+    }
+
+    // Add the largest two months plus the month through the years
+    final sortedYearsForCurrentMonth = currentMonthYearGroups.keys.toList()
+      ..sort(
+        (a, b) => currentMonthYearGroups[b]!.length.compareTo(
+              currentMonthYearGroups[a]!.length,
+            ),
+      );
+    if (neededMemories > 1) {
+      for (int i = neededMemories; i > 1; i--) {
+        if (sortedYearsForCurrentMonth.isEmpty) break;
+        final year = sortedYearsForCurrentMonth.removeAt(0);
+        final monthYearFiles = currentMonthYearGroups[year]!;
+        final photoSelection = await _bestSelection(
+          monthYearFiles,
+          prefferedSize: monthSelectionSize,
+        );
+        final monthName = DateFormat.MMMM(_locale.languageCode)
+            .format(DateTime(year, currentMonth));
+        final name = monthName + ", ${currentTime.year - year} years back";
+        memoryResult.add(
+          TimeMemory(
+            photoSelection,
+            name: name,
+          ),
+        );
+      }
+    }
+    // Show the month through the remaining years
+    if (sortedYearsForCurrentMonth.isEmpty) return memoryResult;
+    final allPhotos = sortedYearsForCurrentMonth
+        .expand((year) => currentMonthYearGroups[year]!)
+        .toList();
+    final photoSelection =
+        await _bestSelection(allPhotos, prefferedSize: monthSelectionSize);
+    final monthName = DateFormat.MMMM(_locale.languageCode)
+        .format(DateTime(currentTime.year, currentMonth));
+    final name = monthName + " through the years";
+    memoryResult.add(
+      TimeMemory(
+        photoSelection,
+        name: name,
+      ),
+    );
+
+    return memoryResult;
+  }
+
+  int _getWeekNumber(DateTime date) {
+    // Get day of year (1-366)
+    final int dayOfYear = int.parse(DateFormat('D').format(date));
+    // Integer division by 7 and add 1 to start from week 1
+    return ((dayOfYear - 1) ~/ 7) + 1;
+  }
+
+  Future<String?> _tryFindLocationName(
+    List<Memory> memories, {
+    bool base = false,
+  }) async {
+    final files = Memory.filesFromMemories(memories);
+    final results = await locationService.getFilesInCity(files, '');
+    final List<City> sortedByResultCount = results.keys.toList()
+      ..sort((a, b) => results[b]!.length.compareTo(results[a]!.length));
+    if (sortedByResultCount.isEmpty) return null;
+    final biggestPlace = sortedByResultCount.first;
+    if (results[biggestPlace]!.length > files.length / 2) {
+      return biggestPlace.city;
+    }
+    if (results.length > 2 &&
+        results.keys.map((city) => city.country).toSet().length == 1 &&
+        !base) {
+      return biggestPlace.country;
+    }
+    return null;
+  }
+
+  /// Returns the best selection of files from the given list.
+  /// Makes sure that the selection is not more than [prefferedSize] or 10 files,
+  /// and that each year of the original list is represented.
+  Future<List<Memory>> _bestSelection(
+    List<Memory> memories, {
+    int? prefferedSize,
+  }) async {
+    // final files = Memory.filesFromMemories(memories);
+    final fileCount = memories.length;
+    int targetSize = prefferedSize ?? 10;
+    if (fileCount <= targetSize) return memories;
+    final safeMemories =
+        memories.where((memory) => memory.file.uploadedFileID != null).toList();
+    final safeCount = safeMemories.length;
+    final fileIDs = safeMemories.map((e) => e.file.uploadedFileID!).toSet();
+    final fileIdToFace = await MLDataDB.instance.getFacesForFileIDs(fileIDs);
+    final faceIDs =
+        fileIdToFace.values.expand((x) => x.map((face) => face.faceID)).toSet();
+    final faceIDsToPersonID =
+        await MLDataDB.instance.getFaceIdToPersonIdForFaces(faceIDs);
+    final fileIdToClip =
+        await MLDataDB.instance.getClipVectorsForFileIDs(fileIDs);
+    final allYears = safeMemories.map((e) {
+      final creationTime =
+          DateTime.fromMicrosecondsSinceEpoch(e.file.creationTime!);
+      return creationTime.year;
+    }).toSet();
+
+    // Get clip scores for each file
+    const query =
+        'Photo of a precious memory radiating warmth, vibrant energy, or quiet beauty — alive with color, light, or emotion';
+    // TODO: lau: optimize this later so we don't keep computing embedding
+    final textEmbedding = await MLComputer.instance.runClipText(query);
+    final textVector = Vector.fromList(textEmbedding);
+    const clipThreshold = 0.75;
+    final fileToScore = <int, double>{};
+    for (final mem in safeMemories) {
+      final clip = fileIdToClip[mem.file.uploadedFileID!];
+      if (clip == null) {
+        fileToScore[mem.file.uploadedFileID!] = 0;
+        continue;
+      }
+      final score = clip.vector.dot(textVector);
+      fileToScore[mem.file.uploadedFileID!] = score;
+    }
+
+    // Get face scores for each file
+    final fileToFaceCount = <int, int>{};
+    for (final mem in safeMemories) {
+      final fileID = mem.file.uploadedFileID!;
+      fileToFaceCount[fileID] = 0;
+      final faces = fileIdToFace[fileID];
+      if (faces == null || faces.isEmpty) {
+        continue;
+      }
+      for (final face in faces) {
+        if (faceIDsToPersonID.containsKey(face.faceID)) {
+          fileToFaceCount[fileID] = fileToFaceCount[fileID]! + 10;
+        } else {
+          fileToFaceCount[fileID] = fileToFaceCount[fileID]! + 1;
+        }
+      }
+    }
+
+    final filteredMemories = <Memory>[];
+    if (allYears.length <= 1) {
+      // TODO: lau: eventually this sorting might have to be replaced with some scoring system
+      // sort first on clip embeddings score (descending)
+      safeMemories.sort(
+        (a, b) => fileToScore[b.file.uploadedFileID!]!
+            .compareTo(fileToScore[a.file.uploadedFileID!]!),
+      );
+      // then sort on faces (descending), heavily prioritizing named faces
+      safeMemories.sort(
+        (a, b) => fileToFaceCount[b.file.uploadedFileID!]!
+            .compareTo(fileToFaceCount[a.file.uploadedFileID!]!),
+      );
+
+      // then filter out similar images as much as possible
+      filteredMemories.add(safeMemories.first);
+      int skipped = 0;
+      filesLoop:
+      for (final mem in safeMemories.sublist(1)) {
+        if (filteredMemories.length >= targetSize) break;
+        final clip = fileIdToClip[mem.file.uploadedFileID!];
+        if (clip != null && (safeCount - skipped) > targetSize) {
+          for (final filteredMem in filteredMemories) {
+            final fClip = fileIdToClip[filteredMem.file.uploadedFileID!];
+            if (fClip == null) continue;
+            final similarity = clip.vector.dot(fClip.vector);
+            if (similarity > clipThreshold) {
+              skipped++;
+              continue filesLoop;
+            }
+          }
+        }
+        filteredMemories.add(mem);
+      }
+    } else {
+      // Multiple years, each represented and roughly equally distributed
+      if (prefferedSize == null && (allYears.length * 2) > 10) {
+        targetSize = allYears.length * 3;
+        if (safeCount < targetSize) return safeMemories;
+      }
+
+      // Group files by year and sort each year's list by CLIP then face count
+      final yearToFiles = <int, List<Memory>>{};
+      for (final safeMem in safeMemories) {
+        final creationTime =
+            DateTime.fromMicrosecondsSinceEpoch(safeMem.file.creationTime!);
+        final year = creationTime.year;
+        yearToFiles.putIfAbsent(year, () => []).add(safeMem);
+      }
+
+      for (final year in yearToFiles.keys) {
+        final yearFiles = yearToFiles[year]!;
+        // sort first on clip embeddings score (descending)
+        yearFiles.sort(
+          (a, b) => fileToScore[b.file.uploadedFileID!]!
+              .compareTo(fileToScore[a.file.uploadedFileID!]!),
+        );
+        // then sort on faces (descending), heavily prioritizing named faces
+        yearFiles.sort(
+          (a, b) => fileToFaceCount[b.file.uploadedFileID!]!
+              .compareTo(fileToFaceCount[a.file.uploadedFileID!]!),
+        );
+      }
+
+      // Then join the years together one by one and filter similar images
+      final years = yearToFiles.keys.toList()
+        ..sort((a, b) => b.compareTo(a)); // Recent years first
+      int round = 0;
+      int skipped = 0;
+      whileLoop:
+      while (filteredMemories.length + skipped < safeCount) {
+        yearLoop:
+        for (final year in years) {
+          final yearFiles = yearToFiles[year]!;
+          if (yearFiles.isEmpty) continue;
+          final newMem = yearFiles.removeAt(0);
+          if (round != 0 && (safeCount - skipped) > targetSize) {
+            // check for filtering
+            final clip = fileIdToClip[newMem.file.uploadedFileID!];
+            if (clip != null) {
+              for (final filteredMem in filteredMemories) {
+                final fClip = fileIdToClip[filteredMem.file.uploadedFileID!];
+                if (fClip == null) continue;
+                final similarity = clip.vector.dot(fClip.vector);
+                if (similarity > clipThreshold) {
+                  skipped++;
+                  continue yearLoop;
+                }
+              }
+            }
+          }
+          filteredMemories.add(newMem);
+          if (filteredMemories.length >= targetSize ||
+              filteredMemories.length + skipped >= safeCount) {
+            break whileLoop;
+          }
+        }
+        round++;
+        // Extra safety to prevent infinite loops
+        if (round > safeCount) break;
+      }
+    }
+
+    // Order the final selection chronologically
+    filteredMemories
+        .sort((a, b) => b.file.creationTime!.compareTo(a.file.creationTime!));
+    return filteredMemories;
+  }
+}
diff --git a/mobile/lib/ui/home/memories/memories_widget.dart b/mobile/lib/ui/home/memories/memories_widget.dart
index fbeb648ab6..2adf60d50d 100644
--- a/mobile/lib/ui/home/memories/memories_widget.dart
+++ b/mobile/lib/ui/home/memories/memories_widget.dart
@@ -5,7 +5,10 @@ import "package:flutter_animate/flutter_animate.dart";
 import "package:photos/core/event_bus.dart";
 import "package:photos/events/memories_setting_changed.dart";
 import 'package:photos/models/memory.dart';
+import "package:photos/models/smart_memory.dart";
+import "package:photos/service_locator.dart";
 import 'package:photos/services/memories_service.dart';
+import "package:photos/services/smart_memories_service.dart";
 import "package:photos/ui/common/loading_widget.dart";
 import 'package:photos/ui/home/memories/memory_cover_widget.dart';
 
@@ -55,6 +58,39 @@ class _MemoriesWidgetState extends State<MemoriesWidget> {
     if (!MemoriesService.instance.showMemories) {
       return const SizedBox.shrink();
     }
+    if (flagService.showSmartMemories) {
+      SmartMemoriesService.instance.init(context);
+      return FutureBuilder<List<SmartMemory>>(
+        future: SmartMemoriesService.instance.getMemories(
+          null,
+        ), // This is where I should hook in my feature flag [showSmartMemories]
+        builder: (context, snapshot) {
+          if (snapshot.hasData && snapshot.data!.isEmpty) {
+            return const SizedBox.shrink();
+          }
+          if (snapshot.hasError || !snapshot.hasData) {
+            return SizedBox(
+              height: _maxHeight + 12 + 10,
+              child: const EnteLoadingWidget(),
+            );
+          } else {
+            return Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(
+                  height: 12,
+                ),
+                _buildSmartMemories(snapshot.data!),
+                const SizedBox(height: 10),
+              ],
+            ).animate().fadeIn(
+                  duration: const Duration(milliseconds: 250),
+                  curve: Curves.easeInOutCirc,
+                );
+          }
+        },
+      );
+    }
     return FutureBuilder<List<Memory>>(
       future: MemoriesService.instance.getMemories(),
       builder: (context, snapshot) {
@@ -85,6 +121,37 @@ class _MemoriesWidgetState extends State<MemoriesWidget> {
     );
   }
 
+  Widget _buildSmartMemories(List<SmartMemory> memories) {
+    final collatedMemories = memories.map((e) => (e.memories, e.name)).toList();
+
+    return SizedBox(
+      height: _maxHeight + MemoryCoverWidget.outerStrokeWidth * 2,
+      child: ListView.builder(
+        physics: const AlwaysScrollableScrollPhysics(
+          parent: BouncingScrollPhysics(),
+        ),
+        scrollDirection: Axis.horizontal,
+        controller: _controller,
+        itemCount: collatedMemories.length,
+        itemBuilder: (context, itemIndex) {
+          final maxScaleOffsetX =
+              _maxWidth + MemoryCoverWidget.horizontalPadding * 2;
+          final offsetOfItem =
+              (_maxWidth + MemoryCoverWidget.horizontalPadding * 2) * itemIndex;
+          return MemoryCoverWidget(
+            memories: collatedMemories[itemIndex].$1,
+            controller: _controller,
+            offsetOfItem: offsetOfItem,
+            maxHeight: _maxHeight,
+            maxWidth: _maxWidth,
+            maxScaleOffsetX: maxScaleOffsetX,
+            title: collatedMemories[itemIndex].$2,
+          );
+        },
+      ),
+    );
+  }
+
   Widget _buildMemories(List<Memory> memories) {
     final collatedMemories = _collateMemories(memories);
 
diff --git a/mobile/lib/ui/home/memories/memory_cover_widget.dart b/mobile/lib/ui/home/memories/memory_cover_widget.dart
index 0dfc9adf84..e825a003cd 100644
--- a/mobile/lib/ui/home/memories/memory_cover_widget.dart
+++ b/mobile/lib/ui/home/memories/memory_cover_widget.dart
@@ -19,6 +19,7 @@ class MemoryCoverWidget extends StatefulWidget {
   static const aspectRatio = 0.68;
   static const horizontalPadding = 2.5;
   final double maxScaleOffsetX;
+  final String? title;
 
   const MemoryCoverWidget({
     required this.memories,
@@ -27,6 +28,7 @@ class MemoryCoverWidget extends StatefulWidget {
     required this.maxHeight,
     required this.maxWidth,
     required this.maxScaleOffsetX,
+    this.title,
     super.key,
   });
 
@@ -45,7 +47,7 @@ class _MemoryCoverWidgetState extends State<MemoryCoverWidget> {
 
     final widthOfScreen = MediaQuery.sizeOf(context).width;
     final index = _getNextMemoryIndex();
-    final title = _getTitle(widget.memories[index]);
+    final title = widget.title ?? _getTitle(widget.memories[index]);
     final memory = widget.memories[index];
     final isSeen = memory.isSeen();
     final brightness =
diff --git a/mobile/plugins/ente_feature_flag/lib/src/service.dart b/mobile/plugins/ente_feature_flag/lib/src/service.dart
index c9e1a94628..92c7ba2402 100644
--- a/mobile/plugins/ente_feature_flag/lib/src/service.dart
+++ b/mobile/plugins/ente_feature_flag/lib/src/service.dart
@@ -75,5 +75,7 @@ class FlagService {
 
   bool get enableMobMultiPart => flags.enableMobMultiPart || internalUser;
 
+  bool get showSmartMemories => internalUser;
+
   String get castUrl => flags.castUrl;
 }

From 5fd18807ccc2f78f192c5e104f6d200283f78e87 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 17 Feb 2025 11:58:44 +0530
Subject: [PATCH 233/796] [mob][photos] Clean up search service

---
 mobile/lib/models/search/search_types.dart |   2 +-
 mobile/lib/services/search_service.dart    | 855 +--------------------
 2 files changed, 13 insertions(+), 844 deletions(-)

diff --git a/mobile/lib/models/search/search_types.dart b/mobile/lib/models/search/search_types.dart
index 90d1a320f5..63d1543042 100644
--- a/mobile/lib/models/search/search_types.dart
+++ b/mobile/lib/models/search/search_types.dart
@@ -242,7 +242,7 @@ extension SectionTypeExtensions on SectionType {
 
       case SectionType.moment:
         if (flagService.internalUser) {
-          return SearchService.instance.onThisDayOrWeekResults(context, limit);
+          return SearchService.instance.smartMemories(context, limit);
         }
         return SearchService.instance.getRandomMomentsSearchResults(context);
 
diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 3257f8f6d7..6a10d835ad 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -4,7 +4,6 @@ import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 import "package:intl/intl.dart";
 import 'package:logging/logging.dart';
-import "package:ml_linalg/linalg.dart";
 import "package:photos/core/constants.dart";
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/data/holidays.dart';
@@ -15,7 +14,6 @@ import "package:photos/db/ml/db.dart";
 import 'package:photos/events/local_photos_updated_event.dart';
 import "package:photos/extensions/user_extension.dart";
 import "package:photos/models/api/collection/user.dart";
-import "package:photos/models/base_location.dart";
 import 'package:photos/models/collection/collection.dart';
 import 'package:photos/models/collection/collection_items.dart';
 import "package:photos/models/file/extensions/file_props.dart";
@@ -24,6 +22,7 @@ import 'package:photos/models/file/file_type.dart';
 import "package:photos/models/local_entity_data.dart";
 import "package:photos/models/location/location.dart";
 import "package:photos/models/location_tag/location_tag.dart";
+import "package:photos/models/memory.dart";
 import "package:photos/models/ml/face/person.dart";
 import 'package:photos/models/search/album_search_result.dart';
 import 'package:photos/models/search/generic_search_result.dart';
@@ -36,15 +35,14 @@ import "package:photos/models/search/hierarchical/magic_filter.dart";
 import "package:photos/models/search/hierarchical/top_level_generic_filter.dart";
 import "package:photos/models/search/search_constants.dart";
 import "package:photos/models/search/search_types.dart";
-import "package:photos/models/trip_memory.dart";
 import "package:photos/service_locator.dart";
 import 'package:photos/services/collections_service.dart';
 import "package:photos/services/filter/db_filters.dart";
 import "package:photos/services/location_service.dart";
 import "package:photos/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart";
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
-import "package:photos/services/machine_learning/ml_computer.dart";
 import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';
+import "package:photos/services/smart_memories_service.dart";
 import "package:photos/services/user_remote_flag_service.dart";
 import "package:photos/services/user_service.dart";
 import "package:photos/states/location_screen_state.dart";
@@ -1191,864 +1189,35 @@ class SearchService {
     return searchResults;
   }
 
-  Future<List<GenericSearchResult>> getTripsResults(
+  /// For debug purposes only, don't use this in production!
+  Future<List<GenericSearchResult>> smartMemories(
     BuildContext context,
     int? limit,
   ) async {
-    final List<GenericSearchResult> searchResults = [];
-    final allFiles = await getAllFilesForSearch();
-    final Iterable<LocalEntity<LocationTag>> locationTagEntities =
-        (await locationService.getLocationTags());
-    if (allFiles.isEmpty) return [];
-    final currentTime = DateTime.now().toLocal();
-    final currentMonth = currentTime.month;
-    final cutOffTime = currentTime.subtract(const Duration(days: 365));
-
-    final Map<LocalEntity<LocationTag>, List<EnteFile>> tagToItemsMap = {};
-    for (int i = 0; i < locationTagEntities.length; i++) {
-      tagToItemsMap[locationTagEntities.elementAt(i)] = [];
-    }
-    final List<(List<EnteFile>, Location)> smallRadiusClusters = [];
-    final List<(List<EnteFile>, Location)> wideRadiusClusters = [];
-    // Go through all files and cluster the ones not inside any location tag
-    for (EnteFile file in allFiles) {
-      if (!file.hasLocation ||
-          file.uploadedFileID == null ||
-          !file.isOwner ||
-          file.creationTime == null) {
-        continue;
-      }
-      // Check if the file is inside any location tag
-      bool hasLocationTag = false;
-      for (LocalEntity<LocationTag> tag in tagToItemsMap.keys) {
-        if (isFileInsideLocationTag(
-          tag.item.centerPoint,
-          file.location!,
-          tag.item.radius,
-        )) {
-          hasLocationTag = true;
-          tagToItemsMap[tag]!.add(file);
-        }
-      }
-      // Cluster the files not inside any location tag (incremental clustering)
-      if (!hasLocationTag) {
-        // Small radius clustering for base locations
-        bool foundSmallCluster = false;
-        for (final cluster in smallRadiusClusters) {
-          final clusterLocation = cluster.$2;
-          if (isFileInsideLocationTag(
-            clusterLocation,
-            file.location!,
-            0.6,
-          )) {
-            cluster.$1.add(file);
-            foundSmallCluster = true;
-            break;
-          }
-        }
-        if (!foundSmallCluster) {
-          smallRadiusClusters.add(([file], file.location!));
-        }
-        // Wide radius clustering for trip locations
-        bool foundWideCluster = false;
-        for (final cluster in wideRadiusClusters) {
-          final clusterLocation = cluster.$2;
-          if (isFileInsideLocationTag(
-            clusterLocation,
-            file.location!,
-            100.0,
-          )) {
-            cluster.$1.add(file);
-            foundWideCluster = true;
-            break;
-          }
-        }
-        if (!foundWideCluster) {
-          wideRadiusClusters.add(([file], file.location!));
-        }
-      }
-    }
-
-    // Identify base locations
-    final List<BaseLocation> baseLocations = [];
-    for (final cluster in smallRadiusClusters) {
-      final files = cluster.$1;
-      final location = cluster.$2;
-      // Check that the photos are distributed over a longer time range (3+ months)
-      final creationTimes = <int>[];
-      final Set<int> uniqueDays = {};
-      for (final file in files) {
-        creationTimes.add(file.creationTime!);
-        final date = DateTime.fromMicrosecondsSinceEpoch(file.creationTime!);
-        final dayStamp =
-            DateTime(date.year, date.month, date.day).microsecondsSinceEpoch;
-        uniqueDays.add(dayStamp);
-      }
-      creationTimes.sort();
-      if (creationTimes.length < 10) continue;
-      final firstCreationTime = DateTime.fromMicrosecondsSinceEpoch(
-        creationTimes.first,
-      );
-      final lastCreationTime = DateTime.fromMicrosecondsSinceEpoch(
-        creationTimes.last,
-      );
-      if (lastCreationTime.difference(firstCreationTime).inDays < 90) {
-        continue;
-      }
-      // Check for a minimum average number of days photos are clicked in range
-      final daysRange = lastCreationTime.difference(firstCreationTime).inDays;
-      if (uniqueDays.length < daysRange * 0.1) continue;
-      // Check if it's a current or old base location
-      final bool isCurrent = lastCreationTime.isAfter(
-        DateTime.now().subtract(
-          const Duration(days: 90),
-        ),
-      );
-      baseLocations.add(BaseLocation(files, location, isCurrent));
-    }
-
-    // Identify trip locations
-    final List<TripMemory> tripLocations = [];
-    clusteredLocations:
-    for (final cluster in wideRadiusClusters) {
-      final files = cluster.$1;
-      final location = cluster.$2;
-      // Check that it's at least 10km away from any base or tag location
-      bool tooClose = false;
-      for (final baseLocation in baseLocations) {
-        if (isFileInsideLocationTag(
-          baseLocation.location,
-          location,
-          10.0,
-        )) {
-          tooClose = true;
-          break;
-        }
-      }
-      for (final tag in tagToItemsMap.keys) {
-        if (isFileInsideLocationTag(
-          tag.item.centerPoint,
-          location,
-          10.0,
-        )) {
-          tooClose = true;
-          break;
-        }
-      }
-      if (tooClose) continue clusteredLocations;
-
-      // Check that the photos are distributed over a short time range (2-30 days) or multiple short time ranges only
-      files.sort((a, b) => a.creationTime!.compareTo(b.creationTime!));
-      // Find distinct time blocks (potential trips)
-      List<EnteFile> currentBlockFiles = [files.first];
-      int blockStart = files.first.creationTime!;
-      int lastTime = files.first.creationTime!;
-      DateTime lastDateTime = DateTime.fromMicrosecondsSinceEpoch(lastTime);
-
-      for (int i = 1; i < files.length; i++) {
-        final currentFile = files[i];
-        final currentTime = currentFile.creationTime!;
-        final gap = DateTime.fromMicrosecondsSinceEpoch(currentTime)
-            .difference(lastDateTime)
-            .inDays;
-
-        // If gap is too large, end current block and check if it's a valid trip
-        if (gap > 15) {
-          // 10 days gap to separate trips. If gap is small, it's likely not a trip
-          if (gap < 90) continue clusteredLocations;
-
-          final blockDuration = lastDateTime
-              .difference(DateTime.fromMicrosecondsSinceEpoch(blockStart))
-              .inDays;
-
-          // Check if current block is a valid trip (2-30 days)
-          if (blockDuration >= 2 && blockDuration <= 30) {
-            tripLocations.add(
-              TripMemory(
-                List.from(currentBlockFiles),
-                location,
-                firstCreationTime: blockStart,
-                lastCreationTime: lastTime,
-              ),
-            );
-          }
-
-          // Start new block
-          currentBlockFiles = [];
-          blockStart = currentTime;
-        }
-
-        currentBlockFiles.add(currentFile);
-        lastTime = currentTime;
-        lastDateTime = DateTime.fromMicrosecondsSinceEpoch(lastTime);
-      }
-      // Check final block
-      final lastBlockDuration = lastDateTime
-          .difference(DateTime.fromMicrosecondsSinceEpoch(blockStart))
-          .inDays;
-      if (lastBlockDuration >= 2 && lastBlockDuration <= 30) {
-        tripLocations.add(
-          TripMemory(
-            List.from(currentBlockFiles),
-            location,
-            firstCreationTime: blockStart,
-            lastCreationTime: lastTime,
-          ),
-        );
-      }
-    }
-
-    // Check if any trip locations should be merged
-    final List<TripMemory> mergedTrips = [];
-    for (final trip in tripLocations) {
-      final tripFirstTime = DateTime.fromMicrosecondsSinceEpoch(
-        trip.firstCreationTime!,
-      );
-      final tripLastTime = DateTime.fromMicrosecondsSinceEpoch(
-        trip.lastCreationTime!,
-      );
-      bool merged = false;
-      for (int idx = 0; idx < mergedTrips.length; idx++) {
-        final otherTrip = mergedTrips[idx];
-        final otherTripFirstTime =
-            DateTime.fromMicrosecondsSinceEpoch(otherTrip.firstCreationTime!);
-        final otherTripLastTime =
-            DateTime.fromMicrosecondsSinceEpoch(otherTrip.lastCreationTime!);
-        if (tripFirstTime
-                .isBefore(otherTripLastTime.add(const Duration(days: 3))) &&
-            tripLastTime.isAfter(
-              otherTripFirstTime.subtract(const Duration(days: 3)),
-            )) {
-          mergedTrips[idx] = TripMemory(
-            otherTrip.files + trip.files,
-            otherTrip.location,
-            firstCreationTime: min(otherTrip.firstCreationTime!, trip.firstCreationTime!),
-            lastCreationTime: max(otherTrip.lastCreationTime!, trip.lastCreationTime!),
-          );
-          _logger.finest('Merged two trip locations');
-          merged = true;
-          break;
-        }
-      }
-      if (merged) continue;
-      mergedTrips.add(
-        TripMemory(
-          trip.files,
-          trip.location,
-          firstCreationTime: trip.firstCreationTime,
-          lastCreationTime: trip.lastCreationTime,
-        ),
-      );
-    }
-
-    // Remove too small and too recent trips
-    final List<TripMemory> validTrips = [];
-    for (final trip in mergedTrips) {
-      if (trip.files.length >= 20 &&
-          trip.averageCreationTime() < cutOffTime.microsecondsSinceEpoch) {
-        validTrips.add(trip);
-      }
-    }
-
-    // For now for testing let's just surface all base locations
-    for (final baseLocation in baseLocations) {
-      String name = "Base (${baseLocation.isCurrentBase ? 'current' : 'old'})";
-      final String? locationName = await _tryFindLocationName(
-        baseLocation.files,
-        base: true,
-      );
-      if (locationName != null) {
-        name =
-            "$locationName (Base, ${baseLocation.isCurrentBase ? 'current' : 'old'})";
-      }
+    SmartMemoriesService.instance.init(context);
+    final memories = await SmartMemoriesService.instance.getMemories(limit);
+    final searchResults = <GenericSearchResult>[];
+    for (final memory in memories) {
+      final name = memory.name ?? "memory";
+      final files = Memory.filesFromMemories(memory.memories);
       searchResults.add(
         GenericSearchResult(
           ResultType.event,
           name,
-          baseLocation.files,
+          files,
           hierarchicalSearchFilter: TopLevelGenericFilter(
             filterName: name,
             occurrence: kMostRelevantFilter,
             filterResultType: ResultType.event,
-            matchedUploadedIDs: filesToUploadedFileIDs(baseLocation.files),
+            matchedUploadedIDs: filesToUploadedFileIDs(files),
             filterIcon: Icons.event_outlined,
           ),
         ),
       );
     }
-
-    // For now we surface the two most recent trips of current month, and if none, the earliest upcoming redundant trip
-    // Group the trips per month and then year
-    final Map<int, Map<int, List<TripMemory>>> tripsByMonthYear = {};
-    for (final trip in validTrips) {
-      final tripDate =
-          DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime());
-      tripsByMonthYear
-          .putIfAbsent(tripDate.month, () => {})
-          .putIfAbsent(tripDate.year, () => [])
-          .add(trip);
-    }
-
-    // Flatten trips for the current month and annotate with their average date.
-    final List<TripMemory> currentMonthTrips = [];
-    if (tripsByMonthYear.containsKey(currentMonth)) {
-      for (final trips in tripsByMonthYear[currentMonth]!.values) {
-        for (final trip in trips) {
-          currentMonthTrips.add(trip);
-        }
-      }
-    }
-
-    // If there are past trips this month, show the one or two most recent ones.
-    if (currentMonthTrips.isNotEmpty) {
-      currentMonthTrips.sort(
-        (a, b) => b.averageCreationTime().compareTo(a.averageCreationTime()),
-      );
-      final tripsToShow = currentMonthTrips.take(2);
-      for (final trip in tripsToShow) {
-        final year =
-            DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime()).year;
-        final String? locationName = await _tryFindLocationName(trip.files);
-        String name = "Trip in $year";
-        if (locationName != null) {
-          name = "Trip to $locationName";
-        } else if (year == currentTime.year - 1) {
-          name = "Last year's trip";
-        }
-        final photoSelection = await _bestSelection(trip.files);
-        searchResults.add(
-          GenericSearchResult(
-            ResultType.event,
-            name,
-            photoSelection,
-            hierarchicalSearchFilter: TopLevelGenericFilter(
-              filterName: name,
-              occurrence: kMostRelevantFilter,
-              filterResultType: ResultType.event,
-              matchedUploadedIDs: filesToUploadedFileIDs(photoSelection),
-              filterIcon: Icons.event_outlined,
-            ),
-          ),
-        );
-        if (limit != null && searchResults.length >= limit) {
-          return searchResults;
-        }
-      }
-    }
-    // Otherwise, if no trips happened in the current month,
-    // look for the earliest upcoming trip in another month that has 3+ trips.
-    else {
-      // TODO lau: make sure the same upcoming trip isn't shown multiple times over multiple months
-      final sortedUpcomingMonths =
-          List<int>.generate(12, (i) => ((currentMonth + i) % 12) + 1);
-      checkUpcomingMonths:
-      for (final month in sortedUpcomingMonths) {
-        if (tripsByMonthYear.containsKey(month)) {
-          final List<TripMemory> thatMonthTrips = [];
-          for (final trips in tripsByMonthYear[month]!.values) {
-            for (final trip in trips) {
-              thatMonthTrips.add(trip);
-            }
-          }
-          if (thatMonthTrips.length >= 3) {
-            // take and use the third earliest trip
-            thatMonthTrips.sort(
-              (a, b) => a.averageCreationTime().compareTo(b.averageCreationTime()),
-            );
-            final trip = thatMonthTrips[2];
-            final year =
-                DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime())
-                    .year;
-            final String? locationName = await _tryFindLocationName(trip.files);
-            String name = "Trip in $year";
-            if (locationName != null) {
-              name = "Trip to $locationName";
-            } else if (year == currentTime.year - 1) {
-              name = "Last year's trip";
-            }
-            final photoSelection = await _bestSelection(trip.files);
-            searchResults.add(
-              GenericSearchResult(
-                ResultType.event,
-                name,
-                photoSelection,
-                hierarchicalSearchFilter: TopLevelGenericFilter(
-                  filterName: name,
-                  occurrence: kMostRelevantFilter,
-                  filterResultType: ResultType.event,
-                  matchedUploadedIDs: filesToUploadedFileIDs(photoSelection),
-                  filterIcon: Icons.event_outlined,
-                ),
-              ),
-            );
-            break checkUpcomingMonths;
-          }
-        }
-      }
-    }
     return searchResults;
   }
 
-  Future<List<GenericSearchResult>> onThisDayOrWeekResults(
-    BuildContext context,
-    int? limit,
-  ) async {
-    final List<GenericSearchResult> searchResults = [];
-    final trips = await getTripsResults(context, limit);
-    if (trips.isNotEmpty) {
-      searchResults.addAll(trips);
-    }
-    final allFiles = await getAllFilesForSearch();
-    if (allFiles.isEmpty) return [];
-
-    final currentTime = DateTime.now().toLocal();
-    final currentDayMonth = currentTime.month * 100 + currentTime.day;
-    final currentWeek = _getWeekNumber(currentTime);
-    final currentMonth = currentTime.month;
-    final cutOffTime = currentTime.subtract(const Duration(days: 365));
-    final averageDailyPhotos = allFiles.length / 365;
-    final significantDayThreshold = averageDailyPhotos * 0.25;
-    final significantWeekThreshold = averageDailyPhotos * 0.40;
-
-    // Group files by day-month and year
-    final dayMonthYearGroups = <int, Map<int, List<EnteFile>>>{};
-
-    for (final file in allFiles) {
-      if (file.creationTime! > cutOffTime.microsecondsSinceEpoch) continue;
-
-      final creationTime =
-          DateTime.fromMicrosecondsSinceEpoch(file.creationTime!);
-      final dayMonth = creationTime.month * 100 + creationTime.day;
-      final year = creationTime.year;
-
-      dayMonthYearGroups
-          .putIfAbsent(dayMonth, () => {})
-          .putIfAbsent(year, () => [])
-          .add(file);
-    }
-
-    // Process each nearby day-month to find significant days
-    for (final dayMonth in dayMonthYearGroups.keys) {
-      final dayDiff = dayMonth - currentDayMonth;
-      if (dayDiff < 0 || dayDiff > 2) continue;
-      // TODO: lau: this doesn't cover month changes properly
-
-      final yearGroups = dayMonthYearGroups[dayMonth]!;
-      final significantDays = yearGroups.entries
-          .where((e) => e.value.length > significantDayThreshold)
-          .map((e) => e.key)
-          .toList();
-
-      if (significantDays.length >= 3) {
-        // Combine all years for this day-month
-        final date =
-            DateTime(currentTime.year, dayMonth ~/ 100, dayMonth % 100);
-        final allPhotos = yearGroups.values.expand((x) => x).toList();
-        final photoSelection = await _bestSelection(allPhotos);
-
-        searchResults.add(
-          GenericSearchResult(
-            ResultType.event,
-            "${DateFormat('MMMM d').format(date)} through the years",
-            photoSelection,
-            hierarchicalSearchFilter: TopLevelGenericFilter(
-              filterName: DateFormat('MMMM d').format(date),
-              occurrence: kMostRelevantFilter,
-              filterResultType: ResultType.event,
-              matchedUploadedIDs: filesToUploadedFileIDs(photoSelection),
-              filterIcon: Icons.event_outlined,
-            ),
-          ),
-        );
-      } else {
-        // Individual entries for significant years
-        for (final year in significantDays) {
-          final date = DateTime(year, dayMonth ~/ 100, dayMonth % 100);
-          final files = yearGroups[year]!;
-          final photoSelection = await _bestSelection(files);
-          String name =
-              DateFormat.yMMMd(Localizations.localeOf(context).languageCode)
-                  .format(date);
-          if (date.day == currentTime.day && date.month == currentTime.month) {
-            name = "This day, ${currentTime.year - date.year} years back";
-          }
-
-          searchResults.add(
-            GenericSearchResult(
-              ResultType.event,
-              name,
-              photoSelection,
-              hierarchicalSearchFilter: TopLevelGenericFilter(
-                filterName: name,
-                occurrence: kMostRelevantFilter,
-                filterResultType: ResultType.event,
-                matchedUploadedIDs: filesToUploadedFileIDs(photoSelection),
-                filterIcon: Icons.event_outlined,
-              ),
-            ),
-          );
-        }
-      }
-
-      if (limit != null && searchResults.length >= limit) return searchResults;
-    }
-
-    // process to find significant weeks (only if there are no significant days)
-    if (searchResults.isEmpty) {
-      // Group files by week and year
-      final currentWeekYearGroups = <int, List<EnteFile>>{};
-      for (final file in allFiles) {
-        if (file.creationTime! > cutOffTime.microsecondsSinceEpoch) continue;
-
-        final creationTime =
-            DateTime.fromMicrosecondsSinceEpoch(file.creationTime!);
-        final week = _getWeekNumber(creationTime);
-        if (week != currentWeek) continue;
-        final year = creationTime.year;
-
-        currentWeekYearGroups.putIfAbsent(year, () => []).add(file);
-      }
-
-      // Process the week and see if it's significant
-      if (currentWeekYearGroups.isNotEmpty) {
-        final significantWeeks = currentWeekYearGroups.entries
-            .where((e) => e.value.length > significantWeekThreshold)
-            .map((e) => e.key)
-            .toList();
-        if (significantWeeks.length >= 3) {
-          // Combine all years for this week
-          final allPhotos =
-              currentWeekYearGroups.values.expand((x) => x).toList();
-          final photoSelection = await _bestSelection(allPhotos);
-
-          searchResults.add(
-            GenericSearchResult(
-              ResultType.event,
-              "This week through the years",
-              photoSelection,
-              hierarchicalSearchFilter: TopLevelGenericFilter(
-                filterName: "Week $currentWeek",
-                occurrence: kMostRelevantFilter,
-                filterResultType: ResultType.event,
-                matchedUploadedIDs: filesToUploadedFileIDs(photoSelection),
-                filterIcon: Icons.event_outlined,
-              ),
-            ),
-          );
-        } else {
-          // Individual entries for significant years
-          for (final year in significantWeeks) {
-            final date = DateTime(year, 1, 1).add(
-              Duration(days: (currentWeek - 1) * 7),
-            );
-            final files = currentWeekYearGroups[year]!;
-            final photoSelection = await _bestSelection(files);
-            final name =
-                "This week, ${currentTime.year - date.year} years back";
-
-            searchResults.add(
-              GenericSearchResult(
-                ResultType.event,
-                name,
-                photoSelection,
-                hierarchicalSearchFilter: TopLevelGenericFilter(
-                  filterName: name,
-                  occurrence: kMostRelevantFilter,
-                  filterResultType: ResultType.event,
-                  matchedUploadedIDs: filesToUploadedFileIDs(photoSelection),
-                  filterIcon: Icons.event_outlined,
-                ),
-              ),
-            );
-          }
-        }
-      }
-    }
-
-    if (limit != null && searchResults.length >= limit) return searchResults;
-
-    // process to find fillers (months)
-    const wantedMemories = 3;
-    final neededMemories = wantedMemories - searchResults.length;
-    if (neededMemories <= 0) return searchResults;
-    const monthSelectionSize = 20;
-
-    // Group files by month and year
-    final currentMonthYearGroups = <int, List<EnteFile>>{};
-    for (final file in allFiles) {
-      if (file.creationTime! > cutOffTime.microsecondsSinceEpoch) continue;
-
-      final creationTime =
-          DateTime.fromMicrosecondsSinceEpoch(file.creationTime!);
-      final month = creationTime.month;
-      if (month != currentMonth) continue;
-      final year = creationTime.year;
-
-      currentMonthYearGroups.putIfAbsent(year, () => []).add(file);
-    }
-
-    // Add the largest two months plus the month through the years
-    final sortedYearsForCurrentMonth = currentMonthYearGroups.keys.toList()
-      ..sort(
-        (a, b) => currentMonthYearGroups[b]!.length.compareTo(
-              currentMonthYearGroups[a]!.length,
-            ),
-      );
-    if (neededMemories > 1) {
-      for (int i = neededMemories; i > 1; i--) {
-        if (sortedYearsForCurrentMonth.isEmpty) break;
-        final year = sortedYearsForCurrentMonth.removeAt(0);
-        final monthYearFiles = currentMonthYearGroups[year]!;
-        final photoSelection = await _bestSelection(
-          monthYearFiles,
-          prefferedSize: monthSelectionSize,
-        );
-        final monthName =
-            DateFormat.MMMM(Localizations.localeOf(context).languageCode)
-                .format(DateTime(year, currentMonth));
-        final name = monthName + ", ${currentTime.year - year} years back";
-        searchResults.add(
-          GenericSearchResult(
-            ResultType.event,
-            name,
-            photoSelection,
-            hierarchicalSearchFilter: TopLevelGenericFilter(
-              filterName: name,
-              occurrence: kMostRelevantFilter,
-              filterResultType: ResultType.event,
-              matchedUploadedIDs: filesToUploadedFileIDs(photoSelection),
-              filterIcon: Icons.event_outlined,
-            ),
-          ),
-        );
-      }
-    }
-    // Show the month through the remaining years
-    if (sortedYearsForCurrentMonth.isEmpty) return searchResults;
-    final allPhotos = sortedYearsForCurrentMonth
-        .expand((year) => currentMonthYearGroups[year]!)
-        .toList();
-    final photoSelection =
-        await _bestSelection(allPhotos, prefferedSize: monthSelectionSize);
-    final monthName =
-        DateFormat.MMMM(Localizations.localeOf(context).languageCode)
-            .format(DateTime(currentTime.year, currentMonth));
-    final name = monthName + " through the years";
-    searchResults.add(
-      GenericSearchResult(
-        ResultType.event,
-        name,
-        photoSelection,
-        hierarchicalSearchFilter: TopLevelGenericFilter(
-          filterName: name,
-          occurrence: kMostRelevantFilter,
-          filterResultType: ResultType.event,
-          matchedUploadedIDs: filesToUploadedFileIDs(photoSelection),
-          filterIcon: Icons.event_outlined,
-        ),
-      ),
-    );
-
-    return searchResults;
-  }
-
-  int _getWeekNumber(DateTime date) {
-    // Get day of year (1-366)
-    final int dayOfYear = int.parse(DateFormat('D').format(date));
-    // Integer division by 7 and add 1 to start from week 1
-    return ((dayOfYear - 1) ~/ 7) + 1;
-  }
-
-  Future<String?> _tryFindLocationName(
-    List<EnteFile> files, {
-    bool base = false,
-  }) async {
-    final results = await locationService.getFilesInCity(files, '');
-    final List<City> sortedByResultCount = results.keys.toList()
-      ..sort((a, b) => results[b]!.length.compareTo(results[a]!.length));
-    if (sortedByResultCount.isEmpty) return null;
-    final biggestPlace = sortedByResultCount.first;
-    if (results[biggestPlace]!.length > files.length / 2) {
-      return biggestPlace.city;
-    }
-    if (results.length > 2 &&
-        results.keys.map((city) => city.country).toSet().length == 1 &&
-        !base) {
-      return biggestPlace.country;
-    }
-    return null;
-  }
-
-  /// Returns the best selection of files from the given list.
-  /// Makes sure that the selection is not more than [prefferedSize] or 10 files,
-  /// and that each year of the original list is represented.
-  Future<List<EnteFile>> _bestSelection(
-    List<EnteFile> files, {
-    int? prefferedSize,
-  }) async {
-    final fileCount = files.length;
-    int targetSize = prefferedSize ?? 10;
-    if (fileCount <= targetSize) return files;
-    final safeFiles =
-        files.where((file) => file.uploadedFileID != null).toList();
-    final safeCount = safeFiles.length;
-    final fileIDs = safeFiles.map((e) => e.uploadedFileID!).toSet();
-    final fileIdToFace = await MLDataDB.instance.getFacesForFileIDs(fileIDs);
-    final faceIDs =
-        fileIdToFace.values.expand((x) => x.map((face) => face.faceID)).toSet();
-    final faceIDsToPersonID =
-        await MLDataDB.instance.getFaceIdToPersonIdForFaces(faceIDs);
-    final fileIdToClip =
-        await MLDataDB.instance.getClipVectorsForFileIDs(fileIDs);
-    final allYears = safeFiles.map((e) {
-      final creationTime = DateTime.fromMicrosecondsSinceEpoch(e.creationTime!);
-      return creationTime.year;
-    }).toSet();
-
-    // Get clip scores for each file
-    const query =
-        'Photo of a precious memory radiating warmth, vibrant energy, or quiet beauty — alive with color, light, or emotion';
-    // TODO: lau: optimize this later so we don't keep computing embedding
-    final textEmbedding = await MLComputer.instance.runClipText(query);
-    final textVector = Vector.fromList(textEmbedding);
-    const clipThreshold = 0.75;
-    final fileToScore = <int, double>{};
-    for (final file in safeFiles) {
-      final clip = fileIdToClip[file.uploadedFileID!];
-      if (clip == null) {
-        fileToScore[file.uploadedFileID!] = 0;
-        continue;
-      }
-      final score = clip.vector.dot(textVector);
-      fileToScore[file.uploadedFileID!] = score;
-    }
-
-    // Get face scores for each file
-    final fileToFaceCount = <int, int>{};
-    for (final file in safeFiles) {
-      final fileID = file.uploadedFileID!;
-      fileToFaceCount[fileID] = 0;
-      final faces = fileIdToFace[fileID];
-      if (faces == null || faces.isEmpty) {
-        continue;
-      }
-      for (final face in faces) {
-        if (faceIDsToPersonID.containsKey(face.faceID)) {
-          fileToFaceCount[fileID] = fileToFaceCount[fileID]! + 10;
-        } else {
-          fileToFaceCount[fileID] = fileToFaceCount[fileID]! + 1;
-        }
-      }
-    }
-
-    final filteredFiles = <EnteFile>[];
-    if (allYears.length <= 1) {
-      // TODO: lau: eventually this sorting might have to be replaced with some scoring system
-      // sort first on clip embeddings score (descending)
-      safeFiles.sort(
-        (a, b) => fileToScore[b.uploadedFileID!]!
-            .compareTo(fileToScore[a.uploadedFileID!]!),
-      );
-      // then sort on faces (descending), heavily prioritizing named faces
-      safeFiles.sort(
-        (a, b) => fileToFaceCount[b.uploadedFileID!]!
-            .compareTo(fileToFaceCount[a.uploadedFileID!]!),
-      );
-
-      // then filter out similar images as much as possible
-      filteredFiles.add(safeFiles.first);
-      int skipped = 0;
-      filesLoop:
-      for (final file in safeFiles.sublist(1)) {
-        if (filteredFiles.length >= targetSize) break;
-        final clip = fileIdToClip[file.uploadedFileID!];
-        if (clip != null && (safeCount - skipped) > targetSize) {
-          for (final filteredFile in filteredFiles) {
-            final fClip = fileIdToClip[filteredFile.uploadedFileID!];
-            if (fClip == null) continue;
-            final similarity = clip.vector.dot(fClip.vector);
-            if (similarity > clipThreshold) {
-              skipped++;
-              continue filesLoop;
-            }
-          }
-        }
-        filteredFiles.add(file);
-      }
-    } else {
-      // Multiple years, each represented and roughly equally distributed
-      if (prefferedSize == null && (allYears.length * 2) > 10) {
-        targetSize = allYears.length * 3;
-        if (safeCount < targetSize) return safeFiles;
-      }
-
-      // Group files by year and sort each year's list by CLIP then face count
-      final yearToFiles = <int, List<EnteFile>>{};
-      for (final file in safeFiles) {
-        final creationTime =
-            DateTime.fromMicrosecondsSinceEpoch(file.creationTime!);
-        final year = creationTime.year;
-        yearToFiles.putIfAbsent(year, () => []).add(file);
-      }
-
-      for (final year in yearToFiles.keys) {
-        final yearFiles = yearToFiles[year]!;
-        // sort first on clip embeddings score (descending)
-        yearFiles.sort(
-          (a, b) => fileToScore[b.uploadedFileID!]!
-              .compareTo(fileToScore[a.uploadedFileID!]!),
-        );
-        // then sort on faces (descending), heavily prioritizing named faces
-        yearFiles.sort(
-          (a, b) => fileToFaceCount[b.uploadedFileID!]!
-              .compareTo(fileToFaceCount[a.uploadedFileID!]!),
-        );
-      }
-
-      // Then join the years together one by one and filter similar images
-      final years = yearToFiles.keys.toList()
-        ..sort((a, b) => b.compareTo(a)); // Recent years first
-      int round = 0;
-      int skipped = 0;
-      whileLoop:
-      while (filteredFiles.length + skipped < safeCount) {
-        yearLoop:
-        for (final year in years) {
-          final yearFiles = yearToFiles[year]!;
-          if (yearFiles.isEmpty) continue;
-          final newFile = yearFiles.removeAt(0);
-          if (round != 0 && (safeCount - skipped) > targetSize) {
-            // check for filtering
-            final clip = fileIdToClip[newFile.uploadedFileID!];
-            if (clip != null) {
-              for (final filteredFile in filteredFiles) {
-                final fClip = fileIdToClip[filteredFile.uploadedFileID!];
-                if (fClip == null) continue;
-                final similarity = clip.vector.dot(fClip.vector);
-                if (similarity > clipThreshold) {
-                  skipped++;
-                  continue yearLoop;
-                }
-              }
-            }
-          }
-          filteredFiles.add(newFile);
-          if (filteredFiles.length >= targetSize ||
-              filteredFiles.length + skipped >= safeCount) {
-            break whileLoop;
-          }
-        }
-        round++;
-        // Extra safety to prevent infinite loops
-        if (round > safeCount) break;
-      }
-    }
-
-    // Order the final selection chronologically
-    filteredFiles.sort((a, b) => b.creationTime!.compareTo(a.creationTime!));
-    return filteredFiles;
-  }
-
   Future<GenericSearchResult?> getRandomDateResults(
     BuildContext context,
   ) async {

From 19976136abc511054c7fb2a4527574b32fe0396c Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 17 Feb 2025 12:25:59 +0530
Subject: [PATCH 234/796] [mob][photos] todo

---
 mobile/lib/services/smart_memories_service.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index c49400e884..447ca8e184 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -426,7 +426,7 @@ class SmartMemoriesService {
             DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime())
                 .year;
         final String? locationName = await _tryFindLocationName(trip.memories);
-        String name = "Trip in $year";
+        String name = "Trip in $year"; // TODO lau: extract strings for translation
         if (locationName != null) {
           name = "Trip to $locationName";
         } else if (year == currentTime.year - 1) {

From 43c0d8a6ad48e12b7c1c08efb5874323ea72e8b9 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 14 Feb 2025 10:39:49 +0530
Subject: [PATCH 235/796] Revert "Revert "Workbench""

This reverts commit 20fea517cecefc236f88bc4e7e77bccca88c9ce6.
---
 web/apps/photos/src/pages/_app.tsx                          | 4 ++--
 web/apps/photos/src/styles/global.css                       | 3 ++-
 web/packages/new/photos/components/FileViewerPhotoSwipe.tsx | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index e5b919e622..c514df101f 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -51,9 +51,9 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { resumeExportsIfNeeded } from "services/export";
 import { photosLogout } from "services/logout";
 
-import "photoswipe/dist/photoswipe.css";
+// import "photoswipe/dist/photoswipe.css";
 // TODO(PS): Note, auto hide only works with the new CSS.
-// import "../../../../packages/new/photos/components/ps5/dist/photoswipe.css";
+import "../../../../packages/new/photos/components/ps5/dist/photoswipe.css";
 
 import "styles/global.css";
 
diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 38d9241ba2..e15e672a24 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -12,7 +12,7 @@ body {
     flex-direction: column;
     height: 100%;
 }
-
+@media DISABLED {
 .pswp__button--custom {
     width: 48px;
     height: 48px;
@@ -114,6 +114,7 @@ body {
 .pswp__caption--empty {
     display: none;
 }
+}
 
 /*
   Make the controllable video elements we render as custom PhotoSwipe content
diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
index db1771f379..22b37ca2fd 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
@@ -28,7 +28,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 let PhotoSwipe;
 if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     // TODO(PS): Comment me before merging into main.
-    // PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
+    PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
 // TODO(PS):
 //import { type SlideData } from "./ps5/dist/types/slide/"

From 8df04b236399e583a895c656ba1851c8bafb90c2 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Mon, 17 Feb 2025 13:50:03 +0530
Subject: [PATCH 236/796] fix: convert the edited video to mp4 with x264

---
 .../ui/tools/editor/video_editor_page.dart    | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/mobile/lib/ui/tools/editor/video_editor_page.dart b/mobile/lib/ui/tools/editor/video_editor_page.dart
index d96f0008a7..238c771115 100644
--- a/mobile/lib/ui/tools/editor/video_editor_page.dart
+++ b/mobile/lib/ui/tools/editor/video_editor_page.dart
@@ -209,15 +209,14 @@ class _VideoEditorPageState extends State<VideoEditorPage> {
 
     final config = VideoFFmpegVideoEditorConfig(
       _controller!,
-      format: VideoExportFormat(
-        path.extension(widget.ioFile.path).substring(1),
-      ),
-      // commandBuilder: (config, videoPath, outputPath) {
-      //   final List<String> filters = config.getExportFilters();
-      //   filters.add('hflip'); // add horizontal flip
+      format: VideoExportFormat.mp4,
+      commandBuilder: (config, videoPath, outputPath) {
+        final List<String> filters = config.getExportFilters();
 
-      //   return '-i $videoPath ${config.filtersCmd(filters)} -preset ultrafast $outputPath';
-      // },
+        final String startTrimCmd = "-ss ${_controller!.startTrim}";
+        final String toTrimCmd = "-t ${_controller!.trimmedDuration}";
+        return '$startTrimCmd -i $videoPath  $toTrimCmd ${config.filtersCmd(filters)} -c:v libx264 -c:a aac $outputPath';
+      },
     );
 
     try {
@@ -241,12 +240,12 @@ class _VideoEditorPageState extends State<VideoEditorPage> {
           await PhotoManager.stopChangeNotify();
 
           try {
-            final AssetEntity? newAsset =
+            final AssetEntity newAsset =
                 await (PhotoManager.editor.saveVideo(result, title: fileName));
             result.deleteSync();
             final newFile = await EnteFile.fromAsset(
               widget.file.deviceFolder ?? '',
-              newAsset!,
+              newAsset,
             );
 
             newFile.creationTime = widget.file.creationTime;

From 8e90541d871b65f4a6bc0ddfb5755433273bcbee Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 13:57:07 +0530
Subject: [PATCH 237/796] Fix path for lps

---
 web/packages/new/photos/components/FileViewerPhotoSwipe.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
index 22b37ca2fd..5f50599274 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
+++ b/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
@@ -301,8 +301,10 @@ export class FileViewerPhotoSwipe {
         });
 
         pswp.on("contentDeactivate", (e) => {
-            // Pause the video tag (if any) for a slide when we move away from it.
-            const video = e.content?.element?.getElementsByTagName("video")[0];
+            // Pause the video element (if any) on a slide when we move away
+            // from it.
+            const video =
+                e.content?.slide?.container?.getElementsByTagName("video")[0];
             video?.pause();
         });
 

From dc0450b155385d41640181c8dff3aad1a0e5f3c2 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 14:05:55 +0530
Subject: [PATCH 238/796] Modal

---
 .../new/photos/components/FileViewer5.tsx      | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
index 0b678f881d..a4d6e3677c 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -13,6 +13,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     throw new Error("Whoa");
 }
 
+import { useModalVisibility } from "@/base/components/utils/modal";
 import type { EnteFile } from "@/media/file.js";
 import { Button, styled } from "@mui/material";
 import { useCallback, useEffect, useRef } from "react";
@@ -57,8 +58,23 @@ const FileViewer: React.FC<FileViewerProps> = ({
 }) => {
     const pswpRef = useRef<FileViewerPhotoSwipe | undefined>();
 
+    // Whenever we get a callback from our custom PhotoSwipe instance, we also
+    // get the active file on which that action was performed as an argument.
+    // Save it as a prop so that the rest of our React tree can use it.
+    //
+    // This is not guaranteed, or even intended, to be in sync with the active
+    // file shown within the file viewer. All that this guarantees is this will
+    // refer to the file on which the last user initiated action was performed.
+    const [activeFile, setActiveFile] = setState<EnteFile | undefined>(
+        undefined,
+    );
+
+    const { show: showFileInfo, props: fileInfoVisibilityProps } =
+        useModalVisibility();
+
     const handleViewInfo = useCallback((file: EnteFile) => {
-        console.log("view-info", file);
+        setActiveFile(file);
+        showFileInfo();
     }, []);
 
     useEffect(() => {

From 1c322a9c62e5e544f17df4f9c6f7cb2c9dcf1ec7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 14:11:16 +0530
Subject: [PATCH 239/796] Modal

---
 .../photos/src/components/PhotoViewer/index.tsx  |  4 ++--
 web/packages/gallery/components/FileInfo.tsx     | 16 +++++++---------
 .../new/photos/components/FileViewer5.tsx        |  6 ++++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index 48b484bb7e..a9fe6a4d8c 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -992,8 +992,8 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
                 onConfirm={handleDeleteFile}
             />
             <FileInfo
-                showInfo={showInfo}
-                handleCloseInfo={handleCloseInfo}
+                open={showInfo}
+                onClose={handleCloseInfo}
                 file={photoSwipe?.currItem as EnteFile}
                 exif={exif?.value}
                 shouldDisableEdits={!isOwnFile}
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 120f81517d..b22fb97a99 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -18,7 +18,7 @@ import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
 import { SidebarDrawer } from "@/base/components/mui/SidebarDrawer";
 import { Titlebar } from "@/base/components/Titlebar";
 import { EllipsizedTypography } from "@/base/components/Typography";
-import { useModalVisibility } from "@/base/components/utils/modal";
+import { useModalVisibility, type ModalVisibilityProps } from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
 import { haveWindow } from "@/base/env";
 import { nameAndExtension } from "@/base/file-name";
@@ -107,13 +107,11 @@ export interface FileInfoExif {
     parsed: ParsedMetadata | undefined;
 }
 
-export interface FileInfoProps {
+export type FileInfoProps = ModalVisibilityProps & {
     /**
      * The file whose information we are showing.
      */
     file: EnteFile | undefined;
-    showInfo: boolean;
-    handleCloseInfo: () => void;
     exif: FileInfoExif | undefined;
     /**
      * TODO: Rename and flip to allowEdits.
@@ -141,11 +139,11 @@ export interface FileInfoProps {
 }
 
 export const FileInfo: React.FC<FileInfoProps> = ({
+    open,
+    onClose,
     file,
     shouldDisableEdits,
     allowMap,
-    showInfo,
-    handleCloseInfo,
     exif,
     scheduleUpdate,
     refreshPhotoswipe,
@@ -209,8 +207,8 @@ export const FileInfo: React.FC<FileInfoProps> = ({
         onSelectPerson?.(personID);
 
     return (
-        <FileInfoSidebar open={showInfo} onClose={handleCloseInfo}>
-            <Titlebar onClose={handleCloseInfo} title={t("info")} backIsClose />
+        <FileInfoSidebar open={open} onClose={onClose}>
+            <Titlebar onClose={onClose} title={t("info")} backIsClose />
             <Stack sx={{ pt: 1, pb: 3, gap: "20px" }}>
                 <RenderCaption
                     {...{
@@ -343,7 +341,7 @@ export const FileInfo: React.FC<FileInfoProps> = ({
             </Stack>
             <RawExif
                 {...rawExifVisibilityProps}
-                onInfoClose={handleCloseInfo}
+                onInfoClose={onClose}
                 tags={exif?.tags}
                 fileName={file.metadata.title}
             />
diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
index a4d6e3677c..2e019202c5 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -14,9 +14,10 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 }
 
 import { useModalVisibility } from "@/base/components/utils/modal";
+import { FileInfo } from "@/gallery/components/FileInfo";
 import type { EnteFile } from "@/media/file.js";
 import { Button, styled } from "@mui/material";
-import { useCallback, useEffect, useRef } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { FileViewerPhotoSwipe } from "./FileViewerPhotoSwipe";
 
 export interface FileViewerProps {
@@ -65,7 +66,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
     // This is not guaranteed, or even intended, to be in sync with the active
     // file shown within the file viewer. All that this guarantees is this will
     // refer to the file on which the last user initiated action was performed.
-    const [activeFile, setActiveFile] = setState<EnteFile | undefined>(
+    const [activeFile, setActiveFile] = useState<EnteFile | undefined>(
         undefined,
     );
 
@@ -101,6 +102,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
     return (
         <Container>
             <Button>Test</Button>
+            <FileInfo {...fileInfoVisibilityProps} file={activeFile} />
         </Container>
     );
 };

From e9d63dfea98269b7f0eaeab0ce6a807ee5c1c2a7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 14:39:49 +0530
Subject: [PATCH 240/796] zi

---
 web/apps/photos/src/styles/global.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index e15e672a24..6de4c6f5d0 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -116,6 +116,12 @@ body {
 }
 }
 
+.pswp-ente {
+    /* The default z-index for PhotoSwipe is 10k, way beyond everything else.
+      Give it a more moderate value so that MUI elements can be used with it. */
+    z-index: calc(var(--mui-zIndex-drawer) - 1);
+}
+
 /*
   Make the controllable video elements we render as custom PhotoSwipe content
   take up the entire container.

From 78ca3937605fe44a61d9c3f1bee580d58648cb59 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 17 Feb 2025 14:47:50 +0530
Subject: [PATCH 241/796] [mob][photos] cache methods

---
 mobile/lib/core/configuration.dart            |  2 ++
 .../lib/services/smart_memories_service.dart  | 24 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/core/configuration.dart b/mobile/lib/core/configuration.dart
index e15193a5d3..b27e153e4b 100644
--- a/mobile/lib/core/configuration.dart
+++ b/mobile/lib/core/configuration.dart
@@ -29,6 +29,7 @@ import 'package:photos/services/ignored_files_service.dart';
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
 import 'package:photos/services/memories_service.dart';
 import 'package:photos/services/search_service.dart';
+import "package:photos/services/smart_memories_service.dart";
 import 'package:photos/services/sync_service.dart';
 import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/file_uploader.dart';
@@ -216,6 +217,7 @@ class Configuration {
       CollectionsService.instance.clearCache();
       FavoritesService.instance.clearCache();
       MemoriesService.instance.clearCache();
+      SmartMemoriesService.instance.clearCache();
       SearchService.instance.clearCache();
       PersonService.instance.clearCache();
       unawaited(HomeWidgetService.instance.clearHomeWidget());
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 447ca8e184..c4d1f8b4fa 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -4,7 +4,9 @@ import "package:flutter/material.dart";
 import "package:intl/intl.dart";
 import "package:logging/logging.dart";
 import "package:ml_linalg/vector.dart";
+import "package:photos/core/event_bus.dart";
 import "package:photos/db/ml/db.dart";
+import "package:photos/events/files_updated_event.dart";
 import "package:photos/models/base_location.dart";
 import "package:photos/models/file/extensions/file_props.dart";
 import "package:photos/models/file/file.dart";
@@ -40,9 +42,28 @@ class SmartMemoriesService {
     if (_isInit) return;
     _locale = Localizations.localeOf(context);
     _isInit = true;
+
+    Bus.instance.on<FilesUpdatedEvent>().where((event) {
+      return event.type == EventType.deletedFromEverywhere;
+    }).listen((event) {
+      if (_cachedMemories == null) return;
+      final generatedIDs = event.updatedFiles
+          .where((element) => element.generatedID != null)
+          .map((e) => e.generatedID!)
+          .toSet();
+      for (final memory in _cachedMemories!) {
+        memory.memories
+            .removeWhere((m) => generatedIDs.contains(m.file.generatedID));
+      }
+    });
     _logger.info("Smart memories service initialized");
   }
 
+  void clearCache() {
+    _cachedMemories = null;
+    _future = null;
+  }
+
   Future<List<SmartMemory>> getMemories(int? limit) async {
     if (!MemoriesService.instance.showMemories) {
       return [];
@@ -426,7 +447,8 @@ class SmartMemoriesService {
             DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime())
                 .year;
         final String? locationName = await _tryFindLocationName(trip.memories);
-        String name = "Trip in $year"; // TODO lau: extract strings for translation
+        String name =
+            "Trip in $year"; // TODO lau: extract strings for translation
         if (locationName != null) {
           name = "Trip to $locationName";
         } else if (year == currentTime.year - 1) {

From fe86075868051e7aaa486518175ac110d5a4a0ac Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 14:54:11 +0530
Subject: [PATCH 242/796] Namespace

---
 web/apps/photos/src/components/PhotoFrame.tsx                   | 2 +-
 web/apps/photos/src/components/PhotoViewer/index.tsx            | 2 +-
 .../components/{FileViewer.tsx => FileViewerComponents.tsx}     | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename web/packages/new/photos/components/{FileViewer.tsx => FileViewerComponents.tsx} (100%)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 25576c0be6..7cd68255ab 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -7,7 +7,7 @@ import {
 } from "@/gallery/services/download";
 import { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
-import { FileViewer } from "@/new/photos/components/FileViewer";
+import { FileViewer } from "@/new/photos/components/FileViewerComponents";
 import type { GalleryBarMode } from "@/new/photos/components/gallery/reducer";
 import { TRASH_SECTION } from "@/new/photos/services/collection";
 import { styled } from "@mui/material";
diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index a9fe6a4d8c..41b83cc307 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -19,7 +19,7 @@ import type { Collection } from "@/media/collection";
 import { fileLogID, type EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import { isHEICExtension, needsJPEGConversion } from "@/media/formats";
-import { ConfirmDeleteFileDialog } from "@/new/photos/components/FileViewer";
+import { ConfirmDeleteFileDialog } from "@/new/photos/components/FileViewerComponents";
 import { ImageEditorOverlay } from "@/new/photos/components/ImageEditorOverlay";
 import { moveToTrash } from "@/new/photos/services/collection";
 import { extractRawExif, parseExif } from "@/new/photos/services/exif";
diff --git a/web/packages/new/photos/components/FileViewer.tsx b/web/packages/new/photos/components/FileViewerComponents.tsx
similarity index 100%
rename from web/packages/new/photos/components/FileViewer.tsx
rename to web/packages/new/photos/components/FileViewerComponents.tsx

From 0eba6b9c98eb22b62cd593cf835e58b20386b622 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 14:58:07 +0530
Subject: [PATCH 243/796] Move

---
 web/apps/photos/src/pages/_app.tsx                            | 2 +-
 .../components => gallery/components/viewer}/.gitignore       | 0
 .../components/viewer/FileViewer.tsx}                         | 2 +-
 .../components/viewer/photoswipe.ts}                          | 2 +-
 web/packages/new/photos/components/FileViewerComponents.tsx   | 4 +++-
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename web/packages/{new/photos/components => gallery/components/viewer}/.gitignore (100%)
 rename web/packages/{new/photos/components/FileViewer5.tsx => gallery/components/viewer/FileViewer.tsx} (98%)
 rename web/packages/{new/photos/components/FileViewerPhotoSwipe.tsx => gallery/components/viewer/photoswipe.ts} (99%)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index c514df101f..c2ed6d7c81 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -53,7 +53,7 @@ import { photosLogout } from "services/logout";
 
 // import "photoswipe/dist/photoswipe.css";
 // TODO(PS): Note, auto hide only works with the new CSS.
-import "../../../../packages/new/photos/components/ps5/dist/photoswipe.css";
+import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
 
 import "styles/global.css";
 
diff --git a/web/packages/new/photos/components/.gitignore b/web/packages/gallery/components/viewer/.gitignore
similarity index 100%
rename from web/packages/new/photos/components/.gitignore
rename to web/packages/gallery/components/viewer/.gitignore
diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
similarity index 98%
rename from web/packages/new/photos/components/FileViewer5.tsx
rename to web/packages/gallery/components/viewer/FileViewer.tsx
index 2e019202c5..9deedd9180 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -18,7 +18,7 @@ import { FileInfo } from "@/gallery/components/FileInfo";
 import type { EnteFile } from "@/media/file.js";
 import { Button, styled } from "@mui/material";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { FileViewerPhotoSwipe } from "./FileViewerPhotoSwipe";
+import { FileViewerPhotoSwipe } from "./photoswipe";
 
 export interface FileViewerProps {
     /**
diff --git a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx b/web/packages/gallery/components/viewer/photoswipe.ts
similarity index 99%
rename from web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
rename to web/packages/gallery/components/viewer/photoswipe.ts
index 5f50599274..f112e712de 100644
--- a/web/packages/new/photos/components/FileViewerPhotoSwipe.tsx
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -9,7 +9,7 @@ import {
 } from "@/gallery/services/download";
 import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
-import type { FileViewerProps } from "./FileViewer5";
+import type { FileViewerProps } from "./FileViewer";
 
 // import { renderToString } from "react-dom/server";
 
diff --git a/web/packages/new/photos/components/FileViewerComponents.tsx b/web/packages/new/photos/components/FileViewerComponents.tsx
index 3835fae56a..120b3a4c2c 100644
--- a/web/packages/new/photos/components/FileViewerComponents.tsx
+++ b/web/packages/new/photos/components/FileViewerComponents.tsx
@@ -13,7 +13,9 @@ import { aboveFileViewerContentZ } from "./utils/z-index";
 import dynamic from "next/dynamic";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-const FV5 = dynamic(() => import("./FileViewer5"), { ssr: false });
+const FV5 = dynamic(() => import("@/gallery/components/viewer/FileViewer"), {
+    ssr: false,
+});
 const FVD = () => <></>;
 
 export const FileViewer: React.FC = (props) => {

From 6140f35e69ca04355847e00de2574d3c2faa1ad6 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 15:27:39 +0530
Subject: [PATCH 244/796] Move

---
 .../gallery/components/viewer/icons.tsx       | 19 +++++++++++++++++++
 .../gallery/components/viewer/photoswipe.ts   |  6 ------
 2 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 web/packages/gallery/components/viewer/icons.tsx

diff --git a/web/packages/gallery/components/viewer/icons.tsx b/web/packages/gallery/components/viewer/icons.tsx
new file mode 100644
index 0000000000..1238f7f619
--- /dev/null
+++ b/web/packages/gallery/components/viewer/icons.tsx
@@ -0,0 +1,19 @@
+/**
+ * @file [Note: SVG paths of MUI icons]
+ *
+ * When creating buttons for use with PhotoSwipe, we need to provide just the
+ * contents of the SVG element (e.g. paths) as an HTML string.
+ *
+ * Since we only need a handful, these strings were created by temporarily
+ * adding the following code in some existing React component to render the
+ * corresponding MUI icon React component to a string, and retain the path.
+ *
+ * 1. import { renderToString } from "react-dom/server";
+ *
+ * 2. console.log(renderToString(<InfoOutlinedIcon />));
+ */
+
+// const html =
+// console.log(renderToString(<InfoOutlinedIcon />));
+// const path =
+//     '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8"></path>';
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index f112e712de..9f2b73d84b 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -11,8 +11,6 @@ import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import type { FileViewerProps } from "./FileViewer";
 
-// import { renderToString } from "react-dom/server";
-
 // TODO(PS): WIP gallery using upstream photoswipe
 //
 // Needs (not committed yet):
@@ -326,10 +324,6 @@ export class FileViewerPhotoSwipe {
         // - zoom: 10
         // - close: 20
         pswp.on("uiRegister", () => {
-            // const html = <InfoOutlinedIcon fontSize="32" />;
-            // console.log(renderToString(html));
-            // const path =
-            //     '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8"></path>';
             const pathWithIDAndTransform =
                 '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8" transform="translate(3.5, 3.5)" id="pswp__icn-info" />';
             pswp.ui.registerElement({

From 84aeb7941221d31f79276bfd316761e2951a360c Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 15:44:05 +0530
Subject: [PATCH 245/796] Move out icons

---
 .../gallery/components/viewer/icons.tsx       | 37 ++++++++++++++++---
 .../gallery/components/viewer/photoswipe.ts   |  9 +----
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/web/packages/gallery/components/viewer/icons.tsx b/web/packages/gallery/components/viewer/icons.tsx
index 1238f7f619..ef4fadd8e1 100644
--- a/web/packages/gallery/components/viewer/icons.tsx
+++ b/web/packages/gallery/components/viewer/icons.tsx
@@ -8,12 +8,37 @@
  * adding the following code in some existing React component to render the
  * corresponding MUI icon React component to a string, and retain the path.
  *
- * 1. import { renderToString } from "react-dom/server";
  *
- * 2. console.log(renderToString(<InfoOutlinedIcon />));
+ *     import { renderToString } from "react-dom/server";
+ *     import InfoOutlinedIcon from ;
+ *
+ *     console.log(renderToString(<InfoOutlinedIcon />));
  */
 
-// const html =
-// console.log(renderToString(<InfoOutlinedIcon />));
-// const path =
-//     '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8"></path>';
+const paths = {
+    // "@mui/icons-material/InfoOutlined"
+    info: '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8"',
+};
+
+/**
+ * Return an object that can be passed verbatim to the "html" option expected by
+ * PhotoSwipe's registerElement function.
+ *
+ * API docs for registerElement:
+ * https://photoswipe.com/adding-ui-elements/#uiregisterelement-api
+ *
+ * Example:
+ *
+ *     html: {
+ *         isCustomSVG: true,
+ *         inner: '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8" transform="translate(3.5, 3.5)" id="pswp__icn-info" />',
+ *         outlineID: "pswp__icn-info",
+ *     }
+ *
+ */
+export const createPSRegisterElementIconHTML = (name: "info") => ({
+    isCustomSVG: true,
+    // TODO(PS): This transform is temporary, audit later.
+    inner: `${paths[name]} transform="translate(3.5, 3.5)" id="pswp__icn-${name}"`,
+    outlineID: `pswp__icn-${name}`,
+});
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 9f2b73d84b..aea060e0ce 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -10,6 +10,7 @@ import {
 import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import type { FileViewerProps } from "./FileViewer";
+import { createPSRegisterElementIconHTML } from "./icons";
 
 // TODO(PS): WIP gallery using upstream photoswipe
 //
@@ -324,19 +325,13 @@ export class FileViewerPhotoSwipe {
         // - zoom: 10
         // - close: 20
         pswp.on("uiRegister", () => {
-            const pathWithIDAndTransform =
-                '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8" transform="translate(3.5, 3.5)" id="pswp__icn-info" />';
             pswp.ui.registerElement({
                 name: "info",
                 title: "Info",
                 ariaLabel: "Info",
                 order: 15,
                 isButton: true,
-                html: {
-                    isCustomSVG: true,
-                    inner: pathWithIDAndTransform,
-                    outlineID: "pswp__icn-info",
-                },
+                html: createPSRegisterElementIconHTML("info"),
                 onClick: (e, element, pswp) => {
                     const file = this.files[pswp.currIndex];
                     if (!file) {

From e93702766704a0865dbeff597ea8dd742b58118f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 16:04:51 +0530
Subject: [PATCH 246/796] Title gets used as ariaLabel

---
 web/packages/gallery/components/viewer/photoswipe.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index aea060e0ce..30ffeafee7 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -11,6 +11,7 @@ import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import type { FileViewerProps } from "./FileViewer";
 import { createPSRegisterElementIconHTML } from "./icons";
+import { t } from "i18next";
 
 // TODO(PS): WIP gallery using upstream photoswipe
 //
@@ -327,8 +328,7 @@ export class FileViewerPhotoSwipe {
         pswp.on("uiRegister", () => {
             pswp.ui.registerElement({
                 name: "info",
-                title: "Info",
-                ariaLabel: "Info",
+                title: t("info"),
                 order: 15,
                 isButton: true,
                 html: createPSRegisterElementIconHTML("info"),

From f6d949db38fab66173d23e51e4359648776229f4 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 16:09:18 +0530
Subject: [PATCH 247/796] wrap

---
 .../gallery/components/viewer/photoswipe.ts       | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 30ffeafee7..dba046614b 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -9,9 +9,9 @@ import {
 } from "@/gallery/services/download";
 import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
+import { t } from "i18next";
 import type { FileViewerProps } from "./FileViewer";
 import { createPSRegisterElementIconHTML } from "./icons";
-import { t } from "i18next";
 
 // TODO(PS): WIP gallery using upstream photoswipe
 //
@@ -316,6 +316,9 @@ export class FileViewerPhotoSwipe {
             onClose();
         });
 
+        const withCurrentFile = (cb: (file: EnteFile) => void) => () =>
+            cb(this.files[this.pswp.currIndex]!);
+
         // Add our custom UI elements to inside the PhotoSwipe dialog.
         //
         // API docs for registerElement:
@@ -332,15 +335,7 @@ export class FileViewerPhotoSwipe {
                 order: 15,
                 isButton: true,
                 html: createPSRegisterElementIconHTML("info"),
-                onClick: (e, element, pswp) => {
-                    const file = this.files[pswp.currIndex];
-                    if (!file) {
-                        assertionFailed();
-                        return;
-                    }
-
-                    onViewInfo(file);
-                },
+                onClick: withCurrentFile(onViewInfo),
             });
         });
 

From f922df304ec3cb0e5fc04cf1395f50417ff8e69f Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 17 Feb 2025 15:29:43 +0530
Subject: [PATCH 248/796] [mob] Refactor

---
 mobile/lib/core/configuration.dart                   |  6 +++---
 mobile/lib/emergency/emergency_service.dart          |  4 ++--
 mobile/lib/emergency/other_contact_page.dart         |  2 +-
 mobile/lib/emergency/recover_others_account.dart     |  4 ++--
 .../lib/models/{ => api/billing}/billing_plan.dart   |  0
 .../lib/models/{ => api/billing}/subscription.dart   |  0
 .../{ => api}/collection/collection_file_item.dart   |  0
 .../{ => api/collection}/trash_item_request.dart     |  0
 mobile/lib/models/api/entity/data.dart               |  2 +-
 mobile/lib/models/{ => api/user}/delete_account.dart |  0
 mobile/lib/models/{ => api/user}/key_attributes.dart |  0
 mobile/lib/models/{ => api/user}/key_gen_result.dart |  4 ++--
 .../{ => api/user}/private_key_attributes.dart       |  0
 mobile/lib/models/{ => api/user}/sessions.dart       |  0
 .../lib/models/{ => api/user}/set_keys_request.dart  |  0
 .../{ => api/user}/set_recovery_key_request.dart     |  0
 mobile/lib/models/user_details.dart                  |  2 +-
 .../{models => module/upload/model}/upload_url.dart  |  0
 mobile/lib/services/billing_service.dart             |  4 ++--
 mobile/lib/services/collections_service.dart         |  2 +-
 mobile/lib/services/trash_sync_service.dart          |  2 +-
 mobile/lib/services/user_service.dart                | 12 ++++++------
 mobile/lib/ui/account/delete_account_page.dart       |  2 +-
 mobile/lib/ui/account/password_entry_page.dart       |  2 +-
 mobile/lib/ui/account/sessions_page.dart             |  2 +-
 mobile/lib/ui/payment/payment_web_page.dart          |  2 +-
 mobile/lib/ui/payment/store_subscription_page.dart   |  4 ++--
 mobile/lib/ui/payment/stripe_subscription_page.dart  |  4 ++--
 .../lib/ui/payment/subscription_common_widgets.dart  |  2 +-
 mobile/lib/utils/delete_file_util.dart               |  2 +-
 mobile/lib/utils/file_uploader.dart                  |  2 +-
 mobile/lib/utils/validator_util.dart                 |  2 +-
 mobile/lib/utils/xml_parser_util.dart                |  1 -
 33 files changed, 34 insertions(+), 35 deletions(-)
 rename mobile/lib/models/{ => api/billing}/billing_plan.dart (100%)
 rename mobile/lib/models/{ => api/billing}/subscription.dart (100%)
 rename mobile/lib/models/{ => api}/collection/collection_file_item.dart (100%)
 rename mobile/lib/models/{ => api/collection}/trash_item_request.dart (100%)
 rename mobile/lib/models/{ => api/user}/delete_account.dart (100%)
 rename mobile/lib/models/{ => api/user}/key_attributes.dart (100%)
 rename mobile/lib/models/{ => api/user}/key_gen_result.dart (65%)
 rename mobile/lib/models/{ => api/user}/private_key_attributes.dart (100%)
 rename mobile/lib/models/{ => api/user}/sessions.dart (100%)
 rename mobile/lib/models/{ => api/user}/set_keys_request.dart (100%)
 rename mobile/lib/models/{ => api/user}/set_recovery_key_request.dart (100%)
 rename mobile/lib/{models => module/upload/model}/upload_url.dart (100%)
 delete mode 100644 mobile/lib/utils/xml_parser_util.dart

diff --git a/mobile/lib/core/configuration.dart b/mobile/lib/core/configuration.dart
index e15193a5d3..03cfd6a16b 100644
--- a/mobile/lib/core/configuration.dart
+++ b/mobile/lib/core/configuration.dart
@@ -19,9 +19,9 @@ import 'package:photos/db/upload_locks_db.dart';
 import "package:photos/events/endpoint_updated_event.dart";
 import 'package:photos/events/signed_in_event.dart';
 import 'package:photos/events/user_logged_out_event.dart';
-import 'package:photos/models/key_attributes.dart';
-import 'package:photos/models/key_gen_result.dart';
-import 'package:photos/models/private_key_attributes.dart';
+import 'package:photos/models/api/user/key_attributes.dart';
+import 'package:photos/models/api/user/key_gen_result.dart';
+import 'package:photos/models/api/user/private_key_attributes.dart';
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/favorites_service.dart';
 import "package:photos/services/home_widget_service.dart";
diff --git a/mobile/lib/emergency/emergency_service.dart b/mobile/lib/emergency/emergency_service.dart
index 10d6ad7b0f..c22d27da36 100644
--- a/mobile/lib/emergency/emergency_service.dart
+++ b/mobile/lib/emergency/emergency_service.dart
@@ -9,9 +9,9 @@ import "package:photos/core/configuration.dart";
 import "package:photos/core/network/network.dart";
 import "package:photos/emergency/model.dart";
 import "package:photos/generated/l10n.dart";
+import "package:photos/models/api/user/key_attributes.dart";
+import "package:photos/models/api/user/set_keys_request.dart";
 import "package:photos/models/api/user/srp.dart";
-import "package:photos/models/key_attributes.dart";
-import "package:photos/models/set_keys_request.dart";
 import "package:photos/services/user_service.dart";
 import "package:photos/ui/common/user_dialogs.dart";
 import "package:photos/utils/crypto_util.dart";
diff --git a/mobile/lib/emergency/other_contact_page.dart b/mobile/lib/emergency/other_contact_page.dart
index f6f6787911..07605b59da 100644
--- a/mobile/lib/emergency/other_contact_page.dart
+++ b/mobile/lib/emergency/other_contact_page.dart
@@ -7,7 +7,7 @@ import "package:photos/emergency/model.dart";
 import "package:photos/emergency/recover_others_account.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/l10n/l10n.dart";
-import "package:photos/models/key_attributes.dart";
+import "package:photos/models/api/user/key_attributes.dart";
 import "package:photos/theme/colors.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/components/action_sheet_widget.dart";
diff --git a/mobile/lib/emergency/recover_others_account.dart b/mobile/lib/emergency/recover_others_account.dart
index d29683ecfd..1576a62504 100644
--- a/mobile/lib/emergency/recover_others_account.dart
+++ b/mobile/lib/emergency/recover_others_account.dart
@@ -7,8 +7,8 @@ import 'package:password_strength/password_strength.dart';
 import "package:photos/emergency/emergency_service.dart";
 import "package:photos/emergency/model.dart";
 import "package:photos/generated/l10n.dart";
-import "package:photos/models/key_attributes.dart";
-import "package:photos/models/set_keys_request.dart";
+import "package:photos/models/api/user/key_attributes.dart";
+import "package:photos/models/api/user/set_keys_request.dart";
 import 'package:photos/ui/common/dynamic_fab.dart';
 import "package:photos/utils/crypto_util.dart";
 import 'package:photos/utils/dialog_util.dart';
diff --git a/mobile/lib/models/billing_plan.dart b/mobile/lib/models/api/billing/billing_plan.dart
similarity index 100%
rename from mobile/lib/models/billing_plan.dart
rename to mobile/lib/models/api/billing/billing_plan.dart
diff --git a/mobile/lib/models/subscription.dart b/mobile/lib/models/api/billing/subscription.dart
similarity index 100%
rename from mobile/lib/models/subscription.dart
rename to mobile/lib/models/api/billing/subscription.dart
diff --git a/mobile/lib/models/collection/collection_file_item.dart b/mobile/lib/models/api/collection/collection_file_item.dart
similarity index 100%
rename from mobile/lib/models/collection/collection_file_item.dart
rename to mobile/lib/models/api/collection/collection_file_item.dart
diff --git a/mobile/lib/models/trash_item_request.dart b/mobile/lib/models/api/collection/trash_item_request.dart
similarity index 100%
rename from mobile/lib/models/trash_item_request.dart
rename to mobile/lib/models/api/collection/trash_item_request.dart
diff --git a/mobile/lib/models/api/entity/data.dart b/mobile/lib/models/api/entity/data.dart
index b46b3bdb75..691ab0edc9 100644
--- a/mobile/lib/models/api/entity/data.dart
+++ b/mobile/lib/models/api/entity/data.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:flutter/material.dart';
+import "package:freezed_annotation/freezed_annotation.dart";
 
 @immutable
 class EntityData {
diff --git a/mobile/lib/models/delete_account.dart b/mobile/lib/models/api/user/delete_account.dart
similarity index 100%
rename from mobile/lib/models/delete_account.dart
rename to mobile/lib/models/api/user/delete_account.dart
diff --git a/mobile/lib/models/key_attributes.dart b/mobile/lib/models/api/user/key_attributes.dart
similarity index 100%
rename from mobile/lib/models/key_attributes.dart
rename to mobile/lib/models/api/user/key_attributes.dart
diff --git a/mobile/lib/models/key_gen_result.dart b/mobile/lib/models/api/user/key_gen_result.dart
similarity index 65%
rename from mobile/lib/models/key_gen_result.dart
rename to mobile/lib/models/api/user/key_gen_result.dart
index 9ea188286b..6d999ea110 100644
--- a/mobile/lib/models/key_gen_result.dart
+++ b/mobile/lib/models/api/user/key_gen_result.dart
@@ -1,7 +1,7 @@
 import "dart:typed_data";
 
-import 'package:photos/models/key_attributes.dart';
-import 'package:photos/models/private_key_attributes.dart';
+import 'package:photos/models/api/user/key_attributes.dart';
+import 'package:photos/models/api/user/private_key_attributes.dart';
 
 class KeyGenResult {
   final KeyAttributes keyAttributes;
diff --git a/mobile/lib/models/private_key_attributes.dart b/mobile/lib/models/api/user/private_key_attributes.dart
similarity index 100%
rename from mobile/lib/models/private_key_attributes.dart
rename to mobile/lib/models/api/user/private_key_attributes.dart
diff --git a/mobile/lib/models/sessions.dart b/mobile/lib/models/api/user/sessions.dart
similarity index 100%
rename from mobile/lib/models/sessions.dart
rename to mobile/lib/models/api/user/sessions.dart
diff --git a/mobile/lib/models/set_keys_request.dart b/mobile/lib/models/api/user/set_keys_request.dart
similarity index 100%
rename from mobile/lib/models/set_keys_request.dart
rename to mobile/lib/models/api/user/set_keys_request.dart
diff --git a/mobile/lib/models/set_recovery_key_request.dart b/mobile/lib/models/api/user/set_recovery_key_request.dart
similarity index 100%
rename from mobile/lib/models/set_recovery_key_request.dart
rename to mobile/lib/models/api/user/set_recovery_key_request.dart
diff --git a/mobile/lib/models/user_details.dart b/mobile/lib/models/user_details.dart
index f107a2e6b0..4b9b2cdfe9 100644
--- a/mobile/lib/models/user_details.dart
+++ b/mobile/lib/models/user_details.dart
@@ -2,9 +2,9 @@ import 'dart:convert';
 import 'dart:math';
 
 import 'package:collection/collection.dart';
+import "package:photos/models/api/billing/subscription.dart";
 import "package:photos/models/api/storage_bonus/bonus.dart";
 import 'package:photos/models/file/file_type.dart';
-import 'package:photos/models/subscription.dart';
 
 class UserDetails {
   final String email;
diff --git a/mobile/lib/models/upload_url.dart b/mobile/lib/module/upload/model/upload_url.dart
similarity index 100%
rename from mobile/lib/models/upload_url.dart
rename to mobile/lib/module/upload/model/upload_url.dart
diff --git a/mobile/lib/services/billing_service.dart b/mobile/lib/services/billing_service.dart
index 130a26241d..7da0976c8f 100644
--- a/mobile/lib/services/billing_service.dart
+++ b/mobile/lib/services/billing_service.dart
@@ -8,8 +8,8 @@ import 'package:in_app_purchase/in_app_purchase.dart';
 import 'package:logging/logging.dart';
 import 'package:photos/core/errors.dart';
 import "package:photos/generated/l10n.dart";
-import 'package:photos/models/billing_plan.dart';
-import 'package:photos/models/subscription.dart';
+import 'package:photos/models/api/billing/billing_plan.dart';
+import 'package:photos/models/api/billing/subscription.dart';
 import 'package:photos/models/user_details.dart';
 import 'package:photos/services/user_service.dart';
 import 'package:photos/ui/common/web_page.dart';
diff --git a/mobile/lib/services/collections_service.dart b/mobile/lib/services/collections_service.dart
index 75ada90f20..f4b3f75421 100644
--- a/mobile/lib/services/collections_service.dart
+++ b/mobile/lib/services/collections_service.dart
@@ -24,11 +24,11 @@ import 'package:photos/events/local_photos_updated_event.dart';
 import 'package:photos/extensions/list.dart';
 import 'package:photos/extensions/stop_watch.dart';
 import "package:photos/generated/l10n.dart";
+import 'package:photos/models/api/collection/collection_file_item.dart';
 import 'package:photos/models/api/collection/create_request.dart';
 import "package:photos/models/api/collection/public_url.dart";
 import "package:photos/models/api/collection/user.dart";
 import 'package:photos/models/collection/collection.dart';
-import 'package:photos/models/collection/collection_file_item.dart';
 import 'package:photos/models/collection/collection_items.dart';
 import 'package:photos/models/file/file.dart';
 import "package:photos/models/files_split.dart";
diff --git a/mobile/lib/services/trash_sync_service.dart b/mobile/lib/services/trash_sync_service.dart
index d1224ab25f..d16bee058b 100644
--- a/mobile/lib/services/trash_sync_service.dart
+++ b/mobile/lib/services/trash_sync_service.dart
@@ -9,10 +9,10 @@ import 'package:photos/events/collection_updated_event.dart';
 import 'package:photos/events/force_reload_trash_page_event.dart';
 import 'package:photos/events/trash_updated_event.dart';
 import 'package:photos/extensions/list.dart';
+import 'package:photos/models/api/collection/trash_item_request.dart';
 import 'package:photos/models/file/file.dart';
 import 'package:photos/models/file/trash_file.dart';
 import 'package:photos/models/ignored_file.dart';
-import 'package:photos/models/trash_item_request.dart';
 import 'package:photos/services/ignored_files_service.dart';
 import 'package:photos/utils/trash_diff_fetcher.dart';
 import 'package:shared_preferences/shared_preferences.dart';
diff --git a/mobile/lib/services/user_service.dart b/mobile/lib/services/user_service.dart
index e33d088b26..8949a271c8 100644
--- a/mobile/lib/services/user_service.dart
+++ b/mobile/lib/services/user_service.dart
@@ -19,13 +19,13 @@ import "package:photos/generated/l10n.dart";
 import "package:photos/l10n/l10n.dart";
 import "package:photos/models/account/two_factor.dart";
 import "package:photos/models/api/collection/user.dart";
+import 'package:photos/models/api/user/delete_account.dart';
+import 'package:photos/models/api/user/key_attributes.dart';
+import 'package:photos/models/api/user/key_gen_result.dart';
+import 'package:photos/models/api/user/sessions.dart';
+import 'package:photos/models/api/user/set_keys_request.dart';
+import 'package:photos/models/api/user/set_recovery_key_request.dart';
 import "package:photos/models/api/user/srp.dart";
-import 'package:photos/models/delete_account.dart';
-import 'package:photos/models/key_attributes.dart';
-import 'package:photos/models/key_gen_result.dart';
-import 'package:photos/models/sessions.dart';
-import 'package:photos/models/set_keys_request.dart';
-import 'package:photos/models/set_recovery_key_request.dart';
 import 'package:photos/models/user_details.dart';
 import "package:photos/services/collections_service.dart";
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
diff --git a/mobile/lib/ui/account/delete_account_page.dart b/mobile/lib/ui/account/delete_account_page.dart
index e4259a6077..e2b5fe7bc4 100644
--- a/mobile/lib/ui/account/delete_account_page.dart
+++ b/mobile/lib/ui/account/delete_account_page.dart
@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import "package:logging/logging.dart";
 import 'package:photos/core/configuration.dart';
 import "package:photos/generated/l10n.dart";
-import 'package:photos/models/delete_account.dart';
+import 'package:photos/models/api/user/delete_account.dart';
 import 'package:photos/services/user_service.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
diff --git a/mobile/lib/ui/account/password_entry_page.dart b/mobile/lib/ui/account/password_entry_page.dart
index 54b7af8507..d64292d045 100644
--- a/mobile/lib/ui/account/password_entry_page.dart
+++ b/mobile/lib/ui/account/password_entry_page.dart
@@ -10,7 +10,7 @@ import 'package:photos/events/account_configured_event.dart';
 import 'package:photos/events/subscription_purchased_event.dart';
 import "package:photos/generated/l10n.dart";
 import "package:photos/l10n/l10n.dart";
-import "package:photos/models/key_gen_result.dart";
+import "package:photos/models/api/user/key_gen_result.dart";
 import 'package:photos/services/user_service.dart';
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/account/recovery_key_page.dart';
diff --git a/mobile/lib/ui/account/sessions_page.dart b/mobile/lib/ui/account/sessions_page.dart
index 4cac67d671..5b84f56571 100644
--- a/mobile/lib/ui/account/sessions_page.dart
+++ b/mobile/lib/ui/account/sessions_page.dart
@@ -3,7 +3,7 @@ import 'package:logging/logging.dart';
 import 'package:photos/core/configuration.dart';
 import 'package:photos/ente_theme_data.dart';
 import "package:photos/generated/l10n.dart";
-import 'package:photos/models/sessions.dart';
+import 'package:photos/models/api/user/sessions.dart';
 import 'package:photos/services/user_service.dart';
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/common/loading_widget.dart';
diff --git a/mobile/lib/ui/payment/payment_web_page.dart b/mobile/lib/ui/payment/payment_web_page.dart
index 162aa99f6f..443a219366 100644
--- a/mobile/lib/ui/payment/payment_web_page.dart
+++ b/mobile/lib/ui/payment/payment_web_page.dart
@@ -8,7 +8,7 @@ import 'package:logging/logging.dart';
 import "package:photos/core/constants.dart";
 import 'package:photos/ente_theme_data.dart';
 import "package:photos/generated/l10n.dart";
-import 'package:photos/models/subscription.dart';
+import 'package:photos/models/api/billing/subscription.dart';
 import "package:photos/service_locator.dart";
 import 'package:photos/services/billing_service.dart';
 import 'package:photos/services/user_service.dart';
diff --git a/mobile/lib/ui/payment/store_subscription_page.dart b/mobile/lib/ui/payment/store_subscription_page.dart
index 3234eea271..709ee632ef 100644
--- a/mobile/lib/ui/payment/store_subscription_page.dart
+++ b/mobile/lib/ui/payment/store_subscription_page.dart
@@ -9,8 +9,8 @@ import 'package:photos/core/errors.dart';
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/events/subscription_purchased_event.dart';
 import "package:photos/generated/l10n.dart";
-import 'package:photos/models/billing_plan.dart';
-import 'package:photos/models/subscription.dart';
+import 'package:photos/models/api/billing/billing_plan.dart';
+import 'package:photos/models/api/billing/subscription.dart';
 import 'package:photos/models/user_details.dart';
 import "package:photos/service_locator.dart";
 import 'package:photos/services/user_service.dart';
diff --git a/mobile/lib/ui/payment/stripe_subscription_page.dart b/mobile/lib/ui/payment/stripe_subscription_page.dart
index d37c6c32d8..c6229fab07 100644
--- a/mobile/lib/ui/payment/stripe_subscription_page.dart
+++ b/mobile/lib/ui/payment/stripe_subscription_page.dart
@@ -6,8 +6,8 @@ import "package:photos/core/event_bus.dart";
 import 'package:photos/ente_theme_data.dart';
 import "package:photos/events/subscription_purchased_event.dart";
 import "package:photos/generated/l10n.dart";
-import 'package:photos/models/billing_plan.dart';
-import 'package:photos/models/subscription.dart';
+import 'package:photos/models/api/billing/billing_plan.dart';
+import 'package:photos/models/api/billing/subscription.dart';
 import 'package:photos/models/user_details.dart';
 import "package:photos/service_locator.dart";
 import 'package:photos/services/user_service.dart';
diff --git a/mobile/lib/ui/payment/subscription_common_widgets.dart b/mobile/lib/ui/payment/subscription_common_widgets.dart
index c708e88afa..7d6714fe28 100644
--- a/mobile/lib/ui/payment/subscription_common_widgets.dart
+++ b/mobile/lib/ui/payment/subscription_common_widgets.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import "package:intl/intl.dart";
 import 'package:photos/ente_theme_data.dart';
 import "package:photos/generated/l10n.dart";
+import 'package:photos/models/api/billing/subscription.dart';
 import "package:photos/models/api/storage_bonus/bonus.dart";
-import 'package:photos/models/subscription.dart';
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/components/captioned_text_widget.dart";
 import "package:photos/ui/components/menu_item_widget/menu_item_widget.dart";
diff --git a/mobile/lib/utils/delete_file_util.dart b/mobile/lib/utils/delete_file_util.dart
index ef771f455d..3a1dc7c25d 100644
--- a/mobile/lib/utils/delete_file_util.dart
+++ b/mobile/lib/utils/delete_file_util.dart
@@ -13,10 +13,10 @@ import 'package:photos/events/files_updated_event.dart';
 import "package:photos/events/force_reload_trash_page_event.dart";
 import 'package:photos/events/local_photos_updated_event.dart';
 import "package:photos/generated/l10n.dart";
+import 'package:photos/models/api/collection/trash_item_request.dart';
 import 'package:photos/models/file/file.dart';
 import "package:photos/models/files_split.dart";
 import 'package:photos/models/selected_files.dart';
-import 'package:photos/models/trash_item_request.dart';
 import "package:photos/service_locator.dart";
 import 'package:photos/services/remote_sync_service.dart';
 import 'package:photos/services/sync_service.dart';
diff --git a/mobile/lib/utils/file_uploader.dart b/mobile/lib/utils/file_uploader.dart
index e36779ead1..659fd560f1 100644
--- a/mobile/lib/utils/file_uploader.dart
+++ b/mobile/lib/utils/file_uploader.dart
@@ -29,8 +29,8 @@ import 'package:photos/models/encryption_result.dart';
 import 'package:photos/models/file/file.dart';
 import 'package:photos/models/file/file_type.dart';
 import "package:photos/models/metadata/file_magic.dart";
-import 'package:photos/models/upload_url.dart';
 import "package:photos/models/user_details.dart";
+import 'package:photos/module/upload/model/upload_url.dart';
 import "package:photos/module/upload/service/multipart.dart";
 import "package:photos/service_locator.dart";
 import 'package:photos/services/collections_service.dart';
diff --git a/mobile/lib/utils/validator_util.dart b/mobile/lib/utils/validator_util.dart
index fb8db69e14..0e54ceeab6 100644
--- a/mobile/lib/utils/validator_util.dart
+++ b/mobile/lib/utils/validator_util.dart
@@ -2,7 +2,7 @@ import 'dart:convert';
 import 'dart:typed_data';
 
 import 'package:logging/logging.dart';
-import 'package:photos/models/key_attributes.dart';
+import 'package:photos/models/api/user/key_attributes.dart';
 
 Logger _logger = Logger("Validator");
 
diff --git a/mobile/lib/utils/xml_parser_util.dart b/mobile/lib/utils/xml_parser_util.dart
deleted file mode 100644
index 8b13789179..0000000000
--- a/mobile/lib/utils/xml_parser_util.dart
+++ /dev/null
@@ -1 +0,0 @@
-

From d36934ec0d0aa6905553323128cead64dcf3f13b Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 17 Feb 2025 15:31:56 +0530
Subject: [PATCH 249/796] remove

---
 mobile/lib/models/user_details.dart | 17 -------------
 mobile/lib/utils/device_info.dart   | 37 -----------------------------
 2 files changed, 54 deletions(-)

diff --git a/mobile/lib/models/user_details.dart b/mobile/lib/models/user_details.dart
index 4b9b2cdfe9..c99ba20184 100644
--- a/mobile/lib/models/user_details.dart
+++ b/mobile/lib/models/user_details.dart
@@ -4,7 +4,6 @@ import 'dart:math';
 import 'package:collection/collection.dart';
 import "package:photos/models/api/billing/subscription.dart";
 import "package:photos/models/api/storage_bonus/bonus.dart";
-import 'package:photos/models/file/file_type.dart';
 
 class UserDetails {
   final String email;
@@ -215,19 +214,3 @@ class FamilyData {
   factory FamilyData.fromJson(String source) =>
       FamilyData.fromMap(json.decode(source));
 }
-
-class FilesCount {
-  final Map<FileType, int> filesCount;
-  FilesCount(this.filesCount);
-
-  int get total =>
-      images + videos + livePhotos + (filesCount[getInt(FileType.other)] ?? 0);
-
-  int get photos => images + livePhotos;
-
-  int get images => filesCount[FileType.image] ?? 0;
-
-  int get videos => filesCount[FileType.video] ?? 0;
-
-  int get livePhotos => filesCount[FileType.livePhoto] ?? 0;
-}
diff --git a/mobile/lib/utils/device_info.dart b/mobile/lib/utils/device_info.dart
index 4925a0b144..ea9509b54e 100644
--- a/mobile/lib/utils/device_info.dart
+++ b/mobile/lib/utils/device_info.dart
@@ -1,46 +1,9 @@
 import 'dart:io';
 
 import "package:device_info_plus/device_info_plus.dart";
-import 'package:flutter/foundation.dart';
 import 'package:logging/logging.dart';
 
 DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
-// https://gist.github.com/adamawolf/3048717
-final Set<String> iOSLowEndMachineCodes = <String>{
-  "iPhone5,1", //iPhone 5 (GSM)
-  "iPhone5,2", //iPhone 5 (GSM+CDMA)
-  "iPhone5,3", //iPhone 5C (GSM)
-  "iPhone5,4", //iPhone 5C (Global)
-  "iPhone6,1", //iPhone 5S (GSM)
-  "iPhone6,2", //iPhone 5S (Global)
-  "iPhone7,1", //iPhone 6 Plus
-  "iPhone7,2", //iPhone 6
-  "iPhone8,1", // iPhone 6s
-  "iPhone8,2", // iPhone 6s Plus
-  "iPhone8,4", // iPhone SE (GSM)
-  "iPhone9,1", // iPhone 7
-  "iPhone9,2", // iPhone 7 Plus
-  "iPhone9,3", // iPhone 7
-  "iPhone9,4", // iPhone 7 Plus
-  "iPhone10,1", // iPhone 8
-  "iPhone10,2", // iPhone 8 Plus
-  "iPhone10,3", // iPhone X Global
-  "iPhone10,4", // iPhone 8
-  "iPhone10,5", //  iPhone 8
-};
-
-Future<bool> isLowSpecDevice() async {
-  try {
-    if (Platform.isIOS) {
-      final IosDeviceInfo iosInfo = await deviceInfoPlugin.iosInfo;
-      debugPrint("ios utc name ${iosInfo.utsname.machine}");
-      return iOSLowEndMachineCodes.contains(iosInfo.utsname.machine);
-    }
-  } catch (e) {
-    Logger("device_info").severe("deviceSpec check failed", e);
-  }
-  return false;
-}
 
 Future<bool> isAndroidSDKVersionLowerThan(int inputSDK) async {
   if (Platform.isAndroid) {

From bb2bbb56556fa261952666983857f94df9db55b1 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 16:32:13 +0530
Subject: [PATCH 250/796] Workaround for an aria issue...

...somewhere (In something we're doing? In PS? In Chrome? In ARIA?)
---
 web/packages/gallery/components/viewer/photoswipe.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index dba046614b..31a198ec38 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -195,6 +195,10 @@ export class FileViewerPhotoSwipe {
             // Taking a step back though, the PhotoSwipe viewport is fixed, so
             // we can just directly map wheel / trackpad scrolls to zooming.
             wheelToZoom: true,
+            // Chrome yells about incorrectly mixing focus and aria-hidden if we
+            // leave this at the default (true) and then swipe between slides
+            // fast, or show MUI drawers etc.
+            trapFocus: false,
             // Set the index within files that we should open to. Subsequent
             // updates to the index will be tracked by PhotoSwipe internally.
             index: initialIndex,

From d8748828662c50296f96c17e6c77accf39ba1299 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 17 Feb 2025 16:49:39 +0530
Subject: [PATCH 251/796] [mob][photos] Use seen times

---
 mobile/lib/models/memory.dart                 | 10 ++++--
 .../lib/services/smart_memories_service.dart  | 35 +++++++++++++++----
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/mobile/lib/models/memory.dart b/mobile/lib/models/memory.dart
index 3ba9e57026..d0f2db37ef 100644
--- a/mobile/lib/models/memory.dart
+++ b/mobile/lib/models/memory.dart
@@ -18,12 +18,16 @@ class Memory {
     _seenTime = DateTime.now().microsecondsSinceEpoch;
   }
 
-  Memory.fromUnseenFile(this.file) : _seenTime = -1;
+  Memory.fromFile(this.file, Map<int, int>? seenTimes)
+      : _seenTime = seenTimes?[file.generatedID] ?? -1;
 
-  static List<Memory> fromFiles(List<EnteFile> files) {
+  static List<Memory> fromFiles(
+    List<EnteFile> files,
+    Map<int, int>? seenTimes,
+  ) {
     final memories = <Memory>[];
     for (final file in files) {
-      memories.add(Memory.fromUnseenFile(file));
+      memories.add(Memory.fromFile(file, seenTimes));
     }
     return memories;
   }
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index c4d1f8b4fa..37d638031b 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -5,6 +5,7 @@ import "package:intl/intl.dart";
 import "package:logging/logging.dart";
 import "package:ml_linalg/vector.dart";
 import "package:photos/core/event_bus.dart";
+import "package:photos/db/memories_db.dart";
 import "package:photos/db/ml/db.dart";
 import "package:photos/events/files_updated_event.dart";
 import "package:photos/models/base_location.dart";
@@ -25,10 +26,12 @@ import "package:photos/services/search_service.dart";
 
 class SmartMemoriesService {
   final _logger = Logger("SmartMemoriesService");
+  final _memoriesDB = MemoriesDB.instance;
 
   bool _isInit = false;
 
   late Locale _locale;
+  late Map<int, int> _seenTimes;
 
   List<SmartMemory>? _cachedMemories;
   Future<List<SmartMemory>>? _future;
@@ -64,6 +67,24 @@ class SmartMemoriesService {
     _future = null;
   }
 
+  Future markMemoryAsSeen(Memory memory) async {
+    memory.markSeen();
+    await _memoriesDB.markMemoryAsSeen(
+      memory,
+      DateTime.now().microsecondsSinceEpoch,
+    );
+    if (_cachedMemories != null && memory.file.generatedID != null) {
+      final generatedID = memory.file.generatedID!;
+      for (final smartMemory in _cachedMemories!) {
+        for (final mem in smartMemory.memories) {
+          if (mem.file.generatedID == generatedID) {
+            mem.markSeen();
+          }
+        }
+      }
+    }
+  }
+
   Future<List<SmartMemory>> getMemories(int? limit) async {
     if (!MemoriesService.instance.showMemories) {
       return [];
@@ -85,6 +106,7 @@ class SmartMemoriesService {
       final allFiles = Set<EnteFile>.from(
         await SearchService.instance.getAllFilesForSearch(),
       );
+      _seenTimes = await _memoriesDB.getSeenTimes();
       _logger.finest("All files length: ${allFiles.length}");
 
       // Pause 10 seconds TODO: lau: remove this later
@@ -307,6 +329,7 @@ class SmartMemoriesService {
               TripMemory(
                 Memory.fromFiles(
                   currentBlockFiles,
+                  _seenTimes,
                 ), // TODO: lau: properly check last seen times
                 location,
                 firstCreationTime: blockStart,
@@ -331,7 +354,7 @@ class SmartMemoriesService {
       if (lastBlockDuration >= 2 && lastBlockDuration <= 30) {
         tripLocations.add(
           TripMemory(
-            Memory.fromFiles(currentBlockFiles),
+            Memory.fromFiles(currentBlockFiles, _seenTimes),
             location,
             firstCreationTime: blockStart,
             lastCreationTime: lastTime,
@@ -398,7 +421,7 @@ class SmartMemoriesService {
     for (final baseLocation in baseLocations) {
       String name = "Base (${baseLocation.isCurrentBase ? 'current' : 'old'})";
       final String? locationName = await _tryFindLocationName(
-        Memory.fromFiles(baseLocation.files),
+        Memory.fromFiles(baseLocation.files, _seenTimes),
         base: true,
       );
       if (locationName != null) {
@@ -407,7 +430,7 @@ class SmartMemoriesService {
       }
       memoryResults.add(
         TripMemory(
-          Memory.fromFiles(baseLocation.files),
+          Memory.fromFiles(baseLocation.files, _seenTimes),
           baseLocation.location,
           name: name,
         ),
@@ -544,7 +567,7 @@ class SmartMemoriesService {
       dayMonthYearGroups
           .putIfAbsent(dayMonth, () => {})
           .putIfAbsent(year, () => [])
-          .add(Memory.fromUnseenFile(file));
+          .add(Memory.fromFile(file, _seenTimes));
     }
 
     // Process each nearby day-month to find significant days
@@ -611,7 +634,7 @@ class SmartMemoriesService {
 
         currentWeekYearGroups
             .putIfAbsent(year, () => [])
-            .add(Memory.fromUnseenFile(file));
+            .add(Memory.fromFile(file, _seenTimes));
       }
 
       // Process the week and see if it's significant
@@ -675,7 +698,7 @@ class SmartMemoriesService {
 
       currentMonthYearGroups
           .putIfAbsent(year, () => [])
-          .add(Memory.fromUnseenFile(file));
+          .add(Memory.fromFile(file, _seenTimes));
     }
 
     // Add the largest two months plus the month through the years

From 8de380d4cff48284a331b9fe9862f89e580a8e36 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 17 Feb 2025 16:51:48 +0530
Subject: [PATCH 252/796] [mob][photos] Clear memories seenTime after a while

---
 mobile/lib/services/smart_memories_service.dart | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 37d638031b..8c352008ab 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -4,6 +4,7 @@ import "package:flutter/material.dart";
 import "package:intl/intl.dart";
 import "package:logging/logging.dart";
 import "package:ml_linalg/vector.dart";
+import "package:photos/core/constants.dart";
 import "package:photos/core/event_bus.dart";
 import "package:photos/db/memories_db.dart";
 import "package:photos/db/ml/db.dart";
@@ -36,6 +37,8 @@ class SmartMemoriesService {
   List<SmartMemory>? _cachedMemories;
   Future<List<SmartMemory>>? _future;
 
+  static const _calculationWindowDays = 14;
+
   // Singleton pattern
   SmartMemoriesService._privateConstructor();
   static final instance = SmartMemoriesService._privateConstructor();
@@ -46,6 +49,9 @@ class SmartMemoriesService {
     _locale = Localizations.localeOf(context);
     _isInit = true;
 
+    _memoriesDB.clearMemoriesSeenBeforeTime(
+        DateTime.now().microsecondsSinceEpoch - (_calculationWindowDays * microSecondsInDay),
+      );
     Bus.instance.on<FilesUpdatedEvent>().where((event) {
       return event.type == EventType.deletedFromEverywhere;
     }).listen((event) {

From 9298e22c5c15ec4aa53d420e776479480aaf2cec Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 17 Feb 2025 17:02:38 +0530
Subject: [PATCH 253/796] [mob][photos] cache clip embedding

---
 mobile/lib/services/smart_memories_service.dart | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 8c352008ab..dd73ae65ec 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -37,6 +37,8 @@ class SmartMemoriesService {
   List<SmartMemory>? _cachedMemories;
   Future<List<SmartMemory>>? _future;
 
+  Vector? _clipTextVector;
+
   static const _calculationWindowDays = 14;
 
   // Singleton pattern
@@ -50,8 +52,9 @@ class SmartMemoriesService {
     _isInit = true;
 
     _memoriesDB.clearMemoriesSeenBeforeTime(
-        DateTime.now().microsecondsSinceEpoch - (_calculationWindowDays * microSecondsInDay),
-      );
+      DateTime.now().microsecondsSinceEpoch -
+          (_calculationWindowDays * microSecondsInDay),
+    );
     Bus.instance.on<FilesUpdatedEvent>().where((event) {
       return event.type == EventType.deletedFromEverywhere;
     }).listen((event) {
@@ -813,9 +816,8 @@ class SmartMemoriesService {
     // Get clip scores for each file
     const query =
         'Photo of a precious memory radiating warmth, vibrant energy, or quiet beauty — alive with color, light, or emotion';
-    // TODO: lau: optimize this later so we don't keep computing embedding
-    final textEmbedding = await MLComputer.instance.runClipText(query);
-    final textVector = Vector.fromList(textEmbedding);
+    _clipTextVector ??=
+        Vector.fromList(await MLComputer.instance.runClipText(query));
     const clipThreshold = 0.75;
     final fileToScore = <int, double>{};
     for (final mem in safeMemories) {
@@ -824,7 +826,7 @@ class SmartMemoriesService {
         fileToScore[mem.file.uploadedFileID!] = 0;
         continue;
       }
-      final score = clip.vector.dot(textVector);
+      final score = clip.vector.dot(_clipTextVector!);
       fileToScore[mem.file.uploadedFileID!] = score;
     }
 

From 4bbac0ca66b26e9b3b12cd15d1bdb2b39971f4fd Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 17 Feb 2025 17:08:22 +0530
Subject: [PATCH 254/796] [auth] Delete unused code

---
 auth/lib/events/opened_settings_event.dart    |  3 -
 auth/lib/json/converter.dart                  | 17 ----
 auth/lib/models/magic_metadata.dart           | 73 --------------
 auth/lib/models/public_key.dart               |  6 --
 auth/lib/services/auth_feature_flag.dart      | 23 -----
 auth/lib/store/user_store.dart                | 14 ---
 auth/lib/ui/common/bottom_shadow.dart         | 25 -----
 .../lib/ui/common/linear_progress_dialog.dart | 49 ----------
 auth/lib/ui/common/rename_dialog.dart         | 98 -------------------
 .../lib/ui/components/home_header_widget.dart | 41 --------
 .../ui/settings/danger_section_widget.dart    | 69 -------------
 .../lib/ui/settings/debug_section_widget.dart | 94 ------------------
 .../ui/settings/made_with_love_widget.dart    | 34 -------
 auth/lib/ui/settings/settings_text_item.dart  | 35 -------
 auth/lib/ui/settings/support_dev_widget.dart  | 83 ----------------
 auth/lib/ui/settings_section_title.dart       |  1 -
 16 files changed, 665 deletions(-)
 delete mode 100644 auth/lib/events/opened_settings_event.dart
 delete mode 100644 auth/lib/json/converter.dart
 delete mode 100644 auth/lib/models/magic_metadata.dart
 delete mode 100644 auth/lib/models/public_key.dart
 delete mode 100644 auth/lib/services/auth_feature_flag.dart
 delete mode 100644 auth/lib/store/user_store.dart
 delete mode 100644 auth/lib/ui/common/bottom_shadow.dart
 delete mode 100644 auth/lib/ui/common/linear_progress_dialog.dart
 delete mode 100644 auth/lib/ui/common/rename_dialog.dart
 delete mode 100644 auth/lib/ui/components/home_header_widget.dart
 delete mode 100644 auth/lib/ui/settings/danger_section_widget.dart
 delete mode 100644 auth/lib/ui/settings/debug_section_widget.dart
 delete mode 100644 auth/lib/ui/settings/made_with_love_widget.dart
 delete mode 100644 auth/lib/ui/settings/settings_text_item.dart
 delete mode 100644 auth/lib/ui/settings/support_dev_widget.dart
 delete mode 100644 auth/lib/ui/settings_section_title.dart

diff --git a/auth/lib/events/opened_settings_event.dart b/auth/lib/events/opened_settings_event.dart
deleted file mode 100644
index 3aadeb1222..0000000000
--- a/auth/lib/events/opened_settings_event.dart
+++ /dev/null
@@ -1,3 +0,0 @@
-import 'package:ente_auth/events/event.dart';
-
-class OpenedSettingsEvent extends Event {}
diff --git a/auth/lib/json/converter.dart b/auth/lib/json/converter.dart
deleted file mode 100644
index 9f45f8f8e5..0000000000
--- a/auth/lib/json/converter.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-import 'dart:typed_data';
-
-import "package:json_annotation/json_annotation.dart";
-
-class Uint8ListConverter implements JsonConverter<Uint8List, List<int>> {
-  const Uint8ListConverter();
-
-  @override
-  Uint8List fromJson(List<int>? json) {
-    return json == null ? Uint8List(0) : Uint8List.fromList(json);
-  }
-
-  @override
-  List<int> toJson(Uint8List object) {
-    return object.toList();
-  }
-}
diff --git a/auth/lib/models/magic_metadata.dart b/auth/lib/models/magic_metadata.dart
deleted file mode 100644
index 9edab547ee..0000000000
--- a/auth/lib/models/magic_metadata.dart
+++ /dev/null
@@ -1,73 +0,0 @@
-import 'dart:convert';
-
-const visibilityVisible = 0;
-const visibilityArchive = 1;
-
-const magicKeyVisibility = 'visibility';
-
-const pubMagicKeyEditedTime = 'editedTime';
-const pubMagicKeyEditedName = 'editedName';
-
-class MagicMetadata {
-  // 0 -> visible
-  // 1 -> archived
-  // 2 -> hidden etc?
-  int visibility;
-
-  MagicMetadata({required this.visibility});
-
-  factory MagicMetadata.fromEncodedJson(String encodedJson) =>
-      MagicMetadata.fromJson(jsonDecode(encodedJson));
-
-  factory MagicMetadata.fromJson(dynamic json) => MagicMetadata.fromMap(json);
-
-  static fromMap(Map<String, dynamic>? map) {
-    if (map == null) return null;
-    return MagicMetadata(
-      visibility: map[magicKeyVisibility] ?? visibilityVisible,
-    );
-  }
-}
-
-class PubMagicMetadata {
-  int? editedTime;
-  String? editedName;
-
-  PubMagicMetadata({this.editedTime, this.editedName});
-
-  factory PubMagicMetadata.fromEncodedJson(String encodedJson) =>
-      PubMagicMetadata.fromJson(jsonDecode(encodedJson));
-
-  factory PubMagicMetadata.fromJson(dynamic json) =>
-      PubMagicMetadata.fromMap(json);
-
-  static fromMap(Map<String, dynamic>? map) {
-    if (map == null) return null;
-    return PubMagicMetadata(
-      editedTime: map[pubMagicKeyEditedTime],
-      editedName: map[pubMagicKeyEditedName],
-    );
-  }
-}
-
-class CollectionMagicMetadata {
-  // 0 -> visible
-  // 1 -> archived
-  // 2 -> hidden etc?
-  int visibility;
-
-  CollectionMagicMetadata({required this.visibility});
-
-  factory CollectionMagicMetadata.fromEncodedJson(String encodedJson) =>
-      CollectionMagicMetadata.fromJson(jsonDecode(encodedJson));
-
-  factory CollectionMagicMetadata.fromJson(dynamic json) =>
-      CollectionMagicMetadata.fromMap(json);
-
-  static fromMap(Map<String, dynamic>? map) {
-    if (map == null) return null;
-    return CollectionMagicMetadata(
-      visibility: map[magicKeyVisibility] ?? visibilityVisible,
-    );
-  }
-}
diff --git a/auth/lib/models/public_key.dart b/auth/lib/models/public_key.dart
deleted file mode 100644
index 0d14a4a557..0000000000
--- a/auth/lib/models/public_key.dart
+++ /dev/null
@@ -1,6 +0,0 @@
-class PublicKey {
-  final String email;
-  final String publicKey;
-
-  PublicKey(this.email, this.publicKey);
-}
diff --git a/auth/lib/services/auth_feature_flag.dart b/auth/lib/services/auth_feature_flag.dart
deleted file mode 100644
index 92a1c540d7..0000000000
--- a/auth/lib/services/auth_feature_flag.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-import 'package:ente_auth/core/configuration.dart';
-import 'package:flutter/foundation.dart';
-
-class FeatureFlagService {
-  FeatureFlagService._privateConstructor();
-  static final FeatureFlagService instance =
-      FeatureFlagService._privateConstructor();
-
-  static final _internalUserIDs = const String.fromEnvironment(
-    "internal_user_ids",
-    defaultValue: "1,2,3,4,191,125,1580559962388044,1580559962392434,10000025",
-  ).split(",").map((element) {
-    return int.parse(element);
-  }).toSet();
-
-  bool isInternalUserOrDebugBuild() {
-    final String? email = Configuration.instance.getEmail();
-    final userID = Configuration.instance.getUserID();
-    return (email != null && email.endsWith("@ente.io")) ||
-        _internalUserIDs.contains(userID) ||
-        kDebugMode;
-  }
-}
diff --git a/auth/lib/store/user_store.dart b/auth/lib/store/user_store.dart
deleted file mode 100644
index b191d169d8..0000000000
--- a/auth/lib/store/user_store.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'package:shared_preferences/shared_preferences.dart';
-
-class UserStore {
-  UserStore._privateConstructor();
-
-  // ignore: unused_field
-  late SharedPreferences _preferences;
-
-  static final UserStore instance = UserStore._privateConstructor();
-
-  Future<void> init() async {
-    _preferences = await SharedPreferences.getInstance();
-  }
-}
diff --git a/auth/lib/ui/common/bottom_shadow.dart b/auth/lib/ui/common/bottom_shadow.dart
deleted file mode 100644
index 2de7e944e2..0000000000
--- a/auth/lib/ui/common/bottom_shadow.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-import 'package:flutter/material.dart';
-
-class BottomShadowWidget extends StatelessWidget {
-  final double offsetDy;
-  final Color? shadowColor;
-  const BottomShadowWidget({this.offsetDy = 28, this.shadowColor, super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      height: 8,
-      decoration: BoxDecoration(
-        color: Colors.transparent,
-        boxShadow: [
-          BoxShadow(
-            color: shadowColor ?? Theme.of(context).colorScheme.surface,
-            spreadRadius: 42,
-            blurRadius: 42,
-            offset: Offset(0, offsetDy), // changes position of shadow
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/auth/lib/ui/common/linear_progress_dialog.dart b/auth/lib/ui/common/linear_progress_dialog.dart
deleted file mode 100644
index 08c46d6c97..0000000000
--- a/auth/lib/ui/common/linear_progress_dialog.dart
+++ /dev/null
@@ -1,49 +0,0 @@
-import 'package:ente_auth/ente_theme_data.dart';
-import 'package:flutter/material.dart';
-
-class LinearProgressDialog extends StatefulWidget {
-  final String message;
-
-  const LinearProgressDialog(this.message, {super.key});
-
-  @override
-  LinearProgressDialogState createState() => LinearProgressDialogState();
-}
-
-class LinearProgressDialogState extends State<LinearProgressDialog> {
-  double? _progress;
-
-  @override
-  void initState() {
-    _progress = 0;
-    super.initState();
-  }
-
-  void setProgress(double progress) {
-    setState(() {
-      _progress = progress;
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return PopScope(
-      canPop: false,
-      child: AlertDialog(
-        title: Text(
-          widget.message,
-          style: const TextStyle(
-            fontSize: 16,
-          ),
-          textAlign: TextAlign.center,
-        ),
-        content: LinearProgressIndicator(
-          value: _progress,
-          valueColor: AlwaysStoppedAnimation<Color>(
-            Theme.of(context).colorScheme.alternativeColor,
-          ),
-        ),
-      ),
-    );
-  }
-}
diff --git a/auth/lib/ui/common/rename_dialog.dart b/auth/lib/ui/common/rename_dialog.dart
deleted file mode 100644
index ad93d1abaa..0000000000
--- a/auth/lib/ui/common/rename_dialog.dart
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-import 'package:ente_auth/utils/dialog_util.dart';
-import 'package:flutter/material.dart';
-
-class RenameDialog extends StatefulWidget {
-  final String name;
-  final String type;
-  final int maxLength;
-
-  const RenameDialog(this.name, this.type, {super.key, this.maxLength = 100});
-
-  @override
-  State<RenameDialog> createState() => _RenameDialogState();
-}
-
-class _RenameDialogState extends State<RenameDialog> {
-  String? _newName;
-
-  @override
-  void initState() {
-    super.initState();
-    _newName = widget.name;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: const Text("Enter a new name"),
-      content: SingleChildScrollView(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.start,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            TextFormField(
-              decoration: InputDecoration(
-                hintText: '${widget.type} name',
-                hintStyle: const TextStyle(
-                  color: Colors.white30,
-                ),
-                contentPadding: const EdgeInsets.all(12),
-              ),
-              onChanged: (value) {
-                setState(() {
-                  _newName = value;
-                });
-              },
-              autocorrect: false,
-              keyboardType: TextInputType.text,
-              initialValue: _newName,
-              autofocus: true,
-            ),
-          ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          child: const Text(
-            "Cancel",
-            style: TextStyle(
-              color: Colors.redAccent,
-            ),
-          ),
-          onPressed: () {
-            Navigator.of(context).pop(null);
-          },
-        ),
-        TextButton(
-          child: Text(
-            "Rename",
-            style: TextStyle(
-              color: Theme.of(context).colorScheme.onSurface,
-            ),
-          ),
-          onPressed: () {
-            if (_newName!.trim().isEmpty) {
-              showErrorDialog(
-                context,
-                "Empty name",
-                "${widget.type} name cannot be empty",
-              );
-              return;
-            }
-            if (_newName!.trim().length > widget.maxLength) {
-              showErrorDialog(
-                context,
-                "Name too large",
-                "${widget.type} name should be less than ${widget.maxLength} characters",
-              );
-              return;
-            }
-            Navigator.of(context).pop(_newName!.trim());
-          },
-        ),
-      ],
-    );
-  }
-}
diff --git a/auth/lib/ui/components/home_header_widget.dart b/auth/lib/ui/components/home_header_widget.dart
deleted file mode 100644
index 0079cc7fa7..0000000000
--- a/auth/lib/ui/components/home_header_widget.dart
+++ /dev/null
@@ -1,41 +0,0 @@
-import 'package:ente_auth/core/event_bus.dart';
-import 'package:ente_auth/events/opened_settings_event.dart';
-import 'package:flutter/material.dart';
-
-class HomeHeaderWidget extends StatefulWidget {
-  final Widget centerWidget;
-  const HomeHeaderWidget({required this.centerWidget, super.key});
-
-  @override
-  State<HomeHeaderWidget> createState() => _HomeHeaderWidgetState();
-}
-
-class _HomeHeaderWidgetState extends State<HomeHeaderWidget> {
-  @override
-  Widget build(BuildContext context) {
-    final hasNotch = View.of(context).viewPadding.top > 65;
-    return Padding(
-      padding: EdgeInsets.fromLTRB(4, hasNotch ? 4 : 8, 4, 4),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          IconButton(
-            visualDensity: const VisualDensity(horizontal: -2, vertical: -2),
-            onPressed: () {
-              Scaffold.of(context).openDrawer();
-              Bus.instance.fire(OpenedSettingsEvent());
-            },
-            splashColor: Colors.transparent,
-            icon: const Icon(
-              Icons.menu_outlined,
-            ),
-          ),
-          AnimatedSwitcher(
-            duration: const Duration(milliseconds: 250),
-            child: widget.centerWidget,
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/auth/lib/ui/settings/danger_section_widget.dart b/auth/lib/ui/settings/danger_section_widget.dart
deleted file mode 100644
index 4f8160c38e..0000000000
--- a/auth/lib/ui/settings/danger_section_widget.dart
+++ /dev/null
@@ -1,69 +0,0 @@
-import 'package:ente_auth/l10n/l10n.dart';
-import 'package:ente_auth/services/user_service.dart';
-import 'package:ente_auth/theme/ente_theme.dart';
-import 'package:ente_auth/ui/account/delete_account_page.dart';
-import 'package:ente_auth/ui/components/captioned_text_widget.dart';
-import 'package:ente_auth/ui/components/expandable_menu_item_widget.dart';
-import 'package:ente_auth/ui/components/menu_item_widget.dart';
-import 'package:ente_auth/ui/settings/common_settings.dart';
-import 'package:ente_auth/utils/dialog_util.dart';
-import 'package:ente_auth/utils/navigation_util.dart';
-import 'package:flutter/material.dart';
-
-class DangerSectionWidget extends StatelessWidget {
-  const DangerSectionWidget({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return ExpandableMenuItemWidget(
-      title: context.l10n.exit,
-      selectionOptionsWidget: _getSectionOptions(context),
-      leadingIcon: Icons.logout_outlined,
-    );
-  }
-
-  Widget _getSectionOptions(BuildContext context) {
-    return Column(
-      children: [
-        sectionOptionSpacing,
-        MenuItemWidget(
-          captionedTextWidget: CaptionedTextWidget(
-            title: context.l10n.logout,
-          ),
-          pressedColor: getEnteColorScheme(context).fillFaint,
-          trailingIcon: Icons.chevron_right_outlined,
-          trailingIconIsMuted: true,
-          onTap: () async {
-            _onLogoutTapped(context);
-          },
-        ),
-        sectionOptionSpacing,
-        MenuItemWidget(
-          captionedTextWidget: CaptionedTextWidget(
-            title: context.l10n.deleteAccount,
-          ),
-          pressedColor: getEnteColorScheme(context).fillFaint,
-          trailingIcon: Icons.chevron_right_outlined,
-          trailingIconIsMuted: true,
-          onTap: () async {
-            // ignore: unawaited_futures
-            routeToPage(context, const DeleteAccountPage());
-          },
-        ),
-        sectionOptionSpacing,
-      ],
-    );
-  }
-
-  void _onLogoutTapped(BuildContext context) {
-    showChoiceActionSheet(
-      context,
-      title: context.l10n.areYouSureYouWantToLogout,
-      firstButtonLabel: context.l10n.yesLogout,
-      isCritical: true,
-      firstButtonOnTap: () async {
-        await UserService.instance.logout(context);
-      },
-    );
-  }
-}
diff --git a/auth/lib/ui/settings/debug_section_widget.dart b/auth/lib/ui/settings/debug_section_widget.dart
deleted file mode 100644
index 03406f7911..0000000000
--- a/auth/lib/ui/settings/debug_section_widget.dart
+++ /dev/null
@@ -1,94 +0,0 @@
-import 'package:ente_auth/core/configuration.dart';
-import 'package:ente_auth/l10n/l10n.dart';
-import 'package:ente_auth/ui/settings/common_settings.dart';
-import 'package:ente_auth/ui/settings/settings_section_title.dart';
-import 'package:ente_auth/ui/settings/settings_text_item.dart';
-import 'package:ente_crypto_dart/ente_crypto_dart.dart';
-import 'package:expandable/expandable.dart';
-import 'package:flutter/material.dart';
-
-class DebugSectionWidget extends StatelessWidget {
-  const DebugSectionWidget({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    // This is a debug only section not shown to end users, so these strings are
-    // not translated.
-    return ExpandablePanel(
-      header: const SettingsSectionTitle("Debug"),
-      collapsed: Container(),
-      expanded: _getSectionOptions(context),
-      theme: getExpandableTheme(),
-    );
-  }
-
-  Widget _getSectionOptions(BuildContext context) {
-    return Column(
-      children: [
-        GestureDetector(
-          behavior: HitTestBehavior.translucent,
-          onTap: () async {
-            _showKeyAttributesDialog(context);
-          },
-          child: const SettingsTextItem(
-            text: "Key attributes",
-            icon: Icons.navigate_next,
-          ),
-        ),
-      ],
-    );
-  }
-
-  void _showKeyAttributesDialog(BuildContext context) {
-    final l10n = context.l10n;
-    final keyAttributes = Configuration.instance.getKeyAttributes()!;
-    final AlertDialog alert = AlertDialog(
-      title: const Text("key attributes"),
-      content: SingleChildScrollView(
-        child: Column(
-          children: [
-            const Text(
-              "Key",
-              style: TextStyle(fontWeight: FontWeight.bold),
-            ),
-            Text(CryptoUtil.bin2base64(Configuration.instance.getKey()!)),
-            const Padding(padding: EdgeInsets.all(12)),
-            const Text(
-              "Encrypted Key",
-              style: TextStyle(fontWeight: FontWeight.bold),
-            ),
-            Text(keyAttributes.encryptedKey),
-            const Padding(padding: EdgeInsets.all(12)),
-            const Text(
-              "Key Decryption Nonce",
-              style: TextStyle(fontWeight: FontWeight.bold),
-            ),
-            Text(keyAttributes.keyDecryptionNonce),
-            const Padding(padding: EdgeInsets.all(12)),
-            const Text(
-              "KEK Salt",
-              style: TextStyle(fontWeight: FontWeight.bold),
-            ),
-            Text(keyAttributes.kekSalt),
-            const Padding(padding: EdgeInsets.all(12)),
-          ],
-        ),
-      ),
-      actions: [
-        TextButton(
-          child: Text(l10n.ok),
-          onPressed: () {
-            Navigator.of(context, rootNavigator: true).pop('dialog');
-          },
-        ),
-      ],
-    );
-
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return alert;
-      },
-    );
-  }
-}
diff --git a/auth/lib/ui/settings/made_with_love_widget.dart b/auth/lib/ui/settings/made_with_love_widget.dart
deleted file mode 100644
index a8e12c106b..0000000000
--- a/auth/lib/ui/settings/made_with_love_widget.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-import 'package:ente_auth/l10n/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class MadeWithLoveWidget extends StatelessWidget {
-  const MadeWithLoveWidget({
-    super.key,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = context.l10n;
-    return GestureDetector(
-      onTap: () {
-        launchUrl(Uri.parse("https://ente.io"));
-      },
-      child: RichText(
-        text: TextSpan(
-          text: l10n.madeWithLoveAtPrefix,
-          style: DefaultTextStyle.of(context).style,
-          children: const <TextSpan>[
-            TextSpan(
-              text: 'ente.io',
-              style: TextStyle(
-                fontWeight: FontWeight.bold,
-                color: Colors.green,
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
diff --git a/auth/lib/ui/settings/settings_text_item.dart b/auth/lib/ui/settings/settings_text_item.dart
deleted file mode 100644
index afaf56432c..0000000000
--- a/auth/lib/ui/settings/settings_text_item.dart
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-import 'dart:io';
-
-import 'package:flutter/material.dart';
-
-class SettingsTextItem extends StatelessWidget {
-  final String text;
-  final IconData icon;
-  const SettingsTextItem({
-    super.key,
-    required this.text,
-    required this.icon,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Padding(padding: EdgeInsets.all(Platform.isIOS ? 4 : 6)),
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Align(
-              alignment: Alignment.centerLeft,
-              child: Text(text, style: Theme.of(context).textTheme.titleMedium),
-            ),
-            Icon(icon),
-          ],
-        ),
-        Padding(padding: EdgeInsets.all(Platform.isIOS ? 4 : 6)),
-      ],
-    );
-  }
-}
diff --git a/auth/lib/ui/settings/support_dev_widget.dart b/auth/lib/ui/settings/support_dev_widget.dart
deleted file mode 100644
index 849b954153..0000000000
--- a/auth/lib/ui/settings/support_dev_widget.dart
+++ /dev/null
@@ -1,83 +0,0 @@
-import 'package:dotted_border/dotted_border.dart';
-import 'package:ente_auth/core/configuration.dart';
-import 'package:ente_auth/l10n/l10n.dart';
-import 'package:ente_auth/models/subscription.dart';
-import 'package:ente_auth/services/billing_service.dart';
-import 'package:ente_auth/theme/ente_theme.dart';
-import 'package:flutter/material.dart';
-import 'package:styled_text/styled_text.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class SupportDevWidget extends StatelessWidget {
-  const SupportDevWidget({
-    super.key,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = context.l10n;
-
-    // fetch
-    if (Configuration.instance.hasConfiguredAccount()) {
-      return FutureBuilder<Subscription>(
-        future: BillingService.instance.getSubscription(),
-        builder: (context, snapshot) {
-          if (snapshot.hasData) {
-            final subscription = snapshot.data;
-            if (subscription != null && subscription.productID == "free") {
-              return buildWidget(l10n, context);
-            }
-          }
-          return const SizedBox.shrink();
-        },
-      );
-    } else {
-      return buildWidget(l10n, context);
-    }
-  }
-
-  Widget buildWidget(AppLocalizations l10n, BuildContext context) {
-    return GestureDetector(
-      onTap: () {
-        launchUrl(Uri.parse("https://ente.io"));
-      },
-      child: DottedBorder(
-        borderType: BorderType.RRect,
-        radius: const Radius.circular(12),
-        padding: const EdgeInsets.all(6),
-        dashPattern: const <double>[3, 3],
-        color: getEnteColorScheme(context).primaryGreen,
-        child: ClipRRect(
-          borderRadius: const BorderRadius.all(Radius.circular(12)),
-          child: Padding(
-            padding: const EdgeInsets.symmetric(vertical: 12.0, horizontal: 6),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                StyledText(
-                  text: l10n.supportDevs,
-                  style: getEnteTextTheme(context).large,
-                  tags: {
-                    'bold-green': StyledTextTag(
-                      style: TextStyle(
-                        fontWeight: FontWeight.bold,
-                        color: getEnteColorScheme(context).primaryGreen,
-                      ),
-                    ),
-                  },
-                ),
-                const Padding(padding: EdgeInsets.all(6)),
-                Text(
-                  l10n.supportDiscount,
-                  style: const TextStyle(
-                    color: Colors.grey,
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
diff --git a/auth/lib/ui/settings_section_title.dart b/auth/lib/ui/settings_section_title.dart
deleted file mode 100644
index 613744d49d..0000000000
--- a/auth/lib/ui/settings_section_title.dart
+++ /dev/null
@@ -1 +0,0 @@
-// TODO Implement this library.

From a851caf78fb9c2f86478544c073f585f4852da22 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 17:11:14 +0530
Subject: [PATCH 255/796] Another ARIA workaround

---
 web/packages/base/components/utils/theme.ts    |  2 ++
 web/packages/gallery/components/FileInfo.tsx   | 18 +++++++++++++++---
 .../gallery/components/viewer/photoswipe.ts    |  3 +++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/web/packages/base/components/utils/theme.ts b/web/packages/base/components/utils/theme.ts
index 1e511b4ac7..1106644235 100644
--- a/web/packages/base/components/utils/theme.ts
+++ b/web/packages/base/components/utils/theme.ts
@@ -541,6 +541,8 @@ const components: Components = {
 
     MuiDialog: {
         defaultProps: {
+            // [Note: Overjealous Chrome? Complicated ARIA?]
+            //
             // This is required to prevent console errors about aria-hiding a
             // focused button when the dialog is closed.
             //
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index b22fb97a99..5357653e87 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -18,7 +18,10 @@ import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
 import { SidebarDrawer } from "@/base/components/mui/SidebarDrawer";
 import { Titlebar } from "@/base/components/Titlebar";
 import { EllipsizedTypography } from "@/base/components/Typography";
-import { useModalVisibility, type ModalVisibilityProps } from "@/base/components/utils/modal";
+import {
+    useModalVisibility,
+    type ModalVisibilityProps,
+} from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
 import { haveWindow } from "@/base/env";
 import { nameAndExtension } from "@/base/file-name";
@@ -136,7 +139,7 @@ export type FileInfoProps = ModalVisibilityProps & {
      * Called when the user selects a person in the file info panel.
      */
     onSelectPerson?: ((personID: string) => void) | undefined;
-}
+};
 
 export const FileInfo: React.FC<FileInfoProps> = ({
     open,
@@ -398,7 +401,16 @@ const parseExifInfo = (
 
 const FileInfoSidebar = styled(
     (props: Pick<DialogProps, "open" | "onClose" | "children">) => (
-        <SidebarDrawer {...props} anchor="right" />
+        <SidebarDrawer
+            {...props}
+            anchor="right"
+            // See: [Note: Overjealous Chrome? Complicated ARIA?], but this time
+            // with a different workaround.
+            //
+            // https://github.com/mui/material-ui/issues/43106#issuecomment-2514637251
+            disableRestoreFocus={true}
+            closeAfterTransition={true}
+        />
     ),
 )(({ theme }) => ({
     zIndex: fileInfoDrawerZ,
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 31a198ec38..2951386288 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -198,6 +198,9 @@ export class FileViewerPhotoSwipe {
             // Chrome yells about incorrectly mixing focus and aria-hidden if we
             // leave this at the default (true) and then swipe between slides
             // fast, or show MUI drawers etc.
+            //
+            // See: [Note: Overjealous Chrome? Complicated ARIA?], but time with
+            // a different library.
             trapFocus: false,
             // Set the index within files that we should open to. Subsequent
             // updates to the index will be tracked by PhotoSwipe internally.

From 12a96b68ba2bf8305383cc164b7b3c46c1a52d61 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 18:39:18 +0530
Subject: [PATCH 256/796] wip ds

---
 .../gallery/components/viewer/data-source.ts  | 170 ++++++++++++++++++
 .../gallery/components/viewer/photoswipe.ts   |  63 +------
 2 files changed, 176 insertions(+), 57 deletions(-)
 create mode 100644 web/packages/gallery/components/viewer/data-source.ts

diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
new file mode 100644
index 0000000000..4a1d35c591
--- /dev/null
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -0,0 +1,170 @@
+/* xeslint-disable */
+// x-@ts-nocheck
+
+import {
+    downloadManager,
+    type LivePhotoSourceURL,
+} from "@/gallery/services/download";
+import type { EnteFile } from "@/media/file";
+import { FileType } from "@/media/file-type";
+
+// TODO(PS):
+//import { type SlideData } from "./ps5/dist/types/slide/"
+export interface SlideData {
+    /**
+     * image URL
+     */
+    src?: string | undefined;
+    /**
+     * image width
+     */
+    width?: number | undefined;
+    /**
+     * image height
+     */
+    height?: number | undefined;
+    /**
+     * html content of a slide
+     */
+    html?: string | undefined;
+
+    // Our props. TODO(PS) document if end up using these.
+
+    isContentLoading?: boolean;
+    isContentZoomable?: boolean;
+    isFinal?: boolean;
+}
+
+/**
+ * A class that stores and serves data required by our custom PhotoSwipe
+ * instance, effectively acting as an in-memory cache.
+ *
+ * By keeping this independent of the lifetime of the PhotoSwipe instance, we
+ * can reuse the same cache for multiple displays of our file viewer.
+ */
+export class FileViewerDataSource {
+    /**
+     * The best available SlideData for rendering the file with the given ID.
+     *
+     * If an entry does not exist for a particular fileID, then it is lazily
+     * added on demand, and updated as we keep getting better data (thumbnail,
+     * original) for the file.
+     */
+    private itemDataByFileID = new Map<number, SlideData>();
+
+    /**
+     *
+     * The {@link onUpdate} callback is invoked each time we have data about the
+     * given {@link file}.
+     *
+     * If we already have the final data about file, then {@link onUpdate} will
+     * be called once with this final {@link itemData}. Otherwise it'll be
+     * called multiple times.
+     *
+     * 1. First with empty itemData.
+     *
+     * 2. Then with the thumbnail data.
+     *
+     * 3. Then with the original. For live photos, this will happen twice, first
+     *    with the original image, then again with the video component.
+     *
+     * 4. At this point, the data for this file will be considered final, and
+     *    subsequent calls for the same file will return this same value unless
+     *    it is invalidated.
+     *
+     *   The same entry might get updated multiple times, as we start with the
+     * thumbnail but then also update this as we keep getting more of the
+     * original (e.g. for a live photo, it'll be updated once when we get the
+     * original image, and then again later once we get the original video).
+     *
+     * @param index
+     * @param file
+     * @param onUpdate Callback invoked each time we have data about the given
+     * {@link file}.
+     */
+    private async enqueueUpdates(
+        file: EnteFile,
+        onUpdate: (itemData: SlideData) => void,
+    ) {
+        const update = (itemData: SlideData) => {
+            this.itemDataByFileID.set(file.id, itemData);
+            onUpdate(itemData);
+        };
+
+        // We might not have anything to show immediately, though in most cases
+        // a cached renderable thumbnail URL will be available shortly.
+        //
+        // Meanwhile,
+        //
+        // 1. Return empty slide data; PhotoSwipe will not show anything in the
+        //    image area but will otherwise render UI controls properly.
+        //
+        // 2. Insert empty data so that we don't enqueue multiple updates.
+
+        const itemData = this.itemDataByFileID.get(file.id);
+            if (itemData) {
+                itemData = {};
+                this.itemDataByFileID.set(file.id, itemData);
+                this.enqueueUpdates(index, file);
+            }
+        }
+
+        const thumbnailURL = await downloadManager.renderableThumbnailURL(file);
+        const thumbnailData = await augmentedWithDimensions(thumbnailURL);
+        update({
+            ...thumbnailData,
+            isContentLoading: true,
+            isContentZoomable: false,
+        });
+
+        switch (file.metadata.fileType) {
+            case FileType.image: {
+                const sourceURLs =
+                    await downloadManager.renderableSourceURLs(file);
+                update(await augmentedWithDimensions(sourceURLs.url));
+                break;
+            }
+
+            case FileType.video: {
+                const sourceURLs =
+                    await downloadManager.renderableSourceURLs(file);
+                const disableDownload = !!this.opts.disableDownload;
+                update({ html: videoHTML(sourceURLs.url, disableDownload) });
+                break;
+            }
+
+            default: {
+                const sourceURLs =
+                    await downloadManager.renderableSourceURLs(file);
+                const livePhotoSourceURLs =
+                    sourceURLs.url as LivePhotoSourceURL;
+                const imageURL = await livePhotoSourceURLs.image();
+                const imageData = await augmentedWithDimensions(imageURL);
+                update(imageData);
+                const livePhotoVideoURL = await livePhotoSourceURLs.video();
+                update({ ...imageData, livePhotoVideoURL });
+                break;
+            }
+        }
+    }
+}
+
+/**
+ * Take a image URL, determine its dimensions using browser APIs, and return the URL
+ * and its dimensions in a form that can directly be passed to PhotoSwipe as
+ * {@link SlideData}.
+ */
+const augmentedWithDimensions = (imageURL: string): Promise<SlideData> =>
+    new Promise((resolve) => {
+        const image = new Image();
+        image.onload = () => {
+            resolve({
+                src: imageURL,
+                width: image.naturalWidth,
+                height: image.naturalHeight,
+            });
+        };
+        // image.onerror = ()
+        // TODO(PS): Handle imageElement.onerror
+        image.src = imageURL;
+    });
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 2951386288..d05e7a6304 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -10,6 +10,7 @@ import {
 import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import { t } from "i18next";
+import { FileViewerDataSource, type SlideData } from "./data-source";
 import type { FileViewerProps } from "./FileViewer";
 import { createPSRegisterElementIconHTML } from "./icons";
 
@@ -30,58 +31,6 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     // TODO(PS): Comment me before merging into main.
     PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
-// TODO(PS):
-//import { type SlideData } from "./ps5/dist/types/slide/"
-type SlideData = {
-    /**
-     * thumbnail element
-     */
-    element?: HTMLElement | undefined;
-    /**
-     * image URL
-     */
-    src?: string | undefined;
-    /**
-     * image srcset
-     */
-    srcset?: string | undefined;
-    /**
-     * image width (deprecated)
-     */
-    w?: number | undefined;
-    /**
-     * image height (deprecated)
-     */
-    h?: number | undefined;
-    /**
-     * image width
-     */
-    width?: number | undefined;
-    /**
-     * image height
-     */
-    height?: number | undefined;
-    /**
-     * placeholder image URL that's displayed before large image is loaded
-     */
-    msrc?: string | undefined;
-    /**
-     * image alt text
-     */
-    alt?: string | undefined;
-    /**
-     * whether thumbnail is cropped client-side or not
-     */
-    thumbCropped?: boolean | undefined;
-    /**
-     * html content of a slide
-     */
-    html?: string | undefined;
-    /**
-     * slide type
-     */
-    type?: string | undefined;
-};
 
 type FileViewerPhotoSwipeOptions = FileViewerProps & {
     /**
@@ -126,13 +75,12 @@ export class FileViewerPhotoSwipe {
      */
     private opts: Pick<FileViewerPhotoSwipeOptions, "disableDownload">;
     /**
-     * The best available SlideData for rendering the file with the given ID.
+     * Our data source.
      *
-     * If an entry does not exist for a particular fileID, then it is lazily
-     * added on demand. The same entry might get updated multiple times, as we
-     * start with the thumbnail but then also update this with the original etc.
+     * TODO(PS): Move this elsewhere, or merge with download manager.
      */
-    private itemDataByFileID: Map<number, SlideData> = new Map();
+    private dataSource: FileViewerDataSource;
+
     /**
      * An interval that invokes a periodic check of whether we should the hide
      * controls if the user does not perform any pointer events for a while.
@@ -161,6 +109,7 @@ export class FileViewerPhotoSwipe {
     }: FileViewerPhotoSwipeOptions) {
         this.files = files;
         this.opts = { disableDownload };
+        this.dataSource = new FileViewerDataSource();
 
         const pswp = new PhotoSwipe({
             // Opaque background.

From aab4bff6ff09c4061f2f6734a41ff7536e30bbb9 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Mon, 17 Feb 2025 18:54:20 +0530
Subject: [PATCH 257/796] bump version

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 2af747b753..8c2d314dd4 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.98+998
+version: 0.9.99+999
 publish_to: none
 
 environment:

From 9d76d93254a2bcdc3696245094c8df6b758968f8 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 19:10:32 +0530
Subject: [PATCH 258/796] Integrate

---
 .../gallery/components/viewer/data-source.ts  | 156 ++++++++++--------
 .../gallery/components/viewer/photoswipe.ts   | 105 ++----------
 2 files changed, 99 insertions(+), 162 deletions(-)

diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 4a1d35c591..58876cd6d2 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -10,7 +10,7 @@ import { FileType } from "@/media/file-type";
 
 // TODO(PS):
 //import { type SlideData } from "./ps5/dist/types/slide/"
-export interface SlideData {
+interface SlideData {
     /**
      * image URL
      */
@@ -27,13 +27,16 @@ export interface SlideData {
      * html content of a slide
      */
     html?: string | undefined;
+}
 
+type ItemData = SlideData & {
     // Our props. TODO(PS) document if end up using these.
-
+    videoURL?: string;
+    livePhotoVideoURL?: string;
     isContentLoading?: boolean;
     isContentZoomable?: boolean;
     isFinal?: boolean;
-}
+};
 
 /**
  * A class that stores and serves data required by our custom PhotoSwipe
@@ -43,74 +46,83 @@ export interface SlideData {
  * can reuse the same cache for multiple displays of our file viewer.
  */
 export class FileViewerDataSource {
+    private itemDataByFileID = new Map<number, ItemData>();
+    private needsRefreshByFileID = new Map<number, () => void>();
+
     /**
-     * The best available SlideData for rendering the file with the given ID.
+     * Return the best available ItemData for rendering the given {@link file}.
      *
-     * If an entry does not exist for a particular fileID, then it is lazily
-     * added on demand, and updated as we keep getting better data (thumbnail,
+     * If an entry does not exist for a particular file, then it is lazily added
+     * on demand, and updated as we keep getting better data (thumbnail,
      * original) for the file.
+     *
+     * At each step, we call the provided callback so that file viewer can call
+     * us again to get the updated data.
+     *
+     * ---
+     *
+     * Detailed flow:
+     *
+     * If we already have the final data about the file, then this function will
+     * return it and do nothing subsequently.
+     *
+     * Otherwise, it will:
+     *
+     * 1. Return empty slide data; PhotoSwipe will not show anything in the
+     *    image area but will otherwise render UI controls properly (in most
+     *    cases a cached renderable thumbnail URL will be available shortly)
+     *
+     * 2. Insert empty data so that we don't enqueue multiple updates, and
+     *    return this empty data.
+     *
+     * Then it we start fetching data for the file.
+     *
+     * First it'll fetch the thumbnail. Once that is done, it'll update the data
+     * it has cached, and notify the caller (using the provided callback) so it
+     * can refresh the slide.
+     *
+     * Then it'll continue fetching the original.
+     *
+     * - For images and videos, this will be the single original.
+     *
+     * - For live photos, this will also be a two step process, first with the
+     *   original image, then again with the video component.
+     *
+     * At this point, the data for this file will be considered final, and
+     * subsequent calls for the same file will return this same value unless it
+     * is invalidated.
+     *
+     * If at any point an error occurs, we reset our cache so that the next time
+     * the data is requested we repeat the process instead of continuing to
+     * serve the incomplete result.
      */
-    private itemDataByFileID = new Map<number, SlideData>();
-
-    /**
-     *
-     * The {@link onUpdate} callback is invoked each time we have data about the
-     * given {@link file}.
-     *
-     * If we already have the final data about file, then {@link onUpdate} will
-     * be called once with this final {@link itemData}. Otherwise it'll be
-     * called multiple times.
-     *
-     * 1. First with empty itemData.
-     *
-     * 2. Then with the thumbnail data.
-     *
-     * 3. Then with the original. For live photos, this will happen twice, first
-     *    with the original image, then again with the video component.
-     *
-     * 4. At this point, the data for this file will be considered final, and
-     *    subsequent calls for the same file will return this same value unless
-     *    it is invalidated.
-     *
-     *   The same entry might get updated multiple times, as we start with the
-     * thumbnail but then also update this as we keep getting more of the
-     * original (e.g. for a live photo, it'll be updated once when we get the
-     * original image, and then again later once we get the original video).
-     *
-     * @param index
-     * @param file
-     * @param onUpdate Callback invoked each time we have data about the given
-     * {@link file}.
-     */
-    private async enqueueUpdates(
-        file: EnteFile,
-        onUpdate: (itemData: SlideData) => void,
-    ) {
-        const update = (itemData: SlideData) => {
-            this.itemDataByFileID.set(file.id, itemData);
-            onUpdate(itemData);
-        };
-
-        // We might not have anything to show immediately, though in most cases
-        // a cached renderable thumbnail URL will be available shortly.
-        //
-        // Meanwhile,
-        //
-        // 1. Return empty slide data; PhotoSwipe will not show anything in the
-        //    image area but will otherwise render UI controls properly.
-        //
-        // 2. Insert empty data so that we don't enqueue multiple updates.
-
-        const itemData = this.itemDataByFileID.get(file.id);
-            if (itemData) {
-                itemData = {};
-                this.itemDataByFileID.set(file.id, itemData);
-                this.enqueueUpdates(index, file);
+    itemDataForFile(file: EnteFile, needsRefresh: () => void) {
+        let itemData = this.itemDataByFileID.get(file.id);
+        if (itemData) {
+            if (!itemData.isFinal) {
+                // We assume that there is only one file viewer that is using us
+                // at a given point of time. This assumption is currently valid.
+                this.needsRefreshByFileID.set(file.id, needsRefresh);
             }
+        } else {
+            itemData = {};
+            this.itemDataByFileID.set(file.id, itemData);
+            this.needsRefreshByFileID.set(file.id, needsRefresh);
+            void this.enqueueUpdates(file);
         }
 
+        return itemData;
+    }
+
+    private async enqueueUpdates(file: EnteFile) {
+        const update = (itemData: ItemData) => {
+            this.itemDataByFileID.set(file.id, itemData);
+            this.needsRefreshByFileID.get(file.id)?.();
+        };
+
         const thumbnailURL = await downloadManager.renderableThumbnailURL(file);
-        const thumbnailData = await augmentedWithDimensions(thumbnailURL);
+        // TODO(PS):
+        const thumbnailData = await withDimensions(thumbnailURL!);
         update({
             ...thumbnailData,
             isContentLoading: true,
@@ -121,25 +133,29 @@ export class FileViewerDataSource {
             case FileType.image: {
                 const sourceURLs =
                     await downloadManager.renderableSourceURLs(file);
-                update(await augmentedWithDimensions(sourceURLs.url));
+                // TODO(PS):
+                update(await withDimensions(sourceURLs.url as string));
                 break;
             }
 
             case FileType.video: {
                 const sourceURLs =
                     await downloadManager.renderableSourceURLs(file);
-                const disableDownload = !!this.opts.disableDownload;
-                update({ html: videoHTML(sourceURLs.url, disableDownload) });
+                // const disableDownload = !!this.opts.disableDownload;
+                // update({ html: videoHTML(sourceURLs.url, disableDownload) });
+                // TODO(PS):
+                update({ videoURL: sourceURLs.url as string });
                 break;
             }
 
-            default: {
+            case FileType.livePhoto: {
                 const sourceURLs =
                     await downloadManager.renderableSourceURLs(file);
                 const livePhotoSourceURLs =
                     sourceURLs.url as LivePhotoSourceURL;
                 const imageURL = await livePhotoSourceURLs.image();
-                const imageData = await augmentedWithDimensions(imageURL);
+                // TODO(PS):
+                const imageData = await withDimensions(imageURL!);
                 update(imageData);
                 const livePhotoVideoURL = await livePhotoSourceURLs.video();
                 update({ ...imageData, livePhotoVideoURL });
@@ -152,9 +168,9 @@ export class FileViewerDataSource {
 /**
  * Take a image URL, determine its dimensions using browser APIs, and return the URL
  * and its dimensions in a form that can directly be passed to PhotoSwipe as
- * {@link SlideData}.
+ * {@link ItemData}.
  */
-const augmentedWithDimensions = (imageURL: string): Promise<SlideData> =>
+const withDimensions = (imageURL: string): Promise<ItemData> =>
     new Promise((resolve) => {
         const image = new Image();
         image.onload = () => {
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index d05e7a6304..cb85d2be91 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -1,16 +1,10 @@
 /* eslint-disable */
 // @ts-nocheck
 
-import { assertionFailed } from "@/base/assert";
 import log from "@/base/log";
-import {
-    downloadManager,
-    type LivePhotoSourceURL,
-} from "@/gallery/services/download";
 import type { EnteFile } from "@/media/file";
-import { FileType } from "@/media/file-type";
 import { t } from "i18next";
-import { FileViewerDataSource, type SlideData } from "./data-source";
+import { FileViewerDataSource } from "./data-source";
 import type { FileViewerProps } from "./FileViewer";
 import { createPSRegisterElementIconHTML } from "./icons";
 
@@ -167,36 +161,27 @@ export class FileViewerPhotoSwipe {
         });
 
         pswp.addFilter("itemData", (_, index) => {
-            const file = files[index];
+            const file = files[index]!;
 
-            // We might not have anything to show immediately, though in most
-            // cases a cached renderable thumbnail URL will be available
-            // shortly.
-            //
-            // Meanwhile,
-            //
-            // 1. Return empty slide data; PhotoSwipe will not show anything in
-            //    the image area but will otherwise render UI controls properly.
-            //
-            // 2. Insert empty data so that we don't enqueue multiple updates.
+            let itemData = this.dataSource.itemDataForFile(file, () => {
+                this.pswp.refreshSlideContent(index);
+            });
 
-            let itemData: SlideData | undefined;
-            if (file) {
-                itemData = this.itemDataByFileID.get(file.id);
-                if (!itemData) {
-                    itemData = {};
-                    this.itemDataByFileID.set(file.id, itemData);
-                    this.enqueueUpdates(index, file);
-                }
+            const { videoURL, ...rest } = itemData;
+            if (videoURL) {
+                const disableDownload = !!this.opts.disableDownload;
+                itemData = {
+                    ...rest,
+                    html: videoHTML(videoURL, disableDownload),
+                };
             }
 
             log.debug(() => ["[viewer]", { index, itemData, file }]);
-            if (!file) assertionFailed();
 
             if (this.lastActivityDate != "already-hidden")
                 this.lastActivityDate = new Date();
 
-            return itemData ?? {};
+            return itemData;
         });
 
         pswp.addFilter("isContentLoading", (isLoading, content) => {
@@ -390,72 +375,8 @@ export class FileViewerPhotoSwipe {
         // TODO(PS): Commented during testing
         // this.pswp.element.classList.remove("pswp--ui-visible");
     }
-
-    private async enqueueUpdates(index: number, file: EnteFile) {
-        const update = (itemData: SlideData) => {
-            this.itemDataByFileID.set(file.id, itemData);
-            this.pswp.refreshSlideContent(index);
-        };
-
-        const thumbnailURL = await downloadManager.renderableThumbnailURL(file);
-        const thumbnailData = await augmentedWithDimensions(thumbnailURL);
-        update({
-            ...thumbnailData,
-            isContentLoading: true,
-            isContentZoomable: false,
-        });
-
-        switch (file.metadata.fileType) {
-            case FileType.image: {
-                const sourceURLs =
-                    await downloadManager.renderableSourceURLs(file);
-                update(await augmentedWithDimensions(sourceURLs.url));
-                break;
-            }
-
-            case FileType.video: {
-                const sourceURLs =
-                    await downloadManager.renderableSourceURLs(file);
-                const disableDownload = !!this.opts.disableDownload;
-                update({ html: videoHTML(sourceURLs.url, disableDownload) });
-                break;
-            }
-
-            default: {
-                const sourceURLs =
-                    await downloadManager.renderableSourceURLs(file);
-                const livePhotoSourceURLs =
-                    sourceURLs.url as LivePhotoSourceURL;
-                const imageURL = await livePhotoSourceURLs.image();
-                const imageData = await augmentedWithDimensions(imageURL);
-                update(imageData);
-                const livePhotoVideoURL = await livePhotoSourceURLs.video();
-                update({ ...imageData, livePhotoVideoURL });
-                break;
-            }
-        }
-    }
 }
 
-/**
- * Take a image URL, determine its dimensions using browser APIs, and return the URL
- * and its dimensions in a form that can directly be passed to PhotoSwipe as
- * {@link SlideData}.
- */
-const augmentedWithDimensions = (imageURL: string): Promise<SlideData> =>
-    new Promise((resolve) => {
-        let image = new Image();
-        image.onload = () => {
-            resolve({
-                src: imageURL,
-                width: image.naturalWidth,
-                height: image.naturalHeight,
-            });
-        };
-        // TODO(PS): Handle imageElement.onerror
-        image.src = imageURL;
-    });
-
 const videoHTML = (url: string, disableDownload: boolean) => `
 <video controls ${disableDownload && "controlsList=nodownload"} oncontextmenu="return false;">
   <source src="${url}" />

From 36e7dae2eef7827e62af309215664ae543ff1b53 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 19:30:19 +0530
Subject: [PATCH 259/796] Simplify

---
 .../gallery/components/viewer/data-source.ts    | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 58876cd6d2..d814ee65bf 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -35,7 +35,6 @@ type ItemData = SlideData & {
     livePhotoVideoURL?: string;
     isContentLoading?: boolean;
     isContentZoomable?: boolean;
-    isFinal?: boolean;
 };
 
 /**
@@ -98,16 +97,13 @@ export class FileViewerDataSource {
      */
     itemDataForFile(file: EnteFile, needsRefresh: () => void) {
         let itemData = this.itemDataByFileID.get(file.id);
-        if (itemData) {
-            if (!itemData.isFinal) {
-                // We assume that there is only one file viewer that is using us
-                // at a given point of time. This assumption is currently valid.
-                this.needsRefreshByFileID.set(file.id, needsRefresh);
-            }
-        } else {
+        // We assume that there is only one file viewer that is using us
+        // at a given point of time. This assumption is currently valid.
+        this.needsRefreshByFileID.set(file.id, needsRefresh);
+
+        if (!itemData) {
             itemData = {};
             this.itemDataByFileID.set(file.id, itemData);
-            this.needsRefreshByFileID.set(file.id, needsRefresh);
             void this.enqueueUpdates(file);
         }
 
@@ -134,7 +130,8 @@ export class FileViewerDataSource {
                 const sourceURLs =
                     await downloadManager.renderableSourceURLs(file);
                 // TODO(PS):
-                update(await withDimensions(sourceURLs.url as string));
+                const itemData = await withDimensions(sourceURLs.url as string);
+                update(itemData);
                 break;
             }
 

From 0e3708ffdc06c9f674e802207437f1d43b607c6d Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 19:34:11 +0530
Subject: [PATCH 260/796] LP resume

---
 web/packages/gallery/components/viewer/data-source.ts | 2 --
 web/packages/gallery/components/viewer/photoswipe.ts  | 9 +++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index d814ee65bf..c2f96cb03c 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -138,8 +138,6 @@ export class FileViewerDataSource {
             case FileType.video: {
                 const sourceURLs =
                     await downloadManager.renderableSourceURLs(file);
-                // const disableDownload = !!this.opts.disableDownload;
-                // update({ html: videoHTML(sourceURLs.url, disableDownload) });
                 // TODO(PS):
                 update({ videoURL: sourceURLs.url as string });
                 break;
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index cb85d2be91..90d3bf4cd2 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -249,6 +249,15 @@ export class FileViewerPhotoSwipe {
             video?.pause();
         });
 
+        pswp.on("contentActivate", (e) => {
+            // Undo the effect of a previous "contentDeactivate".
+            if (e.content?.slide.data?.livePhotoVideoURL) {
+                e.content?.slide?.container
+                    ?.getElementsByTagName("video")[0]
+                    ?.play();
+            }
+        });
+
         // The user did some action within the file viewer to close it.
         pswp.on("close", () => {
             // Clear intervals.

From 6ccca2114e2621e94d33e96bd9106a0a331677a3 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 19:37:03 +0530
Subject: [PATCH 261/796] Mainlineable

---
 web/apps/photos/src/pages/_app.tsx                   | 4 ++--
 web/apps/photos/src/styles/global.css                | 3 +--
 web/packages/gallery/components/viewer/photoswipe.ts | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index c2ed6d7c81..009a8c459c 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -51,9 +51,9 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { resumeExportsIfNeeded } from "services/export";
 import { photosLogout } from "services/logout";
 
-// import "photoswipe/dist/photoswipe.css";
+import "photoswipe/dist/photoswipe.css";
 // TODO(PS): Note, auto hide only works with the new CSS.
-import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
+// import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
 
 import "styles/global.css";
 
diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 6de4c6f5d0..1105c89a44 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -12,7 +12,7 @@ body {
     flex-direction: column;
     height: 100%;
 }
-@media DISABLED {
+
 .pswp__button--custom {
     width: 48px;
     height: 48px;
@@ -114,7 +114,6 @@ body {
 .pswp__caption--empty {
     display: none;
 }
-}
 
 .pswp-ente {
     /* The default z-index for PhotoSwipe is 10k, way beyond everything else.
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 90d3bf4cd2..c14bb52fc1 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -23,7 +23,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 let PhotoSwipe;
 if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     // TODO(PS): Comment me before merging into main.
-    PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
+    // PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
 
 type FileViewerPhotoSwipeOptions = FileViewerProps & {

From 00db3c033586bfb163e518c687f18994116d3923 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 17 Feb 2025 19:42:40 +0530
Subject: [PATCH 262/796] sp

---
 web/packages/base/components/utils/theme.ts          | 2 +-
 web/packages/gallery/components/FileInfo.tsx         | 2 +-
 web/packages/gallery/components/viewer/photoswipe.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/packages/base/components/utils/theme.ts b/web/packages/base/components/utils/theme.ts
index 1106644235..080e5eef74 100644
--- a/web/packages/base/components/utils/theme.ts
+++ b/web/packages/base/components/utils/theme.ts
@@ -541,7 +541,7 @@ const components: Components = {
 
     MuiDialog: {
         defaultProps: {
-            // [Note: Overjealous Chrome? Complicated ARIA?]
+            // [Note: Overzealous Chrome? Complicated ARIA?]
             //
             // This is required to prevent console errors about aria-hiding a
             // focused button when the dialog is closed.
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 5357653e87..6c9b2b6a67 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -404,7 +404,7 @@ const FileInfoSidebar = styled(
         <SidebarDrawer
             {...props}
             anchor="right"
-            // See: [Note: Overjealous Chrome? Complicated ARIA?], but this time
+            // See: [Note: Overzealous Chrome? Complicated ARIA?], but this time
             // with a different workaround.
             //
             // https://github.com/mui/material-ui/issues/43106#issuecomment-2514637251
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index c14bb52fc1..739abae54f 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -142,7 +142,7 @@ export class FileViewerPhotoSwipe {
             // leave this at the default (true) and then swipe between slides
             // fast, or show MUI drawers etc.
             //
-            // See: [Note: Overjealous Chrome? Complicated ARIA?], but time with
+            // See: [Note: Overzealous Chrome? Complicated ARIA?], but time with
             // a different library.
             trapFocus: false,
             // Set the index within files that we should open to. Subsequent

From d398838742ccc1f68d56f1b29d76a114cffde512 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 09:02:11 +0530
Subject: [PATCH 263/796] Revert "Mainlineable"

This reverts commit 6ccca2114e2621e94d33e96bd9106a0a331677a3.
---
 web/apps/photos/src/pages/_app.tsx                   | 4 ++--
 web/apps/photos/src/styles/global.css                | 3 ++-
 web/packages/gallery/components/viewer/photoswipe.ts | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index 009a8c459c..c2ed6d7c81 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -51,9 +51,9 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { resumeExportsIfNeeded } from "services/export";
 import { photosLogout } from "services/logout";
 
-import "photoswipe/dist/photoswipe.css";
+// import "photoswipe/dist/photoswipe.css";
 // TODO(PS): Note, auto hide only works with the new CSS.
-// import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
+import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
 
 import "styles/global.css";
 
diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 1105c89a44..6de4c6f5d0 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -12,7 +12,7 @@ body {
     flex-direction: column;
     height: 100%;
 }
-
+@media DISABLED {
 .pswp__button--custom {
     width: 48px;
     height: 48px;
@@ -114,6 +114,7 @@ body {
 .pswp__caption--empty {
     display: none;
 }
+}
 
 .pswp-ente {
     /* The default z-index for PhotoSwipe is 10k, way beyond everything else.
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 739abae54f..bac8121121 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -23,7 +23,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 let PhotoSwipe;
 if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     // TODO(PS): Comment me before merging into main.
-    // PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
+    PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
 
 type FileViewerPhotoSwipeOptions = FileViewerProps & {

From fe5146ead8a43f1fd01a6215edb4f2bc3cb6a818 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 09:13:10 +0530
Subject: [PATCH 264/796] Singleton => module

---
 .../gallery/components/viewer/data-source.ts  | 243 +++++++++---------
 .../gallery/components/viewer/photoswipe.ts   |  12 +-
 2 files changed, 130 insertions(+), 125 deletions(-)

diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index c2f96cb03c..73099965e3 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -38,128 +38,141 @@ type ItemData = SlideData & {
 };
 
 /**
- * A class that stores and serves data required by our custom PhotoSwipe
+ * This module stores and serves data required by our custom PhotoSwipe
  * instance, effectively acting as an in-memory cache.
  *
  * By keeping this independent of the lifetime of the PhotoSwipe instance, we
  * can reuse the same cache for multiple displays of our file viewer.
+ *
+ * This will be cleared on logout.
  */
-export class FileViewerDataSource {
-    private itemDataByFileID = new Map<number, ItemData>();
-    private needsRefreshByFileID = new Map<number, () => void>();
-
-    /**
-     * Return the best available ItemData for rendering the given {@link file}.
-     *
-     * If an entry does not exist for a particular file, then it is lazily added
-     * on demand, and updated as we keep getting better data (thumbnail,
-     * original) for the file.
-     *
-     * At each step, we call the provided callback so that file viewer can call
-     * us again to get the updated data.
-     *
-     * ---
-     *
-     * Detailed flow:
-     *
-     * If we already have the final data about the file, then this function will
-     * return it and do nothing subsequently.
-     *
-     * Otherwise, it will:
-     *
-     * 1. Return empty slide data; PhotoSwipe will not show anything in the
-     *    image area but will otherwise render UI controls properly (in most
-     *    cases a cached renderable thumbnail URL will be available shortly)
-     *
-     * 2. Insert empty data so that we don't enqueue multiple updates, and
-     *    return this empty data.
-     *
-     * Then it we start fetching data for the file.
-     *
-     * First it'll fetch the thumbnail. Once that is done, it'll update the data
-     * it has cached, and notify the caller (using the provided callback) so it
-     * can refresh the slide.
-     *
-     * Then it'll continue fetching the original.
-     *
-     * - For images and videos, this will be the single original.
-     *
-     * - For live photos, this will also be a two step process, first with the
-     *   original image, then again with the video component.
-     *
-     * At this point, the data for this file will be considered final, and
-     * subsequent calls for the same file will return this same value unless it
-     * is invalidated.
-     *
-     * If at any point an error occurs, we reset our cache so that the next time
-     * the data is requested we repeat the process instead of continuing to
-     * serve the incomplete result.
-     */
-    itemDataForFile(file: EnteFile, needsRefresh: () => void) {
-        let itemData = this.itemDataByFileID.get(file.id);
-        // We assume that there is only one file viewer that is using us
-        // at a given point of time. This assumption is currently valid.
-        this.needsRefreshByFileID.set(file.id, needsRefresh);
-
-        if (!itemData) {
-            itemData = {};
-            this.itemDataByFileID.set(file.id, itemData);
-            void this.enqueueUpdates(file);
-        }
-
-        return itemData;
-    }
-
-    private async enqueueUpdates(file: EnteFile) {
-        const update = (itemData: ItemData) => {
-            this.itemDataByFileID.set(file.id, itemData);
-            this.needsRefreshByFileID.get(file.id)?.();
-        };
-
-        const thumbnailURL = await downloadManager.renderableThumbnailURL(file);
-        // TODO(PS):
-        const thumbnailData = await withDimensions(thumbnailURL!);
-        update({
-            ...thumbnailData,
-            isContentLoading: true,
-            isContentZoomable: false,
-        });
-
-        switch (file.metadata.fileType) {
-            case FileType.image: {
-                const sourceURLs =
-                    await downloadManager.renderableSourceURLs(file);
-                // TODO(PS):
-                const itemData = await withDimensions(sourceURLs.url as string);
-                update(itemData);
-                break;
-            }
-
-            case FileType.video: {
-                const sourceURLs =
-                    await downloadManager.renderableSourceURLs(file);
-                // TODO(PS):
-                update({ videoURL: sourceURLs.url as string });
-                break;
-            }
-
-            case FileType.livePhoto: {
-                const sourceURLs =
-                    await downloadManager.renderableSourceURLs(file);
-                const livePhotoSourceURLs =
-                    sourceURLs.url as LivePhotoSourceURL;
-                const imageURL = await livePhotoSourceURLs.image();
-                // TODO(PS):
-                const imageData = await withDimensions(imageURL!);
-                update(imageData);
-                const livePhotoVideoURL = await livePhotoSourceURLs.video();
-                update({ ...imageData, livePhotoVideoURL });
-                break;
-            }
-        }
-    }
+class FileViewerDataSourceState {
+    itemDataByFileID = new Map<number, ItemData>();
+    needsRefreshByFileID = new Map<number, () => void>();
 }
 
+/**
+ * State shared by functions in this module.
+ *
+ * See {@link FileViewerDataSourceState}.
+ */
+let _state = new FileViewerDataSourceState();
+
+/**
+ * Clear any internal state maintained by the file viewer data source.
+ */
+// TODO(PS): Call me during logout sequence once this is integrated.
+export const logoutFileViewerDataSource = () => {
+    _state = new FileViewerDataSourceState();
+};
+
+/**
+ * Return the best available ItemData for rendering the given {@link file}.
+ *
+ * If an entry does not exist for a particular file, then it is lazily added on
+ * demand, and updated as we keep getting better data (thumbnail, original) for
+ * the file.
+ *
+ * At each step, we call the provided callback so that file viewer can call us
+ * again to get the updated data.
+ *
+ * ---
+ *
+ * Detailed flow:
+ *
+ * If we already have the final data about the file, then this function will
+ * return it and do nothing subsequently.
+ *
+ * Otherwise, it will:
+ *
+ * 1. Return empty slide data; PhotoSwipe will not show anything in the image
+ *    area but will otherwise render UI controls properly (in most cases a
+ *    cached renderable thumbnail URL will be available shortly)
+ *
+ * 2. Insert empty data so that we don't enqueue multiple updates, and return
+ *    this empty data.
+ *
+ * Then it we start fetching data for the file.
+ *
+ * First it'll fetch the thumbnail. Once that is done, it'll update the data it
+ * has cached, and notify the caller (using the provided callback) so it can
+ * refresh the slide.
+ *
+ * Then it'll continue fetching the original.
+ *
+ * - For images and videos, this will be the single original.
+ *
+ * - For live photos, this will also be a two step process, first with the
+ *   original image, then again with the video component.
+ *
+ * At this point, the data for this file will be considered final, and
+ * subsequent calls for the same file will return this same value unless it is
+ * invalidated.
+ *
+ * If at any point an error occurs, we reset our cache so that the next time the
+ * data is requested we repeat the process instead of continuing to serve the
+ * incomplete result.
+ */
+export const itemDataForFile = (file: EnteFile, needsRefresh: () => void) => {
+    let itemData = _state.itemDataByFileID.get(file.id);
+    // We assume that there is only one file viewer that is using us at a given
+    // point of time. This assumption is currently valid.
+    _state.needsRefreshByFileID.set(file.id, needsRefresh);
+
+    if (!itemData) {
+        itemData = {};
+        _state.itemDataByFileID.set(file.id, itemData);
+        void enqueueUpdates(file);
+    }
+
+    return itemData;
+};
+
+const enqueueUpdates = async (file: EnteFile) => {
+    const update = (itemData: ItemData) => {
+        _state.itemDataByFileID.set(file.id, itemData);
+        _state.needsRefreshByFileID.get(file.id)?.();
+    };
+
+    const thumbnailURL = await downloadManager.renderableThumbnailURL(file);
+    // TODO(PS):
+    const thumbnailData = await withDimensions(thumbnailURL!);
+    update({
+        ...thumbnailData,
+        isContentLoading: true,
+        isContentZoomable: false,
+    });
+
+    switch (file.metadata.fileType) {
+        case FileType.image: {
+            const sourceURLs = await downloadManager.renderableSourceURLs(file);
+            // TODO(PS):
+            const itemData = await withDimensions(sourceURLs.url as string);
+            update(itemData);
+            break;
+        }
+
+        case FileType.video: {
+            const sourceURLs = await downloadManager.renderableSourceURLs(file);
+            // TODO(PS):
+            update({ videoURL: sourceURLs.url as string });
+            break;
+        }
+
+        case FileType.livePhoto: {
+            const sourceURLs = await downloadManager.renderableSourceURLs(file);
+            const livePhotoSourceURLs = sourceURLs.url as LivePhotoSourceURL;
+            const imageURL = await livePhotoSourceURLs.image();
+            // TODO(PS):
+            const imageData = await withDimensions(imageURL!);
+            update(imageData);
+            const livePhotoVideoURL = await livePhotoSourceURLs.video();
+            update({ ...imageData, livePhotoVideoURL });
+            break;
+        }
+    }
+};
+
 /**
  * Take a image URL, determine its dimensions using browser APIs, and return the URL
  * and its dimensions in a form that can directly be passed to PhotoSwipe as
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index bac8121121..f843139b44 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -4,7 +4,7 @@
 import log from "@/base/log";
 import type { EnteFile } from "@/media/file";
 import { t } from "i18next";
-import { FileViewerDataSource } from "./data-source";
+import { itemDataForFile } from "./data-source";
 import type { FileViewerProps } from "./FileViewer";
 import { createPSRegisterElementIconHTML } from "./icons";
 
@@ -68,13 +68,6 @@ export class FileViewerPhotoSwipe {
      * The options with which we were initialized.
      */
     private opts: Pick<FileViewerPhotoSwipeOptions, "disableDownload">;
-    /**
-     * Our data source.
-     *
-     * TODO(PS): Move this elsewhere, or merge with download manager.
-     */
-    private dataSource: FileViewerDataSource;
-
     /**
      * An interval that invokes a periodic check of whether we should the hide
      * controls if the user does not perform any pointer events for a while.
@@ -103,7 +96,6 @@ export class FileViewerPhotoSwipe {
     }: FileViewerPhotoSwipeOptions) {
         this.files = files;
         this.opts = { disableDownload };
-        this.dataSource = new FileViewerDataSource();
 
         const pswp = new PhotoSwipe({
             // Opaque background.
@@ -163,7 +155,7 @@ export class FileViewerPhotoSwipe {
         pswp.addFilter("itemData", (_, index) => {
             const file = files[index]!;
 
-            let itemData = this.dataSource.itemDataForFile(file, () => {
+            let itemData = itemDataForFile(file, () => {
                 this.pswp.refreshSlideContent(index);
             });
 

From 808c611a92eb0882f1db6899e6cd71a732dd5abf Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 09:16:17 +0530
Subject: [PATCH 265/796] Docs

---
 .../gallery/components/viewer/data-source.ts  | 47 +++++++++++++++----
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 73099965e3..623fc6e531 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -30,10 +30,31 @@ interface SlideData {
 }
 
 type ItemData = SlideData & {
-    // Our props. TODO(PS) document if end up using these.
+    /**
+     * If the file is a video, then this will be set to a renderable URL of the
+     * original when it becomes available.
+     */
     videoURL?: string;
+    /**
+     * If the file is a live photo, then this will be set to a renderable URL of
+     * the original when it becomes available.
+     */
     livePhotoVideoURL?: string;
+    /**
+     * `true` if we should indicate to the user that we're still fetching data
+     * for this file.
+     *
+     * Note that this doesn't imply that the data is final. e.g. for a live
+     * photo, this will be not be set after we get the original image component,
+     * but the fetch for the video component might still be ongoing.
+     */
     isContentLoading?: boolean;
+    /**
+     * This will be explicitly set to `false` when we want to disable
+     * PhotoSwipe's built in image zoom.
+     *
+     * It is set while the thumbnail is loaded.
+     */
     isContentZoomable?: boolean;
 };
 
@@ -47,7 +68,14 @@ type ItemData = SlideData & {
  * This will be cleared on logout.
  */
 class FileViewerDataSourceState {
+    /**
+     * The best data we have for a particular file (ID).
+     */
     itemDataByFileID = new Map<number, ItemData>();
+    /**
+     * The latest callback registered for notifications of better data being
+     * available for a particular file (ID).
+     */
     needsRefreshByFileID = new Map<number, () => void>();
 }
 
@@ -87,10 +115,10 @@ export const logoutFileViewerDataSource = () => {
  *
  * 1. Return empty slide data; PhotoSwipe will not show anything in the image
  *    area but will otherwise render UI controls properly (in most cases a
- *    cached renderable thumbnail URL will be available shortly)
+ *    cached renderable thumbnail URL will be available shortly).
  *
- * 2. Insert empty data so that we don't enqueue multiple updates, and return
- *    this empty data.
+ * 2. Insert this empty data in its cache so that we don't enqueue multiple
+ *    updates.
  *
  * Then it we start fetching data for the file.
  *
@@ -102,19 +130,20 @@ export const logoutFileViewerDataSource = () => {
  *
  * - For images and videos, this will be the single original.
  *
- * - For live photos, this will also be a two step process, first with the
- *   original image, then again with the video component.
+ * - For live photos, this will also be a two step process, first fetching the
+ *   original image, then again the video component.
  *
  * At this point, the data for this file will be considered final, and
  * subsequent calls for the same file will return this same value unless it is
  * invalidated.
  *
- * If at any point an error occurs, we reset our cache so that the next time the
- * data is requested we repeat the process instead of continuing to serve the
- * incomplete result.
+ * If at any point an error occurs, we reset our cache for this file so that the
+ * next time the data is requested we repeat the process instead of continuing
+ * to serve the incomplete result.
  */
 export const itemDataForFile = (file: EnteFile, needsRefresh: () => void) => {
     let itemData = _state.itemDataByFileID.get(file.id);
+
     // We assume that there is only one file viewer that is using us at a given
     // point of time. This assumption is currently valid.
     _state.needsRefreshByFileID.set(file.id, needsRefresh);

From e715d582acedae959bc5b2f974a60b236f0a2528 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 09:54:07 +0530
Subject: [PATCH 266/796] err 1

---
 .../gallery/components/viewer/data-source.ts  | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 623fc6e531..2bd0f0a841 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -1,6 +1,7 @@
 /* xeslint-disable */
 // x-@ts-nocheck
 
+import log from "@/base/log";
 import {
     downloadManager,
     type LivePhotoSourceURL,
@@ -56,6 +57,11 @@ type ItemData = SlideData & {
      * It is set while the thumbnail is loaded.
      */
     isContentZoomable?: boolean;
+    /**
+     * If the fetch has failed then this will be set, and set to a failure
+     * reason category that the UI can use to show the appropriate message.
+     */
+    failureReason?: "other";
 };
 
 /**
@@ -148,7 +154,7 @@ export const itemDataForFile = (file: EnteFile, needsRefresh: () => void) => {
     // point of time. This assumption is currently valid.
     _state.needsRefreshByFileID.set(file.id, needsRefresh);
 
-    if (!itemData) {
+    if (!itemData || itemData.failureReason) {
         itemData = {};
         _state.itemDataByFileID.set(file.id, itemData);
         void enqueueUpdates(file);
@@ -163,14 +169,25 @@ const enqueueUpdates = async (file: EnteFile) => {
         _state.needsRefreshByFileID.get(file.id)?.();
     };
 
-    const thumbnailURL = await downloadManager.renderableThumbnailURL(file);
-    // TODO(PS):
-    const thumbnailData = await withDimensions(thumbnailURL!);
-    update({
-        ...thumbnailData,
-        isContentLoading: true,
-        isContentZoomable: false,
-    });
+    try {
+        const thumbnailURL = await downloadManager.renderableThumbnailURL(file);
+        // TODO(PS):
+        const thumbnailData = await withDimensions(thumbnailURL!);
+        update({
+            ...thumbnailData,
+            isContentLoading: true,
+            isContentZoomable: false,
+        });
+    } catch (e) {
+        // If we can't even get the thumbnail, then a persistent (for now)
+        // network error is likely (download manager already has retries).
+        //
+        // Notify the user of the error. The entire process will be retried when
+        // they reopen the slide later.
+        log.error("Failed to show thumbnail", e);
+        update({ failureReason: "other" });
+        return;
+    }
 
     switch (file.metadata.fileType) {
         case FileType.image: {

From 89881975f20a7705171cea6f2956d36861dc0932 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 10:22:48 +0530
Subject: [PATCH 267/796] err 2

---
 .../gallery/components/viewer/icons.tsx       |  4 +-
 .../gallery/components/viewer/photoswipe.ts   | 38 +++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/web/packages/gallery/components/viewer/icons.tsx b/web/packages/gallery/components/viewer/icons.tsx
index ef4fadd8e1..8b6ef33b5f 100644
--- a/web/packages/gallery/components/viewer/icons.tsx
+++ b/web/packages/gallery/components/viewer/icons.tsx
@@ -10,7 +10,7 @@
  *
  *
  *     import { renderToString } from "react-dom/server";
- *     import InfoOutlinedIcon from ;
+ *     import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
  *
  *     console.log(renderToString(<InfoOutlinedIcon />));
  */
@@ -18,6 +18,8 @@
 const paths = {
     // "@mui/icons-material/InfoOutlined"
     info: '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8"',
+    // "@mui/icons-material/ErrorOutline"
+    error: '<path d="M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2M12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8"',
 };
 
 /**
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index f843139b44..18b2734b5c 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -271,6 +271,44 @@ export class FileViewerPhotoSwipe {
         // - zoom: 10
         // - close: 20
         pswp.on("uiRegister", () => {
+            pswp.ui.registerElement({
+                name: "error",
+                title: t("error"),
+                order: 6,
+                html: createPSRegisterElementIconHTML("error"),
+                onInit: (errorElement, pswp) => {
+                    let isVisible = false;
+
+                    const toggleIndicatorClass = (className, add) => {
+                        errorElement.classList.toggle(
+                            // Reuse preloading hide / show mechanism.
+                            "pswp__preloader--" + className,
+                            add,
+                        );
+                    };
+
+                    const setIndicatorVisibility = (visible) => {
+                        if (isVisible !== visible) {
+                            isVisible = visible;
+                            toggleIndicatorClass("active", visible);
+                        }
+                    };
+
+                    const updateErrorIndicatorVisibility = () => {
+                        console.log(
+                            "updateErrorIndicatorVisibility",
+                            pswp.currSlide.content,
+                        );
+                        if (pswp.currSlide.content.data.failureReason) {
+                            setIndicatorVisibility(true);
+                        } else {
+                            setIndicatorVisibility(false);
+                        }
+                    };
+
+                    pswp.on("change", updateErrorIndicatorVisibility);
+                },
+            });
             pswp.ui.registerElement({
                 name: "info",
                 title: t("info"),

From ac94dccb90666a30239d51578a4dacd461f95fba Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 18 Feb 2025 10:26:17 +0530
Subject: [PATCH 268/796] remove oversize icon

---
 auth/assets/custom-icons/icons/onshape.svg | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 auth/assets/custom-icons/icons/onshape.svg

diff --git a/auth/assets/custom-icons/icons/onshape.svg b/auth/assets/custom-icons/icons/onshape.svg
deleted file mode 100644
index fa92df6eba..0000000000
--- a/auth/assets/custom-icons/icons/onshape.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 1452 1446" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><rect id="Artboard1" x="0" y="0" width="1451.76" height="1445.83" style="fill:none;"/><clipPath id="_clip1"><rect x="0" y="0" width="1451.76" height="1445.83"/></clipPath><g clip-path="url(#_clip1)"><use id="Background" xlink:href="#_Image2" x="1791" y="511" width="1557px" height="348px" transform="matrix(4.16667,0,0,4.16667,-7362.5,-2133.33)"/></g><defs><image id="_Image2" width="1557px" height="348px" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABhUAAAFcCAYAAADPgj/FAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAgAElEQVR4nOzdT2hcR773/0+ibtRm6OletRdRg2GCvAo/yOpC4r8kutwhgrvJkIH7ZGwiZxEY8DbEGctjh2wNA1lcO9gJAzPMLBWykHMtO3Z4drMJzyJN8sMPUhbuVfdPPKh9W/3Mb3HqWMftltR/TlWdOuf9gpBMJj5dlqvrVNW36vuVAAAAAAAAAAAAxvCCJP3rxbd8twM5UZ2vNmpLO7+XdELSJ1tru3d8twkAAAAAAAAAkI6S7wYgPxaWS29KO3+W1DD/6tTCcul+d/3Ib7afbLd9tg0AAAAAAAAAMLsXfTcA4VtYLr25sFy6J2ldewGF2Kna0s73C8ulq9X56vD/BwAAAAAAAAAICEEFTK06X20sLJeuKgomnDrgP21IumSCC2+6aR0AAAAAAAAAIG2kP8JUomDCzvt6/mbCQRqS1heWS/dFvQUAAAAAAAAACM6cJL38L4u+24FALCyX3vzl8Rf/p6R/k/SLKR9zTNL/+OXxF0v//N+/+F//Pfjv/5NaAwEAAAAAAAAA1pD+CGMxqY7uaXTdhGnFKZGupvQ8AAAAAAAAAIBFBBVwoLhuQm1p57EOrpswrYakSwvLpcfUWwAAAAAAAACAbCOogH0tLJferC3tfC/pkoOPi+st3KvOV9O6CQEAAAAAAAAASBFBBTxnYbn0poVUR+M6VVvaebywXLpKcAEAAAAAAAAAsoWgAp6KUx0pCibYSHU0ibjeAimRAAAAAAAAACAjSr4bgGyIggk778v9zYSDxCmR7kv6ZGtt947vBgEAAAAAAABAkc1J0sv/sui7HfBkYbn05i+Pv/g/Jf2bpF/4bs8+jkn6H788/mLpn//7F//rvwf//X98NwgAAAAAAAAAioj0RwVlUh3dk5+6CdOKUyJd9d0QAAAAAAAAACgiggoFE9dNqC3tPJb/ugnTaEi6tLBceky9BQAAAAAAAABwi6BCgSwsl96sLe18L+mS77akIK63cK86Xw3lpgUAAAAAAAAABI2gQgEsLJfeDDDV0bhO1ZZ2Hi8sl64SXAAAAAAAAAAAuwgq5Fic6khRMCHEVEeToN4CAAAAAAAAAFg2J0kv/8ui73YgZQvLpauVX+1+LunffLfFoV9IOvnL4y+e+eXxF3/+/1r/9//13SAAAAAAAAAAyBNuKuSMSXX0WFHdhKKmAzol6i0AAAAAAAAAQOoIKuSESXV0T/msmzCtU3FKJIILAAAAAAAAADA7ggqBi+sm1JZ2Hiv/dROm0dBevYU3fTcGAAAAAAAAAEJW8t0ATC/aJN/5s7iZMI6GopRI9yV9srW2e8d3gwAAAAAAAAAgNNxUCJCpm3BPpDqaRlxvgZRIAAAAAAAAADAhggoBiVMdKQomkOpoNnFKpKu+GwIAAAAAAAAAoXhBkv714lu+24FDmM3v98XNBBvakv6DlEgAAAAAAAAAcDBuKmScSXX0WNIlEVCwJa63cI+USAAAAAAAAACwP4IKGWVSHd0TdRNcOlVb2nlMvQUAAAAAAAAAGI2gQsbEdRNqSzuPRd0EX+J6C2/6bggAAAAAAAAAZEnJdwOwJ9rE3vmzuJmQBXFKpPuSPqHeAgAAAAAAAABwUyETTN2EeyLVURadUhRcICUSAAAAAAAAgMIjqOBRnOpIUTCBVEfZFqdEuuq7IQAAAAAAAADgywuS9K8X3/LdjsIxm9Pvi5sJIWpL+g9SIgEAAAAAAAAoGm4qOGZSHT2WdEkEFEIV11u457shAAAAAAAAAOASQQVHTKqje6JuQl5c664f+Y3vRgAAAAAAAACASyXfDci76ny1UVva+b20c8l3W5CK+5I+iVIfbftuCwAAAAAAAAA4RVDBooXl0pvSzp/FzYQ8oI4CAAAAAAAAgMIjqGBBFEzQR5JO+W4LUnGtu37kT9tPttu+GwIAAAAAAAAAPhFUSNFeqiOR6igf7nfXj/wmCiaQ6ggAAAAAAAAACCqkZGG5dFXaeV+kOsqDRKojggkAAAAAAAAAECOoMCOT6oi6CfnQlvSfW2u7H/tuCAAAAAAAAABkEUGFKZlUR38TdRPyIpHqCAAAAAAAAAAwCkGFCe3VTdihbkI+kOoIAAAAAAAAAMZEUGECUaqjHVId5QOpjgAAAAAAAABgQgQVxmDqJnwkUh3lxbXu+pE/keoIAAAAAAAAACZDUOEAe6mORKqjfLgv6RNSHQEAAAAAAADAdAgq7GNhuXRV2nlfpDrKg0TdBAAAAAAAAADAtAgqDDGpjqibkB9BpjpKpNz6hGAIAAAAAAAAgKwgqGCYVEd/E3UT8iLIVEcj6necWlgu3e+uH/lNaIERAAAAAAAAAPlT+KDCXt2EHeom5EOQqY4Oqd9xqra087imUpC3LgAAAAAAAADkxwuS9K8X3/LdDi9IdZQ7QW66R/U7NG79jrak/9xa2/3YbqsAAACQRZV2/fW0n1luDlqhzaEBAADgTyFvKoxIMYOwJdIDBZfqaNKgVkPSpYXl0glRbwEAAKCI/ijpTJoP7G/OnVBDBBUAAAAwlhd9N8Cl6ny1YU6Fr4uAQh60JS1tre2eDulklemH9xT1w2lvyZyStL6wXLpXna9y0wYAAAAAAACAE4W5qRAFE3bGTTGDbAsyBZCl+h3UWwAAAAAAAADgTO6DCtRNyJ1EqqNwOAhqXaot7bxfUym4ItUAAAAAAAAAwpHboII5Ff43keYoL9qSzIZ57usmTKuhKCXSfVFvAQAAAAAAAIAFuQsqWEoxA39CTnXkK6h1StKphWVSIgEAAAAAAABIV66CCtGp8B1SHeVHcJviGQtqxSmRggvKAAAAAAAAAMimXAQVTIqZj0Sqo7xIpO8JLdVR5oJaDUmXFpZL7+tp+igAAAAAAAAAmE7QQYW9U+HKwqlwpGMptI3vQIJa1FsAAAAAAAAAMLNggwoLy6Wr0s77ytapcEwv1FRHoRUDp94CAAAAAAAAgKkFF1Qwp8KzlmIG0wsu1VHG6iZMi3oLAAAAAAAAACYWTFAh0FPh2F9bAeb4z2jdhGlRbwEAAAAAAADARDIfVMjJqXA8K7jUO4HUTZjW03oL3fUjvwnpzwUAAAAAAACAW5kOKuTsVDikxKZ1aKmOClEM/FRtaedxTdRbAAAAAAAAADBaJoMKOT8VXkSJVEehBRMKWQz8Um1p51JNpSVSIgEAAAAAAABIylRQoWCnwougLSm4QsDckHlqfWG5lCikDQAAAAAAAKDoMhNUWFguXS3oqfC8Ci4/PzdkRjol6RT1FgAAAAAAAABIGQgqmI1cToXnR8CpjrghcwDqLQAAAAAAAADwF1QwG7l/E6fC8yLUVEfckJnMpdrSzvs1lf6DlEgAAAAAAABA8TgPKhS8AG5eBXd6nRsyM2mIegsAAAAAAABAITkNKlAAN3cSm8phpDqibkKq4noLwQWVAAAAAAAAAEzHSVCBjdzcSdRNCAN1E6yKUyIFl/4KAAAAAAAAwGSsBhXYyM2l4E6lUzfBiYakSwvLpfcVWMAJAAAAAAAAwPisBRXYyM2dUFMdkW7LLeotAAAAAAAAADmWelCBVEe5E2qqo7+JPugT9RYAAAAAAACAHEotqMBGbi4FtSG8l25rh3Rb2UG9BQAAAAAAACBHZg4qJDZySXWUH/e760d+EwUTQkp1tEOqo2yi3gIAAAAAAACQEzMFFdjIzZ1EqqOQggmk2wrE03oLe0ErAAAAAAAAACGZKqjARm7utCUFlZ6GdFtBO1Vb2nlcE/UWAAAAAAAAgNBMFFTYS3UkctbnR3CnxheWS1epm5ALcb0FUiIBAAAAAAAAgXhx3P9wYbl0tba0870IKOTFfUlLW2u7p0MKKBjfKmo/whenRLpnbkABAAAAAAAAyLBDbyqQ6ih3gkt1NMycar9j+iY1PfLhlKRT1FsAAAAAAAAAsm3fmwrV+WpjYbl0T9K6CCjkxbXu+pFXQg4oJG2t7d7prh95RdI1321Bak7Vlna+X1guXa3OVwkWAQAAAAAAABnzXFDBBBPiVEcEE/IhTnX0cd5OgG8/2W5vre1+3F0/clSkRMqLhqJ6C9+TEgkAAAAAAADIlmfSH0UbeDukk8mXpSIUwd1+st3eXtNpUiLlSlxv4b6kT4rQjwEAAAAAAICse1GKggmJVEdsxubDte76kaNF24jdWtu9s7W2e1RRSqRc3coosFOKggukRAIAAAAAAAA8i9MfnRSpjvIit6mOJmFSIlFvIV8u1ZZ2fu+7EQAAAAAAAECR7VuoGcFpKwomnC7a7YT9xPUWJC2JegsAAAAAAAAAMDOCCvlwrbt+5BWCCaOZlEinFQUXCnt7AwAAAAAAAABmVTr8P0GG3e+uH/lNlOZo23dbMm9rbfdOdb76ikmhc8l3ewAAAAAAAAAgNNxUCNPTVEdFrpswjTglUnf9yFGREgkAAAAAAAAAJkJQISxtSde21naPkupoNia4cFqkRAIAAAAAAACAsZH+KByJVEdIiwnOHF1YLl2V9L6khucmAQAAAAAAAEBmcVMh++4rsFRHlXb99Uq7fqPSrr/uuy3jMimRXpF0zXdbAAAAAAAAACCrCCpkV5zq6HQoqY6q89VGpV2/IemBpBVJDyrt+o3qfDWI0/9xvQVFKZGotwAAAAAAAAAAQwgqZNO17vqRV8wGdxAq7fq5/uZcS1EwIWmlvznXqrTr5zw0aypba7t3qLcAAAAAAAAAAM8jqJAtcaqjjwNLdfSDpFuSavv8ZzVJtyrt+t3AUiLdISUSAAAAAAAAAOwhqJANbZm6CYGlOrqrKNXR4pi/7IyilEiroaVE6q4fOSpSIgEAAAAAAAAoOIIK/sWpjkIKJqz2N+ceKwoSTONyf3PuQUgpkUxw4bRIiQQAAAAAAACgwAgq+BNiqqNz/c25B5Iup/C4RZmUSKHcWpCeS4kUxJ8bAAAAAAAAAKSFoIJ7waU6MnUT7iqqmzBuqqNxnTGFnFdTfq41iZRIr4iUSAAAAAAAAAAKhKCCWyGmOrqhqG7CtKmOxlGTdLnSrv8QUiHnoZRIBBcAAAAAAAAA5F7JdwMK4n53/chvojRH277bMpZKu36uL11XtOHvyqKiQs43y83BR6GkhTJBojsLy6Wrkt6XFEw6JwBhqM5XG/3Nuac3xcrNQSuUMRL5MBz07zU6D321Bdk3PGZJjFuYHe9C2Ma7DqFifIQrjJNIIqhgV1vSf0SbzsEEE16X9LnST3M0iZX+5tzbFdUv9hqd2x7bMZGttd2Pq/PVP9WWdn4v6ZLv9gDItsSE7A3z95Pm7y9paAzuD/3a/uacKqoPP7Ir6R/mn3+S9LOkR5J+ZLKHg5i++LKkY9rrhwfeUKy06X9FkRir4j7ykqRfmX/33HglPT9mSfuOWy1FfUWi3xRaYkPsDe31sWf615jvwmSf+lamP7HBVkyJfjVq/Dr0Jv4h7zr6F6wa0X9nXSswPuI5FsZJSdpI/DN9zSEzb0/OpUb5SdJ35ebg61n/PF6QpPf+69+vik3QNLUl/efW2u7HvhsyLjOQ/FV20xxNY0PSH0JbWC4sl96U9JGkU77bkjPXQvpeAbHEpu1ril7uPsbaeCHxraRvQhtXkR7zzv+1pHclvSo3txJbivred2LDOJOGNnVPap+AgWOMWyOYWmdpv0dOuP75mnfj7xT1Nxd9Ld4Q/lbSozQW08iOxLvtmKI+5er9Fkv2L8YrTGTEO9hn/2V8zKkMjJMSfS11lXb9nKJ9hrc1+Z9nS9Jfys3BZ9P8ORBUSF8i1VH2mUHlA0mXfbflEEGlRIqZ4MKfRUqktBBUQBA8bdpOY0PSl2KTdyxmA+xByo/d6DU6Z1N+5nMS7/vfyv9GsRQtKP6ulE7JYHKJceo1udvUTcOGCr5pF3JQYcaFrw0tSX9RgftTyBL9Katj2IakL12/50IeI8ZVadf/mfYze43OC2k/8yCJE8Unlb3DndLegZAvsvRnj8kEME5KicNHIWUr8c382X6o/f9cN0b8u4MODU2870pQIT33JX0SShFmaawOmDUtSZ+GNshU56sNUiKlhqACMiuxQRfSuJrEwuEQIQYVzLv+XWVzsZp0UywkrMvBODWskONWaBuGGQxq7qcl6VMCndkV0KGNUZwFGEIbI6YRalDB9OFPlO0N3lHiwyCFet+GaGiczPr8fz9eArKhMGvSP+r5P9+WpE91yIHBMQ4WXRn35gJBhdkFl+rogA4Yio1yc/BOaIOLCS78TaREmgVBBWRKDjfoYjNdg8yrkIIKAR4ciLGpl7Icj1PDCjNuhbJhmNg8W0nzuY4EmYI1rxKpsrJyw2UWXUl/t3kLP5QxYhahBRUCnpeNUpj3bUhyNk4m3RTBrKfMWHJr6F/PlNlln0NoLUnvHfZzf3GaD8RT17rrR14JZZOzOl9tVNr1G4o2REINKEjSmf7mXGu46nzWbT/Zbm+t7Z6WtKQoGAUgUPF42t+cayl6qedhgZC0KOlyf3PucaVdvxvaeFtklXb99Uq7/oPC7ZeLkm6Z9/xqdb5K+sApFWCcGpYct27Qd/wxfW/V9L0QAwpStFZ6wDvQr0q7fs680x4o6kt52CirSVphjpV/8VhYadc7ytd7+Jn3LX3YH9PH8jhOJq0oeh//UGnXzxV5fmf2c5MBhY1yc3C01+hcmCXA12t0bptDbucVBROk6Hv+lQk47IugwnTuS1raWtv9OJTIbKVdPxf4xD6pK+liqJHKrbXdO1tru0clXRPBBSAoZsP2Rn9z7rHyOWkbJd5Y+eGwSQX8MYuKu4oWFHlYtNYULVgJLkwoEUwo0jg1bIXggh9mzfFAUb22PPQ9gguO5XgjdpSn/YuxKj+GAqt5GQv3E2/4MkY6NNTH8j5Oxgp98MgEFOL93K6k871G52yae9K9Rud2uTk4ob1aDDVJtw7aAyCoMLmlrbXd06HUThg6sZiHl9nNcnOwmIecy1trux9314+8oii4ACDDhjZs8xCcncaioknFDywasiVxcCDkW4j7iYMLDwhqHWxEMAEEF5xJvCfzurkRb/7Slywq0EbssDOMVfmQmJMVrg+LAJl1BQtY7adwB49GBBTesrUnuv1ku524tRDbN7BAUGF817rrR46GEkzI4YnFVK71ZI1JifSxopRI9323B8Czhjbp8rhhO41FcSIpE4Y28fK+qIiDWixWR8jZjVQbVszi85zvhuRRzgObw+hLFiTSdxR1kyxG/wpUDg9zTosAmSUFDljtJxlcOOe7MbZU2vVVPR9QsJ61xQQtkoGF66PW/gQVDhdUqqNE5DIvG2AtWbjWkzUmJdJpUW8ByAw26Q7FqU2PKu366wXaxEs6k/fFwyQKFliaVXyFm8BUShL12orW/+hLKSnADZdp0L8CYzb98nKYMy0EyFJCwOpQ8ZiZu9v05vdz2fxPZwGFmAksXDH/sybp8+H/hqDC/toKL9VRModp6LqSrvQaneN5SHU0rq213TukRAL8YuI2MRYNjiUWr0Xtn/HiYdV3Q3wygaUHKl5gaVYEplJQna82TP8rcuD9jEnNlqtNDFcKdsNlGvFYRf/KqMSaIQ/7LzYQIJtBInBPwGo88W36XBx4M7+H5Ca+04BCrNforGqvxsLi8PqLoMJo17rrR14JKJjwes5OeMR1E1Z9N8SHOCVSd/3IUZESCXDKbDIxcZsciwYHEic6WbxGLhe1zzFWzSwes274bkiIEpvB9L+9TYxzvhsSCm5YTaSmqH+t+m4InmW+81+JcXAcBMgmlDg4UuTA/bRW8hDw72/OfaC98eXmQQEFk5b4nxP+9cO4AZhyc/COooPfknQ5+WsIKjzrvqmbEFKqozhymYcTHi1JJ/JWN2FaJrhwWqREAqwbWuBiepzatCRxKjgP7/s0Fa7PmY0Mxqp0rFTa9R+KGJiaVqL/sRn8LIJUY+B2wtQu5+X0bR4UNO3brAiQjYmDI6mIA/6rvhsyDTPWXzT/s1tuDj6y8DGLigIwjw87GGH2Z+P2qL8590n8zwQVIk9THYWymZ2zXN9dRXUTjvu4zpN1pt7CUUUpkYLon0BICpyb3hZObaYs0UdZXIy2KOmrIgQWEhsZSM9if3PuAZt1h6P/HWqFwML+2Iid2QpjlV+JQ5152IPxpbC3TA/DITcrguxv5pZC/K68OOE+dUtRuqKD/uoO/Zpbh63dTVr6lvmfK/HPtOhBhbaka1tru0cDS3WUp1zfcaqj264+sNKunwvxpIdJiUS9BSBFiZMgeRhPs+ZWiGNt1piN8q9EHz1MTTkPLJjxio0MOwgsHIKNtLERWBiS2Cij/8yOscoT6sikqnC3TA9DnSyrQuxvvzV/706xV/qXXqNz9pC/6pLOD/2662M8+9P4H/qbc7+Wih1UuG/qJnzsuyHjSEzG8nINakOOUx0NBWTiwqKrIU3K4noLilIiUW8BmAEnLp3gVN0MCHpNLLeBBVIeOXGU8ep5bAhPhcCCQeo+KxbJT+9Woh/nYR8mKwpzy/QwiQNE9C974v52zndDDmP6Q9wX/m7rc0yw4kriX9UO+z6aXxPfcvhQKmZQ4b4CSnVkJvKrOUrN0VKU6uisq1RHQ7UnkgN1TdJlE7U856ItaTEpkU6LegvAxLi67NxigKdDvGMTeWq5CyyY3wt9wb6aOAX8DDaEZ1L4wAKp+6yqSfqKsco+AgpW5W7ONikOEDlV0xhpfjLgjcQ/f2Hzg8rNwWdD/+rlMX5ZHOhYrM5XG0UKKsSpjk4HlOronHmBXVb4g0xX0pVyc3DCcaqj1TFqTywqGlzuhvZC21rbvUNKJGB8XF32htNIEyCgMLPcLFLNhtHnvtsxoeG8ra2D//PMWUwWoCuy/ubcX8VG2iwKG1ggdZ8TNYKgdhFQcCKes53z3RDXmO97k/XAwknz967tg9hTHrT/Lv6H/ubcr0sptifLrnXXj/wphJsJ0tNJ2B+Vn1NBG+Xm4J3tJ9vt3hM3H2h+hp9rsgnAGUXFRW+Wm4OPQukv20+229tr+nhhuXTJd1uALGNh4F28aHjL1U21EJn31zg5LXGwmqTPq/PVE6G8z0fJ0KZuV9I/JP0k6WdJ30hSuTloTfPzTQR8XpZ0TNJLkn6l7Mx9Vyrt+ncuD8JkjdkMz8qfR8hWKu36z71GZ9V3Q1whoOBUdLuqGfa7LqtMgDkL7+C8i0+Q/1iUNQIBBe9uVdr113qNzgXfDRnhVfP3f9j+oBEHsH487NeUm4Ov+5tz8f88VoSgwv0oB/2273Ycymx4faL8nKBtSXqv1+g8dBVMMD/Dv2q2RdBKf3Pu7YrqF4u8mATyJICAQkvRRt23kh7JvNDH2bALYHMuicDCATxuxLQU9b2fZfrfYX3PfKcWtdfvTirqe1n6jgW92WL6g6/vcdwnvis3B1/v9/Obdn6X+P4/Nw6Y3/fLkt5VtLDytTFZqA2OJE8pAuPA1TPvwcN+/kPvwNcUvf989ptRLlfa9UdFWFcEElAYOeca57s+Ys6VhXdfdLuqoSxujgUrI6lSi7I+iBVijRBAQGFDe4dIHmnMMXLE2iDrfW6l0q4rg4GF+P35rYPPeibdUbk5aB02t99+st2uqB7/z5NFCCoEodKun+tHJxOzPAEbV1eS0w15M4B90I9SRaUhjpZ/KBMYSem5ABzLaEChJekvkr45aGEwzoZdIJtzSQQWRqjOVxv96Iadiz+jeMP4i/3+DMaZUKqhtob6nfm+/VrR5t5J+f/ehbzZ4jrtUUvSX8rNwWfJMcnVwZCnnxf1yYeSbktPF9+vSXpb7sewzyUdd/yZXpmft4uNtDiI8OVBgavDDL0Db8f/fuj9l4UNjet5D1KZ91gWAwobit5538z68x9jzvWGonef6z5XuBsxNjkcB4elFtAPcH0gFWCNkMGAwtN3saSZ3lH7rQ2kTPe5TN1MdZm6dURfvDnBXGxD5j1HUMGzKdP0ZJnz1EGWAzKLilIiPU3hZOEzAFiUofQhGxqxeWJzwy5jm3NJuUhNkyYHga+WpE9n2bwbh1lQ3NZen3td0u/kt89lasEwDvNddTVubUj6Q7yQdB1EOIz5c7tdna9+ZAJWH8rdz2ax0q6vFmWjzlFR8JuSnvk+2uhzyfdfItjpsu8My/V7L3GAIysbRSPnXDYl+txwgN3V5nRhbsTY5CEN5cj5meP1QTxXy8JhkLgI+WLexsoMBRS6iortOpsbH9DnfK9JpegwsTI4dj6a8tedrLTrqwf8/y/p+e96t9wcfDTNuPOCJL33X/9+VVJe87Hf31rbPe27EcNSStOTJc8sSF3wUHuiK+n68Am+rFhYLv3TdxscuBalMwPGk4GryyNP/maBmdj63GCRpFa5OQhmg8W8dx6k/Nj4irGtfur8/TxKfKNQ0kX5Wzyc8P1zGFelXe/I/s/paZpKy5+TOtfjV7k5OJqlcarSrt9V+vPf87J3SCczc+gM1K7b6DU6Zz19tjWW+uSknATPJ+U4qNUtNweLlvYZMvUOrbTrqa99y83BUUe3m7uS/p7FOo7m/ZqFG15BrREOY2kNMakNSV9mbfM8Q33O+xg31E/Gbs+M7+CJD4YnPm/jxSk/FFOqzlcblXZ9tb8515L/L00aWpLO9xqds66+gOZneEPRl83lz7Am6XJ/c+5BxqvFA5DXq8vS3th4vNforGZxQtxrdG73Gp3jkk4ommT6cNQsfIvsVdnppxvl5uCoy/fzQbafbLd7jc5quTlYlHRF0YLaNdfphKZixi7bAYWbZnzy3jem0Wt0bpebgxOKTr1bZ2qe5Z2NgEJX0buwnpV3Ya/ReWg29X29+87kbR2RgaLeG9qbc93OQj9LMu8/V3OuGvOq6TkozNyVdKXcHCz2Gp0LWeur0tP1wdlyc3BUjt6x+8jNGqE6X20oSg3ny01FG9RnsxZQkDLV575ymX5oDG/4bsA4uKngUEZOhabpiusTR+ZnmJXaE5k4/Zb5B7IAACAASURBVBnjpgKwx+NpkJakT7M4YTuM59ObV0JIL5KRU0aHCeL0uccbm5nva5V2/QfZmys6r3tlm8PCsN5PsMUycir8MM7XCdPwtLbolpuDXKT28JzOI4j33SiBpkDOzBgo2bmpYFFmbmtNyszXPpG/g1qZn7cdxHNtvyBTeHvO6uL9hkxibBu77w/NC+M6Qgf5rZ7tky0T+B63jfGNam4quFBp1183f8i3FNbEYT/x6UdnJ47Mz/AHRT/DLAQUpOhL+6DSrt8w0WcAGeDxNMiVcnNwItTNusTpzfNyf4r8csZOhoQoPhEcxOlzc3LTR3/LdF8zbbMZUHgr1DFqP71G56G5AdOy/FG/s/z8vHC+TpiFufWyKLe3FnJxmtxD7vlYUO+7Ucyc67j8zLng1oa5mRDEmDjMzNcuKLplY/s9O0qm522HcXD7ZZSWzM2EgPtcfKPQdZ9bzNDt1JNT/rpve43O6iF/HVd0czy2OO4tSrPXEu/JfktQwSKPaXpscT44mZ/hXUU/w6wGZFb6m3OtvF1lBkJlFuoug4/x2BjkYmGYpw0WKSrKRoB2Oi2zYL3tuyGTSvQ3l4uGPzr8rEnZ3Li+GOoG3GG2n2y3TTokm/1ohTHqUOdD3MTwFOQMOg2S+S58LveHvTZCfd+N4nHOBfvi4FdwY+IongNhQa4RPKXivWkOuQU/30v0uSuH/sfpWvH8fo7fBy/Z/BBzCyI5b353nF/X35xL7ss+IqhgSaVdP2fqJvgsEJoW56dBErUnHiuMgExNUdX4H0KOpAOhq7Trq3I7ZuRm4pbkaYMlFyc3PbjZa3SOh7xgNf3tuNzlUc3yZt60p5IOcyUvm3D7cRFYyNDptayJg+u3fTdkFqb9b8nde+9DR5+TOg+nb3O1QZuUmHO53jiDPbkKfiUlxkmXh0GCWyOYIIjLm1zxeziTtTpmYTa/Xd9auO5xX+8n8/dFB8G0v0zxa54egCo3B18TVEhZRtP0zOKm6xeiCcg8kHTZ1WemaFFRSqS7IUbTgZCZF7/LceN8HiduSR4WDlne7M2aeIPlgu+GpMX8XlxtqnyYtfe0aY+NTbpWyPmIJ2HG4/dkb1P4bUvPDdlGnoLrDtNpSVG6gVUHn5MqM99yeXCupRymbhuW2DgjHVLYbuYx+JWUOEHusqhuUGsExzfnc/UeHsW8m20Xuk+qKbqN58N38T/0N+d+bfmzHiX++dUxf018AKq1/WS7TVAhJYGk6ZnEhjxEOs2C+l2F/zM8Y1IirWZt0wLIMVcv/q5ycCJzXIlJnKvAwnXGzUPlMje+9HRT5byDj1rsb8594OBzxmZx4fCppedmkllUX7T0+FpImxoO5HLzzFE6rdjFkN55ibRHruR+syzJ/D5dnwJHenJ12OMw5vfqYs4WC2KNYOYJrm7O5/I9PIqHW11eAv9mfRcHl23faPwx8c+HBsGGar99K0kEFWaUSNPTUhhpeg7z9Gqpj8nbUMqN0CdTNUmX+5tzD1iAAnaZF76LYGS8mVuIxW0sscHi4nRIcFecHct9HzSTaReL1Kxt5r1m4ZmtPAafDmN+z7bmkTb+nEJ0M8+bZw4DC7WsBTgP4jjtUWE2y5I8HObA7OI9lNu+G+Ka+T27umGT+TWC47RHhQpixRweQJL8rRX+bv6+aDMNU7k5mPQ987QuXbk5+EgiqDAzMwm8rHykOrqSldx/pmjVCUVRyNCvgC4qSocFwALzord1KjUp95u5B0kEfV1cdQ7qirNDhemDZi5iu6/VHFwrnsSvLDzzWwvPDMV7lp5rq+5FSHIdUIg5SKcVy1qAcyTHaY+uFKGP7cfxbRnMJre3R8eVuGHjYt8m02sEh2mPChnEijk8gOQlkBVv2BvWbgcOB+0PCmCY/y8+SL8R/1qCCpCia6VHe43OapZOgpgNrFWT19RV7jQAgTGn5mxP3gqzmXsYs8h3scjNXM57zwrXB01fs/3+z1KhVBs3Xr+w8MwgmO+Kjf5j9dRYAAoRUIglNstsylqAcz9/PPw/ScX5otSBOQiBhWAUam62H8eBhUymQRradLWp0AGFmMPAgvNAltmXjQ9XLTr8/JcP+P+SwY0/xP9AUKHY4grxmb5Wmjgdy6QKwDMcnZor3GbuYRwtcjOX896zQvbBcnPwjuz2NZcT9X3ZWhwXsc8M+dLScw9adOXZRpECCjHzPbK9cZGlAOdzHOYIv8Jm2R4CC5l3nvfsHoeBhaymjXNRb4aAQoLDwILzd7S5rRB/l65bPNCSfL+M/H0OpZreSI57BBWKqatownY8pJdgr9F52Gt0jisaNEJPiQQgHS5OzRVyM/cgiUUuKSHcKOyiNZF+xKZ3LT//UP3NORs5ygt/y7PcHHxt6dHe+4wHLRPkKySzcWHzO5X1GzAuNlRuckPheQ7TcGEybO6O4Oh2lyRdztIawQRebdebIeg6gqPAgvNDSGbsj+tz1CR9fkCf/4OiQ9gnys3BZ5N8jlnTx3+9N/wZ5vd92fzP7vBckKBC8dw0dRNWfTdkWqbewqLc5PUGkFGOrpgWdjP3MGaiY/s0UlZPIrl0s+gLCPMdvGLxI85kaWGK9JhxysZG8EsWnpl172X5ZrMLZiFt8533O4vPnpqjzbJC3oIZl3kPuqgfhvEUfm52EEe3u+IUuFlhO/BK0PUAjmqxOU+7Zf7M43nsYn9z7sGoNpgD2A97jc7DSedqJjPMyF9v9luShccvDj+foEJxxKmOLuRhQWA6/gVF0bTCn8QDCsr2LQUWDIdwtMgt8m2F1lChrsIyp26spX/IQPDqDQvPLHKR5iQbKZBsb7BmDQF2PQ1S2XznvW3x2bOwvVlW6Fsw4zJzUpsBdoyHudkYHG3yrmRhjeAg8EqfG4ODun9e6h8NpYLdN7CQNhNQ+Ep7tStH3pQhqJB/XUULgaBSHY3LRNPOKoqEk2sSKAgHtxSYvI3JwaKhyLcVCn8yOGZ+Dp9a/IjfWnw2/PrRxkMznqomTRsE2PdYToNUy0KNlyQHm2Vd8a4b29CpVbhHf52A2eS12l8zclvBZuCVPjcBB+l5nddWGFFbZ7G/OffA5jzUvPsfaC+gsO9NGYIK+RanOrrtuyG2mZRIJxSd3iDfJJB/tm8pMHmbgAnA2AzsFvG2ws08HgaYheXNvMUC9rFCsPg9Kkqx5j/4bkAG2fyZvGbx2dOwvYFykXfdZByk4cL+6K8TctBfvd5WcBB4pc9NwMGNQue1FaTRgQVJX6Xdlup8tVFp1+9KupX41zcPSk9YSrMByIyNcnPwzvaT7Xbvie+muLP9ZLuthlar89XP+ptzf5X9XOsAPKjOVxt9u9/vK0zeJrP9ZLtdUf09RScabIiumzZ029Lzs6Zbbg4+KtI7fAJ/kKV+lsM+dtJ3AzLERsoQKzcgMobg5gi9RudhpV3fkJ25yNuSMlFbwJyCtLlZxi2YKZg510U9u+kD++ivU3DRX/ubcx+ooVVbzz/EuxafTZ+bQq/RuV1p19+Vvf2CDyX364XtJ9vtarN6IrHXWZN0q9Kufyjp01n6SnW+2uhvzn3QjwIy8e2ErqKg1oHPJaiQLy2ZzlTkjQgTXDhrJsKfq3h5b4Fcs3zNtUURrOmYTZabklYsfYSXCZwn17kpM5rpZy3Zebe/q+L0sUJhXJ8Kwc2D2Qpw1irt+usZCebYvBXaLTcH79C/puNg0wzPor/OwEF/vSi5DypYTsdLn5tBuTl4p78519LeBnmaFn29pxN7necUFVCuKVoTxcGFbyV9MU7bTCDh15Je6z+/ft+Q9IdxnkNQIR+6kq6zYHqW+QIcH/rCAQiYuaVgs5DhexafnXvl5uCj/ubc28rZBM6xbrk5+IxFxIE+lZ0Tb3nbnMnb7wduEdw8gOUA5xuSvL7rHNwKvUj/mo3ZNHvsux0FwXg4I8ubvLVKu37Ow6n+31l8Nn1uBuaGzHVJly19xO/k8T3da3RuV+erX5vDlnFAYNH8tVJp17uS/iHpJ0k/D/3ylySd7I+evzw9qD5uW6ipEL64bsKq74Zklam3sCi7hUQBOGCi6bYChBsF2LC2ykEeS5uT96xgEXEIM9G1kp83b8V3s1b0FcHolpuDz3w3IgC2isd7T13W35z7wOLjSemRAjNXYH1rX4vxcHYO1gg20xDtx9ZBN/pcCsweqa2af15reUjRd6rX6FwoNwdHFb0Lkr/XmqKDASuKAivJv1b0fEBhQ9L5XqNzfNL3M0GFcLUkneg1OhfYfDhc/IWTdEL2ijwCsM/ahNEUEsOMzETE1gTubd8TONtYRIzt75ae+4al5x7mG0vPzVrRV4Th76wvDlduDr629Ogs3DL6rcVnU/w7JeXm4CNRtNm2TxkP02F5jXDG5RrBHNqwddCNPpceW8H/+LCjd/FeZ6/ROa5ov/OKoj3Pg75rLUWBiPPl5uBor9E5O22wn6BCeLraiyBxonZCvUbnYa/ROSvpvOy90ABYYCaKthbaN5m8pcrWBK6WlQmcJfTD8X1h6bneTwinzPtJKgTJ1vcrV8x4beWwks9bU5YLNHMrNEWmD1733Y4ca3GrJnU2N3lt3rAaZuugG30uRZYDWT5uxxzI7HeumiDB8V6j88I+fx03gYjbs649CSqEJU51dNt3Q0JnUiLFUTxOdwABsLmZbE56ISVFm8Cl6DvfDQiF2ZSy8f5+ycIzD1VuDqwddLBc3B7502LTdyJfWnruy5aeOw6bqQa5pZAyc8OR9awd1jbAi8ryGsHmDaunLB90o8+lz9bP1OntmKwiqBCOK6Q6Spe5JrRq6i0AyD5bm8kbjK1WWJvAWXqub10ODUzMRgqkRR8LBMtj0Aq1FTABNjQmYDEFks/UZbZubHFLwQLz/rCVErDIODFuj633zKKLW14WD7p1Lb5TCstmICvnN+jHQlABhcdmIpB9lk+E2DplWGhmUmyrmO45G8/1jA2ByVm52dHfnPN12MBmzafreStCDTvY0JiMWUfY2Kz4lYVnHspy6iNuKVjCjVsr/uK7AXll+baCi1tetoK+1DOyx9b3Oc836MdCUAEAkHkWTwFwCskSyyfnjll6rk+kPpqQxc1PX2lHfrL47Jqkrwgs4BAtNjSm8q2FZ75q4ZnjsDX+kVbLIpv1PYrKpJWCPbY2eT+09Nykt208lOCgPRa/z77e1ZlBUAEAEIJjlp7LKSS7bBX7dJIz1SVOB0/ObKLYuA1zzMIzx2E7sBQHFs5Z/hyEy8bmeBHY+O7WLDxzHLZOXZJWyz5u3qaH1KiWWdzktZrG0hzOsDE+E9S3yGLgtVb0AzsEFQAAIbCyicwpJLvMqUQb15u95L23iIXE9P5h4Zm28okfyNyasl1ssybpVqVdv5uz7xDSwY2p6fxo46GeNiqspJokcG6fo3dIURCgsczm7RrLee5t3eYi8Gqfre/1G5aeGwSCCgCATDMbXzby+7KR64aVk685K4zF6eDp5e1n56q2xpn+5tzjSru+SnABCVY2x/MuL2l9LAYxOPXtDvWZZtclNaoztjZ5j1l6rmTpNheBV/ss/oy9HEbKCoIKAIBMs7h5zIkQN2ylQLJVJM2Hn303IGCPLDzzJQvPHJet78t+Lvc351oEFyDlZ3PcExu38lzXd7F12pJT3+5w22h2Nm5AYgSLm7w206TayKHPQTcHLN6OsXLDLxQEFQAAWXfM0nM5kemAxRRIv7LwTF++8d2AgNn4Htu4GTUWi9+Xg9S0F1y4QXChsCjyOhsbweFjFp55ECunLTmB6w4/61QQBHPE4iavlXmcmR/ZqKdAjT93rHy/i1xXgaACACDrbCxyW5zIdMpGippCnwpBrvm6RVWTtGLSIt2loDMwkZ98NyAFNm5pcQLXIZt56ouCwIxzwWzyWrw9z+Eid2wdKnR9szAzCCoAALLOxiI3b3nYs87Kdfy8nAohwDW9PP7sTC5n17cVhp1RVNC5U2nXb+Tlu4YD8V6cjY2bCs5SsVmsX8UJXPf4Lk+PIJhjFoM4NjZ5j1l4Zi7nslllftY2Ctofs/DMIBBUAABklsVFLjlnHeLUF0KTgU309zx/fqwmaUXSg0q7/oMJMJzz3CagKJyl+etvztlK+8YJXPf4mU+PgIxjJohj4yCFjdprNm7Pc7PIPRt1UwpbrJmgAgAgsywucqmn4JBZMNg4FWKrqKRLvk+kI4PMSaorvtsxZFFRgOFWpV3/Z5wiKQMBGKTjke8GwCsrqRs4geseP/OZcOjIDxs3vWwEZW3cHstD6rzQ2AgeOrtZmDUEFQAAWcYiNz84FTKajYVU0eQyMNNrdFaV7RNsZyTdUnSLoUOQIXgE22cT+unwYxaemcuxORD87KfDOOiHjU3eVy08k9vz+fDIwjNtHYTMPIIKAIAsO2bhmVnepMszrpTDltwGZsrNwTsKY3OoptFBhlWCDEAQbATpee/7k9v3ok0cOvLGRlC2lubDTEpeGwhkOWYrLW9R57sl3w0AAOAAXDPNj0cWnmnjFBKQGdtPttvVZvVEf3PugcI6BRUHGc5Iulxp16UooPuTpO/KzcHXFMMEMsXGfIuNbX++VTT+YnwhBPBzqdwctPqbc6k/t9Kuv55WoMhiSt4/mjkSHOn7bkDOEFQAAGSZjXyYLHL9sHESJ9VTSEAWBRxYGBYHGVb6m3OqqN5SNB5/K+mbcnPQItAAeGNjbAk9JVTIHvluQIBYH3iy/WS7XVHmN9atpOQVwb88eVlS4W47kf4IAFA0j3w3oIjKzYGVE2AWryMDmbH9ZLtdbg5OKF8nKRdlbjJIetDfnHtcadd/SKZN4vsNAFMhpcrkSNfll430tGkGAo6l+Czk0zHfDfCBoAIAIMtsnN5goeWBrRPIFq8jA5my/WS73Wt0jku66bstFu0XaLhRadfPEWQA0mcrDzT56f2xdZADCMwx3w0A8i4OKnwrievG03kkqeu7EQCA8bDQ8oqfPTCjXqNzQdJ5FWf+uShpRdItggwAcDhSyU2FdF1+Zf2miI26M8iXk74b4MOLkrS1tnunu37kFUnXPLcnOL1G53a5OVhUvk+NAUBusNDyiny1QAp6jc5tSW+pmIG64SDDXQIMQObYSGWCyRQl8AzsJ81NXht1/oDgPU1/tP1ku721tvuxpCVJ9/01KTzmOvoFSSfEBCo4LEKBbOK7iTG94bsBgA+9RuehSYd0xXdbPDujZ28xEGAAAOkfvhsATOCR7wYAmNxzNRW21nbvbK3tnlYUXOA05wTM4u6soivpRTw5FqQ85ONm8Yw8ysN3EwBs6zU6q+Xm4Kg42CJFtxi4wQBMJs1ipkCQSI/qHTXvgADtW6h5KCUSwYUJ9Bqd24mTY1w7hHW1pZ3/x3cbgECwYPAr6/lSgSCZW7NnFd2aZZyLxDcYWqYGg5VitEAOHPPdAMA30qMCwOT2DSpIeymRTHCBlEgTMifHqLcAANlBTn8AuZVIicSt2T01RTUYHsS3Fzy3BygCDhEAAIrkVd8N8OHAoELMBBdOi3oLE6PeAgAAAFxK3Jpl/vmsM5JuxbUXfDcGAAAAuVDz3QAfxgoqxKi3MD3qLQAAAMCleP5pai7cFHPQ2KIILgAAAABTmyioEBuqt4AJ9Bqd2+Xm4ISotwAAAAAH4puzidRIpOaMxMGFuxR0BgAAAMY3VVBBeqbewlGREmkiZmFHvQUAAAA4ZVIjXTC3F86L9EiSdKa/Ofe40q6v+m4IAAAAEIKpgwqxoXoLpESaAPUWAMC5l3w3AACywMxDb/canbO9RucF7d1gKHKKpMsmJdLrvhsCBO6k7wYAAAC7Zg4qxEy9haOKUiIRXJgA9RYAwJlF3w0oODYZgIyKbzAkCjwX9RbDoqSvqLWAAnnkuwGAb6TAA4DJpRZUiJmUSNRbmMJQvQUAKLRyc0CQFeN45LsBQN6YAy/JWwzx/HRDxagJVlNUa+GG74YADvzouwGAb/3NOQ4e+fWy7wYAmFzqQQVpr96CopRI1FuYQKLewlEV83QYAEiKxkPfbUAQ2AwBLDNBhlUTZKgn6jHcVL4DDSuVdv0GJ1gBBOhV3w0AJnDMdwMATM5KUCFmUiKdFvUWJmaCC2cVnQzjtC4ApITNIa+oaQHkQKIew4U40KC9lElxoCEvVvqbcw94dwATOeO7AVDNdwMAz75N8Vk/pfgsIDdKLj5ka233TnW++kptaef3ki65+My86DU6DyUdr85XG70nvlsDAOHrb84tqkGg2xOulgM5ZeasDyXdjv+dKXj8sqR3FQUVQx0DFvubcw+qzeoJbtEByLrqfLXR992I8Lyh6B0GP7Jed+1n3w0AsshJUEGKTjRtr+nj6nz1T7Wlnb9JOuXqs/OABQyAgtpQ+qfdXhaLBudsLXDLzUGLoDuQTcOBhup8tdHfnPu1pNcUbSCEFGQgsIBc6jU6DyvteurPrbTrr5sxAI5RHwCQlP26a61eo3PcdyOAWVhNfzSKqbdwWjlJiVRp11/nOjQABOWY7wYUka0FLpt7QDiG0iYdH6rNEEK6z8X+5twnvhsBAIeg6O3ksn5SPu9spExLs+7aNyk+K0bwD8FzHlSImXoLRyVdU9jBhTf6m3OtSru+SnABAFJnI38lef39sLHAzWtxWKAQhoMM2qvLkOWaDCuVdn3VdyOAlNkI6r1h4ZkYzzHfDQgQ6wNPiryPVuTfO/LBW1AhtrW2+3F3/cgrioILoapJutzfnHtQadfP+W4MAOSIjfyVv7LwTBzumIVn/sPCMwF40mt0Hpogw9leo/OC9m4xZC2AeNnUiwDywsZ8i01afzh1PzlOjXti6zZzmunXys2BlduUpCpD6LwHFaSnKZE+VpQS6b7v9sxgUdKtSrt+l4UGAKTikYVn2rhei8OxwAUwkcQthrqyF2D43HcDgBR9a+GZvPf9IaAzBfZwvLFxqynVuYLFdKvc6ELQMhFUiJmUSKcVfr2FM5IeVNr1G1xnAoCZpJkL8ykWDV68auGZNjZBAGRQHGAoNweLigIMvmswLHJDGTnyyMIzOYHrDz/76VCLwg8bAUgbt5ltpGYk+IqgZSqoENta272Tg5RIkrQS11vw3RAACJGtq6Zi0eCUCbDXLDz6kYVnAsiwRB2GuAaDz/oLH3r8bCBNHOLICX7mM3nNdwMKysbNGht1+Ww808ahK8CZTAYVpL2USN31I0cVdkqkmqK8qz/wggeAyZirpjYCCywaHOpvzv3a0qOtbIIACIOpwXC23BwcVZQayTVuKyAXLB7iILWHe/zMp8epccfMwSMbN2u+C+SZNfYJEbLMBhViJrhwWuGnRFpUlBLpLimRAGAiNooHsmhwy0oQJ80CbADCZW4vXJCfmwvvOv48IHUWD3H81sIzcTDmuNNbZK/Grf7m3AeWHm3j4JGtw0zcoEewMh9UiJl6C0cVpUQKObhwpr8597jSrq/ywgKAsdjIm7/IqRCnbCxwfaY8AZBB8c0FRTUXXBV0PsOcHjlh4xAHm7QOmZ/1Gd/tCJnF27UYzUoQzMbBI4uHmTicgGAFE1SImZRIeai3cNnUWzjnuyEAkHGPLD2XUyEOmOCNjWvNNvKaAsiBXqNz2xR0dhJ8tHjSEnDJxiEONmkd4medCjZ4HbEYBLOVzs3WszmcgGAFF1SQ9uotKEqJFHq9hVvUWwCA/ZWbg68tPZoCm278ztJzbeQ1BZATJiVSfGvBNtKNIA++sfRcNmndoWbY7Cic64jFIJiVAKnNZxMQRKhelKSF5dKbIUbGTEqk08pPvYUbIf45AIBNFvP8ciXfDSubbRaDTQBypNfo3Jb9wAKbUAiexdQenMJ1523fDciBGtkknLEVcPzC0nNtPpvgK4IU31Q4WVva+X5huXTVa2umtLW2eycnKZFWTEqkVd8NAYCMsXUqhJQVFllMfdQywSYAOJSDwEKNW8fICSspwziFa5/ZCK/5bkdOsMFrmc36H+XmwFr6I4vPJviKICXTHzUkXVpYLj1eWC696atB04pTInXXjxxV+CmRLpuUSOd8NwYAMsLWqZDfWnouIrZSH9m81gwgh0xggQLvwMG+tPRcUk7ax0Z4etjgtcziwS6rB4/Ms20FXznshuCMqqnQkLS+sFy6F+JAaoILp5WPlEi3Ku36XU4+ASg6i6dCFhlj7TBzCFvX8KmnAGBi5ebgHYuPf8PiswFXfrT0XOZbFtk89V1UbPBaZ+tg16eWnptkK/jKYTcE56BCzadqSzuPF5ZLV0MMLph6C0clfeK7LTM6I+otACg4m6dCJP3R0nMLzaQ6sHIN35w4BoCJmHfJTUuPf8nScwFnTF0FWwc5mG9Z0t+cC33PI4vY4LXEZOSwkR5VshcYfcpiXbdFspUgNKUx/ptLtaWd92sq/efW2u7H1luUsq213Tu+25CSlf7m3NsV1S+ymQKgoL6UnVNYZ6rz1QY5+lNnK9UB6UuQC5V2/a6Fx/7Ua3QuWHhunnwhacXCc39l4ZmAD9/KzoYf8y0LqvPVRp8CzTYsVtr1c+y9WGFrjdCyWHD+qe0n2+2K6i3ZGSc/lHTbwnMBK8YJKkh79Rbel/QfOdqoD01NUUqkDyW952LABICsKDcHX/c356w8u78594kaYiMuJZZPINm6cgy4ZiVIKjGWHaTX6DystK1tBgB5YCvwpv7m3F/V0Fkbzy4qk6aHAs12sMGbMstrhL9Yeu4on0q6ZeG5BLMQlIPSH40SdL2FHFlUlBLpLn8OAIrCcgqkFcbTVNk6gdS1eOUYyAXGsrFQ7B3Yh+UUSGeorZAeM95f9N2OHCMdTfqsFW0vNwef2Xr2iM+yuR6hsD2CMe5NhWGnaks7j2sqXeuuH/kTVxi9OdPfnHtcUf1KuTn4jD8HAAVgKwUSp+dSYvkE0t951yFHNmRhPOtvzi2qIb4nB/tOlk5iAznxF0mXLT37jxLzrTRwS8GJD6vz1a+Zf87O8hqhCfr6+AAAIABJREFU5fLPyKRAsjKPE7cVUlOdrzb6m3PWbqaSPWbymwrDLtWWdr5fWC5dTaU1mNbl/ubcA6LoAPLOnArpWno8p+dmZE7MXbf4EV9YfDaQF2/4bkAArBdyBEJm+cTvGdatszNzLluBH+xZNMEbzMDBGuFTi8/ej82UrNe5eTo7U8T+gaW/fufwt5JZswYVpL16C48XlktvpvA8TGdRUb2Fu2yKAcgrcwLl7xY/4nOLz849M3GzdWLOSfE1wCFbKXhOWnougIKwnHJSYsNsZv3Nub/6bkOBXKS/zsb0V1trhK6PU/3mM22liqvxHZ+N2Re1diu13Bx8ZOvZIUkjqBCj3kI2nFFUb+EGfw4A8sjyC3yx0q6vWnx+btmeuMnPCSTApkeWnmslRRyAwvmDxWezYTYDc9ODsd4d+usMHPRXmzcgDmNzfcKtrtn80eKzN0iJFkkzqBA7VVvaebywXLrKprZXK/3NuVZRNseq89UG/Q0oBgen5y5z42syZvy1ecuDAs3II2speFiEApiV5YLNEhtmU3GQRgaj0V+n4KK/uizQPOKzbabmlbjVNRUHgSybqa+CYiOoEKPegn81RZtjP+R1g6w6X21U2vXV/ubcY5sFWABkjs3Tc5L0ORO48Zm0RzbH4OucBkHeWE7n9a7FZwMoDtu3BK/ndZ1qi+U0MjgY/XVCDvrrTZ9rBPPZNoMmtf7m3AOLz88dB4GsFkW099gMKkjUW8iKRUUpke7maZOs0q6f62/OtUSBKqBwzGaczdsKi2ajHIcwJ0Fspj3q+jyBBFhmaxw7k6c5nwUvW3jmTxaeCXhlOWe4FG02cpBjTCYLAWmP/KG/TqDSrt+Q5f6ahbz2Zp1i87bCovlZYgwOAlmk5E2wHVSIUW8hG870N+ceh15vodKuv15p1+9KuiVOaQBFZvu2wgrXnA9mTmvZvoLPLQXkma1izepvzn1g69k58JqFZ/5s4ZlAFtjeQDlKvvrDmTkph+n84+DRGBwcOpI831KIObitILEuHYuDtEfcUhjiKqgQo95CNsT1Fs75bsgkTKqjG5IeiBMaQOE5uK0gSbe45jyaeY9/JbvBXW4pIO++sfjsi8y393XSwjMfWXgm4J2j2wpnOIm7P0eHODA+NngPYPrrLdufk4VbCjGzXrE5TkrRuvSc5c8IlqN+xy2FIa6DCjHqLfhXUzQoBVFvIZHqyHa02xab1+GAIrN9W0GSvgphnHSpOl9tmPyetm+LcUsBuWa5EGqN05TPM4EWGzVgrBXeBjLAxUbKiknvgwQzZn0ubuhnDRu8I5g101cOPupKltYIpi0uxknqeoyQOOxmE7cURvAVVJByUm/BRCSv+G7HDDJdb8GkOvpBYac6ulluDigiDVhgNuRuWv6YmggsPMMEFGyPay1uKaAgrKVAUrRJx9iVYCstlOXC24BXZiPF9u1QSbrMRu2exCEO1pLZxI3mhERAwfa+TSZvMjsaJ1mXDnF42I1bCiP4DCrEgq63sP1ku91rdFbLzcFRuZlo2XLGpERazcKfg0l1dFdRqqNQJ1Ebkk70Gp0LWYqiA3ljrr7avg3EBM4w6QlcjMufMnaiCBxc36eo5LN+a+GZtlMeAFng4naoxAlwSQQUAsL6QE4DCpJ0McNrBBfjJOtSw+E4ucEthdGyEFSIBV1vwQQXzko6oXAXFjVJl/ubcw98TeRMMGG1vzn3WOHWTWhJOt9rdM5yag2wz1FxLKngE7hEsNdFGjombigMM4bZPJhCUUnDzG9tLDxt3jYBMsHR7dDYrSLXWCCgEJRCrw8k5wGFTK8RzDjpIpNJTVHGkXMOPiuTHI+TroLqwclSUCEWdL2FXqPzsNfoHJd0XuHm0V9UNJG76/LlaOomPJB02dVnWnCl3BycyPKLDsijXqOzKjcB3UIuHBKTNhfB3m65OXjHwecAWfKl5ecXvqikObRkKwD9haXnAplibla5OkC3ktUUvTZV2vXXCSgEp7AbvOb37CL1jBTIGsHhulQq6M0uxwGFmxwW3l8WgwpSDuot9Bqd2yaPvqvTHDacUfRyvGFzMmfqJtxVVDch1MnTRrk5ONprdFYzfBUPyLv3HH1OoRYOHha3Wb7SDFhhDiPYXoAWcuEZs5lvt9wchHpLGZiIeT+7mm9JUYreB0U5zJE48R3qmrjoCnXDxvxebzn8yJDWCC7HyVu29+yyxPHatOUgTWnQshpUiOWh3sKFHNRbWDH1Fs6l+VCTSuOGosh2yKmOTvQanbMBveCAXHJ43TSW+wmcGfddLm4zfaUZsMxFAbhCBhYs14LZYA6IInGcBkmKvrtf5X3sqrTrq3J34hv25P6GjdnH+UFuUqLGglojmHHyvMOPXClCANbD2vQ95ngHy3pQIUa9Bf9qihaiP6QxUJlURy25fRGlqSvpSq/ROc5VKCA7zHVTl0HcXE7gEvUTbsnd4jaIK82ALY5uK0jRfG7Vwedkggko2JxvkmcXheM4DZK0txbN3WZtYs4VcgpgPOuMjUOZWZDYx3F5mybINYKZ17lcly4quk2/6vAznUgcSHa5NiXt0RhCCSrE8lJv4YrCrrfwYNoJnUl19IPcDgZpu1luDhbN5iWAjDGTTpdj7NMJXB4WuonFgusbZG9xEgRwdl3+ch4355IcFZdvseBEESXSILle0+Zqs9bjnAv25SoQNpSy2vU+Tkhpj55h1qWuDxZfTuswcBYkaq+6PJDc6jU6Fxx+XrBCCypI+ai3sJqHegv9zbnH426iJRZ2IRedilMdXQj1pQYUgfl+vuXhoy+bWwvnPHz2zDwvFq6wMQc8vS7v6lRbbnOVJ/Lt2t6o+4vl5wOZZcarix4+OtUb9D7k5KBdHtkIksWBsCAPH2UgZfWVkNIeDfMYgJ3pMHAWDN2cd30z5oTDzwtaiEGFWC7qLShKiRRyvYXLB50WMQPBauAnMLqSzpPqCAiHhzyWsUXtLXTPefj8iSWCCb4WCxvc/AL2OL5tFfyiM2lo88P2ArRbbg4+s/wZQKaZzT5fB+Wejl+hBBeG5ly2xqiuwk257JutIFlNe/smQQQX4vdpf3PusfylrM7FGsFjAFbaOwx8I5Rxcqjv+VibBnszxoeQgwqxoOstmJRIZxVtfoX68n96tS85UCWuKV1WuCcw4lRHt303BMBkMrDQjYMLmVw8VNr1c56DCZLUCjFHKmCTWci4Xnzm4iSl482P6yw6AckclPN5SO6MouDCD5V2/VzWxjAzPp0zNxNczLnekvSz5c/IJQc58JPBhRtZ66vS3vrAczBBytkawfQtHwfeYivaC8JmbpyUMtP3gr4Z40MeggqxSya4EGpKpNvmik3I9RbiCd0NT9eU0rQhUh0BwcvAQndR0eLhcRYmcWaydqPSrncUjdE+b5B1y83BCcZY4HmegqKZ3+wY5nEB2uKWArDHU97wYYuSbmVtzmXGJ1frYtJJzshRX65JWjF91XswzNyguZFIyeU7w0Qu1wieD7zFzigaJ1vmz/ycz8ZkrO/dzMPNGNdKvhtgwfrCcum+pE+21nbv+G7MJLafbLfV0Gp1vvpZf3PuE/mNDM8i1HZL0QTiU6KTQH6Um4N3zK0p30HOM4pOA6ui+oakbyV9Y3PxZ26PvSzpXUmvKju3xrqiMDNwoF6jc6HSrp+U+7Er3uxYMWPVl+Xm4OssfF+r89VGf3Pu1/I/pn2ahZ8HkBXbT7bb1Wb1hEl5m4W5hu85F+kkA7X9ZLtdUf09SV/JTV+Og2GqqN5S1Fe/s/neTfTV1yS9rWx8Z2O5XiOYuZ3kf8+sZtqwUmnXbyk6hOdynMxa36Mw85TyGFSQpFOSTi0sl+5314/8JrQByQQXLlTa9S8k/VH+I8VF0JV0vdwcfBZafwFwsMRCNwuBhdgZ89dlM7FsKbqq/q2kR5J+lJ7m4DxQIu3cy5KOSXpJ0q+U3XdHV9JbnKQDDlduDnxv0g1vzH0p6UdX39+hxefJfjbG8A0OnwDPM5uxb8ndZuy4bM65Tiqad/kem1rl5uCd3hPPrciJXqPzsNKuX1R0ctqlRfPXSiLI8FxfLTcHrcP2LAJcH0gFWSNkKLCQVOS1aavcHJxg/JxOXoMKsVO1pZ3HNZWuddeP/Cm0zWLzhT1rriRdV7YmZ7lRbg5akha3n2y3GUiAfMpoYCEpXkQ8M9kyk7o8KcRiAUhLxjbp4gVnPDZtSPpJ0neSfhxnk2PYUNHAN8zfTyY+L2vYuAMOYDZjszJm7Sdvc66upPdC2+vIul6jc9v0CdeBhaSRfdUEHPy0yK7CrBEyGlhIyts4uZ9WHlNtuZT3oELsUm1p51JNpaXQUiJJ0QutOl/9ur8594GiosdIEQMIUAwBBBbyjoACMIUMb9LFQYYVaeQmx3A9myylYJsGG3fAGDI8ZuURcyuLTGDhNWV34zcvupIuFq0fBxBYyDsCCinIU6HmcawvLJfuhVjMefvJdrvX6KyWm4Oj8lt0FACCtf1ku11uDk7If5GsommJRS8wNfPdeUvRwjsUZ4b+Cn1zsXAbHsC0Ah2zQkNAwQGTZ511gz1xP77tuyE+mP513nc7CoiAQkqKFlSQonoL6wvLpXvV+WrDd2MmZYILZyWdULRJAwCYgBlHWSC4E+WpZNELzIRNOq/OF3XDA5hWr9F5WG4OFsWa1QYCCg6xbrCGfqzoRoyiwALzOzc2CCikp4hBhdip2tLO44Xl0tUQgwu9Rudhr9E5LgYfAJgKJ0OcuMmkDUgPm3ReEFAAppS4IcqYlR42Yj0gsJC6Vrk5WKQfR8w8g4Mj9t3sNTpnWZump8hBhdglE1wILiWSFA0+ZnHJCw4AJmQmcCfEBM6G871G5wKTNiBdiU060mHaR0ABmJG5IXpcrFfTQEDBIwILqeGk+AiJgyPM7+w4b77DSBFBhT2h11u4QL0FAJgcE7jUtSSdYCMOsCeRDvOK77bkVFeMY0CqEjdEOcgxHU52ZwA3nWd2npPi+2N+ZwVzOosIKjwrL/UWzosrpgAwNiZwqdmgfgLgTq/RWRWbdGlj4w6wJJHig7XqZEgnmSHcdJ4Kh44mYOZ3pI6b3QZzOrsIKowWer2F2+aK6RXxogOAsTGBm1pXnDwCvEikwuS21exu9hqd44xjgD2J2oAc5DhcPL8inWTGcNN5Ijc5dDQ508dOiJRb07rC2tQ+ggoHC73ewmqB6i1slJsDNgEBzCyx2OX073humhMgt303BCiqoduqjFuTi09QkmsXcISDHIfaYH6Vbdx0PtTTdysbu9OJU50rGisJYI0n7nervhtSBAQVxhN8vQXldxDidCwAKxKnf4sQmJ3GhlgoAJnCuDWxrqKTbMc5QQm4x0GOkVjfBiYRIMvjfss0eLemzIyVpDo/WDx20u8cIqgwvqDrLeR0EOJ0LACr4sBsuTk4KhYKsZbMYpcJG5A9jFtji+eRq74bAhQdAdGnWN8Gami/pcgBMt6tFpmx8oRIdT7sCmOnHwQVJhd8vYUcDELBnY4Nsa8A2JO43lzkvJZxMOE4EzYg+4bGLYILe26Wm4OjIc0jgSIYCogWba61wbiUD4kAWcj7LdPg3eqIGStXE/0sL4eGpxH3u1X6nR8EFaYXbL2FoUEopEVmkKdjF5ZLV2tLO9/7bgeA2ZlTSMkFbxEWC3Egl2ACEKD49GTBxq1hLUWn2NjwADJuKLiQ943ZeEOMVEc5MmLTN699uCverd7E/SyRQq4owQX6XYYQVJhd6PUW4hNsWR+ArpSbgxMhbWgtLJfeXFgu3ZN0SRI3FYAcSSx4F5XPSVxyAy6oQC6A0Qowbo2yob0bVpxiAwIytDGbpzGLIGdB5LgPx+/WOu/WbOg1OrdNcCG+VZ/HQBb9LoNKvhuQE6cknVpYLt3vrh/5TWid22wWHa+06+ckXZdU89uiZ2yUm4N3tp9st3tPfDdlPNX5aqO2tPN7RcEEADm2/WS7rYZuS7pdna82+ptzv5b0oaRFvy2bSkvSt5K+iIMIoYy7AMaXs3FrWFfSPyR9WW4Ovg5tTg7geSPGrA8k/VZhjVldSX+X9F18SI45VnEk+3ClXX9d0u8kva1s7bscpiXpU96t2WbWcA8lXTD7e68pvL6WRL/LOIIK6TpVW9p5XFPpWnf9yJ9C6/S9Rud2db76dX9z7hNJK56b05L0aa/RuR3ShGthuXRV2nlf3EwACmefjbp3Jb2q7E7kNhQFEr7hNgJQPPuMW69JOqlwNuxGjmMhzR8BjMeMWauSVofmWmf8tmyk+LDGdyHdtodd+2z6ZvGdOzJIz7s1HGbcua2or8XBrCz2taSn4yb9LgwvSNJ7//XvV8WpahuWttZ27/huxDTMJO2vcj9B60q6Xm4OPgspKGPSX32k6NbKSFtruy9Y/vx1W8/PkGtba7sf+24EMCkzkXtZfhcOLUk/iyACgDEkNuyOKRq3shAg3ZD0k6TvJP3IOAYgZuZabygar16S+7nW0/GJU7X2Vdr1f6b9zF6jY229fpgMrBV4vxaEmd8tyu94Ke0Frhg3A0ZQwb77kj4JNbhgXm6fy80g8zTVkYPPSsUkqY4IKqSCoAJyw4yvUjShk6JJnTT9xC6emEnR5OxnSY/EwgBAShIL0ZcVBRtekvQr83/PuiiNA5/S0BhWbg5aIc0PAWRDYqP2mJ4dr6Y5ODdqnvWN9PT0ORzKW1BhlKH+O+s6IfmO/db8/Rver4gdMF7Ocqhkw/ydeV1Okf7IPuotHK4l6b1eo/MwpGtNpDoCMIvEAvTQhWhiI2/UrwcAJ0zqkbbGGLfSFNL8EEB2JFLNHIh5FrJo3P6bOKgkSZpkw5b3K2Lj9jfp+T6X+PXjfRb9LjcIKrhDvYXndSVd7zU6qyk9z4lxUh0BQJoSG3kAAABIEfMshGx4M5cNW9hG0BWxF303oIAu1ZZ2HpuN6aBsP9lu9xqdC5JOaO8a07Q2ys3BYkgBhep8tRHdTtC6CCgAAAAAAAAAKCCCCv6sLyyX7oUYXOg1Og97jc5ZSecVpS6aREvSiV6jczak2xoLy6WrtaWd70XtEQAAAAAAAAAFRlDBr1MywYXqfDW4vPy9Rud2uTk4IemKolRGB+lKOt9rdI6HdFVqYbn05sJy6bGiYEJwf0YAAAAAAAAAkCaCCtlwyqREuhpacMGkRFotNweLkm7u85/dNKmObjts2kxMqqN7ilIdBfVnAgAAAAAAAAC2EFTIlrzVW4hTHV0INNURdRMAAAAAAAAAIKHkuwEYaX1huXRf0idba7t3fDdmEia10dlKu/56SGmOpCjVkaQ/i5sJAAAAAAAAADASNxWyK/R6C8EEFEh1BAAAAAAAAADjIaiQfcHWWwgBqY4AAAAAAAAAYHwEFcIRbL2FLFpYLr25sFx6LOmSuJ0AAAAAAAAAAGMhqBCe9YXl0j2CC9Mh1REAAAAAAAAATI+gQpiCrrfggwkmkOoobPe760f+5LsRAAAAAAAAQJG9KElmo+6+57ZgctRbGMPCculNE0wg1VGY2pKWttZ2T28/2W77bgwAAAAAAABQZC9K0vaT7fbW2u5pSUuKNvAQFuotjECqo+C1JV3bWts9urW2e8d3YwAAAAAAAAAMpT/aWtu9s7W2e1TSNRFcCBH1FvRMqqPHItVRqK5114+8srW2+7HvhgAAAAAAAADYM7Kmwtba7sfd9SOvKAouICyFrrcwlOoI4bmvKNXRx6Q6AgAAAAAAALJn30LNJiXSx931I0dFvYUQFareAqmOghenOjpNqiMAAAAAAAAgu/YNKsSotxC8XNdbINVRLpDqCAAAAAAAAAjEoUGFGPUWgpe7egukOgoeqY4AAAAAAACAwIwdVIhRbyFouai3QKqjXFgi1REAAAAAAAAQnomDCtJevQVFKZGotxCeU7Wlne9Dq7dAqqNcuNZdP3KUYAIAAAAAAAAQpqmCCjGTEum0qLcQoob+//bu2DWOOw0D8JfLgj0YnTptI44Dh9w14sqkisWBFQhR6ypwqdwF0idbea9Okc5cZVylHVezhdkr7h8wuFBhMEy1uLjRYmSJsXzF7uRkJ7ZlaXdnZ+Z56lj6wK7mze99Z3sLj5pQidSGqqMmBThLoOoIAAAAAFrgUqFCxd5Co23FGu8tbO/3bral6mhz7+hvdd9Qg0moOgIAAACA1lhIqFCxt9Boa7W3UFUdxSxMUHXUTMMiS3aECQAAAADQHr1F/8Dp8XQyTWOwvd/7d0T8ED4IN82Nzb2jR5vRu1tkyc91VNXMXkwc3Y+Gv0zosHGRJbdm/3amdd8CAAAAACzQQl8qnGVvodFq2VtoU9VRR/1adWQ3AQAAAADaaWmhQsXeQqOtZG9B1VErqDoCAAAAgA5YeqhQsbfQaEvbW9je793c3Dt6FBE/LvLnsjLjIkv6eVoOvE4AAAAAgPZbWagQMdtbyNNyELNKpPEqfzcLcWNeiXTnsuGCqqPGU3UEAAAAAB200lChYm+h0S61t6DqqPEmETHM07Kv6ggAAAAAuqdX5y/P03K0cWVjZ3Pv6LuIuB3+j/UmqfYWxhHxz/N8YJ6FEEf3w99zU42LLLnlZQIAAAAAdFctLxXOqiqR7C001nv3FlQdNZ6qIwAAAAAgItYgVKjYW2i83+wtqDpqPFVHAAAAAMBraq0/+j3zj5ejeV+/qpxmqfYWbm9G727EkUqr5lJ1BAAAAAD8xtq8VHhTnpYjlUiNtRURP4ZAoYnGoeoIAAAAAHiLtQ0VIl7bW+iHSiRYpqrqaFfVEQAAAADwNmsdKlTm4cJu2FuAZRgWWbIz3zQBAAAAAHirRoQKlTwtR2fCBdUscDlV1dFA1REAAAAAcB6NChUq9hbgUlQdAQAAAAAX0shQIcLeAlyQqiMAAAAA4MIaGypU7C3Auag6AgAAAAAurVf3AYsyr3EZbe/37kTE7YjYqvkkWBd7ao4AAAAAgEVo/EuFN80rkewtwKzqqC9QAAAAAAAWpXWhQoS9BTpP1REAAAAAsBStDBUqb+wt+LhK201iFibsep0AAAAAACxDazYV3mX+gbVvb4G2ytNytHFlY8fLBAAAAABgmVr9UuFN9hZoM4ECAAAAALBsnQoVIuwtAAAAAADARXUuVKjYWwAAAAAAgA/T2VChkqflKE/LfswqkYQLAAAAAADwFp0PFSr2FgAAAAAA4N16dR+wTqbH08k0jcH2fu/fEfFDRNyo+yYAAAAAfvWw7gMAuk6o8DvytBxFxGh7v3czIu5HxFbNJwEAAAB03out//697hsAuk790TvYWwAAAAAAgP8TKpyDvQUAAAAAABAqnNv0eDrJ03IQEXsRMa77HgAAAAAAWDWhwgeaVyLtxixcUIkEAAAAAEBnCBUuKE/L0ZlKJOECAAAAAACtJ1S4hKoSyd4CAAAAAABdIFRYAHsLvMckIoZ5Wo7qPgQAAAAA4DJ6dR/QJvOPxqPt/d7NiLgfEVs1n0T9hkWW/Dw9nqrIAgAAAAAa7+OIiE8+/7TuO1rl8OD0yaun1+5dvV4eR8RfI+Ja3TexcuOIuJ2n5b9OXp48r/sYAAAAAIBF+Cgi4svvv677jtbauLKxtbl39EtE3Kj7FlZiEhHfqDoCAAAAANrIpsKSzfcWdsPeQhcMiyzZESgAAAAAAG3lpcKK2VtopXGRJbfsJgAAAAAAbeelworlaTkqsmQnIoZ138KlTSJiL0/LXYECAAAAANAFQoUazCuRBkWW9EMlUlOpOgIAAAAAOkeoUCN7C400LrKkn6flwOsEAAAAAKBrhAprIE/L0ZlwwYfq9aTqCAAAAADovI8jIj75/NO67yAiDg9On7x6eu3e1evlcUR8Ufc9RMQsTPgpT8uvDg9On9R9DAAAAABAnT6KiPjy+6/rvoM3bFzZ2NrcO/olIm7UfUuHDYss+dnLBAAAAACAGfVHa+qNvQUftVdrHLOqI7sJAAAAAABn9Oo+gHfL03IUEf3t/d6diLgdEVs1n9Rmk4i4m6floO5DAAAAAADWkU2Fhjg8OH1ob2GphkWWfPvs8YsHdR8CAAAAALCu1B81yLwSaVBkST9mFT1cnqojAAAAAIBzEio0kL2FhdnL03J3XjEFAAAAAMB7CBUaLE/LUZ6W/YgYhnDhQwyLLOkLEwAAAAAAPoxNhRawt3Bu4yJLPnv2+MWDk5cnz+s+BgAAAACgabxUaIlqbyFmlUj2Fl43iXnVkd0EAAAAAICLEyq0zLwSaTfsLVSGRZbsqDoCAAAAALi8Xt0HsBzzj+j97f3enYi4HRFbNZ+0auMiS27NXiZM674FAAAAAKAVvFRouTwtB0WW7MRszLkLVB0BAAAAACyJoeYOOHl58vzw4PThH//yh/9ExJ8i4s81n7QMk4j4KU/Lrw4PTp/UfQwAAAAAQBupP+qQeSXSaHu/dzMi7kd7KpHOVB0BAAAAALAs6o86aD7m3I9ZJVKTP8SPQ9URAAAAAMDKqD/qsMOD04evnl67d/V6eRwRX9R9zweoqo7+oeoIAAAAAGB1hAod18C9hWGRJd8+e/ziQd2HAAAAAAB0jfojIuLXSqTdiNiL9axEqqqOBqqOAAAAAADqYaiZ1+RpOdq4srGzuXf0XUTcjvrHnCcR8c18ZBoAAAAAgBqpP+I3qkqkNdhbqKqOHtX0+wEAAAAAOEOowFvVuLcwLrLks2ePXzw4eXnyfEW/EwAAAACA97CpwHutcG9hErPdhF27CQAAAAAA60eowLnlaTkqsmQnIoZL+PHDIkt2bCcAAAAAAKyvjyIivvz+67rvoGE2rmxsbe4d/RIRNy75o8ZFltzyMgEAAAAAYP15qcCFTI+nkzOVSOML/AhVRwAAAAAADdOr+wCabV5XNNre792MiPsRsfWePzKJiLt5Wg6WfhwAAAAAAAv1cUTEJ59/WvcdNNzhwemTV0+v3bt6vTyOiC/e8p8Niyz59tn1elhiAAAARklEQVTjFw9WeRsAAAAAAIuh/oiFmVciDYos6cfrlUjjmFUdDVQdAQAAAAA0l/ojFm56PJ1M09idVyJVFUkAAAAAADTc/wDSFw/+yqNRiAAAAABJRU5ErkJggg=="/></defs></svg>
\ No newline at end of file

From c3da41eee2052d9f28df1e5980e285207f186f49 Mon Sep 17 00:00:00 2001
From: Edoardo Mileto <edomileto@gmail.com>
Date: Tue, 18 Feb 2025 06:01:04 +0100
Subject: [PATCH 269/796] Create a custom icon for Deloitte (#5096)

## Description
followed [this
guide](https://github.com/ente-io/ente/blob/main/auth/docs/adding-icons.md)
---
 auth/assets/custom-icons/_data/custom-icons.json |  3 +++
 auth/assets/custom-icons/icons/deloitte.svg      | 15 +++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 auth/assets/custom-icons/icons/deloitte.svg

diff --git a/auth/assets/custom-icons/_data/custom-icons.json b/auth/assets/custom-icons/_data/custom-icons.json
index bffe8b165f..5493087930 100644
--- a/auth/assets/custom-icons/_data/custom-icons.json
+++ b/auth/assets/custom-icons/_data/custom-icons.json
@@ -306,6 +306,9 @@
     {
       "title": "Discourse"
     },
+    {
+      "title": "Deloitte"
+    },
     {
       "title": "DMarket"
     },
diff --git a/auth/assets/custom-icons/icons/deloitte.svg b/auth/assets/custom-icons/icons/deloitte.svg
new file mode 100644
index 0000000000..990f467189
--- /dev/null
+++ b/auth/assets/custom-icons/icons/deloitte.svg
@@ -0,0 +1,15 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1545 1333" width="1545" height="1333">
+	<title>Deloitte-svg</title>
+	<style>
+		.s0 { fill: #86bc24 } 
+		.s1 { fill: #0f0b0b } 
+	</style>
+	<g id="layer1">
+		<g id="g3359">
+			<g id="g3371">
+				<path id="path3356" class="s0" d="m1354.4 1332.5c-105.1 0-190-84.8-190-189.6 0-104.9 84.9-189.6 190-189.6 105 0 189.9 84.7 189.9 189.6 0 104.8-84.9 189.6-189.9 189.6z"/>
+				<path id="path3360" fill-rule="evenodd" class="s1" d="m1089.4 628.2q0 328.2-176.7 505.8-176.8 177.6-497.1 177.6h-414.9v-1311.1h443.9q308.8 0 476.8 161.4c112 107.6 168 263 168 466.3zm-359.7 12.5q0-180.1-69.7-267.2c-46.6-58-117.1-87-211.9-87h-100.9v734.5h77.2c105.3 0 182.5-31.2 231.6-93.8 49.1-62.4 73.7-157.9 73.7-286.5z"/>
+			</g>
+		</g>
+	</g>
+</svg>
\ No newline at end of file

From af91adeb724f434315a6183e843b2f15697a4440 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 10:53:16 +0530
Subject: [PATCH 270/796] err 3

---
 web/apps/photos/src/styles/global.css | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 6de4c6f5d0..1a1042809a 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -134,3 +134,26 @@ body {
 .pswp-ente .pswp__preloader--active .pswp__icn {
     opacity: 0.4;
 }
+
+/*
+ Error indicator on the file viewer.
+
+ It is styled similar to the loading indicator provided by PhotoSwipe since it
+ is meant to occupy the same space. Only one of these will be shown at the same
+ time, so it can also set the auto right margin.
+ */
+.pswp-ente .pswp-ente__error-indicator {
+    position: relative;
+    overflow: hidden;
+    width: 50px;
+    height: 60px;
+    margin-right: auto;
+}
+
+.pswp-ente .pswp-ente__error-indicator .pswp__icn {
+    visibility: hidden;
+}
+
+.pswp-ente .pswp-ente__error-indicator--active .pswp__icn {
+    visibility: visible;
+}

From 1af8d7481d20700fa2ad73e48e3d58183e4d19c2 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 11:07:00 +0530
Subject: [PATCH 271/796] err 4

---
 web/apps/photos/src/styles/global.css         |  9 ++++---
 .../gallery/components/viewer/photoswipe.ts   | 24 +++++++++++++++----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 1a1042809a..fabcbda6d1 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -142,18 +142,21 @@ body {
  is meant to occupy the same space. Only one of these will be shown at the same
  time, so it can also set the auto right margin.
  */
-.pswp-ente .pswp-ente__error-indicator {
+.pswp-ente .pswp__error {
     position: relative;
     overflow: hidden;
     width: 50px;
     height: 60px;
     margin-right: auto;
+    /* "visibility" is used to toggle visibility, opacity is fixed to be similar
+       to that of the loading indicator when it is visible. */
+    opacity: 0.6;
 }
 
-.pswp-ente .pswp-ente__error-indicator .pswp__icn {
+.pswp-ente .pswp__error .pswp__icn {
     visibility: hidden;
 }
 
-.pswp-ente .pswp-ente__error-indicator--active .pswp__icn {
+.pswp-ente .pswp__error--active .pswp__icn {
     visibility: visible;
 }
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 18b2734b5c..ffe82140b4 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -268,12 +268,12 @@ export class FileViewerPhotoSwipe {
         //
         // The "order" prop is used to position items. Some landmarks:
         // - counter: 5
+        // - preloader: 7
         // - zoom: 10
         // - close: 20
         pswp.on("uiRegister", () => {
             pswp.ui.registerElement({
                 name: "error",
-                title: t("error"),
                 order: 6,
                 html: createPSRegisterElementIconHTML("error"),
                 onInit: (errorElement, pswp) => {
@@ -281,8 +281,7 @@ export class FileViewerPhotoSwipe {
 
                     const toggleIndicatorClass = (className, add) => {
                         errorElement.classList.toggle(
-                            // Reuse preloading hide / show mechanism.
-                            "pswp__preloader--" + className,
+                            "pswp__error--" + className,
                             add,
                         );
                     };
@@ -299,7 +298,7 @@ export class FileViewerPhotoSwipe {
                             "updateErrorIndicatorVisibility",
                             pswp.currSlide.content,
                         );
-                        if (pswp.currSlide.content.data.failureReason) {
+                        if (!pswp.currSlide.content.data.failureReason) {
                             setIndicatorVisibility(true);
                         } else {
                             setIndicatorVisibility(false);
@@ -317,6 +316,23 @@ export class FileViewerPhotoSwipe {
                 html: createPSRegisterElementIconHTML("info"),
                 onClick: withCurrentFile(onViewInfo),
             });
+            // const counterIndicator2 = {
+            //     name: "counter-2",
+            //     order: 5,
+            //     html: '<div><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true" class="xxxpswp__icn"><path d="M20.5 14.3 17.1 18V10h-2.2v7.9l-3.4-3.6L10 16l6 6.1 6-6.1ZM23 23H9v2h14Z" /></svg></div>',
+
+            //     onInit: (counterElement, pswp) => {
+            //         pswp.on("change", () => {
+            //             counterElement.style.fill = "red";
+            //             // counterElement.innerText =
+            //             //     pswp.currIndex +
+            //             //     1 +
+            //             //     pswp.options.indexIndicatorSep +
+            //             //     pswp.getNumItems();
+            //         });
+            //     },
+            // };
+            // pswp.ui.registerElement(counterIndicator2);
         });
 
         // Modify the default UI elements.

From f47837f550e7e18625295afc2e22a810e062f3a7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 11:21:34 +0530
Subject: [PATCH 272/796] fin visually

---
 web/apps/photos/src/styles/global.css            | 3 +--
 web/packages/gallery/components/viewer/icons.tsx | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index fabcbda6d1..b2dc418309 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -147,10 +147,9 @@ body {
     overflow: hidden;
     width: 50px;
     height: 60px;
-    margin-right: auto;
     /* "visibility" is used to toggle visibility, opacity is fixed to be similar
        to that of the loading indicator when it is visible. */
-    opacity: 0.6;
+    opacity: 0.5;
 }
 
 .pswp-ente .pswp__error .pswp__icn {
diff --git a/web/packages/gallery/components/viewer/icons.tsx b/web/packages/gallery/components/viewer/icons.tsx
index 8b6ef33b5f..a021afb96c 100644
--- a/web/packages/gallery/components/viewer/icons.tsx
+++ b/web/packages/gallery/components/viewer/icons.tsx
@@ -17,9 +17,10 @@
 
 const paths = {
     // "@mui/icons-material/InfoOutlined"
-    info: '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8"',
+    // TODO(PS): This transform is temporary, audit later.
+    info: '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8" transform="translate(3.5, 3.5)"',
     // "@mui/icons-material/ErrorOutline"
-    error: '<path d="M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2M12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8"',
+    error: '<path d="M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2M12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8" transform="translate(10, 5.7) scale(0.85)"',
 };
 
 /**
@@ -40,7 +41,6 @@ const paths = {
  */
 export const createPSRegisterElementIconHTML = (name: "info") => ({
     isCustomSVG: true,
-    // TODO(PS): This transform is temporary, audit later.
-    inner: `${paths[name]} transform="translate(3.5, 3.5)" id="pswp__icn-${name}"`,
+    inner: `${paths[name]} id="pswp__icn-${name}"`,
     outlineID: `pswp__icn-${name}`,
 });

From 22e2d5edd914a5d8b2302c3b2eaec77dee809a90 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Tue, 18 Feb 2025 12:18:50 +0530
Subject: [PATCH 273/796] [mob][photos] Init locale

---
 mobile/lib/main.dart                          |  2 ++
 mobile/lib/services/search_service.dart       |  1 -
 .../lib/services/smart_memories_service.dart  | 26 ++++++++++++-------
 .../lib/ui/home/memories/memories_widget.dart |  1 -
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index 70deb70cd7..970f9615a0 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -43,6 +43,7 @@ import "package:photos/services/preview_video_store.dart";
 import 'package:photos/services/push_service.dart';
 import 'package:photos/services/remote_sync_service.dart';
 import 'package:photos/services/search_service.dart';
+import "package:photos/services/smart_memories_service.dart";
 import "package:photos/services/sync_service.dart";
 import "package:photos/services/user_service.dart";
 import 'package:photos/ui/tools/app_lock.dart';
@@ -252,6 +253,7 @@ Future<void> _init(bool isBackground, {String via = ''}) async {
 
     FavoritesService.instance.initFav().ignore();
     MemoriesService.instance.init(preferences);
+    unawaited(SmartMemoriesService.instance.init());
     LocalFileUpdateService.instance.init(preferences);
     SearchService.instance.init();
     FileDataService.instance.init(preferences);
diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 6a10d835ad..222246f815 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1194,7 +1194,6 @@ class SearchService {
     BuildContext context,
     int? limit,
   ) async {
-    SmartMemoriesService.instance.init(context);
     final memories = await SmartMemoriesService.instance.getMemories(limit);
     final searchResults = <GenericSearchResult>[];
     for (final memory in memories) {
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index dd73ae65ec..ec6e29ea79 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -1,3 +1,4 @@
+import "dart:async";
 import "dart:math" show min, max;
 
 import "package:flutter/material.dart";
@@ -9,6 +10,7 @@ import "package:photos/core/event_bus.dart";
 import "package:photos/db/memories_db.dart";
 import "package:photos/db/ml/db.dart";
 import "package:photos/events/files_updated_event.dart";
+import "package:photos/l10n/l10n.dart";
 import "package:photos/models/base_location.dart";
 import "package:photos/models/file/extensions/file_props.dart";
 import "package:photos/models/file/file.dart";
@@ -31,7 +33,7 @@ class SmartMemoriesService {
 
   bool _isInit = false;
 
-  late Locale _locale;
+  Locale? _locale;
   late Map<int, int> _seenTimes;
 
   List<SmartMemory>? _cachedMemories;
@@ -46,14 +48,15 @@ class SmartMemoriesService {
   static final instance = SmartMemoriesService._privateConstructor();
   factory SmartMemoriesService() => instance;
 
-  void init(BuildContext context) {
+  Future<void> init() async {
     if (_isInit) return;
-    _locale = Localizations.localeOf(context);
-    _isInit = true;
+    _locale = await getLocale();
 
-    _memoriesDB.clearMemoriesSeenBeforeTime(
-      DateTime.now().microsecondsSinceEpoch -
-          (_calculationWindowDays * microSecondsInDay),
+    unawaited(
+      _memoriesDB.clearMemoriesSeenBeforeTime(
+        DateTime.now().microsecondsSinceEpoch -
+            (_calculationWindowDays * microSecondsInDay),
+      ),
     );
     Bus.instance.on<FilesUpdatedEvent>().where((event) {
       return event.type == EventType.deletedFromEverywhere;
@@ -68,6 +71,7 @@ class SmartMemoriesService {
             .removeWhere((m) => generatedIDs.contains(m.file.generatedID));
       }
     });
+    _isInit = true;
     _logger.info("Smart memories service initialized");
   }
 
@@ -111,6 +115,7 @@ class SmartMemoriesService {
   // One general method to get all memories, which calls on internal methods for each separate memory type
   Future<List<SmartMemory>> _calcMemories() async {
     try {
+      await init();
       final List<SmartMemory> memories = [];
       final allFiles = Set<EnteFile>.from(
         await SearchService.instance.getAllFilesForSearch(),
@@ -145,6 +150,7 @@ class SmartMemoriesService {
       // memories.addAll(fillerMemories);
       // _logger.finest("All files length: ${allFiles.length}");
 
+      _cachedMemories = memories;
       return memories;
     } catch (e, s) {
       _logger.severe("Error calculating smart memories", e, s);
@@ -611,7 +617,7 @@ class SmartMemoriesService {
           final date = DateTime(year, dayMonth ~/ 100, dayMonth % 100);
           final files = yearGroups[year]!;
           final photoSelection = await _bestSelection(files);
-          String name = DateFormat.yMMMd(_locale.languageCode).format(date);
+          String name = DateFormat.yMMMd(_locale?.languageCode).format(date);
           if (date.day == currentTime.day && date.month == currentTime.month) {
             name = "This day, ${currentTime.year - date.year} years back";
           }
@@ -726,7 +732,7 @@ class SmartMemoriesService {
           monthYearFiles,
           prefferedSize: monthSelectionSize,
         );
-        final monthName = DateFormat.MMMM(_locale.languageCode)
+        final monthName = DateFormat.MMMM(_locale?.languageCode)
             .format(DateTime(year, currentMonth));
         final name = monthName + ", ${currentTime.year - year} years back";
         memoryResult.add(
@@ -744,7 +750,7 @@ class SmartMemoriesService {
         .toList();
     final photoSelection =
         await _bestSelection(allPhotos, prefferedSize: monthSelectionSize);
-    final monthName = DateFormat.MMMM(_locale.languageCode)
+    final monthName = DateFormat.MMMM(_locale?.languageCode)
         .format(DateTime(currentTime.year, currentMonth));
     final name = monthName + " through the years";
     memoryResult.add(
diff --git a/mobile/lib/ui/home/memories/memories_widget.dart b/mobile/lib/ui/home/memories/memories_widget.dart
index 2adf60d50d..2e2117f25d 100644
--- a/mobile/lib/ui/home/memories/memories_widget.dart
+++ b/mobile/lib/ui/home/memories/memories_widget.dart
@@ -59,7 +59,6 @@ class _MemoriesWidgetState extends State<MemoriesWidget> {
       return const SizedBox.shrink();
     }
     if (flagService.showSmartMemories) {
-      SmartMemoriesService.instance.init(context);
       return FutureBuilder<List<SmartMemory>>(
         future: SmartMemoriesService.instance.getMemories(
           null,

From 0e157a4e33410f13ecfb9f0006422d696dcf7e88 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prateekmedia@users.noreply.github.com>
Date: Tue, 18 Feb 2025 12:19:16 +0530
Subject: [PATCH 274/796] fix: still check 10mb preview limit

---
 mobile/lib/services/preview_video_store.dart | 57 +++++++++++++-------
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 97145056e1..bbbb39ed42 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -135,7 +135,15 @@ class PreviewVideoStore {
         }
       }
 
+      var (props, result) = await checkFileForPreviewCreation(enteFile);
+
+      if (result) {
+        return;
+      }
+
       if (uploadingFileId >= 0) {
+        if (uploadingFileId == enteFile.uploadedFileID) return;
+
         _items[enteFile.uploadedFileID!] = PreviewItem(
           status: PreviewItemStatus.inQueue,
           file: enteFile,
@@ -158,7 +166,7 @@ class PreviewVideoStore {
       );
       Bus.instance.fire(PreviewUpdatedEvent(_items));
 
-      final props = await getVideoPropsAsync(file);
+      props = await getVideoPropsAsync(file);
       final fileSize = enteFile.fileSize ?? file.lengthSync();
 
       final videoData = List.from(props?.propData?["streams"] ?? [])
@@ -571,6 +579,32 @@ class PreviewVideoStore {
     }
   }
 
+  Future<(FFProbeProps?, bool)> checkFileForPreviewCreation(
+    EnteFile enteFile,
+  ) async {
+    final fileSize = enteFile.fileSize;
+    FFProbeProps? props;
+
+    if (fileSize != null && fileSize <= 10 * 1024 * 1024) {
+      final file = await getFile(enteFile, isOrigin: true);
+      if (file != null) {
+        props = await getVideoPropsAsync(file);
+        final videoData = List.from(props?.propData?["streams"] ?? [])
+            .firstWhereOrNull((e) => e["type"] == "video");
+
+        final codec = videoData["codec_name"]?.toString().toLowerCase();
+        final codecIsH264 = codec?.contains("h264") ?? false;
+
+        if (codecIsH264) {
+          _items.removeWhere((key, value) => value.file == enteFile);
+          Bus.instance.fire(PreviewUpdatedEvent(_items));
+          return (props, true);
+        }
+      }
+    }
+    return (props, false);
+  }
+
   // get all files after cutoff date and add it to queue for preview creation
   // only run when video streaming is enabled
   Future<void> putFilesForPreviewCreation() async {
@@ -597,25 +631,10 @@ class PreviewVideoStore {
 
     // set all video status to be in queue
     for (final enteFile in allFiles) {
-      final fileSize = enteFile.fileSize;
-      FFProbeProps? props;
+      final (_, result) = await checkFileForPreviewCreation(enteFile);
 
-      if (fileSize != null && fileSize <= 10 * 1024 * 1024) {
-        final file = await getFile(enteFile, isOrigin: true);
-        if (file != null) {
-          props = await getVideoPropsAsync(file);
-          final videoData = List.from(props?.propData?["streams"] ?? [])
-              .firstWhereOrNull((e) => e["type"] == "video");
-
-          final codec = videoData["codec_name"]?.toString().toLowerCase();
-          final codecIsH264 = codec?.contains("h264") ?? false;
-
-          if (codecIsH264) {
-            _items.removeWhere((key, value) => value.file == enteFile);
-            Bus.instance.fire(PreviewUpdatedEvent(_items));
-            continue;
-          }
-        }
+      if (result) {
+        continue;
       }
 
       _items[enteFile.uploadedFileID!] = PreviewItem(

From b3100f098b9cd3408a675a48c60664b1917b95b0 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 12:11:25 +0530
Subject: [PATCH 275/796] Reset failures

---
 web/apps/photos/src/styles/global.css         | 15 ++--
 .../gallery/components/viewer/data-source.ts  | 78 ++++++++++++-------
 .../gallery/components/viewer/icons.tsx       |  4 +-
 .../gallery/components/viewer/photoswipe.ts   | 73 ++++++-----------
 4 files changed, 80 insertions(+), 90 deletions(-)

diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index b2dc418309..3eb8dd8d62 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -147,15 +147,12 @@ body {
     overflow: hidden;
     width: 50px;
     height: 60px;
-    /* "visibility" is used to toggle visibility, opacity is fixed to be similar
-       to that of the loading indicator when it is visible. */
-    opacity: 0.5;
+    /* Unlike the loading indicator, "display" is used to toggle visibility, and
+      the opacity is fixed to be similar to that of the counter. */
+    opacity: 0.85;
+    display: none;
 }
 
-.pswp-ente .pswp__error .pswp__icn {
-    visibility: hidden;
-}
-
-.pswp-ente .pswp__error--active .pswp__icn {
-    visibility: visible;
+.pswp-ente .pswp__error--active {
+    display: initial;
 }
diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 2bd0f0a841..0abaf0755a 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -154,7 +154,7 @@ export const itemDataForFile = (file: EnteFile, needsRefresh: () => void) => {
     // point of time. This assumption is currently valid.
     _state.needsRefreshByFileID.set(file.id, needsRefresh);
 
-    if (!itemData || itemData.failureReason) {
+    if (!itemData) {
         itemData = {};
         _state.itemDataByFileID.set(file.id, itemData);
         void enqueueUpdates(file);
@@ -163,24 +163,37 @@ export const itemDataForFile = (file: EnteFile, needsRefresh: () => void) => {
     return itemData;
 };
 
+/**
+ * Reset any failure reasons for the given {@link file}.
+ *
+ * This is called when the user moves away from a slide, so that when the come
+ * back the next time, the entire process is retried.
+ */
+export const resetFailuresForFile = (file: EnteFile) => {
+    if (_state.itemDataByFileID.get(file.id)?.failureReason) {
+        _state.itemDataByFileID.delete(file.id);
+    }
+};
+
 const enqueueUpdates = async (file: EnteFile) => {
     const update = (itemData: ItemData) => {
         _state.itemDataByFileID.set(file.id, itemData);
         _state.needsRefreshByFileID.get(file.id)?.();
     };
 
+    let thumbnailData: ItemData;
     try {
         const thumbnailURL = await downloadManager.renderableThumbnailURL(file);
         // TODO(PS):
-        const thumbnailData = await withDimensions(thumbnailURL!);
+        thumbnailData = await withDimensions(thumbnailURL!);
         update({
             ...thumbnailData,
             isContentLoading: true,
             isContentZoomable: false,
         });
     } catch (e) {
-        // If we can't even get the thumbnail, then a persistent (for now)
-        // network error is likely (download manager already has retries).
+        // If we can't even get the thumbnail, then a network error is likely
+        // (download manager already has retries).
         //
         // Notify the user of the error. The entire process will be retried when
         // they reopen the slide later.
@@ -189,33 +202,42 @@ const enqueueUpdates = async (file: EnteFile) => {
         return;
     }
 
-    switch (file.metadata.fileType) {
-        case FileType.image: {
-            const sourceURLs = await downloadManager.renderableSourceURLs(file);
-            // TODO(PS):
-            const itemData = await withDimensions(sourceURLs.url as string);
-            update(itemData);
-            break;
-        }
+    try {
+        switch (file.metadata.fileType) {
+            case FileType.image: {
+                const sourceURLs =
+                    await downloadManager.renderableSourceURLs(file);
+                // TODO(PS):
+                const itemData = await withDimensions(sourceURLs.url as string);
+                update(itemData);
+                break;
+            }
 
-        case FileType.video: {
-            const sourceURLs = await downloadManager.renderableSourceURLs(file);
-            // TODO(PS):
-            update({ videoURL: sourceURLs.url as string });
-            break;
-        }
+            case FileType.video: {
+                const sourceURLs =
+                    await downloadManager.renderableSourceURLs(file);
+                // TODO(PS):
+                update({ videoURL: sourceURLs.url as string });
+                break;
+            }
 
-        case FileType.livePhoto: {
-            const sourceURLs = await downloadManager.renderableSourceURLs(file);
-            const livePhotoSourceURLs = sourceURLs.url as LivePhotoSourceURL;
-            const imageURL = await livePhotoSourceURLs.image();
-            // TODO(PS):
-            const imageData = await withDimensions(imageURL!);
-            update(imageData);
-            const livePhotoVideoURL = await livePhotoSourceURLs.video();
-            update({ ...imageData, livePhotoVideoURL });
-            break;
+            case FileType.livePhoto: {
+                const sourceURLs =
+                    await downloadManager.renderableSourceURLs(file);
+                const livePhotoSourceURLs =
+                    sourceURLs.url as LivePhotoSourceURL;
+                const imageURL = await livePhotoSourceURLs.image();
+                // TODO(PS):
+                const imageData = await withDimensions(imageURL!);
+                update(imageData);
+                const livePhotoVideoURL = await livePhotoSourceURLs.video();
+                update({ ...imageData, livePhotoVideoURL });
+                break;
+            }
         }
+    } catch (e) {
+        log.error("Failed to show file", e);
+        update({ ...thumbnailData, failureReason: "other" });
     }
 };
 
diff --git a/web/packages/gallery/components/viewer/icons.tsx b/web/packages/gallery/components/viewer/icons.tsx
index a021afb96c..5b8201f459 100644
--- a/web/packages/gallery/components/viewer/icons.tsx
+++ b/web/packages/gallery/components/viewer/icons.tsx
@@ -20,7 +20,7 @@ const paths = {
     // TODO(PS): This transform is temporary, audit later.
     info: '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8" transform="translate(3.5, 3.5)"',
     // "@mui/icons-material/ErrorOutline"
-    error: '<path d="M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2M12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8" transform="translate(10, 5.7) scale(0.85)"',
+    error: '<path d="M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2M12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8" transform="translate(7, 5.7) scale(0.85)"',
 };
 
 /**
@@ -41,6 +41,6 @@ const paths = {
  */
 export const createPSRegisterElementIconHTML = (name: "info") => ({
     isCustomSVG: true,
-    inner: `${paths[name]} id="pswp__icn-${name}"`,
+    inner: `${paths[name]} id="pswp__icn-${name}" />`,
     outlineID: `pswp__icn-${name}`,
 });
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index ffe82140b4..8684ad7c21 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -4,7 +4,7 @@
 import log from "@/base/log";
 import type { EnteFile } from "@/media/file";
 import { t } from "i18next";
-import { itemDataForFile } from "./data-source";
+import { itemDataForFile, resetFailuresForFile } from "./data-source";
 import type { FileViewerProps } from "./FileViewer";
 import { createPSRegisterElementIconHTML } from "./icons";
 
@@ -145,6 +145,11 @@ export class FileViewerPhotoSwipe {
             mainClass: "pswp-ente",
         });
 
+        // Helper routines to obtain the file at `currIndex`.
+        const currentFile = () => this.files[pswp.currIndex]!;
+        const withCurrentFile = (cb: (file: EnteFile) => void) => () =>
+            cb(currentFile());
+
         // Provide data about slides to PhotoSwipe via callbacks
         // https://photoswipe.com/data-sources/#dynamically-generated-data
 
@@ -234,15 +239,24 @@ export class FileViewerPhotoSwipe {
         });
 
         pswp.on("contentDeactivate", (e) => {
-            // Pause the video element (if any) on a slide when we move away
-            // from it.
+            // Reset failures, if any, for this file so that the fetch is tried
+            // again when we come back to it^.
+            //
+            // ^ Note that because of how the preloading works, this will have
+            //   an effect (i.e. the retry will happen) only if the user moves
+            //   more than 2 slides and then back, or if they reopen the viewer.
+            resetFailuresForFile(currentFile());
+
+            // Pause the video element, if any, when we move away from the
+            // slide.
             const video =
                 e.content?.slide?.container?.getElementsByTagName("video")[0];
             video?.pause();
         });
 
         pswp.on("contentActivate", (e) => {
-            // Undo the effect of a previous "contentDeactivate".
+            // Undo the effect of a previous "contentDeactivate" if it was
+            // displaying a live photo.
             if (e.content?.slide.data?.livePhotoVideoURL) {
                 e.content?.slide?.container
                     ?.getElementsByTagName("video")[0]
@@ -258,9 +272,6 @@ export class FileViewerPhotoSwipe {
             onClose();
         });
 
-        const withCurrentFile = (cb: (file: EnteFile) => void) => () =>
-            cb(this.files[this.pswp.currIndex]!);
-
         // Add our custom UI elements to inside the PhotoSwipe dialog.
         //
         // API docs for registerElement:
@@ -277,35 +288,12 @@ export class FileViewerPhotoSwipe {
                 order: 6,
                 html: createPSRegisterElementIconHTML("error"),
                 onInit: (errorElement, pswp) => {
-                    let isVisible = false;
-
-                    const toggleIndicatorClass = (className, add) => {
+                    pswp.on("change", () => {
                         errorElement.classList.toggle(
-                            "pswp__error--" + className,
-                            add,
+                            "pswp__error--active",
+                            !!pswp.currSlide.content.data.failureReason,
                         );
-                    };
-
-                    const setIndicatorVisibility = (visible) => {
-                        if (isVisible !== visible) {
-                            isVisible = visible;
-                            toggleIndicatorClass("active", visible);
-                        }
-                    };
-
-                    const updateErrorIndicatorVisibility = () => {
-                        console.log(
-                            "updateErrorIndicatorVisibility",
-                            pswp.currSlide.content,
-                        );
-                        if (!pswp.currSlide.content.data.failureReason) {
-                            setIndicatorVisibility(true);
-                        } else {
-                            setIndicatorVisibility(false);
-                        }
-                    };
-
-                    pswp.on("change", updateErrorIndicatorVisibility);
+                    });
                 },
             });
             pswp.ui.registerElement({
@@ -316,23 +304,6 @@ export class FileViewerPhotoSwipe {
                 html: createPSRegisterElementIconHTML("info"),
                 onClick: withCurrentFile(onViewInfo),
             });
-            // const counterIndicator2 = {
-            //     name: "counter-2",
-            //     order: 5,
-            //     html: '<div><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true" class="xxxpswp__icn"><path d="M20.5 14.3 17.1 18V10h-2.2v7.9l-3.4-3.6L10 16l6 6.1 6-6.1ZM23 23H9v2h14Z" /></svg></div>',
-
-            //     onInit: (counterElement, pswp) => {
-            //         pswp.on("change", () => {
-            //             counterElement.style.fill = "red";
-            //             // counterElement.innerText =
-            //             //     pswp.currIndex +
-            //             //     1 +
-            //             //     pswp.options.indexIndicatorSep +
-            //             //     pswp.getNumItems();
-            //         });
-            //     },
-            // };
-            // pswp.ui.registerElement(counterIndicator2);
         });
 
         // Modify the default UI elements.

From 0c8dc3af959e999289c0aa33c2b4b587917b63c8 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 18 Feb 2025 13:19:09 +0530
Subject: [PATCH 276/796] [mob] Extract ente_crypto plugin

---
 mobile/ios/Podfile.lock                       |  96 ++++++++--------
 mobile/lib/core/configuration.dart            |   2 +-
 mobile/lib/core/errors.dart                   |   4 -
 mobile/lib/emergency/emergency_service.dart   |   2 +-
 .../lib/emergency/recover_others_account.dart |   2 +-
 mobile/lib/main.dart                          |   2 +-
 .../lib/module/upload/service/multipart.dart  |   3 +-
 mobile/lib/services/collections_service.dart  |   2 +-
 mobile/lib/services/entity_service.dart       |   2 +-
 mobile/lib/services/favorites_service.dart    |   2 +-
 mobile/lib/services/file_magic_service.dart   |   2 +-
 mobile/lib/services/hidden_service.dart       |   2 +-
 mobile/lib/services/user_service.dart         |   2 +-
 .../lib/ui/account/delete_account_page.dart   |   2 +-
 .../account/login_pwd_verification_page.dart  |   2 +-
 .../lib/ui/account/password_reentry_page.dart |   2 +-
 .../request_pwd_verification_page.dart        |   2 +-
 .../lib/ui/account/two_factor_setup_page.dart |   2 +-
 .../lib/ui/account/verify_recovery_page.dart  |   2 +-
 .../ui/settings/account_section_widget.dart   |   2 +-
 .../settings/debug/debug_section_widget.dart  |   2 +-
 .../lock_screen/lock_screen_password.dart     |   2 +-
 .../settings/lock_screen/lock_screen_pin.dart |   2 +-
 .../ui/settings/security_section_widget.dart  |   2 +-
 .../lib/ui/sharing/manage_links_widget.dart   |   2 +-
 mobile/lib/ui/tabs/home_widget.dart           |   2 +-
 mobile/lib/utils/diff_fetcher.dart            |   8 +-
 mobile/lib/utils/file_download_util.dart      |   2 +-
 mobile/lib/utils/file_key.dart                |   2 +-
 mobile/lib/utils/file_uploader.dart           |   3 +-
 mobile/lib/utils/file_uploader_util.dart      |   2 +-
 mobile/lib/utils/gzip.dart                    |   2 +-
 mobile/lib/utils/lock_screen_settings.dart    |   2 +-
 mobile/lib/utils/thumbnail_util.dart          |   2 +-
 mobile/lib/utils/trash_diff_fetcher.dart      |   2 +-
 mobile/plugins/ente_crypto/.metadata          |  10 ++
 .../plugins/ente_crypto/analysis_options.yaml |   1 +
 .../plugins/ente_crypto/lib/ente_crypto.dart  |   4 +
 .../ente_crypto/lib/src/crypto.dart}          |  12 +-
 .../lib/src}/models/derived_key_result.dart   |   0
 .../lib/src}/models/encryption_result.dart    |   0
 .../ente_crypto/lib/src/models/errors.dart    |   3 +
 mobile/plugins/ente_crypto/pubspec.lock       | 105 ++++++++++++++++++
 mobile/plugins/ente_crypto/pubspec.yaml       |  20 ++++
 mobile/pubspec.lock                           |  11 +-
 mobile/pubspec.yaml                           |   4 +-
 46 files changed, 245 insertions(+), 99 deletions(-)
 create mode 100644 mobile/plugins/ente_crypto/.metadata
 create mode 100644 mobile/plugins/ente_crypto/analysis_options.yaml
 create mode 100644 mobile/plugins/ente_crypto/lib/ente_crypto.dart
 rename mobile/{lib/utils/crypto_util.dart => plugins/ente_crypto/lib/src/crypto.dart} (98%)
 rename mobile/{lib => plugins/ente_crypto/lib/src}/models/derived_key_result.dart (100%)
 rename mobile/{lib => plugins/ente_crypto/lib/src}/models/encryption_result.dart (100%)
 create mode 100644 mobile/plugins/ente_crypto/lib/src/models/errors.dart
 create mode 100644 mobile/plugins/ente_crypto/pubspec.lock
 create mode 100644 mobile/plugins/ente_crypto/pubspec.yaml

diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index 9903debdf8..6769a1fcc8 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -457,77 +457,77 @@ SPEC CHECKSUMS:
   dart_ui_isolate: d5bcda83ca4b04f129d70eb90110b7a567aece14
   device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   ffmpeg-kit-ios-full-gpl: 80adc341962e55ef709e36baa8ed9a70cf4ea62b
-  ffmpeg_kit_flutter_full_gpl: ce18b888487c05c46ed252cd2e7956812f2e3bd1
-  file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
+  ffmpeg_kit_flutter_full_gpl: 8d15c14c0c3aba616fac04fe44b3d27d02e3c330
+  file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
   Firebase: 98e6bf5278170668a7983e12971a66b2cd57fc8c
-  firebase_core: 085320ddfaacb80d1a96eac3a87857afcc150db1
-  firebase_messaging: d398edc15fe825f832836e74f6ac61e8cd2f3ad3
+  firebase_core: 2bedc3136ec7c7b8561c6123ed0239387b53f2af
+  firebase_messaging: 15d114e1a41fc31e4fbabcd48d765a19eec94a38
   FirebaseCore: a282032ae9295c795714ded2ec9c522fc237f8da
   FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2
   FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414
   FirebaseMessaging: c9ec7b90c399c7a6100297e9d16f8a27fc7f7152
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_email_sender: cd533cdc7ea5eda6fabb2c7f78521c71207778a4
-  flutter_image_compress: 4b058288a81f76e5e80340af37c709abafff34c4
-  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
-  flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100
-  flutter_native_splash: 35ddbc7228eafcb3969dcc5f1fbbe27c1145a4f0
-  flutter_secure_storage: 2c2ff13db9e0a5647389bff88b0ecac56e3f3418
-  flutter_sodium: 152647449ba89a157fd48d7e293dcd6d29c6ab0e
-  fluttertoast: 76fea30fcf04176325f6864c87306927bd7d2038
+  flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
+  flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433
+  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
+  flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
+  flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
+  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
+  flutter_sodium: c84426b4de738514b5b66cfdeb8a06634e72fe0b
+  fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
-  home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
-  image_editor_common: 3de87e7c4804f4ae24c8f8a998362b98c105cac1
-  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
-  in_app_purchase_storekit: e126ef1b89e4a9fdf07e28f005f82632b4609437
-  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
+  home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57
+  image_editor_common: d6f6644ae4a6de80481e89fe6d0a8c49e30b4b43
+  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
+  in_app_purchase_storekit: 8c3b0b3eb1b0f04efbff401c3de6266d4258d433
+  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
   libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
-  local_auth_darwin: 553ce4f9b16d3fdfeafce9cf042e7c9f77c1c391
-  local_auth_ios: f7a1841beef3151d140a967c2e46f30637cdf451
+  local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
+  local_auth_ios: 5046a18c018dd973247a0564496c8898dbb5adf9
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
-  maps_launcher: edf829809ba9e894d70e569bab11c16352dedb45
-  media_extension: a1fec16ee9c8241a6aef9613578ebf097d6c5e64
-  media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
-  media_kit_native_event_loop: 5fba1a849a6c87a34985f1e178a0de5bd444a0cf
-  media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
-  motion_sensors: 741e702c17467b9569a92165dda8d4d88c6167f1
-  motionphoto: 584b43031ead3060225cdff08fa49818879801d2
-  move_to_background: 155f7bfbd34d43ad847cb630d2d2d87c17199710
+  maps_launcher: 2e5b6a2d664ec6c27f82ffa81b74228d770ab203
+  media_extension: 6d30dc1431ebaa63f43c397c37917b1a0a597a4c
+  media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
+  media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
+  media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
+  motion_sensors: 03f55b7c637a7e365a0b5f9697a449f9059d5d91
+  motionphoto: d4a432b8c8f22fb3ad966258597c0103c9c5ff16
+  move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
   native_video_player: d12af78a1a4a8cf09775a5177d5b392def6fd23c
   objective_c: 77e887b5ba1827970907e10e832eec1683f3431d
   onnxruntime: e7c2ae44385191eaad5ae64c935a72debaddc997
   onnxruntime-c: a909204639a1f035f575127ac406f781ac797c9c
   onnxruntime-objc: b6fab0f1787aa6f7190c2013f03037df4718bd8b
-  open_mail_app: 06d5a4162866388a92b1df3deb96e56be20cf45c
+  open_mail_app: 794172f6a22cd16319d3ddaf45e945b2f74952b0
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: 566e1b7a2f3900e4b0020914ad3fc051dcc95596
-  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
-  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
-  photo_manager: d2fbcc0f2d82458700ee6256a15018210a81d413
-  privacy_screen: 3159a541f5d3a31bea916cfd4e58f9dc722b3fd4
+  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
+  photo_manager: ff695c7a1dd5bc379974953a2b5c0a293f7c4c8a
+  privacy_screen: 1a131c052ceb3c3659934b003b0d397c2381a24e
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  receive_sharing_intent: f6a12b7e8f7ed745f61c982de8a65de88db44a44
-  screen_brightness_ios: 5ed898fa50fa82a26171c086ca5e28228f932576
+  receive_sharing_intent: df9c334dc9feadcbd3266e5cb49c8443405e1c9f
+  screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
   SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
   Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
-  sentry_flutter: 0a211008f52553ba5dd81ceb71f48d78f0f1f6ab
-  share_plus: 011d6fb4f9d2576b83179a3a5c5e323202cdabcf
-  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
-  sqflite_darwin: 44bb54cc302bff1fbe5752293aba1820b157cf1c
+  sentry_flutter: 0eb93e5279eb41e2392212afe1ccd2fecb4f8cbe
+  share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  sqflite_darwin: a553b1fd6fe66f53bbb0fe5b4f5bab93f08d7a13
   sqlite3: 0bb0e6389d824e40296f531b858a2a0b71c0d2fb
-  sqlite3_flutter_libs: 9379996d65aa23dcda7585a5b58766cebe0aa042
-  system_info_plus: 555ce7047fbbf29154726db942ae785c29211740
+  sqlite3_flutter_libs: c00457ebd31e59fa6bb830380ddba24d44fbcd3b
+  system_info_plus: 5393c8da281d899950d751713575fbf91c7709aa
   Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
-  ua_client_hints: 0b48eae1134283f5b131ee0871fa878377f07a01
-  uni_links: ed8c961e47ed9ce42b6d91e1de8049e38a4b3152
-  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
-  video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
-  video_thumbnail: b637e0ad5f588ca9945f6e2c927f73a69a661140
-  volume_controller: ca1cde542ee70fad77d388f82e9616488110942b
-  wakelock_plus: 8c239121a007daa1d6759c6acdc507860273dd2f
+  ua_client_hints: 46bb5817a868f9e397c0ba7e3f2f5c5d90c35156
+  uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
+  video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1
+  volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
+  wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
 
 PODFILE CHECKSUM: 20e086e6008977d43a3d40260f3f9bffcac748dd
 
diff --git a/mobile/lib/core/configuration.dart b/mobile/lib/core/configuration.dart
index 03cfd6a16b..20fb02b57a 100644
--- a/mobile/lib/core/configuration.dart
+++ b/mobile/lib/core/configuration.dart
@@ -3,6 +3,7 @@ import 'dart:convert';
 import "dart:io";
 
 import 'package:bip39/bip39.dart' as bip39;
+import "package:ente_crypto/ente_crypto.dart";
 import "package:flutter/services.dart";
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:logging/logging.dart';
@@ -30,7 +31,6 @@ import "package:photos/services/machine_learning/face_ml/person/person_service.d
 import 'package:photos/services/memories_service.dart';
 import 'package:photos/services/search_service.dart';
 import 'package:photos/services/sync_service.dart';
-import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/file_uploader.dart';
 import "package:photos/utils/lock_screen_settings.dart";
 import 'package:photos/utils/validator_util.dart';
diff --git a/mobile/lib/core/errors.dart b/mobile/lib/core/errors.dart
index f1c7c24b3c..8ea8aa6ad6 100644
--- a/mobile/lib/core/errors.dart
+++ b/mobile/lib/core/errors.dart
@@ -72,10 +72,6 @@ class InvalidStateError extends AssertionError {
   InvalidStateError(String message) : super(message);
 }
 
-class KeyDerivationError extends Error {}
-
-class LoginKeyDerivationError extends Error {}
-
 class SrpSetupNotCompleteError extends Error {}
 
 class SharingNotPermittedForFreeAccountsError extends Error {}
diff --git a/mobile/lib/emergency/emergency_service.dart b/mobile/lib/emergency/emergency_service.dart
index c22d27da36..537adaf513 100644
--- a/mobile/lib/emergency/emergency_service.dart
+++ b/mobile/lib/emergency/emergency_service.dart
@@ -3,6 +3,7 @@ import "dart:math";
 import "dart:typed_data";
 
 import "package:dio/dio.dart";
+import "package:ente_crypto/ente_crypto.dart";
 import "package:flutter/cupertino.dart";
 import "package:logging/logging.dart";
 import "package:photos/core/configuration.dart";
@@ -14,7 +15,6 @@ import "package:photos/models/api/user/set_keys_request.dart";
 import "package:photos/models/api/user/srp.dart";
 import "package:photos/services/user_service.dart";
 import "package:photos/ui/common/user_dialogs.dart";
-import "package:photos/utils/crypto_util.dart";
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/email_util.dart";
 import "package:pointycastle/pointycastle.dart";
diff --git a/mobile/lib/emergency/recover_others_account.dart b/mobile/lib/emergency/recover_others_account.dart
index 1576a62504..5b7d658d61 100644
--- a/mobile/lib/emergency/recover_others_account.dart
+++ b/mobile/lib/emergency/recover_others_account.dart
@@ -1,5 +1,6 @@
 import "dart:convert";
 
+import "package:ente_crypto/ente_crypto.dart";
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:logging/logging.dart';
@@ -10,7 +11,6 @@ import "package:photos/generated/l10n.dart";
 import "package:photos/models/api/user/key_attributes.dart";
 import "package:photos/models/api/user/set_keys_request.dart";
 import 'package:photos/ui/common/dynamic_fab.dart';
-import "package:photos/utils/crypto_util.dart";
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/toast_util.dart';
 
diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index 70deb70cd7..7c5c92e491 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -4,6 +4,7 @@ import 'dart:io';
 import "package:adaptive_theme/adaptive_theme.dart";
 import 'package:background_fetch/background_fetch.dart';
 import "package:computer/computer.dart";
+import 'package:ente_crypto/ente_crypto.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -47,7 +48,6 @@ import "package:photos/services/sync_service.dart";
 import "package:photos/services/user_service.dart";
 import 'package:photos/ui/tools/app_lock.dart';
 import 'package:photos/ui/tools/lock_screen.dart';
-import 'package:photos/utils/crypto_util.dart';
 import "package:photos/utils/email_util.dart";
 import 'package:photos/utils/file_uploader.dart';
 import "package:photos/utils/lock_screen_settings.dart";
diff --git a/mobile/lib/module/upload/service/multipart.dart b/mobile/lib/module/upload/service/multipart.dart
index 762d26301e..e03c4315d8 100644
--- a/mobile/lib/module/upload/service/multipart.dart
+++ b/mobile/lib/module/upload/service/multipart.dart
@@ -1,17 +1,16 @@
 import "dart:io";
 
 import "package:dio/dio.dart";
+import "package:ente_crypto/ente_crypto.dart";
 import "package:ente_feature_flag/ente_feature_flag.dart";
 import "package:flutter/foundation.dart";
 import "package:logging/logging.dart";
 import "package:photos/core/constants.dart";
 import "package:photos/db/upload_locks_db.dart";
-import "package:photos/models/encryption_result.dart";
 import "package:photos/module/upload/model/multipart.dart";
 import "package:photos/module/upload/model/xml.dart";
 import "package:photos/service_locator.dart";
 import "package:photos/services/collections_service.dart";
-import "package:photos/utils/crypto_util.dart";
 
 class MultiPartUploader {
   final Dio _enteDio;
diff --git a/mobile/lib/services/collections_service.dart b/mobile/lib/services/collections_service.dart
index f4b3f75421..f3c1f8dbae 100644
--- a/mobile/lib/services/collections_service.dart
+++ b/mobile/lib/services/collections_service.dart
@@ -4,6 +4,7 @@ import 'dart:math';
 
 import 'package:collection/collection.dart';
 import 'package:dio/dio.dart';
+import 'package:ente_crypto/ente_crypto.dart';
 import "package:fast_base58/fast_base58.dart";
 import 'package:flutter/foundation.dart';
 import "package:flutter/material.dart";
@@ -39,7 +40,6 @@ import "package:photos/services/favorites_service.dart";
 import 'package:photos/services/file_magic_service.dart';
 import 'package:photos/services/local_sync_service.dart';
 import 'package:photos/services/remote_sync_service.dart';
-import 'package:photos/utils/crypto_util.dart';
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/file_key.dart";
 import "package:photos/utils/local_settings.dart";
diff --git a/mobile/lib/services/entity_service.dart b/mobile/lib/services/entity_service.dart
index d3df225ca3..2986a33ef5 100644
--- a/mobile/lib/services/entity_service.dart
+++ b/mobile/lib/services/entity_service.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:math';
 
+import "package:ente_crypto/ente_crypto.dart";
 import 'package:flutter/foundation.dart';
 import 'package:logging/logging.dart';
 import "package:photos/core/configuration.dart";
@@ -12,7 +13,6 @@ import "package:photos/models/api/entity/data.dart";
 import "package:photos/models/api/entity/key.dart";
 import "package:photos/models/api/entity/type.dart";
 import "package:photos/models/local_entity_data.dart";
-import "package:photos/utils/crypto_util.dart";
 import "package:photos/utils/gzip.dart";
 import 'package:shared_preferences/shared_preferences.dart';
 
diff --git a/mobile/lib/services/favorites_service.dart b/mobile/lib/services/favorites_service.dart
index 8623066247..c8d2cb15f3 100644
--- a/mobile/lib/services/favorites_service.dart
+++ b/mobile/lib/services/favorites_service.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:typed_data';
 
+import 'package:ente_crypto/ente_crypto.dart';
 import 'package:flutter/material.dart';
 import 'package:photos/core/configuration.dart';
 import 'package:photos/core/event_bus.dart';
@@ -15,7 +16,6 @@ import 'package:photos/models/file/file.dart';
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/remote_sync_service.dart';
 import 'package:photos/ui/actions/collection/collection_sharing_actions.dart';
-import 'package:photos/utils/crypto_util.dart';
 
 class FavoritesService {
   late Configuration _config;
diff --git a/mobile/lib/services/file_magic_service.dart b/mobile/lib/services/file_magic_service.dart
index 30e74d9c73..99ffcfb622 100644
--- a/mobile/lib/services/file_magic_service.dart
+++ b/mobile/lib/services/file_magic_service.dart
@@ -2,6 +2,7 @@ import 'dart:convert';
 import 'dart:typed_data';
 
 import 'package:dio/dio.dart';
+import 'package:ente_crypto/ente_crypto.dart';
 import 'package:logging/logging.dart';
 import 'package:photos/core/configuration.dart';
 import 'package:photos/core/constants.dart';
@@ -16,7 +17,6 @@ import 'package:photos/models/file/file.dart';
 import "package:photos/models/metadata/common_keys.dart";
 import "package:photos/models/metadata/file_magic.dart";
 import 'package:photos/services/remote_sync_service.dart';
-import 'package:photos/utils/crypto_util.dart';
 import "package:photos/utils/file_key.dart";
 
 class FileMagicService {
diff --git a/mobile/lib/services/hidden_service.dart b/mobile/lib/services/hidden_service.dart
index 8705ab7afa..069ee094f8 100644
--- a/mobile/lib/services/hidden_service.dart
+++ b/mobile/lib/services/hidden_service.dart
@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'dart:typed_data';
 
 import 'package:collection/collection.dart';
+import 'package:ente_crypto/ente_crypto.dart';
 import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
 import "package:photos/core/constants.dart";
@@ -18,7 +19,6 @@ import "package:photos/models/metadata/collection_magic.dart";
 import "package:photos/models/metadata/common_keys.dart";
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/file_magic_service.dart';
-import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/dialog_util.dart';
 
 extension HiddenService on CollectionsService {
diff --git a/mobile/lib/services/user_service.dart b/mobile/lib/services/user_service.dart
index 8949a271c8..5a1ef86910 100644
--- a/mobile/lib/services/user_service.dart
+++ b/mobile/lib/services/user_service.dart
@@ -4,6 +4,7 @@ import "dart:math";
 
 import 'package:bip39/bip39.dart' as bip39;
 import 'package:dio/dio.dart';
+import 'package:ente_crypto/ente_crypto.dart';
 import "package:flutter/foundation.dart";
 import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
@@ -40,7 +41,6 @@ import 'package:photos/ui/account/two_factor_recovery_page.dart';
 import 'package:photos/ui/account/two_factor_setup_page.dart';
 import "package:photos/ui/common/progress_dialog.dart";
 import "package:photos/ui/tabs/home_widget.dart";
-import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/navigation_util.dart';
 import 'package:photos/utils/toast_util.dart';
diff --git a/mobile/lib/ui/account/delete_account_page.dart b/mobile/lib/ui/account/delete_account_page.dart
index e2b5fe7bc4..7a433829b6 100644
--- a/mobile/lib/ui/account/delete_account_page.dart
+++ b/mobile/lib/ui/account/delete_account_page.dart
@@ -2,6 +2,7 @@ import "dart:async";
 import 'dart:convert';
 
 import "package:dropdown_button2/dropdown_button2.dart";
+import 'package:ente_crypto/ente_crypto.dart';
 import 'package:flutter/material.dart';
 import "package:logging/logging.dart";
 import 'package:photos/core/configuration.dart';
@@ -11,7 +12,6 @@ import 'package:photos/services/user_service.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
 import 'package:photos/ui/components/models/button_type.dart';
-import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/dialog_util.dart';
 import "package:photos/utils/toast_util.dart";
 
diff --git a/mobile/lib/ui/account/login_pwd_verification_page.dart b/mobile/lib/ui/account/login_pwd_verification_page.dart
index 2d5e9237ce..c97f81c7f2 100644
--- a/mobile/lib/ui/account/login_pwd_verification_page.dart
+++ b/mobile/lib/ui/account/login_pwd_verification_page.dart
@@ -1,9 +1,9 @@
 import "package:dio/dio.dart";
+import "package:ente_crypto/ente_crypto.dart";
 import "package:flutter/foundation.dart";
 import 'package:flutter/material.dart';
 import "package:logging/logging.dart";
 import 'package:photos/core/configuration.dart';
-import "package:photos/core/errors.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/models/api/user/srp.dart";
 import "package:photos/services/user_service.dart";
diff --git a/mobile/lib/ui/account/password_reentry_page.dart b/mobile/lib/ui/account/password_reentry_page.dart
index d3f6be5644..a93d4866a0 100644
--- a/mobile/lib/ui/account/password_reentry_page.dart
+++ b/mobile/lib/ui/account/password_reentry_page.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import "dart:typed_data";
 
+import "package:ente_crypto/ente_crypto.dart";
 import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
 import 'package:photos/core/configuration.dart';
@@ -14,7 +15,6 @@ import 'package:photos/ui/account/recovery_page.dart';
 import 'package:photos/ui/common/dynamic_fab.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
 import 'package:photos/ui/tabs/home_widget.dart';
-import "package:photos/utils/crypto_util.dart";
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/email_util.dart';
 
diff --git a/mobile/lib/ui/account/request_pwd_verification_page.dart b/mobile/lib/ui/account/request_pwd_verification_page.dart
index e29d568867..da96e97997 100644
--- a/mobile/lib/ui/account/request_pwd_verification_page.dart
+++ b/mobile/lib/ui/account/request_pwd_verification_page.dart
@@ -1,13 +1,13 @@
 import "dart:convert";
 import "dart:typed_data";
 
+import "package:ente_crypto/ente_crypto.dart";
 import 'package:flutter/material.dart';
 import "package:logging/logging.dart";
 import 'package:photos/core/configuration.dart';
 import "package:photos/l10n/l10n.dart";
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/common/dynamic_fab.dart';
-import "package:photos/utils/crypto_util.dart";
 import "package:photos/utils/dialog_util.dart";
 
 typedef OnPasswordVerifiedFn = Future<void> Function(Uint8List bytes);
diff --git a/mobile/lib/ui/account/two_factor_setup_page.dart b/mobile/lib/ui/account/two_factor_setup_page.dart
index ac8c8eba0a..175ddd6966 100644
--- a/mobile/lib/ui/account/two_factor_setup_page.dart
+++ b/mobile/lib/ui/account/two_factor_setup_page.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:ente_crypto/ente_crypto.dart';
 import "package:flutter/material.dart";
 import 'package:flutter/services.dart';
 import 'package:photos/core/configuration.dart';
@@ -8,7 +9,6 @@ import "package:photos/generated/l10n.dart";
 import 'package:photos/services/user_service.dart';
 import 'package:photos/ui/account/recovery_key_page.dart';
 import 'package:photos/ui/lifecycle_event_handler.dart';
-import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/navigation_util.dart';
 import 'package:photos/utils/toast_util.dart';
 import "package:pinput/pinput.dart";
diff --git a/mobile/lib/ui/account/verify_recovery_page.dart b/mobile/lib/ui/account/verify_recovery_page.dart
index 46585a734d..80fa00bae4 100644
--- a/mobile/lib/ui/account/verify_recovery_page.dart
+++ b/mobile/lib/ui/account/verify_recovery_page.dart
@@ -1,5 +1,6 @@
 import 'package:bip39/bip39.dart' as bip39;
 import 'package:dio/dio.dart';
+import 'package:ente_crypto/ente_crypto.dart';
 import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
 import 'package:photos/core/event_bus.dart';
@@ -13,7 +14,6 @@ import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/account/recovery_key_page.dart';
 import 'package:photos/ui/common/gradient_button.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
-import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/navigation_util.dart';
 
diff --git a/mobile/lib/ui/settings/account_section_widget.dart b/mobile/lib/ui/settings/account_section_widget.dart
index 2c67514268..1182208aea 100644
--- a/mobile/lib/ui/settings/account_section_widget.dart
+++ b/mobile/lib/ui/settings/account_section_widget.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:ente_crypto/ente_crypto.dart';
 import "package:flutter/foundation.dart";
 import 'package:flutter/material.dart';
 import "package:photos/emergency/emergency_page.dart";
@@ -16,7 +17,6 @@ import 'package:photos/ui/components/expandable_menu_item_widget.dart';
 import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart';
 import "package:photos/ui/payment/subscription.dart";
 import 'package:photos/ui/settings/common_settings.dart';
-import "package:photos/utils/crypto_util.dart";
 import 'package:photos/utils/dialog_util.dart';
 import "package:photos/utils/navigation_util.dart";
 import "package:url_launcher/url_launcher_string.dart";
diff --git a/mobile/lib/ui/settings/debug/debug_section_widget.dart b/mobile/lib/ui/settings/debug/debug_section_widget.dart
index 55b0ef4f10..5265e96f6b 100644
--- a/mobile/lib/ui/settings/debug/debug_section_widget.dart
+++ b/mobile/lib/ui/settings/debug/debug_section_widget.dart
@@ -1,3 +1,4 @@
+import 'package:ente_crypto/ente_crypto.dart';
 import 'package:flutter/material.dart';
 import 'package:photos/core/configuration.dart';
 import "package:photos/service_locator.dart";
@@ -9,7 +10,6 @@ import 'package:photos/ui/components/captioned_text_widget.dart';
 import 'package:photos/ui/components/expandable_menu_item_widget.dart';
 import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart';
 import 'package:photos/ui/settings/common_settings.dart';
-import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/toast_util.dart';
 
 class DebugSectionWidget extends StatelessWidget {
diff --git a/mobile/lib/ui/settings/lock_screen/lock_screen_password.dart b/mobile/lib/ui/settings/lock_screen/lock_screen_password.dart
index 5341f21b66..3c8c2cc330 100644
--- a/mobile/lib/ui/settings/lock_screen/lock_screen_password.dart
+++ b/mobile/lib/ui/settings/lock_screen/lock_screen_password.dart
@@ -1,5 +1,6 @@
 import "dart:convert";
 
+import 'package:ente_crypto/ente_crypto.dart';
 import "package:flutter/material.dart";
 import "package:flutter/services.dart";
 import "package:flutter_sodium/flutter_sodium.dart";
@@ -10,7 +11,6 @@ import "package:photos/ui/components/buttons/icon_button_widget.dart";
 import "package:photos/ui/components/text_input_widget.dart";
 import "package:photos/ui/settings/lock_screen/lock_screen_confirm_password.dart";
 import "package:photos/ui/settings/lock_screen/lock_screen_options.dart";
-import "package:photos/utils/crypto_util.dart";
 import "package:photos/utils/lock_screen_settings.dart";
 
 class LockScreenPassword extends StatefulWidget {
diff --git a/mobile/lib/ui/settings/lock_screen/lock_screen_pin.dart b/mobile/lib/ui/settings/lock_screen/lock_screen_pin.dart
index 2f526751f2..039b9df242 100644
--- a/mobile/lib/ui/settings/lock_screen/lock_screen_pin.dart
+++ b/mobile/lib/ui/settings/lock_screen/lock_screen_pin.dart
@@ -1,5 +1,6 @@
 import "dart:convert";
 
+import 'package:ente_crypto/ente_crypto.dart';
 import "package:flutter/material.dart";
 import "package:flutter/services.dart";
 import "package:flutter_sodium/flutter_sodium.dart";
@@ -11,7 +12,6 @@ import "package:photos/ui/components/buttons/icon_button_widget.dart";
 import "package:photos/ui/settings/lock_screen/custom_pin_keypad.dart";
 import "package:photos/ui/settings/lock_screen/lock_screen_confirm_pin.dart";
 import "package:photos/ui/settings/lock_screen/lock_screen_options.dart";
-import "package:photos/utils/crypto_util.dart";
 import "package:photos/utils/lock_screen_settings.dart";
 import 'package:pinput/pinput.dart';
 
diff --git a/mobile/lib/ui/settings/security_section_widget.dart b/mobile/lib/ui/settings/security_section_widget.dart
index 403a5506d4..8b73a1cc00 100644
--- a/mobile/lib/ui/settings/security_section_widget.dart
+++ b/mobile/lib/ui/settings/security_section_widget.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import "dart:typed_data";
 
+import 'package:ente_crypto/ente_crypto.dart';
 import 'package:flutter/material.dart';
 import "package:local_auth/local_auth.dart";
 import "package:logging/logging.dart";
@@ -24,7 +25,6 @@ import 'package:photos/ui/components/toggle_switch_widget.dart';
 import 'package:photos/ui/settings/common_settings.dart';
 import "package:photos/ui/settings/lock_screen/lock_screen_options.dart";
 import "package:photos/utils/auth_util.dart";
-import "package:photos/utils/crypto_util.dart";
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/navigation_util.dart";
 import "package:photos/utils/toast_util.dart";
diff --git a/mobile/lib/ui/sharing/manage_links_widget.dart b/mobile/lib/ui/sharing/manage_links_widget.dart
index 6e55fbfbb9..b77aa00211 100644
--- a/mobile/lib/ui/sharing/manage_links_widget.dart
+++ b/mobile/lib/ui/sharing/manage_links_widget.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:collection/collection.dart';
+import 'package:ente_crypto/ente_crypto.dart';
 import "package:fast_base58/fast_base58.dart";
 import 'package:flutter/material.dart';
 import "package:flutter/services.dart";
@@ -18,7 +19,6 @@ import 'package:photos/ui/components/menu_section_description_widget.dart';
 import "package:photos/ui/components/toggle_switch_widget.dart";
 import 'package:photos/ui/sharing/pickers/device_limit_picker_page.dart';
 import 'package:photos/ui/sharing/pickers/link_expiry_picker_page.dart';
-import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/date_time_util.dart';
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/navigation_util.dart';
diff --git a/mobile/lib/ui/tabs/home_widget.dart b/mobile/lib/ui/tabs/home_widget.dart
index 28165ddd4f..f48113923c 100644
--- a/mobile/lib/ui/tabs/home_widget.dart
+++ b/mobile/lib/ui/tabs/home_widget.dart
@@ -66,7 +66,7 @@ import "package:photos/ui/viewer/gallery/shared_public_collection_page.dart";
 import "package:photos/ui/viewer/search/search_widget.dart";
 import 'package:photos/ui/viewer/search_tab/search_tab.dart';
 import "package:photos/utils/collection_util.dart";
-import "package:photos/utils/crypto_util.dart";
+import "package:ente_crypto/ente_crypto.dart";
 import 'package:photos/utils/dialog_util.dart';
 import "package:photos/utils/diff_fetcher.dart";
 import "package:photos/utils/navigation_util.dart";
diff --git a/mobile/lib/utils/diff_fetcher.dart b/mobile/lib/utils/diff_fetcher.dart
index 3bcf22b7d0..405978f2f8 100644
--- a/mobile/lib/utils/diff_fetcher.dart
+++ b/mobile/lib/utils/diff_fetcher.dart
@@ -1,16 +1,16 @@
 import 'dart:convert';
 import 'dart:math';
 
-import "package:dio/dio.dart";
-import "package:flutter/material.dart";
+import 'package:dio/dio.dart';
+import 'package:ente_crypto/ente_crypto.dart';
+import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
 import 'package:photos/core/network/network.dart';
 import 'package:photos/db/files_db.dart';
-import "package:photos/generated/l10n.dart";
+import 'package:photos/generated/l10n.dart';
 import 'package:photos/models/file/file.dart';
 import "package:photos/models/metadata/file_magic.dart";
 import "package:photos/services/collections_service.dart";
-import 'package:photos/utils/crypto_util.dart';
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/file_key.dart";
 
diff --git a/mobile/lib/utils/file_download_util.dart b/mobile/lib/utils/file_download_util.dart
index b998c22db3..8958136c69 100644
--- a/mobile/lib/utils/file_download_util.dart
+++ b/mobile/lib/utils/file_download_util.dart
@@ -3,6 +3,7 @@ import "dart:collection";
 import 'dart:io';
 
 import 'package:dio/dio.dart';
+import 'package:ente_crypto/ente_crypto.dart';
 import "package:flutter/foundation.dart";
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as file_path;
@@ -18,7 +19,6 @@ import "package:photos/models/ignored_file.dart";
 import "package:photos/services/collections_service.dart";
 import "package:photos/services/ignored_files_service.dart";
 import "package:photos/services/local_sync_service.dart";
-import 'package:photos/utils/crypto_util.dart';
 import "package:photos/utils/data_util.dart";
 import "package:photos/utils/fake_progress.dart";
 import "package:photos/utils/file_key.dart";
diff --git a/mobile/lib/utils/file_key.dart b/mobile/lib/utils/file_key.dart
index 2a27d33bc2..345c6f6b1d 100644
--- a/mobile/lib/utils/file_key.dart
+++ b/mobile/lib/utils/file_key.dart
@@ -1,9 +1,9 @@
 import "dart:typed_data";
 
 import "package:computer/computer.dart";
+import "package:ente_crypto/ente_crypto.dart";
 import "package:photos/models/file/file.dart";
 import "package:photos/services/collections_service.dart";
-import "package:photos/utils/crypto_util.dart";
 
 Uint8List getFileKey(EnteFile file) {
   final encryptedKey = CryptoUtil.base642bin(file.encryptedKey!);
diff --git a/mobile/lib/utils/file_uploader.dart b/mobile/lib/utils/file_uploader.dart
index 659fd560f1..78b31ff4f9 100644
--- a/mobile/lib/utils/file_uploader.dart
+++ b/mobile/lib/utils/file_uploader.dart
@@ -6,6 +6,7 @@ import 'dart:math' as math;
 
 import 'package:collection/collection.dart';
 import 'package:dio/dio.dart';
+import 'package:ente_crypto/ente_crypto.dart';
 import 'package:flutter/foundation.dart';
 import 'package:logging/logging.dart';
 import "package:path/path.dart";
@@ -25,7 +26,6 @@ import 'package:photos/events/subscription_purchased_event.dart';
 import 'package:photos/main.dart';
 import "package:photos/models/backup/backup_item.dart";
 import "package:photos/models/backup/backup_item_status.dart";
-import 'package:photos/models/encryption_result.dart';
 import 'package:photos/models/file/file.dart';
 import 'package:photos/models/file/file_type.dart';
 import "package:photos/models/metadata/file_magic.dart";
@@ -39,7 +39,6 @@ import 'package:photos/services/local_sync_service.dart';
 import "package:photos/services/preview_video_store.dart";
 import 'package:photos/services/sync_service.dart';
 import "package:photos/services/user_service.dart";
-import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/data_util.dart';
 import "package:photos/utils/exif_util.dart";
 import "package:photos/utils/file_key.dart";
diff --git a/mobile/lib/utils/file_uploader_util.dart b/mobile/lib/utils/file_uploader_util.dart
index 6f37236b8e..8a7afb44e0 100644
--- a/mobile/lib/utils/file_uploader_util.dart
+++ b/mobile/lib/utils/file_uploader_util.dart
@@ -6,6 +6,7 @@ import 'dart:ui' as ui;
 
 import "package:archive/archive_io.dart";
 import "package:computer/computer.dart";
+import 'package:ente_crypto/ente_crypto.dart';
 import "package:exif/exif.dart";
 import 'package:logging/logging.dart';
 import "package:motion_photos/motion_photos.dart";
@@ -23,7 +24,6 @@ import 'package:photos/models/file/file_type.dart';
 import "package:photos/models/location/location.dart";
 import "package:photos/models/metadata/file_magic.dart";
 import "package:photos/services/file_magic_service.dart";
-import 'package:photos/utils/crypto_util.dart';
 import "package:photos/utils/exif_util.dart";
 import 'package:photos/utils/file_util.dart';
 import "package:uuid/uuid.dart";
diff --git a/mobile/lib/utils/gzip.dart b/mobile/lib/utils/gzip.dart
index 8de71f49df..3c8fbafe9e 100644
--- a/mobile/lib/utils/gzip.dart
+++ b/mobile/lib/utils/gzip.dart
@@ -2,8 +2,8 @@ import "dart:convert";
 import "dart:io";
 
 import "package:computer/computer.dart";
+import "package:ente_crypto/ente_crypto.dart";
 import "package:flutter/foundation.dart";
-import "package:photos/utils/crypto_util.dart";
 
 class ChaChaEncryptionResult {
   final String encData;
diff --git a/mobile/lib/utils/lock_screen_settings.dart b/mobile/lib/utils/lock_screen_settings.dart
index 2a42b1d930..f60ed48504 100644
--- a/mobile/lib/utils/lock_screen_settings.dart
+++ b/mobile/lib/utils/lock_screen_settings.dart
@@ -1,9 +1,9 @@
 import "dart:convert";
 
+import "package:ente_crypto/ente_crypto.dart";
 import "package:flutter/foundation.dart";
 import "package:flutter_secure_storage/flutter_secure_storage.dart";
 import "package:flutter_sodium/flutter_sodium.dart";
-import "package:photos/utils/crypto_util.dart";
 import "package:privacy_screen/privacy_screen.dart";
 import "package:shared_preferences/shared_preferences.dart";
 
diff --git a/mobile/lib/utils/thumbnail_util.dart b/mobile/lib/utils/thumbnail_util.dart
index 7769976888..17d52c6432 100644
--- a/mobile/lib/utils/thumbnail_util.dart
+++ b/mobile/lib/utils/thumbnail_util.dart
@@ -4,6 +4,7 @@ import 'dart:io';
 import "dart:typed_data";
 
 import 'package:dio/dio.dart';
+import 'package:ente_crypto/ente_crypto.dart';
 import 'package:logging/logging.dart';
 import 'package:photo_manager/photo_manager.dart';
 import 'package:photos/core/cache/thumbnail_in_memory_cache.dart';
@@ -13,7 +14,6 @@ import 'package:photos/core/errors.dart';
 import 'package:photos/core/network/network.dart';
 import 'package:photos/models/file/file.dart';
 import "package:photos/services/collections_service.dart";
-import 'package:photos/utils/crypto_util.dart';
 import "package:photos/utils/file_key.dart";
 import 'package:photos/utils/file_uploader_util.dart';
 import 'package:photos/utils/file_util.dart';
diff --git a/mobile/lib/utils/trash_diff_fetcher.dart b/mobile/lib/utils/trash_diff_fetcher.dart
index e525125a82..80041315c5 100644
--- a/mobile/lib/utils/trash_diff_fetcher.dart
+++ b/mobile/lib/utils/trash_diff_fetcher.dart
@@ -2,10 +2,10 @@ import 'dart:convert';
 import 'dart:math';
 
 import "package:dio/dio.dart";
+import 'package:ente_crypto/ente_crypto.dart';
 import 'package:logging/logging.dart';
 import 'package:photos/models/file/trash_file.dart';
 import "package:photos/models/metadata/file_magic.dart";
-import 'package:photos/utils/crypto_util.dart';
 import "package:photos/utils/file_key.dart";
 
 class TrashDiffFetcher {
diff --git a/mobile/plugins/ente_crypto/.metadata b/mobile/plugins/ente_crypto/.metadata
new file mode 100644
index 0000000000..9fc7ede54d
--- /dev/null
+++ b/mobile/plugins/ente_crypto/.metadata
@@ -0,0 +1,10 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: 0b8abb4724aa590dd0f429683339b1e045a1594d
+  channel: stable
+
+project_type: plugin
diff --git a/mobile/plugins/ente_crypto/analysis_options.yaml b/mobile/plugins/ente_crypto/analysis_options.yaml
new file mode 100644
index 0000000000..fac60e247c
--- /dev/null
+++ b/mobile/plugins/ente_crypto/analysis_options.yaml
@@ -0,0 +1 @@
+include: ../../analysis_options.yaml
\ No newline at end of file
diff --git a/mobile/plugins/ente_crypto/lib/ente_crypto.dart b/mobile/plugins/ente_crypto/lib/ente_crypto.dart
new file mode 100644
index 0000000000..02b6d0bb58
--- /dev/null
+++ b/mobile/plugins/ente_crypto/lib/ente_crypto.dart
@@ -0,0 +1,4 @@
+export 'src/crypto.dart';
+export 'src/models/derived_key_result.dart';
+export 'src/models/encryption_result.dart';
+export 'src/models/errors.dart';
diff --git a/mobile/lib/utils/crypto_util.dart b/mobile/plugins/ente_crypto/lib/src/crypto.dart
similarity index 98%
rename from mobile/lib/utils/crypto_util.dart
rename to mobile/plugins/ente_crypto/lib/src/crypto.dart
index 52ed85f857..7a3ec6c3c5 100644
--- a/mobile/lib/utils/crypto_util.dart
+++ b/mobile/plugins/ente_crypto/lib/src/crypto.dart
@@ -2,12 +2,12 @@ import "dart:convert";
 import "dart:io";
 import 'dart:typed_data';
 
-import 'package:computer/computer.dart';
-import 'package:flutter_sodium/flutter_sodium.dart';
-import 'package:logging/logging.dart';
-import "package:photos/core/errors.dart";
-import 'package:photos/models/derived_key_result.dart';
-import 'package:photos/models/encryption_result.dart';
+import "package:computer/computer.dart";
+import "package:ente_crypto/src/models/derived_key_result.dart";
+import "package:ente_crypto/src/models/encryption_result.dart";
+import "package:ente_crypto/src/models/errors.dart";
+import "package:flutter_sodium/flutter_sodium.dart";
+import "package:logging/logging.dart";
 
 const int encryptionChunkSize = 4 * 1024 * 1024;
 final int decryptionChunkSize =
diff --git a/mobile/lib/models/derived_key_result.dart b/mobile/plugins/ente_crypto/lib/src/models/derived_key_result.dart
similarity index 100%
rename from mobile/lib/models/derived_key_result.dart
rename to mobile/plugins/ente_crypto/lib/src/models/derived_key_result.dart
diff --git a/mobile/lib/models/encryption_result.dart b/mobile/plugins/ente_crypto/lib/src/models/encryption_result.dart
similarity index 100%
rename from mobile/lib/models/encryption_result.dart
rename to mobile/plugins/ente_crypto/lib/src/models/encryption_result.dart
diff --git a/mobile/plugins/ente_crypto/lib/src/models/errors.dart b/mobile/plugins/ente_crypto/lib/src/models/errors.dart
new file mode 100644
index 0000000000..3d4a186456
--- /dev/null
+++ b/mobile/plugins/ente_crypto/lib/src/models/errors.dart
@@ -0,0 +1,3 @@
+class KeyDerivationError extends Error {}
+
+class LoginKeyDerivationError extends Error {}
diff --git a/mobile/plugins/ente_crypto/pubspec.lock b/mobile/plugins/ente_crypto/pubspec.lock
new file mode 100644
index 0000000000..0807ae8a31
--- /dev/null
+++ b/mobile/plugins/ente_crypto/pubspec.lock
@@ -0,0 +1,105 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
+  collection:
+    dependency: "direct main"
+    description:
+      name: collection
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.18.0"
+  computer:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: "82e365fed8a1a76f6eea0220de98389eed7b0445"
+      url: "https://github.com/ente-io/computer.git"
+    source: git
+    version: "3.2.1"
+  ffi:
+    dependency: transitive
+    description:
+      name: ffi
+      sha256: "13a6ccf6a459a125b3fcdb6ec73bd5ff90822e071207c663bfd1f70062d51d18"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
+  flutter:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_lints:
+    dependency: "direct dev"
+    description:
+      name: flutter_lints
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.0"
+  flutter_sodium:
+    dependency: "direct main"
+    description:
+      name: flutter_sodium
+      sha256: "0e8c475088f8c9a60fda0ef19ee42cdcb574f8549c8ea809f736ef60e8ad51a6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
+  lints:
+    dependency: transitive
+    description:
+      name: lints
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.0"
+  logging:
+    dependency: "direct main"
+    description:
+      name: logging
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.11.1"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.15.0"
+  sky_engine:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.99"
+  vector_math:
+    dependency: transitive
+    description:
+      name: vector_math
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+sdks:
+  dart: ">=3.5.0 <4.0.0"
+  flutter: ">=1.12.0"
diff --git a/mobile/plugins/ente_crypto/pubspec.yaml b/mobile/plugins/ente_crypto/pubspec.yaml
new file mode 100644
index 0000000000..a3aea1ca8a
--- /dev/null
+++ b/mobile/plugins/ente_crypto/pubspec.yaml
@@ -0,0 +1,20 @@
+name: ente_crypto
+version: 0.0.1
+publish_to: none
+
+environment:
+  sdk: '>=3.3.0 <4.0.0'
+
+dependencies:
+  collection:
+  computer:
+    git: "https://github.com/ente-io/computer.git"
+  flutter:
+    sdk: flutter
+  flutter_sodium: ^0.2.0
+  logging: ^1.3.0
+  
+dev_dependencies:
+  flutter_lints:
+
+flutter:
\ No newline at end of file
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index ab9c4cd2a4..bc7f169214 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -511,6 +511,13 @@ packages:
       relative: true
     source: path
     version: "0.0.1"
+  ente_crypto:
+    dependency: "direct main"
+    description:
+      path: "plugins/ente_crypto"
+      relative: true
+    source: path
+    version: "0.0.1"
   ente_feature_flag:
     dependency: "direct main"
     description:
@@ -1526,10 +1533,10 @@ packages:
     dependency: "direct main"
     description:
       name: logging
-      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   lottie:
     dependency: "direct main"
     description:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 2af747b753..f5e6f65e94 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -53,6 +53,8 @@ dependencies:
     path: plugins/ente_cast
   ente_cast_normal:
     path: plugins/ente_cast_normal
+  ente_crypto:
+    path: plugins/ente_crypto
   ente_feature_flag:
     path: plugins/ente_feature_flag
   equatable: ^2.0.5
@@ -111,7 +113,7 @@ dependencies:
   local_auth: ^2.1.5
   local_auth_android:
   local_auth_ios:
-  logging: ^1.0.1
+  logging: ^1.3.0
   lottie: ^1.2.2
   maps_launcher: ^2.2.1
   media_extension:

From 8ff8a0f0d2b9e968a9fa0f065de739eeca83cc33 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Tue, 18 Feb 2025 13:21:34 +0530
Subject: [PATCH 277/796] [mob][photos] Don't use computer anywhere (yet)

---
 mobile/lib/services/location_service.dart     | 13 +++++++++
 .../lib/services/smart_memories_service.dart  | 29 ++++++++++---------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/mobile/lib/services/location_service.dart b/mobile/lib/services/location_service.dart
index 1e2a181828..66563be7ad 100644
--- a/mobile/lib/services/location_service.dart
+++ b/mobile/lib/services/location_service.dart
@@ -82,6 +82,19 @@ class LocationService {
     return result;
   }
 
+  /// WARNING: This method does not use computer, consider using [getFilesInCity] instead
+  Map<City, List<EnteFile>> getFilesInCitySync(
+    List<EnteFile> allFiles,
+  ) {
+    if (allFiles.isEmpty) reloadLocationDiscoverySection = true;
+    final result = getCityResults({
+      "query": '',
+      "cities": _cities,
+      "files": allFiles,
+    });
+    return result;
+  }
+
   Future<Iterable<LocalEntity<LocationTag>>> getLocationTags() {
     return _getStoredLocationTags();
   }
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index ec6e29ea79..1cfbdd795f 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -39,9 +39,11 @@ class SmartMemoriesService {
   List<SmartMemory>? _cachedMemories;
   Future<List<SmartMemory>>? _future;
 
-  Vector? _clipTextVector;
+  Vector? _clipPositiveTextVector;
+  static const String clipPositiveQuery =
+      'Photo of a precious memory radiating warmth, vibrant energy, or quiet beauty — alive with color, light, or emotion';
 
-  static const _calculationWindowDays = 14;
+  static const int _calculationWindowDays = 14;
 
   // Singleton pattern
   SmartMemoriesService._privateConstructor();
@@ -71,6 +73,11 @@ class SmartMemoriesService {
             .removeWhere((m) => generatedIDs.contains(m.file.generatedID));
       }
     });
+    unawaited(
+      MLComputer.instance.runClipText(clipPositiveQuery).then((embedding) {
+        _clipPositiveTextVector ??= Vector.fromList(embedding);
+      }),
+    );
     _isInit = true;
     _logger.info("Smart memories service initialized");
   }
@@ -435,7 +442,7 @@ class SmartMemoriesService {
     // For now for testing let's just surface all base locations
     for (final baseLocation in baseLocations) {
       String name = "Base (${baseLocation.isCurrentBase ? 'current' : 'old'})";
-      final String? locationName = await _tryFindLocationName(
+      final String? locationName = _tryFindLocationName(
         Memory.fromFiles(baseLocation.files, _seenTimes),
         base: true,
       );
@@ -484,7 +491,7 @@ class SmartMemoriesService {
         final year =
             DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime())
                 .year;
-        final String? locationName = await _tryFindLocationName(trip.memories);
+        final String? locationName = _tryFindLocationName(trip.memories);
         String name =
             "Trip in $year"; // TODO lau: extract strings for translation
         if (locationName != null) {
@@ -530,7 +537,7 @@ class SmartMemoriesService {
                 DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime())
                     .year;
             final String? locationName =
-                await _tryFindLocationName(trip.memories);
+                _tryFindLocationName(trip.memories);
             String name = "Trip in $year";
             if (locationName != null) {
               name = "Trip to $locationName";
@@ -770,12 +777,12 @@ class SmartMemoriesService {
     return ((dayOfYear - 1) ~/ 7) + 1;
   }
 
-  Future<String?> _tryFindLocationName(
+  String? _tryFindLocationName(
     List<Memory> memories, {
     bool base = false,
-  }) async {
+  }) {
     final files = Memory.filesFromMemories(memories);
-    final results = await locationService.getFilesInCity(files, '');
+    final results = locationService.getFilesInCitySync(files);
     final List<City> sortedByResultCount = results.keys.toList()
       ..sort((a, b) => results[b]!.length.compareTo(results[a]!.length));
     if (sortedByResultCount.isEmpty) return null;
@@ -820,10 +827,6 @@ class SmartMemoriesService {
     }).toSet();
 
     // Get clip scores for each file
-    const query =
-        'Photo of a precious memory radiating warmth, vibrant energy, or quiet beauty — alive with color, light, or emotion';
-    _clipTextVector ??=
-        Vector.fromList(await MLComputer.instance.runClipText(query));
     const clipThreshold = 0.75;
     final fileToScore = <int, double>{};
     for (final mem in safeMemories) {
@@ -832,7 +835,7 @@ class SmartMemoriesService {
         fileToScore[mem.file.uploadedFileID!] = 0;
         continue;
       }
-      final score = clip.vector.dot(_clipTextVector!);
+      final score = clip.vector.dot(_clipPositiveTextVector!);
       fileToScore[mem.file.uploadedFileID!] = score;
     }
 

From c1a53bdfcec8257cc4a5d49b07f0a12c618b9900 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 18 Feb 2025 13:24:15 +0530
Subject: [PATCH 278/796] Fix lint issues

---
 mobile/lib/services/preview_video_store.dart | 2 +-
 mobile/lib/ui/tabs/home_widget.dart          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 97145056e1..bd9ef30ea6 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -127,7 +127,7 @@ class PreviewVideoStore {
         Bus.instance.fire(PreviewUpdatedEvent(_items));
         return;
       } catch (e, s) {
-        if (e is DioError && e.response?.statusCode == 404) {
+        if (e is DioException && e.response?.statusCode == 404) {
           _logger.info("No preview found for $enteFile");
         } else {
           _logger.warning("Failed to get playlist for $enteFile", e, s);
diff --git a/mobile/lib/ui/tabs/home_widget.dart b/mobile/lib/ui/tabs/home_widget.dart
index f48113923c..cfb44c5d64 100644
--- a/mobile/lib/ui/tabs/home_widget.dart
+++ b/mobile/lib/ui/tabs/home_widget.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import "dart:convert";
 import "dart:io";
 
+import "package:ente_crypto/ente_crypto.dart";
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
@@ -66,7 +67,6 @@ import "package:photos/ui/viewer/gallery/shared_public_collection_page.dart";
 import "package:photos/ui/viewer/search/search_widget.dart";
 import 'package:photos/ui/viewer/search_tab/search_tab.dart';
 import "package:photos/utils/collection_util.dart";
-import "package:ente_crypto/ente_crypto.dart";
 import 'package:photos/utils/dialog_util.dart';
 import "package:photos/utils/diff_fetcher.dart";
 import "package:photos/utils/navigation_util.dart";

From 4b87c9f3ac371be859812300723cf6acb32a2a72 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 13:18:18 +0530
Subject: [PATCH 279/796] Thumb errs

---
 .../gallery/components/viewer/data-source.ts       | 14 ++++++++------
 web/packages/gallery/services/download.ts          |  3 +++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 0abaf0755a..4d05dcb990 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -155,7 +155,7 @@ export const itemDataForFile = (file: EnteFile, needsRefresh: () => void) => {
     _state.needsRefreshByFileID.set(file.id, needsRefresh);
 
     if (!itemData) {
-        itemData = {};
+        itemData = { isContentLoading: true };
         _state.itemDataByFileID.set(file.id, itemData);
         void enqueueUpdates(file);
     }
@@ -184,7 +184,9 @@ const enqueueUpdates = async (file: EnteFile) => {
     let thumbnailData: ItemData;
     try {
         const thumbnailURL = await downloadManager.renderableThumbnailURL(file);
-        // TODO(PS):
+        // While the types don't reflect it, it is safe to use the ! (null
+        // assertion) here since renderableThumbnailURL can throw but will not
+        // return undefined by default.
         thumbnailData = await withDimensions(thumbnailURL!);
         update({
             ...thumbnailData,
@@ -193,7 +195,8 @@ const enqueueUpdates = async (file: EnteFile) => {
         });
     } catch (e) {
         // If we can't even get the thumbnail, then a network error is likely
-        // (download manager already has retries).
+        // (download manager already has retries); in particular, it cannot be a
+        // format error since thumbnails are already standard JPEGs.
         //
         // Notify the user of the error. The entire process will be retried when
         // they reopen the slide later.
@@ -247,7 +250,7 @@ const enqueueUpdates = async (file: EnteFile) => {
  * {@link ItemData}.
  */
 const withDimensions = (imageURL: string): Promise<ItemData> =>
-    new Promise((resolve) => {
+    new Promise((resolve, reject) => {
         const image = new Image();
         image.onload = () => {
             resolve({
@@ -256,7 +259,6 @@ const withDimensions = (imageURL: string): Promise<ItemData> =>
                 height: image.naturalHeight,
             });
         };
-        // image.onerror = ()
-        // TODO(PS): Handle imageElement.onerror
+        image.onerror = reject;
         image.src = imageURL;
     });
diff --git a/web/packages/gallery/services/download.ts b/web/packages/gallery/services/download.ts
index bce3d92bd0..03fa6c2f14 100644
--- a/web/packages/gallery/services/download.ts
+++ b/web/packages/gallery/services/download.ts
@@ -217,6 +217,9 @@ class DownloadManager {
      *
      * The returned URL is actually an object URL, but it should not be revoked
      * since the download manager caches it for future use.
+     *
+     * If {@link cachedOnly} is false (the default), then this method will
+     * indicate errors by throwing but will never return `undefined`.
      */
     async renderableThumbnailURL(
         file: EnteFile,

From 324c156ea140daa44f419bf8e2a0d75861936d3d Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 13:43:23 +0530
Subject: [PATCH 280/796] Use last best instead of thumbnail

---
 .../gallery/components/viewer/data-source.ts      | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 4d05dcb990..058e015e5e 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -181,13 +181,20 @@ const enqueueUpdates = async (file: EnteFile) => {
         _state.needsRefreshByFileID.get(file.id)?.();
     };
 
-    let thumbnailData: ItemData;
+    // Use the last best available data, but stop showing the loading indicator
+    // and instead show the error indicator.
+    const updateFailureReason = (failureReason: ItemData["failureReason"]) => {
+        const lastData = _state.itemDataByFileID.get(file.id) ?? {};
+        delete lastData.isContentLoading;
+        update({ ...lastData, failureReason });
+    };
+
     try {
         const thumbnailURL = await downloadManager.renderableThumbnailURL(file);
         // While the types don't reflect it, it is safe to use the ! (null
         // assertion) here since renderableThumbnailURL can throw but will not
         // return undefined by default.
-        thumbnailData = await withDimensions(thumbnailURL!);
+        const thumbnailData = await withDimensions(thumbnailURL!);
         update({
             ...thumbnailData,
             isContentLoading: true,
@@ -201,7 +208,7 @@ const enqueueUpdates = async (file: EnteFile) => {
         // Notify the user of the error. The entire process will be retried when
         // they reopen the slide later.
         log.error("Failed to show thumbnail", e);
-        update({ failureReason: "other" });
+        updateFailureReason("other");
         return;
     }
 
@@ -240,7 +247,7 @@ const enqueueUpdates = async (file: EnteFile) => {
         }
     } catch (e) {
         log.error("Failed to show file", e);
-        update({ ...thumbnailData, failureReason: "other" });
+        updateFailureReason("other");
     }
 };
 

From a0025ab09b928502bddc937245196011b249fef7 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 18 Feb 2025 13:48:28 +0530
Subject: [PATCH 281/796] [mob] Lint fixes

---
 mobile/lib/core/configuration.dart            |  6 +--
 mobile/lib/core/errors.dart                   |  6 +--
 .../lib/emergency/recover_others_account.dart |  2 +-
 mobile/lib/ente_theme_data.dart               | 44 +++++++++----------
 mobile/lib/services/collections_service.dart  | 12 ++---
 mobile/lib/services/favorites_service.dart    |  3 +-
 mobile/lib/services/file_magic_service.dart   |  5 +--
 mobile/lib/services/hidden_service.dart       |  7 ++-
 .../face_ml/face_detection/detection.dart     |  9 ++--
 mobile/lib/services/remote_sync_service.dart  |  1 -
 mobile/lib/services/user_service.dart         |  2 +-
 mobile/lib/states/user_details_state.dart     | 10 ++---
 .../lib/ui/account/change_email_dialog.dart   |  2 +-
 mobile/lib/ui/account/login_page.dart         |  2 +-
 .../account/login_pwd_verification_page.dart  |  3 +-
 .../lib/ui/account/ott_verification_page.dart |  4 +-
 .../lib/ui/account/password_entry_page.dart   |  4 +-
 .../lib/ui/account/password_reentry_page.dart |  2 +-
 mobile/lib/ui/account/recovery_key_page.dart  |  4 +-
 mobile/lib/ui/account/recovery_page.dart      |  3 +-
 .../request_pwd_verification_page.dart        |  2 +-
 mobile/lib/ui/account/sessions_page.dart      |  2 +-
 .../ui/account/two_factor_recovery_page.dart  |  4 +-
 .../lib/ui/account/two_factor_setup_page.dart |  4 +-
 .../lib/ui/account/verify_recovery_page.dart  |  2 +-
 mobile/lib/ui/cast/auto.dart                  |  4 +-
 mobile/lib/ui/cast/choose.dart                |  4 +-
 .../ui/collections/album/horizontal_list.dart |  4 +-
 .../collections/button/archived_button.dart   |  6 +--
 .../ui/collections/button/hidden_button.dart  |  2 +-
 .../ui/collections/button/trash_button.dart   |  2 +-
 .../button/uncategorized_button.dart          |  6 +--
 .../ui/collections/collection_list_page.dart  |  4 +-
 .../device/device_folder_item.dart            |  4 +-
 .../device_folders_vertical_grid_view.dart    |  4 +-
 mobile/lib/ui/collections/flex_grid_view.dart |  4 +-
 mobile/lib/ui/collections/new_album_icon.dart |  4 +-
 mobile/lib/ui/common/bottom_shadow.dart       |  2 +-
 mobile/lib/ui/common/dynamic_fab.dart         |  6 +--
 mobile/lib/ui/common/fast_scroll_physics.dart |  3 +-
 mobile/lib/ui/common/gradient_button.dart     |  4 +-
 .../lib/ui/common/linear_progress_dialog.dart |  2 +-
 mobile/lib/ui/common/web_page.dart            |  4 +-
 .../ui/components/captioned_text_widget.dart  |  4 +-
 .../lib/ui/components/home_header_widget.dart |  3 +-
 .../menu_item_widget/menu_item_widget.dart    |  4 +-
 .../ui/components/toggle_switch_widget.dart   |  6 +--
 mobile/lib/ui/extents_page_view.dart          | 20 ++++-----
 mobile/lib/ui/home/header_error_widget.dart   |  5 +--
 mobile/lib/ui/home/home_bottom_nav_bar.dart   |  4 +-
 mobile/lib/ui/home/landing_page_widget.dart   |  6 +--
 .../ui/home/memories/full_screen_memory.dart  |  6 +--
 .../ui/huge_listview/draggable_scrollbar.dart |  4 +-
 .../lib/ui/huge_listview/huge_listview.dart   |  4 +-
 .../ui/huge_listview/scroll_bar_thumb.dart    |  8 ++--
 mobile/lib/ui/map/map_pull_up_gallery.dart    |  4 +-
 .../map/tile/attribution/map_attribution.dart |  2 +-
 .../ui/payment/billing_questions_widget.dart  |  8 ++--
 .../ui/payment/child_subscription_widget.dart |  4 +-
 mobile/lib/ui/payment/payment_web_page.dart   |  3 +-
 .../payment/subscription_common_widgets.dart  |  2 +-
 .../lib/ui/settings/about_section_widget.dart |  6 +--
 .../ui/settings/account_section_widget.dart   |  2 +-
 mobile/lib/ui/settings/app_update_dialog.dart |  2 +-
 .../lib/ui/settings/app_version_widget.dart   |  4 +-
 .../backup/backup_section_widget.dart         |  2 +-
 .../settings/debug/debug_section_widget.dart  |  2 +-
 .../ui/settings/general_section_widget.dart   |  2 +-
 .../ui/settings/inherited_settings_state.dart | 10 ++---
 mobile/lib/ui/settings/language_picker.dart   |  8 ++--
 .../ui/settings/security_section_widget.dart  |  2 +-
 .../settings/settings_title_bar_widget.dart   |  2 +-
 .../ui/settings/social_section_widget.dart    |  6 +--
 .../lib/ui/settings/storage_card_widget.dart  |  2 +-
 .../ui/settings/support_section_widget.dart   |  2 +-
 .../lib/ui/settings/theme_switch_widget.dart  |  2 +-
 mobile/lib/ui/settings_page.dart              |  2 +-
 .../lib/ui/sharing/manage_links_widget.dart   |  2 +-
 .../ui/sharing/verify_identity_dialog.dart    |  4 +-
 mobile/lib/ui/tabs/nav_bar.dart               | 12 ++---
 mobile/lib/ui/tabs/section_title.dart         |  4 +-
 mobile/lib/ui/tabs/user_collections_tab.dart  |  2 +-
 mobile/lib/ui/tools/app_lock.dart             |  4 +-
 .../ui/tools/debug/app_storage_viewer.dart    |  2 +-
 .../lib/ui/tools/debug/log_file_viewer.dart   |  3 +-
 .../ui/tools/debug/path_storage_viewer.dart   |  4 +-
 .../lib/ui/tools/editor/filtered_image.dart   |  4 +-
 .../ui/tools/editor/image_editor_page.dart    |  1 -
 mobile/lib/ui/tools/free_space_page.dart      |  4 +-
 mobile/lib/ui/tools/lock_screen.dart          |  2 +-
 .../viewer/actions/delete_empty_albums.dart   |  2 +-
 .../lib/ui/viewer/file/exif_info_dialog.dart  |  3 +-
 .../lib/ui/viewer/file/video_exif_dialog.dart |  2 +-
 .../file/video_widget_media_kit_new.dart      |  1 -
 .../component/grid/lazy_grid_view.dart        |  4 +-
 .../grid/place_holder_grid_view_widget.dart   |  4 +-
 .../component/group/lazy_group_gallery.dart   |  4 +-
 .../viewer/gallery/empty_hidden_widget.dart   |  6 +--
 mobile/lib/ui/viewer/gallery/empty_state.dart |  2 +-
 .../gallery/state/gallery_context_state.dart  |  6 +--
 mobile/lib/ui/viewer/gallery/trash_page.dart  |  2 +-
 .../search/result/no_result_widget.dart       |  2 +-
 .../search/search_suffix_icon_widget.dart     |  2 +-
 mobile/lib/utils/email_util.dart              |  1 -
 mobile/lib/utils/file_uploader_util.dart      |  2 +-
 mobile/lib/utils/validator_util.dart          |  2 +-
 106 files changed, 219 insertions(+), 241 deletions(-)

diff --git a/mobile/lib/core/configuration.dart b/mobile/lib/core/configuration.dart
index 20fb02b57a..c6fb81a9d7 100644
--- a/mobile/lib/core/configuration.dart
+++ b/mobile/lib/core/configuration.dart
@@ -248,7 +248,7 @@ class Configuration {
     // decrypt the master key
     final kekSalt = CryptoUtil.getSaltToDeriveKey();
     final derivedKeyResult = await CryptoUtil.deriveSensitiveKey(
-      utf8.encode(password) as Uint8List,
+      utf8.encode(password),
       kekSalt,
     );
     final loginKey = await CryptoUtil.deriveLoginKey(derivedKeyResult.key);
@@ -294,7 +294,7 @@ class Configuration {
     // decrypt the master key
     final kekSalt = CryptoUtil.getSaltToDeriveKey();
     final derivedKeyResult = await CryptoUtil.deriveSensitiveKey(
-      utf8.encode(password) as Uint8List,
+      utf8.encode(password),
       kekSalt,
     );
     final loginKey = await CryptoUtil.deriveLoginKey(derivedKeyResult.key);
@@ -332,7 +332,7 @@ class Configuration {
     // Derive key-encryption-key from the entered password and existing
     // mem and ops limits
     keyEncryptionKey ??= await CryptoUtil.deriveKey(
-      utf8.encode(password) as Uint8List,
+      utf8.encode(password),
       CryptoUtil.base642bin(attributes.kekSalt),
       attributes.memLimit!,
       attributes.opsLimit!,
diff --git a/mobile/lib/core/errors.dart b/mobile/lib/core/errors.dart
index 8ea8aa6ad6..b6d16802c3 100644
--- a/mobile/lib/core/errors.dart
+++ b/mobile/lib/core/errors.dart
@@ -20,7 +20,7 @@ extension InvalidReasonExn on InvalidReason {
 class InvalidFileError extends ArgumentError {
   final InvalidReason reason;
 
-  InvalidFileError(String message, this.reason) : super(message);
+  InvalidFileError(String super.message, this.reason);
 
   @override
   String toString() {
@@ -63,13 +63,13 @@ class UnauthorizedError extends Error {}
 class RequestCancelledError extends Error {}
 
 class InvalidSyncStatusError extends AssertionError {
-  InvalidSyncStatusError(String message) : super(message);
+  InvalidSyncStatusError(String super.message);
 }
 
 class UnauthorizedEditError extends AssertionError {}
 
 class InvalidStateError extends AssertionError {
-  InvalidStateError(String message) : super(message);
+  InvalidStateError(String super.message);
 }
 
 class SrpSetupNotCompleteError extends Error {}
diff --git a/mobile/lib/emergency/recover_others_account.dart b/mobile/lib/emergency/recover_others_account.dart
index 5b7d658d61..58d4714da7 100644
--- a/mobile/lib/emergency/recover_others_account.dart
+++ b/mobile/lib/emergency/recover_others_account.dart
@@ -325,7 +325,7 @@ class _RecoverOthersAccountState extends State<RecoverOthersAccount> {
       // decrypt the master key
       final kekSalt = CryptoUtil.getSaltToDeriveKey();
       final derivedKeyResult = await CryptoUtil.deriveSensitiveKey(
-        utf8.encode(password) as Uint8List,
+        utf8.encode(password),
         kekSalt,
       );
       final loginKey = await CryptoUtil.deriveLoginKey(derivedKeyResult.key);
diff --git a/mobile/lib/ente_theme_data.dart b/mobile/lib/ente_theme_data.dart
index 6ee3384ac4..3e5665d56e 100644
--- a/mobile/lib/ente_theme_data.dart
+++ b/mobile/lib/ente_theme_data.dart
@@ -15,7 +15,7 @@ final lightThemeData = ThemeData(
   colorScheme: const ColorScheme.light(
     primary: Colors.black,
     secondary: Color.fromARGB(255, 163, 163, 163),
-    background: Colors.white,
+    surface: Colors.white,
     surfaceTint: Colors.transparent,
   ),
   outlinedButtonTheme: buildOutlinedButtonThemeData(
@@ -70,13 +70,13 @@ final lightThemeData = ThemeData(
       color: Colors.black,
       width: 2,
     ),
-    fillColor: MaterialStateProperty.resolveWith((states) {
-      return states.contains(MaterialState.selected)
+    fillColor: WidgetStateProperty.resolveWith((states) {
+      return states.contains(WidgetState.selected)
           ? const Color.fromRGBO(0, 0, 0, 1)
           : const Color.fromRGBO(255, 255, 255, 1);
     }),
-    checkColor: MaterialStateProperty.resolveWith((states) {
-      return states.contains(MaterialState.selected)
+    checkColor: WidgetStateProperty.resolveWith((states) {
+      return states.contains(WidgetState.selected)
           ? const Color.fromRGBO(255, 255, 255, 1)
           : const Color.fromRGBO(0, 0, 0, 1);
     }),
@@ -93,7 +93,7 @@ final darkThemeData = ThemeData(
   hintColor: const Color.fromRGBO(158, 158, 158, 1),
   colorScheme: const ColorScheme.dark(
     primary: Colors.white,
-    background: Color.fromRGBO(0, 0, 0, 1),
+    surface: Color.fromRGBO(0, 0, 0, 1),
     secondary: Color.fromARGB(255, 163, 163, 163),
     surfaceTint: Colors.transparent,
   ),
@@ -145,15 +145,15 @@ final darkThemeData = ThemeData(
       color: Colors.grey,
       width: 2,
     ),
-    fillColor: MaterialStateProperty.resolveWith((states) {
-      if (states.contains(MaterialState.selected)) {
+    fillColor: WidgetStateProperty.resolveWith((states) {
+      if (states.contains(WidgetState.selected)) {
         return const Color.fromRGBO(158, 158, 158, 1);
       } else {
         return const Color.fromRGBO(0, 0, 0, 1);
       }
     }),
-    checkColor: MaterialStateProperty.resolveWith((states) {
-      if (states.contains(MaterialState.selected)) {
+    checkColor: WidgetStateProperty.resolveWith((states) {
+      if (states.contains(WidgetState.selected)) {
         return const Color.fromRGBO(0, 0, 0, 1);
       } else {
         return const Color.fromRGBO(158, 158, 158, 1);
@@ -378,17 +378,17 @@ OutlinedButtonThemeData buildOutlinedButtonThemeData({
         fontSize: 18,
       ),
     ).copyWith(
-      backgroundColor: MaterialStateProperty.resolveWith<Color>(
-        (Set<MaterialState> states) {
-          if (states.contains(MaterialState.disabled)) {
+      backgroundColor: WidgetStateProperty.resolveWith<Color>(
+        (Set<WidgetState> states) {
+          if (states.contains(WidgetState.disabled)) {
             return bgDisabled;
           }
           return bgEnabled;
         },
       ),
-      foregroundColor: MaterialStateProperty.resolveWith<Color>(
-        (Set<MaterialState> states) {
-          if (states.contains(MaterialState.disabled)) {
+      foregroundColor: WidgetStateProperty.resolveWith<Color>(
+        (Set<WidgetState> states) {
+          if (states.contains(WidgetState.disabled)) {
             return fgDisabled;
           }
           return fgEnabled;
@@ -426,21 +426,21 @@ ElevatedButtonThemeData buildElevatedButtonThemeData({
 SwitchThemeData getSwitchThemeData(Color activeColor) {
   return SwitchThemeData(
     thumbColor:
-        MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
-      if (states.contains(MaterialState.disabled)) {
+        WidgetStateProperty.resolveWith<Color?>((Set<WidgetState> states) {
+      if (states.contains(WidgetState.disabled)) {
         return null;
       }
-      if (states.contains(MaterialState.selected)) {
+      if (states.contains(WidgetState.selected)) {
         return activeColor;
       }
       return null;
     }),
     trackColor:
-        MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
-      if (states.contains(MaterialState.disabled)) {
+        WidgetStateProperty.resolveWith<Color?>((Set<WidgetState> states) {
+      if (states.contains(WidgetState.disabled)) {
         return null;
       }
-      if (states.contains(MaterialState.selected)) {
+      if (states.contains(WidgetState.selected)) {
         return activeColor;
       }
       return null;
diff --git a/mobile/lib/services/collections_service.dart b/mobile/lib/services/collections_service.dart
index f3c1f8dbae..aacec742bd 100644
--- a/mobile/lib/services/collections_service.dart
+++ b/mobile/lib/services/collections_service.dart
@@ -730,7 +730,7 @@ class CollectionsService {
         await updateMagicMetadata(collection, {"subType": 0});
       }
       final encryptedName = CryptoUtil.encryptSync(
-        utf8.encode(newName) as Uint8List,
+        utf8.encode(newName),
         getCollectionKey(collection.id),
       );
       await _enteDio.post(
@@ -781,7 +781,7 @@ class CollectionsService {
 
       final key = getCollectionKey(collection.id);
       final encryptedMMd = await CryptoUtil.encryptChaCha(
-        utf8.encode(jsonEncode(jsonToUpdate)) as Uint8List,
+        utf8.encode(jsonEncode(jsonToUpdate)),
         key,
       );
       // for required field, the json validator on golang doesn't treat 0 as valid
@@ -840,7 +840,7 @@ class CollectionsService {
 
       final key = getCollectionKey(collection.id);
       final encryptedMMd = await CryptoUtil.encryptChaCha(
-        utf8.encode(jsonEncode(jsonToUpdate)) as Uint8List,
+        utf8.encode(jsonEncode(jsonToUpdate)),
         key,
       );
       // for required field, the json validator on golang doesn't treat 0 as valid
@@ -900,7 +900,7 @@ class CollectionsService {
 
       final key = getCollectionKey(collection.id);
       final encryptedMMd = await CryptoUtil.encryptChaCha(
-        utf8.encode(jsonEncode(jsonToUpdate)) as Uint8List,
+        utf8.encode(jsonEncode(jsonToUpdate)),
         key,
       );
       // for required field, the json validator on golang doesn't treat 0 as valid
@@ -1271,7 +1271,7 @@ class CollectionsService {
     final encryptedKeyData =
         CryptoUtil.encryptSync(collectionKey, _config.getKey()!);
     final encryptedName = CryptoUtil.encryptSync(
-      utf8.encode(albumName) as Uint8List,
+      utf8.encode(albumName),
       collectionKey,
     );
     final collection = await createAndCacheCollection(
@@ -1321,7 +1321,7 @@ class CollectionsService {
     final encryptedKeyData =
         CryptoUtil.encryptSync(collectionKey, _config.getKey()!);
     final encryptedPath =
-        CryptoUtil.encryptSync(utf8.encode(path) as Uint8List, collectionKey);
+        CryptoUtil.encryptSync(utf8.encode(path), collectionKey);
     final collection = await createAndCacheCollection(
       CreateRequest(
         encryptedKey: CryptoUtil.bin2base64(encryptedKeyData.encryptedData!),
diff --git a/mobile/lib/services/favorites_service.dart b/mobile/lib/services/favorites_service.dart
index c8d2cb15f3..af8dbda084 100644
--- a/mobile/lib/services/favorites_service.dart
+++ b/mobile/lib/services/favorites_service.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:typed_data';
 
 import 'package:ente_crypto/ente_crypto.dart';
 import 'package:flutter/material.dart';
@@ -254,7 +253,7 @@ class FavoritesService {
     final encryptedKeyResult =
         CryptoUtil.encryptSync(favoriteCollectionKey, _config.getKey()!);
     final encName = CryptoUtil.encryptSync(
-      utf8.encode("Favorites") as Uint8List,
+      utf8.encode("Favorites"),
       favoriteCollectionKey,
     );
     final collection = await _collectionsService.createAndCacheCollection(
diff --git a/mobile/lib/services/file_magic_service.dart b/mobile/lib/services/file_magic_service.dart
index 99ffcfb622..5d0c2721c4 100644
--- a/mobile/lib/services/file_magic_service.dart
+++ b/mobile/lib/services/file_magic_service.dart
@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'dart:typed_data';
 
 import 'package:dio/dio.dart';
 import 'package:ente_crypto/ente_crypto.dart';
@@ -95,7 +94,7 @@ class FileMagicService {
 
         final fileKey = getFileKey(file);
         final encryptedMMd = await CryptoUtil.encryptChaCha(
-          utf8.encode(jsonEncode(jsonToUpdate)) as Uint8List,
+          utf8.encode(jsonEncode(jsonToUpdate)),
           fileKey,
         );
         params['metadataList'].add(
@@ -161,7 +160,7 @@ class FileMagicService {
 
           final fileKey = getFileKey(file);
           final encryptedMMd = await CryptoUtil.encryptChaCha(
-            utf8.encode(jsonEncode(jsonToUpdate)) as Uint8List,
+            utf8.encode(jsonEncode(jsonToUpdate)),
             fileKey,
           );
           params['metadataList'].add(
diff --git a/mobile/lib/services/hidden_service.dart b/mobile/lib/services/hidden_service.dart
index 069ee094f8..90d65559c7 100644
--- a/mobile/lib/services/hidden_service.dart
+++ b/mobile/lib/services/hidden_service.dart
@@ -1,6 +1,5 @@
 import "dart:async";
 import 'dart:convert';
-import 'dart:typed_data';
 
 import 'package:collection/collection.dart';
 import 'package:ente_crypto/ente_crypto.dart';
@@ -216,7 +215,7 @@ extension HiddenService on CollectionsService {
     final encKey =
         CryptoUtil.encryptSync(uncategorizedCollectionKey, config.getKey()!);
     final encName = CryptoUtil.encryptSync(
-      utf8.encode("Uncategorized") as Uint8List,
+      utf8.encode("Uncategorized"),
       uncategorizedCollectionKey,
     );
     final collection = await createAndCacheCollection(
@@ -242,7 +241,7 @@ extension HiddenService on CollectionsService {
     final encryptedKeyData =
         CryptoUtil.encryptSync(collectionKey, config.getKey()!);
     final encryptedName = CryptoUtil.encryptSync(
-      utf8.encode(name) as Uint8List,
+      utf8.encode(name),
       collectionKey,
     );
     final jsonToUpdate = CollectionMagicMetadata(
@@ -251,7 +250,7 @@ extension HiddenService on CollectionsService {
     ).toJson();
     assert(jsonToUpdate.length == 2, "metadata should have two keys");
     final encryptedMMd = await CryptoUtil.encryptChaCha(
-      utf8.encode(jsonEncode(jsonToUpdate)) as Uint8List,
+      utf8.encode(jsonEncode(jsonToUpdate)),
       collectionKey,
     );
     final MetadataRequest metadataRequest = MetadataRequest(
diff --git a/mobile/lib/services/machine_learning/face_ml/face_detection/detection.dart b/mobile/lib/services/machine_learning/face_ml/face_detection/detection.dart
index dbe2055eb6..f7a7e630e2 100644
--- a/mobile/lib/services/machine_learning/face_ml/face_detection/detection.dart
+++ b/mobile/lib/services/machine_learning/face_ml/face_detection/detection.dart
@@ -57,7 +57,7 @@ class FaceDetectionRelative extends Detection {
   List<double> get rightMouth => allKeypoints[4];
 
   FaceDetectionRelative({
-    required double score,
+    required super.score,
     required List<double> box,
     required List<List<double>> allKeypoints,
   })  : assert(
@@ -75,8 +75,7 @@ class FaceDetectionRelative extends Detection {
               (sublist) =>
                   List<double>.from(sublist.map((e) => e.clamp(0.0, 1.0))),
             )
-            .toList(),
-        super(score: score);
+            .toList();
 
   void correctForMaintainedAspectRatio(
     Dimensions originalSize,
@@ -252,10 +251,10 @@ class FaceDetectionAbsolute extends Detection {
   List<double> get rightMouth => allKeypoints[4];
 
   FaceDetectionAbsolute({
-    required double score,
+    required super.score,
     required this.box,
     required this.allKeypoints,
-  }) : super(score: score);
+  });
 
   @override
   String toString() {
diff --git a/mobile/lib/services/remote_sync_service.dart b/mobile/lib/services/remote_sync_service.dart
index 3c60a0009c..e3bb5b463d 100644
--- a/mobile/lib/services/remote_sync_service.dart
+++ b/mobile/lib/services/remote_sync_service.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:math';
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:logging/logging.dart';
 import 'package:photos/core/configuration.dart';
diff --git a/mobile/lib/services/user_service.dart b/mobile/lib/services/user_service.dart
index 5a1ef86910..03c1123a38 100644
--- a/mobile/lib/services/user_service.dart
+++ b/mobile/lib/services/user_service.dart
@@ -695,7 +695,7 @@ class UserService {
     late Uint8List keyEncryptionKey;
     _logger.finest('Start deriving key');
     keyEncryptionKey = await CryptoUtil.deriveKey(
-      utf8.encode(userPassword) as Uint8List,
+      utf8.encode(userPassword),
       CryptoUtil.base642bin(srpAttributes.kekSalt),
       srpAttributes.memLimit,
       srpAttributes.opsLimit,
diff --git a/mobile/lib/states/user_details_state.dart b/mobile/lib/states/user_details_state.dart
index 07e90fd939..842d8bfad6 100644
--- a/mobile/lib/states/user_details_state.dart
+++ b/mobile/lib/states/user_details_state.dart
@@ -11,8 +11,8 @@ class UserDetailsStateWidget extends StatefulWidget {
 
   const UserDetailsStateWidget({
     required this.child,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<UserDetailsStateWidget> createState() => UserDetailsStateWidgetState();
@@ -65,12 +65,12 @@ class InheritedUserDetails extends InheritedWidget {
   final bool isCached;
 
   const InheritedUserDetails({
-    Key? key,
-    required Widget child,
+    super.key,
+    required super.child,
     required this.userDetails,
     required this.isCached,
     required this.userDetailsState,
-  }) : super(key: key, child: child);
+  });
 
   static InheritedUserDetails? of(BuildContext context) =>
       context.dependOnInheritedWidgetOfExactType<InheritedUserDetails>();
diff --git a/mobile/lib/ui/account/change_email_dialog.dart b/mobile/lib/ui/account/change_email_dialog.dart
index 18c70d00b0..4b888760d1 100644
--- a/mobile/lib/ui/account/change_email_dialog.dart
+++ b/mobile/lib/ui/account/change_email_dialog.dart
@@ -5,7 +5,7 @@ import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/email_util.dart';
 
 class ChangeEmailDialog extends StatefulWidget {
-  const ChangeEmailDialog({Key? key}) : super(key: key);
+  const ChangeEmailDialog({super.key});
 
   @override
   State<ChangeEmailDialog> createState() => _ChangeEmailDialogState();
diff --git a/mobile/lib/ui/account/login_page.dart b/mobile/lib/ui/account/login_page.dart
index f5f77a4bbf..6b960aa9e3 100644
--- a/mobile/lib/ui/account/login_page.dart
+++ b/mobile/lib/ui/account/login_page.dart
@@ -15,7 +15,7 @@ import 'package:photos/ui/common/web_page.dart';
 import "package:styled_text/styled_text.dart";
 
 class LoginPage extends StatefulWidget {
-  const LoginPage({Key? key}) : super(key: key);
+  const LoginPage({super.key});
 
   @override
   State<LoginPage> createState() => _LoginPageState();
diff --git a/mobile/lib/ui/account/login_pwd_verification_page.dart b/mobile/lib/ui/account/login_pwd_verification_page.dart
index c97f81c7f2..c919b19018 100644
--- a/mobile/lib/ui/account/login_pwd_verification_page.dart
+++ b/mobile/lib/ui/account/login_pwd_verification_page.dart
@@ -21,8 +21,7 @@ import "package:photos/utils/email_util.dart";
 class LoginPasswordVerificationPage extends StatefulWidget {
   final SrpAttributes srpAttributes;
 
-  const LoginPasswordVerificationPage({Key? key, required this.srpAttributes})
-      : super(key: key);
+  const LoginPasswordVerificationPage({super.key, required this.srpAttributes});
 
   @override
   State<LoginPasswordVerificationPage> createState() =>
diff --git a/mobile/lib/ui/account/ott_verification_page.dart b/mobile/lib/ui/account/ott_verification_page.dart
index d03861055c..f411bd09d3 100644
--- a/mobile/lib/ui/account/ott_verification_page.dart
+++ b/mobile/lib/ui/account/ott_verification_page.dart
@@ -18,8 +18,8 @@ class OTTVerificationPage extends StatefulWidget {
     this.isChangeEmail = false,
     this.isCreateAccountScreen = false,
     this.isResetPasswordScreen = false,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<OTTVerificationPage> createState() => _OTTVerificationPageState();
diff --git a/mobile/lib/ui/account/password_entry_page.dart b/mobile/lib/ui/account/password_entry_page.dart
index d64292d045..60de6c6899 100644
--- a/mobile/lib/ui/account/password_entry_page.dart
+++ b/mobile/lib/ui/account/password_entry_page.dart
@@ -34,8 +34,8 @@ class PasswordEntryPage extends StatefulWidget {
 
   const PasswordEntryPage({
     required this.mode,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<PasswordEntryPage> createState() => _PasswordEntryPageState();
diff --git a/mobile/lib/ui/account/password_reentry_page.dart b/mobile/lib/ui/account/password_reentry_page.dart
index a93d4866a0..8597ba1d45 100644
--- a/mobile/lib/ui/account/password_reentry_page.dart
+++ b/mobile/lib/ui/account/password_reentry_page.dart
@@ -19,7 +19,7 @@ import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/email_util.dart';
 
 class PasswordReentryPage extends StatefulWidget {
-  const PasswordReentryPage({Key? key}) : super(key: key);
+  const PasswordReentryPage({super.key});
 
   @override
   State<PasswordReentryPage> createState() => _PasswordReentryPageState();
diff --git a/mobile/lib/ui/account/recovery_key_page.dart b/mobile/lib/ui/account/recovery_key_page.dart
index 9ea3107096..69b3ff672c 100644
--- a/mobile/lib/ui/account/recovery_key_page.dart
+++ b/mobile/lib/ui/account/recovery_key_page.dart
@@ -28,7 +28,7 @@ class RecoveryKeyPage extends StatefulWidget {
   const RecoveryKeyPage(
     this.recoveryKey,
     this.doneText, {
-    Key? key,
+    super.key,
     this.showAppBar,
     this.onDone,
     this.isDismissible,
@@ -36,7 +36,7 @@ class RecoveryKeyPage extends StatefulWidget {
     this.text,
     this.subText,
     this.showProgressBar = false,
-  }) : super(key: key);
+  });
 
   @override
   State<RecoveryKeyPage> createState() => _RecoveryKeyPageState();
diff --git a/mobile/lib/ui/account/recovery_page.dart b/mobile/lib/ui/account/recovery_page.dart
index 881b0792dd..90c4279039 100644
--- a/mobile/lib/ui/account/recovery_page.dart
+++ b/mobile/lib/ui/account/recovery_page.dart
@@ -1,4 +1,3 @@
-import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:photos/core/configuration.dart';
@@ -10,7 +9,7 @@ import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/toast_util.dart';
 
 class RecoveryPage extends StatefulWidget {
-  const RecoveryPage({Key? key}) : super(key: key);
+  const RecoveryPage({super.key});
 
   @override
   State<RecoveryPage> createState() => _RecoveryPageState();
diff --git a/mobile/lib/ui/account/request_pwd_verification_page.dart b/mobile/lib/ui/account/request_pwd_verification_page.dart
index da96e97997..a9b5063495 100644
--- a/mobile/lib/ui/account/request_pwd_verification_page.dart
+++ b/mobile/lib/ui/account/request_pwd_verification_page.dart
@@ -91,7 +91,7 @@ class _RequestPasswordVerificationPageState
           try {
             final attributes = Configuration.instance.getKeyAttributes()!;
             final Uint8List keyEncryptionKey = await CryptoUtil.deriveKey(
-              utf8.encode(_passwordController.text) as Uint8List,
+              utf8.encode(_passwordController.text),
               CryptoUtil.base642bin(attributes.kekSalt),
               attributes.memLimit!,
               attributes.opsLimit!,
diff --git a/mobile/lib/ui/account/sessions_page.dart b/mobile/lib/ui/account/sessions_page.dart
index 5b84f56571..5de4bf1002 100644
--- a/mobile/lib/ui/account/sessions_page.dart
+++ b/mobile/lib/ui/account/sessions_page.dart
@@ -12,7 +12,7 @@ import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/toast_util.dart';
 
 class SessionsPage extends StatefulWidget {
-  const SessionsPage({Key? key}) : super(key: key);
+  const SessionsPage({super.key});
 
   @override
   State<SessionsPage> createState() => _SessionsPageState();
diff --git a/mobile/lib/ui/account/two_factor_recovery_page.dart b/mobile/lib/ui/account/two_factor_recovery_page.dart
index 8c106025b5..6274024b9c 100644
--- a/mobile/lib/ui/account/two_factor_recovery_page.dart
+++ b/mobile/lib/ui/account/two_factor_recovery_page.dart
@@ -16,8 +16,8 @@ class TwoFactorRecoveryPage extends StatefulWidget {
     this.sessionID,
     this.encryptedSecret,
     this.secretDecryptionNonce, {
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<TwoFactorRecoveryPage> createState() => _TwoFactorRecoveryPageState();
diff --git a/mobile/lib/ui/account/two_factor_setup_page.dart b/mobile/lib/ui/account/two_factor_setup_page.dart
index 175ddd6966..c9db107deb 100644
--- a/mobile/lib/ui/account/two_factor_setup_page.dart
+++ b/mobile/lib/ui/account/two_factor_setup_page.dart
@@ -22,8 +22,8 @@ class TwoFactorSetupPage extends StatefulWidget {
     this.secretCode,
     this.qrCode,
     this.completer, {
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<TwoFactorSetupPage> createState() => _TwoFactorSetupPageState();
diff --git a/mobile/lib/ui/account/verify_recovery_page.dart b/mobile/lib/ui/account/verify_recovery_page.dart
index 80fa00bae4..573f351828 100644
--- a/mobile/lib/ui/account/verify_recovery_page.dart
+++ b/mobile/lib/ui/account/verify_recovery_page.dart
@@ -18,7 +18,7 @@ import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/navigation_util.dart';
 
 class VerifyRecoveryPage extends StatefulWidget {
-  const VerifyRecoveryPage({Key? key}) : super(key: key);
+  const VerifyRecoveryPage({super.key});
 
   @override
   State<VerifyRecoveryPage> createState() => _VerifyRecoveryPageState();
diff --git a/mobile/lib/ui/cast/auto.dart b/mobile/lib/ui/cast/auto.dart
index 34c97b34de..bb1fc465b6 100644
--- a/mobile/lib/ui/cast/auto.dart
+++ b/mobile/lib/ui/cast/auto.dart
@@ -14,8 +14,8 @@ class AutoCastDialog extends StatefulWidget {
   final void Function(String) onConnect;
   AutoCastDialog(
     this.onConnect, {
-    Key? key,
-  }) : super(key: key) {}
+    super.key,
+  }) {}
 
   @override
   State<AutoCastDialog> createState() => _AutoCastDialogState();
diff --git a/mobile/lib/ui/cast/choose.dart b/mobile/lib/ui/cast/choose.dart
index e0997f4403..5cf3368dce 100644
--- a/mobile/lib/ui/cast/choose.dart
+++ b/mobile/lib/ui/cast/choose.dart
@@ -7,8 +7,8 @@ import "package:photos/ui/components/models/button_type.dart";
 
 class CastChooseDialog extends StatefulWidget {
   const CastChooseDialog({
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<CastChooseDialog> createState() => _CastChooseDialogState();
diff --git a/mobile/lib/ui/collections/album/horizontal_list.dart b/mobile/lib/ui/collections/album/horizontal_list.dart
index 0021d6836a..53ea3232e0 100644
--- a/mobile/lib/ui/collections/album/horizontal_list.dart
+++ b/mobile/lib/ui/collections/album/horizontal_list.dart
@@ -17,8 +17,8 @@ class AlbumHorizontalList extends StatefulWidget {
   const AlbumHorizontalList(
     this.collectionsFuture, {
     this.hasVerifiedLock,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<AlbumHorizontalList> createState() => _AlbumHorizontalListState();
diff --git a/mobile/lib/ui/collections/button/archived_button.dart b/mobile/lib/ui/collections/button/archived_button.dart
index 16957dfe09..6676d4dcc5 100644
--- a/mobile/lib/ui/collections/button/archived_button.dart
+++ b/mobile/lib/ui/collections/button/archived_button.dart
@@ -12,8 +12,8 @@ class ArchivedCollectionsButton extends StatelessWidget {
 
   const ArchivedCollectionsButton(
     this.textStyle, {
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -21,7 +21,7 @@ class ArchivedCollectionsButton extends StatelessWidget {
         CollectionsService.instance.getHiddenCollectionIds();
     return OutlinedButton(
       style: OutlinedButton.styleFrom(
-        backgroundColor: Theme.of(context).colorScheme.background,
+        backgroundColor: Theme.of(context).colorScheme.surface,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(8),
         ),
diff --git a/mobile/lib/ui/collections/button/hidden_button.dart b/mobile/lib/ui/collections/button/hidden_button.dart
index a721aefd8a..8172d3c6a2 100644
--- a/mobile/lib/ui/collections/button/hidden_button.dart
+++ b/mobile/lib/ui/collections/button/hidden_button.dart
@@ -16,7 +16,7 @@ class HiddenCollectionsButtonWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     return OutlinedButton(
       style: OutlinedButton.styleFrom(
-        backgroundColor: Theme.of(context).colorScheme.background,
+        backgroundColor: Theme.of(context).colorScheme.surface,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(8),
         ),
diff --git a/mobile/lib/ui/collections/button/trash_button.dart b/mobile/lib/ui/collections/button/trash_button.dart
index 3ba73ac97c..b6e71006fc 100644
--- a/mobile/lib/ui/collections/button/trash_button.dart
+++ b/mobile/lib/ui/collections/button/trash_button.dart
@@ -45,7 +45,7 @@ class _TrashSectionButtonState extends State<TrashSectionButton> {
   Widget build(BuildContext context) {
     return OutlinedButton(
       style: OutlinedButton.styleFrom(
-        backgroundColor: Theme.of(context).colorScheme.background,
+        backgroundColor: Theme.of(context).colorScheme.surface,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(8),
         ),
diff --git a/mobile/lib/ui/collections/button/uncategorized_button.dart b/mobile/lib/ui/collections/button/uncategorized_button.dart
index f474bc6a1d..29800df76e 100644
--- a/mobile/lib/ui/collections/button/uncategorized_button.dart
+++ b/mobile/lib/ui/collections/button/uncategorized_button.dart
@@ -12,8 +12,8 @@ class UnCategorizedCollections extends StatelessWidget {
 
   const UnCategorizedCollections(
     this.textStyle, {
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -26,7 +26,7 @@ class UnCategorizedCollections extends StatelessWidget {
     }
     return OutlinedButton(
       style: OutlinedButton.styleFrom(
-        backgroundColor: Theme.of(context).colorScheme.background,
+        backgroundColor: Theme.of(context).colorScheme.surface,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(8),
         ),
diff --git a/mobile/lib/ui/collections/collection_list_page.dart b/mobile/lib/ui/collections/collection_list_page.dart
index f7308e331b..974acdfdbb 100644
--- a/mobile/lib/ui/collections/collection_list_page.dart
+++ b/mobile/lib/ui/collections/collection_list_page.dart
@@ -27,8 +27,8 @@ class CollectionListPage extends StatefulWidget {
     this.appTitle,
     this.initialScrollOffset,
     this.tag = "",
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<CollectionListPage> createState() => _CollectionListPageState();
diff --git a/mobile/lib/ui/collections/device/device_folder_item.dart b/mobile/lib/ui/collections/device/device_folder_item.dart
index 726d784fe4..64d0eef739 100644
--- a/mobile/lib/ui/collections/device/device_folder_item.dart
+++ b/mobile/lib/ui/collections/device/device_folder_item.dart
@@ -13,8 +13,8 @@ class DeviceFolderItem extends StatelessWidget {
     this.deviceCollection, {
     ///120 is default for the 'on device' scrollview in albums section
     this.sideOfThumbnail = 120,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/collections/device/device_folders_vertical_grid_view.dart b/mobile/lib/ui/collections/device/device_folders_vertical_grid_view.dart
index d5ac85e0ea..c0acc66af6 100644
--- a/mobile/lib/ui/collections/device/device_folders_vertical_grid_view.dart
+++ b/mobile/lib/ui/collections/device/device_folders_vertical_grid_view.dart
@@ -44,9 +44,7 @@ class DeviceFolderVerticalGridView extends StatelessWidget {
 }
 
 class _DeviceFolderVerticalGridViewBody extends StatefulWidget {
-  const _DeviceFolderVerticalGridViewBody({
-    Key? key,
-  }) : super(key: key);
+  const _DeviceFolderVerticalGridViewBody();
 
   @override
   State<_DeviceFolderVerticalGridViewBody> createState() =>
diff --git a/mobile/lib/ui/collections/flex_grid_view.dart b/mobile/lib/ui/collections/flex_grid_view.dart
index a0c3a0e139..4114ff0493 100644
--- a/mobile/lib/ui/collections/flex_grid_view.dart
+++ b/mobile/lib/ui/collections/flex_grid_view.dart
@@ -28,8 +28,8 @@ class CollectionsFlexiGridViewWidget extends StatelessWidget {
     this.displayLimitCount = 10,
     this.shrinkWrap = false,
     this.tag = "",
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/collections/new_album_icon.dart b/mobile/lib/ui/collections/new_album_icon.dart
index 61b7355a9f..4e18123b66 100644
--- a/mobile/lib/ui/collections/new_album_icon.dart
+++ b/mobile/lib/ui/collections/new_album_icon.dart
@@ -17,8 +17,8 @@ class NewAlbumIcon extends StatelessWidget {
     required this.icon,
     required this.iconButtonType,
     this.color,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/common/bottom_shadow.dart b/mobile/lib/ui/common/bottom_shadow.dart
index f6e8bee046..2de7e944e2 100644
--- a/mobile/lib/ui/common/bottom_shadow.dart
+++ b/mobile/lib/ui/common/bottom_shadow.dart
@@ -13,7 +13,7 @@ class BottomShadowWidget extends StatelessWidget {
         color: Colors.transparent,
         boxShadow: [
           BoxShadow(
-            color: shadowColor ?? Theme.of(context).colorScheme.background,
+            color: shadowColor ?? Theme.of(context).colorScheme.surface,
             spreadRadius: 42,
             blurRadius: 42,
             offset: Offset(0, offsetDy), // changes position of shadow
diff --git a/mobile/lib/ui/common/dynamic_fab.dart b/mobile/lib/ui/common/dynamic_fab.dart
index d1a7cf6479..b19fcb654a 100644
--- a/mobile/lib/ui/common/dynamic_fab.dart
+++ b/mobile/lib/ui/common/dynamic_fab.dart
@@ -10,12 +10,12 @@ class DynamicFAB extends StatelessWidget {
   final Function? onPressedFunction;
 
   const DynamicFAB({
-    Key? key,
+    super.key,
     this.isKeypadOpen,
     this.buttonText,
     this.isFormValid,
     this.onPressedFunction,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -24,7 +24,7 @@ class DynamicFAB extends StatelessWidget {
         decoration: BoxDecoration(
           boxShadow: [
             BoxShadow(
-              color: Theme.of(context).colorScheme.background,
+              color: Theme.of(context).colorScheme.surface,
               spreadRadius: 200,
               blurRadius: 100,
               offset: const Offset(0, 230),
diff --git a/mobile/lib/ui/common/fast_scroll_physics.dart b/mobile/lib/ui/common/fast_scroll_physics.dart
index 97771af242..139bdca9ad 100644
--- a/mobile/lib/ui/common/fast_scroll_physics.dart
+++ b/mobile/lib/ui/common/fast_scroll_physics.dart
@@ -3,8 +3,7 @@ import 'package:flutter/material.dart';
 class FastScrollPhysics extends PageScrollPhysics {
   final double speedFactor;
 
-  const FastScrollPhysics({this.speedFactor = 2.0, ScrollPhysics? parent})
-      : super(parent: parent);
+  const FastScrollPhysics({this.speedFactor = 2.0, super.parent});
 
   @override
   FastScrollPhysics applyTo(ScrollPhysics? ancestor) {
diff --git a/mobile/lib/ui/common/gradient_button.dart b/mobile/lib/ui/common/gradient_button.dart
index af9ca07c70..e96a460ef6 100644
--- a/mobile/lib/ui/common/gradient_button.dart
+++ b/mobile/lib/ui/common/gradient_button.dart
@@ -15,7 +15,7 @@ class GradientButton extends StatelessWidget {
   final double paddingValue;
 
   const GradientButton({
-    Key? key,
+    super.key,
     this.linearGradientColors = const [
       Color(0xFF2CD267),
       Color(0xFF1DB954),
@@ -24,7 +24,7 @@ class GradientButton extends StatelessWidget {
     this.text = '',
     this.iconData,
     this.paddingValue = 0.0,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/common/linear_progress_dialog.dart b/mobile/lib/ui/common/linear_progress_dialog.dart
index 375eebe48c..714ad73155 100644
--- a/mobile/lib/ui/common/linear_progress_dialog.dart
+++ b/mobile/lib/ui/common/linear_progress_dialog.dart
@@ -4,7 +4,7 @@ import 'package:photos/ente_theme_data.dart';
 class LinearProgressDialog extends StatefulWidget {
   final String message;
 
-  const LinearProgressDialog(this.message, {Key? key}) : super(key: key);
+  const LinearProgressDialog(this.message, {super.key});
 
   @override
   LinearProgressDialogState createState() => LinearProgressDialogState();
diff --git a/mobile/lib/ui/common/web_page.dart b/mobile/lib/ui/common/web_page.dart
index 1566f6cba0..ee14b1e3e3 100644
--- a/mobile/lib/ui/common/web_page.dart
+++ b/mobile/lib/ui/common/web_page.dart
@@ -14,9 +14,9 @@ class WebPage extends StatefulWidget {
   const WebPage(
     this.title,
     this.url, {
-    Key? key,
+    super.key,
     this.canOpenInBrowser = false,
-  }) : super(key: key);
+  });
 
   @override
   State<WebPage> createState() => _WebPageState();
diff --git a/mobile/lib/ui/components/captioned_text_widget.dart b/mobile/lib/ui/components/captioned_text_widget.dart
index abec18fb84..d10810eaa0 100644
--- a/mobile/lib/ui/components/captioned_text_widget.dart
+++ b/mobile/lib/ui/components/captioned_text_widget.dart
@@ -15,8 +15,8 @@ class CaptionedTextWidget extends StatelessWidget {
     this.makeTextBold = false,
     this.textColor,
     this.subTitleColor,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/components/home_header_widget.dart b/mobile/lib/ui/components/home_header_widget.dart
index 88471e251a..b4f98c4899 100644
--- a/mobile/lib/ui/components/home_header_widget.dart
+++ b/mobile/lib/ui/components/home_header_widget.dart
@@ -14,8 +14,7 @@ import "package:photos/utils/photo_manager_util.dart";
 
 class HomeHeaderWidget extends StatefulWidget {
   final Widget centerWidget;
-  const HomeHeaderWidget({required this.centerWidget, Key? key})
-      : super(key: key);
+  const HomeHeaderWidget({required this.centerWidget, super.key});
 
   @override
   State<HomeHeaderWidget> createState() => _HomeHeaderWidgetState();
diff --git a/mobile/lib/ui/components/menu_item_widget/menu_item_widget.dart b/mobile/lib/ui/components/menu_item_widget/menu_item_widget.dart
index d1e87e26a5..f737de5f9c 100644
--- a/mobile/lib/ui/components/menu_item_widget/menu_item_widget.dart
+++ b/mobile/lib/ui/components/menu_item_widget/menu_item_widget.dart
@@ -88,8 +88,8 @@ class MenuItemWidget extends StatefulWidget {
     this.showOnlyLoadingState = false,
     this.surfaceExecutionStates = true,
     this.alwaysShowSuccessState = false,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<MenuItemWidget> createState() => _MenuItemWidgetState();
diff --git a/mobile/lib/ui/components/toggle_switch_widget.dart b/mobile/lib/ui/components/toggle_switch_widget.dart
index fb132cedf0..f04cbfc99b 100644
--- a/mobile/lib/ui/components/toggle_switch_widget.dart
+++ b/mobile/lib/ui/components/toggle_switch_widget.dart
@@ -14,8 +14,8 @@ class ToggleSwitchWidget extends StatefulWidget {
   const ToggleSwitchWidget({
     required this.value,
     required this.onChanged,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<ToggleSwitchWidget> createState() => _ToggleSwitchWidgetState();
@@ -58,7 +58,7 @@ class _ToggleSwitchWidgetState extends State<ToggleSwitchWidget> {
                     activeTrackColor: enteColorScheme.primary500,
                     activeColor: Colors.white,
                     inactiveThumbColor: enteColorScheme.primary500,
-                    trackOutlineColor: MaterialStateColor.resolveWith(
+                    trackOutlineColor: WidgetStateColor.resolveWith(
                       (states) => enteColorScheme.primary500,
                     ),
                     materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
diff --git a/mobile/lib/ui/extents_page_view.dart b/mobile/lib/ui/extents_page_view.dart
index dbf1b2f3fc..1ed3572c9e 100644
--- a/mobile/lib/ui/extents_page_view.dart
+++ b/mobile/lib/ui/extents_page_view.dart
@@ -42,7 +42,7 @@ class ExtentsPageView extends StatefulWidget {
   /// child that could possibly be displayed in the page view, instead of just
   /// those children that are actually visible.
   ExtentsPageView({
-    Key? key,
+    super.key,
     this.scrollDirection = Axis.horizontal,
     this.reverse = false,
     required this.controller,
@@ -53,8 +53,7 @@ class ExtentsPageView extends StatefulWidget {
     this.dragStartBehavior = DragStartBehavior.start,
     this.openDrawer,
   })  : childrenDelegate = SliverChildListDelegate(children),
-        extents = children.length,
-        super(key: key);
+        extents = children.length;
 
   /// Creates a scrollable list that works page by page using widgets that are
   /// created on demand.
@@ -73,7 +72,7 @@ class ExtentsPageView extends StatefulWidget {
   /// you are planning to change child order at a later time, consider using
   /// [PageView] or [PageView.custom].
   ExtentsPageView.builder({
-    Key? key,
+    super.key,
     this.scrollDirection = Axis.horizontal,
     this.reverse = false,
     required this.controller,
@@ -86,11 +85,10 @@ class ExtentsPageView extends StatefulWidget {
     this.openDrawer,
   })  : childrenDelegate =
             SliverChildBuilderDelegate(itemBuilder, childCount: itemCount),
-        extents = 0,
-        super(key: key);
+        extents = 0;
 
   ExtentsPageView.extents({
-    Key? key,
+    super.key,
     this.extents = 1,
     this.scrollDirection = Axis.horizontal,
     this.reverse = false,
@@ -107,8 +105,7 @@ class ExtentsPageView extends StatefulWidget {
           childCount: itemCount,
           addAutomaticKeepAlives: false,
           addRepaintBoundaries: false,
-        ),
-        super(key: key);
+        );
 
   /// Creates a scrollable list that works page by page with a custom child
   /// model.
@@ -191,7 +188,7 @@ class ExtentsPageView extends StatefulWidget {
   /// ```
   /// {@end-tool}
   const ExtentsPageView.custom({
-    Key? key,
+    super.key,
     this.scrollDirection = Axis.horizontal,
     this.reverse = false,
     required this.controller,
@@ -201,8 +198,7 @@ class ExtentsPageView extends StatefulWidget {
     required this.childrenDelegate,
     this.dragStartBehavior = DragStartBehavior.start,
     this.openDrawer,
-  })  : extents = 0,
-        super(key: key);
+  })  : extents = 0;
 
   /// The number of pages to build off screen.
   ///
diff --git a/mobile/lib/ui/home/header_error_widget.dart b/mobile/lib/ui/home/header_error_widget.dart
index 3faf2304a7..381d1c1a95 100644
--- a/mobile/lib/ui/home/header_error_widget.dart
+++ b/mobile/lib/ui/home/header_error_widget.dart
@@ -9,9 +9,8 @@ import "package:photos/utils/navigation_util.dart";
 class HeaderErrorWidget extends StatelessWidget {
   final Error? _error;
 
-  const HeaderErrorWidget({Key? key, required Error? error})
-      : _error = error,
-        super(key: key);
+  const HeaderErrorWidget({super.key, required Error? error})
+      : _error = error;
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/home/home_bottom_nav_bar.dart b/mobile/lib/ui/home/home_bottom_nav_bar.dart
index aa1e0e1d9b..67a0d98cf9 100644
--- a/mobile/lib/ui/home/home_bottom_nav_bar.dart
+++ b/mobile/lib/ui/home/home_bottom_nav_bar.dart
@@ -12,8 +12,8 @@ class HomeBottomNavigationBar extends StatefulWidget {
   const HomeBottomNavigationBar(
     this.selectedFiles, {
     required this.selectedTabIndex,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   final SelectedFiles selectedFiles;
   final int selectedTabIndex;
diff --git a/mobile/lib/ui/home/landing_page_widget.dart b/mobile/lib/ui/home/landing_page_widget.dart
index 29d0c97758..bdc1e8a03e 100644
--- a/mobile/lib/ui/home/landing_page_widget.dart
+++ b/mobile/lib/ui/home/landing_page_widget.dart
@@ -26,7 +26,7 @@ import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/navigation_util.dart";
 
 class LandingPageWidget extends StatefulWidget {
-  const LandingPageWidget({Key? key}) : super(key: key);
+  const LandingPageWidget({super.key});
 
   @override
   State<LandingPageWidget> createState() => _LandingPageWidgetState();
@@ -317,8 +317,8 @@ class FeatureItemWidget extends StatelessWidget {
     this.featureTitleFirstLine,
     this.featureTitleSecondLine,
     this.subText, {
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/home/memories/full_screen_memory.dart b/mobile/lib/ui/home/memories/full_screen_memory.dart
index c8e69b58d8..10b02b4862 100644
--- a/mobile/lib/ui/home/memories/full_screen_memory.dart
+++ b/mobile/lib/ui/home/memories/full_screen_memory.dart
@@ -96,9 +96,9 @@ class FullScreenMemoryData extends InheritedWidget {
     required this.memories,
     required this.indexNotifier,
     required this.removeCurrentMemory,
-    required Widget child,
-    Key? key,
-  }) : super(child: child, key: key);
+    required super.child,
+    super.key,
+  });
 
   static FullScreenMemoryData? of(BuildContext context) {
     return context.dependOnInheritedWidgetOfExactType<FullScreenMemoryData>();
diff --git a/mobile/lib/ui/huge_listview/draggable_scrollbar.dart b/mobile/lib/ui/huge_listview/draggable_scrollbar.dart
index f3d215c695..0c54170f54 100644
--- a/mobile/lib/ui/huge_listview/draggable_scrollbar.dart
+++ b/mobile/lib/ui/huge_listview/draggable_scrollbar.dart
@@ -19,7 +19,7 @@ class DraggableScrollbar extends StatefulWidget {
   final bool isEnabled;
 
   const DraggableScrollbar({
-    Key? key,
+    super.key,
     required this.child,
     this.backgroundColor = Colors.white,
     this.drawColor = Colors.grey,
@@ -32,7 +32,7 @@ class DraggableScrollbar extends StatefulWidget {
     required this.labelTextBuilder,
     this.onChange,
     this.isEnabled = true,
-  }) : super(key: key);
+  });
 
   @override
   DraggableScrollbarState createState() => DraggableScrollbarState();
diff --git a/mobile/lib/ui/huge_listview/huge_listview.dart b/mobile/lib/ui/huge_listview/huge_listview.dart
index a2dd3119c3..c4a8f343ee 100644
--- a/mobile/lib/ui/huge_listview/huge_listview.dart
+++ b/mobile/lib/ui/huge_listview/huge_listview.dart
@@ -65,7 +65,7 @@ class HugeListView<T> extends StatefulWidget {
   final bool isScrollablePositionedList;
 
   const HugeListView({
-    Key? key,
+    super.key,
     this.controller,
     required this.startIndex,
     required this.totalCount,
@@ -83,7 +83,7 @@ class HugeListView<T> extends StatefulWidget {
     this.thumbPadding,
     this.disableScroll = false,
     this.isScrollablePositionedList = true,
-  }) : super(key: key);
+  });
 
   @override
   HugeListViewState<T> createState() => HugeListViewState<T>();
diff --git a/mobile/lib/ui/huge_listview/scroll_bar_thumb.dart b/mobile/lib/ui/huge_listview/scroll_bar_thumb.dart
index a18ab86f94..11714f1f6a 100644
--- a/mobile/lib/ui/huge_listview/scroll_bar_thumb.dart
+++ b/mobile/lib/ui/huge_listview/scroll_bar_thumb.dart
@@ -21,8 +21,8 @@ class ScrollBarThumb extends StatelessWidget {
     this.onDragStart,
     this.onDragUpdate,
     this.onDragEnd, {
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -133,10 +133,10 @@ class SlideFadeTransition extends StatelessWidget {
   final Widget child;
 
   const SlideFadeTransition({
-    Key? key,
+    super.key,
     required this.animation,
     required this.child,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/map/map_pull_up_gallery.dart b/mobile/lib/ui/map/map_pull_up_gallery.dart
index b547d984dd..6cb6ea04b0 100644
--- a/mobile/lib/ui/map/map_pull_up_gallery.dart
+++ b/mobile/lib/ui/map/map_pull_up_gallery.dart
@@ -200,10 +200,10 @@ class _MapPullUpGalleryState extends State<MapPullUpGallery> {
 
 class DraggableHeader extends StatelessWidget {
   const DraggableHeader({
-    Key? key,
+    super.key,
     required this.scrollController,
     required this.bottomSheetDraggableAreaHeight,
-  }) : super(key: key);
+  });
   static const indicatorHeight = 4.0;
   final ScrollController scrollController;
   final double bottomSheetDraggableAreaHeight;
diff --git a/mobile/lib/ui/map/tile/attribution/map_attribution.dart b/mobile/lib/ui/map/tile/attribution/map_attribution.dart
index 7ae8c6bc86..8740806914 100644
--- a/mobile/lib/ui/map/tile/attribution/map_attribution.dart
+++ b/mobile/lib/ui/map/tile/attribution/map_attribution.dart
@@ -221,7 +221,7 @@ class MapAttributionWidgetState extends State<MapAttributionWidget> {
                   child: Container(
                     decoration: BoxDecoration(
                       color: widget.popupBackgroundColor ??
-                          Theme.of(context).colorScheme.background,
+                          Theme.of(context).colorScheme.surface,
                       border: Border.all(width: 0, style: BorderStyle.none),
                       borderRadius: widget.popupBorderRadius ??
                           BorderRadius.only(
diff --git a/mobile/lib/ui/payment/billing_questions_widget.dart b/mobile/lib/ui/payment/billing_questions_widget.dart
index 3cadc8acb8..8c4dd63c98 100644
--- a/mobile/lib/ui/payment/billing_questions_widget.dart
+++ b/mobile/lib/ui/payment/billing_questions_widget.dart
@@ -8,8 +8,8 @@ import 'package:photos/ui/common/loading_widget.dart';
 
 class BillingQuestionsWidget extends StatelessWidget {
   const BillingQuestionsWidget({
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -62,9 +62,9 @@ class BillingQuestionsWidget extends StatelessWidget {
 
 class FaqWidget extends StatelessWidget {
   const FaqWidget({
-    Key? key,
+    super.key,
     required this.faq,
-  }) : super(key: key);
+  });
 
   final FaqItem? faq;
 
diff --git a/mobile/lib/ui/payment/child_subscription_widget.dart b/mobile/lib/ui/payment/child_subscription_widget.dart
index 2b61d3cf95..2fb6353ec1 100644
--- a/mobile/lib/ui/payment/child_subscription_widget.dart
+++ b/mobile/lib/ui/payment/child_subscription_widget.dart
@@ -10,9 +10,9 @@ import "package:styled_text/styled_text.dart";
 
 class ChildSubscriptionWidget extends StatelessWidget {
   const ChildSubscriptionWidget({
-    Key? key,
+    super.key,
     required this.userDetails,
-  }) : super(key: key);
+  });
 
   final UserDetails userDetails;
 
diff --git a/mobile/lib/ui/payment/payment_web_page.dart b/mobile/lib/ui/payment/payment_web_page.dart
index 443a219366..aa1b50a499 100644
--- a/mobile/lib/ui/payment/payment_web_page.dart
+++ b/mobile/lib/ui/payment/payment_web_page.dart
@@ -20,8 +20,7 @@ class PaymentWebPage extends StatefulWidget {
   final String? planId;
   final String? actionType;
 
-  const PaymentWebPage({Key? key, this.planId, this.actionType})
-      : super(key: key);
+  const PaymentWebPage({super.key, this.planId, this.actionType});
 
   @override
   State<StatefulWidget> createState() => _PaymentWebPageState();
diff --git a/mobile/lib/ui/payment/subscription_common_widgets.dart b/mobile/lib/ui/payment/subscription_common_widgets.dart
index 7d6714fe28..84fe693b7f 100644
--- a/mobile/lib/ui/payment/subscription_common_widgets.dart
+++ b/mobile/lib/ui/payment/subscription_common_widgets.dart
@@ -150,7 +150,7 @@ class AddOnBonusValidity extends StatelessWidget {
 class SubFaqWidget extends StatelessWidget {
   final bool isOnboarding;
 
-  const SubFaqWidget({Key? key, this.isOnboarding = false}) : super(key: key);
+  const SubFaqWidget({super.key, this.isOnboarding = false});
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/settings/about_section_widget.dart b/mobile/lib/ui/settings/about_section_widget.dart
index 24f98e5a7e..375fdac64a 100644
--- a/mobile/lib/ui/settings/about_section_widget.dart
+++ b/mobile/lib/ui/settings/about_section_widget.dart
@@ -13,7 +13,7 @@ import 'package:photos/utils/toast_util.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class AboutSectionWidget extends StatelessWidget {
-  const AboutSectionWidget({Key? key}) : super(key: key);
+  const AboutSectionWidget({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -104,8 +104,8 @@ class AboutMenuItemWidget extends StatelessWidget {
     required this.title,
     required this.url,
     this.webPageTitle,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/settings/account_section_widget.dart b/mobile/lib/ui/settings/account_section_widget.dart
index 1182208aea..5783598f5b 100644
--- a/mobile/lib/ui/settings/account_section_widget.dart
+++ b/mobile/lib/ui/settings/account_section_widget.dart
@@ -22,7 +22,7 @@ import "package:photos/utils/navigation_util.dart";
 import "package:url_launcher/url_launcher_string.dart";
 
 class AccountSectionWidget extends StatelessWidget {
-  const AccountSectionWidget({Key? key}) : super(key: key);
+  const AccountSectionWidget({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/settings/app_update_dialog.dart b/mobile/lib/ui/settings/app_update_dialog.dart
index c4c6608db8..adb305b820 100644
--- a/mobile/lib/ui/settings/app_update_dialog.dart
+++ b/mobile/lib/ui/settings/app_update_dialog.dart
@@ -10,7 +10,7 @@ import 'package:url_launcher/url_launcher_string.dart';
 class AppUpdateDialog extends StatefulWidget {
   final LatestVersionInfo? latestVersionInfo;
 
-  const AppUpdateDialog(this.latestVersionInfo, {Key? key}) : super(key: key);
+  const AppUpdateDialog(this.latestVersionInfo, {super.key});
 
   @override
   State<AppUpdateDialog> createState() => _AppUpdateDialogState();
diff --git a/mobile/lib/ui/settings/app_version_widget.dart b/mobile/lib/ui/settings/app_version_widget.dart
index 01dfb7d1f9..c0e5b72d55 100644
--- a/mobile/lib/ui/settings/app_version_widget.dart
+++ b/mobile/lib/ui/settings/app_version_widget.dart
@@ -4,8 +4,8 @@ import "package:photos/generated/l10n.dart";
 
 class AppVersionWidget extends StatefulWidget {
   const AppVersionWidget({
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<AppVersionWidget> createState() => _AppVersionWidgetState();
diff --git a/mobile/lib/ui/settings/backup/backup_section_widget.dart b/mobile/lib/ui/settings/backup/backup_section_widget.dart
index 6fbdca287e..674ac057c6 100644
--- a/mobile/lib/ui/settings/backup/backup_section_widget.dart
+++ b/mobile/lib/ui/settings/backup/backup_section_widget.dart
@@ -12,7 +12,7 @@ import 'package:photos/ui/settings/common_settings.dart';
 import 'package:photos/utils/navigation_util.dart';
 
 class BackupSectionWidget extends StatefulWidget {
-  const BackupSectionWidget({Key? key}) : super(key: key);
+  const BackupSectionWidget({super.key});
 
   @override
   BackupSectionWidgetState createState() => BackupSectionWidgetState();
diff --git a/mobile/lib/ui/settings/debug/debug_section_widget.dart b/mobile/lib/ui/settings/debug/debug_section_widget.dart
index 5265e96f6b..d8bd13b002 100644
--- a/mobile/lib/ui/settings/debug/debug_section_widget.dart
+++ b/mobile/lib/ui/settings/debug/debug_section_widget.dart
@@ -13,7 +13,7 @@ import 'package:photos/ui/settings/common_settings.dart';
 import 'package:photos/utils/toast_util.dart';
 
 class DebugSectionWidget extends StatelessWidget {
-  const DebugSectionWidget({Key? key}) : super(key: key);
+  const DebugSectionWidget({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/settings/general_section_widget.dart b/mobile/lib/ui/settings/general_section_widget.dart
index 3532292551..d42d280244 100644
--- a/mobile/lib/ui/settings/general_section_widget.dart
+++ b/mobile/lib/ui/settings/general_section_widget.dart
@@ -18,7 +18,7 @@ import "package:photos/ui/settings/notification_settings_screen.dart";
 import 'package:photos/utils/navigation_util.dart';
 
 class GeneralSectionWidget extends StatelessWidget {
-  const GeneralSectionWidget({Key? key}) : super(key: key);
+  const GeneralSectionWidget({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/settings/inherited_settings_state.dart b/mobile/lib/ui/settings/inherited_settings_state.dart
index dee7d317d4..ce749a0adb 100644
--- a/mobile/lib/ui/settings/inherited_settings_state.dart
+++ b/mobile/lib/ui/settings/inherited_settings_state.dart
@@ -3,9 +3,9 @@ import 'package:flutter/widgets.dart';
 /// StatefulWidget that wraps InheritedSettingsState
 class SettingsStateContainer extends StatefulWidget {
   const SettingsStateContainer({
-    Key? key,
+    super.key,
     required this.child,
-  }) : super(key: key);
+  });
   final Widget child;
 
   @override
@@ -54,12 +54,12 @@ class InheritedSettingsState extends InheritedWidget {
   final void Function() decrement;
 
   const InheritedSettingsState({
-    Key? key,
+    super.key,
     required this.expandedSectionCount,
     required this.increment,
     required this.decrement,
-    required Widget child,
-  }) : super(key: key, child: child);
+    required super.child,
+  });
 
   bool get isAnySectionExpanded => expandedSectionCount > 0;
 
diff --git a/mobile/lib/ui/settings/language_picker.dart b/mobile/lib/ui/settings/language_picker.dart
index 98efa54f47..9cd313e549 100644
--- a/mobile/lib/ui/settings/language_picker.dart
+++ b/mobile/lib/ui/settings/language_picker.dart
@@ -18,8 +18,8 @@ class LanguageSelectorPage extends StatelessWidget {
     this.supportedLocales,
     this.onLocaleChanged,
     this.currentLocale, {
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -78,8 +78,8 @@ class ItemsWidget extends StatefulWidget {
     this.supportedLocales,
     this.onLocaleChanged,
     this.currentLocale, {
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<ItemsWidget> createState() => _ItemsWidgetState();
diff --git a/mobile/lib/ui/settings/security_section_widget.dart b/mobile/lib/ui/settings/security_section_widget.dart
index 8b73a1cc00..c136018acb 100644
--- a/mobile/lib/ui/settings/security_section_widget.dart
+++ b/mobile/lib/ui/settings/security_section_widget.dart
@@ -30,7 +30,7 @@ import "package:photos/utils/navigation_util.dart";
 import "package:photos/utils/toast_util.dart";
 
 class SecuritySectionWidget extends StatefulWidget {
-  const SecuritySectionWidget({Key? key}) : super(key: key);
+  const SecuritySectionWidget({super.key});
 
   @override
   State<SecuritySectionWidget> createState() => _SecuritySectionWidgetState();
diff --git a/mobile/lib/ui/settings/settings_title_bar_widget.dart b/mobile/lib/ui/settings/settings_title_bar_widget.dart
index b15db62763..5fa625b49b 100644
--- a/mobile/lib/ui/settings/settings_title_bar_widget.dart
+++ b/mobile/lib/ui/settings/settings_title_bar_widget.dart
@@ -7,7 +7,7 @@ import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/common/loading_widget.dart';
 
 class SettingsTitleBarWidget extends StatelessWidget {
-  const SettingsTitleBarWidget({Key? key}) : super(key: key);
+  const SettingsTitleBarWidget({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/settings/social_section_widget.dart b/mobile/lib/ui/settings/social_section_widget.dart
index b9329eec7f..c97b16b30a 100644
--- a/mobile/lib/ui/settings/social_section_widget.dart
+++ b/mobile/lib/ui/settings/social_section_widget.dart
@@ -11,7 +11,7 @@ import 'package:photos/ui/settings/common_settings.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
 class SocialSectionWidget extends StatelessWidget {
-  const SocialSectionWidget({Key? key}) : super(key: key);
+  const SocialSectionWidget({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -85,9 +85,9 @@ class SocialsMenuItemWidget extends StatelessWidget {
   const SocialsMenuItemWidget(
     this.text,
     this.url, {
-    Key? key,
+    super.key,
     this.launchInExternalApp = true,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/settings/storage_card_widget.dart b/mobile/lib/ui/settings/storage_card_widget.dart
index 3554c6fa47..1b40a1f3e1 100644
--- a/mobile/lib/ui/settings/storage_card_widget.dart
+++ b/mobile/lib/ui/settings/storage_card_widget.dart
@@ -14,7 +14,7 @@ import 'package:photos/ui/settings/storage_progress_widget.dart';
 import 'package:photos/utils/data_util.dart';
 
 class StorageCardWidget extends StatefulWidget {
-  const StorageCardWidget({Key? key}) : super(key: key);
+  const StorageCardWidget({super.key});
 
   @override
   State<StorageCardWidget> createState() => _StorageCardWidgetState();
diff --git a/mobile/lib/ui/settings/support_section_widget.dart b/mobile/lib/ui/settings/support_section_widget.dart
index fa730f703a..49ef874c71 100644
--- a/mobile/lib/ui/settings/support_section_widget.dart
+++ b/mobile/lib/ui/settings/support_section_widget.dart
@@ -13,7 +13,7 @@ import 'package:photos/utils/email_util.dart';
 import "package:url_launcher/url_launcher_string.dart";
 
 class SupportSectionWidget extends StatelessWidget {
-  const SupportSectionWidget({Key? key}) : super(key: key);
+  const SupportSectionWidget({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/settings/theme_switch_widget.dart b/mobile/lib/ui/settings/theme_switch_widget.dart
index 545ef92b75..1fcd6802ee 100644
--- a/mobile/lib/ui/settings/theme_switch_widget.dart
+++ b/mobile/lib/ui/settings/theme_switch_widget.dart
@@ -9,7 +9,7 @@ import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart';
 import 'package:photos/ui/settings/common_settings.dart';
 
 class ThemeSwitchWidget extends StatefulWidget {
-  const ThemeSwitchWidget({Key? key}) : super(key: key);
+  const ThemeSwitchWidget({super.key});
 
   @override
   State<ThemeSwitchWidget> createState() => _ThemeSwitchWidgetState();
diff --git a/mobile/lib/ui/settings_page.dart b/mobile/lib/ui/settings_page.dart
index 274e2c785f..32401fd30f 100644
--- a/mobile/lib/ui/settings_page.dart
+++ b/mobile/lib/ui/settings_page.dart
@@ -33,7 +33,7 @@ import "package:photos/utils/navigation_util.dart";
 class SettingsPage extends StatelessWidget {
   final ValueNotifier<String?> emailNotifier;
 
-  const SettingsPage({Key? key, required this.emailNotifier}) : super(key: key);
+  const SettingsPage({super.key, required this.emailNotifier});
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/sharing/manage_links_widget.dart b/mobile/lib/ui/sharing/manage_links_widget.dart
index b77aa00211..a0d336c81c 100644
--- a/mobile/lib/ui/sharing/manage_links_widget.dart
+++ b/mobile/lib/ui/sharing/manage_links_widget.dart
@@ -328,7 +328,7 @@ class _ManageSharedLinkWidgetState extends State<ManageSharedLinkWidget> {
   Future<Map<String, dynamic>> _getEncryptedPassword(String pass) async {
     final kekSalt = CryptoUtil.getSaltToDeriveKey();
     final result = await CryptoUtil.deriveInteractiveKey(
-      utf8.encode(pass) as Uint8List,
+      utf8.encode(pass),
       kekSalt,
     );
     return {
diff --git a/mobile/lib/ui/sharing/verify_identity_dialog.dart b/mobile/lib/ui/sharing/verify_identity_dialog.dart
index eaa725635e..424525f2fc 100644
--- a/mobile/lib/ui/sharing/verify_identity_dialog.dart
+++ b/mobile/lib/ui/sharing/verify_identity_dialog.dart
@@ -24,10 +24,10 @@ class VerifyIdentifyDialog extends StatefulWidget {
   final bool self;
 
   VerifyIdentifyDialog({
-    Key? key,
+    super.key,
     required this.self,
     this.email = '',
-  }) : super(key: key) {
+  }) {
     if (!self && email.isEmpty) {
       throw ArgumentError("email cannot be empty when self is false");
     }
diff --git a/mobile/lib/ui/tabs/nav_bar.dart b/mobile/lib/ui/tabs/nav_bar.dart
index be2d313f8e..e5f0d22c2d 100644
--- a/mobile/lib/ui/tabs/nav_bar.dart
+++ b/mobile/lib/ui/tabs/nav_bar.dart
@@ -6,7 +6,7 @@ import "package:photos/theme/effects.dart";
 
 class GNav extends StatefulWidget {
   const GNav({
-    Key? key,
+    super.key,
     this.tabs,
     this.selectedIndex = 0,
     this.onTabChange,
@@ -31,7 +31,7 @@ class GNav extends StatefulWidget {
     this.haptic,
     this.tabBackgroundGradient,
     this.mainAxisAlignment = MainAxisAlignment.spaceBetween,
-  }) : super(key: key);
+  });
 
   final List<GButton>? tabs;
   final int selectedIndex;
@@ -159,7 +159,7 @@ class GButton extends StatefulWidget {
   final String? semanticLabel;
 
   const GButton({
-    Key? key,
+    super.key,
     this.active,
     this.haptic,
     this.backgroundColor,
@@ -186,7 +186,7 @@ class GButton extends StatefulWidget {
     this.activeBorder,
     this.shadow,
     this.semanticLabel,
-  }) : super(key: key);
+  });
 
   @override
   State<GButton> createState() => _GButtonState();
@@ -229,7 +229,7 @@ class _GButtonState extends State<GButton> {
 
 class Button extends StatefulWidget {
   const Button({
-    Key? key,
+    super.key,
     this.icon,
     this.iconSize,
     this.leading,
@@ -252,7 +252,7 @@ class Button extends StatefulWidget {
     this.border,
     this.activeBorder,
     this.shadow,
-  }) : super(key: key);
+  });
 
   final IconData? icon;
   final double? iconSize;
diff --git a/mobile/lib/ui/tabs/section_title.dart b/mobile/lib/ui/tabs/section_title.dart
index 5229082014..1f1be877f2 100644
--- a/mobile/lib/ui/tabs/section_title.dart
+++ b/mobile/lib/ui/tabs/section_title.dart
@@ -14,9 +14,9 @@ class SectionTitle extends StatelessWidget {
     this.title,
     this.titleWithBrand,
     this.mutedTitle = false,
-    Key? key,
+    super.key,
     this.padding,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/tabs/user_collections_tab.dart b/mobile/lib/ui/tabs/user_collections_tab.dart
index 5e8431a5a9..6f4621484d 100644
--- a/mobile/lib/ui/tabs/user_collections_tab.dart
+++ b/mobile/lib/ui/tabs/user_collections_tab.dart
@@ -32,7 +32,7 @@ import 'package:photos/utils/local_settings.dart';
 import "package:photos/utils/navigation_util.dart";
 
 class UserCollectionsTab extends StatefulWidget {
-  const UserCollectionsTab({Key? key}) : super(key: key);
+  const UserCollectionsTab({super.key});
 
   @override
   State<UserCollectionsTab> createState() => _UserCollectionsTabState();
diff --git a/mobile/lib/ui/tools/app_lock.dart b/mobile/lib/ui/tools/app_lock.dart
index 19a718b7a0..784b2eaa14 100644
--- a/mobile/lib/ui/tools/app_lock.dart
+++ b/mobile/lib/ui/tools/app_lock.dart
@@ -38,7 +38,7 @@ class AppLock extends StatefulWidget {
   final Locale? locale;
 
   const AppLock({
-    Key? key,
+    super.key,
     required this.builder,
     required this.lockScreen,
     required this.savedThemeMode,
@@ -46,7 +46,7 @@ class AppLock extends StatefulWidget {
     this.locale,
     this.darkTheme,
     this.lightTheme,
-  }) : super(key: key);
+  });
 
   static _AppLockState? of(BuildContext context) =>
       context.findAncestorStateOfType<_AppLockState>();
diff --git a/mobile/lib/ui/tools/debug/app_storage_viewer.dart b/mobile/lib/ui/tools/debug/app_storage_viewer.dart
index 5ac484684d..f5e58f1a8a 100644
--- a/mobile/lib/ui/tools/debug/app_storage_viewer.dart
+++ b/mobile/lib/ui/tools/debug/app_storage_viewer.dart
@@ -19,7 +19,7 @@ import 'package:photos/ui/tools/debug/path_storage_viewer.dart';
 import 'package:photos/utils/directory_content.dart';
 
 class AppStorageViewer extends StatefulWidget {
-  const AppStorageViewer({Key? key}) : super(key: key);
+  const AppStorageViewer({super.key});
 
   @override
   State<AppStorageViewer> createState() => _AppStorageViewerState();
diff --git a/mobile/lib/ui/tools/debug/log_file_viewer.dart b/mobile/lib/ui/tools/debug/log_file_viewer.dart
index e41561c0e8..2b538ef160 100644
--- a/mobile/lib/ui/tools/debug/log_file_viewer.dart
+++ b/mobile/lib/ui/tools/debug/log_file_viewer.dart
@@ -1,5 +1,4 @@
 import 'dart:io';
-import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import "package:photos/generated/l10n.dart";
@@ -7,7 +6,7 @@ import 'package:photos/ui/common/loading_widget.dart';
 
 class LogFileViewer extends StatefulWidget {
   final File file;
-  const LogFileViewer(this.file, {Key? key}) : super(key: key);
+  const LogFileViewer(this.file, {super.key});
 
   @override
   State<LogFileViewer> createState() => _LogFileViewerState();
diff --git a/mobile/lib/ui/tools/debug/path_storage_viewer.dart b/mobile/lib/ui/tools/debug/path_storage_viewer.dart
index 6d169ef48f..63b4e0bde2 100644
--- a/mobile/lib/ui/tools/debug/path_storage_viewer.dart
+++ b/mobile/lib/ui/tools/debug/path_storage_viewer.dart
@@ -33,8 +33,8 @@ class PathStorageViewer extends StatefulWidget {
     this.removeTopRadius = false,
     this.removeBottomRadius = false,
     this.enableDoubleTapClear = false,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<PathStorageViewer> createState() => _PathStorageViewerState();
diff --git a/mobile/lib/ui/tools/editor/filtered_image.dart b/mobile/lib/ui/tools/editor/filtered_image.dart
index 92fcc976e4..31c74590ac 100644
--- a/mobile/lib/ui/tools/editor/filtered_image.dart
+++ b/mobile/lib/ui/tools/editor/filtered_image.dart
@@ -9,8 +9,8 @@ class FilteredImage extends StatelessWidget {
     this.brightness,
     this.saturation,
     this.hue,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   final double? brightness, saturation, hue;
   final Widget child;
diff --git a/mobile/lib/ui/tools/editor/image_editor_page.dart b/mobile/lib/ui/tools/editor/image_editor_page.dart
index 2ef93601f2..522831664b 100644
--- a/mobile/lib/ui/tools/editor/image_editor_page.dart
+++ b/mobile/lib/ui/tools/editor/image_editor_page.dart
@@ -6,7 +6,6 @@ import 'dart:ui' as ui show Image;
 
 import 'package:extended_image/extended_image.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/painting.dart' show decodeImageFromList;
 import "package:flutter_image_compress/flutter_image_compress.dart";
 import 'package:image_editor/image_editor.dart';
 import 'package:logging/logging.dart';
diff --git a/mobile/lib/ui/tools/free_space_page.dart b/mobile/lib/ui/tools/free_space_page.dart
index 44c8e72449..3b60096d1f 100644
--- a/mobile/lib/ui/tools/free_space_page.dart
+++ b/mobile/lib/ui/tools/free_space_page.dart
@@ -13,9 +13,9 @@ class FreeSpacePage extends StatefulWidget {
 
   const FreeSpacePage(
     this.status, {
-    Key? key,
+    super.key,
     this.clearSpaceForFolder = false,
-  }) : super(key: key);
+  });
 
   @override
   State<FreeSpacePage> createState() => _FreeSpacePageState();
diff --git a/mobile/lib/ui/tools/lock_screen.dart b/mobile/lib/ui/tools/lock_screen.dart
index 516ac92319..6a77e0c97d 100644
--- a/mobile/lib/ui/tools/lock_screen.dart
+++ b/mobile/lib/ui/tools/lock_screen.dart
@@ -19,7 +19,7 @@ import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/lock_screen_settings.dart";
 
 class LockScreen extends StatefulWidget {
-  const LockScreen({Key? key}) : super(key: key);
+  const LockScreen({super.key});
 
   @override
   State<LockScreen> createState() => _LockScreenState();
diff --git a/mobile/lib/ui/viewer/actions/delete_empty_albums.dart b/mobile/lib/ui/viewer/actions/delete_empty_albums.dart
index 95ee49da49..3f3186465f 100644
--- a/mobile/lib/ui/viewer/actions/delete_empty_albums.dart
+++ b/mobile/lib/ui/viewer/actions/delete_empty_albums.dart
@@ -13,7 +13,7 @@ import 'package:photos/ui/components/models/button_type.dart';
 
 class DeleteEmptyAlbums extends StatefulWidget {
   final List<Collection> collections;
-  const DeleteEmptyAlbums(this.collections, {Key? key}) : super(key: key);
+  const DeleteEmptyAlbums(this.collections, {super.key});
 
   @override
   State<DeleteEmptyAlbums> createState() => _DeleteEmptyAlbumsState();
diff --git a/mobile/lib/ui/viewer/file/exif_info_dialog.dart b/mobile/lib/ui/viewer/file/exif_info_dialog.dart
index e3344aa48b..2b286b5601 100644
--- a/mobile/lib/ui/viewer/file/exif_info_dialog.dart
+++ b/mobile/lib/ui/viewer/file/exif_info_dialog.dart
@@ -1,4 +1,3 @@
-import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import "package:photos/generated/l10n.dart";
@@ -9,7 +8,7 @@ import 'package:photos/utils/exif_util.dart';
 
 class ExifInfoDialog extends StatelessWidget {
   final EnteFile file;
-  const ExifInfoDialog(this.file, {Key? key}) : super(key: key);
+  const ExifInfoDialog(this.file, {super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/viewer/file/video_exif_dialog.dart b/mobile/lib/ui/viewer/file/video_exif_dialog.dart
index ba650d469f..51dc0f1f64 100644
--- a/mobile/lib/ui/viewer/file/video_exif_dialog.dart
+++ b/mobile/lib/ui/viewer/file/video_exif_dialog.dart
@@ -7,7 +7,7 @@ import "package:photos/theme/ente_theme.dart";
 class VideoExifDialog extends StatelessWidget {
   final FFProbeProps props;
 
-  const VideoExifDialog({Key? key, required this.props}) : super(key: key);
+  const VideoExifDialog({super.key, required this.props});
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
index 7d1ba08cfa..54ff94ce6a 100644
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
@@ -242,7 +242,6 @@ class _VideoWidget extends StatefulWidget {
     this.controller,
     this.playbackCallback, {
     required this.isFromMemories,
-    this.onStreamChange,
   });
 
   @override
diff --git a/mobile/lib/ui/viewer/gallery/component/grid/lazy_grid_view.dart b/mobile/lib/ui/viewer/gallery/component/grid/lazy_grid_view.dart
index 248b4c5664..54323fbfd4 100644
--- a/mobile/lib/ui/viewer/gallery/component/grid/lazy_grid_view.dart
+++ b/mobile/lib/ui/viewer/gallery/component/grid/lazy_grid_view.dart
@@ -30,8 +30,8 @@ class LazyGridView extends StatefulWidget {
     this.shouldRecycle,
     this.photoGridSize, {
     this.limitSelectionToOne = false,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<LazyGridView> createState() => _LazyGridViewState();
diff --git a/mobile/lib/ui/viewer/gallery/component/grid/place_holder_grid_view_widget.dart b/mobile/lib/ui/viewer/gallery/component/grid/place_holder_grid_view_widget.dart
index 9cb2984a28..c29d817ab3 100644
--- a/mobile/lib/ui/viewer/gallery/component/grid/place_holder_grid_view_widget.dart
+++ b/mobile/lib/ui/viewer/gallery/component/grid/place_holder_grid_view_widget.dart
@@ -8,8 +8,8 @@ class PlaceHolderGridViewWidget extends StatelessWidget {
   const PlaceHolderGridViewWidget(
     this.count,
     this.columns, {
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   final int count, columns;
 
diff --git a/mobile/lib/ui/viewer/gallery/component/group/lazy_group_gallery.dart b/mobile/lib/ui/viewer/gallery/component/group/lazy_group_gallery.dart
index 299d84d7d3..19ac9a0b7c 100644
--- a/mobile/lib/ui/viewer/gallery/component/group/lazy_group_gallery.dart
+++ b/mobile/lib/ui/viewer/gallery/component/group/lazy_group_gallery.dart
@@ -43,8 +43,8 @@ class LazyGroupGallery extends StatefulWidget {
     this.logTag = "",
     this.photoGridSize = photoGridSizeDefault,
     this.limitSelectionToOne = false,
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   State<LazyGroupGallery> createState() => _LazyGroupGalleryState();
diff --git a/mobile/lib/ui/viewer/gallery/empty_hidden_widget.dart b/mobile/lib/ui/viewer/gallery/empty_hidden_widget.dart
index 0791ffe734..250d69af0c 100644
--- a/mobile/lib/ui/viewer/gallery/empty_hidden_widget.dart
+++ b/mobile/lib/ui/viewer/gallery/empty_hidden_widget.dart
@@ -5,7 +5,7 @@ import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/theme/text_style.dart';
 
 class EmptyHiddenWidget extends StatelessWidget {
-  const EmptyHiddenWidget({Key? key}) : super(key: key);
+  const EmptyHiddenWidget({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -88,8 +88,8 @@ class EmptyHiddenTextWidget extends StatelessWidget {
 
   const EmptyHiddenTextWidget(
     this.text, {
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/viewer/gallery/empty_state.dart b/mobile/lib/ui/viewer/gallery/empty_state.dart
index 80f95000a4..dde2651471 100644
--- a/mobile/lib/ui/viewer/gallery/empty_state.dart
+++ b/mobile/lib/ui/viewer/gallery/empty_state.dart
@@ -5,7 +5,7 @@ import "package:photos/generated/l10n.dart";
 class EmptyState extends StatelessWidget {
   final String? text;
 
-  const EmptyState({Key? key, this.text}) : super(key: key);
+  const EmptyState({super.key, this.text});
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/viewer/gallery/state/gallery_context_state.dart b/mobile/lib/ui/viewer/gallery/state/gallery_context_state.dart
index 4b202c39bd..a3e7ae6048 100644
--- a/mobile/lib/ui/viewer/gallery/state/gallery_context_state.dart
+++ b/mobile/lib/ui/viewer/gallery/state/gallery_context_state.dart
@@ -11,9 +11,9 @@ class GalleryContextState extends InheritedWidget {
     this.inSelectionMode = false,
     this.type = GroupType.day,
     required this.sortOrderAsc,
-    required Widget child,
-    Key? key,
-  }) : super(key: key, child: child);
+    required super.child,
+    super.key,
+  });
 
   static GalleryContextState? of(BuildContext context) {
     return context.dependOnInheritedWidgetOfExactType<GalleryContextState>();
diff --git a/mobile/lib/ui/viewer/gallery/trash_page.dart b/mobile/lib/ui/viewer/gallery/trash_page.dart
index 4c5570f2ef..499bcc73c5 100644
--- a/mobile/lib/ui/viewer/gallery/trash_page.dart
+++ b/mobile/lib/ui/viewer/gallery/trash_page.dart
@@ -126,7 +126,7 @@ class TrashPage extends StatelessWidget {
 }
 
 class BottomButtonsWidget extends StatelessWidget {
-  const BottomButtonsWidget({Key? key}) : super(key: key);
+  const BottomButtonsWidget({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/mobile/lib/ui/viewer/search/result/no_result_widget.dart b/mobile/lib/ui/viewer/search/result/no_result_widget.dart
index dc64a8e322..fe08b86ba5 100644
--- a/mobile/lib/ui/viewer/search/result/no_result_widget.dart
+++ b/mobile/lib/ui/viewer/search/result/no_result_widget.dart
@@ -7,7 +7,7 @@ import "package:photos/states/all_sections_examples_state.dart";
 import "package:photos/theme/ente_theme.dart";
 
 class NoResultWidget extends StatefulWidget {
-  const NoResultWidget({Key? key}) : super(key: key);
+  const NoResultWidget({super.key});
 
   @override
   State<NoResultWidget> createState() => _NoResultWidgetState();
diff --git a/mobile/lib/ui/viewer/search/search_suffix_icon_widget.dart b/mobile/lib/ui/viewer/search/search_suffix_icon_widget.dart
index 744684422d..9f94bb863b 100644
--- a/mobile/lib/ui/viewer/search/search_suffix_icon_widget.dart
+++ b/mobile/lib/ui/viewer/search/search_suffix_icon_widget.dart
@@ -5,7 +5,7 @@ import "package:photos/theme/ente_theme.dart";
 
 class SearchSuffixIcon extends StatefulWidget {
   final bool shouldShowSpinner;
-  const SearchSuffixIcon(this.shouldShowSpinner, {Key? key}) : super(key: key);
+  const SearchSuffixIcon(this.shouldShowSpinner, {super.key});
 
   @override
   State<SearchSuffixIcon> createState() => _SearchSuffixIconState();
diff --git a/mobile/lib/utils/email_util.dart b/mobile/lib/utils/email_util.dart
index d85db2bb20..9831e3b480 100644
--- a/mobile/lib/utils/email_util.dart
+++ b/mobile/lib/utils/email_util.dart
@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:archive/archive_io.dart';
-import "package:cross_file/cross_file.dart";
 import 'package:email_validator/email_validator.dart';
 import "package:file_saver/file_saver.dart";
 import 'package:flutter/cupertino.dart';
diff --git a/mobile/lib/utils/file_uploader_util.dart b/mobile/lib/utils/file_uploader_util.dart
index 8a7afb44e0..7bbdbd0bb2 100644
--- a/mobile/lib/utils/file_uploader_util.dart
+++ b/mobile/lib/utils/file_uploader_util.dart
@@ -342,7 +342,7 @@ Future<MetadataRequest> getPubMetadataRequest(
   file.pubMmdEncodedJson = jsonEncode(jsonToUpdate);
   file.pubMagicMetadata = PubMagicMetadata.fromJson(jsonToUpdate);
   final encryptedMMd = await CryptoUtil.encryptChaCha(
-    utf8.encode(jsonEncode(jsonToUpdate)) as Uint8List,
+    utf8.encode(jsonEncode(jsonToUpdate)),
     fileKey,
   );
   return MetadataRequest(
diff --git a/mobile/lib/utils/validator_util.dart b/mobile/lib/utils/validator_util.dart
index 0e54ceeab6..b7a812a7ae 100644
--- a/mobile/lib/utils/validator_util.dart
+++ b/mobile/lib/utils/validator_util.dart
@@ -33,7 +33,7 @@ void validatePreVerificationStateCheck(
   }
   // check password encoding issues
   try {
-    final Uint8List passwordL = utf8.encode(password!) as Uint8List;
+    final Uint8List passwordL = utf8.encode(password!);
     try {
       utf8.decode(passwordL);
     } catch (e) {

From 8c81a377c0dc9c16d53d467266267892c0af2b1e Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 18 Feb 2025 14:08:10 +0530
Subject: [PATCH 282/796] Lint fixes

---
 mobile/lib/ui/map/tile/layers.dart              |  1 +
 mobile/lib/ui/viewer/file/detail_page.dart      |  2 +-
 .../viewer/file/video_widget_media_kit_new.dart |  2 ++
 .../location/update_location_data_widget.dart   | 17 +++++++++--------
 .../plugins/ente_cast_none/lib/src/service.dart |  3 ---
 mobile/plugins/onnx_dart/pubspec.yaml           |  2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/mobile/lib/ui/map/tile/layers.dart b/mobile/lib/ui/map/tile/layers.dart
index 2597dddea2..7c1a5a1846 100644
--- a/mobile/lib/ui/map/tile/layers.dart
+++ b/mobile/lib/ui/map/tile/layers.dart
@@ -102,6 +102,7 @@ class MapBoxTilesLayer extends StatelessWidget {
       fallbackUrl: 'https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png',
       subdomains: const ['a', 'b', 'c'],
       backgroundColor: Colors.transparent,
+    
       userAgentPackageName: _userAgent,
       tileProvider: CachedNetworkTileProvider(),
       additionalOptions: const {
diff --git a/mobile/lib/ui/viewer/file/detail_page.dart b/mobile/lib/ui/viewer/file/detail_page.dart
index 3751e327f6..98ff163b14 100644
--- a/mobile/lib/ui/viewer/file/detail_page.dart
+++ b/mobile/lib/ui/viewer/file/detail_page.dart
@@ -65,7 +65,7 @@ class DetailPageConfiguration {
 class DetailPage extends StatefulWidget {
   final DetailPageConfiguration config;
 
-  const DetailPage(this.config, {key}) : super(key: key);
+  const DetailPage(this.config, {super.key});
 
   @override
   State<DetailPage> createState() => _DetailPageState();
diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
index 54ff94ce6a..a4f5651004 100644
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
@@ -242,6 +242,8 @@ class _VideoWidget extends StatefulWidget {
     this.controller,
     this.playbackCallback, {
     required this.isFromMemories,
+    // ignore: unused_element
+    this.onStreamChange,
   });
 
   @override
diff --git a/mobile/lib/ui/viewer/location/update_location_data_widget.dart b/mobile/lib/ui/viewer/location/update_location_data_widget.dart
index edafccd0e4..2584c8748d 100644
--- a/mobile/lib/ui/viewer/location/update_location_data_widget.dart
+++ b/mobile/lib/ui/viewer/location/update_location_data_widget.dart
@@ -49,8 +49,9 @@ class _UpdateLocationDataWidgetState extends State<UpdateLocationDataWidget> {
         FlutterMap(
           mapController: _mapController,
           options: MapOptions(
-            enableMultiFingerGestureRace: true,
-            zoom: 3,
+            interactionOptions:
+                const InteractionOptions(enableMultiFingerGestureRace: true),
+            initialZoom: 3,
             maxZoom: 18.0,
             minZoom: 2.8,
             onMapEvent: (p0) {
@@ -62,8 +63,8 @@ class _UpdateLocationDataWidgetState extends State<UpdateLocationDataWidget> {
             },
             onTap: (tapPosition, latlng) {
               final zoom = selectedLocation.value == null
-                  ? _mapController.zoom + 2.0
-                  : _mapController.zoom;
+                  ? _mapController.camera.zoom + 2.0
+                  : _mapController.camera.zoom;
               _mapController.move(latlng, zoom);
 
               selectedLocation.value = latlng;
@@ -138,8 +139,8 @@ class _UpdateLocationDataWidgetState extends State<UpdateLocationDataWidget> {
                 icon: Icons.add,
                 onPressed: () {
                   _mapController.move(
-                    _mapController.center,
-                    _mapController.zoom + 1,
+                    _mapController.camera.center,
+                    _mapController.camera.zoom + 1,
                   );
                 },
                 heroTag: 'zoom-in',
@@ -149,8 +150,8 @@ class _UpdateLocationDataWidgetState extends State<UpdateLocationDataWidget> {
                 icon: Icons.remove,
                 onPressed: () {
                   _mapController.move(
-                    _mapController.center,
-                    _mapController.zoom - 1,
+                    _mapController.camera.center,
+                    _mapController.camera.zoom - 1,
                   );
                 },
                 heroTag: 'zoom-out',
diff --git a/mobile/plugins/ente_cast_none/lib/src/service.dart b/mobile/plugins/ente_cast_none/lib/src/service.dart
index c781889733..bcc6fb4e5a 100644
--- a/mobile/plugins/ente_cast_none/lib/src/service.dart
+++ b/mobile/plugins/ente_cast_none/lib/src/service.dart
@@ -17,19 +17,16 @@ class CastServiceImpl extends CastService {
 
   @override
   Future<List<(String, Object)>> searchDevices() {
-    // TODO: implement searchDevices
     throw UnimplementedError();
   }
 
   @override
   Future<void> closeActiveCasts() {
-    // TODO: implement closeActiveCasts
     throw UnimplementedError();
   }
 
   @override
   Map<String, String> getActiveSessions() {
-    // TODO: implement getActiveSessions
     throw UnimplementedError();
   }
 }
diff --git a/mobile/plugins/onnx_dart/pubspec.yaml b/mobile/plugins/onnx_dart/pubspec.yaml
index fe7dd8c484..8757519440 100644
--- a/mobile/plugins/onnx_dart/pubspec.yaml
+++ b/mobile/plugins/onnx_dart/pubspec.yaml
@@ -1,7 +1,7 @@
 name: onnx_dart
 description: "A new Flutter plugin project."
 version: 0.0.1
-homepage: http://ente.io
+homepage: https://ente.io
 
 environment:
   sdk: '>=3.4.3 <4.0.0'

From ce5a8f04575c81cfdd61882a1cd1e81cfe032f22 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prateekmedia@users.noreply.github.com>
Date: Tue, 18 Feb 2025 14:09:39 +0530
Subject: [PATCH 283/796] fix: logic for queuing and item removal

---
 mobile/lib/services/preview_video_store.dart | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index bbbb39ed42..e175635676 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -596,8 +596,10 @@ class PreviewVideoStore {
         final codecIsH264 = codec?.contains("h264") ?? false;
 
         if (codecIsH264) {
-          _items.removeWhere((key, value) => value.file == enteFile);
-          Bus.instance.fire(PreviewUpdatedEvent(_items));
+          if (_items.containsKey(enteFile.uploadedFileID!)) {
+            _items.remove(enteFile.uploadedFileID!);
+            Bus.instance.fire(PreviewUpdatedEvent(_items));
+          }
           return (props, true);
         }
       }
@@ -634,6 +636,7 @@ class PreviewVideoStore {
       final (_, result) = await checkFileForPreviewCreation(enteFile);
 
       if (result) {
+        allFiles.remove(enteFile);
         continue;
       }
 

From a5c4d9cc18582517239c119c7d3ae2de1218887e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 14:39:50 +0530
Subject: [PATCH 284/796] ff

---
 .../gallery/components/viewer/data-source.ts  | 57 +++++++++++++------
 .../gallery/components/viewer/photoswipe.ts   | 11 +++-
 web/packages/gallery/package.json             |  2 +
 3 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 058e015e5e..e85cdc65e9 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -8,6 +8,7 @@ import {
 } from "@/gallery/services/download";
 import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
+import { ensureString } from "@/utils/ensure";
 
 // TODO(PS):
 //import { type SlideData } from "./ps5/dist/types/slide/"
@@ -58,10 +59,13 @@ type ItemData = SlideData & {
      */
     isContentZoomable?: boolean;
     /**
-     * If the fetch has failed then this will be set, and set to a failure
-     * reason category that the UI can use to show the appropriate message.
+     * This will be `true` if the fetch for the file's data has failed.
+     *
+     * It is possible for this to be set in tandem with the content URLs also
+     * being set (e.g. if we were able to use the cached thumbnail, but the
+     * original file could not be fetched because of an network error).
      */
-    failureReason?: "other";
+    fetchFailed?: boolean;
 };
 
 /**
@@ -170,7 +174,7 @@ export const itemDataForFile = (file: EnteFile, needsRefresh: () => void) => {
  * back the next time, the entire process is retried.
  */
 export const resetFailuresForFile = (file: EnteFile) => {
-    if (_state.itemDataByFileID.get(file.id)?.failureReason) {
+    if (_state.itemDataByFileID.get(file.id)?.fetchFailed) {
         _state.itemDataByFileID.delete(file.id);
     }
 };
@@ -183,10 +187,10 @@ const enqueueUpdates = async (file: EnteFile) => {
 
     // Use the last best available data, but stop showing the loading indicator
     // and instead show the error indicator.
-    const updateFailureReason = (failureReason: ItemData["failureReason"]) => {
+    const markFailed = () => {
         const lastData = _state.itemDataByFileID.get(file.id) ?? {};
         delete lastData.isContentLoading;
-        update({ ...lastData, failureReason });
+        update({ ...lastData, fetchFailed: true });
     };
 
     try {
@@ -194,7 +198,7 @@ const enqueueUpdates = async (file: EnteFile) => {
         // While the types don't reflect it, it is safe to use the ! (null
         // assertion) here since renderableThumbnailURL can throw but will not
         // return undefined by default.
-        const thumbnailData = await withDimensions(thumbnailURL!);
+        const thumbnailData = await withDimensions(ensureString(thumbnailURL));
         update({
             ...thumbnailData,
             isContentLoading: true,
@@ -207,8 +211,10 @@ const enqueueUpdates = async (file: EnteFile) => {
         //
         // Notify the user of the error. The entire process will be retried when
         // they reopen the slide later.
-        log.error("Failed to show thumbnail", e);
-        updateFailureReason("other");
+        //
+        // See: [Note: File viewer error handling]
+        log.error("Failed to fetch thumbnail", e);
+        markFailed();
         return;
     }
 
@@ -217,8 +223,9 @@ const enqueueUpdates = async (file: EnteFile) => {
             case FileType.image: {
                 const sourceURLs =
                     await downloadManager.renderableSourceURLs(file);
-                // TODO(PS):
-                const itemData = await withDimensions(sourceURLs.url as string);
+                const itemData = await withDimensions(
+                    ensureString(sourceURLs.url),
+                );
                 update(itemData);
                 break;
             }
@@ -237,8 +244,7 @@ const enqueueUpdates = async (file: EnteFile) => {
                 const livePhotoSourceURLs =
                     sourceURLs.url as LivePhotoSourceURL;
                 const imageURL = await livePhotoSourceURLs.image();
-                // TODO(PS):
-                const imageData = await withDimensions(imageURL!);
+                const imageData = await withDimensions(ensureString(imageURL));
                 update(imageData);
                 const livePhotoVideoURL = await livePhotoSourceURLs.video();
                 update({ ...imageData, livePhotoVideoURL });
@@ -246,8 +252,26 @@ const enqueueUpdates = async (file: EnteFile) => {
             }
         }
     } catch (e) {
-        log.error("Failed to show file", e);
-        updateFailureReason("other");
+        // [Note: File viewer error handling]
+        //
+        // Generally, file downloads will fail because of two reasons: Network
+        // errors, or format errors.
+        //
+        // In the first case (network error), the `renderableSourceURLs` method
+        // above will throw. We will show an error indicator icon in the UI, but
+        // will keep showing the thumbnail.
+        //
+        // In the second case (format error), we'll get back a URL, but if a
+        // file conversion was needed but not possible (say, it is an
+        // unsupported format), we might have at our hands the original file's
+        // untouched URL, that the browser might not know how to render.
+        //
+        // In this case we won't get into an error state here, but PhotoSwipe
+        // will encounter an error when trying to render it, and it will show
+        // our customized error message ("This file could not be previewed"),
+        // but the user will still be able to download it.
+        log.error("Failed to fetch file", e);
+        markFailed();
     }
 };
 
@@ -259,13 +283,12 @@ const enqueueUpdates = async (file: EnteFile) => {
 const withDimensions = (imageURL: string): Promise<ItemData> =>
     new Promise((resolve, reject) => {
         const image = new Image();
-        image.onload = () => {
+        image.onload = () =>
             resolve({
                 src: imageURL,
                 width: image.naturalWidth,
                 height: image.naturalHeight,
             });
-        };
         image.onerror = reject;
         image.src = imageURL;
     });
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 8684ad7c21..c4ff37318a 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -143,6 +143,13 @@ export class FileViewerPhotoSwipe {
             // TODO(PS): padding option? for handling custom title bar.
             // TODO(PS): will we need this?
             mainClass: "pswp-ente",
+            // Translated variants
+            closeTitle: t("close_key"),
+            zoomTitle: t("zoom_in_out_key") /* TODO(PS): Add "(scroll)" */,
+            arrowPrevTitle: t("previous_key"),
+            arrowNextTitle: t("next_key"),
+            // TODO(PS): Move to translations (unpreviewable_file_notification).
+            errorMsg: "This file could not be previewed",
         });
 
         // Helper routines to obtain the file at `currIndex`.
@@ -245,6 +252,8 @@ export class FileViewerPhotoSwipe {
             // ^ Note that because of how the preloading works, this will have
             //   an effect (i.e. the retry will happen) only if the user moves
             //   more than 2 slides and then back, or if they reopen the viewer.
+            //
+            // See: [Note: File viewer error handling]
             resetFailuresForFile(currentFile());
 
             // Pause the video element, if any, when we move away from the
@@ -291,7 +300,7 @@ export class FileViewerPhotoSwipe {
                     pswp.on("change", () => {
                         errorElement.classList.toggle(
                             "pswp__error--active",
-                            !!pswp.currSlide.content.data.failureReason,
+                            pswp.currSlide.content.data.fetchFailed,
                         );
                     });
                 },
diff --git a/web/packages/gallery/package.json b/web/packages/gallery/package.json
index 24e07a5a6f..30da67c985 100644
--- a/web/packages/gallery/package.json
+++ b/web/packages/gallery/package.json
@@ -3,6 +3,8 @@
     "version": "0.0.0",
     "private": true,
     "dependencies": {
+        "@/base": "*",
+        "@/utils": "*",
         "@ffmpeg/ffmpeg": "^0.12.10",
         "bs58": "^6.0.0"
     },

From 132962b92f6595c25198be296b1db270c8ca6026 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 14:48:51 +0530
Subject: [PATCH 285/796] Exclusive

---
 web/packages/gallery/components/viewer/photoswipe.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index c4ff37318a..4610762bcb 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -298,9 +298,11 @@ export class FileViewerPhotoSwipe {
                 html: createPSRegisterElementIconHTML("error"),
                 onInit: (errorElement, pswp) => {
                     pswp.on("change", () => {
+                        const { fetchFailed, isContentLoading } =
+                            pswp.currSlide.content.data;
                         errorElement.classList.toggle(
                             "pswp__error--active",
-                            pswp.currSlide.content.data.fetchFailed,
+                            !!fetchFailed && !isContentLoading,
                         );
                     });
                 },

From 931d7c851351ec300a648f96e6849e60c248345f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 15:01:58 +0530
Subject: [PATCH 286/796] Close

---
 .../gallery/components/viewer/data-source.ts  | 24 ++++++++++++++-----
 .../gallery/components/viewer/photoswipe.ts   | 17 ++++++++-----
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index e85cdc65e9..e8f588b0fe 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -168,14 +168,26 @@ export const itemDataForFile = (file: EnteFile, needsRefresh: () => void) => {
 };
 
 /**
- * Reset any failure reasons for the given {@link file}.
+ * Forget item data for the given {@link file} if its fetch had failed.
  *
- * This is called when the user moves away from a slide, so that when the come
- * back the next time, the entire process is retried.
+ * This is called when the user moves away from a slide so that we attempt a
+ * full retry when they come back the next time.
  */
-export const resetFailuresForFile = (file: EnteFile) => {
-    if (_state.itemDataByFileID.get(file.id)?.fetchFailed) {
-        _state.itemDataByFileID.delete(file.id);
+export const forgetFailedItemDataForFile = (file: EnteFile) =>
+    forgetFailedItemDataForFileID(file.id);
+
+/**
+ * Forget item data for the all files whose fetch had failed.
+ *
+ * This is called when the user closes the file viewer so that we attempt a full
+ * retry when they reopen the viewer the next time.
+ */
+export const forgetFailedItems = () =>
+    [..._state.itemDataByFileID.keys()].forEach(forgetFailedItemDataForFileID);
+
+const forgetFailedItemDataForFileID = (fileID: number) => {
+    if (_state.itemDataByFileID.get(fileID)?.fetchFailed) {
+        _state.itemDataByFileID.delete(fileID);
     }
 };
 
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 4610762bcb..62bc367e38 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -4,7 +4,11 @@
 import log from "@/base/log";
 import type { EnteFile } from "@/media/file";
 import { t } from "i18next";
-import { itemDataForFile, resetFailuresForFile } from "./data-source";
+import {
+    forgetFailedItemDataForFile,
+    forgetFailedItems,
+    itemDataForFile,
+} from "./data-source";
 import type { FileViewerProps } from "./FileViewer";
 import { createPSRegisterElementIconHTML } from "./icons";
 
@@ -254,7 +258,7 @@ export class FileViewerPhotoSwipe {
             //   more than 2 slides and then back, or if they reopen the viewer.
             //
             // See: [Note: File viewer error handling]
-            resetFailuresForFile(currentFile());
+            forgetFailedItemDataForFile(currentFile());
 
             // Pause the video element, if any, when we move away from the
             // slide.
@@ -273,10 +277,11 @@ export class FileViewerPhotoSwipe {
             }
         });
 
-        // The user did some action within the file viewer to close it.
-        pswp.on("close", () => {
-            // Clear intervals.
+        // The PhotoSwipe dialog has being closed and the animations have
+        // completed.
+        pswp.on("destroy", () => {
             this.clearAutoHideIntervalIfNeeded();
+            forgetFailedItems();
             // Let our parent know that we have been closed.
             onClose();
         });
@@ -295,6 +300,7 @@ export class FileViewerPhotoSwipe {
             pswp.ui.registerElement({
                 name: "error",
                 order: 6,
+                // TODO(PS): Change color?
                 html: createPSRegisterElementIconHTML("error"),
                 onInit: (errorElement, pswp) => {
                     pswp.on("change", () => {
@@ -353,7 +359,6 @@ export class FileViewerPhotoSwipe {
         // closed internally (e.g. the user activated the close button within
         // the file viewer), then PhotoSwipe will ignore this extra close.
         this.pswp.close();
-        this.clearAutoHideIntervalIfNeeded();
     }
 
     updateFiles(files: EnteFile[]) {

From 37c467eb86fab38c3984e15331d3b344fab2ae20 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prateekmedia@users.noreply.github.com>
Date: Tue, 18 Feb 2025 15:09:52 +0530
Subject: [PATCH 287/796] fix: remove internal user flag

---
 mobile/lib/main.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index 7c5c92e491..906654c793 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -238,7 +238,7 @@ Future<void> _init(bool isBackground, {String via = ''}) async {
     ServiceLocator.instance
         .init(preferences, NetworkClient.instance.enteDio, packageInfo);
 
-    if (!isBackground && flagService.internalUser) {
+    if (!isBackground) {
       VideoPlayerMediaKit.ensureInitialized(iOS: true);
     }
 

From 764add95c8ca2e153efaffe229551318bb1b68c1 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 16:22:03 +0530
Subject: [PATCH 288/796] EP 1

---
 .../gallery/components/viewer/data-source.ts  | 39 +++++++++++++++++++
 .../gallery/components/viewer/photoswipe.ts   | 12 ++++++
 2 files changed, 51 insertions(+)

diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index e8f588b0fe..c04ef79258 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -9,6 +9,8 @@ import {
 import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import { ensureString } from "@/utils/ensure";
+// TODO:
+import { extractRawExif, parseExif } from "@/new/photos/services/exif";
 
 // TODO(PS):
 //import { type SlideData } from "./ps5/dist/types/slide/"
@@ -304,3 +306,40 @@ const withDimensions = (imageURL: string): Promise<ItemData> =>
         image.onerror = reject;
         image.src = imageURL;
     });
+
+/**
+ * Return the Exif data for the given {@link file}, caching it appropriately.
+ *
+ * The shape of the returned data is such that it can directly be used by the
+ * {@link FileInfo} sidebar.
+ *
+ * @see {@link forgetExif}.
+ */
+export const exifForItemData = async (itemData: ItemData) => {
+    // Determine the (object) URL corresponding to the image portion, if any,
+    // associated with the given itemData.
+    //
+    // - For images, this will be the object URL of the renderable image itself.
+    // - For videos, this will not be defined.
+    // - For live photos, this will be the object URL of the image portion of
+    //   the live photo.
+    const { src: associatedImageURL } = itemData;
+
+    if (!associatedImageURL) {
+        // This is a video. Use a placeholder.
+        return { tags: undefined, parsed: undefined };
+    }
+
+    try {
+        console.time("exif");
+        const blob = await (await fetch(associatedImageURL)).blob();
+        const file = new File([blob], "");
+        const tags = await extractRawExif(file);
+        const parsed = parseExif(tags);
+        console.timeEnd("exif");
+        return { tags, parsed };
+    } catch (e) {
+        log.error("Failed to extract exif", e);
+        return { tags: undefined, parsed: undefined };
+    }
+};
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 62bc367e38..09829a35cc 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -5,6 +5,7 @@ import log from "@/base/log";
 import type { EnteFile } from "@/media/file";
 import { t } from "i18next";
 import {
+    exifForItemData,
     forgetFailedItemDataForFile,
     forgetFailedItems,
     itemDataForFile,
@@ -323,6 +324,17 @@ export class FileViewerPhotoSwipe {
             });
         });
 
+        pswp.on("loadComplete", (e) => {
+            console.log("xxx loadComplete", e);
+        });
+
+        pswp.on("change", (e) => {
+            const itemData = pswp.currSlide.content.data;
+            exifForItemData(itemData).then((data) =>
+                console.log("exif data", data),
+            );
+        });
+
         // Modify the default UI elements.
         pswp.addFilter("uiElement", (element, data) => {
             if (element.name == "preloader") {

From fd7c25029e14a675aad5e5cdf9750fdd5f538f3f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 16:52:39 +0530
Subject: [PATCH 289/796] Restructure

---
 .../gallery/components/viewer/data-source.ts  | 51 ++++++++++++-------
 .../gallery/components/viewer/photoswipe.ts   |  8 +--
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index c04ef79258..48bd4aee65 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -35,15 +35,27 @@ interface SlideData {
 
 type ItemData = SlideData & {
     /**
-     * If the file is a video, then this will be set to a renderable URL of the
-     * original when it becomes available.
+     * The {@link EnteFile} type of the file whose data we are.
+     */
+    fileType?: FileType;
+    /**
+     * The renderable object URL of the image associated with the file.
+     *
+     * - For images, this will be the object URL of a renderable image.
+     * - For videos, this will not be defined.
+     * - For live photos, this will be a renderable object URL of the image
+     *   portion of the live photo.
+     */
+    imageURL?: string;
+    /**
+     * The renderable object URL of the video associated with the file.
+     *
+     * - For images, this will not be defined.
+     * - For videos, this will be the object URL of a renderable video.
+     * - For live photos, this will be a renderable object URL of the video
+     *   portion of the live photo.
      */
     videoURL?: string;
-    /**
-     * If the file is a live photo, then this will be set to a renderable URL of
-     * the original when it becomes available.
-     */
-    livePhotoVideoURL?: string;
     /**
      * `true` if we should indicate to the user that we're still fetching data
      * for this file.
@@ -194,8 +206,10 @@ const forgetFailedItemDataForFileID = (fileID: number) => {
 };
 
 const enqueueUpdates = async (file: EnteFile) => {
+    const fileType = file.metadata.fileType;
+
     const update = (itemData: ItemData) => {
-        _state.itemDataByFileID.set(file.id, itemData);
+        _state.itemDataByFileID.set(file.id, { ...itemData, fileType });
         _state.needsRefreshByFileID.get(file.id)?.();
     };
 
@@ -233,14 +247,13 @@ const enqueueUpdates = async (file: EnteFile) => {
     }
 
     try {
-        switch (file.metadata.fileType) {
+        switch (fileType) {
             case FileType.image: {
                 const sourceURLs =
                     await downloadManager.renderableSourceURLs(file);
-                const itemData = await withDimensions(
-                    ensureString(sourceURLs.url),
-                );
-                update(itemData);
+                const imageURL = ensureString(sourceURLs.url);
+                const itemData = await withDimensions(imageURL);
+                update({ ...itemData, imageURL });
                 break;
             }
 
@@ -260,8 +273,8 @@ const enqueueUpdates = async (file: EnteFile) => {
                 const imageURL = await livePhotoSourceURLs.image();
                 const imageData = await withDimensions(ensureString(imageURL));
                 update(imageData);
-                const livePhotoVideoURL = await livePhotoSourceURLs.video();
-                update({ ...imageData, livePhotoVideoURL });
+                const videoURL = await livePhotoSourceURLs.video();
+                update({ ...imageData, videoURL });
                 break;
             }
         }
@@ -323,16 +336,16 @@ export const exifForItemData = async (itemData: ItemData) => {
     // - For videos, this will not be defined.
     // - For live photos, this will be the object URL of the image portion of
     //   the live photo.
-    const { src: associatedImageURL } = itemData;
+    const { imageURL } = itemData;
 
-    if (!associatedImageURL) {
-        // This is a video. Use a placeholder.
+    if (!imageURL) {
+        // TODO(PS): This is a video. Use a placeholder.
         return { tags: undefined, parsed: undefined };
     }
 
     try {
         console.time("exif");
-        const blob = await (await fetch(associatedImageURL)).blob();
+        const blob = await (await fetch(imageURL)).blob();
         const file = new File([blob], "");
         const tags = await extractRawExif(file);
         const parsed = parseExif(tags);
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 09829a35cc..7c1fdf3bed 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -3,6 +3,7 @@
 
 import log from "@/base/log";
 import type { EnteFile } from "@/media/file";
+import { FileType } from "@/media/file-type";
 import { t } from "i18next";
 import {
     exifForItemData,
@@ -210,7 +211,8 @@ export class FileViewerPhotoSwipe {
         });
 
         pswp.on("contentAppend", (e) => {
-            const videoURL = e.content.data.livePhotoVideoURL;
+            const { fileType, videoURL } = e.content.data;
+            if (fileType !== FileType.livePhoto) return;
             if (!videoURL) return;
 
             // This slide is displaying a live photo. Append a video element to
@@ -234,7 +236,7 @@ export class FileViewerPhotoSwipe {
         });
 
         pswp.on("imageSizeChange", ({ content, width, height }) => {
-            if (!content.data.livePhotoVideoURL) return;
+            if (content.data.fileType !== FileType.livePhoto) return;
 
             // This slide is displaying a live photo. Resize the size of the
             // video element to match that of the image.
@@ -271,7 +273,7 @@ export class FileViewerPhotoSwipe {
         pswp.on("contentActivate", (e) => {
             // Undo the effect of a previous "contentDeactivate" if it was
             // displaying a live photo.
-            if (e.content?.slide.data?.livePhotoVideoURL) {
+            if (e.content?.slide.data?.fileType === FileType.livePhoto) {
                 e.content?.slide?.container
                     ?.getElementsByTagName("video")[0]
                     ?.play();

From 844f969f1c945da66e7649de92391559b5b68bca Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Tue, 18 Feb 2025 17:00:28 +0530
Subject: [PATCH 290/796] [mob][photos] people memory model

---
 mobile/lib/models/people_memory.dart | 38 ++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 mobile/lib/models/people_memory.dart

diff --git a/mobile/lib/models/people_memory.dart b/mobile/lib/models/people_memory.dart
new file mode 100644
index 0000000000..1a3dbaa7ce
--- /dev/null
+++ b/mobile/lib/models/people_memory.dart
@@ -0,0 +1,38 @@
+import "package:photos/models/memory.dart";
+import "package:photos/models/smart_memory.dart";
+
+enum PeopleMemoryType {
+  spotlight,
+  youAndThem,
+  doingSomethingTogether,
+  lastTimeYouSawThem,
+}
+
+class PeopleMemory extends SmartMemory {
+  final PeopleMemoryType peopleMemoryType;
+
+  PeopleMemory(
+    List<Memory> memories,
+    this.peopleMemoryType, {
+    super.name,
+    super.firstCreationTime,
+    super.lastCreationTime,
+  }) : super(memories, MemoryType.people);
+
+  @override
+  PeopleMemory copyWith({
+    List<Memory>? memories,
+    PeopleMemoryType? peopleMemoryType,
+    String? name,
+    int? firstCreationTime,
+    int? lastCreationTime,
+  }) {
+    return PeopleMemory(
+      memories ?? super.memories,
+      peopleMemoryType ?? this.peopleMemoryType,
+      name: name ?? super.name,
+      firstCreationTime: firstCreationTime ?? super.firstCreationTime,
+      lastCreationTime: lastCreationTime ?? super.lastCreationTime,
+    );
+  }
+}

From 20bc84ca967edd8229153ddbd5ad81f13063f039 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 17:00:27 +0530
Subject: [PATCH 291/796] Doc

---
 .../gallery/components/viewer/data-source.ts  | 43 +++++++++++--------
 .../gallery/components/viewer/photoswipe.ts   |  4 +-
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 48bd4aee65..1615a27622 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -9,31 +9,43 @@ import {
 import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import { ensureString } from "@/utils/ensure";
-// TODO:
+// TODO(PS):
 import { extractRawExif, parseExif } from "@/new/photos/services/exif";
 
-// TODO(PS):
-//import { type SlideData } from "./ps5/dist/types/slide/"
-interface SlideData {
+/**
+ * This is a subset of the fields expected by PhotoSwipe itself (see the
+ * {@link SlideData} type exported by PhotoSwipe).
+ */
+interface PhotoSwipeSlideData {
     /**
-     * image URL
+     * The image URL expected by PhotoSwipe.
+     *
+     * This is set to the URL of the image that should be shown in the image
+     * viewer component provided by PhotoSwipe. It will be a renderable (i.e.,
+     * possibly converted) object URL obtained from the current "best" image we
+     * have: e.g. if all we have is the thumbnail, then this'll be an renderable
+     * object URL from the thumbnail. Then later when we fetch the original
+     * image, this'll be the renderable object URL derived from the original.
      */
     src?: string | undefined;
     /**
-     * image width
+     * The width (in pixels) of the {@link src} image.
      */
     width?: number | undefined;
     /**
-     * image height
+     * The height (in pixels) of the {@link src} image.
      */
     height?: number | undefined;
-    /**
-     * html content of a slide
-     */
-    html?: string | undefined;
 }
 
-type ItemData = SlideData & {
+/**
+ * The data returned by the flagship {@link itemDataForFile} function provided
+ * by the file viewer data source module.
+ *
+ * This is the minimal data expected by PhotoSwipe, plus some fields we use
+ * ourselves in the custom scaffolding we have around PhotoSwipe.
+ */
+export type ItemData = PhotoSwipeSlideData & {
     /**
      * The {@link EnteFile} type of the file whose data we are.
      */
@@ -329,13 +341,6 @@ const withDimensions = (imageURL: string): Promise<ItemData> =>
  * @see {@link forgetExif}.
  */
 export const exifForItemData = async (itemData: ItemData) => {
-    // Determine the (object) URL corresponding to the image portion, if any,
-    // associated with the given itemData.
-    //
-    // - For images, this will be the object URL of the renderable image itself.
-    // - For videos, this will not be defined.
-    // - For live photos, this will be the object URL of the image portion of
-    //   the live photo.
     const { imageURL } = itemData;
 
     if (!imageURL) {
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 7c1fdf3bed..4c7e5530ff 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -177,8 +177,8 @@ export class FileViewerPhotoSwipe {
                 this.pswp.refreshSlideContent(index);
             });
 
-            const { videoURL, ...rest } = itemData;
-            if (videoURL) {
+            const { fileType, videoURL, ...rest } = itemData;
+            if (fileType === FileType.video && videoURL) {
                 const disableDownload = !!this.opts.disableDownload;
                 itemData = {
                     ...rest,

From 7de2a47c51c4e57d5d6f12d94db984e48bbd7a37 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 19:23:13 +0530
Subject: [PATCH 292/796] Sketch

---
 .../src/components/PhotoViewer/index.tsx      |   7 +-
 web/packages/gallery/components/FileInfo.tsx  |   7 +-
 .../gallery/components/viewer/data-source.ts  | 136 +++++++++++++++---
 .../gallery/components/viewer/photoswipe.ts   |  29 ++--
 4 files changed, 136 insertions(+), 43 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index 41b83cc307..14fae8f95c 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -9,11 +9,8 @@ import {
 } from "@/base/components/utils/modal";
 import { lowercaseExtension } from "@/base/file-name";
 import log from "@/base/log";
-import {
-    FileInfo,
-    type FileInfoExif,
-    type FileInfoProps,
-} from "@/gallery/components/FileInfo";
+import { FileInfo, type FileInfoProps } from "@/gallery/components/FileInfo";
+import { type FileInfoExif } from "@/gallery/components/viewer/data-source";
 import { downloadManager } from "@/gallery/services/download";
 import type { Collection } from "@/media/collection";
 import { fileLogID, type EnteFile } from "@/media/file";
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 6c9b2b6a67..2feb22f9fb 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -34,7 +34,6 @@ import {
     updateExistingFilePubMetadata,
 } from "@/gallery/services/file";
 import { type EnteFile } from "@/media/file";
-import type { ParsedMetadata } from "@/media/file-metadata";
 import {
     fileCreationPhotoDate,
     fileLocation,
@@ -94,6 +93,7 @@ import { Formik } from "formik";
 import { t } from "i18next";
 import React, { useEffect, useMemo, useRef, useState } from "react";
 import * as Yup from "yup";
+import type { FileInfoExif } from "./viewer/data-source";
 
 // Re-uses images from ~leaflet package.
 import "leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css";
@@ -105,11 +105,6 @@ const leaflet = haveWindow()
       (require("leaflet") as typeof import("leaflet"))
     : null;
 
-export interface FileInfoExif {
-    tags: RawExifTags | undefined;
-    parsed: ParsedMetadata | undefined;
-}
-
 export type FileInfoProps = ModalVisibilityProps & {
     /**
      * The file whose information we are showing.
diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 1615a27622..44ece51f7a 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -10,7 +10,12 @@ import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import { ensureString } from "@/utils/ensure";
 // TODO(PS):
-import { extractRawExif, parseExif } from "@/new/photos/services/exif";
+import type { ParsedMetadata } from "@/media/file-metadata";
+import {
+    extractRawExif,
+    parseExif,
+    type RawExifTags,
+} from "@/new/photos/services/exif";
 
 /**
  * This is a subset of the fields expected by PhotoSwipe itself (see the
@@ -46,10 +51,14 @@ interface PhotoSwipeSlideData {
  * ourselves in the custom scaffolding we have around PhotoSwipe.
  */
 export type ItemData = PhotoSwipeSlideData & {
+    /**
+     * The ID of the {@link EnteFile} whose data we are.
+     */
+    fileID: number;
     /**
      * The {@link EnteFile} type of the file whose data we are.
      */
-    fileType?: FileType;
+    fileType: FileType;
     /**
      * The renderable object URL of the image associated with the file.
      *
@@ -94,6 +103,17 @@ export type ItemData = PhotoSwipeSlideData & {
     fetchFailed?: boolean;
 };
 
+/**
+ * Exif data for a file, in a form suitable for use by {@link FileInfo}.
+ *
+ * TODO(PS): Indicate missing exif (e.g. videos) better, both in the data type,
+ * and in the UI (e.g. by omitting the entire row).
+ */
+export interface FileInfoExif {
+    tags: RawExifTags | undefined;
+    parsed: ParsedMetadata | undefined;
+}
+
 /**
  * This module stores and serves data required by our custom PhotoSwipe
  * instance, effectively acting as an in-memory cache.
@@ -113,6 +133,10 @@ class FileViewerDataSourceState {
      * available for a particular file (ID).
      */
     needsRefreshByFileID = new Map<number, () => void>();
+    /**
+     * The exif data we have for a particular file (ID).
+     */
+    fileInfoExifByFileID = new Map<number, FileInfoExif>();
 }
 
 /**
@@ -178,14 +202,17 @@ export const logoutFileViewerDataSource = () => {
  * to serve the incomplete result.
  */
 export const itemDataForFile = (file: EnteFile, needsRefresh: () => void) => {
-    let itemData = _state.itemDataByFileID.get(file.id);
+    const fileID = file.id;
+    const fileType = file.metadata.fileType;
+
+    let itemData = _state.itemDataByFileID.get(fileID);
 
     // We assume that there is only one file viewer that is using us at a given
     // point of time. This assumption is currently valid.
     _state.needsRefreshByFileID.set(file.id, needsRefresh);
 
     if (!itemData) {
-        itemData = { isContentLoading: true };
+        itemData = { fileID, fileType, isContentLoading: true };
         _state.itemDataByFileID.set(file.id, itemData);
         void enqueueUpdates(file);
     }
@@ -218,17 +245,19 @@ const forgetFailedItemDataForFileID = (fileID: number) => {
 };
 
 const enqueueUpdates = async (file: EnteFile) => {
+    const fileID = file.id;
     const fileType = file.metadata.fileType;
 
-    const update = (itemData: ItemData) => {
-        _state.itemDataByFileID.set(file.id, { ...itemData, fileType });
+    const update = (itemData: Partial<ItemData>) => {
+        _state.itemDataByFileID.set(file.id, { ...itemData, fileType, fileID });
         _state.needsRefreshByFileID.get(file.id)?.();
     };
 
     // Use the last best available data, but stop showing the loading indicator
     // and instead show the error indicator.
     const markFailed = () => {
-        const lastData = _state.itemDataByFileID.get(file.id) ?? {};
+        const lastData: Partial<ItemData> =
+            _state.itemDataByFileID.get(file.id) ?? {};
         delete lastData.isContentLoading;
         update({ ...lastData, fetchFailed: true });
     };
@@ -319,7 +348,7 @@ const enqueueUpdates = async (file: EnteFile) => {
  * and its dimensions in a form that can directly be passed to PhotoSwipe as
  * {@link ItemData}.
  */
-const withDimensions = (imageURL: string): Promise<ItemData> =>
+const withDimensions = (imageURL: string): Promise<Partial<ItemData>> =>
     new Promise((resolve, reject) => {
         const image = new Image();
         image.onload = () =>
@@ -333,31 +362,98 @@ const withDimensions = (imageURL: string): Promise<ItemData> =>
     });
 
 /**
- * Return the Exif data for the given {@link file}, caching it appropriately.
+ * Return the cached Exif data for the given {@link file}.
  *
  * The shape of the returned data is such that it can directly be used by the
  * {@link FileInfo} sidebar.
  *
- * @see {@link forgetExif}.
+ * Exif extraction is not too expensive, and takes around 10-200 ms usually, so
+ * this can be done preemptively. As soon as we get data for a particular item
+ * as the user swipes through the file viewer, we extract its exif data using
+ * {@link updateFileInfoExifIfNeeded}.
+ *
+ * Then, if the user were to open the file info sidebar for that particular file
+ * again, the associated exif data will be returned by this function. Since the
+ * happy path is for synchronous use in a React component, this function
+ * synchronously returns the cached value (and the callback is never invoked).
+ *
+ * In rare cases, it is possible that this function gets called before
+ * {@link updateFileInfoExifIfNeeded} has completed. In that case, it will
+ * trigger a parallel extraction. The function will synchronously return
+ * `undefined`, and then will call the provided callback once the extraction
+ * results are available.
  */
-export const exifForItemData = async (itemData: ItemData) => {
-    const { imageURL } = itemData;
+export const fileInfoExifForItemData = (
+    itemData: ItemData,
+    // cb: (exifData: FileInfoExif) => void,
+) => {
+    const exifData = _state.fileInfoExifByFileID.get(itemData.fileID);
+    if (exifData) return exifData;
 
-    if (!imageURL) {
-        // TODO(PS): This is a video. Use a placeholder.
-        return { tags: undefined, parsed: undefined };
-    }
+    return undefined;
+    // updateFileInfoExifIfNeeded()
+};
 
+//     // TODO(PS): This is a video. Use a placeholder.
+//     return { tags: undefined, parsed: undefined };
+// }
+
+//     const
+// };
+
+/**
+ * Update, if needed, the cached Exif data for with the given {@link itemData}.
+ *
+ * This function is expected to be called when an item is loaded as PhotoSwipe
+ * content. It can be safely called multiple times - it will ignore calls until
+ * the item has an associated {@link imageURL}, and it will also ignore calls
+ * that are made after exif data has already been extracted.
+ *
+ * If required, it will extract the exif data from the file, massage it to a
+ * form suitable for use by {@link FileInfo}, and stash it in its caches.
+ *
+ *
+ *
+ * @see {@link forgetExifForItemData}.
+ */
+export const updateFileInfoExifIfNeeded = async (itemData: ItemData) => {
+    const { fileID, fileType, imageURL } = itemData;
+
+    if (_state.fileInfoExifByFileID.has(fileID)) return;
+    if (fileType === FileType.video) return;
+    if (!imageURL) return;
+
+    let exifData: FileInfoExif;
     try {
-        console.time("exif");
         const blob = await (await fetch(imageURL)).blob();
         const file = new File([blob], "");
         const tags = await extractRawExif(file);
         const parsed = parseExif(tags);
-        console.timeEnd("exif");
-        return { tags, parsed };
+        exifData = { tags, parsed };
     } catch (e) {
         log.error("Failed to extract exif", e);
-        return { tags: undefined, parsed: undefined };
+        // Save the empty placeholder exif corresponding to the file, no point
+        // in unnecessarily retrying this, it will deterministically fail again.
+        exifData = createPlaceholderFileInfoExif();
     }
+
+    _state.fileInfoExifByFileID.set(fileID, exifData);
+
+    return exifData;
 };
+
+const createPlaceholderFileInfoExif = (): FileInfoExif => ({
+    tags: undefined,
+    parsed: undefined,
+});
+
+/**
+ * Clear any cached {@link FileInfoExif} for the given {@link ItemData}.
+ */
+export const forgetExifForItemData = ({ fileID }: ItemData) =>
+    _state.fileInfoExifByFileID.delete(fileID);
+
+/**
+ * Clear all cached {@link FileInfoExif}.
+ */
+export const forgetExif = () => _state.fileInfoExifByFileID.clear();
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 4c7e5530ff..9857a758d5 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -6,10 +6,12 @@ import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import { t } from "i18next";
 import {
-    exifForItemData,
+    forgetExif,
+    forgetExifForItemData,
     forgetFailedItemDataForFile,
     forgetFailedItems,
     itemDataForFile,
+    updateFileInfoExifIfNeeded,
 } from "./data-source";
 import type { FileViewerProps } from "./FileViewer";
 import { createPSRegisterElementIconHTML } from "./icons";
@@ -280,11 +282,25 @@ export class FileViewerPhotoSwipe {
             }
         });
 
+        pswp.on("loadComplete", (e) =>
+            updateFileInfoExifIfNeeded(e.content.data),
+        );
+
+        // pswp.on("change", (e) => {
+        //     const itemData = pswp.currSlide.content.data;
+        //     exifForItemData(itemData).then((data) =>
+        //         console.log("exif data", data),
+        //     );
+        // });
+
+        pswp.on("contentDestroy", (e) => forgetExifForItemData(e.content.data));
+
         // The PhotoSwipe dialog has being closed and the animations have
         // completed.
         pswp.on("destroy", () => {
             this.clearAutoHideIntervalIfNeeded();
             forgetFailedItems();
+            forgetExif();
             // Let our parent know that we have been closed.
             onClose();
         });
@@ -326,17 +342,6 @@ export class FileViewerPhotoSwipe {
             });
         });
 
-        pswp.on("loadComplete", (e) => {
-            console.log("xxx loadComplete", e);
-        });
-
-        pswp.on("change", (e) => {
-            const itemData = pswp.currSlide.content.data;
-            exifForItemData(itemData).then((data) =>
-                console.log("exif data", data),
-            );
-        });
-
         // Modify the default UI elements.
         pswp.addFilter("uiElement", (element, data) => {
             if (element.name == "preloader") {

From d5e8777e0d78e32a642af452409250fe874b5f53 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 19:47:06 +0530
Subject: [PATCH 293/796] Take 1

---
 .../gallery/components/viewer/FileViewer.tsx  | 41 +++++++++---
 .../gallery/components/viewer/data-source.ts  | 65 +++++++++++--------
 2 files changed, 68 insertions(+), 38 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 9deedd9180..837cce4d95 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -1,4 +1,4 @@
-/* eslint-disable */
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 // @ts-nocheck
 
 // TODO(PS): WIP gallery using upstream photoswipe
@@ -13,14 +13,18 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     throw new Error("Whoa");
 }
 
-import { useModalVisibility } from "@/base/components/utils/modal";
+import {
+    useModalVisibility,
+    type ModalVisibilityProps,
+} from "@/base/components/utils/modal";
 import { FileInfo } from "@/gallery/components/FileInfo";
 import type { EnteFile } from "@/media/file.js";
 import { Button, styled } from "@mui/material";
 import { useCallback, useEffect, useRef, useState } from "react";
+import { fileInfoExifForFile, type FileInfoExif } from "./data-source";
 import { FileViewerPhotoSwipe } from "./photoswipe";
 
-export interface FileViewerProps {
+export type FileViewerProps = ModalVisibilityProps & {
     /**
      * The list of files that are currently being displayed in the context in
      * which the file viewer was invoked.
@@ -45,7 +49,7 @@ export interface FileViewerProps {
      * If true then the viewer does not show controls for downloading the file.
      */
     disableDownload?: boolean;
-}
+};
 
 /**
  * A PhotoSwipe based image and video viewer.
@@ -69,14 +73,25 @@ const FileViewer: React.FC<FileViewerProps> = ({
     const [activeFile, setActiveFile] = useState<EnteFile | undefined>(
         undefined,
     );
+    // With semantics similar to activeFile, this is the exif data associated
+    // with the activeFile, if any.
+    const [activeFileExif, setActiveFileExif] = useState<
+        FileInfoExif | undefined
+    >(undefined);
 
     const { show: showFileInfo, props: fileInfoVisibilityProps } =
         useModalVisibility();
 
-    const handleViewInfo = useCallback((file: EnteFile) => {
-        setActiveFile(file);
-        showFileInfo();
-    }, []);
+    const handleViewInfo = useCallback(
+        (file: EnteFile) => {
+            setActiveFile(file);
+            setActiveFileExif(
+                fileInfoExifForFile(file, (exif) => setActiveFileExif(exif)),
+            );
+            showFileInfo();
+        },
+        [showFileInfo],
+    );
 
     useEffect(() => {
         if (!open) {
@@ -97,12 +112,18 @@ const FileViewer: React.FC<FileViewerProps> = ({
             pswpRef.current?.closeIfNeeded();
             pswpRef.current = undefined;
         };
-    }, [open]);
+        // TODO(PS): This is missing files, initialIndex, disableDownload,
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [open, onClose, handleViewInfo]);
 
     return (
         <Container>
             <Button>Test</Button>
-            <FileInfo {...fileInfoVisibilityProps} file={activeFile} />
+            <FileInfo
+                {...fileInfoVisibilityProps}
+                file={activeFile}
+                exif={activeFileExif}
+            />
         </Container>
     );
 };
diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 44ece51f7a..2a3cb6aba2 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -137,6 +137,11 @@ class FileViewerDataSourceState {
      * The exif data we have for a particular file (ID).
      */
     fileInfoExifByFileID = new Map<number, FileInfoExif>();
+    /**
+     * The latest callback registered for notifications of exif data being
+     * available for a particular file (ID).
+     */
+    exifObserverByFileID = new Map<number, (exif: FileInfoExif) => void>();
 }
 
 /**
@@ -378,29 +383,22 @@ const withDimensions = (imageURL: string): Promise<Partial<ItemData>> =>
  * synchronously returns the cached value (and the callback is never invoked).
  *
  * In rare cases, it is possible that this function gets called before
- * {@link updateFileInfoExifIfNeeded} has completed. In that case, it will
- * trigger a parallel extraction. The function will synchronously return
- * `undefined`, and then will call the provided callback once the extraction
- * results are available.
+ * {@link updateFileInfoExifIfNeeded} has completed, the function will
+ * synchronously return `undefined`, and then later call the provided
+ * {@link observer} once the extraction results are available.
  */
-export const fileInfoExifForItemData = (
-    itemData: ItemData,
-    // cb: (exifData: FileInfoExif) => void,
+export const fileInfoExifForFile = (
+    file: EnteFile,
+    observer: (exifData: FileInfoExif) => void,
 ) => {
-    const exifData = _state.fileInfoExifByFileID.get(itemData.fileID);
+    const fileID = file.id;
+    const exifData = _state.fileInfoExifByFileID.get(fileID);
     if (exifData) return exifData;
 
+    _state.exifObserverByFileID.set(fileID, observer);
     return undefined;
-    // updateFileInfoExifIfNeeded()
 };
 
-//     // TODO(PS): This is a video. Use a placeholder.
-//     return { tags: undefined, parsed: undefined };
-// }
-
-//     const
-// };
-
 /**
  * Update, if needed, the cached Exif data for with the given {@link itemData}.
  *
@@ -412,34 +410,40 @@ export const fileInfoExifForItemData = (
  * If required, it will extract the exif data from the file, massage it to a
  * form suitable for use by {@link FileInfo}, and stash it in its caches.
  *
- *
- *
  * @see {@link forgetExifForItemData}.
  */
 export const updateFileInfoExifIfNeeded = async (itemData: ItemData) => {
     const { fileID, fileType, imageURL } = itemData;
 
+    // We already have it available.
     if (_state.fileInfoExifByFileID.has(fileID)) return;
-    if (fileType === FileType.video) return;
+
+    const updateNotifyAndReturn = (exifData: FileInfoExif) => {
+        _state.fileInfoExifByFileID.set(fileID, exifData);
+        _state.exifObserverByFileID.get(fileID)?.(exifData);
+        return exifData;
+    };
+
+    // For videos, insert a placeholder.
+    if (fileType === FileType.video) {
+        return updateNotifyAndReturn(createPlaceholderFileInfoExif());
+    }
+
+    // This is not a video, but the original image is not available yet.
     if (!imageURL) return;
 
-    let exifData: FileInfoExif;
     try {
         const blob = await (await fetch(imageURL)).blob();
         const file = new File([blob], "");
         const tags = await extractRawExif(file);
         const parsed = parseExif(tags);
-        exifData = { tags, parsed };
+        return updateNotifyAndReturn({ tags, parsed });
     } catch (e) {
         log.error("Failed to extract exif", e);
         // Save the empty placeholder exif corresponding to the file, no point
         // in unnecessarily retrying this, it will deterministically fail again.
-        exifData = createPlaceholderFileInfoExif();
+        return updateNotifyAndReturn(createPlaceholderFileInfoExif());
     }
-
-    _state.fileInfoExifByFileID.set(fileID, exifData);
-
-    return exifData;
 };
 
 const createPlaceholderFileInfoExif = (): FileInfoExif => ({
@@ -450,10 +454,15 @@ const createPlaceholderFileInfoExif = (): FileInfoExif => ({
 /**
  * Clear any cached {@link FileInfoExif} for the given {@link ItemData}.
  */
-export const forgetExifForItemData = ({ fileID }: ItemData) =>
+export const forgetExifForItemData = ({ fileID }: ItemData) => {
     _state.fileInfoExifByFileID.delete(fileID);
+    _state.exifObserverByFileID.delete(fileID);
+};
 
 /**
  * Clear all cached {@link FileInfoExif}.
  */
-export const forgetExif = () => _state.fileInfoExifByFileID.clear();
+export const forgetExif = () => {
+    _state.fileInfoExifByFileID.clear();
+    _state.exifObserverByFileID.clear();
+};

From 13752654cd36faf9b849267b946e96759c425d6b Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 19:59:56 +0530
Subject: [PATCH 294/796] Retain original image URL

---
 .../gallery/components/viewer/data-source.ts  | 19 ++++++++++---------
 web/packages/gallery/services/download.ts     |  4 ++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 2a3cb6aba2..1c27344a0e 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -1,16 +1,13 @@
-/* xeslint-disable */
-// x-@ts-nocheck
-
 import log from "@/base/log";
 import {
     downloadManager,
     type LivePhotoSourceURL,
 } from "@/gallery/services/download";
 import type { EnteFile } from "@/media/file";
+import type { ParsedMetadata } from "@/media/file-metadata";
 import { FileType } from "@/media/file-type";
 import { ensureString } from "@/utils/ensure";
 // TODO(PS):
-import type { ParsedMetadata } from "@/media/file-metadata";
 import {
     extractRawExif,
     parseExif,
@@ -26,11 +23,15 @@ interface PhotoSwipeSlideData {
      * The image URL expected by PhotoSwipe.
      *
      * This is set to the URL of the image that should be shown in the image
-     * viewer component provided by PhotoSwipe. It will be a renderable (i.e.,
-     * possibly converted) object URL obtained from the current "best" image we
-     * have: e.g. if all we have is the thumbnail, then this'll be an renderable
-     * object URL from the thumbnail. Then later when we fetch the original
-     * image, this'll be the renderable object URL derived from the original.
+     * viewer component provided by PhotoSwipe.
+     *
+     * It will be a renderable (i.e., possibly converted) object URL obtained
+     * from the current "best" image we have.
+     *
+     * For example, if all we have is the thumbnail, then this'll be an
+     * renderable object URL obtained from the thumbnail data. Then later when
+     * we fetch the original image, this'll be the renderable object URL derived
+     * from the original. But if it is a video, this will just be cleared.
      */
     src?: string | undefined;
     /**
diff --git a/web/packages/gallery/services/download.ts b/web/packages/gallery/services/download.ts
index 03fa6c2f14..d7eb4dadb7 100644
--- a/web/packages/gallery/services/download.ts
+++ b/web/packages/gallery/services/download.ts
@@ -52,6 +52,7 @@ export interface LoadedLivePhotoSourceURL {
  */
 export interface RenderableSourceURLs {
     url: string | LivePhotoSourceURL | LoadedLivePhotoSourceURL;
+    originalImageURL: string | undefined;
     type: "normal" | "livePhoto";
     /**
      * `true` if there is potential conversion that can still be applied.
@@ -545,6 +546,7 @@ const createRenderableSourceURLs = async (
             : undefined;
 
     let url: RenderableSourceURLs["url"] | undefined;
+    let originalImageURL: RenderableSourceURLs["originalImageURL"] | undefined;
     let type: RenderableSourceURLs["type"] = "normal";
     let mimeType: string | undefined;
     let canForceConvert = false;
@@ -555,6 +557,7 @@ const createRenderableSourceURLs = async (
             const convertedBlob = await renderableImageBlob(fileBlob, fileName);
             const convertedURL = existingOrNewObjectURL(convertedBlob);
             url = convertedURL;
+            originalImageURL = originalFileURL;
             mimeType = convertedBlob.type;
             break;
         }
@@ -591,6 +594,7 @@ const createRenderableSourceURLs = async (
     // @ts-ignore
     return {
         url: url!,
+        originalImageURL,
         type,
         mimeType,
         canForceConvert,

From fcf06cff57861f17064a78f53e09af4d7d619df3 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 20:15:16 +0530
Subject: [PATCH 295/796] Cleanup

---
 .../gallery/components/viewer/FileViewer.tsx  | 15 +++++++++++-
 .../gallery/components/viewer/data-source.ts  | 23 +++++++++++--------
 web/packages/gallery/services/download.ts     |  2 +-
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 837cce4d95..fd2b0ca0a3 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -112,7 +112,20 @@ const FileViewer: React.FC<FileViewerProps> = ({
             pswpRef.current?.closeIfNeeded();
             pswpRef.current = undefined;
         };
-        // TODO(PS): This is missing files, initialIndex, disableDownload,
+        // The hook is missing dependencies; this is intentional - we don't want
+        // to recreate the PhotoSwipe dialog when these dependencies change.
+        //
+        // - Updates to initialIndex can be safely ignored: they don't matter,
+        //   only their initial value at the time of open mattered.
+        //
+        // - Updates to disableDownload are not expected after open. We could've
+        //   also added it to the dependencies array, not adding it was a more
+        //   conservative choice to be on the safer side and trigger too few
+        //   instead of too many updates.
+        //
+        // - Updates to files matter, but these are conveyed separately.
+        //   TODO(PS):
+        //
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [open, onClose, handleViewInfo]);
 
diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 1c27344a0e..9a0415e4bd 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -378,15 +378,16 @@ const withDimensions = (imageURL: string): Promise<Partial<ItemData>> =>
  * as the user swipes through the file viewer, we extract its exif data using
  * {@link updateFileInfoExifIfNeeded}.
  *
- * Then, if the user were to open the file info sidebar for that particular file
- * again, the associated exif data will be returned by this function. Since the
- * happy path is for synchronous use in a React component, this function
- * synchronously returns the cached value (and the callback is never invoked).
+ * Then if the user were to open the file info sidebar for that particular file,
+ * the associated exif data will be returned by this function. Since the happy
+ * path is for synchronous use in a React component, this function synchronously
+ * returns the cached value (and the callback is never invoked).
  *
- * In rare cases, it is possible that this function gets called before
- * {@link updateFileInfoExifIfNeeded} has completed, the function will
- * synchronously return `undefined`, and then later call the provided
- * {@link observer} once the extraction results are available.
+ * The user can open the file info sidebar before the original has been fetched,
+ * so it is possible that this function gets called before
+ * {@link updateFileInfoExifIfNeeded} has completed. In such cases, this
+ * function will synchronously return `undefined`, and then later call the
+ * provided {@link observer} once the extraction results are available.
  */
 export const fileInfoExifForFile = (
     file: EnteFile,
@@ -409,9 +410,11 @@ export const fileInfoExifForFile = (
  * that are made after exif data has already been extracted.
  *
  * If required, it will extract the exif data from the file, massage it to a
- * form suitable for use by {@link FileInfo}, and stash it in its caches.
+ * form suitable for use by {@link FileInfo}, and stash it in its caches, and
+ * notify the most recent observer for that file attached via
+ * {@link fileInfoExifForFile}.
  *
- * @see {@link forgetExifForItemData}.
+ * See also {@link forgetExifForItemData}.
  */
 export const updateFileInfoExifIfNeeded = async (itemData: ItemData) => {
     const { fileID, fileType, imageURL } = itemData;
diff --git a/web/packages/gallery/services/download.ts b/web/packages/gallery/services/download.ts
index d7eb4dadb7..c201928c2a 100644
--- a/web/packages/gallery/services/download.ts
+++ b/web/packages/gallery/services/download.ts
@@ -52,7 +52,7 @@ export interface LoadedLivePhotoSourceURL {
  */
 export interface RenderableSourceURLs {
     url: string | LivePhotoSourceURL | LoadedLivePhotoSourceURL;
-    originalImageURL: string | undefined;
+    originalImageURL?: string | undefined;
     type: "normal" | "livePhoto";
     /**
      * `true` if there is potential conversion that can still be applied.

From 65a5248338599ce9fdd4c92ca229ccfeb41cee5c Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 18 Feb 2025 20:17:50 +0530
Subject: [PATCH 296/796] Revert "Revert "Mainlineable""

This reverts commit d398838742ccc1f68d56f1b29d76a114cffde512.
---
 web/apps/photos/src/pages/_app.tsx                   | 4 ++--
 web/apps/photos/src/styles/global.css                | 3 +--
 web/packages/gallery/components/viewer/photoswipe.ts | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index c2ed6d7c81..009a8c459c 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -51,9 +51,9 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { resumeExportsIfNeeded } from "services/export";
 import { photosLogout } from "services/logout";
 
-// import "photoswipe/dist/photoswipe.css";
+import "photoswipe/dist/photoswipe.css";
 // TODO(PS): Note, auto hide only works with the new CSS.
-import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
+// import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
 
 import "styles/global.css";
 
diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 3eb8dd8d62..aced5adc91 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -12,7 +12,7 @@ body {
     flex-direction: column;
     height: 100%;
 }
-@media DISABLED {
+
 .pswp__button--custom {
     width: 48px;
     height: 48px;
@@ -114,7 +114,6 @@ body {
 .pswp__caption--empty {
     display: none;
 }
-}
 
 .pswp-ente {
     /* The default z-index for PhotoSwipe is 10k, way beyond everything else.
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 9857a758d5..94ce2ed68c 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -31,7 +31,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 let PhotoSwipe;
 if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     // TODO(PS): Comment me before merging into main.
-    PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
+    // PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
 
 type FileViewerPhotoSwipeOptions = FileViewerProps & {

From b14ad92b91fe448a3cd2417197d64dc1de8c99a5 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 08:29:33 +0530
Subject: [PATCH 297/796] Improvements

---
 .../src/components/PhotoViewer/index.tsx      |   8 +-
 web/packages/gallery/components/FileInfo.tsx  | 139 ++++++++++--------
 2 files changed, 81 insertions(+), 66 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index 14fae8f95c..25744354a3 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -993,15 +993,15 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
                 onClose={handleCloseInfo}
                 file={photoSwipe?.currItem as EnteFile}
                 exif={exif?.value}
-                shouldDisableEdits={!isOwnFile}
+                allowEdits={isOwnFile}
                 allowMap={!publicCollectionGalleryContext.credentials}
-                showCollectionChips={
+                showCollections={
                     !isTrashCollection && isOwnFile && !isInHiddenSection
                 }
-                scheduleUpdate={scheduleUpdate}
-                refreshPhotoswipe={refreshPhotoswipe}
                 fileToCollectionsMap={fileToCollectionsMap}
                 collectionNameMap={collectionNameMap}
+                scheduleUpdate={scheduleUpdate}
+                refreshPhotoswipe={refreshPhotoswipe}
                 onSelectCollection={handleSelectCollection}
                 onSelectPerson={handleSelectPerson}
             />
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 2feb22f9fb..4b197d69d2 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -110,21 +110,43 @@ export type FileInfoProps = ModalVisibilityProps & {
      * The file whose information we are showing.
      */
     file: EnteFile | undefined;
+    /**
+     * Exif information for {@link file}.
+     */
     exif: FileInfoExif | undefined;
     /**
-     * TODO: Rename and flip to allowEdits.
+     * If set, then controls to edit the file's metadata (name, date, caption)
+     * will be shown.
      */
-    shouldDisableEdits: boolean;
+    allowEdits?: boolean;
     /**
-     * If `true`, an inline map will be shown (if the user has enabled it) using
-     * the file's location.
+     * If set, then an inline map will be shown (if the user has enabled it)
+     * using the file's location.
      */
-    allowMap: boolean;
+    allowMap?: boolean;
+    /**
+     * If set, then a clickable chip will be shown for each collection that this
+     * file is a part of.
+     *
+     * Uses (and requires) {@link fileToCollectionsMap} and
+     * {@link collectionNameMap}, so both of those props should also be set for
+     * this to have an effect.
+     */
+    showCollections?: boolean;
+    /**
+     * A map from file IDs to the IDs of the collections that they're a part of.
+     *
+     * Used when {@link showCollections} is set.
+     */
+    fileToCollectionsMap?: Map<number, number[]>;
+    /**
+     * A map from collection IDs to their name.
+     *
+     * Used when {@link showCollections} is set.
+     */
+    collectionNameMap?: Map<number, string>;
     scheduleUpdate: () => void;
     refreshPhotoswipe: () => void;
-    fileToCollectionsMap?: Map<number, number[]>;
-    collectionNameMap?: Map<number, string>;
-    showCollectionChips: boolean;
     /**
      * Called when the user selects a collection from among the collections that
      * the file belongs to.
@@ -140,14 +162,14 @@ export const FileInfo: React.FC<FileInfoProps> = ({
     open,
     onClose,
     file,
-    shouldDisableEdits,
-    allowMap,
     exif,
-    scheduleUpdate,
-    refreshPhotoswipe,
+    allowEdits,
+    allowMap,
+    showCollections,
     fileToCollectionsMap,
     collectionNameMap,
-    showCollectionChips,
+    scheduleUpdate,
+    refreshPhotoswipe,
     onSelectCollection,
     onSelectPerson,
 }) => {
@@ -187,10 +209,6 @@ export const FileInfo: React.FC<FileInfoProps> = ({
         setExifInfo(parseExifInfo(exif));
     }, [exif]);
 
-    if (!file) {
-        return <></>;
-    }
-
     const openEnableMapConfirmationDialog = () =>
         showMiniDialog(
             confirmEnableMapsDialogAttributes(() => updateMapEnabled(true)),
@@ -204,31 +222,25 @@ export const FileInfo: React.FC<FileInfoProps> = ({
     const handleSelectFace = ({ personID }: AnnotatedFaceID) =>
         onSelectPerson?.(personID);
 
+    if (!file) {
+        return <></>;
+    }
+
     return (
         <FileInfoSidebar open={open} onClose={onClose}>
             <Titlebar onClose={onClose} title={t("info")} backIsClose />
             <Stack sx={{ pt: 1, pb: 3, gap: "20px" }}>
-                <RenderCaption
+                <Caption
                     {...{
                         file,
-                        shouldDisableEdits,
+                        allowEdits,
                         scheduleUpdate,
                         refreshPhotoswipe,
                     }}
                 />
 
-                <CreationTime
-                    {...{ file, shouldDisableEdits, scheduleUpdate }}
-                />
-
-                <RenderFileName
-                    {...{
-                        file,
-                        exifInfo: exifInfo,
-                        shouldDisableEdits,
-                        scheduleUpdate,
-                    }}
-                />
+                <CreationTime {...{ file, allowEdits, scheduleUpdate }} />
+                <FileName {...{ file, exifInfo, allowEdits, scheduleUpdate }} />
 
                 {exifInfo?.takenOnDevice && (
                     <InfoItem
@@ -307,7 +319,7 @@ export const FileInfo: React.FC<FileInfoProps> = ({
                         />
                     </InfoItem>
                 )}
-                {showCollectionChips && collectionNameMap && (
+                {showCollections && collectionNameMap && (
                     <InfoItem icon={<FolderOutlinedIcon />}>
                         <Stack
                             direction="row"
@@ -517,24 +529,26 @@ const EditButton: React.FC<EditButtonProps> = ({ onClick, loading }) => (
     </IconButton>
 );
 
-interface RenderCaptionFormValues {
+interface CaptionFormValues {
     caption: string;
 }
 
-function RenderCaption({
-    file,
-    scheduleUpdate,
-    refreshPhotoswipe,
-    shouldDisableEdits,
-}: {
-    shouldDisableEdits: boolean;
-    /* TODO: This is DisplayFile, but that's meant to be deprecated */
+type CaptionProps = Pick<
+    FileInfoProps,
+    "allowEdits" | "scheduleUpdate" | "refreshPhotoswipe"
+> & {
+    /* TODO(PS): This is DisplayFile, but that's meant to be removed */
     file: EnteFile & {
         title?: string;
     };
-    scheduleUpdate: () => void;
-    refreshPhotoswipe: () => void;
-}) {
+};
+
+const Caption: React.FC<CaptionProps> = ({
+    file,
+    allowEdits,
+    scheduleUpdate,
+    refreshPhotoswipe,
+}) => {
     const [caption, setCaption] = useState(
         file?.pubMagicMetadata?.data.caption,
     );
@@ -561,7 +575,7 @@ function RenderCaption({
         }
     };
 
-    const onSubmit = async (values: RenderCaptionFormValues) => {
+    const onSubmit = async (values: CaptionFormValues) => {
         try {
             setLoading(true);
             await saveEdits(values.caption);
@@ -569,12 +583,14 @@ function RenderCaption({
             setLoading(false);
         }
     };
-    if (!caption?.length && shouldDisableEdits) {
+
+    if (!caption?.length && !allowEdits) {
         return <></>;
     }
+
     return (
         <Box sx={{ p: 1 }}>
-            <Formik<RenderCaptionFormValues>
+            <Formik<CaptionFormValues>
                 // @ts-ignore
                 initialValues={{ caption }}
                 validationSchema={Yup.object().shape({
@@ -606,7 +622,7 @@ function RenderCaption({
                             onChange={handleChange("caption")}
                             error={Boolean(errors.caption)}
                             helperText={errors.caption}
-                            disabled={loading || shouldDisableEdits}
+                            disabled={!allowEdits || loading}
                         />
                         {values.caption !== caption && (
                             <FlexWrapper justifyContent={"flex-end"}>
@@ -638,17 +654,18 @@ function RenderCaption({
             </Formik>
         </Box>
     );
-}
+};
 
-interface CreationTimeProps {
+type CreationTimeProps = Pick<
+    FileInfoProps,
+    "allowEdits" | "scheduleUpdate"
+> & {
     file: EnteFile;
-    shouldDisableEdits: boolean;
-    scheduleUpdate: () => void;
-}
+};
 
 const CreationTime: React.FC<CreationTimeProps> = ({
     file,
-    shouldDisableEdits,
+    allowEdits,
     scheduleUpdate,
 }) => {
     const [loading, setLoading] = useState(false);
@@ -706,7 +723,7 @@ const CreationTime: React.FC<CreationTimeProps> = ({
                     title={formatDate(originalDate)}
                     caption={formatTime(originalDate)}
                     trailingButton={
-                        shouldDisableEdits || (
+                        allowEdits && (
                             <EditButton
                                 onClick={openEditMode}
                                 loading={loading}
@@ -727,17 +744,15 @@ const CreationTime: React.FC<CreationTimeProps> = ({
     );
 };
 
-interface RenderFileNameProps {
+type FileNameProps = Pick<FileInfoProps, "allowEdits" | "scheduleUpdate"> & {
     file: EnteFile;
-    shouldDisableEdits: boolean;
     exifInfo: ExifInfo | undefined;
-    scheduleUpdate: () => void;
-}
+};
 
-const RenderFileName: React.FC<RenderFileNameProps> = ({
+const FileName: React.FC<FileNameProps> = ({
     file,
-    shouldDisableEdits,
     exifInfo,
+    allowEdits,
     scheduleUpdate,
 }) => {
     const [isInEditMode, setIsInEditMode] = useState(false);
@@ -778,7 +793,7 @@ const RenderFileName: React.FC<RenderFileNameProps> = ({
                 title={[fileName, extension].join(".")}
                 caption={getCaption(file, exifInfo)}
                 trailingButton={
-                    shouldDisableEdits || <EditButton onClick={openEditMode} />
+                    allowEdits && <EditButton onClick={openEditMode} />
                 }
             />
             <FileNameEditDialog

From 38a31b749232c1de5017b22c535ee74cfec216cf Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 08:32:33 +0530
Subject: [PATCH 298/796] 5s

---
 web/packages/gallery/components/viewer/photoswipe.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 94ce2ed68c..85d9b21fdc 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -400,7 +400,7 @@ export class FileViewerPhotoSwipe {
     private autoHideIfInactive() {
         if (this.lastActivityDate == "already-hidden") return;
         if (this.lastActivityDate == "auto-hidden") return;
-        if (Date.now() - this.lastActivityDate.getTime() > 3000) {
+        if (Date.now() - this.lastActivityDate.getTime() > 5000 /* 5s */) {
             if (this.areUIControlsVisible()) {
                 this.hideUIControlsIfNotFocused();
                 this.lastActivityDate = "auto-hidden";

From 149196e7dd4ece6556976e8ab056317c9dc60f14 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 08:45:38 +0530
Subject: [PATCH 299/796] Rename

---
 web/apps/photos/src/pages/gallery.tsx                 |  4 ++--
 web/packages/new/photos/components/gallery/reducer.ts | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 0956a25690..afe799e483 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -1103,7 +1103,7 @@ const Page: React.FC = () => {
                         activePersonID={activePerson?.id}
                         enableDownload={true}
                         fileToCollectionsMap={state.fileCollectionIDs}
-                        collectionNameMap={state.allCollectionNameByID}
+                        collectionNameMap={state.allCollectionsNameByID}
                         showAppDownloadBanner={
                             files.length < 30 && !isInSearchMode
                         }
@@ -1119,7 +1119,7 @@ const Page: React.FC = () => {
                 )}
                 <Export
                     {...exportVisibilityProps}
-                    collectionNameMap={state.allCollectionNameByID}
+                    collectionNameMap={state.allCollectionsNameByID}
                 />
                 <AuthenticateUserModal
                     open={authenticateUserModalView}
diff --git a/web/packages/new/photos/components/gallery/reducer.ts b/web/packages/new/photos/components/gallery/reducer.ts
index 8c4f9c3b27..174297859e 100644
--- a/web/packages/new/photos/components/gallery/reducer.ts
+++ b/web/packages/new/photos/components/gallery/reducer.ts
@@ -200,7 +200,7 @@ export interface GalleryState {
      * This map will contain entries for all (both normal and hidden)
      * collections.
      */
-    allCollectionNameByID: Map<number, string>;
+    allCollectionsNameByID: Map<number, string>;
     /**
      * A list of collection IDs to which a file belongs, indexed by file ID.
      */
@@ -420,7 +420,7 @@ const initialGalleryState: GalleryState = {
     hiddenFileIDs: new Set(),
     archivedFileIDs: new Set(),
     favoriteFileIDs: new Set(),
-    allCollectionNameByID: new Map(),
+    allCollectionsNameByID: new Map(),
     fileCollectionIDs: new Map(),
     collectionSummaries: new Map(),
     hiddenCollectionSummaries: new Map(),
@@ -481,7 +481,7 @@ const galleryReducer: React.Reducer<GalleryState, GalleryAction> = (
                     action.files,
                     state.unsyncedFavoriteUpdates,
                 ),
-                allCollectionNameByID: createCollectionNameByID(
+                allCollectionsNameByID: createCollectionNameByID(
                     action.allCollections,
                 ),
                 fileCollectionIDs: createFileCollectionIDs(action.files),
@@ -539,7 +539,7 @@ const galleryReducer: React.Reducer<GalleryState, GalleryAction> = (
                     state.files,
                     state.unsyncedFavoriteUpdates,
                 ),
-                allCollectionNameByID: createCollectionNameByID(
+                allCollectionsNameByID: createCollectionNameByID(
                     collections.concat(state.hiddenCollections),
                 ),
                 collectionSummaries,
@@ -608,7 +608,7 @@ const galleryReducer: React.Reducer<GalleryState, GalleryAction> = (
                     state.files,
                     state.unsyncedFavoriteUpdates,
                 ),
-                allCollectionNameByID: createCollectionNameByID(
+                allCollectionsNameByID: createCollectionNameByID(
                     collections.concat(hiddenCollections),
                 ),
                 collectionSummaries,

From 1eaaafb8df3107c05a17128b729a617a429ff064 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 08:58:25 +0530
Subject: [PATCH 300/796] Ditto

---
 web/apps/photos/src/components/Export.tsx     | 12 +--
 .../photos/src/components/ExportFinished.tsx  |  4 +-
 .../src/components/ExportPendingList.tsx      |  6 +-
 web/apps/photos/src/components/PhotoFrame.tsx | 12 +--
 .../src/components/PhotoViewer/index.tsx      | 12 +--
 web/apps/photos/src/pages/gallery.tsx         |  6 +-
 web/apps/photos/src/pages/shared-albums.tsx   |  4 +-
 web/apps/photos/src/utils/collection.ts       |  8 --
 web/packages/gallery/components/FileInfo.tsx  | 78 ++++++++++---------
 .../new/photos/components/gallery/reducer.ts  |  7 +-
 10 files changed, 72 insertions(+), 77 deletions(-)

diff --git a/web/apps/photos/src/components/Export.tsx b/web/apps/photos/src/components/Export.tsx
index a3feaae4af..b245a33d1e 100644
--- a/web/apps/photos/src/components/Export.tsx
+++ b/web/apps/photos/src/components/Export.tsx
@@ -42,13 +42,13 @@ import ExportInProgress from "./ExportInProgress";
 import ExportInit from "./ExportInit";
 
 type ExportProps = ModalVisibilityProps & {
-    collectionNameMap: Map<number, string>;
+    allCollectionsNameByID: Map<number, string>;
 };
 
 export const Export: React.FC<ExportProps> = ({
     open,
     onClose,
-    collectionNameMap,
+    allCollectionsNameByID,
 }) => {
     const { showMiniDialog } = useBaseContext();
     const [exportStage, setExportStage] = useState(ExportStage.INIT);
@@ -202,7 +202,7 @@ export const Export: React.FC<ExportProps> = ({
                 lastExportTime={lastExportTime}
                 exportProgress={exportProgress}
                 pendingExports={pendingExports}
-                collectionNameMap={collectionNameMap}
+                allCollectionsNameByID={allCollectionsNameByID}
             />
         </Dialog>
     );
@@ -291,7 +291,7 @@ const ExportDynamicContent = ({
     lastExportTime,
     exportProgress,
     pendingExports,
-    collectionNameMap,
+    allCollectionsNameByID,
 }: {
     exportStage: ExportStage;
     startExport: (opts?: ExportOpts) => void;
@@ -300,7 +300,7 @@ const ExportDynamicContent = ({
     lastExportTime: number;
     exportProgress: ExportProgress;
     pendingExports: EnteFile[];
-    collectionNameMap: Map<number, string>;
+    allCollectionsNameByID: Map<number, string>;
 }) => {
     switch (exportStage) {
         case ExportStage.INIT:
@@ -326,7 +326,7 @@ const ExportDynamicContent = ({
                     onHide={onHide}
                     lastExportTime={lastExportTime}
                     pendingExports={pendingExports}
-                    collectionNameMap={collectionNameMap}
+                    allCollectionsNameByID={allCollectionsNameByID}
                     onResync={() => startExport({ resync: true })}
                 />
             );
diff --git a/web/apps/photos/src/components/ExportFinished.tsx b/web/apps/photos/src/components/ExportFinished.tsx
index 3f13a8c2a5..9b1507c6a8 100644
--- a/web/apps/photos/src/components/ExportFinished.tsx
+++ b/web/apps/photos/src/components/ExportFinished.tsx
@@ -11,7 +11,7 @@ import ExportPendingList from "./ExportPendingList";
 
 interface Props {
     pendingExports: EnteFile[];
-    collectionNameMap: Map<number, string>;
+    allCollectionsNameByID: Map<number, string>;
     onHide: () => void;
     lastExportTime: number;
     /** Called when the user presses the "Resync" button. */
@@ -73,7 +73,7 @@ export default function ExportFinished(props: Props) {
             </DialogActions>
             <ExportPendingList
                 pendingExports={props.pendingExports}
-                collectionNameMap={props.collectionNameMap}
+                allCollectionsNameByID={props.allCollectionsNameByID}
                 isOpen={pendingFileListView}
                 onClose={closePendingFileList}
             />
diff --git a/web/apps/photos/src/components/ExportPendingList.tsx b/web/apps/photos/src/components/ExportPendingList.tsx
index c9e87afca8..4433330665 100644
--- a/web/apps/photos/src/components/ExportPendingList.tsx
+++ b/web/apps/photos/src/components/ExportPendingList.tsx
@@ -10,7 +10,7 @@ import { t } from "i18next";
 interface Iprops {
     isOpen: boolean;
     onClose: () => void;
-    collectionNameMap: Map<number, string>;
+    allCollectionsNameByID: Map<number, string>;
     pendingExports: EnteFile[];
 }
 
@@ -36,7 +36,7 @@ const ExportPendingList = (props: Iprops) => {
                     />
                 </Box>
                 <ItemContainer>
-                    {`${props.collectionNameMap.get(file.collectionID)} / ${
+                    {`${props.allCollectionsNameByID.get(file.collectionID)} / ${
                         file.metadata.title
                     }`}
                 </ItemContainer>
@@ -45,7 +45,7 @@ const ExportPendingList = (props: Iprops) => {
     };
 
     const getItemTitle = (file: EnteFile) => {
-        return `${props.collectionNameMap.get(file.collectionID)} / ${
+        return `${props.allCollectionsNameByID.get(file.collectionID)} / ${
             file.metadata.title
         }`;
     };
diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 7cd68255ab..8b914da1a9 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -112,8 +112,8 @@ export interface PhotoFrameProps {
     /** This will be set if mode is "people". */
     activePersonID?: string | undefined;
     enableDownload?: boolean;
-    fileToCollectionsMap?: Map<number, number[]>;
-    collectionNameMap?: Map<number, string>;
+    fileCollectionIDs?: Map<number, number[]>;
+    allCollectionsNameByID?: Map<number, string>;
     showAppDownloadBanner?: boolean;
     setIsPhotoSwipeOpen?: (value: boolean) => void;
     isInHiddenSection?: boolean;
@@ -138,8 +138,8 @@ const PhotoFrame = ({
     activeCollectionID,
     activePersonID,
     enableDownload,
-    fileToCollectionsMap,
-    collectionNameMap,
+    fileCollectionIDs,
+    allCollectionsNameByID,
     showAppDownloadBanner,
     setIsPhotoSwipeOpen,
     isInHiddenSection,
@@ -555,8 +555,8 @@ const PhotoFrame = ({
                     favoriteFileIDs,
                     markUnsyncedFavoriteUpdate,
                     markTempDeleted,
-                    collectionNameMap,
-                    fileToCollectionsMap,
+                    allCollectionsNameByID,
+                    fileCollectionIDs,
                     setFilesDownloadProgressAttributesCreator,
                     onSelectPerson,
                 }}
diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index 25744354a3..4f7bc0d348 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -102,8 +102,8 @@ export type PhotoViewerProps = Pick<
     isInHiddenSection: boolean;
     enableDownload: boolean;
     setFilesDownloadProgressAttributesCreator: SetFilesDownloadProgressAttributesCreator;
-    fileToCollectionsMap?: Map<number, number[]>;
-    collectionNameMap?: Map<number, string>;
+    fileCollectionIDs?: Map<number, number[]>;
+    allCollectionsNameByID?: Map<number, string>;
     onSelectPerson?: FileInfoProps["onSelectPerson"];
 };
 
@@ -136,8 +136,8 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
     isInHiddenSection,
     enableDownload,
     setFilesDownloadProgressAttributesCreator,
-    fileToCollectionsMap,
-    collectionNameMap,
+    fileCollectionIDs,
+    allCollectionsNameByID,
     onSelectPerson,
 }) => {
     const { showLoadingBar, hideLoadingBar } = usePhotosAppContext();
@@ -998,8 +998,8 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
                 showCollections={
                     !isTrashCollection && isOwnFile && !isInHiddenSection
                 }
-                fileToCollectionsMap={fileToCollectionsMap}
-                collectionNameMap={collectionNameMap}
+                fileCollectionIDs={fileCollectionIDs}
+                allCollectionsNameByID={allCollectionsNameByID}
                 scheduleUpdate={scheduleUpdate}
                 refreshPhotoswipe={refreshPhotoswipe}
                 onSelectCollection={handleSelectCollection}
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index afe799e483..2a1f26368f 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -1102,8 +1102,8 @@ const Page: React.FC = () => {
                         activeCollectionID={activeCollectionID}
                         activePersonID={activePerson?.id}
                         enableDownload={true}
-                        fileToCollectionsMap={state.fileCollectionIDs}
-                        collectionNameMap={state.allCollectionsNameByID}
+                        fileCollectionIDs={state.fileCollectionIDs}
+                        allCollectionsNameByID={state.allCollectionsNameByID}
                         showAppDownloadBanner={
                             files.length < 30 && !isInSearchMode
                         }
@@ -1119,7 +1119,7 @@ const Page: React.FC = () => {
                 )}
                 <Export
                     {...exportVisibilityProps}
-                    collectionNameMap={state.allCollectionsNameByID}
+                    allCollectionsNameByID={state.allCollectionsNameByID}
                 />
                 <AuthenticateUserModal
                     open={authenticateUserModalView}
diff --git a/web/apps/photos/src/pages/shared-albums.tsx b/web/apps/photos/src/pages/shared-albums.tsx
index 856c230a59..6f4b666c6f 100644
--- a/web/apps/photos/src/pages/shared-albums.tsx
+++ b/web/apps/photos/src/pages/shared-albums.tsx
@@ -548,8 +548,8 @@ export default function PublicCollectionGallery() {
                     selected={selected}
                     activeCollectionID={ALL_SECTION}
                     enableDownload={downloadEnabled}
-                    fileToCollectionsMap={undefined}
-                    collectionNameMap={undefined}
+                    fileCollectionIDs={undefined}
+                    allCollectionsNameByID={undefined}
                     setFilesDownloadProgressAttributesCreator={
                         setFilesDownloadProgressAttributesCreator
                     }
diff --git a/web/apps/photos/src/utils/collection.ts b/web/apps/photos/src/utils/collection.ts
index aa46ab4a88..2cf35df026 100644
--- a/web/apps/photos/src/utils/collection.ts
+++ b/web/apps/photos/src/utils/collection.ts
@@ -348,14 +348,6 @@ export function isValidReplacementAlbum(
     );
 }
 
-export function getCollectionNameMap(
-    collections: Collection[],
-): Map<number, string> {
-    return new Map<number, string>(
-        collections.map((collection) => [collection.id, collection.name]),
-    );
-}
-
 export const getOrCreateAlbum = async (
     albumName: string,
     existingCollections: Collection[],
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 4b197d69d2..cbfcce934a 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -128,9 +128,8 @@ export type FileInfoProps = ModalVisibilityProps & {
      * If set, then a clickable chip will be shown for each collection that this
      * file is a part of.
      *
-     * Uses (and requires) {@link fileToCollectionsMap} and
-     * {@link collectionNameMap}, so both of those props should also be set for
-     * this to have an effect.
+     * Uses {@link fileCollectionIDs} and {@link allCollectionsNameByID}, so
+     * both of those props should also be set for this to have an effect.
      */
     showCollections?: boolean;
     /**
@@ -138,13 +137,13 @@ export type FileInfoProps = ModalVisibilityProps & {
      *
      * Used when {@link showCollections} is set.
      */
-    fileToCollectionsMap?: Map<number, number[]>;
+    fileCollectionIDs?: Map<number, number[]>;
     /**
      * A map from collection IDs to their name.
      *
      * Used when {@link showCollections} is set.
      */
-    collectionNameMap?: Map<number, string>;
+    allCollectionsNameByID?: Map<number, string>;
     scheduleUpdate: () => void;
     refreshPhotoswipe: () => void;
     /**
@@ -166,8 +165,8 @@ export const FileInfo: React.FC<FileInfoProps> = ({
     allowEdits,
     allowMap,
     showCollections,
-    fileToCollectionsMap,
-    collectionNameMap,
+    fileCollectionIDs,
+    allCollectionsNameByID,
     scheduleUpdate,
     refreshPhotoswipe,
     onSelectCollection,
@@ -238,7 +237,6 @@ export const FileInfo: React.FC<FileInfoProps> = ({
                         refreshPhotoswipe,
                     }}
                 />
-
                 <CreationTime {...{ file, allowEdits, scheduleUpdate }} />
                 <FileName {...{ file, exifInfo, allowEdits, scheduleUpdate }} />
 
@@ -319,35 +317,41 @@ export const FileInfo: React.FC<FileInfoProps> = ({
                         />
                     </InfoItem>
                 )}
-                {showCollections && collectionNameMap && (
-                    <InfoItem icon={<FolderOutlinedIcon />}>
-                        <Stack
-                            direction="row"
-                            sx={{
-                                gap: 1,
-                                flexWrap: "wrap",
-                                justifyContent: "flex-start",
-                                alignItems: "flex-start",
-                            }}
-                        >
-                            {fileToCollectionsMap
-                                ?.get(file.id)
-                                ?.filter((collectionID) =>
-                                    collectionNameMap.has(collectionID),
-                                )
-                                ?.map((collectionID) => (
-                                    <ChipButton
-                                        key={collectionID}
-                                        onClick={() =>
-                                            onSelectCollection(collectionID)
-                                        }
-                                    >
-                                        {collectionNameMap.get(collectionID)}
-                                    </ChipButton>
-                                ))}
-                        </Stack>
-                    </InfoItem>
-                )}
+                {showCollections &&
+                    fileCollectionIDs &&
+                    allCollectionsNameByID && (
+                        <InfoItem icon={<FolderOutlinedIcon />}>
+                            <Stack
+                                direction="row"
+                                sx={{
+                                    gap: 1,
+                                    flexWrap: "wrap",
+                                    justifyContent: "flex-start",
+                                    alignItems: "flex-start",
+                                }}
+                            >
+                                {fileCollectionIDs
+                                    .get(file.id)
+                                    ?.filter((collectionID) =>
+                                        allCollectionsNameByID.has(
+                                            collectionID,
+                                        ),
+                                    )
+                                    ?.map((collectionID) => (
+                                        <ChipButton
+                                            key={collectionID}
+                                            onClick={() =>
+                                                onSelectCollection(collectionID)
+                                            }
+                                        >
+                                            {allCollectionsNameByID.get(
+                                                collectionID,
+                                            )}
+                                        </ChipButton>
+                                    ))}
+                            </Stack>
+                        </InfoItem>
+                    )}
             </Stack>
             <RawExif
                 {...rawExifVisibilityProps}
diff --git a/web/packages/new/photos/components/gallery/reducer.ts b/web/packages/new/photos/components/gallery/reducer.ts
index 174297859e..adc044d672 100644
--- a/web/packages/new/photos/components/gallery/reducer.ts
+++ b/web/packages/new/photos/components/gallery/reducer.ts
@@ -195,14 +195,13 @@ export interface GalleryState {
      */
     favoriteFileIDs: Set<number>;
     /**
-     * User visible collection names indexed by collection IDs for fast lookup.
+     * A map from collection IDs to their user visible name.
      *
-     * This map will contain entries for all (both normal and hidden)
-     * collections.
+     * It will contain entries for all collections (both normal and hidden).
      */
     allCollectionsNameByID: Map<number, string>;
     /**
-     * A list of collection IDs to which a file belongs, indexed by file ID.
+     * A map from file IDs to the IDs of the collections that they're a part of.
      */
     fileCollectionIDs: Map<number, number[]>;
 

From 8544f5e109fa220ec66fd7c6999f4e268fccd317 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 09:30:19 +0530
Subject: [PATCH 301/796] Fixes

---
 web/packages/gallery/components/FileInfo.tsx | 113 +++++++++----------
 1 file changed, 53 insertions(+), 60 deletions(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index cbfcce934a..96d5b332b2 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-/* eslint-disable @typescript-eslint/no-unnecessary-condition */
 /* eslint-disable @typescript-eslint/no-unused-expressions */
 /* TODO: Audit this file
 Plan of action:
@@ -176,38 +175,33 @@ export const FileInfo: React.FC<FileInfoProps> = ({
 
     const { mapEnabled } = useSettingsSnapshot();
 
-    const [exifInfo, setExifInfo] = useState<ExifInfo | undefined>();
-    const { show: showRawExif, props: rawExifVisibilityProps } =
-        useModalVisibility();
     const [annotatedFaces, setAnnotatedFaces] = useState<AnnotatedFaceID[]>([]);
 
-    const location = useMemo(() => {
-        if (file) {
-            const location = fileLocation(file);
-            if (location) return location;
-        }
-        return exif?.parsed?.location;
-    }, [file, exif]);
+    const { show: showRawExif, props: rawExifVisibilityProps } =
+        useModalVisibility();
+
+    const location = useMemo(
+        // Prefer the location in the EnteFile, then fall back to Exif.
+        () => (file ? fileLocation(file) : undefined) ?? exif?.parsed?.location,
+        [file, exif],
+    );
+
+    const annotatedExif = useMemo(() => annotateExif(exif), [exif]);
 
     useEffect(() => {
         if (!file) return;
 
         let didCancel = false;
 
-        void (async () => {
-            const result = await getAnnotatedFacesForFile(file);
-            !didCancel && setAnnotatedFaces(result);
-        })();
+        void getAnnotatedFacesForFile(file).then(
+            (faces) => !didCancel && setAnnotatedFaces(faces),
+        );
 
         return () => {
             didCancel = true;
         };
     }, [file]);
 
-    useEffect(() => {
-        setExifInfo(parseExifInfo(exif));
-    }, [exif]);
-
     const openEnableMapConfirmationDialog = () =>
         showMiniDialog(
             confirmEnableMapsDialogAttributes(() => updateMapEnabled(true)),
@@ -238,15 +232,20 @@ export const FileInfo: React.FC<FileInfoProps> = ({
                     }}
                 />
                 <CreationTime {...{ file, allowEdits, scheduleUpdate }} />
-                <FileName {...{ file, exifInfo, allowEdits, scheduleUpdate }} />
+                <FileName
+                    {...{
+                        file,
+                        exifInfo: annotatedExif,
+                        allowEdits,
+                        scheduleUpdate,
+                    }}
+                />
 
-                {exifInfo?.takenOnDevice && (
+                {annotatedExif?.takenOnDevice && (
                     <InfoItem
                         icon={<CameraOutlinedIcon />}
-                        title={exifInfo?.takenOnDevice}
-                        caption={
-                            <BasicDeviceCamera {...{ parsedExif: exifInfo }} />
-                        }
+                        title={annotatedExif.takenOnDevice}
+                        caption={<BasicDeviceCamera {...{ annotatedExif }} />}
                     />
                 )}
 
@@ -337,7 +336,7 @@ export const FileInfo: React.FC<FileInfoProps> = ({
                                             collectionID,
                                         ),
                                     )
-                                    ?.map((collectionID) => (
+                                    .map((collectionID) => (
                                         <ChipButton
                                             key={collectionID}
                                             onClick={() =>
@@ -367,7 +366,7 @@ export const FileInfo: React.FC<FileInfoProps> = ({
  * Some immediate fields of interest, in the form that we want to display on the
  * info panel for a file.
  */
-type ExifInfo = Required<FileInfoExif> & {
+type AnnotatedExif = Required<FileInfoExif> & {
     resolution?: string;
     megaPixels?: string;
     takenOnDevice?: string;
@@ -376,13 +375,13 @@ type ExifInfo = Required<FileInfoExif> & {
     iso?: string;
 };
 
-const parseExifInfo = (
+const annotateExif = (
     fileInfoExif: FileInfoExif | undefined,
-): ExifInfo | undefined => {
+): AnnotatedExif | undefined => {
     if (!fileInfoExif || !fileInfoExif.tags || !fileInfoExif.parsed)
         return undefined;
 
-    const info: ExifInfo = { ...fileInfoExif };
+    const info: AnnotatedExif = { ...fileInfoExif };
 
     const { width, height } = fileInfoExif.parsed;
     if (width && height) {
@@ -407,6 +406,7 @@ const parseExifInfo = (
         if (exif.ISOSpeedRatings)
             info.iso = `ISO${tagNumericValue(exif.ISOSpeedRatings)}`;
     }
+
     return info;
 };
 
@@ -553,27 +553,23 @@ const Caption: React.FC<CaptionProps> = ({
     scheduleUpdate,
     refreshPhotoswipe,
 }) => {
-    const [caption, setCaption] = useState(
-        file?.pubMagicMetadata?.data.caption,
-    );
+    const [caption, setCaption] = useState(file.pubMagicMetadata?.data.caption);
 
     const [loading, setLoading] = useState(false);
 
     const saveEdits = async (newCaption: string) => {
         try {
-            if (file) {
-                if (caption === newCaption) {
-                    return;
-                }
-                setCaption(newCaption);
-
-                const updatedFile = await changeCaption(file, newCaption);
-                updateExistingFilePubMetadata(file, updatedFile);
-                // @ts-ignore
-                file.title = file.pubMagicMetadata.data.caption;
-                refreshPhotoswipe();
-                scheduleUpdate();
+            if (caption === newCaption) {
+                return;
             }
+            setCaption(newCaption);
+
+            const updatedFile = await changeCaption(file, newCaption);
+            updateExistingFilePubMetadata(file, updatedFile);
+            // @ts-ignore
+            file.title = file.pubMagicMetadata.data.caption;
+            refreshPhotoswipe();
+            scheduleUpdate();
         } catch (e) {
             log.error("failed to update caption", e);
         }
@@ -684,7 +680,7 @@ const CreationTime: React.FC<CreationTimeProps> = ({
     const saveEdits = async (pickedTime: ParsedMetadataDate) => {
         try {
             setLoading(true);
-            if (isInEditMode && file) {
+            if (isInEditMode) {
                 // [Note: Don't modify offsetTime when editing date via picker]
                 //
                 // Use the updated date time (both in its canonical dateTime
@@ -750,7 +746,7 @@ const CreationTime: React.FC<CreationTimeProps> = ({
 
 type FileNameProps = Pick<FileInfoProps, "allowEdits" | "scheduleUpdate"> & {
     file: EnteFile;
-    exifInfo: ExifInfo | undefined;
+    exifInfo: AnnotatedExif | undefined;
 };
 
 const FileName: React.FC<FileNameProps> = ({
@@ -772,7 +768,6 @@ const FileName: React.FC<FileNameProps> = ({
     }, [file]);
 
     const saveEdits = async (newFilename: string) => {
-        if (!file) return;
         if (fileName === newFilename) {
             closeEditMode();
             return;
@@ -811,7 +806,7 @@ const FileName: React.FC<FileNameProps> = ({
     );
 };
 
-const getCaption = (file: EnteFile, exifInfo: ExifInfo | undefined) => {
+const getCaption = (file: EnteFile, exifInfo: AnnotatedExif | undefined) => {
     const megaPixels = exifInfo?.megaPixels;
     const resolution = exifInfo?.resolution;
     const fileSize = file.info?.fileSize;
@@ -883,17 +878,15 @@ const FileNameEditDialog: React.FC<FileNameEditDialogProps> = ({
     );
 };
 
-const BasicDeviceCamera: React.FC<{ parsedExif: ExifInfo }> = ({
-    parsedExif,
-}) => {
-    return (
-        <FlexWrapper gap={1}>
-            <Box>{parsedExif.fNumber}</Box>
-            <Box>{parsedExif.exposureTime}</Box>
-            <Box>{parsedExif.iso}</Box>
-        </FlexWrapper>
-    );
-};
+const BasicDeviceCamera: React.FC<{ annotatedExif: AnnotatedExif }> = ({
+    annotatedExif,
+}) => (
+    <Stack direction="row" sx={{ gap: 1 }}>
+        <Box>{annotatedExif.fNumber}</Box>
+        <Box>{annotatedExif.exposureTime}</Box>
+        <Box>{annotatedExif.iso}</Box>
+    </Stack>
+);
 
 const openStreetMapLink = ({ latitude, longitude }: Location) =>
     `https://www.openstreetmap.org/?mlat=${latitude}&mlon=${longitude}#map=15/${latitude}/${longitude}`;

From 239f08b516fe42f6ddcc8e4358a17ca7946685d7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 09:32:23 +0530
Subject: [PATCH 302/796] Fixes

---
 web/packages/gallery/components/FileInfo.tsx | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 96d5b332b2..b85bf6f94d 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -1,6 +1,4 @@
-/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-/* eslint-disable @typescript-eslint/no-unused-expressions */
 /* TODO: Audit this file
 Plan of action:
 - Move common components into FileInfoComponents.tsx
@@ -8,7 +6,6 @@ Plan of action:
 - Move the rest out to files in the apps themeselves: albums/SharedFileInfo
   and photos/FileInfo to deal with the @/new/photos imports here.
 */
-/* @ts-nocheck */
 
 import { LinkButtonUndecorated } from "@/base/components/LinkButton";
 import { TitledMiniDialog } from "@/base/components/MiniDialog";
@@ -97,7 +94,7 @@ import type { FileInfoExif } from "./viewer/data-source";
 // Re-uses images from ~leaflet package.
 import "leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css";
 import "leaflet/dist/leaflet.css";
-// eslint-disable-next-line @typescript-eslint/no-require-imports
+// eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-unused-expressions
 haveWindow() && require("leaflet-defaulticon-compatibility");
 const leaflet = haveWindow()
     ? // eslint-disable-next-line @typescript-eslint/no-require-imports
@@ -482,9 +479,7 @@ const InfoItem: React.FC<React.PropsWithChildren<InfoItemProps>> = ({
     >
         <InfoItemIconContainer>{icon}</InfoItemIconContainer>
         <Box sx={{ flex: 1, mt: "4px" }}>
-            {children ? (
-                children
-            ) : (
+            {children ?? (
                 <>
                     <Typography sx={{ wordBreak: "break-all" }}>
                         {title}

From f31a6f240171cf71cbb36e42540cb954f29fce13 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 09:39:15 +0530
Subject: [PATCH 303/796] Move

---
 web/apps/photos/src/components/FixCreationTime.tsx    | 2 +-
 web/apps/photos/src/components/PhotoViewer/index.tsx  | 2 +-
 web/apps/photos/src/services/upload/upload-service.ts | 2 +-
 web/packages/gallery/components/FileInfo.tsx          | 2 +-
 web/packages/gallery/components/viewer/data-source.ts | 2 +-
 web/packages/{new/photos => gallery}/services/exif.ts | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename web/packages/{new/photos => gallery}/services/exif.ts (100%)

diff --git a/web/apps/photos/src/components/FixCreationTime.tsx b/web/apps/photos/src/components/FixCreationTime.tsx
index 878a9d1c60..171433cb46 100644
--- a/web/apps/photos/src/components/FixCreationTime.tsx
+++ b/web/apps/photos/src/components/FixCreationTime.tsx
@@ -2,6 +2,7 @@ import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import type { ModalVisibilityProps } from "@/base/components/utils/modal";
 import log from "@/base/log";
 import { downloadManager } from "@/gallery/services/download";
+import { extractExifDates } from "@/gallery/services/exif";
 import { fileLogID, type EnteFile } from "@/media/file";
 import {
     decryptPublicMagicMetadata,
@@ -11,7 +12,6 @@ import {
 } from "@/media/file-metadata";
 import { FileType } from "@/media/file-type";
 import { PhotoDateTimePicker } from "@/new/photos/components/PhotoDateTimePicker";
-import { extractExifDates } from "@/new/photos/services/exif";
 import {
     Dialog,
     DialogContent,
diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index 4f7bc0d348..af1295677a 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -12,6 +12,7 @@ import log from "@/base/log";
 import { FileInfo, type FileInfoProps } from "@/gallery/components/FileInfo";
 import { type FileInfoExif } from "@/gallery/components/viewer/data-source";
 import { downloadManager } from "@/gallery/services/download";
+import { extractRawExif, parseExif } from "@/gallery/services/exif";
 import type { Collection } from "@/media/collection";
 import { fileLogID, type EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
@@ -19,7 +20,6 @@ import { isHEICExtension, needsJPEGConversion } from "@/media/formats";
 import { ConfirmDeleteFileDialog } from "@/new/photos/components/FileViewerComponents";
 import { ImageEditorOverlay } from "@/new/photos/components/ImageEditorOverlay";
 import { moveToTrash } from "@/new/photos/services/collection";
-import { extractRawExif, parseExif } from "@/new/photos/services/exif";
 import { usePhotosAppContext } from "@/new/photos/types/context";
 import AlbumOutlinedIcon from "@mui/icons-material/AlbumOutlined";
 import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
diff --git a/web/apps/photos/src/services/upload/upload-service.ts b/web/apps/photos/src/services/upload/upload-service.ts
index c26f14b23b..87603866f3 100644
--- a/web/apps/photos/src/services/upload/upload-service.ts
+++ b/web/apps/photos/src/services/upload/upload-service.ts
@@ -5,6 +5,7 @@ import { ensureElectron } from "@/base/electron";
 import { basename, nameAndExtension } from "@/base/file-name";
 import type { PublicAlbumsCredentials } from "@/base/http";
 import log from "@/base/log";
+import { extractExif } from "@/gallery/services/exif";
 import { extractVideoMetadata } from "@/gallery/services/ffmpeg";
 import {
     getNonEmptyMagicMetadataProps,
@@ -38,7 +39,6 @@ import {
 import { FileType, type FileTypeInfo } from "@/media/file-type";
 import { encodeLivePhoto } from "@/media/live-photo";
 import { addToCollection } from "@/new/photos/services/collection";
-import { extractExif } from "@/new/photos/services/exif";
 import { mergeUint8Arrays } from "@/utils/array";
 import { ensureInteger, ensureNumber } from "@/utils/ensure";
 import { CustomError, handleUploadError } from "@ente/shared/error";
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index b85bf6f94d..3a0c46d9d8 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -24,6 +24,7 @@ import { nameAndExtension } from "@/base/file-name";
 import log from "@/base/log";
 import type { Location } from "@/base/types";
 import { CopyButton } from "@/gallery/components/FileInfoComponents";
+import { tagNumericValue, type RawExifTags } from "@/gallery/services/exif";
 import {
     changeCaption,
     changeFileName,
@@ -49,7 +50,6 @@ import {
     aboveFileViewerContentZ,
     fileInfoDrawerZ,
 } from "@/new/photos/components/utils/z-index";
-import { tagNumericValue, type RawExifTags } from "@/new/photos/services/exif";
 import {
     getAnnotatedFacesForFile,
     isMLEnabled,
diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 9a0415e4bd..50f234d8ea 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -12,7 +12,7 @@ import {
     extractRawExif,
     parseExif,
     type RawExifTags,
-} from "@/new/photos/services/exif";
+} from "@/gallery/services/exif";
 
 /**
  * This is a subset of the fields expected by PhotoSwipe itself (see the
diff --git a/web/packages/new/photos/services/exif.ts b/web/packages/gallery/services/exif.ts
similarity index 100%
rename from web/packages/new/photos/services/exif.ts
rename to web/packages/gallery/services/exif.ts

From ed50e5a36c9654ced0103d21e7e068bf45cd8f6d Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 09:42:14 +0530
Subject: [PATCH 304/796] pkg json cleanup

---
 web/apps/photos/package.json       | 8 --------
 web/packages/accounts/package.json | 2 ++
 web/packages/gallery/package.json  | 9 +++++++--
 web/yarn.lock                      | 2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/web/apps/photos/package.json b/web/apps/photos/package.json
index 7f72d2b0fb..97423cc2f4 100644
--- a/web/apps/photos/package.json
+++ b/web/apps/photos/package.json
@@ -9,14 +9,8 @@
         "@/media": "*",
         "@/new": "*",
         "@ente/shared": "*",
-        "@stripe/stripe-js": "^1.13.2",
-        "bip39": "^3.0.4",
         "chrono-node": "^2.7.8",
         "debounce": "^2.2.0",
-        "exifreader": "^4.26.1",
-        "fast-srp-hap": "^2.0.4",
-        "leaflet": "^1.9.4",
-        "leaflet-defaulticon-compatibility": "^0.1.2",
         "localforage": "^1.9.0",
         "memoize-one": "^6.0.0",
         "ml-matrix": "^6.12.0",
@@ -24,7 +18,6 @@
         "photoswipe": "file:./thirdparty/photoswipe",
         "react": "^19.0.0",
         "react-dom": "^19.0.0",
-        "react-dropzone": "14.2.10",
         "react-select": "^5.10.0",
         "react-top-loading-bar": "^3.0.2",
         "react-virtualized-auto-sizer": "^1.0.25",
@@ -35,7 +28,6 @@
     },
     "devDependencies": {
         "@/build-config": "*",
-        "@types/leaflet": "^1.9.16",
         "@types/node": "^20",
         "@types/photoswipe": "^4.1.1",
         "@types/react": "^19.0.8",
diff --git a/web/packages/accounts/package.json b/web/packages/accounts/package.json
index 8ab3abed3f..129ae6002a 100644
--- a/web/packages/accounts/package.json
+++ b/web/packages/accounts/package.json
@@ -6,6 +6,8 @@
         "@/base": "*",
         "@ente/shared": "*",
         "@types/zxcvbn": "^4.4.5",
+        "bip39": "^3.0.4",
+        "fast-srp-hap": "^2.0.4",
         "react-otp-input": "^3.1.1",
         "uuid": "^11.0.5",
         "zxcvbn": "^4.4.2"
diff --git a/web/packages/gallery/package.json b/web/packages/gallery/package.json
index 30da67c985..3c4669150d 100644
--- a/web/packages/gallery/package.json
+++ b/web/packages/gallery/package.json
@@ -6,9 +6,14 @@
         "@/base": "*",
         "@/utils": "*",
         "@ffmpeg/ffmpeg": "^0.12.10",
-        "bs58": "^6.0.0"
+        "bs58": "^6.0.0",
+        "exifreader": "^4.26.1",
+        "leaflet": "^1.9.4",
+        "leaflet-defaulticon-compatibility": "^0.1.2",
+        "react-dropzone": "14.2.10"
     },
     "devDependencies": {
-        "@/build-config": "*"
+        "@/build-config": "*",
+        "@types/leaflet": "^1.9.16"
     }
 }
diff --git a/web/yarn.lock b/web/yarn.lock
index 519abed926..faab8e0c40 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -980,7 +980,7 @@
   resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.29.1.tgz#c82f04a09ba481e13857d6f2516e072aaa51b7f4"
   integrity sha512-+10CMg9vt1MoHj6x1pxyjPSMjHTIlqs8/tBztXvPAx24SKs9jwVnKqHJumlH/IzhaPUaj3T6T6wfZr8okdXaIg==
 
-"@stripe/stripe-js@^1.13.2", "@stripe/stripe-js@^1.17.0":
+"@stripe/stripe-js@^1.17.0":
   version "1.54.2"
   resolved "https://registry.yarnpkg.com/@stripe/stripe-js/-/stripe-js-1.54.2.tgz#0665848e22cbda936cfd05256facdfbba121438d"
   integrity sha512-R1PwtDvUfs99cAjfuQ/WpwJ3c92+DAMy9xGApjqlWQMj0FKQabUAys2swfTRNzuYAYJh7NqK2dzcYVNkKLEKUg==

From 682710a8a875cd2890446e043269efb2d40e338a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 09:54:56 +0530
Subject: [PATCH 305/796] Remove unneeded ignore

We no longer have any source in public
---
 web/.prettierignore                           |  1 -
 .../auth/public/.well-known/assetlinks.json   | 20 +++--------
 .../photos/public/.well-known/assetlinks.json | 34 +++++++------------
 3 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/web/.prettierignore b/web/.prettierignore
index c94d62482f..c2ed1358c4 100644
--- a/web/.prettierignore
+++ b/web/.prettierignore
@@ -1,2 +1 @@
 thirdparty/
-public/
diff --git a/web/apps/auth/public/.well-known/assetlinks.json b/web/apps/auth/public/.well-known/assetlinks.json
index cee8007fca..692be7e7a3 100644
--- a/web/apps/auth/public/.well-known/assetlinks.json
+++ b/web/apps/auth/public/.well-known/assetlinks.json
@@ -1,26 +1,20 @@
 [
     {
-        "relation": [
-            "delegate_permission/common.get_login_creds"
-        ],
+        "relation": ["delegate_permission/common.get_login_creds"],
         "target": {
             "namespace": "photos-web",
             "site": "https://web.ente.io"
         }
     },
     {
-        "relation": [
-            "delegate_permission/common.get_login_creds"
-        ],
+        "relation": ["delegate_permission/common.get_login_creds"],
         "target": {
             "namespace": "auth-web",
             "site": "https://auth.ente.io"
         }
     },
     {
-        "relation": [
-            "delegate_permission/common.get_login_creds"
-        ],
+        "relation": ["delegate_permission/common.get_login_creds"],
         "target": {
             "namespace": "android_app",
             "package_name": "io.ente.photos.independent",
@@ -30,9 +24,7 @@
         }
     },
     {
-        "relation": [
-            "delegate_permission/common.get_login_creds"
-        ],
+        "relation": ["delegate_permission/common.get_login_creds"],
         "target": {
             "namespace": "android_app",
             "package_name": "io.ente.photos",
@@ -42,9 +34,7 @@
         }
     },
     {
-        "relation": [
-            "delegate_permission/common.get_login_creds"
-        ],
+        "relation": ["delegate_permission/common.get_login_creds"],
         "target": {
             "namespace": "android_app",
             "package_name": "io.ente.auth",
diff --git a/web/apps/photos/public/.well-known/assetlinks.json b/web/apps/photos/public/.well-known/assetlinks.json
index 292dbcfdaf..ec818a305b 100644
--- a/web/apps/photos/public/.well-known/assetlinks.json
+++ b/web/apps/photos/public/.well-known/assetlinks.json
@@ -1,26 +1,20 @@
 [
     {
-        "relation": [
-            "delegate_permission/common.get_login_creds"
-        ],
+        "relation": ["delegate_permission/common.get_login_creds"],
         "target": {
             "namespace": "photos-web",
             "site": "https://web.ente.io"
         }
     },
-     {
-        "relation": [
-            "delegate_permission/common.get_login_creds"
-        ],
+    {
+        "relation": ["delegate_permission/common.get_login_creds"],
         "target": {
             "namespace": "auth-web",
             "site": "https://auth.ente.io"
         }
     },
     {
-        "relation": [
-            "delegate_permission/common.get_login_creds"
-        ],
+        "relation": ["delegate_permission/common.get_login_creds"],
         "target": {
             "namespace": "android_app",
             "package_name": "io.ente.photos.independent",
@@ -30,9 +24,7 @@
         }
     },
     {
-        "relation": [
-            "delegate_permission/common.get_login_creds"
-        ],
+        "relation": ["delegate_permission/common.get_login_creds"],
         "target": {
             "namespace": "android_app",
             "package_name": "io.ente.photos",
@@ -44,9 +36,9 @@
     {
         "relation": ["delegate_permission/common.handle_all_urls"],
         "target": {
-          "namespace": "android_app",
-          "package_name": "io.ente.photos",
-          "sha256_cert_fingerprints": [
+            "namespace": "android_app",
+            "package_name": "io.ente.photos",
+            "sha256_cert_fingerprints": [
                 "37:D4:0B:10:3B:BF:86:43:EB:AE:23:B3:BB:73:F8:65:B4:E9:3A:BF:65:45:EF:37:12:8A:4C:EA:5B:C2:7E:2E"
             ]
         }
@@ -54,17 +46,15 @@
     {
         "relation": ["delegate_permission/common.handle_all_urls"],
         "target": {
-          "namespace": "android_app",
-          "package_name": "io.ente.photos.independent",
-          "sha256_cert_fingerprints": [
+            "namespace": "android_app",
+            "package_name": "io.ente.photos.independent",
+            "sha256_cert_fingerprints": [
                 "37:D4:0B:10:3B:BF:86:43:EB:AE:23:B3:BB:73:F8:65:B4:E9:3A:BF:65:45:EF:37:12:8A:4C:EA:5B:C2:7E:2E"
             ]
         }
     },
     {
-        "relation": [
-            "delegate_permission/common.get_login_creds"
-        ],
+        "relation": ["delegate_permission/common.get_login_creds"],
         "target": {
             "namespace": "android_app",
             "package_name": "io.ente.auth",

From 2cfc5d9c59ef3a85dbf0ed73b1a583871ebcbb35 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 09:57:45 +0530
Subject: [PATCH 306/796] Unused

---
 web/docs/dev.md  | 8 --------
 web/package.json | 8 +-------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/web/docs/dev.md b/web/docs/dev.md
index a719c678f1..7ab1ef22c0 100644
--- a/web/docs/dev.md
+++ b/web/docs/dev.md
@@ -34,14 +34,6 @@ that can be then deployed to any web server.
 There is one `yarn build:foo` for each app, e.g. `yarn build:auth`. The output
 will be placed in `apps/<foo>/out`, e.g. `apps/auth/out`.
 
-### yarn preview:\*
-
-Build a production export and start a local web server to serve it. This uses
-Python's built in web server, and is okay for quick testing but should not be
-used in production.
-
-The ports are the same as that for `yarn dev:*`
-
 ### lint, lint-fix
 
 Use `yarn lint` to check that your code formatting is as expected, and that
diff --git a/web/package.json b/web/package.json
index 35c30fbe31..7a8d9fd00b 100644
--- a/web/package.json
+++ b/web/package.json
@@ -21,13 +21,7 @@
         "dev:payments": "yarn workspace payments dev",
         "dev:photos": "yarn workspace photos next dev -p 3000",
         "lint": "concurrently --names 'prettier,eslint,tsc' \"yarn prettier --check --log-level warn .\" \"yarn workspaces run eslint\" \"yarn workspaces run tsc\"",
-        "lint-fix": "concurrently --names 'prettier,eslint,tsc' \"yarn prettier --write --log-level warn .\" \"yarn workspaces run eslint --fix\" \"yarn workspaces run tsc\"",
-        "preview": "yarn preview:photos",
-        "preview:accounts": "yarn build:accounts && python3 -m http.server -d apps/accounts/out 3001",
-        "preview:auth": "yarn build:auth && python3 -m http.server -d apps/auth/out 3000",
-        "preview:cast": "yarn build:cast && python3 -m http.server -d apps/accounts/out 3001",
-        "preview:payments": "yarn workspace payments preview",
-        "preview:photos": "yarn build:photos && python3 -m http.server -d apps/photos/out 3000"
+        "lint-fix": "concurrently --names 'prettier,eslint,tsc' \"yarn prettier --write --log-level warn .\" \"yarn workspaces run eslint --fix\" \"yarn workspaces run tsc\""
     },
     "devDependencies": {
         "concurrently": "^9.1.1",

From a1fda786f5a789a8ca65df98ac8e34f5fa5d7360 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 10:30:33 +0530
Subject: [PATCH 307/796] Fix look (paper now has a default shadow)

---
 .../photos/components/sidebar/MLSettings.tsx  | 72 +++++++++----------
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/web/packages/new/photos/components/sidebar/MLSettings.tsx b/web/packages/new/photos/components/sidebar/MLSettings.tsx
index aadea1c373..fd107c17e6 100644
--- a/web/packages/new/photos/components/sidebar/MLSettings.tsx
+++ b/web/packages/new/photos/components/sidebar/MLSettings.tsx
@@ -16,7 +16,6 @@ import {
     FormControlLabel,
     FormGroup,
     Link,
-    Paper,
     Stack,
     Typography,
 } from "@mui/material";
@@ -288,43 +287,42 @@ const ManageML: React.FC<ManageMLProps> = ({ mlStatus, onDisableML }) => {
                     />
                 </RowButtonGroup>
             </Stack>
-            <Paper variant="outlined">
-                <Stack>
-                    <Stack
-                        direction="row"
-                        sx={{
-                            gap: 2,
-                            px: 2,
-                            pt: 1,
-                            pb: 2,
-                            justifyContent: "space-between",
-                        }}
-                    >
-                        <Typography sx={{ color: "text.faint" }}>
-                            {t("indexing")}
-                        </Typography>
-                        <Typography>{status}</Typography>
-                    </Stack>
-                    <Divider sx={{ marginInlineStart: 2 }} />
-                    <Stack
-                        direction="row"
-                        sx={{
-                            gap: 2,
-                            px: 2,
-                            pt: 2,
-                            pb: 1,
-                            justifyContent: "space-between",
-                        }}
-                    >
-                        <Typography sx={{ color: "text.faint" }}>
-                            {t("processed")}
-                        </Typography>
-                        <Typography sx={{ textAlign: "right" }}>
-                            {processed}
-                        </Typography>
-                    </Stack>
+
+            <Stack>
+                <Stack
+                    direction="row"
+                    sx={{
+                        gap: 2,
+                        px: 2,
+                        pt: 1,
+                        pb: 2,
+                        justifyContent: "space-between",
+                    }}
+                >
+                    <Typography sx={{ color: "text.faint" }}>
+                        {t("indexing")}
+                    </Typography>
+                    <Typography>{status}</Typography>
                 </Stack>
-            </Paper>
+                <Divider sx={{ marginInline: 2 }} />
+                <Stack
+                    direction="row"
+                    sx={{
+                        gap: 2,
+                        px: 2,
+                        pt: 2,
+                        pb: 1,
+                        justifyContent: "space-between",
+                    }}
+                >
+                    <Typography sx={{ color: "text.faint" }}>
+                        {t("processed")}
+                    </Typography>
+                    <Typography sx={{ textAlign: "right" }}>
+                        {processed}
+                    </Typography>
+                </Stack>
+            </Stack>
         </Stack>
     );
 };

From d21ea0a5a65fcf60dde21bb4ea060ac2216b7edc Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 10:31:34 +0530
Subject: [PATCH 308/796] Fix NaN% for empty account

---
 web/packages/new/photos/components/sidebar/MLSettings.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/packages/new/photos/components/sidebar/MLSettings.tsx b/web/packages/new/photos/components/sidebar/MLSettings.tsx
index fd107c17e6..143ca9ed2e 100644
--- a/web/packages/new/photos/components/sidebar/MLSettings.tsx
+++ b/web/packages/new/photos/components/sidebar/MLSettings.tsx
@@ -263,7 +263,7 @@ const ManageML: React.FC<ManageMLProps> = ({ mlStatus, onDisableML }) => {
     }
 
     // Show processed as percentages instead of potentially confusing counts.
-    const processed = `${Math.round((100 * nSyncedFiles) / nTotalFiles)}%`;
+    const processed = `${nTotalFiles ? Math.round((100 * nSyncedFiles) / nTotalFiles) : 100}%`;
 
     const confirmDisableML = () =>
         showMiniDialog({

From bde8a17cb4ea06138c1a1a9b0ec12474ee968122 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 10:39:24 +0530
Subject: [PATCH 309/796] Tweak

---
 web/packages/new/photos/components/sidebar/MLSettings.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/packages/new/photos/components/sidebar/MLSettings.tsx b/web/packages/new/photos/components/sidebar/MLSettings.tsx
index 143ca9ed2e..567c85b5bd 100644
--- a/web/packages/new/photos/components/sidebar/MLSettings.tsx
+++ b/web/packages/new/photos/components/sidebar/MLSettings.tsx
@@ -304,7 +304,7 @@ const ManageML: React.FC<ManageMLProps> = ({ mlStatus, onDisableML }) => {
                     </Typography>
                     <Typography>{status}</Typography>
                 </Stack>
-                <Divider sx={{ marginInline: 2 }} />
+                <Divider sx={{ mx: 1.5 }} />
                 <Stack
                     direction="row"
                     sx={{

From e5448685caf3a3614fb239943c2a65aae10f3bad Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 10:52:32 +0530
Subject: [PATCH 310/796] Tweak

---
 web/packages/new/photos/services/ml/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/packages/new/photos/services/ml/index.ts b/web/packages/new/photos/services/ml/index.ts
index 207a02d863..fc1bc8af4d 100644
--- a/web/packages/new/photos/services/ml/index.ts
+++ b/web/packages/new/photos/services/ml/index.ts
@@ -336,7 +336,7 @@ export const mlSync = async () => {
     //
 
     // Fetch indexes, or index locally if needed.
-    await (await worker()).index();
+    await worker().then((w) => w.index());
 
     await updateClustersAndPeople();
 

From 55cff6f1749b47d9633056fbdd5d404a2c5f0918 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 11:41:31 +0530
Subject: [PATCH 311/796] log ww unhandled

---
 web/packages/base/log-web.ts                  | 20 +++++++++++++++++++
 web/packages/new/photos/services/ml/worker.ts |  3 +++
 2 files changed, 23 insertions(+)

diff --git a/web/packages/base/log-web.ts b/web/packages/base/log-web.ts
index 6ff6ed0a04..85a66bb00e 100644
--- a/web/packages/base/log-web.ts
+++ b/web/packages/base/log-web.ts
@@ -50,6 +50,26 @@ export const logUnhandledErrorsAndRejections = (attach: boolean) => {
     }
 };
 
+/**
+ * Attach handlers to log any unhandled exceptions and promise rejections in web
+ * workers.
+ *
+ * This is a variant of {@link logUnhandledErrorsAndRejections} that works in
+ * web workers. It should be called at the top level of the main worker script.
+ */
+export const logUnhandledErrorsAndRejectionsInWorker = () => {
+    const handleError = (event: ErrorEvent) => {
+        log.error("Unhandled error", event.error);
+    };
+
+    const handleUnhandledRejection = (event: PromiseRejectionEvent) => {
+        log.error("Unhandled promise rejection", event.reason);
+    };
+
+    self.addEventListener("error", handleError);
+    self.addEventListener("unhandledrejection", handleUnhandledRejection);
+};
+
 interface LogEntry {
     timestamp: number;
     logLine: string;
diff --git a/web/packages/new/photos/services/ml/worker.ts b/web/packages/new/photos/services/ml/worker.ts
index 48f6213677..e51defd508 100644
--- a/web/packages/new/photos/services/ml/worker.ts
+++ b/web/packages/new/photos/services/ml/worker.ts
@@ -2,6 +2,7 @@ import { clientPackageName } from "@/base/app";
 import { assertionFailed } from "@/base/assert";
 import { isHTTP4xxError } from "@/base/http";
 import log from "@/base/log";
+import { logUnhandledErrorsAndRejectionsInWorker } from "@/base/log-web";
 import type { ElectronMLWorker } from "@/base/types/ipc";
 import type { UploadItem } from "@/gallery/services/upload";
 import { fileLogID, type EnteFile } from "@/media/file";
@@ -347,6 +348,8 @@ export class MLWorker {
 
 expose(MLWorker);
 
+logUnhandledErrorsAndRejectionsInWorker();
+
 /**
  * Index the given batch of items.
  *

From 802ad184d2187cd086b6473724f6ed25b6217182 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 12:01:05 +0530
Subject: [PATCH 312/796] Log at top level to cover unknown scenarios too

---
 web/packages/base/log-web.ts                  |  5 ++
 web/packages/new/photos/services/ml/worker.ts | 51 ++++++++-----------
 2 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/web/packages/base/log-web.ts b/web/packages/base/log-web.ts
index 85a66bb00e..6cfcba31cb 100644
--- a/web/packages/base/log-web.ts
+++ b/web/packages/base/log-web.ts
@@ -56,6 +56,11 @@ export const logUnhandledErrorsAndRejections = (attach: boolean) => {
  *
  * This is a variant of {@link logUnhandledErrorsAndRejections} that works in
  * web workers. It should be called at the top level of the main worker script.
+ *
+ * Note: When I tested this, attaching the onerror handler to the worker outside
+ * the worker (e.g. when creating it in comlink-worker.ts) worked, but attaching
+ * the "unhandledrejection" event there did not work. Attaching them to `self`
+ * (the {@link WorkerGlobal}) worked.
  */
 export const logUnhandledErrorsAndRejectionsInWorker = () => {
     const handleError = (event: ErrorEvent) => {
diff --git a/web/packages/new/photos/services/ml/worker.ts b/web/packages/new/photos/services/ml/worker.ts
index e51defd508..2e374aaca3 100644
--- a/web/packages/new/photos/services/ml/worker.ts
+++ b/web/packages/new/photos/services/ml/worker.ts
@@ -373,7 +373,7 @@ const indexNextBatch = async (
     }
 
     // Keep track if any of the items failed.
-    let allSuccess = true;
+    let failureCount = 0;
 
     // Index up to 4 items simultaneously.
     const tasks = new Array<Promise<void> | undefined>(4).fill(undefined);
@@ -389,8 +389,10 @@ const indexNextBatch = async (
                         .then(() => {
                             tasks[j] = undefined;
                         })
-                        .catch(() => {
-                            allSuccess = false;
+                        .catch((e: unknown) => {
+                            const f = fileLogID(item.file);
+                            log.error(`Failed to index ${f}`, e);
+                            failureCount++;
                             tasks[j] = undefined;
                         }))(items[i++]!, j);
             }
@@ -414,8 +416,14 @@ const indexNextBatch = async (
     // Clear any cached CLIP indexes, since now we might have new ones.
     clearCachedCLIPIndexes();
 
+    log.info(
+        failureCount > 0
+            ? `Indexed ${items.length - failureCount} files (${failureCount} failed)`
+            : `Indexed ${items.length} files`,
+    );
+
     // Return true if nothing failed.
-    return allSuccess;
+    return failureCount == 0;
 };
 
 /**
@@ -524,15 +532,10 @@ const index = async (
     // and return.
 
     if (existingFaceIndex && existingCLIPIndex) {
-        try {
-            await saveIndexes(
-                { fileID, ...existingFaceIndex },
-                { fileID, ...existingCLIPIndex },
-            );
-        } catch (e) {
-            log.error(`Failed to save indexes for ${f}`, e);
-            throw e;
-        }
+        await saveIndexes(
+            { fileID, ...existingFaceIndex },
+            { fileID, ...existingCLIPIndex },
+        );
         return;
     }
 
@@ -554,7 +557,6 @@ const index = async (
         // reindexing attempt for failed files).
         //
         // See: [Note: Transient and permanent indexing failures]
-        log.error(`Failed to get image data for indexing ${f}`, e);
         await markIndexingFailed(file.id);
         throw e;
     }
@@ -572,7 +574,6 @@ const index = async (
             ]);
         } catch (e) {
             // See: [Note: Transient and permanent indexing failures]
-            log.error(`Failed to index ${f}`, e);
             await markIndexingFailed(file.id);
             throw e;
         }
@@ -614,33 +615,21 @@ const index = async (
             await putMLData(file, rawMLData);
         } catch (e) {
             // See: [Note: Transient and permanent indexing failures]
-            log.error(`Failed to put ML data for ${f}`, e);
             if (isHTTP4xxError(e)) await markIndexingFailed(file.id);
             throw e;
         }
 
-        try {
-            await saveIndexes(
-                { fileID, ...faceIndex },
-                { fileID, ...clipIndex },
-            );
-        } catch (e) {
-            // Not sure if DB failures should be considered permanent or
-            // transient. There isn't a known case where writing to the local
-            // indexedDB should systematically fail. It could fail if there was
-            // no space on device, but that's eminently retriable.
-            log.error(`Failed to save indexes for ${f}`, e);
-            throw e;
-        }
+        await saveIndexes({ fileID, ...faceIndex }, { fileID, ...clipIndex });
 
         // This step, saving face crops, is conceptually not part of the
         // indexing pipeline; we just do it here since we have already have the
-        // ImageBitmap at hand. Ignore errors that happen during this since it
-        // does not impact the generated face index.
+        // ImageBitmap at hand.
         if (!existingFaceIndex) {
             try {
                 await saveFaceCrops(image.bitmap, faceIndex);
             } catch (e) {
+                // Ignore errors that happen during this since it does not
+                // impact the generated face index.
                 log.error(`Failed to save face crops for ${f}`, e);
             }
         }

From 38d42c67fbaa2df3c9c1fb2a52d03c4c6dc09f30 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 12:08:40 +0530
Subject: [PATCH 313/796] Log in other workers too

---
 web/packages/base/crypto/worker.ts                | 3 +++
 web/packages/media/heic-convert.worker.ts         | 3 +++
 web/packages/new/photos/services/search/worker.ts | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/web/packages/base/crypto/worker.ts b/web/packages/base/crypto/worker.ts
index 693ade2be1..429451d27c 100644
--- a/web/packages/base/crypto/worker.ts
+++ b/web/packages/base/crypto/worker.ts
@@ -1,3 +1,4 @@
+import { logUnhandledErrorsAndRejectionsInWorker } from "@/base/log-web";
 import { expose } from "comlink";
 import type { StateAddress } from "libsodium-wrappers-sumo";
 import * as ei from "./ente-impl";
@@ -98,3 +99,5 @@ export class CryptoWorker {
 }
 
 expose(CryptoWorker);
+
+logUnhandledErrorsAndRejectionsInWorker();
diff --git a/web/packages/media/heic-convert.worker.ts b/web/packages/media/heic-convert.worker.ts
index 52c9d7abba..0209267702 100644
--- a/web/packages/media/heic-convert.worker.ts
+++ b/web/packages/media/heic-convert.worker.ts
@@ -1,3 +1,4 @@
+import { logUnhandledErrorsAndRejectionsInWorker } from "@/base/log-web";
 import { wait } from "@/utils/promise";
 import { expose } from "comlink";
 import HeicConvert from "heic-convert";
@@ -19,6 +20,8 @@ export class HEICConvertWorker {
 
 expose(HEICConvertWorker);
 
+logUnhandledErrorsAndRejectionsInWorker();
+
 const heicToJPEG = async (heicBlob: Blob): Promise<Blob> => {
     const buffer = new Uint8Array(await heicBlob.arrayBuffer());
     const result = await HeicConvert({ buffer, format: "JPEG" });
diff --git a/web/packages/new/photos/services/search/worker.ts b/web/packages/new/photos/services/search/worker.ts
index c96dd7425b..9fc9850712 100644
--- a/web/packages/new/photos/services/search/worker.ts
+++ b/web/packages/new/photos/services/search/worker.ts
@@ -1,4 +1,5 @@
 import { HTTPError } from "@/base/http";
+import { logUnhandledErrorsAndRejectionsInWorker } from "@/base/log-web";
 import type { Location } from "@/base/types";
 import type { Collection } from "@/media/collection";
 import type { EnteFile } from "@/media/file";
@@ -113,6 +114,8 @@ export class SearchWorker {
 
 expose(SearchWorker);
 
+logUnhandledErrorsAndRejectionsInWorker();
+
 /**
  * @param s The normalized form of {@link searchString}.
  * @param searchString The original search string.

From 29671aa1549d80fc8969a7b4348602543d48adfd Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Wed, 19 Feb 2025 12:28:44 +0530
Subject: [PATCH 314/796] fix: use media kit in android too

---
 mobile/lib/main.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index 906654c793..b907203cf9 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -239,7 +239,7 @@ Future<void> _init(bool isBackground, {String via = ''}) async {
         .init(preferences, NetworkClient.instance.enteDio, packageInfo);
 
     if (!isBackground) {
-      VideoPlayerMediaKit.ensureInitialized(iOS: true);
+      VideoPlayerMediaKit.ensureInitialized(iOS: true, android: true);
     }
 
     _logger.info("UserService init $tlog");

From cdaeec0e8e511b2564e26ad052c2f21df9e102bb Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Wed, 19 Feb 2025 14:17:09 +0530
Subject: [PATCH 315/796] fix: skip errors in checking file for preview
 creation

---
 mobile/lib/services/preview_video_store.dart | 35 ++++++++++----------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 6881577b41..a5cd33fb3a 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -58,10 +58,7 @@ class PreviewVideoStore {
   void init(SharedPreferences prefs) {
     _prefs = prefs;
 
-    Future.delayed(
-      const Duration(seconds: 10),
-      PreviewVideoStore.instance.putFilesForPreviewCreation,
-    );
+    Future.delayed(const Duration(seconds: 10), putFilesForPreviewCreation);
   }
 
   late final SharedPreferences _prefs;
@@ -585,24 +582,28 @@ class PreviewVideoStore {
     final fileSize = enteFile.fileSize;
     FFProbeProps? props;
 
-    if (fileSize != null && fileSize <= 10 * 1024 * 1024) {
-      final file = await getFile(enteFile, isOrigin: true);
-      if (file != null) {
-        props = await getVideoPropsAsync(file);
-        final videoData = List.from(props?.propData?["streams"] ?? [])
-            .firstWhereOrNull((e) => e["type"] == "video");
+    try {
+      if (fileSize != null && fileSize <= 10 * 1024 * 1024) {
+        final file = await getFile(enteFile, isOrigin: true);
+        if (file != null) {
+          props = await getVideoPropsAsync(file);
+          final videoData = List.from(props?.propData?["streams"] ?? [])
+              .firstWhereOrNull((e) => e["type"] == "video");
 
-        final codec = videoData["codec_name"]?.toString().toLowerCase();
-        final codecIsH264 = codec?.contains("h264") ?? false;
+          final codec = videoData["codec_name"]?.toString().toLowerCase();
+          final codecIsH264 = codec?.contains("h264") ?? false;
 
-        if (codecIsH264) {
-          if (_items.containsKey(enteFile.uploadedFileID!)) {
-            _items.remove(enteFile.uploadedFileID!);
-            Bus.instance.fire(PreviewUpdatedEvent(_items));
+          if (codecIsH264) {
+            if (_items.containsKey(enteFile.uploadedFileID!)) {
+              _items.remove(enteFile.uploadedFileID!);
+              Bus.instance.fire(PreviewUpdatedEvent(_items));
+            }
+            return (props, true);
           }
-          return (props, true);
         }
       }
+    } catch (e, sT) {
+      _logger.warning("Failed to check props", e, sT);
     }
     return (props, false);
   }

From e44405b46f3680248ef1f4d5c78d2163d3d6f44b Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Wed, 19 Feb 2025 14:54:18 +0530
Subject: [PATCH 316/796] feat: document more, better code

---
 mobile/lib/services/preview_video_store.dart | 174 ++++++++++---------
 1 file changed, 96 insertions(+), 78 deletions(-)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index a5cd33fb3a..164b86ac29 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -50,7 +50,7 @@ class PreviewVideoStore {
   final cacheManager = DefaultCacheManager();
   final videoCacheManager = VideoCacheManager.instance;
 
-  LinkedHashSet<EnteFile> files = LinkedHashSet();
+  LinkedHashSet<EnteFile> fileQueue = LinkedHashSet();
   int uploadingFileId = -1;
 
   final _dio = NetworkClient.instance.enteDio;
@@ -58,7 +58,10 @@ class PreviewVideoStore {
   void init(SharedPreferences prefs) {
     _prefs = prefs;
 
-    Future.delayed(const Duration(seconds: 10), putFilesForPreviewCreation);
+    Future.delayed(
+      const Duration(seconds: 10),
+      _putFilesForPreviewCreation,
+    );
   }
 
   late final SharedPreferences _prefs;
@@ -79,16 +82,16 @@ class PreviewVideoStore {
     Bus.instance.fire(VideoStreamingChanged());
 
     if (isVideoStreamingEnabled) {
-      putFilesForPreviewCreation().ignore();
+      _putFilesForPreviewCreation().ignore();
     } else {
       clearQueue();
     }
   }
 
-  clearQueue() {
+  void clearQueue() {
     _items.clear();
     Bus.instance.fire(PreviewUpdatedEvent(_items));
-    files.clear();
+    fileQueue.clear();
   }
 
   DateTime? get videoStreamingCutoff {
@@ -115,11 +118,11 @@ class PreviewVideoStore {
       try {
         // check if playlist already exist
         await getPlaylist(enteFile);
-        final resultUrl = await getPreviewUrl(enteFile);
+        final _ = await getPreviewUrl(enteFile);
+
         if (ctx != null && ctx.mounted) {
           showShortToast(ctx, 'Video preview already exists');
         }
-        debugPrint("previewUrl $resultUrl");
         _items.removeWhere((key, value) => value.file == enteFile);
         Bus.instance.fire(PreviewUpdatedEvent(_items));
         return;
@@ -128,16 +131,16 @@ class PreviewVideoStore {
           _logger.info("No preview found for $enteFile");
         } else {
           _logger.warning("Failed to get playlist for $enteFile", e, s);
-          rethrow;
+          _retryFile(enteFile, e);
+          return;
         }
       }
 
-      var (props, result) = await checkFileForPreviewCreation(enteFile);
-
-      if (result) {
-        return;
-      }
+      // elimination case for <=10 MB with H.264
+      var (props, result) = await _checkFileForPreviewCreation(enteFile);
+      if (result) return;
 
+      // check if there is already a preview in processing
       if (uploadingFileId >= 0) {
         if (uploadingFileId == enteFile.uploadedFileID) return;
 
@@ -150,9 +153,11 @@ class PreviewVideoStore {
           collectionID: enteFile.collectionID ?? 0,
         );
         Bus.instance.fire(PreviewUpdatedEvent(_items));
-        files.add(enteFile);
+        fileQueue.add(enteFile);
         return;
       }
+
+      // everything is fine, let's process
       uploadingFileId = enteFile.uploadedFileID!;
       _items[enteFile.uploadedFileID!] = PreviewItem(
         status: PreviewItemStatus.compressing,
@@ -163,17 +168,24 @@ class PreviewVideoStore {
       );
       Bus.instance.fire(PreviewUpdatedEvent(_items));
 
-      props = await getVideoPropsAsync(file);
+      // check metadata for bitrate, codec, color space
+      props ??= await getVideoPropsAsync(file);
       final fileSize = enteFile.fileSize ?? file.lengthSync();
 
       final videoData = List.from(props?.propData?["streams"] ?? [])
           .firstWhereOrNull((e) => e["type"] == "video");
 
       final codec = videoData["codec_name"]?.toString().toLowerCase();
+      final codecIsH264 = codec?.contains("h264") ?? false;
+
       final bitrate = props?.duration?.inSeconds != null
           ? (fileSize * 8) / props!.duration!.inSeconds
           : null;
 
+      final colorSpace = videoData["color_space"]?.toString().toLowerCase();
+      final isColorGood = colorSpace == "bt709";
+
+      // create temp file & directory for preview generation
       final String tempDir = Configuration.instance.getTempDirectory();
       final String prefix =
           "${tempDir}_${enteFile.uploadedFileID}_${newID("pv")}";
@@ -187,15 +199,14 @@ class PreviewVideoStore {
       final keyinfo = File('$prefix/mykey.keyinfo');
       keyinfo.writeAsStringSync("data:text/plain;base64,${key.base64}\n"
           "${keyfile.path}\n");
+
       _logger.info(
         'Generating HLS Playlist ${enteFile.displayName} at $prefix/output.m3u8}',
       );
 
       FFmpegSession? session;
-      final colorSpace = videoData["color_space"]?.toString().toLowerCase();
-      final isColorGood = colorSpace == "bt709";
-      final codecIsH264 = codec?.contains("h264") ?? false;
 
+      // case 1, if it's already a good stream
       if (bitrate != null && bitrate <= 4000 * 1000 && codecIsH264) {
         session = await FFmpegKit.execute(
           '-i "${file.path}" '
@@ -205,7 +216,8 @@ class PreviewVideoStore {
           '-hls_list_size 0 -hls_key_info_file ${keyinfo.path} '
           '$prefix/output.m3u8',
         );
-      } else if (bitrate != null &&
+      } // case 2, if it's bitrate is good, but codec is not
+      else if (bitrate != null &&
           codec != null &&
           bitrate <= 2000 * 1000 &&
           !codecIsH264) {
@@ -220,10 +232,9 @@ class PreviewVideoStore {
           '-hls_list_size 0 -hls_key_info_file ${keyinfo.path} '
           '$prefix/output.m3u8',
         );
-      }
-
-      if (colorSpace != null && isColorGood) {
-        session ??= await FFmpegKit.execute(
+      } // case 3, if it's color space is good
+      else if (colorSpace != null && isColorGood) {
+        session = await FFmpegKit.execute(
           '-i "${file.path}" '
           '-metadata:s:v:0 rotate=0 '
           '-vf "scale=-2:720,fps=30" '
@@ -232,20 +243,21 @@ class PreviewVideoStore {
           '-hls_list_size 0 -hls_key_info_file ${keyinfo.path} '
           '$prefix/output.m3u8',
         );
+      } // case 4, make it compatible
+      else {
+        session = await FFmpegKit.execute(
+          '-i "${file.path}" '
+          '-metadata:s:v:0 rotate=0 '
+          '-vf "scale=-2:720,fps=30,format=yuv420p10le,zscale=transfer=linear,tonemap=tonemap=hable:desat=0:peak=10,zscale=transfer=bt709:matrix=bt709:primaries=bt709,format=yuv420p" '
+          '-color_primaries bt709 -color_trc bt709 -colorspace bt709 '
+          '-x264-params "colorprim=bt709:transfer=bt709:colormatrix=bt709" '
+          '-c:v libx264 -b:v 2000k -crf 23 -preset medium '
+          '-c:a aac -b:a 128k -f hls -hls_time 2 -hls_flags single_file '
+          '-hls_list_size 0 -hls_key_info_file ${keyinfo.path} '
+          '$prefix/output.m3u8',
+        );
       }
 
-      session ??= await FFmpegKit.execute(
-        '-i "${file.path}" '
-        '-metadata:s:v:0 rotate=0 '
-        '-vf "scale=-2:720,fps=30,format=yuv420p10le,zscale=transfer=linear,tonemap=tonemap=hable:desat=0:peak=10,zscale=transfer=bt709:matrix=bt709:primaries=bt709,format=yuv420p" '
-        '-color_primaries bt709 -color_trc bt709 -colorspace bt709 '
-        '-x264-params "colorprim=bt709:transfer=bt709:colormatrix=bt709" '
-        '-c:v libx264 -b:v 2000k -crf 23 -preset medium '
-        '-c:a aac -b:a 128k -f hls -hls_time 2 -hls_flags single_file '
-        '-hls_list_size 0 -hls_key_info_file ${keyinfo.path} '
-        '$prefix/output.m3u8',
-      );
-
       final returnCode = await session.getReturnCode();
 
       String? error;
@@ -261,14 +273,15 @@ class PreviewVideoStore {
           Bus.instance.fire(PreviewUpdatedEvent(_items));
 
           _logger.info('Playlist Generated ${enteFile.displayName}');
+
           final playlistFile = File("$prefix/output.m3u8");
           final previewFile = File("$prefix/output.ts");
           final result = await _uploadPreviewVideo(enteFile, previewFile);
+
           final String objectID = result.$1;
           final objectSize = result.$2;
 
-          // Logic to fetch width & height of preview
-          //-allowed_extensions ALL -i "https://example.com/stream.m3u8" -frames:v 1 -c copy frame.ts
+          // Fetch resolution of generated stream by decrypting a single frame
           final FFmpegSession session2 = await FFmpegKit.execute(
             '-allowed_extensions ALL -i "$prefix/output.m3u8" -frames:v 1 -c copy "$prefix/frame.ts"',
           );
@@ -283,8 +296,8 @@ class PreviewVideoStore {
               width = props2?.width;
               height = props2?.height;
             }
-          } catch (_) {
-            _logger.warning("Failed to get width and height", _);
+          } catch (err, sT) {
+            _logger.warning("Failed to fetch resolution of stream", err, sT);
           }
 
           await _reportVideoPreview(
@@ -299,7 +312,7 @@ class PreviewVideoStore {
           _logger.info("Video preview uploaded for $enteFile");
         } catch (err, sT) {
           error = "Failed to upload video preview\nError: $err";
-          _logger.shout("Video preview uploaded for $enteFile", err, sT);
+          _logger.shout("Something went wrong with preview upload", err, sT);
         }
       } else if (ReturnCode.isCancel(returnCode)) {
         _logger.warning("FFmpeg command cancelled");
@@ -310,14 +323,13 @@ class PreviewVideoStore {
           "FFmpeg command failed with return code $returnCode",
           output ?? "Error not found",
         );
-        if (kDebugMode) {
-          _logger.severe(output);
-        }
         error = "Failed to generate video preview\nError: $output";
       }
 
       if (error == null) {
+        // update previewIds
         FileDataService.instance.syncFDStatus().ignore();
+
         _items[enteFile.uploadedFileID!] = PreviewItem(
           status: PreviewItemStatus.uploaded,
           file: enteFile,
@@ -325,37 +337,44 @@ class PreviewVideoStore {
           collectionID: enteFile.collectionID ?? 0,
         );
       } else {
-        if (_items[enteFile.uploadedFileID!]!.retryCount < 3) {
-          _items[enteFile.uploadedFileID!] = PreviewItem(
-            status: PreviewItemStatus.retry,
-            file: enteFile,
-            retryCount: _items[enteFile.uploadedFileID!]!.retryCount + 1,
-            collectionID: enteFile.collectionID ?? 0,
-          );
-          files.add(enteFile);
-        } else {
-          _items[enteFile.uploadedFileID!] = PreviewItem(
-            status: PreviewItemStatus.failed,
-            file: enteFile,
-            retryCount: _items[enteFile.uploadedFileID!]!.retryCount,
-            collectionID: enteFile.collectionID ?? 0,
-            error: error,
-          );
-        }
+        _retryFile(enteFile, error);
       }
       Bus.instance.fire(PreviewUpdatedEvent(_items));
     } finally {
+      // reset uploading status if this was getting processed
       if (uploadingFileId == enteFile.uploadedFileID!) {
         uploadingFileId = -1;
       }
-      if (files.isNotEmpty) {
-        final file = files.first;
-        files.remove(file);
+      _logger.info("[chunk] Processing ${_items.length} items for streaming");
+      // process next file
+      if (fileQueue.isNotEmpty) {
+        final file = fileQueue.first;
+        fileQueue.remove(file);
         await chunkAndUploadVideo(ctx, file);
       }
     }
   }
 
+  void _retryFile(EnteFile enteFile, Object error) {
+    if (_items[enteFile.uploadedFileID!]!.retryCount < 3) {
+      _items[enteFile.uploadedFileID!] = PreviewItem(
+        status: PreviewItemStatus.retry,
+        file: enteFile,
+        retryCount: _items[enteFile.uploadedFileID!]!.retryCount + 1,
+        collectionID: enteFile.collectionID ?? 0,
+      );
+      fileQueue.add(enteFile);
+    } else {
+      _items[enteFile.uploadedFileID!] = PreviewItem(
+        status: PreviewItemStatus.failed,
+        file: enteFile,
+        retryCount: _items[enteFile.uploadedFileID!]!.retryCount,
+        collectionID: enteFile.collectionID ?? 0,
+        error: error,
+      );
+    }
+  }
+
   Future<void> _reportVideoPreview(
     EnteFile file,
     File playlist, {
@@ -525,7 +544,7 @@ class PreviewVideoStore {
         final previewURL = response2.data["url"];
         if (objectKey != null) {
           unawaited(
-            downloadAndCacheVideo(
+            _downloadAndCacheVideo(
               previewURL,
               _getVideoPreviewKey(objectKey),
             ),
@@ -554,7 +573,7 @@ class PreviewVideoStore {
     }
   }
 
-  Future downloadAndCacheVideo(String url, String key) async {
+  Future _downloadAndCacheVideo(String url, String key) async {
     final file = await videoCacheManager.downloadFile(url, key: key);
     return file;
   }
@@ -576,14 +595,15 @@ class PreviewVideoStore {
     }
   }
 
-  Future<(FFProbeProps?, bool)> checkFileForPreviewCreation(
+  Future<(FFProbeProps?, bool)> _checkFileForPreviewCreation(
     EnteFile enteFile,
   ) async {
     final fileSize = enteFile.fileSize;
     FFProbeProps? props;
 
     try {
-      if (fileSize != null && fileSize <= 10 * 1024 * 1024) {
+      final isFileUnder10MB = fileSize != null && fileSize <= 10 * 1024 * 1024;
+      if (isFileUnder10MB) {
         final file = await getFile(enteFile, isOrigin: true);
         if (file != null) {
           props = await getVideoPropsAsync(file);
@@ -608,9 +628,8 @@ class PreviewVideoStore {
     return (props, false);
   }
 
-  // get all files after cutoff date and add it to queue for preview creation
-  // only run when video streaming is enabled
-  Future<void> putFilesForPreviewCreation() async {
+  // generate stream for all files after cutoff date
+  Future<void> _putFilesForPreviewCreation() async {
     if (!isVideoStreamingEnabled) return;
 
     final cutoff = videoStreamingCutoff;
@@ -632,10 +651,10 @@ class PreviewVideoStore {
       return first.compareTo(second);
     }).toList();
 
-    // set all video status to be in queue
+    // set all video status to in queue
     for (final enteFile in allFiles) {
-      final (_, result) = await checkFileForPreviewCreation(enteFile);
-
+      // elimination case for <=10 MB with H.264
+      final (_, result) = await _checkFileForPreviewCreation(enteFile);
       if (result) {
         allFiles.remove(enteFile);
         continue;
@@ -647,14 +666,13 @@ class PreviewVideoStore {
         collectionID: enteFile.collectionID ?? 0,
       );
     }
-
     Bus.instance.fire(PreviewUpdatedEvent(_items));
 
-    final file = allFiles.first;
-    allFiles.remove(file);
-
-    this.files.addAll(allFiles);
+    _logger.info("[init] Processing ${_items.length} items for streaming");
 
+    // take first file and put it for stream generation
+    final file = allFiles.removeAt(0);
+    fileQueue.addAll(allFiles);
     await chunkAndUploadVideo(null, file);
   }
 }

From 503c2506aa8487f29326940c13f2476eeee13660 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Wed, 19 Feb 2025 15:21:38 +0530
Subject: [PATCH 317/796] fix: put remote files at last, get file after
 updating status as compressing,

---
 mobile/lib/services/preview_video_store.dart | 59 ++++++++++++--------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 164b86ac29..42aba87e5e 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -89,9 +89,9 @@ class PreviewVideoStore {
   }
 
   void clearQueue() {
+    fileQueue.clear();
     _items.clear();
     Bus.instance.fire(PreviewUpdatedEvent(_items));
-    fileQueue.clear();
   }
 
   DateTime? get videoStreamingCutoff {
@@ -111,9 +111,10 @@ class PreviewVideoStore {
     }
 
     try {
-      if (!enteFile.isUploaded) return;
-      final file = await getFile(enteFile, isOrigin: true);
-      if (file == null) return;
+      if (!enteFile.isUploaded) {
+        _removeFile(enteFile);
+        return;
+      }
 
       try {
         // check if playlist already exist
@@ -123,8 +124,7 @@ class PreviewVideoStore {
         if (ctx != null && ctx.mounted) {
           showShortToast(ctx, 'Video preview already exists');
         }
-        _items.removeWhere((key, value) => value.file == enteFile);
-        Bus.instance.fire(PreviewUpdatedEvent(_items));
+        _removeFile(enteFile);
         return;
       } catch (e, s) {
         if (e is DioException && e.response?.statusCode == 404) {
@@ -137,8 +137,11 @@ class PreviewVideoStore {
       }
 
       // elimination case for <=10 MB with H.264
-      var (props, result) = await _checkFileForPreviewCreation(enteFile);
-      if (result) return;
+      var (props, result, file) = await _checkFileForPreviewCreation(enteFile);
+      if (result) {
+        _removeFile(enteFile);
+        return;
+      }
 
       // check if there is already a preview in processing
       if (uploadingFileId >= 0) {
@@ -168,6 +171,13 @@ class PreviewVideoStore {
       );
       Bus.instance.fire(PreviewUpdatedEvent(_items));
 
+      // get file
+      file ??= await getFile(enteFile, isOrigin: true);
+      if (file == null) {
+        _retryFile(enteFile, "Unable to fetch file");
+        return;
+      }
+
       // check metadata for bitrate, codec, color space
       props ??= await getVideoPropsAsync(file);
       final fileSize = enteFile.fileSize ?? file.lengthSync();
@@ -355,6 +365,11 @@ class PreviewVideoStore {
     }
   }
 
+  void _removeFile(EnteFile enteFile) {
+    _items.remove(enteFile.uploadedFileID!);
+    Bus.instance.fire(PreviewUpdatedEvent(_items));
+  }
+
   void _retryFile(EnteFile enteFile, Object error) {
     if (_items[enteFile.uploadedFileID!]!.retryCount < 3) {
       _items[enteFile.uploadedFileID!] = PreviewItem(
@@ -595,37 +610,31 @@ class PreviewVideoStore {
     }
   }
 
-  Future<(FFProbeProps?, bool)> _checkFileForPreviewCreation(
+  Future<(FFProbeProps?, bool, File?)> _checkFileForPreviewCreation(
     EnteFile enteFile,
   ) async {
     final fileSize = enteFile.fileSize;
     FFProbeProps? props;
+    File? file;
+    bool result = false;
 
     try {
       final isFileUnder10MB = fileSize != null && fileSize <= 10 * 1024 * 1024;
       if (isFileUnder10MB) {
-        final file = await getFile(enteFile, isOrigin: true);
+        file = await getFile(enteFile, isOrigin: true);
         if (file != null) {
           props = await getVideoPropsAsync(file);
           final videoData = List.from(props?.propData?["streams"] ?? [])
               .firstWhereOrNull((e) => e["type"] == "video");
 
           final codec = videoData["codec_name"]?.toString().toLowerCase();
-          final codecIsH264 = codec?.contains("h264") ?? false;
-
-          if (codecIsH264) {
-            if (_items.containsKey(enteFile.uploadedFileID!)) {
-              _items.remove(enteFile.uploadedFileID!);
-              Bus.instance.fire(PreviewUpdatedEvent(_items));
-            }
-            return (props, true);
-          }
+          result = codec?.contains("h264") ?? false;
         }
       }
     } catch (e, sT) {
       _logger.warning("Failed to check props", e, sT);
     }
-    return (props, false);
+    return (props, result, file);
   }
 
   // generate stream for all files after cutoff date
@@ -645,16 +654,18 @@ class PreviewVideoStore {
     final allFiles = files
         .where((file) => previewIds?[file.uploadedFileID] == null)
         .sorted((a, b) {
-      // put higher duration videos last
-      final first = a.duration == null || a.duration! >= 10 * 60 ? 1 : 0;
-      final second = b.duration == null || b.duration! >= 10 * 60 ? 1 : 0;
+      // put higher duration videos last along with remote files
+      final first = (a.localID == null ? 2 : 0) +
+          (a.duration == null || a.duration! >= 10 * 60 ? 1 : 0);
+      final second = (b.localID == null ? 2 : 0) +
+          (b.duration == null || b.duration! >= 10 * 60 ? 1 : 0);
       return first.compareTo(second);
     }).toList();
 
     // set all video status to in queue
     for (final enteFile in allFiles) {
       // elimination case for <=10 MB with H.264
-      final (_, result) = await _checkFileForPreviewCreation(enteFile);
+      final (_, result, _) = await _checkFileForPreviewCreation(enteFile);
       if (result) {
         allFiles.remove(enteFile);
         continue;

From d59d3c3b07e4b019f4fe373e25ac3186f0ee958a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 17:40:29 +0530
Subject: [PATCH 318/796] grandfather

---
 web/packages/media/file.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/web/packages/media/file.ts b/web/packages/media/file.ts
index f087dbb17e..9499aa4523 100644
--- a/web/packages/media/file.ts
+++ b/web/packages/media/file.ts
@@ -2,6 +2,7 @@ import { sharedCryptoWorker } from "@/base/crypto";
 import { dateFromEpochMicroseconds } from "@/base/date";
 import log from "@/base/log";
 import { type Metadata, ItemVisibility } from "./file-metadata";
+import { FileType } from "./file-type";
 
 // TODO: Audit this file.
 
@@ -405,12 +406,19 @@ export const mergeMetadata1 = (file: EnteFile): EnteFile => {
         }
     }
 
-    // In a very rare cases (have found only one so far, a very old file in
+    // In very rare cases (have found only one so far, a very old file in
     // Vishnu's account, uploaded by an initial dev version of Ente) the photo
     // has no modification time. Gracefully handle such cases.
     if (!file.metadata.modificationTime)
         file.metadata.modificationTime = file.metadata.creationTime;
 
+    // In very rare cases (again, some files shared with Vishnu's account,
+    // uploaded by dev builds) the photo might not have a file type. Gracefully
+    // handle these too. The file ID threshold is an arbitrary cutoff so that
+    // this graceful handling does not mask new issues.
+    if (!file.metadata.fileType && file.id < 100000000)
+        file.metadata.fileType = FileType.image;
+
     return file;
 };
 

From 2fe6df5d21ffe8e1390ffa76db643046e128284b Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Wed, 19 Feb 2025 18:31:57 +0530
Subject: [PATCH 319/796] fix: sync previewIds after enabling streaming

---
 mobile/lib/services/preview_video_store.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 42aba87e5e..7a72a93a9d 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -82,6 +82,7 @@ class PreviewVideoStore {
     Bus.instance.fire(VideoStreamingChanged());
 
     if (isVideoStreamingEnabled) {
+      await FileDataService.instance.syncFDStatus();
       _putFilesForPreviewCreation().ignore();
     } else {
       clearQueue();

From 8eb34503ac3289b6bc29027083a90536d0556199 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 18:32:25 +0530
Subject: [PATCH 320/796] net 1

---
 web/packages/gallery/services/download.ts | 45 +++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/web/packages/gallery/services/download.ts b/web/packages/gallery/services/download.ts
index c201928c2a..9b53765c48 100644
--- a/web/packages/gallery/services/download.ts
+++ b/web/packages/gallery/services/download.ts
@@ -277,6 +277,14 @@ class DownloadManager {
     };
 
     private async _downloadThumbnail(file: EnteFile) {
+        try {
+            return await this.__downloadThumbnail(file);
+        } catch (e) {
+            throw new NetworkDownloadError(e);
+        }
+    }
+
+    private async __downloadThumbnail(file: EnteFile) {
         if (this.publicAlbumsCredentials) {
             return publicAlbums_downloadThumbnail(
                 file,
@@ -522,6 +530,43 @@ class DownloadManager {
  */
 export const downloadManager = new DownloadManager();
 
+/**
+ * A custom Error that is thrown if a download fails during network I/O.
+ *
+ * [Note: Identifying network related errors during download]
+ *
+ * We dealing with code that touches the network, we often don't specifically
+ * care about the specific error - there is a lot that can go wrong when a
+ * network is involved - but need to identify if an error was in the network
+ * related phase of an action, since these are usually transient and can be
+ * dealt with more softly than other errors.
+ *
+ * To that end, network related phases of download operations are wrapped in
+ * catches that intercept the error and wrap it in our custom
+ * {@link NetworkDownloadError} whose presence can be checked using the
+ * {@link isNetworkDownloadError} predicate.
+ */
+export class NetworkDownloadError extends Error {
+    error: unknown;
+
+    constructor(e: unknown) {
+        super(
+            `NetworkDownloadError: ${e instanceof Error ? e.message : String(e)}`,
+        );
+
+        // Cargo culted from
+        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error#custom_error_types
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        if (Error.captureStackTrace)
+            Error.captureStackTrace(this, NetworkDownloadError);
+
+        this.error = e;
+    }
+}
+
+export const isNetworkDownloadError = (e: unknown) =>
+    e instanceof NetworkDownloadError;
+
 /**
  * Create and return a {@link RenderableSourceURLs} for the given {@link file},
  * where {@link originalFileURLPromise} is a promise that resolves with an

From 7fc42bed648ed1cf656f8923ff76f7767d9793d3 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Wed, 19 Feb 2025 18:32:47 +0530
Subject: [PATCH 321/796] fix: add playbackCallback to hideStuff properly

---
 mobile/lib/ui/viewer/file/preview_video_widget.dart | 1 +
 mobile/lib/ui/viewer/file/video_control.dart        | 7 +++++++
 mobile/lib/ui/viewer/file/video_widget_native.dart  | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/ui/viewer/file/preview_video_widget.dart b/mobile/lib/ui/viewer/file/preview_video_widget.dart
index dbaa409ed4..01b51df09b 100644
--- a/mobile/lib/ui/viewer/file/preview_video_widget.dart
+++ b/mobile/lib/ui/viewer/file/preview_video_widget.dart
@@ -254,6 +254,7 @@ class _PreviewVideoWidgetState extends State<PreviewVideoWidget> {
       customControls: VideoControls(
         file: widget.file,
         onStreamChange: widget.onStreamChange,
+        playbackCallback: widget.playbackCallback,
       ),
     );
     return Container(
diff --git a/mobile/lib/ui/viewer/file/video_control.dart b/mobile/lib/ui/viewer/file/video_control.dart
index d662819003..b0384895b9 100644
--- a/mobile/lib/ui/viewer/file/video_control.dart
+++ b/mobile/lib/ui/viewer/file/video_control.dart
@@ -15,9 +15,11 @@ class VideoControls extends StatefulWidget {
     super.key,
     required this.file,
     required this.onStreamChange,
+    required this.playbackCallback,
   });
   final EnteFile file;
   final void Function()? onStreamChange;
+  final void Function(bool)? playbackCallback;
 
   @override
   State<StatefulWidget> createState() {
@@ -186,6 +188,7 @@ class _VideoControlsState extends State<VideoControls> {
             _hideStuff = true;
           });
         }
+        widget.playbackCallback?.call(_hideStuff);
       },
       behavior: HitTestBehavior.opaque,
       child: AnimatedOpacity(
@@ -209,6 +212,7 @@ class _VideoControlsState extends State<VideoControls> {
       _hideStuff = false;
       _displayTapped = true;
     });
+    widget.playbackCallback?.call(_hideStuff);
   }
 
   Future<void> _initialize() async {
@@ -225,6 +229,7 @@ class _VideoControlsState extends State<VideoControls> {
         setState(() {
           _hideStuff = false;
         });
+        widget.playbackCallback?.call(_hideStuff);
       });
     }
   }
@@ -251,6 +256,7 @@ class _VideoControlsState extends State<VideoControls> {
           controller.play();
         }
       }
+      widget.playbackCallback?.call(_hideStuff);
     });
   }
 
@@ -259,6 +265,7 @@ class _VideoControlsState extends State<VideoControls> {
       setState(() {
         _hideStuff = true;
       });
+      widget.playbackCallback?.call(_hideStuff);
     });
   }
 
diff --git a/mobile/lib/ui/viewer/file/video_widget_native.dart b/mobile/lib/ui/viewer/file/video_widget_native.dart
index 810bca4dd6..8eee011233 100644
--- a/mobile/lib/ui/viewer/file/video_widget_native.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_native.dart
@@ -210,10 +210,10 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
                         behavior: HitTestBehavior.opaque,
                         onTap: () {
                           _showControls.value = !_showControls.value;
-                          _elTooltipController.hide();
                           if (widget.playbackCallback != null) {
                             widget.playbackCallback!(!_showControls.value);
                           }
+                          _elTooltipController.hide();
                         },
                         child: Container(
                           constraints: const BoxConstraints.expand(),

From 94a77b7df1f9c2f85077a17c53500c59e981d08c Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Wed, 19 Feb 2025 18:35:41 +0530
Subject: [PATCH 322/796] chore: update lock files

---
 mobile/ios/Podfile.lock                      | 114 +++++++++----------
 mobile/plugins/ente_cast/pubspec.lock        |  20 +++-
 mobile/plugins/ente_cast_none/pubspec.lock   |  20 +++-
 mobile/plugins/ente_cast_normal/pubspec.lock |  12 +-
 mobile/pubspec.lock                          |  22 ++--
 mobile/pubspec.yaml                          |   4 +-
 6 files changed, 116 insertions(+), 76 deletions(-)

diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index 6769a1fcc8..c7558782b8 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -450,84 +450,84 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/wakelock_plus/ios"
 
 SPEC CHECKSUMS:
-  background_fetch: 39f11371c0dce04b001c4bfd5e782bcccb0a85e2
-  battery_info: 09f5c9ee65394f2291c8c6227bedff345b8a730c
-  connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
-  cupertino_http: 947a233f40cfea55167a49f2facc18434ea117ba
-  dart_ui_isolate: d5bcda83ca4b04f129d70eb90110b7a567aece14
-  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
+  background_fetch: 94b36ee293e82972852dba8ede1fbcd3bd3d9d57
+  battery_info: a06b00c06a39bc94c92beebf600f1810cb6c8c87
+  connectivity_plus: 3f6c9057f4cd64198dc826edfb0542892f825343
+  cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
+  dart_ui_isolate: 46f6714abe6891313267153ef6f9748d8ecfcab1
+  device_info_plus: 335f3ce08d2e174b9fdc3db3db0f4e3b1f66bd89
   ffmpeg-kit-ios-full-gpl: 80adc341962e55ef709e36baa8ed9a70cf4ea62b
-  ffmpeg_kit_flutter_full_gpl: 8d15c14c0c3aba616fac04fe44b3d27d02e3c330
-  file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
+  ffmpeg_kit_flutter_full_gpl: ce18b888487c05c46ed252cd2e7956812f2e3bd1
+  file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
   Firebase: 98e6bf5278170668a7983e12971a66b2cd57fc8c
-  firebase_core: 2bedc3136ec7c7b8561c6123ed0239387b53f2af
-  firebase_messaging: 15d114e1a41fc31e4fbabcd48d765a19eec94a38
+  firebase_core: 085320ddfaacb80d1a96eac3a87857afcc150db1
+  firebase_messaging: d398edc15fe825f832836e74f6ac61e8cd2f3ad3
   FirebaseCore: a282032ae9295c795714ded2ec9c522fc237f8da
   FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2
   FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414
   FirebaseMessaging: c9ec7b90c399c7a6100297e9d16f8a27fc7f7152
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
-  flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433
-  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
-  flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
-  flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
-  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
-  flutter_sodium: c84426b4de738514b5b66cfdeb8a06634e72fe0b
-  fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c
+  flutter_email_sender: cd533cdc7ea5eda6fabb2c7f78521c71207778a4
+  flutter_image_compress: 4b058288a81f76e5e80340af37c709abafff34c4
+  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
+  flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100
+  flutter_native_splash: 35ddbc7228eafcb3969dcc5f1fbbe27c1145a4f0
+  flutter_secure_storage: 2c2ff13db9e0a5647389bff88b0ecac56e3f3418
+  flutter_sodium: 152647449ba89a157fd48d7e293dcd6d29c6ab0e
+  fluttertoast: 76fea30fcf04176325f6864c87306927bd7d2038
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
-  home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57
-  image_editor_common: d6f6644ae4a6de80481e89fe6d0a8c49e30b4b43
-  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
-  in_app_purchase_storekit: 8c3b0b3eb1b0f04efbff401c3de6266d4258d433
-  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
+  home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
+  image_editor_common: 3de87e7c4804f4ae24c8f8a998362b98c105cac1
+  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
+  in_app_purchase_storekit: e126ef1b89e4a9fdf07e28f005f82632b4609437
+  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
   libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
-  local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
-  local_auth_ios: 5046a18c018dd973247a0564496c8898dbb5adf9
+  local_auth_darwin: 553ce4f9b16d3fdfeafce9cf042e7c9f77c1c391
+  local_auth_ios: f7a1841beef3151d140a967c2e46f30637cdf451
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
-  maps_launcher: 2e5b6a2d664ec6c27f82ffa81b74228d770ab203
-  media_extension: 6d30dc1431ebaa63f43c397c37917b1a0a597a4c
-  media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
-  media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
-  media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
-  motion_sensors: 03f55b7c637a7e365a0b5f9697a449f9059d5d91
-  motionphoto: d4a432b8c8f22fb3ad966258597c0103c9c5ff16
-  move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d
+  maps_launcher: edf829809ba9e894d70e569bab11c16352dedb45
+  media_extension: a1fec16ee9c8241a6aef9613578ebf097d6c5e64
+  media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
+  media_kit_native_event_loop: 5fba1a849a6c87a34985f1e178a0de5bd444a0cf
+  media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
+  motion_sensors: 741e702c17467b9569a92165dda8d4d88c6167f1
+  motionphoto: 584b43031ead3060225cdff08fa49818879801d2
+  move_to_background: 155f7bfbd34d43ad847cb630d2d2d87c17199710
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  native_video_player: d12af78a1a4a8cf09775a5177d5b392def6fd23c
-  objective_c: 77e887b5ba1827970907e10e832eec1683f3431d
-  onnxruntime: e7c2ae44385191eaad5ae64c935a72debaddc997
+  native_video_player: b65c58951ede2f93d103a25366bdebca95081265
+  objective_c: 89e720c30d716b036faf9c9684022048eee1eee2
+  onnxruntime: f9b296392c96c42882be020a59dbeac6310d81b2
   onnxruntime-c: a909204639a1f035f575127ac406f781ac797c9c
   onnxruntime-objc: b6fab0f1787aa6f7190c2013f03037df4718bd8b
-  open_mail_app: 794172f6a22cd16319d3ddaf45e945b2f74952b0
+  open_mail_app: 06d5a4162866388a92b1df3deb96e56be20cf45c
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
-  photo_manager: ff695c7a1dd5bc379974953a2b5c0a293f7c4c8a
-  privacy_screen: 1a131c052ceb3c3659934b003b0d397c2381a24e
+  package_info_plus: 566e1b7a2f3900e4b0020914ad3fc051dcc95596
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
+  photo_manager: d2fbcc0f2d82458700ee6256a15018210a81d413
+  privacy_screen: 3159a541f5d3a31bea916cfd4e58f9dc722b3fd4
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  receive_sharing_intent: df9c334dc9feadcbd3266e5cb49c8443405e1c9f
-  screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
+  receive_sharing_intent: f6a12b7e8f7ed745f61c982de8a65de88db44a44
+  screen_brightness_ios: 5ed898fa50fa82a26171c086ca5e28228f932576
   SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
   Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
-  sentry_flutter: 0eb93e5279eb41e2392212afe1ccd2fecb4f8cbe
-  share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sqflite_darwin: a553b1fd6fe66f53bbb0fe5b4f5bab93f08d7a13
+  sentry_flutter: 0a211008f52553ba5dd81ceb71f48d78f0f1f6ab
+  share_plus: 011d6fb4f9d2576b83179a3a5c5e323202cdabcf
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sqflite_darwin: 44bb54cc302bff1fbe5752293aba1820b157cf1c
   sqlite3: 0bb0e6389d824e40296f531b858a2a0b71c0d2fb
-  sqlite3_flutter_libs: c00457ebd31e59fa6bb830380ddba24d44fbcd3b
-  system_info_plus: 5393c8da281d899950d751713575fbf91c7709aa
+  sqlite3_flutter_libs: 9379996d65aa23dcda7585a5b58766cebe0aa042
+  system_info_plus: 555ce7047fbbf29154726db942ae785c29211740
   Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
-  ua_client_hints: 46bb5817a868f9e397c0ba7e3f2f5c5d90c35156
-  uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
-  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
-  video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1
-  volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
-  wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
+  ua_client_hints: 0b48eae1134283f5b131ee0871fa878377f07a01
+  uni_links: ed8c961e47ed9ce42b6d91e1de8049e38a4b3152
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
+  video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
+  video_thumbnail: b637e0ad5f588ca9945f6e2c927f73a69a661140
+  volume_controller: ca1cde542ee70fad77d388f82e9616488110942b
+  wakelock_plus: 8c239121a007daa1d6759c6acdc507860273dd2f
 
 PODFILE CHECKSUM: 20e086e6008977d43a3d40260f3f9bffcac748dd
 
diff --git a/mobile/plugins/ente_cast/pubspec.lock b/mobile/plugins/ente_cast/pubspec.lock
index 8de07d1e38..7c17037ed2 100644
--- a/mobile/plugins/ente_cast/pubspec.lock
+++ b/mobile/plugins/ente_cast/pubspec.lock
@@ -1,6 +1,14 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  async:
+    dependency: transitive
+    description:
+      name: async
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.13.0"
   characters:
     dependency: transitive
     description:
@@ -21,10 +29,18 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: "7d328c4d898a61efc3cd93655a0955858e29a0aa647f0f9e02d59b3bb275e2e8"
+      sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.6"
+    version: "5.8.0+1"
+  dio_web_adapter:
+    dependency: transitive
+    description:
+      name: dio_web_adapter
+      sha256: e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   ffi:
     dependency: transitive
     description:
diff --git a/mobile/plugins/ente_cast_none/pubspec.lock b/mobile/plugins/ente_cast_none/pubspec.lock
index ee83b2bd96..aeb3c20955 100644
--- a/mobile/plugins/ente_cast_none/pubspec.lock
+++ b/mobile/plugins/ente_cast_none/pubspec.lock
@@ -1,6 +1,14 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  async:
+    dependency: transitive
+    description:
+      name: async
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.13.0"
   characters:
     dependency: transitive
     description:
@@ -21,10 +29,18 @@ packages:
     dependency: transitive
     description:
       name: dio
-      sha256: "7d328c4d898a61efc3cd93655a0955858e29a0aa647f0f9e02d59b3bb275e2e8"
+      sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.6"
+    version: "5.8.0+1"
+  dio_web_adapter:
+    dependency: transitive
+    description:
+      name: dio_web_adapter
+      sha256: e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   ente_cast:
     dependency: "direct main"
     description:
diff --git a/mobile/plugins/ente_cast_normal/pubspec.lock b/mobile/plugins/ente_cast_normal/pubspec.lock
index 2d37f86c87..e1786a9a8f 100644
--- a/mobile/plugins/ente_cast_normal/pubspec.lock
+++ b/mobile/plugins/ente_cast_normal/pubspec.lock
@@ -38,10 +38,18 @@ packages:
     dependency: transitive
     description:
       name: dio
-      sha256: "7d328c4d898a61efc3cd93655a0955858e29a0aa647f0f9e02d59b3bb275e2e8"
+      sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.6"
+    version: "5.8.0+1"
+  dio_web_adapter:
+    dependency: transitive
+    description:
+      name: dio_web_adapter
+      sha256: e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   ente_cast:
     dependency: "direct main"
     description:
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index bc7f169214..0c14e7b23a 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -259,11 +259,11 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: forked_video_player_plus
-      resolved-ref: "2d8908efe9d7533ec76abe2e59444547c4031f28"
+      ref: mybranched
+      resolved-ref: "539079ac2758086ef4dfb602a5f8785bf5295fb3"
       url: "https://github.com/ente-io/chewie.git"
     source: git
-    version: "1.7.1"
+    version: "1.10.0"
   cli_util:
     dependency: transitive
     description:
@@ -1842,18 +1842,18 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017"
+      sha256: "67eae327b1b0faf761964a1d2e5d323c797f3799db0e85aa232db8d9e922bc35"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.0"
+    version: "8.2.1"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
+      sha256: "205ec83335c2ab9107bbba3f8997f9356d72ca3c715d2f038fc773d0366b4c76"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.1.0"
   page_transition:
     dependency: "direct main"
     description:
@@ -2922,18 +2922,18 @@ packages:
     dependency: "direct main"
     description:
       name: wakelock_plus
-      sha256: f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d
+      sha256: "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.4"
+    version: "1.2.10"
   wakelock_plus_platform_interface:
     dependency: transitive
     description:
       name: wakelock_plus_platform_interface
-      sha256: "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16"
+      sha256: "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   wallpaper_manager_flutter:
     dependency: "direct main"
     description:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 933e203bc7..4799f26441 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -31,7 +31,7 @@ dependencies:
   chewie:
     git:
       url: https://github.com/ente-io/chewie.git
-      ref: forked_video_player_plus
+      ref: mybranched
   collection: # dart
   computer:
     git: "https://github.com/ente-io/computer.git"
@@ -144,7 +144,7 @@ dependencies:
       url: https://github.com/ente-io/onnxruntime.git
       ref: ios_only
   open_mail_app: ^0.4.5
-  package_info_plus: ^4.1.0
+  package_info_plus: ^8.2.1
   page_transition: ^2.0.2
   panorama:
     git:

From 56f9f2a028fff142aa848597b2a251c49a741019 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 18:58:00 +0530
Subject: [PATCH 323/796] wrap

---
 web/packages/gallery/services/download.ts | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/web/packages/gallery/services/download.ts b/web/packages/gallery/services/download.ts
index 9b53765c48..03d6c0fa71 100644
--- a/web/packages/gallery/services/download.ts
+++ b/web/packages/gallery/services/download.ts
@@ -271,20 +271,14 @@ class DownloadManager {
     }
 
     private downloadThumbnail = async (file: EnteFile) => {
-        const encryptedData = await this._downloadThumbnail(file);
+        const encryptedData = await wrapErrors(() =>
+            this._downloadThumbnail(file),
+        );
         const decryptionHeader = file.thumbnail.decryptionHeader;
         return decryptThumbnail({ encryptedData, decryptionHeader }, file.key);
     };
 
     private async _downloadThumbnail(file: EnteFile) {
-        try {
-            return await this.__downloadThumbnail(file);
-        } catch (e) {
-            throw new NetworkDownloadError(e);
-        }
-    }
-
-    private async __downloadThumbnail(file: EnteFile) {
         if (this.publicAlbumsCredentials) {
             return publicAlbums_downloadThumbnail(
                 file,
@@ -393,7 +387,7 @@ class DownloadManager {
     ): Promise<ReadableStream<Uint8Array> | null> {
         log.info(`download attempted for file id ${file.id}`);
 
-        const res = await this._downloadFile(file);
+        const res = await wrapErrors(() => this._downloadFile(file));
 
         if (
             file.metadata.fileType === FileType.image ||
@@ -567,6 +561,15 @@ export class NetworkDownloadError extends Error {
 export const isNetworkDownloadError = (e: unknown) =>
     e instanceof NetworkDownloadError;
 
+/**
+ * A helper function to convert all rejections of the given promise {@link op}
+ * into {@link NetworkDownloadError}s.
+ */
+const wrapErrors = <T>(op: () => Promise<T>) =>
+    op().catch((e: unknown) => {
+        throw new NetworkDownloadError(e);
+    });
+
 /**
  * Create and return a {@link RenderableSourceURLs} for the given {@link file},
  * where {@link originalFileURLPromise} is a promise that resolves with an

From 8920462b54e2511e930affe28754e6e4dfad8e93 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 18:59:59 +0530
Subject: [PATCH 324/796] wrap

---
 web/packages/gallery/services/download.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/web/packages/gallery/services/download.ts b/web/packages/gallery/services/download.ts
index 03d6c0fa71..b36a06cc51 100644
--- a/web/packages/gallery/services/download.ts
+++ b/web/packages/gallery/services/download.ts
@@ -393,7 +393,9 @@ class DownloadManager {
             file.metadata.fileType === FileType.image ||
             file.metadata.fileType === FileType.livePhoto
         ) {
-            const encryptedData = new Uint8Array(await res.arrayBuffer());
+            const encryptedData = new Uint8Array(
+                await wrapErrors(() => res.arrayBuffer()),
+            );
 
             const decrypted = await decryptStreamBytes(
                 {
@@ -433,7 +435,9 @@ class DownloadManager {
                 do {
                     // done is a boolean and value is an Uint8Array. When done
                     // is true value will be empty.
-                    const { done, value } = await reader.read();
+                    const { done, value } = await wrapErrors(() =>
+                        reader.read(),
+                    );
 
                     let data: Uint8Array;
                     if (done) {

From 7035d3ca90922ad25d93fd67e58fd6b83dfedc3e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 19 Feb 2025 19:02:42 +0530
Subject: [PATCH 325/796] Use

---
 web/packages/new/photos/services/ml/worker.ts | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/web/packages/new/photos/services/ml/worker.ts b/web/packages/new/photos/services/ml/worker.ts
index 2e374aaca3..c4148fb555 100644
--- a/web/packages/new/photos/services/ml/worker.ts
+++ b/web/packages/new/photos/services/ml/worker.ts
@@ -4,6 +4,7 @@ import { isHTTP4xxError } from "@/base/http";
 import log from "@/base/log";
 import { logUnhandledErrorsAndRejectionsInWorker } from "@/base/log-web";
 import type { ElectronMLWorker } from "@/base/types/ipc";
+import { isNetworkDownloadError } from "@/gallery/services/download";
 import type { UploadItem } from "@/gallery/services/upload";
 import { fileLogID, type EnteFile } from "@/media/file";
 import { wait } from "@/utils/promise";
@@ -541,11 +542,16 @@ const index = async (
 
     // There is at least one ML data type that still needs to be indexed.
 
-    const renderableBlob = await fetchRenderableBlob(
-        file,
-        uploadItem,
-        electron,
-    );
+    let renderableBlob: Blob;
+    try {
+        renderableBlob = await fetchRenderableBlob(file, uploadItem, electron);
+    } catch (e) {
+        // Network errors are transient and shouldn't be marked.
+        //
+        // See: [Note: Transient and permanent indexing failures]
+        if (!isNetworkDownloadError(e)) await markIndexingFailed(fileID);
+        throw e;
+    }
 
     let image: ImageBitmapAndData;
     try {
@@ -557,7 +563,7 @@ const index = async (
         // reindexing attempt for failed files).
         //
         // See: [Note: Transient and permanent indexing failures]
-        await markIndexingFailed(file.id);
+        await markIndexingFailed(fileID);
         throw e;
     }
 
@@ -574,7 +580,7 @@ const index = async (
             ]);
         } catch (e) {
             // See: [Note: Transient and permanent indexing failures]
-            await markIndexingFailed(file.id);
+            await markIndexingFailed(fileID);
             throw e;
         }
 
@@ -615,7 +621,7 @@ const index = async (
             await putMLData(file, rawMLData);
         } catch (e) {
             // See: [Note: Transient and permanent indexing failures]
-            if (isHTTP4xxError(e)) await markIndexingFailed(file.id);
+            if (isHTTP4xxError(e)) await markIndexingFailed(fileID);
             throw e;
         }
 

From 664c40064d412dd1f9166ddab3fbabdf074e7e0a Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 19 Feb 2025 19:07:46 +0530
Subject: [PATCH 326/796] [mob][photos] people memories MVP

---
 mobile/lib/models/people_memory.dart          |  28 +-
 .../lib/services/smart_memories_service.dart  | 262 +++++++++++++++++-
 2 files changed, 279 insertions(+), 11 deletions(-)

diff --git a/mobile/lib/models/people_memory.dart b/mobile/lib/models/people_memory.dart
index 1a3dbaa7ce..dea66faf30 100644
--- a/mobile/lib/models/people_memory.dart
+++ b/mobile/lib/models/people_memory.dart
@@ -8,12 +8,36 @@ enum PeopleMemoryType {
   lastTimeYouSawThem,
 }
 
+enum PeopleActivity {
+  celebration,
+  // hiking,
+  // feast,
+  // selfies,
+  // sports
+}
+
+String activityQuery(PeopleActivity activity) {
+  switch (activity) {
+    case PeopleActivity.celebration:
+      return "Photo of people celebrating together";
+  }
+}
+
+String activityTitle(PeopleActivity activity, String personName) {
+  switch (activity) {
+    case PeopleActivity.celebration:
+      return "Celebrations with $personName";
+  }
+}
+
 class PeopleMemory extends SmartMemory {
+  final String personID;
   final PeopleMemoryType peopleMemoryType;
 
   PeopleMemory(
     List<Memory> memories,
-    this.peopleMemoryType, {
+    this.peopleMemoryType,
+    this.personID, {
     super.name,
     super.firstCreationTime,
     super.lastCreationTime,
@@ -23,6 +47,7 @@ class PeopleMemory extends SmartMemory {
   PeopleMemory copyWith({
     List<Memory>? memories,
     PeopleMemoryType? peopleMemoryType,
+    String? personID,
     String? name,
     int? firstCreationTime,
     int? lastCreationTime,
@@ -30,6 +55,7 @@ class PeopleMemory extends SmartMemory {
     return PeopleMemory(
       memories ?? super.memories,
       peopleMemoryType ?? this.peopleMemoryType,
+      personID ?? this.personID,
       name: name ?? super.name,
       firstCreationTime: firstCreationTime ?? super.firstCreationTime,
       lastCreationTime: lastCreationTime ?? super.lastCreationTime,
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 1cfbdd795f..9e97a402e7 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -5,6 +5,7 @@ import "package:flutter/material.dart";
 import "package:intl/intl.dart";
 import "package:logging/logging.dart";
 import "package:ml_linalg/vector.dart";
+import "package:photos/core/configuration.dart";
 import "package:photos/core/constants.dart";
 import "package:photos/core/event_bus.dart";
 import "package:photos/db/memories_db.dart";
@@ -18,12 +19,17 @@ import "package:photos/models/local_entity_data.dart";
 import "package:photos/models/location/location.dart";
 import "package:photos/models/location_tag/location_tag.dart";
 import "package:photos/models/memory.dart";
+import "package:photos/models/ml/face/face.dart";
+import "package:photos/models/ml/face/person.dart";
+import "package:photos/models/people_memory.dart";
 import "package:photos/models/smart_memory.dart";
 import "package:photos/models/time_memory.dart";
 import "package:photos/models/trip_memory.dart";
 import "package:photos/service_locator.dart";
 import "package:photos/services/location_service.dart";
+import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
 import "package:photos/services/machine_learning/ml_computer.dart";
+import "package:photos/services/machine_learning/ml_result.dart";
 import "package:photos/services/memories_service.dart";
 import "package:photos/services/search_service.dart";
 
@@ -43,8 +49,13 @@ class SmartMemoriesService {
   static const String clipPositiveQuery =
       'Photo of a precious memory radiating warmth, vibrant energy, or quiet beauty — alive with color, light, or emotion';
 
+  final Map<PeopleActivity, Vector> _clipPeopleActivityVectors = {};
+
   static const int _calculationWindowDays = 14;
 
+  static const _clipSimilarImageThreshold = 0.75;
+  static const _clipActivityQueryThreshold = 0.20;
+
   // Singleton pattern
   SmartMemoriesService._privateConstructor();
   static final instance = SmartMemoriesService._privateConstructor();
@@ -78,6 +89,16 @@ class SmartMemoriesService {
         _clipPositiveTextVector ??= Vector.fromList(embedding);
       }),
     );
+    for (final peopleActivity in PeopleActivity.values) {
+      unawaited(
+        MLComputer.instance
+            .runClipText(activityQuery(peopleActivity))
+            .then((embedding) {
+          _clipPeopleActivityVectors[peopleActivity] =
+              Vector.fromList(embedding);
+        }),
+      );
+    }
     _isInit = true;
     _logger.info("Smart memories service initialized");
   }
@@ -133,11 +154,10 @@ class SmartMemoriesService {
       // Pause 10 seconds TODO: lau: remove this later
       await Future.delayed(const Duration(seconds: 10));
 
-      // // People memories TODO: lau: add people
-      // final peopleMemories = await _getPeopleResults(allFiles, limit);
-      // _deductUsedMemories(allFiles, peopleMemories);
-      // memories.addAll(peopleMemories);
-      // _logger.finest("All files length: ${allFiles.length}");
+      final peopleMemories = await _getPeopleResults(allFiles, null);
+      _deductUsedMemories(allFiles, peopleMemories);
+      memories.addAll(peopleMemories);
+      _logger.finest("All files length: ${allFiles.length}");
 
       // Trip memories
       final tripMemories = await _getTripsResults(allFiles, null);
@@ -176,6 +196,230 @@ class SmartMemoriesService {
     files.removeAll(usedFiles);
   }
 
+  Future<List<PeopleMemory>> _getPeopleResults(
+    Iterable<EnteFile> allFiles,
+    int? limit, // TODO: lau: implement limit
+  ) async {
+    final List<PeopleMemory> memoryResults = [];
+    if (allFiles.isEmpty) return [];
+    final allFileIdsToFile = <int, EnteFile>{};
+    for (final file in allFiles) {
+      if (file.uploadedFileID != null) {
+        allFileIdsToFile[file.uploadedFileID!] = file;
+      }
+    }
+    final currentTime = DateTime.now().toLocal();
+
+    // Get ordered list of important people (all named, from most to least files)
+    final persons = await PersonService.instance.getPersons();
+    if (persons.length < 5) return []; // Stop if not enough named persons
+    final personIdToPerson = <String, PersonEntity>{};
+    final personIdToFaceIDs = <String, Set<String>>{};
+    final personIdToFileIDs = <String, Set<int>>{};
+    // final personIdToFaceIdToFace = <String, Map<String, Face>>{}; TODO: lau: try using relative face size as metric of importance
+    for (final person in persons) {
+      final personID = person.remoteID;
+      personIdToPerson[personID] = person;
+      personIdToFaceIDs[personID] = {};
+      personIdToFileIDs[personID] = {};
+      for (final cluster in person.data.assigned) {
+        if (cluster.faces.isEmpty) continue;
+        personIdToFaceIDs[personID]!.addAll(cluster.faces);
+        personIdToFileIDs[personID]!
+            .addAll(cluster.faces.map((faceID) => getFileIdFromFaceId(faceID)));
+      }
+    }
+    final List<String> orderedImportantPersonsID =
+        persons.map((p) => p.remoteID).toList();
+    orderedImportantPersonsID.sort((a, b) {
+      final aFaces = personIdToFaceIDs[a]!.length;
+      final bFaces = personIdToFaceIDs[b]!.length;
+      return bFaces.compareTo(aFaces);
+    });
+
+    // Check if the user has assignmed "me"
+    String? meID;
+    final currentUserEmail = Configuration.instance.getEmail();
+    for (final personEntity in persons) {
+      if (personEntity.data.email == currentUserEmail) {
+        meID = personEntity.remoteID;
+        break;
+      }
+    }
+    final bool isMeAssigned = meID != null;
+    Map<int, List<Face>>? meFilesToFaces;
+    if (isMeAssigned) {
+      final meFileIDs = personIdToFileIDs[meID]!;
+      meFilesToFaces = await MLDataDB.instance.getFacesForFileIDs(
+        meFileIDs,
+      );
+    }
+
+    // Loop through the people and find all memories
+    final Map<String, Map<PeopleMemoryType, PeopleMemory>> personToMemories =
+        {};
+    for (final personID in orderedImportantPersonsID) {
+      final personFileIDs = personIdToFileIDs[personID]!;
+      final personName = personIdToPerson[personID]!.data.name;
+      final Map<int, List<Face>> personFilesToFaces =
+          await MLDataDB.instance.getFacesForFileIDs(
+        personFileIDs,
+      );
+      // Inside people loop, check for spotlight
+      final spotlightFiles = <EnteFile>[];
+      for (final fileID in personFileIDs) {
+        final int personsPresent = personFilesToFaces[fileID]?.length ?? 10;
+        if (personsPresent > 2) continue;
+        final file = allFileIdsToFile[fileID];
+        if (file != null) {
+          spotlightFiles.add(file);
+        }
+      }
+      if (spotlightFiles.length > 5) {
+        String title = "Spotlight on $personName";
+        if (isMeAssigned && meID == personID) {
+          title = "Spotlight on yourself";
+        }
+        // TODO: lau: create selection on spotlightFiles on time, location and faces
+        final spotlightMemory = PeopleMemory(
+          spotlightFiles.map((f) => Memory.fromFile(f, _seenTimes)).toList(),
+          PeopleMemoryType.spotlight,
+          personID,
+          name: title,
+        );
+        personToMemories
+            .putIfAbsent(personID, () => {})
+            .putIfAbsent(PeopleMemoryType.spotlight, () => spotlightMemory);
+      }
+
+      // Inside people loop, check for youAndThem
+      if (isMeAssigned && meID != personID) {
+        final youAndThemFiles = <EnteFile>[];
+        for (final fileID in personFileIDs) {
+          final meFaces = meFilesToFaces![fileID];
+          final personFaces = personFilesToFaces[fileID] ?? [];
+          if (meFaces == null || personFaces.length != 2) continue;
+          final file = allFileIdsToFile[fileID];
+          if (file != null) {
+            youAndThemFiles.add(file);
+          }
+        }
+        if (youAndThemFiles.length > 5) {
+          final String title = "You and $personName";
+          // TODO: lau: create selection on youAndThemFiles on time and location
+          final youAndThemMemory = PeopleMemory(
+            youAndThemFiles.map((f) => Memory.fromFile(f, _seenTimes)).toList(),
+            PeopleMemoryType.youAndThem,
+            personID,
+            name: title,
+          );
+          personToMemories
+              .putIfAbsent(personID, () => {})
+              .putIfAbsent(PeopleMemoryType.spotlight, () => youAndThemMemory);
+        }
+      }
+
+      // Inside people loop, check for doingSomethingTogether
+      if (isMeAssigned && meID != personID) {
+        final fileIdToClip =
+            await MLDataDB.instance.getClipVectorsForFileIDs(personFileIDs);
+        final activityFiles = <EnteFile>[];
+        PeopleActivity lastActivity = PeopleActivity.values.first;
+        activityLoop:
+        for (final activity in PeopleActivity.values) {
+          activityFiles.clear();
+          lastActivity = activity;
+          final Vector? activityVector = _clipPeopleActivityVectors[activity];
+          if (activityVector == null) {
+            _logger.severe("No vector for activity $activity");
+            continue activityLoop;
+          }
+          for (final fileID in personFileIDs) {
+            final clipVector = fileIdToClip[fileID];
+            if (clipVector == null) continue;
+            final similarity = activityVector.dot(clipVector.vector);
+            if (similarity > _clipActivityQueryThreshold) {
+              final file = allFileIdsToFile[fileID];
+              if (file != null) {
+                activityFiles.add(file);
+              }
+            }
+          }
+          if (activityFiles.length > 5) break activityLoop;
+        }
+        if (activityFiles.length > 5) {
+          final String title = activityTitle(lastActivity, personName);
+          // TODO: lau: create selection on activityFiles on time and location
+          final activityMemory = PeopleMemory(
+            activityFiles.map((f) => Memory.fromFile(f, _seenTimes)).toList(),
+            PeopleMemoryType.doingSomethingTogether,
+            personID,
+            name: title,
+          );
+          personToMemories.putIfAbsent(personID, () => {}).putIfAbsent(
+                PeopleMemoryType.doingSomethingTogether,
+                () => activityMemory,
+              );
+        }
+      }
+
+      // Inside people loop, check for lastTimeYouSawThem
+      final lastTimeYouSawThemFiles = <EnteFile>[];
+      int lastCreationTime = 0;
+      bool longAgo = true;
+      fileLoop:
+      for (final fileID in personFileIDs) {
+        final file = allFileIdsToFile[fileID];
+        if (file != null && file.creationTime != null) {
+          final creationTime = file.creationTime!;
+          final creationDateTime =
+              DateTime.fromMicrosecondsSinceEpoch(creationTime);
+          if (currentTime.difference(creationDateTime).inDays < 365) {
+            longAgo = false;
+            break fileLoop;
+          }
+          if (creationTime > lastCreationTime) {
+            final lastDateTime =
+                DateTime.fromMicrosecondsSinceEpoch(lastCreationTime);
+            if (creationDateTime.difference(lastDateTime).inHours > 24) {
+              lastTimeYouSawThemFiles.clear();
+            }
+            lastCreationTime = creationTime;
+            lastTimeYouSawThemFiles.add(file);
+          }
+        }
+      }
+      if (longAgo && lastTimeYouSawThemFiles.length >= 5) {
+        final String title = "Last time with $personName";
+        final lastTimeMemory = PeopleMemory(
+          lastTimeYouSawThemFiles
+              .map((f) => Memory.fromFile(f, _seenTimes))
+              .toList(),
+          PeopleMemoryType.lastTimeYouSawThem,
+          personID,
+          name: title,
+        );
+        personToMemories.putIfAbsent(personID, () => {}).putIfAbsent(
+              PeopleMemoryType.lastTimeYouSawThem,
+              () => lastTimeMemory,
+            );
+      }
+    }
+
+    // Surface everything just for debug checking
+    for (final personID in personToMemories.keys) {
+      for (final memoryType in personToMemories[personID]!.keys) {
+        memoryResults.add(personToMemories[personID]![memoryType]!);
+      }
+    }
+
+    // Loop through the people and check if we should surface anything based on relevancy (bday, last met)
+
+    // Loop through the people (and memory types) and add the remaining memories (for this month only?)
+
+    return memoryResults;
+  }
+
   Future<List<TripMemory>> _getTripsResults(
     Iterable<EnteFile> allFiles,
     int? limit,
@@ -536,8 +780,7 @@ class SmartMemoriesService {
             final year =
                 DateTime.fromMicrosecondsSinceEpoch(trip.averageCreationTime())
                     .year;
-            final String? locationName =
-                _tryFindLocationName(trip.memories);
+            final String? locationName = _tryFindLocationName(trip.memories);
             String name = "Trip in $year";
             if (locationName != null) {
               name = "Trip to $locationName";
@@ -827,7 +1070,6 @@ class SmartMemoriesService {
     }).toSet();
 
     // Get clip scores for each file
-    const clipThreshold = 0.75;
     final fileToScore = <int, double>{};
     for (final mem in safeMemories) {
       final clip = fileIdToClip[mem.file.uploadedFileID!];
@@ -883,7 +1125,7 @@ class SmartMemoriesService {
             final fClip = fileIdToClip[filteredMem.file.uploadedFileID!];
             if (fClip == null) continue;
             final similarity = clip.vector.dot(fClip.vector);
-            if (similarity > clipThreshold) {
+            if (similarity > _clipSimilarImageThreshold) {
               skipped++;
               continue filesLoop;
             }
@@ -941,7 +1183,7 @@ class SmartMemoriesService {
                 final fClip = fileIdToClip[filteredMem.file.uploadedFileID!];
                 if (fClip == null) continue;
                 final similarity = clip.vector.dot(fClip.vector);
-                if (similarity > clipThreshold) {
+                if (similarity > _clipSimilarImageThreshold) {
                   skipped++;
                   continue yearLoop;
                 }

From 82fdae9253d3dfd74c3b26c2a8a86451a8c6fb0a Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Wed, 19 Feb 2025 20:36:30 +0530
Subject: [PATCH 327/796] fix: seek bar & buffering

---
 .../ui/viewer/file/preview_video_widget.dart  |   1 +
 mobile/lib/ui/viewer/file/video_control.dart  | 569 ++++++++----------
 .../video_control/custom_progress_bar.dart    |  41 ++
 3 files changed, 291 insertions(+), 320 deletions(-)
 create mode 100644 mobile/lib/ui/viewer/file/video_control/custom_progress_bar.dart

diff --git a/mobile/lib/ui/viewer/file/preview_video_widget.dart b/mobile/lib/ui/viewer/file/preview_video_widget.dart
index 01b51df09b..be2c7034a8 100644
--- a/mobile/lib/ui/viewer/file/preview_video_widget.dart
+++ b/mobile/lib/ui/viewer/file/preview_video_widget.dart
@@ -244,6 +244,7 @@ class _PreviewVideoWidgetState extends State<PreviewVideoWidget> {
       }
     });
     _chewieController = ChewieController(
+      progressIndicatorDelay: const Duration(milliseconds: 200),
       videoPlayerController: _videoPlayerController!,
       aspectRatio: _videoPlayerController!.value.aspectRatio,
       autoPlay: widget.autoPlay!,
diff --git a/mobile/lib/ui/viewer/file/video_control.dart b/mobile/lib/ui/viewer/file/video_control.dart
index b0384895b9..4048a28836 100644
--- a/mobile/lib/ui/viewer/file/video_control.dart
+++ b/mobile/lib/ui/viewer/file/video_control.dart
@@ -1,13 +1,18 @@
+// ignore_for_file: implementation_imports
+
 import 'dart:async';
 
-import 'package:chewie/chewie.dart';
+import "package:chewie/chewie.dart";
+import "package:chewie/src/helpers/utils.dart";
+import "package:chewie/src/notifiers/index.dart";
 import 'package:flutter/material.dart';
 import "package:photos/models/file/file.dart";
 import "package:photos/theme/colors.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/common/loading_widget.dart";
 import "package:photos/ui/viewer/file/preview_status_widget.dart";
-import "package:photos/utils/debouncer.dart";
+import "package:photos/ui/viewer/file/video_control/custom_progress_bar.dart";
+import 'package:provider/provider.dart';
 import 'package:video_player/video_player.dart';
 
 class VideoControls extends StatefulWidget {
@@ -27,9 +32,10 @@ class VideoControls extends StatefulWidget {
   }
 }
 
-class _VideoControlsState extends State<VideoControls> {
-  VideoPlayerValue? _latestValue;
-  bool _hideStuff = true;
+class _VideoControlsState extends State<VideoControls>
+    with SingleTickerProviderStateMixin {
+  late PlayerNotifier notifier;
+  late VideoPlayerValue _latestValue;
   Timer? _hideTimer;
   Timer? _initTimer;
   Timer? _showAfterExpandCollapseTimer;
@@ -38,34 +44,35 @@ class _VideoControlsState extends State<VideoControls> {
   Timer? _bufferingDisplayTimer;
   bool _displayBufferingIndicator = false;
 
-  final barHeight = 120.0;
+  final barHeight = 48.0 * 1.5;
   final marginSize = 5.0;
 
   late VideoPlayerController controller;
-  ChewieController? chewieController;
+  ChewieController? _chewieController;
 
-  void _bufferingTimerTimeout() {
-    _displayBufferingIndicator = true;
-    if (mounted) {
-      setState(() {});
-    }
+  // We know that _chewieController is set in didChangeDependencies
+  ChewieController get chewieController => _chewieController!;
+
+  @override
+  void initState() {
+    super.initState();
+    notifier = Provider.of<PlayerNotifier>(context, listen: false);
   }
 
   @override
   Widget build(BuildContext context) {
-    if (_latestValue!.hasError) {
-      return chewieController!.errorBuilder != null
-          ? chewieController!.errorBuilder!(
-              context,
-              chewieController!.videoPlayerController.value.errorDescription!,
-            )
-          : Center(
-              child: Icon(
-                Icons.error,
-                color: Theme.of(context).colorScheme.onSurface,
-                size: 42,
-              ),
-            );
+    if (_latestValue.hasError) {
+      return chewieController.errorBuilder?.call(
+            context,
+            chewieController.videoPlayerController.value.errorDescription!,
+          ) ??
+          Center(
+            child: Icon(
+              Icons.error,
+              color: Theme.of(context).colorScheme.onSurface,
+              size: 42,
+            ),
+          );
     }
 
     return MouseRegion(
@@ -75,43 +82,35 @@ class _VideoControlsState extends State<VideoControls> {
       child: GestureDetector(
         onTap: () => _cancelAndRestartTimer(),
         child: AbsorbPointer(
-          absorbing: _hideStuff,
+          absorbing: notifier.hideStuff,
           child: Stack(
-            children: <Widget>[
-              if (_latestValue != null &&
-                      !_latestValue!.isPlaying &&
-                      _latestValue!.isBuffering ||
-                  _displayBufferingIndicator)
-                const Align(
-                  alignment: Alignment.center,
-                  child: Center(
-                    child: EnteLoadingWidget(
-                      size: 32,
-                      color: fillBaseDark,
-                      padding: 0,
-                    ),
-                  ),
-                )
-              else
-                Positioned.fill(child: _buildHitArea()),
-              Align(
-                alignment: Alignment.bottomCenter,
-                child: SafeArea(
-                  top: false,
-                  left: false,
-                  right: false,
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      PreviewStatusWidget(
-                        showControls: !_hideStuff,
-                        file: widget.file,
-                        isPreviewPlayer: true,
-                        onStreamChange: widget.onStreamChange,
+            children: [
+              if (_displayBufferingIndicator)
+                _chewieController?.bufferingBuilder?.call(context) ??
+                    const Center(
+                      child: EnteLoadingWidget(
+                        size: 32,
+                        color: fillBaseDark,
+                        padding: 0,
                       ),
-                      _buildBottomBar(context),
-                    ],
-                  ),
+                    )
+              else
+                _buildHitArea(),
+              SafeArea(
+                top: false,
+                left: false,
+                right: false,
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.end,
+                  children: <Widget>[
+                    PreviewStatusWidget(
+                      showControls: !notifier.hideStuff,
+                      file: widget.file,
+                      isPreviewPlayer: true,
+                      onStreamChange: widget.onStreamChange,
+                    ),
+                    if (!chewieController.isLive) _buildBottomBar(context),
+                  ],
                 ),
               ),
             ],
@@ -136,9 +135,9 @@ class _VideoControlsState extends State<VideoControls> {
 
   @override
   void didChangeDependencies() {
-    final oldController = chewieController;
-    chewieController = ChewieController.of(context);
-    controller = chewieController!.videoPlayerController;
+    final oldController = _chewieController;
+    _chewieController = ChewieController.of(context);
+    controller = chewieController.videoPlayerController;
 
     if (oldController != chewieController) {
       _dispose();
@@ -148,35 +147,75 @@ class _VideoControlsState extends State<VideoControls> {
     super.didChangeDependencies();
   }
 
-  Widget _buildBottomBar(
+  AnimatedOpacity _buildBottomBar(
     BuildContext context,
   ) {
-    return Container(
-      padding: const EdgeInsets.only(bottom: 60),
-      height: 100,
-      child: AnimatedOpacity(
-        opacity: _hideStuff ? 0.0 : 1.0,
-        duration: const Duration(milliseconds: 300),
-        child: _SeekBarAndDuration(
-          controller: controller,
-          latestValue: _latestValue,
-          updateDragging: (bool value) {
-            setState(() {
-              _dragging = value;
-            });
-          },
+    return AnimatedOpacity(
+      opacity: notifier.hideStuff ? 0.0 : 1.0,
+      duration: const Duration(milliseconds: 300),
+      child: Container(
+        height: 40,
+        margin: const EdgeInsets.only(bottom: 60),
+        child: Container(
+          padding: const EdgeInsets.fromLTRB(
+            16,
+            4,
+            16,
+            4,
+          ),
+          decoration: BoxDecoration(
+            color: Colors.black.withOpacity(0.3),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(8),
+            ),
+            border: Border.all(
+              color: strokeFaintDark,
+              width: 1,
+            ),
+          ),
+          child: Row(
+            children: [
+              Text(
+                formatDuration(_latestValue.position),
+                style: getEnteTextTheme(
+                  context,
+                ).mini.copyWith(
+                      color: textBaseDark,
+                    ),
+              ),
+              const SizedBox(width: 16),
+              Expanded(
+                child: _buildProgressBar(),
+              ),
+              const SizedBox(width: 16),
+              Text(
+                formatDuration(
+                  _latestValue.duration,
+                ),
+                style: getEnteTextTheme(
+                  context,
+                ).mini.copyWith(
+                      color: textBaseDark,
+                    ),
+              ),
+            ],
+          ),
         ),
       ),
     );
   }
 
   Widget _buildHitArea() {
+    final bool isFinished = (_latestValue.position >= _latestValue.duration) &&
+        _latestValue.duration.inSeconds > 0;
+    final bool showPlayButton = true && !_dragging && !notifier.hideStuff;
+
     return GestureDetector(
       onTap: () {
-        if (_latestValue != null) {
+        if (_latestValue.isPlaying) {
           if (_displayTapped) {
             setState(() {
-              _hideStuff = !_hideStuff;
+              notifier.hideStuff = true;
             });
           } else {
             _cancelAndRestartTimer();
@@ -185,20 +224,32 @@ class _VideoControlsState extends State<VideoControls> {
           _playPause();
 
           setState(() {
-            _hideStuff = true;
+            notifier.hideStuff = true;
           });
         }
-        widget.playbackCallback?.call(_hideStuff);
+        widget.playbackCallback?.call(notifier.hideStuff);
       },
-      behavior: HitTestBehavior.opaque,
-      child: AnimatedOpacity(
-        opacity: _latestValue != null && !_hideStuff && !_dragging ? 1.0 : 0.0,
-        duration: const Duration(milliseconds: 300),
-        child: Center(
-          child: _PlayPauseButton(
-            _playPause,
-            _latestValue!.isPlaying,
-          ),
+      child: Container(
+        alignment: Alignment.center,
+        color: Colors
+            .transparent, // The Gesture Detector doesn't expand to the full size of the container without this; Not sure why!
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Container(
+              margin: EdgeInsets.symmetric(
+                horizontal: marginSize,
+              ),
+              child: CenterPlayButton(
+                backgroundColor: Colors.black54,
+                iconColor: Colors.white,
+                isFinished: isFinished,
+                isPlaying: controller.value.isPlaying,
+                show: showPlayButton,
+                onPressed: _playPause,
+              ),
+            ),
+          ],
         ),
       ),
     );
@@ -209,10 +260,10 @@ class _VideoControlsState extends State<VideoControls> {
     _startHideTimer();
 
     setState(() {
-      _hideStuff = false;
+      notifier.hideStuff = false;
       _displayTapped = true;
     });
-    widget.playbackCallback?.call(_hideStuff);
+    widget.playbackCallback?.call(notifier.hideStuff);
   }
 
   Future<void> _initialize() async {
@@ -220,26 +271,28 @@ class _VideoControlsState extends State<VideoControls> {
 
     _updateState();
 
-    if ((controller.value.isPlaying) || chewieController!.autoPlay) {
+    if (controller.value.isPlaying || chewieController.autoPlay) {
       _startHideTimer();
     }
 
-    if (chewieController!.showControlsOnInitialize) {
+    if (chewieController.showControlsOnInitialize) {
       _initTimer = Timer(const Duration(milliseconds: 200), () {
         setState(() {
-          _hideStuff = false;
+          notifier.hideStuff = false;
         });
-        widget.playbackCallback?.call(_hideStuff);
+        widget.playbackCallback?.call(notifier.hideStuff);
       });
     }
   }
 
   void _playPause() {
-    final bool isFinished = _latestValue!.position >= _latestValue!.duration;
+    final bool isFinished = (_latestValue.position >= _latestValue.duration) &&
+        _latestValue.duration.inSeconds > 0;
 
     setState(() {
       if (controller.value.isPlaying) {
-        _hideStuff = false;
+        notifier.hideStuff = false;
+        widget.playbackCallback?.call(notifier.hideStuff);
         _hideTimer?.cancel();
         controller.pause();
       } else {
@@ -251,30 +304,41 @@ class _VideoControlsState extends State<VideoControls> {
           });
         } else {
           if (isFinished) {
-            controller.seekTo(const Duration(seconds: 0));
+            controller.seekTo(Duration.zero);
           }
           controller.play();
         }
       }
-      widget.playbackCallback?.call(_hideStuff);
     });
   }
 
   void _startHideTimer() {
-    _hideTimer = Timer(const Duration(seconds: 2), () {
+    final hideControlsTimer = chewieController.hideControlsTimer.isNegative
+        ? ChewieController.defaultHideControlsTimer
+        : chewieController.hideControlsTimer;
+    _hideTimer = Timer(hideControlsTimer, () {
       setState(() {
-        _hideStuff = true;
+        notifier.hideStuff = true;
+        widget.playbackCallback?.call(notifier.hideStuff);
       });
-      widget.playbackCallback?.call(_hideStuff);
     });
   }
 
+  void _bufferingTimerTimeout() {
+    _displayBufferingIndicator = true;
+    if (mounted) {
+      setState(() {});
+    }
+  }
+
   void _updateState() {
+    if (!mounted) return;
+
     // display the progress bar indicator only after the buffering delay if it has been set
-    if (chewieController?.progressIndicatorDelay != null) {
+    if (chewieController.progressIndicatorDelay != null) {
       if (controller.value.isBuffering) {
         _bufferingDisplayTimer ??= Timer(
-          chewieController!.progressIndicatorDelay!,
+          chewieController.progressIndicatorDelay!,
           _bufferingTimerTimeout,
         );
       } else {
@@ -285,239 +349,104 @@ class _VideoControlsState extends State<VideoControls> {
     } else {
       _displayBufferingIndicator = controller.value.isBuffering;
     }
+
     setState(() {
       _latestValue = controller.value;
     });
   }
+
+  Widget _buildProgressBar() {
+    final colorScheme = getEnteColorScheme(context);
+    return Expanded(
+      child: CustomProgressBar(
+        controller,
+        onDragStart: () {
+          setState(() {
+            _dragging = true;
+          });
+
+          _hideTimer?.cancel();
+        },
+        onDragUpdate: () {
+          _hideTimer?.cancel();
+        },
+        onDragEnd: () {
+          setState(() {
+            _dragging = false;
+          });
+
+          _startHideTimer();
+        },
+        colors: ChewieProgressColors(
+          playedColor: colorScheme.primary300,
+          handleColor: backgroundElevatedLight,
+          bufferedColor: backgroundElevatedLight.withOpacity(0.5),
+          backgroundColor: fillMutedDark,
+        ),
+        draggableProgressBar: chewieController.draggableProgressBar,
+      ),
+    );
+  }
 }
 
-class _SeekBarAndDuration extends StatelessWidget {
-  final VideoPlayerController? controller;
-  final VideoPlayerValue? latestValue;
-  final Function(bool) updateDragging;
-
-  const _SeekBarAndDuration({
-    required this.controller,
-    required this.latestValue,
-    required this.updateDragging,
+class CenterPlayButton extends StatelessWidget {
+  const CenterPlayButton({
+    super.key,
+    required this.backgroundColor,
+    this.iconColor,
+    required this.show,
+    required this.isPlaying,
+    required this.isFinished,
+    this.onPressed,
   });
 
+  final Color backgroundColor;
+  final Color? iconColor;
+  final bool show;
+  final bool isPlaying;
+  final bool isFinished;
+  final VoidCallback? onPressed;
+
   @override
   Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(
-        horizontal: 8,
-      ),
+    return AnimatedOpacity(
+      opacity: show ? 1.0 : 0.0,
+      duration: const Duration(milliseconds: 300),
       child: Container(
-        padding: const EdgeInsets.fromLTRB(
-          16,
-          4,
-          16,
-          4,
-        ),
+        width: 54,
+        height: 54,
         decoration: BoxDecoration(
           color: Colors.black.withOpacity(0.3),
-          borderRadius: const BorderRadius.all(
-            Radius.circular(8),
-          ),
+          shape: BoxShape.circle,
           border: Border.all(
             color: strokeFaintDark,
             width: 1,
           ),
         ),
-        child: Row(
-          children: [
-            if (latestValue?.position == null)
-              Text(
-                "0:00",
-                style: getEnteTextTheme(
-                  context,
-                ).mini.copyWith(
-                      color: textBaseDark,
-                    ),
-              )
-            else
-              Text(
-                _secondsToDuration(latestValue!.position.inSeconds),
-                style: getEnteTextTheme(
-                  context,
-                ).mini.copyWith(
-                      color: textBaseDark,
-                    ),
-              ),
-            Expanded(
-              child: _SeekBar(controller!, updateDragging),
-            ),
-            Text(
-              _secondsToDuration(
-                latestValue?.duration.inSeconds ?? 0,
-              ),
-              style: getEnteTextTheme(
-                context,
-              ).mini.copyWith(
-                    color: textBaseDark,
+        child: GestureDetector(
+          behavior: HitTestBehavior.opaque,
+          onTap: onPressed,
+          child: AnimatedSwitcher(
+            duration: const Duration(milliseconds: 250),
+            transitionBuilder: (Widget child, Animation<double> animation) {
+              return ScaleTransition(scale: animation, child: child);
+            },
+            switchInCurve: Curves.easeInOutQuart,
+            switchOutCurve: Curves.easeInOutQuart,
+            child: isPlaying
+                ? const Icon(
+                    Icons.pause,
+                    size: 32,
+                    key: ValueKey("pause"),
+                    color: Colors.white,
+                  )
+                : const Icon(
+                    Icons.play_arrow,
+                    size: 36,
+                    key: ValueKey("play"),
+                    color: Colors.white,
                   ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  /// Returns the duration in the format "h:mm:ss" or "m:ss".
-  String _secondsToDuration(int totalSeconds) {
-    final hours = totalSeconds ~/ 3600;
-    final minutes = (totalSeconds % 3600) ~/ 60;
-    final seconds = totalSeconds % 60;
-
-    if (hours > 0) {
-      return '${hours.toString().padLeft(1, '0')}:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}';
-    } else {
-      return '${minutes.toString().padLeft(1, '0')}:${seconds.toString().padLeft(2, '0')}';
-    }
-  }
-}
-
-class _SeekBar extends StatefulWidget {
-  final VideoPlayerController controller;
-  final Function(bool) updateDragging;
-  const _SeekBar(
-    this.controller,
-    this.updateDragging,
-  );
-
-  @override
-  State<_SeekBar> createState() => _SeekBarState();
-}
-
-class _SeekBarState extends State<_SeekBar> {
-  double _sliderValue = 0.0;
-  final _debouncer = Debouncer(
-    const Duration(milliseconds: 300),
-    executionInterval: const Duration(milliseconds: 300),
-  );
-  bool _controllerWasPlaying = false;
-
-  @override
-  void initState() {
-    super.initState();
-    widget.controller.addListener(updateSlider);
-  }
-
-  void updateSlider() {
-    if (widget.controller.value.isInitialized) {
-      setState(() {
-        _sliderValue = widget.controller.value.position.inSeconds.toDouble();
-      });
-    }
-  }
-
-  @override
-  void dispose() {
-    _debouncer.cancelDebounceTimer();
-    widget.controller.removeListener(updateSlider);
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final colorScheme = getEnteColorScheme(context);
-    return SliderTheme(
-      data: SliderTheme.of(context).copyWith(
-        trackHeight: 1.0,
-        thumbShape: const RoundSliderThumbShape(enabledThumbRadius: 8.0),
-        overlayShape: const RoundSliderOverlayShape(overlayRadius: 14.0),
-        activeTrackColor: colorScheme.primary300,
-        inactiveTrackColor: fillMutedDark,
-        thumbColor: backgroundElevatedLight,
-        overlayColor: fillMutedDark,
-      ),
-      child: Slider(
-        min: 0.0,
-        max: widget.controller.value.duration.inSeconds.toDouble(),
-        value: _sliderValue,
-        onChangeStart: (value) async {
-          widget.updateDragging(true);
-          _controllerWasPlaying = widget.controller.value.isPlaying;
-          if (_controllerWasPlaying) {
-            await widget.controller.pause();
-          }
-        },
-        onChanged: (value) {
-          if (mounted) {
-            setState(() {
-              _sliderValue = value;
-            });
-          }
-
-          _debouncer.run(() async {
-            await widget.controller.seekTo(Duration(seconds: value.toInt()));
-          });
-        },
-        divisions: 4500,
-        onChangeEnd: (value) async {
-          await widget.controller.seekTo(Duration(seconds: value.toInt()));
-
-          if (_controllerWasPlaying) {
-            await widget.controller.play();
-          }
-          widget.updateDragging(false);
-        },
-        allowedInteraction: SliderInteraction.tapAndSlide,
-      ),
-    );
-  }
-}
-
-class _PlayPauseButton extends StatefulWidget {
-  final void Function() playPause;
-  final bool isPlaying;
-  const _PlayPauseButton(
-    this.playPause,
-    this.isPlaying,
-  );
-
-  @override
-  State<_PlayPauseButton> createState() => _PlayPauseButtonState();
-}
-
-class _PlayPauseButtonState extends State<_PlayPauseButton> {
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      width: 54,
-      height: 54,
-      decoration: BoxDecoration(
-        color: Colors.black.withOpacity(0.3),
-        shape: BoxShape.circle,
-        border: Border.all(
-          color: strokeFaintDark,
-          width: 1,
-        ),
-      ),
-      child: GestureDetector(
-        behavior: HitTestBehavior.opaque,
-        onTap: widget.playPause,
-        child: AnimatedSwitcher(
-          duration: const Duration(milliseconds: 250),
-          transitionBuilder: (Widget child, Animation<double> animation) {
-            return ScaleTransition(scale: animation, child: child);
-          },
-          switchInCurve: Curves.easeInOutQuart,
-          switchOutCurve: Curves.easeInOutQuart,
-          child: widget.isPlaying
-              ? const Icon(
-                  Icons.pause,
-                  size: 32,
-                  key: ValueKey("pause"),
-                  color: Colors.white,
-                )
-              : const Icon(
-                  Icons.play_arrow,
-                  size: 36,
-                  key: ValueKey("play"),
-                  color: Colors.white,
-                ),
+          ),
         ),
       ),
     );
diff --git a/mobile/lib/ui/viewer/file/video_control/custom_progress_bar.dart b/mobile/lib/ui/viewer/file/video_control/custom_progress_bar.dart
new file mode 100644
index 0000000000..563f6d1a07
--- /dev/null
+++ b/mobile/lib/ui/viewer/file/video_control/custom_progress_bar.dart
@@ -0,0 +1,41 @@
+// ignore_for_file: implementation_imports
+
+import "package:chewie/src/chewie_progress_colors.dart";
+import "package:chewie/src/progress_bar.dart";
+import "package:flutter/material.dart";
+import "package:flutter/widgets.dart";
+import "package:video_player/video_player.dart";
+
+class CustomProgressBar extends StatelessWidget {
+  CustomProgressBar(
+    this.controller, {
+    ChewieProgressColors? colors,
+    this.onDragEnd,
+    this.onDragStart,
+    this.onDragUpdate,
+    super.key,
+    this.draggableProgressBar = true,
+  }) : colors = colors ?? ChewieProgressColors();
+
+  final VideoPlayerController controller;
+  final ChewieProgressColors colors;
+  final Function()? onDragStart;
+  final Function()? onDragEnd;
+  final Function()? onDragUpdate;
+  final bool draggableProgressBar;
+
+  @override
+  Widget build(BuildContext context) {
+    return VideoProgressBar(
+      controller,
+      barHeight: 1.5,
+      handleHeight: 8,
+      drawShadow: true,
+      colors: colors,
+      onDragEnd: onDragEnd,
+      onDragStart: onDragStart,
+      onDragUpdate: onDragUpdate,
+      draggableProgressBar: draggableProgressBar,
+    );
+  }
+}

From 68bc6fac38503bbd13c0a76a2470d9d9fcf29229 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Wed, 19 Feb 2025 20:36:38 +0530
Subject: [PATCH 328/796] chore: bump locks

---
 mobile/ios/Podfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index c7558782b8..93a14d304a 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -502,7 +502,7 @@ SPEC CHECKSUMS:
   onnxruntime-objc: b6fab0f1787aa6f7190c2013f03037df4718bd8b
   open_mail_app: 06d5a4162866388a92b1df3deb96e56be20cf45c
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: 566e1b7a2f3900e4b0020914ad3fc051dcc95596
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
   path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
   permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
   photo_manager: d2fbcc0f2d82458700ee6256a15018210a81d413
@@ -527,7 +527,7 @@ SPEC CHECKSUMS:
   video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
   video_thumbnail: b637e0ad5f588ca9945f6e2c927f73a69a661140
   volume_controller: ca1cde542ee70fad77d388f82e9616488110942b
-  wakelock_plus: 8c239121a007daa1d6759c6acdc507860273dd2f
+  wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49
 
 PODFILE CHECKSUM: 20e086e6008977d43a3d40260f3f9bffcac748dd
 

From 7b902a607a93244cce1e26ff76df7d2a1845a091 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Wed, 19 Feb 2025 20:37:11 +0530
Subject: [PATCH 329/796] chore: bump version

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 4799f26441..b742983207 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.99+999
+version: 0.9.99+1002
 publish_to: none
 
 environment:

From d25e37e2ad0beec0e9873c499463e88cb4b9cb55 Mon Sep 17 00:00:00 2001
From: Francis Geronimo <midtown1672@gmail.com>
Date: Wed, 19 Feb 2025 17:33:13 -0700
Subject: [PATCH 330/796] New Icons

ButterFlyMX
FreeTaxUSA
---
 .../custom-icons/_data/custom-icons.json      |  8 ++++++
 .../assets/custom-icons/icons/Butterflymx.svg | 27 +++++++++++++++++++
 auth/assets/custom-icons/icons/freetaxusa.svg |  1 +
 3 files changed, 36 insertions(+)
 create mode 100644 auth/assets/custom-icons/icons/Butterflymx.svg
 create mode 100644 auth/assets/custom-icons/icons/freetaxusa.svg

diff --git a/auth/assets/custom-icons/_data/custom-icons.json b/auth/assets/custom-icons/_data/custom-icons.json
index 5493087930..9106dfb6a0 100644
--- a/auth/assets/custom-icons/_data/custom-icons.json
+++ b/auth/assets/custom-icons/_data/custom-icons.json
@@ -208,6 +208,10 @@
     {
       "title": "Bugzilla"
     },
+    {
+      "title": "ButterflyMX",
+      "slug": "butterflymx"
+    },
     {
       "title": "Bybit"
     },
@@ -396,6 +400,10 @@
     {
       "title": "ForUsAll"
     },
+    {
+      "title": "FreeTaxUSA",
+      "slug": "freetaxusa"
+    },
     {
       "title": "G2A"
     },
diff --git a/auth/assets/custom-icons/icons/Butterflymx.svg b/auth/assets/custom-icons/icons/Butterflymx.svg
new file mode 100644
index 0000000000..b73c3b15b9
--- /dev/null
+++ b/auth/assets/custom-icons/icons/Butterflymx.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="462px" height="404px" viewBox="0 0 462 404" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="464.529999" y1="-2595.189941" x2="1224.150024" y2="-2986.919922" gradientTransform="matrix(0.249968,0,0,-0.249968,150.980393,-561.725816)">
+<stop offset="0" style="stop-color:rgb(100%,92.156863%,18.039216%);stop-opacity:1;"/>
+<stop offset="0.92" style="stop-color:rgb(99.607843%,56.470591%,18.82353%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="-580.880005" y1="-2987.179932" x2="121.110001" y2="-2623.179932" gradientTransform="matrix(0.249968,0,0,-0.249968,150.980393,-561.725816)">
+<stop offset="0.06" style="stop-color:rgb(0%,40.784314%,89.803922%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(3.921569%,85.09804%,100%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="1063.689941" y1="-3644.949951" x2="436.269989" y2="-3207.530029" gradientTransform="matrix(0.249968,0,0,-0.249968,150.980393,-561.725816)">
+<stop offset="0" style="stop-color:rgb(93.725491%,3.921569%,21.176471%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(100%,59.215689%,54.11765%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear3" gradientUnits="userSpaceOnUse" x1="-389.76001" y1="-3622.02002" x2="266.369995" y2="-3164.639893" gradientTransform="matrix(0.249968,0,0,-0.249968,150.980393,-561.725816)">
+<stop offset="0" style="stop-color:rgb(47.450981%,7.843138%,93.725491%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(85.882354%,41.176471%,100%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 437.566406 160.457031 C 437.566406 192.628906 411.488281 218.730469 379.324219 218.730469 L 239.71875 218.730469 C 239.71875 116.257812 317.625 31.976562 417.445312 21.886719 C 428.53125 20.769531 437.585938 29.886719 437.585938 41.027344 Z M 437.566406 160.457031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 24.640625 160.457031 C 24.640625 192.628906 50.722656 218.730469 82.882812 218.730469 L 222.492188 218.730469 C 222.492188 116.257812 144.589844 31.976562 44.777344 21.886719 C 33.695312 20.769531 24.640625 29.886719 24.640625 41.027344 Z M 24.640625 160.457031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 269.425781 338.792969 C 249.960938 308.039062 239.65625 272.375 239.71875 235.976562 L 381.667969 235.976562 C 412.507812 235.976562 437.574219 260.675781 437.574219 291.0625 C 437.566406 380.972656 317.730469 415.246094 269.425781 338.792969 Z M 269.425781 338.792969 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear3);" d="M 192.78125 338.792969 C 212.25 308.039062 222.554688 272.375 222.492188 235.976562 L 80.546875 235.976562 C 49.707031 235.976562 24.640625 260.675781 24.640625 291.0625 C 24.640625 380.972656 144.480469 415.246094 192.78125 338.792969 Z M 192.78125 338.792969 "/>
+</g>
+</svg>
diff --git a/auth/assets/custom-icons/icons/freetaxusa.svg b/auth/assets/custom-icons/icons/freetaxusa.svg
new file mode 100644
index 0000000000..a4fc2eb654
--- /dev/null
+++ b/auth/assets/custom-icons/icons/freetaxusa.svg
@@ -0,0 +1 @@
+<svg clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" viewBox="0 0 560 400" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(2.51518 0 0 2.51518 30 162.272)"><path d="m136.108 5.893 6.356 23.513h-4.7l-1.218-5.334h-6.587l-1.284 5.334h-4.545l6.52-23.513h5.468zm-2.833 4.107-2.436 10.242h4.806zm-65.8 1.7c2.02 0 3.508.522 4.463 1.563s1.432 2.674 1.432 4.9v11.263h-3.95v-1.9c-.505.746-1.114 1.323-1.828 1.73-.706.405-1.508.615-2.322.61-1.405 0-2.502-.45-3.294-1.35s-1.176-2.182-1.176-3.786c0-1.734.577-3.1 1.73-4.1s2.804-1.586 4.956-1.762l1.78-.132v-1.02c0-1.03-.153-1.788-.462-2.27s-.8-.725-1.482-.725c-.615 0-1.086.187-1.415.56s-.56.966-.7 1.78l-3.887-.33c.264-1.713.9-2.98 1.9-3.804s2.427-1.235 4.25-1.235zm1.78 9.78-1.317.132c-.988.088-1.752.373-2.3.856s-.808 1.13-.808 1.943c0 .724.153 1.28.463 1.662s.756.577 1.35.577c.748.022 1.459-.331 1.894-.939.472-.626.708-1.476.708-2.553v-1.68zm-25.26-9.78c2.064 0 3.617.714 4.66 2.14s1.563 3.535 1.563 6.323v1.68h-8.825c.044 3.338.9 5.005 2.536 5.005.66 0 1.152-.202 1.482-.608s.548-1.092.66-2.06h4.084c-.177 1.888-.797 3.322-1.86 4.298s-2.542 1.465-4.43 1.465c-2.282 0-3.972-.73-5.07-2.2s-1.647-3.716-1.647-6.768c0-3.03.58-5.334 1.745-6.915s2.869-2.36 5.107-2.36zm-.133 3.03c-.8 0-1.372.346-1.744 1.038s-.604 1.84-.7 3.442h4.676c0-1.56-.18-2.695-.544-3.4s-.927-1.07-1.696-1.07zm-14.29-3.03c2.064 0 3.617.714 4.66 2.14s1.563 3.535 1.563 6.323v1.68h-8.825c.044 3.338.9 5.005 2.536 5.005.66 0 1.152-.202 1.482-.608s.55-1.092.66-2.06h4.084c-.177 1.888-.797 3.322-1.86 4.298s-2.542 1.465-4.43 1.465c-2.282 0-3.972-.73-5.07-2.2s-1.647-3.716-1.647-6.768c0-3.03.58-5.334 1.745-6.915s2.867-2.37 5.105-2.37zm-.133 3.03c-.8 0-1.372.346-1.744 1.038s-.604 1.84-.7 3.442h4.676c0-1.56-.18-2.695-.544-3.4s-.927-1.07-1.696-1.07zm-29.439-8.8v23.513h4.645v-9.55h7.3v-4.15h-7.3v-5.665h7.837v-4.148zm13.7 23.477v-17.2h4.215v2.306c.46-.834 1-1.477 1.647-1.927s1.305-.675 2-.675c.352 0 .747.054 1.185.165l-.493 3.952c-.33-.087-.757-.132-1.285-.132-.792-.018-1.554.306-2.09.89-.56.594-.84 1.33-.84 2.206v10.406h-4.339zm39.813 0v-19.364h-5.335v-4.15h15.315v4.15h-5.336v19.365zm30.792 0-2.832-5.665-2.7 5.665h-4.28l4.84-8.727-4.545-8.464h4.6l2.47 5.204 2.536-5.204h4.282l-4.676 8.234 4.908 8.957zm17.652-23.514h4.644v15.083c0 2.92-.68 5.155-2.04 6.702s-3.328 2.322-5.897 2.322-4.533-.773-5.896-2.322-2.04-3.78-2.04-6.702v-15.083h4.644v15.413c0 1.537.27 2.68.807 3.424s1.366 1.12 2.486 1.12 1.948-.373 2.487-1.12.807-1.887.807-3.424v-15.413zm12.118 13.14c-1.865-.548-3.237-1.377-4.116-2.486s-1.318-2.564-1.318-4.364c0-2.085.682-3.754 2.042-5.005s3.163-1.878 5.4-1.878c2.13 0 3.788.538 4.973 1.614s1.93 2.733 2.24 4.972l-4.414.594c-.22-1.23-.548-2.103-.987-2.62s-1.087-.774-1.943-.774-1.515.247-1.977.74-.7 1.224-.7 2.2c0 .813.175 1.444.527 1.894s.955.806 1.812 1.07l2.503.8c1.338.418 2.415.94 3.227 1.564.783.594 1.397 1.384 1.78 2.29.376.9.56 1.977.56 3.228 0 2.196-.675 3.936-2.025 5.22s-3.179 1.908-5.507 1.908c-4.897 0-7.5-2.547-7.84-7.64h4.612c.1 1.34.422 2.316.938 2.93s1.3.922 2.355.922c.9 0 1.597-.27 2.1-.807s.74-1.312.74-2.322c0-.9-.203-1.614-.6-2.14s-1.048-.92-1.926-1.185l-2.438-.724z" fill="#212f63"/><path d="m140.638 5.893 1.207 4.25h49.07v-4.25zm2.7 9.463 1.213 4.25 46.373-.007v-4.25zm2.79 9.802 1.208 4.25h43.6v-4.25z" fill="#bf2032"/><path d="m195.992 2.462h.33c.364 0 .546-.143.546-.432.005-.113-.036-.223-.115-.304-.076-.076-.212-.115-.406-.115h-.354v.85zm-.52 1.295v-2.577h.964c.27 0 .502.06.698.183s.29.336.29.64c0 .153-.042.294-.126.425s-.2.223-.343.273l.584 1.053h-.584l-.444-.89h-.52v.89h-.52zm.913.774c.255.001.508-.049.743-.147.232-.097.433-.234.6-.412.174-.185.31-.402.4-.64.1-.265.15-.547.147-.831.002-.28-.048-.558-.147-.819-.098-.25-.23-.465-.4-.648-.169-.181-.374-.326-.601-.425-.234-.1-.48-.153-.743-.153-.257-.002-.512.05-.748.153-.224.099-.426.244-.591.425-.169.191-.302.41-.394.648-.097.25-.145.522-.145.82-.004.284.046.565.145.831.098.25.23.462.394.64s.363.316.59.412c.237.1.491.15.748.147zm0 .47c-.318.003-.634-.06-.927-.184-.288-.122-.538-.293-.754-.514-.221-.227-.396-.494-.515-.787-.127-.304-.19-.643-.19-1.015s.062-.71.19-1.016c.12-.293.295-.56.515-.787.215-.22.471-.394.754-.514.288-.123.596-.184.927-.184.32-.002.637.061.933.184.293.123.545.293.76.514s.388.483.515.787.2.643.2 1.016-.063.71-.2 1.015-.298.568-.515.787-.468.392-.76.514c-.295.124-.613.186-.933.184z" fill="#212f63"/></g></svg>
\ No newline at end of file

From e222d091d894b7b7fb66b2936fe739d9ae7e85d5 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 20 Feb 2025 09:14:16 +0530
Subject: [PATCH 331/796] [mob][photos] Extra check against me for
 lastTimeMemory

---
 mobile/lib/services/smart_memories_service.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 9e97a402e7..b9ad1ca3dc 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -389,7 +389,7 @@ class SmartMemoriesService {
           }
         }
       }
-      if (longAgo && lastTimeYouSawThemFiles.length >= 5) {
+      if (longAgo && lastTimeYouSawThemFiles.length >= 5 && meID != personID) {
         final String title = "Last time with $personName";
         final lastTimeMemory = PeopleMemory(
           lastTimeYouSawThemFiles

From 4e6b86118f9cefc63d58e68ab5342ea804ca8298 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 20 Feb 2025 09:14:54 +0530
Subject: [PATCH 332/796] [mob][photos] Comment

---
 mobile/lib/services/smart_memories_service.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index b9ad1ca3dc..4680c017a9 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -265,7 +265,7 @@ class SmartMemoriesService {
           await MLDataDB.instance.getFacesForFileIDs(
         personFileIDs,
       );
-      // Inside people loop, check for spotlight
+      // Inside people loop, check for spotlight (Most likely every person will have a spotlight)
       final spotlightFiles = <EnteFile>[];
       for (final fileID in personFileIDs) {
         final int personsPresent = personFilesToFaces[fileID]?.length ?? 10;

From 22b91a164b91bb7f58816f8019b4e2b5f62369dd Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 20 Feb 2025 10:08:33 +0530
Subject: [PATCH 333/796] [mob][photos] Sign that smart memories are for
 internal users only

---
 mobile/lib/models/smart_memory.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/models/smart_memory.dart b/mobile/lib/models/smart_memory.dart
index 0c16b64c16..fa5f2524a7 100644
--- a/mobile/lib/models/smart_memory.dart
+++ b/mobile/lib/models/smart_memory.dart
@@ -17,10 +17,10 @@ abstract class SmartMemory {
   SmartMemory(
     this.memories,
     this.type, {
-    this.name,
+    name,
     this.firstCreationTime,
     this.lastCreationTime,
-  });
+  }) : name = name != null ? name + "(I)" : null;
 
   int averageCreationTime() {
     if (firstCreationTime != null && lastCreationTime != null) {

From 41e5cf03e44bbc4a37163a6431a8156d1ff9d1a0 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 20 Feb 2025 10:08:55 +0530
Subject: [PATCH 334/796] [mob][photos] Increase activity threshold

---
 mobile/lib/services/smart_memories_service.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 4680c017a9..797fec96eb 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -54,7 +54,7 @@ class SmartMemoriesService {
   static const int _calculationWindowDays = 14;
 
   static const _clipSimilarImageThreshold = 0.75;
-  static const _clipActivityQueryThreshold = 0.20;
+  static const _clipActivityQueryThreshold = 0.225;
 
   // Singleton pattern
   SmartMemoriesService._privateConstructor();

From 321d3d6031ffe4bbdd411f9df96968a33c4a1d48 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 20 Feb 2025 10:24:32 +0530
Subject: [PATCH 335/796] [mob][photos] Small fix

---
 mobile/lib/services/smart_memories_service.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 797fec96eb..79996d1c5c 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -315,7 +315,7 @@ class SmartMemoriesService {
           );
           personToMemories
               .putIfAbsent(personID, () => {})
-              .putIfAbsent(PeopleMemoryType.spotlight, () => youAndThemMemory);
+              .putIfAbsent(PeopleMemoryType.youAndThem, () => youAndThemMemory);
         }
       }
 

From 58c10ad20411355001fbe9abf4164e9c0c230360 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 20 Feb 2025 10:31:28 +0530
Subject: [PATCH 336/796] [mob][photos] Increase activity threshold

---
 mobile/lib/services/smart_memories_service.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 79996d1c5c..5fa14b7dc5 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -54,7 +54,7 @@ class SmartMemoriesService {
   static const int _calculationWindowDays = 14;
 
   static const _clipSimilarImageThreshold = 0.75;
-  static const _clipActivityQueryThreshold = 0.225;
+  static const _clipActivityQueryThreshold = 0.25;
 
   // Singleton pattern
   SmartMemoriesService._privateConstructor();

From 91017969b3e4357b23af91d64d192826778e11f5 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 10:49:42 +0530
Subject: [PATCH 337/796] Transplant

---
 .../photos/src/components/Upload/Uploader.tsx | 45 ++++++++++++++-----
 .../src/components/UploadSelectorInputs.tsx   |  6 +--
 web/apps/photos/src/pages/gallery.tsx         | 40 +----------------
 .../gallery/components/FullScreenDropZone.tsx | 34 ++++++++------
 4 files changed, 59 insertions(+), 66 deletions(-)

diff --git a/web/apps/photos/src/components/Upload/Uploader.tsx b/web/apps/photos/src/components/Upload/Uploader.tsx
index 9c8f1f0005..f6bf01cf96 100644
--- a/web/apps/photos/src/components/Upload/Uploader.tsx
+++ b/web/apps/photos/src/components/Upload/Uploader.tsx
@@ -4,6 +4,7 @@ import { useBaseContext } from "@/base/context";
 import { basename } from "@/base/file-name";
 import log from "@/base/log";
 import type { CollectionMapping, Electron, ZipItem } from "@/base/types/ipc";
+import { useFileInput } from "@/gallery/components/utils/use-file-input";
 import type {
     FileAndPath,
     UploadItem,
@@ -23,6 +24,7 @@ import { firstNonEmpty } from "@/utils/array";
 import { CustomError } from "@ente/shared/error";
 import DiscFullIcon from "@mui/icons-material/DiscFull";
 import InfoRoundedIcon from "@mui/icons-material/InfoRounded";
+import { UploadSelectorInputs } from "components/UploadSelectorInputs";
 import { t } from "i18next";
 import { GalleryContext } from "pages/gallery";
 import { useContext, useEffect, useRef, useState } from "react";
@@ -85,12 +87,6 @@ interface Props {
     uploadTypeSelectorView: boolean;
     showSessionExpiredMessage: () => void;
     dragAndDropFiles: File[];
-    openFileSelector: () => void;
-    fileSelectorFiles: File[];
-    openFolderSelector: () => void;
-    folderSelectorFiles: File[];
-    openZipFileSelector?: () => void;
-    fileSelectorZipFiles?: File[];
     uploadCollection?: Collection;
     uploadTypeSelectorIntent: UploadTypeSelectorIntent;
     activeCollection?: Collection;
@@ -99,12 +95,6 @@ interface Props {
 export default function Uploader({
     isFirstUpload,
     dragAndDropFiles,
-    openFileSelector,
-    fileSelectorFiles,
-    openFolderSelector,
-    folderSelectorFiles,
-    openZipFileSelector,
-    fileSelectorZipFiles,
     onUploadFile,
     showSessionExpiredMessage,
     ...props
@@ -216,6 +206,29 @@ export default function Uploader({
     const uploaderNameRef = useRef<string>(null);
     const isDragAndDrop = useRef(false);
 
+    const {
+        getInputProps: getFileSelectorInputProps,
+        openSelector: openFileSelector,
+        selectedFiles: fileSelectorFiles,
+    } = useFileInput({
+        directory: false,
+    });
+    const {
+        getInputProps: getFolderSelectorInputProps,
+        openSelector: openFolderSelector,
+        selectedFiles: folderSelectorFiles,
+    } = useFileInput({
+        directory: true,
+    });
+    const {
+        getInputProps: getZipFileSelectorInputProps,
+        openSelector: openZipFileSelector,
+        selectedFiles: fileSelectorZipFiles,
+    } = useFileInput({
+        directory: false,
+        accept: ".zip",
+    });
+
     const electron = globalThis.electron;
 
     const closeUploadProgress = () => setUploadProgressView(false);
@@ -775,6 +788,14 @@ export default function Uploader({
 
     return (
         <>
+            <UploadSelectorInputs
+                {...{
+                    // getDragAndDropInputProps,
+                    getFileSelectorInputProps,
+                    getFolderSelectorInputProps,
+                    getZipFileSelectorInputProps,
+                }}
+            />
             <CollectionMappingChoice
                 open={openCollectionMappingChoice}
                 onClose={handleCollectionMappingChoiceClose}
diff --git a/web/apps/photos/src/components/UploadSelectorInputs.tsx b/web/apps/photos/src/components/UploadSelectorInputs.tsx
index e22e2f541a..d0720992ab 100644
--- a/web/apps/photos/src/components/UploadSelectorInputs.tsx
+++ b/web/apps/photos/src/components/UploadSelectorInputs.tsx
@@ -1,7 +1,7 @@
 type GetInputProps = () => React.HTMLAttributes<HTMLInputElement>;
 
 interface UploadSelectorInputsProps {
-    getDragAndDropInputProps: GetInputProps;
+    // getDragAndDropInputProps: GetInputProps;
     getFileSelectorInputProps: GetInputProps;
     getFolderSelectorInputProps: GetInputProps;
     getZipFileSelectorInputProps?: GetInputProps;
@@ -14,14 +14,14 @@ interface UploadSelectorInputsProps {
  * folder Selector dialogs and handle drag and drop inputs.
  */
 export const UploadSelectorInputs: React.FC<UploadSelectorInputsProps> = ({
-    getDragAndDropInputProps,
+    // getDragAndDropInputProps,
     getFileSelectorInputProps,
     getFolderSelectorInputProps,
     getZipFileSelectorInputProps,
 }) => {
     return (
         <>
-            <input {...getDragAndDropInputProps()} />
+            {/* <input {...getDragAndDropInputProps()} /> */}
             <input {...getFileSelectorInputProps()} />
             <input {...getFolderSelectorInputProps()} />
             {getZipFileSelectorInputProps && (
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 2a1f26368f..be321594f4 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -12,7 +12,6 @@ import { useModalVisibility } from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
 import log from "@/base/log";
 import { FullScreenDropZone } from "@/gallery/components/FullScreenDropZone";
-import { useFileInput } from "@/gallery/components/utils/use-file-input";
 import { type Collection } from "@/media/collection";
 import { mergeMetadata, type EnteFile } from "@/media/file";
 import {
@@ -106,7 +105,6 @@ import { ITEM_TYPE, TimeStampListItem } from "components/PhotoList";
 import { Sidebar } from "components/Sidebar";
 import { type UploadTypeSelectorIntent } from "components/Upload/UploadTypeSelector";
 import Uploader from "components/Upload/Uploader";
-import { UploadSelectorInputs } from "components/UploadSelectorInputs";
 import SelectedFileOptions from "components/pages/gallery/SelectedFileOptions";
 import { t } from "i18next";
 import { useRouter, type NextRouter } from "next/router";
@@ -211,28 +209,6 @@ const Page: React.FC = () => {
         noKeyboard: true,
         disabled: shouldDisableDropzone,
     });
-    const {
-        getInputProps: getFileSelectorInputProps,
-        openSelector: openFileSelector,
-        selectedFiles: fileSelectorFiles,
-    } = useFileInput({
-        directory: false,
-    });
-    const {
-        getInputProps: getFolderSelectorInputProps,
-        openSelector: openFolderSelector,
-        selectedFiles: folderSelectorFiles,
-    } = useFileInput({
-        directory: true,
-    });
-    const {
-        getInputProps: getZipFileSelectorInputProps,
-        openSelector: openZipFileSelector,
-        selectedFiles: fileSelectorZipFiles,
-    } = useFileInput({
-        directory: false,
-        accept: ".zip",
-    });
 
     const syncInProgress = useRef(false);
     const syncInterval = useRef<ReturnType<typeof setInterval> | undefined>(
@@ -892,14 +868,8 @@ const Page: React.FC = () => {
                         : undefined
                 }
             >
-                <UploadSelectorInputs
-                    {...{
-                        getDragAndDropInputProps,
-                        getFileSelectorInputProps,
-                        getFolderSelectorInputProps,
-                        getZipFileSelectorInputProps,
-                    }}
-                />
+                <input {...getDragAndDropInputProps()} />
+
                 {blockingLoad && <TranslucentLoadingOverlay />}
                 <PlanSelector
                     {...planSelectorVisibilityProps}
@@ -1052,12 +1022,6 @@ const Page: React.FC = () => {
                     showSessionExpiredMessage={showSessionExpiredDialog}
                     {...{
                         dragAndDropFiles,
-                        openFileSelector,
-                        fileSelectorFiles,
-                        openFolderSelector,
-                        folderSelectorFiles,
-                        openZipFileSelector,
-                        fileSelectorZipFiles,
                         uploadTypeSelectorIntent,
                         uploadTypeSelectorView,
                     }}
diff --git a/web/packages/gallery/components/FullScreenDropZone.tsx b/web/packages/gallery/components/FullScreenDropZone.tsx
index e66409181b..eab7da7be2 100644
--- a/web/packages/gallery/components/FullScreenDropZone.tsx
+++ b/web/packages/gallery/components/FullScreenDropZone.tsx
@@ -49,19 +49,27 @@ export const FullScreenDropZone: React.FC<
     }, [onDragLeave]);
 
     return (
-        <Stack sx={{ flex: 1 }} {...getDragAndDropRootProps({ onDragEnter })}>
-            {isDragActive && (
-                <DropZoneOverlay onDrop={onDragLeave} onDragLeave={onDragLeave}>
-                    <CloseButton onClick={onDragLeave}>
-                        <CloseIcon />
-                    </CloseButton>
-                    <Typography variant="h3">
-                        {message ?? t("upload_dropzone_hint")}
-                    </Typography>
-                </DropZoneOverlay>
-            )}
-            {children}
-        </Stack>
+        <>
+            <Stack
+                sx={{ flex: 1 }}
+                {...getDragAndDropRootProps({ onDragEnter })}
+            >
+                {isDragActive && (
+                    <DropZoneOverlay
+                        onDrop={onDragLeave}
+                        onDragLeave={onDragLeave}
+                    >
+                        <CloseButton onClick={onDragLeave}>
+                            <CloseIcon />
+                        </CloseButton>
+                        <Typography variant="h3">
+                            {message ?? t("upload_dropzone_hint")}
+                        </Typography>
+                    </DropZoneOverlay>
+                )}
+                {children}
+            </Stack>
+        </>
     );
 };
 

From 5eba06a269fa489d48f6ab851f1d030f77f355a4 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 11:02:12 +0530
Subject: [PATCH 338/796] Sublimate

---
 .../photos/src/components/Upload/Uploader.tsx | 34 ++++++++++++++++---
 .../src/components/UploadSelectorInputs.tsx   | 32 -----------------
 web/apps/photos/src/pages/shared-albums.tsx   | 28 +--------------
 3 files changed, 31 insertions(+), 63 deletions(-)
 delete mode 100644 web/apps/photos/src/components/UploadSelectorInputs.tsx

diff --git a/web/apps/photos/src/components/Upload/Uploader.tsx b/web/apps/photos/src/components/Upload/Uploader.tsx
index f6bf01cf96..bde425d344 100644
--- a/web/apps/photos/src/components/Upload/Uploader.tsx
+++ b/web/apps/photos/src/components/Upload/Uploader.tsx
@@ -24,7 +24,6 @@ import { firstNonEmpty } from "@/utils/array";
 import { CustomError } from "@ente/shared/error";
 import DiscFullIcon from "@mui/icons-material/DiscFull";
 import InfoRoundedIcon from "@mui/icons-material/InfoRounded";
-import { UploadSelectorInputs } from "components/UploadSelectorInputs";
 import { t } from "i18next";
 import { GalleryContext } from "pages/gallery";
 import { useContext, useEffect, useRef, useState } from "react";
@@ -213,6 +212,7 @@ export default function Uploader({
     } = useFileInput({
         directory: false,
     });
+
     const {
         getInputProps: getFolderSelectorInputProps,
         openSelector: openFolderSelector,
@@ -220,6 +220,7 @@ export default function Uploader({
     } = useFileInput({
         directory: true,
     });
+
     const {
         getInputProps: getZipFileSelectorInputProps,
         openSelector: openZipFileSelector,
@@ -713,7 +714,7 @@ export default function Uploader({
         } else if (type === PICKED_UPLOAD_TYPE.FOLDERS) {
             openFolderSelector();
         } else {
-            if (openZipFileSelector && electron) {
+            if (electron) {
                 openZipFileSelector();
             } else {
                 showMiniDialog(downloadAppDialogAttributes());
@@ -788,9 +789,8 @@ export default function Uploader({
 
     return (
         <>
-            <UploadSelectorInputs
+            <Inputs
                 {...{
-                    // getDragAndDropInputProps,
                     getFileSelectorInputProps,
                     getFolderSelectorInputProps,
                     getZipFileSelectorInputProps,
@@ -833,6 +833,32 @@ export default function Uploader({
     );
 }
 
+type GetInputProps = () => React.HTMLAttributes<HTMLInputElement>;
+
+interface InputsProps {
+    getFileSelectorInputProps: GetInputProps;
+    getFolderSelectorInputProps: GetInputProps;
+    getZipFileSelectorInputProps: GetInputProps;
+}
+
+/**
+ * Create a bunch of HTML inputs elements, one each for the given props.
+ *
+ * These hidden input element serve as the way for us to show various file /
+ * folder Selector dialogs and handle drag and drop inputs.
+ */
+const Inputs: React.FC<InputsProps> = ({
+    getFileSelectorInputProps,
+    getFolderSelectorInputProps,
+    getZipFileSelectorInputProps,
+}) => (
+    <>
+        <input {...getFileSelectorInputProps()} />
+        <input {...getFolderSelectorInputProps()} />
+        <input {...getZipFileSelectorInputProps()} />
+    </>
+);
+
 const desktopFilesAndZipItems = async (electron: Electron, files: File[]) => {
     const fileAndPaths: FileAndPath[] = [];
     let zipItems: ZipItem[] = [];
diff --git a/web/apps/photos/src/components/UploadSelectorInputs.tsx b/web/apps/photos/src/components/UploadSelectorInputs.tsx
deleted file mode 100644
index d0720992ab..0000000000
--- a/web/apps/photos/src/components/UploadSelectorInputs.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-type GetInputProps = () => React.HTMLAttributes<HTMLInputElement>;
-
-interface UploadSelectorInputsProps {
-    // getDragAndDropInputProps: GetInputProps;
-    getFileSelectorInputProps: GetInputProps;
-    getFolderSelectorInputProps: GetInputProps;
-    getZipFileSelectorInputProps?: GetInputProps;
-}
-
-/**
- * Create a bunch of HTML inputs elements, one each for the given props.
- *
- * These hidden input element serve as the way for us to show various file /
- * folder Selector dialogs and handle drag and drop inputs.
- */
-export const UploadSelectorInputs: React.FC<UploadSelectorInputsProps> = ({
-    // getDragAndDropInputProps,
-    getFileSelectorInputProps,
-    getFolderSelectorInputProps,
-    getZipFileSelectorInputProps,
-}) => {
-    return (
-        <>
-            {/* <input {...getDragAndDropInputProps()} /> */}
-            <input {...getFileSelectorInputProps()} />
-            <input {...getFolderSelectorInputProps()} />
-            {getZipFileSelectorInputProps && (
-                <input {...getZipFileSelectorInputProps()} />
-            )}
-        </>
-    );
-};
diff --git a/web/apps/photos/src/pages/shared-albums.tsx b/web/apps/photos/src/pages/shared-albums.tsx
index 6f4b666c6f..b170192ca1 100644
--- a/web/apps/photos/src/pages/shared-albums.tsx
+++ b/web/apps/photos/src/pages/shared-albums.tsx
@@ -23,7 +23,6 @@ import { useBaseContext } from "@/base/context";
 import { isHTTP401Error, PublicAlbumsCredentials } from "@/base/http";
 import log from "@/base/log";
 import { FullScreenDropZone } from "@/gallery/components/FullScreenDropZone";
-import { useFileInput } from "@/gallery/components/utils/use-file-input";
 import { downloadManager } from "@/gallery/services/download";
 import { extractCollectionKeyFromShareURL } from "@/gallery/services/share";
 import { updateShouldDisableCFUploadProxy } from "@/gallery/services/upload";
@@ -59,7 +58,6 @@ import {
 import PhotoFrame from "components/PhotoFrame";
 import { ITEM_TYPE, TimeStampListItem } from "components/PhotoList";
 import Uploader from "components/Upload/Uploader";
-import { UploadSelectorInputs } from "components/UploadSelectorInputs";
 import { t } from "i18next";
 import { useRouter } from "next/router";
 import { useEffect, useMemo, useRef, useState } from "react";
@@ -126,20 +124,6 @@ export default function PublicCollectionGallery() {
         noKeyboard: true,
         disabled: shouldDisableDropzone,
     });
-    const {
-        getInputProps: getFileSelectorInputProps,
-        openSelector: openFileSelector,
-        selectedFiles: fileSelectorFiles,
-    } = useFileInput({
-        directory: false,
-    });
-    const {
-        getInputProps: getFolderSelectorInputProps,
-        openSelector: openFolderSelector,
-        selectedFiles: folderSelectorFiles,
-    } = useFileInput({
-        directory: true,
-    });
 
     const [
         filesDownloadProgressAttributesList,
@@ -507,13 +491,7 @@ export default function PublicCollectionGallery() {
     return (
         <PublicCollectionGalleryContext.Provider value={context}>
             <FullScreenDropZone {...{ getDragAndDropRootProps }}>
-                <UploadSelectorInputs
-                    {...{
-                        getDragAndDropInputProps,
-                        getFileSelectorInputProps,
-                        getFolderSelectorInputProps,
-                    }}
-                />
+                <input {...getDragAndDropInputProps()} />
                 <NavbarBase
                     sx={{
                         mb: "16px",
@@ -570,10 +548,6 @@ export default function PublicCollectionGallery() {
                     uploadTypeSelectorIntent="collect"
                     {...{
                         dragAndDropFiles,
-                        openFileSelector,
-                        fileSelectorFiles,
-                        openFolderSelector,
-                        folderSelectorFiles,
                     }}
                 />
                 <FilesDownloadProgress

From ca28a3c5953a16ee915e850a73b593dfb94ffd2a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 11:05:57 +0530
Subject: [PATCH 339/796] Also

---
 web/apps/photos/src/pages/gallery.tsx              |  5 ++---
 web/apps/photos/src/pages/shared-albums.tsx        |  6 ++++--
 .../gallery/components/FullScreenDropZone.tsx      | 14 ++++++++------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index be321594f4..c8f2d3e3d3 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -861,15 +861,14 @@ const Page: React.FC = () => {
             }}
         >
             <FullScreenDropZone
-                {...{ getDragAndDropRootProps }}
+                getInputProps={getDragAndDropInputProps}
+                getRootProps={getDragAndDropRootProps}
                 message={
                     watchFolderView
                         ? t("watch_folder_dropzone_hint")
                         : undefined
                 }
             >
-                <input {...getDragAndDropInputProps()} />
-
                 {blockingLoad && <TranslucentLoadingOverlay />}
                 <PlanSelector
                     {...planSelectorVisibilityProps}
diff --git a/web/apps/photos/src/pages/shared-albums.tsx b/web/apps/photos/src/pages/shared-albums.tsx
index b170192ca1..a6212f42a7 100644
--- a/web/apps/photos/src/pages/shared-albums.tsx
+++ b/web/apps/photos/src/pages/shared-albums.tsx
@@ -490,8 +490,10 @@ export default function PublicCollectionGallery() {
 
     return (
         <PublicCollectionGalleryContext.Provider value={context}>
-            <FullScreenDropZone {...{ getDragAndDropRootProps }}>
-                <input {...getDragAndDropInputProps()} />
+            <FullScreenDropZone
+                getInputProps={getDragAndDropInputProps}
+                getRootProps={getDragAndDropRootProps}
+            >
                 <NavbarBase
                     sx={{
                         mb: "16px",
diff --git a/web/packages/gallery/components/FullScreenDropZone.tsx b/web/packages/gallery/components/FullScreenDropZone.tsx
index eab7da7be2..a226c7d600 100644
--- a/web/packages/gallery/components/FullScreenDropZone.tsx
+++ b/web/packages/gallery/components/FullScreenDropZone.tsx
@@ -5,10 +5,14 @@ import React, { useCallback, useEffect, useState } from "react";
 import type { DropzoneState } from "react-dropzone";
 
 interface FullScreenDropZoneProps {
+    /**
+     * The `getInputProps` function returned by a call to {@link useDropzone}.
+     */
+    getInputProps: DropzoneState["getInputProps"];
     /**
      * The `getRootProps` function returned by a call to {@link useDropzone}.
      */
-    getDragAndDropRootProps: DropzoneState["getRootProps"];
+    getRootProps: DropzoneState["getRootProps"];
     /**
      * Optional override to the message show to the user when a drag is in
      * progress.
@@ -33,7 +37,7 @@ interface FullScreenDropZoneProps {
  */
 export const FullScreenDropZone: React.FC<
     React.PropsWithChildren<FullScreenDropZoneProps>
-> = ({ getDragAndDropRootProps, message, children }) => {
+> = ({ getInputProps, getRootProps, message, children }) => {
     const [isDragActive, setIsDragActive] = useState(false);
 
     const onDragEnter = useCallback(() => setIsDragActive(true), []);
@@ -50,10 +54,8 @@ export const FullScreenDropZone: React.FC<
 
     return (
         <>
-            <Stack
-                sx={{ flex: 1 }}
-                {...getDragAndDropRootProps({ onDragEnter })}
-            >
+            <input {...getInputProps()} />
+            <Stack sx={{ flex: 1 }} {...getRootProps({ onDragEnter })}>
                 {isDragActive && (
                     <DropZoneOverlay
                         onDrop={onDragLeave}

From cac846f0e22b9453e6c1d6a3160db01c6d6fbb04 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 20 Feb 2025 11:12:56 +0530
Subject: [PATCH 340/796] [mob][photos] Change surfacing order

---
 mobile/lib/models/people_memory.dart            | 2 +-
 mobile/lib/services/smart_memories_service.dart | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mobile/lib/models/people_memory.dart b/mobile/lib/models/people_memory.dart
index dea66faf30..644192e658 100644
--- a/mobile/lib/models/people_memory.dart
+++ b/mobile/lib/models/people_memory.dart
@@ -2,9 +2,9 @@ import "package:photos/models/memory.dart";
 import "package:photos/models/smart_memory.dart";
 
 enum PeopleMemoryType {
-  spotlight,
   youAndThem,
   doingSomethingTogether,
+  spotlight,
   lastTimeYouSawThem,
 }
 
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 5fa14b7dc5..39e1261fa3 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -408,8 +408,10 @@ class SmartMemoriesService {
 
     // Surface everything just for debug checking
     for (final personID in personToMemories.keys) {
-      for (final memoryType in personToMemories[personID]!.keys) {
-        memoryResults.add(personToMemories[personID]![memoryType]!);
+      for (final memoryType in PeopleMemoryType.values){
+        if (personToMemories[personID]!.containsKey(memoryType)) {
+          memoryResults.add(personToMemories[personID]![memoryType]!);
+        }
       }
     }
 

From f4d73e683c66a64b480e4cc3d05f6ca19172ff07 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 20 Feb 2025 11:14:43 +0530
Subject: [PATCH 341/796] [mob][photos] Fix lastTimeWith

---
 mobile/lib/services/smart_memories_service.dart | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 39e1261fa3..f1f556c9a6 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -378,13 +378,15 @@ class SmartMemoriesService {
             longAgo = false;
             break fileLoop;
           }
-          if (creationTime > lastCreationTime) {
+          if (creationTime > lastCreationTime - microSecondsInDay) {
             final lastDateTime =
                 DateTime.fromMicrosecondsSinceEpoch(lastCreationTime);
             if (creationDateTime.difference(lastDateTime).inHours > 24) {
               lastTimeYouSawThemFiles.clear();
             }
-            lastCreationTime = creationTime;
+            if (creationTime > lastCreationTime) {
+              lastCreationTime = creationTime;
+            }
             lastTimeYouSawThemFiles.add(file);
           }
         }

From 87f2957e1951264d63f5c1a18258ceb21f623c43 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 20 Feb 2025 11:20:12 +0530
Subject: [PATCH 342/796] [mob][photos] Lower threshold

---
 mobile/lib/services/smart_memories_service.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index f1f556c9a6..66d7068d6e 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -391,7 +391,7 @@ class SmartMemoriesService {
           }
         }
       }
-      if (longAgo && lastTimeYouSawThemFiles.length >= 5 && meID != personID) {
+      if (longAgo && lastTimeYouSawThemFiles.length >= 2 && meID != personID) {
         final String title = "Last time with $personName";
         final lastTimeMemory = PeopleMemory(
           lastTimeYouSawThemFiles

From 8618babc11789ed9aba625d03e29d887ed97149c Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 11:20:54 +0530
Subject: [PATCH 343/796] Attempt to intercept cancellation

---
 .../photos/src/components/Upload/Uploader.tsx | 34 +++++++++++++++----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/web/apps/photos/src/components/Upload/Uploader.tsx b/web/apps/photos/src/components/Upload/Uploader.tsx
index bde425d344..cf97f03905 100644
--- a/web/apps/photos/src/components/Upload/Uploader.tsx
+++ b/web/apps/photos/src/components/Upload/Uploader.tsx
@@ -851,13 +851,33 @@ const Inputs: React.FC<InputsProps> = ({
     getFileSelectorInputProps,
     getFolderSelectorInputProps,
     getZipFileSelectorInputProps,
-}) => (
-    <>
-        <input {...getFileSelectorInputProps()} />
-        <input {...getFolderSelectorInputProps()} />
-        <input {...getZipFileSelectorInputProps()} />
-    </>
-);
+}) => {
+    const refFile = useRef(null);
+    const refFolder = useRef(null);
+    const refZip = useRef(null);
+
+    useEffect(() => {
+        const handleCancel = () => {
+            console.log("cancel");
+        };
+        [refFile, refFolder, refZip].map((ref) =>
+            ref.current?.addEventListener("cancel", handleCancel),
+        );
+        return () => {
+            [refFile, refFolder, refZip].map((ref) =>
+                ref.current?.removeEventListener("cancel", handleCancel),
+            );
+        };
+    }, []);
+
+    return (
+        <>
+            <input ref={refFile} {...getFileSelectorInputProps()} />
+            <input ref={refFolder} {...getFolderSelectorInputProps()} />
+            <input ref={refZip} {...getZipFileSelectorInputProps()} />
+        </>
+    );
+};
 
 const desktopFilesAndZipItems = async (electron: Electron, files: File[]) => {
     const fileAndPaths: FileAndPath[] = [];

From 512cf3b395da08bf2aba3cdfadf350efc31cded5 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 20 Feb 2025 11:26:32 +0530
Subject: [PATCH 344/796] [mob][photos] More activities

---
 mobile/lib/models/people_memory.dart          | 32 ++++++++++++++-----
 .../lib/services/smart_memories_service.dart  |  2 +-
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/mobile/lib/models/people_memory.dart b/mobile/lib/models/people_memory.dart
index 644192e658..8b4dddde1e 100644
--- a/mobile/lib/models/people_memory.dart
+++ b/mobile/lib/models/people_memory.dart
@@ -9,24 +9,40 @@ enum PeopleMemoryType {
 }
 
 enum PeopleActivity {
-  celebration,
-  // hiking,
-  // feast,
-  // selfies,
-  // sports
+  party,
+  hiking,
+  feast,
+  selfies,
+  sports
 }
 
 String activityQuery(PeopleActivity activity) {
   switch (activity) {
-    case PeopleActivity.celebration:
+    case PeopleActivity.party:
       return "Photo of people celebrating together";
+    case PeopleActivity.hiking:
+      return "Photo of people hiking together in nature";
+    case PeopleActivity.feast:
+      return "Photo of people having a big feast together";
+    case PeopleActivity.selfies:
+      return "Happy and nostalgic selfie with people";
+    case PeopleActivity.sports:
+      return "Photo of people joyfully playing sports together";
   }
 }
 
 String activityTitle(PeopleActivity activity, String personName) {
   switch (activity) {
-    case PeopleActivity.celebration:
-      return "Celebrations with $personName";
+    case PeopleActivity.party:
+      return "Party with $personName";
+    case PeopleActivity.hiking:
+      return "Hiking with $personName";
+    case PeopleActivity.feast:
+      return "Feasting with $personName";
+    case PeopleActivity.selfies:
+      return "Selfies with $personName";
+    case PeopleActivity.sports:
+      return "Sports with $personName";
   }
 }
 
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 66d7068d6e..5188006e91 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -410,7 +410,7 @@ class SmartMemoriesService {
 
     // Surface everything just for debug checking
     for (final personID in personToMemories.keys) {
-      for (final memoryType in PeopleMemoryType.values){
+      for (final memoryType in PeopleMemoryType.values) {
         if (personToMemories[personID]!.containsKey(memoryType)) {
           memoryResults.add(personToMemories[personID]![memoryType]!);
         }

From fd133d4023838eb44c4d77aef02d377346863697 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 11:40:07 +0530
Subject: [PATCH 345/796] Attach cancel callback

---
 .../photos/src/components/Upload/Uploader.tsx | 43 +++++++------------
 .../components/utils/use-file-input.ts        | 25 ++++++++---
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/web/apps/photos/src/components/Upload/Uploader.tsx b/web/apps/photos/src/components/Upload/Uploader.tsx
index cf97f03905..64b5bbbe02 100644
--- a/web/apps/photos/src/components/Upload/Uploader.tsx
+++ b/web/apps/photos/src/components/Upload/Uploader.tsx
@@ -26,7 +26,7 @@ import DiscFullIcon from "@mui/icons-material/DiscFull";
 import InfoRoundedIcon from "@mui/icons-material/InfoRounded";
 import { t } from "i18next";
 import { GalleryContext } from "pages/gallery";
-import { useContext, useEffect, useRef, useState } from "react";
+import { useCallback, useContext, useEffect, useRef, useState } from "react";
 import { Trans } from "react-i18next";
 import {
     getPublicCollectionUID,
@@ -205,12 +205,17 @@ export default function Uploader({
     const uploaderNameRef = useRef<string>(null);
     const isDragAndDrop = useRef(false);
 
+    const handleInputCancel = useCallback(() => {
+        console.log("cancel");
+    }, []);
+
     const {
         getInputProps: getFileSelectorInputProps,
         openSelector: openFileSelector,
         selectedFiles: fileSelectorFiles,
     } = useFileInput({
         directory: false,
+        onCancel: handleInputCancel,
     });
 
     const {
@@ -219,6 +224,7 @@ export default function Uploader({
         selectedFiles: folderSelectorFiles,
     } = useFileInput({
         directory: true,
+        onCancel: handleInputCancel,
     });
 
     const {
@@ -228,6 +234,7 @@ export default function Uploader({
     } = useFileInput({
         directory: false,
         accept: ".zip",
+        onCancel: handleInputCancel,
     });
 
     const electron = globalThis.electron;
@@ -851,33 +858,13 @@ const Inputs: React.FC<InputsProps> = ({
     getFileSelectorInputProps,
     getFolderSelectorInputProps,
     getZipFileSelectorInputProps,
-}) => {
-    const refFile = useRef(null);
-    const refFolder = useRef(null);
-    const refZip = useRef(null);
-
-    useEffect(() => {
-        const handleCancel = () => {
-            console.log("cancel");
-        };
-        [refFile, refFolder, refZip].map((ref) =>
-            ref.current?.addEventListener("cancel", handleCancel),
-        );
-        return () => {
-            [refFile, refFolder, refZip].map((ref) =>
-                ref.current?.removeEventListener("cancel", handleCancel),
-            );
-        };
-    }, []);
-
-    return (
-        <>
-            <input ref={refFile} {...getFileSelectorInputProps()} />
-            <input ref={refFolder} {...getFolderSelectorInputProps()} />
-            <input ref={refZip} {...getZipFileSelectorInputProps()} />
-        </>
-    );
-};
+}) => (
+    <>
+        <input {...getFileSelectorInputProps()} />
+        <input {...getFolderSelectorInputProps()} />
+        <input {...getZipFileSelectorInputProps()} />
+    </>
+);
 
 const desktopFilesAndZipItems = async (electron: Electron, files: File[]) => {
     const fileAndPaths: FileAndPath[] = [];
diff --git a/web/packages/gallery/components/utils/use-file-input.ts b/web/packages/gallery/components/utils/use-file-input.ts
index f344ed6ec5..11958d1cea 100644
--- a/web/packages/gallery/components/utils/use-file-input.ts
+++ b/web/packages/gallery/components/utils/use-file-input.ts
@@ -1,4 +1,4 @@
-import { useCallback, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 
 interface UseFileInputParams {
     /**
@@ -14,6 +14,11 @@ interface UseFileInputParams {
      * https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/accept).
      */
     accept?: string;
+    /**
+     * A callback that is invoked when the user cancels on the file / directory
+     * dialog.
+     */
+    onCancel: () => void;
 }
 
 interface UseFileInputResult {
@@ -50,15 +55,25 @@ interface UseFileInputResult {
 export const useFileInput = ({
     directory,
     accept,
+    onCancel,
 }: UseFileInputParams): UseFileInputResult => {
     const [selectedFiles, setSelectedFiles] = useState<File[]>([]);
     const inputRef = useRef<HTMLInputElement | undefined>(undefined);
 
+    useEffect(() => {
+        // React (as of 19) doesn't support attaching the onCancel event handler
+        // via props, so do it using its ref.
+        //
+        // https://github.com/facebook/react/issues/27858
+        inputRef.current!.addEventListener("cancel", onCancel);
+        return () => {
+            inputRef.current!.removeEventListener("cancel", onCancel);
+        };
+    }, [onCancel]);
+
     const openSelector = useCallback(() => {
-        if (inputRef.current) {
-            inputRef.current.value = "";
-            inputRef.current.click();
-        }
+        inputRef.current!.value = "";
+        inputRef.current!.click();
     }, []);
 
     const handleChange: React.ChangeEventHandler<HTMLInputElement> = (

From e3ef1e462843f261ad4ebef126cd32750b095a83 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 11:51:53 +0530
Subject: [PATCH 346/796] Move

---
 .../{Upload/Uploader.tsx => Upload.tsx}       | 285 +++++++++++++++++-
 .../components/Upload/UploadTypeSelector.tsx  | 261 ----------------
 .../{Upload => }/UploadProgress.tsx           |   0
 web/apps/photos/src/pages/gallery.tsx         |   5 +-
 web/apps/photos/src/pages/shared-albums.tsx   |   4 +-
 5 files changed, 278 insertions(+), 277 deletions(-)
 rename web/apps/photos/src/components/{Upload/Uploader.tsx => Upload.tsx} (80%)
 rename web/apps/photos/src/components/{Upload => }/UploadProgress.tsx (100%)

diff --git a/web/apps/photos/src/components/Upload/Uploader.tsx b/web/apps/photos/src/components/Upload.tsx
similarity index 80%
rename from web/apps/photos/src/components/Upload/Uploader.tsx
rename to web/apps/photos/src/components/Upload.tsx
index 64b5bbbe02..f14c4966e8 100644
--- a/web/apps/photos/src/components/Upload/Uploader.tsx
+++ b/web/apps/photos/src/components/Upload.tsx
@@ -1,4 +1,9 @@
 import { isDesktop } from "@/base/app";
+import { SpacedRow } from "@/base/components/containers";
+import { DialogCloseIconButton } from "@/base/components/mui/DialogCloseIconButton";
+import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
+import { RowButton } from "@/base/components/RowButton";
+import { useIsTouchscreen } from "@/base/components/utils/hooks";
 import { useModalVisibility } from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
 import { basename } from "@/base/file-name";
@@ -22,11 +27,29 @@ import { redirectToCustomerPortal } from "@/new/photos/services/user-details";
 import { usePhotosAppContext } from "@/new/photos/types/context";
 import { firstNonEmpty } from "@/utils/array";
 import { CustomError } from "@ente/shared/error";
+import ChevronRightIcon from "@mui/icons-material/ChevronRight";
 import DiscFullIcon from "@mui/icons-material/DiscFull";
+import GoogleIcon from "@mui/icons-material/Google";
+import ImageOutlinedIcon from "@mui/icons-material/ImageOutlined";
 import InfoRoundedIcon from "@mui/icons-material/InfoRounded";
+import PermMediaOutlinedIcon from "@mui/icons-material/PermMediaOutlined";
+import {
+    Box,
+    Dialog,
+    DialogTitle,
+    Link,
+    Stack,
+    Typography,
+} from "@mui/material";
 import { t } from "i18next";
 import { GalleryContext } from "pages/gallery";
-import { useCallback, useContext, useEffect, useRef, useState } from "react";
+import React, {
+    useCallback,
+    useContext,
+    useEffect,
+    useRef,
+    useState,
+} from "react";
 import { Trans } from "react-i18next";
 import {
     getPublicCollectionUID,
@@ -45,12 +68,10 @@ import watcher from "services/watch";
 import { SetLoading } from "types/gallery";
 import { getOrCreateAlbum } from "utils/collection";
 import { PublicCollectionGalleryContext } from "utils/publicCollectionGallery";
-import { SetCollectionNamerAttributes } from "../Collections/CollectionNamer";
+import { SetCollectionNamerAttributes } from "./Collections/CollectionNamer";
 import { UploadProgress } from "./UploadProgress";
-import {
-    UploadTypeSelector,
-    type UploadTypeSelectorIntent,
-} from "./UploadTypeSelector";
+
+export type UploadTypeSelectorIntent = "upload" | "import" | "collect";
 
 enum PICKED_UPLOAD_TYPE {
     FILES = "files",
@@ -58,7 +79,7 @@ enum PICKED_UPLOAD_TYPE {
     ZIPS = "zips",
 }
 
-interface Props {
+interface UploadProps {
     syncWithRemote: (force?: boolean, silent?: boolean) => Promise<void>;
     closeUploadTypeSelector: () => void;
     /**
@@ -91,13 +112,16 @@ interface Props {
     activeCollection?: Collection;
 }
 
-export default function Uploader({
+/**
+ * Top level component that houses the infrastructure for handling uploads.
+ */
+export const Upload: React.FC<UploadProps> = ({
     isFirstUpload,
     dragAndDropFiles,
     onUploadFile,
     showSessionExpiredMessage,
     ...props
-}: Props) {
+}) => {
     const { showMiniDialog } = useBaseContext();
     const { showNotification, onGenericError, watchFolderView } =
         usePhotosAppContext();
@@ -838,7 +862,7 @@ export default function Uploader({
             />
         </>
     );
-}
+};
 
 type GetInputProps = () => React.HTMLAttributes<HTMLInputElement>;
 
@@ -1000,7 +1024,7 @@ const groupFilesBasedOnParentFolder = (
     return result;
 };
 
-export const setPendingUploads = async (
+const setPendingUploads = async (
     electron: Electron,
     collections: Collection[],
     uploadItems: UploadItem[],
@@ -1035,3 +1059,242 @@ export const setPendingUploads = async (
 
     await electron.setPendingUploads({ collectionName, filePaths, zipItems });
 };
+
+interface UploadTypeSelectorProps {
+    /** If `true`, then the selector is shown. */
+    open: boolean;
+    /** Callback to indicate that the selector should be closed. */
+    onClose: () => void;
+    /** The particular context / scenario in which this upload is occuring. */
+    intent: UploadTypeSelectorIntent;
+    uploadFiles: () => void;
+    uploadFolders: () => void;
+    uploadGoogleTakeoutZips: () => void;
+}
+
+/**
+ * Request the user to specify which type of file / folder / zip it is that they
+ * wish to upload.
+ *
+ * This selector (and the "Upload" button) is functionally redundant, the user
+ * can just drag and drop any of these into the app to directly initiate the
+ * upload. But having an explicit easy to reach button is also necessary for new
+ * users, or for cases where drag-and-drop might not be appropriate.
+ */
+const UploadTypeSelector: React.FC<UploadTypeSelectorProps> = ({
+    open,
+    onClose,
+    intent,
+    uploadFiles,
+    uploadFolders,
+    uploadGoogleTakeoutZips,
+}) => {
+    const publicCollectionGalleryContext = useContext(
+        PublicCollectionGalleryContext,
+    );
+
+    // Directly show the file selector for the public albums app on likely
+    // mobile devices.
+    const directlyShowUploadFiles = useIsTouchscreen();
+
+    useEffect(() => {
+        if (
+            open &&
+            directlyShowUploadFiles &&
+            publicCollectionGalleryContext.credentials
+        ) {
+            uploadFiles();
+            onClose();
+        }
+    }, [open]);
+
+    const handleSelect = (option: UploadOptionType) => {
+        switch (option) {
+            case "files":
+                uploadFiles();
+                break;
+            case "folders":
+                uploadFolders();
+                break;
+            case "zips":
+                uploadGoogleTakeoutZips();
+                break;
+        }
+    };
+
+    return (
+        <Dialog
+            open={open}
+            fullWidth
+            slotProps={{
+                paper: {
+                    sx: (theme) => ({
+                        maxWidth: "375px",
+                        p: 1,
+                        [theme.breakpoints.down(360)]: { p: 0 },
+                    }),
+                },
+            }}
+            onClose={onClose}
+        >
+            <UploadOptions
+                intent={intent}
+                onSelect={handleSelect}
+                onClose={onClose}
+            />
+        </Dialog>
+    );
+};
+
+type UploadOptionType = "files" | "folders" | "zips";
+
+interface UploadOptionsProps {
+    intent: UploadTypeSelectorIntent;
+    /** Called when the user selects one of the provided options. */
+    onSelect: (option: UploadOptionType) => void;
+    /** Called when the dialog should be closed. */
+    onClose: () => void;
+}
+
+const UploadOptions: React.FC<UploadOptionsProps> = ({
+    intent,
+    onSelect,
+    onClose,
+}) => {
+    // [Note: Dialog state remains preseved on reopening]
+    //
+    // Keep dialog content specific state here, in a separate component, so that
+    // this state is not tied to the lifetime of the dialog.
+    //
+    // If we don't do this, then a MUI dialog retains whatever it was doing when
+    // it was last closed. Sometimes that is desirable, but sometimes not, and
+    // in the latter cases moving the instance specific state to a child works.
+
+    const [showTakeoutOptions, setShowTakeoutOptions] = useState(false);
+
+    const handleTakeoutClose = () => setShowTakeoutOptions(false);
+
+    const handleSelect = (option: UploadOptionType) => {
+        switch (option) {
+            case "files":
+                onSelect("files");
+                break;
+            case "folders":
+                onSelect("folders");
+                break;
+            case "zips":
+                !showTakeoutOptions
+                    ? setShowTakeoutOptions(true)
+                    : onSelect("zips");
+                break;
+        }
+    };
+
+    return !showTakeoutOptions ? (
+        <DefaultOptions {...{ intent, onClose }} onSelect={handleSelect} />
+    ) : (
+        <TakeoutOptions onSelect={handleSelect} onClose={handleTakeoutClose} />
+    );
+};
+
+const DefaultOptions: React.FC<UploadOptionsProps> = ({
+    intent,
+    onClose,
+    onSelect,
+}) => {
+    return (
+        <>
+            <SpacedRow>
+                <DialogTitle variant="h5">
+                    {intent == "collect"
+                        ? t("select_photos")
+                        : intent == "import"
+                          ? t("import")
+                          : t("upload")}
+                </DialogTitle>
+                <DialogCloseIconButton {...{ onClose }} />
+            </SpacedRow>
+            <Box sx={{ p: "12px", pt: "16px" }}>
+                <Stack sx={{ gap: 0.5 }}>
+                    {intent != "import" && (
+                        <RowButton
+                            startIcon={<ImageOutlinedIcon />}
+                            endIcon={<ChevronRightIcon />}
+                            label={t("file")}
+                            onClick={() => onSelect("files")}
+                        />
+                    )}
+                    <RowButton
+                        startIcon={<PermMediaOutlinedIcon />}
+                        endIcon={<ChevronRightIcon />}
+                        label={t("folder")}
+                        onClick={() => onSelect("folders")}
+                    />
+                    {intent !== "collect" && (
+                        <RowButton
+                            startIcon={<GoogleIcon />}
+                            endIcon={<ChevronRightIcon />}
+                            label={t("google_takeout")}
+                            onClick={() => onSelect("zips")}
+                        />
+                    )}
+                </Stack>
+                <Typography
+                    sx={{
+                        color: "text.muted",
+                        p: "12px",
+                        pt: "24px",
+                        textAlign: "center",
+                    }}
+                >
+                    {t("drag_and_drop_hint")}
+                </Typography>
+            </Box>
+        </>
+    );
+};
+
+const TakeoutOptions: React.FC<Omit<UploadOptionsProps, "intent">> = ({
+    onSelect,
+    onClose,
+}) => {
+    return (
+        <>
+            <SpacedRow>
+                <DialogTitle variant="h5">{t("google_takeout")}</DialogTitle>
+                <DialogCloseIconButton {...{ onClose }} />
+            </SpacedRow>
+            <Stack sx={{ padding: "18px 12px 20px 12px", gap: "16px" }}>
+                <Stack sx={{ gap: "8px" }}>
+                    <FocusVisibleButton
+                        color="accent"
+                        fullWidth
+                        onClick={() => onSelect("folders")}
+                    >
+                        {t("select_folder")}
+                    </FocusVisibleButton>
+                    <FocusVisibleButton
+                        color="secondary"
+                        fullWidth
+                        onClick={() => onSelect("zips")}
+                    >
+                        {t("select_zips")}
+                    </FocusVisibleButton>
+                    <Link
+                        href="https://help.ente.io/photos/migration/from-google-photos/"
+                        target="_blank"
+                        rel="noopener"
+                    >
+                        <FocusVisibleButton color="secondary" fullWidth>
+                            {t("faq")}
+                        </FocusVisibleButton>
+                    </Link>
+                </Stack>
+
+                <Typography variant="small" sx={{ color: "text.muted" }}>
+                    {t("takeout_hint")}
+                </Typography>
+            </Stack>
+        </>
+    );
+};
diff --git a/web/apps/photos/src/components/Upload/UploadTypeSelector.tsx b/web/apps/photos/src/components/Upload/UploadTypeSelector.tsx
index fdf6f7f070..e69de29bb2 100644
--- a/web/apps/photos/src/components/Upload/UploadTypeSelector.tsx
+++ b/web/apps/photos/src/components/Upload/UploadTypeSelector.tsx
@@ -1,261 +0,0 @@
-import { SpacedRow } from "@/base/components/containers";
-import { DialogCloseIconButton } from "@/base/components/mui/DialogCloseIconButton";
-import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
-import { RowButton } from "@/base/components/RowButton";
-import { useIsTouchscreen } from "@/base/components/utils/hooks";
-import ChevronRightIcon from "@mui/icons-material/ChevronRight";
-import GoogleIcon from "@mui/icons-material/Google";
-import ImageOutlinedIcon from "@mui/icons-material/ImageOutlined";
-import PermMediaOutlinedIcon from "@mui/icons-material/PermMediaOutlined";
-import {
-    Box,
-    Dialog,
-    DialogTitle,
-    Link,
-    Stack,
-    Typography,
-} from "@mui/material";
-import { t } from "i18next";
-import React, { useContext, useEffect, useState } from "react";
-import { PublicCollectionGalleryContext } from "utils/publicCollectionGallery";
-
-export type UploadTypeSelectorIntent = "upload" | "import" | "collect";
-
-interface UploadTypeSelectorProps {
-    /** If `true`, then the selector is shown. */
-    open: boolean;
-    /** Callback to indicate that the selector should be closed. */
-    onClose: () => void;
-    /** The particular context / scenario in which this upload is occuring. */
-    intent: UploadTypeSelectorIntent;
-    uploadFiles: () => void;
-    uploadFolders: () => void;
-    uploadGoogleTakeoutZips: () => void;
-}
-
-/**
- * Request the user to specify which type of file / folder / zip it is that they
- * wish to upload.
- *
- * This selector (and the "Upload" button) is functionally redundant, the user
- * can just drag and drop any of these into the app to directly initiate the
- * upload. But having an explicit easy to reach button is also necessary for new
- * users, or for cases where drag-and-drop might not be appropriate.
- */
-export const UploadTypeSelector: React.FC<UploadTypeSelectorProps> = ({
-    open,
-    onClose,
-    intent,
-    uploadFiles,
-    uploadFolders,
-    uploadGoogleTakeoutZips,
-}) => {
-    const publicCollectionGalleryContext = useContext(
-        PublicCollectionGalleryContext,
-    );
-
-    // Directly show the file selector for the public albums app on likely
-    // mobile devices.
-    const directlyShowUploadFiles = useIsTouchscreen();
-
-    useEffect(() => {
-        if (
-            open &&
-            directlyShowUploadFiles &&
-            publicCollectionGalleryContext.credentials
-        ) {
-            uploadFiles();
-            onClose();
-        }
-    }, [open]);
-
-    const handleSelect = (option: OptionType) => {
-        switch (option) {
-            case "files":
-                uploadFiles();
-                break;
-            case "folders":
-                uploadFolders();
-                break;
-            case "zips":
-                uploadGoogleTakeoutZips();
-                break;
-        }
-    };
-
-    return (
-        <Dialog
-            open={open}
-            fullWidth
-            slotProps={{
-                paper: {
-                    sx: (theme) => ({
-                        maxWidth: "375px",
-                        p: 1,
-                        [theme.breakpoints.down(360)]: { p: 0 },
-                    }),
-                },
-            }}
-            onClose={onClose}
-        >
-            <Options
-                intent={intent}
-                onSelect={handleSelect}
-                onClose={onClose}
-            />
-        </Dialog>
-    );
-};
-
-type OptionType = "files" | "folders" | "zips";
-
-interface OptionsProps {
-    intent: UploadTypeSelectorIntent;
-    /** Called when the user selects one of the provided options. */
-    onSelect: (option: OptionType) => void;
-    /** Called when the dialog should be closed. */
-    onClose: () => void;
-}
-
-export const Options: React.FC<OptionsProps> = ({
-    intent,
-    onSelect,
-    onClose,
-}) => {
-    // [Note: Dialog state remains preseved on reopening]
-    //
-    // Keep dialog content specific state here, in a separate component, so that
-    // this state is not tied to the lifetime of the dialog.
-    //
-    // If we don't do this, then a MUI dialog retains whatever it was doing when
-    // it was last closed. Sometimes that is desirable, but sometimes not, and
-    // in the latter cases moving the instance specific state to a child works.
-
-    const [showTakeoutOptions, setShowTakeoutOptions] = useState(false);
-
-    const handleTakeoutClose = () => setShowTakeoutOptions(false);
-
-    const handleSelect = (option: OptionType) => {
-        switch (option) {
-            case "files":
-                onSelect("files");
-                break;
-            case "folders":
-                onSelect("folders");
-                break;
-            case "zips":
-                !showTakeoutOptions
-                    ? setShowTakeoutOptions(true)
-                    : onSelect("zips");
-                break;
-        }
-    };
-
-    return !showTakeoutOptions ? (
-        <DefaultOptions {...{ intent, onClose }} onSelect={handleSelect} />
-    ) : (
-        <TakeoutOptions onSelect={handleSelect} onClose={handleTakeoutClose} />
-    );
-};
-
-const DefaultOptions: React.FC<OptionsProps> = ({
-    intent,
-    onClose,
-    onSelect,
-}) => {
-    return (
-        <>
-            <SpacedRow>
-                <DialogTitle variant="h5">
-                    {intent == "collect"
-                        ? t("select_photos")
-                        : intent == "import"
-                          ? t("import")
-                          : t("upload")}
-                </DialogTitle>
-                <DialogCloseIconButton {...{ onClose }} />
-            </SpacedRow>
-            <Box sx={{ p: "12px", pt: "16px" }}>
-                <Stack sx={{ gap: 0.5 }}>
-                    {intent != "import" && (
-                        <RowButton
-                            startIcon={<ImageOutlinedIcon />}
-                            endIcon={<ChevronRightIcon />}
-                            label={t("file")}
-                            onClick={() => onSelect("files")}
-                        />
-                    )}
-                    <RowButton
-                        startIcon={<PermMediaOutlinedIcon />}
-                        endIcon={<ChevronRightIcon />}
-                        label={t("folder")}
-                        onClick={() => onSelect("folders")}
-                    />
-                    {intent !== "collect" && (
-                        <RowButton
-                            startIcon={<GoogleIcon />}
-                            endIcon={<ChevronRightIcon />}
-                            label={t("google_takeout")}
-                            onClick={() => onSelect("zips")}
-                        />
-                    )}
-                </Stack>
-                <Typography
-                    sx={{
-                        color: "text.muted",
-                        p: "12px",
-                        pt: "24px",
-                        textAlign: "center",
-                    }}
-                >
-                    {t("drag_and_drop_hint")}
-                </Typography>
-            </Box>
-        </>
-    );
-};
-
-const TakeoutOptions: React.FC<Omit<OptionsProps, "intent">> = ({
-    onSelect,
-    onClose,
-}) => {
-    return (
-        <>
-            <SpacedRow>
-                <DialogTitle variant="h5">{t("google_takeout")}</DialogTitle>
-                <DialogCloseIconButton {...{ onClose }} />
-            </SpacedRow>
-            <Stack sx={{ padding: "18px 12px 20px 12px", gap: "16px" }}>
-                <Stack sx={{ gap: "8px" }}>
-                    <FocusVisibleButton
-                        color="accent"
-                        fullWidth
-                        onClick={() => onSelect("folders")}
-                    >
-                        {t("select_folder")}
-                    </FocusVisibleButton>
-                    <FocusVisibleButton
-                        color="secondary"
-                        fullWidth
-                        onClick={() => onSelect("zips")}
-                    >
-                        {t("select_zips")}
-                    </FocusVisibleButton>
-                    <Link
-                        href="https://help.ente.io/photos/migration/from-google-photos/"
-                        target="_blank"
-                        rel="noopener"
-                    >
-                        <FocusVisibleButton color="secondary" fullWidth>
-                            {t("faq")}
-                        </FocusVisibleButton>
-                    </Link>
-                </Stack>
-
-                <Typography variant="small" sx={{ color: "text.muted" }}>
-                    {t("takeout_hint")}
-                </Typography>
-            </Stack>
-        </>
-    );
-};
diff --git a/web/apps/photos/src/components/Upload/UploadProgress.tsx b/web/apps/photos/src/components/UploadProgress.tsx
similarity index 100%
rename from web/apps/photos/src/components/Upload/UploadProgress.tsx
rename to web/apps/photos/src/components/UploadProgress.tsx
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index c8f2d3e3d3..cfc63e03d7 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -103,8 +103,7 @@ import GalleryEmptyState from "components/GalleryEmptyState";
 import PhotoFrame from "components/PhotoFrame";
 import { ITEM_TYPE, TimeStampListItem } from "components/PhotoList";
 import { Sidebar } from "components/Sidebar";
-import { type UploadTypeSelectorIntent } from "components/Upload/UploadTypeSelector";
-import Uploader from "components/Upload/Uploader";
+import { Upload, type UploadTypeSelectorIntent } from "components/Upload";
 import SelectedFileOptions from "components/pages/gallery/SelectedFileOptions";
 import { t } from "i18next";
 import { useRouter, type NextRouter } from "next/router";
@@ -997,7 +996,7 @@ const Page: React.FC = () => {
                     }}
                 />
 
-                <Uploader
+                <Upload
                     activeCollection={activeCollection}
                     syncWithRemote={syncWithRemote}
                     closeUploadTypeSelector={setUploadTypeSelectorView.bind(
diff --git a/web/apps/photos/src/pages/shared-albums.tsx b/web/apps/photos/src/pages/shared-albums.tsx
index a6212f42a7..8e22b6af49 100644
--- a/web/apps/photos/src/pages/shared-albums.tsx
+++ b/web/apps/photos/src/pages/shared-albums.tsx
@@ -57,7 +57,7 @@ import {
 } from "components/FilesDownloadProgress";
 import PhotoFrame from "components/PhotoFrame";
 import { ITEM_TYPE, TimeStampListItem } from "components/PhotoList";
-import Uploader from "components/Upload/Uploader";
+import {Upload} from "components/Upload";
 import { t } from "i18next";
 import { useRouter } from "next/router";
 import { useEffect, useMemo, useRef, useState } from "react";
@@ -536,7 +536,7 @@ export default function PublicCollectionGallery() {
                     selectable={downloadEnabled}
                 />
                 {blockingLoad && <TranslucentLoadingOverlay />}
-                <Uploader
+                <Upload
                     syncWithRemote={syncWithRemote}
                     uploadCollection={publicCollection}
                     setLoading={setBlockingLoad}

From 101a9d4b5d5c6fc7b78e3c8e2a49406f3de6503c Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 20 Feb 2025 12:00:27 +0530
Subject: [PATCH 347/796] [mob] Share only image for live photos

---
 mobile/lib/utils/share_util.dart | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/mobile/lib/utils/share_util.dart b/mobile/lib/utils/share_util.dart
index 3ec147798d..694bc6cff6 100644
--- a/mobile/lib/utils/share_util.dart
+++ b/mobile/lib/utils/share_util.dart
@@ -47,12 +47,6 @@ Future<void> share(
       pathFutures.add(
         getFile(file, isOrigin: true).then((fetchedFile) => fetchedFile?.path),
       );
-      if (file.fileType == FileType.livePhoto) {
-        pathFutures.add(
-          getFile(file, liveVideo: true)
-              .then((fetchedFile) => fetchedFile?.path),
-        );
-      }
     }
     final paths = await Future.wait(pathFutures);
     await dialog.hide();

From c480dd71f185af77c1889d0a7b21aab1a0e145cd Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 20 Feb 2025 12:06:22 +0530
Subject: [PATCH 348/796] [mob] Parse family member storage limit

---
 mobile/lib/models/user_details.dart | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mobile/lib/models/user_details.dart b/mobile/lib/models/user_details.dart
index c99ba20184..f7cfd1c1dc 100644
--- a/mobile/lib/models/user_details.dart
+++ b/mobile/lib/models/user_details.dart
@@ -106,12 +106,14 @@ class FamilyMember {
   final int usage;
   final String id;
   final bool isAdmin;
+  final int? storageLimit;
 
   FamilyMember(
     this.email,
     this.usage,
     this.id,
     this.isAdmin,
+    this.storageLimit,
   );
 
   factory FamilyMember.fromMap(Map<String, dynamic> map) {
@@ -120,6 +122,7 @@ class FamilyMember {
       map['usage'] as int,
       map['id'] as String,
       map['isAdmin'] as bool,
+      map['storageLimit'] as int?,
     );
   }
 
@@ -129,6 +132,7 @@ class FamilyMember {
       'usage': usage,
       'id': id,
       'isAdmin': isAdmin,
+      'storageLimit': storageLimit,
     };
   }
 

From 957c333cf30494eece7bd9136945d6fb29b9c4ad Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 12:08:31 +0530
Subject: [PATCH 349/796] Use the same enum throughout

---
 web/apps/photos/src/components/Upload.tsx | 146 +++++++++-------------
 1 file changed, 61 insertions(+), 85 deletions(-)

diff --git a/web/apps/photos/src/components/Upload.tsx b/web/apps/photos/src/components/Upload.tsx
index f14c4966e8..fb614d5c7f 100644
--- a/web/apps/photos/src/components/Upload.tsx
+++ b/web/apps/photos/src/components/Upload.tsx
@@ -4,7 +4,10 @@ import { DialogCloseIconButton } from "@/base/components/mui/DialogCloseIconButt
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import { RowButton } from "@/base/components/RowButton";
 import { useIsTouchscreen } from "@/base/components/utils/hooks";
-import { useModalVisibility } from "@/base/components/utils/modal";
+import {
+    useModalVisibility,
+    type ModalVisibilityProps,
+} from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
 import { basename } from "@/base/file-name";
 import log from "@/base/log";
@@ -73,12 +76,6 @@ import { UploadProgress } from "./UploadProgress";
 
 export type UploadTypeSelectorIntent = "upload" | "import" | "collect";
 
-enum PICKED_UPLOAD_TYPE {
-    FILES = "files",
-    FOLDERS = "folders",
-    ZIPS = "zips",
-}
-
 interface UploadProps {
     syncWithRemote: (force?: boolean, silent?: boolean) => Promise<void>;
     closeUploadTypeSelector: () => void;
@@ -112,6 +109,8 @@ interface UploadProps {
     activeCollection?: Collection;
 }
 
+type UploadType = "files" | "folders" | "zips";
+
 /**
  * Top level component that houses the infrastructure for handling uploads.
  */
@@ -148,7 +147,7 @@ export const Upload: React.FC<UploadProps> = ({
     const [openCollectionMappingChoice, setOpenCollectionMappingChoice] =
         useState(false);
     const [importSuggestion, setImportSuggestion] = useState<ImportSuggestion>(
-        DEFAULT_IMPORT_SUGGESTION,
+        defaultImportSuggestion,
     );
     const {
         show: showUploaderNameInput,
@@ -222,7 +221,7 @@ export const Upload: React.FC<UploadProps> = ({
      * This is set to thue user's choice when the user chooses one of the
      * predefined type to upload from the upload type selector dialog
      */
-    const pickedUploadType = useRef<PICKED_UPLOAD_TYPE>(null);
+    const selectedUploadType = useRef<UploadType | undefined>(undefined);
 
     const currentUploadPromise = useRef<Promise<void> | undefined>(undefined);
     const uploadRunning = useRef(false);
@@ -345,16 +344,16 @@ export const Upload: React.FC<UploadProps> = ({
         let files: File[];
         isDragAndDrop.current = false;
 
-        switch (pickedUploadType.current) {
-            case PICKED_UPLOAD_TYPE.FILES:
+        switch (selectedUploadType.current) {
+            case "files":
                 files = fileSelectorFiles;
                 break;
 
-            case PICKED_UPLOAD_TYPE.FOLDERS:
+            case "folders":
                 files = folderSelectorFiles;
                 break;
 
-            case PICKED_UPLOAD_TYPE.ZIPS:
+            case "zips":
                 files = fileSelectorZipFiles;
                 break;
 
@@ -442,7 +441,7 @@ export const Upload: React.FC<UploadProps> = ({
         }
 
         const importSuggestion = getImportSuggestion(
-            pickedUploadType.current,
+            selectedUploadType.current,
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             prunedItemAndPaths.map(([_, p]) => p),
         );
@@ -451,8 +450,8 @@ export const Upload: React.FC<UploadProps> = ({
         log.debug(() => ["Upload request", uploadItemsAndPaths.current]);
         log.debug(() => ["Import suggestion", importSuggestion]);
 
-        const _pickedUploadType = pickedUploadType.current;
-        pickedUploadType.current = null;
+        const _selectedUploadType = selectedUploadType.current;
+        selectedUploadType.current = null;
         props.setLoading(false);
 
         (async () => {
@@ -481,7 +480,7 @@ export const Upload: React.FC<UploadProps> = ({
                 return;
             }
 
-            if (electron && _pickedUploadType === PICKED_UPLOAD_TYPE.ZIPS) {
+            if (electron && _selectedUploadType == "zips") {
                 uploadFilesToNewCollections("parent");
                 return;
             }
@@ -738,25 +737,25 @@ export const Upload: React.FC<UploadProps> = ({
         uploadManager.cancelRunningUpload();
     };
 
-    const handleUpload = (type: PICKED_UPLOAD_TYPE) => {
-        pickedUploadType.current = type;
-        if (type === PICKED_UPLOAD_TYPE.FILES) {
-            openFileSelector();
-        } else if (type === PICKED_UPLOAD_TYPE.FOLDERS) {
-            openFolderSelector();
-        } else {
-            if (electron) {
-                openZipFileSelector();
-            } else {
-                showMiniDialog(downloadAppDialogAttributes());
-            }
+    const handleUploadTypeSelect = (type: UploadType) => {
+        selectedUploadType.current = type;
+        switch (type) {
+            case "files":
+                openFileSelector();
+                break;
+            case "folders":
+                openFolderSelector();
+                break;
+            case "zips":
+                if (electron) {
+                    openZipFileSelector();
+                } else {
+                    showMiniDialog(downloadAppDialogAttributes());
+                }
+                break;
         }
     };
 
-    const handleFileUpload = () => handleUpload(PICKED_UPLOAD_TYPE.FILES);
-    const handleFolderUpload = () => handleUpload(PICKED_UPLOAD_TYPE.FOLDERS);
-    const handleZipUpload = () => handleUpload(PICKED_UPLOAD_TYPE.ZIPS);
-
     const handlePublicUpload = async (
         uploaderName: string,
         skipSave?: boolean,
@@ -836,9 +835,7 @@ export const Upload: React.FC<UploadProps> = ({
                 open={props.uploadTypeSelectorView}
                 onClose={props.closeUploadTypeSelector}
                 intent={props.uploadTypeSelectorIntent}
-                uploadFiles={handleFileUpload}
-                uploadFolders={handleFolderUpload}
-                uploadGoogleTakeoutZips={handleZipUpload}
+                onSelect={handleUploadTypeSelect}
             />
             <UploadProgress
                 open={uploadProgressView}
@@ -933,25 +930,29 @@ const pathLikeForWebFile = (file: File): string =>
         file.name,
     ])!;
 
-// This is used to prompt the user the make upload strategy choice
+/**
+ * This is used to prompt the user the make upload strategy choice.
+ *
+ * This is derived from the items that the user selected.
+ */
 interface ImportSuggestion {
     rootFolderName: string;
     hasNestedFolders: boolean;
     hasRootLevelFileWithFolder: boolean;
 }
 
-const DEFAULT_IMPORT_SUGGESTION: ImportSuggestion = {
+const defaultImportSuggestion: ImportSuggestion = {
     rootFolderName: "",
     hasNestedFolders: false,
     hasRootLevelFileWithFolder: false,
 };
 
 function getImportSuggestion(
-    uploadType: PICKED_UPLOAD_TYPE,
+    uploadType: UploadType,
     paths: string[],
 ): ImportSuggestion {
-    if (isDesktop && uploadType === PICKED_UPLOAD_TYPE.FILES) {
-        return DEFAULT_IMPORT_SUGGESTION;
+    if (isDesktop && uploadType == "files") {
+        return defaultImportSuggestion;
     }
 
     const separatorCounts = new Map(
@@ -981,6 +982,7 @@ function getImportSuggestion(
             );
         }
     }
+
     return {
         rootFolderName: commonPathPrefix || null,
         hasNestedFolders: firstFileFolder !== lastFileFolder,
@@ -1060,17 +1062,16 @@ const setPendingUploads = async (
     await electron.setPendingUploads({ collectionName, filePaths, zipItems });
 };
 
-interface UploadTypeSelectorProps {
-    /** If `true`, then the selector is shown. */
-    open: boolean;
-    /** Callback to indicate that the selector should be closed. */
-    onClose: () => void;
-    /** The particular context / scenario in which this upload is occuring. */
+type UploadTypeSelectorProps = ModalVisibilityProps & {
+    /**
+     * The particular context / scenario in which this upload is occuring.
+     */
     intent: UploadTypeSelectorIntent;
-    uploadFiles: () => void;
-    uploadFolders: () => void;
-    uploadGoogleTakeoutZips: () => void;
-}
+    /**
+     * Called when the user selects one of the options.
+     */
+    onSelect: (type: UploadType) => void;
+};
 
 /**
  * Request the user to specify which type of file / folder / zip it is that they
@@ -1085,9 +1086,7 @@ const UploadTypeSelector: React.FC<UploadTypeSelectorProps> = ({
     open,
     onClose,
     intent,
-    uploadFiles,
-    uploadFolders,
-    uploadGoogleTakeoutZips,
+    onSelect,
 }) => {
     const publicCollectionGalleryContext = useContext(
         PublicCollectionGalleryContext,
@@ -1103,28 +1102,15 @@ const UploadTypeSelector: React.FC<UploadTypeSelectorProps> = ({
             directlyShowUploadFiles &&
             publicCollectionGalleryContext.credentials
         ) {
-            uploadFiles();
+            onSelect("files");
             onClose();
         }
     }, [open]);
 
-    const handleSelect = (option: UploadOptionType) => {
-        switch (option) {
-            case "files":
-                uploadFiles();
-                break;
-            case "folders":
-                uploadFolders();
-                break;
-            case "zips":
-                uploadGoogleTakeoutZips();
-                break;
-        }
-    };
-
     return (
         <Dialog
             open={open}
+            onClose={onClose}
             fullWidth
             slotProps={{
                 paper: {
@@ -1135,26 +1121,16 @@ const UploadTypeSelector: React.FC<UploadTypeSelectorProps> = ({
                     }),
                 },
             }}
-            onClose={onClose}
         >
-            <UploadOptions
-                intent={intent}
-                onSelect={handleSelect}
-                onClose={onClose}
-            />
+            <UploadOptions {...{ intent, onSelect, onClose }} />
         </Dialog>
     );
 };
 
-type UploadOptionType = "files" | "folders" | "zips";
-
-interface UploadOptionsProps {
-    intent: UploadTypeSelectorIntent;
-    /** Called when the user selects one of the provided options. */
-    onSelect: (option: UploadOptionType) => void;
-    /** Called when the dialog should be closed. */
-    onClose: () => void;
-}
+type UploadOptionsProps = Pick<
+    UploadTypeSelectorProps,
+    "onClose" | "intent" | "onSelect"
+>;
 
 const UploadOptions: React.FC<UploadOptionsProps> = ({
     intent,
@@ -1174,7 +1150,7 @@ const UploadOptions: React.FC<UploadOptionsProps> = ({
 
     const handleTakeoutClose = () => setShowTakeoutOptions(false);
 
-    const handleSelect = (option: UploadOptionType) => {
+    const handleSelect = (option: UploadType) => {
         switch (option) {
             case "files":
                 onSelect("files");

From 77d16e275dfa74763328911962e539e12be6fcc8 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 12:46:54 +0530
Subject: [PATCH 350/796] Also mark selection

---
 web/apps/photos/src/components/Upload.tsx     | 50 ++++++++++++-------
 .../components/utils/use-file-input.ts        | 30 +++++++----
 2 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/web/apps/photos/src/components/Upload.tsx b/web/apps/photos/src/components/Upload.tsx
index fb614d5c7f..bc6e0d6498 100644
--- a/web/apps/photos/src/components/Upload.tsx
+++ b/web/apps/photos/src/components/Upload.tsx
@@ -228,35 +228,61 @@ export const Upload: React.FC<UploadProps> = ({
     const uploaderNameRef = useRef<string>(null);
     const isDragAndDrop = useRef(false);
 
+    /**
+     * `true` if we've activated one hidden {@link Inputs} that allow the user
+     * to select items, and haven't heard back from the browser as to the
+     * selection (or cancellation).
+     *
+     * [Note: Showing an activity indicator during upload item selection]
+     *
+     * When selecting a large number of items (100K+), the browser can take
+     * significant time (10s+) before it hands back control to us. The
+     * {@link isInputPending} state tracks this intermediate state, and we use
+     * it to show an activity indicator to let that the user know that their
+     * selection is still being processed.
+     */
+    const [isInputPending, setIsInputPending] = useState(false);
+
+    /**
+     * Files that were selected by the user in the last activation of one of the
+     * hidden {@link Inputs}.
+     */
+    const [selectedInputFiles, setSelectedInputFiles] = useState<File[]>([]);
+
+    const handleInputSelect = useCallback((files: File[]) => {
+        setIsInputPending(false);
+        setSelectedInputFiles(files);
+    }, []);
+
     const handleInputCancel = useCallback(() => {
-        console.log("cancel");
+        setIsInputPending(false);
     }, []);
 
     const {
         getInputProps: getFileSelectorInputProps,
         openSelector: openFileSelector,
-        selectedFiles: fileSelectorFiles,
     } = useFileInput({
         directory: false,
+        onSelect: handleInputSelect,
         onCancel: handleInputCancel,
     });
 
     const {
         getInputProps: getFolderSelectorInputProps,
         openSelector: openFolderSelector,
-        selectedFiles: folderSelectorFiles,
     } = useFileInput({
         directory: true,
+        onSelect: handleInputSelect,
         onCancel: handleInputCancel,
     });
 
     const {
         getInputProps: getZipFileSelectorInputProps,
         openSelector: openZipFileSelector,
-        selectedFiles: fileSelectorZipFiles,
     } = useFileInput({
         directory: false,
         accept: ".zip",
+        onSelect: handleInputSelect,
         onCancel: handleInputCancel,
     });
 
@@ -346,15 +372,9 @@ export const Upload: React.FC<UploadProps> = ({
 
         switch (selectedUploadType.current) {
             case "files":
-                files = fileSelectorFiles;
-                break;
-
             case "folders":
-                files = folderSelectorFiles;
-                break;
-
             case "zips":
-                files = fileSelectorZipFiles;
+                files = selectedInputFiles;
                 break;
 
             default:
@@ -373,12 +393,7 @@ export const Upload: React.FC<UploadProps> = ({
         } else {
             setWebFiles(files);
         }
-    }, [
-        dragAndDropFiles,
-        fileSelectorFiles,
-        folderSelectorFiles,
-        fileSelectorZipFiles,
-    ]);
+    }, [selectedInputFiles, dragAndDropFiles]);
 
     // Trigger an upload when any of the dependencies change.
     useEffect(() => {
@@ -739,6 +754,7 @@ export const Upload: React.FC<UploadProps> = ({
 
     const handleUploadTypeSelect = (type: UploadType) => {
         selectedUploadType.current = type;
+        setIsInputPending(true);
         switch (type) {
             case "files":
                 openFileSelector();
diff --git a/web/packages/gallery/components/utils/use-file-input.ts b/web/packages/gallery/components/utils/use-file-input.ts
index 11958d1cea..e46141d9e9 100644
--- a/web/packages/gallery/components/utils/use-file-input.ts
+++ b/web/packages/gallery/components/utils/use-file-input.ts
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useRef } from "react";
 
 interface UseFileInputParams {
     /**
@@ -14,6 +14,17 @@ interface UseFileInputParams {
      * https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/accept).
      */
     accept?: string;
+    /**
+     * A callback that is invoked when the user selects files.
+     *
+     * It will be passed the list of {@link File}s that the user selected.
+     *
+     * This will be a list even if the user selected directories - in that case,
+     * it will be the recursive list of files within this directory.
+     *
+     * If the user selected no items, then {@link onCancel} will be invoked.
+     */
+    onSelect: (selectedFiles: File[]) => void;
     /**
      * A callback that is invoked when the user cancels on the file / directory
      * dialog.
@@ -33,13 +44,6 @@ interface UseFileInputResult {
      * A function that can be called to open the select file / directory dialog.
      */
     openSelector: () => void;
-    /**
-     * The list of {@link File}s that the user selected.
-     *
-     * This will be a list even if the user selected directories - in that case,
-     * it will be the recursive list of files within this directory.
-     */
-    selectedFiles: File[];
 }
 
 /**
@@ -55,9 +59,9 @@ interface UseFileInputResult {
 export const useFileInput = ({
     directory,
     accept,
+    onSelect,
     onCancel,
 }: UseFileInputParams): UseFileInputResult => {
-    const [selectedFiles, setSelectedFiles] = useState<File[]>([]);
     const inputRef = useRef<HTMLInputElement | undefined>(undefined);
 
     useEffect(() => {
@@ -80,7 +84,11 @@ export const useFileInput = ({
         event,
     ) => {
         const files = event.target.files;
-        if (files) setSelectedFiles([...files]);
+        if (files?.length) {
+            onSelect([...files]);
+        } else {
+            onCancel();
+        }
     };
 
     // [Note: webkitRelativePath]
@@ -111,5 +119,5 @@ export const useFileInput = ({
         [directoryOpts, accept, handleChange],
     );
 
-    return { getInputProps, openSelector, selectedFiles };
+    return { getInputProps, openSelector };
 };

From b5f850b3be25590873bd296a7c30138346d4f94b Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 13:06:37 +0530
Subject: [PATCH 351/796] Activity indicator

---
 web/apps/photos/src/components/Upload.tsx | 114 +++++++++++++---------
 1 file changed, 68 insertions(+), 46 deletions(-)

diff --git a/web/apps/photos/src/components/Upload.tsx b/web/apps/photos/src/components/Upload.tsx
index bc6e0d6498..ad2fe96b8c 100644
--- a/web/apps/photos/src/components/Upload.tsx
+++ b/web/apps/photos/src/components/Upload.tsx
@@ -38,6 +38,7 @@ import InfoRoundedIcon from "@mui/icons-material/InfoRounded";
 import PermMediaOutlinedIcon from "@mui/icons-material/PermMediaOutlined";
 import {
     Box,
+    CircularProgress,
     Dialog,
     DialogTitle,
     Link,
@@ -851,6 +852,9 @@ export const Upload: React.FC<UploadProps> = ({
                 open={props.uploadTypeSelectorView}
                 onClose={props.closeUploadTypeSelector}
                 intent={props.uploadTypeSelectorIntent}
+                pendingUploadType={
+                    isInputPending ? selectedUploadType.current : undefined
+                }
                 onSelect={handleUploadTypeSelect}
             />
             <UploadProgress
@@ -1083,6 +1087,11 @@ type UploadTypeSelectorProps = ModalVisibilityProps & {
      * The particular context / scenario in which this upload is occuring.
      */
     intent: UploadTypeSelectorIntent;
+    /**
+     * If we're waiting on the user to select items using a previously activated
+     * file input, then this will be set to the type of that input.
+     */
+    pendingUploadType: UploadType | undefined;
     /**
      * Called when the user selects one of the options.
      */
@@ -1102,6 +1111,7 @@ const UploadTypeSelector: React.FC<UploadTypeSelectorProps> = ({
     open,
     onClose,
     intent,
+    pendingUploadType,
     onSelect,
 }) => {
     const publicCollectionGalleryContext = useContext(
@@ -1138,18 +1148,21 @@ const UploadTypeSelector: React.FC<UploadTypeSelectorProps> = ({
                 },
             }}
         >
-            <UploadOptions {...{ intent, onSelect, onClose }} />
+            <UploadOptions
+                {...{ intent, pendingUploadType, onSelect, onClose }}
+            />
         </Dialog>
     );
 };
 
 type UploadOptionsProps = Pick<
     UploadTypeSelectorProps,
-    "onClose" | "intent" | "onSelect"
+    "onClose" | "intent" | "pendingUploadType" | "onSelect"
 >;
 
 const UploadOptions: React.FC<UploadOptionsProps> = ({
     intent,
+    pendingUploadType,
     onSelect,
     onClose,
 }) => {
@@ -1183,7 +1196,10 @@ const UploadOptions: React.FC<UploadOptionsProps> = ({
     };
 
     return !showTakeoutOptions ? (
-        <DefaultOptions {...{ intent, onClose }} onSelect={handleSelect} />
+        <DefaultOptions
+            {...{ intent, pendingUploadType, onClose }}
+            onSelect={handleSelect}
+        />
     ) : (
         <TakeoutOptions onSelect={handleSelect} onClose={handleTakeoutClose} />
     );
@@ -1191,6 +1207,7 @@ const UploadOptions: React.FC<UploadOptionsProps> = ({
 
 const DefaultOptions: React.FC<UploadOptionsProps> = ({
     intent,
+    pendingUploadType,
     onClose,
     onSelect,
 }) => {
@@ -1211,7 +1228,16 @@ const DefaultOptions: React.FC<UploadOptionsProps> = ({
                     {intent != "import" && (
                         <RowButton
                             startIcon={<ImageOutlinedIcon />}
-                            endIcon={<ChevronRightIcon />}
+                            endIcon={
+                                pendingUploadType == "files" ? (
+                                    <CircularProgress
+                                        // color="accent"
+                                        size={20}
+                                    />
+                                ) : (
+                                    <ChevronRightIcon />
+                                )
+                            }
                             label={t("file")}
                             onClick={() => onSelect("files")}
                         />
@@ -1246,47 +1272,43 @@ const DefaultOptions: React.FC<UploadOptionsProps> = ({
     );
 };
 
-const TakeoutOptions: React.FC<Omit<UploadOptionsProps, "intent">> = ({
-    onSelect,
-    onClose,
-}) => {
-    return (
-        <>
-            <SpacedRow>
-                <DialogTitle variant="h5">{t("google_takeout")}</DialogTitle>
-                <DialogCloseIconButton {...{ onClose }} />
-            </SpacedRow>
-            <Stack sx={{ padding: "18px 12px 20px 12px", gap: "16px" }}>
-                <Stack sx={{ gap: "8px" }}>
-                    <FocusVisibleButton
-                        color="accent"
-                        fullWidth
-                        onClick={() => onSelect("folders")}
-                    >
-                        {t("select_folder")}
+const TakeoutOptions: React.FC<
+    Pick<UploadOptionsProps, "onSelect" | "onClose">
+> = ({ onSelect, onClose }) => (
+    <>
+        <SpacedRow>
+            <DialogTitle variant="h5">{t("google_takeout")}</DialogTitle>
+            <DialogCloseIconButton {...{ onClose }} />
+        </SpacedRow>
+        <Stack sx={{ padding: "18px 12px 20px 12px", gap: "16px" }}>
+            <Stack sx={{ gap: "8px" }}>
+                <FocusVisibleButton
+                    color="accent"
+                    fullWidth
+                    onClick={() => onSelect("folders")}
+                >
+                    {t("select_folder")}
+                </FocusVisibleButton>
+                <FocusVisibleButton
+                    color="secondary"
+                    fullWidth
+                    onClick={() => onSelect("zips")}
+                >
+                    {t("select_zips")}
+                </FocusVisibleButton>
+                <Link
+                    href="https://help.ente.io/photos/migration/from-google-photos/"
+                    target="_blank"
+                    rel="noopener"
+                >
+                    <FocusVisibleButton color="secondary" fullWidth>
+                        {t("faq")}
                     </FocusVisibleButton>
-                    <FocusVisibleButton
-                        color="secondary"
-                        fullWidth
-                        onClick={() => onSelect("zips")}
-                    >
-                        {t("select_zips")}
-                    </FocusVisibleButton>
-                    <Link
-                        href="https://help.ente.io/photos/migration/from-google-photos/"
-                        target="_blank"
-                        rel="noopener"
-                    >
-                        <FocusVisibleButton color="secondary" fullWidth>
-                            {t("faq")}
-                        </FocusVisibleButton>
-                    </Link>
-                </Stack>
-
-                <Typography variant="small" sx={{ color: "text.muted" }}>
-                    {t("takeout_hint")}
-                </Typography>
+                </Link>
             </Stack>
-        </>
-    );
-};
+            <Typography variant="small" sx={{ color: "text.muted" }}>
+                {t("takeout_hint")}
+            </Typography>
+        </Stack>
+    </>
+);

From 3f358b951135d3fb77178b6ae99ef1e09de70425 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prateekmedia@users.noreply.github.com>
Date: Thu, 20 Feb 2025 13:08:56 +0530
Subject: [PATCH 352/796] fix: run preview creation after sync fd status

---
 mobile/lib/services/preview_video_store.dart | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 7a72a93a9d..7ba2e88fca 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -58,10 +58,9 @@ class PreviewVideoStore {
   void init(SharedPreferences prefs) {
     _prefs = prefs;
 
-    Future.delayed(
-      const Duration(seconds: 10),
-      _putFilesForPreviewCreation,
-    );
+    FileDataService.instance.syncFDStatus().then(
+          (_) => _putFilesForPreviewCreation(),
+        );
   }
 
   late final SharedPreferences _prefs;

From 270a628478b04e5e43b0f082c07b845f291b79f1 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 13:09:53 +0530
Subject: [PATCH 353/796] Use

---
 web/apps/photos/src/components/Upload.tsx | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/web/apps/photos/src/components/Upload.tsx b/web/apps/photos/src/components/Upload.tsx
index ad2fe96b8c..5831e348e5 100644
--- a/web/apps/photos/src/components/Upload.tsx
+++ b/web/apps/photos/src/components/Upload.tsx
@@ -1230,10 +1230,7 @@ const DefaultOptions: React.FC<UploadOptionsProps> = ({
                             startIcon={<ImageOutlinedIcon />}
                             endIcon={
                                 pendingUploadType == "files" ? (
-                                    <CircularProgress
-                                        // color="accent"
-                                        size={20}
-                                    />
+                                    <PendingIndicator />
                                 ) : (
                                     <ChevronRightIcon />
                                 )
@@ -1244,7 +1241,13 @@ const DefaultOptions: React.FC<UploadOptionsProps> = ({
                     )}
                     <RowButton
                         startIcon={<PermMediaOutlinedIcon />}
-                        endIcon={<ChevronRightIcon />}
+                        endIcon={
+                            pendingUploadType == "folders" ? (
+                                <PendingIndicator />
+                            ) : (
+                                <ChevronRightIcon />
+                            )
+                        }
                         label={t("folder")}
                         onClick={() => onSelect("folders")}
                     />
@@ -1272,6 +1275,10 @@ const DefaultOptions: React.FC<UploadOptionsProps> = ({
     );
 };
 
+const PendingIndicator = () => (
+    <CircularProgress size={18} sx={{ color: "stroke.muted" }} />
+);
+
 const TakeoutOptions: React.FC<
     Pick<UploadOptionsProps, "onSelect" | "onClose">
 > = ({ onSelect, onClose }) => (

From ddb867d21ffeffe436ac1adc3af833bb14837c70 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prateekmedia@users.noreply.github.com>
Date: Thu, 20 Feb 2025 13:14:21 +0530
Subject: [PATCH 354/796] fix: correct sources

---
 mobile/pubspec.lock | 135 ++++++++++++++++----------------------------
 mobile/pubspec.yaml |  33 +++++++----
 2 files changed, 72 insertions(+), 96 deletions(-)

diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index 0c14e7b23a..532ec80678 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -977,26 +977,26 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_secure_storage
-      sha256: "22dbf16f23a4bcf9d35e51be1c84ad5bb6f627750565edd70dab70f3ff5fff8f"
+      sha256: "9cad52d75ebc511adfae3d447d5d13da15a55a92c9410e50f67335b6d21d16ea"
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.0"
+    version: "9.2.4"
   flutter_secure_storage_linux:
     dependency: transitive
     description:
       name: flutter_secure_storage_linux
-      sha256: "4d91bfc23047422cbcd73ac684bc169859ee766482517c22172c86596bf1464b"
+      sha256: bf7404619d7ab5c0a1151d7c4e802edad8f33535abfbeff2f9e1fe1274e2d705
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   flutter_secure_storage_macos:
     dependency: transitive
     description:
       name: flutter_secure_storage_macos
-      sha256: "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81"
+      sha256: "6c0a2795a2d1de26ae202a0d78527d163f4acbb11cde4c75c670f3a0fc064247"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.3"
   flutter_secure_storage_platform_interface:
     dependency: transitive
     description:
@@ -1017,10 +1017,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_secure_storage_windows
-      sha256: "38f9501c7cb6f38961ef0e1eacacee2b2d4715c63cc83fe56449c4d3d0b47255"
+      sha256: b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "3.1.2"
   flutter_shaders:
     dependency: transitive
     description:
@@ -1386,7 +1386,7 @@ packages:
     source: hosted
     version: "0.10.1"
   js:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       name: js
       sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
@@ -1587,12 +1587,13 @@ packages:
     source: git
     version: "1.0.2"
   media_kit:
-    dependency: "direct main"
+    dependency: "direct overridden"
     description:
-      name: media_kit
-      sha256: "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62"
-      url: "https://pub.dev"
-    source: hosted
+      path: media_kit
+      ref: HEAD
+      resolved-ref: "3c4ff28c43d20e68f8d587956b2f525292c25a80"
+      url: "https://github.com/media-kit/media-kit"
+    source: git
     version: "1.1.11"
   media_kit_libs_android_video:
     dependency: transitive
@@ -1603,12 +1604,13 @@ packages:
     source: hosted
     version: "1.3.6"
   media_kit_libs_ios_video:
-    dependency: "direct main"
+    dependency: "direct overridden"
     description:
-      name: media_kit_libs_ios_video
-      sha256: b5382994eb37a4564c368386c154ad70ba0cc78dacdd3fb0cd9f30db6d837991
-      url: "https://pub.dev"
-    source: hosted
+      path: "libs/ios/media_kit_libs_ios_video"
+      ref: HEAD
+      resolved-ref: "3c4ff28c43d20e68f8d587956b2f525292c25a80"
+      url: "https://github.com/media-kit/media-kit"
+    source: git
     version: "1.1.4"
   media_kit_libs_linux:
     dependency: transitive
@@ -1627,12 +1629,13 @@ packages:
     source: hosted
     version: "1.1.4"
   media_kit_libs_video:
-    dependency: "direct main"
+    dependency: "direct overridden"
     description:
-      name: media_kit_libs_video
-      sha256: "20bb4aefa8fece282b59580e1cd8528117297083a6640c98c2e98cfc96b93288"
-      url: "https://pub.dev"
-    source: hosted
+      path: "libs/universal/media_kit_libs_video"
+      ref: HEAD
+      resolved-ref: "3c4ff28c43d20e68f8d587956b2f525292c25a80"
+      url: "https://github.com/media-kit/media-kit"
+    source: git
     version: "1.0.5"
   media_kit_libs_windows_video:
     dependency: transitive
@@ -1642,21 +1645,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.10"
-  media_kit_native_event_loop:
-    dependency: transitive
-    description:
-      name: media_kit_native_event_loop
-      sha256: "7d82e3b3e9ded5c35c3146c5ba1da3118d1dd8ac3435bac7f29f458181471b40"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.9"
   media_kit_video:
-    dependency: "direct main"
+    dependency: "direct overridden"
     description:
-      name: media_kit_video
-      sha256: "2cc3b966679963ba25a4ce5b771e532a521ebde7c6aa20e9802bec95d9916c8f"
-      url: "https://pub.dev"
-    source: hosted
+      path: media_kit_video
+      ref: HEAD
+      resolved-ref: "3c4ff28c43d20e68f8d587956b2f525292c25a80"
+      url: "https://github.com/media-kit/media-kit"
+    source: git
     version: "1.2.5"
   meta:
     dependency: transitive
@@ -2171,58 +2167,26 @@ packages:
     dependency: transitive
     description:
       name: safe_local_storage
-      sha256: ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440
+      sha256: e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
-  screen_brightness:
-    dependency: transitive
-    description:
-      name: screen_brightness
-      sha256: ed8da4a4511e79422fc1aa88138e920e4008cd312b72cdaa15ccb426c0faaedd
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.2+1"
+    version: "2.0.1"
   screen_brightness_android:
     dependency: transitive
     description:
       name: screen_brightness_android
-      sha256: "3df10961e3a9e968a5e076fe27e7f4741fa8a1d3950bdeb48cf121ed529d0caf"
+      sha256: ff9141bed547db02233e7dd88f990ab01973a0c8a8c04ddb855c7b072f33409a
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.0+2"
-  screen_brightness_ios:
-    dependency: transitive
-    description:
-      name: screen_brightness_ios
-      sha256: "99adc3ca5490b8294284aad5fcc87f061ad685050e03cf45d3d018fe398fd9a2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.0"
-  screen_brightness_macos:
-    dependency: transitive
-    description:
-      name: screen_brightness_macos
-      sha256: "64b34e7e3f4900d7687c8e8fb514246845a73ecec05ab53483ed025bd4a899fd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.0+1"
+    version: "2.1.0"
   screen_brightness_platform_interface:
     dependency: transitive
     description:
       name: screen_brightness_platform_interface
-      sha256: b211d07f0c96637a15fb06f6168617e18030d5d74ad03795dd8547a52717c171
+      sha256: "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.0"
-  screen_brightness_windows:
-    dependency: transitive
-    description:
-      name: screen_brightness_windows
-      sha256: "9261bf33d0fc2707d8cf16339ce25768100a65e70af0fcabaf032fc12408ba86"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.3"
+    version: "2.1.0"
   screenshot:
     dependency: "direct main"
     description:
@@ -2712,10 +2676,10 @@ packages:
     dependency: transitive
     description:
       name: uri_parser
-      sha256: "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835"
+      sha256: ff4d2c720aca3f4f7d5445e23b11b2d15ef8af5ddce5164643f38ff962dcb270
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "3.0.0"
   url_launcher:
     dependency: "direct main"
     description:
@@ -2838,7 +2802,7 @@ packages:
     source: git
     version: "3.0.0"
   video_player:
-    dependency: "direct main"
+    dependency: "direct overridden"
     description:
       path: "packages/video_player/video_player"
       ref: android_video_roation_fix
@@ -2863,12 +2827,13 @@ packages:
     source: hosted
     version: "2.6.2"
   video_player_media_kit:
-    dependency: "direct main"
+    dependency: "direct overridden"
     description:
-      name: video_player_media_kit
-      sha256: eadf78b85d0ecc6f65bb5ca84c5ad9546a8609c6c0ee207e81673f7969461f3b
-      url: "https://pub.dev"
-    source: hosted
+      path: video_player_media_kit
+      ref: HEAD
+      resolved-ref: "3c4ff28c43d20e68f8d587956b2f525292c25a80"
+      url: "https://github.com/media-kit/media-kit"
+    source: git
     version: "1.0.5"
   video_player_platform_interface:
     dependency: transitive
@@ -2914,10 +2879,10 @@ packages:
     dependency: transitive
     description:
       name: volume_controller
-      sha256: c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e
+      sha256: "68975792fbd2ac36cd2aa387273669772a452785d94b6db5808bf2dc3e44a0f1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.8"
+    version: "3.3.0"
   wakelock_plus:
     dependency: "direct main"
     description:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index b742983207..7ad4a66164 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -90,7 +90,7 @@ dependencies:
   flutter_map_marker_cluster: ^1.3.6
   flutter_native_splash: ^2.2.0+1
   flutter_password_strength: ^0.1.6
-  flutter_secure_storage: ^8.0.0
+  flutter_secure_storage: ^9.2.4
   flutter_sodium: ^0.2.0
   flutter_staggered_grid_view: ^0.6.2
   flutter_svg: ^2.0.10+1
@@ -120,10 +120,6 @@ dependencies:
     git:
       url: "https://github.com/ente-io/media_extension.git"
       ref: deeplink_fixes
-  media_kit: ^1.1.10+1
-  media_kit_libs_ios_video: ^1.1.4
-  media_kit_libs_video: ^1.0.4
-  media_kit_video: ^1.2.4
   ml_linalg: ^13.11.31
   modal_bottom_sheet: ^3.0.0-pre
   motion_photos:
@@ -190,12 +186,6 @@ dependencies:
   video_editor:
     git:
       url: https://github.com/prateekmedia/video_editor.git
-  video_player:
-    git:
-      url: https://github.com/ente-io/packages.git
-      ref: android_video_roation_fix
-      path: packages/video_player/video_player/
-  video_player_media_kit: ^1.0.5
   video_thumbnail: ^0.5.3
   visibility_detector: ^0.3.3
   wakelock_plus: ^1.1.1
@@ -210,11 +200,32 @@ dependency_overrides:
   # Newer flutter packages depends on ffi > 2.0.0 while flutter_sodium depends on ffi < 2.0.0
   ffi: 2.1.0
   intl: 0.18.1
+  media_kit:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: media_kit
+  media_kit_video:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: media_kit_video
+  media_kit_libs_video:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: libs/universal/media_kit_libs_video
+  media_kit_libs_ios_video:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: libs/ios/media_kit_libs_ios_video
   video_player:
     git:
       url: https://github.com/ente-io/packages.git
       ref: android_video_roation_fix
       path: packages/video_player/video_player/
+  video_player_media_kit:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: video_player_media_kit
+  js: ^0.6.7
   watcher: ^1.1.0
   win32: ^5.5.4
 

From 80ab0a308f4edb412b3f50fc8afba3797fa0ad64 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prateekmedia@users.noreply.github.com>
Date: Thu, 20 Feb 2025 13:14:32 +0530
Subject: [PATCH 355/796] chore: bump locks

---
 mobile/ios/Podfile.lock | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index 93a14d304a..fa4e5f3a09 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -144,8 +144,6 @@ PODS:
     - Flutter
   - media_kit_libs_ios_video (1.0.4):
     - Flutter
-  - media_kit_native_event_loop (1.0.0):
-    - Flutter
   - media_kit_video (0.0.1):
     - Flutter
   - motion_sensors (0.0.1):
@@ -189,8 +187,6 @@ PODS:
   - PromisesObjC (2.4.0)
   - receive_sharing_intent (1.8.0):
     - Flutter
-  - screen_brightness_ios (0.1.0):
-    - Flutter
   - SDWebImage (5.20.0):
     - SDWebImage/Core (= 5.20.0)
   - SDWebImage/Core (5.20.0)
@@ -278,7 +274,6 @@ DEPENDENCIES:
   - maps_launcher (from `.symlinks/plugins/maps_launcher/ios`)
   - media_extension (from `.symlinks/plugins/media_extension/ios`)
   - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
-  - media_kit_native_event_loop (from `.symlinks/plugins/media_kit_native_event_loop/ios`)
   - media_kit_video (from `.symlinks/plugins/media_kit_video/ios`)
   - motion_sensors (from `.symlinks/plugins/motion_sensors/ios`)
   - motionphoto (from `.symlinks/plugins/motionphoto/ios`)
@@ -293,7 +288,6 @@ DEPENDENCIES:
   - photo_manager (from `.symlinks/plugins/photo_manager/ios`)
   - privacy_screen (from `.symlinks/plugins/privacy_screen/ios`)
   - receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`)
-  - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
   - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
@@ -390,8 +384,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/media_extension/ios"
   media_kit_libs_ios_video:
     :path: ".symlinks/plugins/media_kit_libs_ios_video/ios"
-  media_kit_native_event_loop:
-    :path: ".symlinks/plugins/media_kit_native_event_loop/ios"
   media_kit_video:
     :path: ".symlinks/plugins/media_kit_video/ios"
   motion_sensors:
@@ -420,8 +412,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/privacy_screen/ios"
   receive_sharing_intent:
     :path: ".symlinks/plugins/receive_sharing_intent/ios"
-  screen_brightness_ios:
-    :path: ".symlinks/plugins/screen_brightness_ios/ios"
   sentry_flutter:
     :path: ".symlinks/plugins/sentry_flutter/ios"
   share_plus:
@@ -472,7 +462,7 @@ SPEC CHECKSUMS:
   flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
   flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100
   flutter_native_splash: 35ddbc7228eafcb3969dcc5f1fbbe27c1145a4f0
-  flutter_secure_storage: 2c2ff13db9e0a5647389bff88b0ecac56e3f3418
+  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
   flutter_sodium: 152647449ba89a157fd48d7e293dcd6d29c6ab0e
   fluttertoast: 76fea30fcf04176325f6864c87306927bd7d2038
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
@@ -489,7 +479,6 @@ SPEC CHECKSUMS:
   maps_launcher: edf829809ba9e894d70e569bab11c16352dedb45
   media_extension: a1fec16ee9c8241a6aef9613578ebf097d6c5e64
   media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
-  media_kit_native_event_loop: 5fba1a849a6c87a34985f1e178a0de5bd444a0cf
   media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
   motion_sensors: 741e702c17467b9569a92165dda8d4d88c6167f1
   motionphoto: 584b43031ead3060225cdff08fa49818879801d2
@@ -509,7 +498,6 @@ SPEC CHECKSUMS:
   privacy_screen: 3159a541f5d3a31bea916cfd4e58f9dc722b3fd4
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   receive_sharing_intent: f6a12b7e8f7ed745f61c982de8a65de88db44a44
-  screen_brightness_ios: 5ed898fa50fa82a26171c086ca5e28228f932576
   SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
   Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
@@ -526,7 +514,7 @@ SPEC CHECKSUMS:
   url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
   video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
   video_thumbnail: b637e0ad5f588ca9945f6e2c927f73a69a661140
-  volume_controller: ca1cde542ee70fad77d388f82e9616488110942b
+  volume_controller: 3657a1f65bedb98fa41ff7dc5793537919f31b12
   wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49
 
 PODFILE CHECKSUM: 20e086e6008977d43a3d40260f3f9bffcac748dd

From 2275a47438fd7dfba4129099c681802be26f0900 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prateekmedia@users.noreply.github.com>
Date: Thu, 20 Feb 2025 13:14:47 +0530
Subject: [PATCH 356/796] chore: bump deps changes

---
 mobile/ios/Runner.xcodeproj/project.pbxproj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj
index de19bf899f..74a0b8ae7a 100644
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -315,7 +315,6 @@
 				"${BUILT_PRODUCTS_DIR}/maps_launcher/maps_launcher.framework",
 				"${BUILT_PRODUCTS_DIR}/media_extension/media_extension.framework",
 				"${BUILT_PRODUCTS_DIR}/media_kit_libs_ios_video/media_kit_libs_ios_video.framework",
-				"${BUILT_PRODUCTS_DIR}/media_kit_native_event_loop/media_kit_native_event_loop.framework",
 				"${BUILT_PRODUCTS_DIR}/media_kit_video/media_kit_video.framework",
 				"${BUILT_PRODUCTS_DIR}/motion_sensors/motion_sensors.framework",
 				"${BUILT_PRODUCTS_DIR}/motionphoto/motionphoto.framework",
@@ -329,7 +328,6 @@
 				"${BUILT_PRODUCTS_DIR}/photo_manager/photo_manager.framework",
 				"${BUILT_PRODUCTS_DIR}/privacy_screen/privacy_screen.framework",
 				"${BUILT_PRODUCTS_DIR}/receive_sharing_intent/receive_sharing_intent.framework",
-				"${BUILT_PRODUCTS_DIR}/screen_brightness_ios/screen_brightness_ios.framework",
 				"${BUILT_PRODUCTS_DIR}/sentry_flutter/sentry_flutter.framework",
 				"${BUILT_PRODUCTS_DIR}/share_plus/share_plus.framework",
 				"${BUILT_PRODUCTS_DIR}/shared_preferences_foundation/shared_preferences_foundation.framework",
@@ -412,7 +410,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/maps_launcher.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/media_extension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/media_kit_libs_ios_video.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/media_kit_native_event_loop.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/media_kit_video.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/motion_sensors.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/motionphoto.framework",
@@ -426,7 +423,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/photo_manager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/privacy_screen.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/receive_sharing_intent.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/screen_brightness_ios.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sentry_flutter.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share_plus.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_foundation.framework",

From f46f063bebc9bc760d6dda0d5e93d67a4f719d4c Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 13:17:04 +0530
Subject: [PATCH 357/796] Disable backdrop clicks

---
 web/apps/photos/src/components/Upload.tsx | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/web/apps/photos/src/components/Upload.tsx b/web/apps/photos/src/components/Upload.tsx
index 5831e348e5..1ec31eaf78 100644
--- a/web/apps/photos/src/components/Upload.tsx
+++ b/web/apps/photos/src/components/Upload.tsx
@@ -44,6 +44,7 @@ import {
     Link,
     Stack,
     Typography,
+    type DialogProps,
 } from "@mui/material";
 import { t } from "i18next";
 import { GalleryContext } from "pages/gallery";
@@ -1133,10 +1134,22 @@ const UploadTypeSelector: React.FC<UploadTypeSelectorProps> = ({
         }
     }, [open]);
 
+    const handleClose: DialogProps["onClose"] = (_, reason) => {
+        // Disable backdrop clicks and esc keypresses if a selection is pending
+        // processing so that the user doesn't inadvertently close the dialog.
+        if (
+            pendingUploadType &&
+            (reason == "backdropClick" || reason == "escapeKeyDown")
+        ) {
+            return;
+        }
+        onClose();
+    };
+
     return (
         <Dialog
             open={open}
-            onClose={onClose}
+            onClose={handleClose}
             fullWidth
             slotProps={{
                 paper: {

From 4f271887fcdbf3d58cba3f916c3a95242c7a87e7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 13:50:42 +0530
Subject: [PATCH 358/796] dd

---
 web/apps/photos/src/pages/gallery.tsx         | 37 ++++-------------
 .../gallery/components/FullScreenDropZone.tsx | 41 ++++++++++++++-----
 2 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index cfc63e03d7..efa75b1332 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -107,15 +107,8 @@ import { Upload, type UploadTypeSelectorIntent } from "components/Upload";
 import SelectedFileOptions from "components/pages/gallery/SelectedFileOptions";
 import { t } from "i18next";
 import { useRouter, type NextRouter } from "next/router";
-import {
-    createContext,
-    useCallback,
-    useEffect,
-    useMemo,
-    useRef,
-    useState,
-} from "react";
-import { useDropzone } from "react-dropzone";
+import { createContext, useCallback, useEffect, useRef, useState } from "react";
+import { FileWithPath } from "react-dropzone";
 import { Trans } from "react-i18next";
 import {
     constructEmailList,
@@ -195,19 +188,9 @@ const Page: React.FC = () => {
     const [collectionNamerView, setCollectionNamerView] = useState(false);
     const [shouldDisableDropzone, setShouldDisableDropzone] = useState(false);
     const [isPhotoSwipeOpen, setIsPhotoSwipeOpen] = useState(false);
-
-    const {
-        // A function to call to get the props we should apply to the container,
-        getRootProps: getDragAndDropRootProps,
-        // ... the props we should apply to the <input> element,
-        getInputProps: getDragAndDropInputProps,
-        // ... and the files that we got.
-        acceptedFiles: dragAndDropFilesReadOnly,
-    } = useDropzone({
-        noClick: true,
-        noKeyboard: true,
-        disabled: shouldDisableDropzone,
-    });
+    const [dragAndDropFiles, setDragAndDropFiles] = useState<FileWithPath[]>(
+        [],
+    );
 
     const syncInProgress = useRef(false);
     const syncInterval = useRef<ReturnType<typeof setInterval> | undefined>(
@@ -529,12 +512,6 @@ const Page: React.FC = () => {
         };
     }, [selectAll, clearSelection]);
 
-    // Create a regular array from the readonly array returned by dropzone.
-    const dragAndDropFiles = useMemo(
-        () => [...dragAndDropFilesReadOnly],
-        [dragAndDropFilesReadOnly],
-    );
-
     const showSessionExpiredDialog = () =>
         showMiniDialog(sessionExpiredDialogAttributes(logout));
 
@@ -860,13 +837,13 @@ const Page: React.FC = () => {
             }}
         >
             <FullScreenDropZone
-                getInputProps={getDragAndDropInputProps}
-                getRootProps={getDragAndDropRootProps}
                 message={
                     watchFolderView
                         ? t("watch_folder_dropzone_hint")
                         : undefined
                 }
+                disabled={shouldDisableDropzone}
+                onDrop={setDragAndDropFiles}
             >
                 {blockingLoad && <TranslucentLoadingOverlay />}
                 <PlanSelector
diff --git a/web/packages/gallery/components/FullScreenDropZone.tsx b/web/packages/gallery/components/FullScreenDropZone.tsx
index a226c7d600..e82b2ade1b 100644
--- a/web/packages/gallery/components/FullScreenDropZone.tsx
+++ b/web/packages/gallery/components/FullScreenDropZone.tsx
@@ -2,17 +2,9 @@ import CloseIcon from "@mui/icons-material/Close";
 import { IconButton, Stack, styled, Typography } from "@mui/material";
 import { t } from "i18next";
 import React, { useCallback, useEffect, useState } from "react";
-import type { DropzoneState } from "react-dropzone";
+import { type FileWithPath, useDropzone } from "react-dropzone";
 
 interface FullScreenDropZoneProps {
-    /**
-     * The `getInputProps` function returned by a call to {@link useDropzone}.
-     */
-    getInputProps: DropzoneState["getInputProps"];
-    /**
-     * The `getRootProps` function returned by a call to {@link useDropzone}.
-     */
-    getRootProps: DropzoneState["getRootProps"];
     /**
      * Optional override to the message show to the user when a drag is in
      * progress.
@@ -20,6 +12,16 @@ interface FullScreenDropZoneProps {
      * Default: t("upload_dropzone_hint")
      */
     message?: string;
+    /**
+     * If `true`, then drag and drop functionality is disabled.
+     */
+    disabled?: boolean;
+    /**
+     * Callback invoked when the user drags and drops files.
+     *
+     * It will only be called if there is at least one file in {@link files}.
+     */
+    onDrop: (files: FileWithPath[]) => void;
 }
 
 /**
@@ -37,7 +39,26 @@ interface FullScreenDropZoneProps {
  */
 export const FullScreenDropZone: React.FC<
     React.PropsWithChildren<FullScreenDropZoneProps>
-> = ({ getInputProps, getRootProps, message, children }) => {
+> = ({ message, disabled, onDrop, children }) => {
+    const {
+        // A function to call to get the props we should apply to the container,
+        getRootProps,
+        // ... the props we should apply to the <input> element,
+        getInputProps,
+    } = useDropzone({
+        noClick: true,
+        noKeyboard: true,
+        disabled,
+        onDrop(acceptedFiles) {
+            // Invoked the `onDrop` callback only if there is at least 1 file.
+            if (acceptedFiles.length) {
+                // Create a regular array from the readonly array returned by
+                // dropzone.
+                onDrop([...acceptedFiles]);
+            }
+        },
+    });
+
     const [isDragActive, setIsDragActive] = useState(false);
 
     const onDragEnter = useCallback(() => setIsDragActive(true), []);

From c0eeb7dd2f5f6a9c3cc9aeca761aa1a0a5604114 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 13:53:43 +0530
Subject: [PATCH 359/796] Maybe

---
 web/packages/gallery/components/utils/use-file-input.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/packages/gallery/components/utils/use-file-input.ts b/web/packages/gallery/components/utils/use-file-input.ts
index e46141d9e9..44e923af22 100644
--- a/web/packages/gallery/components/utils/use-file-input.ts
+++ b/web/packages/gallery/components/utils/use-file-input.ts
@@ -71,7 +71,8 @@ export const useFileInput = ({
         // https://github.com/facebook/react/issues/27858
         inputRef.current!.addEventListener("cancel", onCancel);
         return () => {
-            inputRef.current!.removeEventListener("cancel", onCancel);
+            // Use optional chaining to avoid spurious errors during HMR.
+            inputRef.current?.removeEventListener("cancel", onCancel);
         };
     }, [onCancel]);
 

From d2a4634f0211d2bb6b1a71446a63c71ecde201e3 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prateekmedia@users.noreply.github.com>
Date: Thu, 20 Feb 2025 13:55:22 +0530
Subject: [PATCH 360/796] fix: callbacks

---
 mobile/lib/ui/viewer/file/video_control.dart | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/mobile/lib/ui/viewer/file/video_control.dart b/mobile/lib/ui/viewer/file/video_control.dart
index 4048a28836..9d05b502fe 100644
--- a/mobile/lib/ui/viewer/file/video_control.dart
+++ b/mobile/lib/ui/viewer/file/video_control.dart
@@ -3,7 +3,6 @@
 import 'dart:async';
 
 import "package:chewie/chewie.dart";
-import "package:chewie/src/helpers/utils.dart";
 import "package:chewie/src/notifiers/index.dart";
 import 'package:flutter/material.dart';
 import "package:photos/models/file/file.dart";
@@ -12,6 +11,7 @@ import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/common/loading_widget.dart";
 import "package:photos/ui/viewer/file/preview_status_widget.dart";
 import "package:photos/ui/viewer/file/video_control/custom_progress_bar.dart";
+import "package:photos/utils/seconds_to_duration.dart";
 import 'package:provider/provider.dart';
 import 'package:video_player/video_player.dart';
 
@@ -155,7 +155,7 @@ class _VideoControlsState extends State<VideoControls>
       duration: const Duration(milliseconds: 300),
       child: Container(
         height: 40,
-        margin: const EdgeInsets.only(bottom: 60),
+        margin: const EdgeInsets.only(bottom: 60, left: 8, right: 8),
         child: Container(
           padding: const EdgeInsets.fromLTRB(
             16,
@@ -176,7 +176,7 @@ class _VideoControlsState extends State<VideoControls>
           child: Row(
             children: [
               Text(
-                formatDuration(_latestValue.position),
+                secondsToDuration(_latestValue.position.inSeconds),
                 style: getEnteTextTheme(
                   context,
                 ).mini.copyWith(
@@ -189,9 +189,7 @@ class _VideoControlsState extends State<VideoControls>
               ),
               const SizedBox(width: 16),
               Text(
-                formatDuration(
-                  _latestValue.duration,
-                ),
+                secondsToDuration(_latestValue.duration.inSeconds),
                 style: getEnteTextTheme(
                   context,
                 ).mini.copyWith(
@@ -221,8 +219,6 @@ class _VideoControlsState extends State<VideoControls>
             _cancelAndRestartTimer();
           }
         } else {
-          _playPause();
-
           setState(() {
             notifier.hideStuff = true;
           });
@@ -231,8 +227,7 @@ class _VideoControlsState extends State<VideoControls>
       },
       child: Container(
         alignment: Alignment.center,
-        color: Colors
-            .transparent, // The Gesture Detector doesn't expand to the full size of the container without this; Not sure why!
+        color: Colors.transparent,
         child: Row(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
@@ -292,7 +287,6 @@ class _VideoControlsState extends State<VideoControls>
     setState(() {
       if (controller.value.isPlaying) {
         notifier.hideStuff = false;
-        widget.playbackCallback?.call(notifier.hideStuff);
         _hideTimer?.cancel();
         controller.pause();
       } else {
@@ -309,6 +303,7 @@ class _VideoControlsState extends State<VideoControls>
           controller.play();
         }
       }
+      widget.playbackCallback?.call(notifier.hideStuff);
     });
   }
 
@@ -319,8 +314,8 @@ class _VideoControlsState extends State<VideoControls>
     _hideTimer = Timer(hideControlsTimer, () {
       setState(() {
         notifier.hideStuff = true;
-        widget.playbackCallback?.call(notifier.hideStuff);
       });
+      widget.playbackCallback?.call(notifier.hideStuff);
     });
   }
 

From c37deecb964df61d268afdb589da9627b30bf5cd Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prateekmedia@users.noreply.github.com>
Date: Thu, 20 Feb 2025 13:55:37 +0530
Subject: [PATCH 361/796] chore: extract out some functions

---
 .../file/video_widget_media_kit_new.dart      |  3 +-
 .../ui/viewer/file/video_widget_native.dart   | 45 ++-----------------
 mobile/lib/utils/duration_to_seconds.dart     | 23 ++++++++++
 mobile/lib/utils/seconds_to_duration.dart     | 12 +++++
 4 files changed, 41 insertions(+), 42 deletions(-)
 create mode 100644 mobile/lib/utils/duration_to_seconds.dart
 create mode 100644 mobile/lib/utils/seconds_to_duration.dart

diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
index a4f5651004..fe5c5d13b4 100644
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
@@ -20,6 +20,7 @@ import "package:photos/ui/viewer/file/preview_status_widget.dart";
 import "package:photos/utils/debouncer.dart";
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/file_util.dart";
+import "package:photos/utils/seconds_to_duration.dart";
 import "package:photos/utils/toast_util.dart";
 
 class VideoWidgetMediaKitNew extends StatefulWidget {
@@ -528,7 +529,7 @@ class _SeekBarAndDuration extends StatelessWidget {
                   );
                 }
                 return Text(
-                  _secondsToDuration(snapshot.data!.inSeconds),
+                  secondsToDuration(snapshot.data!.inSeconds),
                   style: getEnteTextTheme(
                     context,
                   ).mini.copyWith(
diff --git a/mobile/lib/ui/viewer/file/video_widget_native.dart b/mobile/lib/ui/viewer/file/video_widget_native.dart
index 8eee011233..8b2706a3a5 100644
--- a/mobile/lib/ui/viewer/file/video_widget_native.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_native.dart
@@ -26,8 +26,10 @@ import "package:photos/ui/viewer/file/preview_status_widget.dart";
 import "package:photos/ui/viewer/file/thumbnail_widget.dart";
 import "package:photos/utils/debouncer.dart";
 import "package:photos/utils/dialog_util.dart";
+import "package:photos/utils/duration_to_seconds.dart";
 import "package:photos/utils/exif_util.dart";
 import "package:photos/utils/file_util.dart";
+import "package:photos/utils/seconds_to_duration.dart";
 import "package:photos/utils/toast_util.dart";
 import "package:visibility_detector/visibility_detector.dart";
 
@@ -615,7 +617,7 @@ class _SeekBarAndDuration extends StatelessWidget {
                           _,
                         ) {
                           return Text(
-                            _secondsToDuration(
+                            secondsToDuration(
                               value,
                             ),
                             style: getEnteTextTheme(
@@ -630,9 +632,7 @@ class _SeekBarAndDuration extends StatelessWidget {
                     Expanded(
                       child: SeekBar(
                         controller!,
-                        _durationToSeconds(
-                          duration,
-                        ),
+                        durationToSeconds(duration),
                         isSeeking,
                       ),
                     ),
@@ -653,43 +653,6 @@ class _SeekBarAndDuration extends StatelessWidget {
       },
     );
   }
-
-  /// Returns the duration in the format "h:mm:ss" or "m:ss".
-  String _secondsToDuration(int totalSeconds) {
-    final hours = totalSeconds ~/ 3600;
-    final minutes = (totalSeconds % 3600) ~/ 60;
-    final seconds = totalSeconds % 60;
-
-    if (hours > 0) {
-      return '${hours.toString().padLeft(1, '0')}:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}';
-    } else {
-      return '${minutes.toString().padLeft(1, '0')}:${seconds.toString().padLeft(2, '0')}';
-    }
-  }
-
-  /// Returns the duration in seconds from the format "h:mm:ss" or "m:ss".
-  int? _durationToSeconds(String? duration) {
-    if (duration == null) {
-      return null;
-    }
-    final parts = duration.split(':');
-    int seconds = 0;
-
-    if (parts.length == 3) {
-      // Format: "h:mm:ss"
-      seconds += int.parse(parts[0]) * 3600; // Hours to seconds
-      seconds += int.parse(parts[1]) * 60; // Minutes to seconds
-      seconds += int.parse(parts[2]); // Seconds
-    } else if (parts.length == 2) {
-      // Format: "m:ss"
-      seconds += int.parse(parts[0]) * 60; // Minutes to seconds
-      seconds += int.parse(parts[1]); // Seconds
-    } else {
-      throw FormatException('Invalid duration format: $duration');
-    }
-
-    return seconds;
-  }
 }
 
 class _VideoDescriptionAndSwitchToMediaKitButton extends StatelessWidget {
diff --git a/mobile/lib/utils/duration_to_seconds.dart b/mobile/lib/utils/duration_to_seconds.dart
new file mode 100644
index 0000000000..7b0f274c53
--- /dev/null
+++ b/mobile/lib/utils/duration_to_seconds.dart
@@ -0,0 +1,23 @@
+/// Returns the duration in seconds from the format "h:mm:ss" or "m:ss".
+int? durationToSeconds(String? duration) {
+  if (duration == null) {
+    return null;
+  }
+  final parts = duration.split(':');
+  int seconds = 0;
+
+  if (parts.length == 3) {
+    // Format: "h:mm:ss"
+    seconds += int.parse(parts[0]) * 3600; // Hours to seconds
+    seconds += int.parse(parts[1]) * 60; // Minutes to seconds
+    seconds += int.parse(parts[2]); // Seconds
+  } else if (parts.length == 2) {
+    // Format: "m:ss"
+    seconds += int.parse(parts[0]) * 60; // Minutes to seconds
+    seconds += int.parse(parts[1]); // Seconds
+  } else {
+    throw FormatException('Invalid duration format: $duration');
+  }
+
+  return seconds;
+}
diff --git a/mobile/lib/utils/seconds_to_duration.dart b/mobile/lib/utils/seconds_to_duration.dart
new file mode 100644
index 0000000000..3446ee09f8
--- /dev/null
+++ b/mobile/lib/utils/seconds_to_duration.dart
@@ -0,0 +1,12 @@
+/// Returns the duration in the format "h:mm:ss" or "m:ss".
+String secondsToDuration(int totalSeconds) {
+  final hours = totalSeconds ~/ 3600;
+  final minutes = (totalSeconds % 3600) ~/ 60;
+  final seconds = totalSeconds % 60;
+
+  if (hours > 0) {
+    return '${hours.toString().padLeft(1, '0')}:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}';
+  } else {
+    return '${minutes.toString().padLeft(1, '0')}:${seconds.toString().padLeft(2, '0')}';
+  }
+}

From 189a3ebc4083621e2c4e3b37706fd3442e1110c7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 13:58:29 +0530
Subject: [PATCH 362/796] Take 1

---
 .../gallery/components/FullScreenDropZone.tsx | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/web/packages/gallery/components/FullScreenDropZone.tsx b/web/packages/gallery/components/FullScreenDropZone.tsx
index e82b2ade1b..c7c5610a93 100644
--- a/web/packages/gallery/components/FullScreenDropZone.tsx
+++ b/web/packages/gallery/components/FullScreenDropZone.tsx
@@ -50,6 +50,7 @@ export const FullScreenDropZone: React.FC<
         noKeyboard: true,
         disabled,
         onDrop(acceptedFiles) {
+            setIsDropPending(false);
             // Invoked the `onDrop` callback only if there is at least 1 file.
             if (acceptedFiles.length) {
                 // Create a regular array from the readonly array returned by
@@ -60,33 +61,46 @@ export const FullScreenDropZone: React.FC<
     });
 
     const [isDragActive, setIsDragActive] = useState(false);
+    const [isDropPending, setIsDropPending] = useState(false);
 
-    const onDragEnter = useCallback(() => setIsDragActive(true), []);
-    const onDragLeave = useCallback(() => setIsDragActive(false), []);
+    const handleDragEnter = useCallback(() => {
+        setIsDropPending(true);
+        setIsDragActive(true);
+    }, []);
+
+    const handleDragLeave = useCallback(() => {
+        setIsDropPending(false);
+        setIsDragActive(false);
+    }, []);
 
     useEffect(() => {
         const handleKeydown = (event: KeyboardEvent) => {
-            if (event.code == "Escape") onDragLeave();
+            if (event.code == "Escape" && !isDropPending) handleDragLeave();
         };
 
         window.addEventListener("keydown", handleKeydown);
         return () => window.removeEventListener("keydown", handleKeydown);
-    }, [onDragLeave]);
+    }, [isDropPending, handleDragLeave]);
 
     return (
         <>
             <input {...getInputProps()} />
-            <Stack sx={{ flex: 1 }} {...getRootProps({ onDragEnter })}>
-                {isDragActive && (
+            <Stack
+                sx={{ flex: 1 }}
+                {...getRootProps({ onDragEnter: handleDragEnter })}
+            >
+                {(isDragActive || isDropPending) && (
                     <DropZoneOverlay
-                        onDrop={onDragLeave}
-                        onDragLeave={onDragLeave}
+                        onDrop={handleDragLeave}
+                        onDragLeave={handleDragLeave}
                     >
-                        <CloseButton onClick={onDragLeave}>
+                        <CloseButton onClick={handleDragLeave}>
                             <CloseIcon />
                         </CloseButton>
                         <Typography variant="h3">
-                            {message ?? t("upload_dropzone_hint")}
+                            {isDropPending
+                                ? "Processing..."
+                                : (message ?? t("upload_dropzone_hint"))}
                         </Typography>
                     </DropZoneOverlay>
                 )}

From 0a7984a0d2dc4c512d5f917f81f49d5aa78e88d8 Mon Sep 17 00:00:00 2001
From: Natoshi <sittichaifx@gmail.com>
Date: Thu, 20 Feb 2025 15:31:21 +0700
Subject: [PATCH 363/796] [auth] Add Gate.io icon (#5107)

Add new icon to ente auth (gateio.svg)
and Add Gate.io icon to custom-icons.json
---
 auth/assets/custom-icons/_data/custom-icons.json |  4 ++++
 auth/assets/custom-icons/icons/gateio.svg        | 15 +++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 auth/assets/custom-icons/icons/gateio.svg

diff --git a/auth/assets/custom-icons/_data/custom-icons.json b/auth/assets/custom-icons/_data/custom-icons.json
index 5493087930..7c14be6fae 100644
--- a/auth/assets/custom-icons/_data/custom-icons.json
+++ b/auth/assets/custom-icons/_data/custom-icons.json
@@ -399,6 +399,10 @@
     {
       "title": "G2A"
     },
+    {
+      "title": "Gate.io",
+      "slug": "gateio.svg"
+    },
     {
       "title": "GitHub"
     },
diff --git a/auth/assets/custom-icons/icons/gateio.svg b/auth/assets/custom-icons/icons/gateio.svg
new file mode 100644
index 0000000000..83972c0d84
--- /dev/null
+++ b/auth/assets/custom-icons/icons/gateio.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns:xodm="http://www.corel.com/coreldraw/odm/2003" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 2500 2500" style="enable-background:new 0 0 2500 2500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#2354E6;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#17E6A1;}
+</style>
+<g id="Layer_x0020_1">
+	<rect y="0" class="st0" width="2500" height="2500"></rect>
+	<g id="_2500576017504">
+		<path id="Fill-3" class="st1" d="M1250,1937.5c-379.7,0-687.5-307.8-687.5-687.5c0-379.7,307.8-687.5,687.5-687.5V0    C559.6,0,0,559.6,0,1250c0,690.3,559.6,1250,1250,1250c690.3,0,1250-559.6,1250-1250h-562.5    C1937.5,1629.7,1629.7,1937.5,1250,1937.5z"></path>
+		<polygon id="Fill-4" class="st2" points="1250,1250 1937.5,1250 1937.5,562.5 1250,562.5   "></polygon>
+	</g>
+</g>
+</svg>

From 31478004861a2df1d9bd4915f859fe83413a2dd3 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 14:11:40 +0530
Subject: [PATCH 364/796] Fin

---
 web/apps/photos/src/pages/gallery.tsx         |  2 +-
 web/apps/photos/src/pages/shared-albums.tsx   | 29 +++++--------------
 .../gallery/components/FullScreenDropZone.tsx | 24 ++++++++++-----
 3 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index efa75b1332..2f691ddef7 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -187,10 +187,10 @@ const Page: React.FC = () => {
         useState<CollectionNamerAttributes>(null);
     const [collectionNamerView, setCollectionNamerView] = useState(false);
     const [shouldDisableDropzone, setShouldDisableDropzone] = useState(false);
-    const [isPhotoSwipeOpen, setIsPhotoSwipeOpen] = useState(false);
     const [dragAndDropFiles, setDragAndDropFiles] = useState<FileWithPath[]>(
         [],
     );
+    const [isPhotoSwipeOpen, setIsPhotoSwipeOpen] = useState(false);
 
     const syncInProgress = useRef(false);
     const syncInterval = useRef<ReturnType<typeof setInterval> | undefined>(
diff --git a/web/apps/photos/src/pages/shared-albums.tsx b/web/apps/photos/src/pages/shared-albums.tsx
index 8e22b6af49..1e52800a82 100644
--- a/web/apps/photos/src/pages/shared-albums.tsx
+++ b/web/apps/photos/src/pages/shared-albums.tsx
@@ -27,7 +27,7 @@ import { downloadManager } from "@/gallery/services/download";
 import { extractCollectionKeyFromShareURL } from "@/gallery/services/share";
 import { updateShouldDisableCFUploadProxy } from "@/gallery/services/upload";
 import type { Collection } from "@/media/collection";
-import { type EnteFile, mergeMetadata } from "@/media/file";
+import { mergeMetadata, type EnteFile } from "@/media/file";
 import { verifyPublicAlbumPassword } from "@/new/albums/services/publicCollection";
 import {
     GalleryItemsHeaderAdapter,
@@ -57,11 +57,11 @@ import {
 } from "components/FilesDownloadProgress";
 import PhotoFrame from "components/PhotoFrame";
 import { ITEM_TYPE, TimeStampListItem } from "components/PhotoList";
-import {Upload} from "components/Upload";
+import { Upload } from "components/Upload";
 import { t } from "i18next";
 import { useRouter } from "next/router";
 import { useEffect, useMemo, useRef, useState } from "react";
-import { useDropzone } from "react-dropzone";
+import { type FileWithPath } from "react-dropzone";
 import {
     getLocalPublicCollection,
     getLocalPublicCollectionPassword,
@@ -108,6 +108,9 @@ export default function PublicCollectionGallery() {
     const [uploadTypeSelectorView, setUploadTypeSelectorView] = useState(false);
     const [blockingLoad, setBlockingLoad] = useState(false);
     const [shouldDisableDropzone, setShouldDisableDropzone] = useState(false);
+    const [dragAndDropFiles, setDragAndDropFiles] = useState<FileWithPath[]>(
+        [],
+    );
     const [selected, setSelected] = useState<SelectedState>({
         ownCount: 0,
         count: 0,
@@ -115,16 +118,6 @@ export default function PublicCollectionGallery() {
         context: undefined,
     });
 
-    const {
-        getRootProps: getDragAndDropRootProps,
-        getInputProps: getDragAndDropInputProps,
-        acceptedFiles: dragAndDropFilesReadOnly,
-    } = useDropzone({
-        noClick: true,
-        noKeyboard: true,
-        disabled: shouldDisableDropzone,
-    });
-
     const [
         filesDownloadProgressAttributesList,
         setFilesDownloadProgressAttributesList,
@@ -163,12 +156,6 @@ export default function PublicCollectionGallery() {
             return updater;
         };
 
-    // Create a regular array from the readonly array returned by dropzone.
-    const dragAndDropFiles = useMemo(
-        () => [...dragAndDropFilesReadOnly],
-        [dragAndDropFilesReadOnly],
-    );
-
     const onAddPhotos = useMemo(() => {
         return publicCollection?.publicURLs?.[0]?.enableCollect
             ? () => setUploadTypeSelectorView(true)
@@ -491,8 +478,8 @@ export default function PublicCollectionGallery() {
     return (
         <PublicCollectionGalleryContext.Provider value={context}>
             <FullScreenDropZone
-                getInputProps={getDragAndDropInputProps}
-                getRootProps={getDragAndDropRootProps}
+                disabled={shouldDisableDropzone}
+                onDrop={setDragAndDropFiles}
             >
                 <NavbarBase
                     sx={{
diff --git a/web/packages/gallery/components/FullScreenDropZone.tsx b/web/packages/gallery/components/FullScreenDropZone.tsx
index c7c5610a93..e817e2f034 100644
--- a/web/packages/gallery/components/FullScreenDropZone.tsx
+++ b/web/packages/gallery/components/FullScreenDropZone.tsx
@@ -1,3 +1,4 @@
+import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
 import CloseIcon from "@mui/icons-material/Close";
 import { IconButton, Stack, styled, Typography } from "@mui/material";
 import { t } from "i18next";
@@ -64,12 +65,15 @@ export const FullScreenDropZone: React.FC<
     const [isDropPending, setIsDropPending] = useState(false);
 
     const handleDragEnter = useCallback(() => {
-        setIsDropPending(true);
         setIsDragActive(true);
     }, []);
 
+    const handleOverlayDrop = useCallback(() => {
+        setIsDropPending(true);
+        setIsDragActive(false);
+    }, []);
+
     const handleDragLeave = useCallback(() => {
-        setIsDropPending(false);
         setIsDragActive(false);
     }, []);
 
@@ -91,16 +95,21 @@ export const FullScreenDropZone: React.FC<
             >
                 {(isDragActive || isDropPending) && (
                     <DropZoneOverlay
-                        onDrop={handleDragLeave}
+                        onDrop={handleOverlayDrop}
                         onDragLeave={handleDragLeave}
                     >
-                        <CloseButton onClick={handleDragLeave}>
+                        <CloseButton
+                            disabled={isDropPending}
+                            onClick={handleDragLeave}
+                        >
                             <CloseIcon />
                         </CloseButton>
                         <Typography variant="h3">
-                            {isDropPending
-                                ? "Processing..."
-                                : (message ?? t("upload_dropzone_hint"))}
+                            {isDropPending ? (
+                                <ActivityIndicator />
+                            ) : (
+                                (message ?? t("upload_dropzone_hint"))
+                            )}
                         </Typography>
                     </DropZoneOverlay>
                 )}
@@ -125,6 +134,7 @@ const DropZoneOverlay = styled(Stack)(
     border-style: solid;
     border-color: ${theme.vars.palette.accent.light};
     background-color: ${theme.vars.palette.backdrop.base};
+    backdrop-filter: blur(10px);
     z-index: 2000; /* aboveFileViewerContentZ + delta */
 `,
 );

From 09d390bd38bf345b32e5fcd0a6d0b8aa3a8522fe Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 20 Feb 2025 14:26:10 +0530
Subject: [PATCH 365/796] [server] Return on err

---
 server/pkg/api/family.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/pkg/api/family.go b/server/pkg/api/family.go
index 0e27f0d999..a61ee2605f 100644
--- a/server/pkg/api/family.go
+++ b/server/pkg/api/family.go
@@ -131,6 +131,7 @@ func (h *FamilyHandler) ModifyStorageLimit(c *gin.Context) {
 	err := h.Controller.ModifyMemberStorage(c, auth.GetUserID(c.Request.Header), request.ID, request.StorageLimit)
 	if err != nil {
 		handler.Error(c, stacktrace.Propagate(err, ""))
+		return
 	}
 	c.JSON(http.StatusOK, nil)
 }

From b44f8445139b9b242302c70fcad726d81a6857b7 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 20 Feb 2025 14:27:18 +0530
Subject: [PATCH 366/796] [server] Remove null resp

---
 server/pkg/api/family.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/pkg/api/family.go b/server/pkg/api/family.go
index a61ee2605f..aa0d2f6c9f 100644
--- a/server/pkg/api/family.go
+++ b/server/pkg/api/family.go
@@ -133,7 +133,7 @@ func (h *FamilyHandler) ModifyStorageLimit(c *gin.Context) {
 		handler.Error(c, stacktrace.Propagate(err, ""))
 		return
 	}
-	c.JSON(http.StatusOK, nil)
+	c.Status(http.StatusOK)
 }
 
 // GetInviteInfo returns basic information about invitor/admin as long as the invite is valid

From c5dab37dfa9b9e98f0081b5b524a97c22c2cf1b0 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prateekmedia@users.noreply.github.com>
Date: Thu, 20 Feb 2025 15:23:21 +0530
Subject: [PATCH 367/796] feat: use media kit directly for preview, instead of
 video_player proxy

---
 mobile/lib/main.dart                          |   5 -
 .../ui/viewer/file/preview_video_widget.dart  | 500 +++++------
 mobile/lib/ui/viewer/file/video_control.dart  | 820 +++++++++---------
 mobile/lib/ui/viewer/file/video_widget.dart   |   4 +-
 .../file/video_widget_media_kit_common.dart   | 458 ++++++++++
 .../file/video_widget_media_kit_new.dart      | 502 +----------
 .../file/video_widget_media_kit_preview.dart  | 172 ++++
 mobile/pubspec.lock                           |  19 +-
 mobile/pubspec.yaml                           |  43 +-
 9 files changed, 1341 insertions(+), 1182 deletions(-)
 create mode 100644 mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
 create mode 100644 mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart

diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index b907203cf9..b2e00dfbdf 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -52,7 +52,6 @@ import "package:photos/utils/email_util.dart";
 import 'package:photos/utils/file_uploader.dart';
 import "package:photos/utils/lock_screen_settings.dart";
 import 'package:shared_preferences/shared_preferences.dart';
-import "package:video_player_media_kit/video_player_media_kit.dart";
 
 final _logger = Logger("main");
 
@@ -238,10 +237,6 @@ Future<void> _init(bool isBackground, {String via = ''}) async {
     ServiceLocator.instance
         .init(preferences, NetworkClient.instance.enteDio, packageInfo);
 
-    if (!isBackground) {
-      VideoPlayerMediaKit.ensureInitialized(iOS: true, android: true);
-    }
-
     _logger.info("UserService init $tlog");
     await UserService.instance.init();
     _logger.info("UserService init done $tlog");
diff --git a/mobile/lib/ui/viewer/file/preview_video_widget.dart b/mobile/lib/ui/viewer/file/preview_video_widget.dart
index be2c7034a8..e6ab5020c7 100644
--- a/mobile/lib/ui/viewer/file/preview_video_widget.dart
+++ b/mobile/lib/ui/viewer/file/preview_video_widget.dart
@@ -1,266 +1,266 @@
-import 'dart:async';
-import "dart:io";
+// import 'dart:async';
+// import "dart:io";
 
-import 'package:chewie/chewie.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import "package:fluttertoast/fluttertoast.dart";
-import "package:logging/logging.dart";
-import 'package:photos/core/constants.dart';
-import "package:photos/core/event_bus.dart";
-import "package:photos/events/guest_view_event.dart";
-import 'package:photos/models/file/file.dart';
-import "package:photos/service_locator.dart";
-import "package:photos/services/filedata/filedata_service.dart";
-import "package:photos/services/preview_video_store.dart";
-import "package:photos/ui/actions/file/file_actions.dart";
-import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
-import "package:photos/ui/viewer/file/video_control.dart";
-import "package:photos/utils/data_util.dart";
-// import 'package:photos/ui/viewer/file/video_controls.dart';
-import "package:photos/utils/dialog_util.dart";
-import 'package:photos/utils/file_util.dart';
-import 'package:photos/utils/toast_util.dart';
-import "package:photos/utils/wakelock_util.dart";
-import 'package:video_player/video_player.dart';
-import 'package:visibility_detector/visibility_detector.dart';
+// import 'package:chewie/chewie.dart';
+// import 'package:flutter/cupertino.dart';
+// import 'package:flutter/material.dart';
+// import "package:fluttertoast/fluttertoast.dart";
+// import "package:logging/logging.dart";
+// import 'package:photos/core/constants.dart';
+// import "package:photos/core/event_bus.dart";
+// import "package:photos/events/guest_view_event.dart";
+// import 'package:photos/models/file/file.dart';
+// import "package:photos/service_locator.dart";
+// import "package:photos/services/filedata/filedata_service.dart";
+// import "package:photos/services/preview_video_store.dart";
+// import "package:photos/ui/actions/file/file_actions.dart";
+// import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
+// import "package:photos/ui/viewer/file/video_control.dart";
+// import "package:photos/utils/data_util.dart";
+// // import 'package:photos/ui/viewer/file/video_controls.dart';
+// import "package:photos/utils/dialog_util.dart";
+// import 'package:photos/utils/file_util.dart';
+// import 'package:photos/utils/toast_util.dart';
+// import "package:photos/utils/wakelock_util.dart";
+// import 'package:video_player/video_player.dart';
+// import 'package:visibility_detector/visibility_detector.dart';
 
-class PreviewVideoWidget extends StatefulWidget {
-  final EnteFile file;
-  final bool? autoPlay;
-  final String? tagPrefix;
-  final Function(bool)? playbackCallback;
-  final void Function()? onStreamChange;
+// class PreviewVideoWidget extends StatefulWidget {
+//   final EnteFile file;
+//   final bool? autoPlay;
+//   final String? tagPrefix;
+//   final Function(bool)? playbackCallback;
+//   final void Function()? onStreamChange;
 
-  const PreviewVideoWidget(
-    this.file, {
-    this.autoPlay = true,
-    this.tagPrefix,
-    this.playbackCallback,
-    this.onStreamChange,
-    super.key,
-  });
+//   const PreviewVideoWidget(
+//     this.file, {
+//     this.autoPlay = true,
+//     this.tagPrefix,
+//     this.playbackCallback,
+//     this.onStreamChange,
+//     super.key,
+//   });
 
-  @override
-  State<PreviewVideoWidget> createState() => _PreviewVideoWidgetState();
-}
+//   @override
+//   State<PreviewVideoWidget> createState() => _PreviewVideoWidgetState();
+// }
 
-class _PreviewVideoWidgetState extends State<PreviewVideoWidget> {
-  final _logger = Logger("PreviewVideoWidget");
-  VideoPlayerController? _videoPlayerController;
-  ChewieController? _chewieController;
-  final _progressNotifier = ValueNotifier<double?>(null);
-  bool _isPlaying = false;
-  final EnteWakeLock _wakeLock = EnteWakeLock();
-  bool _isFileSwipeLocked = false;
-  late final StreamSubscription<GuestViewEvent> _fileSwipeLockEventSubscription;
-  File? previewFile;
+// class _PreviewVideoWidgetState extends State<PreviewVideoWidget> {
+//   final _logger = Logger("PreviewVideoWidget");
+//   VideoPlayerController? _videoPlayerController;
+//   ChewieController? _chewieController;
+//   final _progressNotifier = ValueNotifier<double?>(null);
+//   bool _isPlaying = false;
+//   final EnteWakeLock _wakeLock = EnteWakeLock();
+//   bool _isFileSwipeLocked = false;
+//   late final StreamSubscription<GuestViewEvent> _fileSwipeLockEventSubscription;
+//   File? previewFile;
 
-  @override
-  void initState() {
-    super.initState();
+//   @override
+//   void initState() {
+//     super.initState();
 
-    _checkForPreview();
-    _fileSwipeLockEventSubscription =
-        Bus.instance.on<GuestViewEvent>().listen((event) {
-      setState(() {
-        _isFileSwipeLocked = event.swipeLocked;
-      });
-    });
-  }
+//     _checkForPreview();
+//     _fileSwipeLockEventSubscription =
+//         Bus.instance.on<GuestViewEvent>().listen((event) {
+//       setState(() {
+//         _isFileSwipeLocked = event.swipeLocked;
+//       });
+//     });
+//   }
 
-  @override
-  void dispose() {
-    _fileSwipeLockEventSubscription.cancel();
-    removeCallBack(widget.file);
-    _videoPlayerController?.dispose();
-    _chewieController?.dispose();
-    _progressNotifier.dispose();
-    _wakeLock.dispose();
-    super.dispose();
-  }
+//   @override
+//   void dispose() {
+//     _fileSwipeLockEventSubscription.cancel();
+//     removeCallBack(widget.file);
+//     _videoPlayerController?.dispose();
+//     _chewieController?.dispose();
+//     _progressNotifier.dispose();
+//     _wakeLock.dispose();
+//     super.dispose();
+//   }
 
-  Future<void> _checkForPreview() async {
-    final data = await PreviewVideoStore.instance
-        .getPlaylist(widget.file)
-        .onError((error, stackTrace) {
-      if (!mounted) return;
-      _logger.warning("Failed to download preview video", error, stackTrace);
-      Fluttertoast.showToast(msg: "Failed to download preview!");
-      return null;
-    });
-    if (!mounted) return;
-    if (data != null) {
-      if (flagService.internalUser) {
-        final d =
-            FileDataService.instance.previewIds?[widget.file.uploadedFileID!];
-        if (d != null && widget.file.fileSize != null) {
-          // show toast with human readable size
-          final size = formatBytes(widget.file.fileSize!);
-          showToast(
-            context,
-            "Preview OG Size ($size), previewSize: ${formatBytes(d.objectSize)}",
-          );
-        } else {
-          showShortToast(context, "Playing preview");
-        }
-      }
-      previewFile = data.preview;
-      _setVideoPlayerController();
-    }
-  }
+//   Future<void> _checkForPreview() async {
+//     final data = await PreviewVideoStore.instance
+//         .getPlaylist(widget.file)
+//         .onError((error, stackTrace) {
+//       if (!mounted) return;
+//       _logger.warning("Failed to download preview video", error, stackTrace);
+//       Fluttertoast.showToast(msg: "Failed to download preview!");
+//       return null;
+//     });
+//     if (!mounted) return;
+//     if (data != null) {
+//       if (flagService.internalUser) {
+//         final d =
+//             FileDataService.instance.previewIds?[widget.file.uploadedFileID!];
+//         if (d != null && widget.file.fileSize != null) {
+//           // show toast with human readable size
+//           final size = formatBytes(widget.file.fileSize!);
+//           showToast(
+//             context,
+//             "Preview OG Size ($size), previewSize: ${formatBytes(d.objectSize)}",
+//           );
+//         } else {
+//           showShortToast(context, "Playing preview");
+//         }
+//       }
+//       previewFile = data.preview;
+//       _setVideoPlayerController();
+//     }
+//   }
 
-  void _setVideoPlayerController() {
-    if (!mounted) {
-      // Note: Do not initiale video player if widget is not mounted.
-      // On Android, if multiple instance of ExoPlayer is created, it will start
-      // resulting in playback errors for videos. See https://github.com/google/ExoPlayer/issues/6168
-      return;
-    }
-    VideoPlayerController videoPlayerController;
-    videoPlayerController = VideoPlayerController.file(previewFile!);
+//   void _setVideoPlayerController() {
+//     if (!mounted) {
+//       // Note: Do not initiale video player if widget is not mounted.
+//       // On Android, if multiple instance of ExoPlayer is created, it will start
+//       // resulting in playback errors for videos. See https://github.com/google/ExoPlayer/issues/6168
+//       return;
+//     }
+//     VideoPlayerController videoPlayerController;
+//     videoPlayerController = VideoPlayerController.file(previewFile!);
 
-    debugPrint("videoPlayerController: $videoPlayerController");
-    _videoPlayerController = videoPlayerController
-      ..initialize().whenComplete(() {
-        if (mounted) {
-          setState(() {});
-        }
-      }).onError(
-        (error, stackTrace) {
-          if (mounted && flagService.internalUser) {
-            if (error is Exception) {
-              showErrorDialogForException(
-                context: context,
-                exception: error,
-                message: "Failed to play video\n ${error.toString()}",
-              );
-            } else {
-              showToast(context, "Failed to play video");
-            }
-          }
-        },
-      );
-  }
+//     debugPrint("videoPlayerController: $videoPlayerController");
+//     _videoPlayerController = videoPlayerController
+//       ..initialize().whenComplete(() {
+//         if (mounted) {
+//           setState(() {});
+//         }
+//       }).onError(
+//         (error, stackTrace) {
+//           if (mounted && flagService.internalUser) {
+//             if (error is Exception) {
+//               showErrorDialogForException(
+//                 context: context,
+//                 exception: error,
+//                 message: "Failed to play video\n ${error.toString()}",
+//               );
+//             } else {
+//               showToast(context, "Failed to play video");
+//             }
+//           }
+//         },
+//       );
+//   }
 
-  @override
-  Widget build(BuildContext context) {
-    final content = _videoPlayerController != null &&
-            _videoPlayerController!.value.isInitialized
-        ? _getVideoPlayer()
-        : _getLoadingWidget();
-    final contentWithDetector = GestureDetector(
-      onVerticalDragUpdate: _isFileSwipeLocked
-          ? null
-          : (d) => {
-                if (d.delta.dy > dragSensitivity)
-                  {
-                    Navigator.of(context).pop(),
-                  }
-                else if (d.delta.dy < (dragSensitivity * -1))
-                  {
-                    showDetailsSheet(context, widget.file),
-                  },
-              },
-      child: content,
-    );
-    return VisibilityDetector(
-      key: Key(widget.file.tag),
-      onVisibilityChanged: (info) {
-        if (info.visibleFraction < 1) {
-          if (mounted && _chewieController != null) {
-            _chewieController!.pause();
-          }
-        }
-      },
-      child: Hero(
-        tag: widget.tagPrefix! + widget.file.tag,
-        child: contentWithDetector,
-      ),
-    );
-  }
+//   @override
+//   Widget build(BuildContext context) {
+//     final content = _videoPlayerController != null &&
+//             _videoPlayerController!.value.isInitialized
+//         ? _getVideoPlayer()
+//         : _getLoadingWidget();
+//     final contentWithDetector = GestureDetector(
+//       onVerticalDragUpdate: _isFileSwipeLocked
+//           ? null
+//           : (d) => {
+//                 if (d.delta.dy > dragSensitivity)
+//                   {
+//                     Navigator.of(context).pop(),
+//                   }
+//                 else if (d.delta.dy < (dragSensitivity * -1))
+//                   {
+//                     showDetailsSheet(context, widget.file),
+//                   },
+//               },
+//       child: content,
+//     );
+//     return VisibilityDetector(
+//       key: Key(widget.file.tag),
+//       onVisibilityChanged: (info) {
+//         if (info.visibleFraction < 1) {
+//           if (mounted && _chewieController != null) {
+//             _chewieController!.pause();
+//           }
+//         }
+//       },
+//       child: Hero(
+//         tag: widget.tagPrefix! + widget.file.tag,
+//         child: contentWithDetector,
+//       ),
+//     );
+//   }
 
-  Widget _getLoadingWidget() {
-    return Stack(
-      children: [
-        _getThumbnail(),
-        Container(
-          color: Colors.black12,
-          constraints: const BoxConstraints.expand(),
-        ),
-        Center(
-          child: SizedBox.fromSize(
-            size: const Size.square(20),
-            child: ValueListenableBuilder(
-              valueListenable: _progressNotifier,
-              builder: (BuildContext context, double? progress, _) {
-                return progress == null || progress == 1
-                    ? const CupertinoActivityIndicator(
-                        color: Colors.white,
-                      )
-                    : CircularProgressIndicator(
-                        backgroundColor: Colors.black,
-                        value: progress,
-                        valueColor: const AlwaysStoppedAnimation<Color>(
-                          Color.fromRGBO(45, 194, 98, 1.0),
-                        ),
-                      );
-              },
-            ),
-          ),
-        ),
-      ],
-    );
-  }
+//   Widget _getLoadingWidget() {
+//     return Stack(
+//       children: [
+//         _getThumbnail(),
+//         Container(
+//           color: Colors.black12,
+//           constraints: const BoxConstraints.expand(),
+//         ),
+//         Center(
+//           child: SizedBox.fromSize(
+//             size: const Size.square(20),
+//             child: ValueListenableBuilder(
+//               valueListenable: _progressNotifier,
+//               builder: (BuildContext context, double? progress, _) {
+//                 return progress == null || progress == 1
+//                     ? const CupertinoActivityIndicator(
+//                         color: Colors.white,
+//                       )
+//                     : CircularProgressIndicator(
+//                         backgroundColor: Colors.black,
+//                         value: progress,
+//                         valueColor: const AlwaysStoppedAnimation<Color>(
+//                           Color.fromRGBO(45, 194, 98, 1.0),
+//                         ),
+//                       );
+//               },
+//             ),
+//           ),
+//         ),
+//       ],
+//     );
+//   }
 
-  Widget _getThumbnail() {
-    return Container(
-      color: Colors.black,
-      constraints: const BoxConstraints.expand(),
-      child: ThumbnailWidget(
-        widget.file,
-        fit: BoxFit.contain,
-      ),
-    );
-  }
+//   Widget _getThumbnail() {
+//     return Container(
+//       color: Colors.black,
+//       constraints: const BoxConstraints.expand(),
+//       child: ThumbnailWidget(
+//         widget.file,
+//         fit: BoxFit.contain,
+//       ),
+//     );
+//   }
 
-  Future<void> _keepScreenAliveOnPlaying(bool isPlaying) async {
-    if (isPlaying) {
-      _wakeLock.enable();
-    }
-    if (!isPlaying) {
-      _wakeLock.disable();
-    }
-  }
+//   Future<void> _keepScreenAliveOnPlaying(bool isPlaying) async {
+//     if (isPlaying) {
+//       _wakeLock.enable();
+//     }
+//     if (!isPlaying) {
+//       _wakeLock.disable();
+//     }
+//   }
 
-  Widget _getVideoPlayer() {
-    _videoPlayerController!.addListener(() {
-      if (_isPlaying != _videoPlayerController!.value.isPlaying) {
-        _isPlaying = _videoPlayerController!.value.isPlaying;
-        if (widget.playbackCallback != null) {
-          widget.playbackCallback!(_isPlaying);
-        }
-        unawaited(_keepScreenAliveOnPlaying(_isPlaying));
-      }
-    });
-    _chewieController = ChewieController(
-      progressIndicatorDelay: const Duration(milliseconds: 200),
-      videoPlayerController: _videoPlayerController!,
-      aspectRatio: _videoPlayerController!.value.aspectRatio,
-      autoPlay: widget.autoPlay!,
-      autoInitialize: true,
-      looping: true,
-      allowMuting: true,
-      allowFullScreen: false,
-      customControls: VideoControls(
-        file: widget.file,
-        onStreamChange: widget.onStreamChange,
-        playbackCallback: widget.playbackCallback,
-      ),
-    );
-    return Container(
-      color: Colors.black,
-      child: Chewie(controller: _chewieController!),
-    );
-  }
-}
+//   Widget _getVideoPlayer() {
+//     _videoPlayerController!.addListener(() {
+//       if (_isPlaying != _videoPlayerController!.value.isPlaying) {
+//         _isPlaying = _videoPlayerController!.value.isPlaying;
+//         if (widget.playbackCallback != null) {
+//           widget.playbackCallback!(_isPlaying);
+//         }
+//         unawaited(_keepScreenAliveOnPlaying(_isPlaying));
+//       }
+//     });
+//     _chewieController = ChewieController(
+//       progressIndicatorDelay: const Duration(milliseconds: 200),
+//       videoPlayerController: _videoPlayerController!,
+//       aspectRatio: _videoPlayerController!.value.aspectRatio,
+//       autoPlay: widget.autoPlay!,
+//       autoInitialize: true,
+//       looping: true,
+//       allowMuting: true,
+//       allowFullScreen: false,
+//       customControls: VideoControls(
+//         file: widget.file,
+//         onStreamChange: widget.onStreamChange,
+//         playbackCallback: widget.playbackCallback,
+//       ),
+//     );
+//     return Container(
+//       color: Colors.black,
+//       child: Chewie(controller: _chewieController!),
+//     );
+//   }
+// }
diff --git a/mobile/lib/ui/viewer/file/video_control.dart b/mobile/lib/ui/viewer/file/video_control.dart
index 9d05b502fe..b6cfca4ba4 100644
--- a/mobile/lib/ui/viewer/file/video_control.dart
+++ b/mobile/lib/ui/viewer/file/video_control.dart
@@ -1,449 +1,449 @@
-// ignore_for_file: implementation_imports
+// // ignore_for_file: implementation_imports
 
-import 'dart:async';
+// import 'dart:async';
 
-import "package:chewie/chewie.dart";
-import "package:chewie/src/notifiers/index.dart";
-import 'package:flutter/material.dart';
-import "package:photos/models/file/file.dart";
-import "package:photos/theme/colors.dart";
-import "package:photos/theme/ente_theme.dart";
-import "package:photos/ui/common/loading_widget.dart";
-import "package:photos/ui/viewer/file/preview_status_widget.dart";
-import "package:photos/ui/viewer/file/video_control/custom_progress_bar.dart";
-import "package:photos/utils/seconds_to_duration.dart";
-import 'package:provider/provider.dart';
-import 'package:video_player/video_player.dart';
+// import "package:chewie/chewie.dart";
+// import "package:chewie/src/notifiers/index.dart";
+// import 'package:flutter/material.dart';
+// import "package:photos/models/file/file.dart";
+// import "package:photos/theme/colors.dart";
+// import "package:photos/theme/ente_theme.dart";
+// import "package:photos/ui/common/loading_widget.dart";
+// import "package:photos/ui/viewer/file/preview_status_widget.dart";
+// import "package:photos/ui/viewer/file/video_control/custom_progress_bar.dart";
+// import "package:photos/utils/seconds_to_duration.dart";
+// import 'package:provider/provider.dart';
+// import 'package:video_player/video_player.dart';
 
-class VideoControls extends StatefulWidget {
-  const VideoControls({
-    super.key,
-    required this.file,
-    required this.onStreamChange,
-    required this.playbackCallback,
-  });
-  final EnteFile file;
-  final void Function()? onStreamChange;
-  final void Function(bool)? playbackCallback;
+// class VideoControls extends StatefulWidget {
+//   const VideoControls({
+//     super.key,
+//     required this.file,
+//     required this.onStreamChange,
+//     required this.playbackCallback,
+//   });
+//   final EnteFile file;
+//   final void Function()? onStreamChange;
+//   final void Function(bool)? playbackCallback;
 
-  @override
-  State<StatefulWidget> createState() {
-    return _VideoControlsState();
-  }
-}
+//   @override
+//   State<StatefulWidget> createState() {
+//     return _VideoControlsState();
+//   }
+// }
 
-class _VideoControlsState extends State<VideoControls>
-    with SingleTickerProviderStateMixin {
-  late PlayerNotifier notifier;
-  late VideoPlayerValue _latestValue;
-  Timer? _hideTimer;
-  Timer? _initTimer;
-  Timer? _showAfterExpandCollapseTimer;
-  bool _dragging = false;
-  bool _displayTapped = false;
-  Timer? _bufferingDisplayTimer;
-  bool _displayBufferingIndicator = false;
+// class _VideoControlsState extends State<VideoControls>
+//     with SingleTickerProviderStateMixin {
+//   late PlayerNotifier notifier;
+//   late VideoPlayerValue _latestValue;
+//   Timer? _hideTimer;
+//   Timer? _initTimer;
+//   Timer? _showAfterExpandCollapseTimer;
+//   bool _dragging = false;
+//   bool _displayTapped = false;
+//   Timer? _bufferingDisplayTimer;
+//   bool _displayBufferingIndicator = false;
 
-  final barHeight = 48.0 * 1.5;
-  final marginSize = 5.0;
+//   final barHeight = 48.0 * 1.5;
+//   final marginSize = 5.0;
 
-  late VideoPlayerController controller;
-  ChewieController? _chewieController;
+//   late VideoPlayerController controller;
+//   ChewieController? _chewieController;
 
-  // We know that _chewieController is set in didChangeDependencies
-  ChewieController get chewieController => _chewieController!;
+//   // We know that _chewieController is set in didChangeDependencies
+//   ChewieController get chewieController => _chewieController!;
 
-  @override
-  void initState() {
-    super.initState();
-    notifier = Provider.of<PlayerNotifier>(context, listen: false);
-  }
+//   @override
+//   void initState() {
+//     super.initState();
+//     notifier = Provider.of<PlayerNotifier>(context, listen: false);
+//   }
 
-  @override
-  Widget build(BuildContext context) {
-    if (_latestValue.hasError) {
-      return chewieController.errorBuilder?.call(
-            context,
-            chewieController.videoPlayerController.value.errorDescription!,
-          ) ??
-          Center(
-            child: Icon(
-              Icons.error,
-              color: Theme.of(context).colorScheme.onSurface,
-              size: 42,
-            ),
-          );
-    }
+//   @override
+//   Widget build(BuildContext context) {
+//     if (_latestValue.hasError) {
+//       return chewieController.errorBuilder?.call(
+//             context,
+//             chewieController.videoPlayerController.value.errorDescription!,
+//           ) ??
+//           Center(
+//             child: Icon(
+//               Icons.error,
+//               color: Theme.of(context).colorScheme.onSurface,
+//               size: 42,
+//             ),
+//           );
+//     }
 
-    return MouseRegion(
-      onHover: (_) {
-        _cancelAndRestartTimer();
-      },
-      child: GestureDetector(
-        onTap: () => _cancelAndRestartTimer(),
-        child: AbsorbPointer(
-          absorbing: notifier.hideStuff,
-          child: Stack(
-            children: [
-              if (_displayBufferingIndicator)
-                _chewieController?.bufferingBuilder?.call(context) ??
-                    const Center(
-                      child: EnteLoadingWidget(
-                        size: 32,
-                        color: fillBaseDark,
-                        padding: 0,
-                      ),
-                    )
-              else
-                _buildHitArea(),
-              SafeArea(
-                top: false,
-                left: false,
-                right: false,
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.end,
-                  children: <Widget>[
-                    PreviewStatusWidget(
-                      showControls: !notifier.hideStuff,
-                      file: widget.file,
-                      isPreviewPlayer: true,
-                      onStreamChange: widget.onStreamChange,
-                    ),
-                    if (!chewieController.isLive) _buildBottomBar(context),
-                  ],
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
+//     return MouseRegion(
+//       onHover: (_) {
+//         _cancelAndRestartTimer();
+//       },
+//       child: GestureDetector(
+//         onTap: () => _cancelAndRestartTimer(),
+//         child: AbsorbPointer(
+//           absorbing: notifier.hideStuff,
+//           child: Stack(
+//             children: [
+//               if (_displayBufferingIndicator)
+//                 _chewieController?.bufferingBuilder?.call(context) ??
+//                     const Center(
+//                       child: EnteLoadingWidget(
+//                         size: 32,
+//                         color: fillBaseDark,
+//                         padding: 0,
+//                       ),
+//                     )
+//               else
+//                 _buildHitArea(),
+//               SafeArea(
+//                 top: false,
+//                 left: false,
+//                 right: false,
+//                 child: Column(
+//                   mainAxisAlignment: MainAxisAlignment.end,
+//                   children: <Widget>[
+//                     PreviewStatusWidget(
+//                       showControls: !notifier.hideStuff,
+//                       file: widget.file,
+//                       isPreviewPlayer: true,
+//                       onStreamChange: widget.onStreamChange,
+//                     ),
+//                     if (!chewieController.isLive) _buildBottomBar(context),
+//                   ],
+//                 ),
+//               ),
+//             ],
+//           ),
+//         ),
+//       ),
+//     );
+//   }
 
-  @override
-  void dispose() {
-    _dispose();
-    super.dispose();
-  }
+//   @override
+//   void dispose() {
+//     _dispose();
+//     super.dispose();
+//   }
 
-  void _dispose() {
-    controller.removeListener(_updateState);
-    _hideTimer?.cancel();
-    _initTimer?.cancel();
-    _showAfterExpandCollapseTimer?.cancel();
-  }
+//   void _dispose() {
+//     controller.removeListener(_updateState);
+//     _hideTimer?.cancel();
+//     _initTimer?.cancel();
+//     _showAfterExpandCollapseTimer?.cancel();
+//   }
 
-  @override
-  void didChangeDependencies() {
-    final oldController = _chewieController;
-    _chewieController = ChewieController.of(context);
-    controller = chewieController.videoPlayerController;
+//   @override
+//   void didChangeDependencies() {
+//     final oldController = _chewieController;
+//     _chewieController = ChewieController.of(context);
+//     controller = chewieController.videoPlayerController;
 
-    if (oldController != chewieController) {
-      _dispose();
-      _initialize();
-    }
+//     if (oldController != chewieController) {
+//       _dispose();
+//       _initialize();
+//     }
 
-    super.didChangeDependencies();
-  }
+//     super.didChangeDependencies();
+//   }
 
-  AnimatedOpacity _buildBottomBar(
-    BuildContext context,
-  ) {
-    return AnimatedOpacity(
-      opacity: notifier.hideStuff ? 0.0 : 1.0,
-      duration: const Duration(milliseconds: 300),
-      child: Container(
-        height: 40,
-        margin: const EdgeInsets.only(bottom: 60, left: 8, right: 8),
-        child: Container(
-          padding: const EdgeInsets.fromLTRB(
-            16,
-            4,
-            16,
-            4,
-          ),
-          decoration: BoxDecoration(
-            color: Colors.black.withOpacity(0.3),
-            borderRadius: const BorderRadius.all(
-              Radius.circular(8),
-            ),
-            border: Border.all(
-              color: strokeFaintDark,
-              width: 1,
-            ),
-          ),
-          child: Row(
-            children: [
-              Text(
-                secondsToDuration(_latestValue.position.inSeconds),
-                style: getEnteTextTheme(
-                  context,
-                ).mini.copyWith(
-                      color: textBaseDark,
-                    ),
-              ),
-              const SizedBox(width: 16),
-              Expanded(
-                child: _buildProgressBar(),
-              ),
-              const SizedBox(width: 16),
-              Text(
-                secondsToDuration(_latestValue.duration.inSeconds),
-                style: getEnteTextTheme(
-                  context,
-                ).mini.copyWith(
-                      color: textBaseDark,
-                    ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
+//   AnimatedOpacity _buildBottomBar(
+//     BuildContext context,
+//   ) {
+//     return AnimatedOpacity(
+//       opacity: notifier.hideStuff ? 0.0 : 1.0,
+//       duration: const Duration(milliseconds: 300),
+//       child: Container(
+//         height: 40,
+//         margin: const EdgeInsets.only(bottom: 60, left: 8, right: 8),
+//         child: Container(
+//           padding: const EdgeInsets.fromLTRB(
+//             16,
+//             4,
+//             16,
+//             4,
+//           ),
+//           decoration: BoxDecoration(
+//             color: Colors.black.withOpacity(0.3),
+//             borderRadius: const BorderRadius.all(
+//               Radius.circular(8),
+//             ),
+//             border: Border.all(
+//               color: strokeFaintDark,
+//               width: 1,
+//             ),
+//           ),
+//           child: Row(
+//             children: [
+//               Text(
+//                 secondsToDuration(_latestValue.position.inSeconds),
+//                 style: getEnteTextTheme(
+//                   context,
+//                 ).mini.copyWith(
+//                       color: textBaseDark,
+//                     ),
+//               ),
+//               const SizedBox(width: 16),
+//               Expanded(
+//                 child: _buildProgressBar(),
+//               ),
+//               const SizedBox(width: 16),
+//               Text(
+//                 secondsToDuration(_latestValue.duration.inSeconds),
+//                 style: getEnteTextTheme(
+//                   context,
+//                 ).mini.copyWith(
+//                       color: textBaseDark,
+//                     ),
+//               ),
+//             ],
+//           ),
+//         ),
+//       ),
+//     );
+//   }
 
-  Widget _buildHitArea() {
-    final bool isFinished = (_latestValue.position >= _latestValue.duration) &&
-        _latestValue.duration.inSeconds > 0;
-    final bool showPlayButton = true && !_dragging && !notifier.hideStuff;
+//   Widget _buildHitArea() {
+//     final bool isFinished = (_latestValue.position >= _latestValue.duration) &&
+//         _latestValue.duration.inSeconds > 0;
+//     final bool showPlayButton = true && !_dragging && !notifier.hideStuff;
 
-    return GestureDetector(
-      onTap: () {
-        if (_latestValue.isPlaying) {
-          if (_displayTapped) {
-            setState(() {
-              notifier.hideStuff = true;
-            });
-          } else {
-            _cancelAndRestartTimer();
-          }
-        } else {
-          setState(() {
-            notifier.hideStuff = true;
-          });
-        }
-        widget.playbackCallback?.call(notifier.hideStuff);
-      },
-      child: Container(
-        alignment: Alignment.center,
-        color: Colors.transparent,
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Container(
-              margin: EdgeInsets.symmetric(
-                horizontal: marginSize,
-              ),
-              child: CenterPlayButton(
-                backgroundColor: Colors.black54,
-                iconColor: Colors.white,
-                isFinished: isFinished,
-                isPlaying: controller.value.isPlaying,
-                show: showPlayButton,
-                onPressed: _playPause,
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
+//     return GestureDetector(
+//       onTap: () {
+//         if (_latestValue.isPlaying) {
+//           if (_displayTapped) {
+//             setState(() {
+//               notifier.hideStuff = true;
+//             });
+//           } else {
+//             _cancelAndRestartTimer();
+//           }
+//         } else {
+//           setState(() {
+//             notifier.hideStuff = true;
+//           });
+//         }
+//         widget.playbackCallback?.call(notifier.hideStuff);
+//       },
+//       child: Container(
+//         alignment: Alignment.center,
+//         color: Colors.transparent,
+//         child: Row(
+//           mainAxisAlignment: MainAxisAlignment.center,
+//           children: [
+//             Container(
+//               margin: EdgeInsets.symmetric(
+//                 horizontal: marginSize,
+//               ),
+//               child: CenterPlayButton(
+//                 backgroundColor: Colors.black54,
+//                 iconColor: Colors.white,
+//                 isFinished: isFinished,
+//                 isPlaying: controller.value.isPlaying,
+//                 show: showPlayButton,
+//                 onPressed: _playPause,
+//               ),
+//             ),
+//           ],
+//         ),
+//       ),
+//     );
+//   }
 
-  void _cancelAndRestartTimer() {
-    _hideTimer?.cancel();
-    _startHideTimer();
+//   void _cancelAndRestartTimer() {
+//     _hideTimer?.cancel();
+//     _startHideTimer();
 
-    setState(() {
-      notifier.hideStuff = false;
-      _displayTapped = true;
-    });
-    widget.playbackCallback?.call(notifier.hideStuff);
-  }
+//     setState(() {
+//       notifier.hideStuff = false;
+//       _displayTapped = true;
+//     });
+//     widget.playbackCallback?.call(notifier.hideStuff);
+//   }
 
-  Future<void> _initialize() async {
-    controller.addListener(_updateState);
+//   Future<void> _initialize() async {
+//     controller.addListener(_updateState);
 
-    _updateState();
+//     _updateState();
 
-    if (controller.value.isPlaying || chewieController.autoPlay) {
-      _startHideTimer();
-    }
+//     if (controller.value.isPlaying || chewieController.autoPlay) {
+//       _startHideTimer();
+//     }
 
-    if (chewieController.showControlsOnInitialize) {
-      _initTimer = Timer(const Duration(milliseconds: 200), () {
-        setState(() {
-          notifier.hideStuff = false;
-        });
-        widget.playbackCallback?.call(notifier.hideStuff);
-      });
-    }
-  }
+//     if (chewieController.showControlsOnInitialize) {
+//       _initTimer = Timer(const Duration(milliseconds: 200), () {
+//         setState(() {
+//           notifier.hideStuff = false;
+//         });
+//         widget.playbackCallback?.call(notifier.hideStuff);
+//       });
+//     }
+//   }
 
-  void _playPause() {
-    final bool isFinished = (_latestValue.position >= _latestValue.duration) &&
-        _latestValue.duration.inSeconds > 0;
+//   void _playPause() {
+//     final bool isFinished = (_latestValue.position >= _latestValue.duration) &&
+//         _latestValue.duration.inSeconds > 0;
 
-    setState(() {
-      if (controller.value.isPlaying) {
-        notifier.hideStuff = false;
-        _hideTimer?.cancel();
-        controller.pause();
-      } else {
-        _cancelAndRestartTimer();
+//     setState(() {
+//       if (controller.value.isPlaying) {
+//         notifier.hideStuff = false;
+//         _hideTimer?.cancel();
+//         controller.pause();
+//       } else {
+//         _cancelAndRestartTimer();
 
-        if (!controller.value.isInitialized) {
-          controller.initialize().then((_) {
-            controller.play();
-          });
-        } else {
-          if (isFinished) {
-            controller.seekTo(Duration.zero);
-          }
-          controller.play();
-        }
-      }
-      widget.playbackCallback?.call(notifier.hideStuff);
-    });
-  }
+//         if (!controller.value.isInitialized) {
+//           controller.initialize().then((_) {
+//             controller.play();
+//           });
+//         } else {
+//           if (isFinished) {
+//             controller.seekTo(Duration.zero);
+//           }
+//           controller.play();
+//         }
+//       }
+//       widget.playbackCallback?.call(notifier.hideStuff);
+//     });
+//   }
 
-  void _startHideTimer() {
-    final hideControlsTimer = chewieController.hideControlsTimer.isNegative
-        ? ChewieController.defaultHideControlsTimer
-        : chewieController.hideControlsTimer;
-    _hideTimer = Timer(hideControlsTimer, () {
-      setState(() {
-        notifier.hideStuff = true;
-      });
-      widget.playbackCallback?.call(notifier.hideStuff);
-    });
-  }
+//   void _startHideTimer() {
+//     final hideControlsTimer = chewieController.hideControlsTimer.isNegative
+//         ? ChewieController.defaultHideControlsTimer
+//         : chewieController.hideControlsTimer;
+//     _hideTimer = Timer(hideControlsTimer, () {
+//       setState(() {
+//         notifier.hideStuff = true;
+//       });
+//       widget.playbackCallback?.call(notifier.hideStuff);
+//     });
+//   }
 
-  void _bufferingTimerTimeout() {
-    _displayBufferingIndicator = true;
-    if (mounted) {
-      setState(() {});
-    }
-  }
+//   void _bufferingTimerTimeout() {
+//     _displayBufferingIndicator = true;
+//     if (mounted) {
+//       setState(() {});
+//     }
+//   }
 
-  void _updateState() {
-    if (!mounted) return;
+//   void _updateState() {
+//     if (!mounted) return;
 
-    // display the progress bar indicator only after the buffering delay if it has been set
-    if (chewieController.progressIndicatorDelay != null) {
-      if (controller.value.isBuffering) {
-        _bufferingDisplayTimer ??= Timer(
-          chewieController.progressIndicatorDelay!,
-          _bufferingTimerTimeout,
-        );
-      } else {
-        _bufferingDisplayTimer?.cancel();
-        _bufferingDisplayTimer = null;
-        _displayBufferingIndicator = false;
-      }
-    } else {
-      _displayBufferingIndicator = controller.value.isBuffering;
-    }
+//     // display the progress bar indicator only after the buffering delay if it has been set
+//     if (chewieController.progressIndicatorDelay != null) {
+//       if (controller.value.isBuffering) {
+//         _bufferingDisplayTimer ??= Timer(
+//           chewieController.progressIndicatorDelay!,
+//           _bufferingTimerTimeout,
+//         );
+//       } else {
+//         _bufferingDisplayTimer?.cancel();
+//         _bufferingDisplayTimer = null;
+//         _displayBufferingIndicator = false;
+//       }
+//     } else {
+//       _displayBufferingIndicator = controller.value.isBuffering;
+//     }
 
-    setState(() {
-      _latestValue = controller.value;
-    });
-  }
+//     setState(() {
+//       _latestValue = controller.value;
+//     });
+//   }
 
-  Widget _buildProgressBar() {
-    final colorScheme = getEnteColorScheme(context);
-    return Expanded(
-      child: CustomProgressBar(
-        controller,
-        onDragStart: () {
-          setState(() {
-            _dragging = true;
-          });
+//   Widget _buildProgressBar() {
+//     final colorScheme = getEnteColorScheme(context);
+//     return Expanded(
+//       child: CustomProgressBar(
+//         controller,
+//         onDragStart: () {
+//           setState(() {
+//             _dragging = true;
+//           });
 
-          _hideTimer?.cancel();
-        },
-        onDragUpdate: () {
-          _hideTimer?.cancel();
-        },
-        onDragEnd: () {
-          setState(() {
-            _dragging = false;
-          });
+//           _hideTimer?.cancel();
+//         },
+//         onDragUpdate: () {
+//           _hideTimer?.cancel();
+//         },
+//         onDragEnd: () {
+//           setState(() {
+//             _dragging = false;
+//           });
 
-          _startHideTimer();
-        },
-        colors: ChewieProgressColors(
-          playedColor: colorScheme.primary300,
-          handleColor: backgroundElevatedLight,
-          bufferedColor: backgroundElevatedLight.withOpacity(0.5),
-          backgroundColor: fillMutedDark,
-        ),
-        draggableProgressBar: chewieController.draggableProgressBar,
-      ),
-    );
-  }
-}
+//           _startHideTimer();
+//         },
+//         colors: ChewieProgressColors(
+//           playedColor: colorScheme.primary300,
+//           handleColor: backgroundElevatedLight,
+//           bufferedColor: backgroundElevatedLight.withOpacity(0.5),
+//           backgroundColor: fillMutedDark,
+//         ),
+//         draggableProgressBar: chewieController.draggableProgressBar,
+//       ),
+//     );
+//   }
+// }
 
-class CenterPlayButton extends StatelessWidget {
-  const CenterPlayButton({
-    super.key,
-    required this.backgroundColor,
-    this.iconColor,
-    required this.show,
-    required this.isPlaying,
-    required this.isFinished,
-    this.onPressed,
-  });
+// class CenterPlayButton extends StatelessWidget {
+//   const CenterPlayButton({
+//     super.key,
+//     required this.backgroundColor,
+//     this.iconColor,
+//     required this.show,
+//     required this.isPlaying,
+//     required this.isFinished,
+//     this.onPressed,
+//   });
 
-  final Color backgroundColor;
-  final Color? iconColor;
-  final bool show;
-  final bool isPlaying;
-  final bool isFinished;
-  final VoidCallback? onPressed;
+//   final Color backgroundColor;
+//   final Color? iconColor;
+//   final bool show;
+//   final bool isPlaying;
+//   final bool isFinished;
+//   final VoidCallback? onPressed;
 
-  @override
-  Widget build(BuildContext context) {
-    return AnimatedOpacity(
-      opacity: show ? 1.0 : 0.0,
-      duration: const Duration(milliseconds: 300),
-      child: Container(
-        width: 54,
-        height: 54,
-        decoration: BoxDecoration(
-          color: Colors.black.withOpacity(0.3),
-          shape: BoxShape.circle,
-          border: Border.all(
-            color: strokeFaintDark,
-            width: 1,
-          ),
-        ),
-        child: GestureDetector(
-          behavior: HitTestBehavior.opaque,
-          onTap: onPressed,
-          child: AnimatedSwitcher(
-            duration: const Duration(milliseconds: 250),
-            transitionBuilder: (Widget child, Animation<double> animation) {
-              return ScaleTransition(scale: animation, child: child);
-            },
-            switchInCurve: Curves.easeInOutQuart,
-            switchOutCurve: Curves.easeInOutQuart,
-            child: isPlaying
-                ? const Icon(
-                    Icons.pause,
-                    size: 32,
-                    key: ValueKey("pause"),
-                    color: Colors.white,
-                  )
-                : const Icon(
-                    Icons.play_arrow,
-                    size: 36,
-                    key: ValueKey("play"),
-                    color: Colors.white,
-                  ),
-          ),
-        ),
-      ),
-    );
-  }
-}
+//   @override
+//   Widget build(BuildContext context) {
+//     return AnimatedOpacity(
+//       opacity: show ? 1.0 : 0.0,
+//       duration: const Duration(milliseconds: 300),
+//       child: Container(
+//         width: 54,
+//         height: 54,
+//         decoration: BoxDecoration(
+//           color: Colors.black.withOpacity(0.3),
+//           shape: BoxShape.circle,
+//           border: Border.all(
+//             color: strokeFaintDark,
+//             width: 1,
+//           ),
+//         ),
+//         child: GestureDetector(
+//           behavior: HitTestBehavior.opaque,
+//           onTap: onPressed,
+//           child: AnimatedSwitcher(
+//             duration: const Duration(milliseconds: 250),
+//             transitionBuilder: (Widget child, Animation<double> animation) {
+//               return ScaleTransition(scale: animation, child: child);
+//             },
+//             switchInCurve: Curves.easeInOutQuart,
+//             switchOutCurve: Curves.easeInOutQuart,
+//             child: isPlaying
+//                 ? const Icon(
+//                     Icons.pause,
+//                     size: 32,
+//                     key: ValueKey("pause"),
+//                     color: Colors.white,
+//                   )
+//                 : const Icon(
+//                     Icons.play_arrow,
+//                     size: 36,
+//                     key: ValueKey("play"),
+//                     color: Colors.white,
+//                   ),
+//           ),
+//         ),
+//       ),
+//     );
+//   }
+// }
diff --git a/mobile/lib/ui/viewer/file/video_widget.dart b/mobile/lib/ui/viewer/file/video_widget.dart
index 237e4cdaca..e93c353617 100644
--- a/mobile/lib/ui/viewer/file/video_widget.dart
+++ b/mobile/lib/ui/viewer/file/video_widget.dart
@@ -7,8 +7,8 @@ import "package:photos/events/use_media_kit_for_video.dart";
 import "package:photos/models/file/file.dart";
 import "package:photos/services/filedata/filedata_service.dart";
 import "package:photos/services/preview_video_store.dart";
-import "package:photos/ui/viewer/file/preview_video_widget.dart";
 import "package:photos/ui/viewer/file/video_widget_media_kit_new.dart";
+import "package:photos/ui/viewer/file/video_widget_media_kit_preview.dart";
 import "package:photos/ui/viewer/file/video_widget_native.dart";
 
 class VideoWidget extends StatefulWidget {
@@ -60,7 +60,7 @@ class _VideoWidgetState extends State<VideoWidget> {
                     ?.containsKey(widget.file.uploadedFileID!) ??
                 false);
     if (isPreviewVideoPlayable && selectPreviewForPlay) {
-      return PreviewVideoWidget(
+      return VideoWidgetMediaKitPreview(
         widget.file,
         tagPrefix: widget.tagPrefix,
         playbackCallback: widget.playbackCallback,
diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
new file mode 100644
index 0000000000..a5f2be3e8c
--- /dev/null
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
@@ -0,0 +1,458 @@
+import "dart:async";
+
+import "package:flutter/material.dart";
+import "package:media_kit_video/media_kit_video.dart";
+import "package:photos/models/file/file.dart";
+import "package:photos/theme/colors.dart";
+import "package:photos/theme/ente_theme.dart";
+import "package:photos/ui/viewer/file/preview_status_widget.dart";
+import "package:photos/utils/debouncer.dart";
+import "package:photos/utils/seconds_to_duration.dart";
+
+class VideoWidget extends StatefulWidget {
+  final EnteFile file;
+  final VideoController controller;
+  final Function(bool)? playbackCallback;
+  final bool isFromMemories;
+  final void Function() onStreamChange;
+
+  const VideoWidget(
+    this.file,
+    this.controller,
+    this.playbackCallback, {
+    super.key,
+    required this.isFromMemories,
+    // ignore: unused_element
+    required this.onStreamChange,
+  });
+
+  @override
+  State<VideoWidget> createState() => _VideoWidgetState();
+}
+
+class _VideoWidgetState extends State<VideoWidget> {
+  final showControlsNotifier = ValueNotifier<bool>(true);
+  static const verticalMargin = 72.0;
+  final _hideControlsDebouncer = Debouncer(
+    const Duration(milliseconds: 2000),
+  );
+  final _isSeekingNotifier = ValueNotifier<bool>(false);
+  late final StreamSubscription<bool> _isPlayingStreamSubscription;
+
+  @override
+  void initState() {
+    _isPlayingStreamSubscription =
+        widget.controller.player.stream.playing.listen((isPlaying) {
+      if (isPlaying && !_isSeekingNotifier.value) {
+        _hideControlsDebouncer.run(() async {
+          showControlsNotifier.value = false;
+          widget.playbackCallback?.call(true);
+        });
+      }
+    });
+
+    _isSeekingNotifier.addListener(isSeekingListener);
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    showControlsNotifier.dispose();
+    _isPlayingStreamSubscription.cancel();
+    _hideControlsDebouncer.cancelDebounceTimer();
+    _isSeekingNotifier.removeListener(isSeekingListener);
+    _isSeekingNotifier.dispose();
+    super.dispose();
+  }
+
+  void isSeekingListener() {
+    if (_isSeekingNotifier.value) {
+      _hideControlsDebouncer.cancelDebounceTimer();
+    } else {
+      if (widget.controller.player.state.playing) {
+        _hideControlsDebouncer.run(() async {
+          showControlsNotifier.value = false;
+          widget.playbackCallback?.call(false);
+        });
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Video(
+      controller: widget.controller,
+      controls: (state) {
+        return ValueListenableBuilder(
+          valueListenable: showControlsNotifier,
+          builder: (context, value, _) {
+            return AnimatedOpacity(
+              duration: const Duration(milliseconds: 200),
+              opacity: value ? 1 : 0,
+              curve: Curves.easeInOutQuad,
+              child: Stack(
+                alignment: Alignment.center,
+                children: [
+                  GestureDetector(
+                    behavior: HitTestBehavior.opaque,
+                    onTap: () {
+                      showControlsNotifier.value = !showControlsNotifier.value;
+                      if (widget.playbackCallback != null) {
+                        widget.playbackCallback!(
+                          !showControlsNotifier.value,
+                        );
+                      }
+                    },
+                    child: Container(
+                      constraints: const BoxConstraints.expand(),
+                    ),
+                  ),
+                  IgnorePointer(
+                    ignoring: !value,
+                    child: PlayPauseButtonMediaKit(widget.controller),
+                  ),
+                  Positioned(
+                    bottom: verticalMargin,
+                    right: 0,
+                    left: 0,
+                    child: IgnorePointer(
+                      ignoring: !value,
+                      child: SafeArea(
+                        top: false,
+                        left: false,
+                        right: false,
+                        child: Padding(
+                          padding: EdgeInsets.only(
+                            bottom: widget.isFromMemories ? 32 : 0,
+                          ),
+                          child: Column(
+                            mainAxisAlignment: MainAxisAlignment.center,
+                            children: [
+                              widget.file.caption != null
+                                  ? Padding(
+                                      padding: const EdgeInsets.fromLTRB(
+                                        16,
+                                        12,
+                                        16,
+                                        8,
+                                      ),
+                                      child: Text(
+                                        widget.file.caption!,
+                                        overflow: TextOverflow.ellipsis,
+                                        maxLines: 1,
+                                        style: getEnteTextTheme(context)
+                                            .mini
+                                            .copyWith(
+                                              color: textBaseDark,
+                                            ),
+                                        textAlign: TextAlign.center,
+                                      ),
+                                    )
+                                  : const SizedBox.shrink(),
+                              PreviewStatusWidget(
+                                showControls: value,
+                                file: widget.file,
+                                isPreviewPlayer: true,
+                                onStreamChange: widget.onStreamChange,
+                              ),
+                              SeekBarAndDuration(
+                                controller: widget.controller,
+                                isSeekingNotifier: _isSeekingNotifier,
+                              ),
+                            ],
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
+}
+
+class PlayPauseButtonMediaKit extends StatefulWidget {
+  final VideoController? controller;
+  const PlayPauseButtonMediaKit(
+    this.controller, {
+    super.key,
+  });
+
+  @override
+  State<PlayPauseButtonMediaKit> createState() => _PlayPauseButtonState();
+}
+
+class _PlayPauseButtonState extends State<PlayPauseButtonMediaKit> {
+  bool _isPlaying = true;
+  late final StreamSubscription<bool>? isPlayingStreamSubscription;
+
+  @override
+  void initState() {
+    super.initState();
+
+    isPlayingStreamSubscription =
+        widget.controller?.player.stream.playing.listen((isPlaying) {
+      setState(() {
+        _isPlaying = isPlaying;
+      });
+    });
+  }
+
+  @override
+  void dispose() {
+    isPlayingStreamSubscription?.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      behavior: HitTestBehavior.opaque,
+      onTap: () {
+        if (widget.controller?.player.state.playing ?? false) {
+          widget.controller?.player.pause();
+        } else {
+          widget.controller?.player.play();
+        }
+      },
+      child: Container(
+        width: 54,
+        height: 54,
+        decoration: BoxDecoration(
+          color: Colors.black.withOpacity(0.3),
+          shape: BoxShape.circle,
+          border: Border.all(
+            color: strokeFaintDark,
+            width: 1,
+          ),
+        ),
+        child: AnimatedSwitcher(
+          duration: const Duration(milliseconds: 250),
+          transitionBuilder: (Widget child, Animation<double> animation) {
+            return ScaleTransition(scale: animation, child: child);
+          },
+          switchInCurve: Curves.easeInOutQuart,
+          switchOutCurve: Curves.easeInOutQuart,
+          child: _isPlaying
+              ? const Icon(
+                  Icons.pause,
+                  size: 32,
+                  key: ValueKey("pause"),
+                  color: Colors.white,
+                )
+              : const Icon(
+                  Icons.play_arrow,
+                  size: 36,
+                  key: ValueKey("play"),
+                  color: Colors.white,
+                ),
+        ),
+      ),
+    );
+  }
+}
+
+class SeekBarAndDuration extends StatelessWidget {
+  final VideoController? controller;
+  final ValueNotifier<bool> isSeekingNotifier;
+
+  const SeekBarAndDuration({
+    super.key,
+    required this.controller,
+    required this.isSeekingNotifier,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(
+        horizontal: 8,
+      ),
+      child: Container(
+        padding: const EdgeInsets.fromLTRB(
+          16,
+          4,
+          16,
+          4,
+        ),
+        decoration: BoxDecoration(
+          color: Colors.black.withOpacity(0.3),
+          borderRadius: const BorderRadius.all(
+            Radius.circular(8),
+          ),
+          border: Border.all(
+            color: strokeFaintDark,
+            width: 1,
+          ),
+        ),
+        child: Row(
+          children: [
+            StreamBuilder(
+              stream: controller?.player.stream.position,
+              builder: (context, snapshot) {
+                if (snapshot.data == null) {
+                  return Text(
+                    "0:00",
+                    style: getEnteTextTheme(
+                      context,
+                    ).mini.copyWith(
+                          color: textBaseDark,
+                        ),
+                  );
+                }
+                return Text(
+                  secondsToDuration(snapshot.data!.inSeconds),
+                  style: getEnteTextTheme(
+                    context,
+                  ).mini.copyWith(
+                        color: textBaseDark,
+                      ),
+                );
+              },
+            ),
+            Expanded(
+              child: SeekBar(
+                controller!,
+                isSeekingNotifier,
+              ),
+            ),
+            Text(
+              _secondsToDuration(
+                controller!.player.state.duration.inSeconds,
+              ),
+              style: getEnteTextTheme(
+                context,
+              ).mini.copyWith(
+                    color: textBaseDark,
+                  ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  /// Returns the duration in the format "h:mm:ss" or "m:ss".
+  String _secondsToDuration(int totalSeconds) {
+    final hours = totalSeconds ~/ 3600;
+    final minutes = (totalSeconds % 3600) ~/ 60;
+    final seconds = totalSeconds % 60;
+
+    if (hours > 0) {
+      return '${hours.toString().padLeft(1, '0')}:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}';
+    } else {
+      return '${minutes.toString().padLeft(1, '0')}:${seconds.toString().padLeft(2, '0')}';
+    }
+  }
+}
+
+class SeekBar extends StatefulWidget {
+  final VideoController controller;
+  final ValueNotifier<bool> isSeekingNotifier;
+  const SeekBar(
+    this.controller,
+    this.isSeekingNotifier, {
+    super.key,
+  });
+
+  @override
+  State<SeekBar> createState() => _SeekBarState();
+}
+
+class _SeekBarState extends State<SeekBar> {
+  double _sliderValue = 0.0;
+  late final StreamSubscription<Duration> _positionStreamSubscription;
+  final _debouncer = Debouncer(
+    const Duration(milliseconds: 300),
+    executionInterval: const Duration(milliseconds: 300),
+  );
+  @override
+  void initState() {
+    super.initState();
+    _positionStreamSubscription =
+        widget.controller.player.stream.position.listen((event) {
+      if (widget.isSeekingNotifier.value) return;
+      if (mounted) {
+        setState(() {
+          _sliderValue = event.inMilliseconds /
+              widget.controller.player.state.duration.inMilliseconds;
+          if (_sliderValue.isNaN) {
+            _sliderValue = 0.0;
+          }
+        });
+      }
+    });
+  }
+
+  @override
+  void dispose() {
+    _positionStreamSubscription.cancel();
+    _debouncer.cancelDebounceTimer();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = getEnteColorScheme(context);
+    return SliderTheme(
+      data: SliderTheme.of(context).copyWith(
+        trackHeight: 1.0,
+        thumbShape: const RoundSliderThumbShape(enabledThumbRadius: 8.0),
+        overlayShape: const RoundSliderOverlayShape(overlayRadius: 14.0),
+        activeTrackColor: colorScheme.primary300,
+        inactiveTrackColor: fillMutedDark,
+        thumbColor: backgroundElevatedLight,
+        overlayColor: fillMutedDark,
+      ),
+      child: Slider(
+        min: 0.0,
+        max: 1.0,
+        value: _sliderValue,
+        onChangeStart: (value) {
+          if (mounted) {
+            setState(() {
+              widget.isSeekingNotifier.value = true;
+            });
+          }
+        },
+        onChanged: (value) {
+          if (mounted) {
+            setState(() {
+              _sliderValue = value;
+            });
+          }
+
+          _debouncer.run(() async {
+            await widget.controller.player.seek(
+              Duration(
+                milliseconds: (value *
+                        widget.controller.player.state.duration.inMilliseconds)
+                    .round(),
+              ),
+            );
+          });
+        },
+        divisions: 4500,
+        onChangeEnd: (value) async {
+          await widget.controller.player.seek(
+            Duration(
+              milliseconds: (value *
+                      widget.controller.player.state.duration.inMilliseconds)
+                  .round(),
+            ),
+          );
+          if (mounted) {
+            setState(() {
+              widget.isSeekingNotifier.value = false;
+            });
+          }
+        },
+        allowedInteraction: SliderInteraction.tapAndSlide,
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
index fe5c5d13b4..13d45bd57a 100644
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
@@ -14,13 +14,12 @@ import "package:photos/models/file/extensions/file_props.dart";
 import "package:photos/models/file/file.dart";
 import "package:photos/services/files_service.dart";
 import "package:photos/theme/colors.dart";
-import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/actions/file/file_actions.dart";
-import "package:photos/ui/viewer/file/preview_status_widget.dart";
-import "package:photos/utils/debouncer.dart";
+import "package:photos/ui/common/loading_widget.dart";
+import "package:photos/ui/viewer/file/video_widget_media_kit_common.dart"
+    as common;
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/file_util.dart";
-import "package:photos/utils/seconds_to_duration.dart";
 import "package:photos/utils/toast_util.dart";
 
 class VideoWidgetMediaKitNew extends StatefulWidget {
@@ -28,14 +27,14 @@ class VideoWidgetMediaKitNew extends StatefulWidget {
   final String? tagPrefix;
   final Function(bool)? playbackCallback;
   final bool isFromMemories;
-  final void Function()? onStreamChange;
+  final void Function() onStreamChange;
 
   const VideoWidgetMediaKitNew(
     this.file, {
     this.tagPrefix,
     this.playbackCallback,
     this.isFromMemories = false,
-    this.onStreamChange,
+    required this.onStreamChange,
     super.key,
   });
 
@@ -138,44 +137,20 @@ class _VideoWidgetMediaKitNewState extends State<VideoWidgetMediaKitNew>
               },
       child: Center(
         child: controller != null
-            ? _VideoWidget(
+            ? common.VideoWidget(
                 widget.file,
                 controller!,
                 widget.playbackCallback,
                 isFromMemories: widget.isFromMemories,
+                onStreamChange: widget.onStreamChange,
               )
-            // : Stack(
-            //     children: [
-            //       _getThumbnail(),
-            //       Container(
-            //         color: Colors.black12,
-            //         constraints: const BoxConstraints.expand(),
-            //       ),
-            //       Center(
-            //         child: SizedBox.fromSize(
-            //           size: const Size.square(20),
-            //           child: ValueListenableBuilder(
-            //             valueListenable: _progressNotifier,
-            //             builder: (BuildContext context, double? progress, _) {
-            //               return progress == null || progress == 1
-            //                   ? const CupertinoActivityIndicator(
-            //                       color: Colors.white,
-            //                     )
-            //                   : CircularProgressIndicator(
-            //                       backgroundColor: Colors.black,
-            //                       value: progress,
-            //                       valueColor:
-            //                           const AlwaysStoppedAnimation<Color>(
-            //                         Color.fromRGBO(45, 194, 98, 1.0),
-            //                       ),
-            //                     );
-            //             },
-            //           ),
-            //         ),
-            //       ),
-            //     ],
-            //   ),
-            : const SizedBox.shrink(),
+            : const Center(
+                child: EnteLoadingWidget(
+                  size: 32,
+                  color: fillBaseDark,
+                  padding: 0,
+                ),
+              ),
       ),
     );
   }
@@ -230,452 +205,3 @@ class _VideoWidgetMediaKitNewState extends State<VideoWidgetMediaKitNew>
     }
   }
 }
-
-class _VideoWidget extends StatefulWidget {
-  final EnteFile file;
-  final VideoController controller;
-  final Function(bool)? playbackCallback;
-  final bool isFromMemories;
-  final void Function()? onStreamChange;
-
-  const _VideoWidget(
-    this.file,
-    this.controller,
-    this.playbackCallback, {
-    required this.isFromMemories,
-    // ignore: unused_element
-    this.onStreamChange,
-  });
-
-  @override
-  State<_VideoWidget> createState() => __VideoWidgetState();
-}
-
-class __VideoWidgetState extends State<_VideoWidget> {
-  final showControlsNotifier = ValueNotifier<bool>(true);
-  static const verticalMargin = 72.0;
-  final _hideControlsDebouncer = Debouncer(
-    const Duration(milliseconds: 2000),
-  );
-  final _isSeekingNotifier = ValueNotifier<bool>(false);
-  late final StreamSubscription<bool> _isPlayingStreamSubscription;
-
-  @override
-  void initState() {
-    _isPlayingStreamSubscription =
-        widget.controller.player.stream.playing.listen((isPlaying) {
-      if (isPlaying && !_isSeekingNotifier.value) {
-        _hideControlsDebouncer.run(() async {
-          showControlsNotifier.value = false;
-          widget.playbackCallback?.call(true);
-        });
-      }
-    });
-
-    _isSeekingNotifier.addListener(isSeekingListener);
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    showControlsNotifier.dispose();
-    _isPlayingStreamSubscription.cancel();
-    _hideControlsDebouncer.cancelDebounceTimer();
-    _isSeekingNotifier.removeListener(isSeekingListener);
-    _isSeekingNotifier.dispose();
-    super.dispose();
-  }
-
-  void isSeekingListener() {
-    if (_isSeekingNotifier.value) {
-      _hideControlsDebouncer.cancelDebounceTimer();
-    } else {
-      if (widget.controller.player.state.playing) {
-        _hideControlsDebouncer.run(() async {
-          showControlsNotifier.value = false;
-          widget.playbackCallback?.call(false);
-        });
-      }
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Video(
-      controller: widget.controller,
-      controls: (state) {
-        return ValueListenableBuilder(
-          valueListenable: showControlsNotifier,
-          builder: (context, value, _) {
-            return AnimatedOpacity(
-              duration: const Duration(milliseconds: 200),
-              opacity: value ? 1 : 0,
-              curve: Curves.easeInOutQuad,
-              child: Stack(
-                alignment: Alignment.center,
-                children: [
-                  GestureDetector(
-                    behavior: HitTestBehavior.opaque,
-                    onTap: () {
-                      showControlsNotifier.value = !showControlsNotifier.value;
-                      if (widget.playbackCallback != null) {
-                        widget.playbackCallback!(
-                          !showControlsNotifier.value,
-                        );
-                      }
-                    },
-                    child: Container(
-                      constraints: const BoxConstraints.expand(),
-                    ),
-                  ),
-                  IgnorePointer(
-                    ignoring: !value,
-                    child: PlayPauseButtonMediaKit(widget.controller),
-                  ),
-                  Positioned(
-                    bottom: verticalMargin,
-                    right: 0,
-                    left: 0,
-                    child: IgnorePointer(
-                      ignoring: !value,
-                      child: SafeArea(
-                        top: false,
-                        left: false,
-                        right: false,
-                        child: Padding(
-                          padding: EdgeInsets.only(
-                            bottom: widget.isFromMemories ? 32 : 0,
-                          ),
-                          child: Column(
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            children: [
-                              widget.file.caption != null
-                                  ? Padding(
-                                      padding: const EdgeInsets.fromLTRB(
-                                        16,
-                                        12,
-                                        16,
-                                        8,
-                                      ),
-                                      child: Text(
-                                        widget.file.caption!,
-                                        overflow: TextOverflow.ellipsis,
-                                        maxLines: 1,
-                                        style: getEnteTextTheme(context)
-                                            .mini
-                                            .copyWith(
-                                              color: textBaseDark,
-                                            ),
-                                        textAlign: TextAlign.center,
-                                      ),
-                                    )
-                                  : const SizedBox.shrink(),
-                              ValueListenableBuilder(
-                                valueListenable: showControlsNotifier,
-                                builder: (context, value, _) {
-                                  return PreviewStatusWidget(
-                                    showControls: value,
-                                    file: widget.file,
-                                    onStreamChange: widget.onStreamChange,
-                                  );
-                                },
-                              ),
-                              _SeekBarAndDuration(
-                                controller: widget.controller,
-                                isSeekingNotifier: _isSeekingNotifier,
-                              ),
-                            ],
-                          ),
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            );
-          },
-        );
-      },
-    );
-  }
-}
-
-class PlayPauseButtonMediaKit extends StatefulWidget {
-  final VideoController? controller;
-  const PlayPauseButtonMediaKit(
-    this.controller, {
-    super.key,
-  });
-
-  @override
-  State<PlayPauseButtonMediaKit> createState() => _PlayPauseButtonState();
-}
-
-class _PlayPauseButtonState extends State<PlayPauseButtonMediaKit> {
-  bool _isPlaying = true;
-  late final StreamSubscription<bool>? isPlayingStreamSubscription;
-
-  @override
-  void initState() {
-    super.initState();
-
-    isPlayingStreamSubscription =
-        widget.controller?.player.stream.playing.listen((isPlaying) {
-      setState(() {
-        _isPlaying = isPlaying;
-      });
-    });
-  }
-
-  @override
-  void dispose() {
-    isPlayingStreamSubscription?.cancel();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      behavior: HitTestBehavior.opaque,
-      onTap: () {
-        if (widget.controller?.player.state.playing ?? false) {
-          widget.controller?.player.pause();
-        } else {
-          widget.controller?.player.play();
-        }
-      },
-      child: Container(
-        width: 54,
-        height: 54,
-        decoration: BoxDecoration(
-          color: Colors.black.withOpacity(0.3),
-          shape: BoxShape.circle,
-          border: Border.all(
-            color: strokeFaintDark,
-            width: 1,
-          ),
-        ),
-        child: AnimatedSwitcher(
-          duration: const Duration(milliseconds: 250),
-          transitionBuilder: (Widget child, Animation<double> animation) {
-            return ScaleTransition(scale: animation, child: child);
-          },
-          switchInCurve: Curves.easeInOutQuart,
-          switchOutCurve: Curves.easeInOutQuart,
-          child: _isPlaying
-              ? const Icon(
-                  Icons.pause,
-                  size: 32,
-                  key: ValueKey("pause"),
-                  color: Colors.white,
-                )
-              : const Icon(
-                  Icons.play_arrow,
-                  size: 36,
-                  key: ValueKey("play"),
-                  color: Colors.white,
-                ),
-        ),
-      ),
-    );
-  }
-}
-
-class _SeekBarAndDuration extends StatelessWidget {
-  final VideoController? controller;
-  final ValueNotifier<bool> isSeekingNotifier;
-
-  const _SeekBarAndDuration({
-    required this.controller,
-    required this.isSeekingNotifier,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(
-        horizontal: 8,
-      ),
-      child: Container(
-        padding: const EdgeInsets.fromLTRB(
-          16,
-          4,
-          16,
-          4,
-        ),
-        decoration: BoxDecoration(
-          color: Colors.black.withOpacity(0.3),
-          borderRadius: const BorderRadius.all(
-            Radius.circular(8),
-          ),
-          border: Border.all(
-            color: strokeFaintDark,
-            width: 1,
-          ),
-        ),
-        child: Row(
-          children: [
-            StreamBuilder(
-              stream: controller?.player.stream.position,
-              builder: (context, snapshot) {
-                if (snapshot.data == null) {
-                  return Text(
-                    "0:00",
-                    style: getEnteTextTheme(
-                      context,
-                    ).mini.copyWith(
-                          color: textBaseDark,
-                        ),
-                  );
-                }
-                return Text(
-                  secondsToDuration(snapshot.data!.inSeconds),
-                  style: getEnteTextTheme(
-                    context,
-                  ).mini.copyWith(
-                        color: textBaseDark,
-                      ),
-                );
-              },
-            ),
-            Expanded(
-              child: _SeekBar(
-                controller!,
-                isSeekingNotifier,
-              ),
-            ),
-            Text(
-              _secondsToDuration(
-                controller!.player.state.duration.inSeconds,
-              ),
-              style: getEnteTextTheme(
-                context,
-              ).mini.copyWith(
-                    color: textBaseDark,
-                  ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  /// Returns the duration in the format "h:mm:ss" or "m:ss".
-  String _secondsToDuration(int totalSeconds) {
-    final hours = totalSeconds ~/ 3600;
-    final minutes = (totalSeconds % 3600) ~/ 60;
-    final seconds = totalSeconds % 60;
-
-    if (hours > 0) {
-      return '${hours.toString().padLeft(1, '0')}:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}';
-    } else {
-      return '${minutes.toString().padLeft(1, '0')}:${seconds.toString().padLeft(2, '0')}';
-    }
-  }
-}
-
-class _SeekBar extends StatefulWidget {
-  final VideoController controller;
-  final ValueNotifier<bool> isSeekingNotifier;
-  const _SeekBar(
-    this.controller,
-    this.isSeekingNotifier,
-  );
-
-  @override
-  State<_SeekBar> createState() => _SeekBarState();
-}
-
-class _SeekBarState extends State<_SeekBar> {
-  double _sliderValue = 0.0;
-  late final StreamSubscription<Duration> _positionStreamSubscription;
-  final _debouncer = Debouncer(
-    const Duration(milliseconds: 300),
-    executionInterval: const Duration(milliseconds: 300),
-  );
-  @override
-  void initState() {
-    super.initState();
-    _positionStreamSubscription =
-        widget.controller.player.stream.position.listen((event) {
-      if (widget.isSeekingNotifier.value) return;
-      if (mounted) {
-        setState(() {
-          _sliderValue = event.inMilliseconds /
-              widget.controller.player.state.duration.inMilliseconds;
-          if (_sliderValue.isNaN) {
-            _sliderValue = 0.0;
-          }
-        });
-      }
-    });
-  }
-
-  @override
-  void dispose() {
-    _positionStreamSubscription.cancel();
-    _debouncer.cancelDebounceTimer();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final colorScheme = getEnteColorScheme(context);
-    return SliderTheme(
-      data: SliderTheme.of(context).copyWith(
-        trackHeight: 1.0,
-        thumbShape: const RoundSliderThumbShape(enabledThumbRadius: 8.0),
-        overlayShape: const RoundSliderOverlayShape(overlayRadius: 14.0),
-        activeTrackColor: colorScheme.primary300,
-        inactiveTrackColor: fillMutedDark,
-        thumbColor: backgroundElevatedLight,
-        overlayColor: fillMutedDark,
-      ),
-      child: Slider(
-        min: 0.0,
-        max: 1.0,
-        value: _sliderValue,
-        onChangeStart: (value) {
-          if (mounted) {
-            setState(() {
-              widget.isSeekingNotifier.value = true;
-            });
-          }
-        },
-        onChanged: (value) {
-          if (mounted) {
-            setState(() {
-              _sliderValue = value;
-            });
-          }
-
-          _debouncer.run(() async {
-            await widget.controller.player.seek(
-              Duration(
-                milliseconds: (value *
-                        widget.controller.player.state.duration.inMilliseconds)
-                    .round(),
-              ),
-            );
-          });
-        },
-        divisions: 4500,
-        onChangeEnd: (value) async {
-          await widget.controller.player.seek(
-            Duration(
-              milliseconds: (value *
-                      widget.controller.player.state.duration.inMilliseconds)
-                  .round(),
-            ),
-          );
-          if (mounted) {
-            setState(() {
-              widget.isSeekingNotifier.value = false;
-            });
-          }
-        },
-        allowedInteraction: SliderInteraction.tapAndSlide,
-      ),
-    );
-  }
-}
diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart
new file mode 100644
index 0000000000..39ff6e491f
--- /dev/null
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart
@@ -0,0 +1,172 @@
+import "dart:async";
+
+import "package:flutter/material.dart";
+import "package:fluttertoast/fluttertoast.dart";
+import "package:logging/logging.dart";
+import "package:media_kit/media_kit.dart";
+import "package:media_kit_video/media_kit_video.dart";
+import "package:photos/core/constants.dart";
+import "package:photos/core/event_bus.dart";
+import "package:photos/events/guest_view_event.dart";
+import "package:photos/events/pause_video_event.dart";
+import "package:photos/models/file/file.dart";
+import "package:photos/service_locator.dart";
+import "package:photos/services/filedata/filedata_service.dart";
+import "package:photos/services/preview_video_store.dart";
+import "package:photos/theme/colors.dart";
+import "package:photos/ui/actions/file/file_actions.dart";
+import "package:photos/ui/common/loading_widget.dart";
+import "package:photos/ui/viewer/file/video_widget_media_kit_common.dart"
+    as common;
+import "package:photos/utils/data_util.dart";
+import "package:photos/utils/file_util.dart";
+import "package:photos/utils/toast_util.dart";
+
+class VideoWidgetMediaKitPreview extends StatefulWidget {
+  final EnteFile file;
+  final String? tagPrefix;
+  final Function(bool)? playbackCallback;
+  final bool isFromMemories;
+  final void Function() onStreamChange;
+
+  const VideoWidgetMediaKitPreview(
+    this.file, {
+    this.tagPrefix,
+    this.playbackCallback,
+    this.isFromMemories = false,
+    required this.onStreamChange,
+    super.key,
+  });
+
+  @override
+  State<VideoWidgetMediaKitPreview> createState() =>
+      _VideoWidgetMediaKitPreviewState();
+}
+
+class _VideoWidgetMediaKitPreviewState extends State<VideoWidgetMediaKitPreview>
+    with WidgetsBindingObserver {
+  final Logger _logger = Logger("VideoWidgetMediaKitNew");
+  late final player = Player();
+  VideoController? controller;
+  final _progressNotifier = ValueNotifier<double?>(null);
+  bool _isAppInFG = true;
+  late StreamSubscription<PauseVideoEvent> pauseVideoSubscription;
+  bool isGuestView = false;
+  late final StreamSubscription<GuestViewEvent> _guestViewEventSubscription;
+  bool _isGuestView = false;
+
+  @override
+  void initState() {
+    _logger.info(
+      'initState for ${widget.file.generatedID} with tag ${widget.file.tag} and name ${widget.file.displayName}',
+    );
+    super.initState();
+    WidgetsBinding.instance.addObserver(this);
+    _checkForPreview();
+
+    pauseVideoSubscription = Bus.instance.on<PauseVideoEvent>().listen((event) {
+      player.pause();
+    });
+    _guestViewEventSubscription =
+        Bus.instance.on<GuestViewEvent>().listen((event) {
+      setState(() {
+        _isGuestView = event.isGuestView;
+      });
+    });
+  }
+
+  Future<void> _checkForPreview() async {
+    widget.playbackCallback?.call(false);
+    final data = await PreviewVideoStore.instance
+        .getPlaylist(widget.file)
+        .onError((error, stackTrace) {
+      if (!mounted) return;
+      _logger.warning("Failed to download preview video", error, stackTrace);
+      Fluttertoast.showToast(msg: "Failed to download preview!");
+      return null;
+    });
+    if (!mounted) return;
+    if (data != null) {
+      if (flagService.internalUser) {
+        final d =
+            FileDataService.instance.previewIds?[widget.file.uploadedFileID!];
+        if (d != null && widget.file.fileSize != null) {
+          // show toast with human readable size
+          final size = formatBytes(widget.file.fileSize!);
+          showToast(
+            context,
+            "[i] Preview OG Size ($size), previewSize: ${formatBytes(d.objectSize)}",
+          );
+        } else {
+          showShortToast(context, "Playing preview");
+        }
+      }
+      _setVideoController(data.preview.path);
+    }
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    if (state == AppLifecycleState.resumed) {
+      _isAppInFG = true;
+    } else {
+      _isAppInFG = false;
+    }
+  }
+
+  @override
+  void dispose() {
+    _guestViewEventSubscription.cancel();
+    pauseVideoSubscription.cancel();
+    removeCallBack(widget.file);
+    _progressNotifier.dispose();
+    WidgetsBinding.instance.removeObserver(this);
+    player.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onVerticalDragUpdate: _isGuestView
+          ? null
+          : (d) => {
+                if (d.delta.dy > dragSensitivity)
+                  {
+                    Navigator.of(context).pop(),
+                  }
+                else if (d.delta.dy < (dragSensitivity * -1))
+                  {
+                    showDetailsSheet(context, widget.file),
+                  },
+              },
+      child: Center(
+        child: controller != null
+            ? common.VideoWidget(
+                widget.file,
+                controller!,
+                widget.playbackCallback,
+                isFromMemories: widget.isFromMemories,
+                onStreamChange: widget.onStreamChange,
+              )
+            : const Center(
+                child: EnteLoadingWidget(
+                  size: 32,
+                  color: fillBaseDark,
+                  padding: 0,
+                ),
+              ),
+      ),
+    );
+  }
+
+  void _setVideoController(String url) {
+    if (mounted) {
+      setState(() {
+        player.setPlaylistMode(PlaylistMode.single);
+        controller = VideoController(player);
+        player.open(Media(url), play: _isAppInFG);
+      });
+    }
+  }
+}
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index 532ec80678..286c154ba7 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -1587,7 +1587,7 @@ packages:
     source: git
     version: "1.0.2"
   media_kit:
-    dependency: "direct overridden"
+    dependency: "direct main"
     description:
       path: media_kit
       ref: HEAD
@@ -1604,7 +1604,7 @@ packages:
     source: hosted
     version: "1.3.6"
   media_kit_libs_ios_video:
-    dependency: "direct overridden"
+    dependency: "direct main"
     description:
       path: "libs/ios/media_kit_libs_ios_video"
       ref: HEAD
@@ -1629,7 +1629,7 @@ packages:
     source: hosted
     version: "1.1.4"
   media_kit_libs_video:
-    dependency: "direct overridden"
+    dependency: "direct main"
     description:
       path: "libs/universal/media_kit_libs_video"
       ref: HEAD
@@ -1646,7 +1646,7 @@ packages:
     source: hosted
     version: "1.0.10"
   media_kit_video:
-    dependency: "direct overridden"
+    dependency: "direct main"
     description:
       path: media_kit_video
       ref: HEAD
@@ -2802,7 +2802,7 @@ packages:
     source: git
     version: "3.0.0"
   video_player:
-    dependency: "direct overridden"
+    dependency: "direct main"
     description:
       path: "packages/video_player/video_player"
       ref: android_video_roation_fix
@@ -2826,15 +2826,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.6.2"
-  video_player_media_kit:
-    dependency: "direct overridden"
-    description:
-      path: video_player_media_kit
-      ref: HEAD
-      resolved-ref: "3c4ff28c43d20e68f8d587956b2f525292c25a80"
-      url: "https://github.com/media-kit/media-kit"
-    source: git
-    version: "1.0.5"
   video_player_platform_interface:
     dependency: transitive
     description:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 7ad4a66164..d1179b13b3 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -120,6 +120,22 @@ dependencies:
     git:
       url: "https://github.com/ente-io/media_extension.git"
       ref: deeplink_fixes
+  media_kit:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: media_kit
+  media_kit_libs_ios_video:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: libs/ios/media_kit_libs_ios_video
+  media_kit_libs_video:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: libs/universal/media_kit_libs_video
+  media_kit_video:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: media_kit_video
   ml_linalg: ^13.11.31
   modal_bottom_sheet: ^3.0.0-pre
   motion_photos:
@@ -186,6 +202,11 @@ dependencies:
   video_editor:
     git:
       url: https://github.com/prateekmedia/video_editor.git
+  video_player:
+    git:
+      url: https://github.com/ente-io/packages.git
+      ref: android_video_roation_fix
+      path: packages/video_player/video_player/
   video_thumbnail: ^0.5.3
   visibility_detector: ^0.3.3
   wakelock_plus: ^1.1.1
@@ -200,32 +221,28 @@ dependency_overrides:
   # Newer flutter packages depends on ffi > 2.0.0 while flutter_sodium depends on ffi < 2.0.0
   ffi: 2.1.0
   intl: 0.18.1
+  js: ^0.6.7
   media_kit:
     git:
       url: https://github.com/media-kit/media-kit
       path: media_kit
-  media_kit_video:
-    git:
-      url: https://github.com/media-kit/media-kit
-      path: media_kit_video
-  media_kit_libs_video:
-    git:
-      url: https://github.com/media-kit/media-kit
-      path: libs/universal/media_kit_libs_video
   media_kit_libs_ios_video:
     git:
       url: https://github.com/media-kit/media-kit
       path: libs/ios/media_kit_libs_ios_video
+  media_kit_libs_video:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: libs/universal/media_kit_libs_video
+  media_kit_video:
+    git:
+      url: https://github.com/media-kit/media-kit
+      path: media_kit_video
   video_player:
     git:
       url: https://github.com/ente-io/packages.git
       ref: android_video_roation_fix
       path: packages/video_player/video_player/
-  video_player_media_kit:
-    git:
-      url: https://github.com/media-kit/media-kit
-      path: video_player_media_kit
-  js: ^0.6.7
   watcher: ^1.1.0
   win32: ^5.5.4
 

From 00028e3a100676cf99da2be4073cca260405140e Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prateekmedia@users.noreply.github.com>
Date: Thu, 20 Feb 2025 15:23:53 +0530
Subject: [PATCH 368/796] fix: queue addition logic

---
 mobile/lib/services/preview_video_store.dart | 33 +++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 7ba2e88fca..556eb5193e 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -73,11 +73,13 @@ class PreviewVideoStore {
 
   Future<void> setIsVideoStreamingEnabled(bool value) async {
     final oneMonthBack = DateTime.now().subtract(const Duration(days: 30));
-    await _prefs.setBool(_videoStreamingEnabled, value);
-    await _prefs.setInt(
-      _videoStreamingCutoff,
-      oneMonthBack.millisecondsSinceEpoch,
-    );
+    _prefs.setBool(_videoStreamingEnabled, value).ignore();
+    _prefs
+        .setInt(
+          _videoStreamingCutoff,
+          oneMonthBack.millisecondsSinceEpoch,
+        )
+        .ignore();
     Bus.instance.fire(VideoStreamingChanged());
 
     if (isVideoStreamingEnabled) {
@@ -663,23 +665,24 @@ class PreviewVideoStore {
     }).toList();
 
     // set all video status to in queue
-    for (final enteFile in allFiles) {
+    final n = allFiles.length;
+    for (int i = 0; i < n; i++) {
+      final enteFile = allFiles[i];
       // elimination case for <=10 MB with H.264
       final (_, result, _) = await _checkFileForPreviewCreation(enteFile);
       if (result) {
-        allFiles.remove(enteFile);
-        continue;
+        allFiles.removeAt(i);
+      } else {
+        _items[enteFile.uploadedFileID!] = PreviewItem(
+          status: PreviewItemStatus.inQueue,
+          file: enteFile,
+          collectionID: enteFile.collectionID ?? 0,
+        );
       }
-
-      _items[enteFile.uploadedFileID!] = PreviewItem(
-        status: PreviewItemStatus.inQueue,
-        file: enteFile,
-        collectionID: enteFile.collectionID ?? 0,
-      );
     }
     Bus.instance.fire(PreviewUpdatedEvent(_items));
 
-    _logger.info("[init] Processing ${_items.length} items for streaming");
+    _logger.info("[init] Processing ${allFiles.length} items for streaming");
 
     // take first file and put it for stream generation
     final file = allFiles.removeAt(0);

From 82df23a3b25a59ec13ac1a248a81e9f0db2b6950 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prateekmedia@users.noreply.github.com>
Date: Thu, 20 Feb 2025 15:24:09 +0530
Subject: [PATCH 369/796] fix: bump build number

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index d1179b13b3..7b9da3ccd5 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.99+1002
+version: 0.9.99+1003
 publish_to: none
 
 environment:

From 11c75dc5c8e4fbe1bd9c27e210a13af894bb4a63 Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Thu, 20 Feb 2025 16:58:27 +0530
Subject: [PATCH 370/796] [mob][photos] Log info

---
 .../people/person_selection_action_widgets.dart  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart b/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart
index ba9379f103..8898eb0d32 100644
--- a/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart
+++ b/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart
@@ -61,7 +61,8 @@ class _LinkContactToPersonSelectionPageState
             (person.data.isHidden || person.data.isIgnored)) {
           continue;
         }
-        final file = await PersonService.instance.getRecentFileOfPerson(person);
+        final file =
+            await PersonService.instance.getThumbnailFileOfPerson(person);
         result.add(PersonEntityWithThumbnailFile(person, file));
       }
       return result;
@@ -70,6 +71,7 @@ class _LinkContactToPersonSelectionPageState
 
   @override
   Widget build(BuildContext context) {
+    _logger.info("Building LinkContactToPersonSelectionPage");
     final smallFontSize = getEnteTextTheme(context).small.fontSize!;
     final textScaleFactor =
         MediaQuery.textScalerOf(context).scale(smallFontSize) / smallFontSize;
@@ -88,6 +90,10 @@ class _LinkContactToPersonSelectionPageState
           if (snapshot.connectionState == ConnectionState.waiting) {
             return const Center(child: EnteLoadingWidget());
           } else if (snapshot.hasError) {
+            _logger.severe(
+              "Failed to load _personEntitiesWithThumnailFile",
+              snapshot.error,
+            );
             return const Center(child: Icon(Icons.error_outline_rounded));
           } else if (!snapshot.hasData || snapshot.data!.isEmpty) {
             return Center(child: Text(S.of(context).noResultsFound + '.'));
@@ -229,7 +235,8 @@ class _ReassignMeSelectionPageState extends State<ReassignMeSelectionPage> {
             (person.data.isHidden || person.data.isIgnored)) {
           continue;
         }
-        final file = await PersonService.instance.getRecentFileOfPerson(person);
+        final file =
+            await PersonService.instance.getThumbnailFileOfPerson(person);
         result.add(PersonEntityWithThumbnailFile(person, file));
       }
       return result;
@@ -238,6 +245,7 @@ class _ReassignMeSelectionPageState extends State<ReassignMeSelectionPage> {
 
   @override
   Widget build(BuildContext context) {
+    _logger.info("Building ReassignMeSelectionPage");
     final smallFontSize = getEnteTextTheme(context).small.fontSize!;
     final textScaleFactor =
         MediaQuery.textScalerOf(context).scale(smallFontSize) / smallFontSize;
@@ -256,6 +264,10 @@ class _ReassignMeSelectionPageState extends State<ReassignMeSelectionPage> {
           if (snapshot.connectionState == ConnectionState.waiting) {
             return const Center(child: EnteLoadingWidget());
           } else if (snapshot.hasError) {
+            _logger.severe(
+              "Failed to load _personEntitiesWithThumnailFile",
+              snapshot.error,
+            );
             return const Center(child: Icon(Icons.error_outline_rounded));
           } else if (!snapshot.hasData || snapshot.data!.isEmpty) {
             return Center(child: Text(S.of(context).noResultsFound + '.'));

From bc699b8f373fa14a483d83b1af8932c88f5a7056 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 17:16:39 +0530
Subject: [PATCH 371/796] sys

---
 web/apps/photos/src/components/Sidebar.tsx | 27 +++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsx
index 65d0741edf..f868cd5ce9 100644
--- a/web/apps/photos/src/components/Sidebar.tsx
+++ b/web/apps/photos/src/components/Sidebar.tsx
@@ -20,7 +20,10 @@ import {
     type NestedSidebarDrawerVisibilityProps,
 } from "@/base/components/mui/SidebarDrawer";
 import { useIsSmallWidth } from "@/base/components/utils/hooks";
-import { useModalVisibility } from "@/base/components/utils/modal";
+import {
+    useModalVisibility,
+    type ModalVisibilityProps,
+} from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
 import { isDevBuild } from "@/base/env";
 import {
@@ -125,27 +128,25 @@ import exportService from "services/export";
 import { testUpload } from "../../tests/upload.test";
 import { SubscriptionCard } from "./SubscriptionCard";
 
-interface SidebarProps {
+type SidebarProps = ModalVisibilityProps & {
     collectionSummaries: CollectionSummaries;
-    sidebarView: boolean;
-    closeSidebar: () => void;
-}
+};
 
 export const Sidebar: React.FC<SidebarProps> = ({
+    open,
+    onClose,
     collectionSummaries,
-    sidebarView,
-    closeSidebar,
 }) => (
-    <RootSidebarDrawer open={sidebarView} onClose={closeSidebar}>
-        <HeaderSection closeSidebar={closeSidebar} />
-        <UserDetailsSection sidebarView={sidebarView} />
+    <RootSidebarDrawer open={open} onClose={onClose}>
+        <HeaderSection closeSidebar={onClose} />
+        <UserDetailsSection sidebarView={open} />
         <Stack sx={{ gap: 0.5, mb: 3 }}>
             <ShortcutSection
-                closeSidebar={closeSidebar}
+                closeSidebar={onClose}
                 collectionSummaries={collectionSummaries}
             />
-            <UtilitySection closeSidebar={closeSidebar} />
-            <HelpSection closeSidebar={closeSidebar} />
+            <UtilitySection closeSidebar={onClose} />
+            <HelpSection closeSidebar={onClose} />
             <Divider sx={{ my: "2px" }} />
             <ExitSection />
             <InfoSection />

From af676e610779c97299cd0a95fd0278c26889e621 Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Thu, 20 Feb 2025 17:20:41 +0530
Subject: [PATCH 372/796] [mob][photos] Refactor

---
 .../face_ml/person/person_service.dart        | 25 ++++++++++++-------
 mobile/lib/ui/sharing/user_avator_widget.dart |  2 +-
 .../result/search_thumbnail_widget.dart       |  2 +-
 .../viewer/search_tab/contacts_section.dart   |  2 +-
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/mobile/lib/services/machine_learning/face_ml/person/person_service.dart b/mobile/lib/services/machine_learning/face_ml/person/person_service.dart
index bca190786b..6b60a2ec1f 100644
--- a/mobile/lib/services/machine_learning/face_ml/person/person_service.dart
+++ b/mobile/lib/services/machine_learning/face_ml/person/person_service.dart
@@ -4,6 +4,7 @@ import "dart:developer";
 import "package:flutter/foundation.dart";
 import "package:logging/logging.dart";
 import "package:photos/core/event_bus.dart";
+import "package:photos/db/files_db.dart";
 import "package:photos/db/ml/db.dart";
 import "package:photos/events/people_changed_event.dart";
 import "package:photos/extensions/stop_watch.dart";
@@ -483,25 +484,31 @@ class PersonService {
     }
   }
 
-  Future<EnteFile> getRecentFileOfPerson(
+  Future<EnteFile> getThumbnailFileOfPerson(
     PersonEntity person,
   ) async {
+    if (person.data.hasAvatar()) {
+      final avatarFileID = tryGetFileIdFromFaceId(person.data.avatarFaceID!);
+      if (avatarFileID != null) {
+        final file = (await FilesDB.instance
+            .getFileIDToFileFromIDs([avatarFileID]))[avatarFileID];
+        if (file != null) {
+          return file;
+        } else {
+          logger.severe("Avatar File not found for face ${person.data}");
+        }
+      }
+    }
+
     final clustersToFiles =
         await SearchService.instance.getClusterFilesForPersonID(
       person.remoteID,
     );
-    int? avatarFileID;
-    if (person.data.hasAvatar()) {
-      avatarFileID = tryGetFileIdFromFaceId(person.data.avatarFaceID!);
-    }
+
     EnteFile? resultFile;
     // iterate over all clusters and get the first file
     for (final clusterFiles in clustersToFiles.values) {
       for (final file in clusterFiles) {
-        if (avatarFileID != null && file.uploadedFileID! == avatarFileID) {
-          resultFile = file;
-          break;
-        }
         resultFile ??= file;
         if (resultFile.creationTime! < file.creationTime!) {
           resultFile = file;
diff --git a/mobile/lib/ui/sharing/user_avator_widget.dart b/mobile/lib/ui/sharing/user_avator_widget.dart
index a69430a953..96af5ccbfc 100644
--- a/mobile/lib/ui/sharing/user_avator_widget.dart
+++ b/mobile/lib/ui/sharing/user_avator_widget.dart
@@ -80,7 +80,7 @@ class _UserAvatarWidgetState extends State<UserAvatarWidget> {
             );
             if (person != null) {
               _faceThumbnail =
-                  await PersonService.instance.getRecentFileOfPerson(person);
+                  await PersonService.instance.getThumbnailFileOfPerson(person);
             }
             return person?.remoteID;
           });
diff --git a/mobile/lib/ui/viewer/search/result/search_thumbnail_widget.dart b/mobile/lib/ui/viewer/search/result/search_thumbnail_widget.dart
index ec0be2f447..aa0b6dc6d0 100644
--- a/mobile/lib/ui/viewer/search/result/search_thumbnail_widget.dart
+++ b/mobile/lib/ui/viewer/search/result/search_thumbnail_widget.dart
@@ -89,7 +89,7 @@ class _ContactSearchThumbnailWidgetState
         if (person == null) {
           return null;
         } else {
-          return PersonService.instance.getRecentFileOfPerson(person);
+          return PersonService.instance.getThumbnailFileOfPerson(person);
         }
       });
     }
diff --git a/mobile/lib/ui/viewer/search_tab/contacts_section.dart b/mobile/lib/ui/viewer/search_tab/contacts_section.dart
index d92a314684..bc751fbfa4 100644
--- a/mobile/lib/ui/viewer/search_tab/contacts_section.dart
+++ b/mobile/lib/ui/viewer/search_tab/contacts_section.dart
@@ -163,7 +163,7 @@ class _ContactRecommendationState extends State<ContactRecommendation> {
         if (person == null) {
           return null;
         } else {
-          return PersonService.instance.getRecentFileOfPerson(person);
+          return PersonService.instance.getThumbnailFileOfPerson(person);
         }
       });
     }

From 35601956d2a5a113fbdec8bef9580f5dfe4c0598 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 17:23:51 +0530
Subject: [PATCH 373/796] Use

---
 web/apps/photos/src/components/Sidebar.tsx | 102 ++++++++++-----------
 web/apps/photos/src/pages/gallery.tsx      |  60 ++++++------
 2 files changed, 79 insertions(+), 83 deletions(-)

diff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsx
index f868cd5ce9..b5e2b7e936 100644
--- a/web/apps/photos/src/components/Sidebar.tsx
+++ b/web/apps/photos/src/components/Sidebar.tsx
@@ -129,6 +129,12 @@ import { testUpload } from "../../tests/upload.test";
 import { SubscriptionCard } from "./SubscriptionCard";
 
 type SidebarProps = ModalVisibilityProps & {
+    /**
+     * The latest UI collections.
+     *
+     * These are used to obtain data about the uncategorized, hidden and other
+     * items shown in the shortcut section within the sidebar.
+     */
     collectionSummaries: CollectionSummaries;
 };
 
@@ -138,15 +144,15 @@ export const Sidebar: React.FC<SidebarProps> = ({
     collectionSummaries,
 }) => (
     <RootSidebarDrawer open={open} onClose={onClose}>
-        <HeaderSection closeSidebar={onClose} />
-        <UserDetailsSection sidebarView={open} />
+        <HeaderSection onCloseSidebar={onClose} />
+        <UserDetailsSection sidebarOpen={open} />
         <Stack sx={{ gap: 0.5, mb: 3 }}>
             <ShortcutSection
-                closeSidebar={onClose}
+                onCloseSidebar={onClose}
                 collectionSummaries={collectionSummaries}
             />
-            <UtilitySection closeSidebar={onClose} />
-            <HelpSection closeSidebar={onClose} />
+            <UtilitySection onCloseSidebar={onClose} />
+            <HelpSection onCloseSidebar={onClose} />
             <Divider sx={{ my: "2px" }} />
             <ExitSection />
             <InfoSection />
@@ -160,31 +166,29 @@ const RootSidebarDrawer = styled(SidebarDrawer)(({ theme }) => ({
     },
 }));
 
-interface HeaderSectionProps {
-    closeSidebar: () => void;
+interface SectionProps {
+    onCloseSidebar: SidebarProps["onClose"];
 }
 
-const HeaderSection: React.FC<HeaderSectionProps> = ({ closeSidebar }) => {
-    return (
-        <SpacedRow sx={{ my: "4px 4px", pl: "12px" }}>
-            <EnteLogo />
-            <IconButton
-                aria-label={t("close")}
-                onClick={closeSidebar}
-                color="secondary"
-            >
-                <CloseIcon fontSize="small" />
-            </IconButton>
-        </SpacedRow>
-    );
-};
+const HeaderSection: React.FC<SectionProps> = ({ onCloseSidebar }) => (
+    <SpacedRow sx={{ my: "4px 4px", pl: "12px" }}>
+        <EnteLogo />
+        <IconButton
+            aria-label={t("close")}
+            onClick={onCloseSidebar}
+            color="secondary"
+        >
+            <CloseIcon fontSize="small" />
+        </IconButton>
+    </SpacedRow>
+);
 
 interface UserDetailsSectionProps {
-    sidebarView: boolean;
+    sidebarOpen: boolean;
 }
 
 const UserDetailsSection: React.FC<UserDetailsSectionProps> = ({
-    sidebarView,
+    sidebarOpen,
 }) => {
     const galleryContext = useContext(GalleryContext);
     const userDetails = useUserDetailsSnapshot();
@@ -197,8 +201,8 @@ const UserDetailsSection: React.FC<UserDetailsSectionProps> = ({
         setMemberSubscriptionManageView(false);
 
     useEffect(() => {
-        if (sidebarView) void syncUserDetails();
-    }, [sidebarView]);
+        if (sidebarOpen) void syncUserDetails();
+    }, [sidebarOpen]);
 
     const isNonAdminFamilyMember = useMemo(
         () =>
@@ -417,13 +421,12 @@ function MemberSubscriptionManage({ open, userDetails, onClose }) {
     );
 }
 
-interface ShortcutSectionProps {
-    closeSidebar: () => void;
-    collectionSummaries: CollectionSummaries;
-}
+type ShortcutSectionProps = SectionProps & {
+    collectionSummaries: SidebarProps["collectionSummaries"];
+};
 
 const ShortcutSection: React.FC<ShortcutSectionProps> = ({
-    closeSidebar,
+    onCloseSidebar,
     collectionSummaries,
 }) => {
     const galleryContext = useContext(GalleryContext);
@@ -431,35 +434,31 @@ const ShortcutSection: React.FC<ShortcutSectionProps> = ({
         useState<number>();
 
     useEffect(() => {
-        const main = async () => {
-            const unCategorizedCollection = await getUncategorizedCollection();
-            if (unCategorizedCollection) {
-                setUncategorizedCollectionID(unCategorizedCollection.id);
-            } else {
-                setUncategorizedCollectionID(DUMMY_UNCATEGORIZED_COLLECTION);
-            }
-        };
-        main();
+        void getUncategorizedCollection().then((uncat) =>
+            setUncategorizedCollectionID(
+                uncat?.id ?? DUMMY_UNCATEGORIZED_COLLECTION,
+            ),
+        );
     }, []);
 
     const openUncategorizedSection = () => {
         galleryContext.setActiveCollectionID(uncategorizedCollectionId);
-        closeSidebar();
+        onCloseSidebar();
     };
 
     const openTrashSection = () => {
         galleryContext.setActiveCollectionID(TRASH_SECTION);
-        closeSidebar();
+        onCloseSidebar();
     };
 
     const openArchiveSection = () => {
         galleryContext.setActiveCollectionID(ARCHIVE_SECTION);
-        closeSidebar();
+        onCloseSidebar();
     };
 
     const openHiddenSection = () => {
         galleryContext.openHiddenSection(() => {
-            closeSidebar();
+            onCloseSidebar();
         });
     };
 
@@ -506,12 +505,11 @@ const ShortcutSection: React.FC<ShortcutSectionProps> = ({
     );
 };
 
-const UtilitySection: React.FC<Pick<SidebarProps, "closeSidebar">> = ({
-    closeSidebar,
-}) => {
-    const router = useRouter();
+const UtilitySection: React.FC<SectionProps> = ({ onCloseSidebar }) => {
     const { watchFolderView, setWatchFolderView } = usePhotosAppContext();
 
+    const router = useRouter();
+
     const { show: showAccount, props: accountVisibilityProps } =
         useModalVisibility();
     const { show: showPreferences, props: preferencesVisibilityProps } =
@@ -552,18 +550,16 @@ const UtilitySection: React.FC<Pick<SidebarProps, "closeSidebar">> = ({
                     onClose={handleCloseWatchFolder}
                 />
             )}
-            <Account {...accountVisibilityProps} onRootClose={closeSidebar} />
+            <Account {...accountVisibilityProps} onRootClose={onCloseSidebar} />
             <Preferences
                 {...preferencesVisibilityProps}
-                onRootClose={closeSidebar}
+                onRootClose={onCloseSidebar}
             />
         </>
     );
 };
 
-const HelpSection: React.FC<Pick<SidebarProps, "closeSidebar">> = ({
-    closeSidebar,
-}) => {
+const HelpSection: React.FC<SectionProps> = ({ onCloseSidebar }) => {
     const { showMiniDialog } = useBaseContext();
     const { openExportModal } = useContext(GalleryContext);
 
@@ -591,7 +587,7 @@ const HelpSection: React.FC<Pick<SidebarProps, "closeSidebar">> = ({
                 }
                 onClick={handleExport}
             />
-            <Help {...helpVisibilityProps} onRootClose={closeSidebar} />
+            <Help {...helpVisibilityProps} onRootClose={onCloseSidebar} />
         </>
     );
 };
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 2f691ddef7..7d82d4c04f 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -208,11 +208,6 @@ const Page: React.FC = () => {
     const [uploadTypeSelectorIntent, setUploadTypeSelectorIntent] =
         useState<UploadTypeSelectorIntent>("upload");
 
-    const [sidebarView, setSidebarView] = useState(false);
-
-    const closeSidebar = () => setSidebarView(false);
-    const openSidebar = () => setSidebarView(true);
-
     const [authenticateUserModalView, setAuthenticateUserModalView] =
         useState(false);
 
@@ -249,6 +244,8 @@ const Page: React.FC = () => {
     const [collectionSelectorAttributes, setCollectionSelectorAttributes] =
         useState<CollectionSelectorAttributes | undefined>();
 
+    const { show: showSidebar, props: sidebarVisibilityProps } =
+        useModalVisibility();
     const { show: showPlanSelector, props: planSelectorVisibilityProps } =
         useModalVisibility();
     const { show: showWhatsNew, props: whatsNewVisibilityProps } =
@@ -447,10 +444,10 @@ const Page: React.FC = () => {
         }
         // if any of the modals are open, don't select all
         if (
-            sidebarView ||
             uploadTypeSelectorView ||
             openCollectionSelector ||
             collectionNamerView ||
+            sidebarVisibilityProps.open ||
             planSelectorVisibilityProps.open ||
             fixCreationTimeVisibilityProps.open ||
             exportVisibilityProps.open ||
@@ -927,21 +924,19 @@ const Page: React.FC = () => {
                         />
                     ) : (
                         <NormalNavbarContents
-                            {...{
-                                openSidebar,
-                                openUploader,
-                                isInSearchMode,
-                                onShowSearchInput: () =>
-                                    dispatch({ type: "enterSearchMode" }),
-                                onSelectSearchOption: handleSelectSearchOption,
-                                onSelectPeople: () =>
-                                    dispatch({ type: "showPeople" }),
-                                onSelectPerson: (personID) =>
-                                    dispatch({
-                                        type: "showPerson",
-                                        personID,
-                                    }),
-                            }}
+                            {...{ isInSearchMode }}
+                            onSidebar={showSidebar}
+                            onUpload={openUploader}
+                            onShowSearchInput={() =>
+                                dispatch({ type: "enterSearchMode" })
+                            }
+                            onSelectSearchOption={handleSelectSearchOption}
+                            onSelectPeople={() =>
+                                dispatch({ type: "showPeople" })
+                            }
+                            onSelectPerson={(personID) =>
+                                dispatch({ type: "showPerson", personID })
+                            }
                         />
                     )}
                 </NavbarBase>
@@ -1002,9 +997,8 @@ const Page: React.FC = () => {
                     }}
                 />
                 <Sidebar
-                    collectionSummaries={collectionSummaries}
-                    sidebarView={sidebarView}
-                    closeSidebar={closeSidebar}
+                    {...sidebarVisibilityProps}
+                    {...{ collectionSummaries }}
                 />
                 <WhatsNew {...whatsNewVisibilityProps} />
                 {!isInSearchMode &&
@@ -1099,19 +1093,25 @@ const preloadImage = (imgBasePath: string) => {
 };
 
 type NormalNavbarContentsProps = SearchBarProps & {
-    openSidebar: () => void;
-    openUploader: () => void;
+    /**
+     * Called when the user activates the sidebar icon.
+     */
+    onSidebar: () => void;
+    /**
+     * Called when the user activates the upload button.
+     */
+    onUpload: () => void;
 };
 
 const NormalNavbarContents: React.FC<NormalNavbarContentsProps> = ({
-    openSidebar,
-    openUploader,
+    onSidebar,
+    onUpload,
     ...props
 }) => (
     <>
-        {!props.isInSearchMode && <SidebarButton onClick={openSidebar} />}
+        {!props.isInSearchMode && <SidebarButton onClick={onSidebar} />}
         <SearchBar {...props} />
-        {!props.isInSearchMode && <UploadButton onClick={openUploader} />}
+        {!props.isInSearchMode && <UploadButton onClick={onUpload} />}
     </>
 );
 

From d2764fe7e15b8f50b896951291d02e4052c6e5f4 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prateekmedia@users.noreply.github.com>
Date: Thu, 20 Feb 2025 17:33:13 +0530
Subject: [PATCH 374/796] chore: delete redundant files

---
 .../ui/viewer/file/preview_video_widget.dart  | 266 -----------
 mobile/lib/ui/viewer/file/video_control.dart  | 449 ------------------
 2 files changed, 715 deletions(-)
 delete mode 100644 mobile/lib/ui/viewer/file/preview_video_widget.dart
 delete mode 100644 mobile/lib/ui/viewer/file/video_control.dart

diff --git a/mobile/lib/ui/viewer/file/preview_video_widget.dart b/mobile/lib/ui/viewer/file/preview_video_widget.dart
deleted file mode 100644
index e6ab5020c7..0000000000
--- a/mobile/lib/ui/viewer/file/preview_video_widget.dart
+++ /dev/null
@@ -1,266 +0,0 @@
-// import 'dart:async';
-// import "dart:io";
-
-// import 'package:chewie/chewie.dart';
-// import 'package:flutter/cupertino.dart';
-// import 'package:flutter/material.dart';
-// import "package:fluttertoast/fluttertoast.dart";
-// import "package:logging/logging.dart";
-// import 'package:photos/core/constants.dart';
-// import "package:photos/core/event_bus.dart";
-// import "package:photos/events/guest_view_event.dart";
-// import 'package:photos/models/file/file.dart';
-// import "package:photos/service_locator.dart";
-// import "package:photos/services/filedata/filedata_service.dart";
-// import "package:photos/services/preview_video_store.dart";
-// import "package:photos/ui/actions/file/file_actions.dart";
-// import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
-// import "package:photos/ui/viewer/file/video_control.dart";
-// import "package:photos/utils/data_util.dart";
-// // import 'package:photos/ui/viewer/file/video_controls.dart';
-// import "package:photos/utils/dialog_util.dart";
-// import 'package:photos/utils/file_util.dart';
-// import 'package:photos/utils/toast_util.dart';
-// import "package:photos/utils/wakelock_util.dart";
-// import 'package:video_player/video_player.dart';
-// import 'package:visibility_detector/visibility_detector.dart';
-
-// class PreviewVideoWidget extends StatefulWidget {
-//   final EnteFile file;
-//   final bool? autoPlay;
-//   final String? tagPrefix;
-//   final Function(bool)? playbackCallback;
-//   final void Function()? onStreamChange;
-
-//   const PreviewVideoWidget(
-//     this.file, {
-//     this.autoPlay = true,
-//     this.tagPrefix,
-//     this.playbackCallback,
-//     this.onStreamChange,
-//     super.key,
-//   });
-
-//   @override
-//   State<PreviewVideoWidget> createState() => _PreviewVideoWidgetState();
-// }
-
-// class _PreviewVideoWidgetState extends State<PreviewVideoWidget> {
-//   final _logger = Logger("PreviewVideoWidget");
-//   VideoPlayerController? _videoPlayerController;
-//   ChewieController? _chewieController;
-//   final _progressNotifier = ValueNotifier<double?>(null);
-//   bool _isPlaying = false;
-//   final EnteWakeLock _wakeLock = EnteWakeLock();
-//   bool _isFileSwipeLocked = false;
-//   late final StreamSubscription<GuestViewEvent> _fileSwipeLockEventSubscription;
-//   File? previewFile;
-
-//   @override
-//   void initState() {
-//     super.initState();
-
-//     _checkForPreview();
-//     _fileSwipeLockEventSubscription =
-//         Bus.instance.on<GuestViewEvent>().listen((event) {
-//       setState(() {
-//         _isFileSwipeLocked = event.swipeLocked;
-//       });
-//     });
-//   }
-
-//   @override
-//   void dispose() {
-//     _fileSwipeLockEventSubscription.cancel();
-//     removeCallBack(widget.file);
-//     _videoPlayerController?.dispose();
-//     _chewieController?.dispose();
-//     _progressNotifier.dispose();
-//     _wakeLock.dispose();
-//     super.dispose();
-//   }
-
-//   Future<void> _checkForPreview() async {
-//     final data = await PreviewVideoStore.instance
-//         .getPlaylist(widget.file)
-//         .onError((error, stackTrace) {
-//       if (!mounted) return;
-//       _logger.warning("Failed to download preview video", error, stackTrace);
-//       Fluttertoast.showToast(msg: "Failed to download preview!");
-//       return null;
-//     });
-//     if (!mounted) return;
-//     if (data != null) {
-//       if (flagService.internalUser) {
-//         final d =
-//             FileDataService.instance.previewIds?[widget.file.uploadedFileID!];
-//         if (d != null && widget.file.fileSize != null) {
-//           // show toast with human readable size
-//           final size = formatBytes(widget.file.fileSize!);
-//           showToast(
-//             context,
-//             "Preview OG Size ($size), previewSize: ${formatBytes(d.objectSize)}",
-//           );
-//         } else {
-//           showShortToast(context, "Playing preview");
-//         }
-//       }
-//       previewFile = data.preview;
-//       _setVideoPlayerController();
-//     }
-//   }
-
-//   void _setVideoPlayerController() {
-//     if (!mounted) {
-//       // Note: Do not initiale video player if widget is not mounted.
-//       // On Android, if multiple instance of ExoPlayer is created, it will start
-//       // resulting in playback errors for videos. See https://github.com/google/ExoPlayer/issues/6168
-//       return;
-//     }
-//     VideoPlayerController videoPlayerController;
-//     videoPlayerController = VideoPlayerController.file(previewFile!);
-
-//     debugPrint("videoPlayerController: $videoPlayerController");
-//     _videoPlayerController = videoPlayerController
-//       ..initialize().whenComplete(() {
-//         if (mounted) {
-//           setState(() {});
-//         }
-//       }).onError(
-//         (error, stackTrace) {
-//           if (mounted && flagService.internalUser) {
-//             if (error is Exception) {
-//               showErrorDialogForException(
-//                 context: context,
-//                 exception: error,
-//                 message: "Failed to play video\n ${error.toString()}",
-//               );
-//             } else {
-//               showToast(context, "Failed to play video");
-//             }
-//           }
-//         },
-//       );
-//   }
-
-//   @override
-//   Widget build(BuildContext context) {
-//     final content = _videoPlayerController != null &&
-//             _videoPlayerController!.value.isInitialized
-//         ? _getVideoPlayer()
-//         : _getLoadingWidget();
-//     final contentWithDetector = GestureDetector(
-//       onVerticalDragUpdate: _isFileSwipeLocked
-//           ? null
-//           : (d) => {
-//                 if (d.delta.dy > dragSensitivity)
-//                   {
-//                     Navigator.of(context).pop(),
-//                   }
-//                 else if (d.delta.dy < (dragSensitivity * -1))
-//                   {
-//                     showDetailsSheet(context, widget.file),
-//                   },
-//               },
-//       child: content,
-//     );
-//     return VisibilityDetector(
-//       key: Key(widget.file.tag),
-//       onVisibilityChanged: (info) {
-//         if (info.visibleFraction < 1) {
-//           if (mounted && _chewieController != null) {
-//             _chewieController!.pause();
-//           }
-//         }
-//       },
-//       child: Hero(
-//         tag: widget.tagPrefix! + widget.file.tag,
-//         child: contentWithDetector,
-//       ),
-//     );
-//   }
-
-//   Widget _getLoadingWidget() {
-//     return Stack(
-//       children: [
-//         _getThumbnail(),
-//         Container(
-//           color: Colors.black12,
-//           constraints: const BoxConstraints.expand(),
-//         ),
-//         Center(
-//           child: SizedBox.fromSize(
-//             size: const Size.square(20),
-//             child: ValueListenableBuilder(
-//               valueListenable: _progressNotifier,
-//               builder: (BuildContext context, double? progress, _) {
-//                 return progress == null || progress == 1
-//                     ? const CupertinoActivityIndicator(
-//                         color: Colors.white,
-//                       )
-//                     : CircularProgressIndicator(
-//                         backgroundColor: Colors.black,
-//                         value: progress,
-//                         valueColor: const AlwaysStoppedAnimation<Color>(
-//                           Color.fromRGBO(45, 194, 98, 1.0),
-//                         ),
-//                       );
-//               },
-//             ),
-//           ),
-//         ),
-//       ],
-//     );
-//   }
-
-//   Widget _getThumbnail() {
-//     return Container(
-//       color: Colors.black,
-//       constraints: const BoxConstraints.expand(),
-//       child: ThumbnailWidget(
-//         widget.file,
-//         fit: BoxFit.contain,
-//       ),
-//     );
-//   }
-
-//   Future<void> _keepScreenAliveOnPlaying(bool isPlaying) async {
-//     if (isPlaying) {
-//       _wakeLock.enable();
-//     }
-//     if (!isPlaying) {
-//       _wakeLock.disable();
-//     }
-//   }
-
-//   Widget _getVideoPlayer() {
-//     _videoPlayerController!.addListener(() {
-//       if (_isPlaying != _videoPlayerController!.value.isPlaying) {
-//         _isPlaying = _videoPlayerController!.value.isPlaying;
-//         if (widget.playbackCallback != null) {
-//           widget.playbackCallback!(_isPlaying);
-//         }
-//         unawaited(_keepScreenAliveOnPlaying(_isPlaying));
-//       }
-//     });
-//     _chewieController = ChewieController(
-//       progressIndicatorDelay: const Duration(milliseconds: 200),
-//       videoPlayerController: _videoPlayerController!,
-//       aspectRatio: _videoPlayerController!.value.aspectRatio,
-//       autoPlay: widget.autoPlay!,
-//       autoInitialize: true,
-//       looping: true,
-//       allowMuting: true,
-//       allowFullScreen: false,
-//       customControls: VideoControls(
-//         file: widget.file,
-//         onStreamChange: widget.onStreamChange,
-//         playbackCallback: widget.playbackCallback,
-//       ),
-//     );
-//     return Container(
-//       color: Colors.black,
-//       child: Chewie(controller: _chewieController!),
-//     );
-//   }
-// }
diff --git a/mobile/lib/ui/viewer/file/video_control.dart b/mobile/lib/ui/viewer/file/video_control.dart
deleted file mode 100644
index b6cfca4ba4..0000000000
--- a/mobile/lib/ui/viewer/file/video_control.dart
+++ /dev/null
@@ -1,449 +0,0 @@
-// // ignore_for_file: implementation_imports
-
-// import 'dart:async';
-
-// import "package:chewie/chewie.dart";
-// import "package:chewie/src/notifiers/index.dart";
-// import 'package:flutter/material.dart';
-// import "package:photos/models/file/file.dart";
-// import "package:photos/theme/colors.dart";
-// import "package:photos/theme/ente_theme.dart";
-// import "package:photos/ui/common/loading_widget.dart";
-// import "package:photos/ui/viewer/file/preview_status_widget.dart";
-// import "package:photos/ui/viewer/file/video_control/custom_progress_bar.dart";
-// import "package:photos/utils/seconds_to_duration.dart";
-// import 'package:provider/provider.dart';
-// import 'package:video_player/video_player.dart';
-
-// class VideoControls extends StatefulWidget {
-//   const VideoControls({
-//     super.key,
-//     required this.file,
-//     required this.onStreamChange,
-//     required this.playbackCallback,
-//   });
-//   final EnteFile file;
-//   final void Function()? onStreamChange;
-//   final void Function(bool)? playbackCallback;
-
-//   @override
-//   State<StatefulWidget> createState() {
-//     return _VideoControlsState();
-//   }
-// }
-
-// class _VideoControlsState extends State<VideoControls>
-//     with SingleTickerProviderStateMixin {
-//   late PlayerNotifier notifier;
-//   late VideoPlayerValue _latestValue;
-//   Timer? _hideTimer;
-//   Timer? _initTimer;
-//   Timer? _showAfterExpandCollapseTimer;
-//   bool _dragging = false;
-//   bool _displayTapped = false;
-//   Timer? _bufferingDisplayTimer;
-//   bool _displayBufferingIndicator = false;
-
-//   final barHeight = 48.0 * 1.5;
-//   final marginSize = 5.0;
-
-//   late VideoPlayerController controller;
-//   ChewieController? _chewieController;
-
-//   // We know that _chewieController is set in didChangeDependencies
-//   ChewieController get chewieController => _chewieController!;
-
-//   @override
-//   void initState() {
-//     super.initState();
-//     notifier = Provider.of<PlayerNotifier>(context, listen: false);
-//   }
-
-//   @override
-//   Widget build(BuildContext context) {
-//     if (_latestValue.hasError) {
-//       return chewieController.errorBuilder?.call(
-//             context,
-//             chewieController.videoPlayerController.value.errorDescription!,
-//           ) ??
-//           Center(
-//             child: Icon(
-//               Icons.error,
-//               color: Theme.of(context).colorScheme.onSurface,
-//               size: 42,
-//             ),
-//           );
-//     }
-
-//     return MouseRegion(
-//       onHover: (_) {
-//         _cancelAndRestartTimer();
-//       },
-//       child: GestureDetector(
-//         onTap: () => _cancelAndRestartTimer(),
-//         child: AbsorbPointer(
-//           absorbing: notifier.hideStuff,
-//           child: Stack(
-//             children: [
-//               if (_displayBufferingIndicator)
-//                 _chewieController?.bufferingBuilder?.call(context) ??
-//                     const Center(
-//                       child: EnteLoadingWidget(
-//                         size: 32,
-//                         color: fillBaseDark,
-//                         padding: 0,
-//                       ),
-//                     )
-//               else
-//                 _buildHitArea(),
-//               SafeArea(
-//                 top: false,
-//                 left: false,
-//                 right: false,
-//                 child: Column(
-//                   mainAxisAlignment: MainAxisAlignment.end,
-//                   children: <Widget>[
-//                     PreviewStatusWidget(
-//                       showControls: !notifier.hideStuff,
-//                       file: widget.file,
-//                       isPreviewPlayer: true,
-//                       onStreamChange: widget.onStreamChange,
-//                     ),
-//                     if (!chewieController.isLive) _buildBottomBar(context),
-//                   ],
-//                 ),
-//               ),
-//             ],
-//           ),
-//         ),
-//       ),
-//     );
-//   }
-
-//   @override
-//   void dispose() {
-//     _dispose();
-//     super.dispose();
-//   }
-
-//   void _dispose() {
-//     controller.removeListener(_updateState);
-//     _hideTimer?.cancel();
-//     _initTimer?.cancel();
-//     _showAfterExpandCollapseTimer?.cancel();
-//   }
-
-//   @override
-//   void didChangeDependencies() {
-//     final oldController = _chewieController;
-//     _chewieController = ChewieController.of(context);
-//     controller = chewieController.videoPlayerController;
-
-//     if (oldController != chewieController) {
-//       _dispose();
-//       _initialize();
-//     }
-
-//     super.didChangeDependencies();
-//   }
-
-//   AnimatedOpacity _buildBottomBar(
-//     BuildContext context,
-//   ) {
-//     return AnimatedOpacity(
-//       opacity: notifier.hideStuff ? 0.0 : 1.0,
-//       duration: const Duration(milliseconds: 300),
-//       child: Container(
-//         height: 40,
-//         margin: const EdgeInsets.only(bottom: 60, left: 8, right: 8),
-//         child: Container(
-//           padding: const EdgeInsets.fromLTRB(
-//             16,
-//             4,
-//             16,
-//             4,
-//           ),
-//           decoration: BoxDecoration(
-//             color: Colors.black.withOpacity(0.3),
-//             borderRadius: const BorderRadius.all(
-//               Radius.circular(8),
-//             ),
-//             border: Border.all(
-//               color: strokeFaintDark,
-//               width: 1,
-//             ),
-//           ),
-//           child: Row(
-//             children: [
-//               Text(
-//                 secondsToDuration(_latestValue.position.inSeconds),
-//                 style: getEnteTextTheme(
-//                   context,
-//                 ).mini.copyWith(
-//                       color: textBaseDark,
-//                     ),
-//               ),
-//               const SizedBox(width: 16),
-//               Expanded(
-//                 child: _buildProgressBar(),
-//               ),
-//               const SizedBox(width: 16),
-//               Text(
-//                 secondsToDuration(_latestValue.duration.inSeconds),
-//                 style: getEnteTextTheme(
-//                   context,
-//                 ).mini.copyWith(
-//                       color: textBaseDark,
-//                     ),
-//               ),
-//             ],
-//           ),
-//         ),
-//       ),
-//     );
-//   }
-
-//   Widget _buildHitArea() {
-//     final bool isFinished = (_latestValue.position >= _latestValue.duration) &&
-//         _latestValue.duration.inSeconds > 0;
-//     final bool showPlayButton = true && !_dragging && !notifier.hideStuff;
-
-//     return GestureDetector(
-//       onTap: () {
-//         if (_latestValue.isPlaying) {
-//           if (_displayTapped) {
-//             setState(() {
-//               notifier.hideStuff = true;
-//             });
-//           } else {
-//             _cancelAndRestartTimer();
-//           }
-//         } else {
-//           setState(() {
-//             notifier.hideStuff = true;
-//           });
-//         }
-//         widget.playbackCallback?.call(notifier.hideStuff);
-//       },
-//       child: Container(
-//         alignment: Alignment.center,
-//         color: Colors.transparent,
-//         child: Row(
-//           mainAxisAlignment: MainAxisAlignment.center,
-//           children: [
-//             Container(
-//               margin: EdgeInsets.symmetric(
-//                 horizontal: marginSize,
-//               ),
-//               child: CenterPlayButton(
-//                 backgroundColor: Colors.black54,
-//                 iconColor: Colors.white,
-//                 isFinished: isFinished,
-//                 isPlaying: controller.value.isPlaying,
-//                 show: showPlayButton,
-//                 onPressed: _playPause,
-//               ),
-//             ),
-//           ],
-//         ),
-//       ),
-//     );
-//   }
-
-//   void _cancelAndRestartTimer() {
-//     _hideTimer?.cancel();
-//     _startHideTimer();
-
-//     setState(() {
-//       notifier.hideStuff = false;
-//       _displayTapped = true;
-//     });
-//     widget.playbackCallback?.call(notifier.hideStuff);
-//   }
-
-//   Future<void> _initialize() async {
-//     controller.addListener(_updateState);
-
-//     _updateState();
-
-//     if (controller.value.isPlaying || chewieController.autoPlay) {
-//       _startHideTimer();
-//     }
-
-//     if (chewieController.showControlsOnInitialize) {
-//       _initTimer = Timer(const Duration(milliseconds: 200), () {
-//         setState(() {
-//           notifier.hideStuff = false;
-//         });
-//         widget.playbackCallback?.call(notifier.hideStuff);
-//       });
-//     }
-//   }
-
-//   void _playPause() {
-//     final bool isFinished = (_latestValue.position >= _latestValue.duration) &&
-//         _latestValue.duration.inSeconds > 0;
-
-//     setState(() {
-//       if (controller.value.isPlaying) {
-//         notifier.hideStuff = false;
-//         _hideTimer?.cancel();
-//         controller.pause();
-//       } else {
-//         _cancelAndRestartTimer();
-
-//         if (!controller.value.isInitialized) {
-//           controller.initialize().then((_) {
-//             controller.play();
-//           });
-//         } else {
-//           if (isFinished) {
-//             controller.seekTo(Duration.zero);
-//           }
-//           controller.play();
-//         }
-//       }
-//       widget.playbackCallback?.call(notifier.hideStuff);
-//     });
-//   }
-
-//   void _startHideTimer() {
-//     final hideControlsTimer = chewieController.hideControlsTimer.isNegative
-//         ? ChewieController.defaultHideControlsTimer
-//         : chewieController.hideControlsTimer;
-//     _hideTimer = Timer(hideControlsTimer, () {
-//       setState(() {
-//         notifier.hideStuff = true;
-//       });
-//       widget.playbackCallback?.call(notifier.hideStuff);
-//     });
-//   }
-
-//   void _bufferingTimerTimeout() {
-//     _displayBufferingIndicator = true;
-//     if (mounted) {
-//       setState(() {});
-//     }
-//   }
-
-//   void _updateState() {
-//     if (!mounted) return;
-
-//     // display the progress bar indicator only after the buffering delay if it has been set
-//     if (chewieController.progressIndicatorDelay != null) {
-//       if (controller.value.isBuffering) {
-//         _bufferingDisplayTimer ??= Timer(
-//           chewieController.progressIndicatorDelay!,
-//           _bufferingTimerTimeout,
-//         );
-//       } else {
-//         _bufferingDisplayTimer?.cancel();
-//         _bufferingDisplayTimer = null;
-//         _displayBufferingIndicator = false;
-//       }
-//     } else {
-//       _displayBufferingIndicator = controller.value.isBuffering;
-//     }
-
-//     setState(() {
-//       _latestValue = controller.value;
-//     });
-//   }
-
-//   Widget _buildProgressBar() {
-//     final colorScheme = getEnteColorScheme(context);
-//     return Expanded(
-//       child: CustomProgressBar(
-//         controller,
-//         onDragStart: () {
-//           setState(() {
-//             _dragging = true;
-//           });
-
-//           _hideTimer?.cancel();
-//         },
-//         onDragUpdate: () {
-//           _hideTimer?.cancel();
-//         },
-//         onDragEnd: () {
-//           setState(() {
-//             _dragging = false;
-//           });
-
-//           _startHideTimer();
-//         },
-//         colors: ChewieProgressColors(
-//           playedColor: colorScheme.primary300,
-//           handleColor: backgroundElevatedLight,
-//           bufferedColor: backgroundElevatedLight.withOpacity(0.5),
-//           backgroundColor: fillMutedDark,
-//         ),
-//         draggableProgressBar: chewieController.draggableProgressBar,
-//       ),
-//     );
-//   }
-// }
-
-// class CenterPlayButton extends StatelessWidget {
-//   const CenterPlayButton({
-//     super.key,
-//     required this.backgroundColor,
-//     this.iconColor,
-//     required this.show,
-//     required this.isPlaying,
-//     required this.isFinished,
-//     this.onPressed,
-//   });
-
-//   final Color backgroundColor;
-//   final Color? iconColor;
-//   final bool show;
-//   final bool isPlaying;
-//   final bool isFinished;
-//   final VoidCallback? onPressed;
-
-//   @override
-//   Widget build(BuildContext context) {
-//     return AnimatedOpacity(
-//       opacity: show ? 1.0 : 0.0,
-//       duration: const Duration(milliseconds: 300),
-//       child: Container(
-//         width: 54,
-//         height: 54,
-//         decoration: BoxDecoration(
-//           color: Colors.black.withOpacity(0.3),
-//           shape: BoxShape.circle,
-//           border: Border.all(
-//             color: strokeFaintDark,
-//             width: 1,
-//           ),
-//         ),
-//         child: GestureDetector(
-//           behavior: HitTestBehavior.opaque,
-//           onTap: onPressed,
-//           child: AnimatedSwitcher(
-//             duration: const Duration(milliseconds: 250),
-//             transitionBuilder: (Widget child, Animation<double> animation) {
-//               return ScaleTransition(scale: animation, child: child);
-//             },
-//             switchInCurve: Curves.easeInOutQuart,
-//             switchOutCurve: Curves.easeInOutQuart,
-//             child: isPlaying
-//                 ? const Icon(
-//                     Icons.pause,
-//                     size: 32,
-//                     key: ValueKey("pause"),
-//                     color: Colors.white,
-//                   )
-//                 : const Icon(
-//                     Icons.play_arrow,
-//                     size: 36,
-//                     key: ValueKey("play"),
-//                     color: Colors.white,
-//                   ),
-//           ),
-//         ),
-//       ),
-//     );
-//   }
-// }

From 7743a4af98fa879d411a9a68b1301d254ec588ef Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prateekmedia@users.noreply.github.com>
Date: Thu, 20 Feb 2025 17:35:07 +0530
Subject: [PATCH 375/796] chore: move date related utils to date_time_util.dart

---
 .../file/video_widget_media_kit_common.dart   |  2 +-
 .../ui/viewer/file/video_widget_native.dart   | 11 ++----
 mobile/lib/utils/date_time_util.dart          | 37 +++++++++++++++++++
 mobile/lib/utils/duration_to_seconds.dart     | 23 ------------
 mobile/lib/utils/seconds_to_duration.dart     | 12 ------
 5 files changed, 41 insertions(+), 44 deletions(-)
 delete mode 100644 mobile/lib/utils/duration_to_seconds.dart
 delete mode 100644 mobile/lib/utils/seconds_to_duration.dart

diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
index a5f2be3e8c..e2b0229591 100644
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
@@ -6,8 +6,8 @@ import "package:photos/models/file/file.dart";
 import "package:photos/theme/colors.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/viewer/file/preview_status_widget.dart";
+import "package:photos/utils/date_time_util.dart";
 import "package:photos/utils/debouncer.dart";
-import "package:photos/utils/seconds_to_duration.dart";
 
 class VideoWidget extends StatefulWidget {
   final EnteFile file;
diff --git a/mobile/lib/ui/viewer/file/video_widget_native.dart b/mobile/lib/ui/viewer/file/video_widget_native.dart
index 8b2706a3a5..c3d1bb8c83 100644
--- a/mobile/lib/ui/viewer/file/video_widget_native.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_native.dart
@@ -24,12 +24,11 @@ import "package:photos/ui/viewer/file/native_video_player_controls/play_pause_bu
 import "package:photos/ui/viewer/file/native_video_player_controls/seek_bar.dart";
 import "package:photos/ui/viewer/file/preview_status_widget.dart";
 import "package:photos/ui/viewer/file/thumbnail_widget.dart";
+import "package:photos/utils/date_time_util.dart";
 import "package:photos/utils/debouncer.dart";
 import "package:photos/utils/dialog_util.dart";
-import "package:photos/utils/duration_to_seconds.dart";
 import "package:photos/utils/exif_util.dart";
 import "package:photos/utils/file_util.dart";
-import "package:photos/utils/seconds_to_duration.dart";
 import "package:photos/utils/toast_util.dart";
 import "package:visibility_detector/visibility_detector.dart";
 
@@ -617,9 +616,7 @@ class _SeekBarAndDuration extends StatelessWidget {
                           _,
                         ) {
                           return Text(
-                            secondsToDuration(
-                              value,
-                            ),
+                            secondsToDuration(value),
                             style: getEnteTextTheme(
                               context,
                             ).mini.copyWith(
@@ -638,9 +635,7 @@ class _SeekBarAndDuration extends StatelessWidget {
                     ),
                     Text(
                       duration ?? "0:00",
-                      style: getEnteTextTheme(
-                        context,
-                      ).mini.copyWith(
+                      style: getEnteTextTheme(context).mini.copyWith(
                             color: textBaseDark,
                           ),
                     ),
diff --git a/mobile/lib/utils/date_time_util.dart b/mobile/lib/utils/date_time_util.dart
index afcd92aa16..bb29960319 100644
--- a/mobile/lib/utils/date_time_util.dart
+++ b/mobile/lib/utils/date_time_util.dart
@@ -216,3 +216,40 @@ bool isNumeric(String? s) {
   }
   return double.tryParse(s) != null;
 }
+
+/// Returns the duration in seconds from the format "h:mm:ss" or "m:ss".
+int? durationToSeconds(String? duration) {
+  if (duration == null) {
+    return null;
+  }
+  final parts = duration.split(':');
+  int seconds = 0;
+
+  if (parts.length == 3) {
+    // Format: "h:mm:ss"
+    seconds += int.parse(parts[0]) * 3600; // Hours to seconds
+    seconds += int.parse(parts[1]) * 60; // Minutes to seconds
+    seconds += int.parse(parts[2]); // Seconds
+  } else if (parts.length == 2) {
+    // Format: "m:ss"
+    seconds += int.parse(parts[0]) * 60; // Minutes to seconds
+    seconds += int.parse(parts[1]); // Seconds
+  } else {
+    throw FormatException('Invalid duration format: $duration');
+  }
+
+  return seconds;
+}
+
+/// Returns the duration in the format "h:mm:ss" or "m:ss".
+String secondsToDuration(int totalSeconds) {
+  final hours = totalSeconds ~/ 3600;
+  final minutes = (totalSeconds % 3600) ~/ 60;
+  final seconds = totalSeconds % 60;
+
+  if (hours > 0) {
+    return '${hours.toString().padLeft(1, '0')}:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}';
+  } else {
+    return '${minutes.toString().padLeft(1, '0')}:${seconds.toString().padLeft(2, '0')}';
+  }
+}
diff --git a/mobile/lib/utils/duration_to_seconds.dart b/mobile/lib/utils/duration_to_seconds.dart
deleted file mode 100644
index 7b0f274c53..0000000000
--- a/mobile/lib/utils/duration_to_seconds.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-/// Returns the duration in seconds from the format "h:mm:ss" or "m:ss".
-int? durationToSeconds(String? duration) {
-  if (duration == null) {
-    return null;
-  }
-  final parts = duration.split(':');
-  int seconds = 0;
-
-  if (parts.length == 3) {
-    // Format: "h:mm:ss"
-    seconds += int.parse(parts[0]) * 3600; // Hours to seconds
-    seconds += int.parse(parts[1]) * 60; // Minutes to seconds
-    seconds += int.parse(parts[2]); // Seconds
-  } else if (parts.length == 2) {
-    // Format: "m:ss"
-    seconds += int.parse(parts[0]) * 60; // Minutes to seconds
-    seconds += int.parse(parts[1]); // Seconds
-  } else {
-    throw FormatException('Invalid duration format: $duration');
-  }
-
-  return seconds;
-}
diff --git a/mobile/lib/utils/seconds_to_duration.dart b/mobile/lib/utils/seconds_to_duration.dart
deleted file mode 100644
index 3446ee09f8..0000000000
--- a/mobile/lib/utils/seconds_to_duration.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-/// Returns the duration in the format "h:mm:ss" or "m:ss".
-String secondsToDuration(int totalSeconds) {
-  final hours = totalSeconds ~/ 3600;
-  final minutes = (totalSeconds % 3600) ~/ 60;
-  final seconds = totalSeconds % 60;
-
-  if (hours > 0) {
-    return '${hours.toString().padLeft(1, '0')}:${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}';
-  } else {
-    return '${minutes.toString().padLeft(1, '0')}:${seconds.toString().padLeft(2, '0')}';
-  }
-}

From 1746db0d44c5723f9dfe190178e1b2d480b354f0 Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Thu, 20 Feb 2025 17:38:37 +0530
Subject: [PATCH 376/796] [mob][photos] Gracefully handle no avatar of recent
 file for face in UI where every getThumbnailFileOfPerson is used

---
 .../face_ml/person/person_service.dart        |  6 ++--
 mobile/lib/ui/sharing/user_avator_widget.dart | 31 ++++++++++++-------
 .../person_selection_action_widgets.dart      | 16 ++++++----
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/mobile/lib/services/machine_learning/face_ml/person/person_service.dart b/mobile/lib/services/machine_learning/face_ml/person/person_service.dart
index 6b60a2ec1f..1af4e69af5 100644
--- a/mobile/lib/services/machine_learning/face_ml/person/person_service.dart
+++ b/mobile/lib/services/machine_learning/face_ml/person/person_service.dart
@@ -484,7 +484,7 @@ class PersonService {
     }
   }
 
-  Future<EnteFile> getThumbnailFileOfPerson(
+  Future<EnteFile?> getThumbnailFileOfPerson(
     PersonEntity person,
   ) async {
     if (person.data.hasAvatar()) {
@@ -516,10 +516,10 @@ class PersonService {
       }
     }
     if (resultFile == null) {
-      debugPrint(
+      logger.warning(
         "Person ${kDebugMode ? person.data.name : person.remoteID} has no files",
       );
-      return EnteFile();
+      return null;
     }
     return resultFile;
   }
diff --git a/mobile/lib/ui/sharing/user_avator_widget.dart b/mobile/lib/ui/sharing/user_avator_widget.dart
index 96af5ccbfc..c24158763e 100644
--- a/mobile/lib/ui/sharing/user_avator_widget.dart
+++ b/mobile/lib/ui/sharing/user_avator_widget.dart
@@ -117,18 +117,25 @@ class _UserAvatarWidgetState extends State<UserAvatarWidget> {
                   if (snapshot.hasData) {
                     final personID = snapshot.data as String;
                     return ClipOval(
-                      child: PersonFaceWidget(
-                        _faceThumbnail!,
-                        personId: personID,
-                        onErrorCallback: () {
-                          if (mounted) {
-                            setState(() {
-                              _personID = null;
-                              _faceThumbnail = null;
-                            });
-                          }
-                        },
-                      ),
+                      child: _faceThumbnail == null
+                          ? _FirstLetterCircularAvatar(
+                              user: widget.user,
+                              currentUserID: widget.currentUserID,
+                              thumbnailView: widget.thumbnailView,
+                              type: widget.type,
+                            )
+                          : PersonFaceWidget(
+                              _faceThumbnail!,
+                              personId: personID,
+                              onErrorCallback: () {
+                                if (mounted) {
+                                  setState(() {
+                                    _personID = null;
+                                    _faceThumbnail = null;
+                                  });
+                                }
+                              },
+                            ),
                     );
                   } else if (snapshot.hasError) {
                     _logger.severe("Error loading personID", snapshot.error);
diff --git a/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart b/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart
index 8898eb0d32..128b44c9df 100644
--- a/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart
+++ b/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart
@@ -16,6 +16,7 @@ import "package:photos/ui/common/loading_widget.dart";
 import "package:photos/ui/components/buttons/button_widget.dart";
 import "package:photos/ui/components/dialog_widget.dart";
 import "package:photos/ui/components/models/button_type.dart";
+import "package:photos/ui/viewer/file/no_thumbnail_widget.dart";
 import "package:photos/ui/viewer/search/result/person_face_widget.dart";
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/person_contact_linking_util.dart";
@@ -23,7 +24,7 @@ import "package:photos/utils/toast_util.dart";
 
 class PersonEntityWithThumbnailFile {
   final PersonEntity person;
-  final EnteFile thumbnailFile;
+  final EnteFile? thumbnailFile;
 
   const PersonEntityWithThumbnailFile(
     this.person,
@@ -422,11 +423,14 @@ class _RoundedPersonFaceWidget extends StatelessWidget {
                         ),
                       ),
                     ),
-                    child: PersonFaceWidget(
-                      personEntitiesWithThumbnailFile.thumbnailFile,
-                      personId: personEntitiesWithThumbnailFile.person.remoteID,
-                      useFullFile: true,
-                    ),
+                    child: personEntitiesWithThumbnailFile.thumbnailFile == null
+                        ? const NoThumbnailWidget(addBorder: false)
+                        : PersonFaceWidget(
+                            personEntitiesWithThumbnailFile.thumbnailFile!,
+                            personId:
+                                personEntitiesWithThumbnailFile.person.remoteID,
+                            useFullFile: true,
+                          ),
                   ),
                 ),
               ),

From 898658f0ef61e86807f0311a70b47a1c95e40c6b Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 20 Feb 2025 17:39:21 +0530
Subject: [PATCH 377/796] [mob] Show memberLimit and usage when familyMember
 limit is set

---
 mobile/lib/models/user_details.dart           | 13 ++++++++
 .../lib/ui/settings/storage_card_widget.dart  | 30 +++++++++++++------
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/mobile/lib/models/user_details.dart b/mobile/lib/models/user_details.dart
index f7cfd1c1dc..6b49371631 100644
--- a/mobile/lib/models/user_details.dart
+++ b/mobile/lib/models/user_details.dart
@@ -61,6 +61,15 @@ class UserDetails {
         storageBonus;
   }
 
+  int? familyMemberStorageLimit() {
+    if (isPartOfFamily()) {
+      final FamilyMember currentUserMember = familyData!.members!
+          .firstWhere((element) => element.email.trim() == email.trim());
+      return currentUserMember.storageLimit;
+    }
+    return null;
+  }
+
   // This is the total storage for which user has paid for.
   int getPlanPlusAddonStorage() {
     return (isPartOfFamily() ? familyData!.storage : subscription.storage) +
@@ -192,6 +201,10 @@ class FamilyData {
     return members!.map((e) => e.usage).toList().sum;
   }
 
+  FamilyMember? getMemberByID(String id) {
+    return members!.firstWhereOrNull((element) => element.id == id);
+  }
+
   static fromMap(Map<String, dynamic>? map) {
     if (map == null) return null;
     assert(map['members'] != null && map['members'].length >= 0);
diff --git a/mobile/lib/ui/settings/storage_card_widget.dart b/mobile/lib/ui/settings/storage_card_widget.dart
index 1b40a1f3e1..ffc09fa550 100644
--- a/mobile/lib/ui/settings/storage_card_widget.dart
+++ b/mobile/lib/ui/settings/storage_card_widget.dart
@@ -24,6 +24,8 @@ class _StorageCardWidgetState extends State<StorageCardWidget> {
   late Image _background;
   final _logger = Logger((_StorageCardWidgetState).toString());
   final ValueNotifier<bool> _isStorageCardPressed = ValueNotifier(false);
+  int? familyMemberStorageLimit;
+  bool showFamilyBreakup = false;
 
   @override
   void initState() {
@@ -119,9 +121,18 @@ class _StorageCardWidgetState extends State<StorageCardWidget> {
   Widget _userDetails(UserDetails userDetails) {
     const hundredMBinBytes = 107374182;
     const oneTBinBytes = 1073741824000;
+    showFamilyBreakup = userDetails.isPartOfFamily();
+    if (showFamilyBreakup) {
+      familyMemberStorageLimit = userDetails.familyMemberStorageLimit();
+      showFamilyBreakup = familyMemberStorageLimit == null;
+    }
 
-    final usedStorageInBytes = userDetails.getFamilyOrPersonalUsage();
-    final totalStorageInBytes = userDetails.getTotalStorage();
+    final usedStorageInBytes = familyMemberStorageLimit != null
+        ? userDetails.usage
+        : userDetails.getFamilyOrPersonalUsage();
+    final totalStorageInBytes = familyMemberStorageLimit != null
+        ? familyMemberStorageLimit!
+        : userDetails.getTotalStorage();
     final freeStorageInBytes = totalStorageInBytes - usedStorageInBytes;
 
     final isMobileScreenSmall =
@@ -212,20 +223,19 @@ class _StorageCardWidgetState extends State<StorageCardWidget> {
                         Color.fromRGBO(255, 255, 255, 0.2), //hardcoded in figma
                     fractionOfStorage: 1,
                   ),
-                  userDetails.isPartOfFamily()
+                  showFamilyBreakup
                       ? StorageProgressWidget(
                           color: strokeBaseDark,
                           fractionOfStorage:
-                              ((userDetails.getFamilyOrPersonalUsage()) /
-                                  userDetails.getTotalStorage()),
+                              ((usedStorageInBytes) / totalStorageInBytes),
                         )
                       : const SizedBox.shrink(),
                   StorageProgressWidget(
-                    color: userDetails.isPartOfFamily()
+                    color: showFamilyBreakup
                         ? getEnteColorScheme(context).primary300
                         : strokeBaseDark,
                     fractionOfStorage:
-                        (userDetails.usage / userDetails.getTotalStorage()),
+                        (userDetails.usage / totalStorageInBytes),
                   ),
                 ],
               ),
@@ -234,7 +244,7 @@ class _StorageCardWidgetState extends State<StorageCardWidget> {
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  userDetails.isPartOfFamily()
+                  showFamilyBreakup
                       ? Row(
                           children: [
                             Container(
@@ -272,7 +282,9 @@ class _StorageCardWidgetState extends State<StorageCardWidget> {
                         )
                       : const SizedBox.shrink(),
                   Text(
-                    S.of(context).availableStorageSpace(freeSpace, freeSpaceUnit),
+                    S
+                        .of(context)
+                        .availableStorageSpace(freeSpace, freeSpaceUnit),
                     style: getEnteTextTheme(context)
                         .mini
                         .copyWith(color: textFaintDark),

From bc742f20e19d85e68d02aa0713f2e1ef01dd66fc Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 17:42:00 +0530
Subject: [PATCH 378/796] Use 3

---
 web/apps/photos/src/components/Sidebar.tsx | 30 +++++++++++++---------
 web/apps/photos/src/components/Upload.tsx  |  7 ++++-
 web/apps/photos/src/pages/gallery.tsx      |  4 +--
 web/apps/photos/src/types/gallery/index.ts |  1 -
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsx
index b5e2b7e936..cfe9e085eb 100644
--- a/web/apps/photos/src/components/Sidebar.tsx
+++ b/web/apps/photos/src/components/Sidebar.tsx
@@ -136,16 +136,21 @@ type SidebarProps = ModalVisibilityProps & {
      * items shown in the shortcut section within the sidebar.
      */
     collectionSummaries: CollectionSummaries;
+    /**
+     * Called when the plan selection modal should be shown.
+     */
+    onShowPlanSelector: () => void;
 };
 
 export const Sidebar: React.FC<SidebarProps> = ({
     open,
     onClose,
     collectionSummaries,
+    onShowPlanSelector,
 }) => (
     <RootSidebarDrawer open={open} onClose={onClose}>
         <HeaderSection onCloseSidebar={onClose} />
-        <UserDetailsSection sidebarOpen={open} />
+        <UserDetailsSection sidebarOpen={open} {...{ onShowPlanSelector }} />
         <Stack sx={{ gap: 0.5, mb: 3 }}>
             <ShortcutSection
                 onCloseSidebar={onClose}
@@ -183,14 +188,14 @@ const HeaderSection: React.FC<SectionProps> = ({ onCloseSidebar }) => (
     </SpacedRow>
 );
 
-interface UserDetailsSectionProps {
+type UserDetailsSectionProps = Pick<SidebarProps, "onShowPlanSelector"> & {
     sidebarOpen: boolean;
-}
+};
 
 const UserDetailsSection: React.FC<UserDetailsSectionProps> = ({
     sidebarOpen,
+    onShowPlanSelector,
 }) => {
-    const galleryContext = useContext(GalleryContext);
     const userDetails = useUserDetailsSnapshot();
     const [memberSubscriptionManageView, setMemberSubscriptionManageView] =
         useState(false);
@@ -223,7 +228,7 @@ const UserDetailsSection: React.FC<UserDetailsSectionProps> = ({
             ) {
                 redirectToCustomerPortal();
             } else {
-                galleryContext.showPlanSelectorModal();
+                onShowPlanSelector();
             }
         }
     };
@@ -244,7 +249,9 @@ const UserDetailsSection: React.FC<UserDetailsSectionProps> = ({
                     onClick={handleSubscriptionCardClick}
                 />
                 {userDetails && (
-                    <SubscriptionStatus userDetails={userDetails} />
+                    <SubscriptionStatus
+                        {...{ userDetails, onShowPlanSelector }}
+                    />
                 )}
             </Box>
             {isNonAdminFamilyMember && (
@@ -258,15 +265,14 @@ const UserDetailsSection: React.FC<UserDetailsSectionProps> = ({
     );
 };
 
-interface SubscriptionStatusProps {
+type SubscriptionStatusProps = Pick<SidebarProps, "onShowPlanSelector"> & {
     userDetails: UserDetails;
-}
+};
 
 const SubscriptionStatus: React.FC<SubscriptionStatusProps> = ({
     userDetails,
+    onShowPlanSelector,
 }) => {
-    const { showPlanSelectorModal } = useContext(GalleryContext);
-
     const hasAMessage = useMemo(() => {
         if (isPartOfFamily(userDetails) && !isFamilyAdmin(userDetails)) {
             return false;
@@ -286,7 +292,7 @@ const SubscriptionStatus: React.FC<SubscriptionStatusProps> = ({
 
             if (isSubscriptionActive(userDetails.subscription)) {
                 if (hasExceededStorageQuota(userDetails)) {
-                    showPlanSelectorModal();
+                    onShowPlanSelector();
                 }
             } else {
                 if (
@@ -295,7 +301,7 @@ const SubscriptionStatus: React.FC<SubscriptionStatusProps> = ({
                 ) {
                     redirectToCustomerPortal();
                 } else {
-                    showPlanSelectorModal();
+                    onShowPlanSelector();
                 }
             }
         };
diff --git a/web/apps/photos/src/components/Upload.tsx b/web/apps/photos/src/components/Upload.tsx
index 1ec31eaf78..b266a9e8f0 100644
--- a/web/apps/photos/src/components/Upload.tsx
+++ b/web/apps/photos/src/components/Upload.tsx
@@ -101,6 +101,10 @@ interface UploadProps {
      * @param file The newly uploaded file.
      */
     onUploadFile: (file: EnteFile) => void;
+    /**
+     * Called when the plan selection modal should be shown.
+     */
+    onShowPlanSelector: () => void;
     setCollections?: (cs: Collection[]) => void;
     isFirstUpload?: boolean;
     uploadTypeSelectorView: boolean;
@@ -120,6 +124,7 @@ export const Upload: React.FC<UploadProps> = ({
     isFirstUpload,
     dragAndDropFiles,
     onUploadFile,
+    onShowPlanSelector,
     showSessionExpiredMessage,
     ...props
 }) => {
@@ -725,7 +730,7 @@ export const Upload: React.FC<UploadProps> = ({
                     captionFirst: true,
                     caption: t("storage_quota_exceeded"),
                     title: t("upgrade_now"),
-                    onClick: galleryContext.showPlanSelectorModal,
+                    onClick: onShowPlanSelector,
                     startIcon: <DiscFullIcon />,
                 });
                 break;
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 7d82d4c04f..7b5010fcc3 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -133,7 +133,6 @@ import {
 import { FILE_OPS_TYPE, getSelectedFiles, handleFileOps } from "utils/file";
 
 const defaultGalleryContext: GalleryContextType = {
-    showPlanSelectorModal: () => null,
     setActiveCollectionID: () => null,
     onShowCollection: () => null,
     syncWithRemote: () => null,
@@ -812,7 +811,6 @@ const Page: React.FC = () => {
         <GalleryContext.Provider
             value={{
                 ...defaultGalleryContext,
-                showPlanSelectorModal: showPlanSelector,
                 setActiveCollectionID: handleSetActiveCollectionID,
                 onShowCollection: (id) =>
                     dispatch({
@@ -983,6 +981,7 @@ const Page: React.FC = () => {
                     onUploadFile={(file) =>
                         dispatch({ type: "uploadFile", file })
                     }
+                    onShowPlanSelector={showPlanSelector}
                     setCollections={(collections) =>
                         dispatch({ type: "setNormalCollections", collections })
                     }
@@ -999,6 +998,7 @@ const Page: React.FC = () => {
                 <Sidebar
                     {...sidebarVisibilityProps}
                     {...{ collectionSummaries }}
+                    onShowPlanSelector={showPlanSelector}
                 />
                 <WhatsNew {...whatsNewVisibilityProps} />
                 {!isInSearchMode &&
diff --git a/web/apps/photos/src/types/gallery/index.ts b/web/apps/photos/src/types/gallery/index.ts
index dffe171cc3..2b619c5f30 100644
--- a/web/apps/photos/src/types/gallery/index.ts
+++ b/web/apps/photos/src/types/gallery/index.ts
@@ -39,7 +39,6 @@ export interface MergedSourceURL {
 }
 
 export interface GalleryContextType {
-    showPlanSelectorModal: () => void;
     setActiveCollectionID: (collectionID: number) => void;
     /** Newer and almost equivalent alternative to setActiveCollectionID. */
     onShowCollection: (collectionID: number) => void;

From d41e177b3c0cfa622ed06c34917f0c90cca72fc7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 17:53:00 +0530
Subject: [PATCH 379/796] ex

---
 web/apps/photos/src/components/Sidebar.tsx | 17 +++++++++++++----
 web/apps/photos/src/pages/gallery.tsx      |  1 +
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsx
index cfe9e085eb..3a08e826cb 100644
--- a/web/apps/photos/src/components/Sidebar.tsx
+++ b/web/apps/photos/src/components/Sidebar.tsx
@@ -140,6 +140,10 @@ type SidebarProps = ModalVisibilityProps & {
      * Called when the plan selection modal should be shown.
      */
     onShowPlanSelector: () => void;
+    /**
+     * Called when the export dialog should be shown.
+     */
+    onShowExport: () => void;
 };
 
 export const Sidebar: React.FC<SidebarProps> = ({
@@ -147,6 +151,7 @@ export const Sidebar: React.FC<SidebarProps> = ({
     onClose,
     collectionSummaries,
     onShowPlanSelector,
+    onShowExport,
 }) => (
     <RootSidebarDrawer open={open} onClose={onClose}>
         <HeaderSection onCloseSidebar={onClose} />
@@ -157,7 +162,7 @@ export const Sidebar: React.FC<SidebarProps> = ({
                 collectionSummaries={collectionSummaries}
             />
             <UtilitySection onCloseSidebar={onClose} />
-            <HelpSection onCloseSidebar={onClose} />
+            <HelpSection onCloseSidebar={onClose} {...{ onShowExport }} />
             <Divider sx={{ my: "2px" }} />
             <ExitSection />
             <InfoSection />
@@ -565,15 +570,19 @@ const UtilitySection: React.FC<SectionProps> = ({ onCloseSidebar }) => {
     );
 };
 
-const HelpSection: React.FC<SectionProps> = ({ onCloseSidebar }) => {
+type HelpSectionProps = SectionProps & Pick<SidebarProps, "onShowExport">;
+
+const HelpSection: React.FC<HelpSectionProps> = ({
+    onCloseSidebar,
+    onShowExport,
+}) => {
     const { showMiniDialog } = useBaseContext();
-    const { openExportModal } = useContext(GalleryContext);
 
     const { show: showHelp, props: helpVisibilityProps } = useModalVisibility();
 
     const handleExport = () =>
         isDesktop
-            ? openExportModal()
+            ? onShowExport()
             : showMiniDialog(downloadAppDialogAttributes());
 
     return (
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 7b5010fcc3..1d0b1966e3 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -999,6 +999,7 @@ const Page: React.FC = () => {
                     {...sidebarVisibilityProps}
                     {...{ collectionSummaries }}
                     onShowPlanSelector={showPlanSelector}
+                    onShowExport={showExport}
                 />
                 <WhatsNew {...whatsNewVisibilityProps} />
                 {!isInSearchMode &&

From f5ea565aa8492df838a091e2d3d1b4add6c3a420 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 17:57:25 +0530
Subject: [PATCH 380/796] Combine visually single section

---
 web/apps/photos/src/components/Sidebar.tsx | 61 +++++++++-------------
 1 file changed, 26 insertions(+), 35 deletions(-)

diff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsx
index 3a08e826cb..c85b7df42e 100644
--- a/web/apps/photos/src/components/Sidebar.tsx
+++ b/web/apps/photos/src/components/Sidebar.tsx
@@ -161,8 +161,7 @@ export const Sidebar: React.FC<SidebarProps> = ({
                 onCloseSidebar={onClose}
                 collectionSummaries={collectionSummaries}
             />
-            <UtilitySection onCloseSidebar={onClose} />
-            <HelpSection onCloseSidebar={onClose} {...{ onShowExport }} />
+            <UtilitySection onCloseSidebar={onClose} {...{ onShowExport }} />
             <Divider sx={{ my: "2px" }} />
             <ExitSection />
             <InfoSection />
@@ -516,11 +515,19 @@ const ShortcutSection: React.FC<ShortcutSectionProps> = ({
     );
 };
 
-const UtilitySection: React.FC<SectionProps> = ({ onCloseSidebar }) => {
+type UtilitySectionProps = SectionProps & Pick<SidebarProps, "onShowExport">;
+
+const UtilitySection: React.FC<UtilitySectionProps> = ({
+    onCloseSidebar,
+    onShowExport,
+}) => {
+    const { showMiniDialog } = useBaseContext();
     const { watchFolderView, setWatchFolderView } = usePhotosAppContext();
 
     const router = useRouter();
 
+    const { show: showHelp, props: helpVisibilityProps } = useModalVisibility();
+
     const { show: showAccount, props: accountVisibilityProps } =
         useModalVisibility();
     const { show: showPreferences, props: preferencesVisibilityProps } =
@@ -531,6 +538,11 @@ const UtilitySection: React.FC<SectionProps> = ({ onCloseSidebar }) => {
 
     const handleDeduplicate = () => router.push("/duplicates");
 
+    const handleExport = () =>
+        isDesktop
+            ? onShowExport()
+            : showMiniDialog(downloadAppDialogAttributes());
+
     return (
         <>
             <RowButton
@@ -555,38 +567,6 @@ const UtilitySection: React.FC<SectionProps> = ({ onCloseSidebar }) => {
                 label={t("preferences")}
                 onClick={showPreferences}
             />
-            {isDesktop && (
-                <WatchFolder
-                    open={watchFolderView}
-                    onClose={handleCloseWatchFolder}
-                />
-            )}
-            <Account {...accountVisibilityProps} onRootClose={onCloseSidebar} />
-            <Preferences
-                {...preferencesVisibilityProps}
-                onRootClose={onCloseSidebar}
-            />
-        </>
-    );
-};
-
-type HelpSectionProps = SectionProps & Pick<SidebarProps, "onShowExport">;
-
-const HelpSection: React.FC<HelpSectionProps> = ({
-    onCloseSidebar,
-    onShowExport,
-}) => {
-    const { showMiniDialog } = useBaseContext();
-
-    const { show: showHelp, props: helpVisibilityProps } = useModalVisibility();
-
-    const handleExport = () =>
-        isDesktop
-            ? onShowExport()
-            : showMiniDialog(downloadAppDialogAttributes());
-
-    return (
-        <>
             <RowButton
                 variant="secondary"
                 label={t("help")}
@@ -603,6 +583,17 @@ const HelpSection: React.FC<HelpSectionProps> = ({
                 onClick={handleExport}
             />
             <Help {...helpVisibilityProps} onRootClose={onCloseSidebar} />
+            {isDesktop && (
+                <WatchFolder
+                    open={watchFolderView}
+                    onClose={handleCloseWatchFolder}
+                />
+            )}
+            <Account {...accountVisibilityProps} onRootClose={onCloseSidebar} />
+            <Preferences
+                {...preferencesVisibilityProps}
+                onRootClose={onCloseSidebar}
+            />
         </>
     );
 };

From 9ce0b43bfeb6eb90e88451b01e29cd4fb9f81311 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 18:05:19 +0530
Subject: [PATCH 381/796] del 1

---
 ...leteAccountModal.tsx => DeleteAccount.tsx} | 21 ++++++++++++-------
 web/apps/photos/src/components/Sidebar.tsx    |  2 +-
 web/apps/photos/src/pages/gallery.tsx         |  1 +
 3 files changed, 16 insertions(+), 8 deletions(-)
 rename web/apps/photos/src/components/{DeleteAccountModal.tsx => DeleteAccount.tsx} (95%)

diff --git a/web/apps/photos/src/components/DeleteAccountModal.tsx b/web/apps/photos/src/components/DeleteAccount.tsx
similarity index 95%
rename from web/apps/photos/src/components/DeleteAccountModal.tsx
rename to web/apps/photos/src/components/DeleteAccount.tsx
index 8e195fe649..3fadc1354c 100644
--- a/web/apps/photos/src/components/DeleteAccountModal.tsx
+++ b/web/apps/photos/src/components/DeleteAccount.tsx
@@ -24,8 +24,7 @@ import {
 } from "@mui/material";
 import { Formik, type FormikHelpers } from "formik";
 import { t } from "i18next";
-import { GalleryContext } from "pages/gallery";
-import React, { useContext, useRef, useState } from "react";
+import React, { useRef, useState } from "react";
 import { Trans } from "react-i18next";
 import { deleteAccount, getAccountDeleteChallenge } from "services/userService";
 import * as Yup from "yup";
@@ -35,13 +34,23 @@ interface FormValues {
     feedback: string;
 }
 
-const DeleteAccountModal: React.FC<ModalVisibilityProps> = ({
+type DeleteAccountProps = ModalVisibilityProps & {
+    /**
+     * Called when the user should be authenticated again.
+     *
+     * Account deletion only proceeds if the promise returned by this function
+     * is fulfilled.
+     */
+    onAuthenticateUser: () => Promise<void>;
+};
+
+export const DeleteAccount: React.FC<DeleteAccountProps> = ({
     open,
     onClose,
+    onAuthenticateUser,
 }) => {
     const { logout, showMiniDialog } = useBaseContext();
     const { onGenericError } = usePhotosAppContext();
-    const { authenticateUser } = useContext(GalleryContext);
 
     const [loading, setLoading] = useState(false);
     const deleteAccountChallenge = useRef<string | undefined>(undefined);
@@ -76,7 +85,7 @@ const DeleteAccountModal: React.FC<ModalVisibilityProps> = ({
             deleteAccountChallenge.current =
                 deleteChallengeResponse.encryptedChallenge;
             if (deleteChallengeResponse.allowDelete) {
-                authenticateUser(confirmAccountDeletion);
+                onAuthenticateUser().then(confirmAccountDeletion);
             } else {
                 askToMailForDeletion();
             }
@@ -213,8 +222,6 @@ const DeleteAccountModal: React.FC<ModalVisibilityProps> = ({
     );
 };
 
-export default DeleteAccountModal;
-
 /**
  * All of these must have a corresponding localized string nested under the
  * "delete_reason" key.
diff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsx
index c85b7df42e..b5fddbc168 100644
--- a/web/apps/photos/src/components/Sidebar.tsx
+++ b/web/apps/photos/src/components/Sidebar.tsx
@@ -109,7 +109,7 @@ import {
     useColorScheme,
 } from "@mui/material";
 import Typography from "@mui/material/Typography";
-import DeleteAccountModal from "components/DeleteAccountModal";
+import DeleteAccountModal from "components/DeleteAccount";
 import { WatchFolder } from "components/WatchFolder";
 import { t } from "i18next";
 import { useRouter } from "next/router";
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 1d0b1966e3..04fd8e198c 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -216,6 +216,7 @@ const Page: React.FC = () => {
         onAuthenticateCallback.current = callback;
         setAuthenticateUserModalView(true);
     };
+
     const closeAuthenticateUserModal = () =>
         setAuthenticateUserModalView(false);
 

From aad42b3c00f731bb12c0a60e2e08c78b9a834cf1 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 18:10:00 +0530
Subject: [PATCH 382/796] del 2

---
 web/apps/photos/src/components/Sidebar.tsx | 35 ++++++++++++++++++----
 web/apps/photos/src/pages/gallery.tsx      |  7 +++++
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsx
index b5fddbc168..fb471f3a25 100644
--- a/web/apps/photos/src/components/Sidebar.tsx
+++ b/web/apps/photos/src/components/Sidebar.tsx
@@ -109,7 +109,7 @@ import {
     useColorScheme,
 } from "@mui/material";
 import Typography from "@mui/material/Typography";
-import DeleteAccountModal from "components/DeleteAccount";
+import { DeleteAccount } from "components/DeleteAccount";
 import { WatchFolder } from "components/WatchFolder";
 import { t } from "i18next";
 import { useRouter } from "next/router";
@@ -144,6 +144,13 @@ type SidebarProps = ModalVisibilityProps & {
      * Called when the export dialog should be shown.
      */
     onShowExport: () => void;
+    /**
+     * Called when the user should be authenticated again.
+     *
+     * This will be invoked before sensitive actions, and the action will only
+     * proceed if the promise returned by this function is fulfilled.
+     */
+    onAuthenticateUser: () => Promise<void>;
 };
 
 export const Sidebar: React.FC<SidebarProps> = ({
@@ -152,6 +159,7 @@ export const Sidebar: React.FC<SidebarProps> = ({
     collectionSummaries,
     onShowPlanSelector,
     onShowExport,
+    onAuthenticateUser,
 }) => (
     <RootSidebarDrawer open={open} onClose={onClose}>
         <HeaderSection onCloseSidebar={onClose} />
@@ -161,7 +169,10 @@ export const Sidebar: React.FC<SidebarProps> = ({
                 onCloseSidebar={onClose}
                 collectionSummaries={collectionSummaries}
             />
-            <UtilitySection onCloseSidebar={onClose} {...{ onShowExport }} />
+            <UtilitySection
+                onCloseSidebar={onClose}
+                {...{ onShowExport, onAuthenticateUser }}
+            />
             <Divider sx={{ my: "2px" }} />
             <ExitSection />
             <InfoSection />
@@ -515,11 +526,13 @@ const ShortcutSection: React.FC<ShortcutSectionProps> = ({
     );
 };
 
-type UtilitySectionProps = SectionProps & Pick<SidebarProps, "onShowExport">;
+type UtilitySectionProps = SectionProps &
+    Pick<SidebarProps, "onShowExport" | "onAuthenticateUser">;
 
 const UtilitySection: React.FC<UtilitySectionProps> = ({
     onCloseSidebar,
     onShowExport,
+    onAuthenticateUser,
 }) => {
     const { showMiniDialog } = useBaseContext();
     const { watchFolderView, setWatchFolderView } = usePhotosAppContext();
@@ -589,7 +602,11 @@ const UtilitySection: React.FC<UtilitySectionProps> = ({
                     onClose={handleCloseWatchFolder}
                 />
             )}
-            <Account {...accountVisibilityProps} onRootClose={onCloseSidebar} />
+            <Account
+                {...accountVisibilityProps}
+                onRootClose={onCloseSidebar}
+                {...{ onAuthenticateUser }}
+            />
             <Preferences
                 {...preferencesVisibilityProps}
                 onRootClose={onCloseSidebar}
@@ -647,10 +664,13 @@ const InfoSection: React.FC = () => {
     );
 };
 
-const Account: React.FC<NestedSidebarDrawerVisibilityProps> = ({
+type AccountProps = NestedSidebarDrawerVisibilityProps &
+    Pick<SidebarProps, "onAuthenticateUser">;
+const Account: React.FC<AccountProps> = ({
     open,
     onClose,
     onRootClose,
+    onAuthenticateUser,
 }) => {
     const { showMiniDialog } = useBaseContext();
 
@@ -735,7 +755,10 @@ const Account: React.FC<NestedSidebarDrawerVisibilityProps> = ({
                 {...twoFactorVisibilityProps}
                 onRootClose={onRootClose}
             />
-            <DeleteAccountModal {...deleteAccountVisibilityProps} />
+            <DeleteAccount
+                {...deleteAccountVisibilityProps}
+                {...{ onAuthenticateUser }}
+            />
         </NestedSidebarDrawer>
     );
 };
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 04fd8e198c..3ac32c397e 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -217,6 +217,12 @@ const Page: React.FC = () => {
         setAuthenticateUserModalView(true);
     };
 
+    const authenticateUser2 = () =>
+        new Promise<void>((resolve) => {
+            onAuthenticateCallback.current = resolve;
+            setAuthenticateUserModalView(true);
+        });
+
     const closeAuthenticateUserModal = () =>
         setAuthenticateUserModalView(false);
 
@@ -1001,6 +1007,7 @@ const Page: React.FC = () => {
                     {...{ collectionSummaries }}
                     onShowPlanSelector={showPlanSelector}
                     onShowExport={showExport}
+                    onAuthenticateUser={authenticateUser2}
                 />
                 <WhatsNew {...whatsNewVisibilityProps} />
                 {!isInSearchMode &&

From 371377d4d1c86acfe35ac71f2957d40136c2b0da Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 18:16:26 +0530
Subject: [PATCH 383/796] R

---
 .../{AuthenticateUserModal.tsx => AuthenticateUser.tsx}         | 0
 web/apps/photos/src/pages/gallery.tsx                           | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename web/apps/photos/src/components/{AuthenticateUserModal.tsx => AuthenticateUser.tsx} (100%)

diff --git a/web/apps/photos/src/components/AuthenticateUserModal.tsx b/web/apps/photos/src/components/AuthenticateUser.tsx
similarity index 100%
rename from web/apps/photos/src/components/AuthenticateUserModal.tsx
rename to web/apps/photos/src/components/AuthenticateUser.tsx
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 3ac32c397e..8e516a2af1 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -88,7 +88,7 @@ import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import FileUploadOutlinedIcon from "@mui/icons-material/FileUploadOutlined";
 import MenuIcon from "@mui/icons-material/Menu";
 import { IconButton, Stack, Typography } from "@mui/material";
-import AuthenticateUserModal from "components/AuthenticateUserModal";
+import AuthenticateUserModal from "components/AuthenticateUser";
 import CollectionNamer, {
     CollectionNamerAttributes,
 } from "components/Collections/CollectionNamer";

From 776b7488d35528ca1b2ea67b0090b4588445573a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 18:24:16 +0530
Subject: [PATCH 384/796] Fin

---
 .../src/components/AuthenticateUser.tsx       | 22 +++++---
 web/apps/photos/src/pages/gallery.tsx         | 53 ++++++++-----------
 web/apps/photos/src/types/gallery/index.ts    |  2 -
 3 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/web/apps/photos/src/components/AuthenticateUser.tsx b/web/apps/photos/src/components/AuthenticateUser.tsx
index 972dd33d68..285ec85cab 100644
--- a/web/apps/photos/src/components/AuthenticateUser.tsx
+++ b/web/apps/photos/src/components/AuthenticateUser.tsx
@@ -3,6 +3,7 @@ import {
     TitledMiniDialog,
     type MiniDialogAttributes,
 } from "@/base/components/MiniDialog";
+import type { ModalVisibilityProps } from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
 import log from "@/base/log";
 import { usePhotosAppContext } from "@/new/photos/types/context";
@@ -14,17 +15,24 @@ import type { KeyAttributes, User } from "@ente/shared/user/types";
 import { t } from "i18next";
 import { useCallback, useEffect, useState } from "react";
 
-interface Iprops {
-    open: boolean;
-    onClose: () => void;
+type AuthenticateUserProps = ModalVisibilityProps & {
+    /**
+     * Called when the user successfully reauthenticates themselves.
+     */
     onAuthenticate: () => void;
-}
+};
 
-export default function AuthenticateUserModal({
+/**
+ * A dialog for reauthenticating the logged in user by prompting them for their
+ * password.
+ *
+ * This is used as precursor to performing various sensitive or locked actions.
+ */
+export const AuthenticateUser: React.FC<AuthenticateUserProps> = ({
     open,
     onClose,
     onAuthenticate,
-}: Iprops) {
+}) => {
     const { logout, showMiniDialog } = useBaseContext();
     const { onGenericError } = usePhotosAppContext();
     const [user, setUser] = useState<User>();
@@ -106,7 +114,7 @@ export default function AuthenticateUserModal({
             />
         </TitledMiniDialog>
     );
-}
+};
 
 /**
  * Attributes for a dialog box that informs the user that their password was
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 8e516a2af1..5dbe443445 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -88,7 +88,7 @@ import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import FileUploadOutlinedIcon from "@mui/icons-material/FileUploadOutlined";
 import MenuIcon from "@mui/icons-material/Menu";
 import { IconButton, Stack, Typography } from "@mui/material";
-import AuthenticateUserModal from "components/AuthenticateUser";
+import { AuthenticateUser } from "components/AuthenticateUser";
 import CollectionNamer, {
     CollectionNamerAttributes,
 } from "components/Collections/CollectionNamer";
@@ -138,8 +138,6 @@ const defaultGalleryContext: GalleryContextType = {
     syncWithRemote: () => null,
     setBlockingLoad: () => null,
     photoListHeader: null,
-    openExportModal: () => null,
-    authenticateUser: () => null,
     user: null,
     userIDToEmailMap: null,
     emailList: null,
@@ -207,25 +205,6 @@ const Page: React.FC = () => {
     const [uploadTypeSelectorIntent, setUploadTypeSelectorIntent] =
         useState<UploadTypeSelectorIntent>("upload");
 
-    const [authenticateUserModalView, setAuthenticateUserModalView] =
-        useState(false);
-
-    const onAuthenticateCallback = useRef<(() => void) | undefined>(undefined);
-
-    const authenticateUser = (callback: () => void) => {
-        onAuthenticateCallback.current = callback;
-        setAuthenticateUserModalView(true);
-    };
-
-    const authenticateUser2 = () =>
-        new Promise<void>((resolve) => {
-            onAuthenticateCallback.current = resolve;
-            setAuthenticateUserModalView(true);
-        });
-
-    const closeAuthenticateUserModal = () =>
-        setAuthenticateUserModalView(false);
-
     // If the fix creation time dialog is being shown, then the list of files on
     // which it should act.
     const [fixCreationTimeFiles, setFixCreationTimeFiles] = useState<
@@ -260,6 +239,21 @@ const Page: React.FC = () => {
         useModalVisibility();
     const { show: showExport, props: exportVisibilityProps } =
         useModalVisibility();
+    const {
+        show: showAuthenticateUser,
+        props: authenticateUserVisibilityProps,
+    } = useModalVisibility();
+
+    const onAuthenticateCallback = useRef<(() => void) | undefined>(undefined);
+
+    const authenticateUser = useCallback(
+        () =>
+            new Promise<void>((resolve) => {
+                onAuthenticateCallback.current = resolve;
+                showAuthenticateUser();
+            }),
+        [],
+    );
 
     // TODO: Temp
     const user = state.user;
@@ -457,7 +451,7 @@ const Page: React.FC = () => {
             planSelectorVisibilityProps.open ||
             fixCreationTimeVisibilityProps.open ||
             exportVisibilityProps.open ||
-            authenticateUserModalView ||
+            authenticateUserVisibilityProps.open ||
             isPhotoSwipeOpen ||
             !filteredFiles?.length ||
             !user
@@ -787,7 +781,7 @@ const Page: React.FC = () => {
     const openHiddenSection: GalleryContextType["openHiddenSection"] = (
         callback,
     ) => {
-        authenticateUser(() => {
+        authenticateUser().then(() => {
             dispatch({ type: "showHidden" });
             callback?.();
         });
@@ -827,8 +821,6 @@ const Page: React.FC = () => {
                 syncWithRemote,
                 setBlockingLoad,
                 photoListHeader,
-                openExportModal: showExport,
-                authenticateUser,
                 userIDToEmailMap,
                 user,
                 emailList,
@@ -1007,7 +999,7 @@ const Page: React.FC = () => {
                     {...{ collectionSummaries }}
                     onShowPlanSelector={showPlanSelector}
                     onShowExport={showExport}
-                    onAuthenticateUser={authenticateUser2}
+                    onAuthenticateUser={authenticateUser}
                 />
                 <WhatsNew {...whatsNewVisibilityProps} />
                 {!isInSearchMode &&
@@ -1063,10 +1055,9 @@ const Page: React.FC = () => {
                     {...exportVisibilityProps}
                     allCollectionsNameByID={state.allCollectionsNameByID}
                 />
-                <AuthenticateUserModal
-                    open={authenticateUserModalView}
-                    onClose={closeAuthenticateUserModal}
-                    onAuthenticate={onAuthenticateCallback.current}
+                <AuthenticateUser
+                    {...authenticateUserVisibilityProps}
+                    onAuthenticate={onAuthenticateCallback.current!}
                 />
             </FullScreenDropZone>
         </GalleryContext.Provider>
diff --git a/web/apps/photos/src/types/gallery/index.ts b/web/apps/photos/src/types/gallery/index.ts
index 2b619c5f30..c25c49ecba 100644
--- a/web/apps/photos/src/types/gallery/index.ts
+++ b/web/apps/photos/src/types/gallery/index.ts
@@ -45,8 +45,6 @@ export interface GalleryContextType {
     syncWithRemote: (force?: boolean, silent?: boolean) => Promise<void>;
     setBlockingLoad: (value: boolean) => void;
     photoListHeader: TimeStampListItem;
-    openExportModal: () => void;
-    authenticateUser: (callback: () => void) => void;
     user: User;
     userIDToEmailMap: Map<number, string>;
     emailList: string[];

From 3e6c253a245297307ba85a01d84b534e093c9822 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 18:45:17 +0530
Subject: [PATCH 385/796] Uncontext

---
 web/apps/photos/src/components/PhotoFrame.tsx | 28 +++++--
 .../src/components/PhotoViewer/index.tsx      | 16 ++--
 web/apps/photos/src/pages/gallery.tsx         | 12 +--
 web/apps/photos/src/types/gallery/index.ts    |  2 -
 web/packages/gallery/components/FileInfo.tsx  | 12 +--
 .../gallery/components/viewer/FileViewer.tsx  | 82 +++++++++++++------
 6 files changed, 98 insertions(+), 54 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 8b914da1a9..1535713ed6 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -1,4 +1,5 @@
 import log from "@/base/log";
+import type { FileInfoProps } from "@/gallery/components/FileInfo";
 import {
     downloadManager,
     type LivePhotoSourceURL,
@@ -11,7 +12,7 @@ import { FileViewer } from "@/new/photos/components/FileViewerComponents";
 import type { GalleryBarMode } from "@/new/photos/components/gallery/reducer";
 import { TRASH_SECTION } from "@/new/photos/services/collection";
 import { styled } from "@mui/material";
-import { PhotoViewer, type PhotoViewerProps } from "components/PhotoViewer";
+import { PhotoViewer } from "components/PhotoViewer";
 import { useRouter } from "next/router";
 import { GalleryContext } from "pages/gallery";
 import PhotoSwipe from "photoswipe";
@@ -67,7 +68,13 @@ export type DisplayFile = EnteFile & {
     canForceConvert?: boolean;
 };
 
-export interface PhotoFrameProps {
+export type PhotoFrameProps = Pick<
+    FileInfoProps,
+    | "fileCollectionIDs"
+    | "allCollectionsNameByID"
+    | "onSelectCollection"
+    | "onSelectPerson"
+> & {
     mode?: GalleryBarMode;
     /**
      * This is an experimental prop, to see if we can merge the separate
@@ -112,15 +119,12 @@ export interface PhotoFrameProps {
     /** This will be set if mode is "people". */
     activePersonID?: string | undefined;
     enableDownload?: boolean;
-    fileCollectionIDs?: Map<number, number[]>;
-    allCollectionsNameByID?: Map<number, string>;
     showAppDownloadBanner?: boolean;
     setIsPhotoSwipeOpen?: (value: boolean) => void;
     isInHiddenSection?: boolean;
     setFilesDownloadProgressAttributesCreator?: SetFilesDownloadProgressAttributesCreator;
     selectable?: boolean;
-    onSelectPerson?: PhotoViewerProps["onSelectPerson"];
-}
+};
 
 /**
  * TODO: Rename me to FileListWithViewer (or Gallery?)
@@ -145,6 +149,7 @@ const PhotoFrame = ({
     isInHiddenSection,
     setFilesDownloadProgressAttributesCreator,
     selectable,
+    onSelectCollection,
     onSelectPerson,
 }: PhotoFrameProps) => {
     const [open, setOpen] = useState(false);
@@ -524,6 +529,12 @@ const PhotoFrame = ({
                     onClose={handleClose}
                     files={files}
                     initialIndex={currentIndex}
+                    {...{
+                        fileCollectionIDs,
+                        allCollectionsNameByID,
+                        onSelectCollection,
+                        onSelectPerson,
+                    }}
                 />
             )}
             <AutoSizer>
@@ -555,9 +566,10 @@ const PhotoFrame = ({
                     favoriteFileIDs,
                     markUnsyncedFavoriteUpdate,
                     markTempDeleted,
-                    allCollectionsNameByID,
-                    fileCollectionIDs,
                     setFilesDownloadProgressAttributesCreator,
+                    fileCollectionIDs,
+                    allCollectionsNameByID,
+                    onSelectCollection,
                     onSelectPerson,
                 }}
             />
diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index af1295677a..ed28d55f37 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -9,7 +9,7 @@ import {
 } from "@/base/components/utils/modal";
 import { lowercaseExtension } from "@/base/file-name";
 import log from "@/base/log";
-import { FileInfo, type FileInfoProps } from "@/gallery/components/FileInfo";
+import { FileInfo } from "@/gallery/components/FileInfo";
 import { type FileInfoExif } from "@/gallery/components/viewer/data-source";
 import { downloadManager } from "@/gallery/services/download";
 import { extractRawExif, parseExif } from "@/gallery/services/exif";
@@ -76,7 +76,13 @@ import { PublicCollectionGalleryContext } from "utils/publicCollectionGallery";
 
 export type PhotoViewerProps = Pick<
     PhotoFrameProps,
-    "favoriteFileIDs" | "markUnsyncedFavoriteUpdate" | "markTempDeleted"
+    | "favoriteFileIDs"
+    | "markUnsyncedFavoriteUpdate"
+    | "markTempDeleted"
+    | "fileCollectionIDs"
+    | "allCollectionsNameByID"
+    | "onSelectCollection"
+    | "onSelectPerson"
 > & {
     /**
      * The PhotoViewer is shown when this is `true`.
@@ -102,9 +108,6 @@ export type PhotoViewerProps = Pick<
     isInHiddenSection: boolean;
     enableDownload: boolean;
     setFilesDownloadProgressAttributesCreator: SetFilesDownloadProgressAttributesCreator;
-    fileCollectionIDs?: Map<number, number[]>;
-    allCollectionsNameByID?: Map<number, string>;
-    onSelectPerson?: FileInfoProps["onSelectPerson"];
 };
 
 /**
@@ -138,6 +141,7 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
     setFilesDownloadProgressAttributesCreator,
     fileCollectionIDs,
     allCollectionsNameByID,
+    onSelectCollection,
     onSelectPerson,
 }) => {
     const { showLoadingBar, hideLoadingBar } = usePhotosAppContext();
@@ -733,7 +737,7 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
     };
 
     const handleSelectCollection = (collectionID: number) => {
-        galleryContext.onShowCollection(collectionID);
+        onSelectCollection(collectionID);
         handleClose();
     };
 
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 5dbe443445..d2c83cc341 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -134,7 +134,6 @@ import { FILE_OPS_TYPE, getSelectedFiles, handleFileOps } from "utils/file";
 
 const defaultGalleryContext: GalleryContextType = {
     setActiveCollectionID: () => null,
-    onShowCollection: () => null,
     syncWithRemote: () => null,
     setBlockingLoad: () => null,
     photoListHeader: null,
@@ -813,11 +812,6 @@ const Page: React.FC = () => {
             value={{
                 ...defaultGalleryContext,
                 setActiveCollectionID: handleSetActiveCollectionID,
-                onShowCollection: (id) =>
-                    dispatch({
-                        type: "showNormalOrHiddenCollectionSummary",
-                        collectionSummaryID: id,
-                    }),
                 syncWithRemote,
                 setBlockingLoad,
                 photoListHeader,
@@ -1046,6 +1040,12 @@ const Page: React.FC = () => {
                             setFilesDownloadProgressAttributesCreator
                         }
                         selectable={true}
+                        onSelectCollection={(collectionID) =>
+                            dispatch({
+                                type: "showNormalOrHiddenCollectionSummary",
+                                collectionSummaryID: collectionID,
+                            })
+                        }
                         onSelectPerson={(personID) => {
                             dispatch({ type: "showPerson", personID });
                         }}
diff --git a/web/apps/photos/src/types/gallery/index.ts b/web/apps/photos/src/types/gallery/index.ts
index c25c49ecba..264dd314cf 100644
--- a/web/apps/photos/src/types/gallery/index.ts
+++ b/web/apps/photos/src/types/gallery/index.ts
@@ -40,8 +40,6 @@ export interface MergedSourceURL {
 
 export interface GalleryContextType {
     setActiveCollectionID: (collectionID: number) => void;
-    /** Newer and almost equivalent alternative to setActiveCollectionID. */
-    onShowCollection: (collectionID: number) => void;
     syncWithRemote: (force?: boolean, silent?: boolean) => Promise<void>;
     setBlockingLoad: (value: boolean) => void;
     photoListHeader: TimeStampListItem;
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 3a0c46d9d8..045b217e17 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -124,8 +124,9 @@ export type FileInfoProps = ModalVisibilityProps & {
      * If set, then a clickable chip will be shown for each collection that this
      * file is a part of.
      *
-     * Uses {@link fileCollectionIDs} and {@link allCollectionsNameByID}, so
-     * both of those props should also be set for this to have an effect.
+     * Uses {@link fileCollectionIDs}, {@link allCollectionsNameByID} and
+     * {@link onSelectCollection}, so all of those props should also be set for
+     * this to have an effect.
      */
     showCollections?: boolean;
     /**
@@ -146,11 +147,11 @@ export type FileInfoProps = ModalVisibilityProps & {
      * Called when the user selects a collection from among the collections that
      * the file belongs to.
      */
-    onSelectCollection: (collectionID: number) => void;
+    onSelectCollection?: (collectionID: number) => void;
     /**
      * Called when the user selects a person in the file info panel.
      */
-    onSelectPerson?: ((personID: string) => void) | undefined;
+    onSelectPerson?: (personID: string) => void;
 };
 
 export const FileInfo: React.FC<FileInfoProps> = ({
@@ -315,7 +316,8 @@ export const FileInfo: React.FC<FileInfoProps> = ({
                 )}
                 {showCollections &&
                     fileCollectionIDs &&
-                    allCollectionsNameByID && (
+                    allCollectionsNameByID &&
+                    onSelectCollection && (
                         <InfoItem icon={<FolderOutlinedIcon />}>
                             <Stack
                                 direction="row"
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index fd2b0ca0a3..ec1fdb36ca 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -17,39 +17,48 @@ import {
     useModalVisibility,
     type ModalVisibilityProps,
 } from "@/base/components/utils/modal";
-import { FileInfo } from "@/gallery/components/FileInfo";
+import { FileInfo, type FileInfoProps } from "@/gallery/components/FileInfo";
 import type { EnteFile } from "@/media/file.js";
 import { Button, styled } from "@mui/material";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { fileInfoExifForFile, type FileInfoExif } from "./data-source";
 import { FileViewerPhotoSwipe } from "./photoswipe";
 
-export type FileViewerProps = ModalVisibilityProps & {
-    /**
-     * The list of files that are currently being displayed in the context in
-     * which the file viewer was invoked.
-     *
-     * Although the file viewer is called on to display a particular file
-     * (specified by the {@link initialIndex} prop), the viewer is always used
-     * in the context of a an album, or search results, or some other arbitrary
-     * list of files. The {@link files} prop sets this underlying list of files.
-     *
-     * After the initial file has been shown, the user can navigate through the
-     * other files from within the viewer by using the arrow buttons.
-     */
-    files: EnteFile[];
-    /**
-     * The index of the file that should be initially shown.
-     *
-     * Subsequently the user may navigate between files by using the controls
-     * provided within the file viewer itself.
-     */
-    initialIndex: number;
-    /**
-     * If true then the viewer does not show controls for downloading the file.
-     */
-    disableDownload?: boolean;
-};
+export type FileViewerProps = ModalVisibilityProps &
+    Pick<
+        FileInfoProps,
+        | "fileCollectionIDs"
+        | "allCollectionsNameByID"
+        | "onSelectCollection"
+        | "onSelectPerson"
+    > & {
+        /**
+         * The list of files that are currently being displayed in the context
+         * in which the file viewer was invoked.
+         *
+         * Although the file viewer is called on to display a particular file
+         * (specified by the {@link initialIndex} prop), the viewer is always
+         * used in the context of a an album, or search results, or some other
+         * arbitrary list of files. The {@link files} prop sets this underlying
+         * list of files.
+         *
+         * After the initial file has been shown, the user can navigate through
+         * the other files from within the viewer by using the arrow buttons.
+         */
+        files: EnteFile[];
+        /**
+         * The index of the file that should be initially shown.
+         *
+         * Subsequently the user may navigate between files by using the
+         * controls provided within the file viewer itself.
+         */
+        initialIndex: number;
+        /**
+         * If true then the viewer does not show controls for downloading the
+         * file.
+         */
+        disableDownload?: boolean;
+    };
 
 /**
  * A PhotoSwipe based image and video viewer.
@@ -60,6 +69,10 @@ const FileViewer: React.FC<FileViewerProps> = ({
     files,
     initialIndex,
     disableDownload,
+    fileCollectionIDs,
+    allCollectionsNameByID,
+    onSelectCollection,
+    onSelectPerson,
 }) => {
     const pswpRef = useRef<FileViewerPhotoSwipe | undefined>();
 
@@ -93,6 +106,18 @@ const FileViewer: React.FC<FileViewerProps> = ({
         [showFileInfo],
     );
 
+    const handleSelectCollection = (collectionID: number) => {
+        onSelectCollection(collectionID);
+        onClose();
+    };
+
+    const handleSelectPerson = onSelectPerson
+        ? (personID: string) => {
+              onSelectPerson(personID);
+              onClose();
+          }
+        : undefined;
+
     useEffect(() => {
         if (!open) {
             // The close state will be handled by the cleanup function.
@@ -136,6 +161,9 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 {...fileInfoVisibilityProps}
                 file={activeFile}
                 exif={activeFileExif}
+                onSelectCollection={handleSelectCollection}
+                onSelectPerson={handleSelectPerson}
+                {...{ fileCollectionIDs, allCollectionsNameByID }}
             />
         </Container>
     );

From ee2f03adca7b4e2a120eb25ff6b7bca7f54a7db5 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 20 Feb 2025 18:55:59 +0530
Subject: [PATCH 386/796] Fix

---
 web/apps/photos/src/components/Upload.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/apps/photos/src/components/Upload.tsx b/web/apps/photos/src/components/Upload.tsx
index b266a9e8f0..44cb1cf277 100644
--- a/web/apps/photos/src/components/Upload.tsx
+++ b/web/apps/photos/src/components/Upload.tsx
@@ -103,8 +103,11 @@ interface UploadProps {
     onUploadFile: (file: EnteFile) => void;
     /**
      * Called when the plan selection modal should be shown.
+     *
+     * It is optional because {@link Upload} is also used by the public albums
+     * app, where the scenario requiring this will not arise.
      */
-    onShowPlanSelector: () => void;
+    onShowPlanSelector?: () => void;
     setCollections?: (cs: Collection[]) => void;
     isFirstUpload?: boolean;
     uploadTypeSelectorView: boolean;

From 3669b6be09d404d06e55fbcc8880132b876eba61 Mon Sep 17 00:00:00 2001
From: Francis Geronimo <midtown1672@gmail.com>
Date: Thu, 20 Feb 2025 09:45:01 -0700
Subject: [PATCH 387/796] Rename Butterflymx.svg to butterflymx.svg

---
 .../custom-icons/icons/{Butterflymx.svg => butterflymx.svg}       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename auth/assets/custom-icons/icons/{Butterflymx.svg => butterflymx.svg} (100%)

diff --git a/auth/assets/custom-icons/icons/Butterflymx.svg b/auth/assets/custom-icons/icons/butterflymx.svg
similarity index 100%
rename from auth/assets/custom-icons/icons/Butterflymx.svg
rename to auth/assets/custom-icons/icons/butterflymx.svg

From 0b1eee6c8e30593d8666a91177fb4ea00849ed40 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 10:51:26 +0530
Subject: [PATCH 388/796] select all by date is the culprit

for 100k
t0: 291.615234375 ms
t1: 4.695068359375 ms
t2: 5.75 ms
t3: 5.9921875 ms
t4: 0.014892578125 ms
t5: 0.794921875 ms
t6: 0.0029296875 ms
---
 .../photos/src/components/PhotoList/index.tsx | 40 +++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoList/index.tsx b/web/apps/photos/src/components/PhotoList/index.tsx
index 669abdb948..00d4e9226b 100644
--- a/web/apps/photos/src/components/PhotoList/index.tsx
+++ b/web/apps/photos/src/components/PhotoList/index.tsx
@@ -743,21 +743,36 @@ export function PhotoList({
         // Nothing to do here if nothing is selected.
         if (!galleryContext.selectedFile) return;
 
-        const notSelectedFiles = displayFiles?.filter(
+        console.time("t0");
+        const datedDisplayFiles = displayFiles?.map((item) => ({
+            ...item,
+            date: getDate(item),
+        }));
+        console.timeEnd("t0");
+        console.time("t1");
+        const notSelectedFiles = datedDisplayFiles?.filter(
             (item) => !galleryContext.selectedFile[item.id],
         );
-        const unselectedDates = [
-            ...new Set(notSelectedFiles?.map((item) => getDate(item))), // to get file's date which were manually unselected
-        ];
+        console.timeEnd("t1");
+        console.time("t2");
+        const unselectedDates = new Set(
+            notSelectedFiles?.map((item) => item.date),
+        ); // to get file's date which were manually unselected
 
-        const localSelectedFiles = displayFiles.filter(
+        console.timeEnd("t2");
+        console.time("t3");
+        const localSelectedFiles = datedDisplayFiles.filter(
             // to get files which were manually selected
-            (item) => !unselectedDates.includes(getDate(item)),
+            (item) => !unselectedDates.has(item.date),
         );
+        console.timeEnd("t3");
+        console.time("t4");
 
         const localSelectedDates = [
-            ...new Set(localSelectedFiles?.map((item) => getDate(item))),
+            ...new Set(localSelectedFiles?.map((item) => item.date)),
         ]; // to get file's date which were manually selected
+        console.timeEnd("t4");
+        console.time("t5");
 
         unselectedDates.forEach((date) => {
             setCheckedDates((prev) => ({
@@ -765,6 +780,8 @@ export function PhotoList({
                 [date]: false,
             })); // To uncheck select all checkbox if any of the file on the date is unselected
         });
+        console.timeEnd("t5");
+        console.time("t6");
 
         localSelectedDates.map((date) => {
             setCheckedDates((prev) => ({
@@ -773,6 +790,15 @@ export function PhotoList({
             }));
             // To check select all checkbox if all of the files on the date is selected manually
         });
+
+        console.timeEnd("t6");
+
+        console.log({
+            notSelectedFiles,
+            localSelectedFiles,
+            localSelectedDates,
+            unselectedDatesLen: unselectedDates.size,
+        });
     }, [galleryContext.selectedFile]);
 
     const handleSelect = handleSelectCreator(

From 3214031a0cade360f031e046cd734dd8e6d81c9d Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 11:07:18 +0530
Subject: [PATCH 389/796] Reuse

---
 web/apps/photos/src/components/PhotoList/index.tsx | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoList/index.tsx b/web/apps/photos/src/components/PhotoList/index.tsx
index 00d4e9226b..fd30652db2 100644
--- a/web/apps/photos/src/components/PhotoList/index.tsx
+++ b/web/apps/photos/src/components/PhotoList/index.tsx
@@ -434,14 +434,7 @@ export function PhotoList({
 
                 timeStampList.push({
                     itemType: ITEM_TYPE.TIME,
-                    date: isSameDay(new Date(currentDate), new Date())
-                        ? t("TODAY")
-                        : isSameDay(
-                                new Date(currentDate),
-                                new Date(Date.now() - A_DAY),
-                            )
-                          ? t("YESTERDAY")
-                          : formatDate(currentDate),
+                    date: _getDate(currentDate),
                     id: currentDate.toString(),
                 });
                 timeStampList.push({
@@ -949,6 +942,10 @@ const A_DAY = 24 * 60 * 60 * 1000;
 
 const getDate = (item: EnteFile) => {
     const currentDate = item.metadata.creationTime / 1000;
+    return _getDate(currentDate);
+};
+
+const _getDate = (currentDate: number) => {
     const date = isSameDay(new Date(currentDate), new Date())
         ? t("TODAY")
         : isSameDay(new Date(currentDate), new Date(Date.now() - A_DAY))

From 587da41f5398a79506e0c2ba4f365064f07c80f7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 11:53:42 +0530
Subject: [PATCH 390/796] Dup

---
 web/packages/base/i18n-date.ts | 39 ++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/web/packages/base/i18n-date.ts b/web/packages/base/i18n-date.ts
index 1c60e56d1e..dbe740c70f 100644
--- a/web/packages/base/i18n-date.ts
+++ b/web/packages/base/i18n-date.ts
@@ -6,6 +6,45 @@
  */
 import i18n from "i18next";
 
+const _dateFormat = new Intl.DateTimeFormat(i18n.language, {
+    weekday: "short",
+    day: "numeric",
+    month: "short",
+    year: "numeric",
+});
+
+const _dateWithoutYearFormat = new Intl.DateTimeFormat(i18n.language, {
+    weekday: "short",
+    day: "numeric",
+    month: "short",
+});
+
+const _timeFormat = new Intl.DateTimeFormat(i18n.language, {
+    timeStyle: "short",
+});
+
+/**
+ * Return a locale aware formatted date from the given {@link Date}.
+ *
+ * Example: "Fri, 21 Feb 2025"
+ */
+export const formattedDate = (date: Date) => _dateFormat.format(date);
+
+/**
+ * A variant of {@link formattedDate} that omits the year.
+ *
+ * Example: "Fri, 21 Feb"
+ */
+export const formattedDateWithoutYear = (date: Date) =>
+    _dateWithoutYearFormat.format(date);
+
+/**
+ * Return a locale aware formatted time from the given {@link Date}.
+ *
+ * Example: "11:51 AM"
+ */
+export const formattedTime = (date: Date) => _timeFormat.format(date);
+
 let _relativeTimeFormat: Intl.RelativeTimeFormat | undefined;
 
 export const formattedDateRelative = (date: Date) => {

From 4317f819d826878b0c7017721cff6aa897cd38af Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 12:07:31 +0530
Subject: [PATCH 391/796] mod

---
 web/packages/base/i18n-date.ts | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/web/packages/base/i18n-date.ts b/web/packages/base/i18n-date.ts
index dbe740c70f..56d751387c 100644
--- a/web/packages/base/i18n-date.ts
+++ b/web/packages/base/i18n-date.ts
@@ -26,17 +26,18 @@ const _timeFormat = new Intl.DateTimeFormat(i18n.language, {
 /**
  * Return a locale aware formatted date from the given {@link Date}.
  *
- * Example: "Fri, 21 Feb 2025"
- */
-export const formattedDate = (date: Date) => _dateFormat.format(date);
-
-/**
- * A variant of {@link formattedDate} that omits the year.
+ * The behaviour depends upon whether the given {@link date} falls within the
+ * current calendar year.
  *
- * Example: "Fri, 21 Feb"
+ * - For dates in the current year, year is omitted. Example: "Fri, 21 Feb"
+ *
+ * - Otherwise, the year is included. Example: "Fri, 21 Feb 2025"
  */
-export const formattedDateWithoutYear = (date: Date) =>
-    _dateWithoutYearFormat.format(date);
+export const formattedDate = (date: Date) =>
+    (isSameYear(date) ? _dateWithoutYearFormat : _dateFormat).format(date);
+
+const isSameYear = (date: Date) =>
+    new Date().getFullYear() === date.getFullYear();
 
 /**
  * Return a locale aware formatted time from the given {@link Date}.

From f907303c8b9c829264aedd9a0f8187f8756bee34 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 21 Feb 2025 12:08:16 +0530
Subject: [PATCH 392/796] [server] move files

---
 server/cmd/museum/main.go                                  | 3 ++-
 server/pkg/api/cast.go                                     | 3 ++-
 server/pkg/api/collection.go                               | 3 ++-
 server/pkg/api/public_collection.go                        | 3 ++-
 server/pkg/controller/{ => collections}/collection.go      | 7 ++++---
 server/pkg/controller/{ => collections}/collection_cast.go | 2 +-
 server/pkg/controller/file_copy/file_copy.go               | 3 ++-
 server/pkg/controller/user/user.go                         | 5 +++--
 8 files changed, 18 insertions(+), 11 deletions(-)
 rename server/pkg/controller/{ => collections}/collection.go (99%)
 rename server/pkg/controller/{ => collections}/collection_cast.go (98%)

diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go
index 8f41e79d03..9efaf5141d 100644
--- a/server/cmd/museum/main.go
+++ b/server/cmd/museum/main.go
@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	b64 "encoding/base64"
 	"fmt"
+	"github.com/ente-io/museum/pkg/controller/collections"
 	"net/http"
 	"os"
 	"os/signal"
@@ -305,7 +306,7 @@ func main() {
 		JwtSecret:             jwtSecretBytes,
 	}
 
-	collectionController := &controller.CollectionController{
+	collectionController := &collections.CollectionController{
 		CollectionRepo:       collectionRepo,
 		EmailCtrl:            emailNotificationCtrl,
 		AccessCtrl:           accessCtrl,
diff --git a/server/pkg/api/cast.go b/server/pkg/api/cast.go
index 9012624d32..0fcac8a364 100644
--- a/server/pkg/api/cast.go
+++ b/server/pkg/api/cast.go
@@ -5,6 +5,7 @@ import (
 	entity "github.com/ente-io/museum/ente/cast"
 	"github.com/ente-io/museum/pkg/controller"
 	"github.com/ente-io/museum/pkg/controller/cast"
+	"github.com/ente-io/museum/pkg/controller/collections"
 	"github.com/ente-io/museum/pkg/utils/handler"
 	"github.com/ente-io/stacktrace"
 	"github.com/gin-gonic/gin"
@@ -16,7 +17,7 @@ import (
 // CastHandler exposes request handlers for publicly accessible collections
 type CastHandler struct {
 	FileCtrl       *controller.FileController
-	CollectionCtrl *controller.CollectionController
+	CollectionCtrl *collections.CollectionController
 	Ctrl           *cast.Controller
 }
 
diff --git a/server/pkg/api/collection.go b/server/pkg/api/collection.go
index 57cc8c4f28..e810098cac 100644
--- a/server/pkg/api/collection.go
+++ b/server/pkg/api/collection.go
@@ -2,6 +2,7 @@ package api
 
 import (
 	"fmt"
+	"github.com/ente-io/museum/pkg/controller/collections"
 	"net/http"
 	"strconv"
 
@@ -18,7 +19,7 @@ import (
 
 // CollectionHandler exposes request handlers for all collection related requests
 type CollectionHandler struct {
-	Controller *controller.CollectionController
+	Controller *collections.CollectionController
 }
 
 // Create creates a collection
diff --git a/server/pkg/api/public_collection.go b/server/pkg/api/public_collection.go
index b6d2d79a94..d66c1ff2c1 100644
--- a/server/pkg/api/public_collection.go
+++ b/server/pkg/api/public_collection.go
@@ -2,6 +2,7 @@ package api
 
 import (
 	"fmt"
+	"github.com/ente-io/museum/pkg/controller/collections"
 	"net/http"
 	"strconv"
 
@@ -19,7 +20,7 @@ import (
 type PublicCollectionHandler struct {
 	Controller             *controller.PublicCollectionController
 	FileCtrl               *controller.FileController
-	CollectionCtrl         *controller.CollectionController
+	CollectionCtrl         *collections.CollectionController
 	StorageBonusController *storagebonus.Controller
 }
 
diff --git a/server/pkg/controller/collection.go b/server/pkg/controller/collections/collection.go
similarity index 99%
rename from server/pkg/controller/collection.go
rename to server/pkg/controller/collections/collection.go
index 52c6a32418..cbbfe35e5a 100644
--- a/server/pkg/controller/collection.go
+++ b/server/pkg/controller/collections/collection.go
@@ -1,9 +1,10 @@
-package controller
+package collections
 
 import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/ente-io/museum/pkg/controller"
 	"runtime/debug"
 	"strings"
 
@@ -32,10 +33,10 @@ const (
 
 // CollectionController encapsulates logic that deals with collections
 type CollectionController struct {
-	PublicCollectionCtrl *PublicCollectionController
+	PublicCollectionCtrl *controller.PublicCollectionController
 	EmailCtrl            *email.EmailNotificationController
 	AccessCtrl           access.Controller
-	BillingCtrl          *BillingController
+	BillingCtrl          *controller.BillingController
 	CollectionRepo       *repo.CollectionRepository
 	UserRepo             *repo.UserRepository
 	FileRepo             *repo.FileRepository
diff --git a/server/pkg/controller/collection_cast.go b/server/pkg/controller/collections/collection_cast.go
similarity index 98%
rename from server/pkg/controller/collection_cast.go
rename to server/pkg/controller/collections/collection_cast.go
index 9b975279b2..e29452e2fb 100644
--- a/server/pkg/controller/collection_cast.go
+++ b/server/pkg/controller/collections/collection_cast.go
@@ -1,4 +1,4 @@
-package controller
+package collections
 
 import (
 	"github.com/ente-io/museum/ente"
diff --git a/server/pkg/controller/file_copy/file_copy.go b/server/pkg/controller/file_copy/file_copy.go
index 4f9267e2e9..0d718f4264 100644
--- a/server/pkg/controller/file_copy/file_copy.go
+++ b/server/pkg/controller/file_copy/file_copy.go
@@ -5,6 +5,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/ente-io/museum/ente"
 	"github.com/ente-io/museum/pkg/controller"
+	"github.com/ente-io/museum/pkg/controller/collections"
 	"github.com/ente-io/museum/pkg/repo"
 	"github.com/ente-io/museum/pkg/utils/auth"
 	"github.com/ente-io/museum/pkg/utils/s3config"
@@ -23,7 +24,7 @@ type FileCopyController struct {
 	S3Config       *s3config.S3Config
 	FileController *controller.FileController
 	FileRepo       *repo.FileRepository
-	CollectionCtrl *controller.CollectionController
+	CollectionCtrl *collections.CollectionController
 	ObjectRepo     *repo.ObjectRepository
 }
 
diff --git a/server/pkg/controller/user/user.go b/server/pkg/controller/user/user.go
index 7f5d5d0374..c72d50546b 100644
--- a/server/pkg/controller/user/user.go
+++ b/server/pkg/controller/user/user.go
@@ -3,6 +3,7 @@ package user
 import (
 	"errors"
 	"fmt"
+	"github.com/ente-io/museum/pkg/controller/collections"
 	"github.com/ente-io/museum/pkg/repo/two_factor_recovery"
 	"strings"
 
@@ -38,7 +39,7 @@ type UserController struct {
 	FileRepo               *repo.FileRepository
 	CollectionRepo         *repo.CollectionRepository
 	DataCleanupRepo        *datacleanup.Repository
-	CollectionCtrl         *controller.CollectionController
+	CollectionCtrl         *collections.CollectionController
 	BillingRepo            *repo.BillingRepository
 	BillingController      *controller.BillingController
 	FamilyController       *family.Controller
@@ -101,7 +102,7 @@ func NewUserController(
 	passkeyRepo *passkey.Repository,
 	storageBonusRepo *storageBonusRepo.Repository,
 	fileRepo *repo.FileRepository,
-	collectionController *controller.CollectionController,
+	collectionController *collections.CollectionController,
 	collectionRepo *repo.CollectionRepository,
 	dataCleanupRepository *datacleanup.Repository,
 	billingRepo *repo.BillingRepository,

From 1b90fa93eea96cdddf7df884d099931ce1100a29 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 12:18:43 +0530
Subject: [PATCH 393/796] Use

---
 web/packages/base/i18n-date.ts               |  4 +-
 web/packages/gallery/components/FileInfo.tsx | 40 ++++++++++----------
 web/packages/shared/time/format.ts           |  2 +-
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/web/packages/base/i18n-date.ts b/web/packages/base/i18n-date.ts
index 56d751387c..2a8e21f95f 100644
--- a/web/packages/base/i18n-date.ts
+++ b/web/packages/base/i18n-date.ts
@@ -29,9 +29,9 @@ const _timeFormat = new Intl.DateTimeFormat(i18n.language, {
  * The behaviour depends upon whether the given {@link date} falls within the
  * current calendar year.
  *
- * - For dates in the current year, year is omitted. Example: "Fri, 21 Feb"
+ * - For dates in the current year, year is omitted, e.g, "Fri, 21 Feb".
  *
- * - Otherwise, the year is included. Example: "Fri, 21 Feb 2025"
+ * - Otherwise, the year is included, e.g., "Fri, 21 Feb 2025".
  */
 export const formattedDate = (date: Date) =>
     (isSameYear(date) ? _dateWithoutYearFormat : _dateFormat).format(date);
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 045b217e17..b60e0863f1 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -21,6 +21,7 @@ import {
 import { useBaseContext } from "@/base/context";
 import { haveWindow } from "@/base/env";
 import { nameAndExtension } from "@/base/file-name";
+import { formattedDate, formattedTime } from "@/base/i18n-date";
 import log from "@/base/log";
 import type { Location } from "@/base/types";
 import { CopyButton } from "@/gallery/components/FileInfoComponents";
@@ -62,7 +63,6 @@ import SingleInputForm, {
     type SingleInputFormProps,
 } from "@ente/shared/components/SingleInputForm";
 import { getPublicMagicMetadataSync } from "@ente/shared/file-metadata";
-import { formatDate, formatTime } from "@ente/shared/time/format";
 import CalendarTodayIcon from "@mui/icons-material/CalendarToday";
 import CameraOutlinedIcon from "@mui/icons-material/CameraOutlined";
 import CloseIcon from "@mui/icons-material/Close";
@@ -480,24 +480,22 @@ const InfoItem: React.FC<React.PropsWithChildren<InfoItemProps>> = ({
         sx={{ alignItems: "flex-start", flex: 1, gap: "12px" }}
     >
         <InfoItemIconContainer>{icon}</InfoItemIconContainer>
-        <Box sx={{ flex: 1, mt: "4px" }}>
-            {children ?? (
-                <>
-                    <Typography sx={{ wordBreak: "break-all" }}>
-                        {title}
-                    </Typography>
-                    <Typography
-                        variant="small"
-                        {...(typeof caption == "string"
-                            ? {}
-                            : { component: "div" })}
-                        sx={{ color: "text.muted" }}
-                    >
-                        {caption}
-                    </Typography>
-                </>
-            )}
-        </Box>
+        {children ? (
+            <Box sx={{ flex: 1, mt: "4px" }}>{children}</Box>
+        ) : (
+            <Stack sx={{ flex: 1, mt: "4px", gap: "4px" }}>
+                <Typography sx={{ wordBreak: "break-all" }}>{title}</Typography>
+                <Typography
+                    variant="small"
+                    {...(typeof caption == "string"
+                        ? {}
+                        : { component: "div" })}
+                    sx={{ color: "text.muted" }}
+                >
+                    {caption}
+                </Typography>
+            </Stack>
+        )}
         {trailingButton}
     </Stack>
 );
@@ -717,8 +715,8 @@ const CreationTime: React.FC<CreationTimeProps> = ({
             <FlexWrapper>
                 <InfoItem
                     icon={<CalendarTodayIcon />}
-                    title={formatDate(originalDate)}
-                    caption={formatTime(originalDate)}
+                    title={formattedDate(originalDate)}
+                    caption={formattedTime(originalDate)}
                     trailingButton={
                         allowEdits && (
                             <EditButton
diff --git a/web/packages/shared/time/format.ts b/web/packages/shared/time/format.ts
index 4a728cad4d..06638a66c6 100644
--- a/web/packages/shared/time/format.ts
+++ b/web/packages/shared/time/format.ts
@@ -32,7 +32,7 @@ export function formatDate(date: number | Date) {
         .join(" ");
 }
 
-export function formatTime(date: number | Date) {
+function formatTime(date: number | Date) {
     return timeFormatter.format(date).toUpperCase();
 }
 

From 6b65a974b568956b2f892aa5e93ae74eed7c87b3 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 21 Feb 2025 12:28:11 +0530
Subject: [PATCH 394/796] [server] Refactor

---
 .../{collection_cast.go => cast.go}           |   0
 .../pkg/controller/collections/collection.go  | 606 +-----------------
 server/pkg/controller/collections/diff.go     |  60 ++
 .../pkg/controller/collections/file_action.go | 203 ++++++
 .../pkg/controller/collections/files_diff.go  | 111 ++++
 server/pkg/controller/collections/share.go    | 269 ++++++++
 6 files changed, 644 insertions(+), 605 deletions(-)
 rename server/pkg/controller/collections/{collection_cast.go => cast.go} (100%)
 create mode 100644 server/pkg/controller/collections/diff.go
 create mode 100644 server/pkg/controller/collections/file_action.go
 create mode 100644 server/pkg/controller/collections/files_diff.go
 create mode 100644 server/pkg/controller/collections/share.go

diff --git a/server/pkg/controller/collections/collection_cast.go b/server/pkg/controller/collections/cast.go
similarity index 100%
rename from server/pkg/controller/collections/collection_cast.go
rename to server/pkg/controller/collections/cast.go
diff --git a/server/pkg/controller/collections/collection.go b/server/pkg/controller/collections/collection.go
index cbbfe35e5a..5f096bc133 100644
--- a/server/pkg/controller/collections/collection.go
+++ b/server/pkg/controller/collections/collection.go
@@ -2,20 +2,11 @@ package collections
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"github.com/ente-io/museum/pkg/controller"
-	"runtime/debug"
-	"strings"
-
-	"github.com/ente-io/museum/pkg/repo/cast"
-
 	"github.com/ente-io/museum/pkg/controller/access"
 	"github.com/ente-io/museum/pkg/controller/email"
-	"github.com/gin-contrib/requestid"
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-
+	"github.com/ente-io/museum/pkg/repo/cast"
 	"github.com/ente-io/museum/pkg/utils/array"
 	"github.com/ente-io/museum/pkg/utils/auth"
 	"github.com/gin-gonic/gin"
@@ -79,46 +70,6 @@ func (c *CollectionController) Create(collection ente.Collection, ownerID int64)
 	return collection, nil
 }
 
-// GetOwned returns the list of collections owned by a user
-func (c *CollectionController) GetOwned(userID int64, sinceTime int64, app ente.App) ([]ente.Collection, error) {
-	collections, err := c.CollectionRepo.GetCollectionsOwnedByUser(userID, sinceTime, app)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	go func() {
-		defer func() {
-			if r := recover(); r != nil {
-				log.Errorf("Panic caught: %s, stack: %s", r, string(debug.Stack()))
-			}
-		}()
-		collectionsV2, errV2 := c.CollectionRepo.GetCollectionsOwnedByUserV2(userID, sinceTime, app)
-		if errV2 != nil {
-			log.WithError(errV2).Error("failed to fetch collections using v2")
-		}
-		isEqual := cmp.Equal(collections, collectionsV2, cmpopts.SortSlices(func(a, b ente.Collection) bool { return a.ID < b.ID }))
-		if !isEqual {
-			jsonV1, _ := json.Marshal(collections)
-			jsonV2, _ := json.Marshal(collectionsV2)
-			log.WithFields(log.Fields{
-				"v1": string(jsonV1),
-				"v2": string(jsonV2),
-			}).Error("collections diff didn't match")
-		} else {
-			log.Info("collections diff matched")
-		}
-	}()
-	return collections, nil
-}
-
-// GetOwnedV2 returns the list of collections owned by a user using optimized query
-func (c *CollectionController) GetOwnedV2(userID int64, sinceTime int64, app ente.App) ([]ente.Collection, error) {
-	collections, err := c.CollectionRepo.GetCollectionsOwnedByUserV2(userID, sinceTime, app)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	return collections, nil
-}
-
 // GetCollection returns the collection for given collectionID
 func (c *CollectionController) GetCollection(ctx *gin.Context, userID int64, cID int64) (ente.Collection, error) {
 	resp, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
@@ -132,460 +83,6 @@ func (c *CollectionController) GetCollection(ctx *gin.Context, userID int64, cID
 	return resp.Collection, nil
 }
 
-// GetSharedWith returns the list of collections that are shared with a user
-func (c *CollectionController) GetSharedWith(userID int64, sinceTime int64, app ente.App) ([]ente.Collection, error) {
-	collections, err := c.CollectionRepo.GetCollectionsSharedWithUser(userID, sinceTime, app)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	return collections, nil
-}
-
-// Share shares a collection with a user
-func (c *CollectionController) Share(ctx *gin.Context, req ente.AlterShareRequest) ([]ente.CollectionUser, error) {
-	fromUserID := auth.GetUserID(ctx.Request.Header)
-	cID := req.CollectionID
-	encryptedKey := req.EncryptedKey
-	toUserEmail := strings.ToLower(strings.TrimSpace(req.Email))
-	// default role type
-	role := ente.VIEWER
-	if req.Role != nil {
-		role = *req.Role
-	}
-
-	toUserID, err := c.UserRepo.GetUserIDWithEmail(toUserEmail)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	if toUserID == fromUserID {
-		return nil, stacktrace.Propagate(ente.ErrBadRequest, "Can not share collection with self")
-	}
-	collection, err := c.CollectionRepo.Get(cID)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	if !collection.AllowSharing() {
-		return nil, stacktrace.Propagate(ente.ErrBadRequest, fmt.Sprintf("sharing %s is not allowed", collection.Type))
-	}
-	if fromUserID != collection.Owner.ID {
-		return nil, stacktrace.Propagate(ente.ErrPermissionDenied, "")
-	}
-	err = c.BillingCtrl.HasActiveSelfOrFamilySubscription(fromUserID, true)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	err = c.CollectionRepo.Share(cID, fromUserID, toUserID, encryptedKey, role, time.Microseconds())
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	sharees, err := c.GetSharees(ctx, cID, fromUserID)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	return sharees, nil
-}
-
-func (c *CollectionController) JoinViaLink(ctx *gin.Context, req ente.JoinCollectionViaLinkRequest) error {
-	userID := auth.GetUserID(ctx.Request.Header)
-	collection, err := c.CollectionRepo.Get(req.CollectionID)
-	if err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-	if collection.Owner.ID == userID {
-		return stacktrace.Propagate(ente.ErrBadRequest, "owner can not join via link")
-	}
-	if !collection.AllowSharing() {
-		return stacktrace.Propagate(ente.ErrBadRequest, fmt.Sprintf("joining %s is not allowed", collection.Type))
-	}
-	publicCollectionToken, err := c.PublicCollectionCtrl.GetActivePublicCollectionToken(ctx, req.CollectionID)
-	if err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-
-	if canJoin := publicCollectionToken.CanJoin(); canJoin != nil {
-		return stacktrace.Propagate(ente.ErrBadRequest, fmt.Sprintf("can not join collection: %s", canJoin.Error()))
-	}
-	accessToken := auth.GetAccessToken(ctx)
-	if publicCollectionToken.Token != accessToken {
-		return stacktrace.Propagate(ente.ErrPermissionDenied, "token doesn't match collection")
-	}
-	if publicCollectionToken.PassHash != nil && *publicCollectionToken.PassHash != "" {
-		accessTokenJWT := auth.GetAccessTokenJWT(ctx)
-		if passCheckErr := c.PublicCollectionCtrl.ValidateJWTToken(ctx, accessTokenJWT, *publicCollectionToken.PassHash); passCheckErr != nil {
-			return stacktrace.Propagate(passCheckErr, "")
-		}
-	}
-	err = c.BillingCtrl.HasActiveSelfOrFamilySubscription(collection.Owner.ID, true)
-	if err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-	role := ente.VIEWER
-	if publicCollectionToken.EnableCollect {
-		role = ente.COLLABORATOR
-	}
-	joinErr := c.CollectionRepo.Share(req.CollectionID, collection.Owner.ID, userID, req.EncryptedKey, role, time.Microseconds())
-	if joinErr != nil {
-		return stacktrace.Propagate(joinErr, "")
-	}
-	go c.EmailCtrl.OnLinkJoined(collection.Owner.ID, userID, role)
-	return nil
-}
-
-// UnShare unshares a collection with a user
-func (c *CollectionController) UnShare(ctx *gin.Context, cID int64, fromUserID int64, toUserEmail string) ([]ente.CollectionUser, error) {
-	toUserID, err := c.UserRepo.GetUserIDWithEmail(toUserEmail)
-	if err != nil {
-		return nil, stacktrace.Propagate(ente.ErrNotFound, "")
-	}
-	collection, err := c.CollectionRepo.Get(cID)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	isLeavingCollection := toUserID == fromUserID
-	if fromUserID != collection.Owner.ID || isLeavingCollection {
-		return nil, stacktrace.Propagate(ente.ErrPermissionDenied, "")
-	}
-	err = c.CollectionRepo.UnShare(cID, toUserID)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	err = c.CastRepo.RevokeForGivenUserAndCollection(ctx, cID, toUserID)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	sharees, err := c.GetSharees(ctx, cID, fromUserID)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	return sharees, nil
-}
-
-// Leave leaves the collection owned by someone else,
-func (c *CollectionController) Leave(ctx *gin.Context, cID int64) error {
-	userID := auth.GetUserID(ctx.Request.Header)
-	collection, err := c.CollectionRepo.Get(cID)
-	if err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-	if userID == collection.Owner.ID {
-		return stacktrace.Propagate(ente.ErrPermissionDenied, "can not leave collection owned by self")
-	}
-	sharedCollectionIDs, err := c.CollectionRepo.GetCollectionIDsSharedWithUser(userID)
-	if err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-	if !array.Int64InList(cID, sharedCollectionIDs) {
-		return nil
-	}
-	err = c.CastRepo.RevokeForGivenUserAndCollection(ctx, cID, userID)
-	if err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-	err = c.CollectionRepo.UnShare(cID, userID)
-	if err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-	return nil
-}
-
-func (c *CollectionController) UpdateShareeMagicMetadata(ctx *gin.Context, req ente.UpdateCollectionMagicMetadata) error {
-	actorUserId := auth.GetUserID(ctx.Request.Header)
-	resp, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
-		CollectionID: req.ID,
-		ActorUserID:  actorUserId,
-	})
-	if err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-	if resp.Collection.Owner.ID == actorUserId {
-		return stacktrace.Propagate(ente.NewBadRequestWithMessage("owner can not update sharee magic metadata"), "")
-	}
-	err = c.CollectionRepo.UpdateShareeMetadata(req.ID, resp.Collection.Owner.ID, actorUserId, req.MagicMetadata, time.Microseconds())
-	if err != nil {
-		return stacktrace.Propagate(err, "failed to update sharee magic metadata")
-	}
-	return nil
-}
-
-// ShareURL generates a public auth-token for the given collectionID
-func (c *CollectionController) ShareURL(ctx context.Context, userID int64, req ente.CreatePublicAccessTokenRequest) (
-	ente.PublicURL, error) {
-	collection, err := c.CollectionRepo.Get(req.CollectionID)
-	if err != nil {
-		return ente.PublicURL{}, stacktrace.Propagate(err, "")
-	}
-	if !collection.AllowSharing() {
-		return ente.PublicURL{}, stacktrace.Propagate(ente.ErrBadRequest, fmt.Sprintf("sharing %s is not allowed", collection.Type))
-	}
-	if userID != collection.Owner.ID {
-		return ente.PublicURL{}, stacktrace.Propagate(ente.ErrPermissionDenied, "")
-	}
-	err = c.BillingCtrl.HasActiveSelfOrFamilySubscription(userID, true)
-	if err != nil {
-		return ente.PublicURL{}, stacktrace.Propagate(err, "")
-	}
-	response, err := c.PublicCollectionCtrl.CreateAccessToken(ctx, req)
-	if err != nil {
-		return ente.PublicURL{}, stacktrace.Propagate(err, "")
-	}
-	return response, nil
-}
-
-// UpdateShareURL updates the shared url configuration
-func (c *CollectionController) UpdateShareURL(ctx context.Context, userID int64, req ente.UpdatePublicAccessTokenRequest) (
-	ente.PublicURL, error) {
-	if err := c.verifyOwnership(req.CollectionID, userID); err != nil {
-		return ente.PublicURL{}, stacktrace.Propagate(err, "")
-	}
-	err := c.BillingCtrl.HasActiveSelfOrFamilySubscription(userID, true)
-	if err != nil {
-		return ente.PublicURL{}, stacktrace.Propagate(err, "")
-	}
-	response, err := c.PublicCollectionCtrl.UpdateSharedUrl(ctx, req)
-	if err != nil {
-		return ente.PublicURL{}, stacktrace.Propagate(err, "")
-	}
-	return response, nil
-}
-
-// DisableSharedURL disable a public auth-token for the given collectionID
-func (c *CollectionController) DisableSharedURL(ctx context.Context, userID int64, cID int64) error {
-	if err := c.verifyOwnership(cID, userID); err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-	err := c.PublicCollectionCtrl.Disable(ctx, cID)
-	return stacktrace.Propagate(err, "")
-}
-
-// AddFiles adds files to a collection
-func (c *CollectionController) AddFiles(ctx *gin.Context, userID int64, files []ente.CollectionFileItem, cID int64) error {
-
-	resp, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
-		CollectionID:   cID,
-		ActorUserID:    userID,
-		IncludeDeleted: false,
-	})
-	if err != nil {
-		return stacktrace.Propagate(err, "failed to verify collection access")
-	}
-	if !resp.Role.CanAdd() {
-		return stacktrace.Propagate(ente.ErrPermissionDenied, fmt.Sprintf("user %d with role %s can not add files", userID, *resp.Role))
-	}
-
-	collectionOwnerID := resp.Collection.Owner.ID
-	filesOwnerID := userID
-	// Verify that the user owns each file
-	fileIDs := make([]int64, 0)
-	for _, file := range files {
-		fileIDs = append(fileIDs, file.ID)
-	}
-	err = c.AccessCtrl.VerifyFileOwnership(ctx, &access.VerifyFileOwnershipParams{
-		ActorUserId: userID,
-		FileIDs:     fileIDs,
-	})
-
-	if err != nil {
-		return stacktrace.Propagate(err, "Failed to verify fileOwnership")
-	}
-	err = c.CollectionRepo.AddFiles(cID, collectionOwnerID, files, filesOwnerID)
-	if err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-	return nil
-}
-
-// RestoreFiles restore files from trash and add to the collection
-func (c *CollectionController) RestoreFiles(ctx *gin.Context, userID int64, cID int64, files []ente.CollectionFileItem) error {
-	_, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
-		CollectionID:   cID,
-		ActorUserID:    userID,
-		IncludeDeleted: false,
-		VerifyOwner:    true,
-	})
-	if err != nil {
-		return stacktrace.Propagate(err, "failed to verify collection access")
-	}
-	// Verify that the user owns each file
-	for _, file := range files {
-		// todo #perf find owners of all files
-		ownerID, err := c.FileRepo.GetOwnerID(file.ID)
-		if err != nil {
-			return stacktrace.Propagate(err, "")
-		}
-		if ownerID != userID {
-			log.WithFields(log.Fields{
-				"file_id":  file.ID,
-				"owner_id": ownerID,
-				"user_id":  userID,
-			}).Error("invalid ops: can't add file which isn't owned by user")
-			return stacktrace.Propagate(ente.ErrPermissionDenied, "")
-		}
-	}
-	err = c.CollectionRepo.RestoreFiles(ctx, userID, cID, files)
-	if err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-	return nil
-}
-
-// MoveFiles from one collection to another collection. Both the collections and files should belong to
-// single user
-func (c *CollectionController) MoveFiles(ctx *gin.Context, req ente.MoveFilesRequest) error {
-	userID := auth.GetUserID(ctx.Request.Header)
-	_, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
-		CollectionID:   req.FromCollectionID,
-		ActorUserID:    userID,
-		IncludeDeleted: false,
-		VerifyOwner:    true,
-	})
-	if err != nil {
-		return stacktrace.Propagate(err, "failed to verify if actor owns fromCollection")
-	}
-
-	_, err = c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
-		CollectionID:   req.ToCollectionID,
-		ActorUserID:    userID,
-		IncludeDeleted: false,
-		VerifyOwner:    true,
-	})
-	if err != nil {
-		return stacktrace.Propagate(err, "failed to verify if actor owns toCollection")
-	}
-
-	// Verify that the user owns each file
-	fileIDs := make([]int64, 0)
-	for _, file := range req.Files {
-		fileIDs = append(fileIDs, file.ID)
-	}
-	err = c.AccessCtrl.VerifyFileOwnership(ctx, &access.VerifyFileOwnershipParams{
-		ActorUserId: userID,
-		FileIDs:     fileIDs,
-	})
-	if err != nil {
-		stacktrace.Propagate(err, "Failed to verify fileOwnership")
-	}
-	err = c.CollectionRepo.MoveFiles(ctx, req.ToCollectionID, req.FromCollectionID, req.Files, userID, userID)
-	return stacktrace.Propagate(err, "") // return nil if err is nil
-}
-
-// RemoveFilesV3 removes files from a collection as long as owner(s) of the file is different from collection owner
-func (c *CollectionController) RemoveFilesV3(ctx *gin.Context, req ente.RemoveFilesV3Request) error {
-	actorUserID := auth.GetUserID(ctx.Request.Header)
-	resp, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
-		CollectionID: req.CollectionID,
-		ActorUserID:  actorUserID,
-		VerifyOwner:  false,
-	})
-	if err != nil {
-		return stacktrace.Propagate(err, "failed to verify collection access")
-	}
-	err = c.isRemoveAllowed(ctx, actorUserID, resp.Collection.Owner.ID, req.FileIDs)
-	if err != nil {
-		return stacktrace.Propagate(err, "file removal check failed")
-	}
-	err = c.CollectionRepo.RemoveFilesV3(ctx, req.CollectionID, req.FileIDs)
-	if err != nil {
-		return stacktrace.Propagate(err, "failed to remove files")
-	}
-	return nil
-}
-
-// isRemoveAllowed verifies that given set of files can be removed from the collection or not
-func (c *CollectionController) isRemoveAllowed(ctx *gin.Context, actorUserID int64, collectionOwnerID int64, fileIDs []int64) error {
-	ownerToFilesMap, err := c.FileRepo.GetOwnerToFileIDsMap(ctx, fileIDs)
-	if err != nil {
-		return stacktrace.Propagate(err, "failed to get owner to fileIDs map")
-	}
-	// verify that none of the file belongs to the collection owner
-	if _, ok := ownerToFilesMap[collectionOwnerID]; ok {
-		return ente.NewBadRequestWithMessage("can not remove files owned by album owner")
-	}
-
-	if collectionOwnerID != actorUserID {
-		// verify that user is only trying to remove files owned by them
-		if len(ownerToFilesMap) > 1 {
-			return stacktrace.Propagate(ente.ErrPermissionDenied, "can not remove files owned by others")
-		}
-		// verify that user is only trying to remove files owned by them
-		if _, ok := ownerToFilesMap[actorUserID]; !ok {
-			return stacktrace.Propagate(ente.ErrPermissionDenied, "can not remove files owned by others")
-		}
-	}
-	return nil
-}
-
-func (c *CollectionController) IsCopyAllowed(ctx *gin.Context, actorUserID int64, req ente.CopyFileSyncRequest) error {
-	// verify that srcCollectionID is accessible by actorUserID
-	if _, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
-		CollectionID: req.SrcCollectionID,
-		ActorUserID:  actorUserID,
-	}); err != nil {
-		return stacktrace.Propagate(err, "failed to verify srcCollection access")
-	}
-	// verify that dstCollectionID is owned by actorUserID
-	if _, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
-		CollectionID: req.DstCollection,
-		ActorUserID:  actorUserID,
-		VerifyOwner:  true,
-	}); err != nil {
-		return stacktrace.Propagate(err, "failed to ownership of the dstCollection access")
-	}
-	// verify that all FileIDs exists in the srcCollection
-	fileIDs := make([]int64, len(req.CollectionFileItems))
-	for idx, file := range req.CollectionFileItems {
-		fileIDs[idx] = file.ID
-	}
-	if err := c.CollectionRepo.VerifyAllFileIDsExistsInCollection(ctx, req.SrcCollectionID, fileIDs); err != nil {
-		return stacktrace.Propagate(err, "failed to verify fileIDs in srcCollection")
-	}
-	dsMap, err := c.FileRepo.GetOwnerToFileIDsMap(ctx, fileIDs)
-	if err != nil {
-		return err
-	}
-	// verify that none of the file belongs to actorUserID
-	if _, ok := dsMap[actorUserID]; ok {
-		return ente.NewBadRequestWithMessage("can not copy files owned by actor")
-	}
-	return nil
-}
-
-// GetDiffV2 returns the changes in user's collections since a timestamp, along with hasMore bool flag.
-func (c *CollectionController) GetDiffV2(ctx *gin.Context, cID int64, userID int64, sinceTime int64) ([]ente.File, bool, error) {
-	reqContextLogger := log.WithFields(log.Fields{
-		"user_id":       userID,
-		"collection_id": cID,
-		"since_time":    sinceTime,
-		"req_id":        requestid.Get(ctx),
-	})
-	_, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
-		CollectionID: cID,
-		ActorUserID:  userID,
-	})
-	if err != nil {
-		return nil, false, stacktrace.Propagate(err, "failed to verify access")
-	}
-	diff, hasMore, err := c.getDiff(cID, sinceTime, CollectionDiffLimit, reqContextLogger)
-	if err != nil {
-		return nil, false, stacktrace.Propagate(err, "")
-	}
-	// hide private metadata before returning files info in diff
-	for idx := range diff {
-		if diff[idx].OwnerID != userID {
-			diff[idx].MagicMetadata = nil
-		}
-		if diff[idx].Metadata.EncryptedData == "-" && !diff[idx].IsDeleted {
-			// This indicates that the file is deleted, but we still have a stale entry in the collection
-			log.WithFields(log.Fields{
-				"file_id":       diff[idx].ID,
-				"collection_id": cID,
-				"updated_at":    diff[idx].UpdationTime,
-			}).Warning("stale collection_file found")
-			diff[idx].IsDeleted = true
-		}
-	}
-	return diff, hasMore, nil
-}
-
 func (c *CollectionController) GetFile(ctx *gin.Context, collectionID int64, fileID int64) (*ente.File, error) {
 	userID := auth.GetUserID(ctx.Request.Header)
 	files, err := c.CollectionRepo.GetFile(collectionID, fileID)
@@ -612,107 +109,6 @@ func (c *CollectionController) GetFile(ctx *gin.Context, collectionID int64, fil
 	return &file, nil
 }
 
-// GetPublicDiff returns the changes in the collections since a timestamp, along with hasMore bool flag.
-func (c *CollectionController) GetPublicDiff(ctx *gin.Context, sinceTime int64) ([]ente.File, bool, error) {
-	accessContext := auth.MustGetPublicAccessContext(ctx)
-	reqContextLogger := log.WithFields(log.Fields{
-		"public_id":     accessContext.ID,
-		"collection_id": accessContext.CollectionID,
-		"since_time":    sinceTime,
-		"req_id":        requestid.Get(ctx),
-	})
-	diff, hasMore, err := c.getDiff(accessContext.CollectionID, sinceTime, CollectionDiffLimit, reqContextLogger)
-	if err != nil {
-		return nil, false, stacktrace.Propagate(err, "")
-	}
-	// hide private metadata before returning files info in diff
-	for idx := range diff {
-		if diff[idx].MagicMetadata != nil {
-			diff[idx].MagicMetadata = nil
-		}
-	}
-	return diff, hasMore, nil
-}
-
-// getDiff returns the diff in user's collection since a timestamp, along with hasMore bool flag.
-// The function will never return partial result for a version. To maintain this promise, it will not be able to honor
-// the limit parameter. Based on the db state, compared to the limit, the diff length can be
-// less (case 1), more (case 2), or same (case 3, 4)
-// Example: Assume we have 11 files with following versions: v0, v1, v1, v1, v1, v1, v1, v1, v2, v2, v2 (count = 7 v1, 3 v2)
-// client has synced up till version v0.
-// case 1: ( sinceTime: v0, limit = 8):
-// The method will discard the entries with version v2 and return only 7 entries with version v1.
-// case 2: (sinceTime: v0, limit 5):
-// Instead of returning 5 entries with version V1, method will return all 7 entries with version v1.
-// case 3: (sinceTime: v0, limit 7):
-// The method will return all 7 entries with version V1.
-// case 4: (sinceTime: v0, limit >=10):
-// The method will all 10 entries in the diff
-func (c *CollectionController) getDiff(cID int64, sinceTime int64, limit int, logger *log.Entry) ([]ente.File, bool, error) {
-	// request for limit +1 files
-	diffLimitPlusOne, err := c.CollectionRepo.GetDiff(cID, sinceTime, limit+1)
-	if err != nil {
-		return nil, false, stacktrace.Propagate(err, "")
-	}
-	if len(diffLimitPlusOne) <= limit {
-		// case 4: all files changed after sinceTime are included.
-		return diffLimitPlusOne, false, nil
-	}
-	lastFileVersion := diffLimitPlusOne[limit].UpdationTime
-	filteredDiffs := c.removeFilesWithVersion(diffLimitPlusOne, lastFileVersion)
-	filteredDiffLen := len(filteredDiffs)
-
-	if filteredDiffLen > 0 { // case 1 or case 3
-		if filteredDiffLen < limit {
-			// logging case 1
-			logger.
-				WithField("last_file_version", lastFileVersion).
-				WithField("filtered_diff_len", filteredDiffLen).
-				Info(fmt.Sprintf("less than limit (%d) files in diff", limit))
-		}
-		return filteredDiffs, true, nil
-	}
-	// case 2
-	diff, err := c.CollectionRepo.GetFilesWithVersion(cID, lastFileVersion)
-	logger.
-		WithField("last_file_version", lastFileVersion).
-		WithField("count", len(diff)).
-		Info(fmt.Sprintf("more than limit (%d) files with same version", limit))
-	if err != nil {
-		return nil, false, stacktrace.Propagate(err, "")
-	}
-	return diff, true, nil
-}
-
-// removeFilesWithVersion returns filtered list of files are removing all files with given version.
-// Important: The method assumes that files are sorted by increasing order of File.UpdationTime
-func (c *CollectionController) removeFilesWithVersion(files []ente.File, version int64) []ente.File {
-	var i = len(files) - 1
-	for ; i >= 0; i-- {
-		if files[i].UpdationTime != version {
-			// found index (from end) where file's version is different from given version
-			break
-		}
-	}
-	return files[0 : i+1]
-}
-
-// GetSharees returns the list of users a collection has been shared with
-func (c *CollectionController) GetSharees(ctx *gin.Context, cID int64, userID int64) ([]ente.CollectionUser, error) {
-	_, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
-		CollectionID: cID,
-		ActorUserID:  userID,
-	})
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "Access check failed")
-	}
-	sharees, err := c.CollectionRepo.GetSharees(cID)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	return sharees, nil
-}
-
 // TrashV3 deletes a given collection and based on user input (TrashCollectionV3Request.KeepFiles as FALSE) , it will move all files present in the underlying collection
 // to trash.
 func (c *CollectionController) TrashV3(ctx *gin.Context, req ente.TrashCollectionV3Request) error {
diff --git a/server/pkg/controller/collections/diff.go b/server/pkg/controller/collections/diff.go
new file mode 100644
index 0000000000..59d71e55ff
--- /dev/null
+++ b/server/pkg/controller/collections/diff.go
@@ -0,0 +1,60 @@
+package collections
+
+import (
+	"encoding/json"
+	"github.com/ente-io/museum/ente"
+	"github.com/ente-io/stacktrace"
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
+	log "github.com/sirupsen/logrus"
+	"runtime/debug"
+)
+
+// GetOwned returns the list of collections owned by a user
+func (c *CollectionController) GetOwned(userID int64, sinceTime int64, app ente.App) ([]ente.Collection, error) {
+	collections, err := c.CollectionRepo.GetCollectionsOwnedByUser(userID, sinceTime, app)
+	if err != nil {
+		return nil, stacktrace.Propagate(err, "")
+	}
+	go func() {
+		defer func() {
+			if r := recover(); r != nil {
+				log.Errorf("Panic caught: %s, stack: %s", r, string(debug.Stack()))
+			}
+		}()
+		collectionsV2, errV2 := c.CollectionRepo.GetCollectionsOwnedByUserV2(userID, sinceTime, app)
+		if errV2 != nil {
+			log.WithError(errV2).Error("failed to fetch collections using v2")
+		}
+		isEqual := cmp.Equal(collections, collectionsV2, cmpopts.SortSlices(func(a, b ente.Collection) bool { return a.ID < b.ID }))
+		if !isEqual {
+			jsonV1, _ := json.Marshal(collections)
+			jsonV2, _ := json.Marshal(collectionsV2)
+			log.WithFields(log.Fields{
+				"v1": string(jsonV1),
+				"v2": string(jsonV2),
+			}).Error("collections diff didn't match")
+		} else {
+			log.Info("collections diff matched")
+		}
+	}()
+	return collections, nil
+}
+
+// GetOwnedV2 returns the list of collections owned by a user using optimized query
+func (c *CollectionController) GetOwnedV2(userID int64, sinceTime int64, app ente.App) ([]ente.Collection, error) {
+	collections, err := c.CollectionRepo.GetCollectionsOwnedByUserV2(userID, sinceTime, app)
+	if err != nil {
+		return nil, stacktrace.Propagate(err, "")
+	}
+	return collections, nil
+}
+
+// GetSharedWith returns the list of collections that are shared with a user
+func (c *CollectionController) GetSharedWith(userID int64, sinceTime int64, app ente.App) ([]ente.Collection, error) {
+	collections, err := c.CollectionRepo.GetCollectionsSharedWithUser(userID, sinceTime, app)
+	if err != nil {
+		return nil, stacktrace.Propagate(err, "")
+	}
+	return collections, nil
+}
diff --git a/server/pkg/controller/collections/file_action.go b/server/pkg/controller/collections/file_action.go
new file mode 100644
index 0000000000..5a85381374
--- /dev/null
+++ b/server/pkg/controller/collections/file_action.go
@@ -0,0 +1,203 @@
+package collections
+
+import (
+	"fmt"
+	"github.com/ente-io/museum/ente"
+	"github.com/ente-io/museum/pkg/controller/access"
+	"github.com/ente-io/museum/pkg/utils/auth"
+	"github.com/ente-io/stacktrace"
+	"github.com/gin-gonic/gin"
+	log "github.com/sirupsen/logrus"
+)
+
+// AddFiles adds files to a collection
+func (c *CollectionController) AddFiles(ctx *gin.Context, userID int64, files []ente.CollectionFileItem, cID int64) error {
+
+	resp, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
+		CollectionID:   cID,
+		ActorUserID:    userID,
+		IncludeDeleted: false,
+	})
+	if err != nil {
+		return stacktrace.Propagate(err, "failed to verify collection access")
+	}
+	if !resp.Role.CanAdd() {
+		return stacktrace.Propagate(ente.ErrPermissionDenied, fmt.Sprintf("user %d with role %s can not add files", userID, *resp.Role))
+	}
+
+	collectionOwnerID := resp.Collection.Owner.ID
+	filesOwnerID := userID
+	// Verify that the user owns each file
+	fileIDs := make([]int64, 0)
+	for _, file := range files {
+		fileIDs = append(fileIDs, file.ID)
+	}
+	err = c.AccessCtrl.VerifyFileOwnership(ctx, &access.VerifyFileOwnershipParams{
+		ActorUserId: userID,
+		FileIDs:     fileIDs,
+	})
+
+	if err != nil {
+		return stacktrace.Propagate(err, "Failed to verify fileOwnership")
+	}
+	err = c.CollectionRepo.AddFiles(cID, collectionOwnerID, files, filesOwnerID)
+	if err != nil {
+		return stacktrace.Propagate(err, "")
+	}
+	return nil
+}
+
+// RestoreFiles restore files from trash and add to the collection
+func (c *CollectionController) RestoreFiles(ctx *gin.Context, userID int64, cID int64, files []ente.CollectionFileItem) error {
+	_, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
+		CollectionID:   cID,
+		ActorUserID:    userID,
+		IncludeDeleted: false,
+		VerifyOwner:    true,
+	})
+	if err != nil {
+		return stacktrace.Propagate(err, "failed to verify collection access")
+	}
+	// Verify that the user owns each file
+	for _, file := range files {
+		// todo #perf find owners of all files
+		ownerID, err := c.FileRepo.GetOwnerID(file.ID)
+		if err != nil {
+			return stacktrace.Propagate(err, "")
+		}
+		if ownerID != userID {
+			log.WithFields(log.Fields{
+				"file_id":  file.ID,
+				"owner_id": ownerID,
+				"user_id":  userID,
+			}).Error("invalid ops: can't add file which isn't owned by user")
+			return stacktrace.Propagate(ente.ErrPermissionDenied, "")
+		}
+	}
+	err = c.CollectionRepo.RestoreFiles(ctx, userID, cID, files)
+	if err != nil {
+		return stacktrace.Propagate(err, "")
+	}
+	return nil
+}
+
+// MoveFiles from one collection to another collection. Both the collections and files should belong to
+// single user
+func (c *CollectionController) MoveFiles(ctx *gin.Context, req ente.MoveFilesRequest) error {
+	userID := auth.GetUserID(ctx.Request.Header)
+	_, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
+		CollectionID:   req.FromCollectionID,
+		ActorUserID:    userID,
+		IncludeDeleted: false,
+		VerifyOwner:    true,
+	})
+	if err != nil {
+		return stacktrace.Propagate(err, "failed to verify if actor owns fromCollection")
+	}
+
+	_, err = c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
+		CollectionID:   req.ToCollectionID,
+		ActorUserID:    userID,
+		IncludeDeleted: false,
+		VerifyOwner:    true,
+	})
+	if err != nil {
+		return stacktrace.Propagate(err, "failed to verify if actor owns toCollection")
+	}
+
+	// Verify that the user owns each file
+	fileIDs := make([]int64, 0)
+	for _, file := range req.Files {
+		fileIDs = append(fileIDs, file.ID)
+	}
+	err = c.AccessCtrl.VerifyFileOwnership(ctx, &access.VerifyFileOwnershipParams{
+		ActorUserId: userID,
+		FileIDs:     fileIDs,
+	})
+	if err != nil {
+		stacktrace.Propagate(err, "Failed to verify fileOwnership")
+	}
+	err = c.CollectionRepo.MoveFiles(ctx, req.ToCollectionID, req.FromCollectionID, req.Files, userID, userID)
+	return stacktrace.Propagate(err, "") // return nil if err is nil
+}
+
+// RemoveFilesV3 removes files from a collection as long as owner(s) of the file is different from collection owner
+func (c *CollectionController) RemoveFilesV3(ctx *gin.Context, req ente.RemoveFilesV3Request) error {
+	actorUserID := auth.GetUserID(ctx.Request.Header)
+	resp, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
+		CollectionID: req.CollectionID,
+		ActorUserID:  actorUserID,
+		VerifyOwner:  false,
+	})
+	if err != nil {
+		return stacktrace.Propagate(err, "failed to verify collection access")
+	}
+	err = c.isRemoveAllowed(ctx, actorUserID, resp.Collection.Owner.ID, req.FileIDs)
+	if err != nil {
+		return stacktrace.Propagate(err, "file removal check failed")
+	}
+	err = c.CollectionRepo.RemoveFilesV3(ctx, req.CollectionID, req.FileIDs)
+	if err != nil {
+		return stacktrace.Propagate(err, "failed to remove files")
+	}
+	return nil
+}
+
+// isRemoveAllowed verifies that given set of files can be removed from the collection or not
+func (c *CollectionController) isRemoveAllowed(ctx *gin.Context, actorUserID int64, collectionOwnerID int64, fileIDs []int64) error {
+	ownerToFilesMap, err := c.FileRepo.GetOwnerToFileIDsMap(ctx, fileIDs)
+	if err != nil {
+		return stacktrace.Propagate(err, "failed to get owner to fileIDs map")
+	}
+	// verify that none of the file belongs to the collection owner
+	if _, ok := ownerToFilesMap[collectionOwnerID]; ok {
+		return ente.NewBadRequestWithMessage("can not remove files owned by album owner")
+	}
+
+	if collectionOwnerID != actorUserID {
+		// verify that user is only trying to remove files owned by them
+		if len(ownerToFilesMap) > 1 {
+			return stacktrace.Propagate(ente.ErrPermissionDenied, "can not remove files owned by others")
+		}
+		// verify that user is only trying to remove files owned by them
+		if _, ok := ownerToFilesMap[actorUserID]; !ok {
+			return stacktrace.Propagate(ente.ErrPermissionDenied, "can not remove files owned by others")
+		}
+	}
+	return nil
+}
+
+func (c *CollectionController) IsCopyAllowed(ctx *gin.Context, actorUserID int64, req ente.CopyFileSyncRequest) error {
+	// verify that srcCollectionID is accessible by actorUserID
+	if _, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
+		CollectionID: req.SrcCollectionID,
+		ActorUserID:  actorUserID,
+	}); err != nil {
+		return stacktrace.Propagate(err, "failed to verify srcCollection access")
+	}
+	// verify that dstCollectionID is owned by actorUserID
+	if _, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
+		CollectionID: req.DstCollection,
+		ActorUserID:  actorUserID,
+		VerifyOwner:  true,
+	}); err != nil {
+		return stacktrace.Propagate(err, "failed to ownership of the dstCollection access")
+	}
+	// verify that all FileIDs exists in the srcCollection
+	fileIDs := make([]int64, len(req.CollectionFileItems))
+	for idx, file := range req.CollectionFileItems {
+		fileIDs[idx] = file.ID
+	}
+	if err := c.CollectionRepo.VerifyAllFileIDsExistsInCollection(ctx, req.SrcCollectionID, fileIDs); err != nil {
+		return stacktrace.Propagate(err, "failed to verify fileIDs in srcCollection")
+	}
+	dsMap, err := c.FileRepo.GetOwnerToFileIDsMap(ctx, fileIDs)
+	if err != nil {
+		return err
+	}
+	// verify that none of the file belongs to actorUserID
+	if _, ok := dsMap[actorUserID]; ok {
+		return ente.NewBadRequestWithMessage("can not copy files owned by actor")
+	}
+	return nil
+}
diff --git a/server/pkg/controller/collections/files_diff.go b/server/pkg/controller/collections/files_diff.go
new file mode 100644
index 0000000000..8d2215df47
--- /dev/null
+++ b/server/pkg/controller/collections/files_diff.go
@@ -0,0 +1,111 @@
+package collections
+
+import (
+	"fmt"
+	"github.com/ente-io/museum/ente"
+	"github.com/ente-io/museum/pkg/controller/access"
+	"github.com/ente-io/stacktrace"
+	"github.com/gin-contrib/requestid"
+	"github.com/gin-gonic/gin"
+	log "github.com/sirupsen/logrus"
+)
+
+// GetDiffV2 returns the changes in user's collections since a timestamp, along with hasMore bool flag.
+func (c *CollectionController) GetDiffV2(ctx *gin.Context, cID int64, userID int64, sinceTime int64) ([]ente.File, bool, error) {
+	reqContextLogger := log.WithFields(log.Fields{
+		"user_id":       userID,
+		"collection_id": cID,
+		"since_time":    sinceTime,
+		"req_id":        requestid.Get(ctx),
+	})
+	_, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
+		CollectionID: cID,
+		ActorUserID:  userID,
+	})
+	if err != nil {
+		return nil, false, stacktrace.Propagate(err, "failed to verify access")
+	}
+	diff, hasMore, err := c.getDiff(cID, sinceTime, CollectionDiffLimit, reqContextLogger)
+	if err != nil {
+		return nil, false, stacktrace.Propagate(err, "")
+	}
+	// hide private metadata before returning files info in diff
+	for idx := range diff {
+		if diff[idx].OwnerID != userID {
+			diff[idx].MagicMetadata = nil
+		}
+		if diff[idx].Metadata.EncryptedData == "-" && !diff[idx].IsDeleted {
+			// This indicates that the file is deleted, but we still have a stale entry in the collection
+			log.WithFields(log.Fields{
+				"file_id":       diff[idx].ID,
+				"collection_id": cID,
+				"updated_at":    diff[idx].UpdationTime,
+			}).Warning("stale collection_file found")
+			diff[idx].IsDeleted = true
+		}
+	}
+	return diff, hasMore, nil
+}
+
+// getDiff returns the diff in user's collection since a timestamp, along with hasMore bool flag.
+// The function will never return partial result for a version. To maintain this promise, it will not be able to honor
+// the limit parameter. Based on the db state, compared to the limit, the diff length can be
+// less (case 1), more (case 2), or same (case 3, 4)
+// Example: Assume we have 11 files with following versions: v0, v1, v1, v1, v1, v1, v1, v1, v2, v2, v2 (count = 7 v1, 3 v2)
+// client has synced up till version v0.
+// case 1: ( sinceTime: v0, limit = 8):
+// The method will discard the entries with version v2 and return only 7 entries with version v1.
+// case 2: (sinceTime: v0, limit 5):
+// Instead of returning 5 entries with version V1, method will return all 7 entries with version v1.
+// case 3: (sinceTime: v0, limit 7):
+// The method will return all 7 entries with version V1.
+// case 4: (sinceTime: v0, limit >=10):
+// The method will all 10 entries in the diff
+func (c *CollectionController) getDiff(cID int64, sinceTime int64, limit int, logger *log.Entry) ([]ente.File, bool, error) {
+	// request for limit +1 files
+	diffLimitPlusOne, err := c.CollectionRepo.GetDiff(cID, sinceTime, limit+1)
+	if err != nil {
+		return nil, false, stacktrace.Propagate(err, "")
+	}
+	if len(diffLimitPlusOne) <= limit {
+		// case 4: all files changed after sinceTime are included.
+		return diffLimitPlusOne, false, nil
+	}
+	lastFileVersion := diffLimitPlusOne[limit].UpdationTime
+	filteredDiffs := c.removeFilesWithVersion(diffLimitPlusOne, lastFileVersion)
+	filteredDiffLen := len(filteredDiffs)
+
+	if filteredDiffLen > 0 { // case 1 or case 3
+		if filteredDiffLen < limit {
+			// logging case 1
+			logger.
+				WithField("last_file_version", lastFileVersion).
+				WithField("filtered_diff_len", filteredDiffLen).
+				Info(fmt.Sprintf("less than limit (%d) files in diff", limit))
+		}
+		return filteredDiffs, true, nil
+	}
+	// case 2
+	diff, err := c.CollectionRepo.GetFilesWithVersion(cID, lastFileVersion)
+	logger.
+		WithField("last_file_version", lastFileVersion).
+		WithField("count", len(diff)).
+		Info(fmt.Sprintf("more than limit (%d) files with same version", limit))
+	if err != nil {
+		return nil, false, stacktrace.Propagate(err, "")
+	}
+	return diff, true, nil
+}
+
+// removeFilesWithVersion returns filtered list of files are removing all files with given version.
+// Important: The method assumes that files are sorted by increasing order of File.UpdationTime
+func (c *CollectionController) removeFilesWithVersion(files []ente.File, version int64) []ente.File {
+	var i = len(files) - 1
+	for ; i >= 0; i-- {
+		if files[i].UpdationTime != version {
+			// found index (from end) where file's version is different from given version
+			break
+		}
+	}
+	return files[0 : i+1]
+}
diff --git a/server/pkg/controller/collections/share.go b/server/pkg/controller/collections/share.go
new file mode 100644
index 0000000000..ced64f0fdf
--- /dev/null
+++ b/server/pkg/controller/collections/share.go
@@ -0,0 +1,269 @@
+package collections
+
+import (
+	"context"
+	"fmt"
+	"github.com/ente-io/museum/ente"
+	"github.com/ente-io/museum/pkg/controller/access"
+	"github.com/ente-io/museum/pkg/utils/array"
+	"github.com/ente-io/museum/pkg/utils/auth"
+	"github.com/ente-io/museum/pkg/utils/time"
+	"github.com/ente-io/stacktrace"
+	"github.com/gin-contrib/requestid"
+	"github.com/gin-gonic/gin"
+	log "github.com/sirupsen/logrus"
+	"strings"
+)
+
+func (c *CollectionController) Share(ctx *gin.Context, req ente.AlterShareRequest) ([]ente.CollectionUser, error) {
+	fromUserID := auth.GetUserID(ctx.Request.Header)
+	cID := req.CollectionID
+	encryptedKey := req.EncryptedKey
+	toUserEmail := strings.ToLower(strings.TrimSpace(req.Email))
+	// default role type
+	role := ente.VIEWER
+	if req.Role != nil {
+		role = *req.Role
+	}
+
+	toUserID, err := c.UserRepo.GetUserIDWithEmail(toUserEmail)
+	if err != nil {
+		return nil, stacktrace.Propagate(err, "")
+	}
+	if toUserID == fromUserID {
+		return nil, stacktrace.Propagate(ente.ErrBadRequest, "Can not share collection with self")
+	}
+	collection, err := c.CollectionRepo.Get(cID)
+	if err != nil {
+		return nil, stacktrace.Propagate(err, "")
+	}
+	if !collection.AllowSharing() {
+		return nil, stacktrace.Propagate(ente.ErrBadRequest, fmt.Sprintf("sharing %s is not allowed", collection.Type))
+	}
+	if fromUserID != collection.Owner.ID {
+		return nil, stacktrace.Propagate(ente.ErrPermissionDenied, "")
+	}
+	err = c.BillingCtrl.HasActiveSelfOrFamilySubscription(fromUserID, true)
+	if err != nil {
+		return nil, stacktrace.Propagate(err, "")
+	}
+	err = c.CollectionRepo.Share(cID, fromUserID, toUserID, encryptedKey, role, time.Microseconds())
+	if err != nil {
+		return nil, stacktrace.Propagate(err, "")
+	}
+	sharees, err := c.GetSharees(ctx, cID, fromUserID)
+	if err != nil {
+		return nil, stacktrace.Propagate(err, "")
+	}
+	return sharees, nil
+}
+
+func (c *CollectionController) JoinViaLink(ctx *gin.Context, req ente.JoinCollectionViaLinkRequest) error {
+	userID := auth.GetUserID(ctx.Request.Header)
+	collection, err := c.CollectionRepo.Get(req.CollectionID)
+	if err != nil {
+		return stacktrace.Propagate(err, "")
+	}
+	if collection.Owner.ID == userID {
+		return stacktrace.Propagate(ente.ErrBadRequest, "owner can not join via link")
+	}
+	if !collection.AllowSharing() {
+		return stacktrace.Propagate(ente.ErrBadRequest, fmt.Sprintf("joining %s is not allowed", collection.Type))
+	}
+	publicCollectionToken, err := c.PublicCollectionCtrl.GetActivePublicCollectionToken(ctx, req.CollectionID)
+	if err != nil {
+		return stacktrace.Propagate(err, "")
+	}
+
+	if canJoin := publicCollectionToken.CanJoin(); canJoin != nil {
+		return stacktrace.Propagate(ente.ErrBadRequest, fmt.Sprintf("can not join collection: %s", canJoin.Error()))
+	}
+	accessToken := auth.GetAccessToken(ctx)
+	if publicCollectionToken.Token != accessToken {
+		return stacktrace.Propagate(ente.ErrPermissionDenied, "token doesn't match collection")
+	}
+	if publicCollectionToken.PassHash != nil && *publicCollectionToken.PassHash != "" {
+		accessTokenJWT := auth.GetAccessTokenJWT(ctx)
+		if passCheckErr := c.PublicCollectionCtrl.ValidateJWTToken(ctx, accessTokenJWT, *publicCollectionToken.PassHash); passCheckErr != nil {
+			return stacktrace.Propagate(passCheckErr, "")
+		}
+	}
+	err = c.BillingCtrl.HasActiveSelfOrFamilySubscription(collection.Owner.ID, true)
+	if err != nil {
+		return stacktrace.Propagate(err, "")
+	}
+	role := ente.VIEWER
+	if publicCollectionToken.EnableCollect {
+		role = ente.COLLABORATOR
+	}
+	joinErr := c.CollectionRepo.Share(req.CollectionID, collection.Owner.ID, userID, req.EncryptedKey, role, time.Microseconds())
+	if joinErr != nil {
+		return stacktrace.Propagate(joinErr, "")
+	}
+	go c.EmailCtrl.OnLinkJoined(collection.Owner.ID, userID, role)
+	return nil
+}
+
+// UnShare unshares a collection with a user
+func (c *CollectionController) UnShare(ctx *gin.Context, cID int64, fromUserID int64, toUserEmail string) ([]ente.CollectionUser, error) {
+	toUserID, err := c.UserRepo.GetUserIDWithEmail(toUserEmail)
+	if err != nil {
+		return nil, stacktrace.Propagate(ente.ErrNotFound, "")
+	}
+	collection, err := c.CollectionRepo.Get(cID)
+	if err != nil {
+		return nil, stacktrace.Propagate(err, "")
+	}
+	isLeavingCollection := toUserID == fromUserID
+	if fromUserID != collection.Owner.ID || isLeavingCollection {
+		return nil, stacktrace.Propagate(ente.ErrPermissionDenied, "")
+	}
+	err = c.CollectionRepo.UnShare(cID, toUserID)
+	if err != nil {
+		return nil, stacktrace.Propagate(err, "")
+	}
+	err = c.CastRepo.RevokeForGivenUserAndCollection(ctx, cID, toUserID)
+	if err != nil {
+		return nil, stacktrace.Propagate(err, "")
+	}
+	sharees, err := c.GetSharees(ctx, cID, fromUserID)
+	if err != nil {
+		return nil, stacktrace.Propagate(err, "")
+	}
+	return sharees, nil
+}
+
+// Leave leaves the collection owned by someone else,
+func (c *CollectionController) Leave(ctx *gin.Context, cID int64) error {
+	userID := auth.GetUserID(ctx.Request.Header)
+	collection, err := c.CollectionRepo.Get(cID)
+	if err != nil {
+		return stacktrace.Propagate(err, "")
+	}
+	if userID == collection.Owner.ID {
+		return stacktrace.Propagate(ente.ErrPermissionDenied, "can not leave collection owned by self")
+	}
+	sharedCollectionIDs, err := c.CollectionRepo.GetCollectionIDsSharedWithUser(userID)
+	if err != nil {
+		return stacktrace.Propagate(err, "")
+	}
+	if !array.Int64InList(cID, sharedCollectionIDs) {
+		return nil
+	}
+	err = c.CastRepo.RevokeForGivenUserAndCollection(ctx, cID, userID)
+	if err != nil {
+		return stacktrace.Propagate(err, "")
+	}
+	err = c.CollectionRepo.UnShare(cID, userID)
+	if err != nil {
+		return stacktrace.Propagate(err, "")
+	}
+	return nil
+}
+
+func (c *CollectionController) UpdateShareeMagicMetadata(ctx *gin.Context, req ente.UpdateCollectionMagicMetadata) error {
+	actorUserId := auth.GetUserID(ctx.Request.Header)
+	resp, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
+		CollectionID: req.ID,
+		ActorUserID:  actorUserId,
+	})
+	if err != nil {
+		return stacktrace.Propagate(err, "")
+	}
+	if resp.Collection.Owner.ID == actorUserId {
+		return stacktrace.Propagate(ente.NewBadRequestWithMessage("owner can not update sharee magic metadata"), "")
+	}
+	err = c.CollectionRepo.UpdateShareeMetadata(req.ID, resp.Collection.Owner.ID, actorUserId, req.MagicMetadata, time.Microseconds())
+	if err != nil {
+		return stacktrace.Propagate(err, "failed to update sharee magic metadata")
+	}
+	return nil
+}
+
+// ShareURL generates a public auth-token for the given collectionID
+func (c *CollectionController) ShareURL(ctx context.Context, userID int64, req ente.CreatePublicAccessTokenRequest) (
+	ente.PublicURL, error) {
+	collection, err := c.CollectionRepo.Get(req.CollectionID)
+	if err != nil {
+		return ente.PublicURL{}, stacktrace.Propagate(err, "")
+	}
+	if !collection.AllowSharing() {
+		return ente.PublicURL{}, stacktrace.Propagate(ente.ErrBadRequest, fmt.Sprintf("sharing %s is not allowed", collection.Type))
+	}
+	if userID != collection.Owner.ID {
+		return ente.PublicURL{}, stacktrace.Propagate(ente.ErrPermissionDenied, "")
+	}
+	err = c.BillingCtrl.HasActiveSelfOrFamilySubscription(userID, true)
+	if err != nil {
+		return ente.PublicURL{}, stacktrace.Propagate(err, "")
+	}
+	response, err := c.PublicCollectionCtrl.CreateAccessToken(ctx, req)
+	if err != nil {
+		return ente.PublicURL{}, stacktrace.Propagate(err, "")
+	}
+	return response, nil
+}
+
+// UpdateShareURL updates the shared url configuration
+func (c *CollectionController) UpdateShareURL(ctx context.Context, userID int64, req ente.UpdatePublicAccessTokenRequest) (
+	ente.PublicURL, error) {
+	if err := c.verifyOwnership(req.CollectionID, userID); err != nil {
+		return ente.PublicURL{}, stacktrace.Propagate(err, "")
+	}
+	err := c.BillingCtrl.HasActiveSelfOrFamilySubscription(userID, true)
+	if err != nil {
+		return ente.PublicURL{}, stacktrace.Propagate(err, "")
+	}
+	response, err := c.PublicCollectionCtrl.UpdateSharedUrl(ctx, req)
+	if err != nil {
+		return ente.PublicURL{}, stacktrace.Propagate(err, "")
+	}
+	return response, nil
+}
+
+// DisableSharedURL disable a public auth-token for the given collectionID
+func (c *CollectionController) DisableSharedURL(ctx context.Context, userID int64, cID int64) error {
+	if err := c.verifyOwnership(cID, userID); err != nil {
+		return stacktrace.Propagate(err, "")
+	}
+	err := c.PublicCollectionCtrl.Disable(ctx, cID)
+	return stacktrace.Propagate(err, "")
+}
+
+// GetSharees returns the list of users a collection has been shared with
+func (c *CollectionController) GetSharees(ctx *gin.Context, cID int64, userID int64) ([]ente.CollectionUser, error) {
+	_, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
+		CollectionID: cID,
+		ActorUserID:  userID,
+	})
+	if err != nil {
+		return nil, stacktrace.Propagate(err, "Access check failed")
+	}
+	sharees, err := c.CollectionRepo.GetSharees(cID)
+	if err != nil {
+		return nil, stacktrace.Propagate(err, "")
+	}
+	return sharees, nil
+}
+
+// GetPublicDiff returns the changes in the collections since a timestamp, along with hasMore bool flag.
+func (c *CollectionController) GetPublicDiff(ctx *gin.Context, sinceTime int64) ([]ente.File, bool, error) {
+	accessContext := auth.MustGetPublicAccessContext(ctx)
+	reqContextLogger := log.WithFields(log.Fields{
+		"public_id":     accessContext.ID,
+		"collection_id": accessContext.CollectionID,
+		"since_time":    sinceTime,
+		"req_id":        requestid.Get(ctx),
+	})
+	diff, hasMore, err := c.getDiff(accessContext.CollectionID, sinceTime, CollectionDiffLimit, reqContextLogger)
+	if err != nil {
+		return nil, false, stacktrace.Propagate(err, "")
+	}
+	// hide private metadata before returning files info in diff
+	for idx := range diff {
+		if diff[idx].MagicMetadata != nil {
+			diff[idx].MagicMetadata = nil
+		}
+	}
+	return diff, hasMore, nil
+}

From 6724527c2788bc68882444422ab6e6bb60bc8c7b Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 12:35:11 +0530
Subject: [PATCH 395/796] Another

---
 web/apps/accounts/src/pages/passkeys/index.tsx |  6 ++++--
 web/packages/base/i18n-date.ts                 | 13 ++++++++++++-
 web/packages/shared/time/format.ts             |  6 +++---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/web/apps/accounts/src/pages/passkeys/index.tsx b/web/apps/accounts/src/pages/passkeys/index.tsx
index 629b824135..d6d501d554 100644
--- a/web/apps/accounts/src/pages/passkeys/index.tsx
+++ b/web/apps/accounts/src/pages/passkeys/index.tsx
@@ -11,9 +11,9 @@ import { Titlebar } from "@/base/components/Titlebar";
 import { errorDialogAttributes } from "@/base/components/utils/dialog";
 import { useModalVisibility } from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
+import { formattedDateTime } from "@/base/i18n-date";
 import log from "@/base/log";
 import SingleInputForm from "@ente/shared/components/SingleInputForm";
-import { formatDateTimeFull } from "@ente/shared/time/format";
 import CalendarTodayIcon from "@mui/icons-material/CalendarToday";
 import ChevronRightIcon from "@mui/icons-material/ChevronRight";
 import DeleteIcon from "@mui/icons-material/Delete";
@@ -293,7 +293,9 @@ const ManagePasskeyDrawer: React.FC<ManagePasskeyDrawerProps> = ({
                             onRootClose={onClose}
                         />
                         <CreatedAtEntry>
-                            {formatDateTimeFull(passkey.createdAt / 1000)}
+                            {formattedDateTime(
+                                new Date(passkey.createdAt / 1000),
+                            )}
                         </CreatedAtEntry>
                         <RowButtonGroup>
                             <RowButton
diff --git a/web/packages/base/i18n-date.ts b/web/packages/base/i18n-date.ts
index 2a8e21f95f..b23fed67f0 100644
--- a/web/packages/base/i18n-date.ts
+++ b/web/packages/base/i18n-date.ts
@@ -4,7 +4,7 @@
  * Note that we rely on the current behaviour of a full reload on changing the
  * language. See: [Note: Changing locale causes a full reload].
  */
-import i18n from "i18next";
+import i18n, { t } from "i18next";
 
 const _dateFormat = new Intl.DateTimeFormat(i18n.language, {
     weekday: "short",
@@ -46,6 +46,17 @@ const isSameYear = (date: Date) =>
  */
 export const formattedTime = (date: Date) => _timeFormat.format(date);
 
+/**
+ * Return a locale aware formatted date and time from the given {@link Date},
+ * using the year omission behavior as documented in {@link formattedDate}.
+ *
+ * Example:
+ * - If within year: "Fri, 21 Feb at 11:51 AM".
+ * - Otherwise: "Fri, 21 Feb 2025 at 11:51 AM"
+ */
+export const formattedDateTime = (date: Date) =>
+    [formattedDate(date), t("at"), formattedTime(date)].join(" ");
+
 let _relativeTimeFormat: Intl.RelativeTimeFormat | undefined;
 
 export const formattedDateRelative = (date: Date) => {
diff --git a/web/packages/shared/time/format.ts b/web/packages/shared/time/format.ts
index 06638a66c6..bce4644699 100644
--- a/web/packages/shared/time/format.ts
+++ b/web/packages/shared/time/format.ts
@@ -36,9 +36,9 @@ function formatTime(date: number | Date) {
     return timeFormatter.format(date).toUpperCase();
 }
 
-export function formatDateTimeFull(dateTime: number | Date): string {
-    return [formatDateFull(dateTime), t("at"), formatTime(dateTime)].join(" ");
-}
+// function formatDateTimeFull(dateTime: number | Date): string {
+//     return [formatDateFull(dateTime), t("at"), formatTime(dateTime)].join(" ");
+// }
 
 export function formatDateTime(dateTime: number | Date): string {
     return [formatDate(dateTime), t("at"), formatTime(dateTime)].join(" ");

From bfe39be07e50ea41c79269200e5f1f3a9de78fd8 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Fri, 21 Feb 2025 12:43:44 +0530
Subject: [PATCH 396/796] [mob][photos] Update clip query

---
 mobile/lib/services/smart_memories_service.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 5188006e91..006e025c0d 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -47,7 +47,7 @@ class SmartMemoriesService {
 
   Vector? _clipPositiveTextVector;
   static const String clipPositiveQuery =
-      'Photo of a precious memory radiating warmth, vibrant energy, or quiet beauty — alive with color, light, or emotion';
+      'Photo of a precious and nostalgic memory radiating warmth, vibrant energy, or quiet beauty — alive with color, light, or emotion';
 
   final Map<PeopleActivity, Vector> _clipPeopleActivityVectors = {};
 

From e8d9f4f6cf52ae6cc365c4bd39fc69bac1a6fc0c Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 12:44:27 +0530
Subject: [PATCH 397/796] Conv

---
 web/apps/accounts/src/pages/passkeys/index.tsx |  4 +---
 web/packages/base/date.ts                      |  2 ++
 web/packages/base/i18n-date.ts                 | 17 ++++++++++++++++-
 web/packages/base/i18n.ts                      |  2 ++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/web/apps/accounts/src/pages/passkeys/index.tsx b/web/apps/accounts/src/pages/passkeys/index.tsx
index d6d501d554..3e3a553907 100644
--- a/web/apps/accounts/src/pages/passkeys/index.tsx
+++ b/web/apps/accounts/src/pages/passkeys/index.tsx
@@ -293,9 +293,7 @@ const ManagePasskeyDrawer: React.FC<ManagePasskeyDrawerProps> = ({
                             onRootClose={onClose}
                         />
                         <CreatedAtEntry>
-                            {formattedDateTime(
-                                new Date(passkey.createdAt / 1000),
-                            )}
+                            {formattedDateTime(passkey.createdAt)}
                         </CreatedAtEntry>
                         <RowButtonGroup>
                             <RowButton
diff --git a/web/packages/base/date.ts b/web/packages/base/date.ts
index f08084f79a..ef46f5dfcb 100644
--- a/web/packages/base/date.ts
+++ b/web/packages/base/date.ts
@@ -1,6 +1,8 @@
 /**
  * Convert an epoch microsecond value to a JavaScript date.
  *
+ * [Note: Remote timestamps are epoch microseconds]
+ *
  * This is a convenience API for dealing with optional epoch microseconds in
  * various data structures. Remote talks in terms of epoch microseconds, but
  * JavaScript dates are underlain by epoch milliseconds, and this does a
diff --git a/web/packages/base/i18n-date.ts b/web/packages/base/i18n-date.ts
index b23fed67f0..bd49fb118c 100644
--- a/web/packages/base/i18n-date.ts
+++ b/web/packages/base/i18n-date.ts
@@ -53,10 +53,25 @@ export const formattedTime = (date: Date) => _timeFormat.format(date);
  * Example:
  * - If within year: "Fri, 21 Feb at 11:51 AM".
  * - Otherwise: "Fri, 21 Feb 2025 at 11:51 AM"
+ *
+ * @param dateOrEpochMicroseconds A JavaScript Date or a numeric epoch
+ * microseconds value.
+ *
+ * As a convenience, this function can be either be directly passed a JavaScript
+ * date, or it can be given the raw epoch microseconds value and it'll convert
+ * internally.
+ *
+ * See: [Note: Remote timestamps are epoch microseconds]
  */
-export const formattedDateTime = (date: Date) =>
+export const formattedDateTime = (dateOrEpochMicroseconds: Date | number) =>
+    _formattedDateTime(toDate(dateOrEpochMicroseconds));
+
+const _formattedDateTime = (date: Date) =>
     [formattedDate(date), t("at"), formattedTime(date)].join(" ");
 
+const toDate = (dm: Date | number) =>
+    typeof dm == "number" ? new Date(dm / 1000) : dm;
+
 let _relativeTimeFormat: Intl.RelativeTimeFormat | undefined;
 
 export const formattedDateRelative = (date: Date) => {
diff --git a/web/packages/base/i18n.ts b/web/packages/base/i18n.ts
index 80407383ec..5b4c6eee33 100644
--- a/web/packages/base/i18n.ts
+++ b/web/packages/base/i18n.ts
@@ -134,6 +134,8 @@ export const setupI18n = async () => {
         // Value is an epoch microsecond so that we can directly pass the
         // timestamps we get from our API responses. The formatter expects
         // milliseconds, so divide by 1000.
+        //
+        // See [Note: Remote timestamps are epoch microseconds].
         return (val) => formatter.format(val / 1000);
     });
 };

From 8379162716e1ef2e0c4a6bfcfb7d56b12fbbce6a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 12:51:21 +0530
Subject: [PATCH 398/796] Fix

---
 web/apps/accounts/src/services/passkey.ts              | 2 +-
 web/apps/auth/src/services/remote.ts                   | 2 +-
 web/packages/new/photos/services/user-entity/remote.ts | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/apps/accounts/src/services/passkey.ts b/web/apps/accounts/src/services/passkey.ts
index ee5f0c40c8..b0cf970b96 100644
--- a/web/apps/accounts/src/services/passkey.ts
+++ b/web/apps/accounts/src/services/passkey.ts
@@ -36,7 +36,7 @@ const Passkey = z.object({
      */
     friendlyName: z.string(),
     /**
-     * Epoch milliseconds when this passkey was created.
+     * Epoch microseconds when this passkey was created.
      */
     createdAt: z.number(),
 });
diff --git a/web/apps/auth/src/services/remote.ts b/web/apps/auth/src/services/remote.ts
index a1766c0265..6de83e9a2a 100644
--- a/web/apps/auth/src/services/remote.ts
+++ b/web/apps/auth/src/services/remote.ts
@@ -81,7 +81,7 @@ const RemoteAuthenticatorEntityChange = z.object({
      */
     isDeleted: z.boolean(),
     /**
-     * Epoch milliseconds when this entity was last updated.
+     * Epoch microseconds when this entity was last updated.
      *
      * This value is suitable for being passed as the `sinceTime` in the diff
      * requests to implement pagination.
diff --git a/web/packages/new/photos/services/user-entity/remote.ts b/web/packages/new/photos/services/user-entity/remote.ts
index d56a7fbff1..f93e1e23b1 100644
--- a/web/packages/new/photos/services/user-entity/remote.ts
+++ b/web/packages/new/photos/services/user-entity/remote.ts
@@ -83,7 +83,7 @@ const RemoteUserEntityChange = z.object({
      */
     isDeleted: z.boolean(),
     /**
-     * Epoch milliseconds when this entity was last updated.
+     * Epoch microseconds when this entity was last updated.
      *
      * This value is suitable for being passed as the `sinceTime` in the diff
      * requests to implement pagination.
@@ -97,7 +97,7 @@ const RemoteUserEntityChange = z.object({
  *
  * @param type The type of the entities to fetch.
  *
- * @param sinceTime Epoch milliseconds. This is used to ask remote to provide us
+ * @param sinceTime Epoch microseconds. This is used to ask remote to provide us
  * only entities whose {@link updatedAt} is more than the given value. Set this
  * to zero to start from the beginning.
  *

From e44020f93a261eecbe3fc0139acf5a3a7e5a7df2 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 13:02:58 +0530
Subject: [PATCH 399/796] Swap

---
 .../photos/src/components/Collections/CollectionShare.tsx | 6 +++---
 web/apps/photos/src/components/ExportFinished.tsx         | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/web/apps/photos/src/components/Collections/CollectionShare.tsx b/web/apps/photos/src/components/Collections/CollectionShare.tsx
index 583dd8b6da..4ed9f24342 100644
--- a/web/apps/photos/src/components/Collections/CollectionShare.tsx
+++ b/web/apps/photos/src/components/Collections/CollectionShare.tsx
@@ -17,6 +17,7 @@ import { Titlebar } from "@/base/components/Titlebar";
 import { useModalVisibility } from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
 import { sharedCryptoWorker } from "@/base/crypto";
+import { formattedDateTime } from "@/base/i18n-date";
 import log from "@/base/log";
 import { appendCollectionKeyToShareURL } from "@/gallery/services/share";
 import type {
@@ -34,7 +35,6 @@ import SingleInputForm, {
     type SingleInputFormProps,
 } from "@ente/shared/components/SingleInputForm";
 import { CustomError, parseSharingErrorCodes } from "@ente/shared/error";
-import { formatDateTime } from "@ente/shared/time/format";
 import AddIcon from "@mui/icons-material/Add";
 import AdminPanelSettingsIcon from "@mui/icons-material/AdminPanelSettings";
 import BlockIcon from "@mui/icons-material/Block";
@@ -1539,8 +1539,8 @@ const ManageLinkExpiry: React.FC<ManageLinkExpiryProps> = ({
                         isLinkExpired(publicShareProp?.validTill)
                             ? t("link_expired")
                             : publicShareProp?.validTill
-                              ? formatDateTime(
-                                    publicShareProp?.validTill / 1000,
+                              ? formattedDateTime(
+                                    publicShareProp.validTill / 1000,
                                 )
                               : t("never")
                     }
diff --git a/web/apps/photos/src/components/ExportFinished.tsx b/web/apps/photos/src/components/ExportFinished.tsx
index 9b1507c6a8..eab2d1b7ac 100644
--- a/web/apps/photos/src/components/ExportFinished.tsx
+++ b/web/apps/photos/src/components/ExportFinished.tsx
@@ -1,9 +1,9 @@
 import { LinkButton } from "@/base/components/LinkButton";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import { formattedNumber } from "@/base/i18n";
+import { formattedDateTime } from "@/base/i18n-date";
 import { EnteFile } from "@/media/file";
 import { SpaceBetweenFlex } from "@ente/shared/components/Container";
-import { formatDateTime } from "@ente/shared/time/format";
 import { DialogActions, DialogContent, Stack, Typography } from "@mui/material";
 import { t } from "i18next";
 import { useState } from "react";
@@ -19,6 +19,8 @@ interface Props {
 }
 
 export default function ExportFinished(props: Props) {
+    const { lastExportTime } = props;
+
     const [pendingFileListView, setPendingFileListView] =
         useState<boolean>(false);
 
@@ -52,8 +54,8 @@ export default function ExportFinished(props: Props) {
                             {t("last_export_time")}
                         </Typography>
                         <Typography>
-                            {props.lastExportTime
-                                ? formatDateTime(props.lastExportTime)
+                            {lastExportTime
+                                ? formattedDateTime(new Date(lastExportTime))
                                 : t("never")}
                         </Typography>
                     </SpaceBetweenFlex>

From 1a39846d25ba8722d6b9a772977ca4935eaa412e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 13:05:16 +0530
Subject: [PATCH 400/796] Swap

---
 .../photos/src/components/PhotoList/index.tsx | 22 ++++++++-----------
 web/packages/shared/time/format.ts            |  2 +-
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoList/index.tsx b/web/apps/photos/src/components/PhotoList/index.tsx
index fd30652db2..152df2e306 100644
--- a/web/apps/photos/src/components/PhotoList/index.tsx
+++ b/web/apps/photos/src/components/PhotoList/index.tsx
@@ -1,4 +1,5 @@
 import { assertionFailed } from "@/base/assert";
+import { formattedDate } from "@/base/i18n-date";
 import { EnteFile } from "@/media/file";
 import {
     GAP_BTW_TILES,
@@ -7,7 +8,6 @@ import {
     MIN_COLUMNS,
 } from "@/new/photos/components/PhotoList";
 import { FlexWrapper } from "@ente/shared/components/Container";
-import { formatDate } from "@ente/shared/time/format";
 import { Box, Checkbox, Link, Typography, styled } from "@mui/material";
 import type { PhotoFrameProps } from "components/PhotoFrame";
 import { t } from "i18next";
@@ -946,19 +946,15 @@ const getDate = (item: EnteFile) => {
 };
 
 const _getDate = (currentDate: number) => {
-    const date = isSameDay(new Date(currentDate), new Date())
+    const date = new Date(currentDate);
+    return isSameDay(date, new Date())
         ? t("TODAY")
-        : isSameDay(new Date(currentDate), new Date(Date.now() - A_DAY))
+        : isSameDay(date, new Date(Date.now() - A_DAY))
           ? t("YESTERDAY")
-          : formatDate(currentDate);
-
-    return date;
+          : formattedDate(date);
 };
 
-const isSameDay = (first: Date, second: Date) => {
-    return (
-        first.getFullYear() === second.getFullYear() &&
-        first.getMonth() === second.getMonth() &&
-        first.getDate() === second.getDate()
-    );
-};
+const isSameDay = (first: Date, second: Date) =>
+    first.getFullYear() === second.getFullYear() &&
+    first.getMonth() === second.getMonth() &&
+    first.getDate() === second.getDate();
diff --git a/web/packages/shared/time/format.ts b/web/packages/shared/time/format.ts
index bce4644699..46589ba4ab 100644
--- a/web/packages/shared/time/format.ts
+++ b/web/packages/shared/time/format.ts
@@ -40,6 +40,6 @@ function formatTime(date: number | Date) {
 //     return [formatDateFull(dateTime), t("at"), formatTime(dateTime)].join(" ");
 // }
 
-export function formatDateTime(dateTime: number | Date): string {
+function formatDateTime(dateTime: number | Date): string {
     return [formatDate(dateTime), t("at"), formatTime(dateTime)].join(" ");
 }

From b030c4e1820b165ecfe462c681bf6af95d77ab93 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 21 Feb 2025 13:22:45 +0530
Subject: [PATCH 401/796] [server] Clean up old logic for collection diff

---
 server/pkg/api/collection.go              | 20 +--------
 server/pkg/controller/collections/diff.go | 36 -----------------
 server/pkg/repo/collection.go             | 49 -----------------------
 3 files changed, 1 insertion(+), 104 deletions(-)

diff --git a/server/pkg/api/collection.go b/server/pkg/api/collection.go
index e810098cac..dbfe54abfb 100644
--- a/server/pkg/api/collection.go
+++ b/server/pkg/api/collection.go
@@ -65,25 +65,7 @@ func (h *CollectionHandler) GetCollectionByID(c *gin.Context) {
 // Deprecated: Remove once rps goes to 0.
 // Get returns the list of collections accessible to a user.
 func (h *CollectionHandler) Get(c *gin.Context) {
-	userID := auth.GetUserID(c.Request.Header)
-	sinceTime, _ := strconv.ParseInt(c.Query("sinceTime"), 10, 64)
-
-	app := auth.GetApp(c)
-
-	// TODO: Compute both with a single query
-	ownedCollections, err := h.Controller.GetOwned(userID, sinceTime, app)
-	if err != nil {
-		handler.Error(c, stacktrace.Propagate(err, "Failed to get owned collections"))
-		return
-	}
-	sharedCollections, err := h.Controller.GetSharedWith(userID, sinceTime, app)
-	if err != nil {
-		handler.Error(c, stacktrace.Propagate(err, "Failed to get shared collections"))
-		return
-	}
-	c.JSON(http.StatusOK, gin.H{
-		"collections": append(ownedCollections, sharedCollections...),
-	})
+	h.GetV2(c)
 }
 
 // GetV2 returns the list of collections accessible to a user
diff --git a/server/pkg/controller/collections/diff.go b/server/pkg/controller/collections/diff.go
index 59d71e55ff..eb00ff779b 100644
--- a/server/pkg/controller/collections/diff.go
+++ b/server/pkg/controller/collections/diff.go
@@ -1,46 +1,10 @@
 package collections
 
 import (
-	"encoding/json"
 	"github.com/ente-io/museum/ente"
 	"github.com/ente-io/stacktrace"
-	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
-	log "github.com/sirupsen/logrus"
-	"runtime/debug"
 )
 
-// GetOwned returns the list of collections owned by a user
-func (c *CollectionController) GetOwned(userID int64, sinceTime int64, app ente.App) ([]ente.Collection, error) {
-	collections, err := c.CollectionRepo.GetCollectionsOwnedByUser(userID, sinceTime, app)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	go func() {
-		defer func() {
-			if r := recover(); r != nil {
-				log.Errorf("Panic caught: %s, stack: %s", r, string(debug.Stack()))
-			}
-		}()
-		collectionsV2, errV2 := c.CollectionRepo.GetCollectionsOwnedByUserV2(userID, sinceTime, app)
-		if errV2 != nil {
-			log.WithError(errV2).Error("failed to fetch collections using v2")
-		}
-		isEqual := cmp.Equal(collections, collectionsV2, cmpopts.SortSlices(func(a, b ente.Collection) bool { return a.ID < b.ID }))
-		if !isEqual {
-			jsonV1, _ := json.Marshal(collections)
-			jsonV2, _ := json.Marshal(collectionsV2)
-			log.WithFields(log.Fields{
-				"v1": string(jsonV1),
-				"v2": string(jsonV2),
-			}).Error("collections diff didn't match")
-		} else {
-			log.Info("collections diff matched")
-		}
-	}()
-	return collections, nil
-}
-
 // GetOwnedV2 returns the list of collections owned by a user using optimized query
 func (c *CollectionController) GetOwnedV2(userID int64, sinceTime int64, app ente.App) ([]ente.Collection, error) {
 	collections, err := c.CollectionRepo.GetCollectionsOwnedByUserV2(userID, sinceTime, app)
diff --git a/server/pkg/repo/collection.go b/server/pkg/repo/collection.go
index f7ddcfeced..c1c75b963e 100644
--- a/server/pkg/repo/collection.go
+++ b/server/pkg/repo/collection.go
@@ -5,7 +5,6 @@ import (
 	"database/sql"
 	"fmt"
 	"strconv"
-	"strings"
 	t "time"
 
 	"github.com/prometheus/client_golang/prometheus"
@@ -102,54 +101,6 @@ func (repo *CollectionRepository) GetCollectionByType(userID int64, collectionTy
 	return c, nil
 }
 
-// GetCollectionsOwnedByUser returns the list of collections that a user owns
-// todo: refactor this method
-func (repo *CollectionRepository) GetCollectionsOwnedByUser(userID int64, updationTime int64, app ente.App) ([]ente.Collection, error) {
-	rows, err := repo.DB.Query(`
-		SELECT collections.collection_id, collections.owner_id, collections.encrypted_key, collections.key_decryption_nonce, collections.name, collections.encrypted_name, collections.name_decryption_nonce, collections.type, collections.app, collections.attributes, collections.updation_time, collections.is_deleted, collections.magic_metadata, collections.pub_magic_metadata
-		FROM collections
-		WHERE collections.owner_id = $1 AND collections.updation_time > $2 AND app = $3`, userID, updationTime, strings.ToLower(string(app)))
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	defer rows.Close()
-	collectionIDs := make([]int64, 0)
-	collections := make([]ente.Collection, 0)
-	result := make([]ente.Collection, 0)
-	for rows.Next() {
-		var c ente.Collection
-		var name, encryptedName, nameDecryptionNonce sql.NullString
-		if err := rows.Scan(&c.ID, &c.Owner.ID, &c.EncryptedKey, &c.KeyDecryptionNonce, &name, &encryptedName, &nameDecryptionNonce, &c.Type, &c.App, &c.Attributes, &c.UpdationTime, &c.IsDeleted, &c.MagicMetadata, &c.PublicMagicMetadata); err != nil {
-			return collections, stacktrace.Propagate(err, "")
-		}
-		if name.Valid && len(name.String) > 0 {
-			c.Name = name.String
-		} else {
-			c.EncryptedName = encryptedName.String
-			c.NameDecryptionNonce = nameDecryptionNonce.String
-		}
-		// TODO: Pull this information in the previous query
-		sharees, err := repo.GetSharees(c.ID)
-		if err != nil {
-			return collections, stacktrace.Propagate(err, "")
-		}
-		c.Sharees = sharees
-		collections = append(collections, c)
-		collectionIDs = append(collectionIDs, c.ID)
-	}
-
-	urlMap, err := repo.PublicCollectionRepo.GetCollectionToActivePublicURLMap(context.Background(), collectionIDs)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "failed to get publicURL info")
-	}
-	for _, c := range collections {
-		c.PublicURLs = urlMap[c.ID]
-		result = append(result, c)
-	}
-
-	return result, nil
-}
-
 func (repo *CollectionRepository) GetCollectionsOwnedByUserV2(userID int64, updationTime int64, app ente.App) ([]ente.Collection, error) {
 	rows, err := repo.DB.Query(`
 		SELECT 

From 49f9caac90ef36dc9ddc31a2ee74685a98257a1a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 14:02:43 +0530
Subject: [PATCH 402/796] wip speed up

---
 web/apps/photos/src/components/PhotoFrame.tsx | 24 ++++++++++
 .../photos/src/components/PhotoList/index.tsx | 24 +++++++---
 web/packages/shared/time/format.ts            | 45 -------------------
 3 files changed, 42 insertions(+), 51 deletions(-)
 delete mode 100644 web/packages/shared/time/format.ts

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 1535713ed6..c9968905dd 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -1,3 +1,4 @@
+import { formattedDate } from "@/base/i18n-date";
 import log from "@/base/log";
 import type { FileInfoProps } from "@/gallery/components/FileInfo";
 import {
@@ -13,6 +14,7 @@ import type { GalleryBarMode } from "@/new/photos/components/gallery/reducer";
 import { TRASH_SECTION } from "@/new/photos/services/collection";
 import { styled } from "@mui/material";
 import { PhotoViewer } from "components/PhotoViewer";
+import { t } from "i18next";
 import { useRouter } from "next/router";
 import { GalleryContext } from "pages/gallery";
 import PhotoSwipe from "photoswipe";
@@ -66,6 +68,11 @@ export type DisplayFile = EnteFile & {
     isSourceLoaded?: boolean;
     conversionFailed?: boolean;
     canForceConvert?: boolean;
+    /**
+     * The formatted date string under which this file should be grouped in the
+     * gallery listing.
+     */
+    timelineDateString?: string;
 };
 
 export type PhotoFrameProps = Pick<
@@ -178,6 +185,7 @@ const PhotoFrame = ({
             w: window.innerWidth,
             h: window.innerHeight,
             title: file.pubMagicMetadata?.data.caption,
+            timelineDateString: fileTimelineDateString(file),
         }));
         setDisplayFiles(result);
         setFetching({});
@@ -664,3 +672,19 @@ const updateDisplayFileSource = (
         file.src = url as string;
     }
 };
+
+const A_DAY = 24 * 60 * 60 * 1000;
+
+const fileTimelineDateString = (item: EnteFile) => {
+    const date = new Date(item.metadata.creationTime / 1000);
+    return isSameDay(date, new Date())
+        ? t("TODAY")
+        : isSameDay(date, new Date(Date.now() - A_DAY))
+          ? t("YESTERDAY")
+          : formattedDate(date);
+};
+
+const isSameDay = (first: Date, second: Date) =>
+    first.getFullYear() === second.getFullYear() &&
+    first.getMonth() === second.getMonth() &&
+    first.getDate() === second.getDate();
diff --git a/web/apps/photos/src/components/PhotoList/index.tsx b/web/apps/photos/src/components/PhotoList/index.tsx
index 152df2e306..261831637b 100644
--- a/web/apps/photos/src/components/PhotoList/index.tsx
+++ b/web/apps/photos/src/components/PhotoList/index.tsx
@@ -185,7 +185,9 @@ const NothingContainer = styled(ListItemContainer)`
 type Props = Pick<PhotoFrameProps, "mode" | "modePlus"> & {
     height: number;
     width: number;
-    displayFiles: EnteFile[];
+    displayFiles: (EnteFile & {
+        timelineDateString?: string;
+    })[];
     showAppDownloadBanner: boolean;
     getThumbnail: (
         file: EnteFile,
@@ -432,9 +434,12 @@ export function PhotoList({
             ) {
                 currentDate = item.metadata.creationTime / 1000;
 
+                const a = _getDate(currentDate);
+                const b = item.timelineDateString;
+                if (a !== b) console.error("mismatch", a, b);
                 timeStampList.push({
                     itemType: ITEM_TYPE.TIME,
-                    date: _getDate(currentDate),
+                    date: b,
                     id: currentDate.toString(),
                 });
                 timeStampList.push({
@@ -737,10 +742,17 @@ export function PhotoList({
         if (!galleryContext.selectedFile) return;
 
         console.time("t0");
-        const datedDisplayFiles = displayFiles?.map((item) => ({
-            ...item,
-            date: getDate(item),
-        }));
+        const datedDisplayFiles = displayFiles?.map((item) => {
+            const a = getDate(item);
+            const b = item.timelineDateString;
+            if (a !== b) console.error("mismatch", a, b);
+
+            return {
+                ...item,
+                date: a,
+            };
+        });
+
         console.timeEnd("t0");
         console.time("t1");
         const notSelectedFiles = datedDisplayFiles?.filter(
diff --git a/web/packages/shared/time/format.ts b/web/packages/shared/time/format.ts
deleted file mode 100644
index 46589ba4ab..0000000000
--- a/web/packages/shared/time/format.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import i18n, { t } from "i18next";
-
-// TODO: Move to @/base/date
-
-const dateTimeFullFormatter1 = new Intl.DateTimeFormat(i18n.language, {
-    weekday: "short",
-    month: "short",
-    day: "numeric",
-});
-
-const dateTimeFullFormatter2 = new Intl.DateTimeFormat(i18n.language, {
-    year: "numeric",
-});
-
-const timeFormatter = new Intl.DateTimeFormat(i18n.language, {
-    timeStyle: "short",
-});
-
-function formatDateFull(date: number | Date) {
-    return [dateTimeFullFormatter1, dateTimeFullFormatter2]
-        .map((f) => f.format(date))
-        .join(" ");
-}
-
-export function formatDate(date: number | Date) {
-    const withinYear =
-        new Date().getFullYear() === new Date(date).getFullYear();
-    const dateTimeFormat2 = !withinYear ? dateTimeFullFormatter2 : null;
-    return [dateTimeFullFormatter1, dateTimeFormat2]
-        .filter((f): f is Intl.DateTimeFormat => !!f)
-        .map((f) => f.format(date))
-        .join(" ");
-}
-
-function formatTime(date: number | Date) {
-    return timeFormatter.format(date).toUpperCase();
-}
-
-// function formatDateTimeFull(dateTime: number | Date): string {
-//     return [formatDateFull(dateTime), t("at"), formatTime(dateTime)].join(" ");
-// }
-
-function formatDateTime(dateTime: number | Date): string {
-    return [formatDate(dateTime), t("at"), formatTime(dateTime)].join(" ");
-}

From d118e0e63e204055026662c07039da95707ffdff Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 14:07:07 +0530
Subject: [PATCH 403/796] fast 1

---
 web/apps/photos/src/components/PhotoList/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoList/index.tsx b/web/apps/photos/src/components/PhotoList/index.tsx
index 261831637b..69392172f2 100644
--- a/web/apps/photos/src/components/PhotoList/index.tsx
+++ b/web/apps/photos/src/components/PhotoList/index.tsx
@@ -743,13 +743,13 @@ export function PhotoList({
 
         console.time("t0");
         const datedDisplayFiles = displayFiles?.map((item) => {
-            const a = getDate(item);
+            // const a = getDate(item);
             const b = item.timelineDateString;
-            if (a !== b) console.error("mismatch", a, b);
+            // if (a !== b) console.error("mismatch", a, b);
 
             return {
                 ...item,
-                date: a,
+                date: b,
             };
         });
 

From 760b50b417333d2c0cabee298312f4d2e3a471d7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 14:08:20 +0530
Subject: [PATCH 404/796] fast 3

---
 web/apps/photos/src/components/PhotoList/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoList/index.tsx b/web/apps/photos/src/components/PhotoList/index.tsx
index 69392172f2..c20406bccf 100644
--- a/web/apps/photos/src/components/PhotoList/index.tsx
+++ b/web/apps/photos/src/components/PhotoList/index.tsx
@@ -761,20 +761,20 @@ export function PhotoList({
         console.timeEnd("t1");
         console.time("t2");
         const unselectedDates = new Set(
-            notSelectedFiles?.map((item) => item.date),
+            notSelectedFiles?.map((item) => item.timelineDateString),
         ); // to get file's date which were manually unselected
 
         console.timeEnd("t2");
         console.time("t3");
         const localSelectedFiles = datedDisplayFiles.filter(
             // to get files which were manually selected
-            (item) => !unselectedDates.has(item.date),
+            (item) => !unselectedDates.has(item.timelineDateString),
         );
         console.timeEnd("t3");
         console.time("t4");
 
         const localSelectedDates = [
-            ...new Set(localSelectedFiles?.map((item) => item.date)),
+            ...new Set(localSelectedFiles?.map((item) => item.timelineDateString)),
         ]; // to get file's date which were manually selected
         console.timeEnd("t4");
         console.time("t5");

From 80e86f6f65f55862ce6c13ee24bdda242e428b17 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Fri, 21 Feb 2025 14:08:00 +0530
Subject: [PATCH 405/796] fix: update queuing logic

---
 mobile/lib/services/preview_video_store.dart | 24 +++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 556eb5193e..afdeb7f26f 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -665,21 +665,29 @@ class PreviewVideoStore {
     }).toList();
 
     // set all video status to in queue
-    final n = allFiles.length;
-    for (int i = 0; i < n; i++) {
+    var n = allFiles.length, i = 0;
+    while (i < n) {
       final enteFile = allFiles[i];
       // elimination case for <=10 MB with H.264
       final (_, result, _) = await _checkFileForPreviewCreation(enteFile);
       if (result) {
         allFiles.removeAt(i);
-      } else {
-        _items[enteFile.uploadedFileID!] = PreviewItem(
-          status: PreviewItemStatus.inQueue,
-          file: enteFile,
-          collectionID: enteFile.collectionID ?? 0,
-        );
+        n--;
+        continue;
       }
+      _items[enteFile.uploadedFileID!] = PreviewItem(
+        status: PreviewItemStatus.inQueue,
+        file: enteFile,
+        collectionID: enteFile.collectionID ?? 0,
+      );
+      i++;
     }
+
+    if (allFiles.isEmpty) {
+      _logger.info("[init] No preview to cache");
+      return;
+    }
+
     Bus.instance.fire(PreviewUpdatedEvent(_items));
 
     _logger.info("[init] Processing ${allFiles.length} items for streaming");

From 2688ca446e42ea2ad48ce4c1a3a4aef9cffe79a2 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Fri, 21 Feb 2025 14:09:53 +0530
Subject: [PATCH 406/796] chore: bump version

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 7b9da3ccd5..7e480d60da 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.99+1003
+version: 0.9.99+1004
 publish_to: none
 
 environment:

From 02441239d5c251d1b04e4cc9ba64bc1d515f2f4a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 14:11:11 +0530
Subject: [PATCH 407/796] fast 4

---
 .../photos/src/components/PhotoList/index.tsx | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoList/index.tsx b/web/apps/photos/src/components/PhotoList/index.tsx
index c20406bccf..000fe90a8f 100644
--- a/web/apps/photos/src/components/PhotoList/index.tsx
+++ b/web/apps/photos/src/components/PhotoList/index.tsx
@@ -742,20 +742,20 @@ export function PhotoList({
         if (!galleryContext.selectedFile) return;
 
         console.time("t0");
-        const datedDisplayFiles = displayFiles?.map((item) => {
-            // const a = getDate(item);
-            const b = item.timelineDateString;
-            // if (a !== b) console.error("mismatch", a, b);
+        // const datedDisplayFiles = displayFiles?.map((item) => {
+        //     // const a = getDate(item);
+        //     const b = item.timelineDateString;
+        //     // if (a !== b) console.error("mismatch", a, b);
 
-            return {
-                ...item,
-                date: b,
-            };
-        });
+        //     return {
+        //         ...item,
+        //         date: b,
+        //     };
+        // });
 
         console.timeEnd("t0");
         console.time("t1");
-        const notSelectedFiles = datedDisplayFiles?.filter(
+        const notSelectedFiles = displayFiles?.filter(
             (item) => !galleryContext.selectedFile[item.id],
         );
         console.timeEnd("t1");
@@ -766,7 +766,7 @@ export function PhotoList({
 
         console.timeEnd("t2");
         console.time("t3");
-        const localSelectedFiles = datedDisplayFiles.filter(
+        const localSelectedFiles = displayFiles.filter(
             // to get files which were manually selected
             (item) => !unselectedDates.has(item.timelineDateString),
         );
@@ -820,7 +820,7 @@ export function PhotoList({
         setCheckedDates(dates);
 
         const filesOnADay = displayFiles?.filter(
-            (item) => getDate(item) === date,
+            (item) => item.timelineDateString === date,
         ); // all files on a checked/unchecked day
 
         filesOnADay.forEach((file) => {

From 28160b04b9264b2b374afe58fef5a508d896398b Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 14:17:16 +0530
Subject: [PATCH 408/796] Clean

---
 web/apps/photos/src/components/PhotoFrame.tsx | 10 +--
 .../photos/src/components/PhotoList/index.tsx | 74 +++----------------
 web/packages/base/date.ts                     |  8 ++
 3 files changed, 21 insertions(+), 71 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index c9968905dd..1445ca170b 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -1,3 +1,4 @@
+import { isSameDay } from "@/base/date";
 import { formattedDate } from "@/base/i18n-date";
 import log from "@/base/log";
 import type { FileInfoProps } from "@/gallery/components/FileInfo";
@@ -673,18 +674,11 @@ const updateDisplayFileSource = (
     }
 };
 
-const A_DAY = 24 * 60 * 60 * 1000;
-
 const fileTimelineDateString = (item: EnteFile) => {
     const date = new Date(item.metadata.creationTime / 1000);
     return isSameDay(date, new Date())
         ? t("TODAY")
-        : isSameDay(date, new Date(Date.now() - A_DAY))
+        : isSameDay(date, new Date(Date.now() - 24 * 60 * 60 * 1000))
           ? t("YESTERDAY")
           : formattedDate(date);
 };
-
-const isSameDay = (first: Date, second: Date) =>
-    first.getFullYear() === second.getFullYear() &&
-    first.getMonth() === second.getMonth() &&
-    first.getDate() === second.getDate();
diff --git a/web/apps/photos/src/components/PhotoList/index.tsx b/web/apps/photos/src/components/PhotoList/index.tsx
index 000fe90a8f..0fde64eadd 100644
--- a/web/apps/photos/src/components/PhotoList/index.tsx
+++ b/web/apps/photos/src/components/PhotoList/index.tsx
@@ -1,5 +1,5 @@
 import { assertionFailed } from "@/base/assert";
-import { formattedDate } from "@/base/i18n-date";
+import { isSameDay } from "@/base/date";
 import { EnteFile } from "@/media/file";
 import {
     GAP_BTW_TILES,
@@ -434,12 +434,9 @@ export function PhotoList({
             ) {
                 currentDate = item.metadata.creationTime / 1000;
 
-                const a = _getDate(currentDate);
-                const b = item.timelineDateString;
-                if (a !== b) console.error("mismatch", a, b);
                 timeStampList.push({
                     itemType: ITEM_TYPE.TIME,
-                    date: b,
+                    date: item.timelineDateString,
                     id: currentDate.toString(),
                 });
                 timeStampList.push({
@@ -741,43 +738,24 @@ export function PhotoList({
         // Nothing to do here if nothing is selected.
         if (!galleryContext.selectedFile) return;
 
-        console.time("t0");
-        // const datedDisplayFiles = displayFiles?.map((item) => {
-        //     // const a = getDate(item);
-        //     const b = item.timelineDateString;
-        //     // if (a !== b) console.error("mismatch", a, b);
+        console.time("t6");
 
-        //     return {
-        //         ...item,
-        //         date: b,
-        //     };
-        // });
-
-        console.timeEnd("t0");
-        console.time("t1");
-        const notSelectedFiles = displayFiles?.filter(
+        const notSelectedFiles = (displayFiles ?? []).filter(
             (item) => !galleryContext.selectedFile[item.id],
         );
-        console.timeEnd("t1");
-        console.time("t2");
+
         const unselectedDates = new Set(
-            notSelectedFiles?.map((item) => item.timelineDateString),
+            notSelectedFiles.map((item) => item.timelineDateString),
         ); // to get file's date which were manually unselected
 
-        console.timeEnd("t2");
-        console.time("t3");
-        const localSelectedFiles = displayFiles.filter(
+        const localSelectedFiles = (displayFiles ?? []).filter(
             // to get files which were manually selected
             (item) => !unselectedDates.has(item.timelineDateString),
         );
-        console.timeEnd("t3");
-        console.time("t4");
 
-        const localSelectedDates = [
-            ...new Set(localSelectedFiles?.map((item) => item.timelineDateString)),
-        ]; // to get file's date which were manually selected
-        console.timeEnd("t4");
-        console.time("t5");
+        const localSelectedDates = new Set(
+            localSelectedFiles.map((item) => item.timelineDateString),
+        ); // to get file's date which were manually selected
 
         unselectedDates.forEach((date) => {
             setCheckedDates((prev) => ({
@@ -785,10 +763,8 @@ export function PhotoList({
                 [date]: false,
             })); // To uncheck select all checkbox if any of the file on the date is unselected
         });
-        console.timeEnd("t5");
-        console.time("t6");
 
-        localSelectedDates.map((date) => {
+        localSelectedDates.forEach((date) => {
             setCheckedDates((prev) => ({
                 ...prev,
                 [date]: true,
@@ -797,13 +773,6 @@ export function PhotoList({
         });
 
         console.timeEnd("t6");
-
-        console.log({
-            notSelectedFiles,
-            localSelectedFiles,
-            localSelectedDates,
-            unselectedDatesLen: unselectedDates.size,
-        });
     }, [galleryContext.selectedFile]);
 
     const handleSelect = handleSelectCreator(
@@ -949,24 +918,3 @@ export function PhotoList({
         </List>
     );
 }
-
-const A_DAY = 24 * 60 * 60 * 1000;
-
-const getDate = (item: EnteFile) => {
-    const currentDate = item.metadata.creationTime / 1000;
-    return _getDate(currentDate);
-};
-
-const _getDate = (currentDate: number) => {
-    const date = new Date(currentDate);
-    return isSameDay(date, new Date())
-        ? t("TODAY")
-        : isSameDay(date, new Date(Date.now() - A_DAY))
-          ? t("YESTERDAY")
-          : formattedDate(date);
-};
-
-const isSameDay = (first: Date, second: Date) =>
-    first.getFullYear() === second.getFullYear() &&
-    first.getMonth() === second.getMonth() &&
-    first.getDate() === second.getDate();
diff --git a/web/packages/base/date.ts b/web/packages/base/date.ts
index ef46f5dfcb..c44fc5b234 100644
--- a/web/packages/base/date.ts
+++ b/web/packages/base/date.ts
@@ -14,3 +14,11 @@ export const dateFromEpochMicroseconds = (
     epochMicroseconds === undefined
         ? undefined
         : new Date(epochMicroseconds / 1000);
+
+/**
+ * Return `true` if both the given dates have the same day.
+ */
+export const isSameDay = (first: Date, second: Date) =>
+    first.getFullYear() === second.getFullYear() &&
+    first.getMonth() === second.getMonth() &&
+    first.getDate() === second.getDate();

From 80049b11ba5ce11a083635943ce36be3e9aea85a Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 21 Feb 2025 14:42:59 +0530
Subject: [PATCH 409/796] [mob] Handle null result

---
 mobile/ios/Podfile.lock             | 114 ++++++++++++++--------------
 mobile/lib/models/user_details.dart |   8 +-
 2 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index 93a14d304a..83dbb53f45 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -450,84 +450,84 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/wakelock_plus/ios"
 
 SPEC CHECKSUMS:
-  background_fetch: 94b36ee293e82972852dba8ede1fbcd3bd3d9d57
-  battery_info: a06b00c06a39bc94c92beebf600f1810cb6c8c87
-  connectivity_plus: 3f6c9057f4cd64198dc826edfb0542892f825343
-  cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
-  dart_ui_isolate: 46f6714abe6891313267153ef6f9748d8ecfcab1
-  device_info_plus: 335f3ce08d2e174b9fdc3db3db0f4e3b1f66bd89
+  background_fetch: 39f11371c0dce04b001c4bfd5e782bcccb0a85e2
+  battery_info: 09f5c9ee65394f2291c8c6227bedff345b8a730c
+  connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
+  cupertino_http: 947a233f40cfea55167a49f2facc18434ea117ba
+  dart_ui_isolate: d5bcda83ca4b04f129d70eb90110b7a567aece14
+  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   ffmpeg-kit-ios-full-gpl: 80adc341962e55ef709e36baa8ed9a70cf4ea62b
-  ffmpeg_kit_flutter_full_gpl: ce18b888487c05c46ed252cd2e7956812f2e3bd1
-  file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
+  ffmpeg_kit_flutter_full_gpl: 8d15c14c0c3aba616fac04fe44b3d27d02e3c330
+  file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
   Firebase: 98e6bf5278170668a7983e12971a66b2cd57fc8c
-  firebase_core: 085320ddfaacb80d1a96eac3a87857afcc150db1
-  firebase_messaging: d398edc15fe825f832836e74f6ac61e8cd2f3ad3
+  firebase_core: 2bedc3136ec7c7b8561c6123ed0239387b53f2af
+  firebase_messaging: 15d114e1a41fc31e4fbabcd48d765a19eec94a38
   FirebaseCore: a282032ae9295c795714ded2ec9c522fc237f8da
   FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2
   FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414
   FirebaseMessaging: c9ec7b90c399c7a6100297e9d16f8a27fc7f7152
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_email_sender: cd533cdc7ea5eda6fabb2c7f78521c71207778a4
-  flutter_image_compress: 4b058288a81f76e5e80340af37c709abafff34c4
-  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
-  flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100
-  flutter_native_splash: 35ddbc7228eafcb3969dcc5f1fbbe27c1145a4f0
-  flutter_secure_storage: 2c2ff13db9e0a5647389bff88b0ecac56e3f3418
-  flutter_sodium: 152647449ba89a157fd48d7e293dcd6d29c6ab0e
-  fluttertoast: 76fea30fcf04176325f6864c87306927bd7d2038
+  flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
+  flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433
+  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
+  flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
+  flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
+  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
+  flutter_sodium: c84426b4de738514b5b66cfdeb8a06634e72fe0b
+  fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
-  home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
-  image_editor_common: 3de87e7c4804f4ae24c8f8a998362b98c105cac1
-  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
-  in_app_purchase_storekit: e126ef1b89e4a9fdf07e28f005f82632b4609437
-  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
+  home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57
+  image_editor_common: d6f6644ae4a6de80481e89fe6d0a8c49e30b4b43
+  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
+  in_app_purchase_storekit: 8c3b0b3eb1b0f04efbff401c3de6266d4258d433
+  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
   libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
-  local_auth_darwin: 553ce4f9b16d3fdfeafce9cf042e7c9f77c1c391
-  local_auth_ios: f7a1841beef3151d140a967c2e46f30637cdf451
+  local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
+  local_auth_ios: 5046a18c018dd973247a0564496c8898dbb5adf9
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
-  maps_launcher: edf829809ba9e894d70e569bab11c16352dedb45
-  media_extension: a1fec16ee9c8241a6aef9613578ebf097d6c5e64
-  media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
-  media_kit_native_event_loop: 5fba1a849a6c87a34985f1e178a0de5bd444a0cf
-  media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
-  motion_sensors: 741e702c17467b9569a92165dda8d4d88c6167f1
-  motionphoto: 584b43031ead3060225cdff08fa49818879801d2
-  move_to_background: 155f7bfbd34d43ad847cb630d2d2d87c17199710
+  maps_launcher: 2e5b6a2d664ec6c27f82ffa81b74228d770ab203
+  media_extension: 6d30dc1431ebaa63f43c397c37917b1a0a597a4c
+  media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
+  media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
+  media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
+  motion_sensors: 03f55b7c637a7e365a0b5f9697a449f9059d5d91
+  motionphoto: d4a432b8c8f22fb3ad966258597c0103c9c5ff16
+  move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  native_video_player: b65c58951ede2f93d103a25366bdebca95081265
-  objective_c: 89e720c30d716b036faf9c9684022048eee1eee2
-  onnxruntime: f9b296392c96c42882be020a59dbeac6310d81b2
+  native_video_player: d12af78a1a4a8cf09775a5177d5b392def6fd23c
+  objective_c: 77e887b5ba1827970907e10e832eec1683f3431d
+  onnxruntime: e7c2ae44385191eaad5ae64c935a72debaddc997
   onnxruntime-c: a909204639a1f035f575127ac406f781ac797c9c
   onnxruntime-objc: b6fab0f1787aa6f7190c2013f03037df4718bd8b
-  open_mail_app: 06d5a4162866388a92b1df3deb96e56be20cf45c
+  open_mail_app: 794172f6a22cd16319d3ddaf45e945b2f74952b0
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
-  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
-  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
-  photo_manager: d2fbcc0f2d82458700ee6256a15018210a81d413
-  privacy_screen: 3159a541f5d3a31bea916cfd4e58f9dc722b3fd4
+  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
+  photo_manager: ff695c7a1dd5bc379974953a2b5c0a293f7c4c8a
+  privacy_screen: 1a131c052ceb3c3659934b003b0d397c2381a24e
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  receive_sharing_intent: f6a12b7e8f7ed745f61c982de8a65de88db44a44
-  screen_brightness_ios: 5ed898fa50fa82a26171c086ca5e28228f932576
+  receive_sharing_intent: df9c334dc9feadcbd3266e5cb49c8443405e1c9f
+  screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
   SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
   Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
-  sentry_flutter: 0a211008f52553ba5dd81ceb71f48d78f0f1f6ab
-  share_plus: 011d6fb4f9d2576b83179a3a5c5e323202cdabcf
-  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
-  sqflite_darwin: 44bb54cc302bff1fbe5752293aba1820b157cf1c
+  sentry_flutter: 0eb93e5279eb41e2392212afe1ccd2fecb4f8cbe
+  share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  sqflite_darwin: a553b1fd6fe66f53bbb0fe5b4f5bab93f08d7a13
   sqlite3: 0bb0e6389d824e40296f531b858a2a0b71c0d2fb
-  sqlite3_flutter_libs: 9379996d65aa23dcda7585a5b58766cebe0aa042
-  system_info_plus: 555ce7047fbbf29154726db942ae785c29211740
+  sqlite3_flutter_libs: c00457ebd31e59fa6bb830380ddba24d44fbcd3b
+  system_info_plus: 5393c8da281d899950d751713575fbf91c7709aa
   Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
-  ua_client_hints: 0b48eae1134283f5b131ee0871fa878377f07a01
-  uni_links: ed8c961e47ed9ce42b6d91e1de8049e38a4b3152
-  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
-  video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
-  video_thumbnail: b637e0ad5f588ca9945f6e2c927f73a69a661140
-  volume_controller: ca1cde542ee70fad77d388f82e9616488110942b
-  wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49
+  ua_client_hints: 46bb5817a868f9e397c0ba7e3f2f5c5d90c35156
+  uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
+  video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1
+  volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
+  wakelock_plus: 373cfe59b235a6dd5837d0fb88791d2f13a90d56
 
 PODFILE CHECKSUM: 20e086e6008977d43a3d40260f3f9bffcac748dd
 
diff --git a/mobile/lib/models/user_details.dart b/mobile/lib/models/user_details.dart
index 6b49371631..9fc78fd63c 100644
--- a/mobile/lib/models/user_details.dart
+++ b/mobile/lib/models/user_details.dart
@@ -61,11 +61,13 @@ class UserDetails {
         storageBonus;
   }
 
+  // return the member storage limit if user is part of family and the admin
+  // has set the storage limit for the user.
   int? familyMemberStorageLimit() {
     if (isPartOfFamily()) {
-      final FamilyMember currentUserMember = familyData!.members!
-          .firstWhere((element) => element.email.trim() == email.trim());
-      return currentUserMember.storageLimit;
+      final FamilyMember? currentUserMember = familyData!.members!
+          .firstWhereOrNull((element) => element.email.trim() == email.trim());
+      return currentUserMember?.storageLimit;
     }
     return null;
   }

From 9d06db2b6b40abca939d3c595da804c805fb7ec8 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 21 Feb 2025 14:44:50 +0530
Subject: [PATCH 410/796] [mob] Fix free storage calculation for mob upload

---
 mobile/lib/models/user_details.dart | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mobile/lib/models/user_details.dart b/mobile/lib/models/user_details.dart
index 9fc78fd63c..d7318a9796 100644
--- a/mobile/lib/models/user_details.dart
+++ b/mobile/lib/models/user_details.dart
@@ -51,6 +51,10 @@ class UserDetails {
   }
 
   int getFreeStorage() {
+    final int? memberLimit = familyMemberStorageLimit();
+    if (memberLimit != null) {
+      return max(memberLimit - usage, 0);
+    }
     return max(getTotalStorage() - getFamilyOrPersonalUsage(), 0);
   }
 

From d2dd08391af97edf0d01b1486cd07fadf7835c6d Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 14:44:07 +0530
Subject: [PATCH 411/796] Investigate speeding up the checkbox action too

---
 web/apps/photos/src/components/PhotoFrame.tsx | 14 +++-
 .../photos/src/components/PhotoList/index.tsx | 79 ++++++++++++++-----
 2 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 1445ca170b..12aaf0f4e7 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -70,8 +70,15 @@ export type DisplayFile = EnteFile & {
     conversionFailed?: boolean;
     canForceConvert?: boolean;
     /**
-     * The formatted date string under which this file should be grouped in the
-     * gallery listing.
+     * [Note: Timeline date string]
+     *
+     * The timeline date string is a formatted date string under which a
+     * particular file should be grouped in the gallery listing. e.g. "Today",
+     * "Yesterday", "Fri, 21 Feb" etc.
+     *
+     * All files which have the same timelineDateString will be grouped under a
+     * single section in the gallery listing, prefixed by the timelineDateString
+     * itself, and a checkbox to select all files on that date.
      */
     timelineDateString?: string;
 };
@@ -674,6 +681,9 @@ const updateDisplayFileSource = (
     }
 };
 
+/**
+ * See: [Note: Timeline date string]
+ */
 const fileTimelineDateString = (item: EnteFile) => {
     const date = new Date(item.metadata.creationTime / 1000);
     return isSameDay(date, new Date())
diff --git a/web/apps/photos/src/components/PhotoList/index.tsx b/web/apps/photos/src/components/PhotoList/index.tsx
index 0fde64eadd..da1519d58a 100644
--- a/web/apps/photos/src/components/PhotoList/index.tsx
+++ b/web/apps/photos/src/components/PhotoList/index.tsx
@@ -273,7 +273,11 @@ export function PhotoList({
     const shouldRefresh = useRef(false);
     const listRef = useRef(null);
 
-    const [checkedDates, setCheckedDates] = useState({});
+    // Timeline date strings for which all photos have been selected.
+    //
+    // See: [Note: Timeline date string]
+    const [checkedTimelineDateStrings, setCheckedTimelineDateStrings] =
+        useState(new Set());
 
     const fittableColumns = getFractionFittableColumns(width);
     let columns = Math.floor(fittableColumns);
@@ -757,20 +761,34 @@ export function PhotoList({
             localSelectedFiles.map((item) => item.timelineDateString),
         ); // to get file's date which were manually selected
 
-        unselectedDates.forEach((date) => {
-            setCheckedDates((prev) => ({
-                ...prev,
-                [date]: false,
-            })); // To uncheck select all checkbox if any of the file on the date is unselected
-        });
+        setCheckedTimelineDateStrings((prev) => {
+            console.time("s1");
 
-        localSelectedDates.forEach((date) => {
-            setCheckedDates((prev) => ({
-                ...prev,
-                [date]: true,
-            }));
-            // To check select all checkbox if all of the files on the date is selected manually
+            const checked = new Set(prev);
+            // Uncheck the "Select all" checkbox if any of the files on the date
+            // is unselected.
+            unselectedDates.forEach((date) => checked.delete(date));
+            // Check the "Select all" checkbox if all of the files on a date are
+            // selected.
+            localSelectedDates.forEach((date) => checked.add(date));
+            console.timeEnd("s1");
+
+            return checked;
         });
+        // unselectedDates.forEach((date) => {
+        //     setCheckedDates((prev) => ({
+        //         ...prev,
+        //         [date]: false,
+        //     }));
+        // });
+
+        // localSelectedDates.forEach((date) => {
+        //     setCheckedDates((prev) => ({
+        //         ...prev,
+        //         [date]: true,
+        //     }));
+
+        // });
 
         console.timeEnd("t6");
     }, [galleryContext.selectedFile]);
@@ -783,21 +801,40 @@ export function PhotoList({
     );
 
     const onChangeSelectAllCheckBox = (date: string) => {
-        const dates = { ...checkedDates, [date]: !checkedDates[date] };
-        const isDateSelected = !checkedDates[date];
+        console.time("c1");
 
-        setCheckedDates(dates);
+        // const dates = { ...checkedDates, [date]: !checkedDates[date] };
+        const next = new Set(checkedTimelineDateStrings);
+        let isDateSelected: boolean;
+        if (!next.has(date)) {
+            next.add(date);
+            isDateSelected = true;
+        } else {
+            next.delete(date);
+            isDateSelected = false;
+        }
+        // const isDateSelected = !checkedDates[date];
+
+        // setCheckedDates(dates);
+        setCheckedTimelineDateStrings(next);
+        console.timeEnd("c1");
+        console.time("c2");
 
         const filesOnADay = displayFiles?.filter(
             (item) => item.timelineDateString === date,
         ); // all files on a checked/unchecked day
 
+        console.timeEnd("c2");
+        console.time("c3");
+
         filesOnADay.forEach((file) => {
             handleSelect(
                 file.id,
                 file.ownerID === galleryContext?.user?.id,
             )(isDateSelected);
         });
+
+        console.timeEnd("c3");
     };
 
     const renderListItem = (
@@ -817,7 +854,10 @@ export function PhotoList({
                                     <Checkbox
                                         key={item.date}
                                         name={item.date}
-                                        checked={!!checkedDates[item.date]}
+                                        // checked={!!checkedDates[item.date]}
+                                        checked={checkedTimelineDateStrings.has(
+                                            item.date,
+                                        )}
                                         onChange={() =>
                                             onChangeSelectAllCheckBox(item.date)
                                         }
@@ -836,7 +876,10 @@ export function PhotoList({
                             <Checkbox
                                 key={listItem.date}
                                 name={listItem.date}
-                                checked={!!checkedDates[listItem.date]}
+                                // checked={!!checkedDates[listItem.date]}
+                                checked={checkedTimelineDateStrings.has(
+                                    listItem.date,
+                                )}
                                 onChange={() =>
                                     onChangeSelectAllCheckBox(listItem.date)
                                 }

From 61bb3ce16bba03c6d7541d442cd2036cc50e7cd4 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Fri, 21 Feb 2025 14:55:50 +0530
Subject: [PATCH 412/796] fix: is preview player setting

---
 mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart  | 4 +++-
 mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart     | 1 +
 mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
index e2b0229591..c3791d757e 100644
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
@@ -15,6 +15,7 @@ class VideoWidget extends StatefulWidget {
   final Function(bool)? playbackCallback;
   final bool isFromMemories;
   final void Function() onStreamChange;
+  final bool isPreviewPlayer;
 
   const VideoWidget(
     this.file,
@@ -24,6 +25,7 @@ class VideoWidget extends StatefulWidget {
     required this.isFromMemories,
     // ignore: unused_element
     required this.onStreamChange,
+    required this.isPreviewPlayer,
   });
 
   @override
@@ -152,7 +154,7 @@ class _VideoWidgetState extends State<VideoWidget> {
                               PreviewStatusWidget(
                                 showControls: value,
                                 file: widget.file,
-                                isPreviewPlayer: true,
+                                isPreviewPlayer: widget.isPreviewPlayer,
                                 onStreamChange: widget.onStreamChange,
                               ),
                               SeekBarAndDuration(
diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
index 13d45bd57a..8edb1ac8cf 100644
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
@@ -143,6 +143,7 @@ class _VideoWidgetMediaKitNewState extends State<VideoWidgetMediaKitNew>
                 widget.playbackCallback,
                 isFromMemories: widget.isFromMemories,
                 onStreamChange: widget.onStreamChange,
+                isPreviewPlayer: false,
               )
             : const Center(
                 child: EnteLoadingWidget(
diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart
index 39ff6e491f..46f569660c 100644
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart
@@ -148,6 +148,7 @@ class _VideoWidgetMediaKitPreviewState extends State<VideoWidgetMediaKitPreview>
                 widget.playbackCallback,
                 isFromMemories: widget.isFromMemories,
                 onStreamChange: widget.onStreamChange,
+                isPreviewPlayer: true,
               )
             : const Center(
                 child: EnteLoadingWidget(

From 5d553afea740c80b97c17cb4df25f9588baa4e59 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 15:28:16 +0530
Subject: [PATCH 413/796] Rearrange

---
 web/apps/photos/src/components/PhotoFrame.tsx  | 18 ++++--------------
 .../photos/src/components/PhotoList/index.tsx  |  6 ++----
 web/apps/photos/src/utils/photoFrame/index.ts  |  5 +++--
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 12aaf0f4e7..469ef5521f 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -303,6 +303,7 @@ const PhotoFrame = ({
     const handleSelect = handleSelectCreator(
         setSelected,
         mode,
+        galleryContext.user?.id,
         activeCollectionID,
         activePersonID,
         setRangeStart,
@@ -329,16 +330,9 @@ const PhotoFrame = ({
                 (index - i) * direction > 0;
                 i += direction
             ) {
-                handleSelect(
-                    displayFiles[i].id,
-                    displayFiles[i].ownerID === galleryContext.user?.id,
-                )(!checked);
+                handleSelect(displayFiles[i])(!checked);
             }
-            handleSelect(
-                displayFiles[index].id,
-                displayFiles[index].ownerID === galleryContext.user?.id,
-                index,
-            )(!checked);
+            handleSelect(displayFiles[index], index)(!checked);
         }
     };
 
@@ -353,11 +347,7 @@ const PhotoFrame = ({
             updateURL={updateThumbURL(index)}
             onClick={onThumbnailClick(index)}
             selectable={selectable}
-            onSelect={handleSelect(
-                item.id,
-                item.ownerID === galleryContext.user?.id,
-                index,
-            )}
+            onSelect={handleSelect(item, index)}
             selected={
                 (!mode
                     ? selected.collectionID === activeCollectionID
diff --git a/web/apps/photos/src/components/PhotoList/index.tsx b/web/apps/photos/src/components/PhotoList/index.tsx
index da1519d58a..783c26cbe8 100644
--- a/web/apps/photos/src/components/PhotoList/index.tsx
+++ b/web/apps/photos/src/components/PhotoList/index.tsx
@@ -796,6 +796,7 @@ export function PhotoList({
     const handleSelect = handleSelectCreator(
         galleryContext.setSelectedFiles,
         mode,
+        galleryContext?.user?.id,
         activeCollectionID,
         activePersonID,
     );
@@ -828,10 +829,7 @@ export function PhotoList({
         console.time("c3");
 
         filesOnADay.forEach((file) => {
-            handleSelect(
-                file.id,
-                file.ownerID === galleryContext?.user?.id,
-            )(isDateSelected);
+            handleSelect(file)(isDateSelected);
         });
 
         console.timeEnd("c3");
diff --git a/web/apps/photos/src/utils/photoFrame/index.ts b/web/apps/photos/src/utils/photoFrame/index.ts
index aff8c83512..8fdc03622a 100644
--- a/web/apps/photos/src/utils/photoFrame/index.ts
+++ b/web/apps/photos/src/utils/photoFrame/index.ts
@@ -6,11 +6,12 @@ export const handleSelectCreator =
     (
         setSelected: SetSelectedState,
         mode: GalleryBarMode | undefined,
+        userID: number | undefined,
         activeCollectionID: number,
         activePersonID: string | undefined,
         setRangeStart?,
     ) =>
-    (id: number, isOwnFile: boolean, index?: number) =>
+    ({ id, ownerID }: { id: number; ownerID: number }, index?: number) =>
     (checked: boolean) => {
         if (typeof index !== "undefined") {
             if (checked) {
@@ -110,7 +111,7 @@ export const handleSelectCreator =
             };
 
             const handleAllCounterChange = () => {
-                if (isOwnFile) {
+                if (ownerID === userID) {
                     return {
                         ownCount: handleCounterChange(selected.ownCount),
                         count: handleCounterChange(selected.count),

From 78a7ae7c5fb0a4e6a0cbce1ad0994e07d184ba34 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Fri, 21 Feb 2025 15:28:52 +0530
Subject: [PATCH 414/796] [mob][photos] photo selection of people memories

---
 mobile/lib/services/location_service.dart     |  22 +++
 .../lib/services/smart_memories_service.dart  | 139 +++++++++++++++++-
 2 files changed, 153 insertions(+), 8 deletions(-)

diff --git a/mobile/lib/services/location_service.dart b/mobile/lib/services/location_service.dart
index 66563be7ad..cd00ac4c85 100644
--- a/mobile/lib/services/location_service.dart
+++ b/mobile/lib/services/location_service.dart
@@ -18,6 +18,8 @@ import "package:photos/service_locator.dart";
 import "package:photos/services/remote_assets_service.dart";
 import "package:shared_preferences/shared_preferences.dart";
 
+const double earthRadius = 6371; // Earth's radius in kilometers
+
 class LocationService {
   final SharedPreferences prefs;
   final Logger _logger = Logger((LocationService).toString());
@@ -357,6 +359,26 @@ bool isFileInsideLocationTag(
   return false;
 }
 
+double calculateDistance(Location point1, Location point2) {
+  final lat1 = point1.latitude! * (pi / 180);
+  final lat2 = point2.latitude! * (pi / 180);
+  final long1 = point1.longitude! * (pi / 180);
+  final long2 = point2.longitude! * (pi / 180);
+
+  // Difference in latitude and longitude
+  final dLat = lat2 - lat1;
+  final dLong = long2 - long1;
+
+  // Haversine formula
+  final a = sin(dLat / 2) * sin(dLat / 2) +
+      cos(lat1) * cos(lat2) * sin(dLong / 2) * sin(dLong / 2);
+
+  // Angular distance in radians
+  final c = 2 * atan2(sqrt(a), sqrt(1 - a));
+
+  return earthRadius * c; // Distance in kilometers
+}
+
 ///The area bounded by the location tag becomes more elliptical with increase
 ///in the magnitude of the latitude on the caritesian plane. When latitude is
 ///0 degrees, the ellipse is a circle with a = b = r. When latitude incrases,
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 006e025c0d..220b511b94 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -280,9 +280,11 @@ class SmartMemoriesService {
         if (isMeAssigned && meID == personID) {
           title = "Spotlight on yourself";
         }
-        // TODO: lau: create selection on spotlightFiles on time, location and faces
-        final spotlightMemory = PeopleMemory(
+        final selectSpotlightMemories = await _bestSelectionPeople(
           spotlightFiles.map((f) => Memory.fromFile(f, _seenTimes)).toList(),
+        );
+        final spotlightMemory = PeopleMemory(
+          selectSpotlightMemories,
           PeopleMemoryType.spotlight,
           personID,
           name: title,
@@ -306,9 +308,11 @@ class SmartMemoriesService {
         }
         if (youAndThemFiles.length > 5) {
           final String title = "You and $personName";
-          // TODO: lau: create selection on youAndThemFiles on time and location
-          final youAndThemMemory = PeopleMemory(
+          final selectYouAndThemMemories = await _bestSelectionPeople(
             youAndThemFiles.map((f) => Memory.fromFile(f, _seenTimes)).toList(),
+          );
+          final youAndThemMemory = PeopleMemory(
+            selectYouAndThemMemories,
             PeopleMemoryType.youAndThem,
             personID,
             name: title,
@@ -349,9 +353,11 @@ class SmartMemoriesService {
         }
         if (activityFiles.length > 5) {
           final String title = activityTitle(lastActivity, personName);
-          // TODO: lau: create selection on activityFiles on time and location
-          final activityMemory = PeopleMemory(
+          final selectActivityMemories = await _bestSelectionPeople(
             activityFiles.map((f) => Memory.fromFile(f, _seenTimes)).toList(),
+          );
+          final activityMemory = PeopleMemory(
+            selectActivityMemories,
             PeopleMemoryType.doingSomethingTogether,
             personID,
             name: title,
@@ -1045,14 +1051,131 @@ class SmartMemoriesService {
     return null;
   }
 
-  /// Returns the best selection of files from the given list.
+  /// Creates a curated selection of memories for the People memories.
+  /// The selection is based on the following things:
+  /// - Distribution of photos over time
+  /// - Nostalgia score of photos
+  /// - Distribution of photos over locations
+  Future<List<Memory>> _bestSelectionPeople(
+    List<Memory> memories, {
+    int? prefferedSize,
+  }) async {
+    try {
+      final fileCount = memories.length;
+      final int targetSize = prefferedSize ?? 10;
+      if (fileCount <= targetSize) return memories;
+      final safeMemories = memories
+          .where((memory) => memory.file.uploadedFileID != null)
+          .toList();
+
+      // Sort by time
+      final sortedTimeMemories = <Memory>[];
+      for (final memory in safeMemories) {
+        if (memory.file.creationTime != null) {
+          sortedTimeMemories.add(memory);
+        }
+      }
+      sortedTimeMemories.sort(
+        (a, b) => a.file.creationTime!.compareTo(b.file.creationTime!),
+      );
+      if (sortedTimeMemories.length < targetSize) return sortedTimeMemories;
+
+      // Divide into 10 time buckets distributing all memories as evenly as possible.
+      final int total = sortedTimeMemories.length;
+      final int numBuckets = targetSize;
+      final int quotient = total ~/ numBuckets;
+      final int remainder = total % numBuckets;
+      final List<List<Memory>> timeBuckets = [];
+      int offset = 0;
+      for (int i = 0; i < numBuckets; i++) {
+        final int bucketSize = quotient + (i < remainder ? 1 : 0);
+        timeBuckets.add(sortedTimeMemories.sublist(offset, offset + bucketSize));
+        offset += bucketSize;
+      }
+
+      final finalSelection = <Memory>[];
+      bucketLoop:
+      for (final bucket in timeBuckets) {
+        // Get X% most nostalgic photos
+        final nostalgiaScores = <int, double>{};
+        final bucketFileIDs = bucket
+            .map((memory) => memory.file.uploadedFileID!)
+            .toSet()
+            .toList();
+        final bucketFileIdToClip =
+            await MLDataDB.instance.getClipVectorsForFileIDs(bucketFileIDs);
+        for (final mem in bucket) {
+          final fileID = mem.file.uploadedFileID!;
+          final clip = bucketFileIdToClip[fileID];
+          if (clip == null) {
+            nostalgiaScores[fileID] = 0;
+            continue;
+          }
+          final score = clip.vector.dot(_clipPositiveTextVector!);
+          nostalgiaScores[fileID] = score;
+        }
+        final sortedNostalgia = bucket
+          ..sort(
+            (a, b) => nostalgiaScores[b.file.uploadedFileID!]!
+                .compareTo(nostalgiaScores[a.file.uploadedFileID!]!),
+          );
+        final mostNostalgic = sortedNostalgia
+            .take((max(bucket.length * 0.3, 1)).toInt())
+            .toList();
+
+        if (mostNostalgic.isEmpty) {
+          _logger.severe('No nostalgic photos in bucket');
+        }
+
+        // If no selection yet, take the most nostalgic photo
+        if (finalSelection.isEmpty) {
+          finalSelection.add(mostNostalgic.first);
+          continue bucketLoop;
+        }
+
+        // From nostalgic selection, take the photo furthest away from all currently selected ones
+        double globalMaxMinDistance = 0;
+        int farthestDistanceIdx = 0;
+        for (var i = 0; i < mostNostalgic.length; i++) {
+          final mem = mostNostalgic[i];
+          double minDistance = double.infinity;
+          for (final selected in finalSelection) {
+            if (selected.file.location == null || mem.file.location == null) {
+              continue;
+            }
+            final distance =
+                calculateDistance(mem.file.location!, selected.file.location!);
+            if (distance < minDistance) {
+              minDistance = distance;
+            }
+          }
+          if (minDistance > globalMaxMinDistance) {
+            globalMaxMinDistance = minDistance;
+            farthestDistanceIdx = i;
+          }
+        }
+        finalSelection.add(mostNostalgic[farthestDistanceIdx]);
+      }
+
+      finalSelection
+          .sort((a, b) => b.file.creationTime!.compareTo(a.file.creationTime!));
+
+      _logger.finest(
+          'People memories selection done, returning ${finalSelection.length} memories',);
+      return finalSelection;
+    } catch (e, s) {
+      _logger.severe('Error in _bestSelectionPeople', e, s);
+      return [];
+    }
+  }
+
+  /// Returns the best selection of files from the given list, for time and trip memories.
   /// Makes sure that the selection is not more than [prefferedSize] or 10 files,
   /// and that each year of the original list is represented.
   Future<List<Memory>> _bestSelection(
     List<Memory> memories, {
     int? prefferedSize,
   }) async {
-    // final files = Memory.filesFromMemories(memories);
     final fileCount = memories.length;
     int targetSize = prefferedSize ?? 10;
     if (fileCount <= targetSize) return memories;

From e80e60278653ec1580bd10c8574994bdefaaed66 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 15:38:59 +0530
Subject: [PATCH 415/796] bespoke 1

---
 .../photos/src/components/PhotoList/index.tsx |   4 +-
 web/apps/photos/src/utils/photoFrame/index.ts | 125 ++++++++++++++++++
 2 files changed, 127 insertions(+), 2 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoList/index.tsx b/web/apps/photos/src/components/PhotoList/index.tsx
index 783c26cbe8..72b15ac75a 100644
--- a/web/apps/photos/src/components/PhotoList/index.tsx
+++ b/web/apps/photos/src/components/PhotoList/index.tsx
@@ -20,7 +20,7 @@ import {
     ListChildComponentProps,
     areEqual,
 } from "react-window";
-import { handleSelectCreator } from "utils/photoFrame";
+import { handleSelectCreatorMulti } from "utils/photoFrame";
 import { PublicCollectionGalleryContext } from "utils/publicCollectionGallery";
 
 export const DATE_CONTAINER_HEIGHT = 48;
@@ -793,7 +793,7 @@ export function PhotoList({
         console.timeEnd("t6");
     }, [galleryContext.selectedFile]);
 
-    const handleSelect = handleSelectCreator(
+    const handleSelect = handleSelectCreatorMulti(
         galleryContext.setSelectedFiles,
         mode,
         galleryContext?.user?.id,
diff --git a/web/apps/photos/src/utils/photoFrame/index.ts b/web/apps/photos/src/utils/photoFrame/index.ts
index 8fdc03622a..06d8d41207 100644
--- a/web/apps/photos/src/utils/photoFrame/index.ts
+++ b/web/apps/photos/src/utils/photoFrame/index.ts
@@ -131,3 +131,128 @@ export const handleSelectCreator =
             };
         });
     };
+
+// TODO: This is a copy of handleSelectCreator, forked to
+// handle multiple selections efficiently ("Select all in a single day"). If
+// the code doesn't diverge, we'll have verbatim duplication.
+export const handleSelectCreatorMulti =
+    (
+        setSelected: SetSelectedState,
+        mode: GalleryBarMode | undefined,
+        userID: number | undefined,
+        activeCollectionID: number,
+        activePersonID: string | undefined,
+    ) =>
+    ({ id, ownerID }: { id: number; ownerID: number }) =>
+    (checked: boolean) => {
+        setSelected((selected) => {
+            if (!mode) {
+                // Retain older behavior for non-gallery call sites.
+                if (selected.collectionID !== activeCollectionID) {
+                    selected = {
+                        ownCount: 0,
+                        count: 0,
+                        collectionID: 0,
+                        context: undefined,
+                    };
+                }
+            } else if (!selected.context) {
+                // Gallery will specify a mode, but a fresh selection starts off
+                // without a context, so fill it in with the current context.
+                selected = {
+                    ...selected,
+                    context:
+                        mode == "people"
+                            ? { mode, personID: activePersonID! }
+                            : {
+                                  mode,
+                                  collectionID: activeCollectionID!,
+                              },
+                };
+            } else {
+                // Both mode and context are defined.
+                if (selected.context.mode != mode) {
+                    // Clear selection if mode has changed.
+                    selected = {
+                        ownCount: 0,
+                        count: 0,
+                        collectionID: 0,
+                        context:
+                            mode == "people"
+                                ? { mode, personID: activePersonID! }
+                                : {
+                                      mode,
+                                      collectionID: activeCollectionID!,
+                                  },
+                    };
+                } else {
+                    if (selected.context?.mode == "people") {
+                        if (selected.context.personID != activePersonID) {
+                            // Clear selection if person has changed.
+                            selected = {
+                                ownCount: 0,
+                                count: 0,
+                                collectionID: 0,
+                                context: {
+                                    mode: selected.context?.mode,
+                                    personID: activePersonID!,
+                                },
+                            };
+                        }
+                    } else {
+                        if (
+                            selected.context.collectionID != activeCollectionID
+                        ) {
+                            // Clear selection if collection has changed.
+                            selected = {
+                                ownCount: 0,
+                                count: 0,
+                                collectionID: 0,
+                                context: {
+                                    mode: selected.context?.mode,
+                                    collectionID: activeCollectionID!,
+                                },
+                            };
+                        }
+                    }
+                }
+            }
+
+            const newContext: SelectionContext | undefined = !mode
+                ? undefined
+                : mode == "people"
+                  ? { mode, personID: activePersonID! }
+                  : { mode, collectionID: activeCollectionID! };
+
+            const handleCounterChange = (count: number) => {
+                if (selected[id] === checked) {
+                    return count;
+                }
+                if (checked) {
+                    return count + 1;
+                } else {
+                    return count - 1;
+                }
+            };
+
+            const handleAllCounterChange = () => {
+                if (ownerID === userID) {
+                    return {
+                        ownCount: handleCounterChange(selected.ownCount),
+                        count: handleCounterChange(selected.count),
+                    };
+                } else {
+                    return {
+                        count: handleCounterChange(selected.count),
+                    };
+                }
+            };
+            return {
+                ...selected,
+                [id]: checked,
+                collectionID: activeCollectionID,
+                context: newContext,
+                ...handleAllCounterChange(),
+            };
+        });
+    };

From 488402156ff037112a9fe243798db18bbf1dc31a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 15:45:46 +0530
Subject: [PATCH 416/796] take 1

---
 .../photos/src/components/PhotoList/index.tsx |  4 +-
 web/apps/photos/src/utils/photoFrame/index.ts | 45 +++++++++----------
 2 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoList/index.tsx b/web/apps/photos/src/components/PhotoList/index.tsx
index 72b15ac75a..b83fe3bd4b 100644
--- a/web/apps/photos/src/components/PhotoList/index.tsx
+++ b/web/apps/photos/src/components/PhotoList/index.tsx
@@ -828,9 +828,7 @@ export function PhotoList({
         console.timeEnd("c2");
         console.time("c3");
 
-        filesOnADay.forEach((file) => {
-            handleSelect(file)(isDateSelected);
-        });
+        handleSelect(filesOnADay)(isDateSelected);
 
         console.timeEnd("c3");
     };
diff --git a/web/apps/photos/src/utils/photoFrame/index.ts b/web/apps/photos/src/utils/photoFrame/index.ts
index 06d8d41207..d549be0262 100644
--- a/web/apps/photos/src/utils/photoFrame/index.ts
+++ b/web/apps/photos/src/utils/photoFrame/index.ts
@@ -143,7 +143,7 @@ export const handleSelectCreatorMulti =
         activeCollectionID: number,
         activePersonID: string | undefined,
     ) =>
-    ({ id, ownerID }: { id: number; ownerID: number }) =>
+    (files: { id: number; ownerID: number }[]) =>
     (checked: boolean) => {
         setSelected((selected) => {
             if (!mode) {
@@ -224,35 +224,30 @@ export const handleSelectCreatorMulti =
                   ? { mode, personID: activePersonID! }
                   : { mode, collectionID: activeCollectionID! };
 
-            const handleCounterChange = (count: number) => {
-                if (selected[id] === checked) {
-                    return count;
-                }
-                if (checked) {
-                    return count + 1;
-                } else {
-                    return count - 1;
-                }
-            };
+            const newSelected = { ...selected };
+            let newCount = selected.count;
+            let newOwnCount = selected.ownCount;
 
-            const handleAllCounterChange = () => {
-                if (ownerID === userID) {
-                    return {
-                        ownCount: handleCounterChange(selected.ownCount),
-                        count: handleCounterChange(selected.count),
-                    };
-                } else {
-                    return {
-                        count: handleCounterChange(selected.count),
-                    };
+            if (checked) {
+                for (const file of files) {
+                    newSelected[file.id] = true;
+                    newCount++;
+                    if (file.ownerID === userID) newOwnCount++;
                 }
-            };
+            } else {
+                for (const file of files) {
+                    newSelected[file.id] = false;
+                    newCount--;
+                    if (file.ownerID === userID) newOwnCount--;
+                }
+            }
+
             return {
-                ...selected,
-                [id]: checked,
+                ...newSelected,
+                count: newCount,
+                ownCount: newOwnCount,
                 collectionID: activeCollectionID,
                 context: newContext,
-                ...handleAllCounterChange(),
             };
         });
     };

From 7cb9bc3eb7341ad7c668f4d6d5301c6b4957d2f3 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 15:53:29 +0530
Subject: [PATCH 417/796] Reduce some duplication

---
 web/apps/photos/src/utils/photoFrame/index.ts | 262 +++++++-----------
 1 file changed, 102 insertions(+), 160 deletions(-)

diff --git a/web/apps/photos/src/utils/photoFrame/index.ts b/web/apps/photos/src/utils/photoFrame/index.ts
index d549be0262..4e185bdc1b 100644
--- a/web/apps/photos/src/utils/photoFrame/index.ts
+++ b/web/apps/photos/src/utils/photoFrame/index.ts
@@ -1,7 +1,8 @@
 import type { SelectionContext } from "@/new/photos/components/gallery";
 import type { GalleryBarMode } from "@/new/photos/components/gallery/reducer";
-import { SetSelectedState } from "types/gallery";
+import { SetSelectedState, type SelectedState } from "types/gallery";
 
+// TODO: All this is unnecessarily complex, and needs reworking.
 export const handleSelectCreator =
     (
         setSelected: SetSelectedState,
@@ -20,84 +21,13 @@ export const handleSelectCreator =
                 setRangeStart(undefined);
             }
         }
-        setSelected((selected) => {
-            if (!mode) {
-                // Retain older behavior for non-gallery call sites.
-                if (selected.collectionID !== activeCollectionID) {
-                    selected = {
-                        ownCount: 0,
-                        count: 0,
-                        collectionID: 0,
-                        context: undefined,
-                    };
-                }
-            } else if (!selected.context) {
-                // Gallery will specify a mode, but a fresh selection starts off
-                // without a context, so fill it in with the current context.
-                selected = {
-                    ...selected,
-                    context:
-                        mode == "people"
-                            ? { mode, personID: activePersonID! }
-                            : {
-                                  mode,
-                                  collectionID: activeCollectionID!,
-                              },
-                };
-            } else {
-                // Both mode and context are defined.
-                if (selected.context.mode != mode) {
-                    // Clear selection if mode has changed.
-                    selected = {
-                        ownCount: 0,
-                        count: 0,
-                        collectionID: 0,
-                        context:
-                            mode == "people"
-                                ? { mode, personID: activePersonID! }
-                                : {
-                                      mode,
-                                      collectionID: activeCollectionID!,
-                                  },
-                    };
-                } else {
-                    if (selected.context?.mode == "people") {
-                        if (selected.context.personID != activePersonID) {
-                            // Clear selection if person has changed.
-                            selected = {
-                                ownCount: 0,
-                                count: 0,
-                                collectionID: 0,
-                                context: {
-                                    mode: selected.context?.mode,
-                                    personID: activePersonID!,
-                                },
-                            };
-                        }
-                    } else {
-                        if (
-                            selected.context.collectionID != activeCollectionID
-                        ) {
-                            // Clear selection if collection has changed.
-                            selected = {
-                                ownCount: 0,
-                                count: 0,
-                                collectionID: 0,
-                                context: {
-                                    mode: selected.context?.mode,
-                                    collectionID: activeCollectionID!,
-                                },
-                            };
-                        }
-                    }
-                }
-            }
-
-            const newContext: SelectionContext | undefined = !mode
-                ? undefined
-                : mode == "people"
-                  ? { mode, personID: activePersonID! }
-                  : { mode, collectionID: activeCollectionID! };
+        setSelected((_selected) => {
+            const { selected, newContext } = createSelectedAndContext(
+                mode,
+                activeCollectionID,
+                activePersonID,
+                _selected,
+            );
 
             const handleCounterChange = (count: number) => {
                 if (selected[id] === checked) {
@@ -132,9 +62,6 @@ export const handleSelectCreator =
         });
     };
 
-// TODO: This is a copy of handleSelectCreator, forked to
-// handle multiple selections efficiently ("Select all in a single day"). If
-// the code doesn't diverge, we'll have verbatim duplication.
 export const handleSelectCreatorMulti =
     (
         setSelected: SetSelectedState,
@@ -145,84 +72,13 @@ export const handleSelectCreatorMulti =
     ) =>
     (files: { id: number; ownerID: number }[]) =>
     (checked: boolean) => {
-        setSelected((selected) => {
-            if (!mode) {
-                // Retain older behavior for non-gallery call sites.
-                if (selected.collectionID !== activeCollectionID) {
-                    selected = {
-                        ownCount: 0,
-                        count: 0,
-                        collectionID: 0,
-                        context: undefined,
-                    };
-                }
-            } else if (!selected.context) {
-                // Gallery will specify a mode, but a fresh selection starts off
-                // without a context, so fill it in with the current context.
-                selected = {
-                    ...selected,
-                    context:
-                        mode == "people"
-                            ? { mode, personID: activePersonID! }
-                            : {
-                                  mode,
-                                  collectionID: activeCollectionID!,
-                              },
-                };
-            } else {
-                // Both mode and context are defined.
-                if (selected.context.mode != mode) {
-                    // Clear selection if mode has changed.
-                    selected = {
-                        ownCount: 0,
-                        count: 0,
-                        collectionID: 0,
-                        context:
-                            mode == "people"
-                                ? { mode, personID: activePersonID! }
-                                : {
-                                      mode,
-                                      collectionID: activeCollectionID!,
-                                  },
-                    };
-                } else {
-                    if (selected.context?.mode == "people") {
-                        if (selected.context.personID != activePersonID) {
-                            // Clear selection if person has changed.
-                            selected = {
-                                ownCount: 0,
-                                count: 0,
-                                collectionID: 0,
-                                context: {
-                                    mode: selected.context?.mode,
-                                    personID: activePersonID!,
-                                },
-                            };
-                        }
-                    } else {
-                        if (
-                            selected.context.collectionID != activeCollectionID
-                        ) {
-                            // Clear selection if collection has changed.
-                            selected = {
-                                ownCount: 0,
-                                count: 0,
-                                collectionID: 0,
-                                context: {
-                                    mode: selected.context?.mode,
-                                    collectionID: activeCollectionID!,
-                                },
-                            };
-                        }
-                    }
-                }
-            }
-
-            const newContext: SelectionContext | undefined = !mode
-                ? undefined
-                : mode == "people"
-                  ? { mode, personID: activePersonID! }
-                  : { mode, collectionID: activeCollectionID! };
+        setSelected((_selected) => {
+            const { selected, newContext } = createSelectedAndContext(
+                mode,
+                activeCollectionID,
+                activePersonID,
+                _selected,
+            );
 
             const newSelected = { ...selected };
             let newCount = selected.count;
@@ -251,3 +107,89 @@ export const handleSelectCreatorMulti =
             };
         });
     };
+
+const createSelectedAndContext = (
+    mode: GalleryBarMode | undefined,
+
+    activeCollectionID: number,
+    activePersonID: string | undefined,
+    selected: SelectedState,
+) => {
+    if (!mode) {
+        // Retain older behavior for non-gallery call sites.
+        if (selected.collectionID !== activeCollectionID) {
+            selected = {
+                ownCount: 0,
+                count: 0,
+                collectionID: 0,
+                context: undefined,
+            };
+        }
+    } else if (!selected.context) {
+        // Gallery will specify a mode, but a fresh selection starts off
+        // without a context, so fill it in with the current context.
+        selected = {
+            ...selected,
+            context:
+                mode == "people"
+                    ? { mode, personID: activePersonID! }
+                    : {
+                          mode,
+                          collectionID: activeCollectionID!,
+                      },
+        };
+    } else {
+        // Both mode and context are defined.
+        if (selected.context.mode != mode) {
+            // Clear selection if mode has changed.
+            selected = {
+                ownCount: 0,
+                count: 0,
+                collectionID: 0,
+                context:
+                    mode == "people"
+                        ? { mode, personID: activePersonID! }
+                        : {
+                              mode,
+                              collectionID: activeCollectionID!,
+                          },
+            };
+        } else {
+            if (selected.context?.mode == "people") {
+                if (selected.context.personID != activePersonID) {
+                    // Clear selection if person has changed.
+                    selected = {
+                        ownCount: 0,
+                        count: 0,
+                        collectionID: 0,
+                        context: {
+                            mode: selected.context?.mode,
+                            personID: activePersonID!,
+                        },
+                    };
+                }
+            } else {
+                if (selected.context.collectionID != activeCollectionID) {
+                    // Clear selection if collection has changed.
+                    selected = {
+                        ownCount: 0,
+                        count: 0,
+                        collectionID: 0,
+                        context: {
+                            mode: selected.context?.mode,
+                            collectionID: activeCollectionID!,
+                        },
+                    };
+                }
+            }
+        }
+    }
+
+    const newContext: SelectionContext | undefined = !mode
+        ? undefined
+        : mode == "people"
+          ? { mode, personID: activePersonID! }
+          : { mode, collectionID: activeCollectionID! };
+
+    return { selected, newContext };
+};

From 04ede4326a5582795782931660f1ff340ae630a5 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 15:57:07 +0530
Subject: [PATCH 418/796] Cleanup scaffolding

---
 .../photos/src/components/PhotoList/index.tsx | 37 -------------------
 1 file changed, 37 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoList/index.tsx b/web/apps/photos/src/components/PhotoList/index.tsx
index b83fe3bd4b..a16ac826b8 100644
--- a/web/apps/photos/src/components/PhotoList/index.tsx
+++ b/web/apps/photos/src/components/PhotoList/index.tsx
@@ -742,8 +742,6 @@ export function PhotoList({
         // Nothing to do here if nothing is selected.
         if (!galleryContext.selectedFile) return;
 
-        console.time("t6");
-
         const notSelectedFiles = (displayFiles ?? []).filter(
             (item) => !galleryContext.selectedFile[item.id],
         );
@@ -762,8 +760,6 @@ export function PhotoList({
         ); // to get file's date which were manually selected
 
         setCheckedTimelineDateStrings((prev) => {
-            console.time("s1");
-
             const checked = new Set(prev);
             // Uncheck the "Select all" checkbox if any of the files on the date
             // is unselected.
@@ -771,26 +767,8 @@ export function PhotoList({
             // Check the "Select all" checkbox if all of the files on a date are
             // selected.
             localSelectedDates.forEach((date) => checked.add(date));
-            console.timeEnd("s1");
-
             return checked;
         });
-        // unselectedDates.forEach((date) => {
-        //     setCheckedDates((prev) => ({
-        //         ...prev,
-        //         [date]: false,
-        //     }));
-        // });
-
-        // localSelectedDates.forEach((date) => {
-        //     setCheckedDates((prev) => ({
-        //         ...prev,
-        //         [date]: true,
-        //     }));
-
-        // });
-
-        console.timeEnd("t6");
     }, [galleryContext.selectedFile]);
 
     const handleSelect = handleSelectCreatorMulti(
@@ -802,9 +780,6 @@ export function PhotoList({
     );
 
     const onChangeSelectAllCheckBox = (date: string) => {
-        console.time("c1");
-
-        // const dates = { ...checkedDates, [date]: !checkedDates[date] };
         const next = new Set(checkedTimelineDateStrings);
         let isDateSelected: boolean;
         if (!next.has(date)) {
@@ -814,23 +789,13 @@ export function PhotoList({
             next.delete(date);
             isDateSelected = false;
         }
-        // const isDateSelected = !checkedDates[date];
-
-        // setCheckedDates(dates);
         setCheckedTimelineDateStrings(next);
-        console.timeEnd("c1");
-        console.time("c2");
 
         const filesOnADay = displayFiles?.filter(
             (item) => item.timelineDateString === date,
         ); // all files on a checked/unchecked day
 
-        console.timeEnd("c2");
-        console.time("c3");
-
         handleSelect(filesOnADay)(isDateSelected);
-
-        console.timeEnd("c3");
     };
 
     const renderListItem = (
@@ -850,7 +815,6 @@ export function PhotoList({
                                     <Checkbox
                                         key={item.date}
                                         name={item.date}
-                                        // checked={!!checkedDates[item.date]}
                                         checked={checkedTimelineDateStrings.has(
                                             item.date,
                                         )}
@@ -872,7 +836,6 @@ export function PhotoList({
                             <Checkbox
                                 key={listItem.date}
                                 name={listItem.date}
-                                // checked={!!checkedDates[listItem.date]}
                                 checked={checkedTimelineDateStrings.has(
                                     listItem.date,
                                 )}

From a0f103be9bdcdce4a83addef5289ff565bbf0b77 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 16:03:43 +0530
Subject: [PATCH 419/796] Fix

---
 web/apps/photos/src/utils/photoFrame/index.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/web/apps/photos/src/utils/photoFrame/index.ts b/web/apps/photos/src/utils/photoFrame/index.ts
index 4e185bdc1b..6965b535bf 100644
--- a/web/apps/photos/src/utils/photoFrame/index.ts
+++ b/web/apps/photos/src/utils/photoFrame/index.ts
@@ -86,15 +86,19 @@ export const handleSelectCreatorMulti =
 
             if (checked) {
                 for (const file of files) {
-                    newSelected[file.id] = true;
-                    newCount++;
-                    if (file.ownerID === userID) newOwnCount++;
+                    if (!newSelected[file.id]) {
+                        newSelected[file.id] = true;
+                        newCount++;
+                        if (file.ownerID === userID) newOwnCount++;
+                    }
                 }
             } else {
                 for (const file of files) {
-                    newSelected[file.id] = false;
-                    newCount--;
-                    if (file.ownerID === userID) newOwnCount--;
+                    if (newSelected[file.id]) {
+                        newSelected[file.id] = false;
+                        newCount--;
+                        if (file.ownerID === userID) newOwnCount--;
+                    }
                 }
             }
 

From b09e911f18cb3e30a9f6f4c48e741e020ade30f1 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Fri, 21 Feb 2025 16:25:52 +0530
Subject: [PATCH 420/796] fix: bump native video player

---
 mobile/ios/Podfile.lock                       |   2 +-
 .../play_pause_button.dart                    |  22 ++-
 .../seek_bar.dart                             |  53 ++++--
 mobile/lib/ui/viewer/file/video_widget.dart   | 101 +++++++++-
 .../file/video_widget_media_kit_new.dart      |   8 +-
 .../file/video_widget_media_kit_preview.dart  | 173 ------------------
 .../ui/viewer/file/video_widget_native.dart   |  91 +++++----
 mobile/pubspec.lock                           |  15 +-
 mobile/pubspec.yaml                           |   5 +-
 9 files changed, 213 insertions(+), 257 deletions(-)
 delete mode 100644 mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart

diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index fa4e5f3a09..1ef345a144 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -484,7 +484,7 @@ SPEC CHECKSUMS:
   motionphoto: 584b43031ead3060225cdff08fa49818879801d2
   move_to_background: 155f7bfbd34d43ad847cb630d2d2d87c17199710
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  native_video_player: b65c58951ede2f93d103a25366bdebca95081265
+  native_video_player: e363dd14f6a498ad8a8f7e6486a0db046ad19f13
   objective_c: 89e720c30d716b036faf9c9684022048eee1eee2
   onnxruntime: f9b296392c96c42882be020a59dbeac6310d81b2
   onnxruntime-c: a909204639a1f035f575127ac406f781ac797c9c
diff --git a/mobile/lib/ui/viewer/file/native_video_player_controls/play_pause_button.dart b/mobile/lib/ui/viewer/file/native_video_player_controls/play_pause_button.dart
index 06a1d40708..0b979402ae 100644
--- a/mobile/lib/ui/viewer/file/native_video_player_controls/play_pause_button.dart
+++ b/mobile/lib/ui/viewer/file/native_video_player_controls/play_pause_button.dart
@@ -1,3 +1,5 @@
+import "dart:async";
+
 import "package:flutter/material.dart";
 import "package:native_video_player/native_video_player.dart";
 import "package:photos/theme/colors.dart";
@@ -13,20 +15,29 @@ class PlayPauseButton extends StatefulWidget {
 class _PlayPauseButtonState extends State<PlayPauseButton> {
   bool _isPlaying = true;
 
+  StreamSubscription<PlaybackEvent>? subscription;
+
   @override
   void initState() {
     super.initState();
-    widget.controller?.onPlaybackStatusChanged
-        .addListener(_onPlaybackStatusChanged);
+    subscription = widget.controller?.events.listen(listen);
   }
 
   @override
   void dispose() {
-    widget.controller?.onPlaybackStatusChanged
-        .removeListener(_onPlaybackStatusChanged);
+    subscription?.cancel();
     super.dispose();
   }
 
+  void listen(PlaybackEvent event) {
+    switch (event) {
+      case PlaybackStatusChangedEvent():
+        _onPlaybackStatusChanged();
+        break;
+      default:
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
@@ -74,8 +85,7 @@ class _PlayPauseButtonState extends State<PlayPauseButton> {
     );
   }
 
-  PlaybackStatus? get _playbackStatus =>
-      widget.controller?.playbackInfo?.status;
+  PlaybackStatus? get _playbackStatus => widget.controller?.playbackStatus;
 
   void _onPlaybackStatusChanged() {
     if (_playbackStatus == PlaybackStatus.playing) {
diff --git a/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart b/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart
index dafd812db4..49e0e87d61 100644
--- a/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart
+++ b/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart
@@ -24,6 +24,8 @@ class _SeekBarState extends State<SeekBar> with SingleTickerProviderStateMixin {
     const Duration(milliseconds: 100),
     executionInterval: const Duration(milliseconds: 325),
   );
+  StreamSubscription<void>? _eventsSubscription;
+
   @override
   void initState() {
     super.initState();
@@ -33,11 +35,8 @@ class _SeekBarState extends State<SeekBar> with SingleTickerProviderStateMixin {
       value: 0,
     );
 
-    widget.controller.onPlaybackStatusChanged.addListener(
-      _onPlaybackStatusChanged,
-    );
-    widget.controller.onPlaybackPositionChanged.addListener(
-      _onPlaybackPositionChanged,
+    _eventsSubscription = widget.controller.events.listen(
+      _listen,
     );
 
     _startMovingSeekbar();
@@ -45,13 +44,8 @@ class _SeekBarState extends State<SeekBar> with SingleTickerProviderStateMixin {
 
   @override
   void dispose() {
+    _eventsSubscription?.cancel();
     _animationController.dispose();
-    widget.controller.onPlaybackStatusChanged.removeListener(
-      _onPlaybackStatusChanged,
-    );
-    widget.controller.onPlaybackPositionChanged.removeListener(
-      _onPlaybackPositionChanged,
-    );
     _debouncer.cancelDebounceTimer();
     super.dispose();
   }
@@ -103,7 +97,8 @@ class _SeekBarState extends State<SeekBar> with SingleTickerProviderStateMixin {
   void _seekTo(double value) {
     _debouncer.run(() async {
       unawaited(
-        widget.controller.seekTo((value * widget.duration!).round()),
+        widget.controller
+            .seekTo((Duration(seconds: (value * widget.duration!).round()))),
       );
     });
   }
@@ -133,19 +128,33 @@ class _SeekBarState extends State<SeekBar> with SingleTickerProviderStateMixin {
     });
   }
 
+  void _listen(PlaybackEvent playerData) {
+    switch (playerData) {
+      case PlaybackStatusChangedEvent():
+        // Emitted when playback status changes (playing, paused, or stopped)
+        _onPlaybackStatusChanged();
+        break;
+      case PlaybackPositionChangedEvent():
+        // Emitted when playback position changes
+        _onPlaybackPositionChanged();
+        break;
+      default:
+    }
+  }
+
   void _onPlaybackStatusChanged() {
-    if (widget.controller.playbackInfo?.status == PlaybackStatus.paused) {
+    if (widget.controller.playbackStatus == PlaybackStatus.paused) {
       _animationController.stop();
     }
   }
 
   void _onPlaybackPositionChanged() async {
-    if (widget.controller.playbackInfo?.status == PlaybackStatus.paused ||
-        (widget.controller.playbackInfo?.status == PlaybackStatus.stopped &&
-            widget.controller.playbackInfo?.positionFraction != 0)) {
+    if (widget.controller.playbackStatus == PlaybackStatus.paused ||
+        (widget.controller.playbackStatus == PlaybackStatus.stopped &&
+            widget.controller.playbackPosition.inSeconds != 0)) {
       return;
     }
-    final target = widget.controller.playbackInfo?.positionFraction ?? 0;
+    final target = widget.controller.playbackPosition.inMilliseconds;
 
     //To immediately set the position to 0 when the video ends
     if (_prevPositionFraction == 1.0 && target == 0.0) {
@@ -164,22 +173,26 @@ class _SeekBarState extends State<SeekBar> with SingleTickerProviderStateMixin {
       await Future.delayed(const Duration(milliseconds: 450));
     }
 
+    final duration = widget.controller.videoInfo?.durationInMilliseconds;
+    final double fractionTarget =
+        duration == null || duration <= 0 ? 0 : target / duration;
+
     if (widget.duration != null) {
       unawaited(
         _animationController.animateTo(
-          target + (1 / widget.duration!),
+          fractionTarget + (1 / widget.duration!),
           duration: const Duration(seconds: 1),
         ),
       );
     } else {
       unawaited(
         _animationController.animateTo(
-          target,
+          fractionTarget,
           duration: const Duration(seconds: 1),
         ),
       );
     }
 
-    _prevPositionFraction = target;
+    _prevPositionFraction = fractionTarget;
   }
 }
diff --git a/mobile/lib/ui/viewer/file/video_widget.dart b/mobile/lib/ui/viewer/file/video_widget.dart
index e93c353617..3fc6c1e8cf 100644
--- a/mobile/lib/ui/viewer/file/video_widget.dart
+++ b/mobile/lib/ui/viewer/file/video_widget.dart
@@ -1,15 +1,21 @@
 import "dart:async";
+import "dart:io";
 
 import "package:flutter/material.dart";
+import "package:fluttertoast/fluttertoast.dart";
 import "package:logging/logging.dart";
 import "package:photos/core/event_bus.dart";
 import "package:photos/events/use_media_kit_for_video.dart";
 import "package:photos/models/file/file.dart";
+import "package:photos/service_locator.dart";
 import "package:photos/services/filedata/filedata_service.dart";
 import "package:photos/services/preview_video_store.dart";
+import "package:photos/theme/colors.dart";
+import "package:photos/ui/common/loading_widget.dart";
 import "package:photos/ui/viewer/file/video_widget_media_kit_new.dart";
-import "package:photos/ui/viewer/file/video_widget_media_kit_preview.dart";
 import "package:photos/ui/viewer/file/video_widget_native.dart";
+import "package:photos/utils/data_util.dart";
+import "package:photos/utils/toast_util.dart";
 
 class VideoWidget extends StatefulWidget {
   final EnteFile file;
@@ -32,6 +38,13 @@ class _VideoWidgetState extends State<VideoWidget> {
   late final StreamSubscription<UseMediaKitForVideo>
       useMediaKitForVideoSubscription;
   late bool selectPreviewForPlay = widget.file.localID == null;
+  File? preview;
+  final player1 = GlobalKey();
+  final player2 = GlobalKey();
+  final player3 = GlobalKey();
+  final player4 = GlobalKey();
+
+  bool isPreviewLoadable = true;
 
   @override
   void initState() {
@@ -43,6 +56,7 @@ class _VideoWidgetState extends State<VideoWidget> {
         useNativeVideoPlayer = false;
       });
     });
+    _checkForPreview();
   }
 
   @override
@@ -51,17 +65,88 @@ class _VideoWidgetState extends State<VideoWidget> {
     super.dispose();
   }
 
+  Future<void> _checkForPreview() async {
+    widget.playbackCallback?.call(false);
+    final data = await PreviewVideoStore.instance
+        .getPlaylist(widget.file)
+        .onError((error, stackTrace) {
+      if (!mounted) return;
+      _logger.warning("Failed to download preview video", error, stackTrace);
+      Fluttertoast.showToast(msg: "Failed to download preview!");
+      return null;
+    });
+    if (!mounted) return;
+    if (data != null) {
+      if (flagService.internalUser) {
+        final d =
+            FileDataService.instance.previewIds?[widget.file.uploadedFileID!];
+        if (d != null && widget.file.fileSize != null) {
+          // show toast with human readable size
+          final size = formatBytes(widget.file.fileSize!);
+          showToast(
+            context,
+            "[i] Preview OG Size ($size), previewSize: ${formatBytes(d.objectSize)}",
+          );
+        } else {
+          showShortToast(context, "Playing preview");
+        }
+      }
+      preview = data.preview;
+    } else {
+      isPreviewLoadable = false;
+    }
+    setState(() {});
+  }
+
   @override
   Widget build(BuildContext context) {
-    final isPreviewVideoPlayable =
+    final isPreviewVideoPlayable = isPreviewLoadable &&
         PreviewVideoStore.instance.isVideoStreamingEnabled &&
-            widget.file.isUploaded &&
-            (FileDataService.instance.previewIds
-                    ?.containsKey(widget.file.uploadedFileID!) ??
-                false);
+        widget.file.isUploaded &&
+        (FileDataService.instance.previewIds
+                ?.containsKey(widget.file.uploadedFileID!) ??
+            false);
     if (isPreviewVideoPlayable && selectPreviewForPlay) {
-      return VideoWidgetMediaKitPreview(
+      if (preview == null) {
+        return Center(
+          child: Container(
+            width: 48,
+            height: 48,
+            padding: const EdgeInsets.all(8),
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(24),
+              color: Colors.black.withOpacity(0.3),
+              border: Border.all(
+                color: strokeFaintDark,
+                width: 1,
+              ),
+            ),
+            child: const EnteLoadingWidget(
+              size: 32,
+              color: fillBaseDark,
+              padding: 0,
+            ),
+          ),
+        );
+      }
+      if (Platform.isAndroid) {
+        return VideoWidgetNative(
+          widget.file,
+          key: player1,
+          preview: preview,
+          tagPrefix: widget.tagPrefix,
+          playbackCallback: widget.playbackCallback,
+          onStreamChange: () {
+            setState(() {
+              selectPreviewForPlay = false;
+            });
+          },
+        );
+      }
+      return VideoWidgetMediaKitNew(
         widget.file,
+        key: player2,
+        preview: preview,
         tagPrefix: widget.tagPrefix,
         playbackCallback: widget.playbackCallback,
         onStreamChange: () {
@@ -75,6 +160,7 @@ class _VideoWidgetState extends State<VideoWidget> {
     if (useNativeVideoPlayer) {
       return VideoWidgetNative(
         widget.file,
+        key: player3,
         tagPrefix: widget.tagPrefix,
         playbackCallback: widget.playbackCallback,
         onStreamChange: () {
@@ -86,6 +172,7 @@ class _VideoWidgetState extends State<VideoWidget> {
     } else {
       return VideoWidgetMediaKitNew(
         widget.file,
+        key: player4,
         tagPrefix: widget.tagPrefix,
         playbackCallback: widget.playbackCallback,
         onStreamChange: () {
diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
index 8edb1ac8cf..d483a061c0 100644
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
@@ -28,6 +28,7 @@ class VideoWidgetMediaKitNew extends StatefulWidget {
   final Function(bool)? playbackCallback;
   final bool isFromMemories;
   final void Function() onStreamChange;
+  final File? preview;
 
   const VideoWidgetMediaKitNew(
     this.file, {
@@ -35,6 +36,7 @@ class VideoWidgetMediaKitNew extends StatefulWidget {
     this.playbackCallback,
     this.isFromMemories = false,
     required this.onStreamChange,
+    this.preview,
     super.key,
   });
 
@@ -61,7 +63,9 @@ class _VideoWidgetMediaKitNewState extends State<VideoWidgetMediaKitNew>
     );
     super.initState();
     WidgetsBinding.instance.addObserver(this);
-    if (widget.file.isRemoteFile) {
+    if (widget.preview != null) {
+      _setVideoController(widget.preview!.path);
+    } else if (widget.file.isRemoteFile) {
       _loadNetworkVideo();
       _setFileSizeIfNull();
     } else if (widget.file.isSharedMediaToAppSandbox) {
@@ -143,7 +147,7 @@ class _VideoWidgetMediaKitNewState extends State<VideoWidgetMediaKitNew>
                 widget.playbackCallback,
                 isFromMemories: widget.isFromMemories,
                 onStreamChange: widget.onStreamChange,
-                isPreviewPlayer: false,
+                isPreviewPlayer: widget.preview != null,
               )
             : const Center(
                 child: EnteLoadingWidget(
diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart
deleted file mode 100644
index 46f569660c..0000000000
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart
+++ /dev/null
@@ -1,173 +0,0 @@
-import "dart:async";
-
-import "package:flutter/material.dart";
-import "package:fluttertoast/fluttertoast.dart";
-import "package:logging/logging.dart";
-import "package:media_kit/media_kit.dart";
-import "package:media_kit_video/media_kit_video.dart";
-import "package:photos/core/constants.dart";
-import "package:photos/core/event_bus.dart";
-import "package:photos/events/guest_view_event.dart";
-import "package:photos/events/pause_video_event.dart";
-import "package:photos/models/file/file.dart";
-import "package:photos/service_locator.dart";
-import "package:photos/services/filedata/filedata_service.dart";
-import "package:photos/services/preview_video_store.dart";
-import "package:photos/theme/colors.dart";
-import "package:photos/ui/actions/file/file_actions.dart";
-import "package:photos/ui/common/loading_widget.dart";
-import "package:photos/ui/viewer/file/video_widget_media_kit_common.dart"
-    as common;
-import "package:photos/utils/data_util.dart";
-import "package:photos/utils/file_util.dart";
-import "package:photos/utils/toast_util.dart";
-
-class VideoWidgetMediaKitPreview extends StatefulWidget {
-  final EnteFile file;
-  final String? tagPrefix;
-  final Function(bool)? playbackCallback;
-  final bool isFromMemories;
-  final void Function() onStreamChange;
-
-  const VideoWidgetMediaKitPreview(
-    this.file, {
-    this.tagPrefix,
-    this.playbackCallback,
-    this.isFromMemories = false,
-    required this.onStreamChange,
-    super.key,
-  });
-
-  @override
-  State<VideoWidgetMediaKitPreview> createState() =>
-      _VideoWidgetMediaKitPreviewState();
-}
-
-class _VideoWidgetMediaKitPreviewState extends State<VideoWidgetMediaKitPreview>
-    with WidgetsBindingObserver {
-  final Logger _logger = Logger("VideoWidgetMediaKitNew");
-  late final player = Player();
-  VideoController? controller;
-  final _progressNotifier = ValueNotifier<double?>(null);
-  bool _isAppInFG = true;
-  late StreamSubscription<PauseVideoEvent> pauseVideoSubscription;
-  bool isGuestView = false;
-  late final StreamSubscription<GuestViewEvent> _guestViewEventSubscription;
-  bool _isGuestView = false;
-
-  @override
-  void initState() {
-    _logger.info(
-      'initState for ${widget.file.generatedID} with tag ${widget.file.tag} and name ${widget.file.displayName}',
-    );
-    super.initState();
-    WidgetsBinding.instance.addObserver(this);
-    _checkForPreview();
-
-    pauseVideoSubscription = Bus.instance.on<PauseVideoEvent>().listen((event) {
-      player.pause();
-    });
-    _guestViewEventSubscription =
-        Bus.instance.on<GuestViewEvent>().listen((event) {
-      setState(() {
-        _isGuestView = event.isGuestView;
-      });
-    });
-  }
-
-  Future<void> _checkForPreview() async {
-    widget.playbackCallback?.call(false);
-    final data = await PreviewVideoStore.instance
-        .getPlaylist(widget.file)
-        .onError((error, stackTrace) {
-      if (!mounted) return;
-      _logger.warning("Failed to download preview video", error, stackTrace);
-      Fluttertoast.showToast(msg: "Failed to download preview!");
-      return null;
-    });
-    if (!mounted) return;
-    if (data != null) {
-      if (flagService.internalUser) {
-        final d =
-            FileDataService.instance.previewIds?[widget.file.uploadedFileID!];
-        if (d != null && widget.file.fileSize != null) {
-          // show toast with human readable size
-          final size = formatBytes(widget.file.fileSize!);
-          showToast(
-            context,
-            "[i] Preview OG Size ($size), previewSize: ${formatBytes(d.objectSize)}",
-          );
-        } else {
-          showShortToast(context, "Playing preview");
-        }
-      }
-      _setVideoController(data.preview.path);
-    }
-  }
-
-  @override
-  void didChangeAppLifecycleState(AppLifecycleState state) {
-    if (state == AppLifecycleState.resumed) {
-      _isAppInFG = true;
-    } else {
-      _isAppInFG = false;
-    }
-  }
-
-  @override
-  void dispose() {
-    _guestViewEventSubscription.cancel();
-    pauseVideoSubscription.cancel();
-    removeCallBack(widget.file);
-    _progressNotifier.dispose();
-    WidgetsBinding.instance.removeObserver(this);
-    player.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onVerticalDragUpdate: _isGuestView
-          ? null
-          : (d) => {
-                if (d.delta.dy > dragSensitivity)
-                  {
-                    Navigator.of(context).pop(),
-                  }
-                else if (d.delta.dy < (dragSensitivity * -1))
-                  {
-                    showDetailsSheet(context, widget.file),
-                  },
-              },
-      child: Center(
-        child: controller != null
-            ? common.VideoWidget(
-                widget.file,
-                controller!,
-                widget.playbackCallback,
-                isFromMemories: widget.isFromMemories,
-                onStreamChange: widget.onStreamChange,
-                isPreviewPlayer: true,
-              )
-            : const Center(
-                child: EnteLoadingWidget(
-                  size: 32,
-                  color: fillBaseDark,
-                  padding: 0,
-                ),
-              ),
-      ),
-    );
-  }
-
-  void _setVideoController(String url) {
-    if (mounted) {
-      setState(() {
-        player.setPlaylistMode(PlaylistMode.single);
-        controller = VideoController(player);
-        player.open(Media(url), play: _isAppInFG);
-      });
-    }
-  }
-}
diff --git a/mobile/lib/ui/viewer/file/video_widget_native.dart b/mobile/lib/ui/viewer/file/video_widget_native.dart
index c3d1bb8c83..ebee67c8f0 100644
--- a/mobile/lib/ui/viewer/file/video_widget_native.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_native.dart
@@ -38,6 +38,8 @@ class VideoWidgetNative extends StatefulWidget {
   final Function(bool)? playbackCallback;
   final bool isFromMemories;
   final void Function()? onStreamChange;
+  final File? preview;
+
   const VideoWidgetNative(
     this.file, {
     this.tagPrefix,
@@ -45,6 +47,7 @@ class VideoWidgetNative extends StatefulWidget {
     this.isFromMemories = false,
     required this.onStreamChange,
     super.key,
+    this.preview,
   });
 
   @override
@@ -70,6 +73,8 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
   final _isSeeking = ValueNotifier(false);
   final _debouncer = Debouncer(const Duration(milliseconds: 2000));
   final _elTooltipController = ElTooltipController();
+  StreamSubscription<PlaybackEvent>? _subscription;
+  int position = 0;
 
   @override
   void initState() {
@@ -78,7 +83,9 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
     );
     super.initState();
     WidgetsBinding.instance.addObserver(this);
-    if (widget.file.isRemoteFile) {
+    if (widget.preview != null) {
+      _setFilePathForNativePlayer(widget.preview!.path);
+    } else if (widget.file.isRemoteFile) {
       _loadNetworkVideo();
       _setFileSizeIfNull();
     } else if (widget.file.isSharedMediaToAppSandbox) {
@@ -120,7 +127,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
     if (state != AppLifecycleState.resumed) {
-      if (_controller?.playbackInfo?.status == PlaybackStatus.playing) {
+      if (_controller?.playbackStatus == PlaybackStatus.playing) {
         _controller?.pause();
       }
     }
@@ -148,11 +155,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
     removeCallBack(widget.file);
     _progressNotifier.dispose();
     WidgetsBinding.instance.removeObserver(this);
-    _controller?.onPlaybackEnded.removeListener(_onPlaybackEnded);
-    _controller?.onPlaybackReady.removeListener(_onPlaybackReady);
-    _controller?.onError.removeListener(_onError);
-    _controller?.onPlaybackStatusChanged
-        .removeListener(_onPlaybackStatusChanged);
+    _subscription?.cancel();
     _isPlaybackReady.dispose();
     _showControls.dispose();
     _isSeeking.removeListener(_seekListener);
@@ -286,6 +289,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
                                     return PreviewStatusWidget(
                                       showControls: value,
                                       file: widget.file,
+                                      isPreviewPlayer: widget.preview != null,
                                       onStreamChange: widget.onStreamChange,
                                     );
                                   },
@@ -306,6 +310,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
                                             duration: duration,
                                             showControls: _showControls,
                                             isSeeking: _isSeeking,
+                                            position: position,
                                           )
                                         : const SizedBox();
                                   },
@@ -332,17 +337,15 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
       );
       _controller = controller;
 
-      controller.onError.addListener(_onError);
-      controller.onPlaybackEnded.addListener(_onPlaybackEnded);
-      controller.onPlaybackReady.addListener(_onPlaybackReady);
-      controller.onPlaybackStatusChanged.addListener(_onPlaybackStatusChanged);
+      _subscription = controller.events.listen(_listen);
+
       _isSeeking.addListener(_seekListener);
 
-      final videoSource = await VideoSource.init(
+      final videoSource = VideoSource(
         path: _filePath!,
         type: VideoSourceType.file,
       );
-      await controller.loadVideoSource(videoSource);
+      await controller.loadVideo(videoSource);
     } catch (e) {
       _logger.severe(
         "Error initializing native video player controller for file gen id: ${widget.file.generatedID}",
@@ -351,13 +354,34 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
     }
   }
 
+  void _listen(PlaybackEvent event) {
+    switch (event) {
+      case PlaybackStatusChangedEvent():
+        _onPlaybackStatusChanged();
+      case PlaybackReadyEvent():
+        _onPlaybackReady();
+        break;
+      case PlaybackPositionChangedEvent():
+        position = event.positionInMilliseconds;
+        setState(() {});
+        break;
+      case PlaybackEndedEvent():
+        _onPlaybackEnded();
+        break;
+      case PlaybackErrorEvent():
+        _onError(event.errorMessage);
+        break;
+      default:
+    }
+  }
+
   void _seekListener() {
     if (!_isSeeking.value &&
-        _controller?.playbackInfo?.status == PlaybackStatus.playing) {
+        _controller?.playbackStatus == PlaybackStatus.playing) {
       _debouncer.run(() async {
         if (mounted) {
           if (_isSeeking.value ||
-              _controller?.playbackInfo?.status != PlaybackStatus.playing) {
+              _controller?.playbackStatus != PlaybackStatus.playing) {
             return;
           }
           _showControls.value = false;
@@ -370,15 +394,17 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
   }
 
   void _onPlaybackStatusChanged() {
-    if (_isSeeking.value || _controller?.playbackInfo?.positionFraction == 1) {
+    if (_isSeeking.value ||
+        _controller?.playbackPosition.inMilliseconds ==
+            _controller?.videoInfo?.durationInMilliseconds) {
       return;
     }
-    if (_controller!.playbackInfo?.status == PlaybackStatus.playing) {
+    if (_controller!.playbackStatus == PlaybackStatus.playing) {
       if (mounted) {
         _debouncer.run(() async {
           if (mounted) {
             if (_isSeeking.value ||
-                _controller!.playbackInfo?.status != PlaybackStatus.playing) {
+                _controller!.playbackStatus != PlaybackStatus.playing) {
               return;
             }
             _showControls.value = false;
@@ -395,12 +421,12 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
     }
   }
 
-  void _onError() {
+  void _onError(String errorMessage) {
     //This doesn't work all the time
     _logger.severe(
       "Error in native video player controller for file gen id: ${widget.file.generatedID}",
     );
-    _logger.severe(_controller!.onError.value);
+    _logger.severe(errorMessage);
     Bus.instance.fire(UseMediaKitForVideo());
   }
 
@@ -555,12 +581,14 @@ class _SeekBarAndDuration extends StatelessWidget {
   final String? duration;
   final ValueNotifier<bool> showControls;
   final ValueNotifier<bool> isSeeking;
+  final int position;
 
   const _SeekBarAndDuration({
     required this.controller,
     required this.duration,
     required this.showControls,
     required this.isSeeking,
+    required this.position,
   });
 
   @override
@@ -608,22 +636,13 @@ class _SeekBarAndDuration extends StatelessWidget {
                         seconds: 5,
                       ),
                       curve: Curves.easeInOut,
-                      child: ValueListenableBuilder(
-                        valueListenable: controller!.onPlaybackPositionChanged,
-                        builder: (
-                          BuildContext context,
-                          int value,
-                          _,
-                        ) {
-                          return Text(
-                            secondsToDuration(value),
-                            style: getEnteTextTheme(
-                              context,
-                            ).mini.copyWith(
-                                  color: textBaseDark,
-                                ),
-                          );
-                        },
+                      child: Text(
+                        secondsToDuration(position ~/ 1000),
+                        style: getEnteTextTheme(
+                          context,
+                        ).mini.copyWith(
+                              color: textBaseDark,
+                            ),
                       ),
                     ),
                     Expanded(
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index 286c154ba7..fb7b9beb6a 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -1756,12 +1756,11 @@ packages:
   native_video_player:
     dependency: "direct main"
     description:
-      path: "."
-      ref: notify_if_video_isnt_playable
-      resolved-ref: dd09ee801939372ca3d1a504a9dbd576d4bf6dcf
-      url: "https://github.com/ashilkn/native_video_player.git"
-    source: git
-    version: "1.3.1"
+      name: native_video_player
+      sha256: "5a56da17e6c359de8e8063281dc14c1f8a3f17d40220cdbb1fa69217a2dda8b2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0-dev.3"
   nested:
     dependency: transitive
     description:
@@ -1903,10 +1902,10 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
+      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   path_provider_android:
     dependency: transitive
     description:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 7e480d60da..42aca33e20 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -145,10 +145,7 @@ dependencies:
   move_to_background: ^1.0.2
   nanoid: ^1.0.0
   native_dio_adapter: ^1.4.0
-  native_video_player:
-    git:
-      url: https://github.com/ashilkn/native_video_player.git
-      ref: notify_if_video_isnt_playable
+  native_video_player: ^3.0.0-dev.3
   onnx_dart:
     path: plugins/onnx_dart
   onnxruntime:

From 69eee661d1943aaebe1a61a43a2fd5498d0ee68f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 08:34:13 +0530
Subject: [PATCH 421/796] Prop

---
 .../gallery/components/viewer/FileViewer.tsx  | 68 +++++++++++--------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index ec1fdb36ca..1214eee6fe 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -17,6 +17,7 @@ import {
     useModalVisibility,
     type ModalVisibilityProps,
 } from "@/base/components/utils/modal";
+import type { LocalUser } from "@/base/local-user";
 import { FileInfo, type FileInfoProps } from "@/gallery/components/FileInfo";
 import type { EnteFile } from "@/media/file.js";
 import { Button, styled } from "@mui/material";
@@ -24,41 +25,48 @@ import { useCallback, useEffect, useRef, useState } from "react";
 import { fileInfoExifForFile, type FileInfoExif } from "./data-source";
 import { FileViewerPhotoSwipe } from "./photoswipe";
 
-export type FileViewerProps = ModalVisibilityProps &
-    Pick<
+export type FileViewerProps = ModalVisibilityProps & {
+    /**
+     * The currently logged in user, if any.
+     *
+     * - If we're running in the context of the photos app, then this should be
+     *   set to the currently logged in user.
+     *
+     * - If we're running in the context of the public albums app, then this
+     *   should not be set.
+     */
+    user?: LocalUser;
+    /**
+     * The list of files that are currently being displayed in the context in
+     * which the file viewer was invoked.
+     *
+     * Although the file viewer is called on to display a particular file
+     * (specified by the {@link initialIndex} prop), the viewer is always used
+     * in the context of a an album, or search results, or some other arbitrary
+     * list of files. The {@link files} prop sets this underlying list of files.
+     *
+     * After the initial file has been shown, the user can navigate through the
+     * other files from within the viewer by using the arrow buttons.
+     */
+    files: EnteFile[];
+    /**
+     * The index of the file that should be initially shown.
+     *
+     * Subsequently the user may navigate between files by using the controls
+     * provided within the file viewer itself.
+     */
+    initialIndex: number;
+    /**
+     * If true then the viewer does not show controls for downloading the file.
+     */
+    disableDownload?: boolean;
+} & Pick<
         FileInfoProps,
         | "fileCollectionIDs"
         | "allCollectionsNameByID"
         | "onSelectCollection"
         | "onSelectPerson"
-    > & {
-        /**
-         * The list of files that are currently being displayed in the context
-         * in which the file viewer was invoked.
-         *
-         * Although the file viewer is called on to display a particular file
-         * (specified by the {@link initialIndex} prop), the viewer is always
-         * used in the context of a an album, or search results, or some other
-         * arbitrary list of files. The {@link files} prop sets this underlying
-         * list of files.
-         *
-         * After the initial file has been shown, the user can navigate through
-         * the other files from within the viewer by using the arrow buttons.
-         */
-        files: EnteFile[];
-        /**
-         * The index of the file that should be initially shown.
-         *
-         * Subsequently the user may navigate between files by using the
-         * controls provided within the file viewer itself.
-         */
-        initialIndex: number;
-        /**
-         * If true then the viewer does not show controls for downloading the
-         * file.
-         */
-        disableDownload?: boolean;
-    };
+    >;
 
 /**
  * A PhotoSwipe based image and video viewer.

From fd0c2866a21f7c347b23442518803774f45ec9c0 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 08:47:52 +0530
Subject: [PATCH 422/796] Doc

---
 web/apps/photos/src/pages/gallery.tsx         | 19 ++++++++++++++-----
 .../gallery/components/viewer/FileViewer.tsx  |  2 ++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index d2c83cc341..d2a7b6a01c 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -434,15 +434,20 @@ const Page: React.FC = () => {
     }, [state.isRecomputingSearchResults, state.pendingSearchSuggestions]);
 
     const selectAll = (e: KeyboardEvent) => {
-        // ignore ctrl/cmd + a if the user is typing in a text field
+        // Ignore CTRL/CMD + a if the user is typing in a text field.
         if (
             e.target instanceof HTMLInputElement ||
             e.target instanceof HTMLTextAreaElement
         ) {
             return;
         }
-        // if any of the modals are open, don't select all
+        // Ignore select all if:
         if (
+            // - We haven't fetched the user yet;
+            !user ||
+            // - There is nothing to select;
+            !filteredFiles?.length ||
+            // - Any of the modals are open.
             uploadTypeSelectorView ||
             openCollectionSelector ||
             collectionNamerView ||
@@ -451,13 +456,15 @@ const Page: React.FC = () => {
             fixCreationTimeVisibilityProps.open ||
             exportVisibilityProps.open ||
             authenticateUserVisibilityProps.open ||
-            isPhotoSwipeOpen ||
-            !filteredFiles?.length ||
-            !user
+            isPhotoSwipeOpen
         ) {
             return;
         }
+
+        // Prevent the browser's default select all handling.
         e.preventDefault();
+
+        // Create a selection with everything based on the current context.
         const selected = {
             ownCount: 0,
             count: 0,
@@ -804,6 +811,8 @@ const Page: React.FC = () => {
 
     if (!user) {
         // Don't render until we dispatch "mount" with the logged in user.
+        //
+        // Tag: [Note: Gallery children can assume user]
         return <div></div>;
     }
 
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 1214eee6fe..6efcaf9a83 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -34,6 +34,8 @@ export type FileViewerProps = ModalVisibilityProps & {
      *
      * - If we're running in the context of the public albums app, then this
      *   should not be set.
+     *
+     * See: [Note: Gallery children can assume user]
      */
     user?: LocalUser;
     /**

From 5e4707b69561dc1f2d708dbd5e568a7259ee1509 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 09:36:10 +0530
Subject: [PATCH 423/796] ann

---
 web/apps/photos/src/components/PhotoFrame.tsx |  1 +
 .../gallery/components/viewer/data-source.ts  |  9 +++---
 .../gallery/components/viewer/photoswipe.ts   | 29 +++++++++++++++++--
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 469ef5521f..390746968a 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -533,6 +533,7 @@ const PhotoFrame = ({
                     /* @ts-ignore TODO(PS): test */
                     open={open5}
                     onClose={handleClose}
+                    user={galleryContext.user ?? undefined}
                     files={files}
                     initialIndex={currentIndex}
                     {...{
diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 50f234d8ea..2d215deca3 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -3,16 +3,15 @@ import {
     downloadManager,
     type LivePhotoSourceURL,
 } from "@/gallery/services/download";
-import type { EnteFile } from "@/media/file";
-import type { ParsedMetadata } from "@/media/file-metadata";
-import { FileType } from "@/media/file-type";
-import { ensureString } from "@/utils/ensure";
-// TODO(PS):
 import {
     extractRawExif,
     parseExif,
     type RawExifTags,
 } from "@/gallery/services/exif";
+import type { EnteFile } from "@/media/file";
+import type { ParsedMetadata } from "@/media/file-metadata";
+import { FileType } from "@/media/file-type";
+import { ensureString } from "@/utils/ensure";
 
 /**
  * This is a subset of the fields expected by PhotoSwipe itself (see the
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 85d9b21fdc..e991e9cedf 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -34,16 +34,34 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     // PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
 
-type FileViewerPhotoSwipeOptions = FileViewerProps & {
+type FileViewerPhotoSwipeOptions = {
     /**
      * Called when the file viewer is closed.
      */
     onClose: () => void;
+    /**
+     * Called whenever the slide changes to obtain the derived data for the file
+     * that is about to be displayed.
+     */
+    onAnnotate: (file: EnteFile) => FileViewerFileAnnotation;
     /**
      * Called when the user activates the info action on a file.
      */
     onViewInfo: (file: EnteFile) => void;
-};
+} & Pick<FileViewerProps, "files" | "initialIndex" | "disableDownload">;
+
+/**
+ * Derived data for a file that is needed to display the file viewer controls
+ * etc associated with the file.
+ *
+ * This is recomputed each time the slide changes.
+ */
+interface FileViewerFileAnnotation {
+    /**
+     * `true` if this file is owned by the logged in user (if any).
+     */
+    isOwnFile: boolean;
+}
 
 /**
  * A wrapper over {@link PhotoSwipe} to tailor its interface for use by our file
@@ -94,12 +112,19 @@ export class FileViewerPhotoSwipe {
      * - "auto-hidden" if controls were hidden by us because of inactivity.
      */
     private lastActivityDate: Date | "auto-hidden" | "already-hidden";
+    /**
+     * Derived data about the currently displayed file.
+     *
+     * This is recomputed each time the slide changes.
+     */
+    // private activeFileAnnotation;
 
     constructor({
         files,
         initialIndex,
         disableDownload,
         onClose,
+        onAnnotate,
         onViewInfo,
     }: FileViewerPhotoSwipeOptions) {
         this.files = files;

From e79050a3b686a3fd134fd4e3c74f6d8c4f65d255 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 10:10:43 +0530
Subject: [PATCH 424/796] ann2

---
 .../gallery/components/viewer/FileViewer.tsx  | 34 ++++++++---
 .../gallery/components/viewer/photoswipe.ts   | 61 ++++++++++++++++---
 2 files changed, 76 insertions(+), 19 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 6efcaf9a83..07756ec357 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -23,7 +23,10 @@ import type { EnteFile } from "@/media/file.js";
 import { Button, styled } from "@mui/material";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { fileInfoExifForFile, type FileInfoExif } from "./data-source";
-import { FileViewerPhotoSwipe } from "./photoswipe";
+import {
+    FileViewerPhotoSwipe,
+    type FileViewerAnnotatedFile,
+} from "./photoswipe";
 
 export type FileViewerProps = ModalVisibilityProps & {
     /**
@@ -76,6 +79,7 @@ export type FileViewerProps = ModalVisibilityProps & {
 const FileViewer: React.FC<FileViewerProps> = ({
     open,
     onClose,
+    user,
     files,
     initialIndex,
     disableDownload,
@@ -93,11 +97,11 @@ const FileViewer: React.FC<FileViewerProps> = ({
     // This is not guaranteed, or even intended, to be in sync with the active
     // file shown within the file viewer. All that this guarantees is this will
     // refer to the file on which the last user initiated action was performed.
-    const [activeFile, setActiveFile] = useState<EnteFile | undefined>(
-        undefined,
-    );
+    const [activeAnnotatedFile, setActiveAnnotatedFile] = useState<
+        FileViewerAnnotatedFile | undefined
+    >(undefined);
     // With semantics similar to activeFile, this is the exif data associated
-    // with the activeFile, if any.
+    // with the activeAnnotatedFile, if any.
     const [activeFileExif, setActiveFileExif] = useState<
         FileInfoExif | undefined
     >(undefined);
@@ -105,11 +109,22 @@ const FileViewer: React.FC<FileViewerProps> = ({
     const { show: showFileInfo, props: fileInfoVisibilityProps } =
         useModalVisibility();
 
-    const handleViewInfo = useCallback(
+    const handleAnnotate = useCallback(
         (file: EnteFile) => {
-            setActiveFile(file);
+            const fileID = file.id;
+            const isOwnFile = file.ownerID == user?.id;
+            return { fileID, isOwnFile };
+        },
+        [user],
+    );
+
+    const handleViewInfo = useCallback(
+        (annotatedFile: FileViewerAnnotatedFile) => {
+            setActiveAnnotatedFile(annotatedFile);
             setActiveFileExif(
-                fileInfoExifForFile(file, (exif) => setActiveFileExif(exif)),
+                fileInfoExifForFile(annotatedFile.file, (exif) =>
+                    setActiveFileExif(exif),
+                ),
             );
             showFileInfo();
         },
@@ -139,6 +154,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
             initialIndex,
             disableDownload,
             onClose,
+            onAnnotate: handleAnnotate,
             onViewInfo: handleViewInfo,
         });
         pswpRef.current = pswp;
@@ -169,7 +185,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
             <Button>Test</Button>
             <FileInfo
                 {...fileInfoVisibilityProps}
-                file={activeFile}
+                file={activeAnnotatedFile.file}
                 exif={activeFileExif}
                 onSelectCollection={handleSelectCollection}
                 onSelectPerson={handleSelectPerson}
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index e991e9cedf..a680c515ad 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -47,22 +47,34 @@ type FileViewerPhotoSwipeOptions = {
     /**
      * Called when the user activates the info action on a file.
      */
-    onViewInfo: (file: EnteFile) => void;
+    onViewInfo: (annotatedFile: FileViewerAnnotatedFile) => void;
 } & Pick<FileViewerProps, "files" | "initialIndex" | "disableDownload">;
 
 /**
  * Derived data for a file that is needed to display the file viewer controls
  * etc associated with the file.
  *
- * This is recomputed each time the slide changes.
+ * This is recomputed on-demand each time the slide changes.
  */
-interface FileViewerFileAnnotation {
+export interface FileViewerFileAnnotation {
+    /**
+     * The id of the file whose annotation this is.
+     */
+    fileID: number;
     /**
      * `true` if this file is owned by the logged in user (if any).
      */
     isOwnFile: boolean;
 }
 
+/**
+ * A file and its annotation, in a nice cosy box.
+ */
+export interface FileViewerAnnotatedFile {
+    file: EnteFile;
+    annotation: FileViewerFileAnnotation;
+}
+
 /**
  * A wrapper over {@link PhotoSwipe} to tailor its interface for use by our file
  * viewer.
@@ -115,9 +127,14 @@ export class FileViewerPhotoSwipe {
     /**
      * Derived data about the currently displayed file.
      *
-     * This is recomputed each time the slide changes.
+     * This is recomputed on-demand (by using the {@link onAnnotate} callback)
+     * each time the slide changes, and cached until the next slide change.
+     *
+     * Instead of accessing this property directly, code should funnel through
+     * the `activeFileAnnotation` helper function defined in the constructor
+     * scope.
      */
-    // private activeFileAnnotation;
+    private activeFileAnnotation: FileViewerFileAnnotation | undefined;
 
     constructor({
         files,
@@ -129,6 +146,7 @@ export class FileViewerPhotoSwipe {
     }: FileViewerPhotoSwipeOptions) {
         this.files = files;
         this.opts = { disableDownload };
+        this.lastActivityDate = new Date();
 
         const pswp = new PhotoSwipe({
             // Opaque background.
@@ -185,10 +203,35 @@ export class FileViewerPhotoSwipe {
             errorMsg: "This file could not be previewed",
         });
 
+        this.pswp = pswp;
+
         // Helper routines to obtain the file at `currIndex`.
+
         const currentFile = () => this.files[pswp.currIndex]!;
-        const withCurrentFile = (cb: (file: EnteFile) => void) => () =>
-            cb(currentFile());
+
+        const currentAnnotatedFile = () => {
+            const file = currentFile();
+            let annotation = this.activeFileAnnotation;
+            if (annotation?.fileID != file.id) {
+                annotation = onAnnotate(file);
+                this.activeFileAnnotation = annotation;
+            }
+            return {
+                file,
+                // The above condition implies that annotation can never be
+                // undefined, but it doesn't seem to be enough to convince
+                // TypeScript. Writing the condition in a more unnatural way
+                // `(annotation && annotation?.fileID == file.id)` works, but
+                // instead we use a non-null assertion here.
+                annotation: annotation!,
+            };
+        };
+
+        const currentFileAnnotation = () => currentAnnotatedFile().annotation;
+
+        const withCurrentAnnotatedFile =
+            (cb: (af: AnnotatedFile) => void) => () =>
+                cb(currentFileAnnotation());
 
         // Provide data about slides to PhotoSwipe via callbacks
         // https://photoswipe.com/data-sources/#dynamically-generated-data
@@ -363,7 +406,7 @@ export class FileViewerPhotoSwipe {
                 order: 15,
                 isButton: true,
                 html: createPSRegisterElementIconHTML("info"),
-                onClick: withCurrentFile(onViewInfo),
+                onClick: withCurrentAnnotatedFile(onViewInfo),
             });
         });
 
@@ -380,8 +423,6 @@ export class FileViewerPhotoSwipe {
         // the class "pswp".
         pswp.init();
 
-        this.pswp = pswp;
-
         this.autoHideCheckIntervalId = setInterval(() => {
             this.autoHideIfInactive();
         }, 1000);

From b89da99c968417725825c8005950c37a505ad013 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 16:29:54 +0530
Subject: [PATCH 425/796] Rename

---
 web/apps/photos/src/components/PhotoFrame.tsx    | 4 ++--
 web/packages/base/locales/ar-SA/translation.json | 4 ++--
 web/packages/base/locales/be-BY/translation.json | 4 ++--
 web/packages/base/locales/bg-BG/translation.json | 4 ++--
 web/packages/base/locales/ca-ES/translation.json | 4 ++--
 web/packages/base/locales/cs-CZ/translation.json | 4 ++--
 web/packages/base/locales/da-DK/translation.json | 4 ++--
 web/packages/base/locales/de-DE/translation.json | 4 ++--
 web/packages/base/locales/el-GR/translation.json | 4 ++--
 web/packages/base/locales/en-US/translation.json | 4 ++--
 web/packages/base/locales/es-ES/translation.json | 4 ++--
 web/packages/base/locales/et-EE/translation.json | 4 ++--
 web/packages/base/locales/fa-IR/translation.json | 4 ++--
 web/packages/base/locales/fi-FI/translation.json | 4 ++--
 web/packages/base/locales/fr-FR/translation.json | 4 ++--
 web/packages/base/locales/gu-IN/translation.json | 4 ++--
 web/packages/base/locales/hi-IN/translation.json | 4 ++--
 web/packages/base/locales/hu-HU/translation.json | 4 ++--
 web/packages/base/locales/id-ID/translation.json | 4 ++--
 web/packages/base/locales/is-IS/translation.json | 4 ++--
 web/packages/base/locales/it-IT/translation.json | 4 ++--
 web/packages/base/locales/ja-JP/translation.json | 4 ++--
 web/packages/base/locales/km-KH/translation.json | 4 ++--
 web/packages/base/locales/ko-KR/translation.json | 4 ++--
 web/packages/base/locales/lt-LT/translation.json | 4 ++--
 web/packages/base/locales/ml-IN/translation.json | 4 ++--
 web/packages/base/locales/nl-NL/translation.json | 4 ++--
 web/packages/base/locales/pl-PL/translation.json | 4 ++--
 web/packages/base/locales/pt-BR/translation.json | 4 ++--
 web/packages/base/locales/pt-PT/translation.json | 4 ++--
 web/packages/base/locales/ro-RO/translation.json | 4 ++--
 web/packages/base/locales/ru-RU/translation.json | 4 ++--
 web/packages/base/locales/sl-SI/translation.json | 4 ++--
 web/packages/base/locales/sv-SE/translation.json | 4 ++--
 web/packages/base/locales/ta-IN/translation.json | 4 ++--
 web/packages/base/locales/te-IN/translation.json | 4 ++--
 web/packages/base/locales/th-TH/translation.json | 4 ++--
 web/packages/base/locales/ti-ER/translation.json | 4 ++--
 web/packages/base/locales/tr-TR/translation.json | 4 ++--
 web/packages/base/locales/uk-UA/translation.json | 4 ++--
 web/packages/base/locales/vi-VN/translation.json | 4 ++--
 web/packages/base/locales/zh-CN/translation.json | 4 ++--
 web/packages/base/locales/zh-HK/translation.json | 4 ++--
 43 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 390746968a..c9dca97a4b 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -678,8 +678,8 @@ const updateDisplayFileSource = (
 const fileTimelineDateString = (item: EnteFile) => {
     const date = new Date(item.metadata.creationTime / 1000);
     return isSameDay(date, new Date())
-        ? t("TODAY")
+        ? t("today")
         : isSameDay(date, new Date(Date.now() - 24 * 60 * 60 * 1000))
-          ? t("YESTERDAY")
+          ? t("yesterday")
           : formattedDate(date);
 };
diff --git a/web/packages/base/locales/ar-SA/translation.json b/web/packages/base/locales/ar-SA/translation.json
index 89b4e7dcd1..4cbbbc722d 100644
--- a/web/packages/base/locales/ar-SA/translation.json
+++ b/web/packages/base/locales/ar-SA/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "أدخل الاسم",
     "uploader_name_hint": "أضف اسما حتى يتمكن أصدقاؤك من معرفة من يشكرون على هذه الصور الرائعة!",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/be-BY/translation.json b/web/packages/base/locales/be-BY/translation.json
index 933199338a..a4c106a01a 100644
--- a/web/packages/base/locales/be-BY/translation.json
+++ b/web/packages/base/locales/be-BY/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "Увядзіце імя",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/bg-BG/translation.json b/web/packages/base/locales/bg-BG/translation.json
index b484e2c955..dcb0b96f45 100644
--- a/web/packages/base/locales/bg-BG/translation.json
+++ b/web/packages/base/locales/bg-BG/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/ca-ES/translation.json b/web/packages/base/locales/ca-ES/translation.json
index e6f4c65fd6..966925d0be 100644
--- a/web/packages/base/locales/ca-ES/translation.json
+++ b/web/packages/base/locales/ca-ES/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/cs-CZ/translation.json b/web/packages/base/locales/cs-CZ/translation.json
index e6f4c65fd6..966925d0be 100644
--- a/web/packages/base/locales/cs-CZ/translation.json
+++ b/web/packages/base/locales/cs-CZ/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/da-DK/translation.json b/web/packages/base/locales/da-DK/translation.json
index aaf64f342b..ba9b9c4561 100644
--- a/web/packages/base/locales/da-DK/translation.json
+++ b/web/packages/base/locales/da-DK/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/de-DE/translation.json b/web/packages/base/locales/de-DE/translation.json
index c57b16b41e..001f94e1f6 100644
--- a/web/packages/base/locales/de-DE/translation.json
+++ b/web/packages/base/locales/de-DE/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "Eine neue Version von Ente wurde veröffentlicht, aber sie kann nicht automatisch heruntergeladen und installiert werden.",
     "download_and_install": "Herunterladen und installieren",
     "ignore_this_version": "Diese Version ignorieren",
-    "TODAY": "Heute",
-    "YESTERDAY": "Gestern",
+    "today": "Heute",
+    "yesterday": "Gestern",
     "enter_name": "Name eingeben",
     "uploader_name_hint": "Füge einen Namen hinzu, damit deine Freunde wissen, wem sie für diese tollen Fotos zu danken haben!",
     "name_placeholder": "Name...",
diff --git a/web/packages/base/locales/el-GR/translation.json b/web/packages/base/locales/el-GR/translation.json
index 85f3ac1af4..846130c892 100644
--- a/web/packages/base/locales/el-GR/translation.json
+++ b/web/packages/base/locales/el-GR/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "Σήμερα",
-    "YESTERDAY": "Χθες",
+    "today": "Σήμερα",
+    "yesterday": "Χθες",
     "enter_name": "Εισάγετε όνομα",
     "uploader_name_hint": "Προσθέστε ένα όνομα, ώστε οι φίλοι σας να γνωρίζουν ποιον να ευχαριστήσουν για αυτές τις υπέροχες φωτογραφίες!",
     "name_placeholder": "Όνομα...",
diff --git a/web/packages/base/locales/en-US/translation.json b/web/packages/base/locales/en-US/translation.json
index 5def46e704..3e8b1dc6b6 100644
--- a/web/packages/base/locales/en-US/translation.json
+++ b/web/packages/base/locales/en-US/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "A new version of Ente has been released, but it cannot be automatically downloaded and installed.",
     "download_and_install": "Download and install",
     "ignore_this_version": "Ignore this version",
-    "TODAY": "Today",
-    "YESTERDAY": "Yesterday",
+    "today": "Today",
+    "yesterday": "Yesterday",
     "enter_name": "Enter name",
     "uploader_name_hint": "Add a name so that your friends know who to thank for these great photos!",
     "name_placeholder": "Name...",
diff --git a/web/packages/base/locales/es-ES/translation.json b/web/packages/base/locales/es-ES/translation.json
index 625e2d4883..b06de052bd 100644
--- a/web/packages/base/locales/es-ES/translation.json
+++ b/web/packages/base/locales/es-ES/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "Una nueva versión de ente ha sido lanzada, pero no se puede descargar e instalar automáticamente.",
     "download_and_install": "Descargar e instalar",
     "ignore_this_version": "Ignorar esta versión",
-    "TODAY": "Hoy",
-    "YESTERDAY": "Ayer",
+    "today": "Hoy",
+    "yesterday": "Ayer",
     "enter_name": "Introducir nombre",
     "uploader_name_hint": "¡Añade un nombre para que tus amigos sepan a quién dar las gracias por estas fotos geniales!",
     "name_placeholder": "Nombre...",
diff --git a/web/packages/base/locales/et-EE/translation.json b/web/packages/base/locales/et-EE/translation.json
index e6f4c65fd6..966925d0be 100644
--- a/web/packages/base/locales/et-EE/translation.json
+++ b/web/packages/base/locales/et-EE/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/fa-IR/translation.json b/web/packages/base/locales/fa-IR/translation.json
index 9fa96168e8..c6b5489c9a 100644
--- a/web/packages/base/locales/fa-IR/translation.json
+++ b/web/packages/base/locales/fa-IR/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/fi-FI/translation.json b/web/packages/base/locales/fi-FI/translation.json
index 31688b3bf6..979d75aa20 100644
--- a/web/packages/base/locales/fi-FI/translation.json
+++ b/web/packages/base/locales/fi-FI/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "Lisää nimi",
     "uploader_name_hint": "Lisää nimi, jotta ystäväsi tietävät, ketä kiittää näistä hienoista kuvista!",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/fr-FR/translation.json b/web/packages/base/locales/fr-FR/translation.json
index 4f49c9e60c..30ef8cdb37 100644
--- a/web/packages/base/locales/fr-FR/translation.json
+++ b/web/packages/base/locales/fr-FR/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "Une nouvelle version de Ente est sortie, mais elle ne peut pas être automatiquement téléchargée puis installée.",
     "download_and_install": "Télécharger et installer",
     "ignore_this_version": "Ignorer cette version",
-    "TODAY": "Aujourd'hui",
-    "YESTERDAY": "Hier",
+    "today": "Aujourd'hui",
+    "yesterday": "Hier",
     "enter_name": "Saisir un nom",
     "uploader_name_hint": "Ajouter un nom afin que vos amis sachent qui remercier pour ces magnifiques photos!",
     "name_placeholder": "Nom...",
diff --git a/web/packages/base/locales/gu-IN/translation.json b/web/packages/base/locales/gu-IN/translation.json
index e6f4c65fd6..966925d0be 100644
--- a/web/packages/base/locales/gu-IN/translation.json
+++ b/web/packages/base/locales/gu-IN/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/hi-IN/translation.json b/web/packages/base/locales/hi-IN/translation.json
index e6f4c65fd6..966925d0be 100644
--- a/web/packages/base/locales/hi-IN/translation.json
+++ b/web/packages/base/locales/hi-IN/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/hu-HU/translation.json b/web/packages/base/locales/hu-HU/translation.json
index e6f4c65fd6..966925d0be 100644
--- a/web/packages/base/locales/hu-HU/translation.json
+++ b/web/packages/base/locales/hu-HU/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/id-ID/translation.json b/web/packages/base/locales/id-ID/translation.json
index e05baf1b6b..0d3fc18ca3 100644
--- a/web/packages/base/locales/id-ID/translation.json
+++ b/web/packages/base/locales/id-ID/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "Versi baru Ente telah dirilis, namun tidak dapat diunduh dan diinstal secara otomatis.",
     "download_and_install": "Unduh dan instal",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "Kemarin",
+    "today": "",
+    "yesterday": "Kemarin",
     "enter_name": "Masukkan nama",
     "uploader_name_hint": "Tambahkan nama agar teman Anda tahu kepada siapa harus berterima kasih atas foto-foto hebat ini!",
     "name_placeholder": "Nama...",
diff --git a/web/packages/base/locales/is-IS/translation.json b/web/packages/base/locales/is-IS/translation.json
index b914a48c6d..180670eb53 100644
--- a/web/packages/base/locales/is-IS/translation.json
+++ b/web/packages/base/locales/is-IS/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/it-IT/translation.json b/web/packages/base/locales/it-IT/translation.json
index f951e472b5..08df694faa 100644
--- a/web/packages/base/locales/it-IT/translation.json
+++ b/web/packages/base/locales/it-IT/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "Una nuova versione di Ente è stata rilasciata, ma non può essere scaricata e installata automaticamente.",
     "download_and_install": "Scarica e installa",
     "ignore_this_version": "Ignora questa versione",
-    "TODAY": "Oggi",
-    "YESTERDAY": "Ieri",
+    "today": "Oggi",
+    "yesterday": "Ieri",
     "enter_name": "Inserisci il nome",
     "uploader_name_hint": "Aggiungi un nome in modo che i tuoi amici sappiano chi ringraziare per queste fantastiche foto!",
     "name_placeholder": "Nome...",
diff --git a/web/packages/base/locales/ja-JP/translation.json b/web/packages/base/locales/ja-JP/translation.json
index 9c99e5f0b4..4447f5e361 100644
--- a/web/packages/base/locales/ja-JP/translation.json
+++ b/web/packages/base/locales/ja-JP/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "ダウンロードしてインストール",
     "ignore_this_version": "このバージョンを無視する",
-    "TODAY": "今日",
-    "YESTERDAY": "昨日",
+    "today": "今日",
+    "yesterday": "昨日",
     "enter_name": "名前を入力してください",
     "uploader_name_hint": "友達がこの素晴らしい写真に感謝する相手を知るために、名前を追加してください！",
     "name_placeholder": "名前…",
diff --git a/web/packages/base/locales/km-KH/translation.json b/web/packages/base/locales/km-KH/translation.json
index e6f4c65fd6..966925d0be 100644
--- a/web/packages/base/locales/km-KH/translation.json
+++ b/web/packages/base/locales/km-KH/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/ko-KR/translation.json b/web/packages/base/locales/ko-KR/translation.json
index 62a75eba4a..fa1bdc61e9 100644
--- a/web/packages/base/locales/ko-KR/translation.json
+++ b/web/packages/base/locales/ko-KR/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "이름 입력",
     "uploader_name_hint": "친구들이 이 멋진 사진에 대해 고마워할 수 있도록 이름을 추가하세요!",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/lt-LT/translation.json b/web/packages/base/locales/lt-LT/translation.json
index b08dd943c7..101bb1b800 100644
--- a/web/packages/base/locales/lt-LT/translation.json
+++ b/web/packages/base/locales/lt-LT/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "Išleista nauja „Ente“ versija, bet jos negalima automatiškai atsisiųsti ir įdiegti.",
     "download_and_install": "Atsisiųsti ir įdiegti",
     "ignore_this_version": "Ignoruoti šią versiją",
-    "TODAY": "Šiandien",
-    "YESTERDAY": "Vakar",
+    "today": "Šiandien",
+    "yesterday": "Vakar",
     "enter_name": "Įveskite vardą",
     "uploader_name_hint": "Pridėkite vardą, kad draugai žinotų, kam padėkoti už šias puikias nuotraukas.",
     "name_placeholder": "Pavadinimas...",
diff --git a/web/packages/base/locales/ml-IN/translation.json b/web/packages/base/locales/ml-IN/translation.json
index e6f4c65fd6..966925d0be 100644
--- a/web/packages/base/locales/ml-IN/translation.json
+++ b/web/packages/base/locales/ml-IN/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/nl-NL/translation.json b/web/packages/base/locales/nl-NL/translation.json
index fcacb5b9e5..f838a8327e 100644
--- a/web/packages/base/locales/nl-NL/translation.json
+++ b/web/packages/base/locales/nl-NL/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "Er is een nieuwe versie van Ente vrijgegeven, maar deze kan niet automatisch worden gedownload en geïnstalleerd.",
     "download_and_install": "Downloaden en installeren",
     "ignore_this_version": "Negeer deze versie",
-    "TODAY": "Vandaag",
-    "YESTERDAY": "Gisteren",
+    "today": "Vandaag",
+    "yesterday": "Gisteren",
     "enter_name": "Naam invoeren",
     "uploader_name_hint": "Voeg een naam toe zodat je vrienden weten wie ze moeten bedanken voor deze geweldige foto's!",
     "name_placeholder": "Naam...",
diff --git a/web/packages/base/locales/pl-PL/translation.json b/web/packages/base/locales/pl-PL/translation.json
index 7c4e388db7..39bf849619 100644
--- a/web/packages/base/locales/pl-PL/translation.json
+++ b/web/packages/base/locales/pl-PL/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "Nowa wersja Ente została wydana, ale nie może być automatycznie pobrana i zainstalowana.",
     "download_and_install": "Pobierz i zainstaluj",
     "ignore_this_version": "Ignoruj tę wersję",
-    "TODAY": "Dzisiaj",
-    "YESTERDAY": "Wczoraj",
+    "today": "Dzisiaj",
+    "yesterday": "Wczoraj",
     "enter_name": "Wprowadź nazwę",
     "uploader_name_hint": "Dodaj imię, aby Twoi znajomi wiedzieli, kto będzie mógł podziękować za te wspaniałe zdjęcia!",
     "name_placeholder": "Nazwa...",
diff --git a/web/packages/base/locales/pt-BR/translation.json b/web/packages/base/locales/pt-BR/translation.json
index ddcba909b7..5469aa27e9 100644
--- a/web/packages/base/locales/pt-BR/translation.json
+++ b/web/packages/base/locales/pt-BR/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "Uma nova versão do ente foi lançada, mas não pode ser baixada e instalada automaticamente.",
     "download_and_install": "Baixar e instalar",
     "ignore_this_version": "Ignorar esta versão",
-    "TODAY": "Hoje",
-    "YESTERDAY": "Ontem",
+    "today": "Hoje",
+    "yesterday": "Ontem",
     "enter_name": "Inserir um nome",
     "uploader_name_hint": "Adicione um nome para que seus amigos saibam a quem agradecer por estas ótimas fotos!",
     "name_placeholder": "Nome...",
diff --git a/web/packages/base/locales/pt-PT/translation.json b/web/packages/base/locales/pt-PT/translation.json
index 9de71e0551..9d0ba3a2ed 100644
--- a/web/packages/base/locales/pt-PT/translation.json
+++ b/web/packages/base/locales/pt-PT/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "Foi lançada uma nova versão do Ente, mas não pode ser descarregada e instalada automaticamente.",
     "download_and_install": "Descarregar e instalar",
     "ignore_this_version": "Ignorar esta versão",
-    "TODAY": "Hoje",
-    "YESTERDAY": "Ontem",
+    "today": "Hoje",
+    "yesterday": "Ontem",
     "enter_name": "Introduza o nome",
     "uploader_name_hint": "Adicione um nome para que os seus amigos saibam a quem agradecer por estas ótimas fotos!",
     "name_placeholder": "Nome...",
diff --git a/web/packages/base/locales/ro-RO/translation.json b/web/packages/base/locales/ro-RO/translation.json
index e6f4c65fd6..966925d0be 100644
--- a/web/packages/base/locales/ro-RO/translation.json
+++ b/web/packages/base/locales/ro-RO/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/ru-RU/translation.json b/web/packages/base/locales/ru-RU/translation.json
index 32ea0ccd82..5c318d5241 100644
--- a/web/packages/base/locales/ru-RU/translation.json
+++ b/web/packages/base/locales/ru-RU/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "Была выпущена новая версия Ente, но она не может быть автоматически загружена и установлена.",
     "download_and_install": "Скачайте и установите",
     "ignore_this_version": "Игнорируйте эту версию",
-    "TODAY": "Сегодня",
-    "YESTERDAY": "Вчера",
+    "today": "Сегодня",
+    "yesterday": "Вчера",
     "enter_name": "Введите имя",
     "uploader_name_hint": "Добавьте имя, чтобы ваши друзья знали, кого благодарить за эти замечательные фотографии!",
     "name_placeholder": "Имя...",
diff --git a/web/packages/base/locales/sl-SI/translation.json b/web/packages/base/locales/sl-SI/translation.json
index e6f4c65fd6..966925d0be 100644
--- a/web/packages/base/locales/sl-SI/translation.json
+++ b/web/packages/base/locales/sl-SI/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/sv-SE/translation.json b/web/packages/base/locales/sv-SE/translation.json
index cd4e2a4ef6..b8846813d1 100644
--- a/web/packages/base/locales/sv-SE/translation.json
+++ b/web/packages/base/locales/sv-SE/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "Ange namn",
     "uploader_name_hint": "Lägg till ett namn så att dina vänner vet vem de ska tacka för dessa fantastiska bilder!",
     "name_placeholder": "Namn...",
diff --git a/web/packages/base/locales/ta-IN/translation.json b/web/packages/base/locales/ta-IN/translation.json
index e6f4c65fd6..966925d0be 100644
--- a/web/packages/base/locales/ta-IN/translation.json
+++ b/web/packages/base/locales/ta-IN/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/te-IN/translation.json b/web/packages/base/locales/te-IN/translation.json
index e6f4c65fd6..966925d0be 100644
--- a/web/packages/base/locales/te-IN/translation.json
+++ b/web/packages/base/locales/te-IN/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/th-TH/translation.json b/web/packages/base/locales/th-TH/translation.json
index e6f4c65fd6..966925d0be 100644
--- a/web/packages/base/locales/th-TH/translation.json
+++ b/web/packages/base/locales/th-TH/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/ti-ER/translation.json b/web/packages/base/locales/ti-ER/translation.json
index e6f4c65fd6..966925d0be 100644
--- a/web/packages/base/locales/ti-ER/translation.json
+++ b/web/packages/base/locales/ti-ER/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/tr-TR/translation.json b/web/packages/base/locales/tr-TR/translation.json
index 30926580d7..7a6d6aec9e 100644
--- a/web/packages/base/locales/tr-TR/translation.json
+++ b/web/packages/base/locales/tr-TR/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "İsim gir",
     "uploader_name_hint": "Arkadaşlarının bu harika fotoğraflar için kime teşekkür etmeleri gerektiğini bilmeleri için bir isim ekle!",
     "name_placeholder": "",
diff --git a/web/packages/base/locales/uk-UA/translation.json b/web/packages/base/locales/uk-UA/translation.json
index 4c40eeab63..f8a1be3238 100644
--- a/web/packages/base/locales/uk-UA/translation.json
+++ b/web/packages/base/locales/uk-UA/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "Вийшла нова версія Ente, але вона не може бути автоматично завантажена і встановлена.",
     "download_and_install": "Завантажити й установити",
     "ignore_this_version": "Ігнорувати цю версію",
-    "TODAY": "Сьогодні",
-    "YESTERDAY": "Вчора",
+    "today": "Сьогодні",
+    "yesterday": "Вчора",
     "enter_name": "Введіть ім'я",
     "uploader_name_hint": "Додайте ім'я, щоб ваші друзі знали кому подякувати за ці чудові фото!",
     "name_placeholder": "Назва...",
diff --git a/web/packages/base/locales/vi-VN/translation.json b/web/packages/base/locales/vi-VN/translation.json
index e69dd0fc9f..84f3db1f22 100644
--- a/web/packages/base/locales/vi-VN/translation.json
+++ b/web/packages/base/locales/vi-VN/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "Một phiên bản mới của Ente đã được phát hành, nhưng không thể tự động tải xuống và cài đặt.",
     "download_and_install": "Tải xuống và cài đặt",
     "ignore_this_version": "Bỏ qua phiên bản này",
-    "TODAY": "Hôm nay",
-    "YESTERDAY": "Hôm qua",
+    "today": "Hôm nay",
+    "yesterday": "Hôm qua",
     "enter_name": "Nhập tên",
     "uploader_name_hint": "Thêm một tên để bạn bè biết ai là người đáng cảm ơn cho những bức ảnh tuyệt vời này!",
     "name_placeholder": "Tên...",
diff --git a/web/packages/base/locales/zh-CN/translation.json b/web/packages/base/locales/zh-CN/translation.json
index 3125b800f1..fcb75f303e 100644
--- a/web/packages/base/locales/zh-CN/translation.json
+++ b/web/packages/base/locales/zh-CN/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "新版本的 Ente 已发布，但无法自动下载和安装。",
     "download_and_install": "下载并安装",
     "ignore_this_version": "忽略该版本",
-    "TODAY": "今天",
-    "YESTERDAY": "昨天",
+    "today": "今天",
+    "yesterday": "昨天",
     "enter_name": "输入名字",
     "uploader_name_hint": "请添加一个名字，以便您的朋友知晓该感谢谁拍摄了这些精美的照片！",
     "name_placeholder": "名称...",
diff --git a/web/packages/base/locales/zh-HK/translation.json b/web/packages/base/locales/zh-HK/translation.json
index e6f4c65fd6..966925d0be 100644
--- a/web/packages/base/locales/zh-HK/translation.json
+++ b/web/packages/base/locales/zh-HK/translation.json
@@ -490,8 +490,8 @@
     "update_available_message": "",
     "download_and_install": "",
     "ignore_this_version": "",
-    "TODAY": "",
-    "YESTERDAY": "",
+    "today": "",
+    "yesterday": "",
     "enter_name": "",
     "uploader_name_hint": "",
     "name_placeholder": "",

From 557bdd142b72b7a50d25c25167d5e4a0d290739d Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 16:32:29 +0530
Subject: [PATCH 426/796] R

---
 web/packages/base/locales/ar-SA/translation.json | 8 ++++----
 web/packages/base/locales/be-BY/translation.json | 8 ++++----
 web/packages/base/locales/bg-BG/translation.json | 8 ++++----
 web/packages/base/locales/ca-ES/translation.json | 8 ++++----
 web/packages/base/locales/cs-CZ/translation.json | 8 ++++----
 web/packages/base/locales/da-DK/translation.json | 8 ++++----
 web/packages/base/locales/de-DE/translation.json | 8 ++++----
 web/packages/base/locales/el-GR/translation.json | 8 ++++----
 web/packages/base/locales/en-US/translation.json | 8 ++++----
 web/packages/base/locales/es-ES/translation.json | 8 ++++----
 web/packages/base/locales/et-EE/translation.json | 8 ++++----
 web/packages/base/locales/fa-IR/translation.json | 8 ++++----
 web/packages/base/locales/fi-FI/translation.json | 8 ++++----
 web/packages/base/locales/fr-FR/translation.json | 8 ++++----
 web/packages/base/locales/gu-IN/translation.json | 8 ++++----
 web/packages/base/locales/hi-IN/translation.json | 8 ++++----
 web/packages/base/locales/hu-HU/translation.json | 8 ++++----
 web/packages/base/locales/id-ID/translation.json | 8 ++++----
 web/packages/base/locales/is-IS/translation.json | 8 ++++----
 web/packages/base/locales/it-IT/translation.json | 8 ++++----
 web/packages/base/locales/ja-JP/translation.json | 8 ++++----
 web/packages/base/locales/km-KH/translation.json | 8 ++++----
 web/packages/base/locales/ko-KR/translation.json | 8 ++++----
 web/packages/base/locales/lt-LT/translation.json | 8 ++++----
 web/packages/base/locales/ml-IN/translation.json | 8 ++++----
 web/packages/base/locales/nl-NL/translation.json | 8 ++++----
 web/packages/base/locales/pl-PL/translation.json | 8 ++++----
 web/packages/base/locales/pt-BR/translation.json | 8 ++++----
 web/packages/base/locales/pt-PT/translation.json | 8 ++++----
 web/packages/base/locales/ro-RO/translation.json | 8 ++++----
 web/packages/base/locales/ru-RU/translation.json | 8 ++++----
 web/packages/base/locales/sl-SI/translation.json | 8 ++++----
 web/packages/base/locales/sv-SE/translation.json | 8 ++++----
 web/packages/base/locales/ta-IN/translation.json | 8 ++++----
 web/packages/base/locales/te-IN/translation.json | 8 ++++----
 web/packages/base/locales/th-TH/translation.json | 8 ++++----
 web/packages/base/locales/ti-ER/translation.json | 8 ++++----
 web/packages/base/locales/tr-TR/translation.json | 8 ++++----
 web/packages/base/locales/uk-UA/translation.json | 8 ++++----
 web/packages/base/locales/vi-VN/translation.json | 8 ++++----
 web/packages/base/locales/zh-CN/translation.json | 8 ++++----
 web/packages/base/locales/zh-HK/translation.json | 8 ++++----
 web/packages/new/photos/services/search/index.ts | 8 ++++----
 43 files changed, 172 insertions(+), 172 deletions(-)

diff --git a/web/packages/base/locales/ar-SA/translation.json b/web/packages/base/locales/ar-SA/translation.json
index 4cbbbc722d..8e77b5464a 100644
--- a/web/packages/base/locales/ar-SA/translation.json
+++ b/web/packages/base/locales/ar-SA/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/be-BY/translation.json b/web/packages/base/locales/be-BY/translation.json
index a4c106a01a..ead73eb341 100644
--- a/web/packages/base/locales/be-BY/translation.json
+++ b/web/packages/base/locales/be-BY/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/bg-BG/translation.json b/web/packages/base/locales/bg-BG/translation.json
index dcb0b96f45..9d710ffd7c 100644
--- a/web/packages/base/locales/bg-BG/translation.json
+++ b/web/packages/base/locales/bg-BG/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/ca-ES/translation.json b/web/packages/base/locales/ca-ES/translation.json
index 966925d0be..1626345044 100644
--- a/web/packages/base/locales/ca-ES/translation.json
+++ b/web/packages/base/locales/ca-ES/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/cs-CZ/translation.json b/web/packages/base/locales/cs-CZ/translation.json
index 966925d0be..1626345044 100644
--- a/web/packages/base/locales/cs-CZ/translation.json
+++ b/web/packages/base/locales/cs-CZ/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/da-DK/translation.json b/web/packages/base/locales/da-DK/translation.json
index ba9b9c4561..044e72ffc7 100644
--- a/web/packages/base/locales/da-DK/translation.json
+++ b/web/packages/base/locales/da-DK/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/de-DE/translation.json b/web/packages/base/locales/de-DE/translation.json
index 001f94e1f6..507f9d17c9 100644
--- a/web/packages/base/locales/de-DE/translation.json
+++ b/web/packages/base/locales/de-DE/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "Lade {{name}} herunter",
     "download_failed": "Herunterladen fehlgeschlagen",
     "download_progress": "{{count, number}} / {{total, number}} Dateien",
-    "CHRISTMAS": "Weihnachten",
-    "CHRISTMAS_EVE": "Heiligabend",
-    "NEW_YEAR": "Neujahr",
-    "NEW_YEAR_EVE": "Silvester",
+    "christmas": "Weihnachten",
+    "christmas_eve": "Heiligabend",
+    "new_year": "Neujahr",
+    "new_year_eve": "Silvester",
     "image": "Bild",
     "video": "Video",
     "live_photo": "Live-foto",
diff --git a/web/packages/base/locales/el-GR/translation.json b/web/packages/base/locales/el-GR/translation.json
index 846130c892..41de2840cb 100644
--- a/web/packages/base/locales/el-GR/translation.json
+++ b/web/packages/base/locales/el-GR/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "Λήψη {{name}}",
     "download_failed": "Η λήψη απέτυχε",
     "download_progress": "{{count, number}} / {{total, number}} αρχεία",
-    "CHRISTMAS": "Χριστούγεννα",
-    "CHRISTMAS_EVE": "Παραμονή Χριστουγέννων",
-    "NEW_YEAR": "Πρωτοχρονιά",
-    "NEW_YEAR_EVE": "Παραμονή Πρωτοχρονιάς",
+    "christmas": "Χριστούγεννα",
+    "christmas_eve": "Παραμονή Χριστουγέννων",
+    "new_year": "Πρωτοχρονιά",
+    "new_year_eve": "Παραμονή Πρωτοχρονιάς",
     "image": "Εικόνα",
     "video": "Βίντεο",
     "live_photo": "Ζωντανή φωτογραφία",
diff --git a/web/packages/base/locales/en-US/translation.json b/web/packages/base/locales/en-US/translation.json
index 3e8b1dc6b6..59a3976008 100644
--- a/web/packages/base/locales/en-US/translation.json
+++ b/web/packages/base/locales/en-US/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "Downloading {{name}}",
     "download_failed": "Download failed",
     "download_progress": "{{count, number}} / {{total, number}} files",
-    "CHRISTMAS": "Christmas",
-    "CHRISTMAS_EVE": "Christmas Eve",
-    "NEW_YEAR": "New Year",
-    "NEW_YEAR_EVE": "New Year's Eve",
+    "christmas": "Christmas",
+    "christmas_eve": "Christmas Eve",
+    "new_year": "New Year",
+    "new_year_eve": "New Year's Eve",
     "image": "Image",
     "video": "Video",
     "live_photo": "Live photo",
diff --git a/web/packages/base/locales/es-ES/translation.json b/web/packages/base/locales/es-ES/translation.json
index b06de052bd..6a79d0e1e7 100644
--- a/web/packages/base/locales/es-ES/translation.json
+++ b/web/packages/base/locales/es-ES/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "Descargando {{name}}",
     "download_failed": "Error al descargar",
     "download_progress": "{{count, number}} / {{total, number}} archivos",
-    "CHRISTMAS": "Navidad",
-    "CHRISTMAS_EVE": "Nochebuena",
-    "NEW_YEAR": "Año Nuevo",
-    "NEW_YEAR_EVE": "Nochevieja",
+    "christmas": "Navidad",
+    "christmas_eve": "Nochebuena",
+    "new_year": "Año Nuevo",
+    "new_year_eve": "Nochevieja",
     "image": "Imagen",
     "video": "Video",
     "live_photo": "Foto en vivo",
diff --git a/web/packages/base/locales/et-EE/translation.json b/web/packages/base/locales/et-EE/translation.json
index 966925d0be..1626345044 100644
--- a/web/packages/base/locales/et-EE/translation.json
+++ b/web/packages/base/locales/et-EE/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/fa-IR/translation.json b/web/packages/base/locales/fa-IR/translation.json
index c6b5489c9a..a3fa53de92 100644
--- a/web/packages/base/locales/fa-IR/translation.json
+++ b/web/packages/base/locales/fa-IR/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/fi-FI/translation.json b/web/packages/base/locales/fi-FI/translation.json
index 979d75aa20..06f000929a 100644
--- a/web/packages/base/locales/fi-FI/translation.json
+++ b/web/packages/base/locales/fi-FI/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/fr-FR/translation.json b/web/packages/base/locales/fr-FR/translation.json
index 30ef8cdb37..db5fa274f6 100644
--- a/web/packages/base/locales/fr-FR/translation.json
+++ b/web/packages/base/locales/fr-FR/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "Téléchargement de {{name}}",
     "download_failed": "Échec du téléchargement",
     "download_progress": "{{count, number}} / {{total, number}} fichiers",
-    "CHRISTMAS": "Noël",
-    "CHRISTMAS_EVE": "Réveillon de Noël",
-    "NEW_YEAR": "Nouvel an",
-    "NEW_YEAR_EVE": "Réveillon de Nouvel An",
+    "christmas": "Noël",
+    "christmas_eve": "Réveillon de Noël",
+    "new_year": "Nouvel an",
+    "new_year_eve": "Réveillon de Nouvel An",
     "image": "Image",
     "video": "Vidéo",
     "live_photo": "Photos en direct",
diff --git a/web/packages/base/locales/gu-IN/translation.json b/web/packages/base/locales/gu-IN/translation.json
index 966925d0be..1626345044 100644
--- a/web/packages/base/locales/gu-IN/translation.json
+++ b/web/packages/base/locales/gu-IN/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/hi-IN/translation.json b/web/packages/base/locales/hi-IN/translation.json
index 966925d0be..1626345044 100644
--- a/web/packages/base/locales/hi-IN/translation.json
+++ b/web/packages/base/locales/hi-IN/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/hu-HU/translation.json b/web/packages/base/locales/hu-HU/translation.json
index 966925d0be..1626345044 100644
--- a/web/packages/base/locales/hu-HU/translation.json
+++ b/web/packages/base/locales/hu-HU/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/id-ID/translation.json b/web/packages/base/locales/id-ID/translation.json
index 0d3fc18ca3..6276b1f4cd 100644
--- a/web/packages/base/locales/id-ID/translation.json
+++ b/web/packages/base/locales/id-ID/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "Mengunduh {{name}}",
     "download_failed": "Gagal mengunduh",
     "download_progress": "{{count, number}} / {{total, number}} file",
-    "CHRISTMAS": "Natal",
-    "CHRISTMAS_EVE": "Malam Natal",
-    "NEW_YEAR": "Tahun Baru",
-    "NEW_YEAR_EVE": "Malam Tahun Baru",
+    "christmas": "Natal",
+    "christmas_eve": "Malam Natal",
+    "new_year": "Tahun Baru",
+    "new_year_eve": "Malam Tahun Baru",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/is-IS/translation.json b/web/packages/base/locales/is-IS/translation.json
index 180670eb53..bd8fddc06b 100644
--- a/web/packages/base/locales/is-IS/translation.json
+++ b/web/packages/base/locales/is-IS/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "Nýtt ár",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "Nýtt ár",
+    "new_year_eve": "",
     "image": "Mynd",
     "video": "Mynband",
     "live_photo": "",
diff --git a/web/packages/base/locales/it-IT/translation.json b/web/packages/base/locales/it-IT/translation.json
index 08df694faa..e50fb3ea1f 100644
--- a/web/packages/base/locales/it-IT/translation.json
+++ b/web/packages/base/locales/it-IT/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "Download {{name}}",
     "download_failed": "Download fallito",
     "download_progress": "{{count, number}} / {{total, number}} file",
-    "CHRISTMAS": "Natale",
-    "CHRISTMAS_EVE": "Vigilia di Natale",
-    "NEW_YEAR": "Capodanno",
-    "NEW_YEAR_EVE": "Vigilia di Capodanno",
+    "christmas": "Natale",
+    "christmas_eve": "Vigilia di Natale",
+    "new_year": "Capodanno",
+    "new_year_eve": "Vigilia di Capodanno",
     "image": "Immagine",
     "video": "Video",
     "live_photo": "",
diff --git a/web/packages/base/locales/ja-JP/translation.json b/web/packages/base/locales/ja-JP/translation.json
index 4447f5e361..f26e937932 100644
--- a/web/packages/base/locales/ja-JP/translation.json
+++ b/web/packages/base/locales/ja-JP/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "{{name}} をダウンロード中",
     "download_failed": "ダウンロードに失敗しました",
     "download_progress": "{{count, number}} / {{total, number}}ファイル",
-    "CHRISTMAS": "クリスマス",
-    "CHRISTMAS_EVE": "クリスマスイブ",
-    "NEW_YEAR": "新年",
-    "NEW_YEAR_EVE": "大晦日",
+    "christmas": "クリスマス",
+    "christmas_eve": "クリスマスイブ",
+    "new_year": "新年",
+    "new_year_eve": "大晦日",
     "image": "Image",
     "video": "Video",
     "live_photo": "",
diff --git a/web/packages/base/locales/km-KH/translation.json b/web/packages/base/locales/km-KH/translation.json
index 966925d0be..1626345044 100644
--- a/web/packages/base/locales/km-KH/translation.json
+++ b/web/packages/base/locales/km-KH/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/ko-KR/translation.json b/web/packages/base/locales/ko-KR/translation.json
index fa1bdc61e9..193d46e3f0 100644
--- a/web/packages/base/locales/ko-KR/translation.json
+++ b/web/packages/base/locales/ko-KR/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/lt-LT/translation.json b/web/packages/base/locales/lt-LT/translation.json
index 101bb1b800..7b8d32042b 100644
--- a/web/packages/base/locales/lt-LT/translation.json
+++ b/web/packages/base/locales/lt-LT/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "Atsisiunčiama {{name}}",
     "download_failed": "Atsisiuntimas nepavyko.",
     "download_progress": "{{count, number}} / {{total, number}} failai",
-    "CHRISTMAS": "Kalėdos",
-    "CHRISTMAS_EVE": "Kūčios",
-    "NEW_YEAR": "Naujieji metai",
-    "NEW_YEAR_EVE": "Naujųjų metų išvakarės",
+    "christmas": "Kalėdos",
+    "christmas_eve": "Kūčios",
+    "new_year": "Naujieji metai",
+    "new_year_eve": "Naujųjų metų išvakarės",
     "image": "Vaizdas",
     "video": "Vaizdo įrašas",
     "live_photo": "Gyva nuotrauka",
diff --git a/web/packages/base/locales/ml-IN/translation.json b/web/packages/base/locales/ml-IN/translation.json
index 966925d0be..1626345044 100644
--- a/web/packages/base/locales/ml-IN/translation.json
+++ b/web/packages/base/locales/ml-IN/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/nl-NL/translation.json b/web/packages/base/locales/nl-NL/translation.json
index f838a8327e..229f7d0a54 100644
--- a/web/packages/base/locales/nl-NL/translation.json
+++ b/web/packages/base/locales/nl-NL/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "{{name}} downloaden",
     "download_failed": "Download mislukt",
     "download_progress": "{{count, number}} / {{total, number}} bestanden",
-    "CHRISTMAS": "Kerst",
-    "CHRISTMAS_EVE": "Kerstavond",
-    "NEW_YEAR": "Nieuwjaar",
-    "NEW_YEAR_EVE": "Oudjaarsavond",
+    "christmas": "Kerst",
+    "christmas_eve": "Kerstavond",
+    "new_year": "Nieuwjaar",
+    "new_year_eve": "Oudjaarsavond",
     "image": "Afbeelding",
     "video": "Video",
     "live_photo": "Live foto",
diff --git a/web/packages/base/locales/pl-PL/translation.json b/web/packages/base/locales/pl-PL/translation.json
index 39bf849619..b7cfaa7e98 100644
--- a/web/packages/base/locales/pl-PL/translation.json
+++ b/web/packages/base/locales/pl-PL/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "Pobieranie {{name}}",
     "download_failed": "Pobieranie nie powiodło się",
     "download_progress": "{{count, number}} / {{total, number}} plików",
-    "CHRISTMAS": "Boże Narodzenie",
-    "CHRISTMAS_EVE": "Wigilia",
-    "NEW_YEAR": "Nowy Rok",
-    "NEW_YEAR_EVE": "Sylwester",
+    "christmas": "Boże Narodzenie",
+    "christmas_eve": "Wigilia",
+    "new_year": "Nowy Rok",
+    "new_year_eve": "Sylwester",
     "image": "Zdjęcie",
     "video": "Wideo",
     "live_photo": "Live Photo",
diff --git a/web/packages/base/locales/pt-BR/translation.json b/web/packages/base/locales/pt-BR/translation.json
index 5469aa27e9..be6729a5c2 100644
--- a/web/packages/base/locales/pt-BR/translation.json
+++ b/web/packages/base/locales/pt-BR/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "Fazendo download de {{name}}",
     "download_failed": "Falhou ao baixar",
     "download_progress": "{{count, number}} / {{total, number}} arquivos",
-    "CHRISTMAS": "Natal",
-    "CHRISTMAS_EVE": "Véspera de Natal",
-    "NEW_YEAR": "Ano Novo",
-    "NEW_YEAR_EVE": "Véspera de Ano Novo",
+    "christmas": "Natal",
+    "christmas_eve": "Véspera de Natal",
+    "new_year": "Ano Novo",
+    "new_year_eve": "Véspera de Ano Novo",
     "image": "Imagem",
     "video": "Vídeo",
     "live_photo": "Foto ao vivo",
diff --git a/web/packages/base/locales/pt-PT/translation.json b/web/packages/base/locales/pt-PT/translation.json
index 9d0ba3a2ed..3acdf5b6c2 100644
--- a/web/packages/base/locales/pt-PT/translation.json
+++ b/web/packages/base/locales/pt-PT/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "Fazer download de {{name}}",
     "download_failed": "Falha no download",
     "download_progress": "{{count, number}} / {{total, number}} arquivos",
-    "CHRISTMAS": "Natal",
-    "CHRISTMAS_EVE": "Véspera de Natal",
-    "NEW_YEAR": "Ano Novo",
-    "NEW_YEAR_EVE": "Véspera de Ano Novo",
+    "christmas": "Natal",
+    "christmas_eve": "Véspera de Natal",
+    "new_year": "Ano Novo",
+    "new_year_eve": "Véspera de Ano Novo",
     "image": "Imagem",
     "video": "Vídeo",
     "live_photo": "Fotos em movimento",
diff --git a/web/packages/base/locales/ro-RO/translation.json b/web/packages/base/locales/ro-RO/translation.json
index 966925d0be..1626345044 100644
--- a/web/packages/base/locales/ro-RO/translation.json
+++ b/web/packages/base/locales/ro-RO/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/ru-RU/translation.json b/web/packages/base/locales/ru-RU/translation.json
index 5c318d5241..bd0a4650ff 100644
--- a/web/packages/base/locales/ru-RU/translation.json
+++ b/web/packages/base/locales/ru-RU/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "Загрузка {{name}}",
     "download_failed": "Загрузка не удалась",
     "download_progress": "{{count, number}} / {{total, number}} файлов",
-    "CHRISTMAS": "Рождество",
-    "CHRISTMAS_EVE": "Канун Рождества",
-    "NEW_YEAR": "Новый год",
-    "NEW_YEAR_EVE": "Канун Нового года",
+    "christmas": "Рождество",
+    "christmas_eve": "Канун Рождества",
+    "new_year": "Новый год",
+    "new_year_eve": "Канун Нового года",
     "image": "Изображение",
     "video": "Видео",
     "live_photo": "Живое фото",
diff --git a/web/packages/base/locales/sl-SI/translation.json b/web/packages/base/locales/sl-SI/translation.json
index 966925d0be..1626345044 100644
--- a/web/packages/base/locales/sl-SI/translation.json
+++ b/web/packages/base/locales/sl-SI/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/sv-SE/translation.json b/web/packages/base/locales/sv-SE/translation.json
index b8846813d1..ec2edf7532 100644
--- a/web/packages/base/locales/sv-SE/translation.json
+++ b/web/packages/base/locales/sv-SE/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "Bild",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/ta-IN/translation.json b/web/packages/base/locales/ta-IN/translation.json
index 966925d0be..1626345044 100644
--- a/web/packages/base/locales/ta-IN/translation.json
+++ b/web/packages/base/locales/ta-IN/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/te-IN/translation.json b/web/packages/base/locales/te-IN/translation.json
index 966925d0be..1626345044 100644
--- a/web/packages/base/locales/te-IN/translation.json
+++ b/web/packages/base/locales/te-IN/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/th-TH/translation.json b/web/packages/base/locales/th-TH/translation.json
index 966925d0be..1626345044 100644
--- a/web/packages/base/locales/th-TH/translation.json
+++ b/web/packages/base/locales/th-TH/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/ti-ER/translation.json b/web/packages/base/locales/ti-ER/translation.json
index 966925d0be..1626345044 100644
--- a/web/packages/base/locales/ti-ER/translation.json
+++ b/web/packages/base/locales/ti-ER/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/tr-TR/translation.json b/web/packages/base/locales/tr-TR/translation.json
index 7a6d6aec9e..c87436709d 100644
--- a/web/packages/base/locales/tr-TR/translation.json
+++ b/web/packages/base/locales/tr-TR/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/base/locales/uk-UA/translation.json b/web/packages/base/locales/uk-UA/translation.json
index f8a1be3238..4210b0f828 100644
--- a/web/packages/base/locales/uk-UA/translation.json
+++ b/web/packages/base/locales/uk-UA/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "Завантаження {{name}}",
     "download_failed": "Не вдалося завантажити",
     "download_progress": "{{count, number}} / {{total, number}} файлів",
-    "CHRISTMAS": "Різдво",
-    "CHRISTMAS_EVE": "Святвечір",
-    "NEW_YEAR": "Новий рік",
-    "NEW_YEAR_EVE": "Вечір Нового року",
+    "christmas": "Різдво",
+    "christmas_eve": "Святвечір",
+    "new_year": "Новий рік",
+    "new_year_eve": "Вечір Нового року",
     "image": "Зображення",
     "video": "Відео",
     "live_photo": "Живі фото",
diff --git a/web/packages/base/locales/vi-VN/translation.json b/web/packages/base/locales/vi-VN/translation.json
index 84f3db1f22..005422f19a 100644
--- a/web/packages/base/locales/vi-VN/translation.json
+++ b/web/packages/base/locales/vi-VN/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "Đang tải xuống {{name}}",
     "download_failed": "Tải xuống thất bại",
     "download_progress": "{{count, number}} / {{total, number}} tệp",
-    "CHRISTMAS": "Giáng sinh",
-    "CHRISTMAS_EVE": "Đêm Giáng sinh",
-    "NEW_YEAR": "Năm mới",
-    "NEW_YEAR_EVE": "Đêm giao thừa",
+    "christmas": "Giáng sinh",
+    "christmas_eve": "Đêm Giáng sinh",
+    "new_year": "Năm mới",
+    "new_year_eve": "Đêm giao thừa",
     "image": "Hình ảnh",
     "video": "Video",
     "live_photo": "Ảnh trực tiếp",
diff --git a/web/packages/base/locales/zh-CN/translation.json b/web/packages/base/locales/zh-CN/translation.json
index fcb75f303e..90b62e4463 100644
--- a/web/packages/base/locales/zh-CN/translation.json
+++ b/web/packages/base/locales/zh-CN/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "正在下载 {{name}}",
     "download_failed": "下载失败",
     "download_progress": "{{count, number}} / {{total, number}} 个文件",
-    "CHRISTMAS": "圣诞",
-    "CHRISTMAS_EVE": "平安夜",
-    "NEW_YEAR": "新年",
-    "NEW_YEAR_EVE": "除夕",
+    "christmas": "圣诞",
+    "christmas_eve": "平安夜",
+    "new_year": "新年",
+    "new_year_eve": "除夕",
     "image": "图像",
     "video": "视频",
     "live_photo": "实况照片",
diff --git a/web/packages/base/locales/zh-HK/translation.json b/web/packages/base/locales/zh-HK/translation.json
index 966925d0be..1626345044 100644
--- a/web/packages/base/locales/zh-HK/translation.json
+++ b/web/packages/base/locales/zh-HK/translation.json
@@ -570,10 +570,10 @@
     "downloading_album": "",
     "download_failed": "",
     "download_progress": "",
-    "CHRISTMAS": "",
-    "CHRISTMAS_EVE": "",
-    "NEW_YEAR": "",
-    "NEW_YEAR_EVE": "",
+    "christmas": "",
+    "christmas_eve": "",
+    "new_year": "",
+    "new_year_eve": "",
     "image": "",
     "video": "",
     "live_photo": "",
diff --git a/web/packages/new/photos/services/search/index.ts b/web/packages/new/photos/services/search/index.ts
index 0216373dae..88b9bc9598 100644
--- a/web/packages/new/photos/services/search/index.ts
+++ b/web/packages/new/photos/services/search/index.ts
@@ -176,10 +176,10 @@ const localizedSearchData = () =>
  * A list of holidays - their yearly dates and localized names.
  */
 const holidays = (): LabelledSearchDateComponents[] => [
-    { components: { month: 12, day: 25 }, label: t("CHRISTMAS") },
-    { components: { month: 12, day: 24 }, label: t("CHRISTMAS_EVE") },
-    { components: { month: 1, day: 1 }, label: t("NEW_YEAR") },
-    { components: { month: 12, day: 31 }, label: t("NEW_YEAR_EVE") },
+    { components: { month: 12, day: 25 }, label: t("christmas") },
+    { components: { month: 12, day: 24 }, label: t("christmas_eve") },
+    { components: { month: 1, day: 1 }, label: t("new_year") },
+    { components: { month: 12, day: 31 }, label: t("new_year_eve") },
 ];
 
 /**

From 3968dd93e939ab9c7ac5b4347e915f5733a62ae1 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 16:34:09 +0530
Subject: [PATCH 427/796] R

---
 web/apps/photos/src/components/ExportInProgress.tsx | 2 +-
 web/packages/base/locales/ar-SA/translation.json    | 2 +-
 web/packages/base/locales/be-BY/translation.json    | 2 +-
 web/packages/base/locales/bg-BG/translation.json    | 2 +-
 web/packages/base/locales/ca-ES/translation.json    | 2 +-
 web/packages/base/locales/cs-CZ/translation.json    | 2 +-
 web/packages/base/locales/da-DK/translation.json    | 2 +-
 web/packages/base/locales/de-DE/translation.json    | 2 +-
 web/packages/base/locales/el-GR/translation.json    | 2 +-
 web/packages/base/locales/en-US/translation.json    | 2 +-
 web/packages/base/locales/es-ES/translation.json    | 2 +-
 web/packages/base/locales/et-EE/translation.json    | 2 +-
 web/packages/base/locales/fa-IR/translation.json    | 2 +-
 web/packages/base/locales/fi-FI/translation.json    | 2 +-
 web/packages/base/locales/fr-FR/translation.json    | 2 +-
 web/packages/base/locales/gu-IN/translation.json    | 2 +-
 web/packages/base/locales/hi-IN/translation.json    | 2 +-
 web/packages/base/locales/hu-HU/translation.json    | 2 +-
 web/packages/base/locales/id-ID/translation.json    | 2 +-
 web/packages/base/locales/is-IS/translation.json    | 2 +-
 web/packages/base/locales/it-IT/translation.json    | 2 +-
 web/packages/base/locales/ja-JP/translation.json    | 2 +-
 web/packages/base/locales/km-KH/translation.json    | 2 +-
 web/packages/base/locales/ko-KR/translation.json    | 2 +-
 web/packages/base/locales/lt-LT/translation.json    | 2 +-
 web/packages/base/locales/ml-IN/translation.json    | 2 +-
 web/packages/base/locales/nl-NL/translation.json    | 2 +-
 web/packages/base/locales/pl-PL/translation.json    | 2 +-
 web/packages/base/locales/pt-BR/translation.json    | 2 +-
 web/packages/base/locales/pt-PT/translation.json    | 2 +-
 web/packages/base/locales/ro-RO/translation.json    | 2 +-
 web/packages/base/locales/ru-RU/translation.json    | 2 +-
 web/packages/base/locales/sl-SI/translation.json    | 2 +-
 web/packages/base/locales/sv-SE/translation.json    | 2 +-
 web/packages/base/locales/ta-IN/translation.json    | 2 +-
 web/packages/base/locales/te-IN/translation.json    | 2 +-
 web/packages/base/locales/th-TH/translation.json    | 2 +-
 web/packages/base/locales/ti-ER/translation.json    | 2 +-
 web/packages/base/locales/tr-TR/translation.json    | 2 +-
 web/packages/base/locales/uk-UA/translation.json    | 2 +-
 web/packages/base/locales/vi-VN/translation.json    | 2 +-
 web/packages/base/locales/zh-CN/translation.json    | 2 +-
 web/packages/base/locales/zh-HK/translation.json    | 2 +-
 43 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/web/apps/photos/src/components/ExportInProgress.tsx b/web/apps/photos/src/components/ExportInProgress.tsx
index 1972e880d5..3aaaa0a5d4 100644
--- a/web/apps/photos/src/components/ExportInProgress.tsx
+++ b/web/apps/photos/src/components/ExportInProgress.tsx
@@ -104,7 +104,7 @@ export default function ExportInProgress(props: Props) {
                     color="critical"
                     onClick={props.stopExport}
                 >
-                    {t("STOP_EXPORT")}
+                    {t("stop")}
                 </FocusVisibleButton>
             </DialogActions>
         </>
diff --git a/web/packages/base/locales/ar-SA/translation.json b/web/packages/base/locales/ar-SA/translation.json
index 8e77b5464a..fb3d5699b6 100644
--- a/web/packages/base/locales/ar-SA/translation.json
+++ b/web/packages/base/locales/ar-SA/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/be-BY/translation.json b/web/packages/base/locales/be-BY/translation.json
index ead73eb341..01ae37082c 100644
--- a/web/packages/base/locales/be-BY/translation.json
+++ b/web/packages/base/locales/be-BY/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/bg-BG/translation.json b/web/packages/base/locales/bg-BG/translation.json
index 9d710ffd7c..d627abb740 100644
--- a/web/packages/base/locales/bg-BG/translation.json
+++ b/web/packages/base/locales/bg-BG/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/ca-ES/translation.json b/web/packages/base/locales/ca-ES/translation.json
index 1626345044..37be9b24d0 100644
--- a/web/packages/base/locales/ca-ES/translation.json
+++ b/web/packages/base/locales/ca-ES/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/cs-CZ/translation.json b/web/packages/base/locales/cs-CZ/translation.json
index 1626345044..37be9b24d0 100644
--- a/web/packages/base/locales/cs-CZ/translation.json
+++ b/web/packages/base/locales/cs-CZ/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/da-DK/translation.json b/web/packages/base/locales/da-DK/translation.json
index 044e72ffc7..c1aeeef542 100644
--- a/web/packages/base/locales/da-DK/translation.json
+++ b/web/packages/base/locales/da-DK/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/de-DE/translation.json b/web/packages/base/locales/de-DE/translation.json
index 507f9d17c9..53765bec1a 100644
--- a/web/packages/base/locales/de-DE/translation.json
+++ b/web/packages/base/locales/de-DE/translation.json
@@ -529,7 +529,7 @@
         "gb": "GB",
         "tb": "TB"
     },
-    "STOP_EXPORT": "Stop",
+    "stop": "Stop",
     "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> Dateien synchronisiert",
     "MIGRATING_EXPORT": "Vorbereiten...",
     "RENAMING_COLLECTION_FOLDERS": "Albumordner umbenennen...",
diff --git a/web/packages/base/locales/el-GR/translation.json b/web/packages/base/locales/el-GR/translation.json
index 41de2840cb..05a8c60a4e 100644
--- a/web/packages/base/locales/el-GR/translation.json
+++ b/web/packages/base/locales/el-GR/translation.json
@@ -529,7 +529,7 @@
         "gb": "GB",
         "tb": "TB"
     },
-    "STOP_EXPORT": "Διακοπή",
+    "stop": "Διακοπή",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "Προετοιμασία...",
     "RENAMING_COLLECTION_FOLDERS": "Μετονομασία φακέλων άλμπουμ...",
diff --git a/web/packages/base/locales/en-US/translation.json b/web/packages/base/locales/en-US/translation.json
index 59a3976008..d1a541776d 100644
--- a/web/packages/base/locales/en-US/translation.json
+++ b/web/packages/base/locales/en-US/translation.json
@@ -529,7 +529,7 @@
         "gb": "GB",
         "tb": "TB"
     },
-    "STOP_EXPORT": "Stop",
+    "stop": "Stop",
     "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> items synced",
     "MIGRATING_EXPORT": "Preparing...",
     "RENAMING_COLLECTION_FOLDERS": "Renaming album folders...",
diff --git a/web/packages/base/locales/es-ES/translation.json b/web/packages/base/locales/es-ES/translation.json
index 6a79d0e1e7..46aed4329c 100644
--- a/web/packages/base/locales/es-ES/translation.json
+++ b/web/packages/base/locales/es-ES/translation.json
@@ -529,7 +529,7 @@
         "gb": "GB",
         "tb": "TB"
     },
-    "STOP_EXPORT": "Stop",
+    "stop": "Stop",
     "EXPORT_PROGRESS": "<a>{{progress.success}} / {{progress.total}}</a> archivos exportados",
     "MIGRATING_EXPORT": "Preparando...",
     "RENAMING_COLLECTION_FOLDERS": "Renombrando carpetas del álbum...",
diff --git a/web/packages/base/locales/et-EE/translation.json b/web/packages/base/locales/et-EE/translation.json
index 1626345044..37be9b24d0 100644
--- a/web/packages/base/locales/et-EE/translation.json
+++ b/web/packages/base/locales/et-EE/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/fa-IR/translation.json b/web/packages/base/locales/fa-IR/translation.json
index a3fa53de92..2adfd717bf 100644
--- a/web/packages/base/locales/fa-IR/translation.json
+++ b/web/packages/base/locales/fa-IR/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/fi-FI/translation.json b/web/packages/base/locales/fi-FI/translation.json
index 06f000929a..f3a7b9528c 100644
--- a/web/packages/base/locales/fi-FI/translation.json
+++ b/web/packages/base/locales/fi-FI/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/fr-FR/translation.json b/web/packages/base/locales/fr-FR/translation.json
index db5fa274f6..b637142340 100644
--- a/web/packages/base/locales/fr-FR/translation.json
+++ b/web/packages/base/locales/fr-FR/translation.json
@@ -529,7 +529,7 @@
         "gb": "Go",
         "tb": "To"
     },
-    "STOP_EXPORT": "Stop",
+    "stop": "Stop",
     "EXPORT_PROGRESS": "<a>{{progress.success}} / {{progress.total}}</a> fichiers exportés",
     "MIGRATING_EXPORT": "Préparations...",
     "RENAMING_COLLECTION_FOLDERS": "Renommage des dossiers de l'album en cours...",
diff --git a/web/packages/base/locales/gu-IN/translation.json b/web/packages/base/locales/gu-IN/translation.json
index 1626345044..37be9b24d0 100644
--- a/web/packages/base/locales/gu-IN/translation.json
+++ b/web/packages/base/locales/gu-IN/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/hi-IN/translation.json b/web/packages/base/locales/hi-IN/translation.json
index 1626345044..37be9b24d0 100644
--- a/web/packages/base/locales/hi-IN/translation.json
+++ b/web/packages/base/locales/hi-IN/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/hu-HU/translation.json b/web/packages/base/locales/hu-HU/translation.json
index 1626345044..37be9b24d0 100644
--- a/web/packages/base/locales/hu-HU/translation.json
+++ b/web/packages/base/locales/hu-HU/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/id-ID/translation.json b/web/packages/base/locales/id-ID/translation.json
index 6276b1f4cd..e06a5e9468 100644
--- a/web/packages/base/locales/id-ID/translation.json
+++ b/web/packages/base/locales/id-ID/translation.json
@@ -529,7 +529,7 @@
         "gb": "GB",
         "tb": "TB"
     },
-    "STOP_EXPORT": "Hentikan",
+    "stop": "Hentikan",
     "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> item tersinkron",
     "MIGRATING_EXPORT": "Menyiapkan...",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/is-IS/translation.json b/web/packages/base/locales/is-IS/translation.json
index bd8fddc06b..b0b898e3f0 100644
--- a/web/packages/base/locales/is-IS/translation.json
+++ b/web/packages/base/locales/is-IS/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/it-IT/translation.json b/web/packages/base/locales/it-IT/translation.json
index e50fb3ea1f..f226f8f1d4 100644
--- a/web/packages/base/locales/it-IT/translation.json
+++ b/web/packages/base/locales/it-IT/translation.json
@@ -529,7 +529,7 @@
         "gb": "GB",
         "tb": "TB"
     },
-    "STOP_EXPORT": "Stop",
+    "stop": "Stop",
     "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> elementi sincronizzati",
     "MIGRATING_EXPORT": "Preparazione...",
     "RENAMING_COLLECTION_FOLDERS": "Rinomino cartelle album...",
diff --git a/web/packages/base/locales/ja-JP/translation.json b/web/packages/base/locales/ja-JP/translation.json
index f26e937932..4dd259214e 100644
--- a/web/packages/base/locales/ja-JP/translation.json
+++ b/web/packages/base/locales/ja-JP/translation.json
@@ -529,7 +529,7 @@
         "gb": "GB",
         "tb": "TB"
     },
-    "STOP_EXPORT": "中止",
+    "stop": "中止",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "準備しています…",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/km-KH/translation.json b/web/packages/base/locales/km-KH/translation.json
index 1626345044..37be9b24d0 100644
--- a/web/packages/base/locales/km-KH/translation.json
+++ b/web/packages/base/locales/km-KH/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/ko-KR/translation.json b/web/packages/base/locales/ko-KR/translation.json
index 193d46e3f0..5940407f16 100644
--- a/web/packages/base/locales/ko-KR/translation.json
+++ b/web/packages/base/locales/ko-KR/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/lt-LT/translation.json b/web/packages/base/locales/lt-LT/translation.json
index 7b8d32042b..c4ffa8d712 100644
--- a/web/packages/base/locales/lt-LT/translation.json
+++ b/web/packages/base/locales/lt-LT/translation.json
@@ -529,7 +529,7 @@
         "gb": "GB",
         "tb": "TB"
     },
-    "STOP_EXPORT": "Stabdyti",
+    "stop": "Stabdyti",
     "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> sinchronizuoti elementai",
     "MIGRATING_EXPORT": "Ruošiama...",
     "RENAMING_COLLECTION_FOLDERS": "Pervadinami albumų aplankai...",
diff --git a/web/packages/base/locales/ml-IN/translation.json b/web/packages/base/locales/ml-IN/translation.json
index 1626345044..37be9b24d0 100644
--- a/web/packages/base/locales/ml-IN/translation.json
+++ b/web/packages/base/locales/ml-IN/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/nl-NL/translation.json b/web/packages/base/locales/nl-NL/translation.json
index 229f7d0a54..4ab86b2cbb 100644
--- a/web/packages/base/locales/nl-NL/translation.json
+++ b/web/packages/base/locales/nl-NL/translation.json
@@ -529,7 +529,7 @@
         "gb": "GB",
         "tb": "TB"
     },
-    "STOP_EXPORT": "Stoppen",
+    "stop": "Stoppen",
     "EXPORT_PROGRESS": "<a>{{progress.success}} / {{progress.total}}</a> bestanden geëxporteerd",
     "MIGRATING_EXPORT": "Voorbereiden...",
     "RENAMING_COLLECTION_FOLDERS": "Albumnamen hernoemen...",
diff --git a/web/packages/base/locales/pl-PL/translation.json b/web/packages/base/locales/pl-PL/translation.json
index b7cfaa7e98..5f18a74029 100644
--- a/web/packages/base/locales/pl-PL/translation.json
+++ b/web/packages/base/locales/pl-PL/translation.json
@@ -529,7 +529,7 @@
         "gb": "GB",
         "tb": "TB"
     },
-    "STOP_EXPORT": "Zatrzymaj",
+    "stop": "Zatrzymaj",
     "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> elementy zsynchronizowane",
     "MIGRATING_EXPORT": "Przygotowywanie...",
     "RENAMING_COLLECTION_FOLDERS": "Zmienianie nazwy folderów albumów...",
diff --git a/web/packages/base/locales/pt-BR/translation.json b/web/packages/base/locales/pt-BR/translation.json
index be6729a5c2..da90f92bb8 100644
--- a/web/packages/base/locales/pt-BR/translation.json
+++ b/web/packages/base/locales/pt-BR/translation.json
@@ -529,7 +529,7 @@
         "gb": "GB",
         "tb": "TB"
     },
-    "STOP_EXPORT": "Parar",
+    "stop": "Parar",
     "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> itens sincronizados",
     "MIGRATING_EXPORT": "Preparando...",
     "RENAMING_COLLECTION_FOLDERS": "Renomeando pastas do álbum...",
diff --git a/web/packages/base/locales/pt-PT/translation.json b/web/packages/base/locales/pt-PT/translation.json
index 3acdf5b6c2..d2ae7936ab 100644
--- a/web/packages/base/locales/pt-PT/translation.json
+++ b/web/packages/base/locales/pt-PT/translation.json
@@ -529,7 +529,7 @@
         "gb": "GB",
         "tb": "TB"
     },
-    "STOP_EXPORT": "Parar",
+    "stop": "Parar",
     "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> itens sincronizados",
     "MIGRATING_EXPORT": "Preparar...",
     "RENAMING_COLLECTION_FOLDERS": "Renomear pastas de álbuns...",
diff --git a/web/packages/base/locales/ro-RO/translation.json b/web/packages/base/locales/ro-RO/translation.json
index 1626345044..37be9b24d0 100644
--- a/web/packages/base/locales/ro-RO/translation.json
+++ b/web/packages/base/locales/ro-RO/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/ru-RU/translation.json b/web/packages/base/locales/ru-RU/translation.json
index bd0a4650ff..123df924f4 100644
--- a/web/packages/base/locales/ru-RU/translation.json
+++ b/web/packages/base/locales/ru-RU/translation.json
@@ -529,7 +529,7 @@
         "gb": "Гб",
         "tb": "Терабайт"
     },
-    "STOP_EXPORT": "Остановка",
+    "stop": "Остановка",
     "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> синхронизированные элементы",
     "MIGRATING_EXPORT": "Подготовка...",
     "RENAMING_COLLECTION_FOLDERS": "Переименование папок альбомов...",
diff --git a/web/packages/base/locales/sl-SI/translation.json b/web/packages/base/locales/sl-SI/translation.json
index 1626345044..37be9b24d0 100644
--- a/web/packages/base/locales/sl-SI/translation.json
+++ b/web/packages/base/locales/sl-SI/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/sv-SE/translation.json b/web/packages/base/locales/sv-SE/translation.json
index ec2edf7532..f628c0016f 100644
--- a/web/packages/base/locales/sv-SE/translation.json
+++ b/web/packages/base/locales/sv-SE/translation.json
@@ -529,7 +529,7 @@
         "gb": "GB",
         "tb": "TB"
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/ta-IN/translation.json b/web/packages/base/locales/ta-IN/translation.json
index 1626345044..37be9b24d0 100644
--- a/web/packages/base/locales/ta-IN/translation.json
+++ b/web/packages/base/locales/ta-IN/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/te-IN/translation.json b/web/packages/base/locales/te-IN/translation.json
index 1626345044..37be9b24d0 100644
--- a/web/packages/base/locales/te-IN/translation.json
+++ b/web/packages/base/locales/te-IN/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/th-TH/translation.json b/web/packages/base/locales/th-TH/translation.json
index 1626345044..37be9b24d0 100644
--- a/web/packages/base/locales/th-TH/translation.json
+++ b/web/packages/base/locales/th-TH/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/ti-ER/translation.json b/web/packages/base/locales/ti-ER/translation.json
index 1626345044..37be9b24d0 100644
--- a/web/packages/base/locales/ti-ER/translation.json
+++ b/web/packages/base/locales/ti-ER/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/tr-TR/translation.json b/web/packages/base/locales/tr-TR/translation.json
index c87436709d..7eede84539 100644
--- a/web/packages/base/locales/tr-TR/translation.json
+++ b/web/packages/base/locales/tr-TR/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",
diff --git a/web/packages/base/locales/uk-UA/translation.json b/web/packages/base/locales/uk-UA/translation.json
index 4210b0f828..9c35d5e618 100644
--- a/web/packages/base/locales/uk-UA/translation.json
+++ b/web/packages/base/locales/uk-UA/translation.json
@@ -529,7 +529,7 @@
         "gb": "ГБ",
         "tb": "ТБ"
     },
-    "STOP_EXPORT": "Зупинити",
+    "stop": "Зупинити",
     "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> елементів синхронізовано",
     "MIGRATING_EXPORT": "Підготування...",
     "RENAMING_COLLECTION_FOLDERS": "Перейменування тек альбомів...",
diff --git a/web/packages/base/locales/vi-VN/translation.json b/web/packages/base/locales/vi-VN/translation.json
index 005422f19a..37d88ac96f 100644
--- a/web/packages/base/locales/vi-VN/translation.json
+++ b/web/packages/base/locales/vi-VN/translation.json
@@ -529,7 +529,7 @@
         "gb": "GB",
         "tb": "TB"
     },
-    "STOP_EXPORT": "Dừng",
+    "stop": "Dừng",
     "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> mục đã đồng bộ",
     "MIGRATING_EXPORT": "Đang chuẩn bị...",
     "RENAMING_COLLECTION_FOLDERS": "Đang đổi tên thư mục album...",
diff --git a/web/packages/base/locales/zh-CN/translation.json b/web/packages/base/locales/zh-CN/translation.json
index 90b62e4463..2c2fa80a5b 100644
--- a/web/packages/base/locales/zh-CN/translation.json
+++ b/web/packages/base/locales/zh-CN/translation.json
@@ -529,7 +529,7 @@
         "gb": "GB",
         "tb": "TB"
     },
-    "STOP_EXPORT": "停止",
+    "stop": "停止",
     "EXPORT_PROGRESS": "<a>{{progress.success}} / {{progress.total}}</a> 个文件已导出",
     "MIGRATING_EXPORT": "准备中...",
     "RENAMING_COLLECTION_FOLDERS": "正在重命名相册文件夹...",
diff --git a/web/packages/base/locales/zh-HK/translation.json b/web/packages/base/locales/zh-HK/translation.json
index 1626345044..37be9b24d0 100644
--- a/web/packages/base/locales/zh-HK/translation.json
+++ b/web/packages/base/locales/zh-HK/translation.json
@@ -529,7 +529,7 @@
         "gb": "",
         "tb": ""
     },
-    "STOP_EXPORT": "",
+    "stop": "",
     "EXPORT_PROGRESS": "",
     "MIGRATING_EXPORT": "",
     "RENAMING_COLLECTION_FOLDERS": "",

From 7f69fa5d65f5552a8292fa362a16b6e4495b4dd4 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 16:36:50 +0530
Subject: [PATCH 428/796] Reorder

---
 web/packages/base/locales/en-US/translation.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/packages/base/locales/en-US/translation.json b/web/packages/base/locales/en-US/translation.json
index d1a541776d..27da8b3fe6 100644
--- a/web/packages/base/locales/en-US/translation.json
+++ b/web/packages/base/locales/en-US/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Stop",
-    "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> items synced",
+    "CONTINUOUS_EXPORT": "Sync continuously",
+    "EXPORT_STARTING": "Export starting...",
     "MIGRATING_EXPORT": "Preparing...",
     "RENAMING_COLLECTION_FOLDERS": "Renaming album folders...",
     "TRASHING_DELETED_FILES": "Trashing deleted files...",
     "TRASHING_DELETED_COLLECTIONS": "Trashing deleted albums...",
-    "CONTINUOUS_EXPORT": "Sync continuously",
+    "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> items synced",
     "PENDING_ITEMS": "Pending items",
-    "EXPORT_STARTING": "Export starting...",
     "delete_account_reason_label": "What is the main reason you are deleting your account?",
     "delete_account_reason_placeholder": "Select a reason",
     "delete_reason": {

From b150bbe15ec3a60f45e1b20bece9bc614fa75856 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 16:40:33 +0530
Subject: [PATCH 429/796] Rename

---
 web/apps/photos/src/components/Export.tsx        |  2 +-
 .../photos/src/components/ExportFinished.tsx     |  2 +-
 .../photos/src/components/ExportInProgress.tsx   | 12 ++++++------
 .../photos/src/components/ExportPendingList.tsx  |  2 +-
 web/packages/base/locales/ar-SA/translation.json | 16 ++++++++--------
 web/packages/base/locales/be-BY/translation.json | 16 ++++++++--------
 web/packages/base/locales/bg-BG/translation.json | 16 ++++++++--------
 web/packages/base/locales/ca-ES/translation.json | 16 ++++++++--------
 web/packages/base/locales/cs-CZ/translation.json | 16 ++++++++--------
 web/packages/base/locales/da-DK/translation.json | 16 ++++++++--------
 web/packages/base/locales/de-DE/translation.json | 16 ++++++++--------
 web/packages/base/locales/el-GR/translation.json | 16 ++++++++--------
 web/packages/base/locales/en-US/translation.json | 16 ++++++++--------
 web/packages/base/locales/es-ES/translation.json | 16 ++++++++--------
 web/packages/base/locales/et-EE/translation.json | 16 ++++++++--------
 web/packages/base/locales/fa-IR/translation.json | 16 ++++++++--------
 web/packages/base/locales/fi-FI/translation.json | 16 ++++++++--------
 web/packages/base/locales/fr-FR/translation.json | 16 ++++++++--------
 web/packages/base/locales/gu-IN/translation.json | 16 ++++++++--------
 web/packages/base/locales/hi-IN/translation.json | 16 ++++++++--------
 web/packages/base/locales/hu-HU/translation.json | 16 ++++++++--------
 web/packages/base/locales/id-ID/translation.json | 16 ++++++++--------
 web/packages/base/locales/is-IS/translation.json | 16 ++++++++--------
 web/packages/base/locales/it-IT/translation.json | 16 ++++++++--------
 web/packages/base/locales/ja-JP/translation.json | 16 ++++++++--------
 web/packages/base/locales/km-KH/translation.json | 16 ++++++++--------
 web/packages/base/locales/ko-KR/translation.json | 16 ++++++++--------
 web/packages/base/locales/lt-LT/translation.json | 16 ++++++++--------
 web/packages/base/locales/ml-IN/translation.json | 16 ++++++++--------
 web/packages/base/locales/nl-NL/translation.json | 16 ++++++++--------
 web/packages/base/locales/pl-PL/translation.json | 16 ++++++++--------
 web/packages/base/locales/pt-BR/translation.json | 16 ++++++++--------
 web/packages/base/locales/pt-PT/translation.json | 16 ++++++++--------
 web/packages/base/locales/ro-RO/translation.json | 16 ++++++++--------
 web/packages/base/locales/ru-RU/translation.json | 16 ++++++++--------
 web/packages/base/locales/sl-SI/translation.json | 16 ++++++++--------
 web/packages/base/locales/sv-SE/translation.json | 16 ++++++++--------
 web/packages/base/locales/ta-IN/translation.json | 16 ++++++++--------
 web/packages/base/locales/te-IN/translation.json | 16 ++++++++--------
 web/packages/base/locales/th-TH/translation.json | 16 ++++++++--------
 web/packages/base/locales/ti-ER/translation.json | 16 ++++++++--------
 web/packages/base/locales/tr-TR/translation.json | 16 ++++++++--------
 web/packages/base/locales/uk-UA/translation.json | 16 ++++++++--------
 web/packages/base/locales/vi-VN/translation.json | 16 ++++++++--------
 web/packages/base/locales/zh-CN/translation.json | 16 ++++++++--------
 web/packages/base/locales/zh-HK/translation.json | 16 ++++++++--------
 46 files changed, 345 insertions(+), 345 deletions(-)

diff --git a/web/apps/photos/src/components/Export.tsx b/web/apps/photos/src/components/Export.tsx
index b245a33d1e..1fe4708d79 100644
--- a/web/apps/photos/src/components/Export.tsx
+++ b/web/apps/photos/src/components/Export.tsx
@@ -270,7 +270,7 @@ function ContinuousExport({ continuousExport, toggleContinuousExport }) {
     return (
         <SpaceBetweenFlex minHeight={"48px"}>
             <Typography sx={{ color: "text.muted" }}>
-                {t("CONTINUOUS_EXPORT")}
+                {t("sync_continuously")}
             </Typography>
             <Box>
                 <EnteSwitch
diff --git a/web/apps/photos/src/components/ExportFinished.tsx b/web/apps/photos/src/components/ExportFinished.tsx
index eab2d1b7ac..ae43775c54 100644
--- a/web/apps/photos/src/components/ExportFinished.tsx
+++ b/web/apps/photos/src/components/ExportFinished.tsx
@@ -37,7 +37,7 @@ export default function ExportFinished(props: Props) {
                 <Stack sx={{ pr: 2 }}>
                     <SpaceBetweenFlex minHeight={"48px"}>
                         <Typography sx={{ color: "text.muted" }}>
-                            {t("PENDING_ITEMS")}
+                            {t("pending_items")}
                         </Typography>
                         {props.pendingExports.length ? (
                             <LinkButton onClick={openPendingFileList}>
diff --git a/web/apps/photos/src/components/ExportInProgress.tsx b/web/apps/photos/src/components/ExportInProgress.tsx
index 3aaaa0a5d4..ffb74ddb07 100644
--- a/web/apps/photos/src/components/ExportInProgress.tsx
+++ b/web/apps/photos/src/components/ExportInProgress.tsx
@@ -36,25 +36,25 @@ export default function ExportInProgress(props: Props) {
                 <VerticallyCentered>
                     <Typography sx={{ mb: 1.5 }}>
                         {props.exportStage === ExportStage.STARTING ? (
-                            t("EXPORT_STARTING")
+                            t("export_starting")
                         ) : props.exportStage === ExportStage.MIGRATION ? (
-                            t("MIGRATING_EXPORT")
+                            t("preparing")
                         ) : props.exportStage ===
                           ExportStage.RENAMING_COLLECTION_FOLDERS ? (
-                            t("RENAMING_COLLECTION_FOLDERS")
+                            t("renaming_album_folders")
                         ) : props.exportStage ===
                           ExportStage.TRASHING_DELETED_FILES ? (
-                            t("TRASHING_DELETED_FILES")
+                            t("trashing_deleted_files")
                         ) : props.exportStage ===
                           ExportStage.TRASHING_DELETED_COLLECTIONS ? (
-                            t("TRASHING_DELETED_COLLECTIONS")
+                            t("trashing_deleted_albums")
                         ) : (
                             <Typography
                                 component="span"
                                 sx={{ color: "text.muted" }}
                             >
                                 <Trans
-                                    i18nKey={"EXPORT_PROGRESS"}
+                                    i18nKey={"export_progress"}
                                     components={{
                                         a: (
                                             <Typography
diff --git a/web/apps/photos/src/components/ExportPendingList.tsx b/web/apps/photos/src/components/ExportPendingList.tsx
index 4433330665..da428c8540 100644
--- a/web/apps/photos/src/components/ExportPendingList.tsx
+++ b/web/apps/photos/src/components/ExportPendingList.tsx
@@ -59,7 +59,7 @@ const ExportPendingList = (props: Iprops) => {
             open={props.isOpen}
             onClose={props.onClose}
             paperMaxWidth="444px"
-            title={t("PENDING_ITEMS")}
+            title={t("pending_items")}
         >
             <ItemList
                 maxHeight={240}
diff --git a/web/packages/base/locales/ar-SA/translation.json b/web/packages/base/locales/ar-SA/translation.json
index fb3d5699b6..f632070b4e 100644
--- a/web/packages/base/locales/ar-SA/translation.json
+++ b/web/packages/base/locales/ar-SA/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/be-BY/translation.json b/web/packages/base/locales/be-BY/translation.json
index 01ae37082c..155a38693a 100644
--- a/web/packages/base/locales/be-BY/translation.json
+++ b/web/packages/base/locales/be-BY/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/bg-BG/translation.json b/web/packages/base/locales/bg-BG/translation.json
index d627abb740..27c44eda37 100644
--- a/web/packages/base/locales/bg-BG/translation.json
+++ b/web/packages/base/locales/bg-BG/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/ca-ES/translation.json b/web/packages/base/locales/ca-ES/translation.json
index 37be9b24d0..1f2866d202 100644
--- a/web/packages/base/locales/ca-ES/translation.json
+++ b/web/packages/base/locales/ca-ES/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/cs-CZ/translation.json b/web/packages/base/locales/cs-CZ/translation.json
index 37be9b24d0..1f2866d202 100644
--- a/web/packages/base/locales/cs-CZ/translation.json
+++ b/web/packages/base/locales/cs-CZ/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/da-DK/translation.json b/web/packages/base/locales/da-DK/translation.json
index c1aeeef542..c331979c54 100644
--- a/web/packages/base/locales/da-DK/translation.json
+++ b/web/packages/base/locales/da-DK/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/de-DE/translation.json b/web/packages/base/locales/de-DE/translation.json
index 53765bec1a..4fdc28fe81 100644
--- a/web/packages/base/locales/de-DE/translation.json
+++ b/web/packages/base/locales/de-DE/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Stop",
-    "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> Dateien synchronisiert",
-    "MIGRATING_EXPORT": "Vorbereiten...",
-    "RENAMING_COLLECTION_FOLDERS": "Albumordner umbenennen...",
-    "TRASHING_DELETED_FILES": "Verschiebe gelöschte Dateien in den Trash-Ordner...",
-    "TRASHING_DELETED_COLLECTIONS": "Verschiebe gelöschte Alben in den Trash-Ordner...",
-    "CONTINUOUS_EXPORT": "Stets aktuell halten",
-    "PENDING_ITEMS": "Ausstehende Dateien",
-    "EXPORT_STARTING": "Starte Export...",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> Dateien synchronisiert",
+    "preparing": "Vorbereiten...",
+    "renaming_album_folders": "Albumordner umbenennen...",
+    "trashing_deleted_files": "Verschiebe gelöschte Dateien in den Trash-Ordner...",
+    "trashing_deleted_albums": "Verschiebe gelöschte Alben in den Trash-Ordner...",
+    "sync_continuously": "Stets aktuell halten",
+    "pending_items": "Ausstehende Dateien",
+    "export_starting": "Starte Export...",
     "delete_account_reason_label": "Was ist der Hauptgrund für die Löschung deines Kontos?",
     "delete_account_reason_placeholder": "Wähle einen Grund aus",
     "delete_reason": {
diff --git a/web/packages/base/locales/el-GR/translation.json b/web/packages/base/locales/el-GR/translation.json
index 05a8c60a4e..4ed486edb2 100644
--- a/web/packages/base/locales/el-GR/translation.json
+++ b/web/packages/base/locales/el-GR/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Διακοπή",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "Προετοιμασία...",
-    "RENAMING_COLLECTION_FOLDERS": "Μετονομασία φακέλων άλμπουμ...",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "Συνεχής συγχρονισμός",
-    "PENDING_ITEMS": "Εκκρεμή αντικείμενα",
-    "EXPORT_STARTING": "Έναρξη εξαγωγής...",
+    "export_progress": "",
+    "preparing": "Προετοιμασία...",
+    "renaming_album_folders": "Μετονομασία φακέλων άλμπουμ...",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "Συνεχής συγχρονισμός",
+    "pending_items": "Εκκρεμή αντικείμενα",
+    "export_starting": "Έναρξη εξαγωγής...",
     "delete_account_reason_label": "Ποιος είναι ο κύριος λόγος που διαγράφετε το λογαριασμό σας;",
     "delete_account_reason_placeholder": "Επιλέξτε ένα λόγο",
     "delete_reason": {
diff --git a/web/packages/base/locales/en-US/translation.json b/web/packages/base/locales/en-US/translation.json
index 27da8b3fe6..0f54e19c3a 100644
--- a/web/packages/base/locales/en-US/translation.json
+++ b/web/packages/base/locales/en-US/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Stop",
-    "CONTINUOUS_EXPORT": "Sync continuously",
-    "EXPORT_STARTING": "Export starting...",
-    "MIGRATING_EXPORT": "Preparing...",
-    "RENAMING_COLLECTION_FOLDERS": "Renaming album folders...",
-    "TRASHING_DELETED_FILES": "Trashing deleted files...",
-    "TRASHING_DELETED_COLLECTIONS": "Trashing deleted albums...",
-    "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> items synced",
-    "PENDING_ITEMS": "Pending items",
+    "sync_continuously": "Sync continuously",
+    "export_starting": "Export starting...",
+    "preparing": "Preparing...",
+    "renaming_album_folders": "Renaming album folders...",
+    "trashing_deleted_files": "Trashing deleted files...",
+    "trashing_deleted_albums": "Trashing deleted albums...",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> items synced",
+    "pending_items": "Pending items",
     "delete_account_reason_label": "What is the main reason you are deleting your account?",
     "delete_account_reason_placeholder": "Select a reason",
     "delete_reason": {
diff --git a/web/packages/base/locales/es-ES/translation.json b/web/packages/base/locales/es-ES/translation.json
index 46aed4329c..4ae5e668cf 100644
--- a/web/packages/base/locales/es-ES/translation.json
+++ b/web/packages/base/locales/es-ES/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Stop",
-    "EXPORT_PROGRESS": "<a>{{progress.success}} / {{progress.total}}</a> archivos exportados",
-    "MIGRATING_EXPORT": "Preparando...",
-    "RENAMING_COLLECTION_FOLDERS": "Renombrando carpetas del álbum...",
-    "TRASHING_DELETED_FILES": "Eliminando ficheros borrados...",
-    "TRASHING_DELETED_COLLECTIONS": "Eliminando álbumes borrados...",
-    "CONTINUOUS_EXPORT": "Sincronizar continuamente",
-    "PENDING_ITEMS": "Elementos pendientes",
-    "EXPORT_STARTING": "Exportar iniciando...",
+    "export_progress": "<a>{{progress.success}} / {{progress.total}}</a> archivos exportados",
+    "preparing": "Preparando...",
+    "renaming_album_folders": "Renombrando carpetas del álbum...",
+    "trashing_deleted_files": "Eliminando ficheros borrados...",
+    "trashing_deleted_albums": "Eliminando álbumes borrados...",
+    "sync_continuously": "Sincronizar continuamente",
+    "pending_items": "Elementos pendientes",
+    "export_starting": "Exportar iniciando...",
     "delete_account_reason_label": "¿Cuál es la razón principal por la que eliminas tu cuenta?",
     "delete_account_reason_placeholder": "Selecciona una razón",
     "delete_reason": {
diff --git a/web/packages/base/locales/et-EE/translation.json b/web/packages/base/locales/et-EE/translation.json
index 37be9b24d0..1f2866d202 100644
--- a/web/packages/base/locales/et-EE/translation.json
+++ b/web/packages/base/locales/et-EE/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/fa-IR/translation.json b/web/packages/base/locales/fa-IR/translation.json
index 2adfd717bf..ec2547753b 100644
--- a/web/packages/base/locales/fa-IR/translation.json
+++ b/web/packages/base/locales/fa-IR/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/fi-FI/translation.json b/web/packages/base/locales/fi-FI/translation.json
index f3a7b9528c..1bbb716978 100644
--- a/web/packages/base/locales/fi-FI/translation.json
+++ b/web/packages/base/locales/fi-FI/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/fr-FR/translation.json b/web/packages/base/locales/fr-FR/translation.json
index b637142340..8a3416426a 100644
--- a/web/packages/base/locales/fr-FR/translation.json
+++ b/web/packages/base/locales/fr-FR/translation.json
@@ -530,14 +530,14 @@
         "tb": "To"
     },
     "stop": "Stop",
-    "EXPORT_PROGRESS": "<a>{{progress.success}} / {{progress.total}}</a> fichiers exportés",
-    "MIGRATING_EXPORT": "Préparations...",
-    "RENAMING_COLLECTION_FOLDERS": "Renommage des dossiers de l'album en cours...",
-    "TRASHING_DELETED_FILES": "Mise à la corbeille des fichiers supprimés...",
-    "TRASHING_DELETED_COLLECTIONS": "Mise à la corbeille des albums supprimés...",
-    "CONTINUOUS_EXPORT": "Synchronisation en continu",
-    "PENDING_ITEMS": "Objets en attente",
-    "EXPORT_STARTING": "Démarrage de l'export...",
+    "export_progress": "<a>{{progress.success}} / {{progress.total}}</a> fichiers exportés",
+    "preparing": "Préparations...",
+    "renaming_album_folders": "Renommage des dossiers de l'album en cours...",
+    "trashing_deleted_files": "Mise à la corbeille des fichiers supprimés...",
+    "trashing_deleted_albums": "Mise à la corbeille des albums supprimés...",
+    "sync_continuously": "Synchronisation en continu",
+    "pending_items": "Objets en attente",
+    "export_starting": "Démarrage de l'export...",
     "delete_account_reason_label": "Quelle est la raison principale de la suppression de votre compte ?",
     "delete_account_reason_placeholder": "Choisir une raison",
     "delete_reason": {
diff --git a/web/packages/base/locales/gu-IN/translation.json b/web/packages/base/locales/gu-IN/translation.json
index 37be9b24d0..1f2866d202 100644
--- a/web/packages/base/locales/gu-IN/translation.json
+++ b/web/packages/base/locales/gu-IN/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/hi-IN/translation.json b/web/packages/base/locales/hi-IN/translation.json
index 37be9b24d0..1f2866d202 100644
--- a/web/packages/base/locales/hi-IN/translation.json
+++ b/web/packages/base/locales/hi-IN/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/hu-HU/translation.json b/web/packages/base/locales/hu-HU/translation.json
index 37be9b24d0..1f2866d202 100644
--- a/web/packages/base/locales/hu-HU/translation.json
+++ b/web/packages/base/locales/hu-HU/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/id-ID/translation.json b/web/packages/base/locales/id-ID/translation.json
index e06a5e9468..97c199a81e 100644
--- a/web/packages/base/locales/id-ID/translation.json
+++ b/web/packages/base/locales/id-ID/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Hentikan",
-    "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> item tersinkron",
-    "MIGRATING_EXPORT": "Menyiapkan...",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> item tersinkron",
+    "preparing": "Menyiapkan...",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/is-IS/translation.json b/web/packages/base/locales/is-IS/translation.json
index b0b898e3f0..a172e8a01a 100644
--- a/web/packages/base/locales/is-IS/translation.json
+++ b/web/packages/base/locales/is-IS/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/it-IT/translation.json b/web/packages/base/locales/it-IT/translation.json
index f226f8f1d4..8c741ec09a 100644
--- a/web/packages/base/locales/it-IT/translation.json
+++ b/web/packages/base/locales/it-IT/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Stop",
-    "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> elementi sincronizzati",
-    "MIGRATING_EXPORT": "Preparazione...",
-    "RENAMING_COLLECTION_FOLDERS": "Rinomino cartelle album...",
-    "TRASHING_DELETED_FILES": "Sposto i file nel cestino...",
-    "TRASHING_DELETED_COLLECTIONS": "Sposto gli album nel cestino...",
-    "CONTINUOUS_EXPORT": "Sincronizza continuamente",
-    "PENDING_ITEMS": "Elementi in sospeso",
-    "EXPORT_STARTING": "Esportazione iniziata...",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> elementi sincronizzati",
+    "preparing": "Preparazione...",
+    "renaming_album_folders": "Rinomino cartelle album...",
+    "trashing_deleted_files": "Sposto i file nel cestino...",
+    "trashing_deleted_albums": "Sposto gli album nel cestino...",
+    "sync_continuously": "Sincronizza continuamente",
+    "pending_items": "Elementi in sospeso",
+    "export_starting": "Esportazione iniziata...",
     "delete_account_reason_label": "Qual è il motivo per cui stai cancellando il tuo account?",
     "delete_account_reason_placeholder": "Seleziona un motivo",
     "delete_reason": {
diff --git a/web/packages/base/locales/ja-JP/translation.json b/web/packages/base/locales/ja-JP/translation.json
index 4dd259214e..49f7d3596c 100644
--- a/web/packages/base/locales/ja-JP/translation.json
+++ b/web/packages/base/locales/ja-JP/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "中止",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "準備しています…",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "削除ファイルをごみ箱に移動中…",
-    "TRASHING_DELETED_COLLECTIONS": "削除アルバムをごみ箱に移動中…",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "保留中アイテム",
-    "EXPORT_STARTING": "エクスポートを開始中…",
+    "export_progress": "",
+    "preparing": "準備しています…",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "削除ファイルをごみ箱に移動中…",
+    "trashing_deleted_albums": "削除アルバムをごみ箱に移動中…",
+    "sync_continuously": "",
+    "pending_items": "保留中アイテム",
+    "export_starting": "エクスポートを開始中…",
     "delete_account_reason_label": "アカウントを削除する主な理由は何ですか？",
     "delete_account_reason_placeholder": "理由を選択",
     "delete_reason": {
diff --git a/web/packages/base/locales/km-KH/translation.json b/web/packages/base/locales/km-KH/translation.json
index 37be9b24d0..1f2866d202 100644
--- a/web/packages/base/locales/km-KH/translation.json
+++ b/web/packages/base/locales/km-KH/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/ko-KR/translation.json b/web/packages/base/locales/ko-KR/translation.json
index 5940407f16..65cd73a8b3 100644
--- a/web/packages/base/locales/ko-KR/translation.json
+++ b/web/packages/base/locales/ko-KR/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/lt-LT/translation.json b/web/packages/base/locales/lt-LT/translation.json
index c4ffa8d712..f9a7baad7a 100644
--- a/web/packages/base/locales/lt-LT/translation.json
+++ b/web/packages/base/locales/lt-LT/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Stabdyti",
-    "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> sinchronizuoti elementai",
-    "MIGRATING_EXPORT": "Ruošiama...",
-    "RENAMING_COLLECTION_FOLDERS": "Pervadinami albumų aplankai...",
-    "TRASHING_DELETED_FILES": "Ištuštiniami ištrinti failai...",
-    "TRASHING_DELETED_COLLECTIONS": "Ištuštiniami ištrinti albumai...",
-    "CONTINUOUS_EXPORT": "Sinchronizuoti nuolat",
-    "PENDING_ITEMS": "Laukiami elementai",
-    "EXPORT_STARTING": "Pradedamas eksportavimas...",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> sinchronizuoti elementai",
+    "preparing": "Ruošiama...",
+    "renaming_album_folders": "Pervadinami albumų aplankai...",
+    "trashing_deleted_files": "Ištuštiniami ištrinti failai...",
+    "trashing_deleted_albums": "Ištuštiniami ištrinti albumai...",
+    "sync_continuously": "Sinchronizuoti nuolat",
+    "pending_items": "Laukiami elementai",
+    "export_starting": "Pradedamas eksportavimas...",
     "delete_account_reason_label": "Kokia yra pagrindinė priežastis, dėl kurios ištrinate savo paskyrą?",
     "delete_account_reason_placeholder": "Pasirinkite priežastį",
     "delete_reason": {
diff --git a/web/packages/base/locales/ml-IN/translation.json b/web/packages/base/locales/ml-IN/translation.json
index 37be9b24d0..1f2866d202 100644
--- a/web/packages/base/locales/ml-IN/translation.json
+++ b/web/packages/base/locales/ml-IN/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/nl-NL/translation.json b/web/packages/base/locales/nl-NL/translation.json
index 4ab86b2cbb..d5fe33b236 100644
--- a/web/packages/base/locales/nl-NL/translation.json
+++ b/web/packages/base/locales/nl-NL/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Stoppen",
-    "EXPORT_PROGRESS": "<a>{{progress.success}} / {{progress.total}}</a> bestanden geëxporteerd",
-    "MIGRATING_EXPORT": "Voorbereiden...",
-    "RENAMING_COLLECTION_FOLDERS": "Albumnamen hernoemen...",
-    "TRASHING_DELETED_FILES": "Verwijderde bestanden naar prullenbak...",
-    "TRASHING_DELETED_COLLECTIONS": "Verwijderde albums naar prullenbak...",
-    "CONTINUOUS_EXPORT": "Continue synchroniseren",
-    "PENDING_ITEMS": "Bestanden in behandeling",
-    "EXPORT_STARTING": "Exporteren begonnen...",
+    "export_progress": "<a>{{progress.success}} / {{progress.total}}</a> bestanden geëxporteerd",
+    "preparing": "Voorbereiden...",
+    "renaming_album_folders": "Albumnamen hernoemen...",
+    "trashing_deleted_files": "Verwijderde bestanden naar prullenbak...",
+    "trashing_deleted_albums": "Verwijderde albums naar prullenbak...",
+    "sync_continuously": "Continue synchroniseren",
+    "pending_items": "Bestanden in behandeling",
+    "export_starting": "Exporteren begonnen...",
     "delete_account_reason_label": "Wat is de belangrijkste reden waarom je jouw account verwijdert?",
     "delete_account_reason_placeholder": "Kies een reden",
     "delete_reason": {
diff --git a/web/packages/base/locales/pl-PL/translation.json b/web/packages/base/locales/pl-PL/translation.json
index 5f18a74029..614c8f508f 100644
--- a/web/packages/base/locales/pl-PL/translation.json
+++ b/web/packages/base/locales/pl-PL/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Zatrzymaj",
-    "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> elementy zsynchronizowane",
-    "MIGRATING_EXPORT": "Przygotowywanie...",
-    "RENAMING_COLLECTION_FOLDERS": "Zmienianie nazwy folderów albumów...",
-    "TRASHING_DELETED_FILES": "Przenoszenie usuniętych plików do kosza...",
-    "TRASHING_DELETED_COLLECTIONS": "Przenoszenie usuniętych albumów do kosza...",
-    "CONTINUOUS_EXPORT": "Synchronizuj ciągle",
-    "PENDING_ITEMS": "Oczekujące elementy",
-    "EXPORT_STARTING": "Rozpoczynanie eksportu...",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> elementy zsynchronizowane",
+    "preparing": "Przygotowywanie...",
+    "renaming_album_folders": "Zmienianie nazwy folderów albumów...",
+    "trashing_deleted_files": "Przenoszenie usuniętych plików do kosza...",
+    "trashing_deleted_albums": "Przenoszenie usuniętych albumów do kosza...",
+    "sync_continuously": "Synchronizuj ciągle",
+    "pending_items": "Oczekujące elementy",
+    "export_starting": "Rozpoczynanie eksportu...",
     "delete_account_reason_label": "Jaka jest główna przyczyna usunięcia Twojego konta?",
     "delete_account_reason_placeholder": "Wybierz powód",
     "delete_reason": {
diff --git a/web/packages/base/locales/pt-BR/translation.json b/web/packages/base/locales/pt-BR/translation.json
index da90f92bb8..efb2c11966 100644
--- a/web/packages/base/locales/pt-BR/translation.json
+++ b/web/packages/base/locales/pt-BR/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Parar",
-    "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> itens sincronizados",
-    "MIGRATING_EXPORT": "Preparando...",
-    "RENAMING_COLLECTION_FOLDERS": "Renomeando pastas do álbum...",
-    "TRASHING_DELETED_FILES": "Descartando arquivos excluídos...",
-    "TRASHING_DELETED_COLLECTIONS": "Descartando álbuns excluídos...",
-    "CONTINUOUS_EXPORT": "Sincronizar continuamente",
-    "PENDING_ITEMS": "Itens pendentes",
-    "EXPORT_STARTING": "Iniciando a exportação...",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> itens sincronizados",
+    "preparing": "Preparando...",
+    "renaming_album_folders": "Renomeando pastas do álbum...",
+    "trashing_deleted_files": "Descartando arquivos excluídos...",
+    "trashing_deleted_albums": "Descartando álbuns excluídos...",
+    "sync_continuously": "Sincronizar continuamente",
+    "pending_items": "Itens pendentes",
+    "export_starting": "Iniciando a exportação...",
     "delete_account_reason_label": "Qual é o principal motivo para você excluir sua conta?",
     "delete_account_reason_placeholder": "Selecione um motivo",
     "delete_reason": {
diff --git a/web/packages/base/locales/pt-PT/translation.json b/web/packages/base/locales/pt-PT/translation.json
index d2ae7936ab..7642256b70 100644
--- a/web/packages/base/locales/pt-PT/translation.json
+++ b/web/packages/base/locales/pt-PT/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Parar",
-    "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> itens sincronizados",
-    "MIGRATING_EXPORT": "Preparar...",
-    "RENAMING_COLLECTION_FOLDERS": "Renomear pastas de álbuns...",
-    "TRASHING_DELETED_FILES": "Eliminar arquivos apagados...",
-    "TRASHING_DELETED_COLLECTIONS": "Eliminar álbuns apagados...",
-    "CONTINUOUS_EXPORT": "Sincronização contínua",
-    "PENDING_ITEMS": "Itens pendentes",
-    "EXPORT_STARTING": "Iniciar a exportação...",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> itens sincronizados",
+    "preparing": "Preparar...",
+    "renaming_album_folders": "Renomear pastas de álbuns...",
+    "trashing_deleted_files": "Eliminar arquivos apagados...",
+    "trashing_deleted_albums": "Eliminar álbuns apagados...",
+    "sync_continuously": "Sincronização contínua",
+    "pending_items": "Itens pendentes",
+    "export_starting": "Iniciar a exportação...",
     "delete_account_reason_label": "Qual o principal motivo pelo qual está a eliminar a conta?",
     "delete_account_reason_placeholder": "Selecione um motivo",
     "delete_reason": {
diff --git a/web/packages/base/locales/ro-RO/translation.json b/web/packages/base/locales/ro-RO/translation.json
index 37be9b24d0..1f2866d202 100644
--- a/web/packages/base/locales/ro-RO/translation.json
+++ b/web/packages/base/locales/ro-RO/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/ru-RU/translation.json b/web/packages/base/locales/ru-RU/translation.json
index 123df924f4..f42973fce3 100644
--- a/web/packages/base/locales/ru-RU/translation.json
+++ b/web/packages/base/locales/ru-RU/translation.json
@@ -530,14 +530,14 @@
         "tb": "Терабайт"
     },
     "stop": "Остановка",
-    "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> синхронизированные элементы",
-    "MIGRATING_EXPORT": "Подготовка...",
-    "RENAMING_COLLECTION_FOLDERS": "Переименование папок альбомов...",
-    "TRASHING_DELETED_FILES": "Очистка удаленных файлов...",
-    "TRASHING_DELETED_COLLECTIONS": "Очистка удаленных альбомов...",
-    "CONTINUOUS_EXPORT": "Непрерывная синхронизация",
-    "PENDING_ITEMS": "Отложенные пункты",
-    "EXPORT_STARTING": "Запуск экспорта...",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> синхронизированные элементы",
+    "preparing": "Подготовка...",
+    "renaming_album_folders": "Переименование папок альбомов...",
+    "trashing_deleted_files": "Очистка удаленных файлов...",
+    "trashing_deleted_albums": "Очистка удаленных альбомов...",
+    "sync_continuously": "Непрерывная синхронизация",
+    "pending_items": "Отложенные пункты",
+    "export_starting": "Запуск экспорта...",
     "delete_account_reason_label": "Какова основная причина, по которой вы удаляете свою учетную запись?",
     "delete_account_reason_placeholder": "Выберите причину",
     "delete_reason": {
diff --git a/web/packages/base/locales/sl-SI/translation.json b/web/packages/base/locales/sl-SI/translation.json
index 37be9b24d0..1f2866d202 100644
--- a/web/packages/base/locales/sl-SI/translation.json
+++ b/web/packages/base/locales/sl-SI/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/sv-SE/translation.json b/web/packages/base/locales/sv-SE/translation.json
index f628c0016f..075ad9af30 100644
--- a/web/packages/base/locales/sv-SE/translation.json
+++ b/web/packages/base/locales/sv-SE/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/ta-IN/translation.json b/web/packages/base/locales/ta-IN/translation.json
index 37be9b24d0..1f2866d202 100644
--- a/web/packages/base/locales/ta-IN/translation.json
+++ b/web/packages/base/locales/ta-IN/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/te-IN/translation.json b/web/packages/base/locales/te-IN/translation.json
index 37be9b24d0..1f2866d202 100644
--- a/web/packages/base/locales/te-IN/translation.json
+++ b/web/packages/base/locales/te-IN/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/th-TH/translation.json b/web/packages/base/locales/th-TH/translation.json
index 37be9b24d0..1f2866d202 100644
--- a/web/packages/base/locales/th-TH/translation.json
+++ b/web/packages/base/locales/th-TH/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/ti-ER/translation.json b/web/packages/base/locales/ti-ER/translation.json
index 37be9b24d0..1f2866d202 100644
--- a/web/packages/base/locales/ti-ER/translation.json
+++ b/web/packages/base/locales/ti-ER/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/tr-TR/translation.json b/web/packages/base/locales/tr-TR/translation.json
index 7eede84539..dfb3dd1878 100644
--- a/web/packages/base/locales/tr-TR/translation.json
+++ b/web/packages/base/locales/tr-TR/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/uk-UA/translation.json b/web/packages/base/locales/uk-UA/translation.json
index 9c35d5e618..3b353efc77 100644
--- a/web/packages/base/locales/uk-UA/translation.json
+++ b/web/packages/base/locales/uk-UA/translation.json
@@ -530,14 +530,14 @@
         "tb": "ТБ"
     },
     "stop": "Зупинити",
-    "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> елементів синхронізовано",
-    "MIGRATING_EXPORT": "Підготування...",
-    "RENAMING_COLLECTION_FOLDERS": "Перейменування тек альбомів...",
-    "TRASHING_DELETED_FILES": "Очищення видалених файлів...",
-    "TRASHING_DELETED_COLLECTIONS": "Очищення видалених альбомів...",
-    "CONTINUOUS_EXPORT": "Постійна синхронізація",
-    "PENDING_ITEMS": "Елементи на розгляді",
-    "EXPORT_STARTING": "Початок експортування...",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> елементів синхронізовано",
+    "preparing": "Підготування...",
+    "renaming_album_folders": "Перейменування тек альбомів...",
+    "trashing_deleted_files": "Очищення видалених файлів...",
+    "trashing_deleted_albums": "Очищення видалених альбомів...",
+    "sync_continuously": "Постійна синхронізація",
+    "pending_items": "Елементи на розгляді",
+    "export_starting": "Початок експортування...",
     "delete_account_reason_label": "Яка основна причина видалення вашого облікового запису?",
     "delete_account_reason_placeholder": "Оберіть причину",
     "delete_reason": {
diff --git a/web/packages/base/locales/vi-VN/translation.json b/web/packages/base/locales/vi-VN/translation.json
index 37d88ac96f..fb46024b54 100644
--- a/web/packages/base/locales/vi-VN/translation.json
+++ b/web/packages/base/locales/vi-VN/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Dừng",
-    "EXPORT_PROGRESS": "<a>{{progress.success, number}} / {{progress.total, number}}</a> mục đã đồng bộ",
-    "MIGRATING_EXPORT": "Đang chuẩn bị...",
-    "RENAMING_COLLECTION_FOLDERS": "Đang đổi tên thư mục album...",
-    "TRASHING_DELETED_FILES": "Đang xóa tệp đã xóa...",
-    "TRASHING_DELETED_COLLECTIONS": "Đang xóa album đã xóa...",
-    "CONTINUOUS_EXPORT": "Đồng bộ liên tục",
-    "PENDING_ITEMS": "Mục đang chờ",
-    "EXPORT_STARTING": "Xuất bắt đầu...",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> mục đã đồng bộ",
+    "preparing": "Đang chuẩn bị...",
+    "renaming_album_folders": "Đang đổi tên thư mục album...",
+    "trashing_deleted_files": "Đang xóa tệp đã xóa...",
+    "trashing_deleted_albums": "Đang xóa album đã xóa...",
+    "sync_continuously": "Đồng bộ liên tục",
+    "pending_items": "Mục đang chờ",
+    "export_starting": "Xuất bắt đầu...",
     "delete_account_reason_label": "Lý do chính bạn xóa tài khoản là gì?",
     "delete_account_reason_placeholder": "Chọn một lý do",
     "delete_reason": {
diff --git a/web/packages/base/locales/zh-CN/translation.json b/web/packages/base/locales/zh-CN/translation.json
index 2c2fa80a5b..1ee8cd6057 100644
--- a/web/packages/base/locales/zh-CN/translation.json
+++ b/web/packages/base/locales/zh-CN/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "停止",
-    "EXPORT_PROGRESS": "<a>{{progress.success}} / {{progress.total}}</a> 个文件已导出",
-    "MIGRATING_EXPORT": "准备中...",
-    "RENAMING_COLLECTION_FOLDERS": "正在重命名相册文件夹...",
-    "TRASHING_DELETED_FILES": "正在回收删除的文件...",
-    "TRASHING_DELETED_COLLECTIONS": "正在回收已删除的相册...",
-    "CONTINUOUS_EXPORT": "持续同步",
-    "PENDING_ITEMS": "待处理的项目",
-    "EXPORT_STARTING": "导出开始...",
+    "export_progress": "<a>{{progress.success}} / {{progress.total}}</a> 个文件已导出",
+    "preparing": "准备中...",
+    "renaming_album_folders": "正在重命名相册文件夹...",
+    "trashing_deleted_files": "正在回收删除的文件...",
+    "trashing_deleted_albums": "正在回收已删除的相册...",
+    "sync_continuously": "持续同步",
+    "pending_items": "待处理的项目",
+    "export_starting": "导出开始...",
     "delete_account_reason_label": "您删除账户的主要原因是什么？",
     "delete_account_reason_placeholder": "选择一个原因",
     "delete_reason": {
diff --git a/web/packages/base/locales/zh-HK/translation.json b/web/packages/base/locales/zh-HK/translation.json
index 37be9b24d0..1f2866d202 100644
--- a/web/packages/base/locales/zh-HK/translation.json
+++ b/web/packages/base/locales/zh-HK/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "EXPORT_PROGRESS": "",
-    "MIGRATING_EXPORT": "",
-    "RENAMING_COLLECTION_FOLDERS": "",
-    "TRASHING_DELETED_FILES": "",
-    "TRASHING_DELETED_COLLECTIONS": "",
-    "CONTINUOUS_EXPORT": "",
-    "PENDING_ITEMS": "",
-    "EXPORT_STARTING": "",
+    "export_progress": "",
+    "preparing": "",
+    "renaming_album_folders": "",
+    "trashing_deleted_files": "",
+    "trashing_deleted_albums": "",
+    "sync_continuously": "",
+    "pending_items": "",
+    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {

From 8633dabd9271288e08dc15b8a34dad9e8dc15d34 Mon Sep 17 00:00:00 2001
From: Crowdin Bot <support+bot@crowdin.com>
Date: Fri, 21 Feb 2025 11:22:42 +0000
Subject: [PATCH 430/796] New Crowdin translations by GitHub Action

---
 web/packages/base/locales/ar-SA/translation.json | 6 +++---
 web/packages/base/locales/be-BY/translation.json | 6 +++---
 web/packages/base/locales/bg-BG/translation.json | 6 +++---
 web/packages/base/locales/ca-ES/translation.json | 6 +++---
 web/packages/base/locales/cs-CZ/translation.json | 6 +++---
 web/packages/base/locales/da-DK/translation.json | 6 +++---
 web/packages/base/locales/de-DE/translation.json | 8 ++++----
 web/packages/base/locales/el-GR/translation.json | 6 +++---
 web/packages/base/locales/es-ES/translation.json | 8 ++++----
 web/packages/base/locales/et-EE/translation.json | 6 +++---
 web/packages/base/locales/fa-IR/translation.json | 6 +++---
 web/packages/base/locales/fi-FI/translation.json | 6 +++---
 web/packages/base/locales/fr-FR/translation.json | 8 ++++----
 web/packages/base/locales/gu-IN/translation.json | 6 +++---
 web/packages/base/locales/hi-IN/translation.json | 6 +++---
 web/packages/base/locales/hu-HU/translation.json | 6 +++---
 web/packages/base/locales/id-ID/translation.json | 6 +++---
 web/packages/base/locales/is-IS/translation.json | 6 +++---
 web/packages/base/locales/it-IT/translation.json | 8 ++++----
 web/packages/base/locales/ja-JP/translation.json | 6 +++---
 web/packages/base/locales/km-KH/translation.json | 6 +++---
 web/packages/base/locales/ko-KR/translation.json | 6 +++---
 web/packages/base/locales/lt-LT/translation.json | 6 +++---
 web/packages/base/locales/ml-IN/translation.json | 6 +++---
 web/packages/base/locales/nl-NL/translation.json | 6 +++---
 web/packages/base/locales/pl-PL/translation.json | 6 +++---
 web/packages/base/locales/pt-BR/translation.json | 6 +++---
 web/packages/base/locales/pt-PT/translation.json | 6 +++---
 web/packages/base/locales/ro-RO/translation.json | 6 +++---
 web/packages/base/locales/ru-RU/translation.json | 6 +++---
 web/packages/base/locales/sl-SI/translation.json | 6 +++---
 web/packages/base/locales/sv-SE/translation.json | 6 +++---
 web/packages/base/locales/ta-IN/translation.json | 6 +++---
 web/packages/base/locales/te-IN/translation.json | 6 +++---
 web/packages/base/locales/th-TH/translation.json | 6 +++---
 web/packages/base/locales/ti-ER/translation.json | 6 +++---
 web/packages/base/locales/tr-TR/translation.json | 6 +++---
 web/packages/base/locales/uk-UA/translation.json | 6 +++---
 web/packages/base/locales/vi-VN/translation.json | 6 +++---
 web/packages/base/locales/zh-CN/translation.json | 6 +++---
 web/packages/base/locales/zh-HK/translation.json | 6 +++---
 41 files changed, 127 insertions(+), 127 deletions(-)

diff --git a/web/packages/base/locales/ar-SA/translation.json b/web/packages/base/locales/ar-SA/translation.json
index f632070b4e..e152a97313 100644
--- a/web/packages/base/locales/ar-SA/translation.json
+++ b/web/packages/base/locales/ar-SA/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/be-BY/translation.json b/web/packages/base/locales/be-BY/translation.json
index 155a38693a..01bdba40e8 100644
--- a/web/packages/base/locales/be-BY/translation.json
+++ b/web/packages/base/locales/be-BY/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/bg-BG/translation.json b/web/packages/base/locales/bg-BG/translation.json
index 27c44eda37..9ed4650e5c 100644
--- a/web/packages/base/locales/bg-BG/translation.json
+++ b/web/packages/base/locales/bg-BG/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/ca-ES/translation.json b/web/packages/base/locales/ca-ES/translation.json
index 1f2866d202..7a74514e05 100644
--- a/web/packages/base/locales/ca-ES/translation.json
+++ b/web/packages/base/locales/ca-ES/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/cs-CZ/translation.json b/web/packages/base/locales/cs-CZ/translation.json
index 1f2866d202..7a74514e05 100644
--- a/web/packages/base/locales/cs-CZ/translation.json
+++ b/web/packages/base/locales/cs-CZ/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/da-DK/translation.json b/web/packages/base/locales/da-DK/translation.json
index c331979c54..b684b4930f 100644
--- a/web/packages/base/locales/da-DK/translation.json
+++ b/web/packages/base/locales/da-DK/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/de-DE/translation.json b/web/packages/base/locales/de-DE/translation.json
index 4fdc28fe81..bd3c6f6710 100644
--- a/web/packages/base/locales/de-DE/translation.json
+++ b/web/packages/base/locales/de-DE/translation.json
@@ -529,15 +529,15 @@
         "gb": "GB",
         "tb": "TB"
     },
-    "stop": "Stop",
-    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> Dateien synchronisiert",
+    "stop": "",
+    "sync_continuously": "Stets aktuell halten",
+    "export_starting": "Starte Export...",
     "preparing": "Vorbereiten...",
     "renaming_album_folders": "Albumordner umbenennen...",
     "trashing_deleted_files": "Verschiebe gelöschte Dateien in den Trash-Ordner...",
     "trashing_deleted_albums": "Verschiebe gelöschte Alben in den Trash-Ordner...",
-    "sync_continuously": "Stets aktuell halten",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> Dateien synchronisiert",
     "pending_items": "Ausstehende Dateien",
-    "export_starting": "Starte Export...",
     "delete_account_reason_label": "Was ist der Hauptgrund für die Löschung deines Kontos?",
     "delete_account_reason_placeholder": "Wähle einen Grund aus",
     "delete_reason": {
diff --git a/web/packages/base/locales/el-GR/translation.json b/web/packages/base/locales/el-GR/translation.json
index 4ed486edb2..0b678d49e6 100644
--- a/web/packages/base/locales/el-GR/translation.json
+++ b/web/packages/base/locales/el-GR/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Διακοπή",
-    "export_progress": "",
+    "sync_continuously": "Συνεχής συγχρονισμός",
+    "export_starting": "Έναρξη εξαγωγής...",
     "preparing": "Προετοιμασία...",
     "renaming_album_folders": "Μετονομασία φακέλων άλμπουμ...",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "Συνεχής συγχρονισμός",
+    "export_progress": "",
     "pending_items": "Εκκρεμή αντικείμενα",
-    "export_starting": "Έναρξη εξαγωγής...",
     "delete_account_reason_label": "Ποιος είναι ο κύριος λόγος που διαγράφετε το λογαριασμό σας;",
     "delete_account_reason_placeholder": "Επιλέξτε ένα λόγο",
     "delete_reason": {
diff --git a/web/packages/base/locales/es-ES/translation.json b/web/packages/base/locales/es-ES/translation.json
index 4ae5e668cf..61c31cf65e 100644
--- a/web/packages/base/locales/es-ES/translation.json
+++ b/web/packages/base/locales/es-ES/translation.json
@@ -529,15 +529,15 @@
         "gb": "GB",
         "tb": "TB"
     },
-    "stop": "Stop",
-    "export_progress": "<a>{{progress.success}} / {{progress.total}}</a> archivos exportados",
+    "stop": "",
+    "sync_continuously": "Sincronizar continuamente",
+    "export_starting": "Exportar iniciando...",
     "preparing": "Preparando...",
     "renaming_album_folders": "Renombrando carpetas del álbum...",
     "trashing_deleted_files": "Eliminando ficheros borrados...",
     "trashing_deleted_albums": "Eliminando álbumes borrados...",
-    "sync_continuously": "Sincronizar continuamente",
+    "export_progress": "<a>{{progress.success}} / {{progress.total}}</a> archivos exportados",
     "pending_items": "Elementos pendientes",
-    "export_starting": "Exportar iniciando...",
     "delete_account_reason_label": "¿Cuál es la razón principal por la que eliminas tu cuenta?",
     "delete_account_reason_placeholder": "Selecciona una razón",
     "delete_reason": {
diff --git a/web/packages/base/locales/et-EE/translation.json b/web/packages/base/locales/et-EE/translation.json
index 1f2866d202..7a74514e05 100644
--- a/web/packages/base/locales/et-EE/translation.json
+++ b/web/packages/base/locales/et-EE/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/fa-IR/translation.json b/web/packages/base/locales/fa-IR/translation.json
index ec2547753b..89d9d7dad9 100644
--- a/web/packages/base/locales/fa-IR/translation.json
+++ b/web/packages/base/locales/fa-IR/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/fi-FI/translation.json b/web/packages/base/locales/fi-FI/translation.json
index 1bbb716978..1f0a537415 100644
--- a/web/packages/base/locales/fi-FI/translation.json
+++ b/web/packages/base/locales/fi-FI/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/fr-FR/translation.json b/web/packages/base/locales/fr-FR/translation.json
index 8a3416426a..c2ed1154d7 100644
--- a/web/packages/base/locales/fr-FR/translation.json
+++ b/web/packages/base/locales/fr-FR/translation.json
@@ -529,15 +529,15 @@
         "gb": "Go",
         "tb": "To"
     },
-    "stop": "Stop",
-    "export_progress": "<a>{{progress.success}} / {{progress.total}}</a> fichiers exportés",
+    "stop": "",
+    "sync_continuously": "Synchronisation en continu",
+    "export_starting": "Démarrage de l'export...",
     "preparing": "Préparations...",
     "renaming_album_folders": "Renommage des dossiers de l'album en cours...",
     "trashing_deleted_files": "Mise à la corbeille des fichiers supprimés...",
     "trashing_deleted_albums": "Mise à la corbeille des albums supprimés...",
-    "sync_continuously": "Synchronisation en continu",
+    "export_progress": "<a>{{progress.success}} / {{progress.total}}</a> fichiers exportés",
     "pending_items": "Objets en attente",
-    "export_starting": "Démarrage de l'export...",
     "delete_account_reason_label": "Quelle est la raison principale de la suppression de votre compte ?",
     "delete_account_reason_placeholder": "Choisir une raison",
     "delete_reason": {
diff --git a/web/packages/base/locales/gu-IN/translation.json b/web/packages/base/locales/gu-IN/translation.json
index 1f2866d202..7a74514e05 100644
--- a/web/packages/base/locales/gu-IN/translation.json
+++ b/web/packages/base/locales/gu-IN/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/hi-IN/translation.json b/web/packages/base/locales/hi-IN/translation.json
index 1f2866d202..7a74514e05 100644
--- a/web/packages/base/locales/hi-IN/translation.json
+++ b/web/packages/base/locales/hi-IN/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/hu-HU/translation.json b/web/packages/base/locales/hu-HU/translation.json
index 1f2866d202..7a74514e05 100644
--- a/web/packages/base/locales/hu-HU/translation.json
+++ b/web/packages/base/locales/hu-HU/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/id-ID/translation.json b/web/packages/base/locales/id-ID/translation.json
index 97c199a81e..8bed0abddf 100644
--- a/web/packages/base/locales/id-ID/translation.json
+++ b/web/packages/base/locales/id-ID/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Hentikan",
-    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> item tersinkron",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "Menyiapkan...",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> item tersinkron",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/is-IS/translation.json b/web/packages/base/locales/is-IS/translation.json
index a172e8a01a..09b5cc454c 100644
--- a/web/packages/base/locales/is-IS/translation.json
+++ b/web/packages/base/locales/is-IS/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/it-IT/translation.json b/web/packages/base/locales/it-IT/translation.json
index 8c741ec09a..ef1f9d8d2b 100644
--- a/web/packages/base/locales/it-IT/translation.json
+++ b/web/packages/base/locales/it-IT/translation.json
@@ -529,15 +529,15 @@
         "gb": "GB",
         "tb": "TB"
     },
-    "stop": "Stop",
-    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> elementi sincronizzati",
+    "stop": "",
+    "sync_continuously": "Sincronizza continuamente",
+    "export_starting": "Esportazione iniziata...",
     "preparing": "Preparazione...",
     "renaming_album_folders": "Rinomino cartelle album...",
     "trashing_deleted_files": "Sposto i file nel cestino...",
     "trashing_deleted_albums": "Sposto gli album nel cestino...",
-    "sync_continuously": "Sincronizza continuamente",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> elementi sincronizzati",
     "pending_items": "Elementi in sospeso",
-    "export_starting": "Esportazione iniziata...",
     "delete_account_reason_label": "Qual è il motivo per cui stai cancellando il tuo account?",
     "delete_account_reason_placeholder": "Seleziona un motivo",
     "delete_reason": {
diff --git a/web/packages/base/locales/ja-JP/translation.json b/web/packages/base/locales/ja-JP/translation.json
index 49f7d3596c..46957932f5 100644
--- a/web/packages/base/locales/ja-JP/translation.json
+++ b/web/packages/base/locales/ja-JP/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "中止",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "エクスポートを開始中…",
     "preparing": "準備しています…",
     "renaming_album_folders": "",
     "trashing_deleted_files": "削除ファイルをごみ箱に移動中…",
     "trashing_deleted_albums": "削除アルバムをごみ箱に移動中…",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "保留中アイテム",
-    "export_starting": "エクスポートを開始中…",
     "delete_account_reason_label": "アカウントを削除する主な理由は何ですか？",
     "delete_account_reason_placeholder": "理由を選択",
     "delete_reason": {
diff --git a/web/packages/base/locales/km-KH/translation.json b/web/packages/base/locales/km-KH/translation.json
index 1f2866d202..7a74514e05 100644
--- a/web/packages/base/locales/km-KH/translation.json
+++ b/web/packages/base/locales/km-KH/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/ko-KR/translation.json b/web/packages/base/locales/ko-KR/translation.json
index 65cd73a8b3..fa583d9f9d 100644
--- a/web/packages/base/locales/ko-KR/translation.json
+++ b/web/packages/base/locales/ko-KR/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/lt-LT/translation.json b/web/packages/base/locales/lt-LT/translation.json
index f9a7baad7a..b98c74194d 100644
--- a/web/packages/base/locales/lt-LT/translation.json
+++ b/web/packages/base/locales/lt-LT/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Stabdyti",
-    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> sinchronizuoti elementai",
+    "sync_continuously": "Sinchronizuoti nuolat",
+    "export_starting": "Pradedamas eksportavimas...",
     "preparing": "Ruošiama...",
     "renaming_album_folders": "Pervadinami albumų aplankai...",
     "trashing_deleted_files": "Ištuštiniami ištrinti failai...",
     "trashing_deleted_albums": "Ištuštiniami ištrinti albumai...",
-    "sync_continuously": "Sinchronizuoti nuolat",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> sinchronizuoti elementai",
     "pending_items": "Laukiami elementai",
-    "export_starting": "Pradedamas eksportavimas...",
     "delete_account_reason_label": "Kokia yra pagrindinė priežastis, dėl kurios ištrinate savo paskyrą?",
     "delete_account_reason_placeholder": "Pasirinkite priežastį",
     "delete_reason": {
diff --git a/web/packages/base/locales/ml-IN/translation.json b/web/packages/base/locales/ml-IN/translation.json
index 1f2866d202..7a74514e05 100644
--- a/web/packages/base/locales/ml-IN/translation.json
+++ b/web/packages/base/locales/ml-IN/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/nl-NL/translation.json b/web/packages/base/locales/nl-NL/translation.json
index d5fe33b236..6a7e1d0c44 100644
--- a/web/packages/base/locales/nl-NL/translation.json
+++ b/web/packages/base/locales/nl-NL/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Stoppen",
-    "export_progress": "<a>{{progress.success}} / {{progress.total}}</a> bestanden geëxporteerd",
+    "sync_continuously": "Continue synchroniseren",
+    "export_starting": "Exporteren begonnen...",
     "preparing": "Voorbereiden...",
     "renaming_album_folders": "Albumnamen hernoemen...",
     "trashing_deleted_files": "Verwijderde bestanden naar prullenbak...",
     "trashing_deleted_albums": "Verwijderde albums naar prullenbak...",
-    "sync_continuously": "Continue synchroniseren",
+    "export_progress": "<a>{{progress.success}} / {{progress.total}}</a> bestanden geëxporteerd",
     "pending_items": "Bestanden in behandeling",
-    "export_starting": "Exporteren begonnen...",
     "delete_account_reason_label": "Wat is de belangrijkste reden waarom je jouw account verwijdert?",
     "delete_account_reason_placeholder": "Kies een reden",
     "delete_reason": {
diff --git a/web/packages/base/locales/pl-PL/translation.json b/web/packages/base/locales/pl-PL/translation.json
index 614c8f508f..e7b87172e7 100644
--- a/web/packages/base/locales/pl-PL/translation.json
+++ b/web/packages/base/locales/pl-PL/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Zatrzymaj",
-    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> elementy zsynchronizowane",
+    "sync_continuously": "Synchronizuj ciągle",
+    "export_starting": "Rozpoczynanie eksportu...",
     "preparing": "Przygotowywanie...",
     "renaming_album_folders": "Zmienianie nazwy folderów albumów...",
     "trashing_deleted_files": "Przenoszenie usuniętych plików do kosza...",
     "trashing_deleted_albums": "Przenoszenie usuniętych albumów do kosza...",
-    "sync_continuously": "Synchronizuj ciągle",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> elementy zsynchronizowane",
     "pending_items": "Oczekujące elementy",
-    "export_starting": "Rozpoczynanie eksportu...",
     "delete_account_reason_label": "Jaka jest główna przyczyna usunięcia Twojego konta?",
     "delete_account_reason_placeholder": "Wybierz powód",
     "delete_reason": {
diff --git a/web/packages/base/locales/pt-BR/translation.json b/web/packages/base/locales/pt-BR/translation.json
index efb2c11966..01174fd54a 100644
--- a/web/packages/base/locales/pt-BR/translation.json
+++ b/web/packages/base/locales/pt-BR/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Parar",
-    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> itens sincronizados",
+    "sync_continuously": "Sincronizar continuamente",
+    "export_starting": "Iniciando a exportação...",
     "preparing": "Preparando...",
     "renaming_album_folders": "Renomeando pastas do álbum...",
     "trashing_deleted_files": "Descartando arquivos excluídos...",
     "trashing_deleted_albums": "Descartando álbuns excluídos...",
-    "sync_continuously": "Sincronizar continuamente",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> itens sincronizados",
     "pending_items": "Itens pendentes",
-    "export_starting": "Iniciando a exportação...",
     "delete_account_reason_label": "Qual é o principal motivo para você excluir sua conta?",
     "delete_account_reason_placeholder": "Selecione um motivo",
     "delete_reason": {
diff --git a/web/packages/base/locales/pt-PT/translation.json b/web/packages/base/locales/pt-PT/translation.json
index 7642256b70..71c43361ed 100644
--- a/web/packages/base/locales/pt-PT/translation.json
+++ b/web/packages/base/locales/pt-PT/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Parar",
-    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> itens sincronizados",
+    "sync_continuously": "Sincronização contínua",
+    "export_starting": "Iniciar a exportação...",
     "preparing": "Preparar...",
     "renaming_album_folders": "Renomear pastas de álbuns...",
     "trashing_deleted_files": "Eliminar arquivos apagados...",
     "trashing_deleted_albums": "Eliminar álbuns apagados...",
-    "sync_continuously": "Sincronização contínua",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> itens sincronizados",
     "pending_items": "Itens pendentes",
-    "export_starting": "Iniciar a exportação...",
     "delete_account_reason_label": "Qual o principal motivo pelo qual está a eliminar a conta?",
     "delete_account_reason_placeholder": "Selecione um motivo",
     "delete_reason": {
diff --git a/web/packages/base/locales/ro-RO/translation.json b/web/packages/base/locales/ro-RO/translation.json
index 1f2866d202..7a74514e05 100644
--- a/web/packages/base/locales/ro-RO/translation.json
+++ b/web/packages/base/locales/ro-RO/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/ru-RU/translation.json b/web/packages/base/locales/ru-RU/translation.json
index f42973fce3..72b201dd78 100644
--- a/web/packages/base/locales/ru-RU/translation.json
+++ b/web/packages/base/locales/ru-RU/translation.json
@@ -530,14 +530,14 @@
         "tb": "Терабайт"
     },
     "stop": "Остановка",
-    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> синхронизированные элементы",
+    "sync_continuously": "Непрерывная синхронизация",
+    "export_starting": "Запуск экспорта...",
     "preparing": "Подготовка...",
     "renaming_album_folders": "Переименование папок альбомов...",
     "trashing_deleted_files": "Очистка удаленных файлов...",
     "trashing_deleted_albums": "Очистка удаленных альбомов...",
-    "sync_continuously": "Непрерывная синхронизация",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> синхронизированные элементы",
     "pending_items": "Отложенные пункты",
-    "export_starting": "Запуск экспорта...",
     "delete_account_reason_label": "Какова основная причина, по которой вы удаляете свою учетную запись?",
     "delete_account_reason_placeholder": "Выберите причину",
     "delete_reason": {
diff --git a/web/packages/base/locales/sl-SI/translation.json b/web/packages/base/locales/sl-SI/translation.json
index 1f2866d202..7a74514e05 100644
--- a/web/packages/base/locales/sl-SI/translation.json
+++ b/web/packages/base/locales/sl-SI/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/sv-SE/translation.json b/web/packages/base/locales/sv-SE/translation.json
index 075ad9af30..aaf2a59b25 100644
--- a/web/packages/base/locales/sv-SE/translation.json
+++ b/web/packages/base/locales/sv-SE/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/ta-IN/translation.json b/web/packages/base/locales/ta-IN/translation.json
index 1f2866d202..7a74514e05 100644
--- a/web/packages/base/locales/ta-IN/translation.json
+++ b/web/packages/base/locales/ta-IN/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/te-IN/translation.json b/web/packages/base/locales/te-IN/translation.json
index 1f2866d202..7a74514e05 100644
--- a/web/packages/base/locales/te-IN/translation.json
+++ b/web/packages/base/locales/te-IN/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/th-TH/translation.json b/web/packages/base/locales/th-TH/translation.json
index 1f2866d202..7a74514e05 100644
--- a/web/packages/base/locales/th-TH/translation.json
+++ b/web/packages/base/locales/th-TH/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/ti-ER/translation.json b/web/packages/base/locales/ti-ER/translation.json
index 1f2866d202..7a74514e05 100644
--- a/web/packages/base/locales/ti-ER/translation.json
+++ b/web/packages/base/locales/ti-ER/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/tr-TR/translation.json b/web/packages/base/locales/tr-TR/translation.json
index dfb3dd1878..43bb4fcb38 100644
--- a/web/packages/base/locales/tr-TR/translation.json
+++ b/web/packages/base/locales/tr-TR/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {
diff --git a/web/packages/base/locales/uk-UA/translation.json b/web/packages/base/locales/uk-UA/translation.json
index 3b353efc77..7fa2470521 100644
--- a/web/packages/base/locales/uk-UA/translation.json
+++ b/web/packages/base/locales/uk-UA/translation.json
@@ -530,14 +530,14 @@
         "tb": "ТБ"
     },
     "stop": "Зупинити",
-    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> елементів синхронізовано",
+    "sync_continuously": "Постійна синхронізація",
+    "export_starting": "Початок експортування...",
     "preparing": "Підготування...",
     "renaming_album_folders": "Перейменування тек альбомів...",
     "trashing_deleted_files": "Очищення видалених файлів...",
     "trashing_deleted_albums": "Очищення видалених альбомів...",
-    "sync_continuously": "Постійна синхронізація",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> елементів синхронізовано",
     "pending_items": "Елементи на розгляді",
-    "export_starting": "Початок експортування...",
     "delete_account_reason_label": "Яка основна причина видалення вашого облікового запису?",
     "delete_account_reason_placeholder": "Оберіть причину",
     "delete_reason": {
diff --git a/web/packages/base/locales/vi-VN/translation.json b/web/packages/base/locales/vi-VN/translation.json
index fb46024b54..152cf6e7fb 100644
--- a/web/packages/base/locales/vi-VN/translation.json
+++ b/web/packages/base/locales/vi-VN/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "Dừng",
-    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> mục đã đồng bộ",
+    "sync_continuously": "Đồng bộ liên tục",
+    "export_starting": "Xuất bắt đầu...",
     "preparing": "Đang chuẩn bị...",
     "renaming_album_folders": "Đang đổi tên thư mục album...",
     "trashing_deleted_files": "Đang xóa tệp đã xóa...",
     "trashing_deleted_albums": "Đang xóa album đã xóa...",
-    "sync_continuously": "Đồng bộ liên tục",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> mục đã đồng bộ",
     "pending_items": "Mục đang chờ",
-    "export_starting": "Xuất bắt đầu...",
     "delete_account_reason_label": "Lý do chính bạn xóa tài khoản là gì?",
     "delete_account_reason_placeholder": "Chọn một lý do",
     "delete_reason": {
diff --git a/web/packages/base/locales/zh-CN/translation.json b/web/packages/base/locales/zh-CN/translation.json
index 1ee8cd6057..1053e68ee9 100644
--- a/web/packages/base/locales/zh-CN/translation.json
+++ b/web/packages/base/locales/zh-CN/translation.json
@@ -530,14 +530,14 @@
         "tb": "TB"
     },
     "stop": "停止",
-    "export_progress": "<a>{{progress.success}} / {{progress.total}}</a> 个文件已导出",
+    "sync_continuously": "持续同步",
+    "export_starting": "导出开始...",
     "preparing": "准备中...",
     "renaming_album_folders": "正在重命名相册文件夹...",
     "trashing_deleted_files": "正在回收删除的文件...",
     "trashing_deleted_albums": "正在回收已删除的相册...",
-    "sync_continuously": "持续同步",
+    "export_progress": "<a>{{progress.success}} / {{progress.total}}</a> 个文件已导出",
     "pending_items": "待处理的项目",
-    "export_starting": "导出开始...",
     "delete_account_reason_label": "您删除账户的主要原因是什么？",
     "delete_account_reason_placeholder": "选择一个原因",
     "delete_reason": {
diff --git a/web/packages/base/locales/zh-HK/translation.json b/web/packages/base/locales/zh-HK/translation.json
index 1f2866d202..7a74514e05 100644
--- a/web/packages/base/locales/zh-HK/translation.json
+++ b/web/packages/base/locales/zh-HK/translation.json
@@ -530,14 +530,14 @@
         "tb": ""
     },
     "stop": "",
-    "export_progress": "",
+    "sync_continuously": "",
+    "export_starting": "",
     "preparing": "",
     "renaming_album_folders": "",
     "trashing_deleted_files": "",
     "trashing_deleted_albums": "",
-    "sync_continuously": "",
+    "export_progress": "",
     "pending_items": "",
-    "export_starting": "",
     "delete_account_reason_label": "",
     "delete_account_reason_placeholder": "",
     "delete_reason": {

From 9da79dc99ae7c7f314d43ca3cbf965a0cb24301e Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Fri, 21 Feb 2025 16:59:43 +0530
Subject: [PATCH 431/796] [mob][photos] Don't show others in spotlight

---
 mobile/lib/services/smart_memories_service.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 220b511b94..569bbe3372 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -269,7 +269,7 @@ class SmartMemoriesService {
       final spotlightFiles = <EnteFile>[];
       for (final fileID in personFileIDs) {
         final int personsPresent = personFilesToFaces[fileID]?.length ?? 10;
-        if (personsPresent > 2) continue;
+        if (personsPresent > 1) continue;
         final file = allFileIdsToFile[fileID];
         if (file != null) {
           spotlightFiles.add(file);

From 8830deb619cdab79133eff1e1cfcce7d8ef1a586 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 21 Feb 2025 17:14:09 +0530
Subject: [PATCH 432/796] [web] Update storage card when family member's
 storage limit is configured

Sibling of https://github.com/ente-io/ente/pull/5123
---
 .../src/components/SubscriptionCard.tsx       | 82 ++++++++++++-------
 .../new/photos/services/user-details.ts       | 22 ++++-
 2 files changed, 71 insertions(+), 33 deletions(-)

diff --git a/web/apps/photos/src/components/SubscriptionCard.tsx b/web/apps/photos/src/components/SubscriptionCard.tsx
index 071a0e798b..b389edd62b 100644
--- a/web/apps/photos/src/components/SubscriptionCard.tsx
+++ b/web/apps/photos/src/components/SubscriptionCard.tsx
@@ -3,6 +3,7 @@ import type { ButtonishProps } from "@/base/components/mui";
 import { UnstyledButton } from "@/new/photos/components/UnstyledButton";
 import type { UserDetails } from "@/new/photos/services/user-details";
 import {
+    familyMemberStorageLimit,
     familyUsage,
     isPartOfFamilyWithOtherMembers,
 } from "@/new/photos/services/user-details";
@@ -118,42 +119,63 @@ interface SubscriptionCardContentOverlayProps {
 
 export const SubscriptionCardContentOverlay: React.FC<
     SubscriptionCardContentOverlayProps
-> = ({ userDetails }) => (
-    <Overlay>
-        <Stack
-            sx={{
-                height: "100%",
-                justifyContent: "space-between",
-                padding: "20px 16px",
-            }}
-        >
-            {isPartOfFamilyWithOtherMembers(userDetails) ? (
-                <FamilySubscriptionCardContents userDetails={userDetails} />
-            ) : (
-                <IndividualSubscriptionCardContents userDetails={userDetails} />
-            )}
-        </Stack>
-    </Overlay>
-);
-
-const IndividualSubscriptionCardContents: React.FC<
-    SubscriptionCardContentOverlayProps
 > = ({ userDetails }) => {
-    const totalStorage =
-        userDetails.subscription.storage + userDetails.storageBonus;
+    const inFamily = isPartOfFamilyWithOtherMembers(userDetails);
+    const storageLimit = inFamily
+        ? familyMemberStorageLimit(userDetails)
+        : undefined;
 
     return (
-        <>
-            <StorageSection storage={totalStorage} usage={userDetails.usage} />
-            <IndividualUsageSection
-                usage={userDetails.usage}
-                fileCount={userDetails.fileCount}
-                storage={totalStorage}
-            />
-        </>
+        <Overlay>
+            <Stack
+                sx={{
+                    height: "100%",
+                    justifyContent: "space-between",
+                    padding: "20px 16px",
+                }}
+            >
+                {inFamily ? (
+                    storageLimit ? (
+                        <UserSubscriptionCardContents
+                            userDetails={userDetails}
+                            totalStorage={storageLimit}
+                        />
+                    ) : (
+                        <FamilySubscriptionCardContents
+                            userDetails={userDetails}
+                        />
+                    )
+                ) : (
+                    <UserSubscriptionCardContents
+                        userDetails={userDetails}
+                        totalStorage={
+                            userDetails.subscription.storage +
+                            userDetails.storageBonus
+                        }
+                    />
+                )}
+            </Stack>
+        </Overlay>
     );
 };
 
+type UserSubscriptionCardContentsProps = SubscriptionCardContentOverlayProps & {
+    totalStorage: number;
+};
+
+const UserSubscriptionCardContents: React.FC<
+    UserSubscriptionCardContentsProps
+> = ({ userDetails, totalStorage }) => (
+    <>
+        <StorageSection storage={totalStorage} usage={userDetails.usage} />
+        <IndividualUsageSection
+            usage={userDetails.usage}
+            fileCount={userDetails.fileCount}
+            storage={totalStorage}
+        />
+    </>
+);
+
 interface StorageSectionProps {
     usage: number;
     storage: number;
diff --git a/web/packages/new/photos/services/user-details.ts b/web/packages/new/photos/services/user-details.ts
index a4b96d0f21..79d0ea9c2c 100644
--- a/web/packages/new/photos/services/user-details.ts
+++ b/web/packages/new/photos/services/user-details.ts
@@ -56,6 +56,12 @@ const FamilyMember = z.object({
      * Email address of the family member.
      */
     email: z.string(),
+    /**
+     * `true` if this is the admin.
+     *
+     * This field will not be sent for invited members until they accept.
+     */
+    isAdmin: z.boolean().nullish().transform(nullToUndefined),
     /**
      * Storage used by the family member.
      *
@@ -63,11 +69,13 @@ const FamilyMember = z.object({
      */
     usage: z.number().nullish().transform(nullToUndefined),
     /**
-     * `true` if this is the admin.
+     * Storage limit allocated to the family member.
      *
-     * This field will not be sent for invited members until they accept.
+     * This field will not be present unless the admin for the family plan has
+     * configured a member specific limit, in which case this will be the limit
+     * (in bytes) specifying the storage which this member can use.
      */
-    isAdmin: z.boolean().nullish().transform(nullToUndefined),
+    storageLimit: z.number().nullish().transform(nullToUndefined),
 });
 
 type FamilyMember = z.infer<typeof FamilyMember>;
@@ -484,6 +492,14 @@ export const isPartOfFamilyWithOtherMembers = (userDetails: UserDetails) =>
 export const isFamilyAdmin = (userDetails: UserDetails) =>
     userDetails.email == familyAdminEmail(userDetails);
 
+/**
+ * Return the member specific storage limit for the user (represented by the
+ * given {@link userDetails}).
+ */
+export const familyMemberStorageLimit = (userDetails: UserDetails) =>
+    userDetails.familyData?.members.find((m) => m.email == userDetails.email)
+        ?.storageLimit;
+
 /**
  * Return the email of the admin for the family plan, if any, that the user
  * (represented by the given {@link userDetails}) is a part of.

From 8b94304754529d6cd1788b1378921d411901456c Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Fri, 21 Feb 2025 17:30:00 +0530
Subject: [PATCH 433/796] feat: add stream switched event

---
 mobile/lib/events/stream_switched_event.dart  |  10 ++
 mobile/lib/ui/viewer/file/video_widget.dart   | 122 ++++++++----------
 .../file/video_widget_media_kit_new.dart      |  61 ++++++---
 .../ui/viewer/file/video_widget_native.dart   |  55 ++++++--
 4 files changed, 153 insertions(+), 95 deletions(-)
 create mode 100644 mobile/lib/events/stream_switched_event.dart

diff --git a/mobile/lib/events/stream_switched_event.dart b/mobile/lib/events/stream_switched_event.dart
new file mode 100644
index 0000000000..0716e6d18e
--- /dev/null
+++ b/mobile/lib/events/stream_switched_event.dart
@@ -0,0 +1,10 @@
+import "package:photos/events/event.dart";
+
+class StreamSwitchedEvent extends Event {
+  final bool selectedPreview;
+  final PlayerType type;
+
+  StreamSwitchedEvent(this.selectedPreview, this.type);
+}
+
+enum PlayerType { mediaKit, nativeVideoPlayer }
diff --git a/mobile/lib/ui/viewer/file/video_widget.dart b/mobile/lib/ui/viewer/file/video_widget.dart
index 3fc6c1e8cf..2172f01afa 100644
--- a/mobile/lib/ui/viewer/file/video_widget.dart
+++ b/mobile/lib/ui/viewer/file/video_widget.dart
@@ -5,6 +5,7 @@ import "package:flutter/material.dart";
 import "package:fluttertoast/fluttertoast.dart";
 import "package:logging/logging.dart";
 import "package:photos/core/event_bus.dart";
+import "package:photos/events/stream_switched_event.dart";
 import "package:photos/events/use_media_kit_for_video.dart";
 import "package:photos/models/file/file.dart";
 import "package:photos/service_locator.dart";
@@ -39,10 +40,8 @@ class _VideoWidgetState extends State<VideoWidget> {
       useMediaKitForVideoSubscription;
   late bool selectPreviewForPlay = widget.file.localID == null;
   File? preview;
-  final player1 = GlobalKey();
-  final player2 = GlobalKey();
-  final player3 = GlobalKey();
-  final player4 = GlobalKey();
+  final nativePlayerKey = GlobalKey();
+  final mediaKitKey = GlobalKey();
 
   bool isPreviewLoadable = true;
 
@@ -106,81 +105,74 @@ class _VideoWidgetState extends State<VideoWidget> {
         (FileDataService.instance.previewIds
                 ?.containsKey(widget.file.uploadedFileID!) ??
             false);
-    if (isPreviewVideoPlayable && selectPreviewForPlay) {
-      if (preview == null) {
-        return Center(
-          child: Container(
-            width: 48,
-            height: 48,
-            padding: const EdgeInsets.all(8),
-            decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(24),
-              color: Colors.black.withOpacity(0.3),
-              border: Border.all(
-                color: strokeFaintDark,
-                width: 1,
-              ),
-            ),
-            child: const EnteLoadingWidget(
-              size: 32,
-              color: fillBaseDark,
-              padding: 0,
+    final playPreview = isPreviewVideoPlayable && selectPreviewForPlay;
+    if (playPreview && preview == null) {
+      return Center(
+        child: Container(
+          width: 48,
+          height: 48,
+          padding: const EdgeInsets.all(8),
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(24),
+            color: Colors.black.withOpacity(0.3),
+            border: Border.all(
+              color: strokeFaintDark,
+              width: 1,
             ),
           ),
-        );
-      }
-      if (Platform.isAndroid) {
-        return VideoWidgetNative(
-          widget.file,
-          key: player1,
-          preview: preview,
-          tagPrefix: widget.tagPrefix,
-          playbackCallback: widget.playbackCallback,
-          onStreamChange: () {
-            setState(() {
-              selectPreviewForPlay = false;
-            });
-          },
-        );
-      }
-      return VideoWidgetMediaKitNew(
-        widget.file,
-        key: player2,
-        preview: preview,
-        tagPrefix: widget.tagPrefix,
-        playbackCallback: widget.playbackCallback,
-        onStreamChange: () {
-          setState(() {
-            selectPreviewForPlay = false;
-          });
-        },
+          child: const EnteLoadingWidget(
+            size: 32,
+            color: fillBaseDark,
+            padding: 0,
+          ),
+        ),
       );
     }
 
-    if (useNativeVideoPlayer) {
+    if (useNativeVideoPlayer && !playPreview ||
+        playPreview && Platform.isAndroid) {
       return VideoWidgetNative(
         widget.file,
-        key: player3,
+        key: nativePlayerKey,
         tagPrefix: widget.tagPrefix,
         playbackCallback: widget.playbackCallback,
+        preview: preview,
+        selectedPreview: playPreview,
         onStreamChange: () {
           setState(() {
-            selectPreviewForPlay = true;
-          });
-        },
-      );
-    } else {
-      return VideoWidgetMediaKitNew(
-        widget.file,
-        key: player4,
-        tagPrefix: widget.tagPrefix,
-        playbackCallback: widget.playbackCallback,
-        onStreamChange: () {
-          setState(() {
-            selectPreviewForPlay = true;
+            selectPreviewForPlay = !selectPreviewForPlay;
+            Bus.instance.fire(
+              StreamSwitchedEvent(
+                selectPreviewForPlay,
+                Platform.isAndroid
+                    ? PlayerType.nativeVideoPlayer
+                    : PlayerType.mediaKit,
+              ),
+            );
           });
         },
       );
     }
+    return VideoWidgetMediaKitNew(
+      widget.file,
+      key: mediaKitKey,
+      tagPrefix: widget.tagPrefix,
+      playbackCallback: widget.playbackCallback,
+      preview: preview,
+      selectedPreview: playPreview,
+      onStreamChange: () {
+        setState(() {
+          selectPreviewForPlay = !selectPreviewForPlay;
+          Bus.instance.fire(
+            StreamSwitchedEvent(
+              selectPreviewForPlay,
+              Platform.isAndroid
+                  ? PlayerType.nativeVideoPlayer
+                  : PlayerType.mediaKit,
+            ),
+          );
+        });
+      },
+    );
   }
 }
diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
index d483a061c0..7d4e659a20 100644
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
@@ -9,6 +9,7 @@ import "package:photos/core/constants.dart";
 import "package:photos/core/event_bus.dart";
 import "package:photos/events/guest_view_event.dart";
 import "package:photos/events/pause_video_event.dart";
+import "package:photos/events/stream_switched_event.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/models/file/extensions/file_props.dart";
 import "package:photos/models/file/file.dart";
@@ -29,6 +30,7 @@ class VideoWidgetMediaKitNew extends StatefulWidget {
   final bool isFromMemories;
   final void Function() onStreamChange;
   final File? preview;
+  final bool selectedPreview;
 
   const VideoWidgetMediaKitNew(
     this.file, {
@@ -37,6 +39,7 @@ class VideoWidgetMediaKitNew extends StatefulWidget {
     this.isFromMemories = false,
     required this.onStreamChange,
     this.preview,
+    required this.selectedPreview,
     super.key,
   });
 
@@ -55,6 +58,7 @@ class _VideoWidgetMediaKitNewState extends State<VideoWidgetMediaKitNew>
   bool isGuestView = false;
   late final StreamSubscription<GuestViewEvent> _guestViewEventSubscription;
   bool _isGuestView = false;
+  StreamSubscription<StreamSwitchedEvent>? _streamSwitchedSubscription;
 
   @override
   void initState() {
@@ -63,9 +67,41 @@ class _VideoWidgetMediaKitNewState extends State<VideoWidgetMediaKitNew>
     );
     super.initState();
     WidgetsBinding.instance.addObserver(this);
-    if (widget.preview != null) {
-      _setVideoController(widget.preview!.path);
-    } else if (widget.file.isRemoteFile) {
+
+    if (widget.selectedPreview) {
+      loadPreview();
+    } else {
+      loadOriginal();
+    }
+
+    pauseVideoSubscription = Bus.instance.on<PauseVideoEvent>().listen((event) {
+      player.pause();
+    });
+    _guestViewEventSubscription =
+        Bus.instance.on<GuestViewEvent>().listen((event) {
+      setState(() {
+        _isGuestView = event.isGuestView;
+      });
+    });
+    _streamSwitchedSubscription =
+        Bus.instance.on<StreamSwitchedEvent>().listen((event) {
+      if (event.type != PlayerType.mediaKit || !mounted) return;
+      if (event.selectedPreview) {
+        loadPreview();
+      } else {
+        loadOriginal();
+      }
+    });
+  }
+
+  void loadPreview() {
+    print("[vwmkn] PREVIEW");
+    _setVideoController(widget.preview!.path);
+  }
+
+  void loadOriginal() {
+    print("[vwmkn] ORIGINAL");
+    if (widget.file.isRemoteFile) {
       _loadNetworkVideo();
       _setFileSizeIfNull();
     } else if (widget.file.isSharedMediaToAppSandbox) {
@@ -92,16 +128,6 @@ class _VideoWidgetMediaKitNewState extends State<VideoWidgetMediaKitNew>
         }
       });
     }
-
-    pauseVideoSubscription = Bus.instance.on<PauseVideoEvent>().listen((event) {
-      player.pause();
-    });
-    _guestViewEventSubscription =
-        Bus.instance.on<GuestViewEvent>().listen((event) {
-      setState(() {
-        _isGuestView = event.isGuestView;
-      });
-    });
   }
 
   @override
@@ -115,6 +141,7 @@ class _VideoWidgetMediaKitNewState extends State<VideoWidgetMediaKitNew>
 
   @override
   void dispose() {
+    _streamSwitchedSubscription?.cancel();
     _guestViewEventSubscription.cancel();
     pauseVideoSubscription.cancel();
     removeCallBack(widget.file);
@@ -147,7 +174,7 @@ class _VideoWidgetMediaKitNewState extends State<VideoWidgetMediaKitNew>
                 widget.playbackCallback,
                 isFromMemories: widget.isFromMemories,
                 onStreamChange: widget.onStreamChange,
-                isPreviewPlayer: widget.preview != null,
+                isPreviewPlayer: widget.selectedPreview,
               )
             : const Center(
                 child: EnteLoadingWidget(
@@ -203,8 +230,10 @@ class _VideoWidgetMediaKitNewState extends State<VideoWidgetMediaKitNew>
   void _setVideoController(String url) {
     if (mounted) {
       setState(() {
-        player.setPlaylistMode(PlaylistMode.single);
-        controller = VideoController(player);
+        if (controller == null) {
+          player.setPlaylistMode(PlaylistMode.single);
+          controller = VideoController(player);
+        }
         player.open(Media(url), play: _isAppInFG);
       });
     }
diff --git a/mobile/lib/ui/viewer/file/video_widget_native.dart b/mobile/lib/ui/viewer/file/video_widget_native.dart
index ebee67c8f0..13d67faac6 100644
--- a/mobile/lib/ui/viewer/file/video_widget_native.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_native.dart
@@ -10,6 +10,7 @@ import "package:photos/core/constants.dart";
 import "package:photos/core/event_bus.dart";
 import "package:photos/events/guest_view_event.dart";
 import "package:photos/events/pause_video_event.dart";
+import "package:photos/events/stream_switched_event.dart";
 import "package:photos/events/use_media_kit_for_video.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/models/file/extensions/file_props.dart";
@@ -39,6 +40,7 @@ class VideoWidgetNative extends StatefulWidget {
   final bool isFromMemories;
   final void Function()? onStreamChange;
   final File? preview;
+  final bool selectedPreview;
 
   const VideoWidgetNative(
     this.file, {
@@ -48,6 +50,7 @@ class VideoWidgetNative extends StatefulWidget {
     required this.onStreamChange,
     super.key,
     this.preview,
+    required this.selectedPreview,
   });
 
   @override
@@ -74,6 +77,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
   final _debouncer = Debouncer(const Duration(milliseconds: 2000));
   final _elTooltipController = ElTooltipController();
   StreamSubscription<PlaybackEvent>? _subscription;
+  StreamSubscription<StreamSwitchedEvent>? _streamSwitchedSubscription;
   int position = 0;
 
   @override
@@ -83,9 +87,39 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
     );
     super.initState();
     WidgetsBinding.instance.addObserver(this);
-    if (widget.preview != null) {
-      _setFilePathForNativePlayer(widget.preview!.path);
-    } else if (widget.file.isRemoteFile) {
+
+    if (widget.selectedPreview) {
+      loadPreview();
+    } else {
+      loadOriginal();
+    }
+
+    pauseVideoSubscription = Bus.instance.on<PauseVideoEvent>().listen((event) {
+      _controller?.pause();
+    });
+    _guestViewEventSubscription =
+        Bus.instance.on<GuestViewEvent>().listen((event) {
+      setState(() {
+        _isGuestView = event.isGuestView;
+      });
+    });
+    _streamSwitchedSubscription =
+        Bus.instance.on<StreamSwitchedEvent>().listen((event) {
+      if (event.type != PlayerType.nativeVideoPlayer) return;
+      if (event.selectedPreview) {
+        loadPreview();
+      } else {
+        loadOriginal();
+      }
+    });
+  }
+
+  void loadPreview() {
+    _setFilePathForNativePlayer(widget.preview!.path);
+  }
+
+  void loadOriginal() {
+    if (widget.file.isRemoteFile) {
       _loadNetworkVideo();
       _setFileSizeIfNull();
     } else if (widget.file.isSharedMediaToAppSandbox) {
@@ -112,16 +146,6 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
         }
       });
     }
-
-    pauseVideoSubscription = Bus.instance.on<PauseVideoEvent>().listen((event) {
-      _controller?.pause();
-    });
-    _guestViewEventSubscription =
-        Bus.instance.on<GuestViewEvent>().listen((event) {
-      setState(() {
-        _isGuestView = event.isGuestView;
-      });
-    });
   }
 
   @override
@@ -150,6 +174,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
         );
       }
     }
+    _streamSwitchedSubscription?.cancel();
     _guestViewEventSubscription.cancel();
     pauseVideoSubscription.cancel();
     removeCallBack(widget.file);
@@ -162,6 +187,8 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
     _isSeeking.dispose();
     _debouncer.cancelDebounceTimer();
     _elTooltipController.dispose();
+    _controller?.dispose();
+    _controller = null;
     super.dispose();
   }
 
@@ -289,7 +316,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
                                     return PreviewStatusWidget(
                                       showControls: value,
                                       file: widget.file,
-                                      isPreviewPlayer: widget.preview != null,
+                                      isPreviewPlayer: widget.selectedPreview,
                                       onStreamChange: widget.onStreamChange,
                                     );
                                   },

From 8a615c34efe2c2b2af0079e476e4c6754a756a9e Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Fri, 21 Feb 2025 17:37:22 +0530
Subject: [PATCH 434/796] fix: for media kit android

---
 mobile/lib/ui/viewer/file/video_widget.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/ui/viewer/file/video_widget.dart b/mobile/lib/ui/viewer/file/video_widget.dart
index 2172f01afa..1c000d20c8 100644
--- a/mobile/lib/ui/viewer/file/video_widget.dart
+++ b/mobile/lib/ui/viewer/file/video_widget.dart
@@ -144,7 +144,7 @@ class _VideoWidgetState extends State<VideoWidget> {
             Bus.instance.fire(
               StreamSwitchedEvent(
                 selectPreviewForPlay,
-                Platform.isAndroid
+                Platform.isAndroid && useNativeVideoPlayer
                     ? PlayerType.nativeVideoPlayer
                     : PlayerType.mediaKit,
               ),

From 64712e560048cf226e17852c1be462d4456dd90f Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Fri, 21 Feb 2025 17:37:35 +0530
Subject: [PATCH 435/796] chore: bump version again

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 42aca33e20..62e80a9762 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.99+1004
+version: 0.9.99+1005
 publish_to: none
 
 environment:

From d50171bf7ff416d23e7b723f958e8f09f2e3dbeb Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Fri, 21 Feb 2025 17:50:44 +0530
Subject: [PATCH 436/796] fix: android sdk 35

---
 mobile/android/app/build.gradle | 4 ++--
 mobile/android/build.gradle     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index ad09d00b94..cc8c5bf5a3 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -28,7 +28,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 34
+    compileSdkVersion 35
     ndkVersion "26.0.10792818"
 
     sourceSets {
@@ -44,7 +44,7 @@ android {
     defaultConfig {
         applicationId "io.ente.photos"
         minSdkVersion 26
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/mobile/android/build.gradle b/mobile/android/build.gradle
index 0552ef7fe4..7f8bee8a49 100644
--- a/mobile/android/build.gradle
+++ b/mobile/android/build.gradle
@@ -13,8 +13,8 @@ allprojects {
         }
     }
     ext {
-        compileSdkVersion   = 34
-        targetSdkVersion    = 34
+        compileSdkVersion   = 35
+        targetSdkVersion    = 35
         appCompatVersion    = "1.7.0"
     }
 }

From 0d7f87381a4d06e0f4a0a6fe082b3270863ba87d Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Fri, 21 Feb 2025 17:51:11 +0530
Subject: [PATCH 437/796] chore: down version

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 62e80a9762..42aca33e20 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.99+1005
+version: 0.9.99+1004
 publish_to: none
 
 environment:

From 10e675a81cc0c83e74b5413ec9a75f14e853ceab Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Fri, 21 Feb 2025 17:53:04 +0530
Subject: [PATCH 438/796] chore: bump pod file

---
 mobile/ios/Podfile.lock | 110 ++++++++++++++++++++--------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index 68c5ab0e89..1ef345a144 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -440,82 +440,82 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/wakelock_plus/ios"
 
 SPEC CHECKSUMS:
-  background_fetch: 39f11371c0dce04b001c4bfd5e782bcccb0a85e2
-  battery_info: 09f5c9ee65394f2291c8c6227bedff345b8a730c
-  connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
-  cupertino_http: 947a233f40cfea55167a49f2facc18434ea117ba
-  dart_ui_isolate: d5bcda83ca4b04f129d70eb90110b7a567aece14
-  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
+  background_fetch: 94b36ee293e82972852dba8ede1fbcd3bd3d9d57
+  battery_info: a06b00c06a39bc94c92beebf600f1810cb6c8c87
+  connectivity_plus: 3f6c9057f4cd64198dc826edfb0542892f825343
+  cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
+  dart_ui_isolate: 46f6714abe6891313267153ef6f9748d8ecfcab1
+  device_info_plus: 335f3ce08d2e174b9fdc3db3db0f4e3b1f66bd89
   ffmpeg-kit-ios-full-gpl: 80adc341962e55ef709e36baa8ed9a70cf4ea62b
-  ffmpeg_kit_flutter_full_gpl: 8d15c14c0c3aba616fac04fe44b3d27d02e3c330
-  file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
+  ffmpeg_kit_flutter_full_gpl: ce18b888487c05c46ed252cd2e7956812f2e3bd1
+  file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
   Firebase: 98e6bf5278170668a7983e12971a66b2cd57fc8c
-  firebase_core: 2bedc3136ec7c7b8561c6123ed0239387b53f2af
-  firebase_messaging: 15d114e1a41fc31e4fbabcd48d765a19eec94a38
+  firebase_core: 085320ddfaacb80d1a96eac3a87857afcc150db1
+  firebase_messaging: d398edc15fe825f832836e74f6ac61e8cd2f3ad3
   FirebaseCore: a282032ae9295c795714ded2ec9c522fc237f8da
   FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2
   FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414
   FirebaseMessaging: c9ec7b90c399c7a6100297e9d16f8a27fc7f7152
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b
-  flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433
-  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
-  flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
-  flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
-  flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
-  flutter_sodium: c84426b4de738514b5b66cfdeb8a06634e72fe0b
-  fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c
+  flutter_email_sender: cd533cdc7ea5eda6fabb2c7f78521c71207778a4
+  flutter_image_compress: 4b058288a81f76e5e80340af37c709abafff34c4
+  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
+  flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100
+  flutter_native_splash: 35ddbc7228eafcb3969dcc5f1fbbe27c1145a4f0
+  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
+  flutter_sodium: 152647449ba89a157fd48d7e293dcd6d29c6ab0e
+  fluttertoast: 76fea30fcf04176325f6864c87306927bd7d2038
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
-  home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57
-  image_editor_common: d6f6644ae4a6de80481e89fe6d0a8c49e30b4b43
-  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
-  in_app_purchase_storekit: 8c3b0b3eb1b0f04efbff401c3de6266d4258d433
-  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
+  home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
+  image_editor_common: 3de87e7c4804f4ae24c8f8a998362b98c105cac1
+  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
+  in_app_purchase_storekit: e126ef1b89e4a9fdf07e28f005f82632b4609437
+  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
   libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
-  local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
-  local_auth_ios: 5046a18c018dd973247a0564496c8898dbb5adf9
+  local_auth_darwin: 553ce4f9b16d3fdfeafce9cf042e7c9f77c1c391
+  local_auth_ios: f7a1841beef3151d140a967c2e46f30637cdf451
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
-  maps_launcher: 2e5b6a2d664ec6c27f82ffa81b74228d770ab203
-  media_extension: 6d30dc1431ebaa63f43c397c37917b1a0a597a4c
-  media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
-  media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
-  motion_sensors: 03f55b7c637a7e365a0b5f9697a449f9059d5d91
-  motionphoto: d4a432b8c8f22fb3ad966258597c0103c9c5ff16
-  move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d
+  maps_launcher: edf829809ba9e894d70e569bab11c16352dedb45
+  media_extension: a1fec16ee9c8241a6aef9613578ebf097d6c5e64
+  media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
+  media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
+  motion_sensors: 741e702c17467b9569a92165dda8d4d88c6167f1
+  motionphoto: 584b43031ead3060225cdff08fa49818879801d2
+  move_to_background: 155f7bfbd34d43ad847cb630d2d2d87c17199710
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  native_video_player: d12af78a1a4a8cf09775a5177d5b392def6fd23c
-  objective_c: 77e887b5ba1827970907e10e832eec1683f3431d
-  onnxruntime: e7c2ae44385191eaad5ae64c935a72debaddc997
+  native_video_player: e363dd14f6a498ad8a8f7e6486a0db046ad19f13
+  objective_c: 89e720c30d716b036faf9c9684022048eee1eee2
+  onnxruntime: f9b296392c96c42882be020a59dbeac6310d81b2
   onnxruntime-c: a909204639a1f035f575127ac406f781ac797c9c
   onnxruntime-objc: b6fab0f1787aa6f7190c2013f03037df4718bd8b
-  open_mail_app: 794172f6a22cd16319d3ddaf45e945b2f74952b0
+  open_mail_app: 06d5a4162866388a92b1df3deb96e56be20cf45c
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
-  photo_manager: ff695c7a1dd5bc379974953a2b5c0a293f7c4c8a
-  privacy_screen: 1a131c052ceb3c3659934b003b0d397c2381a24e
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
+  photo_manager: d2fbcc0f2d82458700ee6256a15018210a81d413
+  privacy_screen: 3159a541f5d3a31bea916cfd4e58f9dc722b3fd4
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  receive_sharing_intent: df9c334dc9feadcbd3266e5cb49c8443405e1c9f
+  receive_sharing_intent: f6a12b7e8f7ed745f61c982de8a65de88db44a44
   SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
   Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
-  sentry_flutter: 0eb93e5279eb41e2392212afe1ccd2fecb4f8cbe
-  share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sqflite_darwin: a553b1fd6fe66f53bbb0fe5b4f5bab93f08d7a13
+  sentry_flutter: 0a211008f52553ba5dd81ceb71f48d78f0f1f6ab
+  share_plus: 011d6fb4f9d2576b83179a3a5c5e323202cdabcf
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sqflite_darwin: 44bb54cc302bff1fbe5752293aba1820b157cf1c
   sqlite3: 0bb0e6389d824e40296f531b858a2a0b71c0d2fb
-  sqlite3_flutter_libs: c00457ebd31e59fa6bb830380ddba24d44fbcd3b
-  system_info_plus: 5393c8da281d899950d751713575fbf91c7709aa
+  sqlite3_flutter_libs: 9379996d65aa23dcda7585a5b58766cebe0aa042
+  system_info_plus: 555ce7047fbbf29154726db942ae785c29211740
   Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
-  ua_client_hints: 46bb5817a868f9e397c0ba7e3f2f5c5d90c35156
-  uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
-  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
-  video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1
-  volume_controller: 2e3de73d6e7e81a0067310d17fb70f2f86d71ac7
-  wakelock_plus: 373cfe59b235a6dd5837d0fb88791d2f13a90d56
+  ua_client_hints: 0b48eae1134283f5b131ee0871fa878377f07a01
+  uni_links: ed8c961e47ed9ce42b6d91e1de8049e38a4b3152
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
+  video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
+  video_thumbnail: b637e0ad5f588ca9945f6e2c927f73a69a661140
+  volume_controller: 3657a1f65bedb98fa41ff7dc5793537919f31b12
+  wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49
 
 PODFILE CHECKSUM: 20e086e6008977d43a3d40260f3f9bffcac748dd
 

From 5e6860f2cd6de89bb167b1bce4c852385201a2a9 Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Fri, 21 Feb 2025 20:04:12 +0530
Subject: [PATCH 439/796] [mob][photos] Avoid localIDs of non-existant assets
 from being passed to photo_manager's deleteWithIds() when using free up space
 feature to avoid complete failure of free up space operation

---
 mobile/lib/db/files_db.dart            | 21 ++++++++++++++++-----
 mobile/lib/utils/delete_file_util.dart | 18 +++++++++++++-----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/mobile/lib/db/files_db.dart b/mobile/lib/db/files_db.dart
index c734044c4c..8b36d6d580 100644
--- a/mobile/lib/db/files_db.dart
+++ b/mobile/lib/db/files_db.dart
@@ -1272,15 +1272,26 @@ class FilesDB {
     );
   }
 
-  Future<List<EnteFile>> getLocalFiles(List<String> localIDs) async {
+  Future<List<EnteFile>> getLocalFiles(
+    List<String> localIDs, {
+    bool dedupeByLocalID = false,
+  }) async {
+    late final String query;
     final inParam = localIDs.map((id) => "'$id'").join(',');
     final db = await instance.sqliteAsyncDB;
-    final results = await db.getAll(
-      '''
+    if (dedupeByLocalID) {
+      query = '''
+      SELECT * FROM $filesTable
+      WHERE $columnLocalID IN ($inParam)
+      GROUP BY $columnLocalID;
+    ''';
+    } else {
+      query = '''
       SELECT * FROM $filesTable
       WHERE $columnLocalID IN ($inParam);
-    ''',
-    );
+    ''';
+    }
+    final results = await db.getAll(query);
     return convertToFiles(results);
   }
 
diff --git a/mobile/lib/utils/delete_file_util.dart b/mobile/lib/utils/delete_file_util.dart
index 3a1dc7c25d..03e5455a88 100644
--- a/mobile/lib/utils/delete_file_util.dart
+++ b/mobile/lib/utils/delete_file_util.dart
@@ -325,18 +325,26 @@ Future<bool> deleteLocalFiles(
   BuildContext context,
   List<String> localIDs,
 ) async {
+  final files =
+      await FilesDB.instance.getLocalFiles(localIDs, dedupeByLocalID: true);
   final List<String> deletedIDs = [];
   final List<String> localAssetIDs = [];
   final List<String> localSharedMediaIDs = [];
+  final List<String> alreadyDeletedIDs = []; // to ignore already deleted files
+
   try {
-    for (String id in localIDs) {
-      if (id.startsWith(oldSharedMediaIdentifier) ||
-          id.startsWith(sharedMediaIdentifier)) {
-        localSharedMediaIDs.add(id);
+    for (final file in files) {
+      if (!(await _localFileExist(file))) {
+        _logger.warning("Already deleted " + file.toString());
+        alreadyDeletedIDs.add(file.localID!);
+      } else if (file.localID!.startsWith(oldSharedMediaIdentifier) ||
+          file.localID!.startsWith(sharedMediaIdentifier)) {
+        localSharedMediaIDs.add(file.localID!);
       } else {
-        localAssetIDs.add(id);
+        localAssetIDs.add(file.localID!);
       }
     }
+    deletedIDs.addAll(alreadyDeletedIDs);
     deletedIDs.addAll(await _tryDeleteSharedMediaFiles(localSharedMediaIDs));
 
     final bool shouldDeleteInBatches =

From 8a5cc0c2210f65fc98175bb16835fe696bbc8a8c Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Fri, 21 Feb 2025 20:55:52 +0530
Subject: [PATCH 440/796] feat: push all changes

---
 mobile/.metadata                              |   4 +-
 mobile/android/.gitignore                     |   6 +
 mobile/android/app/build.gradle               |  30 +-
 mobile/android/build.gradle                   |   4 +-
 mobile/android/gradle.properties              |   2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   4 +-
 mobile/android/settings.gradle                |   6 +-
 .../viewer/file/zoomable_live_image_new.dart  |   2 +
 mobile/lib/utils/file_util.dart               |   4 +-
 mobile/pubspec.lock                           | 564 ++++++++++--------
 mobile/pubspec.yaml                           |  48 +-
 11 files changed, 374 insertions(+), 300 deletions(-)

diff --git a/mobile/.metadata b/mobile/.metadata
index 01d2dcb9ad..98bea013b5 100644
--- a/mobile/.metadata
+++ b/mobile/.metadata
@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: 0b8abb4724aa590dd0f429683339b1e045a1594d
-  channel: stable
+  revision: "2663184aa79047d0a33a14a3b607954f8fdd8730"
+  channel: "stable"
 
 project_type: app
diff --git a/mobile/android/.gitignore b/mobile/android/.gitignore
index bc2100d8f7..55afd919c6 100644
--- a/mobile/android/.gitignore
+++ b/mobile/android/.gitignore
@@ -5,3 +5,9 @@ gradle-wrapper.jar
 /gradlew.bat
 /local.properties
 GeneratedPluginRegistrant.java
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/to/reference-keystore
+key.properties
+**/*.keystore
+**/*.jks
diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index cc8c5bf5a3..67f7e6c913 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -28,25 +28,25 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 35
-    ndkVersion "26.0.10792818"
+    namespace = "io.ente.photos"
+    compileSdk = 35
+    ndkVersion = flutter.ndkVersion
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
-    lintOptions {
-        disable 'InvalidPackage'
-        warningsAsErrors false
-        checkReleaseBuilds false
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
-        applicationId "io.ente.photos"
-        minSdkVersion 26
-        targetSdkVersion 35
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        applicationId = "io.ente.photos"
+        minSdk = 26
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         consumerProguardFiles 'proguard-rules.pro'
@@ -115,14 +115,14 @@ rootProject.allprojects {
                 if (details.requested.group == 'com.github.bumptech.glide'
                         && details.requested.name.contains('glide')) {
                     details.useVersion "4.15.1"
-                }
             }
+          }
         }
     }
 }
 
 flutter {
-    source '../..'
+    source = "../.."
 }
 
 dependencies {
diff --git a/mobile/android/build.gradle b/mobile/android/build.gradle
index 7f8bee8a49..1a2fc3752d 100644
--- a/mobile/android/build.gradle
+++ b/mobile/android/build.gradle
@@ -19,11 +19,11 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {
diff --git a/mobile/android/gradle.properties b/mobile/android/gradle.properties
index ed508580fa..2597170821 100644
--- a/mobile/android/gradle.properties
+++ b/mobile/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4608m
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/mobile/android/gradle/wrapper/gradle-wrapper.properties b/mobile/android/gradle/wrapper/gradle-wrapper.properties
index a7e3608ded..7bb2df6ba6 100644
--- a/mobile/android/gradle/wrapper/gradle-wrapper.properties
+++ b/mobile/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
-distributionSha256Sum=a8da5b02437a60819cad23e10fc7e9cf32bcb57029d9cb277e26eeff76ce014b
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
diff --git a/mobile/android/settings.gradle b/mobile/android/settings.gradle
index 0fff0ecaf2..b9e43bd376 100644
--- a/mobile/android/settings.gradle
+++ b/mobile/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.1.2" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.21" apply false
+    id "com.android.application" version "8.1.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 
-include ":app"
\ No newline at end of file
+include ":app"
diff --git a/mobile/lib/ui/viewer/file/zoomable_live_image_new.dart b/mobile/lib/ui/viewer/file/zoomable_live_image_new.dart
index 74be3d954e..9a4fb6eafa 100644
--- a/mobile/lib/ui/viewer/file/zoomable_live_image_new.dart
+++ b/mobile/lib/ui/viewer/file/zoomable_live_image_new.dart
@@ -6,6 +6,7 @@ import 'package:logging/logging.dart';
 import "package:media_kit/media_kit.dart";
 import "package:media_kit_video/media_kit_video.dart";
 import 'package:motion_photos/motion_photos.dart';
+import "package:path_provider/path_provider.dart";
 import "package:photos/core/event_bus.dart";
 import "package:photos/events/guest_view_event.dart";
 import "package:photos/generated/l10n.dart";
@@ -202,6 +203,7 @@ class _ZoomableLiveImageNewState extends State<ZoomableLiveImageNew>
           ).ignore();
         }
         return motionPhoto.getMotionVideoFile(
+          await getTemporaryDirectory(),
           index: index,
         );
       } else if (_enteFile.isMotionPhoto && _enteFile.canEditMetaInfo) {
diff --git a/mobile/lib/utils/file_util.dart b/mobile/lib/utils/file_util.dart
index 8b0f76669f..facde2840e 100644
--- a/mobile/lib/utils/file_util.dart
+++ b/mobile/lib/utils/file_util.dart
@@ -254,7 +254,7 @@ Future<_LivePhoto?> _downloadLivePhoto(
             if (compressResult == null) {
               throw Exception("Failed to compress file");
             } else {
-              imageConvertedFile = compressResult;
+              imageConvertedFile = File(compressResult.path);
             }
           }
           imageFileCache = await DefaultCacheManager().putFile(
@@ -316,7 +316,7 @@ Future<File?> _downloadAndCache(
       if (compressResult == null) {
         throw Exception("Failed to convert heic to jpg");
       } else {
-        outputFile = compressResult;
+        outputFile = File(compressResult.path);
       }
       await decryptedFile.delete();
     }
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index fb7b9beb6a..1fd9c3522e 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -13,10 +13,10 @@ packages:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: "5534e701a2c505fed1f0799e652dd6ae23bd4d2c4cf797220e5ced5764a7c1c2"
+      sha256: "401dd18096f5eaa140404ccbbbf346f83c850e6f27049698a7ee75a3488ddb32"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.44"
+    version: "1.3.52"
   _macros:
     dependency: transitive
     description: dart
@@ -42,10 +42,10 @@ packages:
     dependency: "direct main"
     description:
       name: android_intent_plus
-      sha256: "38921ec22ebb3b9a7eb678792cf6fab0b6f458b61b9d327688573449c9b47db3"
+      sha256: dfc1fd3a577205ae8f11e990fb4ece8c90cceabbee56fcf48e463ecf0bd6aae3
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.0"
+    version: "5.3.0"
   animate_do:
     dependency: "direct main"
     description:
@@ -90,10 +90,10 @@ packages:
     dependency: transitive
     description:
       name: args
-      sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
+      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.0"
   asn1lib:
     dependency: transitive
     description:
@@ -121,10 +121,11 @@ packages:
   battery_info:
     dependency: "direct main"
     description:
-      name: battery_info
-      sha256: "5d5249c87a600a0a20d6b2f5ffdf90d711bccb1bfd3a58e5a6228f270031c680"
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: HEAD
+      resolved-ref: "95c7a9f0400b968b3bfdc98c8c10a07fb4a62ea2"
+      url: "https://github.com/ente-io/battery_info"
+    source: git
     version: "1.1.1"
   bip39:
     dependency: "direct main"
@@ -202,10 +203,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb
+      sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2"
       url: "https://pub.dev"
     source: hosted
-    version: "8.9.2"
+    version: "8.9.3"
   cached_network_image:
     dependency: "direct main"
     description:
@@ -268,10 +269,10 @@ packages:
     dependency: transitive
     description:
       name: cli_util
-      sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
+      sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.1"
+    version: "0.4.2"
   clock:
     dependency: transitive
     description:
@@ -284,10 +285,10 @@ packages:
     dependency: transitive
     description:
       name: code_builder
-      sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37
+      sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
       url: "https://pub.dev"
     source: hosted
-    version: "4.10.0"
+    version: "4.10.1"
   collection:
     dependency: "direct main"
     description:
@@ -309,10 +310,10 @@ packages:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: "2056db5241f96cdc0126bd94459fc4cdc13876753768fc7a31c425e50a7177d0"
+      sha256: "04bf81bb0b77de31557b58d052b24b3eee33f09a6e7a8c68a3e247c7df19ec27"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.5"
+    version: "6.1.3"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -325,18 +326,18 @@ packages:
     dependency: transitive
     description:
       name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
   coverage:
     dependency: transitive
     description:
       name: coverage
-      sha256: c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5
+      sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.2"
+    version: "1.11.1"
   cronet_http:
     dependency: transitive
     description:
@@ -357,18 +358,18 @@ packages:
     dependency: "direct main"
     description:
       name: crypto
-      sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27
+      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.6"
   csslib:
     dependency: transitive
     description:
       name: csslib
-      sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb"
+      sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.2"
   cupertino_http:
     dependency: transitive
     description:
@@ -405,10 +406,10 @@ packages:
     dependency: transitive
     description:
       name: dbus
-      sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac"
+      sha256: "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.10"
+    version: "0.7.11"
   defer_pointer:
     dependency: "direct main"
     description:
@@ -429,10 +430,10 @@ packages:
     dependency: transitive
     description:
       name: device_info_plus_platform_interface
-      sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba"
+      sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.1"
+    version: "7.0.2"
   dio:
     dependency: "direct main"
     description:
@@ -529,10 +530,10 @@ packages:
     dependency: "direct main"
     description:
       name: equatable
-      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
+      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.7"
   event_bus:
     dependency: "direct main"
     description:
@@ -577,10 +578,10 @@ packages:
     dependency: transitive
     description:
       name: extended_image_library
-      sha256: "9a94ec9314aa206cfa35f16145c3cd6e2c924badcc670eaaca8a3a8063a68cd7"
+      sha256: e61dafd94400fff6ef7ed1523d445ff3af137f198f3228e4a3107bc5b4bec5d1
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.5"
+    version: "4.0.6"
   fade_indexed_stack:
     dependency: "direct main"
     description:
@@ -658,10 +659,10 @@ packages:
     dependency: transitive
     description:
       name: file_selector_linux
-      sha256: "712ce7fab537ba532c8febdb1a8f167b32441e74acd68c3ccb2e36dcb52c4ab2"
+      sha256: "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.3"
+    version: "0.9.3+2"
   file_selector_macos:
     dependency: transitive
     description:
@@ -682,66 +683,66 @@ packages:
     dependency: transitive
     description:
       name: file_selector_windows
-      sha256: "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4"
+      sha256: "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.3+3"
+    version: "0.9.3+4"
   firebase_core:
     dependency: "direct main"
     description:
       name: firebase_core
-      sha256: "51dfe2fbf3a984787a2e7b8592f2f05c986bfedd6fdacea3f9e0a7beb334de96"
+      sha256: "6a4ea0f1d533443c8afc3d809cd36a4e2b8f2e2e711f697974f55bb31d71d1b8"
       url: "https://pub.dev"
     source: hosted
-    version: "3.6.0"
+    version: "3.12.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
       name: firebase_core_platform_interface
-      sha256: e30da58198a6d4b49d5bce4e852f985c32cb10db329ebef9473db2b9f09ce810
+      sha256: d7253d255ff10f85cfd2adaba9ac17bae878fa3ba577462451163bd9f1d1f0bf
       url: "https://pub.dev"
     source: hosted
-    version: "5.3.0"
+    version: "5.4.0"
   firebase_core_web:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: f967a7138f5d2ffb1ce15950e2a382924239eaa521150a8f144af34e68b3b3e5
+      sha256: e47f5c2776de018fa19bc9f6f723df136bc75cdb164d64b65305babd715c8e41
       url: "https://pub.dev"
     source: hosted
-    version: "2.18.1"
+    version: "2.21.0"
   firebase_messaging:
     dependency: "direct main"
     description:
       name: firebase_messaging
-      sha256: eb6e28a3a35deda61fe8634967c84215efc19133ba58d8e0fc6c9a2af2cba05e
+      sha256: "8755a083a20bac4485e8b46d223f6f2eab34e659a76a75f8cf3cded53bc98a15"
       url: "https://pub.dev"
     source: hosted
-    version: "15.1.3"
+    version: "15.2.3"
   firebase_messaging_platform_interface:
     dependency: transitive
     description:
       name: firebase_messaging_platform_interface
-      sha256: b316c4ee10d93d32c033644207afc282d9b2b4372f3cf9c6022f3558b3873d2d
+      sha256: "8cc771079677460de53ad8fcca5bc3074d58c5fc4f9d89b19585e5bfd9c64292"
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.46"
+    version: "4.6.3"
   firebase_messaging_web:
     dependency: transitive
     description:
       name: firebase_messaging_web
-      sha256: d7f0147a1a9fe4313168e20154a01fd5cf332898de1527d3930ff77b8c7f5387
+      sha256: caa73059b0396c97f691683c4cfc3f897c8543801579b7dd4851c431d8e4e091
       url: "https://pub.dev"
     source: hosted
-    version: "3.9.2"
+    version: "3.10.3"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -751,10 +752,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_animate
-      sha256: "7c8a6594a9252dad30cc2ef16e33270b6248c4dedc3b3d06c86c4f3f4dc05ae5"
+      sha256: "7befe2d3252728afb77aecaaea1dec88a89d35b9b1d2eea6d04479e8af9117b5"
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.0"
+    version: "4.5.2"
   flutter_cache_manager:
     dependency: "direct main"
     description:
@@ -804,26 +805,66 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_email_sender
-      sha256: "9e253c69617f43d4cb5de672e93a7a19c12a21fb6a75e66c6ce7626336c4c1bc"
+      sha256: d39eb5e91358fc19ec4050da69accec21f9d5b2b6bcf188aa246327b6ca2352c
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.0"
+    version: "7.0.0"
   flutter_image_compress:
     dependency: "direct main"
     description:
       name: flutter_image_compress
-      sha256: "37f1b26399098e5f97b74c1483f534855e7dff68ead6ddaccf747029fb03f29f"
+      sha256: "51d23be39efc2185e72e290042a0da41aed70b14ef97db362a6b5368d0523b27"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.3"
+    version: "2.4.0"
+  flutter_image_compress_common:
+    dependency: transitive
+    description:
+      name: flutter_image_compress_common
+      sha256: c5c5d50c15e97dd7dc72ff96bd7077b9f791932f2076c5c5b6c43f2c88607bfb
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
+  flutter_image_compress_macos:
+    dependency: transitive
+    description:
+      name: flutter_image_compress_macos
+      sha256: "20019719b71b743aba0ef874ed29c50747461e5e8438980dfa5c2031898f7337"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.3"
+  flutter_image_compress_ohos:
+    dependency: transitive
+    description:
+      name: flutter_image_compress_ohos
+      sha256: e76b92bbc830ee08f5b05962fc78a532011fcd2041f620b5400a593e96da3f51
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.0.3"
+  flutter_image_compress_platform_interface:
+    dependency: transitive
+    description:
+      name: flutter_image_compress_platform_interface
+      sha256: "579cb3947fd4309103afe6442a01ca01e1e6f93dc53bb4cbd090e8ce34a41889"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.5"
+  flutter_image_compress_web:
+    dependency: transitive
+    description:
+      name: flutter_image_compress_web
+      sha256: b9b141ac7c686a2ce7bb9a98176321e1182c9074650e47bb140741a44b6f5a96
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.5"
   flutter_inappwebview:
     dependency: "direct main"
     description:
       name: flutter_inappwebview
-      sha256: "93cfcca02bdda4b26cd700cf70d9ddba09d8348e3e8f2857638c23ed23a4fcb4"
+      sha256: "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.4"
+    version: "6.1.5"
   flutter_inappwebview_android:
     dependency: transitive
     description:
@@ -836,10 +877,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_inappwebview_internal_annotations
-      sha256: "5f80fd30e208ddded7dbbcd0d569e7995f9f63d45ea3f548d8dd4c0b473fb4c8"
+      sha256: "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.2.0"
   flutter_inappwebview_ios:
     dependency: transitive
     description:
@@ -876,10 +917,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_inappwebview_windows
-      sha256: "95ebc65aecfa63b2084c822aec6ba0545f0a0afaa3899f2c752ec96c09108db5"
+      sha256: "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0+2"
+    version: "0.6.0"
   flutter_launcher_icons:
     dependency: "direct main"
     description:
@@ -900,10 +941,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: "49eeef364fddb71515bc78d5a8c51435a68bccd6e4d68e25a942c5e47761ae71"
+      sha256: "674173fd3c9eda9d4c8528da2ce0ea69f161577495a9cc835a2a4ecd7eadeb35"
       url: "https://pub.dev"
     source: hosted
-    version: "17.2.3"
+    version: "17.2.4"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
@@ -953,10 +994,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_native_splash
-      sha256: aa06fec78de2190f3db4319dd60fdc8d12b2626e93ef9828633928c2dcaea840
+      sha256: "7062602e0dbd29141fb8eb19220b5871ca650be5197ab9c1f193a28b17537bc7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.4"
   flutter_password_strength:
     dependency: "direct main"
     description:
@@ -969,10 +1010,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398"
+      sha256: "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.23"
+    version: "2.0.24"
   flutter_secure_storage:
     dependency: "direct main"
     description:
@@ -1032,10 +1073,11 @@ packages:
   flutter_sodium:
     dependency: "direct main"
     description:
-      name: flutter_sodium
-      sha256: "0e8c475088f8c9a60fda0ef19ee42cdcb574f8549c8ea809f736ef60e8ad51a6"
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: HEAD
+      resolved-ref: "134ecc72bc09d55500d240df677b8360f140f9ab"
+      url: "https://github.com/ente-io/flutter_sodium"
+    source: git
     version: "0.2.0"
   flutter_spinkit:
     dependency: transitive
@@ -1057,10 +1099,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_svg
-      sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2"
+      sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.10+1"
+    version: "2.0.17"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -1075,10 +1117,10 @@ packages:
     dependency: "direct main"
     description:
       name: fluttertoast
-      sha256: "95f349437aeebe524ef7d6c9bde3e6b4772717cf46a0eb6a3ceaddc740b297cc"
+      sha256: "25e51620424d92d3db3832464774a6143b5053f15e382d8ffbfd40b6e795dcf1"
       url: "https://pub.dev"
     source: hosted
-    version: "8.2.8"
+    version: "8.2.12"
   fraction:
     dependency: "direct main"
     description:
@@ -1120,18 +1162,18 @@ packages:
     dependency: transitive
     description:
       name: glob
-      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
+      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   google_nav_bar:
     dependency: "direct main"
     description:
       name: google_nav_bar
-      sha256: "1c8e3882fa66ee7b74c24320668276ca23affbd58f0b14a24c1e5590f4d07ab0"
+      sha256: bb12dd21514ee1b041ab3127673e2fd85e693337df308f7f2b75cd1e8e92eaf4
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.6"
+    version: "5.0.7"
   graphs:
     dependency: transitive
     description:
@@ -1160,10 +1202,10 @@ packages:
     dependency: transitive
     description:
       name: html
-      sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
+      sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec"
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.4"
+    version: "0.15.5"
   html_unescape:
     dependency: "direct main"
     description:
@@ -1176,10 +1218,10 @@ packages:
     dependency: "direct main"
     description:
       name: http
-      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
+      sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.3.0"
   http_client_helper:
     dependency: transitive
     description:
@@ -1192,10 +1234,10 @@ packages:
     dependency: transitive
     description:
       name: http_multi_server
-      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
+      sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.1"
+    version: "3.2.2"
   http_parser:
     dependency: transitive
     description:
@@ -1216,10 +1258,10 @@ packages:
     dependency: "direct main"
     description:
       name: image
-      sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
+      sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.0"
+    version: "4.3.0"
   image_editor:
     dependency: "direct main"
     description:
@@ -1264,26 +1306,26 @@ packages:
     dependency: transitive
     description:
       name: image_picker_android
-      sha256: d3e5e00fdfeca8fd4ffb3227001264d449cc8950414c2ff70b0e06b9c628e643
+      sha256: "82652a75e3dd667a91187769a6a2cc81bd8c111bbead698d8e938d2b63e5e89a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.12+15"
+    version: "0.8.12+21"
   image_picker_for_web:
     dependency: transitive
     description:
       name: image_picker_for_web
-      sha256: "65d94623e15372c5c51bebbcb820848d7bcb323836e12dfdba60b5d3a8b39e50"
+      sha256: "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.6"
   image_picker_ios:
     dependency: transitive
     description:
       name: image_picker_ios
-      sha256: "6703696ad49f5c3c8356d576d7ace84d1faf459afb07accbb0fae780753ff447"
+      sha256: "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.12"
+    version: "0.8.12+2"
   image_picker_linux:
     dependency: transitive
     description:
@@ -1296,18 +1338,18 @@ packages:
     dependency: transitive
     description:
       name: image_picker_macos
-      sha256: "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62"
+      sha256: "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.1+1"
+    version: "0.2.1+2"
   image_picker_platform_interface:
     dependency: transitive
     description:
       name: image_picker_platform_interface
-      sha256: "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80"
+      sha256: "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.0"
+    version: "2.10.1"
   image_picker_windows:
     dependency: transitive
     description:
@@ -1320,18 +1362,18 @@ packages:
     dependency: "direct main"
     description:
       name: in_app_purchase
-      sha256: "960f26a08d9351fb8f89f08901f8a829d41b04d45a694b8f776121d9e41dcad6"
+      sha256: "11a40f148eeb4f681a0572003e2b33432e110c90c1bbb4f9ef83b81ec0c4f737"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
   in_app_purchase_android:
     dependency: transitive
     description:
       name: in_app_purchase_android
-      sha256: bee60266e443d4ae0e4809bae7f9cd4d6be75ab5ec6bb3d2ca737774a274a3bd
+      sha256: "45ae4fe253f85b4fcc58b421fe137f6e48aca16bf8a618cd760cb0542e7f854e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.6+9"
+    version: "0.4.0"
   in_app_purchase_platform_interface:
     dependency: transitive
     description:
@@ -1344,10 +1386,10 @@ packages:
     dependency: transitive
     description:
       name: in_app_purchase_storekit
-      sha256: e9a408da11d055f9af9849859e1251b2b0a2f84f256fa3bf1285c5614a397079
+      sha256: "276831961023055b55a2156c1fc043f50f6215ff49fb0f5f2273da6eeb510ecf"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.18+1"
+    version: "0.3.21"
   integration_test:
     dependency: "direct dev"
     description: flutter
@@ -1365,18 +1407,18 @@ packages:
     dependency: "direct dev"
     description:
       name: intl_utils
-      sha256: c2b1f5c72c25512cbeef5ab015c008fc50fe7e04813ba5541c25272300484bf4
+      sha256: "35f9a55004871f241e24b07465cf402914992d8549a60205ee0816576a8ddee7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.7"
+    version: "2.8.8"
   io:
     dependency: transitive
     description:
       name: io
-      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
+      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   jni:
     dependency: transitive
     description:
@@ -1405,10 +1447,10 @@ packages:
     dependency: "direct dev"
     description:
       name: json_serializable
-      sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b
+      sha256: c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c
       url: "https://pub.dev"
     source: hosted
-    version: "6.8.0"
+    version: "6.9.0"
   latlong2:
     dependency: "direct main"
     description:
@@ -1493,10 +1535,10 @@ packages:
     dependency: transitive
     description:
       name: local_auth_darwin
-      sha256: "6d2950da311d26d492a89aeb247c72b4653ddc93601ea36a84924a396806d49c"
+      sha256: "630996cd7b7f28f5ab92432c4b35d055dd03a747bc319e5ffbb3c4806a3e50d2"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.3"
   local_auth_ios:
     dependency: "direct main"
     description:
@@ -1525,10 +1567,10 @@ packages:
     dependency: transitive
     description:
       name: logger
-      sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32"
+      sha256: be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.5.0"
   logging:
     dependency: "direct main"
     description:
@@ -1557,10 +1599,10 @@ packages:
     dependency: "direct main"
     description:
       name: maps_launcher
-      sha256: "57ba3c31db96e30f58c23fcb22a1fac6accc5683535b2cf344c534bbb9f8f910"
+      sha256: dac4c609720211fa6336b5903d917fe45e545c6b5665978efc3db2a3f436b1ae
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "3.0.0+1"
   matcher:
     dependency: transitive
     description:
@@ -1581,8 +1623,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: deeplink_fixes
-      resolved-ref: "520a200a6f76dece843f3e0eedb9b1f89c805cdf"
+      ref: HEAD
+      resolved-ref: "23a38887fa6b61330452555f8e686c3a3a1c91a2"
       url: "https://github.com/ente-io/media_extension.git"
     source: git
     version: "1.0.2"
@@ -1674,10 +1716,10 @@ packages:
     dependency: transitive
     description:
       name: mime
-      sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.6"
+    version: "2.0.0"
   ml_linalg:
     dependency: "direct main"
     description:
@@ -1699,10 +1741,10 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: f1ec3d35d5cee2ec1c098b5ca276f311a96d800a
+      resolved-ref: ddf5eba70103c2add7c20010430d9db654ddf95c
       url: "https://github.com/ente-io/motion_photo.git"
     source: git
-    version: "0.0.6"
+    version: "1.0.0"
   motion_sensors:
     dependency: transitive
     description:
@@ -1717,26 +1759,27 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: fc483093e065ed847de81df2af0651a394ffc75e
+      resolved-ref: "7814e2c61ee1fa74cef73b946eb08519c35bdaa5"
       url: "https://github.com/ente-io/motionphoto.git"
     source: git
     version: "0.0.1"
   move_to_background:
     dependency: "direct main"
     description:
-      name: move_to_background
-      sha256: "00caad17a6ce149910777131503f43f8ed80025681f94684e3a6a87d979b914c"
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: HEAD
+      resolved-ref: "3b862fea9665a50e59bcce96cab6997cc7c0cb9e"
+      url: "https://github.com/ente-io/move_to_background.git"
+    source: git
     version: "1.0.2"
   multicast_dns:
     dependency: transitive
     description:
       name: multicast_dns
-      sha256: "982c4cc4cda5f98dd477bddfd623e8e4bd1014e7dbf9e7b05052e14a5b550b99"
+      sha256: "0a568c8411ab0979ab8cd4af1c29b6d316d854ab81592463ccceb92b35fde813"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.2+7"
+    version: "0.3.2+8"
   nanoid:
     dependency: "direct main"
     description:
@@ -1820,19 +1863,20 @@ packages:
   open_mail_app:
     dependency: "direct main"
     description:
-      name: open_mail_app
-      sha256: ffc93edc0590ef4586136f505187b25014a336fe0374ad3cc528e727b3f2e726
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.4.5"
+      path: "."
+      ref: HEAD
+      resolved-ref: "68500a743d824108b236febe4cbd10a1b82c16b1"
+      url: "https://github.com/ente-io/open-mail-app-flutter.git"
+    source: git
+    version: "0.4.4"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
+      sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   package_info_plus:
     dependency: "direct main"
     description:
@@ -1853,10 +1897,10 @@ packages:
     dependency: "direct main"
     description:
       name: page_transition
-      sha256: dee976b1f23de9bbef5cd512fe567e9f6278caee11f5eaca9a2115c19dc49ef6
+      sha256: "9d2a780d7d68b53ae82fbcc43e06a16195e6775e9aae40e55dc0cbb593460f9d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.1"
   panorama:
     dependency: "direct main"
     description:
@@ -1894,10 +1938,10 @@ packages:
     dependency: transitive
     description:
       name: path_parsing
-      sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf
+      sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0"
   path_provider:
     dependency: "direct main"
     description:
@@ -1910,18 +1954,18 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
+      sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.12"
+    version: "2.2.15"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
+      sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   path_provider_linux:
     dependency: transitive
     description:
@@ -1958,42 +2002,42 @@ packages:
     dependency: "direct main"
     description:
       name: permission_handler
-      sha256: "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb"
+      sha256: "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849"
       url: "https://pub.dev"
     source: hosted
-    version: "11.3.1"
+    version: "11.4.0"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: "76e4ab092c1b240d31177bb64d2b0bea43f43d0e23541ec866151b9f7b2490fa"
+      sha256: d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc
       url: "https://pub.dev"
     source: hosted
-    version: "12.0.12"
+    version: "12.1.0"
   permission_handler_apple:
     dependency: transitive
     description:
       name: permission_handler_apple
-      sha256: e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0
+      sha256: f84a188e79a35c687c132a0a0556c254747a08561e99ab933f12f6ca71ef3c98
       url: "https://pub.dev"
     source: hosted
-    version: "9.4.5"
+    version: "9.4.6"
   permission_handler_html:
     dependency: transitive
     description:
       name: permission_handler_html
-      sha256: af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851
+      sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.3+2"
+    version: "0.1.3+5"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
-      sha256: e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9
+      sha256: eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.3"
+    version: "4.3.0"
   permission_handler_windows:
     dependency: transitive
     description:
@@ -2038,10 +2082,10 @@ packages:
     dependency: "direct main"
     description:
       name: pinput
-      sha256: "7bf9aa7d0eeb3da9f7d49d2087c7bc7d36cd277d2e94cc31c6da52e1ebb048d0"
+      sha256: "8a73be426a91fefec90a7f130763ca39772d547e92f19a827cf4aa02e323d35a"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "5.0.1"
   platform:
     dependency: transitive
     description:
@@ -2085,10 +2129,11 @@ packages:
   privacy_screen:
     dependency: "direct main"
     description:
-      name: privacy_screen
-      sha256: b80297d2726d96e8a8341149e81a415302755f02d3af7c05c820d9e191bbfbee
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: "pb/FIX-obsolete-android-plugin"
+      resolved-ref: "949de7b6beedf163507d649a71b1f55bc8f083ca"
+      url: "https://github.com/ente-io/privacy_screen.git"
+    source: git
     version: "0.0.6"
   process:
     dependency: transitive
@@ -2126,18 +2171,18 @@ packages:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
+      sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
+      sha256: "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   quiver:
     dependency: "direct main"
     description:
@@ -2150,10 +2195,10 @@ packages:
     dependency: "direct main"
     description:
       name: receive_sharing_intent
-      sha256: f127989f8662ea15e193bd1e10605e5a0ab6bb92dffd51f3ce002feb0ce24c93
+      sha256: ec76056e4d258ad708e76d85591d933678625318e411564dcb9059048ca3a593
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   rxdart:
     dependency: transitive
     description:
@@ -2206,58 +2251,58 @@ packages:
     dependency: "direct main"
     description:
       name: sentry
-      sha256: "033287044a6644a93498969449d57c37907e56f5cedb17b88a3ff20a882261dd"
+      sha256: "90c2f956c146bcc9c4843406dd4a65d08b25575828dc2ad51de0ca5cd713209f"
       url: "https://pub.dev"
     source: hosted
-    version: "8.9.0"
+    version: "8.13.2"
   sentry_flutter:
     dependency: "direct main"
     description:
       name: sentry_flutter
-      sha256: "3780b5a0bb6afd476857cfbc6c7444d969c29a4d9bd1aa5b6960aa76c65b737a"
+      sha256: ee6b41956ad570706bf5c2489915d71d75522d154200c0df24be2c4e5654ca21
       url: "https://pub.dev"
     source: hosted
-    version: "8.9.0"
+    version: "8.13.2"
   share_plus:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: "468c43f285207c84bcabf5737f33b914ceb8eb38398b91e5e3ad1698d1b72a52"
+      sha256: fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.2"
+    version: "10.1.4"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: "6ababf341050edff57da8b6990f11f4e99eaba837865e2e6defe16d039619db5"
+      sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "5.0.2"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051"
+      sha256: "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.5.2"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab"
+      sha256: a768fc8ede5f0c8e6150476e14f38e2417c0864ca36bb4582be8e21925a03c22
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.3"
+    version: "2.4.6"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d"
+      sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.3"
+    version: "2.5.4"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -2278,10 +2323,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e
+      sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.4.3"
   shared_preferences_windows:
     dependency: transitive
     description:
@@ -2318,10 +2363,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
+      sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   simple_cluster:
     dependency: "direct main"
     description:
@@ -2347,10 +2392,10 @@ packages:
     dependency: transitive
     description:
       name: source_helper
-      sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd"
+      sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.4"
+    version: "1.3.5"
   source_map_stack_trace:
     dependency: transitive
     description:
@@ -2363,10 +2408,10 @@ packages:
     dependency: transitive
     description:
       name: source_maps
-      sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703"
+      sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812"
       url: "https://pub.dev"
     source: hosted
-    version: "0.10.12"
+    version: "0.10.13"
   source_span:
     dependency: transitive
     description:
@@ -2387,10 +2432,10 @@ packages:
     dependency: "direct main"
     description:
       name: sqflite
-      sha256: "79a297dc3cc137e758c6a4baf83342b039e5a6d2436fcdf3f96a00adaaf2ad62"
+      sha256: "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   sqflite_android:
     dependency: transitive
     description:
@@ -2403,18 +2448,18 @@ packages:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: "4468b24876d673418a7b7147e5a08a715b4998a7ae69227acafaab762e0e5490"
+      sha256: "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.4+5"
+    version: "2.5.4+6"
   sqflite_darwin:
     dependency: transitive
     description:
       name: sqflite_darwin
-      sha256: "769733dddf94622d5541c73e4ddc6aa7b252d865285914b6fcd54a63c4b4f027"
+      sha256: "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1-1"
+    version: "2.4.1+1"
   sqflite_migration:
     dependency: "direct main"
     description:
@@ -2435,18 +2480,18 @@ packages:
     dependency: transitive
     description:
       name: sqlite3
-      sha256: "45f168ae2213201b54e09429ed0c593dc2c88c924a1488d6f9c523a255d567cb"
+      sha256: "32b632dda27d664f85520093ed6f735ae5c49b5b75345afb8b19411bc59bb53d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.6"
+    version: "2.7.4"
   sqlite3_flutter_libs:
     dependency: "direct main"
     description:
       name: sqlite3_flutter_libs
-      sha256: "62bbb4073edbcdf53f40c80775f33eea01d301b7b81417e5b3fb7395416258c1"
+      sha256: "57fafacd815c981735406215966ff7caaa8eab984b094f52e692accefcbd9233"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.24"
+    version: "0.5.30"
   sqlite_async:
     dependency: "direct main"
     description:
@@ -2483,10 +2528,10 @@ packages:
     dependency: transitive
     description:
       name: stream_transform
-      sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
+      sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
@@ -2539,10 +2584,10 @@ packages:
     dependency: "direct main"
     description:
       name: system_info_plus
-      sha256: b915c811c6605b802f3988859bc2bb79c95f735762a75b5451741f7a2b949d1b
+      sha256: df94187e95527f9cb459e6a9f6e0b1ea20c157d8029bc233de34b3c1e17e1c48
       url: "https://pub.dev"
     source: hosted
-    version: "0.0.5"
+    version: "0.0.6"
   term_glyph:
     dependency: transitive
     description:
@@ -2587,10 +2632,10 @@ packages:
     dependency: transitive
     description:
       name: timing
-      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
+      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   transparent_image:
     dependency: transitive
     description:
@@ -2611,25 +2656,26 @@ packages:
     dependency: transitive
     description:
       name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
   ua_client_hints:
     dependency: "direct main"
     description:
       name: ua_client_hints
-      sha256: dfea54a1b4d259c057d0f33f198094cf4e09e1a21d347baadbe6dbd3d820c0d4
+      sha256: "1b8759a46bfeab355252881df27f2604c01bded86aa2b578869fb1b638b23118"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
   uni_links:
     dependency: "direct main"
     description:
-      name: uni_links
-      sha256: "051098acfc9e26a9fde03b487bef5d3d228ca8f67693480c6f33fd4fbb8e2b6e"
-      url: "https://pub.dev"
-    source: hosted
+      path: uni_links
+      ref: HEAD
+      resolved-ref: b9168d982885bf64625154d6e6f8d68b92b98b49
+      url: "https://github.com/ente-io/uni_links.git"
+    source: git
     version: "0.5.1"
   uni_links_platform_interface:
     dependency: transitive
@@ -2683,42 +2729,42 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3"
+      sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.0"
+    version: "6.3.1"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "8fc3bae0b68c02c47c5c86fa8bfa74471d42687b0eded01b78de87872db745e2"
+      sha256: "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.12"
+    version: "6.3.14"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e
+      sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.1"
+    version: "6.3.2"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af
+      sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672"
+      sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.1"
+    version: "3.2.2"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -2739,10 +2785,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_windows
-      sha256: "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185"
+      sha256: "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.4"
   utility:
     dependency: transitive
     description:
@@ -2763,26 +2809,26 @@ packages:
     dependency: transitive
     description:
       name: vector_graphics
-      sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3"
+      sha256: "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.11+1"
+    version: "1.1.18"
   vector_graphics_codec:
     dependency: transitive
     description:
       name: vector_graphics_codec
-      sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da
+      sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.11+1"
+    version: "1.1.13"
   vector_graphics_compiler:
     dependency: transitive
     description:
       name: vector_graphics_compiler
-      sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81"
+      sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.11+1"
+    version: "1.1.16"
   vector_math:
     dependency: transitive
     description:
@@ -2813,41 +2859,42 @@ packages:
     dependency: transitive
     description:
       name: video_player_android
-      sha256: ae5287ca367e206eb74d7b3dc1ce0b8912ab9a3fc0597b6a101a0a5239f229d3
+      sha256: "391e092ba4abe2f93b3e625bd6b6a6ec7d7414279462c1c0ee42b5ab8d0a0898"
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.9"
+    version: "2.7.16"
   video_player_avfoundation:
     dependency: transitive
     description:
       name: video_player_avfoundation
-      sha256: cd5ab8a8bc0eab65ab0cea40304097edc46da574c8c1ecdee96f28cd8ef3792f
+      sha256: "84b4752745eeccb6e75865c9aab39b3d28eb27ba5726d352d45db8297fbd75bc"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.2"
+    version: "2.7.0"
   video_player_platform_interface:
     dependency: transitive
     description:
       name: video_player_platform_interface
-      sha256: "229d7642ccd9f3dc4aba169609dd6b5f3f443bb4cc15b82f7785fcada5af9bbb"
+      sha256: df534476c341ab2c6a835078066fc681b8265048addd853a1e3c78740316a844
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.3"
+    version: "6.3.0"
   video_player_web:
     dependency: transitive
     description:
       name: video_player_web
-      sha256: "6dcdd298136523eaf7dfc31abaf0dfba9aa8a8dbc96670e87e9d42b6f2caf774"
+      sha256: "3ef40ea6d72434edbfdba4624b90fd3a80a0740d260667d91e7ecd2d79e13476"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.4"
   video_thumbnail:
     dependency: "direct main"
     description:
-      name: video_thumbnail
-      sha256: "3455c189d3f0bb4e3fc2236475aa84fe598b9b2d0e08f43b9761f5bc44210016"
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: HEAD
+      resolved-ref: "61e72616a0c9e3f380eaeff08a20ae5ea7c57e84"
+      url: "https://github.com/ente-io/video_thumbnail_fork.git"
+    source: git
     version: "0.5.3"
   visibility_detector:
     dependency: "direct main"
@@ -2869,10 +2916,10 @@ packages:
     dependency: transitive
     description:
       name: volume_controller
-      sha256: "68975792fbd2ac36cd2aa387273669772a452785d94b6db5808bf2dc3e44a0f1"
+      sha256: "30863a51338db47fe16f92902b1a6c4ee5e15c9287b46573d7c2eb6be1f197d2"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.0"
+    version: "3.3.1"
   wakelock_plus:
     dependency: "direct main"
     description:
@@ -2892,19 +2939,20 @@ packages:
   wallpaper_manager_flutter:
     dependency: "direct main"
     description:
-      name: wallpaper_manager_flutter
-      sha256: "37286f08293ec62590448599b7dc3b94b11ee1175ab7b0e33cbf6b79fbfcba42"
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: HEAD
+      resolved-ref: "28095979c82b377509098e757873ed88d2df09b1"
+      url: "https://github.com/ente-io/wallpaper_manager_fork.git"
+    source: git
     version: "0.0.2"
   watcher:
     dependency: "direct overridden"
     description:
       name: watcher
-      sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
+      sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   web:
     dependency: transitive
     description:
@@ -2925,10 +2973,10 @@ packages:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
+      sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   webdriver:
     dependency: transitive
     description:
@@ -2965,10 +3013,10 @@ packages:
     dependency: "direct overridden"
     description:
       name: win32
-      sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec"
+      sha256: b89e6e24d1454e149ab20fbb225af58660f0c0bf4475544650700d8e2da54aef
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.5"
+    version: "5.11.0"
   win32_registry:
     dependency: transitive
     description:
@@ -3021,10 +3069,10 @@ packages:
     dependency: transitive
     description:
       name: yaml
-      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
+      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.3"
 sdks:
   dart: ">=3.5.0 <4.0.0"
   flutter: ">=3.24.0"
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 42aca33e20..89682b6bb7 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -25,7 +25,9 @@ dependencies:
   animated_list_plus: ^0.5.2
   archive: ^3.6.1
   background_fetch: ^1.2.1
-  battery_info: ^1.1.1
+  battery_info:
+    git:
+      url: https://github.com/ente-io/battery_info
   bip39: ^1.0.6
   cached_network_image: ^3.0.0
   chewie:
@@ -79,8 +81,8 @@ dependencies:
   flutter_datetime_picker_bdaya: ^3.0.2
   flutter_displaymode: ^0.6.0
   flutter_easyloading: ^3.0.0
-  flutter_email_sender: ^5.2.0
-  flutter_image_compress: ^1.1.0
+  flutter_email_sender: ^7.0.0
+  flutter_image_compress: ^2.4.0
   flutter_inappwebview: ^6.1.4
   flutter_launcher_icons: ^0.13.1
   flutter_local_notifications: ^17.2.2
@@ -91,7 +93,9 @@ dependencies:
   flutter_native_splash: ^2.2.0+1
   flutter_password_strength: ^0.1.6
   flutter_secure_storage: ^9.2.4
-  flutter_sodium: ^0.2.0
+  flutter_sodium:
+    git:
+      url: https://github.com/ente-io/flutter_sodium
   flutter_staggered_grid_view: ^0.6.2
   flutter_svg: ^2.0.10+1
   fluttertoast: ^8.0.6
@@ -115,11 +119,10 @@ dependencies:
   local_auth_ios:
   logging: ^1.3.0
   lottie: ^1.2.2
-  maps_launcher: ^2.2.1
+  maps_launcher: ^3.0.0+1
   media_extension:
     git:
       url: "https://github.com/ente-io/media_extension.git"
-      ref: deeplink_fixes
   media_kit:
     git:
       url: https://github.com/media-kit/media-kit
@@ -142,7 +145,8 @@ dependencies:
     git: "https://github.com/ente-io/motion_photo.git"
   motionphoto:
     git: "https://github.com/ente-io/motionphoto.git"
-  move_to_background: ^1.0.2
+  move_to_background:
+    git: "https://github.com/ente-io/move_to_background.git"
   nanoid: ^1.0.0
   native_dio_adapter: ^1.4.0
   native_video_player: ^3.0.0-dev.3
@@ -152,7 +156,9 @@ dependencies:
     git:
       url: https://github.com/ente-io/onnxruntime.git
       ref: ios_only
-  open_mail_app: ^0.4.5
+  open_mail_app:
+    git:
+      url: https://github.com/ente-io/open-mail-app-flutter.git
   package_info_plus: ^8.2.1
   page_transition: ^2.0.2
   panorama:
@@ -169,7 +175,10 @@ dependencies:
   pinput: ^5.0.0
   pointycastle: ^3.7.3
   pool: ^1.5.1
-  privacy_screen: ^0.0.6
+  privacy_screen:
+    git:
+      url: https://github.com/ente-io/privacy_screen.git
+      ref: pb/FIX-obsolete-android-plugin
   protobuf: ^3.1.0
   provider: ^6.0.0
   quiver: ^3.0.1
@@ -190,10 +199,13 @@ dependencies:
   syncfusion_flutter_core: ^25.2.5
   syncfusion_flutter_sliders: ^25.2.5
   synchronized: ^3.1.0
-  system_info_plus: ^0.0.5
+  system_info_plus: ^0.0.6
   tuple: ^2.0.0
   ua_client_hints: ^1.4.0
-  uni_links: ^0.5.1
+  uni_links:
+    git:
+      url: https://github.com/ente-io/uni_links.git
+      path: uni_links
   url_launcher: ^6.3.0
   uuid: ^4.5.0
   video_editor:
@@ -204,10 +216,12 @@ dependencies:
       url: https://github.com/ente-io/packages.git
       ref: android_video_roation_fix
       path: packages/video_player/video_player/
-  video_thumbnail: ^0.5.3
+  video_thumbnail:
   visibility_detector: ^0.3.3
   wakelock_plus: ^1.1.1
-  wallpaper_manager_flutter: ^0.0.2
+  wallpaper_manager_flutter:
+    git:
+      url: https://github.com/ente-io/wallpaper_manager_fork.git
   wechat_assets_picker: ^8.6.3
   widgets_to_image: ^0.0.2
   xml: ^6.3.0
@@ -217,6 +231,9 @@ dependency_overrides:
   # Remove this after removing dependency from flutter_sodium.
   # Newer flutter packages depends on ffi > 2.0.0 while flutter_sodium depends on ffi < 2.0.0
   ffi: 2.1.0
+  flutter_sodium:
+    git:
+      url: https://github.com/ente-io/flutter_sodium
   intl: 0.18.1
   js: ^0.6.7
   media_kit:
@@ -240,8 +257,11 @@ dependency_overrides:
       url: https://github.com/ente-io/packages.git
       ref: android_video_roation_fix
       path: packages/video_player/video_player/
+  video_thumbnail:
+    git:
+      url: https://github.com/ente-io/video_thumbnail_fork.git
   watcher: ^1.1.0
-  win32: ^5.5.4
+  win32: ^5.11.0
 
 flutter_intl:
   enabled: true

From 34a672fb7c527924ed2c9d6752a8be0d7de415cb Mon Sep 17 00:00:00 2001
From: Aman Raj Singh Mourya <amanrajmourya7@gmail.com>
Date: Fri, 21 Feb 2025 23:10:27 +0530
Subject: [PATCH 441/796] [mob][photos] Initial setup for Video-memory

---
 .../file_selection_actions_widget.dart        | 173 ++++++++++++++++++
 1 file changed, 173 insertions(+)

diff --git a/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart b/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
index ab6cbf315a..d0804dd079 100644
--- a/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
+++ b/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
@@ -1,12 +1,17 @@
 import "dart:async";
+import "dart:io";
 
 import 'package:fast_base58/fast_base58.dart';
+import "package:ffmpeg_kit_flutter_full_gpl/ffmpeg_kit.dart";
+import "package:ffmpeg_kit_flutter_full_gpl/log.dart";
+import "package:ffmpeg_kit_flutter_full_gpl/return_code.dart";
 import "package:flutter/cupertino.dart";
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import "package:local_auth/local_auth.dart";
 import "package:logging/logging.dart";
 import "package:modal_bottom_sheet/modal_bottom_sheet.dart";
+// import "package:photo_manager/photo_manager.dart";
 import 'package:photos/core/configuration.dart';
 import "package:photos/core/event_bus.dart";
 import "package:photos/events/guest_view_event.dart";
@@ -42,6 +47,7 @@ import "package:photos/ui/viewer/location/update_location_data_widget.dart";
 import 'package:photos/utils/delete_file_util.dart';
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/file_download_util.dart";
+import "package:photos/utils/file_util.dart";
 import 'package:photos/utils/magic_util.dart';
 import 'package:photos/utils/navigation_util.dart';
 import "package:photos/utils/share_util.dart";
@@ -86,6 +92,8 @@ class _FileSelectionActionsWidgetState
   Collection? _cachedCollectionForSharedLink;
   final GlobalKey shareButtonKey = GlobalKey();
   final GlobalKey sendLinkButtonKey = GlobalKey();
+  final StreamController<double> _progressController =
+      StreamController<double>();
 
   @override
   void initState() {
@@ -102,6 +110,7 @@ class _FileSelectionActionsWidgetState
 
   @override
   void dispose() {
+    _progressController.close();
     widget.selectedFiles.removeListener(_selectFileChangeListener);
     super.dispose();
   }
@@ -316,6 +325,15 @@ class _FileSelectionActionsWidgetState
         ),
       );
     }
+    if (widget.type != GalleryType.sharedPublicCollection) {
+      items.add(
+        SelectionActionButton(
+          icon: Icons.movie_creation_sharp,
+          labelText: "Video memory",
+          onTap: _onCreateVideoMemoryClicked,
+        ),
+      );
+    }
 
     if (widget.type.showHideOption()) {
       items.add(
@@ -649,6 +667,157 @@ class _FileSelectionActionsWidgetState
     }
   }
 
+  Future<void> _onCreateVideoMemoryClicked() async {
+    final List<EnteFile> selectedFiles = widget.selectedFiles.files.toList();
+    final List<String> paths = [];
+    final List<int> imageHeight = [];
+    final List<int> imageWidth = [];
+    _logger.info("selected files length ${selectedFiles.length}");
+    for (EnteFile file in selectedFiles) {
+      if (file.fileType == FileType.livePhoto ||
+          file.fileType == FileType.video) {
+        continue;
+      }
+
+      final File? fileToSave = await getFile(file);
+      if (fileToSave != null) {
+        paths.add(File(fileToSave.path).path);
+        _logger.info("----- Path ${File(fileToSave.path).path}");
+        _logger.info("----- Height ${file.height}");
+        _logger.info("----- Width ${file.width}");
+        imageHeight.add(file.height);
+        imageWidth.add(file.width);
+        _logger.info("----- Has Dimenssion ${file.hasDimensions}");
+      }
+    }
+    for (var path in paths) {
+      _logger.info("----- Path: $path");
+    }
+
+    await _buildVideoMemoryFFmpegCommand(
+      paths.whereType<String>().toList(),
+      imageHeight,
+      imageWidth,
+    );
+    widget.selectedFiles.clearAll();
+  }
+
+  String getTransitionType(int index) {
+    switch (index) {
+      case 0:
+        return 'fade';
+      case 1:
+        return 'smoothleft';
+      case 2:
+        return 'smoothright';
+      case 3:
+        return 'slideright';
+      default:
+        return 'fade';
+    }
+  }
+
+  Future<void> _buildVideoMemoryFFmpegCommand(
+    List<String> imagePaths,
+    List<int> imageHeight,
+    List<int> imageWidth,
+  ) async {
+    final dialog = createProgressDialog(context, "Video memory");
+    await dialog.show();
+    try {
+      final double desiredDuration = imagePaths.length * 2.0;
+      final int totalFrames = (desiredDuration * 60).toInt();
+
+      final Directory directory = Directory('/storage/emulated/0/Download');
+      final String tempDir = Configuration.instance.getTempDirectory();
+      final String outputPath =
+          "${directory.path}/video_memory${DateTime.now().millisecondsSinceEpoch}.mp4";
+
+      _logger.info("-------- Output path $outputPath");
+
+      StringBuffer command = StringBuffer();
+      command.write('-y ');
+
+      for (String imagePath in imagePaths) {
+        command.write('-loop 1 -t 2 -framerate 60 -i "$imagePath" ');
+      }
+
+      command.write('-filter_complex "');
+
+      command.write(
+          '[0]scale=1280:720:force_original_aspect_ratio=decrease:eval=frame,'
+          'zoompan=z=\'zoom+0.001\':x=iw/2-(iw/zoom/2):y=ih/2-(ih/zoom/2):d=180:fps=60,setsar=1[v0];');
+
+      String lastLabel = 'v0';
+
+      for (int i = 1; i < imagePaths.length; i++) {
+        final int height, width;
+        imageHeight[i] == 0 ? height = 720 : height = imageHeight[i];
+        imageWidth[i] == 0 ? width = 1280 : width = imageWidth[i];
+        command.write(
+            '[$i]scale=1280:720:force_original_aspect_ratio=decrease:eval=frame,'
+            'zoompan=z=\'zoom+0.001\':x=iw/2-(iw/zoom/2):y=ih/2-(ih/zoom/2):d=180:fps=60,setsar=1[v${i}];');
+
+        String transition = getTransitionType(i - 1);
+        String newLabel = 'tx${i}';
+        command.write(
+          '[$lastLabel][v$i]xfade=transition=$transition:duration=1:offset=${i * 2}[$newLabel];',
+        );
+        lastLabel = newLabel;
+      }
+
+      command.write('" ');
+
+      command.write('-map "[$lastLabel]" ');
+
+      command.write('-frames:v $totalFrames ');
+
+      command.write('-c:v libx264 '
+          '-pix_fmt yuv420p '
+          '-crf 23 '
+          '-preset medium '
+          '-movflags +faststart '
+          '-r 60 ');
+
+      command.write('"$outputPath"');
+
+      await FFmpegKit.executeAsync(
+        command.toString(),
+        (session) async {
+          final returnCode = await session.getReturnCode();
+
+          if (ReturnCode.isSuccess(returnCode)) {
+            _logger.info("Video created successfully at: $outputPath");
+          } else {
+            _logger.info("FFmpeg process failed with return code $returnCode");
+          }
+        },
+        (statistics) {
+          final progress = statistics.getTime() / (imagePaths.length * 2000);
+          _progressController.add(progress.clamp(0.0, 1.0));
+        },
+      );
+
+      _logger.info("------- Executing FFmpeg command: ${command.toString()}");
+
+      final DateTime now = DateTime.now();
+      final String formattedTime =
+          "${now.hour.toString().padLeft(2, '0')}:${now.minute.toString().padLeft(2, '0')}:${now.second.toString().padLeft(2, '0')}";
+      _logger.info("Current time: $formattedTime");
+
+      // final File savedVideoMemory = File(outputPath);
+      // await PhotoManager.editor.saveVideo(
+      //   savedVideoMemory,
+      //   title: "ente_video_memory $formattedTime",
+      // );
+      await dialog.hide();
+    } catch (e) {
+      await dialog.hide();
+      _logger.info("------- Error in FFmpeg  $e");
+      rethrow;
+    }
+  }
+
   Future<Uint8List> _createPlaceholder(
     List<EnteFile> ownedSelectedFiles,
   ) async {
@@ -870,3 +1039,7 @@ class _FileSelectionActionsWidgetState
     }
   }
 }
+
+extension on Log {
+  getTime() {}
+}

From d667cc4f9874d374c80af75f3cff49dd706765f5 Mon Sep 17 00:00:00 2001
From: Aman Raj Singh Mourya <amanrajmourya7@gmail.com>
Date: Sat, 22 Feb 2025 00:48:53 +0530
Subject: [PATCH 442/796] [auth] Set cronetHttpNoPlay=true while building apk
 for droid

---
 .github/workflows/auth-internal-release.yml | 2 +-
 .github/workflows/auth-release.yml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/auth-internal-release.yml b/.github/workflows/auth-internal-release.yml
index b83ea10ee8..4aec41202f 100644
--- a/.github/workflows/auth-internal-release.yml
+++ b/.github/workflows/auth-internal-release.yml
@@ -40,7 +40,7 @@ jobs:
 
             - name: Build PlayStore AAB
               run: |
-                  flutter build appbundle --release --flavor playstore --dart-define=app.flavor=playstore
+                  flutter build appbundle --dart-define=cronetHttpNoPlay=true --release --flavor playstore
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_auth_key.jks"
                   SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
diff --git a/.github/workflows/auth-release.yml b/.github/workflows/auth-release.yml
index f1f8eff830..aa2bdc27d1 100644
--- a/.github/workflows/auth-release.yml
+++ b/.github/workflows/auth-release.yml
@@ -68,7 +68,7 @@ jobs:
 
             - name: Build independent APK
               run: |
-                  flutter build apk --release --flavor independent --dart-define=app.flavor=independent
+                  flutter build apk --dart-define=cronetHttpNoPlay=true --release --flavor independent
                   mv build/app/outputs/flutter-apk/app-independent-release.apk artifacts/ente-${{ github.ref_name }}.apk
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_auth_key.jks"

From 8fe9b9571a0cc84465855c51f35dfa79876714f0 Mon Sep 17 00:00:00 2001
From: Aman Raj Singh Mourya <amanrajmourya7@gmail.com>
Date: Sat, 22 Feb 2025 00:49:22 +0530
Subject: [PATCH 443/796] [auth] Upgrade dio

---
 auth/lib/core/network.dart                           | 5 +++++
 auth/lib/ui/account/login_pwd_verification_page.dart | 2 +-
 auth/lib/utils/dialog_util.dart                      | 8 ++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/auth/lib/core/network.dart b/auth/lib/core/network.dart
index c14c9e758b..0f5ae3555d 100644
--- a/auth/lib/core/network.dart
+++ b/auth/lib/core/network.dart
@@ -8,6 +8,7 @@ import 'package:ente_auth/utils/package_info_util.dart';
 import 'package:ente_auth/utils/platform_util.dart';
 import 'package:fk_user_agent/fk_user_agent.dart';
 import 'package:flutter/foundation.dart';
+import 'package:native_dio_adapter/native_dio_adapter.dart';
 import 'package:uuid/uuid.dart';
 
 int kConnectTimeout = 15000;
@@ -50,6 +51,10 @@ class Network {
         },
       ),
     );
+
+    _dio.httpClientAdapter = NativeAdapter();
+    _enteDio.httpClientAdapter = NativeAdapter();
+
     _setupInterceptors(endpoint);
 
     Bus.instance.on<EndpointUpdatedEvent>().listen((event) {
diff --git a/auth/lib/ui/account/login_pwd_verification_page.dart b/auth/lib/ui/account/login_pwd_verification_page.dart
index d5ae7a3dbc..6d43988e2c 100644
--- a/auth/lib/ui/account/login_pwd_verification_page.dart
+++ b/auth/lib/ui/account/login_pwd_verification_page.dart
@@ -113,7 +113,7 @@ class _LoginPasswordVerificationPageState
         );
       } else {
         _logger.severe('API failure during SRP login', e, s);
-        if (e.type == DioExceptionType.unknown) {
+        if (e.type == DioExceptionType.connectionError) {
           await _showContactSupportDialog(
             context,
             context.l10n.noInternetConnection,
diff --git a/auth/lib/utils/dialog_util.dart b/auth/lib/utils/dialog_util.dart
index f747b41f4d..1f64414f8f 100644
--- a/auth/lib/utils/dialog_util.dart
+++ b/auth/lib/utils/dialog_util.dart
@@ -113,12 +113,12 @@ String parseErrorForUI(
         if (dioError.response?.data["code"] != null) {
           errorInfo = "Reason: ${dioError.response!.data["code"]}";
         } else {
-          errorInfo = "Reason: ${dioError.response!.data}";
+          errorInfo = "Reason: ${dioError.response!.data.toString()}";
         }
-      } else if (dioError.type == DioExceptionType.unknown) {
-        errorInfo = "Reason: $dioError.error";
+      } else if (dioError.type == DioExceptionType.badCertificate) {
+        errorInfo = "Reason: ${dioError.error.toString()}";
       } else {
-        errorInfo = "Reason: $dioError.type";
+        errorInfo = "Reason: ${dioError.type.toString()}";
       }
     } else {
       if (kDebugMode) {

From d6ec6809c29d75f185a22c8690b0ad345fd6bd00 Mon Sep 17 00:00:00 2001
From: Aman Raj Singh Mourya <amanrajmourya7@gmail.com>
Date: Sat, 22 Feb 2025 00:53:16 +0530
Subject: [PATCH 444/796] [auth] Use native dio adapter

---
 auth/pubspec.lock | 56 +++++++++++++++++++++++++++++++++++++++++++----
 auth/pubspec.yaml |  3 ++-
 2 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/auth/pubspec.lock b/auth/pubspec.lock
index 3d5d6e9cab..9795a507a8 100644
--- a/auth/pubspec.lock
+++ b/auth/pubspec.lock
@@ -250,10 +250,10 @@ packages:
     dependency: "direct main"
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
   confetti:
     dependency: "direct main"
     description:
@@ -286,6 +286,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.1"
+  cronet_http:
+    dependency: transitive
+    description:
+      name: cronet_http
+      sha256: "3af9c4d57bf07ef4b307e77b22be4ad61bea19ee6ff65e62184863f3a09f1415"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.2"
   cross_file:
     dependency: transitive
     description:
@@ -310,6 +318,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  cupertino_http:
+    dependency: transitive
+    description:
+      name: cupertino_http
+      sha256: "6fcf79586ad872ddcd6004d55c8c2aab3cdf0337436e8f99837b1b6c30665d0c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   dart_style:
     dependency: transitive
     description:
@@ -346,10 +362,10 @@ packages:
     dependency: "direct main"
     description:
       name: dio
-      sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260"
+      sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
       url: "https://pub.dev"
     source: hosted
-    version: "5.7.0"
+    version: "5.8.0+1"
   dio_web_adapter:
     dependency: transitive
     description:
@@ -861,6 +877,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
+  http_profile:
+    dependency: transitive
+    description:
+      name: http_profile
+      sha256: "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
   image:
     dependency: transitive
     description:
@@ -885,6 +909,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
+  jni:
+    dependency: transitive
+    description:
+      name: jni
+      sha256: f377c585ea9c08d48b427dc2e03780af2889d1bb094440da853c6883c1acba4b
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.1"
   js:
     dependency: transitive
     description:
@@ -1061,6 +1093,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
+  native_dio_adapter:
+    dependency: "direct main"
+    description:
+      name: native_dio_adapter
+      sha256: "7420bc9517b2abe09810199a19924617b45690a44ecfb0616ac9babc11875c03"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
   nested:
     dependency: transitive
     description:
@@ -1077,6 +1117,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.5.0"
+  objective_c:
+    dependency: transitive
+    description:
+      name: objective_c
+      sha256: "62e79ab8c3ed6f6a340ea50dd48d65898f5d70425d404f0d99411f6e56e04584"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.0"
   otp:
     dependency: "direct main"
     description:
diff --git a/auth/pubspec.yaml b/auth/pubspec.yaml
index 179586a3b2..7816992bd5 100644
--- a/auth/pubspec.yaml
+++ b/auth/pubspec.yaml
@@ -21,7 +21,7 @@ dependencies:
   connectivity_plus: ^6.0.5
   convert: ^3.1.1
   device_info_plus: ^9.1.1
-  dio: ^5.4.0
+  dio: ^5.8.0+1
   dotted_border: ^2.0.0+2
   dropdown_button2: ^2.3.9
   email_validator: ^3.0.0
@@ -72,6 +72,7 @@ dependencies:
   logging: ^1.0.1
   modal_bottom_sheet: ^3.0.0
   move_to_background: ^1.0.2
+  native_dio_adapter: ^1.4.0
   otp: ^3.1.1
   package_info_plus: ^8.0.2
   password_strength: ^0.2.0

From 48f6071f5c6b7b70175abaf50910b91fcbdddd70 Mon Sep 17 00:00:00 2001
From: frost <ai4allppl@gmail.com>
Date: Sat, 22 Feb 2025 20:50:49 +0500
Subject: [PATCH 445/796] Create Tailscale.md

This is ente photos setup running with tailscale
---
 docs/docs/self-hosting/guides/Tailscale.md | 285 +++++++++++++++++++++
 1 file changed, 285 insertions(+)
 create mode 100644 docs/docs/self-hosting/guides/Tailscale.md

diff --git a/docs/docs/self-hosting/guides/Tailscale.md b/docs/docs/self-hosting/guides/Tailscale.md
new file mode 100644
index 0000000000..bde0c7466d
--- /dev/null
+++ b/docs/docs/self-hosting/guides/Tailscale.md
@@ -0,0 +1,285 @@
+---
+title: Self Hosting with Tailscale
+description: Guides for self hosting Ente Photos and/or Ente Auth with Tailscale
+---
+# Guide
+
+This guide aims to achieve selfhosting Ente photos or Ente-Auth with tailscale (TSDPROXY) without exposing any port OR if someone is behind CGNAT and cannot expose any post on the internet but want to run his/her own selfhosted service for themselves, friends and family only.
+
+Before getting start keep the following NOTE in mind.
+
+> [!NOTE]
+> If someone is behind double or triple CGNAT; must install tailscale system wide by running `curl -fsSL https://tailscale.com/install.sh | sh` in your linux terminal and `sudo tailscale up` otherwise dns resolver will fail and uploading will not work. This is not necessary for those who are not behing CGNAT.
+This guide also work on docker rootless and normal.
+
+> [!CAUTION]
+Remember that current docker update 28.0.0 has some bug and cannot connect to external network. Make sure to install docker-ce 27.5.0, docker-ce-rootless-extras 27.5.0 and docker-ce-cli 27.5.0. Hopefully docker 28.1.0 will resolve this issue in next week.
+
+> [!IMPORTANT]
+> For docker rootless, user must have permission locally to all directories that are necessary for Ente-photos selfhosted server. It is achieve through `sudo chow -R 1000:1000 /home/ubuntu/docker/ente`. In linux terminal do check UID `id -u` or simpally `id`. First user is always 1000. To allow **listening and ping** on any port without root, create `/etc/sysctl.d/99-rootless.conf` with the following content:
+> ```
+> net.ipv4.ip_unprivileged_port_start=0
+> net.ipv4.ping_group_range = 0 2147483647
+> ```
+> than run `sudo sysctl --system`.
+> Create `~/.config/systemd/user/docker.service.d/override.conf` with the following content:
+> ```
+> [Service]
+> Environment="DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns"
+> Environment="DOCKERD_ROOTLESS_ROOTLESSKIT_PORT_DRIVER=slirp4netns"
+> ```
+> and Restart the docker daemon
+> `systemctl --user restart docker`
+> Instead of `--volume /var/run/docker.sock:/var/run/docker.sock` in TSDPROXY compose.yaml, use `--volume $XDG_RUNTIME_DIR/docker.sock:/var/run/docker.sock`
+
+## GETTING START WITH SETUP ##
+First of all create a directory `sudo mkdir -p /home/ubuntu/docker/tsdproxy/config` than `cd docker/tsdproxy` and create compose.yaml file by running `sudo nano compose.yaml`. Populate it with the following:
+```
+services:
+  tsdproxy:
+    image: almeidapaulopt/tsdproxy
+    container_name: tsdproxy
+    restart: unless-stopped
+    environment:
+      TZ: Asia/Singapur # change me
+    volumes:
+      - $XDG_RUNTIME_DIR/docker.sock:/var/run/docker.sock # for docker rootless otherwise /var/run/docker.sock:/var/run/docker.sock
+      - tsdproxy_data:/data
+      - /home/lee/docker/tsdproxy/config:/config
+    networks:
+      - proxy
+    labels: # giving the labels here will create tsdproxy instance in tailscale admin counsle and GUI can be accessable through tailscale if device is connected
+      - tsdproxy.enable=true
+      - tsdproxy.name=tsdproxy
+      - tsdproxy.ephemeral=false # this is optional but useful
+
+volumes:
+  tsdproxy_data:
+    name: tsdproxy_data
+
+networks:
+  proxy:
+    name: proxy
+```
+Now login into your tailscale account admin counsle > settings > keys > Generate authkey. Give any description and must select resuable, because the key get purged if not selected after reboot of machine. It is advisable to create Tags in ACLs settings `tag: tsdproxy` `tag: ente` `tag: minio` as well. As this will create a tag nodes with no key expirory. One is safe to reboot restart docker or machine.
+> Copy the generated authkey as it is shown only once.
+Make tsdproxy.yaml file in `cd docker/tsdproxy/config` by running `sudo nano tsdproxy.yaml` and pupolate it with the following contants:
+```
+defaultproxyprovider: default
+docker:
+    local:
+        host: unix:///var/run/docker.sock
+        defaultproxyprovider: default
+files: {}
+tailscale:
+  providers:
+    default:
+      authkey: ""
+      authkeyfile: "/config/authkey"
+      controlurl: https://controlplane.tailscale.com
+  datadir: /data/
+http:
+  hostname: 0.0.0.0
+  port: 8080
+log:
+  level: info
+  json: false
+proxyaccesslog: true
+```
+In the same directory run `sudo nano authkey` and paste the authkey just copied earlier from tailscale admin counsel.
+> Here Tailscale (TSDPROXY) setup is complet in all respect. Just run `docker compose up -d`. Check your tailscale amdin counsel and you will see tsdproxy node up and running. Make sure that **HTTPS** is enabled in tailscale DNS settings.
+> You can visit the TSDPROXY web GUI by https://tsdproxy.xyz.ts.net. (xyz is change value for everyone)
+
+## ente Part ##
+First make the following necessary files/directories:
+```
+sudo mkdir -p /home/ubuntu/docker/ente/custom-logs
+sudo mkdir -p /home/ubuntu/docker/ente/data
+sudo mkdir -p /home/ubuntu/docker/ente/minio-data
+sudo mkdir -p /home/ubuntu/docker/ente/postgres-data
+sudo mkdir -p /home/ubuntu/docker/ente/scripts/compose
+```
+Than give permission user for each of the above directory. `sudo chown -R 1000:1000 /home/ubuntu/docker/ente/custom-logs` etc etc. Make sure not to skip `/home/ubuntu/docker/tsdproxy/config`
+
+`cd docker/ente/script/compose` and run `sudo nano credentials.yaml` than populate it with the following:
+```
+db:
+    host: postgres
+    port: 5432
+    name: ente_db
+    user: pguser # change me
+    password: pgpass #change me
+
+s3:
+    are_local_buckets: true
+    b2-eu-cen:
+        key: test # change me
+        secret: testtest # change me
+        endpoint: https://minio.xyz.ts.net
+        region: eu-central-2
+        bucket: b2-eu-cen
+    wasabi-eu-central-2-v3:
+        key: test # change me
+        secret: testtest # change me
+        endpoint: localhost:3200
+        region: eu-central-2
+        bucket: wasabi-eu-central-2-v3
+        compliance: false
+    scw-eu-fr-v3:
+        key: test # change me
+        secret: testtest # change me
+        endpoint: localhost:3200
+        region: eu-central-2
+        bucket: scw-eu-fr-v3
+```
+
+In the same directory run `sudo nano minio-provision.sh` and populate it with the following contants:
+```
+#!/bin/sh
+
+# Script used to prepare the minio instance that runs as part of the development
+# Docker compose cluster.
+
+while ! mc config host add h0 http://minio:3200 test testtest #(change me)
+do
+   echo "waiting for minio..."
+   sleep 0.5
+done
+
+cd /data
+
+mc mb -p b2-eu-cen
+mc mb -p wasabi-eu-central-2-v3
+mc mb -p scw-eu-fr-v3
+```
+
+Now `cd docker/ente` and run `sudo nano docker-compose.yaml` and populate it with the following:
+```
+services:
+  museum:
+    image: ghcr.io/ente-io/server
+    ports:
+      - 9080:8080 # 9080 because tsdproxy is running on 8080:8080
+      # - 2112:2112 # Prometheus metrics
+    depends_on:
+      postgres:
+        condition: service_healthy
+    environment:
+      # Pass-in the config to connect to the DB and MinIO
+      ENTE_CREDENTIALS_FILE: /credentials.yaml
+     # ENTE_CLI_SECRETS_PATH: /cli-data/secret.txt
+     # ENTE_CLI_CONFIG_PATH: /cli-data/
+    volumes:
+      - /home/ubuntu/docker/ente/custom-logs:/var/logs
+      - /home/ubuntu/docker/ente/museum.yaml:/museum.yaml:ro
+      - /home/ubuntu/docker/ente/scripts/compose/credentials.yaml:/credentials.yaml:ro
+     #- /home/ubuntu/docker/ente/cli-data:/cli-data
+     #- /home/ubuntu/docker/ente/exports/ente-photos:/exports
+      - /home/ubuntu/docker/ente/data:/data:ro
+    networks:
+      - ente
+      - proxy
+    labels:
+      tsdproxy.enable: "true"
+      tsdproxy.name: "ente"
+
+#  # Resolve "localhost:3200" in the museum container to the minio container.
+  socat:
+    image: alpine/socat
+    network_mode: service:museum
+    depends_on:
+      - museum
+    command: "TCP-LISTEN:3200,fork,reuseaddr TCP:minio:3200"
+
+  postgres:
+    image: postgres:15
+    ports:
+      - 5432:5432
+    environment:
+      POSTGRES_USER: pguser # change me
+      POSTGRES_PASSWORD: pgpass # change me
+      POSTGRES_DB: ente_db
+    # Wait for postgres to be accept connections before starting museum.
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "pg_isready",
+          "-q",
+          "-d",
+          "ente_db",
+          "-U",
+          "pguser" # change it accouding to the POSTGRES_USER: pguser
+        ]
+      start_period: 40s
+      start_interval: 1s
+    volumes:
+      - /home/ubuntu/docker/ente/postgres-data:/var/lib/postgresql/data
+    networks:
+      - ente
+
+  minio:
+    image: minio/minio
+    # Use different ports than the minio defaults to avoid conflicting
+    # with the ports used by Prometheus.
+    ports:
+      - 3200:3200 # API
+      - 3201:3201 # Console
+    environment:
+      MINIO_ROOT_USER: test # change me
+      MINIO_ROOT_PASSWORD: testtest # change me
+      MINIO_SERVER_URL: https://minio.xyz.ts.net
+    command: server /data --address ":3200" --console-address ":3201"
+    volumes:
+      - /home/ubuntu/docker/ente/minio-data:/data
+    networks:
+      - ente
+      - proxy
+    labels:
+      tsdproxy.enable: "true"
+      tsdproxy.name: "minio"
+
+  minio-provision:
+    image: minio/mc
+    depends_on:
+      - minio
+    volumes:
+      - /home/ubuntu/docker/ente/scripts/compose/minio-provision.sh:/provision.sh:ro
+      - /home/ubuntu/docker/ente/minio-data:/data
+    networks:
+      - ente
+    entrypoint: sh /provision.sh
+
+
+networks:
+  ente:
+    name: ente
+  
+  proxy:
+    external: true
+```
+
+> Thats it. Run `docker compose up -d`. Wait till every container become healthy. Open web browser. Make sure tailscale is installed on the machine. Visit https://ente.xyz.ts.net/ping. It will pong. All good if you see it. First time it will take minute or two to get SSL cert. Downnload Desktop or mobile app. Tap 7 time on the screen, which will prompt developer mode. Add https://ente.xyz.ts.net. Add new user. When asked for OTP. Just go to terminal and run `docker logs ente-museum-1`. Search for userauth. Feed the six digit and Done.
+
+> For getting 100TB (limitless) storage. Just Install ente-cli for windows. Extract it and add folder. Name it **export**. Add config.yaml file along and populate it with the following:
+```
+endpoint:
+  api: "https://ente.xyz.ts.net"
+  accounts: "http://localhost:3001"
+  
+log: false
+```
+Right-Click in the directory where you have extracted ente-cli. Select `open in terminal`. Run
+```
+.\ente.exe account bob # change bob to yours
+```
+Hit Enter twice.
+For export directory, just write export. As we already created **export** folder.
+**Write email. The one which is already used befor when creating ente account in ente desktop app.**
+Type the same Password used before for the account.Run 
+```
+.\ente.ext account list
+```
+and you will see the account ID. copy it.
+> Open museum.yaml file. `cd docker/ente`. Run `sudo nano museum.yaml` and the account ID under Admins. Delete any previous entries.
+Restart ente-museum-1 container from linux terminal. Run `docker restart ente-museum-1`. All well, now you will have 100TB storage. Repeat if for any other accounts you want to give unlimited storage access.

From e99bc335d937576608e57b4c922dca28d061618f Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prateekmedia@users.noreply.github.com>
Date: Sun, 23 Feb 2025 05:32:46 +0530
Subject: [PATCH 446/796] chore: bump deps

---
 mobile/pubspec.lock | 28 ++++++++++++++--------------
 mobile/pubspec.yaml | 11 ++++++-----
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index 1fd9c3522e..0d2c072cf8 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -649,12 +649,11 @@ packages:
   file_saver:
     dependency: "direct main"
     description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "01b2e6b6fe520cfa5d2d91342ccbfbaefa8f6482"
-      url: "https://github.com/jesims/file_saver.git"
-    source: git
-    version: "0.2.9"
+      name: file_saver
+      sha256: "017a127de686af2d2fbbd64afea97052d95f2a0f87d19d25b87e097407bf9c1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.14"
   file_selector_linux:
     dependency: transitive
     description:
@@ -1865,7 +1864,7 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: "68500a743d824108b236febe4cbd10a1b82c16b1"
+      resolved-ref: "83740bf55dac38a0be01c863609cf900c4d1aab1"
       url: "https://github.com/ente-io/open-mail-app-flutter.git"
     source: git
     version: "0.4.4"
@@ -2194,10 +2193,11 @@ packages:
   receive_sharing_intent:
     dependency: "direct main"
     description:
-      name: receive_sharing_intent
-      sha256: ec76056e4d258ad708e76d85591d933678625318e411564dcb9059048ca3a593
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: HEAD
+      resolved-ref: "2cea396843cd3ab1b5ec4334be4233864637874e"
+      url: "https://github.com/KasemJaffer/receive_sharing_intent.git"
+    source: git
     version: "1.8.1"
   rxdart:
     dependency: transitive
@@ -3010,13 +3010,13 @@ packages:
     source: hosted
     version: "0.0.3"
   win32:
-    dependency: "direct overridden"
+    dependency: "direct main"
     description:
       name: win32
-      sha256: b89e6e24d1454e149ab20fbb225af58660f0c0bf4475544650700d8e2da54aef
+      sha256: daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e
       url: "https://pub.dev"
     source: hosted
-    version: "5.11.0"
+    version: "5.10.1"
   win32_registry:
     dependency: transitive
     description:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 89682b6bb7..149c4821dc 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -69,9 +69,7 @@ dependencies:
   fast_base58: ^0.2.1
   ffmpeg_kit_flutter_full_gpl: ^6.0.3
   figma_squircle: 0.5.3
-  file_saver:
-    # Use forked version till this PR is merged: https://github.com/incrediblezayed/file_saver/pull/87
-    git: https://github.com/jesims/file_saver.git
+  file_saver: ^0.2.14
   firebase_core: ^3.6.0
   firebase_messaging: ^15.1.3
   flutter:
@@ -182,7 +180,9 @@ dependencies:
   protobuf: ^3.1.0
   provider: ^6.0.0
   quiver: ^3.0.1
-  receive_sharing_intent: ^1.7.0
+  receive_sharing_intent:
+    git:
+      url: https://github.com/KasemJaffer/receive_sharing_intent.git
   screenshot: ^3.0.0
   scrollable_positioned_list: ^0.3.5
   sentry: ^8.0.0
@@ -224,6 +224,7 @@ dependencies:
       url: https://github.com/ente-io/wallpaper_manager_fork.git
   wechat_assets_picker: ^8.6.3
   widgets_to_image: ^0.0.2
+  win32: ^5.10.1
   xml: ^6.3.0
   xmp: ^1.0.3
 
@@ -261,7 +262,7 @@ dependency_overrides:
     git:
       url: https://github.com/ente-io/video_thumbnail_fork.git
   watcher: ^1.1.0
-  win32: ^5.11.0
+  win32: "5.10.1"
 
 flutter_intl:
   enabled: true

From 386554ac709dfb09a24fa6a829d312981be60c5b Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prateekmedia@users.noreply.github.com>
Date: Sun, 23 Feb 2025 05:33:02 +0530
Subject: [PATCH 447/796] fix: don't check for preview if video streaming is
 disabled

---
 mobile/lib/ui/viewer/file/video_widget.dart | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mobile/lib/ui/viewer/file/video_widget.dart b/mobile/lib/ui/viewer/file/video_widget.dart
index 1c000d20c8..efc42266b2 100644
--- a/mobile/lib/ui/viewer/file/video_widget.dart
+++ b/mobile/lib/ui/viewer/file/video_widget.dart
@@ -65,6 +65,9 @@ class _VideoWidgetState extends State<VideoWidget> {
   }
 
   Future<void> _checkForPreview() async {
+    if (!PreviewVideoStore.instance.isVideoStreamingEnabled) {
+      return;
+    }
     widget.playbackCallback?.call(false);
     final data = await PreviewVideoStore.instance
         .getPlaylist(widget.file)

From e0dd39dd950508aa31efb4b8dfd233bfc728f327 Mon Sep 17 00:00:00 2001
From: frost <ai4allppl@gmail.com>
Date: Sun, 23 Feb 2025 13:11:58 +0500
Subject: [PATCH 448/796] Update Tailscale.md

---
 docs/docs/self-hosting/guides/Tailscale.md | 27 +++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/docs/docs/self-hosting/guides/Tailscale.md b/docs/docs/self-hosting/guides/Tailscale.md
index bde0c7466d..b13c5e69f3 100644
--- a/docs/docs/self-hosting/guides/Tailscale.md
+++ b/docs/docs/self-hosting/guides/Tailscale.md
@@ -1,22 +1,23 @@
 ---
 title: Self Hosting with Tailscale
-description: Guides for self hosting Ente Photos and/or Ente Auth with Tailscale
+description: Guides for self-hosting Ente Photos and/or Ente Auth with Tailscale
 ---
 # Guide
 
-This guide aims to achieve selfhosting Ente photos or Ente-Auth with tailscale (TSDPROXY) without exposing any port OR if someone is behind CGNAT and cannot expose any post on the internet but want to run his/her own selfhosted service for themselves, friends and family only.
+This guide aims to achieve self-hosting Ente photos or Ente-Auth with tailscale (TSDPROXY) without exposing any port OR if someone is behind CGNAT and cannot open any port on the internet but want to run their own selfhosted service for themselves, friends and family only.
 
 Before getting start keep the following NOTE in mind.
 
 > [!NOTE]
 > If someone is behind double or triple CGNAT; must install tailscale system wide by running `curl -fsSL https://tailscale.com/install.sh | sh` in your linux terminal and `sudo tailscale up` otherwise dns resolver will fail and uploading will not work. This is not necessary for those who are not behing CGNAT.
-This guide also work on docker rootless and normal.
+> This guide also work on docker rootless and normal.
 
 > [!CAUTION]
-Remember that current docker update 28.0.0 has some bug and cannot connect to external network. Make sure to install docker-ce 27.5.0, docker-ce-rootless-extras 27.5.0 and docker-ce-cli 27.5.0. Hopefully docker 28.1.0 will resolve this issue in next week.
+Remember that current docker update 28.0.0 has some bug and cannot connect to external network. Make sure to install docker-ce 27.5.0, docker-ce-rootless-extras 27.5.0 and docker-ce-cli 27.5.0. Hopefully docker 28.1.0 will resolve this issue in next week. Refrence links are [Moby Github Repo Issues 49511](https://github.com/moby/moby/issues/49511) and [Moby Github Repo Issues 49519](https://github.com/moby/moby/issues/49519)
 
 > [!IMPORTANT]
-> For docker rootless, user must have permission locally to all directories that are necessary for Ente-photos selfhosted server. It is achieve through `sudo chow -R 1000:1000 /home/ubuntu/docker/ente`. In linux terminal do check UID `id -u` or simpally `id`. First user is always 1000. To allow **listening and ping** on any port without root, create `/etc/sysctl.d/99-rootless.conf` with the following content:
+> For Docker rootless, the user must have local permissions for all directories required by the Ente-photos self-hosted server. This can be achieved by running `sudo chown -R 1000:1000 /home/ubuntu/docker/ente`. In the Linux terminal, you can check the UID with `id -u` or simply `id`. The first user typically has UID 1000.
+> To allow listening and pinging on any port without root privileges, create a file called `/etc/sysctl.d/99-rootless.conf` with the following content:
 > ```
 > net.ipv4.ip_unprivileged_port_start=0
 > net.ipv4.ping_group_range = 0 2147483647
@@ -61,9 +62,9 @@ networks:
   proxy:
     name: proxy
 ```
-Now login into your tailscale account admin counsle > settings > keys > Generate authkey. Give any description and must select resuable, because the key get purged if not selected after reboot of machine. It is advisable to create Tags in ACLs settings `tag: tsdproxy` `tag: ente` `tag: minio` as well. As this will create a tag nodes with no key expirory. One is safe to reboot restart docker or machine.
+Now login into your tailscale account admin counsle > settings > keys > Generate authkey. Give any description and must select resuable, because the key get purged if not selected after rebooting machine. It is advisable to create **Tags** in **ACLs settings** `tag: tsdproxy` `tag: ente` `tag: minio` as well. This will create a tag nodes with no key expirory. One is safe to reboot restart docker or machine.
 > Copy the generated authkey as it is shown only once.
-Make tsdproxy.yaml file in `cd docker/tsdproxy/config` by running `sudo nano tsdproxy.yaml` and pupolate it with the following contants:
+Make tsdproxy.yaml file in `cd docker/tsdproxy/config` by running `sudo nano tsdproxy.yaml` and pupolate it with the following contant:
 ```
 defaultproxyprovider: default
 docker:
@@ -99,7 +100,7 @@ sudo mkdir -p /home/ubuntu/docker/ente/minio-data
 sudo mkdir -p /home/ubuntu/docker/ente/postgres-data
 sudo mkdir -p /home/ubuntu/docker/ente/scripts/compose
 ```
-Than give permission user for each of the above directory. `sudo chown -R 1000:1000 /home/ubuntu/docker/ente/custom-logs` etc etc. Make sure not to skip `/home/ubuntu/docker/tsdproxy/config`
+Than give user permission for each of the above directory. `sudo chown -R 1000:1000 /home/ubuntu/docker/ente/custom-logs` etc etc. Make sure not to skip `/home/ubuntu/docker/tsdproxy/config`
 
 `cd docker/ente/script/compose` and run `sudo nano credentials.yaml` than populate it with the following:
 ```
@@ -133,7 +134,7 @@ s3:
         bucket: scw-eu-fr-v3
 ```
 
-In the same directory run `sudo nano minio-provision.sh` and populate it with the following contants:
+In the same directory run `sudo nano minio-provision.sh` and populate it with the following contant:
 ```
 #!/bin/sh
 
@@ -259,7 +260,7 @@ networks:
     external: true
 ```
 
-> Thats it. Run `docker compose up -d`. Wait till every container become healthy. Open web browser. Make sure tailscale is installed on the machine. Visit https://ente.xyz.ts.net/ping. It will pong. All good if you see it. First time it will take minute or two to get SSL cert. Downnload Desktop or mobile app. Tap 7 time on the screen, which will prompt developer mode. Add https://ente.xyz.ts.net. Add new user. When asked for OTP. Just go to terminal and run `docker logs ente-museum-1`. Search for userauth. Feed the six digit and Done.
+> Thats it. Run `docker compose up -d`. Wait till every container become healthy. Open web browser. Make sure tailscale is installed on the machine. Visit https://ente.xyz.ts.net/ping. It will pong. All good if you see it. First time it will take minute or two to get SSL cert. Downnload Desktop or mobile app. Tap 7 time on the screen, which will prompt developer mode. Add https://ente.xyz.ts.net. Add new user. When asked for OTP. Just go to linux terminal and run `docker logs ente-museum-1`. Search for userauth. Feed the six digit and Done.
 
 > For getting 100TB (limitless) storage. Just Install ente-cli for windows. Extract it and add folder. Name it **export**. Add config.yaml file along and populate it with the following:
 ```
@@ -274,12 +275,12 @@ Right-Click in the directory where you have extracted ente-cli. Select `open in
 .\ente.exe account bob # change bob to yours
 ```
 Hit Enter twice.
-For export directory, just write export. As we already created **export** folder.
+For export directory, just write export. As already created **export** folder earlier.
 **Write email. The one which is already used befor when creating ente account in ente desktop app.**
 Type the same Password used before for the account.Run 
 ```
 .\ente.ext account list
 ```
-and you will see the account ID. copy it.
-> Open museum.yaml file. `cd docker/ente`. Run `sudo nano museum.yaml` and the account ID under Admins. Delete any previous entries.
+This will list all account details. Copy Acount ID.
+> Navigate to museum.yaml file. `cd docker/ente`. Run `sudo nano museum.yaml` and add the account ID under Admins. Delete any previous entries.
 Restart ente-museum-1 container from linux terminal. Run `docker restart ente-museum-1`. All well, now you will have 100TB storage. Repeat if for any other accounts you want to give unlimited storage access.

From 8abe6957d7da76bf90946088ec4f6cd2ada001e0 Mon Sep 17 00:00:00 2001
From: Crowdin Bot <support+bot@crowdin.com>
Date: Mon, 24 Feb 2025 00:35:43 +0000
Subject: [PATCH 449/796] New Crowdin translations by GitHub Action

---
 .../base/locales/fr-FR/translation.json       |   6 +-
 .../base/locales/ja-JP/translation.json       | 378 +++++++++---------
 .../base/locales/lt-LT/translation.json       |   8 +-
 .../base/locales/pt-BR/translation.json       |   2 +-
 4 files changed, 197 insertions(+), 197 deletions(-)

diff --git a/web/packages/base/locales/fr-FR/translation.json b/web/packages/base/locales/fr-FR/translation.json
index c2ed1154d7..af6a65ddc8 100644
--- a/web/packages/base/locales/fr-FR/translation.json
+++ b/web/packages/base/locales/fr-FR/translation.json
@@ -529,10 +529,10 @@
         "gb": "Go",
         "tb": "To"
     },
-    "stop": "",
+    "stop": "Arrêter",
     "sync_continuously": "Synchronisation en continu",
     "export_starting": "Démarrage de l'export...",
-    "preparing": "Préparations...",
+    "preparing": "En cours de préparation...",
     "renaming_album_folders": "Renommage des dossiers de l'album en cours...",
     "trashing_deleted_files": "Mise à la corbeille des fichiers supprimés...",
     "trashing_deleted_albums": "Mise à la corbeille des albums supprimés...",
@@ -573,7 +573,7 @@
     "christmas": "Noël",
     "christmas_eve": "Réveillon de Noël",
     "new_year": "Nouvel an",
-    "new_year_eve": "Réveillon de Nouvel An",
+    "new_year_eve": "Réveillon du Nouvel An",
     "image": "Image",
     "video": "Vidéo",
     "live_photo": "Photos en direct",
diff --git a/web/packages/base/locales/ja-JP/translation.json b/web/packages/base/locales/ja-JP/translation.json
index 46957932f5..858c664895 100644
--- a/web/packages/base/locales/ja-JP/translation.json
+++ b/web/packages/base/locales/ja-JP/translation.json
@@ -66,7 +66,7 @@
         "5": "バックアップが完了しました"
     },
     "FILE_NOT_UPLOADED_LIST": "次のファイルはアップロードされませんでした",
-    "initial_load_delay_warning": "",
+    "initial_load_delay_warning": "最初の負荷に時間がかかる場合があります",
     "no_account": "アカウントがありませんか",
     "existing_account": "既にアカウントをお持ちの方",
     "create": "作成",
@@ -87,8 +87,8 @@
     "title_accounts": "Ente アカウント",
     "upload_first_photo": "最初の写真をアップロード",
     "import_your_folders": "フォルダをインポート",
-    "upload_dropzone_hint": "",
-    "watch_folder_dropzone_hint": "",
+    "upload_dropzone_hint": "ファイルをバックアップするにはドロップします",
+    "watch_folder_dropzone_hint": "ドロップして監視フォルダを追加",
     "trash_files_title": "ファイルを削除しますか？",
     "trash_file_title": "ファイルを削除しますか？",
     "delete_files_title": "すぐに削除しますか？",
@@ -99,7 +99,7 @@
     "delete_key": "削除 (DEL)",
     "favorite": "お気に入り",
     "favorite_key": "お気に入り (L)",
-    "unfavorite_key": "",
+    "unfavorite_key": "Unfavorite (L)",
     "convert": "変換する",
     "multi_folder_upload": "複数のフォルダが検出されました",
     "upload_to_choice": "アップロードしますか",
@@ -126,7 +126,7 @@
     "incorrect_recovery_key": "リカバリーキーが正しくありません",
     "sorry": "申し訳ありません",
     "no_recovery_key_message": "エンドツーエンドの暗号化プロトコルの性質上、あなたのデータはパスワードやリカバリキーなしで復号できません",
-    "no_two_factor_recovery_key_message": "",
+    "no_two_factor_recovery_key_message": "あなたの登録したメールアドレスから<a>{{emailID}}</a> にメールをお送りください",
     "contact_support": "お問い合わせ",
     "help": "Help",
     "ente_help": "Ente Help",
@@ -137,14 +137,14 @@
     "logout": "ログアウト",
     "logout_message": "本当にログアウトしてよろしいですか？",
     "delete_account": "アカウント削除",
-    "delete_account_manually_message": "",
+    "delete_account_manually_message": "<p>ご登録のメールアドレスから <a>{{emailID}}</a> にメールを送信してください。</p><p>あなたのリクエストは72時間以内に処理されます。</p>",
     "change_email": "メールアドレスを変更",
     "ok": "OK",
     "success": "成功",
     "error": "エラー",
     "offline_message": "オフラインです。キャッシュされた内容が表示されています",
     "install": "インストール",
-    "install_mobile_app": "",
+    "install_mobile_app": "<a>Android</a> または <b>iOS</b> アプリをインストールして、すべての写真を自動的にバックアップします",
     "download_app": "デスクトップアプリをダウンロード",
     "download_app_message": "申し訳ありませんが、この操作は現在デスクトップアプリでのみサポートされています",
     "subscription": "サブスクリプション",
@@ -152,26 +152,26 @@
     "manage_family": "ファミリー管理",
     "family_plan": "ファミリープラン",
     "leave_family_plan": "ファミリープランから退会",
-    "leave": "",
+    "leave": "離脱",
     "leave_family_plan_confirm": "本当にファミリープランを退会しますか？",
     "choose_plan": "プランを選択",
     "manage_plan": "サブスクリプションの管理",
     "current_usage": "現在の使用量は <strong>{{usage}}</strong>",
-    "two_months_free": "",
+    "two_months_free": "年次プランでは2ヶ月分無料",
     "free_plan_option": "無料プランを継続する",
     "free_plan_description": "{{storage}} は永久に無料です",
     "active": "アクティブ",
     "subscription_info_free": "無料プランをご利用いただいています",
     "subscription_info_family": "あなたはファミリープランを利用しています：",
-    "subscription_info_expired": "",
+    "subscription_info_expired": "サブスクリプションの有効期限が切れています。<a>更新</a>してください",
     "subscription_info_renewal_cancelled": "サブスクリプションは{{date, date}}でキャンセルされます",
-    "subscription_info_storage_quota_exceeded": "",
+    "subscription_info_storage_quota_exceeded": "ストレージの上限を超えました。<a>アップグレードしてください。</a>",
     "subscription_status_renewal_active": "{{date, date}}更新",
     "subscription_status_renewal_cancelled": "{{date, date}}終了",
     "add_on_valid_till": "あなたの {{storage}} アドオンは {{date, date}} まで有効です",
     "subscription_expired": "サブスクリプションが期限切れです",
     "storage_quota_exceeded": "ストレージの上限に達しました",
-    "subscription_purchase_success": "",
+    "subscription_purchase_success": "<p>お支払いを確認しました。</p> <p>あなたのサブスクリプションは <strong>{{date, date}}</strong> まで有効です。</p>",
     "subscription_purchase_cancelled": "購入がキャンセルされました。購読する場合は、もう一度お試しください",
     "subscription_purchase_failed": "サブスクリプションの購入に失敗しました。もう一度お試しください",
     "subscription_verification_error": "サブスクリプションの検証に失敗しました",
@@ -186,9 +186,9 @@
     "update_subscription_title": "プラン変更を確認",
     "update_subscription_message": "プランを変更して良いですか？",
     "cancel_subscription": "サブスクリプションをキャンセル",
-    "cancel_subscription_message": "",
-    "cancel_subscription_with_addon_message": "",
-    "subscription_cancel_success": "",
+    "cancel_subscription_message": "<p>請求期間の終了時に、お客様のデータはすべて弊社のサーバーから削除されます。 <p></p><p>サブスクリプションをキャンセルしてもよろしいですか？</p>",
+    "cancel_subscription_with_addon_message": "<p>サブスクリプションを解約しますか？</p>",
+    "subscription_cancel_success": "サブスクリプションをキャンセルしました",
     "reactivate_subscription": "サブスクリプションを再有効化",
     "reactivate_subscription_message": "再有効化すると、{{date, date}} に請求されます",
     "subscription_activate_success": "サブスクリプションが正常に有効になりました ",
@@ -201,7 +201,7 @@
     "rename_album": "アルバム名を変更",
     "delete_album": "アルバムを削除",
     "delete_album_title": "アルバムを削除しますか？",
-    "delete_album_message": "",
+    "delete_album_message": "このアルバムに含まれている写真 (およびビデオ) を <a>すべて</a> 他のアルバムからも削除しますか？",
     "delete_photos": "写真を削除",
     "keep_photos": "写真を残す",
     "share_album": "アルバムを共有",
@@ -219,27 +219,27 @@
     "description": "説明",
     "file_type": "ファイルの種類",
     "magic": "マジック",
-    "photos_count_zero": "",
-    "photos_count_one": "",
-    "photos_count": "",
+    "photos_count_zero": "0枚",
+    "photos_count_one": "1枚",
+    "photos_count": "{{count, number}}枚",
     "terms_and_conditions": "<a>規約</a> および <b>プライバシー ポリシー</b> に同意します",
-    "people": "",
-    "indexing_scheduled": "",
-    "indexing_photos": "",
-    "indexing_fetching": "",
-    "indexing_people": "",
-    "syncing_wait": "",
-    "people_empty_too_few": "",
-    "unnamed_person": "",
-    "add_a_name": "",
+    "people": "人物",
+    "indexing_scheduled": "インデックス作成がスケジュールされています…",
+    "indexing_photos": "インデックスを更新しています…",
+    "indexing_fetching": "インデックスを同期しています…",
+    "indexing_people": "人を同期しています…",
+    "syncing_wait": "同期中…",
+    "people_empty_too_few": "人物の写真が十分にある場合、ここに人物が表示されます",
+    "unnamed_person": "未登録の人物",
+    "add_a_name": "名前を追加",
     "new_person": "新しい人物",
     "add_name": "名前を追加する",
     "rename_person": "人物名を変更する",
-    "reset_person_confirm": "",
-    "reset_person_confirm_message": "",
+    "reset_person_confirm": "リセットしますか？",
+    "reset_person_confirm_message": "この人の名前、顔のグループ化、提案はリセットされます",
     "ignore": "無視する",
-    "ignore_person_confirm": "",
-    "ignore_person_confirm_message": "",
+    "ignore_person_confirm": "無視しますか？",
+    "ignore_person_confirm_message": "この顔のグループ化は人リストには表示されません",
     "ignored": "無視",
     "show_person": "人物を表示",
     "review_suggestions": "提案を確認",
@@ -257,17 +257,17 @@
     "map": "マップ",
     "enable_map": "マップを有効にする",
     "enable_maps_confirm": "マップを有効にしますか？",
-    "enable_maps_confirm_message": "",
+    "enable_maps_confirm_message": "世界地図上にあなたの写真を表示します。\n\n地図はOpenStreetMapを利用しており、あなたの写真の位置情報が外部に共有されることはありません。\n\nこの機能は設定から無効にすることができます",
     "disable_map": "マップを無効にする",
     "disable_maps_confirm": "マップを無効にしますか？",
-    "disable_maps_confirm_message": "",
+    "disable_maps_confirm_message": "<p>ワールドマップでの写真の表示を無効にします。</p><p>設定からいつでもこの機能を有効にできます。</p>",
     "details": "詳細",
     "view_exif": "すべての Exif データを表示",
     "no_exif": "Exifデータがありません",
     "exif": "Exif",
     "two_factor": "二要素",
     "two_factor_authentication": "二要素認証",
-    "two_factor_qr_help": "",
+    "two_factor_qr_help": "以下のQRコードをお気に入りの認証アプリでスキャンしてください",
     "two_factor_manual_entry_title": "コードを手動で入力",
     "two_factor_manual_entry_message": "このコードをお気に入りの認証アプリに入力してください",
     "scan_qr_title": "代わりにQRコードをスキャン",
@@ -276,44 +276,44 @@
     "enabled": "有効",
     "lost_2fa_device": "紛失した二要素デバイス",
     "incorrect_code": "不正なコード",
-    "two_factor_info": "",
+    "two_factor_info": "セキュリティ強化のため、メールアドレスとパスワードに加えて追加の認証層を設定します",
     "disable": "無効化",
     "reconfigure": "再設定",
     "reconfigure_two_factor_hint": "認証デバイスを更新する",
     "update_two_factor": "二要素認証の更新",
-    "update_two_factor_message": "",
+    "update_two_factor_message": "転送を続行すると、以前に設定された認証情報が無効になります",
     "update": "更新",
     "disable_two_factor": "二要素認証の無効化",
-    "disable_two_factor_message": "",
+    "disable_two_factor_message": "2要素認証を無効にしてもよろしいですか？",
     "export_data": "データをエクスポート",
     "select_folder": "フォルダを選択",
-    "select_zips": "",
+    "select_zips": "Zipを選択",
     "faq": "FAQ",
-    "takeout_hint": "",
+    "takeout_hint": "すべてのzipを一つのフォルダに展開してアップロードします。または直接zipをアップロードします。詳細についてはFAQを参照してください。",
     "destination": "宛先",
     "start": "スタート",
-    "last_export_time": "",
+    "last_export_time": "最終エクスポート日時",
     "export_again": "再同期",
     "LOCAL_STORAGE_NOT_ACCESSIBLE_MESSAGE": "ブラウザまたはアドオンがEnteのローカルストレージへのデータ保存をブロックしています",
     "email_already_taken": "メールアドレスはすでに使用されています",
-    "ETAGS_BLOCKED": "",
-    "LIVE_PHOTOS_DETECTED": "",
-    "RETRY_FAILED": "",
+    "ETAGS_BLOCKED": "ブラウザまたはアドオンが <code>eTags</code> を使用して大きなファイルをアップロードすることを妨げています。",
+    "LIVE_PHOTOS_DETECTED": "Live Photos の写真とビデオファイルが1つのファイルに統合されました",
+    "RETRY_FAILED": "失敗したアップロードを再試行する",
     "FAILED_UPLOADS": "アップロード失敗 ",
-    "failed_uploads_hint": "",
-    "SKIPPED_FILES": "",
-    "THUMBNAIL_GENERATION_FAILED_UPLOADS": "",
-    "UNSUPPORTED_FILES": "",
-    "SUCCESSFUL_UPLOADS": "",
-    "SKIPPED_INFO": "",
+    "failed_uploads_hint": "アップロードが完了すると、これらを再試行するオプションがあります",
+    "SKIPPED_FILES": "無視されたアップロード",
+    "THUMBNAIL_GENERATION_FAILED_UPLOADS": "サムネイルの生成に失敗しました",
+    "UNSUPPORTED_FILES": "サポートされないファイル",
+    "SUCCESSFUL_UPLOADS": "アップロード成功",
+    "SKIPPED_INFO": "同じアルバムに一致する名前と内容を持つファイルがあるため、これらをスキップしました",
     "UNSUPPORTED_INFO": "Enteはこれらのファイル形式をサポートしていません",
-    "BLOCKED_UPLOADS": "",
-    "INPROGRESS_UPLOADS": "",
-    "TOO_LARGE_UPLOADS": "",
-    "LARGER_THAN_AVAILABLE_STORAGE_UPLOADS": "",
-    "LARGER_THAN_AVAILABLE_STORAGE_INFO": "",
-    "TOO_LARGE_INFO": "",
-    "THUMBNAIL_GENERATION_FAILED_INFO": "",
+    "BLOCKED_UPLOADS": "アップロードがブロックされました",
+    "INPROGRESS_UPLOADS": "アップロード進行中",
+    "TOO_LARGE_UPLOADS": "ファイルサイズが大きい",
+    "LARGER_THAN_AVAILABLE_STORAGE_UPLOADS": "ストレージ容量が足りません",
+    "LARGER_THAN_AVAILABLE_STORAGE_INFO": "ストレージプランの最大サイズ制限を超えているため、これらのファイルはアップロードされませんでした",
+    "TOO_LARGE_INFO": "ファイルサイズの上限を超えているため、これらのファイルはアップロードされませんでした",
+    "THUMBNAIL_GENERATION_FAILED_INFO": "これらのファイルはアップロードされましたが、残念ながらサムネイルを生成できませんでした。",
     "upload_to_album": "アルバムにアップロード",
     "add_to_album": "アルバムに追加",
     "move_to_album": "アルバムに移動",
@@ -344,66 +344,66 @@
     "empty_trash": "ごみ箱を空にする",
     "empty_trash_title": "ごみ箱を空にしますか？",
     "empty_trash_message": "これらのファイルはEnteアカウントから完全に削除されます。",
-    "leave_album": "",
-    "leave_shared_album_title": "",
-    "leave_shared_album_message": "",
-    "leave_shared_album": "",
-    "confirm_remove_message": "",
-    "confirm_remove_incl_others_message": "",
-    "oldest": "",
-    "last_updated": "",
-    "name": "",
-    "fix_creation_time": "",
-    "fix_creation_time_in_progress": "",
-    "fix_creation_time_file_updated": "",
-    "fix_creation_time_completed": "",
-    "fix_creation_time_completed_with_errors": "",
-    "fix_creation_time_options": "",
-    "exif_date_time_original": "",
-    "exif_date_time_digitized": "",
+    "leave_album": "アルバムを抜ける",
+    "leave_shared_album_title": "共有アルバムを抜けてよいですか？",
+    "leave_shared_album_message": "アルバムから抜けると、このアルバムは見えなくなります。",
+    "leave_shared_album": "はい、抜けます",
+    "confirm_remove_message": "選択したアイテムはこのアルバムから削除されます。このアルバムにのみ含まれるアイテムは未分類に移動されます。",
+    "confirm_remove_incl_others_message": "削除したアイテムのいくつかは他の人によって追加されました。あなたはそれらにアクセスできなくなります。",
+    "oldest": "古い順",
+    "last_updated": "更新日順",
+    "name": "名前順",
+    "fix_creation_time": "時刻を修正",
+    "fix_creation_time_in_progress": "時刻を修正中",
+    "fix_creation_time_file_updated": "ファイルの時刻が更新されました",
+    "fix_creation_time_completed": "すべてのファイルが正常に更新されました",
+    "fix_creation_time_completed_with_errors": "ファイルの更新に失敗しました。もう一度やり直してください",
+    "fix_creation_time_options": "使用するオプションを選択してください",
+    "exif_date_time_original": "Exif:DateTimeOriginal",
+    "exif_date_time_digitized": "Exif:DateTimeDigitized",
     "exif_metadata_date": "Exif:メタデータ日付",
-    "custom_time": "",
+    "custom_time": "カスタムタイム",
     "caption_character_limit": "最大5000文字",
     "sharing_details": "共有の詳細",
     "modify_sharing": "共有を変更",
-    "add_collaborators": "",
-    "add_new_email": "",
-    "shared_with_people_count_zero": "",
-    "shared_with_people_count_one": "",
-    "shared_with_people_count": "",
-    "participants_count_zero": "",
-    "participants_count_one": "",
-    "participants_count": "",
-    "add_viewers": "",
-    "change_permission_to_viewer": "",
-    "change_permission_to_collaborator": "",
-    "change_permission_title": "",
-    "confirm_convert_to_viewer": "",
-    "confirm_convert_to_collaborator": "",
-    "manage": "",
-    "added_as": "",
-    "collaborator_hint": "",
-    "remove_participant": "",
-    "remove_participant_title": "",
-    "remove_participant_message": "",
-    "confirm_remove": "",
+    "add_collaborators": "コラボレーターを追加",
+    "add_new_email": "新しいメールアドレスを追加",
+    "shared_with_people_count_zero": "特定の人と共有",
+    "shared_with_people_count_one": "1人と共有",
+    "shared_with_people_count": "{{count, number}} 人と共有",
+    "participants_count_zero": "参加者がいません",
+    "participants_count_one": "1人の参加者",
+    "participants_count": "{{count, number}} 人の参加者",
+    "add_viewers": "ビューアーを追加",
+    "change_permission_to_viewer": "{{selectedEmail}} は写真をアルバムに追加できなくなります※{user} が追加した写真は今後も{user} が削除できます",
+    "change_permission_to_collaborator": "{{selectedEmail}} はアルバムに写真を追加できるようになります",
+    "change_permission_title": "権限を変更しますか？",
+    "confirm_convert_to_viewer": "はい、ビューアに変換します",
+    "confirm_convert_to_collaborator": "はい、共同編集者に変換します",
+    "manage": "管理",
+    "added_as": "追加:",
+    "collaborator_hint": "コラボレーターは共有アルバムに写真やビデオを追加できます",
+    "remove_participant": "参加者を削除",
+    "remove_participant_title": "削除しますか？",
+    "remove_participant_message": "<p>{{selectedEmail}} はアルバムから削除されます。</p> <p>また、そのユーザーが追加した写真もアルバムから削除されます。</p>",
+    "confirm_remove": "はい、削除します",
     "owner": "オーナー",
     "collaborators": "コラボレーター",
     "viewers": "ビューアー",
     "add_more": "さらに追加",
-    "or_add_existing": "",
+    "or_add_existing": "または既存のものを選択",
     "NOT_FOUND": "404 - 見つかりません",
-    "link_expired": "",
-    "link_expired_message": "",
-    "manage_link": "",
-    "link_request_limit_exceeded": "",
+    "link_expired": "リンクは有効期限切れです",
+    "link_expired_message": "このリンクは有効期限が切れているか無効になっています",
+    "manage_link": "リンクを管理",
+    "link_request_limit_exceeded": "このアルバムはあまりにも多くの端末で閲覧されています",
     "allow_downloads": "ダウンロードを許可",
-    "allow_adding_photos": "",
-    "allow_adding_photos_hint": "",
-    "device_limit": "",
-    "none": "",
-    "link_expiry": "",
-    "never": "",
+    "allow_adding_photos": "写真の追加を許可",
+    "allow_adding_photos_hint": "リンクを持つ人が共有アルバムに写真を追加できるようにします。",
+    "device_limit": "デバイスの制限",
+    "none": "なし",
+    "link_expiry": "リンクの期限切れ",
+    "never": "なし",
     "after_time": {
         "hour": "1時間後",
         "day": "1日後",
@@ -420,8 +420,8 @@
     "public_link_enabled": "公開リンクが有効です",
     "collect_photos": "写真を収集する",
     "disable_file_download": "ダウンロードを無効化",
-    "disable_file_download_message": "",
-    "shared_using": "",
+    "disable_file_download_message": "<p>ファイルのダウンロードボタンを無効化しますか？</p> <p>閲覧者は、スクリーンショットを撮ったり、外部ツールを使用して写真を保存したりすることが可能です。</p>",
+    "shared_using": "<a>{{url}}</a> を使用して共有",
     "sharing_referral_code": "コード <strong>{{referralCode}}</strong> を使用して、10 GB の空き領域を入手",
     "live_photo_indicator": "LIVE",
     "disable_password": "パスワードロックを無効化する",
@@ -430,17 +430,17 @@
     "lock": "ロック",
     "file": "ファイル",
     "folder": "フォルダ",
-    "google_takeout": "",
-    "deduplicate_files": "",
-    "remove_duplicates": "",
-    "total_size": "",
-    "count": "",
-    "deselect_all": "",
-    "no_duplicates": "",
-    "duplicate_group_description": "",
-    "remove_duplicates_button_count": "",
-    "stop_uploads_title": "",
-    "stop_uploads_message": "",
+    "google_takeout": "Google から取り出し",
+    "deduplicate_files": "重複ファイル",
+    "remove_duplicates": "重複を削除",
+    "total_size": "合計サイズ",
+    "count": "カウント",
+    "deselect_all": "選択解除",
+    "no_duplicates": "重複はありません",
+    "duplicate_group_description": "{{count}} 個のアイテム、 {{itemSize}}",
+    "remove_duplicates_button_count": "{{count, number}} 件を削除",
+    "stop_uploads_title": "アップロードを中止しますか？",
+    "stop_uploads_message": "進行中のすべてのアップロードを中止してもよろしいですか？",
     "yes_stop_uploads": "はい、アップロードを中止します",
     "stop_downloads_title": "ダウンロードを中止しますか？",
     "stop_downloads_message": "進行中のすべてのダウンロードを停止してもよろしいですか？",
@@ -463,31 +463,31 @@
     "family": "ファミリー",
     "free": "free",
     "of": "of",
-    "watch_folders": "",
-    "watched_folders": "",
-    "no_folders_added": "",
-    "watch_folders_hint_1": "",
-    "watch_folders_hint_2": "",
-    "watch_folders_hint_3": "",
+    "watch_folders": "監視フォルダ",
+    "watched_folders": "監視中のフォルダ",
+    "no_folders_added": "フォルダはまだ追加されていません",
+    "watch_folders_hint_1": "ここで追加したフォルダは自動的に監視されます",
+    "watch_folders_hint_2": "Ente に新しいファイルをアップロード",
+    "watch_folders_hint_3": "削除されたファイルをEnteから削除",
     "add_folder": "フォルダを追加",
     "stop_watching": "ウォッチを停止",
-    "stop_watching_folder_title": "",
-    "stop_watching_folder_message": "",
+    "stop_watching_folder_title": "フォルダの監視を停止しますか？",
+    "stop_watching_folder_message": "既存のファイルは削除されませんが、Enteはこのフォルダ変更にリンクしたEnteアルバムへの自動更新を停止します。",
     "yes_stop": "はい、停止します",
     "change_folder": "フォルダを変更",
-    "view_logs": "",
-    "view_logs_message": "",
-    "weak_device_hint": "",
-    "drag_and_drop_hint": "",
+    "view_logs": "ログを表示",
+    "view_logs_message": "<p>デバッグログが表示されますので、問題を解決するためにメールでお問い合わせください。 <p></p><p>問題の特定追跡のため、ファイル名が含まれることに注意してください。</p>",
+    "weak_device_hint": "使用しているWebブラウザは、写真を暗号化するのに十分な強力ではありません。 パソコンでEnteにログインするか、Enteモバイル/デスクトップアプリをダウンロードしてください。",
+    "drag_and_drop_hint": "または、Ente ウィンドウにドラッグ＆ドロップします",
     "authenticate": "認証",
-    "uploaded_to_single_collection": "",
-    "uploaded_to_separate_collections": "",
-    "nevermind": "",
+    "uploaded_to_single_collection": "1つのコレクションにアップロードしました",
+    "uploaded_to_separate_collections": "別々のコレクションにアップロードしました",
+    "nevermind": "気にしない",
     "update_available": "アップデートがあります",
     "update_installable_message": "Enteの新しいバージョンをインストールする準備ができました。",
     "install_now": "今すぐインストール",
     "install_on_next_launch": "次回起動時にインストール",
-    "update_available_message": "",
+    "update_available_message": "Enteの新しいバージョンがリリースされましたが、自動的にダウンロードおよびインストールすることはできません。",
     "download_and_install": "ダウンロードしてインストール",
     "ignore_this_version": "このバージョンを無視する",
     "today": "今日",
@@ -495,12 +495,12 @@
     "enter_name": "名前を入力してください",
     "uploader_name_hint": "友達がこの素晴らしい写真に感謝する相手を知るために、名前を追加してください！",
     "name_placeholder": "名前…",
-    "root_level_file_with_folder_not_allowed": "",
-    "root_level_file_with_folder_not_allowed_message": "",
+    "root_level_file_with_folder_not_allowed": "ファイル/フォルダのミックスからアルバムを作成できません",
+    "root_level_file_with_folder_not_allowed_message": "<p>ファイルとフォルダが混在した状態でドラッグ＆ドロップされました。</p> <p>別々のアルバムを作成するオプションを選択する場合は、ファイルのみ、またはフォルダのみを選択してください。</p>",
     "more_details": "さらに詳細を表示",
     "ml_search": "機械学習",
-    "ml_search_description": "",
-    "ml_search_footnote": "",
+    "ml_search_description": "Enteは顔認識、マジック検索、その他の高度な検索機能のため、あなたのデバイス上で機械学習をしています",
+    "ml_search_footnote": "マジック検索では、「車」、「赤い車」、「フェラーリ」などの写真に写っている内容で写真を検索できます",
     "indexing": "インデックス中",
     "processed": "処理完了",
     "indexing_status_running": "実行中",
@@ -511,8 +511,8 @@
     "ml_search_disable_confirm": "すべてのデバイスで機械学習を無効にしますか？",
     "ml_consent": "機械学習を有効にする",
     "ml_consent_title": "機械学習を有効にしますか？",
-    "ml_consent_description": "",
-    "ml_consent_confirmation": "",
+    "ml_consent_description": "<p>機械学習を有効にすると、Ente はファイル（共有されたものを含む）から顔の形状などの情報を抽出します。</p> <p>これはお使いのデバイス上で行われ、生成された生体情報はエンドツーエンドで暗号化されます。</p> <p><a>この機能の詳細については、プライバシーポリシーをご覧ください</a></p>",
+    "ml_consent_confirmation": "理解して、機械学習を有効にします",
     "labs": "Labs",
     "passphrase_strength_weak": "パスワード強度: 弱い",
     "passphrase_strength_moderate": "パスワード強度: 普通",
@@ -521,7 +521,7 @@
     "language": "言語",
     "advanced": "アドバンスド",
     "export_directory_does_not_exist": "無効なエクスポートディレクトリ",
-    "export_directory_does_not_exist_message": "",
+    "export_directory_does_not_exist_message": "<p>選択したエクスポートディレクトリは存在しません。</p><p>有効なディレクトリを選択してください。</p>",
     "storage_unit": {
         "b": "B",
         "kb": "KB",
@@ -530,13 +530,13 @@
         "tb": "TB"
     },
     "stop": "中止",
-    "sync_continuously": "",
+    "sync_continuously": "継続的に同期",
     "export_starting": "エクスポートを開始中…",
     "preparing": "準備しています…",
-    "renaming_album_folders": "",
+    "renaming_album_folders": "アルバムフォルダの名前を変更しています…",
     "trashing_deleted_files": "削除ファイルをごみ箱に移動中…",
     "trashing_deleted_albums": "削除アルバムをごみ箱に移動中…",
-    "export_progress": "",
+    "export_progress": "<a>{{progress.success, number}} / {{progress.total, number}}</a> アイテムが同期されました",
     "pending_items": "保留中アイテム",
     "delete_account_reason_label": "アカウントを削除する主な理由は何ですか？",
     "delete_account_reason_placeholder": "理由を選択",
@@ -551,13 +551,13 @@
     "delete_account_confirm_checkbox_label": "はい、アカウントとすべてのアプリのデータを削除します",
     "delete_account_confirm": "アカウントの削除に同意",
     "delete_account_confirm_message": "<p>このアカウントは他のEnteアプリも使用している場合はそれらにも紐づけされています。</p>\n<p>すべてのEnteアプリでアップロードされたデータは削除され、アカウントは完全に削除されます。</p>",
-    "feedback_required": "",
-    "feedback_required_found_another_service": "",
-    "recover_two_factor": "",
-    "at": "",
-    "auth_next": "",
-    "auth_download_mobile_app": "",
-    "no_codes_added_yet": "",
+    "feedback_required": "よければ、情報をお寄せください",
+    "feedback_required_found_another_service": "他のサービスの方が良いのは何ですか？",
+    "recover_two_factor": "2要素認証を回復",
+    "at": "at",
+    "auth_next": "次へ",
+    "auth_download_mobile_app": "シークレットを管理するには、モバイルアプリをダウンロードしてください",
+    "no_codes_added_yet": "コードはまだ追加されていません",
     "hide": "非表示",
     "unhide": "再表示",
     "sort_by": "Sort by",
@@ -565,7 +565,7 @@
     "oldest_first": "古い順",
     "pin_album": "アルバムをピン留め",
     "unpin_album": "アルバムのピン留めを解除",
-    "unpreviewable_file_notification": "",
+    "unpreviewable_file_notification": "このファイルはプレビューできませんでした。オリジナルをダウンロードするにはここをクリックしてください。",
     "download_complete": "ダウンロード完了",
     "downloading_album": "{{name}} をダウンロード中",
     "download_failed": "ダウンロードに失敗しました",
@@ -576,10 +576,10 @@
     "new_year_eve": "大晦日",
     "image": "Image",
     "video": "Video",
-    "live_photo": "",
+    "live_photo": "ライブフォト",
     "photo_editor": "フォトエディター",
-    "confirm_editor_close": "",
-    "confirm_editor_close_message": "",
+    "confirm_editor_close": "エディタを閉じてもよろしいですか？",
+    "confirm_editor_close_message": "編集した画像をダウンロードするか、コピーをEnteに保存して変更を保持します。",
     "brightness": "明るさ",
     "contrast": "コントラスト",
     "saturation": "彩度",
@@ -603,59 +603,59 @@
     "colors": "色",
     "invert_colors": "色を反転",
     "reset": "リセット",
-    "faster_upload": "",
-    "faster_upload_description": "",
-    "open_ente_on_startup": "",
-    "cast_album_to_tv": "",
-    "enter_cast_pin_code": "",
+    "faster_upload": "アップロードを高速化",
+    "faster_upload_description": "近くのサーバー経由でのアップロード",
+    "open_ente_on_startup": "開始時に Ente を開く",
+    "cast_album_to_tv": "TVでアルバムを再生",
+    "enter_cast_pin_code": "このデバイスをペアリングするには、以下のテレビで表示されているコードを入力してください。",
     "code": "コード",
     "pair_device_to_tv": "デバイスを接続する",
-    "tv_not_found": "",
-    "cast_auto_pair": "",
-    "cast_auto_pair_description": "",
-    "choose_device_from_browser": "",
-    "cast_auto_pair_failed": "",
-    "pair_with_pin": "",
-    "pair_with_pin_description": "",
-    "visit_cast_url": "",
+    "tv_not_found": "TVが見つかりませんでした。入力したPINは正しいですか？",
+    "cast_auto_pair": "オートペアリング",
+    "cast_auto_pair_description": "自動ペアリングは Chromecast をサポートするデバイスでのみ動作します。",
+    "choose_device_from_browser": "ブラウザポップアップからキャスト対応のデバイスを選択します。",
+    "cast_auto_pair_failed": "Chromecast の自動ペアリングに失敗しました。もう一度やり直してください。",
+    "pair_with_pin": "PINを使ってペアリングする",
+    "pair_with_pin_description": "PINを使ってペアリングすると、どんなスクリーンで動作します。",
+    "visit_cast_url": "ペアリングしたいデバイスで <a>{{url}}</a> にアクセスしてください。",
     "passkeys": "パスキー",
-    "passkey_fetch_failed": "",
+    "passkey_fetch_failed": "パスキーを取得できません。",
     "manage_passkey": "パスキーの管理",
     "delete_passkey": "パスキーを削除",
     "delete_passkey_confirmation": "このパスキーを削除してもよろしいですか？この操作は元に戻せません。",
     "rename_passkey": "パスキーの名前を変更",
     "add_passkey": "パスキーを追加",
     "enter_passkey_name": "パスキーの名前を入力",
-    "passkeys_description": "",
+    "passkeys_description": "パスキーはEnteアカウントの最新かつ安全な第二要素です。利便性とセキュリティのためにデバイス上の生体認証を使用します。",
     "created_at": "作成日",
     "passkey_add_failed": "パスキーを追加できませんでした",
     "passkey_login_failed": "パスキーログインに失敗しました",
     "passkey_login_invalid_url": "ログインURLが不正です。",
-    "passkey_login_already_claimed_session": "",
+    "passkey_login_already_claimed_session": "このセッションはすでに検証されています。",
     "passkey_login_generic_error": "パスキーでログイン中にエラーが発生しました。",
-    "passkey_login_credential_hint": "",
-    "passkeys_not_supported": "",
+    "passkey_login_credential_hint": "パスキーが別のデバイスにある場合は、そのデバイスでこのページを開いて検証できます。",
+    "passkeys_not_supported": "このブラウザではパスキーはサポートされていません",
     "try_again": "再試行",
     "check_status": "ステータスの確認",
-    "passkey_login_instructions": "",
-    "passkey_login": "",
-    "totp_login": "",
+    "passkey_login_instructions": "ログインを続けるには、ブラウザの手順に従ってください。",
+    "passkey_login": "パスキーでログイン",
+    "totp_login": "TOTPでログイン",
     "passkey": "パスキー",
-    "passkey_verify_description": "",
-    "waiting_for_verification": "",
-    "verification_still_pending": "",
-    "passkey_verified": "",
-    "redirecting_back_to_app": "",
-    "redirect_close_instructions": "",
-    "redirect_again": "",
+    "passkey_verify_description": "アカウントにログインするにはパスキーを確認してください。",
+    "waiting_for_verification": "検証を待っています…",
+    "verification_still_pending": "検証はまだ保留中です",
+    "passkey_verified": "パスキーが確認されました",
+    "redirecting_back_to_app": "アプリにリダイレクト中...",
+    "redirect_close_instructions": "アプリを開いた後、このウィンドウを閉じることができます。",
+    "redirect_again": "再度リダイレクトする",
     "autogenerated_first_album_name": "最初のアルバム",
     "autogenerated_default_album_name": "新しいアルバム",
     "developer_settings": "開発者向け設定",
     "server_endpoint": "サーバーエンドポイント",
     "more_information": "詳細情報",
     "save": "保存",
-    "theme": "",
-    "system": "",
-    "light": "",
-    "dark": ""
+    "theme": "テーマ",
+    "system": "システム",
+    "light": "ライト",
+    "dark": "ダーク"
 }
diff --git a/web/packages/base/locales/lt-LT/translation.json b/web/packages/base/locales/lt-LT/translation.json
index b98c74194d..eeb9ce7cb3 100644
--- a/web/packages/base/locales/lt-LT/translation.json
+++ b/web/packages/base/locales/lt-LT/translation.json
@@ -553,10 +553,10 @@
     "delete_account_confirm_message": "<p>Ši paskyra susieta su kitomis „Ente“ programomis, jei jas naudojate.</p><p>Jūsų įkelti duomenys per visas „Ente“ programas bus planuojama ištrinti, o jūsų paskyra bus ištrinta negrįžtamai.</p>",
     "feedback_required": "Maloniai padėkite mums su šia informacija",
     "feedback_required_found_another_service": "Ką kita paslauga daro geriau?",
-    "recover_two_factor": "Atkurkite dvigubą tapatybės nustatymą",
+    "recover_two_factor": "Atkurti dvigubą tapatybės nustatymą",
     "at": " ",
     "auth_next": "sekantis",
-    "auth_download_mobile_app": "Atsisiųskite mūsų mobiliąją programą ir tvarkykite savo paslaptis",
+    "auth_download_mobile_app": "Atsisiųskite mūsų mobiliąją programą, kad tvarkytumėte savo paslaptis.",
     "no_codes_added_yet": "Kol kas nėra pridėtų kodų.",
     "hide": "Slėpti",
     "unhide": "Neslėpti",
@@ -604,7 +604,7 @@
     "invert_colors": "Invertuoti spalvas",
     "reset": "Atkurti",
     "faster_upload": "Spartesni įkėlimai",
-    "faster_upload_description": "Nukreipkite įkėlimus per netoliese esančius serverius",
+    "faster_upload_description": "Nukreipkite įkėlimus per netoliese esančius serverius.",
     "open_ente_on_startup": "Atverti „Ente“ paleidžiant",
     "cast_album_to_tv": "Paleisti albumą televizoriuje",
     "enter_cast_pin_code": "Įveskite žemiau esančiame televizoriuje matomą kodą, kad susietumėte šį įrenginį.",
@@ -632,7 +632,7 @@
     "passkey_login_failed": "Nepavyko slaptarakčio prisijungimas",
     "passkey_login_invalid_url": "Prisijungimo URL netinkamas.",
     "passkey_login_already_claimed_session": "Šis seansas jau patvirtintas.",
-    "passkey_login_generic_error": "Įvyko klaida prisijungiant su slaptarakčiu.",
+    "passkey_login_generic_error": "Prisijungiant su slaptarakčiu įvyko klaida.",
     "passkey_login_credential_hint": "Jei slaptarakčiai yra kitame įrenginyje, galite atverti šį puslapį tame įrenginyje ir patvirtinti.",
     "passkeys_not_supported": "Šioje naršyklėje nepalaikomi slaptarakčiai.",
     "try_again": "Bandyti dar kartą",
diff --git a/web/packages/base/locales/pt-BR/translation.json b/web/packages/base/locales/pt-BR/translation.json
index 01174fd54a..2803a0a546 100644
--- a/web/packages/base/locales/pt-BR/translation.json
+++ b/web/packages/base/locales/pt-BR/translation.json
@@ -531,7 +531,7 @@
     },
     "stop": "Parar",
     "sync_continuously": "Sincronizar continuamente",
-    "export_starting": "Iniciando a exportação...",
+    "export_starting": "Exportação iniciada...",
     "preparing": "Preparando...",
     "renaming_album_folders": "Renomeando pastas do álbum...",
     "trashing_deleted_files": "Descartando arquivos excluídos...",

From 4314d42ab49057ad91ae4cf1a91d8e5cc30e3af5 Mon Sep 17 00:00:00 2001
From: Crowdin Bot <support+bot@crowdin.com>
Date: Mon, 24 Feb 2025 01:17:26 +0000
Subject: [PATCH 450/796] New Crowdin translations by GitHub Action

---
 auth/lib/l10n/arb/app_de.arb | 18 +++++++++++++++++-
 auth/lib/l10n/arb/app_lt.arb |  5 +++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/auth/lib/l10n/arb/app_de.arb b/auth/lib/l10n/arb/app_de.arb
index 9a10ff5be5..94cef6b7b7 100644
--- a/auth/lib/l10n/arb/app_de.arb
+++ b/auth/lib/l10n/arb/app_de.arb
@@ -147,6 +147,7 @@
   "leaveFamily": "Familie verlassen",
   "leaveFamilyMessage": "Sind Sie sicher, dass Sie den Familien-Plan verlassen wollen?",
   "inFamilyPlanMessage": "Sie haben einen Familien-Plan!",
+  "hintForDesktop": "Klicken Sie mit der rechten Maustaste auf einen Code zum Bearbeiten oder Entfernen.",
   "scan": "Scannen",
   "scanACode": "Scan einen Code",
   "verify": "Überprüfen Sie",
@@ -156,6 +157,7 @@
   "twoFactorAuthTitle": "Zwei-Faktor-Authentifizierung",
   "passkeyAuthTitle": "Passkey Authentifizierung",
   "verifyPasskey": "Passkey verifizieren",
+  "loginWithTOTP": "Mit TOTP anmelden",
   "recoverAccount": "Konto wiederherstellen",
   "enterRecoveryKeyHint": "Geben Sie Ihren Wiederherstellungsschlüssel ein",
   "recover": "Wiederherstellen",
@@ -258,6 +260,8 @@
   "yesLogout": "Ja ausloggen",
   "exit": "Schließen",
   "theme": "Theme",
+  "lightTheme": "Hell",
+  "darkTheme": "Dunkel",
   "systemTheme": "System",
   "verifyingRecoveryKey": "Verifiziere Wiederherstellungsschlüssel...",
   "recoveryKeyVerified": "Wiederherstellungsschlüssel verifiziert",
@@ -330,6 +334,9 @@
     }
   },
   "manualSort": "Benutzerdefiniert",
+  "editOrder": "Reihenfolge bearbeiten",
+  "mostFrequentlyUsed": "Häufig verwendet",
+  "mostRecentlyUsed": "Zuletzt verwendet",
   "activeSessions": "Aktive Sitzungen",
   "somethingWentWrongPleaseTryAgain": "Ein Fehler ist aufgetreten, bitte versuche es erneut",
   "thisWillLogYouOutOfThisDevice": "Dadurch wirst du von diesem Gerät abgemeldet!",
@@ -449,6 +456,7 @@
   "customEndpoint": "Mit {endpoint} verbunden",
   "pinText": "Anpinnen",
   "unpinText": "Lösen",
+  "pinned": "Angeheftet",
   "tags": "Tags",
   "createNewTag": "Neuen Tag erstellen",
   "tag": "Tag",
@@ -484,8 +492,16 @@
   "importFailureDescNew": "Die ausgewählte Datei konnte nicht verarbeitet werden.",
   "appLockNotEnabled": "App-Sperre nicht aktiviert",
   "appLockNotEnabledDescription": "Bitte aktivieren Sie die App-Sperre über Security > App-Sperre",
+  "authToViewPasskey": "Bitte authentifizieren, um deinen Passkey zu sehen",
   "duplicateCodes": "Doppelte Codes",
   "noDuplicates": "✨ Keine Duplikate",
+  "youveNoDuplicateCodesThatCanBeCleared": "Sie haben keine doppelten Codes, die gelöscht werden können",
   "deselectAll": "Alle abwählen",
-  "selectAll": "Alles auswählen"
+  "selectAll": "Alles auswählen",
+  "deleteDuplicates": "Duplikate löschen",
+  "plainHTML": "Reines HTML",
+  "tellUsWhatYouThink": "Sagen Sie uns, was Sie denken",
+  "dropReview": "Eine Bewertung im App/Play Store ablegen",
+  "giveUsAStarOnGithub": "Gib uns einen Stern auf Github",
+  "loginWithAuthAccount": "Mit Ihrem Auth Account anmelden"
 }
\ No newline at end of file
diff --git a/auth/lib/l10n/arb/app_lt.arb b/auth/lib/l10n/arb/app_lt.arb
index aa00c7b1ab..f1903dd9b0 100644
--- a/auth/lib/l10n/arb/app_lt.arb
+++ b/auth/lib/l10n/arb/app_lt.arb
@@ -505,5 +505,10 @@
   "selectAll": "Pasirinkti viską",
   "deleteDuplicates": "Ištrinti dublikatus",
   "plainHTML": "Grynasis HTML",
+  "tellUsWhatYouThink": "Pasakykite mums, ką manote",
+  "giveUsAStarOnGithub": "Suteikite mums žvaigždutę platformoje „Github“",
+  "free5GB": "5 GB nemokami programai „<bold-green>ente</bold-green>“ nuotraukos",
+  "loginWithAuthAccount": "Prisijungti su jūsų „Auth“ paskyra",
+  "freeStorageOffer": "10 % nuolaida programai „<bold-green>ente</bold-green>“ nuotraukos",
   "freeStorageOfferDescription": "Naudokite kodą „AUTH“, kad gautumėte 10 % nuolaida pirmiesiems metams. "
 }
\ No newline at end of file

From 8b0990bd6c4b72e082f8fb3fc53a5436ef2ec9bc Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 09:58:52 +0530
Subject: [PATCH 451/796] [web] [desktop] Enable Japanese translations

---
 desktop/CHANGELOG.md                       | 3 +++
 web/apps/photos/src/components/Sidebar.tsx | 2 ++
 web/packages/base/i18n.ts                  | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/desktop/CHANGELOG.md b/desktop/CHANGELOG.md
index 4d7450cec9..730cc92606 100644
--- a/desktop/CHANGELOG.md
+++ b/desktop/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## v1.7.10 (Unreleased)
 
+- Speed up selection for large libraries.
+- Support Japanese translations.
+- Fix video thumbnail generation on drag and drop.
 - .
 
 ## v1.7.9
diff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsx
index fb471f3a25..0aadc8f6e5 100644
--- a/web/apps/photos/src/components/Sidebar.tsx
+++ b/web/apps/photos/src/components/Sidebar.tsx
@@ -903,6 +903,8 @@ const localeName = (locale: SupportedLocale) => {
             return "Українська";
         case "vi-VN":
             return "Tiếng Việt";
+        case "ja-JP":
+            return "日本語";
     }
 };
 
diff --git a/web/packages/base/i18n.ts b/web/packages/base/i18n.ts
index 5b4c6eee33..7a91c3702f 100644
--- a/web/packages/base/i18n.ts
+++ b/web/packages/base/i18n.ts
@@ -33,6 +33,7 @@ export const supportedLocales = [
     "lt-LT" /* Lithuanian */,
     "uk-UA" /* Ukrainian */,
     "vi-VN" /* Vietnamese */,
+    "ja-JP" /* Japanese */
 ] as const;
 
 /** The type of {@link supportedLocales}. */
@@ -192,6 +193,8 @@ const closestSupportedLocale = (
             return "uk-UA";
         } else if (ls.startsWith("vi")) {
             return "vi-VN";
+        } else if (ls.startsWith("ja")) {
+            return "ja-JP";
         }
     }
 

From 3f512bc959df721ec4a2fa546367b355b0574edb Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 10:08:16 +0530
Subject: [PATCH 452/796] lf

---
 web/packages/base/i18n.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/packages/base/i18n.ts b/web/packages/base/i18n.ts
index 7a91c3702f..6949de2eef 100644
--- a/web/packages/base/i18n.ts
+++ b/web/packages/base/i18n.ts
@@ -33,7 +33,7 @@ export const supportedLocales = [
     "lt-LT" /* Lithuanian */,
     "uk-UA" /* Ukrainian */,
     "vi-VN" /* Vietnamese */,
-    "ja-JP" /* Japanese */
+    "ja-JP" /* Japanese */,
 ] as const;
 
 /** The type of {@link supportedLocales}. */

From 245e78ac42ee19a3262d1b606695a15faf176af8 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 24 Feb 2025 11:59:58 +0530
Subject: [PATCH 453/796] [server] Limit support while fetching collections

---
 server/cmd/museum/main.go                 |  1 +
 server/pkg/api/collection.go              | 33 +++++++++++++++++++++--
 server/pkg/controller/collections/diff.go |  8 +++---
 server/pkg/repo/collection.go             | 26 +++++++++++++-----
 4 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go
index 9efaf5141d..ded9c46475 100644
--- a/server/cmd/museum/main.go
+++ b/server/cmd/museum/main.go
@@ -538,6 +538,7 @@ func main() {
 	//lint:ignore SA1019 Deprecated API will be removed in the future
 	privateAPI.GET("/collections", collectionHandler.Get)
 	privateAPI.GET("/collections/v2", collectionHandler.GetV2)
+	privateAPI.GET("/collections/v3", collectionHandler.GetWithLimit)
 	privateAPI.POST("/collections/share", collectionHandler.Share)
 	privateAPI.POST("/collections/join-link", collectionHandler.JoinLink)
 	privateAPI.POST("/collections/share-url", collectionHandler.ShareURL)
diff --git a/server/pkg/api/collection.go b/server/pkg/api/collection.go
index dbfe54abfb..9318f5c329 100644
--- a/server/pkg/api/collection.go
+++ b/server/pkg/api/collection.go
@@ -73,12 +73,12 @@ func (h *CollectionHandler) GetV2(c *gin.Context) {
 	userID := auth.GetUserID(c.Request.Header)
 	sinceTime, _ := strconv.ParseInt(c.Query("sinceTime"), 10, 64)
 	app := auth.GetApp(c)
-	ownedCollections, err := h.Controller.GetOwnedV2(userID, sinceTime, app)
+	ownedCollections, err := h.Controller.GetOwnedV2(userID, sinceTime, app, nil)
 	if err != nil {
 		handler.Error(c, stacktrace.Propagate(err, "Failed to get owned collections"))
 		return
 	}
-	sharedCollections, err := h.Controller.GetSharedWith(userID, sinceTime, app)
+	sharedCollections, err := h.Controller.GetSharedWith(userID, sinceTime, app, nil)
 	if err != nil {
 		handler.Error(c, stacktrace.Propagate(err, "Failed to get shared collections"))
 		return
@@ -88,6 +88,35 @@ func (h *CollectionHandler) GetV2(c *gin.Context) {
 	})
 }
 
+// GetWithLimit returns owned and shared collections accessible to a user
+func (h *CollectionHandler) GetWithLimit(c *gin.Context) {
+	userID := auth.GetUserID(c.Request.Header)
+	sinceTime, _ := strconv.ParseInt(c.Query("sinceTime"), 10, 64)
+	sharedSinceTime, _ := strconv.ParseInt(c.Query("sharedSinceTime"), 10, 64)
+	limit := int64(1000)
+	if c.Query("limit") != "" {
+		limit, _ = strconv.ParseInt(c.Query("limit"), 10, 64)
+		if limit > 1000 {
+			limit = 1000
+		}
+	}
+	app := auth.GetApp(c)
+	ownedCollections, err := h.Controller.GetOwnedV2(userID, sinceTime, app, &limit)
+	if err != nil {
+		handler.Error(c, stacktrace.Propagate(err, "Failed to get owned collections"))
+		return
+	}
+	sharedCollections, err := h.Controller.GetSharedWith(userID, sharedSinceTime, app, &limit)
+	if err != nil {
+		handler.Error(c, stacktrace.Propagate(err, "Failed to get shared collections"))
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{
+		"owned":  ownedCollections,
+		"shared": sharedCollections,
+	})
+}
+
 // Share shares a collection with a user
 func (h *CollectionHandler) Share(c *gin.Context) {
 	var request ente.AlterShareRequest
diff --git a/server/pkg/controller/collections/diff.go b/server/pkg/controller/collections/diff.go
index eb00ff779b..ad4190cfc3 100644
--- a/server/pkg/controller/collections/diff.go
+++ b/server/pkg/controller/collections/diff.go
@@ -6,8 +6,8 @@ import (
 )
 
 // GetOwnedV2 returns the list of collections owned by a user using optimized query
-func (c *CollectionController) GetOwnedV2(userID int64, sinceTime int64, app ente.App) ([]ente.Collection, error) {
-	collections, err := c.CollectionRepo.GetCollectionsOwnedByUserV2(userID, sinceTime, app)
+func (c *CollectionController) GetOwnedV2(userID int64, sinceTime int64, app ente.App, limit *int64) ([]ente.Collection, error) {
+	collections, err := c.CollectionRepo.GetCollectionsOwnedByUserV2(userID, sinceTime, app, limit)
 	if err != nil {
 		return nil, stacktrace.Propagate(err, "")
 	}
@@ -15,8 +15,8 @@ func (c *CollectionController) GetOwnedV2(userID int64, sinceTime int64, app ent
 }
 
 // GetSharedWith returns the list of collections that are shared with a user
-func (c *CollectionController) GetSharedWith(userID int64, sinceTime int64, app ente.App) ([]ente.Collection, error) {
-	collections, err := c.CollectionRepo.GetCollectionsSharedWithUser(userID, sinceTime, app)
+func (c *CollectionController) GetSharedWith(userID int64, sinceTime int64, app ente.App, limit *int64) ([]ente.Collection, error) {
+	collections, err := c.CollectionRepo.GetCollectionsSharedWithUser(userID, sinceTime, app, limit)
 	if err != nil {
 		return nil, stacktrace.Propagate(err, "")
 	}
diff --git a/server/pkg/repo/collection.go b/server/pkg/repo/collection.go
index c1c75b963e..da697ce88b 100644
--- a/server/pkg/repo/collection.go
+++ b/server/pkg/repo/collection.go
@@ -101,8 +101,8 @@ func (repo *CollectionRepository) GetCollectionByType(userID int64, collectionTy
 	return c, nil
 }
 
-func (repo *CollectionRepository) GetCollectionsOwnedByUserV2(userID int64, updationTime int64, app ente.App) ([]ente.Collection, error) {
-	rows, err := repo.DB.Query(`
+func (repo *CollectionRepository) GetCollectionsOwnedByUserV2(userID int64, updationTime int64, app ente.App, limit *int64) ([]ente.Collection, error) {
+	query := `
 		SELECT 
 c.collection_id, c.owner_id, c.encrypted_key,c.key_decryption_nonce, c.name, c.encrypted_name, c.name_decryption_nonce, c.type, c.app, c.attributes, c.updation_time, c.is_deleted, c.magic_metadata, c.pub_magic_metadata,
 users.user_id, users.encrypted_email, users.email_decryption_nonce, cs.role_type,
@@ -114,7 +114,14 @@ pct.access_token, pct.valid_till, pct.device_limit, pct.created_at, pct.updated_
     ON (cs.to_user_id = users.user_id AND users.encrypted_email IS NOT NULL)
     LEFT JOIN public_collection_tokens pct
     ON (pct.collection_id = c.collection_id and pct.is_disabled=FALSE)
-    WHERE c.owner_id = $1 AND c.updation_time > $2 and c.app = $3`, userID, updationTime, string(app))
+    WHERE c.owner_id = $1 AND c.updation_time > $2 and c.app = $3`
+	args := []interface{}{userID, updationTime, string(app)}
+
+	if limit != nil {
+		query += "order by c.updation_time ASC LIMIT $4"
+		args = append(args, *limit)
+	}
+	rows, err := repo.DB.Query(query, args...)
 	if err != nil {
 		return nil, stacktrace.Propagate(err, "")
 	}
@@ -192,14 +199,21 @@ pct.access_token, pct.valid_till, pct.device_limit, pct.created_at, pct.updated_
 
 // GetCollectionsSharedWithUser returns the list of collections that are shared
 // with a user
-func (repo *CollectionRepository) GetCollectionsSharedWithUser(userID int64, updationTime int64, app ente.App) ([]ente.Collection, error) {
-	rows, err := repo.DB.Query(`
+func (repo *CollectionRepository) GetCollectionsSharedWithUser(userID int64, updationTime int64, app ente.App, limit *int64) ([]ente.Collection, error) {
+	query := `
 		SELECT collections.collection_id, collections.owner_id, users.encrypted_email, users.email_decryption_nonce, collection_shares.encrypted_key, collections.name, collections.encrypted_name, collections.name_decryption_nonce, collections.type, collections.app, collections.pub_magic_metadata, collection_shares.magic_metadata, collections.updation_time, collection_shares.is_deleted
 		FROM collections
 		INNER JOIN users
 			ON collections.owner_id = users.user_id
 		INNER JOIN collection_shares
-			ON collections.collection_id = collection_shares.collection_id AND collection_shares.to_user_id = $1 AND (collection_shares.updation_time > $2 OR collections.updation_time > $2) AND users.encrypted_email IS NOT NULL AND app = $3`, userID, updationTime, string(app))
+			ON collections.collection_id = collection_shares.collection_id AND collection_shares.to_user_id = $1 AND (collection_shares.updation_time > $2 OR collections.updation_time > $2) AND users.encrypted_email IS NOT NULL AND app = $3`
+	args := []interface{}{userID, updationTime, string(app)}
+	if limit != nil {
+		query += " LIMIT $4"
+		args = append(args, *limit)
+	}
+
+	rows, err := repo.DB.Query(query, args...)
 	if err != nil {
 		return nil, stacktrace.Propagate(err, "")
 	}

From d268e1f3099e3dca44912da6dbf165f8c55182bc Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 24 Feb 2025 12:39:55 +0530
Subject: [PATCH 454/796] Fix

---
 server/pkg/repo/collection.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/pkg/repo/collection.go b/server/pkg/repo/collection.go
index da697ce88b..2b79441eb7 100644
--- a/server/pkg/repo/collection.go
+++ b/server/pkg/repo/collection.go
@@ -118,7 +118,7 @@ pct.access_token, pct.valid_till, pct.device_limit, pct.created_at, pct.updated_
 	args := []interface{}{userID, updationTime, string(app)}
 
 	if limit != nil {
-		query += "order by c.updation_time ASC LIMIT $4"
+		query += " ORDER BY c.updation_time ASC LIMIT $4"
 		args = append(args, *limit)
 	}
 	rows, err := repo.DB.Query(query, args...)
@@ -209,7 +209,7 @@ func (repo *CollectionRepository) GetCollectionsSharedWithUser(userID int64, upd
 			ON collections.collection_id = collection_shares.collection_id AND collection_shares.to_user_id = $1 AND (collection_shares.updation_time > $2 OR collections.updation_time > $2) AND users.encrypted_email IS NOT NULL AND app = $3`
 	args := []interface{}{userID, updationTime, string(app)}
 	if limit != nil {
-		query += " LIMIT $4"
+		query += " ORDER BY collections.updation_time ASC LIMIT $4"
 		args = append(args, *limit)
 	}
 

From 02dde7f6a2ab7c88f1f44e684c4ca30ca1b3f9a7 Mon Sep 17 00:00:00 2001
From: vishnukvmd <vishnu@ente.io>
Date: Mon, 24 Feb 2025 13:07:04 +0530
Subject: [PATCH 455/796] Update

---
 docs/docs/photos/faq/metadata.md | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/docs/docs/photos/faq/metadata.md b/docs/docs/photos/faq/metadata.md
index 936a3e67dc..03cf10da65 100644
--- a/docs/docs/photos/faq/metadata.md
+++ b/docs/docs/photos/faq/metadata.md
@@ -1,12 +1,11 @@
 ---
 title: Metadata
-description: Handling of metadata, in particular creation dates, in Ente Photos
+description: Handling of metadata in Ente Photos
 ---
 
 # Metadata
 
-This document describes Ente's handling of metadata, in particular photo
-creation dates.
+This document describes Ente's handling of metadata
 
 ## Import
 
@@ -46,7 +45,7 @@ importing that folder into Ente**. This way, we will be able to always correctly
 map, for example, `flower.jpeg` and `flower.json` and show the same date for
 `flower.jpeg` that you would've seen within Google Photos.
 
-### Screenshots
+### File name
 
 In case the photo does not have a date in the Exif data (and it is not a Google
 takeout), for example, for screenshots or Whatsapp forwards, Ente will still try
@@ -57,6 +56,28 @@ and deduce the correct date for the file from the name of the file.
 > This process works great most of the time, but it is inherently based on
 > heuristics and is not exact.
 
+If we are unable to decipher the creation time from these 3 sources, we will set
+the upload time as the photo's creation time.
+
+## Modifications
+
+Ente supports modifications to the following metadata:
+- File name
+- Date & time
+- Location
+
+The first two options are available on both mobile and desktop, while the
+ability to update location is only available within our mobile apps.
+
+### Bulk modifications
+
+You can bulk-edit creation time of photos from our desktop app, by
+multi-selecting items and selecting the "Fix time" option from the action bar.
+
+You can bulk-edit location coordinates of photos from our mobile app, by
+multi-selecting items and selecting the "Edit location" option from the action
+bar.
+
 ## Export
 
 Ente guarantees that you will get back the _exact_ same original photos and

From 5f0bb21491b745b0f4ea2febc58088256ebc059f Mon Sep 17 00:00:00 2001
From: vishnukvmd <vishnu@ente.io>
Date: Mon, 24 Feb 2025 13:54:59 +0530
Subject: [PATCH 456/796] Update

---
 docs/docs/photos/faq/subscription.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/docs/photos/faq/subscription.md b/docs/docs/photos/faq/subscription.md
index 475fbc524b..aa799127bc 100644
--- a/docs/docs/photos/faq/subscription.md
+++ b/docs/docs/photos/faq/subscription.md
@@ -157,6 +157,21 @@ The same applies to monthly plans.
 If you prefer to have this credit refunded to your original payment method,
 please contact support@ente.io, and we'll assist you.
 
+## How can I update my payment method?
+
+You can view and manage your payment method by clicking on the green
+subscription card within the Ente app, and selecting the "Manage payment method"
+button.
+
+You will be able to see all of your previous invoices, with details regarding
+their payment status. In case of failed payments, you will also have an option
+to retry those charges.
+
+## How can I cancel my subscription?
+
+You can cancel your subscription by clicking on the green subscription card
+within the Ente app, and selecting the "Cancel subscription" button.
+
 ## Is there an x GB plan?
 
 We have experimented quite a bit and have found it hard to design a single

From 15aea42b96df015fcf03e3f585559a280f5d526d Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 24 Feb 2025 14:04:39 +0530
Subject: [PATCH 457/796] [server] Minor refactor

---
 server/pkg/repo/collection.go       | 115 --------------------------
 server/pkg/repo/collection_files.go | 123 ++++++++++++++++++++++++++++
 2 files changed, 123 insertions(+), 115 deletions(-)
 create mode 100644 server/pkg/repo/collection_files.go

diff --git a/server/pkg/repo/collection.go b/server/pkg/repo/collection.go
index c1c75b963e..4843a16b01 100644
--- a/server/pkg/repo/collection.go
+++ b/server/pkg/repo/collection.go
@@ -340,85 +340,6 @@ func (repo *CollectionRepository) GetAllSharedCollections(ctx context.Context, u
 	return result, nil
 }
 
-// DoesFileExistInCollections returns true if the file exists in one of the
-// provided collections
-func (repo *CollectionRepository) DoesFileExistInCollections(fileID int64, cIDs []int64) (bool, error) {
-	var exists bool
-	err := repo.DB.QueryRow(`SELECT EXISTS (SELECT 1 FROM collection_files WHERE file_id = $1 AND is_deleted = $2 AND collection_id = ANY ($3))`,
-		fileID, false, pq.Array(cIDs)).Scan(&exists)
-	return exists, stacktrace.Propagate(err, "")
-}
-
-func (repo *CollectionRepository) DoAllFilesExistInGivenCollections(fileIDs []int64, cIDs []int64) error {
-	// Query to get all distinct file_ids that exist in the collections
-	rows, err := repo.DB.Query(`
-        SELECT DISTINCT file_id 
-        FROM collection_files 
-        WHERE file_id = ANY ($1) 
-        AND is_deleted = false 
-        AND collection_id = ANY ($2)`,
-		pq.Array(fileIDs), pq.Array(cIDs))
-
-	if err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-	defer rows.Close()
-
-	// Create a map of input fileIDs for easy lookup
-	fileIDMap := make(map[int64]bool)
-	for _, id := range fileIDs {
-		fileIDMap[id] = false // false means not found yet
-	}
-	// Mark files that were found
-	for rows.Next() {
-		var fileID int64
-		if err := rows.Scan(&fileID); err != nil {
-			return stacktrace.Propagate(err, "")
-		}
-		fileIDMap[fileID] = true // mark as found
-	}
-
-	if err = rows.Err(); err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-
-	// Collect missing files
-	var missingFiles []int64
-	for id, found := range fileIDMap {
-		if !found {
-			missingFiles = append(missingFiles, id)
-		}
-	}
-	if len(missingFiles) > 0 {
-		return stacktrace.Propagate(fmt.Errorf("missing files %v", missingFiles), "")
-	}
-	return nil
-}
-
-// VerifyAllFileIDsExistsInCollection returns error if the fileIDs don't exist in the collection
-func (repo *CollectionRepository) VerifyAllFileIDsExistsInCollection(ctx context.Context, cID int64, fileIDs []int64) error {
-	fileIdMap := make(map[int64]bool)
-	rows, err := repo.DB.QueryContext(ctx, `SELECT file_id FROM collection_files WHERE collection_id = $1 AND is_deleted = $2 AND file_id = ANY ($3)`,
-		cID, false, pq.Array(fileIDs))
-	if err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-	for rows.Next() {
-		var fileID int64
-		if err := rows.Scan(&fileID); err != nil {
-			return stacktrace.Propagate(err, "")
-		}
-		fileIdMap[fileID] = true
-	}
-	// find fileIds that are not present in the collection
-	for _, fileID := range fileIDs {
-		if _, ok := fileIdMap[fileID]; !ok {
-			return stacktrace.Propagate(fmt.Errorf("fileID %d not found in collection %d", fileID, cID), "")
-		}
-	}
-	return nil
-}
-
 // GetCollectionShareeRole returns true if the collection is shared with the user
 func (repo *CollectionRepository) GetCollectionShareeRole(cID int64, userID int64) (*ente.CollectionParticipantRole, error) {
 	var role *ente.CollectionParticipantRole
@@ -434,17 +355,6 @@ func (repo *CollectionRepository) GetOwnerID(collectionID int64) (int64, error)
 	return ownerID, stacktrace.Propagate(err, "failed to get collection owner")
 }
 
-// GetCollectionsFilesCount returns the number of non-deleted files which are present in the given collection
-func (repo *CollectionRepository) GetCollectionsFilesCount(collectionID int64) (int64, error) {
-	row := repo.DB.QueryRow(`SELECT count(*) FROM collection_files WHERE collection_id=$1 AND is_deleted = false`, collectionID)
-	var count int64 = 0
-	err := row.Scan(&count)
-	if err != nil {
-		return -1, stacktrace.Propagate(err, "")
-	}
-	return count, nil
-}
-
 // Share shares a collection with a userID
 func (repo *CollectionRepository) Share(
 	collectionID int64,
@@ -820,21 +730,6 @@ func (repo *CollectionRepository) GetSharees(cID int64) ([]ente.CollectionUser,
 	return users, nil
 }
 
-// GetCollectionFileIDs return list of fileIDs are  currently present in the given collection
-// and fileIDs are owned by the collection owner
-func (repo *CollectionRepository) GetCollectionFileIDs(collectionID int64, collectionOwnerID int64) ([]int64, error) {
-	// Collaboration Todo: Filter out files which are not owned by the collection owner
-	rows, err := repo.DB.Query(
-		`SELECT file_id   
-			FROM collection_files
-			WHERE is_deleted=false
-				AND collection_id =$1 AND (f_owner_id is null or f_owner_id = $2)`, collectionID, collectionOwnerID)
-	if err != nil {
-		return make([]int64, 0), stacktrace.Propagate(err, "")
-	}
-	return convertRowsToFileId(rows)
-}
-
 func convertRowsToFileId(rows *sql.Rows) ([]int64, error) {
 	fileIDs := make([]int64, 0)
 	defer rows.Close()
@@ -1015,13 +910,3 @@ func (repo *CollectionRepository) GetSharedCollectionsCount(userID int64) (int64
 	}
 	return count, nil
 }
-
-func (repo *CollectionRepository) GetCollectionCount(fileID int64) (int64, error) {
-	row := repo.DB.QueryRow(`SELECT count(*) FROM collection_files WHERE file_id = $1 and is_deleted = false`, fileID)
-	var count int64 = 0
-	err := row.Scan(&count)
-	if err != nil {
-		return -1, stacktrace.Propagate(err, "")
-	}
-	return count, nil
-}
diff --git a/server/pkg/repo/collection_files.go b/server/pkg/repo/collection_files.go
new file mode 100644
index 0000000000..9bab3720cf
--- /dev/null
+++ b/server/pkg/repo/collection_files.go
@@ -0,0 +1,123 @@
+package repo
+
+import (
+	"context"
+	"fmt"
+	"github.com/ente-io/stacktrace"
+	"github.com/lib/pq"
+)
+
+// GetCollectionFileIDs return list of fileIDs are  currently present in the given collection
+// and fileIDs are owned by the collection owner
+func (repo *CollectionRepository) GetCollectionFileIDs(collectionID int64, collectionOwnerID int64) ([]int64, error) {
+	// Collaboration Todo: Filter out files which are not owned by the collection owner
+	rows, err := repo.DB.Query(
+		`SELECT file_id   
+			FROM collection_files
+			WHERE is_deleted=false
+				AND collection_id =$1 AND (f_owner_id is null or f_owner_id = $2)`, collectionID, collectionOwnerID)
+	if err != nil {
+		return make([]int64, 0), stacktrace.Propagate(err, "")
+	}
+	return convertRowsToFileId(rows)
+}
+
+// DoesFileExistInCollections returns true if the file exists in one of the
+// provided collections
+func (repo *CollectionRepository) DoesFileExistInCollections(fileID int64, cIDs []int64) (bool, error) {
+	var exists bool
+	err := repo.DB.QueryRow(`SELECT EXISTS (SELECT 1 FROM collection_files WHERE file_id = $1 AND is_deleted = $2 AND collection_id = ANY ($3))`,
+		fileID, false, pq.Array(cIDs)).Scan(&exists)
+	return exists, stacktrace.Propagate(err, "")
+}
+
+func (repo *CollectionRepository) DoAllFilesExistInGivenCollections(fileIDs []int64, cIDs []int64) error {
+	// Query to get all distinct file_ids that exist in the collections
+	rows, err := repo.DB.Query(`
+        SELECT DISTINCT file_id 
+        FROM collection_files 
+        WHERE file_id = ANY ($1) 
+        AND is_deleted = false 
+        AND collection_id = ANY ($2)`,
+		pq.Array(fileIDs), pq.Array(cIDs))
+
+	if err != nil {
+		return stacktrace.Propagate(err, "")
+	}
+	defer rows.Close()
+
+	// Create a map of input fileIDs for easy lookup
+	fileIDMap := make(map[int64]bool)
+	for _, id := range fileIDs {
+		fileIDMap[id] = false // false means not found yet
+	}
+	// Mark files that were found
+	for rows.Next() {
+		var fileID int64
+		if err := rows.Scan(&fileID); err != nil {
+			return stacktrace.Propagate(err, "")
+		}
+		fileIDMap[fileID] = true // mark as found
+	}
+
+	if err = rows.Err(); err != nil {
+		return stacktrace.Propagate(err, "")
+	}
+
+	// Collect missing files
+	var missingFiles []int64
+	for id, found := range fileIDMap {
+		if !found {
+			missingFiles = append(missingFiles, id)
+		}
+	}
+	if len(missingFiles) > 0 {
+		return stacktrace.Propagate(fmt.Errorf("missing files %v", missingFiles), "")
+	}
+	return nil
+}
+
+// VerifyAllFileIDsExistsInCollection returns error if the fileIDs don't exist in the collection
+func (repo *CollectionRepository) VerifyAllFileIDsExistsInCollection(ctx context.Context, cID int64, fileIDs []int64) error {
+	fileIdMap := make(map[int64]bool)
+	rows, err := repo.DB.QueryContext(ctx, `SELECT file_id FROM collection_files WHERE collection_id = $1 AND is_deleted = $2 AND file_id = ANY ($3)`,
+		cID, false, pq.Array(fileIDs))
+	if err != nil {
+		return stacktrace.Propagate(err, "")
+	}
+	for rows.Next() {
+		var fileID int64
+		if err := rows.Scan(&fileID); err != nil {
+			return stacktrace.Propagate(err, "")
+		}
+		fileIdMap[fileID] = true
+	}
+	// find fileIds that are not present in the collection
+	for _, fileID := range fileIDs {
+		if _, ok := fileIdMap[fileID]; !ok {
+			return stacktrace.Propagate(fmt.Errorf("fileID %d not found in collection %d", fileID, cID), "")
+		}
+	}
+	return nil
+}
+
+// GetCollectionsFilesCount returns the number of non-deleted files which are present in the given collection
+func (repo *CollectionRepository) GetCollectionsFilesCount(collectionID int64) (int64, error) {
+	row := repo.DB.QueryRow(`SELECT count(*) FROM collection_files WHERE collection_id=$1 AND is_deleted = false`, collectionID)
+	var count int64 = 0
+	err := row.Scan(&count)
+	if err != nil {
+		return -1, stacktrace.Propagate(err, "")
+	}
+	return count, nil
+}
+
+func (repo *CollectionRepository) GetCollectionCount(fileID int64) (int64, error) {
+	row := repo.DB.QueryRow(`SELECT count(*) FROM collection_files WHERE file_id = $1 and is_deleted = false`, fileID)
+	var count int64 = 0
+	err := row.Scan(&count)
+	if err != nil {
+		return -1, stacktrace.Propagate(err, "")
+	}
+	return count, nil
+}

From 4c3ca8a5658934645e38e46d54897389a0a9ba01 Mon Sep 17 00:00:00 2001
From: vishnukvmd <vishnu@ente.io>
Date: Mon, 24 Feb 2025 14:05:02 +0530
Subject: [PATCH 458/796] Update

---
 docs/docs/photos/faq/security-and-privacy.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/docs/photos/faq/security-and-privacy.md b/docs/docs/photos/faq/security-and-privacy.md
index 0ee3f9b024..240ded8d70 100644
--- a/docs/docs/photos/faq/security-and-privacy.md
+++ b/docs/docs/photos/faq/security-and-privacy.md
@@ -47,6 +47,9 @@ availability and durability. Our
 [reliability document](https://ente.io/reliability) provides in-depth
 information about our storage infrastructure and data replication strategies.
 
+In short, we store 3 copies of your data, across 3 different providers, in 3
+different countries. One of them is in an underground fall-out shelter in Paris.
+
 ### How does Ente's encryption compare to industry standards?
 
 Our encryption model goes beyond industry standards. While many services use

From 4bbe1ae0d237d4d405fb5606df252c3d64f5f2af Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 24 Feb 2025 14:49:21 +0530
Subject: [PATCH 459/796] [server] Remove embeddings handler

---
 server/cmd/museum/main.go                     |   7 -
 server/pkg/api/embedding.go                   |  95 ----
 server/pkg/controller/embedding/controller.go | 425 ------------------
 server/pkg/controller/embedding/delete.go     |  13 -
 4 files changed, 540 deletions(-)
 delete mode 100644 server/pkg/api/embedding.go

diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go
index ded9c46475..9bc1beef63 100644
--- a/server/cmd/museum/main.go
+++ b/server/cmd/museum/main.go
@@ -755,13 +755,6 @@ func main() {
 	privateAPI.POST("/push/token", pushHandler.AddToken)
 
 	embeddingController := embeddingCtrl.New(embeddingRepo, accessCtrl, objectCleanupController, s3Config, queueRepo, taskLockingRepo, fileRepo, collectionRepo, hostName)
-	embeddingHandler := &api.EmbeddingHandler{Controller: embeddingController}
-
-	privateAPI.PUT("/embeddings", embeddingHandler.InsertOrUpdate)
-	privateAPI.GET("/embeddings/diff", embeddingHandler.GetDiff)
-	privateAPI.GET("/embeddings/indexed-files", embeddingHandler.GetIndexedFiles)
-	privateAPI.POST("/embeddings/files", embeddingHandler.GetFilesEmbedding)
-	privateAPI.DELETE("/embeddings", embeddingHandler.DeleteAll)
 
 	offerHandler := &api.OfferHandler{Controller: offerController}
 	publicAPI.GET("/offers/black-friday", offerHandler.GetBlackFridayOffers)
diff --git a/server/pkg/api/embedding.go b/server/pkg/api/embedding.go
deleted file mode 100644
index d95158dd8d..0000000000
--- a/server/pkg/api/embedding.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package api
-
-import (
-	"fmt"
-	"net/http"
-
-	"github.com/ente-io/museum/ente"
-	"github.com/ente-io/museum/pkg/controller/embedding"
-	"github.com/ente-io/museum/pkg/utils/handler"
-
-	"github.com/ente-io/stacktrace"
-	"github.com/gin-gonic/gin"
-)
-
-type EmbeddingHandler struct {
-	Controller *embedding.Controller
-}
-
-// InsertOrUpdate handler for inserting or updating embedding
-func (h *EmbeddingHandler) InsertOrUpdate(c *gin.Context) {
-	var request ente.InsertOrUpdateEmbeddingRequest
-	if err := c.ShouldBindJSON(&request); err != nil {
-		handler.Error(c,
-			stacktrace.Propagate(ente.ErrBadRequest, fmt.Sprintf("Request binding failed %s", err)))
-		return
-	}
-	embedding, err := h.Controller.InsertOrUpdate(c, request)
-	if err != nil {
-		handler.Error(c, stacktrace.Propagate(err, ""))
-		return
-	}
-	c.JSON(http.StatusOK, embedding)
-}
-
-// GetDiff handler for getting diff of embedding
-func (h *EmbeddingHandler) GetDiff(c *gin.Context) {
-	var request ente.GetEmbeddingDiffRequest
-	if err := c.ShouldBindQuery(&request); err != nil {
-		handler.Error(c,
-			stacktrace.Propagate(ente.ErrBadRequest, fmt.Sprintf("Request binding failed %s", err)))
-		return
-	}
-	embeddings, err := h.Controller.GetDiff(c, request)
-	if err != nil {
-		handler.Error(c, stacktrace.Propagate(err, ""))
-		return
-	}
-	c.JSON(http.StatusOK, gin.H{
-		"diff": embeddings,
-	})
-}
-
-// GetIndexedFiles returns the fileIDs that has been indexed or updated for given user
-func (h *EmbeddingHandler) GetIndexedFiles(c *gin.Context) {
-	var request ente.GetIndexedFiles
-	if err := c.ShouldBindQuery(&request); err != nil {
-		handler.Error(c,
-			stacktrace.Propagate(ente.ErrBadRequest, fmt.Sprintf("Request binding failed %s", err)))
-		return
-	}
-	embeddings, err := h.Controller.GetIndexedFiles(c, request)
-	if err != nil {
-		handler.Error(c, stacktrace.Propagate(err, ""))
-		return
-	}
-	c.JSON(http.StatusOK, gin.H{
-		"diff": embeddings,
-	})
-}
-
-// GetFilesEmbedding returns the embeddings for the files
-func (h *EmbeddingHandler) GetFilesEmbedding(c *gin.Context) {
-	var request ente.GetFilesEmbeddingRequest
-	if err := c.ShouldBindJSON(&request); err != nil {
-		handler.Error(c,
-			stacktrace.Propagate(ente.ErrBadRequest, fmt.Sprintf("Request binding failed %s", err)))
-		return
-	}
-	resp, err := h.Controller.GetFilesEmbedding(c, request)
-	if err != nil {
-		handler.Error(c, stacktrace.Propagate(err, ""))
-		return
-	}
-	c.JSON(http.StatusOK, resp)
-}
-
-// DeleteAll handler for deleting all embeddings for the user
-func (h *EmbeddingHandler) DeleteAll(c *gin.Context) {
-	err := h.Controller.DeleteAll(c)
-	if err != nil {
-		handler.Error(c, stacktrace.Propagate(err, ""))
-		return
-	}
-	c.Status(http.StatusOK)
-}
diff --git a/server/pkg/controller/embedding/controller.go b/server/pkg/controller/embedding/controller.go
index 190f21d40a..d8cb4e62c0 100644
--- a/server/pkg/controller/embedding/controller.go
+++ b/server/pkg/controller/embedding/controller.go
@@ -1,32 +1,15 @@
 package embedding
 
 import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/ente-io/museum/pkg/utils/array"
 	"strconv"
-	"strings"
-	"sync"
 	gTime "time"
 
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
-	"github.com/ente-io/museum/ente"
 	"github.com/ente-io/museum/pkg/controller"
 	"github.com/ente-io/museum/pkg/controller/access"
 	"github.com/ente-io/museum/pkg/repo"
 	"github.com/ente-io/museum/pkg/repo/embedding"
-	"github.com/ente-io/museum/pkg/utils/auth"
-	"github.com/ente-io/museum/pkg/utils/network"
 	"github.com/ente-io/museum/pkg/utils/s3config"
-	"github.com/ente-io/stacktrace"
-	"github.com/gin-gonic/gin"
-	log "github.com/sirupsen/logrus"
 )
 
 const (
@@ -35,16 +18,6 @@ const (
 	embeddingFetchTimeout = 10 * gTime.Second
 )
 
-// _fetchConfig is the configuration for the fetching objects from S3
-type _fetchConfig struct {
-	RetryCount     int
-	InitialTimeout gTime.Duration
-	MaxTimeout     gTime.Duration
-}
-
-var _defaultFetchConfig = _fetchConfig{RetryCount: 3, InitialTimeout: 10 * gTime.Second, MaxTimeout: 30 * gTime.Second}
-var _b2FetchConfig = _fetchConfig{RetryCount: 3, InitialTimeout: 15 * gTime.Second, MaxTimeout: 30 * gTime.Second}
-
 type Controller struct {
 	Repo                     *embedding.Repository
 	AccessCtrl               access.Controller
@@ -82,404 +55,6 @@ func New(repo *embedding.Repository, accessCtrl access.Controller, objectCleanup
 	}
 }
 
-func (c *Controller) InsertOrUpdate(ctx *gin.Context, req ente.InsertOrUpdateEmbeddingRequest) (*ente.Embedding, error) {
-	userID := auth.GetUserID(ctx.Request.Header)
-
-	err := c.AccessCtrl.VerifyFileOwnership(ctx, &access.VerifyFileOwnershipParams{
-		ActorUserId: userID,
-		FileIDs:     []int64{req.FileID},
-	})
-
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "User does not own file")
-	}
-
-	count, err := c.CollectionRepo.GetCollectionCount(req.FileID)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	if count < 1 {
-		return nil, stacktrace.Propagate(ente.ErrNotFound, "")
-	}
-	version := 1
-	if req.Version != nil {
-		version = *req.Version
-	}
-
-	obj := ente.EmbeddingObject{
-		Version:            version,
-		EncryptedEmbedding: req.EncryptedEmbedding,
-		DecryptionHeader:   req.DecryptionHeader,
-		Client:             network.GetClientInfo(ctx),
-	}
-	size, uploadErr := c.uploadObject(obj, c.getObjectKey(userID, req.FileID, req.Model), c.derivedStorageDataCenter)
-	if uploadErr != nil {
-		log.Error(uploadErr)
-		return nil, stacktrace.Propagate(uploadErr, "")
-	}
-	embedding, err := c.Repo.InsertOrUpdate(ctx, userID, req, size, version, c.derivedStorageDataCenter)
-	embedding.Version = &version
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	return &embedding, nil
-}
-
-func (c *Controller) GetIndexedFiles(ctx *gin.Context, req ente.GetIndexedFiles) ([]ente.IndexedFile, error) {
-	userID := auth.GetUserID(ctx.Request.Header)
-	updateSince := int64(0)
-	if req.SinceTime != nil {
-		updateSince = *req.SinceTime
-	}
-	indexedFiles, err := c.Repo.GetIndexedFiles(ctx, userID, req.Model, updateSince, req.Limit)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	return indexedFiles, nil
-}
-
-func (c *Controller) GetDiff(ctx *gin.Context, req ente.GetEmbeddingDiffRequest) ([]ente.Embedding, error) {
-	userID := auth.GetUserID(ctx.Request.Header)
-
-	if req.Model == "" {
-		req.Model = ente.GgmlClip
-	}
-
-	embeddings, err := c.Repo.GetDiff(ctx, userID, req.Model, *req.SinceTime, req.Limit)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-
-	// Collect object keys for embeddings with missing data
-	var objectKeys []string
-	for i := range embeddings {
-		if embeddings[i].EncryptedEmbedding == "" {
-			objectKey := c.getObjectKey(userID, embeddings[i].FileID, embeddings[i].Model)
-			objectKeys = append(objectKeys, objectKey)
-		}
-	}
-
-	// Fetch missing embeddings in parallel
-	if len(objectKeys) > 0 {
-		embeddingObjects, err := c.getEmbeddingObjectsParallel(objectKeys, c.derivedStorageDataCenter)
-		if err != nil {
-			return nil, stacktrace.Propagate(err, "")
-		}
-
-		// Populate missing data in embeddings from fetched objects
-		for i, obj := range embeddingObjects {
-			for j := range embeddings {
-				if embeddings[j].EncryptedEmbedding == "" && c.getObjectKey(userID, embeddings[j].FileID, embeddings[j].Model) == objectKeys[i] {
-					embeddings[j].EncryptedEmbedding = obj.EncryptedEmbedding
-					embeddings[j].DecryptionHeader = obj.DecryptionHeader
-				}
-			}
-		}
-	}
-
-	return embeddings, nil
-}
-
-func (c *Controller) GetFilesEmbedding(ctx *gin.Context, req ente.GetFilesEmbeddingRequest) (*ente.GetFilesEmbeddingResponse, error) {
-	userID := auth.GetUserID(ctx.Request.Header)
-	if err := c._validateGetFileEmbeddingsRequest(ctx, userID, req); err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-
-	userFileEmbeddings, err := c.Repo.GetFilesEmbedding(ctx, userID, req.Model, req.FileIDs)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-
-	embeddingsWithData := make([]ente.Embedding, 0)
-	noEmbeddingFileIds := make([]int64, 0)
-	dbFileIds := make([]int64, 0)
-	// fileIDs that were indexed, but they don't contain any embedding information
-	for i := range userFileEmbeddings {
-		dbFileIds = append(dbFileIds, userFileEmbeddings[i].FileID)
-		if userFileEmbeddings[i].Size != nil && *userFileEmbeddings[i].Size < minEmbeddingDataSize {
-			noEmbeddingFileIds = append(noEmbeddingFileIds, userFileEmbeddings[i].FileID)
-		} else {
-			embeddingsWithData = append(embeddingsWithData, userFileEmbeddings[i])
-		}
-	}
-	pendingIndexFileIds := array.FindMissingElementsInSecondList(req.FileIDs, dbFileIds)
-	errFileIds := make([]int64, 0)
-
-	// Fetch missing userFileEmbeddings in parallel
-	embeddingObjects, err := c.getEmbeddingObjectsParallelV2(userID, embeddingsWithData, c.derivedStorageDataCenter)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	fetchedEmbeddings := make([]ente.Embedding, 0)
-
-	// Populate missing data in userFileEmbeddings from fetched objects
-	for _, obj := range embeddingObjects {
-		if obj.err != nil {
-			errFileIds = append(errFileIds, obj.dbEmbeddingRow.FileID)
-		} else {
-			fetchedEmbeddings = append(fetchedEmbeddings, ente.Embedding{
-				FileID:             obj.dbEmbeddingRow.FileID,
-				Model:              obj.dbEmbeddingRow.Model,
-				EncryptedEmbedding: obj.embeddingObject.EncryptedEmbedding,
-				DecryptionHeader:   obj.embeddingObject.DecryptionHeader,
-				UpdatedAt:          obj.dbEmbeddingRow.UpdatedAt,
-				Version:            obj.dbEmbeddingRow.Version,
-			})
-		}
-	}
-
-	return &ente.GetFilesEmbeddingResponse{
-		Embeddings:          fetchedEmbeddings,
-		PendingIndexFileIDs: pendingIndexFileIds,
-		ErrFileIDs:          errFileIds,
-		NoEmbeddingFileIDs:  noEmbeddingFileIds,
-	}, nil
-}
-
-func (c *Controller) getObjectKey(userID int64, fileID int64, model string) string {
-	return c.getEmbeddingObjectPrefix(userID, fileID) + model + ".json"
-}
-
 func (c *Controller) getEmbeddingObjectPrefix(userID int64, fileID int64) string {
 	return strconv.FormatInt(userID, 10) + "/ml-data/" + strconv.FormatInt(fileID, 10) + "/"
 }
-
-// Get userId, model and fileID from the object key
-func (c *Controller) getEmbeddingObjectDetails(objectKey string) (userID int64, model string, fileID int64) {
-	split := strings.Split(objectKey, "/")
-	userID, _ = strconv.ParseInt(split[0], 10, 64)
-	fileID, _ = strconv.ParseInt(split[2], 10, 64)
-	model = strings.Split(split[3], ".")[0]
-	return userID, model, fileID
-}
-
-// uploadObject uploads the embedding object to the object store and returns the object size
-func (c *Controller) uploadObject(obj ente.EmbeddingObject, key string, dc string) (int, error) {
-	embeddingObj, _ := json.Marshal(obj)
-	s3Client := c.S3Config.GetS3Client(dc)
-	s3Bucket := c.S3Config.GetBucket(dc)
-	uploader := s3manager.NewUploaderWithClient(&s3Client)
-	up := s3manager.UploadInput{
-		Bucket: s3Bucket,
-		Key:    &key,
-		Body:   bytes.NewReader(embeddingObj),
-	}
-	result, err := uploader.Upload(&up)
-	if err != nil {
-		log.Error(err)
-		return -1, stacktrace.Propagate(err, "")
-	}
-
-	log.Infof("Uploaded to bucket %s", result.Location)
-	return len(embeddingObj), nil
-}
-
-var globalDiffFetchSemaphore = make(chan struct{}, 300)
-
-var globalFileFetchSemaphore = make(chan struct{}, 400)
-
-func (c *Controller) getEmbeddingObjectsParallel(objectKeys []string, dc string) ([]ente.EmbeddingObject, error) {
-	var wg sync.WaitGroup
-	var errs []error
-	embeddingObjects := make([]ente.EmbeddingObject, len(objectKeys))
-	for i, objectKey := range objectKeys {
-		wg.Add(1)
-		globalDiffFetchSemaphore <- struct{}{} // Acquire from global semaphore
-		go func(i int, objectKey string) {
-			defer wg.Done()
-			defer func() { <-globalDiffFetchSemaphore }() // Release back to global semaphore
-
-			obj, err := c.getEmbeddingObject(context.Background(), objectKey, dc)
-			if err != nil {
-				errs = append(errs, err)
-				log.Error("error fetching embedding object: "+objectKey, err)
-			} else {
-				embeddingObjects[i] = obj
-			}
-		}(i, objectKey)
-	}
-
-	wg.Wait()
-
-	if len(errs) > 0 {
-		return nil, stacktrace.Propagate(errors.New("failed to fetch some objects"), "")
-	}
-
-	return embeddingObjects, nil
-}
-
-type embeddingObjectResult struct {
-	embeddingObject ente.EmbeddingObject
-	dbEmbeddingRow  ente.Embedding
-	err             error
-}
-
-func (c *Controller) getEmbeddingObjectsParallelV2(userID int64, dbEmbeddingRows []ente.Embedding, dc string) ([]embeddingObjectResult, error) {
-	var wg sync.WaitGroup
-	embeddingObjects := make([]embeddingObjectResult, len(dbEmbeddingRows))
-
-	for i, dbEmbeddingRow := range dbEmbeddingRows {
-		wg.Add(1)
-		globalFileFetchSemaphore <- struct{}{} // Acquire from global semaphore
-		go func(i int, dbEmbeddingRow ente.Embedding) {
-			defer wg.Done()
-			defer func() { <-globalFileFetchSemaphore }() // Release back to global semaphore
-			objectKey := c.getObjectKey(userID, dbEmbeddingRow.FileID, dbEmbeddingRow.Model)
-			obj, err := c.getEmbeddingObject(context.Background(), objectKey, dc)
-			if err != nil {
-				log.Error("error fetching embedding object: "+objectKey, err)
-				embeddingObjects[i] = embeddingObjectResult{
-					err:            err,
-					dbEmbeddingRow: dbEmbeddingRow,
-				}
-
-			} else {
-				embeddingObjects[i] = embeddingObjectResult{
-					embeddingObject: obj,
-					dbEmbeddingRow:  dbEmbeddingRow,
-				}
-			}
-		}(i, dbEmbeddingRow)
-	}
-	wg.Wait()
-	return embeddingObjects, nil
-}
-
-func (c *Controller) getEmbeddingObject(ctx context.Context, objectKey string, dc string) (ente.EmbeddingObject, error) {
-	opt := _defaultFetchConfig
-	if dc == c.S3Config.GetHotBackblazeDC() {
-		opt = _b2FetchConfig
-	}
-	ctxLogger := log.WithField("objectKey", objectKey).WithField("dc", dc)
-	totalAttempts := opt.RetryCount + 1
-	timeout := opt.InitialTimeout
-	for i := 0; i < totalAttempts; i++ {
-		if i > 0 {
-			timeout = timeout * 2
-			if timeout > opt.MaxTimeout {
-				timeout = opt.MaxTimeout
-			}
-		}
-		fetchCtx, cancel := context.WithTimeout(ctx, timeout)
-		select {
-		case <-ctx.Done():
-			cancel()
-			return ente.EmbeddingObject{}, stacktrace.Propagate(ctx.Err(), "")
-		default:
-			obj, err := c.downloadObject(fetchCtx, objectKey, dc)
-			cancel() // Ensure cancel is called to release resources
-			if err == nil {
-				if i > 0 {
-					ctxLogger.Infof("Fetched object after %d attempts", i)
-				}
-				return obj, nil
-			}
-			// Check if the error is due to context timeout or cancellation
-			if err == nil && fetchCtx.Err() != nil {
-				ctxLogger.Error("Fetch timed out or cancelled: ", fetchCtx.Err())
-			} else {
-				// check if the error is due to object not found
-				if s3Err, ok := err.(awserr.RequestFailure); ok {
-					if s3Err.Code() == s3.ErrCodeNoSuchKey {
-						var srcDc, destDc string
-						destDc = c.S3Config.GetDerivedStorageDataCenter()
-						// todo:(neeraj) Refactor this later to get available the DC from the DB instead of
-						// querying the DB. This will help in case of multiple DCs and avoid querying the DB
-						// for each object.
-						// For initial migration, as we know that original DC was b2, and if the embedding is not found
-						// in the new derived DC, we can try to fetch it from the B2 DC.
-						if c.derivedStorageDataCenter != c.S3Config.GetHotBackblazeDC() {
-							// embeddings ideally should ideally be in the default hot bucket b2
-							srcDc = c.S3Config.GetHotBackblazeDC()
-						} else {
-							_, modelName, fileID := c.getEmbeddingObjectDetails(objectKey)
-							activeDcs, err := c.Repo.GetOtherDCsForFileAndModel(context.Background(), fileID, modelName, c.derivedStorageDataCenter)
-							if err != nil {
-								return ente.EmbeddingObject{}, stacktrace.Propagate(err, "failed to get other dc")
-							}
-							if len(activeDcs) > 0 {
-								srcDc = activeDcs[0]
-							} else {
-								ctxLogger.Error("Object not found in any dc ", s3Err)
-								return ente.EmbeddingObject{}, stacktrace.Propagate(errors.New("object not found"), "")
-							}
-						}
-						copyEmbeddingObject, err := c.copyEmbeddingObject(ctx, objectKey, srcDc, destDc)
-						if err == nil {
-							ctxLogger.Infof("Got object from dc %s", srcDc)
-							return *copyEmbeddingObject, nil
-						} else {
-							ctxLogger.WithError(err).Errorf("Failed to get object from fallback dc %s", srcDc)
-						}
-						return ente.EmbeddingObject{}, stacktrace.Propagate(errors.New("object not found"), "")
-					}
-				}
-				ctxLogger.Error("Failed to fetch object: ", err)
-			}
-		}
-	}
-	return ente.EmbeddingObject{}, stacktrace.Propagate(errors.New("failed to fetch object"), "")
-}
-
-func (c *Controller) downloadObject(ctx context.Context, objectKey string, dc string) (ente.EmbeddingObject, error) {
-	var obj ente.EmbeddingObject
-	buff := &aws.WriteAtBuffer{}
-	bucket := c.S3Config.GetBucket(dc)
-	downloader := c.downloadManagerCache[dc]
-	_, err := downloader.DownloadWithContext(ctx, buff, &s3.GetObjectInput{
-		Bucket: bucket,
-		Key:    &objectKey,
-	})
-	if err != nil {
-		return obj, err
-	}
-	err = json.Unmarshal(buff.Bytes(), &obj)
-	if err != nil {
-		return obj, stacktrace.Propagate(err, "unmarshal failed")
-	}
-	return obj, nil
-}
-
-// download the embedding object from hot bucket and upload to embeddings bucket
-func (c *Controller) copyEmbeddingObject(ctx context.Context, objectKey string, srcDC, destDC string) (*ente.EmbeddingObject, error) {
-	if srcDC == destDC {
-		return nil, stacktrace.Propagate(errors.New("src and dest dc can not be same"), "")
-	}
-	obj, err := c.downloadObject(ctx, objectKey, srcDC)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, fmt.Sprintf("failed to download object from %s", srcDC))
-	}
-	go func() {
-		userID, modelName, fileID := c.getEmbeddingObjectDetails(objectKey)
-		size, uploadErr := c.uploadObject(obj, objectKey, c.derivedStorageDataCenter)
-		if uploadErr != nil {
-			log.WithField("object", objectKey).Error("Failed to copy  to embeddings bucket: ", uploadErr)
-		}
-		updateDcErr := c.Repo.AddNewDC(context.Background(), fileID, ente.Model(modelName), userID, size, destDC)
-		if updateDcErr != nil {
-			log.WithField("object", objectKey).Error("Failed to update dc in db: ", updateDcErr)
-			return
-		}
-	}()
-	return &obj, nil
-}
-
-func (c *Controller) _validateGetFileEmbeddingsRequest(ctx *gin.Context, userID int64, req ente.GetFilesEmbeddingRequest) error {
-	if req.Model == "" {
-		return ente.NewBadRequestWithMessage("model is required")
-	}
-	if len(req.FileIDs) == 0 {
-		return ente.NewBadRequestWithMessage("fileIDs are required")
-	}
-	if len(req.FileIDs) > 200 {
-		return ente.NewBadRequestWithMessage("fileIDs should be less than or equal to 200")
-	}
-	if err := c.AccessCtrl.VerifyFileOwnership(ctx, &access.VerifyFileOwnershipParams{
-		ActorUserId: userID,
-		FileIDs:     req.FileIDs,
-	}); err != nil {
-		return stacktrace.Propagate(err, "User does not own some file(s)")
-	}
-	return nil
-}
diff --git a/server/pkg/controller/embedding/delete.go b/server/pkg/controller/embedding/delete.go
index 91a70963fe..134a5192dc 100644
--- a/server/pkg/controller/embedding/delete.go
+++ b/server/pkg/controller/embedding/delete.go
@@ -4,24 +4,11 @@ import (
 	"context"
 	"fmt"
 	"github.com/ente-io/museum/pkg/repo"
-	"github.com/ente-io/museum/pkg/utils/auth"
 	"github.com/ente-io/museum/pkg/utils/time"
-	"github.com/ente-io/stacktrace"
-	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
 	"strconv"
 )
 
-func (c *Controller) DeleteAll(ctx *gin.Context) error {
-	userID := auth.GetUserID(ctx.Request.Header)
-
-	err := c.Repo.DeleteAll(ctx, userID)
-	if err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-	return nil
-}
-
 // CleanupDeletedEmbeddings clears all embeddings for deleted files from the object store
 func (c *Controller) CleanupDeletedEmbeddings() {
 	log.Info("Cleaning up deleted embeddings")

From 76b2a73f9a00c4a795864e80f923a27d61848741 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 24 Feb 2025 14:55:21 +0530
Subject: [PATCH 460/796] clean up

---
 server/cmd/museum/main.go                     |   2 +-
 server/pkg/controller/embedding/controller.go |  57 ++----
 server/pkg/repo/embedding/repository.go       | 183 ------------------
 3 files changed, 16 insertions(+), 226 deletions(-)

diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go
index 9bc1beef63..a4b4425a32 100644
--- a/server/cmd/museum/main.go
+++ b/server/cmd/museum/main.go
@@ -754,7 +754,7 @@ func main() {
 	pushHandler := &api.PushHandler{PushController: pushController}
 	privateAPI.POST("/push/token", pushHandler.AddToken)
 
-	embeddingController := embeddingCtrl.New(embeddingRepo, accessCtrl, objectCleanupController, s3Config, queueRepo, taskLockingRepo, fileRepo, collectionRepo, hostName)
+	embeddingController := embeddingCtrl.New(embeddingRepo, objectCleanupController, queueRepo, taskLockingRepo, fileRepo, hostName)
 
 	offerHandler := &api.OfferHandler{Controller: offerController}
 	publicAPI.GET("/offers/black-friday", offerHandler.GetBlackFridayOffers)
diff --git a/server/pkg/controller/embedding/controller.go b/server/pkg/controller/embedding/controller.go
index d8cb4e62c0..e1f23fa50f 100644
--- a/server/pkg/controller/embedding/controller.go
+++ b/server/pkg/controller/embedding/controller.go
@@ -1,57 +1,30 @@
 package embedding
 
 import (
-	"strconv"
-	gTime "time"
-
-	"github.com/aws/aws-sdk-go/service/s3/s3manager"
 	"github.com/ente-io/museum/pkg/controller"
-	"github.com/ente-io/museum/pkg/controller/access"
 	"github.com/ente-io/museum/pkg/repo"
 	"github.com/ente-io/museum/pkg/repo/embedding"
-	"github.com/ente-io/museum/pkg/utils/s3config"
-)
-
-const (
-	// maxEmbeddingDataSize is the min size of an embedding object in bytes
-	minEmbeddingDataSize  = 2048
-	embeddingFetchTimeout = 10 * gTime.Second
+	"strconv"
 )
 
 type Controller struct {
-	Repo                     *embedding.Repository
-	AccessCtrl               access.Controller
-	ObjectCleanupController  *controller.ObjectCleanupController
-	S3Config                 *s3config.S3Config
-	QueueRepo                *repo.QueueRepository
-	TaskLockingRepo          *repo.TaskLockRepository
-	FileRepo                 *repo.FileRepository
-	CollectionRepo           *repo.CollectionRepository
-	HostName                 string
-	cleanupCronRunning       bool
-	derivedStorageDataCenter string
-	downloadManagerCache     map[string]*s3manager.Downloader
+	Repo                    *embedding.Repository
+	ObjectCleanupController *controller.ObjectCleanupController
+	QueueRepo               *repo.QueueRepository
+	TaskLockingRepo         *repo.TaskLockRepository
+	FileRepo                *repo.FileRepository
+	HostName                string
+	cleanupCronRunning      bool
 }
 
-func New(repo *embedding.Repository, accessCtrl access.Controller, objectCleanupController *controller.ObjectCleanupController, s3Config *s3config.S3Config, queueRepo *repo.QueueRepository, taskLockingRepo *repo.TaskLockRepository, fileRepo *repo.FileRepository, collectionRepo *repo.CollectionRepository, hostName string) *Controller {
-	embeddingDcs := []string{s3Config.GetHotBackblazeDC(), s3Config.GetHotWasabiDC(), s3Config.GetWasabiDerivedDC(), s3Config.GetDerivedStorageDataCenter()}
-	cache := make(map[string]*s3manager.Downloader, len(embeddingDcs))
-	for i := range embeddingDcs {
-		s3Client := s3Config.GetS3Client(embeddingDcs[i])
-		cache[embeddingDcs[i]] = s3manager.NewDownloaderWithClient(&s3Client)
-	}
+func New(repo *embedding.Repository, objectCleanupController *controller.ObjectCleanupController, queueRepo *repo.QueueRepository, taskLockingRepo *repo.TaskLockRepository, fileRepo *repo.FileRepository, hostName string) *Controller {
 	return &Controller{
-		Repo:                     repo,
-		AccessCtrl:               accessCtrl,
-		ObjectCleanupController:  objectCleanupController,
-		S3Config:                 s3Config,
-		QueueRepo:                queueRepo,
-		TaskLockingRepo:          taskLockingRepo,
-		FileRepo:                 fileRepo,
-		CollectionRepo:           collectionRepo,
-		HostName:                 hostName,
-		derivedStorageDataCenter: s3Config.GetDerivedStorageDataCenter(),
-		downloadManagerCache:     cache,
+		Repo:                    repo,
+		ObjectCleanupController: objectCleanupController,
+		QueueRepo:               queueRepo,
+		TaskLockingRepo:         taskLockingRepo,
+		FileRepo:                fileRepo,
+		HostName:                hostName,
 	}
 }
 
diff --git a/server/pkg/repo/embedding/repository.go b/server/pkg/repo/embedding/repository.go
index eb570b4e74..22eb92e8e1 100644
--- a/server/pkg/repo/embedding/repository.go
+++ b/server/pkg/repo/embedding/repository.go
@@ -3,12 +3,8 @@ package embedding
 import (
 	"context"
 	"database/sql"
-	"errors"
-	"fmt"
-	"github.com/ente-io/museum/ente"
 	"github.com/ente-io/stacktrace"
 	"github.com/lib/pq"
-	"github.com/sirupsen/logrus"
 )
 
 // Repository defines the methods for inserting, updating and retrieving
@@ -17,74 +13,6 @@ type Repository struct {
 	DB *sql.DB
 }
 
-// Create inserts a new embedding
-func (r *Repository) InsertOrUpdate(ctx context.Context, ownerID int64, entry ente.InsertOrUpdateEmbeddingRequest, size int, version int, dc string) (ente.Embedding, error) {
-	var updatedAt int64
-	err := r.DB.QueryRowContext(ctx, `
-    INSERT INTO embeddings 
-        (file_id, owner_id, model, size, version, datacenters) 
-    VALUES 
-        ($1, $2, $3, $4, $5, ARRAY[$6]::s3region[])
-    ON CONFLICT ON CONSTRAINT unique_embeddings_file_id_model
-    DO UPDATE 
-    SET 
-        updated_at = now_utc_micro_seconds(), 
-        size = $4, 
-        version = $5,
-        datacenters = CASE 
-            WHEN $6 = ANY(COALESCE(embeddings.datacenters, ARRAY['b2-eu-cen']::s3region[])) THEN embeddings.datacenters
-            ELSE array_append(COALESCE(embeddings.datacenters, ARRAY['b2-eu-cen']::s3region[]), $6::s3region)
-        END
-    RETURNING updated_at`,
-		entry.FileID, ownerID, entry.Model, size, version, dc).Scan(&updatedAt)
-
-	if err != nil {
-		// check if error is due to model enum invalid value
-		if err.Error() == fmt.Sprintf("pq: invalid input value for enum model: \"%s\"", entry.Model) {
-			return ente.Embedding{}, stacktrace.Propagate(ente.ErrBadRequest, "invalid model value")
-		}
-		return ente.Embedding{}, stacktrace.Propagate(err, "")
-	}
-	return ente.Embedding{
-		FileID:             entry.FileID,
-		Model:              entry.Model,
-		EncryptedEmbedding: entry.EncryptedEmbedding,
-		DecryptionHeader:   entry.DecryptionHeader,
-		UpdatedAt:          updatedAt,
-	}, nil
-}
-
-// GetDiff returns the embeddings that have been updated since the given time
-func (r *Repository) GetDiff(ctx context.Context, ownerID int64, model ente.Model, sinceTime int64, limit int16) ([]ente.Embedding, error) {
-	rows, err := r.DB.QueryContext(ctx, `SELECT file_id, model, encrypted_embedding, decryption_header, updated_at, version, size
-										FROM embeddings
-										WHERE owner_id = $1 AND model = $2 AND updated_at > $3
-										ORDER BY updated_at ASC
-										LIMIT $4`, ownerID, model, sinceTime, limit)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	return convertRowsToEmbeddings(rows)
-}
-
-func (r *Repository) GetFilesEmbedding(ctx context.Context, ownerID int64, model ente.Model, fileIDs []int64) ([]ente.Embedding, error) {
-	rows, err := r.DB.QueryContext(ctx, `SELECT file_id, model, encrypted_embedding, decryption_header, updated_at, version, size
-										FROM embeddings
-										WHERE owner_id = $1 AND model = $2 AND file_id = ANY($3)`, ownerID, model, pq.Array(fileIDs))
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	return convertRowsToEmbeddings(rows)
-}
-
-func (r *Repository) DeleteAll(ctx context.Context, ownerID int64) error {
-	_, err := r.DB.ExecContext(ctx, "DELETE FROM embeddings WHERE owner_id = $1", ownerID)
-	if err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-	return nil
-}
-
 func (r *Repository) Delete(fileID int64) error {
 	_, err := r.DB.Exec("DELETE FROM embeddings WHERE file_id = $1", fileID)
 	if err != nil {
@@ -117,33 +45,6 @@ func (r *Repository) GetDatacenters(ctx context.Context, fileID int64) ([]string
 	return datacenters, nil
 }
 
-// GetOtherDCsForFileAndModel returns the list of datacenters where the embeddings are stored for a given file and model, excluding the ignoredDC
-func (r *Repository) GetOtherDCsForFileAndModel(ctx context.Context, fileID int64, model string, ignoredDC string) ([]string, error) {
-	rows, err := r.DB.QueryContext(ctx, `SELECT datacenters FROM embeddings WHERE file_id = $1 AND model = $2`, fileID, model)
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	uniqueDatacenters := make(map[string]bool)
-	for rows.Next() {
-		var datacenters []string
-		err = rows.Scan(pq.Array(&datacenters))
-		if err != nil {
-			return nil, stacktrace.Propagate(err, "")
-		}
-		for _, dc := range datacenters {
-			// add to uniqueDatacenters if it is not the ignoredDC
-			if dc != ignoredDC {
-				uniqueDatacenters[dc] = true
-			}
-		}
-	}
-	datacenters := make([]string, 0, len(uniqueDatacenters))
-	for dc := range uniqueDatacenters {
-		datacenters = append(datacenters, dc)
-	}
-	return datacenters, nil
-}
-
 // RemoveDatacenter removes the given datacenter from the list of datacenters
 func (r *Repository) RemoveDatacenter(ctx context.Context, fileID int64, dc string) error {
 	_, err := r.DB.ExecContext(ctx, `UPDATE embeddings SET datacenters = array_remove(datacenters, $1) WHERE file_id = $2`, dc, fileID)
@@ -152,87 +53,3 @@ func (r *Repository) RemoveDatacenter(ctx context.Context, fileID int64, dc stri
 	}
 	return nil
 }
-
-// AddNewDC adds the dc name to the list of datacenters, if it doesn't exist already, for a given file, model and user. It also updates the size of the embedding
-func (r *Repository) AddNewDC(ctx context.Context, fileID int64, model ente.Model, userID int64, size int, dc string) error {
-	res, err := r.DB.ExecContext(ctx, `
-        UPDATE embeddings 
-        SET size = $1, 
-            datacenters = CASE 
-                WHEN $2::s3region = ANY(datacenters) THEN datacenters
-                ELSE array_append(datacenters, $2::s3region)
-            END
-        WHERE file_id = $3 AND model = $4 AND owner_id = $5`, size, dc, fileID, model, userID)
-	if err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-	rowsAffected, err := res.RowsAffected()
-	if err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-	if rowsAffected == 0 {
-		return stacktrace.Propagate(errors.New("no row got updated"), "")
-	}
-	return nil
-}
-
-func (r *Repository) GetIndexedFiles(ctx context.Context, id int64, model ente.Model, since int64, limit *int64) ([]ente.IndexedFile, error) {
-	var rows *sql.Rows
-	var err error
-	if limit == nil {
-		rows, err = r.DB.QueryContext(ctx, `SELECT file_id, updated_at FROM embeddings WHERE owner_id = $1 AND model = $2 AND updated_at > $3`, id, model, since)
-	} else {
-		rows, err = r.DB.QueryContext(ctx, `SELECT file_id, updated_at FROM embeddings WHERE owner_id = $1 AND model = $2 AND updated_at > $3 LIMIT $4`, id, model, since, *limit)
-	}
-	if err != nil {
-		return nil, stacktrace.Propagate(err, "")
-	}
-	defer func() {
-		if err := rows.Close(); err != nil {
-			logrus.Error(err)
-		}
-	}()
-	result := make([]ente.IndexedFile, 0)
-	for rows.Next() {
-		var meta ente.IndexedFile
-		err := rows.Scan(&meta.FileID, &meta.UpdatedAt)
-		if err != nil {
-			return nil, stacktrace.Propagate(err, "")
-		}
-		result = append(result, meta)
-	}
-	return result, nil
-
-}
-
-func convertRowsToEmbeddings(rows *sql.Rows) ([]ente.Embedding, error) {
-	defer func() {
-		if err := rows.Close(); err != nil {
-			logrus.Error(err)
-		}
-	}()
-
-	result := make([]ente.Embedding, 0)
-	for rows.Next() {
-		embedding := ente.Embedding{}
-		var encryptedEmbedding, decryptionHeader sql.NullString
-		var version sql.NullInt32
-		err := rows.Scan(&embedding.FileID, &embedding.Model, &encryptedEmbedding, &decryptionHeader, &embedding.UpdatedAt, &version, &embedding.Size)
-		if encryptedEmbedding.Valid && len(encryptedEmbedding.String) > 0 {
-			embedding.EncryptedEmbedding = encryptedEmbedding.String
-		}
-		if decryptionHeader.Valid && len(decryptionHeader.String) > 0 {
-			embedding.DecryptionHeader = decryptionHeader.String
-		}
-		v := 1
-		if version.Valid {
-			v = int(version.Int32)
-		}
-		embedding.Version = &v
-		if err != nil {
-			return nil, stacktrace.Propagate(err, "")
-		}
-		result = append(result, embedding)
-	}
-	return result, nil
-}

From 19efbad33625f9c3ea7f70250d4afbc9c4971417 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 24 Feb 2025 15:21:34 +0530
Subject: [PATCH 461/796] [server] Add retry for sizeOf fetch

---
 server/pkg/controller/file.go | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/server/pkg/controller/file.go b/server/pkg/controller/file.go
index be9a553756..6597ed3027 100644
--- a/server/pkg/controller/file.go
+++ b/server/pkg/controller/file.go
@@ -10,6 +10,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	gTime "time"
 
 	"github.com/ente-io/museum/pkg/controller/discord"
 	"github.com/ente-io/museum/pkg/utils/network"
@@ -806,14 +807,23 @@ func (c *FileController) getPreSignedURLForDC(objectKey string, dc string) (stri
 
 func (c *FileController) sizeOf(objectKey string) (int64, error) {
 	s3Client := c.S3Config.GetHotS3Client()
-	head, err := s3Client.HeadObject(&s3.HeadObjectInput{
-		Key:    &objectKey,
-		Bucket: c.S3Config.GetHotBucket(),
-	})
-	if err != nil {
-		return -1, stacktrace.Propagate(err, "")
+	bucket := c.S3Config.GetHotBucket()
+	var head *s3.HeadObjectOutput
+	var err error
+	// Retry twice with a delay of 500ms and 1000ms
+	for i := 0; i < 3; i++ {
+		head, err = s3Client.HeadObject(&s3.HeadObjectInput{
+			Key:    &objectKey,
+			Bucket: bucket,
+		})
+		if err == nil {
+			return *head.ContentLength, nil
+		}
+		if i < 2 {
+			gTime.Sleep(gTime.Duration(500*(i+1)) * gTime.Millisecond)
+		}
 	}
-	return *head.ContentLength, nil
+	return -1, stacktrace.Propagate(err, "")
 }
 
 func (c *FileController) onDuplicateObjectDetected(ctx *gin.Context, file ente.File, existing ente.File, hotDC string) (ente.File, error) {

From a36958503d4b1773de739782410258ce5e2f7201 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Mon, 24 Feb 2025 15:34:25 +0530
Subject: [PATCH 462/796] fix: smooth native video player experience

---
 .../seek_bar.dart                             | 18 ++---------
 mobile/lib/ui/viewer/file/video_widget.dart   | 20 ++++++++-----
 .../ui/viewer/file/video_widget_native.dart   | 30 ++++++++++++++-----
 mobile/lib/utils/toast_util.dart              |  6 ++--
 mobile/pubspec.lock                           | 11 +++----
 mobile/pubspec.yaml                           |  5 +++-
 6 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart b/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart
index 49e0e87d61..574bd4f132 100644
--- a/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart
+++ b/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart
@@ -2,7 +2,6 @@ import "dart:async";
 
 import "package:flutter/material.dart";
 import "package:native_video_player/native_video_player.dart";
-import "package:photos/service_locator.dart";
 import "package:photos/theme/colors.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/utils/debouncer.dart";
@@ -19,7 +18,6 @@ class SeekBar extends StatefulWidget {
 
 class _SeekBarState extends State<SeekBar> with SingleTickerProviderStateMixin {
   late final AnimationController _animationController;
-  double _prevPositionFraction = 0.0;
   final _debouncer = Debouncer(
     const Duration(milliseconds: 100),
     executionInterval: const Duration(milliseconds: 325),
@@ -79,7 +77,7 @@ class _SeekBarState extends State<SeekBar> with SingleTickerProviderStateMixin {
               });
               _seekTo(value);
             },
-            divisions: 4500,
+            divisions: widget.duration ?? 4500,
             onChangeEnd: (value) {
               setState(() {
                 _animationController.value = value;
@@ -138,6 +136,8 @@ class _SeekBarState extends State<SeekBar> with SingleTickerProviderStateMixin {
         // Emitted when playback position changes
         _onPlaybackPositionChanged();
         break;
+      case PlaybackEndedEvent():
+        _animationController.value = 0;
       default:
     }
   }
@@ -156,16 +156,6 @@ class _SeekBarState extends State<SeekBar> with SingleTickerProviderStateMixin {
     }
     final target = widget.controller.playbackPosition.inMilliseconds;
 
-    //To immediately set the position to 0 when the video ends
-    if (_prevPositionFraction == 1.0 && target == 0.0) {
-      setState(() {
-        _animationController.value = 0;
-      });
-      if (!localSettings.shouldLoopVideo()) {
-        return;
-      }
-    }
-
     //There is a slight delay (around 350 ms) for the event being listened to
     //by this listener on the next target (target that comes after 0). Adding
     //this buffer to keep the seek bar animation smooth.
@@ -192,7 +182,5 @@ class _SeekBarState extends State<SeekBar> with SingleTickerProviderStateMixin {
         ),
       );
     }
-
-    _prevPositionFraction = fractionTarget;
   }
 }
diff --git a/mobile/lib/ui/viewer/file/video_widget.dart b/mobile/lib/ui/viewer/file/video_widget.dart
index efc42266b2..c3c36a9900 100644
--- a/mobile/lib/ui/viewer/file/video_widget.dart
+++ b/mobile/lib/ui/viewer/file/video_widget.dart
@@ -8,6 +8,7 @@ import "package:photos/core/event_bus.dart";
 import "package:photos/events/stream_switched_event.dart";
 import "package:photos/events/use_media_kit_for_video.dart";
 import "package:photos/models/file/file.dart";
+import "package:photos/models/preview/playlist_data.dart";
 import "package:photos/service_locator.dart";
 import "package:photos/services/filedata/filedata_service.dart";
 import "package:photos/services/preview_video_store.dart";
@@ -39,7 +40,7 @@ class _VideoWidgetState extends State<VideoWidget> {
   late final StreamSubscription<UseMediaKitForVideo>
       useMediaKitForVideoSubscription;
   late bool selectPreviewForPlay = widget.file.localID == null;
-  File? preview;
+  PlaylistData? playlistData;
   final nativePlayerKey = GlobalKey();
   final mediaKitKey = GlobalKey();
 
@@ -65,7 +66,11 @@ class _VideoWidgetState extends State<VideoWidget> {
   }
 
   Future<void> _checkForPreview() async {
-    if (!PreviewVideoStore.instance.isVideoStreamingEnabled) {
+    final isPreviewAvailable = FileDataService.instance.previewIds
+            ?.containsKey(widget.file.uploadedFileID) ??
+        false;
+    if (!PreviewVideoStore.instance.isVideoStreamingEnabled ||
+        !isPreviewAvailable) {
       return;
     }
     widget.playbackCallback?.call(false);
@@ -87,13 +92,12 @@ class _VideoWidgetState extends State<VideoWidget> {
           final size = formatBytes(widget.file.fileSize!);
           showToast(
             context,
+            gravity: ToastGravity.TOP,
             "[i] Preview OG Size ($size), previewSize: ${formatBytes(d.objectSize)}",
           );
-        } else {
-          showShortToast(context, "Playing preview");
         }
       }
-      preview = data.preview;
+      playlistData = data;
     } else {
       isPreviewLoadable = false;
     }
@@ -109,7 +113,7 @@ class _VideoWidgetState extends State<VideoWidget> {
                 ?.containsKey(widget.file.uploadedFileID!) ??
             false);
     final playPreview = isPreviewVideoPlayable && selectPreviewForPlay;
-    if (playPreview && preview == null) {
+    if (playPreview && playlistData == null) {
       return Center(
         child: Container(
           width: 48,
@@ -139,7 +143,7 @@ class _VideoWidgetState extends State<VideoWidget> {
         key: nativePlayerKey,
         tagPrefix: widget.tagPrefix,
         playbackCallback: widget.playbackCallback,
-        preview: preview,
+        playlistData: playlistData,
         selectedPreview: playPreview,
         onStreamChange: () {
           setState(() {
@@ -161,7 +165,7 @@ class _VideoWidgetState extends State<VideoWidget> {
       key: mediaKitKey,
       tagPrefix: widget.tagPrefix,
       playbackCallback: widget.playbackCallback,
-      preview: preview,
+      preview: playlistData?.preview,
       selectedPreview: playPreview,
       onStreamChange: () {
         setState(() {
diff --git a/mobile/lib/ui/viewer/file/video_widget_native.dart b/mobile/lib/ui/viewer/file/video_widget_native.dart
index 13d67faac6..4249a599ef 100644
--- a/mobile/lib/ui/viewer/file/video_widget_native.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_native.dart
@@ -15,6 +15,7 @@ import "package:photos/events/use_media_kit_for_video.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/models/file/extensions/file_props.dart";
 import "package:photos/models/file/file.dart";
+import "package:photos/models/preview/playlist_data.dart";
 import "package:photos/service_locator.dart";
 import "package:photos/services/files_service.dart";
 import "package:photos/theme/colors.dart";
@@ -39,7 +40,7 @@ class VideoWidgetNative extends StatefulWidget {
   final Function(bool)? playbackCallback;
   final bool isFromMemories;
   final void Function()? onStreamChange;
-  final File? preview;
+  final PlaylistData? playlistData;
   final bool selectedPreview;
 
   const VideoWidgetNative(
@@ -49,7 +50,7 @@ class VideoWidgetNative extends StatefulWidget {
     this.isFromMemories = false,
     required this.onStreamChange,
     super.key,
-    this.preview,
+    this.playlistData,
     required this.selectedPreview,
   });
 
@@ -115,7 +116,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
   }
 
   void loadPreview() {
-    _setFilePathForNativePlayer(widget.preview!.path);
+    _setFilePathForNativePlayer(widget.playlistData!.preview.path);
   }
 
   void loadOriginal() {
@@ -421,9 +422,12 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
   }
 
   void _onPlaybackStatusChanged() {
+    final duration = widget.file.duration != null
+        ? widget.file.duration! * 1000
+        : _controller?.videoInfo?.durationInMilliseconds;
+
     if (_isSeeking.value ||
-        _controller?.playbackPosition.inMilliseconds ==
-            _controller?.videoInfo?.durationInMilliseconds) {
+        _controller?.playbackPosition.inMilliseconds == duration) {
       return;
     }
     if (_controller!.playbackStatus == PlaybackStatus.playing) {
@@ -458,14 +462,16 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
   }
 
   Future<void> _onPlaybackReady() async {
+    if (_isPlaybackReady.value) return;
     await _controller!.play();
     unawaited(_controller!.setVolume(1));
     _isPlaybackReady.value = true;
   }
 
-  void _onPlaybackEnded() {
+  void _onPlaybackEnded() async {
+    await _controller?.stop();
     if (localSettings.shouldLoopVideo()) {
-      _controller?.play();
+      await _controller?.play();
     }
   }
 
@@ -581,6 +587,16 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
   }
 
   Future<void> _setAspectRatioFromVideoProps() async {
+    if (widget.playlistData != null && widget.selectedPreview) {
+      aspectRatio = widget.playlistData!.width! / widget.playlistData!.height!;
+      if (widget.file.duration != null &&
+          (duration == "0:00" || duration == null)) {
+        duration = secondsToDuration(widget.file.duration!);
+      }
+      _logger.info("Getting aspect ratio from preview video");
+      return;
+    }
+    if (aspectRatio != 1) return;
     final videoProps = await getVideoPropsAsync(File(_filePath!));
     if (videoProps != null) {
       duration = videoProps.propData?["duration"];
diff --git a/mobile/lib/utils/toast_util.dart b/mobile/lib/utils/toast_util.dart
index 2e876222a7..5e653631bc 100644
--- a/mobile/lib/utils/toast_util.dart
+++ b/mobile/lib/utils/toast_util.dart
@@ -11,6 +11,8 @@ void showToast(
   String message, {
   toastLength = Toast.LENGTH_LONG,
   int iosLongToastLengthInSec = 2,
+  ToastGravity gravity = ToastGravity.BOTTOM,
+  EasyLoadingToastPosition position = EasyLoadingToastPosition.bottom,
 }) async {
   if (Platform.isAndroid) {
     await Fluttertoast.cancel();
@@ -18,7 +20,7 @@ void showToast(
       Fluttertoast.showToast(
         msg: message,
         toastLength: toastLength,
-        gravity: ToastGravity.BOTTOM,
+        gravity: gravity,
         timeInSecForIosWeb: 1,
         backgroundColor: Theme.of(context).colorScheme.toastBackgroundColor,
         textColor: Theme.of(context).colorScheme.toastTextColor,
@@ -39,7 +41,7 @@ void showToast(
           seconds:
               (toastLength == Toast.LENGTH_LONG ? iosLongToastLengthInSec : 1),
         ),
-        toastPosition: EasyLoadingToastPosition.bottom,
+        toastPosition: position,
         dismissOnTap: false,
       ),
     );
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index 0d2c072cf8..0e00455b0b 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -633,11 +633,12 @@ packages:
   figma_squircle:
     dependency: "direct main"
     description:
-      name: figma_squircle
-      sha256: "790b91a9505e90d246f6efe2fa065ff7fffe658c7b44fe9b5b20c7b0ad3818c0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.5.3"
+      path: "."
+      ref: "7cc383b30e96c07acd4e484c1d6731d054f7f6ec"
+      resolved-ref: "7cc383b30e96c07acd4e484c1d6731d054f7f6ec"
+      url: "https://github.com/aloisdeniel/figma_squircle.git"
+    source: git
+    version: "1.0.0"
   file:
     dependency: transitive
     description:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 149c4821dc..a8044a896d 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -68,7 +68,10 @@ dependencies:
   fade_indexed_stack: ^0.2.2
   fast_base58: ^0.2.1
   ffmpeg_kit_flutter_full_gpl: ^6.0.3
-  figma_squircle: 0.5.3
+  figma_squircle:
+    git:
+      url: https://github.com/aloisdeniel/figma_squircle.git
+      ref: 7cc383b30e96c07acd4e484c1d6731d054f7f6ec
   file_saver: ^0.2.14
   firebase_core: ^3.6.0
   firebase_messaging: ^15.1.3

From 8237229823681241ff6dc3abeefb98f66877544d Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Mon, 24 Feb 2025 15:46:13 +0530
Subject: [PATCH 463/796] fix: loop behavior media kit

---
 .../lib/ui/viewer/file/video_widget_media_kit_new.dart   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
index 7d4e659a20..0799158829 100644
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
@@ -13,6 +13,7 @@ import "package:photos/events/stream_switched_event.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/models/file/extensions/file_props.dart";
 import "package:photos/models/file/file.dart";
+import "package:photos/service_locator.dart";
 import "package:photos/services/files_service.dart";
 import "package:photos/theme/colors.dart";
 import "package:photos/ui/actions/file/file_actions.dart";
@@ -95,12 +96,10 @@ class _VideoWidgetMediaKitNewState extends State<VideoWidgetMediaKitNew>
   }
 
   void loadPreview() {
-    print("[vwmkn] PREVIEW");
     _setVideoController(widget.preview!.path);
   }
 
   void loadOriginal() {
-    print("[vwmkn] ORIGINAL");
     if (widget.file.isRemoteFile) {
       _loadNetworkVideo();
       _setFileSizeIfNull();
@@ -231,7 +230,11 @@ class _VideoWidgetMediaKitNewState extends State<VideoWidgetMediaKitNew>
     if (mounted) {
       setState(() {
         if (controller == null) {
-          player.setPlaylistMode(PlaylistMode.single);
+          player.setPlaylistMode(
+            localSettings.shouldLoopVideo()
+                ? PlaylistMode.single
+                : PlaylistMode.none,
+          );
           controller = VideoController(player);
         }
         player.open(Media(url), play: _isAppInFG);

From 7175e1d43a578de8ca8563cec6a271845732a67a Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Mon, 24 Feb 2025 15:47:15 +0530
Subject: [PATCH 464/796] fix: don't show media kit button for preview

---
 mobile/lib/ui/viewer/file/video_widget_native.dart | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/mobile/lib/ui/viewer/file/video_widget_native.dart b/mobile/lib/ui/viewer/file/video_widget_native.dart
index 4249a599ef..a660c5bfee 100644
--- a/mobile/lib/ui/viewer/file/video_widget_native.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_native.dart
@@ -311,6 +311,13 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
                             child: Column(
                               crossAxisAlignment: CrossAxisAlignment.center,
                               children: [
+                                if (!widget.selectedPreview)
+                                  _VideoDescriptionAndSwitchToMediaKitButton(
+                                    file: widget.file,
+                                    showControls: _showControls,
+                                    elTooltipController: _elTooltipController,
+                                    controller: _controller,
+                                  ),
                                 ValueListenableBuilder(
                                   valueListenable: _showControls,
                                   builder: (context, value, _) {
@@ -322,12 +329,6 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
                                     );
                                   },
                                 ),
-                                _VideoDescriptionAndSwitchToMediaKitButton(
-                                  file: widget.file,
-                                  showControls: _showControls,
-                                  elTooltipController: _elTooltipController,
-                                  controller: _controller,
-                                ),
                                 ValueListenableBuilder(
                                   valueListenable: _isPlaybackReady,
                                   builder:

From 54d2813329ee3b74bc3fee958efce121b8d52928 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 24 Feb 2025 15:59:11 +0530
Subject: [PATCH 465/796] [server] Parallize size fetch for file & thumb

---
 server/pkg/controller/file.go | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/server/pkg/controller/file.go b/server/pkg/controller/file.go
index 6597ed3027..210c2e10fe 100644
--- a/server/pkg/controller/file.go
+++ b/server/pkg/controller/file.go
@@ -107,20 +107,43 @@ func (c *FileController) validateFileCreateOrUpdateReq(userID int64, file ente.F
 	return nil
 }
 
+type sizeResult struct {
+	size int64
+	err  error
+}
+
 // Create adds an entry for a file in the respective tables
 func (c *FileController) Create(ctx *gin.Context, userID int64, file ente.File, userAgent string, app ente.App) (ente.File, error) {
+	fileChan := make(chan sizeResult)
+	thumbChan := make(chan sizeResult)
+	go func() {
+		size, err := c.sizeOf(file.File.ObjectKey)
+		fileChan <- sizeResult{size, err}
+	}()
+	go func() {
+		size, err := c.sizeOf(file.Thumbnail.ObjectKey)
+		thumbChan <- sizeResult{size, err}
+	}()
 	err := c.validateFileCreateOrUpdateReq(userID, file)
 	if err != nil {
 		return file, stacktrace.Propagate(err, "")
 	}
+	// Receive results from both operations
+	fileResult := <-fileChan
+	thumbResult := <-thumbChan
+
 	hotDC := c.S3Config.GetHotDataCenter()
-	// sizeOf will do also HEAD check to ensure that the object exists in the
-	// current hot DC
-	fileSize, err := c.sizeOf(file.File.ObjectKey)
-	if err != nil {
+
+	if fileResult.err != nil {
 		log.Error("Could not find size of file: " + file.File.ObjectKey)
-		return file, stacktrace.Propagate(err, "")
+		return file, stacktrace.Propagate(fileResult.err, "")
 	}
+	if thumbResult.err != nil {
+		log.Error("Could not find size of thumbnail: " + file.Thumbnail.ObjectKey)
+		return file, stacktrace.Propagate(thumbResult.err, "")
+	}
+	fileSize := fileResult.size
+	thumbnailSize := thumbResult.size
 	if fileSize > MaxFileSize {
 		return file, stacktrace.Propagate(ente.ErrFileTooLarge, "")
 	}
@@ -128,7 +151,6 @@ func (c *FileController) Create(ctx *gin.Context, userID int64, file ente.File,
 		return file, stacktrace.Propagate(ente.ErrBadRequest, "mismatch in file size")
 	}
 	file.File.Size = fileSize
-	thumbnailSize, err := c.sizeOf(file.Thumbnail.ObjectKey)
 	if err != nil {
 		log.Error("Could not find size of thumbnail: " + file.Thumbnail.ObjectKey)
 		return file, stacktrace.Propagate(err, "")

From 492ea61bb7d38c2b5d88990dba6d5282facf1d52 Mon Sep 17 00:00:00 2001
From: vishnukvmd <vishnu@ente.io>
Date: Mon, 24 Feb 2025 16:03:28 +0530
Subject: [PATCH 466/796] Update

---
 docs/docs/photos/features/trash.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/docs/photos/features/trash.md b/docs/docs/photos/features/trash.md
index f324b48e9c..84a685279b 100644
--- a/docs/docs/photos/features/trash.md
+++ b/docs/docs/photos/features/trash.md
@@ -10,3 +10,9 @@ automatically deleted from Trash after 30 days. You can manaully select photos
 to permanently delete or completely empty the trash if you wish.
 
 Items in trash are included in your used storage calculation.
+
+## Recovery
+
+If you have deleted items accidentally, you can recover them from Trash by
+selecting these items, and clicking the "Restore" button on the action bar that
+pops up.

From 1b98f782f136546adfbab2e35c0c4b83cc8445ff Mon Sep 17 00:00:00 2001
From: vishnukvmd <vishnu@ente.io>
Date: Mon, 24 Feb 2025 16:19:54 +0530
Subject: [PATCH 467/796] Update

---
 docs/docs/.vitepress/sidebar.ts                |  6 +++---
 ...machine-learning.md => face-recognition.md} | 18 ++++++++++++++----
 docs/docs/photos/faq/video-streaming.md        | 10 +++++-----
 docs/docs/photos/features/machine-learning.md  |  4 ++--
 4 files changed, 24 insertions(+), 14 deletions(-)
 rename docs/docs/photos/faq/{machine-learning.md => face-recognition.md} (80%)

diff --git a/docs/docs/.vitepress/sidebar.ts b/docs/docs/.vitepress/sidebar.ts
index 64fb76b8d5..6b545e233f 100644
--- a/docs/docs/.vitepress/sidebar.ts
+++ b/docs/docs/.vitepress/sidebar.ts
@@ -135,11 +135,11 @@ export const sidebar = [
                         link: "/photos/faq/hidden-and-archive",
                     },
                     {
-                        text: "Machine Learning",
-                        link: "/photos/faq/machine-learning",
+                        text: "Face recognition",
+                        link: "/photos/faq/face-recognition",
                     },
                     {
-                        text: "Video Streaming",
+                        text: "Video streaming",
                         link: "/photos/faq/video-streaming",
                     },
                 ],
diff --git a/docs/docs/photos/faq/machine-learning.md b/docs/docs/photos/faq/face-recognition.md
similarity index 80%
rename from docs/docs/photos/faq/machine-learning.md
rename to docs/docs/photos/faq/face-recognition.md
index 53bf5ca558..24c9650345 100644
--- a/docs/docs/photos/faq/machine-learning.md
+++ b/docs/docs/photos/faq/face-recognition.md
@@ -1,10 +1,10 @@
 ---
-title: Machine Learning FAQ
+title: Face recognition
 description:
-    Frequently asked questions about several features of Ente's ML suite
+    Frequently asked questions about Ente's face recognition
 ---
 
-# Machine Learning
+# Face recognition
 
 ## Can I merge or de-merge persons recognized by the app?
 
@@ -19,7 +19,7 @@ instead of typing the name again, tap on the already given name that should now
 be listed.
 
 De-merging a certain grouping can be done by going to the person, pressing
-`review suggestions` and then the top right `history icon`. Now press on the
+`Review suggestions` and then the top right `History icon`. Now press on the
 `minus icon` beside the group you want to de-merge.
 
 ### Desktop
@@ -29,6 +29,16 @@ selecting an existing person, and use the "Review suggestions" sheet to de-merge
 previously merged persons (click the top right history icon on the suggestion
 sheet to see the previous merges, and if necessary, undo them).
 
+## How can I remove an incorrectly grouped face from a person?
+
+On our mobile app, open up the person from the People section, click on the
+three dots to open up overflow menu, and click on Edit. Now you will be
+presented with the list of all photos that were merged to create this person.
+
+You can click on the merged photos and select the photos you think are
+incorrectly grouped (by long-pressing on them) and select "Remove" from the
+action bar that pops up to remove any incorrect faces.
+
 ## How do I change the cover for a recognized person?
 
 ### Mobile
diff --git a/docs/docs/photos/faq/video-streaming.md b/docs/docs/photos/faq/video-streaming.md
index 81018b30b9..59a34907f6 100644
--- a/docs/docs/photos/faq/video-streaming.md
+++ b/docs/docs/photos/faq/video-streaming.md
@@ -1,10 +1,10 @@
 ---
-title: Video Streaming FAQ
+title: Video streaming FAQ
 description:
-    Frequently asked questions about Ente's Video Streaming feature
+    Frequently asked questions about Ente's video streaming feature
 ---
 
-# Video Streaming
+# Video streaming
 
 > [!NOTE]
 >
@@ -31,8 +31,8 @@ You can open these videos by tapping on them.
 Processed videos will show a `Play stream` button, clicking which will load and
 play the stream.
 
-Clicking on the `Info` icon within the original video will show details
-about the generated stream.
+Clicking on the `Info` icon within the original video will show details about
+the generated stream.
 
 ### What is a stream?
 
diff --git a/docs/docs/photos/features/machine-learning.md b/docs/docs/photos/features/machine-learning.md
index 7e14bafa81..215c1d98a8 100644
--- a/docs/docs/photos/features/machine-learning.md
+++ b/docs/docs/photos/features/machine-learning.md
@@ -50,5 +50,5 @@ end-to-end encrypted security that we use for syncing your photos.
 Note that the desktop app does not currently support modifying the face
 groupings, that is only supported by the mobile app.
 
-For more information on how to use Machine Learning please check out
-[the FAQ](../faq/machine-learning).
+For more information on how to use Machine Learning for face recognition please
+check out [the FAQ](../faq/face-recognition).

From b9573c057ea5beacdf969a26117ac278bad54858 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 24 Feb 2025 16:34:57 +0530
Subject: [PATCH 468/796] [server] Use cached result for canUpload

---
 server/cmd/museum/main.go      | 15 ++++++------
 server/pkg/controller/usage.go | 44 +++++++++++++++++++++++++++-------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go
index ded9c46475..96838e9b9b 100644
--- a/server/cmd/museum/main.go
+++ b/server/cmd/museum/main.go
@@ -243,13 +243,14 @@ func main() {
 	)
 
 	usageController := &controller.UsageController{
-		BillingCtrl:      billingController,
-		StorageBonusCtrl: storageBonusCtrl,
-		UserCacheCtrl:    userCacheCtrl,
-		UsageRepo:        usageRepo,
-		UserRepo:         userRepo,
-		FamilyRepo:       familyRepo,
-		FileRepo:         fileRepo,
+		BillingCtrl:       billingController,
+		StorageBonusCtrl:  storageBonusCtrl,
+		UserCacheCtrl:     userCacheCtrl,
+		UsageRepo:         usageRepo,
+		UserRepo:          userRepo,
+		FamilyRepo:        familyRepo,
+		FileRepo:          fileRepo,
+		UploadResultCache: make(map[int64]bool),
 	}
 
 	accessCtrl := access.NewAccessController(collectionRepo, fileRepo)
diff --git a/server/pkg/controller/usage.go b/server/pkg/controller/usage.go
index 0e02febe6b..30209a7634 100644
--- a/server/pkg/controller/usage.go
+++ b/server/pkg/controller/usage.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"sync"
 
 	"github.com/ente-io/museum/ente"
 	bonus "github.com/ente-io/museum/ente/storagebonus"
@@ -15,20 +16,47 @@ import (
 
 // UsageController exposes functions which can be used to check around storage
 type UsageController struct {
-	BillingCtrl      *BillingController
-	StorageBonusCtrl *storagebonus.Controller
-	UserCacheCtrl    *usercache.Controller
-	UsageRepo        *repo.UsageRepository
-	UserRepo         *repo.UserRepository
-	FamilyRepo       *repo.FamilyRepository
-	FileRepo         *repo.FileRepository
+	mu                sync.Mutex
+	BillingCtrl       *BillingController
+	StorageBonusCtrl  *storagebonus.Controller
+	UserCacheCtrl     *usercache.Controller
+	UsageRepo         *repo.UsageRepository
+	UserRepo          *repo.UserRepository
+	FamilyRepo        *repo.FamilyRepository
+	FileRepo          *repo.FileRepository
+	UploadResultCache map[int64]bool
 }
 
 const MaxLockerFiles = 10000
+const hundredMBInBytes = 100 * 1024 * 1024
 
 // CanUploadFile returns error if the file of given size (with StorageOverflowAboveSubscriptionLimit buffer) can be
 // uploaded or not. If size is not passed, it validates if current usage is less than subscription storage.
 func (c *UsageController) CanUploadFile(ctx context.Context, userID int64, size *int64, app ente.App) error {
+	// check if size is nil or less than 100 MB
+	if app != ente.Locker && size == nil || *size < hundredMBInBytes {
+		c.mu.Lock()
+		canUpload, ok := c.UploadResultCache[userID]
+		c.mu.Unlock()
+		if ok && canUpload {
+			go func() {
+				_ = c.checkAndUpdateCache(ctx, userID, size, app)
+			}()
+			return nil
+		}
+	}
+	return c.checkAndUpdateCache(ctx, userID, size, app)
+}
+
+func (c *UsageController) checkAndUpdateCache(ctx context.Context, userID int64, size *int64, app ente.App) error {
+	err := c.canUploadFile(ctx, userID, size, app)
+	c.mu.Lock()
+	c.UploadResultCache[userID] = err == nil
+	c.mu.Unlock()
+	return err
+}
+
+func (c *UsageController) canUploadFile(ctx context.Context, userID int64, size *int64, app ente.App) error {
 	// If app is Locker, limit to MaxLockerFiles files
 	if app == ente.Locker {
 		// Get file count
@@ -113,7 +141,6 @@ func (c *UsageController) CanUploadFile(ctx context.Context, userID int64, size
 
 	// Get particular member's storage and check if the file size is larger than the size of the storage allocated
 	// to the Member and fail if its too large.
-
 	if subscriptionAdminID != userID && memberStorageLimit != nil {
 		memberUsage, memberUsageErr := c.UsageRepo.GetUsage(userID)
 		if memberUsageErr != nil {
@@ -128,5 +155,6 @@ func (c *UsageController) CanUploadFile(ctx context.Context, userID int64, size
 
 		}
 	}
+
 	return nil
 }

From 87555194fe8f811be9445dd3384673ab4086d196 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Mon, 24 Feb 2025 16:43:33 +0530
Subject: [PATCH 469/796] chore: bump lock files

---
 mobile/ios/Podfile.lock                     | 166 ++++++++++----------
 mobile/ios/Runner.xcodeproj/project.pbxproj |   6 +-
 mobile/pubspec.lock                         |   4 +-
 3 files changed, 85 insertions(+), 91 deletions(-)

diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index 1ef345a144..f7c69935af 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -5,7 +5,6 @@ PODS:
     - Flutter
   - connectivity_plus (0.0.1):
     - Flutter
-    - FlutterMacOS
   - cupertino_http (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -22,31 +21,31 @@ PODS:
     - Flutter
   - file_saver (0.0.1):
     - Flutter
-  - Firebase/CoreOnly (11.2.0):
-    - FirebaseCore (= 11.2.0)
-  - Firebase/Messaging (11.2.0):
+  - Firebase/CoreOnly (11.8.0):
+    - FirebaseCore (~> 11.8.0)
+  - Firebase/Messaging (11.8.0):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 11.2.0)
-  - firebase_core (3.6.0):
-    - Firebase/CoreOnly (= 11.2.0)
+    - FirebaseMessaging (~> 11.8.0)
+  - firebase_core (3.12.0):
+    - Firebase/CoreOnly (= 11.8.0)
     - Flutter
-  - firebase_messaging (15.1.3):
-    - Firebase/Messaging (= 11.2.0)
+  - firebase_messaging (15.2.3):
+    - Firebase/Messaging (= 11.8.0)
     - firebase_core
     - Flutter
-  - FirebaseCore (11.2.0):
-    - FirebaseCoreInternal (~> 11.0)
+  - FirebaseCore (11.8.1):
+    - FirebaseCoreInternal (~> 11.8.0)
     - GoogleUtilities/Environment (~> 8.0)
     - GoogleUtilities/Logger (~> 8.0)
-  - FirebaseCoreInternal (11.6.0):
+  - FirebaseCoreInternal (11.8.0):
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
-  - FirebaseInstallations (11.4.0):
-    - FirebaseCore (~> 11.0)
+  - FirebaseInstallations (11.8.0):
+    - FirebaseCore (~> 11.8.0)
     - GoogleUtilities/Environment (~> 8.0)
     - GoogleUtilities/UserDefaults (~> 8.0)
     - PromisesObjC (~> 2.4)
-  - FirebaseMessaging (11.2.0):
-    - FirebaseCore (~> 11.0)
+  - FirebaseMessaging (11.8.0):
+    - FirebaseCore (~> 11.8.0)
     - FirebaseInstallations (~> 11.0)
     - GoogleDataTransport (~> 10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
@@ -57,7 +56,7 @@ PODS:
   - Flutter (1.0.0)
   - flutter_email_sender (0.0.1):
     - Flutter
-  - flutter_image_compress (1.0.0):
+  - flutter_image_compress_common (1.0.0):
     - Flutter
     - Mantle
     - SDWebImage
@@ -71,7 +70,7 @@ PODS:
     - OrderedSet (~> 6.0.3)
   - flutter_local_notifications (0.0.1):
     - Flutter
-  - flutter_native_splash (0.0.1):
+  - flutter_native_splash (2.4.3):
     - Flutter
   - flutter_secure_storage (6.0.0):
     - Flutter
@@ -79,7 +78,6 @@ PODS:
     - Flutter
   - fluttertoast (0.0.2):
     - Flutter
-    - Toast
   - GoogleDataTransport (10.1.0):
     - nanopb (~> 3.30910.0)
     - PromisesObjC (~> 2.4)
@@ -118,17 +116,17 @@ PODS:
     - FlutterMacOS
   - integration_test (0.0.1):
     - Flutter
-  - libwebp (1.3.2):
-    - libwebp/demux (= 1.3.2)
-    - libwebp/mux (= 1.3.2)
-    - libwebp/sharpyuv (= 1.3.2)
-    - libwebp/webp (= 1.3.2)
-  - libwebp/demux (1.3.2):
+  - libwebp (1.5.0):
+    - libwebp/demux (= 1.5.0)
+    - libwebp/mux (= 1.5.0)
+    - libwebp/sharpyuv (= 1.5.0)
+    - libwebp/webp (= 1.5.0)
+  - libwebp/demux (1.5.0):
     - libwebp/webp
-  - libwebp/mux (1.3.2):
+  - libwebp/mux (1.5.0):
     - libwebp/demux
-  - libwebp/sharpyuv (1.3.2)
-  - libwebp/webp (1.3.2):
+  - libwebp/sharpyuv (1.5.0)
+  - libwebp/webp (1.5.0):
     - libwebp/sharpyuv
   - local_auth_darwin (0.0.1):
     - Flutter
@@ -185,19 +183,19 @@ PODS:
   - privacy_screen (0.0.1):
     - Flutter
   - PromisesObjC (2.4.0)
-  - receive_sharing_intent (1.8.0):
+  - receive_sharing_intent (1.8.1):
     - Flutter
-  - SDWebImage (5.20.0):
-    - SDWebImage/Core (= 5.20.0)
-  - SDWebImage/Core (5.20.0)
+  - SDWebImage (5.21.0):
+    - SDWebImage/Core (= 5.21.0)
+  - SDWebImage/Core (5.21.0)
   - SDWebImageWebPCoder (0.14.6):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.17)
-  - Sentry/HybridSDK (8.36.0)
-  - sentry_flutter (8.9.0):
+  - Sentry/HybridSDK (8.44.0)
+  - sentry_flutter (8.13.2):
     - Flutter
     - FlutterMacOS
-    - Sentry/HybridSDK (= 8.36.0)
+    - Sentry/HybridSDK (= 8.44.0)
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
@@ -206,28 +204,28 @@ PODS:
   - sqflite_darwin (0.0.4):
     - Flutter
     - FlutterMacOS
-  - "sqlite3 (3.46.1+1)":
-    - "sqlite3/common (= 3.46.1+1)"
-  - "sqlite3/common (3.46.1+1)"
-  - "sqlite3/dbstatvtab (3.46.1+1)":
+  - sqlite3 (3.49.1):
+    - sqlite3/common (= 3.49.1)
+  - sqlite3/common (3.49.1)
+  - sqlite3/dbstatvtab (3.49.1):
     - sqlite3/common
-  - "sqlite3/fts5 (3.46.1+1)":
+  - sqlite3/fts5 (3.49.1):
     - sqlite3/common
-  - "sqlite3/perf-threadsafe (3.46.1+1)":
+  - sqlite3/perf-threadsafe (3.49.1):
     - sqlite3/common
-  - "sqlite3/rtree (3.46.1+1)":
+  - sqlite3/rtree (3.49.1):
     - sqlite3/common
   - sqlite3_flutter_libs (0.0.1):
     - Flutter
-    - "sqlite3 (~> 3.46.0+1)"
+    - FlutterMacOS
+    - sqlite3 (~> 3.49.0)
     - sqlite3/dbstatvtab
     - sqlite3/fts5
     - sqlite3/perf-threadsafe
     - sqlite3/rtree
   - system_info_plus (0.0.1):
     - Flutter
-  - Toast (4.1.1)
-  - ua_client_hints (1.4.0):
+  - ua_client_hints (1.4.1):
     - Flutter
   - uni_links (0.0.1):
     - Flutter
@@ -247,7 +245,7 @@ PODS:
 DEPENDENCIES:
   - background_fetch (from `.symlinks/plugins/background_fetch/ios`)
   - battery_info (from `.symlinks/plugins/battery_info/ios`)
-  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`)
+  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - cupertino_http (from `.symlinks/plugins/cupertino_http/darwin`)
   - dart_ui_isolate (from `.symlinks/plugins/dart_ui_isolate/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
@@ -257,7 +255,7 @@ DEPENDENCIES:
   - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
   - Flutter (from `Flutter`)
   - flutter_email_sender (from `.symlinks/plugins/flutter_email_sender/ios`)
-  - flutter_image_compress (from `.symlinks/plugins/flutter_image_compress/ios`)
+  - flutter_image_compress_common (from `.symlinks/plugins/flutter_image_compress_common/ios`)
   - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`)
   - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
@@ -292,7 +290,7 @@ DEPENDENCIES:
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
-  - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/ios`)
+  - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/darwin`)
   - system_info_plus (from `.symlinks/plugins/system_info_plus/ios`)
   - ua_client_hints (from `.symlinks/plugins/ua_client_hints/ios`)
   - uni_links (from `.symlinks/plugins/uni_links/ios`)
@@ -323,7 +321,6 @@ SPEC REPOS:
     - SDWebImageWebPCoder
     - Sentry
     - sqlite3
-    - Toast
 
 EXTERNAL SOURCES:
   background_fetch:
@@ -331,7 +328,7 @@ EXTERNAL SOURCES:
   battery_info:
     :path: ".symlinks/plugins/battery_info/ios"
   connectivity_plus:
-    :path: ".symlinks/plugins/connectivity_plus/darwin"
+    :path: ".symlinks/plugins/connectivity_plus/ios"
   cupertino_http:
     :path: ".symlinks/plugins/cupertino_http/darwin"
   dart_ui_isolate:
@@ -350,8 +347,8 @@ EXTERNAL SOURCES:
     :path: Flutter
   flutter_email_sender:
     :path: ".symlinks/plugins/flutter_email_sender/ios"
-  flutter_image_compress:
-    :path: ".symlinks/plugins/flutter_image_compress/ios"
+  flutter_image_compress_common:
+    :path: ".symlinks/plugins/flutter_image_compress_common/ios"
   flutter_inappwebview_ios:
     :path: ".symlinks/plugins/flutter_inappwebview_ios/ios"
   flutter_local_notifications:
@@ -421,7 +418,7 @@ EXTERNAL SOURCES:
   sqflite_darwin:
     :path: ".symlinks/plugins/sqflite_darwin/darwin"
   sqlite3_flutter_libs:
-    :path: ".symlinks/plugins/sqlite3_flutter_libs/ios"
+    :path: ".symlinks/plugins/sqlite3_flutter_libs/darwin"
   system_info_plus:
     :path: ".symlinks/plugins/system_info_plus/ios"
   ua_client_hints:
@@ -441,55 +438,55 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   background_fetch: 94b36ee293e82972852dba8ede1fbcd3bd3d9d57
-  battery_info: a06b00c06a39bc94c92beebf600f1810cb6c8c87
-  connectivity_plus: 3f6c9057f4cd64198dc826edfb0542892f825343
+  battery_info: 83f3aae7be2fccefab1d2bf06b8aa96f11c8bcdd
+  connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
   cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
   dart_ui_isolate: 46f6714abe6891313267153ef6f9748d8ecfcab1
   device_info_plus: 335f3ce08d2e174b9fdc3db3db0f4e3b1f66bd89
   ffmpeg-kit-ios-full-gpl: 80adc341962e55ef709e36baa8ed9a70cf4ea62b
   ffmpeg_kit_flutter_full_gpl: ce18b888487c05c46ed252cd2e7956812f2e3bd1
   file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
-  Firebase: 98e6bf5278170668a7983e12971a66b2cd57fc8c
-  firebase_core: 085320ddfaacb80d1a96eac3a87857afcc150db1
-  firebase_messaging: d398edc15fe825f832836e74f6ac61e8cd2f3ad3
-  FirebaseCore: a282032ae9295c795714ded2ec9c522fc237f8da
-  FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2
-  FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414
-  FirebaseMessaging: c9ec7b90c399c7a6100297e9d16f8a27fc7f7152
+  Firebase: d80354ed7f6df5f9aca55e9eb47cc4b634735eaf
+  firebase_core: 6cbed78b4f298ed103a9fd034e6dbc846320480f
+  firebase_messaging: 5e0adf2eb18b0ee59aa0c109314c091a0497ecac
+  FirebaseCore: 99fe0c4b44a39f37d99e6404e02009d2db5d718d
+  FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629
+  FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917
+  FirebaseMessaging: 487b634ccdf6f7b7ff180fdcb2a9935490f764e8
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_email_sender: cd533cdc7ea5eda6fabb2c7f78521c71207778a4
-  flutter_image_compress: 4b058288a81f76e5e80340af37c709abafff34c4
+  flutter_email_sender: aa1e9772696691d02cd91fea829856c11efb8e58
+  flutter_image_compress_common: 1697a328fd72bfb335507c6bca1a65fa5ad87df1
   flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
   flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100
-  flutter_native_splash: 35ddbc7228eafcb3969dcc5f1fbbe27c1145a4f0
+  flutter_native_splash: 6cad9122ea0fad137d23137dd14b937f3e90b145
   flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
-  flutter_sodium: 152647449ba89a157fd48d7e293dcd6d29c6ab0e
-  fluttertoast: 76fea30fcf04176325f6864c87306927bd7d2038
+  flutter_sodium: 7e4621538491834eba53bd524547854bcbbd6987
+  fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
   home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
   image_editor_common: 3de87e7c4804f4ae24c8f8a998362b98c105cac1
   image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
-  in_app_purchase_storekit: e126ef1b89e4a9fdf07e28f005f82632b4609437
+  in_app_purchase_storekit: d1a48cb0f8b29dbf5f85f782f5dd79b21b90a5e6
   integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
-  libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
+  libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
   local_auth_darwin: 553ce4f9b16d3fdfeafce9cf042e7c9f77c1c391
   local_auth_ios: f7a1841beef3151d140a967c2e46f30637cdf451
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
   maps_launcher: edf829809ba9e894d70e569bab11c16352dedb45
-  media_extension: a1fec16ee9c8241a6aef9613578ebf097d6c5e64
+  media_extension: 671e2567880d96c95c65c9a82ccceed8f2e309fd
   media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
   media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
   motion_sensors: 741e702c17467b9569a92165dda8d4d88c6167f1
-  motionphoto: 584b43031ead3060225cdff08fa49818879801d2
-  move_to_background: 155f7bfbd34d43ad847cb630d2d2d87c17199710
+  motionphoto: 23e2aeb5c6380112f69468d71f970fa7438e5ed1
+  move_to_background: 7e3467dd2a1d1013e98c9c1cb93fd53cd7ef9d84
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
   native_video_player: e363dd14f6a498ad8a8f7e6486a0db046ad19f13
   objective_c: 89e720c30d716b036faf9c9684022048eee1eee2
   onnxruntime: f9b296392c96c42882be020a59dbeac6310d81b2
   onnxruntime-c: a909204639a1f035f575127ac406f781ac797c9c
   onnxruntime-objc: b6fab0f1787aa6f7190c2013f03037df4718bd8b
-  open_mail_app: 06d5a4162866388a92b1df3deb96e56be20cf45c
+  open_mail_app: 7314a609e88eed22d53671279e189af7a0ab0f11
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
   path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
@@ -497,23 +494,22 @@ SPEC CHECKSUMS:
   photo_manager: d2fbcc0f2d82458700ee6256a15018210a81d413
   privacy_screen: 3159a541f5d3a31bea916cfd4e58f9dc722b3fd4
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  receive_sharing_intent: f6a12b7e8f7ed745f61c982de8a65de88db44a44
-  SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
+  receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00
+  SDWebImage: f84b0feeb08d2d11e6a9b843cb06d75ebf5b8868
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
-  Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
-  sentry_flutter: 0a211008f52553ba5dd81ceb71f48d78f0f1f6ab
-  share_plus: 011d6fb4f9d2576b83179a3a5c5e323202cdabcf
+  Sentry: 0f9bc9adfc0b960e7f3bb5ec67e9a3d8193f3bdb
+  sentry_flutter: f4a0466dc8855998ffd59378ec33507c7dc32d7b
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
   shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
-  sqflite_darwin: 44bb54cc302bff1fbe5752293aba1820b157cf1c
-  sqlite3: 0bb0e6389d824e40296f531b858a2a0b71c0d2fb
-  sqlite3_flutter_libs: 9379996d65aa23dcda7585a5b58766cebe0aa042
+  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
+  sqlite3: fc1400008a9b3525f5914ed715a5d1af0b8f4983
+  sqlite3_flutter_libs: 3c323550ef3b928bc0aa9513c841e45a7d242832
   system_info_plus: 555ce7047fbbf29154726db942ae785c29211740
-  Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
-  ua_client_hints: 0b48eae1134283f5b131ee0871fa878377f07a01
-  uni_links: ed8c961e47ed9ce42b6d91e1de8049e38a4b3152
+  ua_client_hints: 92fe0d139619b73ec9fcb46cc7e079a26178f586
+  uni_links: f191d616c4db8750f74c72c988e79a83dd297fac
   url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
   video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
-  video_thumbnail: b637e0ad5f588ca9945f6e2c927f73a69a661140
+  video_thumbnail: 584ccfa55d8fd2f3d5507218b0a18d84c839c620
   volume_controller: 3657a1f65bedb98fa41ff7dc5793537919f31b12
   wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49
 
diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj
index 74a0b8ae7a..183710c51f 100644
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -288,7 +288,6 @@
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework",
 				"${BUILT_PRODUCTS_DIR}/Sentry/Sentry.framework",
-				"${BUILT_PRODUCTS_DIR}/Toast/Toast.framework",
 				"${BUILT_PRODUCTS_DIR}/background_fetch/background_fetch.framework",
 				"${BUILT_PRODUCTS_DIR}/battery_info/battery_info.framework",
 				"${BUILT_PRODUCTS_DIR}/connectivity_plus/connectivity_plus.framework",
@@ -297,7 +296,7 @@
 				"${BUILT_PRODUCTS_DIR}/device_info_plus/device_info_plus.framework",
 				"${BUILT_PRODUCTS_DIR}/file_saver/file_saver.framework",
 				"${BUILT_PRODUCTS_DIR}/flutter_email_sender/flutter_email_sender.framework",
-				"${BUILT_PRODUCTS_DIR}/flutter_image_compress/flutter_image_compress.framework",
+				"${BUILT_PRODUCTS_DIR}/flutter_image_compress_common/flutter_image_compress_common.framework",
 				"${BUILT_PRODUCTS_DIR}/flutter_inappwebview_ios/flutter_inappwebview_ios.framework",
 				"${BUILT_PRODUCTS_DIR}/flutter_local_notifications/flutter_local_notifications.framework",
 				"${BUILT_PRODUCTS_DIR}/flutter_native_splash/flutter_native_splash.framework",
@@ -383,7 +382,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageWebPCoder.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sentry.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/background_fetch.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/battery_info.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity_plus.framework",
@@ -392,7 +390,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info_plus.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_saver.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_email_sender.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_image_compress.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_image_compress_common.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_inappwebview_ios.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_local_notifications.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_native_splash.framework",
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index 0e00455b0b..5cfc923a6f 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -2893,7 +2893,7 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: "61e72616a0c9e3f380eaeff08a20ae5ea7c57e84"
+      resolved-ref: ba086b927621434d1bbd73eeffbe7504d7abebfa
       url: "https://github.com/ente-io/video_thumbnail_fork.git"
     source: git
     version: "0.5.3"
@@ -2942,7 +2942,7 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: "28095979c82b377509098e757873ed88d2df09b1"
+      resolved-ref: a1c96618483ace4596af085891f04a4d463725b4
       url: "https://github.com/ente-io/wallpaper_manager_fork.git"
     source: git
     version: "0.0.2"

From 8036aae2929194b650ae8a27e2a5063814a8e12a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 16:46:43 +0530
Subject: [PATCH 470/796] [desktop] Reattempt indexing if needed

---
 web/packages/new/photos/services/migration.ts | 21 ++++++---
 web/packages/new/photos/services/ml/db.ts     | 14 ++++++
 web/packages/new/photos/services/ml/index.ts  | 44 ++++++++++++++++++-
 3 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/web/packages/new/photos/services/migration.ts b/web/packages/new/photos/services/migration.ts
index 0d319e9688..260bad2be7 100644
--- a/web/packages/new/photos/services/migration.ts
+++ b/web/packages/new/photos/services/migration.ts
@@ -3,6 +3,7 @@ import { getKVN, removeKV, setKV } from "@/base/kv";
 import log from "@/base/log";
 import localForage from "@ente/shared/storage/localForage";
 import { deleteDB } from "idb";
+import { retryIndexingFailuresIfNeeded } from "./ml";
 
 /**
  * App specific migrations.
@@ -29,19 +30,22 @@ import { deleteDB } from "idb";
  */
 export const runMigrations = async () => {
     const m = (await getKVN("migrationLevel")) ?? 0;
-    const latest = 4;
+    const isNewInstall = m == 0;
+    const latest = 5;
     if (m < latest) {
         log.info(`Running migrations ${m} => ${latest}`);
         if (m < 1 && isDesktop) await m1();
         if (m < 2) await m2();
         if (m < 3) await m3();
         if (m < 4) m4();
+        if (m < 5) m5(isNewInstall);
         await setKV("migrationLevel", latest);
     }
 };
 
 // Some of these (indicated by "Prunable") can be no-oped in the future when
-// almost all clients would've migrated over.
+// almost all clients would've migrated over, and there wouldn't be any critical
+// impact if the few remaining outliers never ran that specific migration.
 
 // Added: Aug 2024 (v1.7.3). Prunable.
 const m1 = () =>
@@ -102,7 +106,7 @@ const m3 = () =>
         removeKV("latestUpdatedAt/location"),
     ]);
 
-// Added: Nov 2025 (v1.7.7-beta). Prunable.
+// Added: Nov 2024 (v1.7.7-beta). Prunable.
 const m4 = () => {
     // Delete old local storage keys that have been subsumed elsewhere.
     localStorage.removeItem("mapEnabled");
@@ -111,11 +115,14 @@ const m4 = () => {
     localStorage.removeItem("familyData");
 };
 
-// Future cleanup. Prunable so far.
-/*
-const m5 = () => {
+// Added: Feb 2025 (v1.7.10). Prunable.
+const m5 = (isNewInstall: boolean) => {
     // MUI now persists the color scheme (also in local storage). This was
     // anyway never released, was only ever an internal user flag.
     localStorage.removeItem("theme");
+    if (!isNewInstall) {
+        // Let the indexer have another go at the files, the new vips conversion
+        // logic added since 1.7.9 might be able to convert more outliers.
+        retryIndexingFailuresIfNeeded();
+    }
 };
-*/
diff --git a/web/packages/new/photos/services/ml/db.ts b/web/packages/new/photos/services/ml/db.ts
index b3d58e76cb..57d2f1224c 100644
--- a/web/packages/new/photos/services/ml/db.ts
+++ b/web/packages/new/photos/services/ml/db.ts
@@ -314,6 +314,20 @@ export const updateAssumingLocalFiles = async (
     );
 };
 
+/**
+ * Remove all "failed" file status entries so that we again attempt to index
+ * those files the next time indexing happens.
+ */
+export const resetFailedFileStatuses = async () => {
+    const db = await mlDB();
+    const tx = db.transaction("file-status", "readwrite");
+    const ids = await tx.store
+        .index("status")
+        .getAllKeys(IDBKeyRange.only("failed"));
+
+    await Promise.all([ids.map((id) => tx.store.delete(id)), tx.done].flat());
+};
+
 /**
  * Return the count of files that can be, and that have been, indexed.
  *
diff --git a/web/packages/new/photos/services/ml/index.ts b/web/packages/new/photos/services/ml/index.ts
index fc1bc8af4d..4a6bf3850a 100644
--- a/web/packages/new/photos/services/ml/index.ts
+++ b/web/packages/new/photos/services/ml/index.ts
@@ -25,7 +25,12 @@ import {
 import { deleteUserEntity } from "../user-entity/remote";
 import type { FaceCluster } from "./cluster";
 import { regenerateFaceCrops } from "./crop";
-import { clearMLDB, getIndexableAndIndexedCounts, savedFaceIndex } from "./db";
+import {
+    clearMLDB,
+    getIndexableAndIndexedCounts,
+    resetFailedFileStatuses,
+    savedFaceIndex,
+} from "./db";
 import {
     _applyPersonSuggestionUpdates,
     filterNamedPeople,
@@ -97,6 +102,12 @@ class MLState {
      */
     peopleStateSnapshot: PeopleState | undefined;
 
+    /**
+     * `true` if a reset has been requested via
+     * {@link retryIndexingFailuresIfNeeded}.
+     */
+    needsResetFailures = false;
+
     /**
      * In flight face crop regeneration promises indexed by the IDs of the files
      * whose faces we are regenerating.
@@ -294,6 +305,30 @@ const getIsMLEnabledRemote = () => getRemoteFlag(mlRemoteKey);
 const updateIsMLEnabledRemote = (enabled: boolean) =>
     updateRemoteFlag(mlRemoteKey, enabled);
 
+/**
+ * Reset failures so that indexing is attempted again.
+ *
+ * When indexing of some individual files fails for non-retriable reasons, we
+ * mark those as failures locally.
+ *
+ * See: [Note: Transient and permanent indexing failures].
+ *
+ * Sometimes we might wish to reattempt these though (e.g. when adding support
+ * for more file formats).
+ *
+ * In such cases, this function can be called early on (during an app version
+ * upgrade) to set an in-memory flag which tell us that before attemepting a
+ * sync, we should reset existing failed statii.
+ *
+ * Since this is not a critical operation, we only keep this as an in-memory
+ * flag, failure to honor this will not have permanent repercussions (e.g. the
+ * file would eventually get indexed on mobile, or during logout / login, or
+ * during the next time an reattempt is made).
+ */
+export const retryIndexingFailuresIfNeeded = () => {
+    _state.needsResetFailures = true;
+};
+
 /**
  * Sync the ML status with remote.
  *
@@ -330,6 +365,13 @@ export const mlSync = async () => {
     if (_state.isSyncing) return;
     _state.isSyncing = true;
 
+    if (_state.needsResetFailures) {
+        // CAS. See documentation for retryIndexingFailures why swapping the
+        // flag before performing the operation is fine.
+        _state.needsResetFailures = false;
+        await resetFailedFileStatuses();
+    }
+
     // Dependency order for the sync
     //
     //     files -> faces -> cgroups -> clusters -> people

From 3c90b0dfca1fe8733e46468296c3eb5685ba2abc Mon Sep 17 00:00:00 2001
From: Jay <118880285+Jishnuraj9@users.noreply.github.com>
Date: Mon, 24 Feb 2025 17:21:05 +0530
Subject: [PATCH 471/796] docs-faq

---
 docs/docs/photos/faq/general.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/docs/photos/faq/general.md b/docs/docs/photos/faq/general.md
index 0e911f82e6..72bbbf6ea2 100644
--- a/docs/docs/photos/faq/general.md
+++ b/docs/docs/photos/faq/general.md
@@ -112,3 +112,7 @@ https://github.com/ente-io/ente/tree/main/cli#readme.
 
 Currently, the Ente mobile app allows you to see a map view of all the albums by
 clicking on "Your map" under "Locations" on the search screen.
+
+## How to reset my password if I lost it?
+
+On the login page, enter your email and click on Forgot Password. Then, enter your recovery key and create a new password.
\ No newline at end of file

From 28d04f7725e571ff88ffac8ea9f364ab7fbd5008 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 18:36:06 +0530
Subject: [PATCH 472/796] Inline

---
 .../components/two-factor/VerifyTwoFactor.tsx | 140 -----------------
 .../accounts/pages/two-factor/setup.tsx       | 147 +++++++++++++++++-
 2 files changed, 140 insertions(+), 147 deletions(-)
 delete mode 100644 web/packages/accounts/components/two-factor/VerifyTwoFactor.tsx

diff --git a/web/packages/accounts/components/two-factor/VerifyTwoFactor.tsx b/web/packages/accounts/components/two-factor/VerifyTwoFactor.tsx
deleted file mode 100644
index 0633a35060..0000000000
--- a/web/packages/accounts/components/two-factor/VerifyTwoFactor.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-import { LoadingButton } from "@/base/components/mui/LoadingButton";
-import {
-    CenteredFlex,
-    VerticallyCentered,
-} from "@ente/shared/components/Container";
-import { Box, Typography, styled } from "@mui/material";
-import { Formik, type FormikHelpers } from "formik";
-import { t } from "i18next";
-import React, { useState } from "react";
-import OtpInput from "react-otp-input";
-
-interface formValues {
-    otp: string;
-}
-interface Props {
-    onSubmit: VerifyTwoFactorCallback;
-    buttonText: string;
-}
-
-export type VerifyTwoFactorCallback = (
-    otp: string,
-    markSuccessful: () => void,
-) => Promise<void>;
-
-export function VerifyTwoFactor(props: Props) {
-    const [waiting, setWaiting] = useState(false);
-    const [shouldAutoFocus, setShouldAutoFocus] = useState(true);
-
-    const markSuccessful = () => setWaiting(false);
-
-    const submitForm = async (
-        { otp }: formValues,
-        { setFieldError, resetForm }: FormikHelpers<formValues>,
-    ) => {
-        try {
-            setWaiting(true);
-            await props.onSubmit(otp, markSuccessful);
-        } catch (e) {
-            resetForm();
-            const message = e instanceof Error ? e.message : "";
-            setFieldError("otp", `${t("generic_error_retry")} (${message})`);
-            // Workaround (toggling shouldAutoFocus) to reset the focus back to
-            // the first input field in case of errors.
-            // https://github.com/devfolioco/react-otp-input/issues/420
-            setShouldAutoFocus(false);
-            setTimeout(() => setShouldAutoFocus(true), 100);
-        }
-        setWaiting(false);
-    };
-
-    const onChange =
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
-        (callback: Function, triggerSubmit: Function) => (otp: string) => {
-            callback(otp);
-            if (otp.length === 6) {
-                triggerSubmit(otp);
-            }
-        };
-    return (
-        <Formik<formValues>
-            initialValues={{ otp: "" }}
-            validateOnChange={false}
-            validateOnBlur={false}
-            onSubmit={submitForm}
-        >
-            {({ values, errors, handleChange, handleSubmit, submitForm }) => (
-                <VerticallyCentered>
-                    <form noValidate onSubmit={handleSubmit}>
-                        <Typography
-                            variant="small"
-                            sx={{ mb: 2, color: "text.muted" }}
-                        >
-                            {t("enter_two_factor_otp")}
-                        </Typography>
-                        <Box sx={{ my: 2 }}>
-                            <OtpInput
-                                containerStyle={{ justifyContent: "center" }}
-                                shouldAutoFocus={shouldAutoFocus}
-                                value={values.otp}
-                                onChange={onChange(
-                                    handleChange("otp"),
-                                    submitForm,
-                                )}
-                                numInputs={6}
-                                renderSeparator={<span>-</span>}
-                                renderInput={(props) => (
-                                    <IndividualInput {...props} />
-                                )}
-                            />
-                            {errors.otp && (
-                                <CenteredFlex sx={{ mt: 1 }}>
-                                    <InvalidInputMessage>
-                                        {t("incorrect_code")}
-                                    </InvalidInputMessage>
-                                </CenteredFlex>
-                            )}
-                        </Box>
-                        <LoadingButton
-                            type="submit"
-                            color="accent"
-                            fullWidth
-                            sx={{ my: 4 }}
-                            loading={waiting}
-                            disabled={values.otp.length < 6}
-                        >
-                            {props.buttonText}
-                        </LoadingButton>
-                    </form>
-                </VerticallyCentered>
-            )}
-        </Formik>
-    );
-}
-
-const IndividualInput = styled("input")(
-    ({ theme }) => `
-    font-size: 1.5rem;
-    padding: 4px;
-    width: 40px !important;
-    aspect-ratio: 1;
-    margin-inline: 6px;
-    border: 1px solid ${theme.vars.palette.accent.main};
-    border-radius: 1px;
-    outline-color: ${theme.vars.palette.accent.light};
-    transition: 0.5s;
-    ${theme.breakpoints.down("sm")} {
-        font-size: 1rem;
-        padding: 4px;
-        width: 32px !important;
-    }
-`,
-);
-
-const InvalidInputMessage: React.FC<React.PropsWithChildren> = ({
-    children,
-}) => (
-    <Typography variant="mini" sx={{ color: "critical.main" }}>
-        {children}
-    </Typography>
-);
diff --git a/web/packages/accounts/pages/two-factor/setup.tsx b/web/packages/accounts/pages/two-factor/setup.tsx
index fe23e30b8d..d41aaa0a6f 100644
--- a/web/packages/accounts/pages/two-factor/setup.tsx
+++ b/web/packages/accounts/pages/two-factor/setup.tsx
@@ -1,19 +1,22 @@
-import {
-    VerifyTwoFactor,
-    type VerifyTwoFactorCallback,
-} from "@/accounts/components/two-factor/VerifyTwoFactor";
 import { appHomeRoute } from "@/accounts/services/redirect";
 import type { TwoFactorSecret } from "@/accounts/services/user";
 import { enableTwoFactor, setupTwoFactor } from "@/accounts/services/user";
 import { CenteredFill } from "@/base/components/containers";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
+import { LoadingButton } from "@/base/components/mui/LoadingButton";
 import log from "@/base/log";
+import {
+    CenteredFlex,
+    VerticallyCentered,
+} from "@ente/shared/components/Container";
 import { encryptWithRecoveryKey } from "@ente/shared/crypto/helpers";
 import { getData, LS_KEYS, setLSUser } from "@ente/shared/storage/localStorage";
-import { Paper, Stack, styled, Typography } from "@mui/material";
+import { Box, Paper, Stack, styled, Typography } from "@mui/material";
+import { Formik, type FormikHelpers } from "formik";
 import { t } from "i18next";
 import { useRouter } from "next/router";
-import { useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
+import OtpInput from "react-otp-input";
 import { TwoFactorSetup } from "../../components/two-factor/TwoFactorSetup";
 
 export type SetupMode = "qrCode" | "manualCode";
@@ -84,6 +87,8 @@ const Page: React.FC = () => {
     );
 };
 
+export default Page;
+
 const ContentsPaper = styled(Paper)(({ theme }) => ({
     marginBlock: theme.spacing(2),
     padding: theme.spacing(4, 2),
@@ -94,4 +99,132 @@ const ContentsPaper = styled(Paper)(({ theme }) => ({
     gap: theme.spacing(4),
 }));
 
-export default Page;
+interface formValues {
+    otp: string;
+}
+interface VerifyTwoFactorProps {
+    onSubmit: VerifyTwoFactorCallback;
+    buttonText: string;
+}
+
+export type VerifyTwoFactorCallback = (
+    otp: string,
+    markSuccessful: () => void,
+) => Promise<void>;
+
+const VerifyTwoFactor: React.FC<VerifyTwoFactorProps> = (props) => {
+    const [waiting, setWaiting] = useState(false);
+    const [shouldAutoFocus, setShouldAutoFocus] = useState(true);
+
+    const markSuccessful = () => setWaiting(false);
+
+    const submitForm = async (
+        { otp }: formValues,
+        { setFieldError, resetForm }: FormikHelpers<formValues>,
+    ) => {
+        try {
+            setWaiting(true);
+            await props.onSubmit(otp, markSuccessful);
+        } catch (e) {
+            resetForm();
+            const message = e instanceof Error ? e.message : "";
+            setFieldError("otp", `${t("generic_error_retry")} (${message})`);
+            // Workaround (toggling shouldAutoFocus) to reset the focus back to
+            // the first input field in case of errors.
+            // https://github.com/devfolioco/react-otp-input/issues/420
+            setShouldAutoFocus(false);
+            setTimeout(() => setShouldAutoFocus(true), 100);
+        }
+        setWaiting(false);
+    };
+
+    const onChange =
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
+        (callback: Function, triggerSubmit: Function) => (otp: string) => {
+            callback(otp);
+            if (otp.length === 6) {
+                triggerSubmit(otp);
+            }
+        };
+    return (
+        <Formik<formValues>
+            initialValues={{ otp: "" }}
+            validateOnChange={false}
+            validateOnBlur={false}
+            onSubmit={submitForm}
+        >
+            {({ values, errors, handleChange, handleSubmit, submitForm }) => (
+                <VerticallyCentered>
+                    <form noValidate onSubmit={handleSubmit}>
+                        <Typography
+                            variant="small"
+                            sx={{ mb: 2, color: "text.muted" }}
+                        >
+                            {t("enter_two_factor_otp")}
+                        </Typography>
+                        <Box sx={{ my: 2 }}>
+                            <OtpInput
+                                containerStyle={{ justifyContent: "center" }}
+                                shouldAutoFocus={shouldAutoFocus}
+                                value={values.otp}
+                                onChange={onChange(
+                                    handleChange("otp"),
+                                    submitForm,
+                                )}
+                                numInputs={6}
+                                renderSeparator={<span>-</span>}
+                                renderInput={(props) => (
+                                    <IndividualInput {...props} />
+                                )}
+                            />
+                            {errors.otp && (
+                                <CenteredFlex sx={{ mt: 1 }}>
+                                    <InvalidInputMessage>
+                                        {t("incorrect_code")}
+                                    </InvalidInputMessage>
+                                </CenteredFlex>
+                            )}
+                        </Box>
+                        <LoadingButton
+                            type="submit"
+                            color="accent"
+                            fullWidth
+                            sx={{ my: 4 }}
+                            loading={waiting}
+                            disabled={values.otp.length < 6}
+                        >
+                            {props.buttonText}
+                        </LoadingButton>
+                    </form>
+                </VerticallyCentered>
+            )}
+        </Formik>
+    );
+};
+
+const IndividualInput = styled("input")(
+    ({ theme }) => `
+    font-size: 1.5rem;
+    padding: 4px;
+    width: 40px !important;
+    aspect-ratio: 1;
+    margin-inline: 6px;
+    border: 1px solid ${theme.vars.palette.accent.main};
+    border-radius: 1px;
+    outline-color: ${theme.vars.palette.accent.light};
+    transition: 0.5s;
+    ${theme.breakpoints.down("sm")} {
+        font-size: 1rem;
+        padding: 4px;
+        width: 32px !important;
+    }
+`,
+);
+
+const InvalidInputMessage: React.FC<React.PropsWithChildren> = ({
+    children,
+}) => (
+    <Typography variant="mini" sx={{ color: "critical.main" }}>
+        {children}
+    </Typography>
+);

From ebc310d7425cd97c38991b1a70ded268cef8f868 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 18:38:55 +0530
Subject: [PATCH 473/796] z

---
 web/packages/accounts/services/user.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/web/packages/accounts/services/user.ts b/web/packages/accounts/services/user.ts
index 44bda1ed21..96423f4bee 100644
--- a/web/packages/accounts/services/user.ts
+++ b/web/packages/accounts/services/user.ts
@@ -39,10 +39,12 @@ export interface TwoFactorVerificationResponse {
     token?: string;
 }
 
-export interface TwoFactorSecret {
-    secretCode: string;
-    qrCode: string;
-}
+const TwoFactorSecret = z.object({
+    secretCode: z.string(),
+    qrCode: z.string(),
+});
+
+export type TwoFactorSecret = z.infer<typeof TwoFactorSecret>;
 
 export interface TwoFactorRecoveryResponse {
     encryptedSecret: string;

From 290ae402963228e5e27c838c71aee3ae5ddbd2f4 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 18:41:51 +0530
Subject: [PATCH 474/796] Conv

---
 web/packages/accounts/services/user.ts | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/web/packages/accounts/services/user.ts b/web/packages/accounts/services/user.ts
index 96423f4bee..0138ca359c 100644
--- a/web/packages/accounts/services/user.ts
+++ b/web/packages/accounts/services/user.ts
@@ -294,16 +294,17 @@ export const changeEmail = async (email: string, ott: string) => {
     );
 };
 
+/**
+ * Start the two factor setup process by fetching a secret code (and the
+ * corresponding QR code) from remote.
+ */
 export const setupTwoFactor = async () => {
-    const resp = await HTTPService.post(
-        await apiURL("/users/two-factor/setup"),
-        null,
-        undefined,
-        {
-            "X-Auth-Token": getToken(),
-        },
-    );
-    return resp.data as TwoFactorSecret;
+    const res = await fetch(await apiURL("/users/two-factor/setup"), {
+        method: "POST",
+        headers: await authenticatedRequestHeaders(),
+    });
+    ensureOk(res);
+    return TwoFactorSecret.parse(await res.json());
 };
 
 export const enableTwoFactor = async (

From 58fe69638eb1204957bbb039ad4c4922cfebfe27 Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Mon, 24 Feb 2025 18:49:15 +0530
Subject: [PATCH 475/796] Community

---
 docs/docs/self-hosting/guides/Tailscale.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/self-hosting/guides/Tailscale.md b/docs/docs/self-hosting/guides/Tailscale.md
index b13c5e69f3..1f0a7593ed 100644
--- a/docs/docs/self-hosting/guides/Tailscale.md
+++ b/docs/docs/self-hosting/guides/Tailscale.md
@@ -1,5 +1,5 @@
 ---
-title: Self Hosting with Tailscale
+title: Self Hosting with Tailscale (Community)
 description: Guides for self-hosting Ente Photos and/or Ente Auth with Tailscale
 ---
 # Guide

From 7725b1493554bd7fb3171655055f1997717221de Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 18:43:50 +0530
Subject: [PATCH 476/796] Conv

---
 web/packages/accounts/pages/two-factor/setup.tsx | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/web/packages/accounts/pages/two-factor/setup.tsx b/web/packages/accounts/pages/two-factor/setup.tsx
index d41aaa0a6f..718a6c561f 100644
--- a/web/packages/accounts/pages/two-factor/setup.tsx
+++ b/web/packages/accounts/pages/two-factor/setup.tsx
@@ -4,7 +4,6 @@ import { enableTwoFactor, setupTwoFactor } from "@/accounts/services/user";
 import { CenteredFill } from "@/base/components/containers";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import { LoadingButton } from "@/base/components/mui/LoadingButton";
-import log from "@/base/log";
 import {
     CenteredFlex,
     VerticallyCentered,
@@ -29,18 +28,8 @@ const Page: React.FC = () => {
     const router = useRouter();
 
     useEffect(() => {
-        if (twoFactorSecret) {
-            return;
-        }
-        const main = async () => {
-            try {
-                const twoFactorSecret = await setupTwoFactor();
-                setTwoFactorSecret(twoFactorSecret);
-            } catch (e) {
-                log.error("failed to get two factor setup code", e);
-            }
-        };
-        void main();
+        if (twoFactorSecret) return; // HMR
+        void setupTwoFactor().then(setTwoFactorSecret);
     }, []);
 
     const onSubmit: VerifyTwoFactorCallback = async (

From 425954257bed75be3a27a401cdecf4a07e9117ce Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Mon, 24 Feb 2025 19:04:52 +0530
Subject: [PATCH 477/796] add missing sidebar link

---
 docs/docs/.vitepress/sidebar.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/docs/.vitepress/sidebar.ts b/docs/docs/.vitepress/sidebar.ts
index 64fb76b8d5..45c66c1f88 100644
--- a/docs/docs/.vitepress/sidebar.ts
+++ b/docs/docs/.vitepress/sidebar.ts
@@ -267,6 +267,10 @@ export const sidebar = [
                         text: "Hosting Ente without Docker",
                         link: "/self-hosting/guides/standalone-ente",
                     },
+                    {
+                        text: "Ente via Tailscale (Community)",
+                        link: "/self-hosting/guides/Tailscale.md",
+                    },
                     {
                         text: "Configure CLI for Self Hosted Instance",
                         link: "/self-hosting/guides/selfhost-cli",

From 989708cf58f720d8c6d2ac1e62200d02928f8620 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 19:05:11 +0530
Subject: [PATCH 478/796] Use

---
 .../accounts/components/Verify2FACodeForm.tsx | 166 ++++++++++++++++++
 .../accounts/pages/two-factor/setup.tsx       | 162 ++---------------
 .../accounts/pages/two-factor/verify.tsx      |  65 ++++---
 3 files changed, 215 insertions(+), 178 deletions(-)
 create mode 100644 web/packages/accounts/components/Verify2FACodeForm.tsx

diff --git a/web/packages/accounts/components/Verify2FACodeForm.tsx b/web/packages/accounts/components/Verify2FACodeForm.tsx
new file mode 100644
index 0000000000..bc3d8a2a71
--- /dev/null
+++ b/web/packages/accounts/components/Verify2FACodeForm.tsx
@@ -0,0 +1,166 @@
+import { LoadingButton } from "@/base/components/mui/LoadingButton";
+import {
+    CenteredFlex,
+    VerticallyCentered,
+} from "@ente/shared/components/Container";
+import { Box, styled, Typography } from "@mui/material";
+import { Formik, type FormikHelpers } from "formik";
+import { t } from "i18next";
+import React, { useState } from "react";
+import OtpInput from "react-otp-input";
+
+interface FormValues {
+    otp: string;
+}
+
+interface Verify2FACodeFormProps {
+    /**
+     * Called when the user submits the OTP.
+     *
+     * The submission can happen in two ways:
+     * 1. The fill-in all the required 6 digits, or
+     * 2. They press the "Enable" button.
+     *
+     * The form will stay in a waiting state until this callback returns.
+     *
+     * @param otp The OTP that the user entered.
+     */
+    onSubmit: (otp: string) => Promise<void>;
+    /**
+     * Called when the process was completed successfully.
+     *
+     * This will be called immediately after onSubmit fulfills, but having two
+     * separate callbacks allows the form to indicate the success state in the
+     * interim.
+     */
+    onSuccess: () => void;
+    /**
+     * The label for the submit button.
+     */
+    submitButtonText: string;
+}
+
+/**
+ * A form that can be used to ask the user to fill in a 6 digit OTP that their
+ * authenticator app is providing them with.
+ */
+export const Verify2FACodeForm: React.FC<Verify2FACodeFormProps> = ({
+    onSubmit,
+    onSuccess,
+    submitButtonText,
+}) => {
+    const [waiting, setWaiting] = useState(false);
+    const [shouldAutoFocus, setShouldAutoFocus] = useState(true);
+
+    const submitForm = async (
+        { otp }: FormValues,
+        { setFieldError, resetForm }: FormikHelpers<FormValues>,
+    ) => {
+        try {
+            setWaiting(true);
+            await onSubmit(otp);
+            setWaiting(false);
+            onSuccess();
+        } catch (e) {
+            resetForm();
+            const message = e instanceof Error ? e.message : "";
+            setFieldError("otp", `${t("generic_error_retry")} (${message})`);
+            // Workaround (toggling shouldAutoFocus) to reset the focus back to
+            // the first input field in case of errors.
+            // https://github.com/devfolioco/react-otp-input/issues/420
+            setShouldAutoFocus(false);
+            setTimeout(() => setShouldAutoFocus(true), 100);
+        }
+        setWaiting(false);
+    };
+
+    const onChange =
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
+        (callback: Function, triggerSubmit: Function) => (otp: string) => {
+            callback(otp);
+            if (otp.length === 6) {
+                triggerSubmit(otp);
+            }
+        };
+    return (
+        <Formik<FormValues>
+            initialValues={{ otp: "" }}
+            validateOnChange={false}
+            validateOnBlur={false}
+            onSubmit={submitForm}
+        >
+            {({ values, errors, handleChange, handleSubmit, submitForm }) => (
+                <VerticallyCentered>
+                    <form noValidate onSubmit={handleSubmit}>
+                        <Typography
+                            variant="small"
+                            sx={{ mb: 2, color: "text.muted" }}
+                        >
+                            {t("enter_two_factor_otp")}
+                        </Typography>
+                        <Box sx={{ my: 2 }}>
+                            <OtpInput
+                                containerStyle={{ justifyContent: "center" }}
+                                shouldAutoFocus={shouldAutoFocus}
+                                value={values.otp}
+                                onChange={onChange(
+                                    handleChange("otp"),
+                                    submitForm,
+                                )}
+                                numInputs={6}
+                                renderSeparator={<span>-</span>}
+                                renderInput={(props) => (
+                                    <IndividualInput {...props} />
+                                )}
+                            />
+                            {errors.otp && (
+                                <CenteredFlex sx={{ mt: 1 }}>
+                                    <InvalidInputMessage>
+                                        {t("incorrect_code")}
+                                    </InvalidInputMessage>
+                                </CenteredFlex>
+                            )}
+                        </Box>
+                        <LoadingButton
+                            type="submit"
+                            color="accent"
+                            fullWidth
+                            sx={{ my: 4 }}
+                            loading={waiting}
+                            disabled={values.otp.length < 6}
+                        >
+                            {submitButtonText}
+                        </LoadingButton>
+                    </form>
+                </VerticallyCentered>
+            )}
+        </Formik>
+    );
+};
+
+const IndividualInput = styled("input")(
+    ({ theme }) => `
+    font-size: 1.5rem;
+    padding: 4px;
+    width: 40px !important;
+    aspect-ratio: 1;
+    margin-inline: 6px;
+    border: 1px solid ${theme.vars.palette.accent.main};
+    border-radius: 1px;
+    outline-color: ${theme.vars.palette.accent.light};
+    transition: 0.5s;
+    ${theme.breakpoints.down("sm")} {
+        font-size: 1rem;
+        padding: 4px;
+        width: 32px !important;
+    }
+`,
+);
+
+const InvalidInputMessage: React.FC<React.PropsWithChildren> = ({
+    children,
+}) => (
+    <Typography variant="mini" sx={{ color: "critical.main" }}>
+        {children}
+    </Typography>
+);
diff --git a/web/packages/accounts/pages/two-factor/setup.tsx b/web/packages/accounts/pages/two-factor/setup.tsx
index 718a6c561f..168b75826f 100644
--- a/web/packages/accounts/pages/two-factor/setup.tsx
+++ b/web/packages/accounts/pages/two-factor/setup.tsx
@@ -1,22 +1,16 @@
+import { TwoFactorSetup } from "@/accounts/components/two-factor/TwoFactorSetup";
+import { Verify2FACodeForm } from "@/accounts/components/Verify2FACodeForm";
 import { appHomeRoute } from "@/accounts/services/redirect";
 import type { TwoFactorSecret } from "@/accounts/services/user";
 import { enableTwoFactor, setupTwoFactor } from "@/accounts/services/user";
 import { CenteredFill } from "@/base/components/containers";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
-import { LoadingButton } from "@/base/components/mui/LoadingButton";
-import {
-    CenteredFlex,
-    VerticallyCentered,
-} from "@ente/shared/components/Container";
 import { encryptWithRecoveryKey } from "@ente/shared/crypto/helpers";
 import { getData, LS_KEYS, setLSUser } from "@ente/shared/storage/localStorage";
-import { Box, Paper, Stack, styled, Typography } from "@mui/material";
-import { Formik, type FormikHelpers } from "formik";
+import { Paper, Stack, styled, Typography } from "@mui/material";
 import { t } from "i18next";
 import { useRouter } from "next/router";
-import React, { useEffect, useState } from "react";
-import OtpInput from "react-otp-input";
-import { TwoFactorSetup } from "../../components/two-factor/TwoFactorSetup";
+import React, { useCallback, useEffect, useState } from "react";
 
 export type SetupMode = "qrCode" | "manualCode";
 
@@ -32,21 +26,20 @@ const Page: React.FC = () => {
         void setupTwoFactor().then(setTwoFactorSecret);
     }, []);
 
-    const onSubmit: VerifyTwoFactorCallback = async (
-        otp: string,
-        markSuccessful,
-    ) => {
+    const handleSubmit = useCallback(async (otp: string) => {
         const recoveryEncryptedTwoFactorSecret = await encryptWithRecoveryKey(
             twoFactorSecret!.secretCode,
         );
         await enableTwoFactor(otp, recoveryEncryptedTwoFactorSecret);
-        markSuccessful();
         await setLSUser({
             ...getData(LS_KEYS.USER),
             isTwoFactorEnabled: true,
         });
+    }, []);
+
+    const handleSuccess = useCallback(() => {
         void router.push(appHomeRoute);
-    };
+    }, [router]);
 
     return (
         <Stack sx={{ minHeight: "100svh" }}>
@@ -57,9 +50,10 @@ const Page: React.FC = () => {
                     </Typography>
                     <Stack>
                         <TwoFactorSetup twoFactorSecret={twoFactorSecret} />
-                        <VerifyTwoFactor
-                            onSubmit={onSubmit}
-                            buttonText={t("enable")}
+                        <Verify2FACodeForm
+                            onSubmit={handleSubmit}
+                            onSuccess={handleSuccess}
+                            submitButtonText={t("enable")}
                         />
                         <Stack sx={{ alignItems: "center" }}>
                             <FocusVisibleButton
@@ -87,133 +81,3 @@ const ContentsPaper = styled(Paper)(({ theme }) => ({
     flexDirection: "column",
     gap: theme.spacing(4),
 }));
-
-interface formValues {
-    otp: string;
-}
-interface VerifyTwoFactorProps {
-    onSubmit: VerifyTwoFactorCallback;
-    buttonText: string;
-}
-
-export type VerifyTwoFactorCallback = (
-    otp: string,
-    markSuccessful: () => void,
-) => Promise<void>;
-
-const VerifyTwoFactor: React.FC<VerifyTwoFactorProps> = (props) => {
-    const [waiting, setWaiting] = useState(false);
-    const [shouldAutoFocus, setShouldAutoFocus] = useState(true);
-
-    const markSuccessful = () => setWaiting(false);
-
-    const submitForm = async (
-        { otp }: formValues,
-        { setFieldError, resetForm }: FormikHelpers<formValues>,
-    ) => {
-        try {
-            setWaiting(true);
-            await props.onSubmit(otp, markSuccessful);
-        } catch (e) {
-            resetForm();
-            const message = e instanceof Error ? e.message : "";
-            setFieldError("otp", `${t("generic_error_retry")} (${message})`);
-            // Workaround (toggling shouldAutoFocus) to reset the focus back to
-            // the first input field in case of errors.
-            // https://github.com/devfolioco/react-otp-input/issues/420
-            setShouldAutoFocus(false);
-            setTimeout(() => setShouldAutoFocus(true), 100);
-        }
-        setWaiting(false);
-    };
-
-    const onChange =
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
-        (callback: Function, triggerSubmit: Function) => (otp: string) => {
-            callback(otp);
-            if (otp.length === 6) {
-                triggerSubmit(otp);
-            }
-        };
-    return (
-        <Formik<formValues>
-            initialValues={{ otp: "" }}
-            validateOnChange={false}
-            validateOnBlur={false}
-            onSubmit={submitForm}
-        >
-            {({ values, errors, handleChange, handleSubmit, submitForm }) => (
-                <VerticallyCentered>
-                    <form noValidate onSubmit={handleSubmit}>
-                        <Typography
-                            variant="small"
-                            sx={{ mb: 2, color: "text.muted" }}
-                        >
-                            {t("enter_two_factor_otp")}
-                        </Typography>
-                        <Box sx={{ my: 2 }}>
-                            <OtpInput
-                                containerStyle={{ justifyContent: "center" }}
-                                shouldAutoFocus={shouldAutoFocus}
-                                value={values.otp}
-                                onChange={onChange(
-                                    handleChange("otp"),
-                                    submitForm,
-                                )}
-                                numInputs={6}
-                                renderSeparator={<span>-</span>}
-                                renderInput={(props) => (
-                                    <IndividualInput {...props} />
-                                )}
-                            />
-                            {errors.otp && (
-                                <CenteredFlex sx={{ mt: 1 }}>
-                                    <InvalidInputMessage>
-                                        {t("incorrect_code")}
-                                    </InvalidInputMessage>
-                                </CenteredFlex>
-                            )}
-                        </Box>
-                        <LoadingButton
-                            type="submit"
-                            color="accent"
-                            fullWidth
-                            sx={{ my: 4 }}
-                            loading={waiting}
-                            disabled={values.otp.length < 6}
-                        >
-                            {props.buttonText}
-                        </LoadingButton>
-                    </form>
-                </VerticallyCentered>
-            )}
-        </Formik>
-    );
-};
-
-const IndividualInput = styled("input")(
-    ({ theme }) => `
-    font-size: 1.5rem;
-    padding: 4px;
-    width: 40px !important;
-    aspect-ratio: 1;
-    margin-inline: 6px;
-    border: 1px solid ${theme.vars.palette.accent.main};
-    border-radius: 1px;
-    outline-color: ${theme.vars.palette.accent.light};
-    transition: 0.5s;
-    ${theme.breakpoints.down("sm")} {
-        font-size: 1rem;
-        padding: 4px;
-        width: 32px !important;
-    }
-`,
-);
-
-const InvalidInputMessage: React.FC<React.PropsWithChildren> = ({
-    children,
-}) => (
-    <Typography variant="mini" sx={{ color: "critical.main" }}>
-        {children}
-    </Typography>
-);
diff --git a/web/packages/accounts/pages/two-factor/verify.tsx b/web/packages/accounts/pages/two-factor/verify.tsx
index 3ea0ad6a6b..e9174d7cd6 100644
--- a/web/packages/accounts/pages/two-factor/verify.tsx
+++ b/web/packages/accounts/pages/two-factor/verify.tsx
@@ -1,3 +1,4 @@
+import { Verify2FACodeForm } from "@/accounts/components/Verify2FACodeForm";
 import { PAGES } from "@/accounts/constants/pages";
 import { verifyTwoFactor } from "@/accounts/services/user";
 import { LinkButton } from "@/base/components/LinkButton";
@@ -13,16 +14,12 @@ import type { User } from "@ente/shared/user/types";
 import { HttpStatusCode } from "axios";
 import { t } from "i18next";
 import { useRouter } from "next/router";
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import {
     AccountsPageContents,
     AccountsPageFooter,
     AccountsPageTitle,
 } from "../../components/layouts/centered-paper";
-import {
-    VerifyTwoFactor,
-    type VerifyTwoFactorCallback,
-} from "../../components/two-factor/VerifyTwoFactor";
 import { unstashRedirect } from "../../services/redirect";
 
 const Page: React.FC = () => {
@@ -46,35 +43,45 @@ const Page: React.FC = () => {
         }
     }, []);
 
-    const onSubmit: VerifyTwoFactorCallback = async (otp) => {
-        try {
-            const resp = await verifyTwoFactor(otp, sessionID);
-            const { keyAttributes, encryptedToken, token, id } = resp;
-            await setLSUser({
-                ...getData(LS_KEYS.USER),
-                token,
-                encryptedToken,
-                id,
-            });
-            setData(LS_KEYS.KEY_ATTRIBUTES, keyAttributes!);
-            void router.push(unstashRedirect() ?? PAGES.CREDENTIALS);
-        } catch (e) {
-            if (
-                e instanceof ApiError &&
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
-                e.httpStatusCode === HttpStatusCode.NotFound
-            ) {
-                logout();
-            } else {
-                throw e;
+    const handleSubmit = useCallback(
+        async (otp: string) => {
+            try {
+                const resp = await verifyTwoFactor(otp, sessionID);
+                const { keyAttributes, encryptedToken, token, id } = resp;
+                await setLSUser({
+                    ...getData(LS_KEYS.USER),
+                    token,
+                    encryptedToken,
+                    id,
+                });
+                setData(LS_KEYS.KEY_ATTRIBUTES, keyAttributes!);
+            } catch (e) {
+                if (
+                    e instanceof ApiError &&
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
+                    e.httpStatusCode === HttpStatusCode.NotFound
+                ) {
+                    logout();
+                } else {
+                    throw e;
+                }
             }
-        }
-    };
+        },
+        [logout],
+    );
+
+    const handleSuccess = useCallback(() => {
+        void router.push(unstashRedirect() ?? PAGES.CREDENTIALS);
+    }, [router]);
 
     return (
         <AccountsPageContents>
             <AccountsPageTitle>{t("two_factor")}</AccountsPageTitle>
-            <VerifyTwoFactor onSubmit={onSubmit} buttonText={t("verify")} />
+            <Verify2FACodeForm
+                onSubmit={handleSubmit}
+                onSuccess={handleSuccess}
+                submitButtonText={t("verify")}
+            />
             <AccountsPageFooter>
                 <LinkButton
                     onClick={() => router.push(PAGES.TWO_FACTOR_RECOVER)}

From 4442b3af2889056b82017cb0bf5e3c9c3071baf4 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 19:11:52 +0530
Subject: [PATCH 479/796] Inline

---
 .../components/two-factor/TwoFactorSetup.tsx  | 105 ---------------
 .../accounts/pages/two-factor/setup.tsx       | 120 +++++++++++++++---
 2 files changed, 102 insertions(+), 123 deletions(-)
 delete mode 100644 web/packages/accounts/components/two-factor/TwoFactorSetup.tsx

diff --git a/web/packages/accounts/components/two-factor/TwoFactorSetup.tsx b/web/packages/accounts/components/two-factor/TwoFactorSetup.tsx
deleted file mode 100644
index 1732cf57d7..0000000000
--- a/web/packages/accounts/components/two-factor/TwoFactorSetup.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import { CodeBlock } from "@/accounts/components/CodeBlock";
-import { LinkButton } from "@/base/components/LinkButton";
-import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
-import { VerticallyCentered } from "@ente/shared/components/Container";
-import { Stack, styled, Typography } from "@mui/material";
-import { t } from "i18next";
-import { useState } from "react";
-import { type SetupMode } from "../../pages/two-factor/setup";
-import type { TwoFactorSecret } from "../../services/user";
-
-interface TwoFactorSetupProps {
-    twoFactorSecret?: TwoFactorSecret;
-}
-
-export function TwoFactorSetup({ twoFactorSecret }: TwoFactorSetupProps) {
-    const [setupMode, setSetupMode] = useState<SetupMode>("qrCode");
-
-    const changeToManualMode = () => setSetupMode("manualCode");
-
-    const changeToQRMode = () => setSetupMode("qrCode");
-
-    return (
-        <VerticallyCentered sx={{ mb: 3, gap: 1 }}>
-            {setupMode == "qrCode" ? (
-                <SetupQRMode
-                    twoFactorSecret={twoFactorSecret}
-                    changeToManualMode={changeToManualMode}
-                />
-            ) : (
-                <SetupManualMode
-                    twoFactorSecret={twoFactorSecret}
-                    changeToQRMode={changeToQRMode}
-                />
-            )}
-        </VerticallyCentered>
-    );
-}
-
-interface SetupManualModeProps {
-    twoFactorSecret?: TwoFactorSecret;
-    changeToQRMode: () => void;
-}
-function SetupManualMode({
-    twoFactorSecret,
-    changeToQRMode,
-}: SetupManualModeProps) {
-    return (
-        <Stack sx={{ gap: 3 }}>
-            <Typography sx={{ color: "text.muted" }}>
-                {t("two_factor_manual_entry_message")}
-            </Typography>
-            <CodeBlock code={twoFactorSecret?.secretCode} />
-            <LinkButton onClick={changeToQRMode}>
-                {t("scan_qr_title")}
-            </LinkButton>
-        </Stack>
-    );
-}
-
-interface SetupQRModeProps {
-    twoFactorSecret?: TwoFactorSecret;
-    changeToManualMode: () => void;
-}
-
-function SetupQRMode({
-    twoFactorSecret,
-    changeToManualMode,
-}: SetupQRModeProps) {
-    return (
-        <>
-            <Typography sx={{ color: "text.muted" }}>
-                {t("two_factor_qr_help")}
-            </Typography>
-            {!twoFactorSecret ? (
-                <LoadingQRCode>
-                    <ActivityIndicator />
-                </LoadingQRCode>
-            ) : (
-                <QRCode
-                    src={`data:image/png;base64,${twoFactorSecret?.qrCode}`}
-                />
-            )}
-            <LinkButton onClick={changeToManualMode}>
-                {t("two_factor_manual_entry_title")}
-            </LinkButton>
-        </>
-    );
-}
-
-const QRCode = styled("img")(
-    ({ theme }) => `
-    height: 200px;
-    width: 200px;
-    margin: ${theme.spacing(2)};
-`,
-);
-
-const LoadingQRCode = styled(VerticallyCentered)(
-    ({ theme }) => `
-    width: 200px;
-    aspect-ratio:1;
-    border: 1px solid ${theme.vars.palette.stroke.muted};
-    margin: ${theme.spacing(2)};
-    `,
-);
diff --git a/web/packages/accounts/pages/two-factor/setup.tsx b/web/packages/accounts/pages/two-factor/setup.tsx
index 168b75826f..448f4e74ff 100644
--- a/web/packages/accounts/pages/two-factor/setup.tsx
+++ b/web/packages/accounts/pages/two-factor/setup.tsx
@@ -1,10 +1,13 @@
-import { TwoFactorSetup } from "@/accounts/components/two-factor/TwoFactorSetup";
+import { CodeBlock } from "@/accounts/components/CodeBlock";
 import { Verify2FACodeForm } from "@/accounts/components/Verify2FACodeForm";
 import { appHomeRoute } from "@/accounts/services/redirect";
 import type { TwoFactorSecret } from "@/accounts/services/user";
 import { enableTwoFactor, setupTwoFactor } from "@/accounts/services/user";
 import { CenteredFill } from "@/base/components/containers";
+import { LinkButton } from "@/base/components/LinkButton";
+import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
+import { VerticallyCentered } from "@ente/shared/components/Container";
 import { encryptWithRecoveryKey } from "@ente/shared/crypto/helpers";
 import { getData, LS_KEYS, setLSUser } from "@ente/shared/storage/localStorage";
 import { Paper, Stack, styled, Typography } from "@mui/material";
@@ -12,8 +15,6 @@ import { t } from "i18next";
 import { useRouter } from "next/router";
 import React, { useCallback, useEffect, useState } from "react";
 
-export type SetupMode = "qrCode" | "manualCode";
-
 const Page: React.FC = () => {
     const [twoFactorSecret, setTwoFactorSecret] = useState<
         TwoFactorSecret | undefined
@@ -48,21 +49,19 @@ const Page: React.FC = () => {
                     <Typography variant="h5" sx={{ textAlign: "center" }}>
                         {t("two_factor")}
                     </Typography>
-                    <Stack>
-                        <TwoFactorSetup twoFactorSecret={twoFactorSecret} />
-                        <Verify2FACodeForm
-                            onSubmit={handleSubmit}
-                            onSuccess={handleSuccess}
-                            submitButtonText={t("enable")}
-                        />
-                        <Stack sx={{ alignItems: "center" }}>
-                            <FocusVisibleButton
-                                variant="text"
-                                onClick={router.back}
-                            >
-                                {t("go_back")}
-                            </FocusVisibleButton>
-                        </Stack>
+                    <Instructions twoFactorSecret={twoFactorSecret} />
+                    <Verify2FACodeForm
+                        onSubmit={handleSubmit}
+                        onSuccess={handleSuccess}
+                        submitButtonText={t("enable")}
+                    />
+                    <Stack sx={{ alignItems: "center" }}>
+                        <FocusVisibleButton
+                            variant="text"
+                            onClick={router.back}
+                        >
+                            {t("go_back")}
+                        </FocusVisibleButton>
                     </Stack>
                 </ContentsPaper>
             </CenteredFill>
@@ -81,3 +80,88 @@ const ContentsPaper = styled(Paper)(({ theme }) => ({
     flexDirection: "column",
     gap: theme.spacing(4),
 }));
+
+interface InstructionsProps {
+    twoFactorSecret: TwoFactorSecret | undefined;
+}
+
+const Instructions: React.FC<InstructionsProps> = ({ twoFactorSecret }) => {
+    const [setupMode, setSetupMode] = useState<"qr" | "manual">("qr");
+
+    return (
+        <VerticallyCentered sx={{ mb: 3, gap: 1 }}>
+            {setupMode == "qr" ? (
+                <SetupQRMode
+                    twoFactorSecret={twoFactorSecret}
+                    onChangeMode={() => setSetupMode("manual")}
+                />
+            ) : (
+                <SetupManualMode
+                    twoFactorSecret={twoFactorSecret}
+                    onChangeMode={() => setSetupMode("qr")}
+                />
+            )}
+        </VerticallyCentered>
+    );
+};
+
+interface SetupManualModeProps {
+    twoFactorSecret: TwoFactorSecret | undefined;
+    onChangeMode: () => void;
+}
+
+const SetupManualMode: React.FC<SetupManualModeProps> = ({
+    twoFactorSecret,
+    onChangeMode,
+}) => (
+    <Stack sx={{ gap: 3 }}>
+        <Typography sx={{ color: "text.muted" }}>
+            {t("two_factor_manual_entry_message")}
+        </Typography>
+        <CodeBlock code={twoFactorSecret?.secretCode} />
+        <LinkButton onClick={onChangeMode}>{t("scan_qr_title")}</LinkButton>
+    </Stack>
+);
+
+interface SetupQRModeProps {
+    twoFactorSecret?: TwoFactorSecret;
+    onChangeMode: () => void;
+}
+
+const SetupQRMode: React.FC<SetupQRModeProps> = ({
+    twoFactorSecret,
+    onChangeMode,
+}) => (
+    <>
+        <Typography sx={{ color: "text.muted" }}>
+            {t("two_factor_qr_help")}
+        </Typography>
+        {!twoFactorSecret ? (
+            <LoadingQRCode>
+                <ActivityIndicator />
+            </LoadingQRCode>
+        ) : (
+            <QRCode src={`data:image/png;base64,${twoFactorSecret?.qrCode}`} />
+        )}
+        <LinkButton onClick={onChangeMode}>
+            {t("two_factor_manual_entry_title")}
+        </LinkButton>
+    </>
+);
+
+const QRCode = styled("img")(
+    ({ theme }) => `
+    height: 200px;
+    width: 200px;
+    margin: ${theme.spacing(2)};
+`,
+);
+
+const LoadingQRCode = styled(VerticallyCentered)(
+    ({ theme }) => `
+    width: 200px;
+    aspect-ratio:1;
+    border: 1px solid ${theme.vars.palette.stroke.muted};
+    margin: ${theme.spacing(2)};
+    `,
+);

From 16246d8d583f27427b4398910062df44aeb3e937 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 19:24:37 +0530
Subject: [PATCH 480/796] Conv

---
 .../accounts/pages/two-factor/setup.tsx       |  8 ++++-
 web/packages/accounts/services/user.ts        | 36 +++++++++----------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/web/packages/accounts/pages/two-factor/setup.tsx b/web/packages/accounts/pages/two-factor/setup.tsx
index 448f4e74ff..36d7d27d8a 100644
--- a/web/packages/accounts/pages/two-factor/setup.tsx
+++ b/web/packages/accounts/pages/two-factor/setup.tsx
@@ -31,7 +31,13 @@ const Page: React.FC = () => {
         const recoveryEncryptedTwoFactorSecret = await encryptWithRecoveryKey(
             twoFactorSecret!.secretCode,
         );
-        await enableTwoFactor(otp, recoveryEncryptedTwoFactorSecret);
+        await enableTwoFactor({
+            code: otp,
+            encryptedTwoFactorSecret:
+                recoveryEncryptedTwoFactorSecret.encryptedData,
+            twoFactorSecretDecryptionNonce:
+                recoveryEncryptedTwoFactorSecret.nonce,
+        });
         await setLSUser({
             ...getData(LS_KEYS.USER),
             isTwoFactorEnabled: true,
diff --git a/web/packages/accounts/services/user.ts b/web/packages/accounts/services/user.ts
index 0138ca359c..b1992c890a 100644
--- a/web/packages/accounts/services/user.ts
+++ b/web/packages/accounts/services/user.ts
@@ -1,4 +1,3 @@
-import type { B64EncryptionResult } from "@/base/crypto/libsodium";
 import {
     authenticatedRequestHeaders,
     ensureOk,
@@ -307,25 +306,24 @@ export const setupTwoFactor = async () => {
     return TwoFactorSecret.parse(await res.json());
 };
 
-export const enableTwoFactor = async (
-    code: string,
-    recoveryEncryptedTwoFactorSecret: B64EncryptionResult,
-) => {
-    await HTTPService.post(
-        await apiURL("/users/two-factor/enable"),
-        {
-            code,
-            encryptedTwoFactorSecret:
-                recoveryEncryptedTwoFactorSecret.encryptedData,
-            twoFactorSecretDecryptionNonce:
-                recoveryEncryptedTwoFactorSecret.nonce,
-        },
-        undefined,
-        {
-            "X-Auth-Token": getToken(),
-        },
+interface EnableTwoFactorRequest {
+    code: string;
+    encryptedTwoFactorSecret: string;
+    twoFactorSecretDecryptionNonce: string;
+}
+
+/**
+ * Enable two factor for the user by providing the 2FA code and the encrypted
+ * secret from a previous call to {@link setupTwoFactor}.
+ */
+export const enableTwoFactor = async (req: EnableTwoFactorRequest) =>
+    ensureOk(
+        await fetch(await apiURL("/users/two-factor/enable"), {
+            method: "POST",
+            headers: await authenticatedRequestHeaders(),
+            body: JSON.stringify(req),
+        }),
     );
-};
 
 export const setRecoveryKey = async (token: string, recoveryKey: RecoveryKey) =>
     HTTPService.put(

From 7d5205d57df131cb838cfd6c78d939e9b7223528 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 19:27:21 +0530
Subject: [PATCH 481/796] Conv

---
 web/packages/shared/crypto/helpers.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/packages/shared/crypto/helpers.ts b/web/packages/shared/crypto/helpers.ts
index b83f2d18fe..bde7224c9e 100644
--- a/web/packages/shared/crypto/helpers.ts
+++ b/web/packages/shared/crypto/helpers.ts
@@ -112,13 +112,12 @@ export const saveKeyInSessionStore = async (
     }
 };
 
-export async function encryptWithRecoveryKey(key: string) {
+export const encryptWithRecoveryKey = async (data: string) => {
     const cryptoWorker = await sharedCryptoWorker();
     const hexRecoveryKey = await getRecoveryKey();
     const recoveryKey = await cryptoWorker.fromHex(hexRecoveryKey);
-    const encryptedKey = await cryptoWorker.encryptToB64(key, recoveryKey);
-    return encryptedKey;
-}
+    return cryptoWorker.encryptToB64(data, recoveryKey);
+};
 
 export const getRecoveryKey = async () => {
     try {

From 37775b9ee5a6344574b49fccd0dce617f84479ff Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 19:29:14 +0530
Subject: [PATCH 482/796] Conv

---
 web/packages/accounts/pages/two-factor/setup.tsx | 13 ++++++-------
 web/packages/shared/crypto/helpers.ts            |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/web/packages/accounts/pages/two-factor/setup.tsx b/web/packages/accounts/pages/two-factor/setup.tsx
index 36d7d27d8a..9f503f75fe 100644
--- a/web/packages/accounts/pages/two-factor/setup.tsx
+++ b/web/packages/accounts/pages/two-factor/setup.tsx
@@ -28,15 +28,14 @@ const Page: React.FC = () => {
     }, []);
 
     const handleSubmit = useCallback(async (otp: string) => {
-        const recoveryEncryptedTwoFactorSecret = await encryptWithRecoveryKey(
-            twoFactorSecret!.secretCode,
-        );
+        const {
+            encryptedData: encryptedTwoFactorSecret,
+            nonce: twoFactorSecretDecryptionNonce,
+        } = await encryptWithRecoveryKey(twoFactorSecret!.secretCode);
         await enableTwoFactor({
             code: otp,
-            encryptedTwoFactorSecret:
-                recoveryEncryptedTwoFactorSecret.encryptedData,
-            twoFactorSecretDecryptionNonce:
-                recoveryEncryptedTwoFactorSecret.nonce,
+            encryptedTwoFactorSecret,
+            twoFactorSecretDecryptionNonce,
         });
         await setLSUser({
             ...getData(LS_KEYS.USER),
diff --git a/web/packages/shared/crypto/helpers.ts b/web/packages/shared/crypto/helpers.ts
index bde7224c9e..15abcad3e1 100644
--- a/web/packages/shared/crypto/helpers.ts
+++ b/web/packages/shared/crypto/helpers.ts
@@ -116,7 +116,7 @@ export const encryptWithRecoveryKey = async (data: string) => {
     const cryptoWorker = await sharedCryptoWorker();
     const hexRecoveryKey = await getRecoveryKey();
     const recoveryKey = await cryptoWorker.fromHex(hexRecoveryKey);
-    return cryptoWorker.encryptToB64(data, recoveryKey);
+    return cryptoWorker.encryptBoxB64(data, recoveryKey);
 };
 
 export const getRecoveryKey = async () => {

From 7420eb5a66c72da17abd33003f8528bbf8a21162 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 19:35:36 +0530
Subject: [PATCH 483/796] Vis

---
 .../accounts/pages/two-factor/setup.tsx       | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/web/packages/accounts/pages/two-factor/setup.tsx b/web/packages/accounts/pages/two-factor/setup.tsx
index 9f503f75fe..6a2260f0fa 100644
--- a/web/packages/accounts/pages/two-factor/setup.tsx
+++ b/web/packages/accounts/pages/two-factor/setup.tsx
@@ -94,7 +94,7 @@ const Instructions: React.FC<InstructionsProps> = ({ twoFactorSecret }) => {
     const [setupMode, setSetupMode] = useState<"qr" | "manual">("qr");
 
     return (
-        <VerticallyCentered sx={{ mb: 3, gap: 1 }}>
+        <Stack sx={{ gap: 3, alignItems: "center" }}>
             {setupMode == "qr" ? (
                 <SetupQRMode
                     twoFactorSecret={twoFactorSecret}
@@ -106,7 +106,7 @@ const Instructions: React.FC<InstructionsProps> = ({ twoFactorSecret }) => {
                     onChangeMode={() => setSetupMode("qr")}
                 />
             )}
-        </VerticallyCentered>
+        </Stack>
     );
 };
 
@@ -119,13 +119,13 @@ const SetupManualMode: React.FC<SetupManualModeProps> = ({
     twoFactorSecret,
     onChangeMode,
 }) => (
-    <Stack sx={{ gap: 3 }}>
-        <Typography sx={{ color: "text.muted" }}>
+    <>
+        <Typography sx={{ color: "text.muted", textAlign: "center", px: 2 }}>
             {t("two_factor_manual_entry_message")}
         </Typography>
         <CodeBlock code={twoFactorSecret?.secretCode} />
         <LinkButton onClick={onChangeMode}>{t("scan_qr_title")}</LinkButton>
-    </Stack>
+    </>
 );
 
 interface SetupQRModeProps {
@@ -138,7 +138,7 @@ const SetupQRMode: React.FC<SetupQRModeProps> = ({
     onChangeMode,
 }) => (
     <>
-        <Typography sx={{ color: "text.muted" }}>
+        <Typography sx={{ color: "text.muted", textAlign: "center" }}>
             {t("two_factor_qr_help")}
         </Typography>
         {!twoFactorSecret ? (
@@ -154,19 +154,15 @@ const SetupQRMode: React.FC<SetupQRModeProps> = ({
     </>
 );
 
-const QRCode = styled("img")(
-    ({ theme }) => `
+const QRCode = styled("img")(`
     height: 200px;
     width: 200px;
-    margin: ${theme.spacing(2)};
-`,
-);
+`);
 
 const LoadingQRCode = styled(VerticallyCentered)(
     ({ theme }) => `
     width: 200px;
     aspect-ratio:1;
     border: 1px solid ${theme.vars.palette.stroke.muted};
-    margin: ${theme.spacing(2)};
     `,
 );

From 9ab110c4c389b061f343023dfd718a966607c22a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 19:39:29 +0530
Subject: [PATCH 484/796] Vis

---
 web/packages/accounts/pages/two-factor/setup.tsx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/web/packages/accounts/pages/two-factor/setup.tsx b/web/packages/accounts/pages/two-factor/setup.tsx
index 6a2260f0fa..20435c6f91 100644
--- a/web/packages/accounts/pages/two-factor/setup.tsx
+++ b/web/packages/accounts/pages/two-factor/setup.tsx
@@ -7,7 +7,6 @@ import { CenteredFill } from "@/base/components/containers";
 import { LinkButton } from "@/base/components/LinkButton";
 import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
-import { VerticallyCentered } from "@ente/shared/components/Container";
 import { encryptWithRecoveryKey } from "@ente/shared/crypto/helpers";
 import { getData, LS_KEYS, setLSUser } from "@ente/shared/storage/localStorage";
 import { Paper, Stack, styled, Typography } from "@mui/material";
@@ -155,14 +154,16 @@ const SetupQRMode: React.FC<SetupQRModeProps> = ({
 );
 
 const QRCode = styled("img")(`
-    height: 200px;
     width: 200px;
+    height: 200px;
 `);
 
-const LoadingQRCode = styled(VerticallyCentered)(
+const LoadingQRCode = styled(Stack)(
     ({ theme }) => `
     width: 200px;
-    aspect-ratio:1;
+    height: 200px;
     border: 1px solid ${theme.vars.palette.stroke.muted};
-    `,
+    align-items: center;
+    justify-content: center;
+   `,
 );

From 277c7e452aece5cb9e0fdfa7cdb0c9902a546ad6 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 19:49:37 +0530
Subject: [PATCH 485/796] Cleanup

---
 .../accounts/components/Verify2FACodeForm.tsx      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/web/packages/accounts/components/Verify2FACodeForm.tsx b/web/packages/accounts/components/Verify2FACodeForm.tsx
index bc3d8a2a71..f98321d804 100644
--- a/web/packages/accounts/components/Verify2FACodeForm.tsx
+++ b/web/packages/accounts/components/Verify2FACodeForm.tsx
@@ -1,4 +1,5 @@
 import { LoadingButton } from "@/base/components/mui/LoadingButton";
+import log from "@/base/log";
 import {
     CenteredFlex,
     VerticallyCentered,
@@ -9,10 +10,6 @@ import { t } from "i18next";
 import React, { useState } from "react";
 import OtpInput from "react-otp-input";
 
-interface FormValues {
-    otp: string;
-}
-
 interface Verify2FACodeFormProps {
     /**
      * Called when the user submits the OTP.
@@ -40,6 +37,10 @@ interface Verify2FACodeFormProps {
     submitButtonText: string;
 }
 
+interface FormValues {
+    otp: string;
+}
+
 /**
  * A form that can be used to ask the user to fill in a 6 digit OTP that their
  * authenticator app is providing them with.
@@ -62,9 +63,9 @@ export const Verify2FACodeForm: React.FC<Verify2FACodeFormProps> = ({
             setWaiting(false);
             onSuccess();
         } catch (e) {
+            log.error("Failed to submit 2FA code", e);
             resetForm();
-            const message = e instanceof Error ? e.message : "";
-            setFieldError("otp", `${t("generic_error_retry")} (${message})`);
+            setFieldError("otp", t("generic_error"));
             // Workaround (toggling shouldAutoFocus) to reset the focus back to
             // the first input field in case of errors.
             // https://github.com/devfolioco/react-otp-input/issues/420
@@ -82,6 +83,7 @@ export const Verify2FACodeForm: React.FC<Verify2FACodeFormProps> = ({
                 triggerSubmit(otp);
             }
         };
+
     return (
         <Formik<FormValues>
             initialValues={{ otp: "" }}

From 1c8a796bec9f056c7b0e6856ef33aaff4b048674 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 20:01:28 +0530
Subject: [PATCH 486/796] Reduce indent

---
 .../accounts/components/Verify2FACodeForm.tsx | 137 ++++++++----------
 1 file changed, 60 insertions(+), 77 deletions(-)

diff --git a/web/packages/accounts/components/Verify2FACodeForm.tsx b/web/packages/accounts/components/Verify2FACodeForm.tsx
index f98321d804..dd16a4c86e 100644
--- a/web/packages/accounts/components/Verify2FACodeForm.tsx
+++ b/web/packages/accounts/components/Verify2FACodeForm.tsx
@@ -5,7 +5,7 @@ import {
     VerticallyCentered,
 } from "@ente/shared/components/Container";
 import { Box, styled, Typography } from "@mui/material";
-import { Formik, type FormikHelpers } from "formik";
+import { useFormik } from "formik";
 import { t } from "i18next";
 import React, { useState } from "react";
 import OtpInput from "react-otp-input";
@@ -37,10 +37,6 @@ interface Verify2FACodeFormProps {
     submitButtonText: string;
 }
 
-interface FormValues {
-    otp: string;
-}
-
 /**
  * A form that can be used to ask the user to fill in a 6 digit OTP that their
  * authenticator app is providing them with.
@@ -53,27 +49,31 @@ export const Verify2FACodeForm: React.FC<Verify2FACodeFormProps> = ({
     const [waiting, setWaiting] = useState(false);
     const [shouldAutoFocus, setShouldAutoFocus] = useState(true);
 
-    const submitForm = async (
-        { otp }: FormValues,
-        { setFieldError, resetForm }: FormikHelpers<FormValues>,
-    ) => {
-        try {
-            setWaiting(true);
-            await onSubmit(otp);
+    const formik = useFormik<{ otp: string }>({
+        initialValues: { otp: "" },
+        validateOnBlur: false,
+        validateOnChange: false,
+        onSubmit: async ({ otp }, { setFieldError, resetForm }) => {
+            try {
+                setWaiting(true);
+                await onSubmit(otp);
+                setWaiting(false);
+                onSuccess();
+            } catch (e) {
+                log.error("Failed to submit 2FA code", e);
+                resetForm();
+                setFieldError("otp", t("generic_error"));
+                // Workaround (toggling shouldAutoFocus) to reset the focus back to
+                // the first input field in case of errors.
+                // https://github.com/devfolioco/react-otp-input/issues/420
+                setShouldAutoFocus(false);
+                setTimeout(() => setShouldAutoFocus(true), 100);
+            }
             setWaiting(false);
-            onSuccess();
-        } catch (e) {
-            log.error("Failed to submit 2FA code", e);
-            resetForm();
-            setFieldError("otp", t("generic_error"));
-            // Workaround (toggling shouldAutoFocus) to reset the focus back to
-            // the first input field in case of errors.
-            // https://github.com/devfolioco/react-otp-input/issues/420
-            setShouldAutoFocus(false);
-            setTimeout(() => setShouldAutoFocus(true), 100);
-        }
-        setWaiting(false);
-    };
+        },
+    });
+
+    const { values, errors, handleChange, handleSubmit, submitForm } = formik;
 
     const onChange =
         // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
@@ -85,58 +85,41 @@ export const Verify2FACodeForm: React.FC<Verify2FACodeFormProps> = ({
         };
 
     return (
-        <Formik<FormValues>
-            initialValues={{ otp: "" }}
-            validateOnChange={false}
-            validateOnBlur={false}
-            onSubmit={submitForm}
-        >
-            {({ values, errors, handleChange, handleSubmit, submitForm }) => (
-                <VerticallyCentered>
-                    <form noValidate onSubmit={handleSubmit}>
-                        <Typography
-                            variant="small"
-                            sx={{ mb: 2, color: "text.muted" }}
-                        >
-                            {t("enter_two_factor_otp")}
-                        </Typography>
-                        <Box sx={{ my: 2 }}>
-                            <OtpInput
-                                containerStyle={{ justifyContent: "center" }}
-                                shouldAutoFocus={shouldAutoFocus}
-                                value={values.otp}
-                                onChange={onChange(
-                                    handleChange("otp"),
-                                    submitForm,
-                                )}
-                                numInputs={6}
-                                renderSeparator={<span>-</span>}
-                                renderInput={(props) => (
-                                    <IndividualInput {...props} />
-                                )}
-                            />
-                            {errors.otp && (
-                                <CenteredFlex sx={{ mt: 1 }}>
-                                    <InvalidInputMessage>
-                                        {t("incorrect_code")}
-                                    </InvalidInputMessage>
-                                </CenteredFlex>
-                            )}
-                        </Box>
-                        <LoadingButton
-                            type="submit"
-                            color="accent"
-                            fullWidth
-                            sx={{ my: 4 }}
-                            loading={waiting}
-                            disabled={values.otp.length < 6}
-                        >
-                            {submitButtonText}
-                        </LoadingButton>
-                    </form>
-                </VerticallyCentered>
-            )}
-        </Formik>
+        <VerticallyCentered>
+            <form onSubmit={handleSubmit}>
+                <Typography variant="small" sx={{ mb: 2, color: "text.muted" }}>
+                    {t("enter_two_factor_otp")}
+                </Typography>
+                <Box sx={{ my: 2 }}>
+                    <OtpInput
+                        containerStyle={{ justifyContent: "center" }}
+                        shouldAutoFocus={shouldAutoFocus}
+                        value={values.otp}
+                        onChange={onChange(handleChange("otp"), submitForm)}
+                        numInputs={6}
+                        renderSeparator={<span>-</span>}
+                        renderInput={(props) => <IndividualInput {...props} />}
+                    />
+                    {errors.otp && (
+                        <CenteredFlex sx={{ mt: 1 }}>
+                            <InvalidInputMessage>
+                                {t("incorrect_code")}
+                            </InvalidInputMessage>
+                        </CenteredFlex>
+                    )}
+                </Box>
+                <LoadingButton
+                    type="submit"
+                    color="accent"
+                    fullWidth
+                    sx={{ my: 4 }}
+                    loading={waiting}
+                    disabled={values.otp.length < 6}
+                >
+                    {submitButtonText}
+                </LoadingButton>
+            </form>
+        </VerticallyCentered>
     );
 };
 

From 25ba019a57dcbfea26e987604d003a43a0d22b7f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 20:07:55 +0530
Subject: [PATCH 487/796] Vis

---
 .../accounts/components/Verify2FACodeForm.tsx | 57 +++++++------------
 1 file changed, 20 insertions(+), 37 deletions(-)

diff --git a/web/packages/accounts/components/Verify2FACodeForm.tsx b/web/packages/accounts/components/Verify2FACodeForm.tsx
index dd16a4c86e..75afbc8bd2 100644
--- a/web/packages/accounts/components/Verify2FACodeForm.tsx
+++ b/web/packages/accounts/components/Verify2FACodeForm.tsx
@@ -1,10 +1,6 @@
 import { LoadingButton } from "@/base/components/mui/LoadingButton";
 import log from "@/base/log";
-import {
-    CenteredFlex,
-    VerticallyCentered,
-} from "@ente/shared/components/Container";
-import { Box, styled, Typography } from "@mui/material";
+import { Stack, styled, Typography } from "@mui/material";
 import { useFormik } from "formik";
 import { t } from "i18next";
 import React, { useState } from "react";
@@ -85,41 +81,36 @@ export const Verify2FACodeForm: React.FC<Verify2FACodeFormProps> = ({
         };
 
     return (
-        <VerticallyCentered>
-            <form onSubmit={handleSubmit}>
-                <Typography variant="small" sx={{ mb: 2, color: "text.muted" }}>
+        <form onSubmit={handleSubmit}>
+            <Stack sx={{ gap: 3, textAlign: "center" }}>
+                <Typography variant="small" sx={{ color: "text.muted" }}>
                     {t("enter_two_factor_otp")}
                 </Typography>
-                <Box sx={{ my: 2 }}>
-                    <OtpInput
-                        containerStyle={{ justifyContent: "center" }}
-                        shouldAutoFocus={shouldAutoFocus}
-                        value={values.otp}
-                        onChange={onChange(handleChange("otp"), submitForm)}
-                        numInputs={6}
-                        renderSeparator={<span>-</span>}
-                        renderInput={(props) => <IndividualInput {...props} />}
-                    />
-                    {errors.otp && (
-                        <CenteredFlex sx={{ mt: 1 }}>
-                            <InvalidInputMessage>
-                                {t("incorrect_code")}
-                            </InvalidInputMessage>
-                        </CenteredFlex>
-                    )}
-                </Box>
+                <OtpInput
+                    containerStyle={{ justifyContent: "center" }}
+                    shouldAutoFocus={shouldAutoFocus}
+                    value={values.otp}
+                    onChange={onChange(handleChange("otp"), submitForm)}
+                    numInputs={6}
+                    renderSeparator={<span>-</span>}
+                    renderInput={(props) => <IndividualInput {...props} />}
+                />
+                {errors.otp && (
+                    <Typography variant="mini" sx={{ color: "critical.main" }}>
+                        {t("incorrect_code")}
+                    </Typography>
+                )}
                 <LoadingButton
                     type="submit"
                     color="accent"
                     fullWidth
-                    sx={{ my: 4 }}
                     loading={waiting}
                     disabled={values.otp.length < 6}
                 >
                     {submitButtonText}
                 </LoadingButton>
-            </form>
-        </VerticallyCentered>
+            </Stack>
+        </form>
     );
 };
 
@@ -141,11 +132,3 @@ const IndividualInput = styled("input")(
     }
 `,
 );
-
-const InvalidInputMessage: React.FC<React.PropsWithChildren> = ({
-    children,
-}) => (
-    <Typography variant="mini" sx={{ color: "critical.main" }}>
-        {children}
-    </Typography>
-);

From 841de87a33807d3c782610cbac5883d925662876 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 20:18:03 +0530
Subject: [PATCH 488/796] Combine

---
 .../accounts/components/Verify2FACodeForm.tsx | 31 ++++-------
 .../accounts/pages/two-factor/setup.tsx       | 11 +---
 .../accounts/pages/two-factor/verify.tsx      | 55 ++++++++-----------
 3 files changed, 39 insertions(+), 58 deletions(-)

diff --git a/web/packages/accounts/components/Verify2FACodeForm.tsx b/web/packages/accounts/components/Verify2FACodeForm.tsx
index 75afbc8bd2..3084fa4d76 100644
--- a/web/packages/accounts/components/Verify2FACodeForm.tsx
+++ b/web/packages/accounts/components/Verify2FACodeForm.tsx
@@ -14,19 +14,11 @@ interface Verify2FACodeFormProps {
      * 1. The fill-in all the required 6 digits, or
      * 2. They press the "Enable" button.
      *
-     * The form will stay in a waiting state until this callback returns.
+     * The form will stay in a submitting state until this callback returns.
      *
      * @param otp The OTP that the user entered.
      */
     onSubmit: (otp: string) => Promise<void>;
-    /**
-     * Called when the process was completed successfully.
-     *
-     * This will be called immediately after onSubmit fulfills, but having two
-     * separate callbacks allows the form to indicate the success state in the
-     * interim.
-     */
-    onSuccess: () => void;
     /**
      * The label for the submit button.
      */
@@ -39,10 +31,8 @@ interface Verify2FACodeFormProps {
  */
 export const Verify2FACodeForm: React.FC<Verify2FACodeFormProps> = ({
     onSubmit,
-    onSuccess,
     submitButtonText,
 }) => {
-    const [waiting, setWaiting] = useState(false);
     const [shouldAutoFocus, setShouldAutoFocus] = useState(true);
 
     const formik = useFormik<{ otp: string }>({
@@ -51,25 +41,28 @@ export const Verify2FACodeForm: React.FC<Verify2FACodeFormProps> = ({
         validateOnChange: false,
         onSubmit: async ({ otp }, { setFieldError, resetForm }) => {
             try {
-                setWaiting(true);
                 await onSubmit(otp);
-                setWaiting(false);
-                onSuccess();
             } catch (e) {
                 log.error("Failed to submit 2FA code", e);
                 resetForm();
                 setFieldError("otp", t("generic_error"));
-                // Workaround (toggling shouldAutoFocus) to reset the focus back to
-                // the first input field in case of errors.
+                // Workaround (toggling shouldAutoFocus) to reset the focus back
+                // to the first input field in case of errors.
                 // https://github.com/devfolioco/react-otp-input/issues/420
                 setShouldAutoFocus(false);
                 setTimeout(() => setShouldAutoFocus(true), 100);
             }
-            setWaiting(false);
         },
     });
 
-    const { values, errors, handleChange, handleSubmit, submitForm } = formik;
+    const {
+        values,
+        errors,
+        handleChange,
+        handleSubmit,
+        submitForm,
+        isSubmitting,
+    } = formik;
 
     const onChange =
         // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
@@ -104,7 +97,7 @@ export const Verify2FACodeForm: React.FC<Verify2FACodeFormProps> = ({
                     type="submit"
                     color="accent"
                     fullWidth
-                    loading={waiting}
+                    loading={isSubmitting}
                     disabled={values.otp.length < 6}
                 >
                     {submitButtonText}
diff --git a/web/packages/accounts/pages/two-factor/setup.tsx b/web/packages/accounts/pages/two-factor/setup.tsx
index 20435c6f91..27caee28bd 100644
--- a/web/packages/accounts/pages/two-factor/setup.tsx
+++ b/web/packages/accounts/pages/two-factor/setup.tsx
@@ -12,7 +12,7 @@ import { getData, LS_KEYS, setLSUser } from "@ente/shared/storage/localStorage";
 import { Paper, Stack, styled, Typography } from "@mui/material";
 import { t } from "i18next";
 import { useRouter } from "next/router";
-import React, { useCallback, useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 
 const Page: React.FC = () => {
     const [twoFactorSecret, setTwoFactorSecret] = useState<
@@ -22,11 +22,10 @@ const Page: React.FC = () => {
     const router = useRouter();
 
     useEffect(() => {
-        if (twoFactorSecret) return; // HMR
         void setupTwoFactor().then(setTwoFactorSecret);
     }, []);
 
-    const handleSubmit = useCallback(async (otp: string) => {
+    const handleSubmit = async (otp: string) => {
         const {
             encryptedData: encryptedTwoFactorSecret,
             nonce: twoFactorSecretDecryptionNonce,
@@ -40,11 +39,8 @@ const Page: React.FC = () => {
             ...getData(LS_KEYS.USER),
             isTwoFactorEnabled: true,
         });
-    }, []);
-
-    const handleSuccess = useCallback(() => {
         void router.push(appHomeRoute);
-    }, [router]);
+    };
 
     return (
         <Stack sx={{ minHeight: "100svh" }}>
@@ -56,7 +52,6 @@ const Page: React.FC = () => {
                     <Instructions twoFactorSecret={twoFactorSecret} />
                     <Verify2FACodeForm
                         onSubmit={handleSubmit}
-                        onSuccess={handleSuccess}
                         submitButtonText={t("enable")}
                     />
                     <Stack sx={{ alignItems: "center" }}>
diff --git a/web/packages/accounts/pages/two-factor/verify.tsx b/web/packages/accounts/pages/two-factor/verify.tsx
index e9174d7cd6..bb93262509 100644
--- a/web/packages/accounts/pages/two-factor/verify.tsx
+++ b/web/packages/accounts/pages/two-factor/verify.tsx
@@ -14,7 +14,7 @@ import type { User } from "@ente/shared/user/types";
 import { HttpStatusCode } from "axios";
 import { t } from "i18next";
 import { useRouter } from "next/router";
-import { useCallback, useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import {
     AccountsPageContents,
     AccountsPageFooter,
@@ -43,43 +43,36 @@ const Page: React.FC = () => {
         }
     }, []);
 
-    const handleSubmit = useCallback(
-        async (otp: string) => {
-            try {
-                const resp = await verifyTwoFactor(otp, sessionID);
-                const { keyAttributes, encryptedToken, token, id } = resp;
-                await setLSUser({
-                    ...getData(LS_KEYS.USER),
-                    token,
-                    encryptedToken,
-                    id,
-                });
-                setData(LS_KEYS.KEY_ATTRIBUTES, keyAttributes!);
-            } catch (e) {
-                if (
-                    e instanceof ApiError &&
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
-                    e.httpStatusCode === HttpStatusCode.NotFound
-                ) {
-                    logout();
-                } else {
-                    throw e;
-                }
+    const handleSubmit = async (otp: string) => {
+        try {
+            const resp = await verifyTwoFactor(otp, sessionID);
+            const { keyAttributes, encryptedToken, token, id } = resp;
+            await setLSUser({
+                ...getData(LS_KEYS.USER),
+                token,
+                encryptedToken,
+                id,
+            });
+            setData(LS_KEYS.KEY_ATTRIBUTES, keyAttributes!);
+            void router.push(unstashRedirect() ?? PAGES.CREDENTIALS);
+        } catch (e) {
+            if (
+                e instanceof ApiError &&
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
+                e.httpStatusCode === HttpStatusCode.NotFound
+            ) {
+                logout();
+            } else {
+                throw e;
             }
-        },
-        [logout],
-    );
-
-    const handleSuccess = useCallback(() => {
-        void router.push(unstashRedirect() ?? PAGES.CREDENTIALS);
-    }, [router]);
+        }
+    };
 
     return (
         <AccountsPageContents>
             <AccountsPageTitle>{t("two_factor")}</AccountsPageTitle>
             <Verify2FACodeForm
                 onSubmit={handleSubmit}
-                onSuccess={handleSuccess}
                 submitButtonText={t("verify")}
             />
             <AccountsPageFooter>

From 15d77b7551ca0d4019968e9cf12c3a8500b25028 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 20:25:22 +0530
Subject: [PATCH 489/796] Use correct error

---
 web/packages/accounts/components/Verify2FACodeForm.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/web/packages/accounts/components/Verify2FACodeForm.tsx b/web/packages/accounts/components/Verify2FACodeForm.tsx
index 3084fa4d76..0e036b64b8 100644
--- a/web/packages/accounts/components/Verify2FACodeForm.tsx
+++ b/web/packages/accounts/components/Verify2FACodeForm.tsx
@@ -1,4 +1,5 @@
 import { LoadingButton } from "@/base/components/mui/LoadingButton";
+import { isHTTP401Error } from "@/base/http";
 import log from "@/base/log";
 import { Stack, styled, Typography } from "@mui/material";
 import { useFormik } from "formik";
@@ -45,7 +46,12 @@ export const Verify2FACodeForm: React.FC<Verify2FACodeFormProps> = ({
             } catch (e) {
                 log.error("Failed to submit 2FA code", e);
                 resetForm();
-                setFieldError("otp", t("generic_error"));
+                setFieldError(
+                    "otp",
+                    isHTTP401Error(e)
+                        ? t("incorrect_code")
+                        : t("generic_error"),
+                );
                 // Workaround (toggling shouldAutoFocus) to reset the focus back
                 // to the first input field in case of errors.
                 // https://github.com/devfolioco/react-otp-input/issues/420
@@ -90,7 +96,7 @@ export const Verify2FACodeForm: React.FC<Verify2FACodeFormProps> = ({
                 />
                 {errors.otp && (
                     <Typography variant="mini" sx={{ color: "critical.main" }}>
-                        {t("incorrect_code")}
+                        {errors.otp}
                     </Typography>
                 )}
                 <LoadingButton

From 47539e93f97bf7acc6225eb824e1d6223b320f77 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 20:32:23 +0530
Subject: [PATCH 490/796] Simplify

---
 .../accounts/components/Verify2FACodeForm.tsx | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/web/packages/accounts/components/Verify2FACodeForm.tsx b/web/packages/accounts/components/Verify2FACodeForm.tsx
index 0e036b64b8..a8c52d6f80 100644
--- a/web/packages/accounts/components/Verify2FACodeForm.tsx
+++ b/web/packages/accounts/components/Verify2FACodeForm.tsx
@@ -4,7 +4,7 @@ import log from "@/base/log";
 import { Stack, styled, Typography } from "@mui/material";
 import { useFormik } from "formik";
 import { t } from "i18next";
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import OtpInput from "react-otp-input";
 
 interface Verify2FACodeFormProps {
@@ -70,14 +70,17 @@ export const Verify2FACodeForm: React.FC<Verify2FACodeFormProps> = ({
         isSubmitting,
     } = formik;
 
-    const onChange =
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
-        (callback: Function, triggerSubmit: Function) => (otp: string) => {
-            callback(otp);
-            if (otp.length === 6) {
-                triggerSubmit(otp);
-            }
-        };
+    // const onChange =
+    //     // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
+    //     (callback: Function, triggerSubmit: Function) => (otp: string) => {
+    //         callback(otp);
+    //         if (otp.length === 6) {
+    //             triggerSubmit(otp);
+    //         }
+    //     };
+    useEffect(() => {
+        if (values.otp.length == 6) void submitForm();
+    }, [values]);
 
     return (
         <form onSubmit={handleSubmit}>
@@ -89,7 +92,7 @@ export const Verify2FACodeForm: React.FC<Verify2FACodeFormProps> = ({
                     containerStyle={{ justifyContent: "center" }}
                     shouldAutoFocus={shouldAutoFocus}
                     value={values.otp}
-                    onChange={onChange(handleChange("otp"), submitForm)}
+                    onChange={handleChange("otp")}
                     numInputs={6}
                     renderSeparator={<span>-</span>}
                     renderInput={(props) => <IndividualInput {...props} />}

From 620853190277cffb1f84bc7abab20cb1f373f825 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 20:34:16 +0530
Subject: [PATCH 491/796] Fix the double submit bug

---
 web/packages/accounts/components/Verify2FACodeForm.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/packages/accounts/components/Verify2FACodeForm.tsx b/web/packages/accounts/components/Verify2FACodeForm.tsx
index a8c52d6f80..c11e3872d6 100644
--- a/web/packages/accounts/components/Verify2FACodeForm.tsx
+++ b/web/packages/accounts/components/Verify2FACodeForm.tsx
@@ -79,8 +79,8 @@ export const Verify2FACodeForm: React.FC<Verify2FACodeFormProps> = ({
     //         }
     //     };
     useEffect(() => {
-        if (values.otp.length == 6) void submitForm();
-    }, [values]);
+        if (values.otp.length == 6 && !isSubmitting) void submitForm();
+    }, [values, isSubmitting]);
 
     return (
         <form onSubmit={handleSubmit}>

From af89a2202cae5028a90bed9c7fe4210b14e988d5 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 20:35:40 +0530
Subject: [PATCH 492/796] Cleanup

---
 .../accounts/components/Verify2FACodeForm.tsx | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/web/packages/accounts/components/Verify2FACodeForm.tsx b/web/packages/accounts/components/Verify2FACodeForm.tsx
index c11e3872d6..d83dba61cb 100644
--- a/web/packages/accounts/components/Verify2FACodeForm.tsx
+++ b/web/packages/accounts/components/Verify2FACodeForm.tsx
@@ -36,13 +36,21 @@ export const Verify2FACodeForm: React.FC<Verify2FACodeFormProps> = ({
 }) => {
     const [shouldAutoFocus, setShouldAutoFocus] = useState(true);
 
-    const formik = useFormik<{ otp: string }>({
+    const {
+        values,
+        errors,
+        handleChange,
+        handleSubmit,
+        submitForm,
+        isSubmitting,
+    } = useFormik<{ otp: string }>({
         initialValues: { otp: "" },
         validateOnBlur: false,
         validateOnChange: false,
         onSubmit: async ({ otp }, { setFieldError, resetForm }) => {
             try {
                 await onSubmit(otp);
+                resetForm(); // Prevent resubmission via the useEffect.
             } catch (e) {
                 log.error("Failed to submit 2FA code", e);
                 resetForm();
@@ -61,23 +69,6 @@ export const Verify2FACodeForm: React.FC<Verify2FACodeFormProps> = ({
         },
     });
 
-    const {
-        values,
-        errors,
-        handleChange,
-        handleSubmit,
-        submitForm,
-        isSubmitting,
-    } = formik;
-
-    // const onChange =
-    //     // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
-    //     (callback: Function, triggerSubmit: Function) => (otp: string) => {
-    //         callback(otp);
-    //         if (otp.length === 6) {
-    //             triggerSubmit(otp);
-    //         }
-    //     };
     useEffect(() => {
         if (values.otp.length == 6 && !isSubmitting) void submitForm();
     }, [values, isSubmitting]);

From d0c93338fa3dd8a7763d681537023041b328fc3e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 20:47:58 +0530
Subject: [PATCH 493/796] await route changes

---
 web/packages/accounts/pages/two-factor/setup.tsx  | 2 +-
 web/packages/accounts/pages/two-factor/verify.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/packages/accounts/pages/two-factor/setup.tsx b/web/packages/accounts/pages/two-factor/setup.tsx
index 27caee28bd..c12495d175 100644
--- a/web/packages/accounts/pages/two-factor/setup.tsx
+++ b/web/packages/accounts/pages/two-factor/setup.tsx
@@ -39,7 +39,7 @@ const Page: React.FC = () => {
             ...getData(LS_KEYS.USER),
             isTwoFactorEnabled: true,
         });
-        void router.push(appHomeRoute);
+        await router.push(appHomeRoute);
     };
 
     return (
diff --git a/web/packages/accounts/pages/two-factor/verify.tsx b/web/packages/accounts/pages/two-factor/verify.tsx
index bb93262509..20edbf909a 100644
--- a/web/packages/accounts/pages/two-factor/verify.tsx
+++ b/web/packages/accounts/pages/two-factor/verify.tsx
@@ -54,7 +54,7 @@ const Page: React.FC = () => {
                 id,
             });
             setData(LS_KEYS.KEY_ATTRIBUTES, keyAttributes!);
-            void router.push(unstashRedirect() ?? PAGES.CREDENTIALS);
+            await router.push(unstashRedirect() ?? PAGES.CREDENTIALS);
         } catch (e) {
             if (
                 e instanceof ApiError &&

From 4db25b1b8f8f0572e56fb39192621cf20aa58691 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 24 Feb 2025 20:58:37 +0530
Subject: [PATCH 494/796] Fix error handling

---
 .../accounts/pages/two-factor/verify.tsx        |  9 ++-------
 web/packages/accounts/services/user.ts          | 17 +++++++++--------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/web/packages/accounts/pages/two-factor/verify.tsx b/web/packages/accounts/pages/two-factor/verify.tsx
index 20edbf909a..e1e13af0c0 100644
--- a/web/packages/accounts/pages/two-factor/verify.tsx
+++ b/web/packages/accounts/pages/two-factor/verify.tsx
@@ -3,7 +3,7 @@ import { PAGES } from "@/accounts/constants/pages";
 import { verifyTwoFactor } from "@/accounts/services/user";
 import { LinkButton } from "@/base/components/LinkButton";
 import { useBaseContext } from "@/base/context";
-import { ApiError } from "@ente/shared/error";
+import { HTTPError } from "@/base/http";
 import {
     LS_KEYS,
     getData,
@@ -11,7 +11,6 @@ import {
     setLSUser,
 } from "@ente/shared/storage/localStorage";
 import type { User } from "@ente/shared/user/types";
-import { HttpStatusCode } from "axios";
 import { t } from "i18next";
 import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
@@ -56,11 +55,7 @@ const Page: React.FC = () => {
             setData(LS_KEYS.KEY_ATTRIBUTES, keyAttributes!);
             await router.push(unstashRedirect() ?? PAGES.CREDENTIALS);
         } catch (e) {
-            if (
-                e instanceof ApiError &&
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
-                e.httpStatusCode === HttpStatusCode.NotFound
-            ) {
+            if (e instanceof HTTPError && e.res.status == 404) {
                 logout();
             } else {
                 throw e;
diff --git a/web/packages/accounts/services/user.ts b/web/packages/accounts/services/user.ts
index b1992c890a..9034872d56 100644
--- a/web/packages/accounts/services/user.ts
+++ b/web/packages/accounts/services/user.ts
@@ -236,14 +236,15 @@ export const remoteLogoutIfNeeded = async () => {
 };
 
 export const verifyTwoFactor = async (code: string, sessionID: string) => {
-    const resp = await HTTPService.post(
-        await apiURL("/users/two-factor/verify"),
-        {
-            code,
-            sessionID,
-        },
-    );
-    return resp.data as UserVerificationResponse;
+    const res = await fetch(await apiURL("/users/two-factor/verify"), {
+        method: "POST",
+        headers: publicRequestHeaders(),
+        body: JSON.stringify({ code, sessionID }),
+    });
+    ensureOk(res);
+    const json = await res.json();
+    // TODO: Use zod here
+    return json as UserVerificationResponse;
 };
 
 /** The type of the second factor we're trying to act on */

From 792353bb9e2af162b2656abed518c307c1764db4 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 25 Feb 2025 09:29:50 +0530
Subject: [PATCH 495/796] [server] Add index on file_data(user_id,updated_at)

---
 server/migrations/97_file_data_user_update_idx.down.sql | 1 +
 server/migrations/97_file_data_user_update_idx.up.sql   | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 server/migrations/97_file_data_user_update_idx.down.sql
 create mode 100644 server/migrations/97_file_data_user_update_idx.up.sql

diff --git a/server/migrations/97_file_data_user_update_idx.down.sql b/server/migrations/97_file_data_user_update_idx.down.sql
new file mode 100644
index 0000000000..848321602e
--- /dev/null
+++ b/server/migrations/97_file_data_user_update_idx.down.sql
@@ -0,0 +1 @@
+DROP INDEX CONCURRENTLY IF EXISTS idx_file_data_user_updated;
diff --git a/server/migrations/97_file_data_user_update_idx.up.sql b/server/migrations/97_file_data_user_update_idx.up.sql
new file mode 100644
index 0000000000..b0dc8ae140
--- /dev/null
+++ b/server/migrations/97_file_data_user_update_idx.up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX CONCURRENTLY idx_file_data_user_updated
+    ON file_data (user_id, updated_at);

From 53d71de31ff364f5ffd558b5d611b081ba29b6a4 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Tue, 25 Feb 2025 10:38:41 +0530
Subject: [PATCH 496/796] [mob][photos] More central flag

---
 mobile/lib/services/smart_memories_service.dart  | 2 ++
 mobile/lib/ui/home/memories/memories_widget.dart | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 569bbe3372..97e960bb75 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -103,6 +103,8 @@ class SmartMemoriesService {
     _logger.info("Smart memories service initialized");
   }
 
+  bool get enableSmartMemories => flagService.showSmartMemories;
+
   void clearCache() {
     _cachedMemories = null;
     _future = null;
diff --git a/mobile/lib/ui/home/memories/memories_widget.dart b/mobile/lib/ui/home/memories/memories_widget.dart
index 2e2117f25d..655f4896c5 100644
--- a/mobile/lib/ui/home/memories/memories_widget.dart
+++ b/mobile/lib/ui/home/memories/memories_widget.dart
@@ -58,7 +58,7 @@ class _MemoriesWidgetState extends State<MemoriesWidget> {
     if (!MemoriesService.instance.showMemories) {
       return const SizedBox.shrink();
     }
-    if (flagService.showSmartMemories) {
+    if (SmartMemoriesService.instance.enableSmartMemories) {
       return FutureBuilder<List<SmartMemory>>(
         future: SmartMemoriesService.instance.getMemories(
           null,

From 2ece083d4db7e20a9d2c2ca600a2ac429b2e5e88 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 10:49:12 +0530
Subject: [PATCH 497/796] Rename

---
 web/packages/gallery/components/FileInfo.tsx      | 4 ++--
 web/packages/new/photos/services/search/worker.ts | 4 ++--
 web/packages/shared/file-metadata.ts              | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index b60e0863f1..6ad6e527f7 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -62,7 +62,7 @@ import { FlexWrapper } from "@ente/shared/components/Container";
 import SingleInputForm, {
     type SingleInputFormProps,
 } from "@ente/shared/components/SingleInputForm";
-import { getPublicMagicMetadataSync } from "@ente/shared/file-metadata";
+import { filePublicMagicMetadata } from "@ente/shared/file-metadata";
 import CalendarTodayIcon from "@mui/icons-material/CalendarToday";
 import CameraOutlinedIcon from "@mui/icons-material/CameraOutlined";
 import CloseIcon from "@mui/icons-material/Close";
@@ -669,7 +669,7 @@ const CreationTime: React.FC<CreationTimeProps> = ({
     const openEditMode = () => setIsInEditMode(true);
     const closeEditMode = () => setIsInEditMode(false);
 
-    const publicMagicMetadata = getPublicMagicMetadataSync(file);
+    const publicMagicMetadata = filePublicMagicMetadata(file);
     const originalDate = fileCreationPhotoDate(file, publicMagicMetadata);
 
     const saveEdits = async (pickedTime: ParsedMetadataDate) => {
diff --git a/web/packages/new/photos/services/search/worker.ts b/web/packages/new/photos/services/search/worker.ts
index 9fc9850712..655bf59f10 100644
--- a/web/packages/new/photos/services/search/worker.ts
+++ b/web/packages/new/photos/services/search/worker.ts
@@ -5,7 +5,7 @@ import type { Collection } from "@/media/collection";
 import type { EnteFile } from "@/media/file";
 import { fileCreationPhotoDate, fileLocation } from "@/media/file-metadata";
 import { nullToUndefined } from "@/utils/transform";
-import { getPublicMagicMetadataSync } from "@ente/shared/file-metadata";
+import { filePublicMagicMetadata } from "@ente/shared/file-metadata";
 import type { Component } from "chrono-node";
 import * as chrono from "chrono-node";
 import { expose } from "comlink";
@@ -383,7 +383,7 @@ const isMatchingFile = (file: EnteFile, suggestion: SearchSuggestion) => {
         case "date":
             return isDateComponentsMatch(
                 suggestion.dateComponents,
-                fileCreationPhotoDate(file, getPublicMagicMetadataSync(file)),
+                fileCreationPhotoDate(file, filePublicMagicMetadata(file)),
             );
 
         case "location": {
diff --git a/web/packages/shared/file-metadata.ts b/web/packages/shared/file-metadata.ts
index a4e3356010..f1e8795961 100644
--- a/web/packages/shared/file-metadata.ts
+++ b/web/packages/shared/file-metadata.ts
@@ -15,9 +15,10 @@ import {
  * We are not expected to be in a scenario where the file gets to the UI without
  * having its public magic metadata decrypted, so this function is a sanity
  * check and should be a no-op in usually. On debug builds it'll throw if it
- * finds its assumptions broken.
+ * finds its assumptions broken. Once the types have been refactored this entire
+ * backup code-path can be removed, and this should become a trivial accessor.
  */
-export const getPublicMagicMetadataSync = (file: EnteFile) => {
+export const filePublicMagicMetadata = (file: EnteFile) => {
     if (!file.pubMagicMetadata) return undefined;
     if (typeof file.pubMagicMetadata.data == "string") {
         if (isDevBuild)

From 19ea1ad1f4fb4924c7c39520cc26f33aec60cc03 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 25 Feb 2025 10:56:42 +0530
Subject: [PATCH 498/796] [mob] Clean up

---
 mobile/lib/db/trash_db.dart                 |  23 ----
 mobile/lib/services/trash_sync_service.dart | 127 ++++++++++++++++++-
 mobile/lib/utils/trash_diff_fetcher.dart    | 129 --------------------
 3 files changed, 121 insertions(+), 158 deletions(-)
 delete mode 100644 mobile/lib/utils/trash_diff_fetcher.dart

diff --git a/mobile/lib/db/trash_db.dart b/mobile/lib/db/trash_db.dart
index a4a4ae3dbf..d16fcae958 100644
--- a/mobile/lib/db/trash_db.dart
+++ b/mobile/lib/db/trash_db.dart
@@ -101,20 +101,6 @@ class TrashDB {
     await db.delete(tableName);
   }
 
-  // getRecentlyTrashedFile returns the file which was trashed recently
-  Future<TrashFile?> getRecentlyTrashedFile() async {
-    final db = await instance.database;
-    final rows = await db.query(
-      tableName,
-      orderBy: '$columnTrashDeleteBy DESC',
-      limit: 1,
-    );
-    if (rows.isEmpty) {
-      return null;
-    }
-    return _getTrashFromRow(rows[0]);
-  }
-
   Future<int> count() async {
     final db = await instance.database;
     final count = Sqflite.firstIntValue(
@@ -156,15 +142,6 @@ class TrashDB {
     );
   }
 
-  Future<int> insert(TrashFile trash) async {
-    final db = await instance.database;
-    return db.insert(
-      tableName,
-      _getRowForTrash(trash),
-      conflictAlgorithm: ConflictAlgorithm.replace,
-    );
-  }
-
   Future<int> delete(List<int> uploadedFileIDs) async {
     final db = await instance.database;
     return db.delete(
diff --git a/mobile/lib/services/trash_sync_service.dart b/mobile/lib/services/trash_sync_service.dart
index d16bee058b..53c94f16c7 100644
--- a/mobile/lib/services/trash_sync_service.dart
+++ b/mobile/lib/services/trash_sync_service.dart
@@ -1,6 +1,9 @@
 import 'dart:async';
+import "dart:convert";
+import "dart:math";
 
 import 'package:dio/dio.dart';
+import "package:ente_crypto/ente_crypto.dart";
 import 'package:logging/logging.dart';
 import 'package:photos/core/constants.dart';
 import 'package:photos/core/event_bus.dart';
@@ -13,20 +16,20 @@ import 'package:photos/models/api/collection/trash_item_request.dart';
 import 'package:photos/models/file/file.dart';
 import 'package:photos/models/file/trash_file.dart';
 import 'package:photos/models/ignored_file.dart';
+import "package:photos/models/metadata/file_magic.dart";
 import 'package:photos/services/ignored_files_service.dart';
-import 'package:photos/utils/trash_diff_fetcher.dart';
+import "package:photos/utils/file_key.dart";
 import 'package:shared_preferences/shared_preferences.dart';
 
 class TrashSyncService {
   final _logger = Logger("TrashSyncService");
-  final TrashDiffFetcher _diffFetcher;
+
   final _trashDB = TrashDB.instance;
   static const kLastTrashSyncTime = "last_trash_sync_time";
   late SharedPreferences _prefs;
   final Dio _enteDio;
 
-  TrashSyncService(this._prefs, this._enteDio)
-      : _diffFetcher = TrashDiffFetcher(_enteDio) {
+  TrashSyncService(this._prefs, this._enteDio) {
     _logger.fine("TrashSyncService constructor");
   }
 
@@ -38,7 +41,7 @@ class TrashSyncService {
     final lastSyncTime = _getSyncTime();
     bool isLocalTrashUpdated = false;
     _logger.fine('sync trash sinceTime : $lastSyncTime');
-    final diff = await _diffFetcher.getTrashFilesDiff(lastSyncTime);
+    final diff = await getTrashFilesDiff(lastSyncTime);
     if (diff.trashedFiles.isNotEmpty) {
       isLocalTrashUpdated = true;
       _logger.fine("inserting ${diff.trashedFiles.length} items in trash");
@@ -80,7 +83,7 @@ class TrashSyncService {
     }
   }
 
-  Future<void> _updateIgnoredFiles(Diff diff) async {
+  Future<void> _updateIgnoredFiles(TrashDiff diff) async {
     final ignoredFiles = <IgnoredFile>[];
     for (TrashFile t in diff.trashedFiles) {
       final file = IgnoredFile.fromTrashItem(t);
@@ -122,6 +125,103 @@ class TrashSyncService {
     }
   }
 
+  Future<TrashDiff> getTrashFilesDiff(int sinceTime) async {
+    try {
+      final response = await _enteDio.get(
+        "/trash/v2/diff",
+        queryParameters: {
+          "sinceTime": sinceTime,
+        },
+      );
+      int latestUpdatedAtTime = 0;
+      final trashedFiles = <TrashFile>[];
+      final deletedUploadIDs = <int>[];
+      final restoredFiles = <TrashFile>[];
+
+      final diff = response.data["diff"] as List;
+      final bool hasMore = response.data["hasMore"] as bool;
+      final startTime = DateTime.now();
+      for (final item in diff) {
+        final trash = TrashFile();
+        trash.createdAt = item['createdAt'];
+        trash.updateAt = item['updatedAt'];
+        latestUpdatedAtTime = max(latestUpdatedAtTime, trash.updateAt);
+        if (item["isDeleted"]) {
+          deletedUploadIDs.add(item["file"]["id"]);
+          continue;
+        }
+
+        trash.deleteBy = item['deleteBy'];
+        trash.uploadedFileID = item["file"]["id"];
+        trash.collectionID = item["file"]["collectionID"];
+        trash.updationTime = item["file"]["updationTime"];
+        trash.ownerID = item["file"]["ownerID"];
+        trash.encryptedKey = item["file"]["encryptedKey"];
+        trash.keyDecryptionNonce = item["file"]["keyDecryptionNonce"];
+        trash.fileDecryptionHeader = item["file"]["file"]["decryptionHeader"];
+        trash.thumbnailDecryptionHeader =
+            item["file"]["thumbnail"]["decryptionHeader"];
+        trash.metadataDecryptionHeader =
+            item["file"]["metadata"]["decryptionHeader"];
+        final fileDecryptionKey = getFileKey(trash);
+        final encodedMetadata = await CryptoUtil.decryptChaCha(
+          CryptoUtil.base642bin(item["file"]["metadata"]["encryptedData"]),
+          fileDecryptionKey,
+          CryptoUtil.base642bin(trash.metadataDecryptionHeader!),
+        );
+        final Map<String, dynamic> metadata =
+            jsonDecode(utf8.decode(encodedMetadata));
+        trash.applyMetadata(metadata);
+        if (item["file"]['magicMetadata'] != null) {
+          final utfEncodedMmd = await CryptoUtil.decryptChaCha(
+            CryptoUtil.base642bin(item["file"]['magicMetadata']['data']),
+            fileDecryptionKey,
+            CryptoUtil.base642bin(item["file"]['magicMetadata']['header']),
+          );
+          trash.mMdEncodedJson = utf8.decode(utfEncodedMmd);
+          trash.mMdVersion = item["file"]['magicMetadata']['version'];
+        }
+        if (item["file"]['pubMagicMetadata'] != null) {
+          final utfEncodedMmd = await CryptoUtil.decryptChaCha(
+            CryptoUtil.base642bin(item["file"]['pubMagicMetadata']['data']),
+            fileDecryptionKey,
+            CryptoUtil.base642bin(item["file"]['pubMagicMetadata']['header']),
+          );
+          trash.pubMmdEncodedJson = utf8.decode(utfEncodedMmd);
+          trash.pubMmdVersion = item["file"]['pubMagicMetadata']['version'];
+          trash.pubMagicMetadata =
+              PubMagicMetadata.fromEncodedJson(trash.pubMmdEncodedJson!);
+        }
+        if (item['isRestored']) {
+          restoredFiles.add(trash);
+          continue;
+        }
+        trashedFiles.add(trash);
+      }
+
+      final endTime = DateTime.now();
+      _logger.info(
+        "time for parsing " +
+            diff.length.toString() +
+            ": " +
+            Duration(
+              microseconds: (endTime.microsecondsSinceEpoch -
+                  startTime.microsecondsSinceEpoch),
+            ).inMilliseconds.toString(),
+      );
+      return TrashDiff(
+        trashedFiles,
+        restoredFiles,
+        deletedUploadIDs,
+        hasMore,
+        latestUpdatedAtTime,
+      );
+    } catch (e, s) {
+      _logger.severe(e, s);
+      rethrow;
+    }
+  }
+
   Future<Response<dynamic>> _trashFiles(
     Map<String, dynamic> requestData,
   ) async {
@@ -174,3 +274,18 @@ class TrashSyncService {
     }
   }
 }
+
+class TrashDiff {
+  final List<TrashFile> trashedFiles;
+  final List<TrashFile> restoredFiles;
+  final List<int> deletedUploadIDs;
+  final bool hasMore;
+  final int lastSyncedTimeStamp;
+  TrashDiff(
+    this.trashedFiles,
+    this.restoredFiles,
+    this.deletedUploadIDs,
+    this.hasMore,
+    this.lastSyncedTimeStamp,
+  );
+}
diff --git a/mobile/lib/utils/trash_diff_fetcher.dart b/mobile/lib/utils/trash_diff_fetcher.dart
deleted file mode 100644
index 80041315c5..0000000000
--- a/mobile/lib/utils/trash_diff_fetcher.dart
+++ /dev/null
@@ -1,129 +0,0 @@
-import 'dart:convert';
-import 'dart:math';
-
-import "package:dio/dio.dart";
-import 'package:ente_crypto/ente_crypto.dart';
-import 'package:logging/logging.dart';
-import 'package:photos/models/file/trash_file.dart';
-import "package:photos/models/metadata/file_magic.dart";
-import "package:photos/utils/file_key.dart";
-
-class TrashDiffFetcher {
-  final _logger = Logger("TrashDiffFetcher");
-  final Dio _enteDio;
-
-  TrashDiffFetcher(this._enteDio);
-
-  Future<Diff> getTrashFilesDiff(int sinceTime) async {
-    try {
-      final response = await _enteDio.get(
-        "/trash/v2/diff",
-        queryParameters: {
-          "sinceTime": sinceTime,
-        },
-      );
-      int latestUpdatedAtTime = 0;
-      final trashedFiles = <TrashFile>[];
-      final deletedUploadIDs = <int>[];
-      final restoredFiles = <TrashFile>[];
-
-      final diff = response.data["diff"] as List;
-      final bool hasMore = response.data["hasMore"] as bool;
-      final startTime = DateTime.now();
-      for (final item in diff) {
-        final trash = TrashFile();
-        trash.createdAt = item['createdAt'];
-        trash.updateAt = item['updatedAt'];
-        latestUpdatedAtTime = max(latestUpdatedAtTime, trash.updateAt);
-        if (item["isDeleted"]) {
-          deletedUploadIDs.add(item["file"]["id"]);
-          continue;
-        }
-
-        trash.deleteBy = item['deleteBy'];
-        trash.uploadedFileID = item["file"]["id"];
-        trash.collectionID = item["file"]["collectionID"];
-        trash.updationTime = item["file"]["updationTime"];
-        trash.ownerID = item["file"]["ownerID"];
-        trash.encryptedKey = item["file"]["encryptedKey"];
-        trash.keyDecryptionNonce = item["file"]["keyDecryptionNonce"];
-        trash.fileDecryptionHeader = item["file"]["file"]["decryptionHeader"];
-        trash.thumbnailDecryptionHeader =
-            item["file"]["thumbnail"]["decryptionHeader"];
-        trash.metadataDecryptionHeader =
-            item["file"]["metadata"]["decryptionHeader"];
-        final fileDecryptionKey = getFileKey(trash);
-        final encodedMetadata = await CryptoUtil.decryptChaCha(
-          CryptoUtil.base642bin(item["file"]["metadata"]["encryptedData"]),
-          fileDecryptionKey,
-          CryptoUtil.base642bin(trash.metadataDecryptionHeader!),
-        );
-        final Map<String, dynamic> metadata =
-            jsonDecode(utf8.decode(encodedMetadata));
-        trash.applyMetadata(metadata);
-        if (item["file"]['magicMetadata'] != null) {
-          final utfEncodedMmd = await CryptoUtil.decryptChaCha(
-            CryptoUtil.base642bin(item["file"]['magicMetadata']['data']),
-            fileDecryptionKey,
-            CryptoUtil.base642bin(item["file"]['magicMetadata']['header']),
-          );
-          trash.mMdEncodedJson = utf8.decode(utfEncodedMmd);
-          trash.mMdVersion = item["file"]['magicMetadata']['version'];
-        }
-        if (item["file"]['pubMagicMetadata'] != null) {
-          final utfEncodedMmd = await CryptoUtil.decryptChaCha(
-            CryptoUtil.base642bin(item["file"]['pubMagicMetadata']['data']),
-            fileDecryptionKey,
-            CryptoUtil.base642bin(item["file"]['pubMagicMetadata']['header']),
-          );
-          trash.pubMmdEncodedJson = utf8.decode(utfEncodedMmd);
-          trash.pubMmdVersion = item["file"]['pubMagicMetadata']['version'];
-          trash.pubMagicMetadata =
-              PubMagicMetadata.fromEncodedJson(trash.pubMmdEncodedJson!);
-        }
-        if (item['isRestored']) {
-          restoredFiles.add(trash);
-          continue;
-        }
-        trashedFiles.add(trash);
-      }
-
-      final endTime = DateTime.now();
-      _logger.info(
-        "time for parsing " +
-            diff.length.toString() +
-            ": " +
-            Duration(
-              microseconds: (endTime.microsecondsSinceEpoch -
-                  startTime.microsecondsSinceEpoch),
-            ).inMilliseconds.toString(),
-      );
-      return Diff(
-        trashedFiles,
-        restoredFiles,
-        deletedUploadIDs,
-        hasMore,
-        latestUpdatedAtTime,
-      );
-    } catch (e, s) {
-      _logger.severe(e, s);
-      rethrow;
-    }
-  }
-}
-
-class Diff {
-  final List<TrashFile> trashedFiles;
-  final List<TrashFile> restoredFiles;
-  final List<int> deletedUploadIDs;
-  final bool hasMore;
-  final int lastSyncedTimeStamp;
-
-  Diff(
-    this.trashedFiles,
-    this.restoredFiles,
-    this.deletedUploadIDs,
-    this.hasMore,
-    this.lastSyncedTimeStamp,
-  );
-}

From 62471dad3e5ff15494bb174e35bf5c9102bc5262 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 10:58:30 +0530
Subject: [PATCH 499/796] Move

---
 web/packages/gallery/components/FileInfo.tsx  |  8 +++--
 web/packages/media/file-metadata.ts           | 27 ++++++++++++++-
 web/packages/new/photos/services/dedup.ts     |  5 ++-
 .../new/photos/services/search/worker.ts      |  7 ++--
 web/packages/shared/file-metadata.ts          | 33 -------------------
 5 files changed, 38 insertions(+), 42 deletions(-)
 delete mode 100644 web/packages/shared/file-metadata.ts

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 6ad6e527f7..e7af9061c4 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -35,6 +35,7 @@ import { type EnteFile } from "@/media/file";
 import {
     fileCreationPhotoDate,
     fileLocation,
+    filePublicMagicMetadata,
     updateRemotePublicMagicMetadata,
     type ParsedMetadataDate,
 } from "@/media/file-metadata";
@@ -62,7 +63,6 @@ import { FlexWrapper } from "@ente/shared/components/Container";
 import SingleInputForm, {
     type SingleInputFormProps,
 } from "@ente/shared/components/SingleInputForm";
-import { filePublicMagicMetadata } from "@ente/shared/file-metadata";
 import CalendarTodayIcon from "@mui/icons-material/CalendarToday";
 import CameraOutlinedIcon from "@mui/icons-material/CameraOutlined";
 import CloseIcon from "@mui/icons-material/Close";
@@ -669,8 +669,10 @@ const CreationTime: React.FC<CreationTimeProps> = ({
     const openEditMode = () => setIsInEditMode(true);
     const closeEditMode = () => setIsInEditMode(false);
 
-    const publicMagicMetadata = filePublicMagicMetadata(file);
-    const originalDate = fileCreationPhotoDate(file, publicMagicMetadata);
+    const originalDate = fileCreationPhotoDate(
+        file,
+        filePublicMagicMetadata(file),
+    );
 
     const saveEdits = async (pickedTime: ParsedMetadataDate) => {
         try {
diff --git a/web/packages/media/file-metadata.ts b/web/packages/media/file-metadata.ts
index 2d1c963876..a9ceba491c 100644
--- a/web/packages/media/file-metadata.ts
+++ b/web/packages/media/file-metadata.ts
@@ -2,7 +2,11 @@ import { decryptMetadataJSON, encryptMetadataJSON } from "@/base/crypto";
 import { authenticatedRequestHeaders, ensureOk } from "@/base/http";
 import { apiURL } from "@/base/origins";
 import { type Location } from "@/base/types";
-import { type EnteFile, type FilePublicMagicMetadata } from "@/media/file";
+import {
+    fileLogID,
+    type EnteFile,
+    type FilePublicMagicMetadata,
+} from "@/media/file";
 import { nullToUndefined } from "@/utils/transform";
 import { z } from "zod";
 import { mergeMetadata1 } from "./file";
@@ -290,6 +294,27 @@ const PublicMagicMetadata = z
     })
     .passthrough();
 
+/**
+ * Return the public magic metadata for an {@link EnteFile}.
+ *
+ * We are not expected to be in a scenario where the file gets to the UI without
+ * having its public magic metadata decrypted, so this function is a sanity
+ * check and should be a no-op in usually. It'll throw if it finds its
+ * assumptions broken. Once the types have been refactored this entire
+ * check/cast shouldn't be needed, and this should become a trivial accessor.
+ */
+export const filePublicMagicMetadata = (file: EnteFile) => {
+    if (!file.pubMagicMetadata) return undefined;
+    if (typeof file.pubMagicMetadata.data == "string") {
+        throw new Error(
+            `Public magic metadata for ${fileLogID(file)} had not been decrypted even when the file reached the UI layer`,
+        );
+    }
+    // This cast is unavoidable in the current setup. We need to refactor the
+    // types so that this cast in not needed.
+    return file.pubMagicMetadata.data as PublicMagicMetadata;
+};
+
 /**
  * Return the hash of the file by reading it from its metadata.
  *
diff --git a/web/packages/new/photos/services/dedup.ts b/web/packages/new/photos/services/dedup.ts
index fe57f3d063..1b7554b269 100644
--- a/web/packages/new/photos/services/dedup.ts
+++ b/web/packages/new/photos/services/dedup.ts
@@ -2,8 +2,7 @@ import { assertionFailed } from "@/base/assert";
 import { newID } from "@/base/id";
 import { ensureLocalUser } from "@/base/local-user";
 import type { EnteFile } from "@/media/file";
-import { metadataHash } from "@/media/file-metadata";
-import { getPublicMagicMetadataSync } from "@ente/shared/file-metadata";
+import { filePublicMagicMetadata, metadataHash } from "@/media/file-metadata";
 import {
     addToCollection,
     createCollectionNameByID,
@@ -310,7 +309,7 @@ const duplicateGroupItemToRetain = (duplicateGroup: DuplicateGroup) => {
     const itemsWithCaption: DuplicateGroup["items"] = [];
     const itemsWithOtherEdits: DuplicateGroup["items"] = [];
     for (const item of duplicateGroup.items) {
-        const pubMM = getPublicMagicMetadataSync(item.file);
+        const pubMM = filePublicMagicMetadata(item.file);
         if (!pubMM) continue;
         if (pubMM.caption) itemsWithCaption.push(item);
         if (pubMM.editedName ?? pubMM.editedTime)
diff --git a/web/packages/new/photos/services/search/worker.ts b/web/packages/new/photos/services/search/worker.ts
index 655bf59f10..c17bf65200 100644
--- a/web/packages/new/photos/services/search/worker.ts
+++ b/web/packages/new/photos/services/search/worker.ts
@@ -3,9 +3,12 @@ import { logUnhandledErrorsAndRejectionsInWorker } from "@/base/log-web";
 import type { Location } from "@/base/types";
 import type { Collection } from "@/media/collection";
 import type { EnteFile } from "@/media/file";
-import { fileCreationPhotoDate, fileLocation } from "@/media/file-metadata";
+import {
+    fileCreationPhotoDate,
+    fileLocation,
+    filePublicMagicMetadata,
+} from "@/media/file-metadata";
 import { nullToUndefined } from "@/utils/transform";
-import { filePublicMagicMetadata } from "@ente/shared/file-metadata";
 import type { Component } from "chrono-node";
 import * as chrono from "chrono-node";
 import { expose } from "comlink";
diff --git a/web/packages/shared/file-metadata.ts b/web/packages/shared/file-metadata.ts
deleted file mode 100644
index f1e8795961..0000000000
--- a/web/packages/shared/file-metadata.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { isDevBuild } from "@/base/env";
-import { type EnteFile, fileLogID } from "@/media/file";
-import {
-    decryptPublicMagicMetadata,
-    type PublicMagicMetadata,
-} from "@/media/file-metadata";
-
-/**
- * On-demand decrypt the public magic metadata for an {@link EnteFile} for code
- * running synchronously.
- *
- * It both modifies the given file object, and also returns the decrypted
- * metadata.
- *
- * We are not expected to be in a scenario where the file gets to the UI without
- * having its public magic metadata decrypted, so this function is a sanity
- * check and should be a no-op in usually. On debug builds it'll throw if it
- * finds its assumptions broken. Once the types have been refactored this entire
- * backup code-path can be removed, and this should become a trivial accessor.
- */
-export const filePublicMagicMetadata = (file: EnteFile) => {
-    if (!file.pubMagicMetadata) return undefined;
-    if (typeof file.pubMagicMetadata.data == "string") {
-        if (isDevBuild)
-            throw new Error(
-                `Public magic metadata for ${fileLogID(file)} had not been decrypted even when the file reached the UI layer`,
-            );
-        decryptPublicMagicMetadata(file);
-    }
-    // This cast is unavoidable in the current setup. We need to refactor the
-    // types so that this cast in not needed.
-    return file.pubMagicMetadata.data as PublicMagicMetadata;
-};

From 3ae65e1de91418443156cc7de310761c9a52b4aa Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Tue, 25 Feb 2025 11:16:22 +0530
Subject: [PATCH 500/796] [server] don't allow setting storageLimit for INVITED
 users

---
 server/pkg/controller/family/admin.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/pkg/controller/family/admin.go b/server/pkg/controller/family/admin.go
index c944c0cfc4..204ee3dee7 100644
--- a/server/pkg/controller/family/admin.go
+++ b/server/pkg/controller/family/admin.go
@@ -205,7 +205,7 @@ func (c *Controller) ModifyMemberStorage(ctx context.Context, actorUserID int64,
 		return stacktrace.Propagate(ente.NewBadRequestWithMessage("can not limit admin storage"), "cannot modify admin storage limit")
 	}
 
-	if member.Status != ente.ACCEPTED && member.Status != ente.INVITED {
+	if member.Status != ente.ACCEPTED {
 		return stacktrace.Propagate(ente.ErrBadRequest, "user is not a part of family")
 	}
 

From ba000c2304c17c07cee45219541577d73da1ffc2 Mon Sep 17 00:00:00 2001
From: Crowdin Bot <support+bot@crowdin.com>
Date: Tue, 25 Feb 2025 06:21:48 +0000
Subject: [PATCH 501/796] New Crowdin translations by GitHub Action

---
 .../metadata/android/tr/full_description.txt  |   4 +-
 mobile/fastlane/metadata/ios/tr/name.txt      |   2 +-
 mobile/fastlane/metadata/ios/tr/subtitle.txt  |   2 +-
 mobile/lib/l10n/intl_ar.arb                   |   3 +-
 mobile/lib/l10n/intl_be.arb                   |   3 +-
 mobile/lib/l10n/intl_bg.arb                   |   3 +-
 mobile/lib/l10n/intl_ca.arb                   |   3 +-
 mobile/lib/l10n/intl_cs.arb                   |   3 +-
 mobile/lib/l10n/intl_da.arb                   |   3 +-
 mobile/lib/l10n/intl_de.arb                   |  89 ++-
 mobile/lib/l10n/intl_el.arb                   |   3 +-
 mobile/lib/l10n/intl_es.arb                   |  83 ++-
 mobile/lib/l10n/intl_et.arb                   |   3 +-
 mobile/lib/l10n/intl_fa.arb                   |   3 +-
 mobile/lib/l10n/intl_fr.arb                   | 248 ++++++---
 mobile/lib/l10n/intl_gu.arb                   |   3 +-
 mobile/lib/l10n/intl_he.arb                   |   3 +-
 mobile/lib/l10n/intl_hi.arb                   |   3 +-
 mobile/lib/l10n/intl_hu.arb                   |   3 +-
 mobile/lib/l10n/intl_id.arb                   |   3 +-
 mobile/lib/l10n/intl_it.arb                   |  11 +-
 mobile/lib/l10n/intl_ja.arb                   | 324 ++++++++++-
 mobile/lib/l10n/intl_km.arb                   |   3 +-
 mobile/lib/l10n/intl_ko.arb                   |   3 +-
 mobile/lib/l10n/intl_lt.arb                   |  77 ++-
 mobile/lib/l10n/intl_ml.arb                   |   3 +-
 mobile/lib/l10n/intl_nl.arb                   |  90 ++-
 mobile/lib/l10n/intl_no.arb                   |   3 +-
 mobile/lib/l10n/intl_pl.arb                   |  22 +-
 mobile/lib/l10n/intl_pt.arb                   |  97 +++-
 mobile/lib/l10n/intl_ro.arb                   |  19 +-
 mobile/lib/l10n/intl_ru.arb                   |   3 +-
 mobile/lib/l10n/intl_sl.arb                   |   3 +-
 mobile/lib/l10n/intl_sv.arb                   |  97 +++-
 mobile/lib/l10n/intl_ta.arb                   |   3 +-
 mobile/lib/l10n/intl_te.arb                   |   3 +-
 mobile/lib/l10n/intl_th.arb                   |   3 +-
 mobile/lib/l10n/intl_ti.arb                   |   3 +-
 mobile/lib/l10n/intl_tr.arb                   | 518 +++++++++++++++++-
 mobile/lib/l10n/intl_uk.arb                   |  17 +-
 mobile/lib/l10n/intl_vi.arb                   |  11 +-
 mobile/lib/l10n/intl_zh.arb                   |  86 ++-
 42 files changed, 1691 insertions(+), 178 deletions(-)

diff --git a/mobile/fastlane/metadata/android/tr/full_description.txt b/mobile/fastlane/metadata/android/tr/full_description.txt
index 2362583f60..a978db8478 100644
--- a/mobile/fastlane/metadata/android/tr/full_description.txt
+++ b/mobile/fastlane/metadata/android/tr/full_description.txt
@@ -1,6 +1,6 @@
-ente, fotoğraflarınızı ve videolarınızı yedeklemek ve paylaşmak için basit bir uygulamadır.
+ente, fotoğraflarınızı ve videolarınızı yedekleyip paylaşmanızı sağlayan kullanimi kolay bir uygulamadır.
 
-Google Fotoğraflar'a gizlilik dostu bir alternatif arıyorsanız doğru yere geldiniz. Ente ile uçtan uca şifrelenmiş olarak (e2ee) saklanırlar. Bu, onları yalnızca sizin görebileceğiniz anlamına gelir.
+Anılarınızı saklamak için gizlilik dostu bir alternatif arıyorsanız, doğru yere geldiniz. Ente ile uçtan uca şifrelenmiş olarak (e2ee) saklanırlar. Bu, onları yalnızca sizin görebileceğiniz anlamına gelir.
 
 Android, iOS, web ve masaüstünde açık kaynaklı uygulamalarımız var ve fotoğraflarınız bunların tümü arasında uçtan uca şifrelenmiş (e2ee) şekilde sorunsuz bir şekilde senkronize edilecek.
 
diff --git a/mobile/fastlane/metadata/ios/tr/name.txt b/mobile/fastlane/metadata/ios/tr/name.txt
index 04e5a9c011..06a3a6ebe6 100644
--- a/mobile/fastlane/metadata/ios/tr/name.txt
+++ b/mobile/fastlane/metadata/ios/tr/name.txt
@@ -1 +1 @@
-ente fotoğraf uygulaması
+Ente Fotoğraflar
diff --git a/mobile/fastlane/metadata/ios/tr/subtitle.txt b/mobile/fastlane/metadata/ios/tr/subtitle.txt
index cbc438b5f0..e0b41db095 100644
--- a/mobile/fastlane/metadata/ios/tr/subtitle.txt
+++ b/mobile/fastlane/metadata/ios/tr/subtitle.txt
@@ -1 +1 @@
-Şifrelenmiş depolama sistemi
+Ente - şifrelenmiş depolama sistemi
diff --git a/mobile/lib/l10n/intl_ar.arb b/mobile/lib/l10n/intl_ar.arb
index cc65c1038f..86273581a6 100644
--- a/mobile/lib/l10n/intl_ar.arb
+++ b/mobile/lib/l10n/intl_ar.arb
@@ -23,6 +23,5 @@
   "noRecoveryKeyNoDecryption": "لا يمكن فك تشفير بياناتك دون كلمة المرور أو مفتاح الاسترداد بسبب طبيعة بروتوكول التشفير الخاص بنا من النهاية إلى النهاية",
   "verifyEmail": "التحقق من البريد الإلكتروني",
   "toResetVerifyEmail": "لإعادة تعيين كلمة المرور، يرجى التحقق من بريدك الإلكتروني أولاً.",
-  "ackPasswordLostWarning": "أُدركُ أنّني فقدتُ كلمة مروري، فقد أفقد بياناتي لأن بياناتي <underline>مشفرة تشفيرًا تامًّا من النهاية إلى النهاية</underline>.",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "ackPasswordLostWarning": "أُدركُ أنّني فقدتُ كلمة مروري، فقد أفقد بياناتي لأن بياناتي <underline>مشفرة تشفيرًا تامًّا من النهاية إلى النهاية</underline>."
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_be.arb b/mobile/lib/l10n/intl_be.arb
index 2339063ba5..d6b7f03339 100644
--- a/mobile/lib/l10n/intl_be.arb
+++ b/mobile/lib/l10n/intl_be.arb
@@ -199,6 +199,5 @@
   "darkTheme": "Цёмная",
   "systemTheme": "Сістэма",
   "freeTrial": "Бясплатная пробная версія",
-  "faqs": "Частыя пытанні",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "faqs": "Частыя пытанні"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_bg.arb b/mobile/lib/l10n/intl_bg.arb
index 1a5f45c37d..c8494661c6 100644
--- a/mobile/lib/l10n/intl_bg.arb
+++ b/mobile/lib/l10n/intl_bg.arb
@@ -1,4 +1,3 @@
 {
-  "@@locale ": "en",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "@@locale ": "en"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_ca.arb b/mobile/lib/l10n/intl_ca.arb
index 1a5f45c37d..c8494661c6 100644
--- a/mobile/lib/l10n/intl_ca.arb
+++ b/mobile/lib/l10n/intl_ca.arb
@@ -1,4 +1,3 @@
 {
-  "@@locale ": "en",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "@@locale ": "en"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_cs.arb b/mobile/lib/l10n/intl_cs.arb
index 78b8961406..2bd9d2da70 100644
--- a/mobile/lib/l10n/intl_cs.arb
+++ b/mobile/lib/l10n/intl_cs.arb
@@ -2,6 +2,5 @@
   "@@locale ": "en",
   "askDeleteReason": "Jaký je váš hlavní důvod, proč mažete svůj účet?",
   "incorrectRecoveryKeyBody": "",
-  "checkInboxAndSpamFolder": "Zkontrolujte prosím svou doručenou poštu (a spam) pro dokončení ověření",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "checkInboxAndSpamFolder": "Zkontrolujte prosím svou doručenou poštu (a spam) pro dokončení ověření"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_da.arb b/mobile/lib/l10n/intl_da.arb
index 93a3c2bde1..d29d7c345e 100644
--- a/mobile/lib/l10n/intl_da.arb
+++ b/mobile/lib/l10n/intl_da.arb
@@ -242,6 +242,5 @@
   "longPressAnEmailToVerifyEndToEndEncryption": "Langt tryk på en e-mail for at bekræfte slutningen af krypteringen.",
   "developerSettingsWarning": "Er du sikker på, at du vil ændre udviklerindstillingerne?",
   "next": "Næste",
-  "enterPin": "Indtast PIN",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "enterPin": "Indtast PIN"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_de.arb b/mobile/lib/l10n/intl_de.arb
index eccc1c014e..dd6e8b4b29 100644
--- a/mobile/lib/l10n/intl_de.arb
+++ b/mobile/lib/l10n/intl_de.arb
@@ -965,6 +965,14 @@
   "syncStopped": "Synchronisierung angehalten",
   "syncProgress": "{completed}/{total} Erinnerungsstücke gesichert",
   "uploadingMultipleMemories": "Sichere {count} Erinnerungsstücke...",
+  "@uploadingMultipleMemories": {
+    "description": "Text to tell user how many memories are being preserved",
+    "placeholders": {
+      "count": {
+        "type": "String"
+      }
+    }
+  },
   "uploadingSingleMemory": "Sichere ein Erinnerungsstück...",
   "@syncProgress": {
     "description": "Text to tell user how many memories have been preserved",
@@ -1402,7 +1410,7 @@
     },
     "description": "Number of viewers that were successfully added to an album."
   },
-  "collaboratorsSuccessfullyAdded": "{count, plural, =0 {0 Mitarbeiter hinzugefügt} =1 {1 Mitarbeiter hinzugefügt} other {{count} Mitarbeiter hinzugefügt}}",
+  "collaboratorsSuccessfullyAdded": "{count, plural, one {}=0 {0 Mitarbeiter hinzugefügt} =1 {1 Mitarbeiter hinzugefügt} other {{count} Mitarbeiter hinzugefügt}}",
   "@collaboratorsSuccessfullyAdded": {
     "placeholders": {
       "count": {
@@ -1477,7 +1485,7 @@
   },
   "currentlyRunning": "läuft gerade",
   "ignored": "ignoriert",
-  "photosCount": "{count, plural, =0 {0 Fotos} =1 {1 Foto} other {{count} Fotos}}",
+  "photosCount": "{count, plural, one {}=0 {0 Fotos} =1 {1 Foto} other {{count} Fotos}}",
   "@photosCount": {
     "placeholders": {
       "count": {
@@ -1590,7 +1598,80 @@
   "joinAlbumSubtext": "um deine Fotos anzuzeigen und hinzuzufügen",
   "joinAlbumSubtextViewer": "um dies zu geteilten Alben hinzuzufügen",
   "join": "Beitreten",
-  "link": "Link",
+  "linkEmail": "E-Mail-Adresse verknüpfen",
+  "link": "Verknüpfen",
   "noEnteAccountExclamation": "Kein Ente-Konto!",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "emailDoesNotHaveEnteAccount": "{email} hat kein Ente-Konto.",
+  "@emailDoesNotHaveEnteAccount": {
+    "description": "Shown when email doesn't have an Ente account",
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "accountOwnerPersonAppbarTitle": "{title} (Ich)",
+  "@accountOwnerPersonAppbarTitle": {
+    "description": "Title of appbar for account owner person",
+    "placeholders": {
+      "title": {
+        "type": "String"
+      }
+    }
+  },
+  "reassignMe": "\"Ich\" neu zuweisen",
+  "me": "Ich",
+  "linkEmailToContactBannerCaption": "für schnelleres Teilen",
+  "@linkEmailToContactBannerCaption": {
+    "description": "Caption for the 'Link email' title. It should be a continuation of the 'Link email' title. Just like how 'Link email' + 'for faster sharing' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "selectPersonToLink": "Person zum Verknüpfen auswählen",
+  "linkPersonToEmail": "Person mit {email} verknüpfen",
+  "@linkPersonToEmail": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "linkPersonToEmailConfirmation": "Dies wird {personName} mit {email} verknüpfen",
+  "@linkPersonToEmailConfirmation": {
+    "description": "Confirmation message when linking a person to an email",
+    "placeholders": {
+      "personName": {
+        "type": "String"
+      },
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "selectYourFace": "Wähle dein Gesicht",
+  "reassigningLoading": "Ordne neu zu...",
+  "reassignedToName": "Du wurdest an {name} neu zugewiesen",
+  "@reassignedToName": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "saveChangesBeforeLeavingQuestion": "Änderungen vor dem Verlassen speichern?",
+  "dontSave": "Nicht speichern",
+  "thisIsMeExclamation": "Das bin ich!",
+  "linkPerson": "Person verknüpfen",
+  "linkPersonCaption": "um besseres Teilen zu ermöglichen",
+  "@linkPersonCaption": {
+    "description": "Caption for the 'Link person' title. It should be a continuation of the 'Link person' title. Just like how 'Link person' + 'for better sharing experience' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "videoStreaming": "Video-Streaming",
+  "processingVideos": "Verarbeite Videos",
+  "streamDetails": "Stream-Details",
+  "processing": "In Bearbeitung",
+  "queued": "In der Warteschlange",
+  "ineligible": "Unzulässig",
+  "failed": "Fehlgeschlagen",
+  "playStream": "Stream abspielen",
+  "playOriginal": "Original abspielen",
+  "joinAlbumConfirmationDialogBody": "Wenn du einem Album beitrittst, wird deine E-Mail-Adresse für seine Teilnehmer sichtbar."
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_el.arb b/mobile/lib/l10n/intl_el.arb
index a3e70ec1ee..ce8b1a1a54 100644
--- a/mobile/lib/l10n/intl_el.arb
+++ b/mobile/lib/l10n/intl_el.arb
@@ -1,5 +1,4 @@
 {
   "@@locale ": "en",
-  "enterYourEmailAddress": "Εισάγετε την διεύθυνση ηλ. ταχυδρομείου σας",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "enterYourEmailAddress": "Εισάγετε την διεύθυνση ηλ. ταχυδρομείου σας"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_es.arb b/mobile/lib/l10n/intl_es.arb
index 4c070013e1..027d86301c 100644
--- a/mobile/lib/l10n/intl_es.arb
+++ b/mobile/lib/l10n/intl_es.arb
@@ -965,6 +965,14 @@
   "syncStopped": "Sincronización detenida",
   "syncProgress": "{completed}/{total} recuerdos conservados",
   "uploadingMultipleMemories": "Preservando {count} memorias...",
+  "@uploadingMultipleMemories": {
+    "description": "Text to tell user how many memories are being preserved",
+    "placeholders": {
+      "count": {
+        "type": "String"
+      }
+    }
+  },
   "uploadingSingleMemory": "Preservando 1 memoria...",
   "@syncProgress": {
     "description": "Text to tell user how many memories have been preserved",
@@ -1593,5 +1601,78 @@
   "linkEmail": "Vincular correo electrónico",
   "link": "Enlace",
   "noEnteAccountExclamation": "¡No existe una cuenta de Ente!",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "orPickFromYourContacts": "o elige de entre tus contactos",
+  "emailDoesNotHaveEnteAccount": "{email} no tiene una cuenta de Ente.",
+  "@emailDoesNotHaveEnteAccount": {
+    "description": "Shown when email doesn't have an Ente account",
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "accountOwnerPersonAppbarTitle": "{title} (Yo)",
+  "@accountOwnerPersonAppbarTitle": {
+    "description": "Title of appbar for account owner person",
+    "placeholders": {
+      "title": {
+        "type": "String"
+      }
+    }
+  },
+  "reassignMe": "Reasignar \"Yo\"",
+  "me": "Yo",
+  "linkEmailToContactBannerCaption": "para compartir más rápido",
+  "@linkEmailToContactBannerCaption": {
+    "description": "Caption for the 'Link email' title. It should be a continuation of the 'Link email' title. Just like how 'Link email' + 'for faster sharing' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "selectPersonToLink": "Selecciona persona a vincular",
+  "linkPersonToEmail": "Enlazar persona a {email}",
+  "@linkPersonToEmail": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "linkPersonToEmailConfirmation": "Esto enlazará a {personName} a {email}",
+  "@linkPersonToEmailConfirmation": {
+    "description": "Confirmation message when linking a person to an email",
+    "placeholders": {
+      "personName": {
+        "type": "String"
+      },
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "selectYourFace": "Selecciona tu cara",
+  "reassigningLoading": "Reasignando...",
+  "reassignedToName": "Te has reasignado a {name}",
+  "@reassignedToName": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "saveChangesBeforeLeavingQuestion": "¿Guardar cambios antes de salir?",
+  "dontSave": "No guardar",
+  "thisIsMeExclamation": "¡Este soy yo!",
+  "linkPerson": "Vincular persona",
+  "linkPersonCaption": "para una mejor experiencia compartida",
+  "@linkPersonCaption": {
+    "description": "Caption for the 'Link person' title. It should be a continuation of the 'Link person' title. Just like how 'Link person' + 'for better sharing experience' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "videoStreaming": "Transmisión de vídeo",
+  "processingVideos": "Procesando vídeos",
+  "streamDetails": "Detalles de la transmisión",
+  "processing": "Procesando",
+  "queued": "En cola",
+  "ineligible": "Inelegible",
+  "failed": "Fallido",
+  "playStream": "Reproducir transmisión",
+  "playOriginal": "Reproducir original",
+  "joinAlbumConfirmationDialogBody": "Unirse a un álbum hará visible tu correo electrónico a sus participantes."
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_et.arb b/mobile/lib/l10n/intl_et.arb
index 85e9a51736..dfe1fba1a4 100644
--- a/mobile/lib/l10n/intl_et.arb
+++ b/mobile/lib/l10n/intl_et.arb
@@ -218,6 +218,5 @@
   "storageBreakupYou": "Sina",
   "@storageBreakupYou": {
     "description": "Label to indicate how much storage you are using when you are part of a family plan"
-  },
-  "orPickFromYourContacts": "or pick from your contacts"
+  }
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_fa.arb b/mobile/lib/l10n/intl_fa.arb
index 7229950a22..ba9d203a8f 100644
--- a/mobile/lib/l10n/intl_fa.arb
+++ b/mobile/lib/l10n/intl_fa.arb
@@ -308,6 +308,5 @@
   "developerSettings": "تنظیمات توسعه‌دهنده",
   "search": "جستجو",
   "whatsNew": "تغییرات جدید",
-  "reviewSuggestions": "مرور پیشنهادها",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "reviewSuggestions": "مرور پیشنهادها"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_fr.arb b/mobile/lib/l10n/intl_fr.arb
index adff93b6db..ca1b7fe027 100644
--- a/mobile/lib/l10n/intl_fr.arb
+++ b/mobile/lib/l10n/intl_fr.arb
@@ -2,8 +2,8 @@
   "@@locale ": "en",
   "enterYourEmailAddress": "Entrez votre adresse e-mail",
   "accountWelcomeBack": "Bon retour parmi nous !",
-  "emailAlreadyRegistered": "E-mail déjà enregistré.",
-  "emailNotRegistered": "E-mail non enregistré.",
+  "emailAlreadyRegistered": "Email déjà enregistré.",
+  "emailNotRegistered": "Email inconnu.",
   "email": "E-mail",
   "cancel": "Annuler",
   "verify": "Vérifier",
@@ -50,12 +50,12 @@
   "noRecoveryKey": "Aucune clé de récupération ?",
   "sorry": "Désolé",
   "noRecoveryKeyNoDecryption": "En raison de notre protocole de chiffrement de bout en bout, vos données ne peuvent pas être déchiffré sans votre mot de passe ou clé de récupération",
-  "verifyEmail": "Vérifier l'e-mail",
-  "toResetVerifyEmail": "Pour réinitialiser votre mot de passe, veuillez d'abord vérifier votre e-mail.",
-  "checkInboxAndSpamFolder": "Veuillez consulter votre boîte de réception (ainsi que les indésirables) pour compléter la vérification",
+  "verifyEmail": "Vérifier l'email",
+  "toResetVerifyEmail": "Pour réinitialiser votre mot de passe, vérifiez d'abord votre email.",
+  "checkInboxAndSpamFolder": "Consultez votre boîte de réception (et les indésirables) pour finaliser la vérification",
   "tapToEnterCode": "Appuyez pour entrer le code",
-  "resendEmail": "Renvoyer l'e-mail",
-  "weHaveSendEmailTo": "Nous avons envoyé un e-mail à <green>{email}</green>",
+  "resendEmail": "Renvoyer l'email",
+  "weHaveSendEmailTo": "Nous avons envoyé un email à <green>{email}</green>",
   "@weHaveSendEmailTo": {
     "description": "Text to indicate that we have sent a mail to the user",
     "placeholders": {
@@ -72,7 +72,7 @@
   "encryptionKeys": "Clés de chiffrement",
   "passwordWarning": "Nous ne stockons pas ce mot de passe, donc si vous l'oubliez, <underline>nous ne pouvons pas déchiffrer vos données</underline>",
   "enterPasswordToEncrypt": "Entrez un mot de passe que nous pouvons utiliser pour chiffrer vos données",
-  "enterNewPasswordToEncrypt": "Saisir un nouveau mot de passe pour l'utiliser pour chiffrer vos données",
+  "enterNewPasswordToEncrypt": "Saisissez votre nouveau mot de passe qui sera utilisé pour chiffrer vos données",
   "weakStrength": "Securité Faible",
   "strongStrength": "Forte",
   "moderateStrength": "Moyen",
@@ -114,7 +114,7 @@
   "verifyPassword": "Vérifier le mot de passe",
   "recoveryKey": "Clé de secours",
   "recoveryKeyOnForgotPassword": "Si vous oubliez votre mot de passe, la seule façon de récupérer vos données sera grâce à cette clé.",
-  "recoveryKeySaveDescription": "Nous ne stockons pas cette clé, veuillez garder cette clé de 24 mots dans un endroit sûr.",
+  "recoveryKeySaveDescription": "Nous ne la stockons pas, veuillez la conserver en lieu endroit sûr.",
   "doThisLater": "Plus tard",
   "saveKey": "Enregistrer la clé",
   "recoveryKeyCopiedToClipboard": "Clé de secours copiée dans le presse-papiers",
@@ -142,7 +142,7 @@
   "setupComplete": "Configuration terminée",
   "saveYourRecoveryKeyIfYouHaventAlready": "Enregistrez votre clé de récupération si vous ne l'avez pas déjà fait",
   "thisCanBeUsedToRecoverYourAccountIfYou": "Cela peut être utilisé pour récupérer votre compte si vous perdez votre deuxième facteur",
-  "twofactorAuthenticationPageTitle": "Authentification à deux facteurs",
+  "twofactorAuthenticationPageTitle": "Authentification à deux facteurs (A2F)",
   "lostDevice": "Appareil perdu ?",
   "verifyingRecoveryKey": "Vérification de la clé de récupération...",
   "recoveryKeyVerified": "Clé de récupération vérifiée",
@@ -159,7 +159,7 @@
   "addANewEmail": "Ajouter un nouvel email",
   "orPickAnExistingOne": "Ou sélectionner un email existant",
   "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum": "Les collaborateurs peuvent ajouter des photos et des vidéos à l'album partagé.",
-  "enterEmail": "Entrer e-mail",
+  "enterEmail": "Entrer un email",
   "albumOwner": "Propriétaire",
   "@albumOwner": {
     "description": "Role of the album owner"
@@ -186,7 +186,7 @@
     "description": "Switch button to enable uploading photos to a public link"
   },
   "allowAddPhotosDescription": "Autorisez les personnes ayant le lien à ajouter des photos dans l'album partagé.",
-  "passwordLock": "Mot de passe verrou",
+  "passwordLock": "Verrouillage par mot de passe",
   "canNotOpenTitle": "Impossible d'ouvrir cet album",
   "canNotOpenBody": "Désolé, cet album ne peut pas être ouvert dans l'application.",
   "disableDownloadWarningTitle": "Veuillez remarquer",
@@ -252,7 +252,7 @@
   },
   "thisIsYourVerificationId": "Ceci est votre ID de vérification",
   "someoneSharingAlbumsWithYouShouldSeeTheSameId": "Quelqu'un qui partage des albums avec vous devrait voir le même ID sur son appareil.",
-  "howToViewShareeVerificationID": "Demandez-leur d'appuyer longuement sur leur adresse e-mail sur l'écran des paramètres et de vérifier que les identifiants des deux appareils correspondent.",
+  "howToViewShareeVerificationID": "Demandez-leur d'appuyer longuement sur leur adresse email dans l'écran des paramètres pour vérifier que les identifiants des deux appareils correspondent.",
   "thisIsPersonVerificationId": "Ceci est l'ID de vérification de {email}",
   "@thisIsPersonVerificationId": {
     "placeholders": {
@@ -272,10 +272,10 @@
   "shareTextRecommendUsingEnte": "Téléchargez Ente pour pouvoir facilement partager des photos et vidéos en qualité originale\n\nhttps://ente.io",
   "done": "Terminé",
   "applyCodeTitle": "Utiliser le code",
-  "enterCodeDescription": "Entrez le code fourni par votre ami pour réclamer de l'espace de stockage gratuit pour vous deux",
+  "enterCodeDescription": "Entrez le code fourni par votre ami·e pour débloquer l'espace de stockage gratuit",
   "apply": "Appliquer",
   "failedToApplyCode": "Impossible d'appliquer le code",
-  "enterReferralCode": "Entrez le code de parrainage",
+  "enterReferralCode": "Code de parrainage",
   "codeAppliedPageTitle": "Code appliqué",
   "changeYourReferralCode": "Modifier votre code de parrainage",
   "change": "Modifier",
@@ -292,15 +292,15 @@
   "theyAlsoGetXGb": "Ils obtiennent aussi {storageAmountInGB} Go",
   "freeStorageOnReferralSuccess": "{storageAmountInGB} Go chaque fois que quelqu'un s'inscrit à une offre payante et applique votre code",
   "shareTextReferralCode": "Code de parrainage Ente : {referralCode} \n\nValidez le dans Paramètres → Général → Références pour obtenir {referralStorageInGB} Go gratuitement après votre inscription à un plan payant\n\nhttps://ente.io",
-  "claimFreeStorage": "Stockage gratuit obtenu",
-  "inviteYourFriends": "Invitez vos ami(e)s",
+  "claimFreeStorage": "Obtenez du stockage gratuit",
+  "inviteYourFriends": "Parrainez vos ami·e·s",
   "failedToFetchReferralDetails": "Impossible de récupérer les détails du parrainage. Veuillez réessayer plus tard.",
-  "referralStep1": "1. Donnez ce code à vos amis",
-  "referralStep2": "2. Ils s'inscrivent à une offre payante",
-  "referralStep3": "3. Vous recevez tous les deux {storageInGB} GB* gratuits",
+  "referralStep1": "1. Donnez ce code à vos ami·e·s",
+  "referralStep2": "2. Ils souscrivent à une offre payante",
+  "referralStep3": "3. Vous recevez tous les deux {storageInGB} Go* gratuits",
   "referralsAreCurrentlyPaused": "Les recommandations sont actuellement en pause",
   "youCanAtMaxDoubleYourStorage": "* Vous pouvez au maximum doubler votre espace de stockage",
-  "claimedStorageSoFar": "{isFamilyMember, select, true {Votre famille a demandé {storageAmountInGb} GB jusqu'à présent} false {Vous avez réclamé {storageAmountInGb} GB jusqu'à présent} other {Vous avez réclamé {storageAmountInGb} GB jusqu'à présent!}}",
+  "claimedStorageSoFar": "{isFamilyMember, select, true {Votre famille a obtenu {storageAmountInGb} Go jusqu'à présent} false {Vous avez obtenu {storageAmountInGb} Go jusqu'à présent} other {Vous avez obtenu {storageAmountInGb} Go jusqu'à présent !}}",
   "@claimedStorageSoFar": {
     "placeholders": {
       "isFamilyMember": {
@@ -314,15 +314,15 @@
     }
   },
   "faq": "FAQ",
-  "help": "Aide",
+  "help": "Documentation",
   "oopsSomethingWentWrong": "Oups, une erreur est arrivée",
-  "peopleUsingYourCode": "Personnes utilisant votre code",
+  "peopleUsingYourCode": "Filleul·e·s utilisant votre code",
   "eligible": "éligible",
   "total": "total",
   "codeUsedByYou": "Code utilisé par vous",
   "freeStorageClaimed": "Stockage gratuit obtenu",
-  "freeStorageUsable": "Stockage gratuit utilisable",
-  "usableReferralStorageInfo": "Le stockage utilisable est limité par votre offre actuelle. Le stockage excédentaire deviendra automatiquement utilisable lorsque vous mettez à niveau votre offre.",
+  "freeStorageUsable": "Stockage gratuit disponible",
+  "usableReferralStorageInfo": "Le stockage gratuit possible est limité par votre offre actuelle. Vous pouvez au maximum doubler votre espace de stockage gratuitement, le stockage supplémentaire deviendra donc automatiquement utilisable lorsque vous mettrez à niveau votre offre.",
   "removeFromAlbumTitle": "Retirer de l'album ?",
   "removeFromAlbum": "Retirer de l'album",
   "itemsWillBeRemovedFromAlbum": "Les éléments sélectionnés seront supprimés de cet album",
@@ -419,12 +419,12 @@
   "photoGridSize": "Taille de la grille photo",
   "manageDeviceStorage": "Gérer le cache de l'appareil",
   "manageDeviceStorageDesc": "Examiner et vider le cache.",
-  "machineLearning": "Apprentissage automatique",
+  "machineLearning": "Apprentissage automatique (IA locale)",
   "mlConsent": "Activer l'apprentissage automatique",
   "mlConsentTitle": "Activer l'apprentissage automatique ?",
-  "mlConsentDescription": "Si vous activez l'apprentissage automatique, Ente extraira des informations comme la géométrie des visages, incluant les photos partagées avec vous. \nCela se fera sur votre appareil, avec un cryptage de bout-en-bout de toutes les données biométriques générées.",
+  "mlConsentDescription": "Si vous activez l'apprentissage automatique Ente extraira des informations comme la géométrie des visages, y compris dans les photos partagées avec vous. \nCela se fera localement sur votre appareil et avec un chiffrement bout-en-bout de toutes les données biométriques générées.",
   "mlConsentPrivacy": "Veuillez cliquer ici pour plus de détails sur cette fonctionnalité dans notre politique de confidentialité",
-  "mlConsentConfirmation": "Je comprends, et souhaite activer l'apprentissage automatique",
+  "mlConsentConfirmation": "Je comprends et je souhaite activer l'apprentissage automatique",
   "magicSearch": "Recherche magique",
   "discover": "Découverte",
   "@discover": {
@@ -445,15 +445,15 @@
   "discover_sunset": "Coucher du soleil",
   "discover_hills": "Montagnes",
   "discover_greenery": "Plantes",
-  "mlIndexingDescription": "Veuillez noter que l'apprentissage automatique entraînera une augmentation de l'utilisation de la bande passante et de la batterie, jusqu'à ce que tous les éléments soient indexés. \nEnvisagez d'utiliser l'application de bureau pour une indexation plus rapide, tous les résultats seront automatiquement synchronisés.",
+  "mlIndexingDescription": "Veuillez noter que l'apprentissage automatique entraînera une augmentation de l'utilisation de la connexion Internet et de la batterie jusqu'à ce que tous les souvenirs soient indexés. \nVous pouvez utiliser l'application de bureau Ente pour accélérer cette étape, tous les résultats seront synchronisés.",
   "loadingModel": "Téléchargement des modèles...",
   "waitingForWifi": "En attente de connexion Wi-Fi...",
   "status": "État",
   "indexedItems": "Éléments indexés",
   "pendingItems": "Éléments en attente",
   "clearIndexes": "Effacer les index",
-  "selectFoldersForBackup": "Sélectionnez les dossiers à sauvegarder",
-  "selectedFoldersWillBeEncryptedAndBackedUp": "Les dossiers sélectionnés seront cryptés et sauvegardés",
+  "selectFoldersForBackup": "Dossiers à sauvegarder",
+  "selectedFoldersWillBeEncryptedAndBackedUp": "Les dossiers sélectionnés seront chiffrés et sauvegardés",
   "unselectAll": "Désélectionner tout",
   "selectAll": "Tout sélectionner",
   "skip": "Ignorer",
@@ -483,10 +483,10 @@
   "backupOverMobileData": "Sauvegarder avec les données mobiles",
   "backupVideos": "Sauvegarde des vidéos",
   "disableAutoLock": "Désactiver le verrouillage automatique",
-  "deviceLockExplanation": "Désactiver le verrouillage de l'écran de l'appareil lorsque ente est au premier plan et il y a une sauvegarde en cours. Ce n'est normalement pas nécessaire, mais peut aider les gros téléchargements et les premières importations de grandes bibliothèques plus rapidement.",
-  "about": "À propos",
+  "deviceLockExplanation": "Désactiver le verrouillage de l'écran lorsque Ente est au premier plan et qu'une sauvegarde est en cours. Ce n'est normalement pas nécessaire mais cela peut faciliter les gros téléchargements et les premières importations de grandes bibliothèques.",
+  "about": "À propos d'Ente",
   "weAreOpenSource": "Nous sommes open source !",
-  "privacy": "Confidentialité",
+  "privacy": "Politique de confidentialité",
   "terms": "Conditions",
   "checkForUpdates": "Vérifier les mises à jour",
   "checkStatus": "Vérifier le statut",
@@ -494,11 +494,11 @@
   "youAreOnTheLatestVersion": "Vous êtes sur la dernière version",
   "account": "Compte",
   "manageSubscription": "Gérer l'abonnement",
-  "authToChangeYourEmail": "Veuillez vous authentifier pour modifier votre adresse e-mail",
+  "authToChangeYourEmail": "Authentifiez-vous pour modifier votre adresse email",
   "changePassword": "Modifier le mot de passe",
   "authToChangeYourPassword": "Veuillez vous authentifier pour modifier votre mot de passe",
-  "emailVerificationToggle": "Vérification de l'adresse e-mail",
-  "authToChangeEmailVerificationSetting": "Veuillez vous authentifier pour modifier votre adresse e-mail",
+  "emailVerificationToggle": "Authentification à deux facteurs par email",
+  "authToChangeEmailVerificationSetting": "Authentifiez-vous pour modifier l'authentification à deux facteurs par email",
   "exportYourData": "Exportez vos données",
   "logout": "Déconnexion",
   "authToInitiateAccountDeletion": "Veuillez vous authentifier pour débuter la suppression du compte",
@@ -561,23 +561,23 @@
   "referrals": "Parrainages",
   "notifications": "Notifications",
   "sharedPhotoNotifications": "Nouvelles photos partagées",
-  "sharedPhotoNotificationsExplanation": "Recevoir des notifications quand quelqu'un ajoute une photo à un album partagé dont vous faites partie",
+  "sharedPhotoNotificationsExplanation": "Recevoir des notifications quand quelqu'un·e ajoute une photo à un album partagé dont vous faites partie",
   "advanced": "Avancé",
   "general": "Général",
   "security": "Sécurité",
   "authToViewYourRecoveryKey": "Veuillez vous authentifier pour afficher votre clé de récupération",
-  "twofactor": "Double authentification",
+  "twofactor": "Authentification à deux facteurs (A2F)",
   "authToConfigureTwofactorAuthentication": "Veuillez vous authentifier pour configurer l'authentification à deux facteurs",
   "lockscreen": "Écran de verrouillage",
   "authToChangeLockscreenSetting": "Veuillez vous authentifier pour modifier les paramètres de l'écran de verrouillage",
-  "viewActiveSessions": "Afficher les sessions actives",
-  "authToViewYourActiveSessions": "Veuillez vous authentifier pour voir vos sessions actives",
-  "disableTwofactor": "Désactiver la double-authentification",
+  "viewActiveSessions": "Afficher les connexions actives",
+  "authToViewYourActiveSessions": "Authentifiez-vous pour voir les connexions actives",
+  "disableTwofactor": "Désactiver l'authentification à deux facteurs",
   "confirm2FADisable": "Voulez-vous vraiment désactiver l'authentification à deux facteurs ?",
   "no": "Non",
   "yes": "Oui",
-  "social": "Réseaux sociaux",
-  "rateUsOnStore": "Notez-nous sur {storeName}",
+  "social": "Retrouvez nous",
+  "rateUsOnStore": "Laissez une note sur {storeName}",
   "blog": "Blog",
   "merchandise": "Boutique",
   "twitter": "Twitter",
@@ -586,9 +586,9 @@
   "discord": "Discord",
   "reddit": "Reddit",
   "yourStorageDetailsCouldNotBeFetched": "Vos informations de stockage n'ont pas pu être récupérées",
-  "reportABug": "Signaler un bug",
-  "reportBug": "Signaler un bug",
-  "suggestFeatures": "Suggérer des fonctionnalités",
+  "reportABug": "Signaler un bogue",
+  "reportBug": "Signaler un bogue",
+  "suggestFeatures": "Suggérer une fonctionnalité",
   "support": "Support",
   "theme": "Thème",
   "lightTheme": "Clair",
@@ -596,7 +596,7 @@
   "systemTheme": "Système",
   "freeTrial": "Essai gratuit",
   "selectYourPlan": "Sélectionner votre offre",
-  "enteSubscriptionPitch": "Ente conserve vos souvenirs, ils sont donc toujours disponibles pour vous, même si vous perdez votre appareil.",
+  "enteSubscriptionPitch": "Ente conserve vos souvenirs pour qu'ils soient toujours disponible, même si vous perdez cet appareil.",
   "enteSubscriptionShareWithFamily": "Vous pouvez également ajouter votre famille à votre forfait.",
   "currentUsageIs": "L'utilisation actuelle est de ",
   "@currentUsageIs": {
@@ -663,7 +663,7 @@
   "playstoreSubscription": "Abonnement au PlayStore",
   "appstoreSubscription": "Abonnement à l'AppStore",
   "subAlreadyLinkedErrMessage": "Votre {id} est déjà lié à un autre compte Ente.\nSi vous souhaitez utiliser votre {id} avec ce compte, veuillez contacter notre support",
-  "visitWebToManage": "Veuillez visiter web.ente.io pour gérer votre abonnement",
+  "visitWebToManage": "Vous pouvez gérer votre abonnement sur web.ente.io",
   "couldNotUpdateSubscription": "Impossible de mettre à jour l’abonnement",
   "pleaseContactSupportAndWeWillBeHappyToHelp": "Veuillez contacter support@ente.io et nous serons heureux de vous aider!",
   "paymentFailed": "Échec du paiement",
@@ -821,7 +821,7 @@
   "sharedWithMe": "Partagés avec moi",
   "sharedByMe": "Partagé par moi",
   "doubleYourStorage": "Doublez votre espace de stockage",
-  "referFriendsAnd2xYourPlan": "Parrainez des amis et doublez votre abonnement",
+  "referFriendsAnd2xYourPlan": "Parrainez vos ami·e·s et doublez votre stockage",
   "shareAlbumHint": "Ouvrez un album et appuyez sur le bouton de partage en haut à droite pour le partager.",
   "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion": "Les éléments montrent le nombre de jours restants avant la suppression définitive",
   "trashDaysLeft": "{count, plural, =0 {Bientôt} =1 {1 jour} other {{count} jours}}",
@@ -894,7 +894,7 @@
   "totalSize": "Taille totale",
   "longpressOnAnItemToViewInFullscreen": "Appuyez longuement sur un élément pour le voir en plein écran",
   "decryptingVideo": "Déchiffrement de la vidéo...",
-  "authToViewYourMemories": "Veuillez vous authentifier pour voir vos souvenirs",
+  "authToViewYourMemories": "Authentifiez-vous pour voir vos souvenirs",
   "unlock": "Déverrouiller",
   "freeUpSpace": "Libérer de l'espace",
   "freeUpSpaceSaving": "{count, plural, one {Il peut être supprimé de l'appareil pour libérer {formattedSize}} other {Ils peuvent être supprimés de l'appareil pour libérer {formattedSize}}}",
@@ -955,17 +955,25 @@
   "twofactorAuthenticationHasBeenDisabled": "L'authentification à deux facteurs a été désactivée",
   "sorryTheCodeYouveEnteredIsIncorrect": "Le code que vous avez saisi est incorrect",
   "yourVerificationCodeHasExpired": "Votre code de vérification a expiré",
-  "emailChangedTo": "L'e-mail a été changé en {newEmail}",
+  "emailChangedTo": "L'email a été changé par {newEmail}",
   "verifying": "Validation en cours...",
-  "disablingTwofactorAuthentication": "Désactiver la double-authentification...",
-  "allMemoriesPreserved": "Tous les souvenirs sont conservés",
+  "disablingTwofactorAuthentication": "Désactivation de l'authentification à deux facteurs...",
+  "allMemoriesPreserved": "Tous les souvenirs sont sauvegardés",
   "loadingGallery": "Chargement de la galerie...",
   "syncing": "En cours de synchronisation...",
   "encryptingBackup": "Chiffrement de la sauvegarde...",
   "syncStopped": "Synchronisation arrêtée ?",
-  "syncProgress": "{completed}/{total} souvenirs conservés",
-  "uploadingMultipleMemories": "Sauvegarde {count} souvenirs...",
-  "uploadingSingleMemory": "Sauvegarde 1 souvenir...",
+  "syncProgress": "{completed}/{total} souvenirs sauvegardés",
+  "uploadingMultipleMemories": "Sauvegarde de {count} souvenirs...",
+  "@uploadingMultipleMemories": {
+    "description": "Text to tell user how many memories are being preserved",
+    "placeholders": {
+      "count": {
+        "type": "String"
+      }
+    }
+  },
+  "uploadingSingleMemory": "Sauvegarde d'un souvenir...",
   "@syncProgress": {
     "description": "Text to tell user how many memories have been preserved",
     "placeholders": {
@@ -1010,13 +1018,13 @@
   "localGallery": "Galerie locale",
   "todaysLogs": "Journaux du jour",
   "viewLogs": "Afficher les journaux",
-  "logsDialogBody": "Cela enverra des logs pour nous aider à déboguer votre problème. Veuillez noter que les noms de fichiers seront inclus pour aider à suivre les problèmes avec des fichiers spécifiques.",
+  "logsDialogBody": "Les journaux seront envoyés pour nous aider à déboguer votre problème. Les noms de fichiers seront inclus pour aider à identifier les problèmes.",
   "preparingLogs": "Préparation des journaux...",
-  "emailYourLogs": "Envoyez vos logs par e-mail",
+  "emailYourLogs": "Envoyez vos journaux par email",
   "pleaseSendTheLogsTo": "Envoyez les logs à {toEmail}",
-  "copyEmailAddress": "Copier l’adresse e-mail",
+  "copyEmailAddress": "Copier l’adresse email",
   "exportLogs": "Exporter les logs",
-  "pleaseEmailUsAt": "Merci de nous envoyer un e-mail à {toEmail}",
+  "pleaseEmailUsAt": "Merci de nous envoyer un email à {toEmail}",
   "dismiss": "Rejeter",
   "didYouKnow": "Le savais-tu ?",
   "loadingMessage": "Chargement de vos photos...",
@@ -1036,7 +1044,7 @@
   "searchFaceEmptySection": "Les personnes seront affichées ici une fois l'indexation terminée",
   "searchDatesEmptySection": "Recherche par date, mois ou année",
   "searchLocationEmptySection": "Grouper les photos qui sont prises dans un certain angle d'une photo",
-  "searchPeopleEmptySection": "Invitez des personnes, et vous verrez ici toutes les photos qu'elles partagent",
+  "searchPeopleEmptySection": "Invitez quelqu'un·e et vous verrez ici toutes les photos partagées",
   "searchAlbumsEmptySection": "Albums",
   "searchFileTypesAndNamesEmptySection": "Types et noms de fichiers",
   "searchCaptionEmptySection": "Ajoutez des descriptions comme \"#trip\" dans les infos photo pour les retrouver ici plus rapidement",
@@ -1158,7 +1166,7 @@
   "@map": {
     "description": "Label for the map view"
   },
-  "maps": "Cartes",
+  "maps": "Carte",
   "enableMaps": "Activer la carte",
   "enableMapsDesc": "Vos photos seront affichées sur une carte du monde.\n\nCette carte est hébergée par Open Street Map, et les emplacements exacts de vos photos ne sont jamais partagés.\n\nVous pouvez désactiver cette fonction à tout moment dans les Paramètres.",
   "quickLinks": "Liens rapides",
@@ -1177,14 +1185,14 @@
   "noAlbumsSharedByYouYet": "Aucun album que vous avez partagé",
   "sharedWithYou": "Partagé avec vous",
   "sharedByYou": "Partagé par vous",
-  "inviteYourFriendsToEnte": "Invitez vos amis sur Ente",
+  "inviteYourFriendsToEnte": "Invitez vos ami·e·s sur Ente",
   "failedToDownloadVideo": "Échec du téléchargement de la vidéo",
   "hiding": "Masquage en cours...",
   "unhiding": "Démasquage en cours...",
   "successfullyHid": "Masquage réussi",
   "successfullyUnhid": "Masquage réussi",
-  "crashReporting": "Rapports d'erreurs",
-  "resumableUploads": "Reprise des chargements",
+  "crashReporting": "Rapport d'erreur",
+  "resumableUploads": "Reprise automatique des transferts",
   "addToHiddenAlbum": "Ajouter à un album masqué",
   "moveToHiddenAlbum": "Déplacer vers un album masqué",
   "fileTypes": "Types de fichiers",
@@ -1239,13 +1247,13 @@
   "cleanUncategorized": "Effacer les éléments non classés",
   "cleanUncategorizedDescription": "Supprimer tous les fichiers non-catégorisés étant présents dans d'autres albums",
   "waitingForVerification": "En attente de vérification...",
-  "passkey": "Code d'accès",
-  "passkeyAuthTitle": "Vérification du code d'accès",
+  "passkey": "Authentification à deux facteurs avec une clé de sécurité",
+  "passkeyAuthTitle": "Vérification de la clé de sécurité",
   "loginWithTOTP": "Se connecter avec TOTP",
   "passKeyPendingVerification": "La vérification est toujours en attente",
   "loginSessionExpired": "Session expirée",
   "loginSessionExpiredDetails": "Votre session a expiré. Veuillez vous reconnecter.",
-  "verifyPasskey": "Vérifier le code d'accès",
+  "verifyPasskey": "Vérifier la clé de sécurité",
   "playOnTv": "Lire l'album sur la TV",
   "pair": "Associer",
   "deviceNotFound": "Appareil non trouvé",
@@ -1261,7 +1269,7 @@
   "findPeopleByName": "Trouver des personnes rapidement par leur nom",
   "addViewers": "{count, plural, zero {Ajouter un observateur} one {Ajouter un observateur} other {Ajouter des observateurs}}",
   "addCollaborators": "{count, plural, zero {Ajouter un collaborateur} one {Ajouter un collaborateur} other {Ajouter des collaborateurs}}",
-  "longPressAnEmailToVerifyEndToEndEncryption": "Appuyez longuement sur un e-mail pour vérifier le chiffrement de bout en bout.",
+  "longPressAnEmailToVerifyEndToEndEncryption": "Appuyez longuement sur un email pour vérifier le chiffrement de bout en bout.",
   "developerSettingsWarning": "Êtes-vous sûr de vouloir modifier les paramètres du développeur ?",
   "developerSettings": "Paramètres du développeur",
   "serverEndpoint": "Point de terminaison serveur",
@@ -1320,13 +1328,13 @@
   "enable": "Activer",
   "enabled": "Activé",
   "moreDetails": "Plus de détails",
-  "enableMLIndexingDesc": "Ente prend en charge l'apprentissage automatique sur l'appareil pour la reconnaissance faciale, la recherche magique et d'autres fonctionnalités de recherche avancée",
+  "enableMLIndexingDesc": "Ente prend en charge l'apprentissage automatique sur l'appareil pour la reconnaissance des visages, la recherche magique et d'autres fonctionnalités de recherche avancée",
   "magicSearchHint": "La recherche magique permet de rechercher des photos par leur contenu, par exemple 'fleur', 'voiture rouge', 'documents d'identité'",
   "panorama": "Panorama",
   "reenterPassword": "Ressaisir le mot de passe",
   "reenterPin": "Ressaisir le code PIN",
-  "deviceLock": "Verrouillage de l'appareil",
-  "pinLock": "Verrouillage du code PIN",
+  "deviceLock": "Verrouillage par défaut de l'appareil",
+  "pinLock": "Verrouillage par code PIN",
   "next": "Suivant",
   "setNewPassword": "Définir un nouveau mot de passe",
   "enterPin": "Saisir le code PIN",
@@ -1338,7 +1346,7 @@
   "videoInfo": "Informations vidéo",
   "autoLock": "Verrouillage automatique",
   "immediately": "Immédiatement",
-  "autoLockFeatureDescription": "Délai après lequel l'application se verrouille une fois qu'elle a été mise en arrière-plan",
+  "autoLockFeatureDescription": "Délai après lequel l'application se verrouille une fois qu'elle est en arrière-plan",
   "hideContent": "Masquer le contenu",
   "hideContentDescriptionAndroid": "Masque le contenu de l'application dans le sélecteur d'applications et désactive les captures d'écran",
   "hideContentDescriptionIos": "Masque le contenu de l'application dans le sélecteur d'application",
@@ -1353,7 +1361,7 @@
   "collectPhotosDescription": "Créez un lien où vos amis peuvent ajouter des photos en qualité originale.",
   "collect": "Récupérer",
   "appLockDescriptions": "Choisissez entre l'écran de verrouillage par défaut de votre appareil et un écran de verrouillage personnalisé avec un code PIN ou un mot de passe.",
-  "toEnableAppLockPleaseSetupDevicePasscodeOrScreen": "Pour activer le verrouillage d'application, veuillez configurer le code d'accès de l'appareil ou le verrouillage de l'écran dans les paramètres de votre système.",
+  "toEnableAppLockPleaseSetupDevicePasscodeOrScreen": "Pour activer le verrouillage de l'application vous devez configurer le code d'accès de l'appareil ou le verrouillage de l'écran dans les paramètres de votre système.",
   "authToViewPasskey": "Veuillez vous authentifier pour afficher votre clé de récupération",
   "loopVideoOn": "Vidéo en boucle activée",
   "loopVideoOff": "Vidéo en boucle désactivée",
@@ -1382,14 +1390,14 @@
   "extraPhotosFound": "Photos supplémentaires trouvées",
   "configuration": "Paramètres",
   "localIndexing": "Indexation locale",
-  "processed": "Traité",
+  "processed": "Appris",
   "resetPerson": "Réinitialiser",
   "areYouSureYouWantToResetThisPerson": "Êtes-vous certain de vouloir réinitialiser cette personne ?",
   "allPersonGroupingWillReset": "Tous les groupements pour cette personne seront réinitialisés, et vous perdrez toutes les suggestions faites pour cette personne",
   "yesResetPerson": "Oui, réinitialiser la personne",
   "onlyThem": "Seulement eux",
   "checkingModels": "Vérification des modèles...",
-  "enableMachineLearningBanner": "Activer l'apprentissage automatique pour la recherche magique et la reconnaissance faciale",
+  "enableMachineLearningBanner": "Activer l'apprentissage automatique pour la reconnaissance des visages et la recherche magique",
   "searchDiscoverEmptySection": "Les images seront affichées ici une fois le traitement terminé",
   "searchPersonsEmptySection": "Les personnes seront affichées ici une fois le traitement terminé",
   "viewersSuccessfullyAdded": "{count, plural, =0 {0 observateur ajouté} =1 {1 observateur ajouté} other {{count} observateurs ajoutés}}",
@@ -1417,7 +1425,7 @@
   "@sessionIdMismatch": {
     "description": "In passkey page, deeplink is ignored because of session ID mismatch."
   },
-  "failedToFetchActiveSessions": "Impossible de récupérer les sessions actives",
+  "failedToFetchActiveSessions": "Impossible de récupérer les connexions actives",
   "@failedToFetchActiveSessions": {
     "description": "In session page, warn user (in toast) that active sessions could not be fetched."
   },
@@ -1511,7 +1519,7 @@
   "changeLogBackupStatusTitle": "Statut de la Sauvegarde",
   "changeLogBackupStatusContent": "Nous avons ajouté un journal de tous les fichiers qui ont été envoyés vers Ente, y compris les échecs et la file d'attente.",
   "changeLogDiscoverTitle": "Découverte",
-  "changeLogDiscoverContent": "Vous cherchez des photos de vos cartes d'identité, des notes ou même des memes? Allez dans l'onglet de recherche et découvrez Découverte. Sur la base de notre recherche sémantique, vous trouverez des photos qui pourraient être importantes pour vous.\\n\\nUniquement disponible si vous avez activé l'apprentissage automatique.",
+  "changeLogDiscoverContent": "Vous cherchez des photos de vos papiers d'identité, des notes ou même des \"memes\" ? Rendez-vous dans l'onglet de recherche et explorez la fonction Découverte. Grâce à notre recherche sémantique vous trouverez des photos qui pourraient être importantes pour vous.\\n\\nDisponible uniquement si vous avez activé l'apprentissage automatique.",
   "selectCoverPhoto": "Sélectionnez la photo de couverture",
   "newLocation": "Nouveau lieu",
   "faceNotClusteredYet": "Ce visage n'a pas encore été regroupé, veuillez revenir plus tard",
@@ -1529,7 +1537,7 @@
   "removeYourselfAsTrustedContact": "Retirez-vous comme contact de confiance",
   "legacy": "Héritage",
   "legacyPageDesc": "L'héritage permet aux contacts de confiance d'accéder à votre compte en votre absence.",
-  "legacyPageDesc2": "Les contacts de confiance peuvent initier la récupération du compte et, s'ils ne sont pas bloqués dans les 30 jours qui suivent, peuvent réinitialiser votre mot de passe et accéder à votre compte.",
+  "legacyPageDesc2": "Ces contacts peuvent initier la récupération du compte et, s'ils ne sont pas bloqués dans les 30 jours qui suivent, peuvent réinitialiser votre mot de passe et accéder à votre compte.",
   "legacyAccounts": "Comptes hérités",
   "trustedContacts": "Contacts de confiance",
   "addTrustedContact": "Ajouter un contact de confiance",
@@ -1584,11 +1592,87 @@
   "legacyInvite": "{email} vous a invité à être un contact de confiance",
   "authToManageLegacy": "Veuillez vous authentifier pour gérer vos contacts de confiance",
   "useDifferentPlayerInfo": "Vous avez des difficultés pour lire cette vidéo ? Appuyez longuement ici pour essayer un autre lecteur.",
-  "hideSharedItemsFromHomeGallery": "Masquer les éléments partagés de la galerie d'accueil",
+  "hideSharedItemsFromHomeGallery": "Masquer les éléments partagés avec vous dans la galerie",
   "gallery": "Galerie",
   "joinAlbum": "Rejoindre l'album",
   "joinAlbumSubtext": "pour afficher et ajouter vos photos",
   "joinAlbumSubtextViewer": "pour ajouter ceci aux albums partagés",
   "join": "Rejoindre",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "linkEmail": "Lier l'email",
+  "link": "Lier",
+  "noEnteAccountExclamation": "Aucun compte Ente !",
+  "orPickFromYourContacts": "ou choisissez parmi vos contacts",
+  "emailDoesNotHaveEnteAccount": "{email} n'a pas de compte Ente.",
+  "@emailDoesNotHaveEnteAccount": {
+    "description": "Shown when email doesn't have an Ente account",
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "accountOwnerPersonAppbarTitle": "{title} (Moi)",
+  "@accountOwnerPersonAppbarTitle": {
+    "description": "Title of appbar for account owner person",
+    "placeholders": {
+      "title": {
+        "type": "String"
+      }
+    }
+  },
+  "reassignMe": "Réassigner \"Moi\"",
+  "me": "Moi",
+  "linkEmailToContactBannerCaption": "pour un partage plus rapide",
+  "@linkEmailToContactBannerCaption": {
+    "description": "Caption for the 'Link email' title. It should be a continuation of the 'Link email' title. Just like how 'Link email' + 'for faster sharing' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "selectPersonToLink": "Sélectionnez la personne à associer",
+  "linkPersonToEmail": "Associer la personne à {email}",
+  "@linkPersonToEmail": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "linkPersonToEmailConfirmation": "Cela va associer {personName} à {email}",
+  "@linkPersonToEmailConfirmation": {
+    "description": "Confirmation message when linking a person to an email",
+    "placeholders": {
+      "personName": {
+        "type": "String"
+      },
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "selectYourFace": "Sélectionnez votre visage",
+  "reassigningLoading": "Réassignation...",
+  "reassignedToName": "Vous a réassigné à {name}",
+  "@reassignedToName": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "saveChangesBeforeLeavingQuestion": "Enregistrer les modifications avant de quitter ?",
+  "dontSave": "Ne pas enregistrer",
+  "thisIsMeExclamation": "C'est moi !",
+  "linkPerson": "Lier la personne",
+  "linkPersonCaption": "pour une meilleure expérience de partage",
+  "@linkPersonCaption": {
+    "description": "Caption for the 'Link person' title. It should be a continuation of the 'Link person' title. Just like how 'Link person' + 'for better sharing experience' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "videoStreaming": "Streaming vidéo",
+  "processingVideos": "Traitement des vidéos",
+  "streamDetails": "Détails du stream",
+  "processing": "Traitement en cours",
+  "queued": "En file d'attente",
+  "ineligible": "Non compatible",
+  "failed": "Échec",
+  "playStream": "Lire le stream",
+  "playOriginal": "Lire l'original",
+  "joinAlbumConfirmationDialogBody": "Rejoindre un album rendra votre e-mail visible à ses participants."
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_gu.arb b/mobile/lib/l10n/intl_gu.arb
index 1a5f45c37d..c8494661c6 100644
--- a/mobile/lib/l10n/intl_gu.arb
+++ b/mobile/lib/l10n/intl_gu.arb
@@ -1,4 +1,3 @@
 {
-  "@@locale ": "en",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "@@locale ": "en"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_he.arb b/mobile/lib/l10n/intl_he.arb
index a75dd77c29..f0aad995f8 100644
--- a/mobile/lib/l10n/intl_he.arb
+++ b/mobile/lib/l10n/intl_he.arb
@@ -815,6 +815,5 @@
   "addPhotos": "הוסף תמונות",
   "create": "צור",
   "viewAll": "הצג הכל",
-  "hiding": "מחביא...",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "hiding": "מחביא..."
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_hi.arb b/mobile/lib/l10n/intl_hi.arb
index d16db2abef..b79d9682f2 100644
--- a/mobile/lib/l10n/intl_hi.arb
+++ b/mobile/lib/l10n/intl_hi.arb
@@ -48,6 +48,5 @@
   "sorry": "क्षमा करें!",
   "noRecoveryKeyNoDecryption": "हमारे एंड-टू-एंड एन्क्रिप्शन प्रोटोकॉल की प्रकृति के कारण, आपके डेटा को आपके पासवर्ड या रिकवरी कुंजी के बिना डिक्रिप्ट नहीं किया जा सकता है",
   "verifyEmail": "ईमेल सत्यापित करें",
-  "toResetVerifyEmail": "अपना पासवर्ड रीसेट करने के लिए, कृपया पहले अपना ईमेल सत्यापित करें।",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "toResetVerifyEmail": "अपना पासवर्ड रीसेट करने के लिए, कृपया पहले अपना ईमेल सत्यापित करें।"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_hu.arb b/mobile/lib/l10n/intl_hu.arb
index f960f6f7f6..92bdab9095 100644
--- a/mobile/lib/l10n/intl_hu.arb
+++ b/mobile/lib/l10n/intl_hu.arb
@@ -10,6 +10,5 @@
   "deleteAccount": "Fiók törlése",
   "askDeleteReason": "Miért törli a fiókját?",
   "deleteAccountFeedbackPrompt": "Sajnáljuk, hogy távozik. Kérjük, ossza meg velünk visszajelzéseit, hogy segítsen nekünk a fejlődésben.",
-  "feedback": "Visszajelzés",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "feedback": "Visszajelzés"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_id.arb b/mobile/lib/l10n/intl_id.arb
index 5cf6af497a..21ff8eed39 100644
--- a/mobile/lib/l10n/intl_id.arb
+++ b/mobile/lib/l10n/intl_id.arb
@@ -1131,6 +1131,5 @@
   "rotate": "Putar",
   "left": "Kiri",
   "right": "Kanan",
-  "whatsNew": "Hal yang baru",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "whatsNew": "Hal yang baru"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_it.arb b/mobile/lib/l10n/intl_it.arb
index 03f526fb67..98e7d7dd49 100644
--- a/mobile/lib/l10n/intl_it.arb
+++ b/mobile/lib/l10n/intl_it.arb
@@ -962,6 +962,14 @@
   "syncStopped": "Sincronizzazione interrotta",
   "syncProgress": "{completed}/{total} ricordi conservati",
   "uploadingMultipleMemories": "Conservando {count} ricordi...",
+  "@uploadingMultipleMemories": {
+    "description": "Text to tell user how many memories are being preserved",
+    "placeholders": {
+      "count": {
+        "type": "String"
+      }
+    }
+  },
   "uploadingSingleMemory": "Conservando 1 ricordo...",
   "@syncProgress": {
     "description": "Text to tell user how many memories have been preserved",
@@ -1543,6 +1551,5 @@
   "authToManageLegacy": "Autenticati per gestire i tuoi contatti fidati",
   "useDifferentPlayerInfo": "Hai problemi a riprodurre questo video? Premi a lungo qui per provare un altro lettore.",
   "hideSharedItemsFromHomeGallery": "Nascondi gli elementi condivisi dalla galleria principale",
-  "gallery": "Galleria",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "gallery": "Galleria"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_ja.arb b/mobile/lib/l10n/intl_ja.arb
index a03a212a72..0ea404b5d2 100644
--- a/mobile/lib/l10n/intl_ja.arb
+++ b/mobile/lib/l10n/intl_ja.arb
@@ -2,6 +2,8 @@
   "@@locale ": "en",
   "enterYourEmailAddress": "Eメールアドレスを入力",
   "accountWelcomeBack": "おかえりなさい！",
+  "emailAlreadyRegistered": "このメールアドレスはすでに登録されています。",
+  "emailNotRegistered": "このメールアドレスはまだ登録されていません。",
   "email": "Eメール",
   "cancel": "キャンセル",
   "verify": "確認",
@@ -185,6 +187,8 @@
   },
   "allowAddPhotosDescription": "リンクを持つ人が共有アルバムに写真を追加できるようにします。",
   "passwordLock": "パスワード保護",
+  "canNotOpenTitle": "このアルバムは開けません",
+  "canNotOpenBody": "申し訳ありません。このアルバムをアプリで開くことができませんでした。",
   "disableDownloadWarningTitle": "ご注意ください",
   "disableDownloadWarningBody": "ビューアーはスクリーンショットを撮ったり、外部ツールを使用して写真のコピーを保存したりすることができます",
   "allowDownloads": "ダウンロードを許可",
@@ -351,6 +355,7 @@
   "failedToLoadAlbums": "アルバムの読み込みに失敗しました",
   "hidden": "非表示",
   "authToViewYourHiddenFiles": "隠しファイルを表示するには認証してください",
+  "authToViewTrashedFiles": "削除したファイルを閲覧するには認証が必要です",
   "trash": "ゴミ箱",
   "uncategorized": "カテゴリなし",
   "videoSmallCase": "ビデオ",
@@ -412,6 +417,8 @@
     "description": "The text to display in the advanced settings section"
   },
   "photoGridSize": "写真のグリッドサイズ",
+  "manageDeviceStorage": "端末のキャッシュを管理",
+  "manageDeviceStorageDesc": "端末上のキャッシュを確認・削除",
   "machineLearning": "機械学習",
   "mlConsent": "機械学習を有効にする",
   "mlConsentTitle": "機械学習を有効にしますか？",
@@ -419,13 +426,13 @@
   "mlConsentPrivacy": "この機能の詳細については、こちらをクリックしてください。",
   "mlConsentConfirmation": "機械学習を可能にしたい",
   "magicSearch": "マジックサーチ",
-  "discover": "ディスカバー",
+  "discover": "新たな発見",
   "@discover": {
     "description": "The text to display for the discover section under which we show receipts, screenshots, sunsets, greenery, etc."
   },
-  "discover_identity": "アイデンティティ",
+  "discover_identity": "身分証",
   "discover_screenshots": "スクリーンショット",
-  "discover_receipts": "領収書",
+  "discover_receipts": "レシート",
   "discover_notes": "メモ",
   "discover_memes": "ミーム",
   "discover_visiting_cards": "訪問カード",
@@ -687,6 +694,8 @@
   "noPhotosAreBeingBackedUpRightNow": "現在バックアップされている写真はありません",
   "preserveMore": "もっと保存する",
   "grantFullAccessPrompt": "設定アプリで、すべての写真へのアクセスを許可してください",
+  "allowPermTitle": "写真へのアクセスを許可",
+  "allowPermBody": "Enteがライブラリを表示およびバックアップできるように、端末の設定から写真へのアクセスを許可してください。",
   "openSettings": "設定を開く",
   "selectMorePhotos": "さらに写真を選択",
   "existingUser": "既存のユーザー",
@@ -733,7 +742,7 @@
     "description": "The text displayed above albums backed up to Ente",
     "type": "text"
   },
-  "onEnte": "<branding>Ente</branding>で保管",
+  "onEnte": "<branding>Ente</branding>が保管",
   "name": "名前順",
   "newest": "新しい順",
   "lastUpdated": "更新された順",
@@ -815,6 +824,16 @@
   "referFriendsAnd2xYourPlan": "友達に紹介して2倍",
   "shareAlbumHint": "アルバムを開いて右上のシェアボタンをタップ",
   "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion": "完全に削除されるまでの日数が項目に表示されます",
+  "trashDaysLeft": "{count, plural, =0 {} =1 {1日} other {{count} 日}}",
+  "@trashDaysLeft": {
+    "description": "Text to indicate number of days remaining before permanent deletion",
+    "placeholders": {
+      "count": {
+        "example": "1|2|3",
+        "type": "int"
+      }
+    }
+  },
   "deleteAll": "全て削除",
   "renameAlbum": "アルバムの名前変更",
   "convertToAlbum": "アルバムに変換",
@@ -946,6 +965,14 @@
   "syncStopped": "同期が停止しました",
   "syncProgress": "{completed}/{total} のメモリが保存されました",
   "uploadingMultipleMemories": "{count} メモリを保存しています...",
+  "@uploadingMultipleMemories": {
+    "description": "Text to tell user how many memories are being preserved",
+    "placeholders": {
+      "count": {
+        "type": "String"
+      }
+    }
+  },
   "uploadingSingleMemory": "1メモリを保存しています...",
   "@syncProgress": {
     "description": "Text to tell user how many memories have been preserved",
@@ -1013,7 +1040,7 @@
   "photoDescriptions": "写真の説明",
   "fileTypesAndNames": "ファイルの種類と名前",
   "location": "場所",
-  "moments": "モーメント",
+  "moments": "日々の瞬間",
   "searchFaceEmptySection": "学習が完了すると、ここに人が表示されます",
   "searchDatesEmptySection": "日付、月または年で検索",
   "searchLocationEmptySection": "当時の直近で撮影された写真をグループ化",
@@ -1222,6 +1249,7 @@
   "waitingForVerification": "確認を待っています...",
   "passkey": "パスキー",
   "passkeyAuthTitle": "パスキーの検証",
+  "loginWithTOTP": "TOTPでログイン",
   "passKeyPendingVerification": "検証はまだ保留中です",
   "loginSessionExpired": "セッション切れ",
   "loginSessionExpiredDetails": "セッションの有効期限が切れました。再度ログインしてください。",
@@ -1362,5 +1390,289 @@
   "extraPhotosFound": "追加の写真が見つかりました",
   "configuration": "設定",
   "localIndexing": "このデバイス上での実行",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "processed": "処理完了",
+  "resetPerson": "削除",
+  "areYouSureYouWantToResetThisPerson": "この人を忘れてもよろしいですね？",
+  "allPersonGroupingWillReset": "この人のグループ化がリセットされ、この人かもしれない写真への提案もなくなります",
+  "yesResetPerson": "リセット",
+  "onlyThem": "それらのみ",
+  "checkingModels": "モデルを確認しています...",
+  "enableMachineLearningBanner": "マジック検索と顔認識のため、機械学習を有効にする",
+  "searchDiscoverEmptySection": "処理と同期が完了すると、画像がここに表示されます",
+  "searchPersonsEmptySection": "処理と同期が完了すると、ここに人々が表示されます",
+  "viewersSuccessfullyAdded": "{count, plural, =0 {{count}人のビューアーを追加} =1 {{count}人のビューアーを追加} other {{count}人のビューアーを追加}}",
+  "@viewersSuccessfullyAdded": {
+    "placeholders": {
+      "count": {
+        "type": "int",
+        "example": "2"
+      }
+    },
+    "description": "Number of viewers that were successfully added to an album."
+  },
+  "collaboratorsSuccessfullyAdded": "{count, plural, =0 {{count}人のコラボレーターを追加} =1 {{count}人のコラボレーターを追加} other {{count}人のコラボレーターを追加}}",
+  "@collaboratorsSuccessfullyAdded": {
+    "placeholders": {
+      "count": {
+        "type": "int",
+        "example": "2"
+      }
+    },
+    "description": "Number of collaborators that were successfully added to an album."
+  },
+  "accountIsAlreadyConfigured": "アカウントが既に設定されています",
+  "sessionIdMismatch": "セッションIDが一致しません",
+  "@sessionIdMismatch": {
+    "description": "In passkey page, deeplink is ignored because of session ID mismatch."
+  },
+  "failedToFetchActiveSessions": "アクティブなセッションの取得に失敗しました",
+  "@failedToFetchActiveSessions": {
+    "description": "In session page, warn user (in toast) that active sessions could not be fetched."
+  },
+  "failedToRefreshStripeSubscription": "サブスクリプションの更新に失敗しました",
+  "failedToPlayVideo": "動画の再生に失敗しました",
+  "uploadIsIgnoredDueToIgnorereason": "以下の理由によりアップロードは無視されます: {ignoreReason}",
+  "@uploadIsIgnoredDueToIgnorereason": {
+    "placeholders": {
+      "ignoreReason": {
+        "type": "String",
+        "example": "no network"
+      }
+    }
+  },
+  "typeOfGallerGallerytypeIsNotSupportedForRename": "このギャラリーのタイプ {galleryType} は名前の変更には対応していません",
+  "@typeOfGallerGallerytypeIsNotSupportedForRename": {
+    "placeholders": {
+      "galleryType": {
+        "type": "String",
+        "example": "no network"
+      }
+    }
+  },
+  "tapToUploadIsIgnoredDue": "アップロードするにはタップしてください。 以下の理由のためアップロードは現在無視されています: {ignoreReason}",
+  "@tapToUploadIsIgnoredDue": {
+    "description": "Shown in upload icon widet, inside a tooltip.",
+    "placeholders": {
+      "ignoreReason": {
+        "type": "String",
+        "example": "no network"
+      }
+    }
+  },
+  "tapToUpload": "タップしてアップロード",
+  "@tapToUpload": {
+    "description": "Shown in upload icon widet, inside a tooltip."
+  },
+  "info": "情報",
+  "addFiles": "ファイルを追加",
+  "castAlbum": "アルバムをキャスト",
+  "imageNotAnalyzed": "画像が分析されていません",
+  "noFacesFound": "顔が見つかりません",
+  "fileNotUploadedYet": "ファイルがまだアップロードされていません",
+  "noSuggestionsForPerson": "{personName} の候補はありません",
+  "@noSuggestionsForPerson": {
+    "placeholders": {
+      "personName": {
+        "type": "String",
+        "example": "Alice"
+      }
+    }
+  },
+  "month": "月",
+  "yearShort": "年",
+  "@yearShort": {
+    "description": "Appears in pricing page (/yr)"
+  },
+  "currentlyRunning": "現在実行中",
+  "ignored": "無視された",
+  "photosCount": "{count, plural, =0 {0枚の写真} =1 {1枚の写真} other {{count} 枚の写真}}",
+  "@photosCount": {
+    "placeholders": {
+      "count": {
+        "type": "int",
+        "example": "2"
+      }
+    }
+  },
+  "file": "ファイル",
+  "searchSectionsLengthMismatch": "セクションの長さの不一致: {snapshotLength} != {searchLength}",
+  "@searchSectionsLengthMismatch": {
+    "description": "Appears in search tab page",
+    "placeholders": {
+      "snapshotLength": {
+        "type": "int",
+        "example": "1"
+      },
+      "searchLength": {
+        "type": "int",
+        "example": "2"
+      }
+    }
+  },
+  "selectMailApp": "メールアプリを選択",
+  "selectAllShort": "すべて",
+  "@selectAllShort": {
+    "description": "Text that appears in bottom right when you start to select multiple photos. When clicked, it selects all photos."
+  },
+  "changeLogMagicSearchImprovementTitle": "マジック検索の改善",
+  "changeLogMagicSearchImprovementContent": "マジック検索が改善しました。もう、あなたが探しているものを見つけるのを待つ必要はありません。",
+  "changeLogBackupStatusTitle": "バックアップ ステータス",
+  "changeLogBackupStatusContent": "私たちは、失敗と待機中を含む、Enteにアップロードされたすべてのファイルのログを追加しました。",
+  "changeLogDiscoverTitle": "ディスカバー",
+  "changeLogDiscoverContent": "IDカード、メモなどの写真をお探しですか？検索タブに移動し、ディスカバーを確認してください。 \\n\\n機械学習を有効にしている場合にのみ利用できます。",
+  "selectCoverPhoto": "カバー写真を選択",
+  "newLocation": "新しいロケーション",
+  "faceNotClusteredYet": "顔がまだ集まっていません。後で戻ってきてください",
+  "theLinkYouAreTryingToAccessHasExpired": "アクセスしようとしているリンクの期限が切れています。",
+  "openFile": "ファイルを開く",
+  "backupFile": "バックアップファイル",
+  "openAlbumInBrowser": "ブラウザでアルバムを開く",
+  "openAlbumInBrowserTitle": "このアルバムに写真を追加するには、Webアプリを使用してください",
+  "allow": "許可",
+  "allowAppToOpenSharedAlbumLinks": "共有アルバムリンクを開くことをアプリに許可する",
+  "seePublicAlbumLinksInApp": "アプリ内で公開アルバムのリンクを見る",
+  "emergencyContacts": "緊急連絡先",
+  "acceptTrustInvite": "招待を受け入れる",
+  "declineTrustInvite": "招待を拒否する",
+  "removeYourselfAsTrustedContact": "あなた自身を信頼できる連絡先から削除",
+  "legacy": "レガシー",
+  "legacyPageDesc": "レガシーでは、信頼できる連絡先が不在時(あなたが亡くなった時など)にアカウントにアクセスできます。",
+  "legacyPageDesc2": "信頼できる連絡先はアカウントの回復を開始することができます。30日以内にあなたが拒否しない場合は、その信頼する人がパスワードをリセットしてあなたのアカウントにアクセスできるようになります。",
+  "legacyAccounts": "レガシーアカウント",
+  "trustedContacts": "信頼する連絡先",
+  "addTrustedContact": "信頼する連絡先を追加",
+  "removeInvite": "招待を削除",
+  "recoveryWarning": "信頼する連絡先の持ち主があなたのアカウントにアクセスしようとしています",
+  "rejectRecovery": "リカバリを拒否する",
+  "recoveryInitiated": "リカバリが開始されました",
+  "recoveryInitiatedDesc": "{days} 日後にアカウントにアクセスできます。通知は {email}に送信されます。",
+  "@recoveryInitiatedDesc": {
+    "placeholders": {
+      "days": {
+        "type": "int",
+        "example": "30"
+      },
+      "email": {
+        "type": "String",
+        "example": "me@example.com"
+      }
+    }
+  },
+  "cancelAccountRecovery": "リカバリをキャンセル",
+  "recoveryAccount": "アカウントを復元",
+  "cancelAccountRecoveryBody": "リカバリをキャンセルしてもよろしいですか？",
+  "startAccountRecoveryTitle": "リカバリを開始",
+  "whyAddTrustContact": "信頼する連絡先は、データの復旧が必要な際に役立ちます。",
+  "recoveryReady": "{email}のアカウントを復元できるようになりました。新しいパスワードを設定してください。",
+  "@recoveryReady": {
+    "placeholders": {
+      "email": {
+        "type": "String",
+        "example": "me@example.com"
+      }
+    }
+  },
+  "recoveryWarningBody": "{email} はあなたのアカウントを復元しようとしています。",
+  "trustedInviteBody": "あなたは {email}から信頼する連絡先になってもらうよう、お願いされています。",
+  "warning": "警告",
+  "proceed": "続行",
+  "confirmAddingTrustedContact": "{email} を信頼する連絡先として追加しようとしています。 {numOfDays} 日間あなたの利用がなくなった場合、アカウントを復旧することができるようになります。",
+  "@confirmAddingTrustedContact": {
+    "placeholders": {
+      "email": {
+        "type": "String",
+        "example": "me@example.com"
+      },
+      "numOfDays": {
+        "type": "int",
+        "example": "30"
+      }
+    }
+  },
+  "legacyInvite": "{email} があなたを信頼する連絡先として招待しました",
+  "authToManageLegacy": "信頼する連絡先を管理するために認証してください",
+  "useDifferentPlayerInfo": "この動画の再生に問題がありますか？別のプレイヤーを試すには、ここを長押ししてください。",
+  "hideSharedItemsFromHomeGallery": "ホームギャラリーから共有された写真等を非表示",
+  "gallery": "ギャラリー",
+  "joinAlbum": "アルバムに参加",
+  "joinAlbumSubtext": "写真を表示したり、追加したりするために",
+  "joinAlbumSubtextViewer": "これを共有アルバムに追加するために",
+  "join": "参加する",
+  "linkEmail": "メールアドレスをリンクする",
+  "link": "リンク",
+  "noEnteAccountExclamation": "アカウントがありません！",
+  "orPickFromYourContacts": "または連絡先から選択",
+  "emailDoesNotHaveEnteAccount": "{email} は Ente アカウントを持っていません。",
+  "@emailDoesNotHaveEnteAccount": {
+    "description": "Shown when email doesn't have an Ente account",
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "accountOwnerPersonAppbarTitle": "{title} (私)",
+  "@accountOwnerPersonAppbarTitle": {
+    "description": "Title of appbar for account owner person",
+    "placeholders": {
+      "title": {
+        "type": "String"
+      }
+    }
+  },
+  "reassignMe": "\"自分\" を再割り当て",
+  "me": "自分",
+  "linkEmailToContactBannerCaption": "共有を高速化するために",
+  "@linkEmailToContactBannerCaption": {
+    "description": "Caption for the 'Link email' title. It should be a continuation of the 'Link email' title. Just like how 'Link email' + 'for faster sharing' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "selectPersonToLink": "リンクする人を選択",
+  "linkPersonToEmail": "この人物を {email}に紐づけ",
+  "@linkPersonToEmail": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "linkPersonToEmailConfirmation": "{personName} を {email} に紐づけします",
+  "@linkPersonToEmailConfirmation": {
+    "description": "Confirmation message when linking a person to an email",
+    "placeholders": {
+      "personName": {
+        "type": "String"
+      },
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "selectYourFace": "あなたの顔を選択",
+  "reassigningLoading": "再割り当て中...",
+  "reassignedToName": "あなたを {name} に紐づけました",
+  "@reassignedToName": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "saveChangesBeforeLeavingQuestion": "その前に変更を保存しますか？",
+  "dontSave": "保存しない",
+  "thisIsMeExclamation": "これは私です",
+  "linkPerson": "人を紐づけ",
+  "linkPersonCaption": "良い経験を分かち合うために",
+  "@linkPersonCaption": {
+    "description": "Caption for the 'Link person' title. It should be a continuation of the 'Link person' title. Just like how 'Link person' + 'for better sharing experience' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "videoStreaming": "動画ストリーミング",
+  "processingVideos": "動画を処理中",
+  "streamDetails": "動画の詳細",
+  "processing": "処理中",
+  "queued": "処理待ち",
+  "ineligible": "対象外",
+  "failed": "失敗",
+  "playStream": "再生",
+  "playOriginal": "元動画を再生",
+  "joinAlbumConfirmationDialogBody": "アルバムに参加すると、参加者にメールアドレスが公開されます。"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_km.arb b/mobile/lib/l10n/intl_km.arb
index 1a5f45c37d..c8494661c6 100644
--- a/mobile/lib/l10n/intl_km.arb
+++ b/mobile/lib/l10n/intl_km.arb
@@ -1,4 +1,3 @@
 {
-  "@@locale ": "en",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "@@locale ": "en"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_ko.arb b/mobile/lib/l10n/intl_ko.arb
index 45e987c9e6..06c81195f7 100644
--- a/mobile/lib/l10n/intl_ko.arb
+++ b/mobile/lib/l10n/intl_ko.arb
@@ -12,6 +12,5 @@
   "feedback": "피드백",
   "confirmAccountDeletion": "계정 삭제 확인",
   "deleteAccountPermanentlyButton": "계정을 영구적으로 삭제",
-  "yourAccountHasBeenDeleted": "계정이 삭제되었습니다.",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "yourAccountHasBeenDeleted": "계정이 삭제되었습니다."
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_lt.arb b/mobile/lib/l10n/intl_lt.arb
index 19b1ba3aab..016d909896 100644
--- a/mobile/lib/l10n/intl_lt.arb
+++ b/mobile/lib/l10n/intl_lt.arb
@@ -514,8 +514,15 @@
   "cannotDeleteSharedFiles": "Negalima ištrinti bendrinamų failų.",
   "theDownloadCouldNotBeCompleted": "Atsisiuntimas negalėjo būti baigtas.",
   "retry": "Kartoti",
+  "backedUpFolders": "Sukurtos atsarginės aplankų kopijos",
   "backup": "Kurti atsarginę kopiją",
+  "freeUpDeviceSpace": "Atlaisvinti įrenginio vietą",
+  "freeUpDeviceSpaceDesc": "Sutaupykite vietos savo įrenginyje išvalydami failus, kurių atsarginės kopijos jau buvo sukurtos.",
+  "allClear": "✨ Viskas išvalyta",
+  "noDeviceThatCanBeDeleted": "Neturite šiame įrenginyje failų, kuriuos galima ištrinti.",
   "removeDuplicates": "Šalinti dublikatus",
+  "removeDuplicatesDesc": "Peržiūrėkite ir pašalinkite failus, kurie yra tiksliai dublikatai.",
+  "viewLargeFiles": "Dideli failai",
   "noDuplicates": "✨ Dublikatų nėra",
   "youveNoDuplicateFilesThatCanBeCleared": "Neturite dubliuotų failų, kuriuos būtų galima išvalyti.",
   "success": "Sėkmė",
@@ -547,6 +554,8 @@
   "security": "Saugumas",
   "authToViewYourRecoveryKey": "Nustatykite tapatybę, kad peržiūrėtumėte savo atkūrimo raktą",
   "twofactor": "Dvigubas tapatybės nustatymas",
+  "lockscreen": "Ekrano užraktas",
+  "viewActiveSessions": "Peržiūrėti aktyvius seansus",
   "disableTwofactor": "Išjungti dvigubą tapatybės nustatymą",
   "confirm2FADisable": "Ar tikrai norite išjungti dvigubą tapatybės nustatymą?",
   "no": "Ne",
@@ -564,7 +573,7 @@
   "reportABug": "Pranešti apie riktą",
   "reportBug": "Pranešti apie riktą",
   "suggestFeatures": "Siūlyti funkcijas",
-  "support": "Palaikymas",
+  "support": "Pagalba",
   "theme": "Tema",
   "lightTheme": "Šviesi",
   "darkTheme": "Tamsi",
@@ -589,6 +598,7 @@
   "subscription": "Prenumerata",
   "paymentDetails": "Mokėjimo duomenys",
   "manageFamily": "Tvarkyti šeimą",
+  "contactToManageSubscription": "Susisiekite su mumis adresu support@ente.io, kad sutvarkytumėte savo {provider} prenumeratą.",
   "renewSubscription": "Atnaujinti prenumeratą",
   "cancelSubscription": "Atsisakyti prenumeratos",
   "yesCancel": "Taip, atsisakyti",
@@ -626,6 +636,7 @@
   "playstoreSubscription": "„PlayStore“ prenumerata",
   "subAlreadyLinkedErrMessage": "Jūsų {id} jau susietas su kita „Ente“ paskyra.\nJei norite naudoti savo {id} su šia paskyra, susisiekite su mūsų palaikymo komanda.",
   "visitWebToManage": "Aplankykite web.ente.io, kad tvarkytumėte savo prenumeratą",
+  "pleaseContactSupportAndWeWillBeHappyToHelp": "Susisiekite adresu support@ente.io ir mes mielai padėsime!",
   "paymentFailed": "Mokėjimas nepavyko",
   "paymentFailedTalkToProvider": "Kreipkitės į {providerName} palaikymo komandą, jei jums buvo nuskaičiuota.",
   "@paymentFailedTalkToProvider": {
@@ -740,6 +751,8 @@
     "description": "Page title while adding one or more items to album"
   },
   "createOrSelectAlbum": "Kurkite arba pasirinkite albumą",
+  "searchByAlbumNameHint": "Albumo pavadinimas",
+  "albumTitle": "Albumo pavadinimas",
   "enterAlbumName": "Įveskite albumo pavadinimą",
   "restoringFiles": "Atkuriami failai...",
   "sharedWithMe": "Bendrinta su manimi",
@@ -801,10 +814,13 @@
   "theRecoveryKeyYouEnteredIsIncorrect": "Įvestas atkūrimo raktas yra neteisingas.",
   "pleaseVerifyTheCodeYouHaveEntered": "Patvirtinkite įvestą kodą.",
   "yourVerificationCodeHasExpired": "Jūsų patvirtinimo kodas nebegaliojantis.",
+  "emailChangedTo": "El. paštas pakeistas į {newEmail}",
   "verifying": "Patvirtinama...",
+  "disablingTwofactorAuthentication": "Išjungiamas dvigubas tapatybės nustatymas...",
   "allMemoriesPreserved": "Išsaugoti visi prisiminimai",
   "loadingGallery": "Įkeliama galerija...",
   "syncing": "Sinchronizuojama...",
+  "encryptingBackup": "Šifruojama atsarginė kopija...",
   "syncStopped": "Sinchronizavimas sustabdytas",
   "syncProgress": "{completed} / {total} išsaugomi prisiminimai",
   "@syncProgress": {
@@ -1348,5 +1364,62 @@
   "linkEmail": "Susieti el. paštą",
   "link": "Susieti",
   "noEnteAccountExclamation": "Nėra „Ente“ paskyros!",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "orPickFromYourContacts": "arba pasirinkite iš savo kontaktų",
+  "emailDoesNotHaveEnteAccount": "{email} neturi „Ente“ paskyros.",
+  "@emailDoesNotHaveEnteAccount": {
+    "description": "Shown when email doesn't have an Ente account",
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "accountOwnerPersonAppbarTitle": "{title} (Aš)",
+  "@accountOwnerPersonAppbarTitle": {
+    "description": "Title of appbar for account owner person",
+    "placeholders": {
+      "title": {
+        "type": "String"
+      }
+    }
+  },
+  "me": "Aš",
+  "linkPersonToEmailConfirmation": "Tai susies {personName} su {email}.",
+  "@linkPersonToEmailConfirmation": {
+    "description": "Confirmation message when linking a person to an email",
+    "placeholders": {
+      "personName": {
+        "type": "String"
+      },
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "reassignedToName": "Perskirstė jus į {name}",
+  "@reassignedToName": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "saveChangesBeforeLeavingQuestion": "Išsaugoti pakeitimus prieš išeinant?",
+  "dontSave": "Neišsaugoti",
+  "thisIsMeExclamation": "Tai aš!",
+  "linkPerson": "Susiekite asmenį,",
+  "linkPersonCaption": "kad geriau bendrintumėte patirtį",
+  "@linkPersonCaption": {
+    "description": "Caption for the 'Link person' title. It should be a continuation of the 'Link person' title. Just like how 'Link person' + 'for better sharing experience' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "videoStreaming": "Vaizdo įrašų srautinis perdavimas",
+  "processingVideos": "Apdorojami vaizdo įrašai",
+  "streamDetails": "Srautinio perdavimo išsami informacija",
+  "processing": "Apdorojama",
+  "queued": "Įtraukta eilėje",
+  "ineligible": "Netinkami",
+  "failed": "Nepavyko",
+  "playStream": "Leisti srautinį perdavimą",
+  "playOriginal": "Leisti originalą",
+  "joinAlbumConfirmationDialogBody": "Prisijungus prie albumo, jūsų el. paštas bus matomas jo dalyviams."
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_ml.arb b/mobile/lib/l10n/intl_ml.arb
index 7c0a9b8a5f..7cfd3a2887 100644
--- a/mobile/lib/l10n/intl_ml.arb
+++ b/mobile/lib/l10n/intl_ml.arb
@@ -99,6 +99,5 @@
   "nothingToSeeHere": "ഇവിടൊന്നും കാണ്മാനില്ല! 👀",
   "calculating": "കണക്കുകൂട്ടുന്നു...",
   "close": "അടക്കുക",
-  "count": "എണ്ണം",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "count": "എണ്ണം"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_nl.arb b/mobile/lib/l10n/intl_nl.arb
index 7ed11a22c2..dac3062154 100644
--- a/mobile/lib/l10n/intl_nl.arb
+++ b/mobile/lib/l10n/intl_nl.arb
@@ -1,6 +1,6 @@
 {
   "@@locale ": "en",
-  "enterYourEmailAddress": "Voer uw e-mailadres in",
+  "enterYourEmailAddress": "Voer je e-mailadres in",
   "accountWelcomeBack": "Welkom terug!",
   "emailAlreadyRegistered": "E-mail is al geregistreerd.",
   "emailNotRegistered": "E-mail niet geregistreerd.",
@@ -478,7 +478,7 @@
   "showMemories": "Toon herinneringen",
   "yearsAgo": "{count, plural, one{{count} jaar geleden} other{{count} jaar geleden}}",
   "backupSettings": "Back-up instellingen",
-  "backupStatus": "Back-upstatus",
+  "backupStatus": "Back-up status",
   "backupStatusDescription": "Items die zijn geback-upt, worden hier getoond",
   "backupOverMobileData": "Back-up maken via mobiele data",
   "backupVideos": "Back-up video's",
@@ -965,6 +965,14 @@
   "syncStopped": "Synchronisatie gestopt",
   "syncProgress": "{completed}/{total} herinneringen bewaard",
   "uploadingMultipleMemories": "{count} herinneringen veiligstellen...",
+  "@uploadingMultipleMemories": {
+    "description": "Text to tell user how many memories are being preserved",
+    "placeholders": {
+      "count": {
+        "type": "String"
+      }
+    }
+  },
   "uploadingSingleMemory": "1 herinnering veiligstellen...",
   "@syncProgress": {
     "description": "Text to tell user how many memories have been preserved",
@@ -1590,5 +1598,81 @@
   "joinAlbumSubtext": "om je foto's te bekijken en toe te voegen",
   "joinAlbumSubtextViewer": "om dit aan gedeelde albums toe te voegen",
   "join": "Deelnemen",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "linkEmail": "Link email",
+  "link": "Link",
+  "noEnteAccountExclamation": "Geen Ente account!",
+  "orPickFromYourContacts": "of kies uit je contacten",
+  "emailDoesNotHaveEnteAccount": "{email} heeft geen Ente account.",
+  "@emailDoesNotHaveEnteAccount": {
+    "description": "Shown when email doesn't have an Ente account",
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "accountOwnerPersonAppbarTitle": "{title} (Ik)",
+  "@accountOwnerPersonAppbarTitle": {
+    "description": "Title of appbar for account owner person",
+    "placeholders": {
+      "title": {
+        "type": "String"
+      }
+    }
+  },
+  "reassignMe": "\"Ik\" opnieuw toewijzen",
+  "me": "Ik",
+  "linkEmailToContactBannerCaption": "voor sneller delen",
+  "@linkEmailToContactBannerCaption": {
+    "description": "Caption for the 'Link email' title. It should be a continuation of the 'Link email' title. Just like how 'Link email' + 'for faster sharing' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "selectPersonToLink": "Kies persoon om te linken",
+  "linkPersonToEmail": "Link persoon aan {email}",
+  "@linkPersonToEmail": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "linkPersonToEmailConfirmation": "Dit linkt {personName} aan {email}",
+  "@linkPersonToEmailConfirmation": {
+    "description": "Confirmation message when linking a person to an email",
+    "placeholders": {
+      "personName": {
+        "type": "String"
+      },
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "selectYourFace": "Selecteer je gezicht",
+  "reassigningLoading": "Opnieuw toewijzen...",
+  "reassignedToName": "Toegewezen aan {name}",
+  "@reassignedToName": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "saveChangesBeforeLeavingQuestion": "Wijzigingen opslaan voor verlaten?",
+  "dontSave": "Niet opslaan",
+  "thisIsMeExclamation": "Dit ben ik!",
+  "linkPerson": "Link persoon",
+  "linkPersonCaption": "voor een betere ervaring met delen",
+  "@linkPersonCaption": {
+    "description": "Caption for the 'Link person' title. It should be a continuation of the 'Link person' title. Just like how 'Link person' + 'for better sharing experience' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "videoStreaming": "Video streamen",
+  "processingVideos": "Video's verwerken",
+  "streamDetails": "Stream details",
+  "processing": "Verwerken",
+  "queued": "In wachtrij",
+  "ineligible": "Ongerechtigd",
+  "failed": "Mislukt",
+  "playStream": "Stream afspelen",
+  "playOriginal": "Origineel afspelen",
+  "joinAlbumConfirmationDialogBody": "Deelnemen aan een album maakt je e-mail zichtbaar voor de deelnemers."
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_no.arb b/mobile/lib/l10n/intl_no.arb
index 0a13c2202c..5fd97c2369 100644
--- a/mobile/lib/l10n/intl_no.arb
+++ b/mobile/lib/l10n/intl_no.arb
@@ -370,6 +370,5 @@
   "advanced": "Avansert",
   "general": "Generelt",
   "security": "Sikkerhet",
-  "authToViewYourRecoveryKey": "Vennligst autentiser deg for å se gjennopprettingsnøkkelen din",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "authToViewYourRecoveryKey": "Vennligst autentiser deg for å se gjennopprettingsnøkkelen din"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_pl.arb b/mobile/lib/l10n/intl_pl.arb
index c8a1bd4fa1..5f2470754b 100644
--- a/mobile/lib/l10n/intl_pl.arb
+++ b/mobile/lib/l10n/intl_pl.arb
@@ -2,6 +2,8 @@
   "@@locale ": "en",
   "enterYourEmailAddress": "Podaj swój adres e-mail",
   "accountWelcomeBack": "Witaj ponownie!",
+  "emailAlreadyRegistered": "Adres e-mail jest już zarejestrowany.",
+  "emailNotRegistered": "Adres e-mail nie jest zarejestrowany.",
   "email": "Adres e-mail",
   "cancel": "Anuluj",
   "verify": "Zweryfikuj",
@@ -185,6 +187,8 @@
   },
   "allowAddPhotosDescription": "Pozwól osobom z linkiem na dodawania zdjęć do udostępnionego albumu.",
   "passwordLock": "Blokada hasłem",
+  "canNotOpenTitle": "Nie można otworzyć tego albumu",
+  "canNotOpenBody": "Przepraszamy, ten album nie może zostać otwarty w aplikacji.",
   "disableDownloadWarningTitle": "Uwaga",
   "disableDownloadWarningBody": "Widzowie mogą nadal robić zrzuty ekranu lub zapisywać kopie zdjęć za pomocą programów trzecich",
   "allowDownloads": "Zezwól na pobieranie",
@@ -351,6 +355,7 @@
   "failedToLoadAlbums": "Nie udało się załadować albumów",
   "hidden": "Ukryte",
   "authToViewYourHiddenFiles": "Prosimy uwierzytelnić się, aby wyświetlić ukryte pliki",
+  "authToViewTrashedFiles": "Prosimy uwierzytelnić się, aby wyświetlić swoje pliki w koszu",
   "trash": "Kosz",
   "uncategorized": "Bez kategorii",
   "videoSmallCase": "wideo",
@@ -960,6 +965,14 @@
   "syncStopped": "Synchronizacja zatrzymana",
   "syncProgress": "Zachowano {completed}/{total} wspomnień",
   "uploadingMultipleMemories": "Zachowywanie {count} wspomnień...",
+  "@uploadingMultipleMemories": {
+    "description": "Text to tell user how many memories are being preserved",
+    "placeholders": {
+      "count": {
+        "type": "String"
+      }
+    }
+  },
   "uploadingSingleMemory": "Zachowywanie 1 wspomnienia...",
   "@syncProgress": {
     "description": "Text to tell user how many memories have been preserved",
@@ -1377,6 +1390,7 @@
   "extraPhotosFound": "Znaleziono dodatkowe zdjęcia",
   "configuration": "Konfiguracja",
   "localIndexing": "Indeksowanie lokalne",
+  "processed": "Przetworzone",
   "resetPerson": "Usuń",
   "areYouSureYouWantToResetThisPerson": "Czy na pewno chcesz zresetować tę osobę?",
   "allPersonGroupingWillReset": "Wszystkie grupy dla tej osoby zostaną zresetowane i stracisz wszystkie sugestie dla tej osoby",
@@ -1578,5 +1592,11 @@
   "legacyInvite": "{email} zaprosił Cię do zostania zaufanym kontaktem",
   "authToManageLegacy": "Prosimy uwierzytelnić się, aby zarządzać zaufanymi kontaktami",
   "useDifferentPlayerInfo": "Masz problem z odtwarzaniem tego wideo? Przytrzymaj tutaj, aby spróbować innego odtwarzacza.",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "gallery": "Galeria",
+  "joinAlbum": "Dołącz do albumu",
+  "joinAlbumSubtext": "aby wyświetlić i dodać swoje zdjęcia",
+  "joinAlbumSubtextViewer": "aby dodać to do udostępnionych albumów",
+  "join": "Dołącz",
+  "linkEmail": "Połącz adres e-mail",
+  "noEnteAccountExclamation": "Brak konta Ente!"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_pt.arb b/mobile/lib/l10n/intl_pt.arb
index a27356fbc1..5a119375c1 100644
--- a/mobile/lib/l10n/intl_pt.arb
+++ b/mobile/lib/l10n/intl_pt.arb
@@ -25,8 +25,8 @@
   "deleteReason4": "Meu motivo não está listado",
   "sendEmail": "Enviar e-mail",
   "deleteRequestSLAText": "Sua solicitação será revisada em até 72 horas.",
-  "deleteEmailRequest": "Por favor, envie um e-mail à <warning>account-deletion@ente.io</warning> do seu endereço de e-mail registrado.",
-  "entePhotosPerm": "Ente <i>precisa de sua permissão para</i> preservar suas fotos",
+  "deleteEmailRequest": "Por favor, envie um e-mail a <warning>account-deletion@ente.io</warning> do seu endereço de e-mail registrado.",
+  "entePhotosPerm": "Ente <i>precisa de permissão para</i> preservar suas fotos",
   "ok": "OK",
   "createAccount": "Criar conta",
   "createNewAccount": "Criar nova conta",
@@ -55,7 +55,7 @@
   "checkInboxAndSpamFolder": "Verifique sua caixa de entrada (e spam) para concluir a verificação",
   "tapToEnterCode": "Toque para inserir código",
   "resendEmail": "Reenviar e-mail",
-  "weHaveSendEmailTo": "Nós enviamos um e-mail à <green>{email}</green>",
+  "weHaveSendEmailTo": "Enviamos um e-mail à <green>{email}</green>",
   "@weHaveSendEmailTo": {
     "description": "Text to indicate that we have sent a mail to the user",
     "placeholders": {
@@ -965,6 +965,14 @@
   "syncStopped": "Sincronização interrompida",
   "syncProgress": "{completed}/{total} memórias preservadas",
   "uploadingMultipleMemories": "Preservando {count} memórias...",
+  "@uploadingMultipleMemories": {
+    "description": "Text to tell user how many memories are being preserved",
+    "placeholders": {
+      "count": {
+        "type": "String"
+      }
+    }
+  },
   "uploadingSingleMemory": "Preservando 1 memória...",
   "@syncProgress": {
     "description": "Text to tell user how many memories have been preserved",
@@ -1259,8 +1267,8 @@
     "description": "Subtitle to indicate that the user can find people quickly by name"
   },
   "findPeopleByName": "Busque pessoas facilmente pelo nome",
-  "addViewers": "{count, plural, one {Adicionar visualizador} other {Adicionar visualizadores}}",
-  "addCollaborators": "{count, plural, one {Adicionar colaborador} other {Adicionar colaboradores}}",
+  "addViewers": "{count, plural, one {Adicionar visualizador} one {Adicionar visualizador} other {Adicionar visualizadores}}",
+  "addCollaborators": "{count, plural, one {Adicionar colaborador} one {Adicionar colaborador} other {Adicionar colaboradores}}",
   "longPressAnEmailToVerifyEndToEndEncryption": "Pressione um e-mail para verificar a criptografia ponta a ponta.",
   "developerSettingsWarning": "Deseja modificar as Opções de Desenvolvedor?",
   "developerSettings": "Opções de desenvolvedor",
@@ -1529,8 +1537,8 @@
   "removeYourselfAsTrustedContact": "Remover si mesmo dos contatos confiáveis",
   "legacy": "Legado",
   "legacyPageDesc": "O legado permite que contatos confiáveis acessem sua conta em sua ausência.",
-  "legacyPageDesc2": "Contatos confiáveis podem iniciar recuperação de conta, e se não for cancelado dentro de 30 dias, redefina sua senha e acesse sua conta.",
-  "legacyAccounts": "Contas legado",
+  "legacyPageDesc2": "Contatos confiáveis podem iniciar recuperação de conta. Se não cancelado dentro de 30 dias, redefina sua senha e acesse sua conta.",
+  "legacyAccounts": "Contas legadas",
   "trustedContacts": "Contatos confiáveis",
   "addTrustedContact": "Adicionar contato confiável",
   "removeInvite": "Remover convite",
@@ -1593,5 +1601,78 @@
   "linkEmail": "Vincular e-mail",
   "link": "Vincular",
   "noEnteAccountExclamation": "Nenhuma conta Ente!",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "orPickFromYourContacts": "ou escolher dos seus contatos",
+  "emailDoesNotHaveEnteAccount": "{email} não possui uma conta Ente.",
+  "@emailDoesNotHaveEnteAccount": {
+    "description": "Shown when email doesn't have an Ente account",
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "accountOwnerPersonAppbarTitle": "{title} (Eu)",
+  "@accountOwnerPersonAppbarTitle": {
+    "description": "Title of appbar for account owner person",
+    "placeholders": {
+      "title": {
+        "type": "String"
+      }
+    }
+  },
+  "reassignMe": "Reatribuir \"Eu\"",
+  "me": "Eu",
+  "linkEmailToContactBannerCaption": "para compartilhar rápido",
+  "@linkEmailToContactBannerCaption": {
+    "description": "Caption for the 'Link email' title. It should be a continuation of the 'Link email' title. Just like how 'Link email' + 'for faster sharing' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "selectPersonToLink": "Selecione a pessoa para vincular",
+  "linkPersonToEmail": "Vincular pessoa a {email}",
+  "@linkPersonToEmail": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "linkPersonToEmailConfirmation": "Isso vinculará {personName} a {email}",
+  "@linkPersonToEmailConfirmation": {
+    "description": "Confirmation message when linking a person to an email",
+    "placeholders": {
+      "personName": {
+        "type": "String"
+      },
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "selectYourFace": "Selecione seu rosto",
+  "reassigningLoading": "Reatribuindo...",
+  "reassignedToName": "Atribuído a {name}",
+  "@reassignedToName": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "saveChangesBeforeLeavingQuestion": "Salvar mudanças antes de sair?",
+  "dontSave": "Não salvar",
+  "thisIsMeExclamation": "Este é você!",
+  "linkPerson": "Vincular pessoa",
+  "linkPersonCaption": "para melhor experiência de compartilhamento",
+  "@linkPersonCaption": {
+    "description": "Caption for the 'Link person' title. It should be a continuation of the 'Link person' title. Just like how 'Link person' + 'for better sharing experience' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "videoStreaming": "Transmissão de vídeo",
+  "processingVideos": "Processando vídeos",
+  "streamDetails": "Detalhes da transmissão",
+  "processing": "Processando",
+  "queued": "Na fila",
+  "ineligible": "Inelegível",
+  "failed": "Falhou",
+  "playStream": "Reproduzir transmissão",
+  "playOriginal": "Reproduzir original",
+  "joinAlbumConfirmationDialogBody": "Unir-se ao álbum fará que seu e-mail seja visível a todos do álbum."
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_ro.arb b/mobile/lib/l10n/intl_ro.arb
index 4a2d3f6a1c..0b2780edf6 100644
--- a/mobile/lib/l10n/intl_ro.arb
+++ b/mobile/lib/l10n/intl_ro.arb
@@ -22,7 +22,7 @@
   "deleteReason1": "Lipsește o funcție cheie de care am nevoie",
   "deleteReason2": "Aplicația sau o anumită funcție nu se comportă așa cum cred eu că ar trebui",
   "deleteReason3": "Am găsit un alt serviciu care îmi place mai mult",
-  "deleteReason4": "Motivul meu nu este listat",
+  "deleteReason4": "Motivul meu nu apare",
   "sendEmail": "Trimiteți e-mail",
   "deleteRequestSLAText": "Solicitarea dvs. va fi procesată în 72 de ore.",
   "deleteEmailRequest": "Vă rugăm să trimiteți un e-mail la <warning>account-deletion@ente.io</warning> de pe adresa dvs. de e-mail înregistrată.",
@@ -965,6 +965,14 @@
   "syncStopped": "Sincronizare oprită",
   "syncProgress": "{completed}/{total} amintiri salvate",
   "uploadingMultipleMemories": "Se salvează {count} amintiri...",
+  "@uploadingMultipleMemories": {
+    "description": "Text to tell user how many memories are being preserved",
+    "placeholders": {
+      "count": {
+        "type": "String"
+      }
+    }
+  },
   "uploadingSingleMemory": "Se salvează o amintire...",
   "@syncProgress": {
     "description": "Text to tell user how many memories have been preserved",
@@ -1392,7 +1400,7 @@
   "enableMachineLearningBanner": "Activați învățarea automată pentru a folosi căutarea magică și recunoașterea facială",
   "searchDiscoverEmptySection": "Imaginile vor fi afișate aici odată ce procesarea și sincronizarea este completă",
   "searchPersonsEmptySection": "Persoanele vor fi afișate aici odată ce procesarea și sincronizarea este completă",
-  "viewersSuccessfullyAdded": "{count, plural, few {S-au adăugat {count} observatori}=0 {S-au adăugat 0 observatori} =1 {S-a adăugat 1 observator} other {S-au adăugat {count} de observatori}}",
+  "viewersSuccessfullyAdded": "{count, plural, one {} few {S-au adăugat {count} observatori}=0 {S-au adăugat 0 observatori} =1 {S-a adăugat 1 observator} other {S-au adăugat {count} de observatori}}",
   "@viewersSuccessfullyAdded": {
     "placeholders": {
       "count": {
@@ -1402,7 +1410,7 @@
     },
     "description": "Number of viewers that were successfully added to an album."
   },
-  "collaboratorsSuccessfullyAdded": "{count, plural, few {S-au adăugat {count} colaboratori}=0 {S-au adăugat 0 colaboratori} =1 {S-a adăugat 1 colaborator} other {S-au adăugat {count} de colaboratori}}",
+  "collaboratorsSuccessfullyAdded": "{count, plural, one {} few {S-au adăugat {count} colaboratori}=0 {S-au adăugat 0 colaboratori} =1 {S-a adăugat 1 colaborator} other {S-au adăugat {count} de colaboratori}}",
   "@collaboratorsSuccessfullyAdded": {
     "placeholders": {
       "count": {
@@ -1477,7 +1485,7 @@
   },
   "currentlyRunning": "rulează în prezent",
   "ignored": "ignorat",
-  "photosCount": "{count, plural, few {{count} fotografii}=0 {0 fotografii} =1 {1 fotografie} other {{count} de fotografii}}",
+  "photosCount": "{count, plural, one {} few {{count} fotografii}=0 {0 fotografii} =1 {1 fotografie} other {{count} de fotografii}}",
   "@photosCount": {
     "placeholders": {
       "count": {
@@ -1589,6 +1597,5 @@
   "joinAlbum": "Alăturați-vă albumului",
   "joinAlbumSubtext": "pentru a vedea și a adăuga fotografii",
   "joinAlbumSubtextViewer": "pentru a adăuga la albumele distribuite",
-  "join": "Alăturare",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "join": "Alăturare"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_ru.arb b/mobile/lib/l10n/intl_ru.arb
index 279a92b952..bd1b59594c 100644
--- a/mobile/lib/l10n/intl_ru.arb
+++ b/mobile/lib/l10n/intl_ru.arb
@@ -1462,6 +1462,5 @@
   "removeInvite": "Удалить приглашение",
   "recoveryWarning": "Доверенный контакт пытается получить доступ к вашей учетной записи",
   "rejectRecovery": "Отклонить восстановление",
-  "recoveryInitiated": "Восстановление запущено",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "recoveryInitiated": "Восстановление запущено"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_sl.arb b/mobile/lib/l10n/intl_sl.arb
index 1a5f45c37d..c8494661c6 100644
--- a/mobile/lib/l10n/intl_sl.arb
+++ b/mobile/lib/l10n/intl_sl.arb
@@ -1,4 +1,3 @@
 {
-  "@@locale ": "en",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "@@locale ": "en"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_sv.arb b/mobile/lib/l10n/intl_sv.arb
index fdc0021367..5793132069 100644
--- a/mobile/lib/l10n/intl_sv.arb
+++ b/mobile/lib/l10n/intl_sv.arb
@@ -2,6 +2,8 @@
   "@@locale ": "en",
   "enterYourEmailAddress": "Ange din e-postadress",
   "accountWelcomeBack": "Välkommen tillbaka!",
+  "emailAlreadyRegistered": "E-postadress redan registrerad.",
+  "emailNotRegistered": "E-postadressen är inte registrerad.",
   "email": "E-post",
   "cancel": "Avbryt",
   "verify": "Bekräfta",
@@ -12,6 +14,7 @@
   "deleteAccountFeedbackPrompt": "Vi är ledsna att se dig lämna oss. Vänligen dela dina synpunkter för att hjälpa oss att förbättra.",
   "feedback": "Feedback",
   "kindlyHelpUsWithThisInformation": "Vänligen hjälp oss med denna information",
+  "confirmDeletePrompt": "Ja, jag vill permanent ta bort detta konto och data i alla appar.",
   "confirmAccountDeletion": "Bekräfta radering av konto",
   "deleteAccountPermanentlyButton": "Radera kontot permanent",
   "yourAccountHasBeenDeleted": "Ditt konto har raderats",
@@ -149,6 +152,7 @@
   "tryAgain": "Försök igen",
   "viewRecoveryKey": "Visa återställningsnyckel",
   "confirmRecoveryKey": "Bekräfta återställningsnyckel",
+  "recoveryKeyVerifyReason": "Din återställningsnyckel är det enda sättet att återställa dina foton om du glömmer ditt lösenord. Du hittar din återställningsnyckel i Inställningar > Säkerhet.\n\nAnge din återställningsnyckel här för att verifiera att du har sparat den ordentligt.",
   "confirmYourRecoveryKey": "Bekräfta din återställningsnyckel",
   "addViewer": "Lägg till bildvy",
   "addCollaborator": "Lägg till samarbetspartner",
@@ -183,6 +187,8 @@
   },
   "allowAddPhotosDescription": "Tillåt personer med länken att även lägga till foton i det delade albumet.",
   "passwordLock": "Lösenordskydd",
+  "canNotOpenTitle": "Kan inte öppna det här albumet",
+  "canNotOpenBody": "Tyvärr kan detta album inte öppnas i appen.",
   "disableDownloadWarningTitle": "Vänligen notera:",
   "disableDownloadWarningBody": "Besökare kan fortfarande ta skärmdumpar eller spara en kopia av dina foton med hjälp av externa verktyg",
   "allowDownloads": "Tillåt nedladdningar",
@@ -271,18 +277,74 @@
   "failedToApplyCode": "Det gick inte att använda koden",
   "enterReferralCode": "Ange hänvisningskod",
   "codeAppliedPageTitle": "Kod tillämpad",
+  "changeYourReferralCode": "Ändra din värvningskod",
   "change": "Ändra",
+  "unavailableReferralCode": "Tyvärr är denna kod inte tillgänglig.",
+  "codeChangeLimitReached": "Tyvärr, du har nått gränsen för kodändringar.",
   "onlyFamilyAdminCanChangeCode": "Kontakta {familyAdminEmail} för att ändra din kod.",
   "storageInGB": "{storageAmountInGB} GB",
   "claimed": "Nyttjad",
   "@claimed": {
     "description": "Used to indicate storage claimed, like 10GB Claimed"
   },
+  "details": "Uppgifter",
+  "claimMore": "Begär mer!",
+  "theyAlsoGetXGb": "De får också {storageAmountInGB} GB",
+  "freeStorageOnReferralSuccess": "{storageAmountInGB} GB varje gång någon registrerar sig för en betalplan och tillämpar din kod",
+  "shareTextReferralCode": "Ente värvningskod: {referralCode} \n\nTillämpa den i Inställningar → Allmänt → Hänvisningar för att få {referralStorageInGB} GB gratis när du registrerar dig för en betalplan\n\nhttps://ente.io",
+  "claimFreeStorage": "Hämta kostnadsfri lagring",
   "inviteYourFriends": "Bjud in dina vänner",
+  "failedToFetchReferralDetails": "Det gick inte att hämta hänvisningsdetaljer. Försök igen senare.",
+  "referralStep1": "1. Ge denna kod till dina vänner",
+  "referralStep2": "2. De registrerar sig för en betalplan",
+  "referralStep3": "3. Ni får båda {storageInGB} GB* gratis",
+  "referralsAreCurrentlyPaused": "Hänvisningar är för närvarande pausade",
+  "youCanAtMaxDoubleYourStorage": "* Du kan max fördubbla ditt lagringsutrymme",
+  "claimedStorageSoFar": "{isFamilyMember, select, true {Din familj har begärt {storageAmountInGb} GB} false {{storageAmountInGb}} other {Du har begärt {storageAmountInGb} GB!}}",
+  "@claimedStorageSoFar": {
+    "placeholders": {
+      "isFamilyMember": {
+        "type": "String",
+        "example": "true"
+      },
+      "storageAmountInGb": {
+        "type": "int",
+        "example": "10"
+      }
+    }
+  },
+  "faq": "Vanliga frågor och svar",
   "help": "Hjälp",
+  "oopsSomethingWentWrong": "Oj, något gick fel",
+  "peopleUsingYourCode": "Personer som använder din kod",
+  "eligible": "berättigad",
+  "total": "totalt",
+  "codeUsedByYou": "Kod som används av dig",
+  "freeStorageClaimed": "Gratis lagring begärd",
+  "freeStorageUsable": "Gratis lagringsutrymme som kan användas",
+  "usableReferralStorageInfo": "Användbart lagringsutrymme begränsas av din nuvarande plan. Överskrider du lagringsutrymmet kommer automatiskt att kunna använda det när du uppgraderar din plan.",
+  "removeFromAlbumTitle": "Ta bort från album?",
+  "removeFromAlbum": "Ta bort från album",
+  "itemsWillBeRemovedFromAlbum": "Valda objekt kommer att tas bort från detta album",
+  "removeShareItemsWarning": "Några av de objekt som du tar bort lades av andra personer, och du kommer att förlora tillgång till dem",
+  "addingToFavorites": "Lägger till bland favoriter...",
+  "removingFromFavorites": "Tar bort från favoriter...",
+  "sorryCouldNotAddToFavorites": "Tyvärr, kunde inte lägga till i favoriterna!",
+  "sorryCouldNotRemoveFromFavorites": "Tyvärr kunde inte ta bort från favoriter!",
+  "subscribeToEnableSharing": "Du behöver en aktiv betald prenumeration för att möjliggöra delning.",
   "subscribe": "Prenumerera",
+  "canOnlyRemoveFilesOwnedByYou": "Kan endast ta bort filer som ägs av dig",
+  "deleteSharedAlbum": "Radera delat album?",
   "deleteAlbum": "Radera album",
+  "deleteAlbumDialog": "Ta också bort foton (och videor) som finns i detta album från <bold>alla</bold> andra album som de är en del av?",
+  "deleteSharedAlbumDialogBody": "Albumet kommer att raderas för alla\n\nDu kommer att förlora åtkomst till delade foton i detta album som ägs av andra",
+  "yesRemove": "Ja, ta bort",
+  "creatingLink": "Skapar länk...",
+  "removeWithQuestionMark": "Ta bort?",
+  "removeParticipantBody": "{userEmail} kommer att tas bort från detta delade album\n\nAlla bilder som lagts till av dem kommer också att tas bort från albumet",
+  "keepPhotos": "Behåll foton",
   "deletePhotos": "Radera foton",
+  "inviteToEnte": "Bjud in till Ente",
   "trash": "Papperskorg",
   "photoSmallCase": "foto",
   "yesDelete": "Ja, radera",
@@ -295,10 +357,34 @@
   "discover_receipts": "Kvitton",
   "discover_notes": "Anteckningar",
   "status": "Status",
+  "clearIndexes": "Rensa index",
+  "selectFoldersForBackup": "Välj mappar för säkerhetskopiering",
+  "selectedFoldersWillBeEncryptedAndBackedUp": "Valda mappar kommer att krypteras och säkerhetskopieras",
+  "unselectAll": "Avmarkera alla",
+  "selectAll": "Markera allt",
   "skip": "Hoppa över",
+  "updatingFolderSelection": "Uppdaterar mappval...",
   "itemCount": "{count, plural, one{{count} objekt} other{{count} objekt}}",
   "deleteItemCount": "{count, plural, =1 {Radera {count} objekt} other {Radera {count} objekt}}",
+  "duplicateItemsGroup": "{count} filer, {formattedSize} vardera",
+  "@duplicateItemsGroup": {
+    "description": "Display the number of duplicate files and their size",
+    "type": "text",
+    "placeholders": {
+      "count": {
+        "example": "12",
+        "type": "int"
+      },
+      "formattedSize": {
+        "example": "2.3 MB",
+        "type": "String"
+      }
+    }
+  },
+  "showMemories": "Visa minnen",
   "yearsAgo": "{count, plural, one{{count} år sedan} other{{count} år sedan}}",
+  "backupSettings": "Säkerhetskopieringsinställningar",
+  "backupStatus": "Säkerhetskopieringsstatus",
   "about": "Om",
   "terms": "Villkor",
   "account": "Konto",
@@ -368,6 +454,14 @@
   "theRecoveryKeyYouEnteredIsIncorrect": "Återställningsnyckeln du angav är felaktig",
   "twofactorAuthenticationHasBeenDisabled": "Tvåfaktorsautentisering har inaktiverats",
   "uploadingMultipleMemories": "Bevarar {count} minnen...",
+  "@uploadingMultipleMemories": {
+    "description": "Text to tell user how many memories are being preserved",
+    "placeholders": {
+      "count": {
+        "type": "String"
+      }
+    }
+  },
   "uploadingSingleMemory": "Bevarar 1 minne...",
   "viewLogs": "Visa loggar",
   "copyEmailAddress": "Kopiera e-postadress",
@@ -445,6 +539,5 @@
   "sort": "Sortera",
   "newPerson": "Ny person",
   "addName": "Lägg till namn",
-  "add": "Lägg till",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "add": "Lägg till"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_ta.arb b/mobile/lib/l10n/intl_ta.arb
index 5304ad1d0a..d3d26e203c 100644
--- a/mobile/lib/l10n/intl_ta.arb
+++ b/mobile/lib/l10n/intl_ta.arb
@@ -15,6 +15,5 @@
   "confirmDeletePrompt": "ஆம், எல்லா செயலிகளிலும் இந்தக் கணக்கையும் அதன் தரவையும் நிரந்தரமாக நீக்க விரும்புகிறேன்.",
   "confirmAccountDeletion": "கணக்கு நீக்குதலை உறுதிப்படுத்தவும்",
   "deleteAccountPermanentlyButton": "கணக்கை நிரந்தரமாக நீக்கவும்",
-  "deleteReason1": "எனக்கு தேவையான ஒரு முக்கிய அம்சம் இதில் இல்லை",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "deleteReason1": "எனக்கு தேவையான ஒரு முக்கிய அம்சம் இதில் இல்லை"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_te.arb b/mobile/lib/l10n/intl_te.arb
index 1a5f45c37d..c8494661c6 100644
--- a/mobile/lib/l10n/intl_te.arb
+++ b/mobile/lib/l10n/intl_te.arb
@@ -1,4 +1,3 @@
 {
-  "@@locale ": "en",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "@@locale ": "en"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_th.arb b/mobile/lib/l10n/intl_th.arb
index edc625346c..375d1cc22d 100644
--- a/mobile/lib/l10n/intl_th.arb
+++ b/mobile/lib/l10n/intl_th.arb
@@ -295,6 +295,5 @@
     "description": "Label for the map view"
   },
   "maps": "แผนที่",
-  "enableMaps": "เปิดใช้งานแผนที่",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "enableMaps": "เปิดใช้งานแผนที่"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_ti.arb b/mobile/lib/l10n/intl_ti.arb
index 1a5f45c37d..c8494661c6 100644
--- a/mobile/lib/l10n/intl_ti.arb
+++ b/mobile/lib/l10n/intl_ti.arb
@@ -1,4 +1,3 @@
 {
-  "@@locale ": "en",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "@@locale ": "en"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_tr.arb b/mobile/lib/l10n/intl_tr.arb
index c7d7150de7..3b041effc5 100644
--- a/mobile/lib/l10n/intl_tr.arb
+++ b/mobile/lib/l10n/intl_tr.arb
@@ -2,6 +2,8 @@
   "@@locale ": "en",
   "enterYourEmailAddress": "E-posta adresinizi girin",
   "accountWelcomeBack": "Tekrar hoş geldiniz!",
+  "emailAlreadyRegistered": "Bu e-posta adresi zaten kayıtlı.",
+  "emailNotRegistered": "Bu e-posta adresi sistemde kayıtlı değil.",
   "email": "E-Posta",
   "cancel": "İptal Et",
   "verify": "Doğrula",
@@ -150,6 +152,7 @@
   "tryAgain": "Tekrar deneyiniz",
   "viewRecoveryKey": "Kurtarma anahtarını görüntüle",
   "confirmRecoveryKey": "Kurtarma anahtarını doğrula",
+  "recoveryKeyVerifyReason": "Kurtarma anahtarınız, şifrenizi unutmanız durumunda fotoğraflarınızı kurtarmanın tek yoludur. Kurtarma anahtarınızı Ayarlar > Hesap bölümünde bulabilirsiniz.\n\nDoğru kaydettiğinizi doğrulamak için lütfen kurtarma anahtarınızı buraya girin.",
   "confirmYourRecoveryKey": "Kurtarma anahtarını doğrulayın",
   "addViewer": "Görüntüleyici ekle",
   "addCollaborator": "Düzenleyici ekle",
@@ -184,6 +187,8 @@
   },
   "allowAddPhotosDescription": "Bağlantıya sahip olan kişilere, paylaşılan albüme fotoğraf eklemelerine izin ver.",
   "passwordLock": "Sifre kilidi",
+  "canNotOpenTitle": "Albüm açılamadı",
+  "canNotOpenBody": "Üzgünüz, Bu albüm uygulama içinde açılamadı.",
   "disableDownloadWarningTitle": "Lütfen dikkate alın",
   "disableDownloadWarningBody": "Görüntüleyiciler, hala harici araçlar kullanarak ekran görüntüsü alabilir veya fotoğraflarınızın bir kopyasını kaydedebilir. Lütfen bunu göz önünde bulundurunuz",
   "allowDownloads": "İndirmeye izin ver",
@@ -225,6 +230,7 @@
     },
     "description": "Number of participants in an album, including the album owner."
   },
+  "collabLinkSectionDescription": "Ente aplikasyonu veya hesabı olmadan insanların paylaşılan albümde fotoğraf ekleyip görüntülemelerine izin vermek için bir bağlantı oluşturun. Grup veya etkinlik fotoğraflarını toplamak için harika bir seçenek.",
   "collectPhotos": "Fotoğrafları topla",
   "collaborativeLink": "Organizasyon bağlantısı",
   "shareWithNonenteUsers": "Ente kullanıcısı olmayanlar için paylaş",
@@ -234,6 +240,7 @@
   "linkHasExpired": "Bağlantının süresi dolmuş",
   "publicLinkEnabled": "Herkese açık bağlantı aktive edildi",
   "shareALink": "Linki paylaş",
+  "sharedAlbumSectionDescription": "Diğer Ente kullanıcılarıyla paylaşılan ve topluluk albümleri oluşturun, bu arada ücretsiz planlara sahip kullanıcıları da içerir.",
   "shareWithPeopleSectionTitle": "{numberOfPeople, plural, =0 {Belirli kişilerle paylaş} =1 {1 kişiyle paylaşıldı} other {{numberOfPeople} kişiyle paylaşıldı}}",
   "@shareWithPeopleSectionTitle": {
     "placeholders": {
@@ -262,6 +269,7 @@
   "shareTextConfirmOthersVerificationID": "Merhaba, bu ente.io doğrulama kimliğinizin doğruluğunu onaylayabilir misiniz: {verificationID}",
   "somethingWentWrong": "Bazı şeyler yanlış gitti",
   "sendInvite": "Davet kodu gönder",
+  "shareTextRecommendUsingEnte": "Orijinal kalitede fotoğraf ve videoları kolayca paylaşabilmemiz için Ente'yi indirin\n\nhttps://ente.io",
   "done": "Bitti",
   "applyCodeTitle": "Kodu girin",
   "enterCodeDescription": "Arkadaşınız tarafından sağlanan kodu girerek hem sizin hem de arkadaşınızın ücretsiz depolamayı talep etmek için girin",
@@ -269,6 +277,11 @@
   "failedToApplyCode": "Uygulanırken hata oluştu",
   "enterReferralCode": "Davet kodunuzu girin",
   "codeAppliedPageTitle": "Kod kabul edildi",
+  "changeYourReferralCode": "Referans kodunuzu değiştirin",
+  "change": "Değiştir",
+  "unavailableReferralCode": "Üzgünüz, bu kod mevcut değil.",
+  "codeChangeLimitReached": "Üzgünüz, kod değişikliklerinin sınırına ulaştınız.",
+  "onlyFamilyAdminCanChangeCode": "Kodunuzu değiştirmek için lütfen {familyAdminEmail} ile iletişime geçin.",
   "storageInGB": "{storageAmountInGB} GB",
   "claimed": "Alındı",
   "@claimed": {
@@ -278,6 +291,7 @@
   "claimMore": "Arttır!",
   "theyAlsoGetXGb": "Aynı zamanda {storageAmountInGB} GB alıyorlar",
   "freeStorageOnReferralSuccess": "Birisinin davet kodunuzu uygulayıp ücretli hesap açtığı her seferede {storageAmountInGB} GB",
+  "shareTextReferralCode": "Ente davet kodu: {referralCode} \n\nÜcretli hesaba başvurduktan sonra {referralStorageInGB} GB bedava almak için \nAyarlar → Genel → Davetlerde bu kodu girin\n\nhttps://ente.io",
   "claimFreeStorage": "Bedava alan talep edin",
   "inviteYourFriends": "Arkadaşlarını davet et",
   "failedToFetchReferralDetails": "Davet ayrıntıları çekilemedi. Iütfen daha sonra deneyin.",
@@ -317,6 +331,7 @@
   "removingFromFavorites": "Favorilerimden kaldır...",
   "sorryCouldNotAddToFavorites": "Üzgünüm, favorilere ekleyemedim!",
   "sorryCouldNotRemoveFromFavorites": "Üzgünüm, favorilere ekleyemedim!",
+  "subscribeToEnableSharing": "Paylaşımı etkinleştirmek için aktif bir ücretli aboneliğe ihtiyacınız var.",
   "subscribe": "Abone ol",
   "canOnlyRemoveFilesOwnedByYou": "Yalnızca size ait dosyaları kaldırabilir",
   "deleteSharedAlbum": "Paylaşılan albüm silinsin mi?",
@@ -329,6 +344,7 @@
   "removeParticipantBody": "{userEmail} bu paylaşılan albümden kaldırılacaktır\n\nOnlar tarafından eklenen tüm fotoğraflar da albümden kaldırılacaktır",
   "keepPhotos": "Fotoğrafları sakla",
   "deletePhotos": "Fotoğrafları sil",
+  "inviteToEnte": "Ente'ye davet edin",
   "removePublicLink": "Herkese açık link oluştur",
   "disableLinkMessage": "Bu, \"{albumName}\"e erişim için olan genel bağlantıyı kaldıracaktır.",
   "sharing": "Paylaşılıyor...",
@@ -339,12 +355,16 @@
   "failedToLoadAlbums": "Albüm yüklenirken hata oluştu",
   "hidden": "Gizle",
   "authToViewYourHiddenFiles": "Gizli dosyalarınızı görüntülemek için kimlik doğrulama yapınız",
+  "authToViewTrashedFiles": "Çöp dosyalarınızı görüntülemek için lütfen kimlik doğrulaması yapın",
   "trash": "Cöp kutusu",
   "uncategorized": "Kategorisiz",
   "videoSmallCase": "video",
   "photoSmallCase": "fotoğraf",
   "singleFileDeleteHighlight": "Tüm albümlerden silinecek.",
+  "singleFileInBothLocalAndRemote": "{fileType} Ente ve cihazınızdan silinecektir.",
+  "singleFileInRemoteOnly": "{fileType} Ente'den silinecektir.",
   "singleFileDeleteFromDevice": "Bu {fileType}, cihazınızdan silinecek.",
+  "deleteFromEnte": "Ente'den Sil",
   "yesDelete": "Evet, sil",
   "movedToTrash": "Cöp kutusuna taşı",
   "deleteFromDevice": "Cihazınızdan silin",
@@ -397,8 +417,35 @@
     "description": "The text to display in the advanced settings section"
   },
   "photoGridSize": "Fotoğraf ızgara boyutu",
+  "manageDeviceStorage": "Cihaz önbelliğini yönet",
+  "manageDeviceStorageDesc": "Yerel önbellek depolama alanını gözden geçirin ve temizleyin.",
   "machineLearning": "Makine öğrenimi",
+  "mlConsent": "Makine öğrenimini etkinleştir",
+  "mlConsentTitle": "Makine öğrenimi etkinleştirilsin mi?",
+  "mlConsentDescription": "Makine öğrenimini etkinleştirirseniz, Ente sizinle paylaşılanlar da dahil olmak üzere dosyalardan yüz geometrisi gibi bilgileri çıkarır.\n\nBu, cihazınızda gerçekleşecek ve oluşturulan tüm biyometrik bilgiler uçtan uca şifrelenecektir.",
+  "mlConsentPrivacy": "Gizlilik politikamızdaki bu özellik hakkında daha fazla ayrıntı için lütfen buraya tıklayın",
+  "mlConsentConfirmation": "Anladım, ve makine öğrenimini etkinleştirmek istiyorum",
   "magicSearch": "Sihirli arama",
+  "discover": "Keşfet",
+  "@discover": {
+    "description": "The text to display for the discover section under which we show receipts, screenshots, sunsets, greenery, etc."
+  },
+  "discover_identity": "Kimlik",
+  "discover_screenshots": "Ekran Görüntüleri",
+  "discover_receipts": "Makbuzlar",
+  "discover_notes": "Notlar",
+  "discover_memes": "Mimler",
+  "discover_visiting_cards": "Ziyaret Kartları",
+  "discover_babies": "Bebekler",
+  "discover_pets": "Evcil Hayvanlar",
+  "discover_selfies": "Özçekimler",
+  "discover_wallpapers": "Duvar Kağıtları",
+  "discover_food": "Yiyecek",
+  "discover_celebrations": "Kutlamalar ",
+  "discover_sunset": "Gün batımı",
+  "discover_hills": "Tepeler",
+  "discover_greenery": "Yeşillik",
+  "mlIndexingDescription": "Tüm öğeler dizine eklenene kadar makine öğreniminin daha yüksek bant genişliği ve pil kullanımı ile sonuçlanacağını lütfen unutmayın. Daha hızlı indeksleme için masaüstü uygulamasını kullanmayı düşünün, tüm sonuçlar otomatik olarak senkronize edilecektir.",
   "loadingModel": "Modeller indiriliyor...",
   "waitingForWifi": "WiFi bekleniyor...",
   "status": "Durum",
@@ -431,14 +478,18 @@
   "showMemories": "Anıları göster",
   "yearsAgo": "{count, plural, one{{count} yıl önce} other{{count} yıl önce}}",
   "backupSettings": "Yedekleme seçenekleri",
+  "backupStatus": "Yedekleme durumu",
+  "backupStatusDescription": "Eklenen öğeler burada görünecek",
   "backupOverMobileData": "Mobil veri ile yedekle",
   "backupVideos": "Videolari yedekle",
   "disableAutoLock": "Otomatik kilidi devre dışı bırak",
+  "deviceLockExplanation": "Ente uygulaması önplanda calıştığında ve bir yedekleme işlemi devam ettiğinde, cihaz ekran kilidini devre dışı bırakın. Bu genellikle gerekli olmasa da, büyük dosyaların yüklenmesi ve büyük kütüphanelerin başlangıçta içe aktarılması sürecini hızlandırabilir.",
   "about": "Hakkında",
   "weAreOpenSource": "Biz açık kaynağız!",
   "privacy": "Gizlilik",
   "terms": "Şartlar",
   "checkForUpdates": "Güncellemeleri kontol et",
+  "checkStatus": "Durumu kontrol et",
   "checking": "Kontrol ediliyor...",
   "youAreOnTheLatestVersion": "En son sürüme sahipsiniz",
   "account": "Hesap",
@@ -453,6 +504,7 @@
   "authToInitiateAccountDeletion": "Hesap silme işlemini başlatmak için lütfen kimlik doğrulaması yapın",
   "areYouSureYouWantToLogout": "Çıkış yapmak istediğinize emin misiniz?",
   "yesLogout": "Evet, oturumu kapat",
+  "aNewVersionOfEnteIsAvailable": "Ente için yeni bir sürüm mevcut.",
   "update": "Güncelle",
   "installManually": "Manuel kurulum",
   "criticalUpdateAvailable": "Kritik güncelleme mevcut",
@@ -465,9 +517,13 @@
   "backedUpFolders": "Yedeklenmiş klasörler",
   "backup": "Yedekle",
   "freeUpDeviceSpace": "Cihaz alanını boşaltın",
+  "freeUpDeviceSpaceDesc": "Zaten yedeklenmiş dosyaları temizleyerek cihazınızda yer kazanın.",
   "allClear": "✨ Tamamen temizle",
   "noDeviceThatCanBeDeleted": "Bu cihazda silinebilecek hiçbir dosyanız yok",
   "removeDuplicates": "Yinelenenleri kaldır",
+  "removeDuplicatesDesc": "Tam olarak yinelenen dosyaları gözden geçirin ve kaldırın.",
+  "viewLargeFiles": "Büyük dosyalar",
+  "viewLargeFilesDesc": "En fazla depolama alanı tüketen dosyaları görüntüleyin.",
   "noDuplicates": "Yinelenenleri kaldır",
   "youveNoDuplicateFilesThatCanBeCleared": "Temizlenebilecek yinelenen dosyalarınız yok",
   "success": "Başarılı",
@@ -540,6 +596,7 @@
   "systemTheme": "Sistem",
   "freeTrial": "Ücretsiz deneme",
   "selectYourPlan": "Planınızı seçin",
+  "enteSubscriptionPitch": "Ente anılarınızı korur, böylece cihazınızı kaybetseniz bile anılarınıza her zaman ulaşabilirsiniz.",
   "enteSubscriptionShareWithFamily": "Aileniz de planınıza eklenebilir.",
   "currentUsageIs": "Güncel kullanımınız ",
   "@currentUsageIs": {
@@ -554,6 +611,7 @@
   "freeTrialValidTill": "Ücretsiz deneme {endDate} sona erir",
   "validTill": "{endDate} tarihine kadar geçerli",
   "addOnValidTill": "{storageAmount} eklentiniz {endDate} tarihine kadar geçerlidir",
+  "playStoreFreeTrialValidTill": "Ücretsiz deneme süresi {endDate} tarihine kadar geçerlidir.\nDaha sonra ücretli bir plan seçebilirsiniz.",
   "subWillBeCancelledOn": "Aboneliğiniz {endDate} tarihinde iptal edilecektir",
   "subscription": "Abonelik",
   "paymentDetails": "Ödeme detayları",
@@ -604,6 +662,7 @@
   "appleId": "Apple kimliği",
   "playstoreSubscription": "PlayStore aboneliği",
   "appstoreSubscription": "PlayStore aboneliği",
+  "subAlreadyLinkedErrMessage": "{id}'niz zaten başka bir ente hesabına bağlı.\n{id} numaranızı bu hesapla kullanmak istiyorsanız lütfen desteğimizle iletişime geçin''",
   "visitWebToManage": "Aboneliğinizi yönetmek için lütfen web.ente.io adresini ziyaret edin",
   "couldNotUpdateSubscription": "Abonelikler kaydedilemedi",
   "pleaseContactSupportAndWeWillBeHappyToHelp": "Lütfen support@ente.io ile iletişime geçin; size yardımcı olmaktan memnuniyet duyarız!",
@@ -635,6 +694,8 @@
   "noPhotosAreBeingBackedUpRightNow": "Şu anda hiçbir fotoğraf yedeklenmiyor",
   "preserveMore": "Daha fazlasını koruyun",
   "grantFullAccessPrompt": "Lütfen Ayarlar uygulamasında tüm fotoğraflara erişime izin verin",
+  "allowPermTitle": "Fotoğraflara erişime izin verin",
+  "allowPermBody": "Ente'nin kitaplığınızı görüntüleyebilmesi ve yedekleyebilmesi için lütfen Ayarlar'dan fotoğraflarınıza erişime izin verin.",
   "openSettings": "Ayarları Açın",
   "selectMorePhotos": "Daha Fazla Fotoğraf Seç",
   "existingUser": "Mevcut kullanıcı",
@@ -648,7 +709,9 @@
   "everywhere": "her yerde",
   "androidIosWebDesktop": "Android, iOS, Web, Masaüstü",
   "mobileWebDesktop": "Mobil, Web, Masaüstü",
+  "newToEnte": "Ente'de yeniyim",
   "pleaseLoginAgain": "Lütfen tekrar giriş yapın",
+  "autoLogoutMessage": "Teknik aksaklık nedeniyle oturumunuz kapatıldı. Verdiğimiz rahatsızlıktan dolayı özür dileriz.",
   "yourSubscriptionHasExpired": "Aboneliğinizin süresi doldu",
   "storageLimitExceeded": "Depolama sınırı aşıldı",
   "upgrade": "Yükselt",
@@ -659,10 +722,12 @@
   },
   "backupFailed": "Yedekleme başarısız oldu",
   "couldNotBackUpTryLater": "Verilerinizi yedekleyemedik.\nDaha sonra tekrar deneyeceğiz.",
+  "enteCanEncryptAndPreserveFilesOnlyIfYouGrant": "Ente dosyaları yalnızca erişim izni verdiğiniz takdirde şifreleyebilir ve koruyabilir",
   "pleaseGrantPermissions": "Lütfen izin ver",
   "grantPermission": "İzinleri değiştir",
   "privateSharing": "Özel paylaşım",
   "shareOnlyWithThePeopleYouWant": "Yalnızca istediğiniz kişilerle paylaşın",
+  "usePublicLinksForPeopleNotOnEnte": "Ente'de olmayan kişiler için genel bağlantıları kullanın",
   "allowPeopleToAddPhotos": "Kullanıcıların fotoğraf eklemesine izin ver",
   "shareAnAlbumNow": "Şimdi bir albüm paylaşın",
   "collectEventPhotos": "Etkinlik fotoğraflarını topla",
@@ -714,11 +779,13 @@
   "unhide": "Gizleme",
   "unarchive": "Arşivden cıkar",
   "favorite": "Favori",
+  "removeFromFavorite": "Favorilerden Kaldır",
   "shareLink": "Linki paylaş",
   "createCollage": "Kolaj oluştur",
   "saveCollage": "Kolajı kaydet",
   "collageSaved": "Kolajınız galeriye kaydedildi",
   "collageLayout": "Düzen",
+  "addToEnte": "Ente'ye ekle",
   "addToAlbum": "Albüme ekle",
   "delete": "Sil",
   "hide": "Gizle",
@@ -757,6 +824,16 @@
   "referFriendsAnd2xYourPlan": "Arkadaşlarınıza önerin ve planınızı 2 katına çıkarın",
   "shareAlbumHint": "Bir albüm açın ve paylaşmak için sağ üstteki paylaş düğmesine dokunun.",
   "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion": "Öğeler, kalıcı olarak silinmeden önce kalan gün sayısını gösterir",
+  "trashDaysLeft": "{count, plural, =0 {yakında} =1{1 gün} other {{count} gün}}",
+  "@trashDaysLeft": {
+    "description": "Text to indicate number of days remaining before permanent deletion",
+    "placeholders": {
+      "count": {
+        "example": "1|2|3",
+        "type": "int"
+      }
+    }
+  },
   "deleteAll": "Hepsini Sil",
   "renameAlbum": "Albümü yeniden adlandır",
   "convertToAlbum": "Albüme taşı",
@@ -773,7 +850,10 @@
   "photosAddedByYouWillBeRemovedFromTheAlbum": "Eklediğiniz fotoğraflar albümden kaldırılacak",
   "youveNoFilesInThisAlbumThatCanBeDeleted": "Bu cihazda silinebilecek hiçbir dosyanız yok",
   "youDontHaveAnyArchivedItems": "Arşivlenmiş öğeniz yok.",
+  "ignoredFolderUploadReason": "Bu albümdeki bazı dosyalar daha önce ente'den silindiğinden yükleme işleminde göz ardı edildi.",
   "resetIgnoredFiles": "Yok sayılan dosyaları sıfırla",
+  "deviceFilesAutoUploading": "Bu cihazın albümüne eklenen dosyalar otomatik olarak ente'ye yüklenecektir.",
+  "turnOnBackupForAutoUpload": "Bu cihaz klasörüne eklenen dosyaları otomatik olarak ente'ye yüklemek için yedeklemeyi açın.",
   "noHiddenPhotosOrVideos": "Gizli fotoğraf veya video yok",
   "toHideAPhotoOrVideo": "Bir fotoğrafı veya videoyu gizlemek için",
   "openTheItem": "• Öğeyi açın",
@@ -799,6 +879,7 @@
   "close": "Kapat",
   "setAs": "Şu şekilde ayarla",
   "fileSavedToGallery": "Video galeriye kaydedildi",
+  "filesSavedToGallery": "Dosyalar galeriye kaydedildi",
   "fileFailedToSaveToGallery": "Dosya galeriye kaydedilemedi",
   "download": "İndir",
   "pressAndHoldToPlayVideo": "Videoları yönetmek için basılı tutun",
@@ -850,6 +931,15 @@
   "@freeUpSpaceSaving": {
     "description": "Text to tell user how much space they can free up by deleting items from the device"
   },
+  "freeUpAccessPostDelete": "Aktif bir aboneliğiniz olduğu sürece ente'de {count, plural, one {it} other {them}} erişimine devam edebilirsiniz",
+  "@freeUpAccessPostDelete": {
+    "placeholders": {
+      "count": {
+        "example": "1",
+        "type": "int"
+      }
+    }
+  },
   "freeUpAmount": "{sizeInMBorGB} yer açın",
   "thisEmailIsAlreadyInUse": "Bu e-posta zaten kullanılıyor",
   "incorrectCode": "Yanlış kod",
@@ -874,6 +964,16 @@
   "encryptingBackup": "Yedekleme şifreleniyor...",
   "syncStopped": "Senkronizasyon durduruldu",
   "syncProgress": "{completed}/{total} anı korundu",
+  "uploadingMultipleMemories": "{count} anı korunuyor...",
+  "@uploadingMultipleMemories": {
+    "description": "Text to tell user how many memories are being preserved",
+    "placeholders": {
+      "count": {
+        "type": "String"
+      }
+    }
+  },
+  "uploadingSingleMemory": "1 anı korunuyor...",
   "@syncProgress": {
     "description": "Text to tell user how many memories have been preserved",
     "placeholders": {
@@ -892,6 +992,7 @@
   "renameFile": "Dosyayı yeniden adlandır",
   "enterFileName": "Dosya adını girin",
   "filesDeleted": "Dosyalar silinmiş",
+  "selectedFilesAreNotOnEnte": "Seçilen dosyalar Ente'de değil",
   "thisActionCannotBeUndone": "Bu eylem geri alınamaz",
   "emptyTrash": "Çöp kutusu boşaltılsın mı?",
   "permDeleteWarning": "Çöp kutusundaki tüm öğeler kalıcı olarak silinecek\n\nBu işlem geri alınamaz",
@@ -900,6 +1001,7 @@
   "permanentlyDeleteFromDevice": "Cihazdan kalıcı olarak silinsin mi?",
   "someOfTheFilesYouAreTryingToDeleteAre": "Silmeye çalıştığınız dosyalardan bazıları yalnızca cihazınızda mevcuttur ve silindiği takdirde kurtarılamaz",
   "theyWillBeDeletedFromAllAlbums": "Tüm albümlerden silinecek.",
+  "someItemsAreInBothEnteAndYourDevice": "Bazı öğeler hem Ente'de hem de cihazınızda bulunur.",
   "selectedItemsWillBeDeletedFromAllAlbumsAndMoved": "Seçilen öğeler tüm albümlerden silinecek ve çöp kutusuna taşınacak.",
   "theseItemsWillBeDeletedFromYourDevice": "Bu öğeler cihazınızdan silinecektir.",
   "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "Bir şeyler ters gitmiş gibi görünüyor. Lütfen bir süre sonra tekrar deneyin. Hata devam ederse, lütfen destek ekibimizle iletişime geçin.",
@@ -939,6 +1041,7 @@
   "fileTypesAndNames": "Dosya türleri ve adları",
   "location": "Konum",
   "moments": "Anlar",
+  "searchFaceEmptySection": "İndeksleme yapıldıktan sonra insanlar burada gösterilecek",
   "searchDatesEmptySection": "Tarihe, aya veya yıla göre arama yapın",
   "searchLocationEmptySection": "Bir fotoğrafın belli bir yarıçapında çekilen fotoğrafları gruplandırın",
   "searchPeopleEmptySection": "İnsanları davet ettiğinizde onların paylaştığı tüm fotoğrafları burada göreceksiniz",
@@ -993,6 +1096,7 @@
   "@storageUsageInfo": {
     "description": "Example: 1.2 GB of 2 GB used or 100 GB or 2TB used"
   },
+  "availableStorageSpace": "{freeAmount} {storageUnit} ücretsiz",
   "appVersion": "Sürüm: {versionValue}",
   "verifyIDLabel": "Doğrula",
   "fileInfoAddDescHint": "Bir açıklama ekle...",
@@ -1003,6 +1107,7 @@
   },
   "setRadius": "Yarıçapı ayarla",
   "familyPlanPortalTitle": "Aile",
+  "familyPlanOverview": "Ekstra ödeme yapmadan mevcut planınıza 5 aile üyesi ekleyin.\n\nHer üyenin kendine ait özel alanı vardır ve paylaşılmadıkça birbirlerinin dosyalarını göremezler.\n\nAile planları ücretli ente aboneliğine sahip müşteriler tarafından kullanılabilir.\n\nBaşlamak için şimdi abone olun!",
   "androidBiometricHint": "Kimliği doğrula",
   "@androidBiometricHint": {
     "description": "Hint message advising the user how to authenticate with biometrics. It is used on Android side. Maximum 60 characters."
@@ -1080,15 +1185,18 @@
   "noAlbumsSharedByYouYet": "Henüz paylaştığınız albüm yok",
   "sharedWithYou": "Sizinle paylaşıldı",
   "sharedByYou": "Paylaştıklarınız",
+  "inviteYourFriendsToEnte": "Katılmaları için arkadaşlarınızı davet edin",
   "failedToDownloadVideo": "Video indirilemedi",
   "hiding": "Gizleniyor...",
   "unhiding": "Gösteriliyor...",
   "successfullyHid": "Başarıyla saklandı",
   "successfullyUnhid": "Başarıyla arşivden çıkarıldı",
   "crashReporting": "Çökme raporlaması",
+  "resumableUploads": "Devam edilebilir yüklemeler",
   "addToHiddenAlbum": "Gizli albüme ekle",
   "moveToHiddenAlbum": "Gizli albüme ekle",
   "fileTypes": "Dosya türü",
+  "deleteConfirmDialogBody": "Kullandığınız Ente uygulamaları varsa bu hesap diğer Ente uygulamalarıyla bağlantılıdır. Tüm Ente uygulamalarına yüklediğiniz veriler ve hesabınız kalıcı olarak silinecektir.",
   "hearUsWhereTitle": "Ente'yi nereden duydunuz? (opsiyonel)",
   "hearUsExplanation": "Biz uygulama kurulumlarını takip etmiyoruz. Bizi nereden duyduğunuzdan bahsetmeniz bize çok yardımcı olacak!",
   "viewAddOnButton": "Eklentileri görüntüle",
@@ -1118,6 +1226,7 @@
     }
   },
   "faces": "Yüzler",
+  "people": "Kişiler",
   "contents": "İçerikler",
   "addNew": "Yeni ekle",
   "@addNew": {
@@ -1140,6 +1249,10 @@
   "waitingForVerification": "Doğrulama bekleniyor...",
   "passkey": "Parola Anahtarı",
   "passkeyAuthTitle": "Geçiş anahtarı doğrulaması",
+  "loginWithTOTP": "TOTP ile giriş yap",
+  "passKeyPendingVerification": "Doğrulama hala bekliyor",
+  "loginSessionExpired": "Oturum süresi doldu",
+  "loginSessionExpiredDetails": "Oturum süreniz doldu. Tekrar giriş yapın.",
   "verifyPasskey": "Şifrenizi doğrulayın",
   "playOnTv": "Albümü TV'de oynat",
   "pair": "Eşleştir",
@@ -1148,6 +1261,12 @@
   "deviceCodeHint": "Kodu girin",
   "joinDiscord": "Discord'a Katıl",
   "locations": "Konum",
+  "addAName": "Bir Ad Ekle",
+  "findThemQuickly": "Onları çabucak bulun",
+  "@findThemQuickly": {
+    "description": "Subtitle to indicate that the user can find people quickly by name"
+  },
+  "findPeopleByName": "Kişileri isimlere göre çabucak bulun",
   "addViewers": "{count, plural, zero {Görüntüleyen ekle} one {Görüntüleyen ekle} other {Görüntüleyen ekle}}",
   "addCollaborators": "{count, plural, zero {Ortak çalışan ekle} one {Ortak çalışan ekle} other {Ortak çalışan ekle}}",
   "longPressAnEmailToVerifyEndToEndEncryption": "Uçtan uca şifrelemeyi doğrulamak için bir e-postaya uzun basın.",
@@ -1158,5 +1277,402 @@
   "invalidEndpointMessage": "Üzgünüz, girdiğiniz uç nokta geçersiz. Lütfen geçerli bir uç nokta girin ve tekrar deneyin.",
   "endpointUpdatedMessage": "Fatura başarıyla güncellendi",
   "customEndpoint": "{endpoint}'e bağlanıldı",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "createCollaborativeLink": "Ortak bağlantı oluşturun",
+  "search": "Ara",
+  "enterPersonName": "Kişi ismini giriniz",
+  "enterName": "İsim girin",
+  "savePerson": "Kişiyi Kaydet",
+  "editPerson": "Kişiyi Düzenle",
+  "mergedPhotos": "Birleştirilmiş fotoğraflar",
+  "orMergeWithExistingPerson": "Ya da mevcut olan ile birleştirin",
+  "enterDateOfBirth": "Doğum Günü (isteğe bağlı)",
+  "birthday": "Doğum Günü",
+  "removePersonLabel": "Kişi etiketini kaldırın",
+  "autoPairDesc": "Otomatik eşleştirme yalnızca Chromecast destekleyen cihazlarla çalışır.",
+  "manualPairDesc": "PIN ile eşleştirme, albümünüzü görüntülemek istediğiniz herhangi bir ekranla çalışır.",
+  "connectToDevice": "Cihaza bağlanın",
+  "autoCastDialogBody": "Mevcut Cast cihazlarını burada görebilirsiniz.",
+  "autoCastiOSPermission": "Ayarlar'da Ente Photos uygulaması için Yerel Ağ izinlerinin açık olduğundan emin olun.",
+  "noDeviceFound": "Aygıt bulunamadı",
+  "stopCastingTitle": "Yayını durdur",
+  "stopCastingBody": "Yansıtmayı durdurmak istiyor musunuz?",
+  "castIPMismatchTitle": "Albüm yüklenirken hata oluştu",
+  "castIPMismatchBody": "Lütfen TV ile aynı ağda olduğunuzdan emin olun.",
+  "pairingComplete": "Eşleştirme tamamlandı",
+  "savingEdits": "Düzenlemeler kaydediliyor...",
+  "autoPair": "Otomatik eşle",
+  "pairWithPin": "PIN ile eşleştirin",
+  "faceRecognition": "Yüz Tanıma",
+  "foundFaces": "Yüzler bulundu",
+  "clusteringProgress": "Kümeleme ilerlemesi",
+  "indexingIsPaused": "İndeksleme duraklatılmıştır. Cihaz hazır olduğunda otomatik olarak devam edecektir.",
+  "trim": "Kes",
+  "crop": "Kırp",
+  "rotate": "Döndür",
+  "left": "Sol",
+  "right": "Sağ",
+  "whatsNew": "Yenilikler",
+  "reviewSuggestions": "Önerileri inceleyin",
+  "review": "Gözden Geçir",
+  "useAsCover": "Kapak olarak kullanın",
+  "notPersonLabel": "{name} değil mi?",
+  "@notPersonLabel": {
+    "description": "Label to indicate that the person in the photo is not the person whose name is mentioned",
+    "placeholders": {
+      "name": {
+        "content": "{name}",
+        "type": "String"
+      }
+    }
+  },
+  "enable": "Etkinleştir",
+  "enabled": "Etkin",
+  "moreDetails": "Daha fazla detay",
+  "enableMLIndexingDesc": "Ente, yüz tanıma, sihirli arama ve diğer gelişmiş arama özellikleri için cihaz üzerinde makine öğrenimini destekler",
+  "magicSearchHint": "Sihirli arama, fotoğrafları içeriklerine göre aramanıza olanak tanır, örneğin 'çiçek', 'kırmızı araba', 'kimlik belgeleri'",
+  "panorama": "Panorama",
+  "reenterPassword": "Şifrenizi tekrar girin",
+  "reenterPin": "PIN'inizi tekrar girin",
+  "deviceLock": "Cihaz kilidi",
+  "pinLock": "Pin kilidi",
+  "next": "Sonraki",
+  "setNewPassword": "Yeni şifre belirle",
+  "enterPin": "PIN Girin",
+  "setNewPin": "Yeni PIN belirleyin",
+  "appLock": "Uygulama kilidi",
+  "noSystemLockFound": "Sistem kilidi bulunamadı",
+  "tapToUnlock": "Açmak için dokun",
+  "tooManyIncorrectAttempts": "Çok fazla hatalı deneme",
+  "videoInfo": "Video Bilgileri",
+  "autoLock": "Otomatik Kilit",
+  "immediately": "Hemen",
+  "autoLockFeatureDescription": "Uygulamayı arka plana attıktan sonra kilitlendiği süre",
+  "hideContent": "İçeriği gizle",
+  "hideContentDescriptionAndroid": "Uygulama değiştiricide bulunan uygulama içeriğini gizler ve ekran görüntülerini devre dışı bırakır",
+  "hideContentDescriptionIos": "Uygulama değiştiricideki uygulama içeriğini gizler",
+  "passwordStrengthInfo": "Parola gücü, parolanın uzunluğu, kullanılan karakterler ve parolanın en çok kullanılan ilk 10.000 parola arasında yer alıp almadığı dikkate alınarak hesaplanır",
+  "noQuickLinksSelected": "Hızlı bağlantılar seçilmedi",
+  "pleaseSelectQuickLinksToRemove": "Lütfen kaldırmak için hızlı bağlantıları seçin",
+  "removePublicLinks": "Herkese açık link oluştur",
+  "thisWillRemovePublicLinksOfAllSelectedQuickLinks": "Bu, seçilen tüm hızlı bağlantıların genel bağlantılarını kaldıracaktır.",
+  "guestView": "Misafir Görünümü",
+  "guestViewEnablePreSteps": "Misafir görünümünü etkinleştirmek için lütfen sistem ayarlarınızda cihaz şifresi veya ekran kilidi ayarlayın.",
+  "nameTheAlbum": "Albüm İsmi",
+  "collectPhotosDescription": "Arkadaşlarınızın orijinal kalitede fotoğraf yükleyebileceği bir bağlantı oluşturun.",
+  "collect": "Topla",
+  "appLockDescriptions": "Cihazınızın varsayılan kilit ekranı ile PIN veya parola içeren özel bir kilit ekranı arasında seçim yapın.",
+  "toEnableAppLockPleaseSetupDevicePasscodeOrScreen": "Uygulama kilidini etkinleştirmek için lütfen sistem ayarlarınızda cihaz şifresi veya ekran kilidi ayarlayın.",
+  "authToViewPasskey": "Geçiş anahtarınızı görüntülemek için lütfen kimlik doğrulaması yapın",
+  "loopVideoOn": "Video Döngüsü Açık",
+  "loopVideoOff": "Video Döngüsü Kapalı",
+  "localSyncErrorMessage": "Yerel fotoğraf senkronizasyonu beklenenden daha uzun sürdüğü için bir şeyler ters gitmiş gibi görünüyor. Lütfen destek ekibimize ulaşın",
+  "showPerson": "Kişiyi Göster",
+  "sort": "Sırala",
+  "mostRecent": "En son",
+  "mostRelevant": "En alakalı",
+  "loadingYourPhotos": "Fotoğraflarınız yükleniyor...",
+  "processingImport": "İşleniyor {folderName}...",
+  "personName": "Kişi Adı",
+  "addNewPerson": "Yeni kişi ekle",
+  "addNameOrMerge": "İsim ekleyin veya birleştirin",
+  "mergeWithExisting": "Var olan ile birleştir.",
+  "newPerson": "Yeni Kişi",
+  "addName": "İsim Ekle",
+  "add": "Ekle",
+  "extraPhotosFoundFor": "{text} için ekstra fotoğraflar bulundu",
+  "@extraPhotosFoundFor": {
+    "placeholders": {
+      "text": {
+        "type": "String"
+      }
+    }
+  },
+  "extraPhotosFound": "Ekstra fotoğraflar bulundu",
+  "configuration": "Yapılandırma",
+  "localIndexing": "Yerel indeksleme",
+  "processed": "İşlenen",
+  "resetPerson": "Kaldır",
+  "areYouSureYouWantToResetThisPerson": "Bu kişiyi sıfırlamak istediğinden emin misin?",
+  "allPersonGroupingWillReset": "Bu kişi için tüm gruplamalar sıfırlanacak ve bu kişi için yaptığınız tüm önerileri kaybedeceksiniz",
+  "yesResetPerson": "Evet, kişiyi sıfırla",
+  "onlyThem": "Sadece onlar",
+  "checkingModels": "Modelleri kontrol ediyorum...",
+  "enableMachineLearningBanner": "Sihirli arama ve yüz tanıma için makine öğrenimini etkinleştirin",
+  "searchDiscoverEmptySection": "İşleme ve senkronizasyon tamamlandığında görüntüler burada gösterilecektir",
+  "searchPersonsEmptySection": "İşleme ve senkronizasyon tamamlandığında kişiler burada gösterilecektir",
+  "viewersSuccessfullyAdded": "{count, plural, =0 {0 Görüntüleyen eklendi} =1 {1 Görüntüleyen eklendi} other {{count} Görüntüleyen eklendi}}",
+  "@viewersSuccessfullyAdded": {
+    "placeholders": {
+      "count": {
+        "type": "int",
+        "example": "2"
+      }
+    },
+    "description": "Number of viewers that were successfully added to an album."
+  },
+  "collaboratorsSuccessfullyAdded": "{count, plural, =0 {0 işbirlikçi eklendi} =1 {1 işbirlikçi eklendi} other {{count} işbirlikçi eklendi}}",
+  "@collaboratorsSuccessfullyAdded": {
+    "placeholders": {
+      "count": {
+        "type": "int",
+        "example": "2"
+      }
+    },
+    "description": "Number of collaborators that were successfully added to an album."
+  },
+  "accountIsAlreadyConfigured": "Hesap zaten yapılandırılmıştır.",
+  "sessionIdMismatch": "Oturum kimliği uyuşmazlığı",
+  "@sessionIdMismatch": {
+    "description": "In passkey page, deeplink is ignored because of session ID mismatch."
+  },
+  "failedToFetchActiveSessions": "Etkin oturumlar getirilemedi",
+  "@failedToFetchActiveSessions": {
+    "description": "In session page, warn user (in toast) that active sessions could not be fetched."
+  },
+  "failedToRefreshStripeSubscription": "Abonelik yenilenemedi",
+  "failedToPlayVideo": "Video oynatılamadı",
+  "uploadIsIgnoredDueToIgnorereason": "Yükleme {ignoreReason} nedeniyle yok sayıldı",
+  "@uploadIsIgnoredDueToIgnorereason": {
+    "placeholders": {
+      "ignoreReason": {
+        "type": "String",
+        "example": "no network"
+      }
+    }
+  },
+  "typeOfGallerGallerytypeIsNotSupportedForRename": "Galeri türü {galleryType} yeniden adlandırma için desteklenmiyor",
+  "@typeOfGallerGallerytypeIsNotSupportedForRename": {
+    "placeholders": {
+      "galleryType": {
+        "type": "String",
+        "example": "no network"
+      }
+    }
+  },
+  "tapToUploadIsIgnoredDue": "Yüklemek için dokunun, yükleme şu anda {ignoreReason} nedeniyle yok sayılıyor",
+  "@tapToUploadIsIgnoredDue": {
+    "description": "Shown in upload icon widet, inside a tooltip.",
+    "placeholders": {
+      "ignoreReason": {
+        "type": "String",
+        "example": "no network"
+      }
+    }
+  },
+  "tapToUpload": "Yüklemek için tıklayın",
+  "@tapToUpload": {
+    "description": "Shown in upload icon widet, inside a tooltip."
+  },
+  "info": "Bilgi",
+  "addFiles": "Dosyaları Ekle",
+  "castAlbum": "Yayın albümü",
+  "imageNotAnalyzed": "Görüntü analiz edilmedi",
+  "noFacesFound": "Yüz bulunamadı",
+  "fileNotUploadedYet": "Dosya henüz yüklenmedi",
+  "noSuggestionsForPerson": "{personName} için öneri yok",
+  "@noSuggestionsForPerson": {
+    "placeholders": {
+      "personName": {
+        "type": "String",
+        "example": "Alice"
+      }
+    }
+  },
+  "month": "ay",
+  "yearShort": "yıl",
+  "@yearShort": {
+    "description": "Appears in pricing page (/yr)"
+  },
+  "currentlyRunning": "şu anda çalışıyor",
+  "ignored": "yoksayıldı",
+  "photosCount": "{count, plural, =0 {0 fotoğraf} =1 {1 fotoğraf} other {{count} fotoğraflar}}",
+  "@photosCount": {
+    "placeholders": {
+      "count": {
+        "type": "int",
+        "example": "2"
+      }
+    }
+  },
+  "file": "Dosya",
+  "searchSectionsLengthMismatch": "Bölüm uzunluğu uyuşmazlığı: {snapshotLength} != {searchLength}",
+  "@searchSectionsLengthMismatch": {
+    "description": "Appears in search tab page",
+    "placeholders": {
+      "snapshotLength": {
+        "type": "int",
+        "example": "1"
+      },
+      "searchLength": {
+        "type": "int",
+        "example": "2"
+      }
+    }
+  },
+  "selectMailApp": "Mail Uygulamasını Seç",
+  "selectAllShort": "Tümü",
+  "@selectAllShort": {
+    "description": "Text that appears in bottom right when you start to select multiple photos. When clicked, it selects all photos."
+  },
+  "changeLogMagicSearchImprovementTitle": "Sihirli Arama İyileştirme",
+  "changeLogMagicSearchImprovementContent": "Sihirli aramayı çok daha hızlı olacak şekilde geliştirdik, böylece aradığınızı bulmak için beklemek zorunda kalmazsınız.",
+  "changeLogBackupStatusTitle": "Yedekleme Durumu",
+  "changeLogBackupStatusContent": "Ente'ye yüklenen tüm dosyaların, hatalar ve sıraya alınanlar da dahil olmak üzere bir günlüğünü ekledik.",
+  "changeLogDiscoverTitle": "Keşfet",
+  "changeLogDiscoverContent": "Kimlik kartlarınızın, notlarınızın ve hatta memlerinizin fotoğraflarını mı arıyorsunuz? Arama sekmesine gidin ve Keşfet'e göz atın. Anlamsal aramamıza dayanarak, sizin için önemli olabilecek fotoğrafları bulabileceğiniz bir yerdir.\\n\\n Sadece Makine Öğrenimini etkinleştirdiyseniz kullanılabilir.",
+  "selectCoverPhoto": "Kapak fotoğrafı seçin",
+  "newLocation": "Yeni konum",
+  "faceNotClusteredYet": "Yüz henüz kümelenmedi, lütfen daha sonra tekrar gelin",
+  "theLinkYouAreTryingToAccessHasExpired": "Erişmeye çalıştığınız bağlantının süresi dolmuştur.",
+  "openFile": "Dosyayı aç",
+  "backupFile": "Yedek Dosyası",
+  "openAlbumInBrowser": "Albümü tarayıcıda aç",
+  "openAlbumInBrowserTitle": "Bu albüme fotoğraf eklemek için lütfen web uygulamasını kullanın",
+  "allow": "İzin ver",
+  "allowAppToOpenSharedAlbumLinks": "Uygulamanın paylaşılan albüm bağlantılarını açmasına izin ver",
+  "seePublicAlbumLinksInApp": "Uygulamadaki herkese açık albüm bağlantılarını görün",
+  "emergencyContacts": "Acil Durum İletişim Bilgileri",
+  "acceptTrustInvite": "Daveti Kabul Et",
+  "declineTrustInvite": "Daveti Reddet",
+  "removeYourselfAsTrustedContact": "Kendinizi güvenilir kişi olarak kaldırın",
+  "legacy": "Geleneksel",
+  "legacyPageDesc": "Geleneksel yol, güvendiğiniz kişilerin yokluğunuzda hesabınıza erişmesine olanak tanır.",
+  "legacyPageDesc2": "Güvenilir kişiler hesap kurtarma işlemini başlatabilir ve 30 gün içinde engellenmezse şifrenizi sıfırlayabilir ve hesabınıza erişebilir.",
+  "legacyAccounts": "Geleneksel hesaplar",
+  "trustedContacts": "Güvenilir kişiler",
+  "addTrustedContact": "Güvenilir kişi ekle",
+  "removeInvite": "Davetiyeyi kaldır",
+  "recoveryWarning": "Güvenilir bir kişi hesabınıza erişmeye çalışıyor",
+  "rejectRecovery": "Kurtarmayı reddet",
+  "recoveryInitiated": "Kurtarma başlatıldı",
+  "recoveryInitiatedDesc": "Hesabınıza {days} gün sonra erişebilirsiniz. {email} adresine bir bildirim gönderilecektir.",
+  "@recoveryInitiatedDesc": {
+    "placeholders": {
+      "days": {
+        "type": "int",
+        "example": "30"
+      },
+      "email": {
+        "type": "String",
+        "example": "me@example.com"
+      }
+    }
+  },
+  "cancelAccountRecovery": "Kurtarma işlemini iptal et",
+  "recoveryAccount": "Hesabı kurtar",
+  "cancelAccountRecoveryBody": "Kurtarmayı iptal etmek istediğinize emin misiniz?",
+  "startAccountRecoveryTitle": "Kurtarmayı başlat",
+  "whyAddTrustContact": ".",
+  "recoveryReady": "Artık yeni bir parola belirleyerek {email} hesabını kurtarabilirsiniz.",
+  "@recoveryReady": {
+    "placeholders": {
+      "email": {
+        "type": "String",
+        "example": "me@example.com"
+      }
+    }
+  },
+  "recoveryWarningBody": "{email} hesabınızı kurtarmaya çalışıyor.",
+  "trustedInviteBody": "{email} ile eski bir irtibat kişisi olmaya davet edildiniz.",
+  "warning": "Uyarı",
+  "proceed": "Devam edin",
+  "confirmAddingTrustedContact": "Güvenilir bir kişi olarak {email} eklemek üzeresiniz. Eğer {numOfDays} gün boyunca yoksanız hesabınızı kurtarabilecekler.",
+  "@confirmAddingTrustedContact": {
+    "placeholders": {
+      "email": {
+        "type": "String",
+        "example": "me@example.com"
+      },
+      "numOfDays": {
+        "type": "int",
+        "example": "30"
+      }
+    }
+  },
+  "legacyInvite": "{email} sizi güvenilir bir kişi olmaya davet etti",
+  "authToManageLegacy": "Güvenilir kişilerinizi yönetmek için lütfen kimlik doğrulaması yapın",
+  "useDifferentPlayerInfo": "Bu videoyu oynatmakta sorun mu yaşıyorsunuz? Farklı bir oynatıcı denemek için buraya uzun basın.",
+  "hideSharedItemsFromHomeGallery": "Paylaşılan öğeleri ana galeriden gizle",
+  "gallery": "Galeri",
+  "joinAlbum": "Albüme Katılın",
+  "joinAlbumSubtext": "fotoğraflarınızı görüntülemek ve eklemek için",
+  "joinAlbumSubtextViewer": "bunu paylaşılan albümlere eklemek için",
+  "join": "Katıl",
+  "linkEmail": "E-posta bağlantısı",
+  "link": "Bağlantı",
+  "noEnteAccountExclamation": "Ente hesabı yok!",
+  "orPickFromYourContacts": "veya kişilerinizden birini seçin",
+  "emailDoesNotHaveEnteAccount": "{email} bir Ente hesabına sahip değil",
+  "@emailDoesNotHaveEnteAccount": {
+    "description": "Shown when email doesn't have an Ente account",
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "accountOwnerPersonAppbarTitle": "{title} (Ben)",
+  "@accountOwnerPersonAppbarTitle": {
+    "description": "Title of appbar for account owner person",
+    "placeholders": {
+      "title": {
+        "type": "String"
+      }
+    }
+  },
+  "reassignMe": "\"Ben \"i yeniden atayın",
+  "me": "Ben",
+  "linkEmailToContactBannerCaption": "d",
+  "@linkEmailToContactBannerCaption": {
+    "description": "Caption for the 'Link email' title. It should be a continuation of the 'Link email' title. Just like how 'Link email' + 'for faster sharing' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "selectPersonToLink": "Bağlantı kurulacak kişiyi seçin",
+  "linkPersonToEmail": "Kişiyi {email} adresine bağlayın",
+  "@linkPersonToEmail": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "linkPersonToEmailConfirmation": "Bu, {personName} ile {email} arasında bağlantı kuracaktır.",
+  "@linkPersonToEmailConfirmation": {
+    "description": "Confirmation message when linking a person to an email",
+    "placeholders": {
+      "personName": {
+        "type": "String"
+      },
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "selectYourFace": "Yüzünüzü seçin",
+  "reassigningLoading": "Yeniden atama...",
+  "reassignedToName": "Sizi {name}'e yeniden atadım",
+  "@reassignedToName": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "saveChangesBeforeLeavingQuestion": "Ayrılmadan önce değişiklikleri kaydedin mi?",
+  "dontSave": "Kaydetme",
+  "thisIsMeExclamation": "Bu benim!",
+  "linkPerson": "Bağlantı kişisi",
+  "linkPersonCaption": "daha iyi paylaşım deneyimi için",
+  "@linkPersonCaption": {
+    "description": "Caption for the 'Link person' title. It should be a continuation of the 'Link person' title. Just like how 'Link person' + 'for better sharing experience' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "videoStreaming": "Video akışı",
+  "processingVideos": "Videolar işleniyor",
+  "streamDetails": "Yayın detayları",
+  "processing": "İşleniyor",
+  "queued": "Kuyrukta",
+  "ineligible": "Uygun Değil",
+  "failed": "Başarısız oldu",
+  "playStream": "Akışı oynat",
+  "playOriginal": "Orijinali oynat",
+  "joinAlbumConfirmationDialogBody": "Bir albüme katılmak, e-postanızın katılımcılar tarafından görülebilmesini sağlayacaktır."
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_uk.arb b/mobile/lib/l10n/intl_uk.arb
index 32733441e1..44eeb627a7 100644
--- a/mobile/lib/l10n/intl_uk.arb
+++ b/mobile/lib/l10n/intl_uk.arb
@@ -960,6 +960,14 @@
   "syncStopped": "Синхронізацію зупинено",
   "syncProgress": "{completed} / {total} спогадів збережено",
   "uploadingMultipleMemories": "Збереження {count} спогадів...",
+  "@uploadingMultipleMemories": {
+    "description": "Text to tell user how many memories are being preserved",
+    "placeholders": {
+      "count": {
+        "type": "String"
+      }
+    }
+  },
   "uploadingSingleMemory": "Зберігаємо 1 спогад...",
   "@syncProgress": {
     "description": "Text to tell user how many memories have been preserved",
@@ -1386,7 +1394,7 @@
   "enableMachineLearningBanner": "Увімкніть машинне навчання для магічного пошуку та розпізнавання облич",
   "searchDiscoverEmptySection": "Зображення будуть показані тут після завершення оброблення та синхронізації",
   "searchPersonsEmptySection": "Люди будуть показані тут після завершення оброблення та синхронізації",
-  "viewersSuccessfullyAdded": "{count, plural, few {Додано {count} користувача} many {Додано {count} користувачів}=0 {Додано 0 користувачів} =1 {Додано 1 користувач} other {Додано {count} користувачів}}",
+  "viewersSuccessfullyAdded": "{count, plural, one {} few {Додано {count} користувача} many {Додано {count} користувачів}=0 {Додано 0 користувачів} =1 {Додано 1 користувач} other {Додано {count} користувачів}}",
   "@viewersSuccessfullyAdded": {
     "placeholders": {
       "count": {
@@ -1396,7 +1404,7 @@
     },
     "description": "Number of viewers that were successfully added to an album."
   },
-  "collaboratorsSuccessfullyAdded": "{count, plural, few {Додано {count} співаторів} many {Додано {count} співаторів}=0 {Додано 0 співавторів} =1 {Додано 1 співавтор} other {Додано {count} співавторів}}",
+  "collaboratorsSuccessfullyAdded": "{count, plural, one {} few {Додано {count} співаторів} many {Додано {count} співаторів}=0 {Додано 0 співавторів} =1 {Додано 1 співавтор} other {Додано {count} співавторів}}",
   "@collaboratorsSuccessfullyAdded": {
     "placeholders": {
       "count": {
@@ -1471,7 +1479,7 @@
   },
   "currentlyRunning": "зараз працює",
   "ignored": "ігнорується",
-  "photosCount": "{count, plural, few {{count} фото} many {{count} фото}=0 {0 фото} =1 {1 фото} other {{count} фото}}",
+  "photosCount": "{count, plural, one {} few {{count} фото} many {{count} фото}=0 {0 фото} =1 {1 фото} other {{count} фото}}",
   "@photosCount": {
     "placeholders": {
       "count": {
@@ -1577,6 +1585,5 @@
   },
   "legacyInvite": "{email} запросив вас стати довіреною особою",
   "authToManageLegacy": "Авторизуйтесь, щоби керувати довіреними контактами",
-  "useDifferentPlayerInfo": "Виникли проблеми з відтворенням цього відео? Натисніть і утримуйте тут, щоб спробувати інший плеєр.",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "useDifferentPlayerInfo": "Виникли проблеми з відтворенням цього відео? Натисніть і утримуйте тут, щоб спробувати інший плеєр."
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_vi.arb b/mobile/lib/l10n/intl_vi.arb
index 658d5a857b..ac3e32d9d5 100644
--- a/mobile/lib/l10n/intl_vi.arb
+++ b/mobile/lib/l10n/intl_vi.arb
@@ -965,6 +965,14 @@
   "syncStopped": "Đồng bộ hóa đã dừng",
   "syncProgress": "{completed}/{total} kỷ niệm đã được lưu giữ",
   "uploadingMultipleMemories": "Đang lưu giữ {count} kỷ niệm...",
+  "@uploadingMultipleMemories": {
+    "description": "Text to tell user how many memories are being preserved",
+    "placeholders": {
+      "count": {
+        "type": "String"
+      }
+    }
+  },
   "uploadingSingleMemory": "Đang lưu giữ 1 kỷ niệm...",
   "@syncProgress": {
     "description": "Text to tell user how many memories have been preserved",
@@ -1589,6 +1597,5 @@
   "joinAlbum": "Tham gia album",
   "joinAlbumSubtext": "để xem và thêm ảnh của bạn",
   "joinAlbumSubtextViewer": "thêm vào album được chia sẻ",
-  "join": "Tham gia",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "join": "Tham gia"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_zh.arb b/mobile/lib/l10n/intl_zh.arb
index a4185b23ab..99d7453f7e 100644
--- a/mobile/lib/l10n/intl_zh.arb
+++ b/mobile/lib/l10n/intl_zh.arb
@@ -965,6 +965,14 @@
   "syncStopped": "同步已停止",
   "syncProgress": "已保存的回忆 {completed}/共 {total}",
   "uploadingMultipleMemories": "正在保存 {count} 个回忆...",
+  "@uploadingMultipleMemories": {
+    "description": "Text to tell user how many memories are being preserved",
+    "placeholders": {
+      "count": {
+        "type": "String"
+      }
+    }
+  },
   "uploadingSingleMemory": "正在保存 1 个回忆...",
   "@syncProgress": {
     "description": "Text to tell user how many memories have been preserved",
@@ -1590,5 +1598,81 @@
   "joinAlbumSubtext": "来查看和添加您的照片",
   "joinAlbumSubtextViewer": "来将其添加到共享相册",
   "join": "加入",
-  "orPickFromYourContacts": "or pick from your contacts"
+  "linkEmail": "链接邮箱",
+  "link": "链接",
+  "noEnteAccountExclamation": "没有 Ente 账户！",
+  "orPickFromYourContacts": "或从您的联系人中选择",
+  "emailDoesNotHaveEnteAccount": "{email} 没有 Ente 账户。",
+  "@emailDoesNotHaveEnteAccount": {
+    "description": "Shown when email doesn't have an Ente account",
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "accountOwnerPersonAppbarTitle": "{title} (我)",
+  "@accountOwnerPersonAppbarTitle": {
+    "description": "Title of appbar for account owner person",
+    "placeholders": {
+      "title": {
+        "type": "String"
+      }
+    }
+  },
+  "reassignMe": "重新分配“我”",
+  "me": "我",
+  "linkEmailToContactBannerCaption": "来实现更快的共享",
+  "@linkEmailToContactBannerCaption": {
+    "description": "Caption for the 'Link email' title. It should be a continuation of the 'Link email' title. Just like how 'Link email' + 'for faster sharing' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "selectPersonToLink": "选择要链接的人",
+  "linkPersonToEmail": "将人员链接到 {email}",
+  "@linkPersonToEmail": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "linkPersonToEmailConfirmation": "这将会将 {personName} 链接到 {email}",
+  "@linkPersonToEmailConfirmation": {
+    "description": "Confirmation message when linking a person to an email",
+    "placeholders": {
+      "personName": {
+        "type": "String"
+      },
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "selectYourFace": "选择你的脸",
+  "reassigningLoading": "正在重新分配...",
+  "reassignedToName": "已将您重新分配给 {name}",
+  "@reassignedToName": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "saveChangesBeforeLeavingQuestion": "离开之前要保存更改吗？",
+  "dontSave": "不保存",
+  "thisIsMeExclamation": "这就是我！",
+  "linkPerson": "链接人员",
+  "linkPersonCaption": "来感受更好的共享体验",
+  "@linkPersonCaption": {
+    "description": "Caption for the 'Link person' title. It should be a continuation of the 'Link person' title. Just like how 'Link person' + 'for better sharing experience' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "videoStreaming": "影音流",
+  "processingVideos": "正在处理视频",
+  "streamDetails": "流详情",
+  "processing": "正在处理",
+  "queued": "已入列",
+  "ineligible": "不合格",
+  "failed": "失败",
+  "playStream": "播放流",
+  "playOriginal": "播放原内容",
+  "joinAlbumConfirmationDialogBody": "加入相册将使相册的参与者可以看到您的电子邮件地址。"
 }
\ No newline at end of file

From 99a579f7f30fb0ee7e992a68ffc22a30d3e2569c Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 25 Feb 2025 12:03:19 +0530
Subject: [PATCH 502/796] fix: revert to some original code

---
 mobile/android/app/build.gradle  | 10 ++++++++++
 mobile/android/gradle.properties |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index 67f7e6c913..98d792b9f3 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -41,6 +41,16 @@ android {
         jvmTarget = JavaVersion.VERSION_1_8
     }
 
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
+    
+    lintOptions {
+        disable 'InvalidPackage'
+        warningsAsErrors false
+        checkReleaseBuilds false
+    }
+
     defaultConfig {
         applicationId = "io.ente.photos"
         minSdk = 26
diff --git a/mobile/android/gradle.properties b/mobile/android/gradle.properties
index 2597170821..ed508580fa 100644
--- a/mobile/android/gradle.properties
+++ b/mobile/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx4608m
 android.useAndroidX=true
 android.enableJetifier=true

From 4a03e34a209a44dd7247530b396fba0a7bab277a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 13:18:53 +0530
Subject: [PATCH 503/796] [web] Fix rendering of files without extension

Fixes: https://github.com/ente-io/ente/issues/5125
---
 web/apps/photos/src/components/PhotoViewer/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index ed28d55f37..ef6b0ed8a1 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -391,7 +391,7 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
         const extension = lowercaseExtension(file.metadata.title);
         // Assume it is supported.
         let isSupported = true;
-        if (needsJPEGConversion(extension)) {
+        if (extension && needsJPEGConversion(extension)) {
             // See if the file is on the whitelist of extensions that we know
             // will not be directly renderable.
             if (!isDesktop) {

From 1c94807c361c43b18c522a38efb5fc53aa2eb46c Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 25 Feb 2025 13:27:59 +0530
Subject: [PATCH 504/796] [mob] generated strings

---
 mobile/lib/generated/intl/messages_ar.dart |   2 -
 mobile/lib/generated/intl/messages_be.dart |   2 -
 mobile/lib/generated/intl/messages_bg.dart |   5 +-
 mobile/lib/generated/intl/messages_ca.dart |   5 +-
 mobile/lib/generated/intl/messages_cs.dart |   4 +-
 mobile/lib/generated/intl/messages_da.dart |   2 -
 mobile/lib/generated/intl/messages_de.dart | 376 +++++-----
 mobile/lib/generated/intl/messages_el.dart |   4 +-
 mobile/lib/generated/intl/messages_en.dart | 342 ++++-----
 mobile/lib/generated/intl/messages_es.dart | 375 +++++-----
 mobile/lib/generated/intl/messages_et.dart |   2 -
 mobile/lib/generated/intl/messages_fa.dart |  26 +-
 mobile/lib/generated/intl/messages_fr.dart | 562 ++++++++-------
 mobile/lib/generated/intl/messages_gu.dart |   5 +-
 mobile/lib/generated/intl/messages_he.dart | 126 ++--
 mobile/lib/generated/intl/messages_hi.dart |   2 -
 mobile/lib/generated/intl/messages_hu.dart |   2 -
 mobile/lib/generated/intl/messages_id.dart | 234 +++---
 mobile/lib/generated/intl/messages_it.dart | 314 ++++----
 mobile/lib/generated/intl/messages_ja.dart | 502 +++++++++----
 mobile/lib/generated/intl/messages_km.dart |   5 +-
 mobile/lib/generated/intl/messages_ko.dart |   2 -
 mobile/lib/generated/intl/messages_lt.dart | 318 +++++----
 mobile/lib/generated/intl/messages_ml.dart |   2 -
 mobile/lib/generated/intl/messages_nl.dart | 380 +++++-----
 mobile/lib/generated/intl/messages_no.dart |  50 +-
 mobile/lib/generated/intl/messages_pl.dart | 344 ++++-----
 mobile/lib/generated/intl/messages_pt.dart | 386 +++++-----
 mobile/lib/generated/intl/messages_ro.dart | 324 +++++----
 mobile/lib/generated/intl/messages_ru.dart | 278 ++++----
 mobile/lib/generated/intl/messages_sl.dart |   5 +-
 mobile/lib/generated/intl/messages_sv.dart | 208 ++++--
 mobile/lib/generated/intl/messages_ta.dart |   2 -
 mobile/lib/generated/intl/messages_te.dart |   5 +-
 mobile/lib/generated/intl/messages_th.dart |  38 +-
 mobile/lib/generated/intl/messages_ti.dart |   5 +-
 mobile/lib/generated/intl/messages_tr.dart | 790 ++++++++++++++++++---
 mobile/lib/generated/intl/messages_uk.dart | 322 +++++----
 mobile/lib/generated/intl/messages_vi.dart | 322 +++++----
 mobile/lib/generated/intl/messages_zh.dart | 365 +++++-----
 40 files changed, 4154 insertions(+), 2889 deletions(-)

diff --git a/mobile/lib/generated/intl/messages_ar.dart b/mobile/lib/generated/intl/messages_ar.dart
index 7a0264a378..1ce7ba622c 100644
--- a/mobile/lib/generated/intl/messages_ar.dart
+++ b/mobile/lib/generated/intl/messages_ar.dart
@@ -45,8 +45,6 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("ما من مفتاح استرداد؟"),
         "noRecoveryKeyNoDecryption": MessageLookupByLibrary.simpleMessage(
             "لا يمكن فك تشفير بياناتك دون كلمة المرور أو مفتاح الاسترداد بسبب طبيعة بروتوكول التشفير الخاص بنا من النهاية إلى النهاية"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "recoverButton": MessageLookupByLibrary.simpleMessage("استرداد"),
         "recoverySuccessful":
             MessageLookupByLibrary.simpleMessage("نجح الاسترداد!"),
diff --git a/mobile/lib/generated/intl/messages_be.dart b/mobile/lib/generated/intl/messages_be.dart
index 19d365e183..a4a49d3b64 100644
--- a/mobile/lib/generated/intl/messages_be.dart
+++ b/mobile/lib/generated/intl/messages_be.dart
@@ -175,8 +175,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "notifications": MessageLookupByLibrary.simpleMessage("Апавяшчэнні"),
         "ok": MessageLookupByLibrary.simpleMessage("Добра"),
         "oops": MessageLookupByLibrary.simpleMessage("Вой"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "password": MessageLookupByLibrary.simpleMessage("Пароль"),
         "passwordChangedSuccessfully":
             MessageLookupByLibrary.simpleMessage("Пароль паспяхова зменены"),
diff --git a/mobile/lib/generated/intl/messages_bg.dart b/mobile/lib/generated/intl/messages_bg.dart
index 85a7ce6d64..e887127f40 100644
--- a/mobile/lib/generated/intl/messages_bg.dart
+++ b/mobile/lib/generated/intl/messages_bg.dart
@@ -21,8 +21,5 @@ class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'bg';
 
   final messages = _notInlinedMessages(_notInlinedMessages);
-  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts")
-      };
+  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{};
 }
diff --git a/mobile/lib/generated/intl/messages_ca.dart b/mobile/lib/generated/intl/messages_ca.dart
index 615d5c12da..84dea987b0 100644
--- a/mobile/lib/generated/intl/messages_ca.dart
+++ b/mobile/lib/generated/intl/messages_ca.dart
@@ -21,8 +21,5 @@ class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'ca';
 
   final messages = _notInlinedMessages(_notInlinedMessages);
-  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts")
-      };
+  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{};
 }
diff --git a/mobile/lib/generated/intl/messages_cs.dart b/mobile/lib/generated/intl/messages_cs.dart
index 024158d797..226e365e9c 100644
--- a/mobile/lib/generated/intl/messages_cs.dart
+++ b/mobile/lib/generated/intl/messages_cs.dart
@@ -26,8 +26,6 @@ class MessageLookup extends MessageLookupByLibrary {
             "Jaký je váš hlavní důvod, proč mažete svůj účet?"),
         "checkInboxAndSpamFolder": MessageLookupByLibrary.simpleMessage(
             "Zkontrolujte prosím svou doručenou poštu (a spam) pro dokončení ověření"),
-        "incorrectRecoveryKeyBody": MessageLookupByLibrary.simpleMessage(""),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts")
+        "incorrectRecoveryKeyBody": MessageLookupByLibrary.simpleMessage("")
       };
 }
diff --git a/mobile/lib/generated/intl/messages_da.dart b/mobile/lib/generated/intl/messages_da.dart
index dd67ae7466..8eef3e4a80 100644
--- a/mobile/lib/generated/intl/messages_da.dart
+++ b/mobile/lib/generated/intl/messages_da.dart
@@ -241,8 +241,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "oops": MessageLookupByLibrary.simpleMessage("Ups"),
         "oopsSomethingWentWrong":
             MessageLookupByLibrary.simpleMessage("Ups, noget gik galt"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "password": MessageLookupByLibrary.simpleMessage("Adgangskode"),
         "passwordChangedSuccessfully": MessageLookupByLibrary.simpleMessage(
             "Adgangskoden er blevet ændret"),
diff --git a/mobile/lib/generated/intl/messages_de.dart b/mobile/lib/generated/intl/messages_de.dart
index 8a87f776ad..80d4955501 100644
--- a/mobile/lib/generated/intl/messages_de.dart
+++ b/mobile/lib/generated/intl/messages_de.dart
@@ -20,37 +20,39 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'de';
 
-  static String m9(count) =>
-      "${Intl.plural(count, one: 'Teilnehmer', other: 'Teilnehmer')} hinzufügen";
+  static String m9(title) => "${title} (Ich)";
 
   static String m10(count) =>
+      "${Intl.plural(count, one: 'Teilnehmer', other: 'Teilnehmer')} hinzufügen";
+
+  static String m11(count) =>
       "${Intl.plural(count, one: 'Element hinzufügen', other: 'Elemente hinzufügen')}";
 
-  static String m11(storageAmount, endDate) =>
+  static String m12(storageAmount, endDate) =>
       "Dein ${storageAmount} Add-on ist gültig bis ${endDate}";
 
-  static String m12(count) =>
+  static String m13(count) =>
       "${Intl.plural(count, one: 'Betrachter', other: 'Betrachter')} hinzufügen";
 
-  static String m13(emailOrName) => "Von ${emailOrName} hinzugefügt";
+  static String m14(emailOrName) => "Von ${emailOrName} hinzugefügt";
 
-  static String m14(albumName) => "Erfolgreich zu  ${albumName} hinzugefügt";
+  static String m15(albumName) => "Erfolgreich zu  ${albumName} hinzugefügt";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: 'Keine Teilnehmer', one: '1 Teilnehmer', other: '${count} Teilnehmer')}";
 
-  static String m16(versionValue) => "Version: ${versionValue}";
+  static String m17(versionValue) => "Version: ${versionValue}";
 
-  static String m17(freeAmount, storageUnit) =>
+  static String m18(freeAmount, storageUnit) =>
       "${freeAmount} ${storageUnit} frei";
 
-  static String m18(paymentProvider) =>
+  static String m19(paymentProvider) =>
       "Bitte kündige dein aktuelles Abo über ${paymentProvider} zuerst";
 
   static String m3(user) =>
       "Der Nutzer \"${user}\" wird keine weiteren Fotos zum Album hinzufügen können.\n\nJedoch kann er weiterhin vorhandene Bilder, welche durch ihn hinzugefügt worden sind, wieder entfernen";
 
-  static String m19(isFamilyMember, storageAmountInGb) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
       "${Intl.select(isFamilyMember, {
             'true':
                 'Deine Familiengruppe hat bereits ${storageAmountInGb} GB erhalten',
@@ -58,213 +60,222 @@ class MessageLookup extends MessageLookupByLibrary {
             'other': 'Du hast bereits ${storageAmountInGb} GB erhalten!',
           })}";
 
-  static String m20(albumName) =>
+  static String m21(albumName) =>
       "Kollaborativer Link für ${albumName} erstellt";
 
-  static String m21(count) =>
+  static String m22(count) =>
       "${Intl.plural(count, zero: '0 Mitarbeiter hinzugefügt', one: '1 Mitarbeiter hinzugefügt', other: '${count} Mitarbeiter hinzugefügt')}";
 
-  static String m22(email, numOfDays) =>
+  static String m23(email, numOfDays) =>
       "Du bist dabei, ${email} als vertrauenswürdigen Kontakt hinzuzufügen. Die Person wird in der Lage sein, dein Konto wiederherzustellen, wenn du für ${numOfDays} Tage abwesend bist.";
 
-  static String m23(familyAdminEmail) =>
+  static String m24(familyAdminEmail) =>
       "Bitte kontaktiere <green>${familyAdminEmail}</green> um dein Abo zu verwalten";
 
-  static String m24(provider) =>
+  static String m25(provider) =>
       "Bitte kontaktiere uns über support@ente.io, um dein ${provider} Abo zu verwalten.";
 
-  static String m25(endpoint) => "Verbunden mit ${endpoint}";
+  static String m26(endpoint) => "Verbunden mit ${endpoint}";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: 'Lösche ${count} Element', other: 'Lösche ${count} Elemente')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "Lösche ${currentlyDeleting} / ${totalCount}";
 
-  static String m28(albumName) =>
+  static String m29(albumName) =>
       "Der öffentliche Link zum Zugriff auf \"${albumName}\" wird entfernt.";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "Bitte sende eine E-Mail an ${supportEmail} von deiner registrierten E-Mail-Adresse";
 
-  static String m30(count, storageSaved) =>
+  static String m31(count, storageSaved) =>
       "Du hast ${Intl.plural(count, one: '${count} duplizierte Datei', other: '${count} dupliziere Dateien')} gelöscht und (${storageSaved}!) freigegeben";
 
-  static String m31(count, formattedSize) =>
+  static String m32(count, formattedSize) =>
       "${count} Dateien, ${formattedSize} jede";
 
-  static String m32(newEmail) => "E-Mail-Adresse geändert zu ${newEmail}";
+  static String m33(newEmail) => "E-Mail-Adresse geändert zu ${newEmail}";
 
-  static String m33(email) =>
+  static String m34(email) => "${email} hat kein Ente-Konto.";
+
+  static String m35(email) =>
       "${email} hat kein Ente-Konto.\n\nSende eine Einladung, um Fotos zu teilen.";
 
-  static String m34(text) => "Zusätzliche Fotos für ${text} gefunden";
+  static String m36(text) => "Zusätzliche Fotos für ${text} gefunden";
 
-  static String m35(count, formattedNumber) =>
+  static String m37(count, formattedNumber) =>
       "${Intl.plural(count, one: '1 Datei', other: '${formattedNumber} Dateien')} auf diesem Gerät wurde(n) sicher gespeichert";
 
-  static String m36(count, formattedNumber) =>
+  static String m38(count, formattedNumber) =>
       "${Intl.plural(count, one: '1 Datei', other: '${formattedNumber} Dateien')} in diesem Album wurde(n) sicher gespeichert";
 
   static String m4(storageAmountInGB) =>
       "${storageAmountInGB} GB jedes Mal, wenn sich jemand mit deinem Code für einen bezahlten Tarif anmeldet";
 
-  static String m37(endDate) => "Kostenlose Demo verfügbar bis zum ${endDate}";
+  static String m39(endDate) => "Kostenlose Demo verfügbar bis zum ${endDate}";
 
-  static String m38(count) =>
+  static String m40(count) =>
       "Du kannst immernoch über Ente ${Intl.plural(count, one: 'darauf', other: 'auf sie')} zugreifen, solange du ein aktives Abo hast";
 
-  static String m39(sizeInMBorGB) => "${sizeInMBorGB} freigeben";
+  static String m41(sizeInMBorGB) => "${sizeInMBorGB} freigeben";
 
-  static String m40(count, formattedSize) =>
+  static String m42(count, formattedSize) =>
       "${Intl.plural(count, one: 'Es kann vom Gerät gelöscht werden, um ${formattedSize} freizugeben', other: 'Sie können vom Gerät gelöscht werden, um ${formattedSize} freizugeben')}";
 
-  static String m41(currentlyProcessing, totalCount) =>
+  static String m43(currentlyProcessing, totalCount) =>
       "Verarbeite ${currentlyProcessing} / ${totalCount}";
 
-  static String m42(count) =>
+  static String m44(count) =>
       "${Intl.plural(count, one: '${count} Objekt', other: '${count} Objekte')}";
 
-  static String m43(email) =>
+  static String m45(email) =>
       "${email} hat dich eingeladen, ein vertrauenswürdiger Kontakt zu werden";
 
-  static String m44(expiryTime) => "Link läuft am ${expiryTime} ab";
+  static String m46(expiryTime) => "Link läuft am ${expiryTime} ab";
+
+  static String m47(email) => "Person mit ${email} verknüpfen";
+
+  static String m48(personName, email) =>
+      "Dies wird ${personName} mit ${email} verknüpfen";
 
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, zero: 'keine Erinnerungsstücke', one: '${formattedCount} Erinnerung', other: '${formattedCount} Erinnerungsstücke')}";
 
-  static String m45(count) =>
+  static String m49(count) =>
       "${Intl.plural(count, one: 'Element verschieben', other: 'Elemente verschieben')}";
 
-  static String m46(albumName) => "Erfolgreich zu ${albumName} hinzugefügt";
+  static String m50(albumName) => "Erfolgreich zu ${albumName} hinzugefügt";
 
-  static String m47(personName) => "Keine Vorschläge für ${personName}";
+  static String m51(personName) => "Keine Vorschläge für ${personName}";
 
-  static String m48(name) => "Nicht ${name}?";
+  static String m52(name) => "Nicht ${name}?";
 
-  static String m49(familyAdminEmail) =>
+  static String m53(familyAdminEmail) =>
       "Bitte wende Dich an ${familyAdminEmail}, um den Code zu ändern.";
 
   static String m0(passwordStrengthValue) =>
       "Passwortstärke: ${passwordStrengthValue}";
 
-  static String m50(providerName) =>
+  static String m54(providerName) =>
       "Bitte kontaktiere den Support von ${providerName}, falls etwas abgebucht wurde";
 
-  static String m51(count) =>
+  static String m55(count) =>
       "${Intl.plural(count, zero: '0 Fotos', one: '1 Foto', other: '${count} Fotos')}";
 
-  static String m52(endDate) =>
+  static String m56(endDate) =>
       "Kostenlose Testversion gültig bis ${endDate}.\nDu kannst anschließend ein bezahltes Paket auswählen.";
 
-  static String m53(toEmail) => "Bitte sende uns eine E-Mail an ${toEmail}";
+  static String m57(toEmail) => "Bitte sende uns eine E-Mail an ${toEmail}";
 
-  static String m54(toEmail) => "Bitte sende die Protokolle an ${toEmail}";
+  static String m58(toEmail) => "Bitte sende die Protokolle an ${toEmail}";
 
-  static String m55(folderName) => "Verarbeite ${folderName}...";
+  static String m59(folderName) => "Verarbeite ${folderName}...";
 
-  static String m56(storeName) => "Bewerte uns auf ${storeName}";
+  static String m60(storeName) => "Bewerte uns auf ${storeName}";
 
-  static String m57(days, email) =>
+  static String m61(name) => "Du wurdest an ${name} neu zugewiesen";
+
+  static String m62(days, email) =>
       "Du kannst nach ${days} Tagen auf das Konto zugreifen. Eine Benachrichtigung wird an ${email} versendet.";
 
-  static String m58(email) =>
+  static String m63(email) =>
       "Du kannst jetzt das Konto von ${email} wiederherstellen, indem du ein neues Passwort setzt.";
 
-  static String m59(email) =>
+  static String m64(email) =>
       "${email} versucht, dein Konto wiederherzustellen.";
 
-  static String m60(storageInGB) =>
+  static String m65(storageInGB) =>
       "3. Ihr beide erhaltet ${storageInGB} GB* kostenlos";
 
-  static String m61(userEmail) =>
+  static String m66(userEmail) =>
       "${userEmail} wird aus diesem geteilten Album entfernt\n\nAlle von ihnen hinzugefügte Fotos werden ebenfalls aus dem Album entfernt";
 
-  static String m62(endDate) => "Erneuert am ${endDate}";
+  static String m67(endDate) => "Erneuert am ${endDate}";
 
-  static String m63(count) =>
+  static String m68(count) =>
       "${Intl.plural(count, one: '${count} Ergebnis gefunden', other: '${count} Ergebnisse gefunden')}";
 
-  static String m64(snapshotLength, searchLength) =>
+  static String m69(snapshotLength, searchLength) =>
       "Abschnittslänge stimmt nicht überein: ${snapshotLength} != ${searchLength}";
 
   static String m6(count) => "${count} ausgewählt";
 
-  static String m65(count, yourCount) =>
+  static String m70(count, yourCount) =>
       "${count} ausgewählt (${yourCount} von Ihnen)";
 
-  static String m66(verificationID) =>
+  static String m71(verificationID) =>
       "Hier ist meine Verifizierungs-ID: ${verificationID} für ente.io.";
 
   static String m7(verificationID) =>
       "Hey, kannst du bestätigen, dass dies deine ente.io Verifizierungs-ID ist: ${verificationID}";
 
-  static String m67(referralCode, referralStorageInGB) =>
+  static String m72(referralCode, referralStorageInGB) =>
       "Ente Weiterempfehlungs-Code: ${referralCode} \n\nEinlösen unter Einstellungen → Allgemein → Weiterempfehlungen, um ${referralStorageInGB} GB kostenlos zu erhalten, sobald Sie einen kostenpflichtigen Tarif abgeschlossen haben\n\nhttps://ente.io";
 
-  static String m68(numberOfPeople) =>
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: 'Teile mit bestimmten Personen', one: 'Teilen mit 1 Person', other: 'Teilen mit ${numberOfPeople} Personen')}";
 
-  static String m69(emailIDs) => "Geteilt mit ${emailIDs}";
+  static String m74(emailIDs) => "Geteilt mit ${emailIDs}";
 
-  static String m70(fileType) =>
+  static String m75(fileType) =>
       "Dieses ${fileType} wird von deinem Gerät gelöscht.";
 
-  static String m71(fileType) =>
+  static String m76(fileType) =>
       "Diese Datei ist sowohl in Ente als auch auf deinem Gerät.";
 
-  static String m72(fileType) => "Diese Datei wird von Ente gelöscht.";
+  static String m77(fileType) => "Diese Datei wird von Ente gelöscht.";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} GB";
 
-  static String m73(
+  static String m78(
           usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) =>
       "${usedAmount} ${usedStorageUnit} von ${totalAmount} ${totalStorageUnit} verwendet";
 
-  static String m74(id) =>
+  static String m79(id) =>
       "Dein ${id} ist bereits mit einem anderen Ente-Konto verknüpft.\nWenn du deine ${id} mit diesem Konto verwenden möchtest, kontaktiere bitte unseren Support";
 
-  static String m75(endDate) => "Dein Abo endet am ${endDate}";
+  static String m80(endDate) => "Dein Abo endet am ${endDate}";
 
-  static String m76(completed, total) =>
+  static String m81(completed, total) =>
       "${completed}/${total} Erinnerungsstücke gesichert";
 
-  static String m77(ignoreReason) =>
+  static String m82(ignoreReason) =>
       "Zum Hochladen tippen, Hochladen wird derzeit ignoriert, da ${ignoreReason}";
 
   static String m8(storageAmountInGB) =>
       "Diese erhalten auch ${storageAmountInGB} GB";
 
-  static String m78(email) => "Dies ist ${email}s Verifizierungs-ID";
+  static String m83(email) => "Dies ist ${email}s Verifizierungs-ID";
 
-  static String m79(count) =>
+  static String m84(count) =>
       "${Intl.plural(count, zero: 'Demnächst', one: '1 Tag', other: '${count} Tage')}";
 
-  static String m80(email) =>
+  static String m85(email) =>
       "Du wurdest von ${email} eingeladen, ein Kontakt für das digitale Erbe zu werden.";
 
-  static String m81(galleryType) =>
+  static String m86(galleryType) =>
       "Der Galerie-Typ ${galleryType} unterstützt kein Umbenennen";
 
-  static String m82(ignoreReason) =>
+  static String m87(ignoreReason) =>
       "Upload wird aufgrund von ${ignoreReason} ignoriert";
 
-  static String m83(count) => "Sichere ${count} Erinnerungsstücke...";
+  static String m88(count) => "Sichere ${count} Erinnerungsstücke...";
 
-  static String m84(endDate) => "Gültig bis ${endDate}";
+  static String m89(endDate) => "Gültig bis ${endDate}";
 
-  static String m85(email) => "Verifiziere ${email}";
+  static String m90(email) => "Verifiziere ${email}";
 
-  static String m86(count) =>
+  static String m91(count) =>
       "${Intl.plural(count, zero: '0 Betrachter hinzugefügt', one: '1 Betrachter hinzugefügt', other: '${count} Betrachter hinzugefügt')}";
 
   static String m2(email) =>
       "Wir haben eine E-Mail an <green>${email}</green> gesendet";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, one: 'vor einem Jahr', other: 'vor ${count} Jahren')}";
 
-  static String m88(storageSaved) =>
+  static String m93(storageSaved) =>
       "Du hast ${storageSaved} erfolgreich freigegeben!";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
@@ -278,6 +289,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "account": MessageLookupByLibrary.simpleMessage("Konto"),
         "accountIsAlreadyConfigured": MessageLookupByLibrary.simpleMessage(
             "Das Konto ist bereits konfiguriert."),
+        "accountOwnerPersonAppbarTitle": m9,
         "accountWelcomeBack":
             MessageLookupByLibrary.simpleMessage("Willkommen zurück!"),
         "ackPasswordLostWarning": MessageLookupByLibrary.simpleMessage(
@@ -291,11 +303,11 @@ class MessageLookup extends MessageLookupByLibrary {
             "Neue E-Mail-Adresse hinzufügen"),
         "addCollaborator":
             MessageLookupByLibrary.simpleMessage("Bearbeiter hinzufügen"),
-        "addCollaborators": m9,
+        "addCollaborators": m10,
         "addFiles": MessageLookupByLibrary.simpleMessage("Dateien hinzufügen"),
         "addFromDevice":
             MessageLookupByLibrary.simpleMessage("Vom Gerät hinzufügen"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocation": MessageLookupByLibrary.simpleMessage("Ort hinzufügen"),
         "addLocationButton": MessageLookupByLibrary.simpleMessage("Hinzufügen"),
         "addMore": MessageLookupByLibrary.simpleMessage("Mehr hinzufügen"),
@@ -307,7 +319,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Neue Person hinzufügen"),
         "addOnPageSubtitle":
             MessageLookupByLibrary.simpleMessage("Details der Add-ons"),
-        "addOnValidTill": m11,
+        "addOnValidTill": m12,
         "addOns": MessageLookupByLibrary.simpleMessage("Add-ons"),
         "addPhotos": MessageLookupByLibrary.simpleMessage("Fotos hinzufügen"),
         "addSelected":
@@ -320,12 +332,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "addTrustedContact": MessageLookupByLibrary.simpleMessage(
             "Vertrauenswürdigen Kontakt hinzufügen"),
         "addViewer": MessageLookupByLibrary.simpleMessage("Album teilen"),
-        "addViewers": m12,
+        "addViewers": m13,
         "addYourPhotosNow":
             MessageLookupByLibrary.simpleMessage("Füge deine Foto jetzt hinzu"),
         "addedAs": MessageLookupByLibrary.simpleMessage("Hinzugefügt als"),
-        "addedBy": m13,
-        "addedSuccessfullyTo": m14,
+        "addedBy": m14,
+        "addedSuccessfullyTo": m15,
         "addingToFavorites": MessageLookupByLibrary.simpleMessage(
             "Wird zu Favoriten hinzugefügt..."),
         "advanced": MessageLookupByLibrary.simpleMessage("Erweitert"),
@@ -336,7 +348,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "after1Week": MessageLookupByLibrary.simpleMessage("Nach 1 Woche"),
         "after1Year": MessageLookupByLibrary.simpleMessage("Nach 1 Jahr"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("Besitzer"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumTitle": MessageLookupByLibrary.simpleMessage("Albumtitel"),
         "albumUpdated":
             MessageLookupByLibrary.simpleMessage("Album aktualisiert"),
@@ -386,7 +398,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "appLock": MessageLookupByLibrary.simpleMessage("App-Sperre"),
         "appLockDescriptions": MessageLookupByLibrary.simpleMessage(
             "Wähle zwischen dem Standard-Sperrbildschirm deines Gerätes und einem eigenen Sperrbildschirm mit PIN oder Passwort."),
-        "appVersion": m16,
+        "appVersion": m17,
         "appleId": MessageLookupByLibrary.simpleMessage("Apple ID"),
         "apply": MessageLookupByLibrary.simpleMessage("Anwenden"),
         "applyCodeTitle": MessageLookupByLibrary.simpleMessage("Code nutzen"),
@@ -470,7 +482,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoPairDesc": MessageLookupByLibrary.simpleMessage(
             "Automatisches Verbinden funktioniert nur mit Geräten, die Chromecast unterstützen."),
         "available": MessageLookupByLibrary.simpleMessage("Verfügbar"),
-        "availableStorageSpace": m17,
+        "availableStorageSpace": m18,
         "backedUpFolders":
             MessageLookupByLibrary.simpleMessage("Gesicherte Ordner"),
         "backup": MessageLookupByLibrary.simpleMessage("Backup"),
@@ -510,7 +522,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Wiederherstellung abbrechen"),
         "cancelAccountRecoveryBody": MessageLookupByLibrary.simpleMessage(
             "Bist du sicher, dass du die Wiederherstellung abbrechen möchtest?"),
-        "cancelOtherSubscription": m18,
+        "cancelOtherSubscription": m19,
         "cancelSubscription":
             MessageLookupByLibrary.simpleMessage("Abonnement kündigen"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
@@ -564,7 +576,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Freien Speicher einlösen"),
         "claimMore": MessageLookupByLibrary.simpleMessage("Mehr einlösen!"),
         "claimed": MessageLookupByLibrary.simpleMessage("Eingelöst"),
-        "claimedStorageSoFar": m19,
+        "claimedStorageSoFar": m20,
         "cleanUncategorized":
             MessageLookupByLibrary.simpleMessage("Unkategorisiert leeren"),
         "cleanUncategorizedDescription": MessageLookupByLibrary.simpleMessage(
@@ -593,12 +605,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Erstelle einen Link, mit dem andere Fotos in dem geteilten Album sehen und selbst welche hinzufügen können - ohne dass sie die ein Ente-Konto oder die App benötigen. Ideal um gemeinsam Fotos von Events zu sammeln."),
         "collaborativeLink":
             MessageLookupByLibrary.simpleMessage("Gemeinschaftlicher Link"),
-        "collaborativeLinkCreatedFor": m20,
+        "collaborativeLinkCreatedFor": m21,
         "collaborator": MessageLookupByLibrary.simpleMessage("Bearbeiter"),
         "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Bearbeiter können Fotos & Videos zu dem geteilten Album hinzufügen."),
-        "collaboratorsSuccessfullyAdded": m21,
+        "collaboratorsSuccessfullyAdded": m22,
         "collageLayout": MessageLookupByLibrary.simpleMessage("Layout"),
         "collageSaved": MessageLookupByLibrary.simpleMessage(
             "Collage in Galerie gespeichert"),
@@ -615,7 +627,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Bist du sicher, dass du die Zwei-Faktor-Authentifizierung (2FA) deaktivieren willst?"),
         "confirmAccountDeletion":
             MessageLookupByLibrary.simpleMessage("Kontolöschung bestätigen"),
-        "confirmAddingTrustedContact": m22,
+        "confirmAddingTrustedContact": m23,
         "confirmDeletePrompt": MessageLookupByLibrary.simpleMessage(
             "Ja, ich möchte dieses Konto und alle enthaltenen Daten über alle Apps hinweg endgültig löschen."),
         "confirmPassword":
@@ -628,10 +640,10 @@ class MessageLookup extends MessageLookupByLibrary {
             "Bestätige deinen Wiederherstellungsschlüssel"),
         "connectToDevice":
             MessageLookupByLibrary.simpleMessage("Mit Gerät verbinden"),
-        "contactFamilyAdmin": m23,
+        "contactFamilyAdmin": m24,
         "contactSupport":
             MessageLookupByLibrary.simpleMessage("Support kontaktieren"),
-        "contactToManageSubscription": m24,
+        "contactToManageSubscription": m25,
         "contacts": MessageLookupByLibrary.simpleMessage("Kontakte"),
         "contents": MessageLookupByLibrary.simpleMessage("Inhalte"),
         "continueLabel": MessageLookupByLibrary.simpleMessage("Weiter"),
@@ -679,7 +691,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "currentlyRunning":
             MessageLookupByLibrary.simpleMessage("läuft gerade"),
         "custom": MessageLookupByLibrary.simpleMessage("Benutzerdefiniert"),
-        "customEndpoint": m25,
+        "customEndpoint": m26,
         "darkTheme": MessageLookupByLibrary.simpleMessage("Dunkel"),
         "dayToday": MessageLookupByLibrary.simpleMessage("Heute"),
         "dayYesterday": MessageLookupByLibrary.simpleMessage("Gestern"),
@@ -717,11 +729,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Vom Gerät löschen"),
         "deleteFromEnte":
             MessageLookupByLibrary.simpleMessage("Von Ente löschen"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deleteLocation":
             MessageLookupByLibrary.simpleMessage("Standort löschen"),
         "deletePhotos": MessageLookupByLibrary.simpleMessage("Fotos löschen"),
-        "deleteProgress": m27,
+        "deleteProgress": m28,
         "deleteReason1": MessageLookupByLibrary.simpleMessage(
             "Es fehlt eine zentrale Funktion, die ich benötige"),
         "deleteReason2": MessageLookupByLibrary.simpleMessage(
@@ -759,7 +771,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Zuschauer können weiterhin Screenshots oder mit anderen externen Programmen Kopien der Bilder machen."),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("Bitte beachten Sie:"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "disableTwofactor": MessageLookupByLibrary.simpleMessage(
             "Zweiten Faktor (2FA) deaktivieren"),
         "disablingTwofactorAuthentication":
@@ -795,6 +807,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Möchtest du deine Änderungen verwerfen?"),
         "done": MessageLookupByLibrary.simpleMessage("Fertig"),
+        "dontSave": MessageLookupByLibrary.simpleMessage("Nicht speichern"),
         "doubleYourStorage":
             MessageLookupByLibrary.simpleMessage("Speicherplatz verdoppeln"),
         "download": MessageLookupByLibrary.simpleMessage("Herunterladen"),
@@ -802,9 +815,9 @@ class MessageLookup extends MessageLookupByLibrary {
             "Herunterladen fehlgeschlagen"),
         "downloading":
             MessageLookupByLibrary.simpleMessage("Wird heruntergeladen..."),
-        "dropSupportEmail": m29,
-        "duplicateFileCountWithStorageSaved": m30,
-        "duplicateItemsGroup": m31,
+        "dropSupportEmail": m30,
+        "duplicateFileCountWithStorageSaved": m31,
+        "duplicateItemsGroup": m32,
         "edit": MessageLookupByLibrary.simpleMessage("Bearbeiten"),
         "editLocation":
             MessageLookupByLibrary.simpleMessage("Standort bearbeiten"),
@@ -820,8 +833,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "email": MessageLookupByLibrary.simpleMessage("E-Mail"),
         "emailAlreadyRegistered": MessageLookupByLibrary.simpleMessage(
             "E-Mail ist bereits registriert."),
-        "emailChangedTo": m32,
-        "emailNoEnteAccount": m33,
+        "emailChangedTo": m33,
+        "emailDoesNotHaveEnteAccount": m34,
+        "emailNoEnteAccount": m35,
         "emailNotRegistered":
             MessageLookupByLibrary.simpleMessage("E-Mail nicht registriert."),
         "emailVerificationToggle":
@@ -906,12 +920,13 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Daten exportieren"),
         "extraPhotosFound":
             MessageLookupByLibrary.simpleMessage("Zusätzliche Fotos gefunden"),
-        "extraPhotosFoundFor": m34,
+        "extraPhotosFoundFor": m36,
         "faceNotClusteredYet": MessageLookupByLibrary.simpleMessage(
             "Gesicht ist noch nicht gruppiert, bitte komm später zurück"),
         "faceRecognition":
             MessageLookupByLibrary.simpleMessage("Gesichtserkennung"),
         "faces": MessageLookupByLibrary.simpleMessage("Gesichter"),
+        "failed": MessageLookupByLibrary.simpleMessage("Fehlgeschlagen"),
         "failedToApplyCode": MessageLookupByLibrary.simpleMessage(
             "Der Code konnte nicht aktiviert werden"),
         "failedToCancel":
@@ -956,8 +971,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "fileTypes": MessageLookupByLibrary.simpleMessage("Dateitypen"),
         "fileTypesAndNames":
             MessageLookupByLibrary.simpleMessage("Dateitypen und -namen"),
-        "filesBackedUpFromDevice": m35,
-        "filesBackedUpInAlbum": m36,
+        "filesBackedUpFromDevice": m37,
+        "filesBackedUpInAlbum": m38,
         "filesDeleted":
             MessageLookupByLibrary.simpleMessage("Dateien gelöscht"),
         "filesSavedToGallery": MessageLookupByLibrary.simpleMessage(
@@ -980,23 +995,23 @@ class MessageLookup extends MessageLookupByLibrary {
             "Freier Speicherplatz nutzbar"),
         "freeTrial":
             MessageLookupByLibrary.simpleMessage("Kostenlose Testphase"),
-        "freeTrialValidTill": m37,
-        "freeUpAccessPostDelete": m38,
-        "freeUpAmount": m39,
+        "freeTrialValidTill": m39,
+        "freeUpAccessPostDelete": m40,
+        "freeUpAmount": m41,
         "freeUpDeviceSpace":
             MessageLookupByLibrary.simpleMessage("Gerätespeicher freiräumen"),
         "freeUpDeviceSpaceDesc": MessageLookupByLibrary.simpleMessage(
             "Spare Speicherplatz auf deinem Gerät, indem du Dateien löschst, die bereits gesichert wurden."),
         "freeUpSpace":
             MessageLookupByLibrary.simpleMessage("Speicherplatz freigeben"),
-        "freeUpSpaceSaving": m40,
+        "freeUpSpaceSaving": m42,
         "gallery": MessageLookupByLibrary.simpleMessage("Galerie"),
         "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage(
             "Bis zu 1000 Erinnerungsstücke angezeigt in der Galerie"),
         "general": MessageLookupByLibrary.simpleMessage("Allgemein"),
         "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage(
             "Generierung von Verschlüsselungscodes..."),
-        "genericProgress": m41,
+        "genericProgress": m43,
         "goToSettings":
             MessageLookupByLibrary.simpleMessage("Zu den Einstellungen"),
         "googlePlayId": MessageLookupByLibrary.simpleMessage("Google Play ID"),
@@ -1057,6 +1072,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Indizierte Elemente"),
         "indexingIsPaused": MessageLookupByLibrary.simpleMessage(
             "Die Indizierung ist unterbrochen. Sie wird automatisch fortgesetzt, wenn das Gerät bereit ist."),
+        "ineligible": MessageLookupByLibrary.simpleMessage("Unzulässig"),
         "info": MessageLookupByLibrary.simpleMessage("Info"),
         "insecureDevice":
             MessageLookupByLibrary.simpleMessage("Unsicheres Gerät"),
@@ -1082,7 +1098,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "itLooksLikeSomethingWentWrongPleaseRetryAfterSome":
             MessageLookupByLibrary.simpleMessage(
                 "Etwas ist schiefgelaufen. Bitte versuche es später noch einmal. Sollte der Fehler weiter bestehen, kontaktiere unser Supportteam."),
-        "itemCount": m42,
+        "itemCount": m44,
         "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion":
             MessageLookupByLibrary.simpleMessage(
                 "Elemente zeigen die Anzahl der Tage bis zum dauerhaften Löschen an"),
@@ -1090,6 +1106,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Ausgewählte Elemente werden aus diesem Album entfernt"),
         "join": MessageLookupByLibrary.simpleMessage("Beitreten"),
         "joinAlbum": MessageLookupByLibrary.simpleMessage("Album beitreten"),
+        "joinAlbumConfirmationDialogBody": MessageLookupByLibrary.simpleMessage(
+            "Wenn du einem Album beitrittst, wird deine E-Mail-Adresse für seine Teilnehmer sichtbar."),
         "joinAlbumSubtext": MessageLookupByLibrary.simpleMessage(
             "um deine Fotos anzuzeigen und hinzuzufügen"),
         "joinAlbumSubtextViewer": MessageLookupByLibrary.simpleMessage(
@@ -1113,25 +1131,34 @@ class MessageLookup extends MessageLookupByLibrary {
         "legacy": MessageLookupByLibrary.simpleMessage("Digitales Erbe"),
         "legacyAccounts":
             MessageLookupByLibrary.simpleMessage("Digital geerbte Konten"),
-        "legacyInvite": m43,
+        "legacyInvite": m45,
         "legacyPageDesc": MessageLookupByLibrary.simpleMessage(
             "Das digitale Erbe erlaubt vertrauenswürdigen Kontakten den Zugriff auf dein Konto in deiner Abwesenheit."),
         "legacyPageDesc2": MessageLookupByLibrary.simpleMessage(
             "Vertrauenswürdige Kontakte können eine Kontowiederherstellung einleiten und, wenn dies nicht innerhalb von 30 Tagen blockiert wird, dein Passwort und den Kontozugriff zurücksetzen."),
         "light": MessageLookupByLibrary.simpleMessage("Hell"),
         "lightTheme": MessageLookupByLibrary.simpleMessage("Hell"),
-        "link": MessageLookupByLibrary.simpleMessage("Link"),
+        "link": MessageLookupByLibrary.simpleMessage("Verknüpfen"),
         "linkCopiedToClipboard": MessageLookupByLibrary.simpleMessage(
             "Link in Zwischenablage kopiert"),
         "linkDeviceLimit": MessageLookupByLibrary.simpleMessage("Geräte-Limit"),
+        "linkEmail":
+            MessageLookupByLibrary.simpleMessage("E-Mail-Adresse verknüpfen"),
+        "linkEmailToContactBannerCaption":
+            MessageLookupByLibrary.simpleMessage("für schnelleres Teilen"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("Aktiviert"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("Abgelaufen"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry":
             MessageLookupByLibrary.simpleMessage("Ablaufdatum des Links"),
         "linkHasExpired":
             MessageLookupByLibrary.simpleMessage("Link ist abgelaufen"),
         "linkNeverExpires": MessageLookupByLibrary.simpleMessage("Niemals"),
+        "linkPerson": MessageLookupByLibrary.simpleMessage("Person verknüpfen"),
+        "linkPersonCaption": MessageLookupByLibrary.simpleMessage(
+            "um besseres Teilen zu ermöglichen"),
+        "linkPersonToEmail": m47,
+        "linkPersonToEmailConfirmation": m48,
         "livePhotos": MessageLookupByLibrary.simpleMessage("Live-Fotos"),
         "loadMessage1": MessageLookupByLibrary.simpleMessage(
             "Du kannst dein Abonnement mit deiner Familie teilen"),
@@ -1217,6 +1244,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "maps": MessageLookupByLibrary.simpleMessage("Karten"),
         "mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"),
         "matrix": MessageLookupByLibrary.simpleMessage("Matrix"),
+        "me": MessageLookupByLibrary.simpleMessage("Ich"),
         "memoryCount": m5,
         "merchandise": MessageLookupByLibrary.simpleMessage("Merchandise"),
         "mergeWithExisting": MessageLookupByLibrary.simpleMessage(
@@ -1247,12 +1275,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "moreDetails": MessageLookupByLibrary.simpleMessage("Weitere Details"),
         "mostRecent": MessageLookupByLibrary.simpleMessage("Neuste"),
         "mostRelevant": MessageLookupByLibrary.simpleMessage("Nach Relevanz"),
-        "moveItem": m45,
+        "moveItem": m49,
         "moveToAlbum":
             MessageLookupByLibrary.simpleMessage("Zum Album verschieben"),
         "moveToHiddenAlbum": MessageLookupByLibrary.simpleMessage(
             "Zu verstecktem Album verschieben"),
-        "movedSuccessfullyTo": m46,
+        "movedSuccessfullyTo": m50,
         "movedToTrash": MessageLookupByLibrary.simpleMessage(
             "In den Papierkorb verschoben"),
         "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
@@ -1305,10 +1333,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "noResults": MessageLookupByLibrary.simpleMessage("Keine Ergebnisse"),
         "noResultsFound":
             MessageLookupByLibrary.simpleMessage("Keine Ergebnisse gefunden"),
-        "noSuggestionsForPerson": m47,
+        "noSuggestionsForPerson": m51,
         "noSystemLockFound":
             MessageLookupByLibrary.simpleMessage("Keine Systemsperre gefunden"),
-        "notPersonLabel": m48,
+        "notPersonLabel": m52,
         "nothingSharedWithYouYet":
             MessageLookupByLibrary.simpleMessage("Noch nichts mit Dir geteilt"),
         "nothingToSeeHere": MessageLookupByLibrary.simpleMessage(
@@ -1319,7 +1347,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "onDevice": MessageLookupByLibrary.simpleMessage("Auf dem Gerät"),
         "onEnte": MessageLookupByLibrary.simpleMessage(
             "Auf <branding>ente</branding>"),
-        "onlyFamilyAdminCanChangeCode": m49,
+        "onlyFamilyAdminCanChangeCode": m53,
         "onlyThem": MessageLookupByLibrary.simpleMessage("Nur diese"),
         "oops": MessageLookupByLibrary.simpleMessage("Hoppla"),
         "oopsCouldNotSaveEdits": MessageLookupByLibrary.simpleMessage(
@@ -1342,8 +1370,6 @@ class MessageLookup extends MessageLookupByLibrary {
             "Oder mit existierenden zusammenführen"),
         "orPickAnExistingOne": MessageLookupByLibrary.simpleMessage(
             "Oder eine vorherige auswählen"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "pair": MessageLookupByLibrary.simpleMessage("Koppeln"),
         "pairWithPin":
             MessageLookupByLibrary.simpleMessage("Mit PIN verbinden"),
@@ -1369,7 +1395,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Zahlung fehlgeschlagen"),
         "paymentFailedMessage": MessageLookupByLibrary.simpleMessage(
             "Leider ist deine Zahlung fehlgeschlagen. Wende dich an unseren Support und wir helfen dir weiter!"),
-        "paymentFailedTalkToProvider": m50,
+        "paymentFailedTalkToProvider": m54,
         "pendingItems":
             MessageLookupByLibrary.simpleMessage("Ausstehende Elemente"),
         "pendingSync":
@@ -1393,14 +1419,17 @@ class MessageLookup extends MessageLookupByLibrary {
         "photosAddedByYouWillBeRemovedFromTheAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Von dir hinzugefügte Fotos werden vom Album entfernt"),
-        "photosCount": m51,
+        "photosCount": m55,
         "pickCenterPoint":
             MessageLookupByLibrary.simpleMessage("Mittelpunkt auswählen"),
         "pinAlbum": MessageLookupByLibrary.simpleMessage("Album anheften"),
         "pinLock": MessageLookupByLibrary.simpleMessage("PIN-Sperre"),
         "playOnTv": MessageLookupByLibrary.simpleMessage(
             "Album auf dem Fernseher wiedergeben"),
-        "playStoreFreeTrialValidTill": m52,
+        "playOriginal":
+            MessageLookupByLibrary.simpleMessage("Original abspielen"),
+        "playStoreFreeTrialValidTill": m56,
+        "playStream": MessageLookupByLibrary.simpleMessage("Stream abspielen"),
         "playstoreSubscription":
             MessageLookupByLibrary.simpleMessage("PlayStore Abo"),
         "pleaseCheckYourInternetConnectionAndTryAgain":
@@ -1412,14 +1441,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseContactSupportIfTheProblemPersists":
             MessageLookupByLibrary.simpleMessage(
                 "Bitte wenden Sie sich an den Support, falls das Problem weiterhin besteht"),
-        "pleaseEmailUsAt": m53,
+        "pleaseEmailUsAt": m57,
         "pleaseGrantPermissions": MessageLookupByLibrary.simpleMessage(
             "Bitte erteile die nötigen Berechtigungen"),
         "pleaseLoginAgain":
             MessageLookupByLibrary.simpleMessage("Bitte logge dich erneut ein"),
         "pleaseSelectQuickLinksToRemove": MessageLookupByLibrary.simpleMessage(
             "Bitte wähle die zu entfernenden schnellen Links"),
-        "pleaseSendTheLogsTo": m54,
+        "pleaseSendTheLogsTo": m58,
         "pleaseTryAgain":
             MessageLookupByLibrary.simpleMessage("Bitte versuche es erneut"),
         "pleaseVerifyTheCodeYouHaveEntered":
@@ -1448,17 +1477,26 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Privates Teilen"),
         "proceed": MessageLookupByLibrary.simpleMessage("Fortfahren"),
         "processed": MessageLookupByLibrary.simpleMessage("Verarbeitet"),
-        "processingImport": m55,
+        "processing": MessageLookupByLibrary.simpleMessage("In Bearbeitung"),
+        "processingImport": m59,
+        "processingVideos":
+            MessageLookupByLibrary.simpleMessage("Verarbeite Videos"),
         "publicLinkCreated":
             MessageLookupByLibrary.simpleMessage("Öffentlicher Link erstellt"),
         "publicLinkEnabled":
             MessageLookupByLibrary.simpleMessage("Öffentlicher Link aktiviert"),
+        "queued": MessageLookupByLibrary.simpleMessage("In der Warteschlange"),
         "quickLinks": MessageLookupByLibrary.simpleMessage("Quick Links"),
         "radius": MessageLookupByLibrary.simpleMessage("Umkreis"),
         "raiseTicket": MessageLookupByLibrary.simpleMessage("Ticket erstellen"),
         "rateTheApp": MessageLookupByLibrary.simpleMessage("App bewerten"),
         "rateUs": MessageLookupByLibrary.simpleMessage("Bewerte uns"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
+        "reassignMe":
+            MessageLookupByLibrary.simpleMessage("\"Ich\" neu zuweisen"),
+        "reassignedToName": m61,
+        "reassigningLoading":
+            MessageLookupByLibrary.simpleMessage("Ordne neu zu..."),
         "recover": MessageLookupByLibrary.simpleMessage("Wiederherstellen"),
         "recoverAccount":
             MessageLookupByLibrary.simpleMessage("Konto wiederherstellen"),
@@ -1468,7 +1506,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Konto wiederherstellen"),
         "recoveryInitiated":
             MessageLookupByLibrary.simpleMessage("Wiederherstellung gestartet"),
-        "recoveryInitiatedDesc": m57,
+        "recoveryInitiatedDesc": m62,
         "recoveryKey": MessageLookupByLibrary.simpleMessage(
             "Wiederherstellungs-Schlüssel"),
         "recoveryKeyCopiedToClipboard": MessageLookupByLibrary.simpleMessage(
@@ -1483,12 +1521,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Wiederherstellungs-Schlüssel überprüft"),
         "recoveryKeyVerifyReason": MessageLookupByLibrary.simpleMessage(
             "Dein Wiederherstellungsschlüssel ist die einzige Möglichkeit, auf deine Fotos zuzugreifen, solltest du dein Passwort vergessen. Du findest ihn unter Einstellungen > Konto.\n\nBitte gib deinen Wiederherstellungsschlüssel hier ein, um sicherzugehen, dass du ihn korrekt gesichert hast."),
-        "recoveryReady": m58,
+        "recoveryReady": m63,
         "recoverySuccessful": MessageLookupByLibrary.simpleMessage(
             "Wiederherstellung erfolgreich!"),
         "recoveryWarning": MessageLookupByLibrary.simpleMessage(
             "Ein vertrauenswürdiger Kontakt versucht, auf dein Konto zuzugreifen"),
-        "recoveryWarningBody": m59,
+        "recoveryWarningBody": m64,
         "recreatePasswordBody": MessageLookupByLibrary.simpleMessage(
             "Das aktuelle Gerät ist nicht leistungsfähig genug, um dein Passwort zu verifizieren, aber wir können es neu erstellen, damit es auf allen Geräten funktioniert.\n\nBitte melde dich mit deinem Wiederherstellungs-Schlüssel an und erstelle dein Passwort neu (Wenn du willst, kannst du dasselbe erneut verwenden)."),
         "recreatePasswordTitle":
@@ -1504,7 +1542,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "1. Gib diesen Code an deine Freunde"),
         "referralStep2": MessageLookupByLibrary.simpleMessage(
             "2. Sie schließen ein bezahltes Abo ab"),
-        "referralStep3": m60,
+        "referralStep3": m65,
         "referrals": MessageLookupByLibrary.simpleMessage("Weiterempfehlungen"),
         "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage(
             "Einlösungen sind derzeit pausiert"),
@@ -1536,7 +1574,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "removeLink": MessageLookupByLibrary.simpleMessage("Link entfernen"),
         "removeParticipant":
             MessageLookupByLibrary.simpleMessage("Teilnehmer entfernen"),
-        "removeParticipantBody": m61,
+        "removeParticipantBody": m66,
         "removePersonLabel":
             MessageLookupByLibrary.simpleMessage("Personenetikett entfernen"),
         "removePublicLink":
@@ -1556,7 +1594,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "renameFile": MessageLookupByLibrary.simpleMessage("Datei umbenennen"),
         "renewSubscription":
             MessageLookupByLibrary.simpleMessage("Abonnement erneuern"),
-        "renewsOn": m62,
+        "renewsOn": m67,
         "reportABug": MessageLookupByLibrary.simpleMessage("Fehler melden"),
         "reportBug": MessageLookupByLibrary.simpleMessage("Fehler melden"),
         "resendEmail":
@@ -1588,6 +1626,9 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Nach rechts drehen"),
         "safelyStored": MessageLookupByLibrary.simpleMessage("Gesichert"),
         "save": MessageLookupByLibrary.simpleMessage("Speichern"),
+        "saveChangesBeforeLeavingQuestion":
+            MessageLookupByLibrary.simpleMessage(
+                "Änderungen vor dem Verlassen speichern?"),
         "saveCollage":
             MessageLookupByLibrary.simpleMessage("Collage speichern"),
         "saveCopy": MessageLookupByLibrary.simpleMessage("Kopie speichern"),
@@ -1635,8 +1676,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Laden Sie Personen ein, damit Sie geteilte Fotos hier einsehen können"),
         "searchPersonsEmptySection": MessageLookupByLibrary.simpleMessage(
             "Personen werden hier angezeigt, sobald Verarbeitung und Synchronisierung abgeschlossen sind"),
-        "searchResultCount": m63,
-        "searchSectionsLengthMismatch": m64,
+        "searchResultCount": m68,
+        "searchSectionsLengthMismatch": m69,
         "security": MessageLookupByLibrary.simpleMessage("Sicherheit"),
         "seePublicAlbumLinksInApp": MessageLookupByLibrary.simpleMessage(
             "Öffentliche Album-Links in der App ansehen"),
@@ -1659,7 +1700,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("E-Mail-App auswählen"),
         "selectMorePhotos":
             MessageLookupByLibrary.simpleMessage("Mehr Fotos auswählen"),
+        "selectPersonToLink": MessageLookupByLibrary.simpleMessage(
+            "Person zum Verknüpfen auswählen"),
         "selectReason": MessageLookupByLibrary.simpleMessage("Grund auswählen"),
+        "selectYourFace":
+            MessageLookupByLibrary.simpleMessage("Wähle dein Gesicht"),
         "selectYourPlan":
             MessageLookupByLibrary.simpleMessage("Wähle dein Abo aus"),
         "selectedFilesAreNotOnEnte": MessageLookupByLibrary.simpleMessage(
@@ -1671,7 +1716,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Ausgewählte Elemente werden aus allen Alben gelöscht und in den Papierkorb verschoben."),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "send": MessageLookupByLibrary.simpleMessage("Absenden"),
         "sendEmail": MessageLookupByLibrary.simpleMessage("E-Mail senden"),
         "sendInvite": MessageLookupByLibrary.simpleMessage("Einladung senden"),
@@ -1701,16 +1746,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "shareAnAlbumNow":
             MessageLookupByLibrary.simpleMessage("Teile jetzt ein Album"),
         "shareLink": MessageLookupByLibrary.simpleMessage("Link teilen"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage(
             "Teile mit ausgewählten Personen"),
         "shareTextConfirmOthersVerificationID": m7,
         "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage(
             "Hol dir Ente, damit wir ganz einfach Fotos und Videos in Originalqualität teilen können\n\nhttps://ente.io"),
-        "shareTextReferralCode": m67,
+        "shareTextReferralCode": m72,
         "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage(
             "Mit Nicht-Ente-Benutzern teilen"),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "shareYourFirstAlbum":
             MessageLookupByLibrary.simpleMessage("Teile dein erstes Album"),
         "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
@@ -1721,7 +1766,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Neue geteilte Fotos"),
         "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage(
             "Erhalte Benachrichtigungen, wenn jemand ein Foto zu einem gemeinsam genutzten Album hinzufügt, dem du angehörst"),
-        "sharedWith": m69,
+        "sharedWith": m74,
         "sharedWithMe": MessageLookupByLibrary.simpleMessage("Mit mir geteilt"),
         "sharedWithYou":
             MessageLookupByLibrary.simpleMessage("Mit dir geteilt"),
@@ -1737,11 +1782,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Andere Geräte abmelden"),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "Ich stimme den <u-terms>Nutzungsbedingungen</u-terms> und der <u-policy>Datenschutzerklärung</u-policy> zu"),
-        "singleFileDeleteFromDevice": m70,
+        "singleFileDeleteFromDevice": m75,
         "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage(
             "Es wird aus allen Alben gelöscht."),
-        "singleFileInBothLocalAndRemote": m71,
-        "singleFileInRemoteOnly": m72,
+        "singleFileInBothLocalAndRemote": m76,
+        "singleFileInRemoteOnly": m77,
         "skip": MessageLookupByLibrary.simpleMessage("Überspringen"),
         "social": MessageLookupByLibrary.simpleMessage("Social Media"),
         "someItemsAreInBothEnteAndYourDevice":
@@ -1793,10 +1838,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageInGB": m1,
         "storageLimitExceeded": MessageLookupByLibrary.simpleMessage(
             "Speichergrenze überschritten"),
-        "storageUsageInfo": m73,
+        "storageUsageInfo": m78,
+        "streamDetails": MessageLookupByLibrary.simpleMessage("Stream-Details"),
         "strongStrength": MessageLookupByLibrary.simpleMessage("Stark"),
-        "subAlreadyLinkedErrMessage": m74,
-        "subWillBeCancelledOn": m75,
+        "subAlreadyLinkedErrMessage": m79,
+        "subWillBeCancelledOn": m80,
         "subscribe": MessageLookupByLibrary.simpleMessage("Abonnieren"),
         "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage(
             "Du benötigst ein aktives, bezahltes Abonnement, um das Teilen zu aktivieren."),
@@ -1813,7 +1859,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "suggestFeatures":
             MessageLookupByLibrary.simpleMessage("Verbesserung vorschlagen"),
         "support": MessageLookupByLibrary.simpleMessage("Support"),
-        "syncProgress": m76,
+        "syncProgress": m81,
         "syncStopped":
             MessageLookupByLibrary.simpleMessage("Synchronisierung angehalten"),
         "syncing": MessageLookupByLibrary.simpleMessage("Synchronisiere …"),
@@ -1826,7 +1872,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Zum Entsperren antippen"),
         "tapToUpload":
             MessageLookupByLibrary.simpleMessage("Zum Hochladen antippen"),
-        "tapToUploadIsIgnoredDue": m77,
+        "tapToUploadIsIgnoredDue": m82,
         "tempErrorContactSupportIfPersists": MessageLookupByLibrary.simpleMessage(
             "Etwas ist schiefgelaufen. Bitte versuche es später noch einmal. Sollte der Fehler weiter bestehen, kontaktiere unser Supportteam."),
         "terminate": MessageLookupByLibrary.simpleMessage("Beenden"),
@@ -1866,7 +1912,9 @@ class MessageLookup extends MessageLookupByLibrary {
             "Diese E-Mail-Adresse wird bereits verwendet"),
         "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage(
             "Dieses Bild hat keine Exif-Daten"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsMeExclamation":
+            MessageLookupByLibrary.simpleMessage("Das bin ich!"),
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage(
             "Dies ist deine Verifizierungs-ID"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -1891,11 +1939,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "total": MessageLookupByLibrary.simpleMessage("Gesamt"),
         "totalSize": MessageLookupByLibrary.simpleMessage("Gesamtgröße"),
         "trash": MessageLookupByLibrary.simpleMessage("Papierkorb"),
-        "trashDaysLeft": m79,
+        "trashDaysLeft": m84,
         "trim": MessageLookupByLibrary.simpleMessage("Schneiden"),
         "trustedContacts":
             MessageLookupByLibrary.simpleMessage("Vertrauenswürdige Kontakte"),
-        "trustedInviteBody": m80,
+        "trustedInviteBody": m85,
         "tryAgain": MessageLookupByLibrary.simpleMessage("Erneut versuchen"),
         "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage(
             "Aktiviere die Sicherung, um neue Dateien in diesem Ordner automatisch zu Ente hochzuladen."),
@@ -1914,7 +1962,7 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Zwei-Faktor-Authentifizierung (2FA) erfolgreich zurückgesetzt"),
         "twofactorSetup": MessageLookupByLibrary.simpleMessage(
             "Zweiten Faktor (2FA) einrichten"),
-        "typeOfGallerGallerytypeIsNotSupportedForRename": m81,
+        "typeOfGallerGallerytypeIsNotSupportedForRename": m86,
         "unarchive": MessageLookupByLibrary.simpleMessage("Dearchivieren"),
         "unarchiveAlbum":
             MessageLookupByLibrary.simpleMessage("Album dearchivieren"),
@@ -1938,10 +1986,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "updatingFolderSelection": MessageLookupByLibrary.simpleMessage(
             "Ordnerauswahl wird aktualisiert..."),
         "upgrade": MessageLookupByLibrary.simpleMessage("Upgrade"),
-        "uploadIsIgnoredDueToIgnorereason": m82,
+        "uploadIsIgnoredDueToIgnorereason": m87,
         "uploadingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
             "Dateien werden ins Album hochgeladen..."),
-        "uploadingMultipleMemories": m83,
+        "uploadingMultipleMemories": m88,
         "uploadingSingleMemory": MessageLookupByLibrary.simpleMessage(
             "Sichere ein Erinnerungsstück..."),
         "upto50OffUntil4thDec": MessageLookupByLibrary.simpleMessage(
@@ -1960,7 +2008,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Ausgewähltes Foto verwenden"),
         "usedSpace":
             MessageLookupByLibrary.simpleMessage("Belegter Speicherplatz"),
-        "validTill": m84,
+        "validTill": m89,
         "verificationFailedPleaseTryAgain":
             MessageLookupByLibrary.simpleMessage(
                 "Verifizierung fehlgeschlagen, bitte versuchen Sie es erneut"),
@@ -1969,7 +2017,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "verify": MessageLookupByLibrary.simpleMessage("Überprüfen"),
         "verifyEmail":
             MessageLookupByLibrary.simpleMessage("E-Mail-Adresse verifizieren"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Überprüfen"),
         "verifyPasskey":
             MessageLookupByLibrary.simpleMessage("Passkey verifizieren"),
@@ -1981,6 +2029,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "videoInfo":
             MessageLookupByLibrary.simpleMessage("Video-Informationen"),
         "videoSmallCase": MessageLookupByLibrary.simpleMessage("Video"),
+        "videoStreaming":
+            MessageLookupByLibrary.simpleMessage("Video-Streaming"),
         "videos": MessageLookupByLibrary.simpleMessage("Videos"),
         "viewActiveSessions":
             MessageLookupByLibrary.simpleMessage("Aktive Sitzungen anzeigen"),
@@ -1996,7 +2046,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "viewRecoveryKey": MessageLookupByLibrary.simpleMessage(
             "Wiederherstellungsschlüssel anzeigen"),
         "viewer": MessageLookupByLibrary.simpleMessage("Zuschauer"),
-        "viewersSuccessfullyAdded": m86,
+        "viewersSuccessfullyAdded": m91,
         "visitWebToManage": MessageLookupByLibrary.simpleMessage(
             "Bitte rufe \"web.ente.io\" auf, um dein Abo zu verwalten"),
         "waitingForVerification":
@@ -2018,7 +2068,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Ein vertrauenswürdiger Kontakt kann helfen, deine Daten wiederherzustellen."),
         "yearShort": MessageLookupByLibrary.simpleMessage("Jahr"),
         "yearly": MessageLookupByLibrary.simpleMessage("Jährlich"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("Ja"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("Ja, kündigen"),
         "yesConvertToViewer": MessageLookupByLibrary.simpleMessage(
@@ -2050,7 +2100,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Du kannst nicht mit dir selbst teilen"),
         "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage(
             "Du hast keine archivierten Elemente."),
-        "youHaveSuccessfullyFreedUp": m88,
+        "youHaveSuccessfullyFreedUp": m93,
         "yourAccountHasBeenDeleted": MessageLookupByLibrary.simpleMessage(
             "Dein Benutzerkonto wurde gelöscht"),
         "yourMap": MessageLookupByLibrary.simpleMessage("Deine Karte"),
diff --git a/mobile/lib/generated/intl/messages_el.dart b/mobile/lib/generated/intl/messages_el.dart
index 096f3e56ad..79c0433b27 100644
--- a/mobile/lib/generated/intl/messages_el.dart
+++ b/mobile/lib/generated/intl/messages_el.dart
@@ -23,8 +23,6 @@ class MessageLookup extends MessageLookupByLibrary {
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
         "enterYourEmailAddress": MessageLookupByLibrary.simpleMessage(
-            "Εισάγετε την διεύθυνση ηλ. ταχυδρομείου σας"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts")
+            "Εισάγετε την διεύθυνση ηλ. ταχυδρομείου σας")
       };
 }
diff --git a/mobile/lib/generated/intl/messages_en.dart b/mobile/lib/generated/intl/messages_en.dart
index 41537dd1ec..fbe444345c 100644
--- a/mobile/lib/generated/intl/messages_en.dart
+++ b/mobile/lib/generated/intl/messages_en.dart
@@ -20,258 +20,258 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'en';
 
-  static String m89(title) => "${title} (Me)";
-
-  static String m9(count) =>
-      "${Intl.plural(count, zero: 'Add collaborator', one: 'Add collaborator', other: 'Add collaborators')}";
+  static String m9(title) => "${title} (Me)";
 
   static String m10(count) =>
+      "${Intl.plural(count, zero: 'Add collaborator', one: 'Add collaborator', other: 'Add collaborators')}";
+
+  static String m11(count) =>
       "${Intl.plural(count, one: 'Add item', other: 'Add items')}";
 
-  static String m11(storageAmount, endDate) =>
+  static String m12(storageAmount, endDate) =>
       "Your ${storageAmount} add-on is valid till ${endDate}";
 
-  static String m12(count) =>
+  static String m13(count) =>
       "${Intl.plural(count, zero: 'Add viewer', one: 'Add viewer', other: 'Add viewers')}";
 
-  static String m13(emailOrName) => "Added by ${emailOrName}";
+  static String m14(emailOrName) => "Added by ${emailOrName}";
 
-  static String m14(albumName) => "Added successfully to  ${albumName}";
+  static String m15(albumName) => "Added successfully to  ${albumName}";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: 'No Participants', one: '1 Participant', other: '${count} Participants')}";
 
-  static String m16(versionValue) => "Version: ${versionValue}";
+  static String m17(versionValue) => "Version: ${versionValue}";
 
-  static String m17(freeAmount, storageUnit) =>
+  static String m18(freeAmount, storageUnit) =>
       "${freeAmount} ${storageUnit} free";
 
-  static String m18(paymentProvider) =>
+  static String m19(paymentProvider) =>
       "Please cancel your existing subscription from ${paymentProvider} first";
 
   static String m3(user) =>
       "${user} will not be able to add more photos to this album\n\nThey will still be able to remove existing photos added by them";
 
-  static String m19(isFamilyMember, storageAmountInGb) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
       "${Intl.select(isFamilyMember, {
             'true': 'Your family has claimed ${storageAmountInGb} GB so far',
             'false': 'You have claimed ${storageAmountInGb} GB so far',
             'other': 'You have claimed ${storageAmountInGb} GB so far!',
           })}";
 
-  static String m20(albumName) => "Collaborative link created for ${albumName}";
+  static String m21(albumName) => "Collaborative link created for ${albumName}";
 
-  static String m21(count) =>
+  static String m22(count) =>
       "${Intl.plural(count, zero: 'Added 0 collaborator', one: 'Added 1 collaborator', other: 'Added ${count} collaborators')}";
 
-  static String m22(email, numOfDays) =>
+  static String m23(email, numOfDays) =>
       "You are about to add ${email} as a trusted contact. They will be able to recover your account if you are absent for ${numOfDays} days.";
 
-  static String m23(familyAdminEmail) =>
+  static String m24(familyAdminEmail) =>
       "Please contact <green>${familyAdminEmail}</green> to manage your subscription";
 
-  static String m24(provider) =>
+  static String m25(provider) =>
       "Please contact us at support@ente.io to manage your ${provider} subscription.";
 
-  static String m25(endpoint) => "Connected to ${endpoint}";
+  static String m26(endpoint) => "Connected to ${endpoint}";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: 'Delete ${count} item', other: 'Delete ${count} items')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "Deleting ${currentlyDeleting} / ${totalCount}";
 
-  static String m28(albumName) =>
+  static String m29(albumName) =>
       "This will remove the public link for accessing \"${albumName}\".";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "Please drop an email to ${supportEmail} from your registered email address";
 
-  static String m30(count, storageSaved) =>
+  static String m31(count, storageSaved) =>
       "You have cleaned up ${Intl.plural(count, one: '${count} duplicate file', other: '${count} duplicate files')}, saving (${storageSaved}!)";
 
-  static String m31(count, formattedSize) =>
+  static String m32(count, formattedSize) =>
       "${count} files, ${formattedSize} each";
 
-  static String m32(newEmail) => "Email changed to ${newEmail}";
+  static String m33(newEmail) => "Email changed to ${newEmail}";
 
-  static String m90(email) => "${email} does not have an Ente account.";
+  static String m34(email) => "${email} does not have an Ente account.";
 
-  static String m33(email) =>
+  static String m35(email) =>
       "${email} does not have an Ente account.\n\nSend them an invite to share photos.";
 
-  static String m34(text) => "Extra photos found for ${text}";
+  static String m36(text) => "Extra photos found for ${text}";
 
-  static String m35(count, formattedNumber) =>
+  static String m37(count, formattedNumber) =>
       "${Intl.plural(count, one: '1 file', other: '${formattedNumber} files')} on this device have been backed up safely";
 
-  static String m36(count, formattedNumber) =>
+  static String m38(count, formattedNumber) =>
       "${Intl.plural(count, one: '1 file', other: '${formattedNumber} files')} in this album has been backed up safely";
 
   static String m4(storageAmountInGB) =>
       "${storageAmountInGB} GB each time someone signs up for a paid plan and applies your code";
 
-  static String m37(endDate) => "Free trial valid till ${endDate}";
+  static String m39(endDate) => "Free trial valid till ${endDate}";
 
-  static String m38(count) =>
+  static String m40(count) =>
       "You can still access ${Intl.plural(count, one: 'it', other: 'them')} on Ente as long as you have an active subscription";
 
-  static String m39(sizeInMBorGB) => "Free up ${sizeInMBorGB}";
+  static String m41(sizeInMBorGB) => "Free up ${sizeInMBorGB}";
 
-  static String m40(count, formattedSize) =>
+  static String m42(count, formattedSize) =>
       "${Intl.plural(count, one: 'It can be deleted from the device to free up ${formattedSize}', other: 'They can be deleted from the device to free up ${formattedSize}')}";
 
-  static String m41(currentlyProcessing, totalCount) =>
+  static String m43(currentlyProcessing, totalCount) =>
       "Processing ${currentlyProcessing} / ${totalCount}";
 
-  static String m42(count) =>
+  static String m44(count) =>
       "${Intl.plural(count, one: '${count} item', other: '${count} items')}";
 
-  static String m43(email) =>
+  static String m45(email) =>
       "${email} has invited you to be a trusted contact";
 
-  static String m44(expiryTime) => "Link will expire on ${expiryTime}";
+  static String m46(expiryTime) => "Link will expire on ${expiryTime}";
 
-  static String m91(email) => "Link person to ${email}";
+  static String m47(email) => "Link person to ${email}";
 
-  static String m92(personName, email) =>
+  static String m48(personName, email) =>
       "This will link ${personName} to ${email}";
 
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, zero: 'no memories', one: '${formattedCount} memory', other: '${formattedCount} memories')}";
 
-  static String m45(count) =>
+  static String m49(count) =>
       "${Intl.plural(count, one: 'Move item', other: 'Move items')}";
 
-  static String m46(albumName) => "Moved successfully to ${albumName}";
+  static String m50(albumName) => "Moved successfully to ${albumName}";
 
-  static String m47(personName) => "No suggestions for ${personName}";
+  static String m51(personName) => "No suggestions for ${personName}";
 
-  static String m48(name) => "Not ${name}?";
+  static String m52(name) => "Not ${name}?";
 
-  static String m49(familyAdminEmail) =>
+  static String m53(familyAdminEmail) =>
       "Please contact ${familyAdminEmail} to change your code.";
 
   static String m0(passwordStrengthValue) =>
       "Password strength: ${passwordStrengthValue}";
 
-  static String m50(providerName) =>
+  static String m54(providerName) =>
       "Please talk to ${providerName} support if you were charged";
 
-  static String m51(count) =>
+  static String m55(count) =>
       "${Intl.plural(count, zero: '0 photo', one: '1 photo', other: '${count} photos')}";
 
-  static String m52(endDate) =>
+  static String m56(endDate) =>
       "Free trial valid till ${endDate}.\nYou can choose a paid plan afterwards.";
 
-  static String m53(toEmail) => "Please email us at ${toEmail}";
+  static String m57(toEmail) => "Please email us at ${toEmail}";
 
-  static String m54(toEmail) => "Please send the logs to \n${toEmail}";
+  static String m58(toEmail) => "Please send the logs to \n${toEmail}";
 
-  static String m55(folderName) => "Processing ${folderName}...";
+  static String m59(folderName) => "Processing ${folderName}...";
 
-  static String m56(storeName) => "Rate us on ${storeName}";
+  static String m60(storeName) => "Rate us on ${storeName}";
 
-  static String m93(name) => "Reassigned you to ${name}";
+  static String m61(name) => "Reassigned you to ${name}";
 
-  static String m57(days, email) =>
+  static String m62(days, email) =>
       "You can access the account after ${days} days. A notification will be sent to ${email}.";
 
-  static String m58(email) =>
+  static String m63(email) =>
       "You can now recover ${email}\'s account by setting a new password.";
 
-  static String m59(email) => "${email} is trying to recover your account.";
+  static String m64(email) => "${email} is trying to recover your account.";
 
-  static String m60(storageInGB) =>
+  static String m65(storageInGB) =>
       "3. Both of you get ${storageInGB} GB* free";
 
-  static String m61(userEmail) =>
+  static String m66(userEmail) =>
       "${userEmail} will be removed from this shared album\n\nAny photos added by them will also be removed from the album";
 
-  static String m62(endDate) => "Subscription renews on ${endDate}";
+  static String m67(endDate) => "Subscription renews on ${endDate}";
 
-  static String m63(count) =>
+  static String m68(count) =>
       "${Intl.plural(count, one: '${count} result found', other: '${count} results found')}";
 
-  static String m64(snapshotLength, searchLength) =>
+  static String m69(snapshotLength, searchLength) =>
       "Sections length mismatch: ${snapshotLength} != ${searchLength}";
 
   static String m6(count) => "${count} selected";
 
-  static String m65(count, yourCount) =>
+  static String m70(count, yourCount) =>
       "${count} selected (${yourCount} yours)";
 
-  static String m66(verificationID) =>
+  static String m71(verificationID) =>
       "Here\'s my verification ID: ${verificationID} for ente.io.";
 
   static String m7(verificationID) =>
       "Hey, can you confirm that this is your ente.io verification ID: ${verificationID}";
 
-  static String m67(referralCode, referralStorageInGB) =>
+  static String m72(referralCode, referralStorageInGB) =>
       "Ente referral code: ${referralCode} \n\nApply it in Settings → General → Referrals to get ${referralStorageInGB} GB free after you signup for a paid plan\n\nhttps://ente.io";
 
-  static String m68(numberOfPeople) =>
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: 'Share with specific people', one: 'Shared with 1 person', other: 'Shared with ${numberOfPeople} people')}";
 
-  static String m69(emailIDs) => "Shared with ${emailIDs}";
+  static String m74(emailIDs) => "Shared with ${emailIDs}";
 
-  static String m70(fileType) =>
+  static String m75(fileType) =>
       "This ${fileType} will be deleted from your device.";
 
-  static String m71(fileType) =>
+  static String m76(fileType) =>
       "This ${fileType} is in both Ente and your device.";
 
-  static String m72(fileType) => "This ${fileType} will be deleted from Ente.";
+  static String m77(fileType) => "This ${fileType} will be deleted from Ente.";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} GB";
 
-  static String m73(
+  static String m78(
           usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) =>
       "${usedAmount} ${usedStorageUnit} of ${totalAmount} ${totalStorageUnit} used";
 
-  static String m74(id) =>
+  static String m79(id) =>
       "Your ${id} is already linked to another Ente account.\nIf you would like to use your ${id} with this account, please contact our support\'\'";
 
-  static String m75(endDate) =>
+  static String m80(endDate) =>
       "Your subscription will be cancelled on ${endDate}";
 
-  static String m76(completed, total) =>
+  static String m81(completed, total) =>
       "${completed}/${total} memories preserved";
 
-  static String m77(ignoreReason) =>
+  static String m82(ignoreReason) =>
       "Tap to upload, upload is currently ignored due to ${ignoreReason}";
 
   static String m8(storageAmountInGB) =>
       "They also get ${storageAmountInGB} GB";
 
-  static String m78(email) => "This is ${email}\'s Verification ID";
+  static String m83(email) => "This is ${email}\'s Verification ID";
 
-  static String m79(count) =>
+  static String m84(count) =>
       "${Intl.plural(count, zero: 'Soon', one: '1 day', other: '${count} days')}";
 
-  static String m80(email) =>
+  static String m85(email) =>
       "You have been invited to be a legacy contact by ${email}.";
 
-  static String m81(galleryType) =>
+  static String m86(galleryType) =>
       "Type of gallery ${galleryType} is not supported for rename";
 
-  static String m82(ignoreReason) => "Upload is ignored due to ${ignoreReason}";
+  static String m87(ignoreReason) => "Upload is ignored due to ${ignoreReason}";
 
-  static String m83(count) => "Preserving ${count} memories...";
+  static String m88(count) => "Preserving ${count} memories...";
 
-  static String m84(endDate) => "Valid till ${endDate}";
+  static String m89(endDate) => "Valid till ${endDate}";
 
-  static String m85(email) => "Verify ${email}";
+  static String m90(email) => "Verify ${email}";
 
-  static String m86(count) =>
+  static String m91(count) =>
       "${Intl.plural(count, zero: 'Added 0 viewer', one: 'Added 1 viewer', other: 'Added ${count} viewers')}";
 
   static String m2(email) => "We have sent a mail to <green>${email}</green>";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, one: '${count} year ago', other: '${count} years ago')}";
 
-  static String m88(storageSaved) =>
+  static String m93(storageSaved) =>
       "You have successfully freed up ${storageSaved}!";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
@@ -284,7 +284,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "account": MessageLookupByLibrary.simpleMessage("Account"),
         "accountIsAlreadyConfigured": MessageLookupByLibrary.simpleMessage(
             "Account is already configured."),
-        "accountOwnerPersonAppbarTitle": m89,
+        "accountOwnerPersonAppbarTitle": m9,
         "accountWelcomeBack":
             MessageLookupByLibrary.simpleMessage("Welcome back!"),
         "ackPasswordLostWarning": MessageLookupByLibrary.simpleMessage(
@@ -296,11 +296,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "addANewEmail": MessageLookupByLibrary.simpleMessage("Add a new email"),
         "addCollaborator":
             MessageLookupByLibrary.simpleMessage("Add collaborator"),
-        "addCollaborators": m9,
+        "addCollaborators": m10,
         "addFiles": MessageLookupByLibrary.simpleMessage("Add Files"),
         "addFromDevice":
             MessageLookupByLibrary.simpleMessage("Add from device"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocation": MessageLookupByLibrary.simpleMessage("Add location"),
         "addLocationButton": MessageLookupByLibrary.simpleMessage("Add"),
         "addMore": MessageLookupByLibrary.simpleMessage("Add more"),
@@ -311,7 +311,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "addNewPerson": MessageLookupByLibrary.simpleMessage("Add new person"),
         "addOnPageSubtitle":
             MessageLookupByLibrary.simpleMessage("Details of add-ons"),
-        "addOnValidTill": m11,
+        "addOnValidTill": m12,
         "addOns": MessageLookupByLibrary.simpleMessage("Add-ons"),
         "addPhotos": MessageLookupByLibrary.simpleMessage("Add photos"),
         "addSelected": MessageLookupByLibrary.simpleMessage("Add selected"),
@@ -322,12 +322,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "addTrustedContact":
             MessageLookupByLibrary.simpleMessage("Add Trusted Contact"),
         "addViewer": MessageLookupByLibrary.simpleMessage("Add viewer"),
-        "addViewers": m12,
+        "addViewers": m13,
         "addYourPhotosNow":
             MessageLookupByLibrary.simpleMessage("Add your photos now"),
         "addedAs": MessageLookupByLibrary.simpleMessage("Added as"),
-        "addedBy": m13,
-        "addedSuccessfullyTo": m14,
+        "addedBy": m14,
+        "addedSuccessfullyTo": m15,
         "addingToFavorites":
             MessageLookupByLibrary.simpleMessage("Adding to favorites..."),
         "advanced": MessageLookupByLibrary.simpleMessage("Advanced"),
@@ -338,7 +338,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "after1Week": MessageLookupByLibrary.simpleMessage("After 1 week"),
         "after1Year": MessageLookupByLibrary.simpleMessage("After 1 year"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("Owner"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumTitle": MessageLookupByLibrary.simpleMessage("Album title"),
         "albumUpdated": MessageLookupByLibrary.simpleMessage("Album updated"),
         "albums": MessageLookupByLibrary.simpleMessage("Albums"),
@@ -384,7 +384,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "appLock": MessageLookupByLibrary.simpleMessage("App lock"),
         "appLockDescriptions": MessageLookupByLibrary.simpleMessage(
             "Choose between your device\'s default lock screen and a custom lock screen with a PIN or password."),
-        "appVersion": m16,
+        "appVersion": m17,
         "appleId": MessageLookupByLibrary.simpleMessage("Apple ID"),
         "apply": MessageLookupByLibrary.simpleMessage("Apply"),
         "applyCodeTitle": MessageLookupByLibrary.simpleMessage("Apply code"),
@@ -466,7 +466,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoPairDesc": MessageLookupByLibrary.simpleMessage(
             "Auto pair works only with devices that support Chromecast."),
         "available": MessageLookupByLibrary.simpleMessage("Available"),
-        "availableStorageSpace": m17,
+        "availableStorageSpace": m18,
         "backedUpFolders":
             MessageLookupByLibrary.simpleMessage("Backed up folders"),
         "backup": MessageLookupByLibrary.simpleMessage("Backup"),
@@ -503,7 +503,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Cancel recovery"),
         "cancelAccountRecoveryBody": MessageLookupByLibrary.simpleMessage(
             "Are you sure you want to cancel recovery?"),
-        "cancelOtherSubscription": m18,
+        "cancelOtherSubscription": m19,
         "cancelSubscription":
             MessageLookupByLibrary.simpleMessage("Cancel subscription"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
@@ -554,7 +554,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Claim free storage"),
         "claimMore": MessageLookupByLibrary.simpleMessage("Claim more!"),
         "claimed": MessageLookupByLibrary.simpleMessage("Claimed"),
-        "claimedStorageSoFar": m19,
+        "claimedStorageSoFar": m20,
         "cleanUncategorized":
             MessageLookupByLibrary.simpleMessage("Clean Uncategorized"),
         "cleanUncategorizedDescription": MessageLookupByLibrary.simpleMessage(
@@ -583,12 +583,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Create a link to allow people to add and view photos in your shared album without needing an Ente app or account. Great for collecting event photos."),
         "collaborativeLink":
             MessageLookupByLibrary.simpleMessage("Collaborative link"),
-        "collaborativeLinkCreatedFor": m20,
+        "collaborativeLinkCreatedFor": m21,
         "collaborator": MessageLookupByLibrary.simpleMessage("Collaborator"),
         "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Collaborators can add photos and videos to the shared album."),
-        "collaboratorsSuccessfullyAdded": m21,
+        "collaboratorsSuccessfullyAdded": m22,
         "collageLayout": MessageLookupByLibrary.simpleMessage("Layout"),
         "collageSaved":
             MessageLookupByLibrary.simpleMessage("Collage saved to gallery"),
@@ -605,7 +605,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Are you sure you want to disable two-factor authentication?"),
         "confirmAccountDeletion":
             MessageLookupByLibrary.simpleMessage("Confirm Account Deletion"),
-        "confirmAddingTrustedContact": m22,
+        "confirmAddingTrustedContact": m23,
         "confirmDeletePrompt": MessageLookupByLibrary.simpleMessage(
             "Yes, I want to permanently delete this account and its data across all apps."),
         "confirmPassword":
@@ -618,10 +618,10 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Confirm your recovery key"),
         "connectToDevice":
             MessageLookupByLibrary.simpleMessage("Connect to device"),
-        "contactFamilyAdmin": m23,
+        "contactFamilyAdmin": m24,
         "contactSupport":
             MessageLookupByLibrary.simpleMessage("Contact support"),
-        "contactToManageSubscription": m24,
+        "contactToManageSubscription": m25,
         "contacts": MessageLookupByLibrary.simpleMessage("Contacts"),
         "contents": MessageLookupByLibrary.simpleMessage("Contents"),
         "continueLabel": MessageLookupByLibrary.simpleMessage("Continue"),
@@ -667,7 +667,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "currentlyRunning":
             MessageLookupByLibrary.simpleMessage("currently running"),
         "custom": MessageLookupByLibrary.simpleMessage("Custom"),
-        "customEndpoint": m25,
+        "customEndpoint": m26,
         "darkTheme": MessageLookupByLibrary.simpleMessage("Dark"),
         "dayToday": MessageLookupByLibrary.simpleMessage("Today"),
         "dayYesterday": MessageLookupByLibrary.simpleMessage("Yesterday"),
@@ -704,11 +704,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Delete from device"),
         "deleteFromEnte":
             MessageLookupByLibrary.simpleMessage("Delete from Ente"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deleteLocation":
             MessageLookupByLibrary.simpleMessage("Delete location"),
         "deletePhotos": MessageLookupByLibrary.simpleMessage("Delete photos"),
-        "deleteProgress": m27,
+        "deleteProgress": m28,
         "deleteReason1": MessageLookupByLibrary.simpleMessage(
             "It’s missing a key feature that I need"),
         "deleteReason2": MessageLookupByLibrary.simpleMessage(
@@ -747,7 +747,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Viewers can still take screenshots or save a copy of your photos using external tools"),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("Please note"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "disableTwofactor":
             MessageLookupByLibrary.simpleMessage("Disable two-factor"),
         "disablingTwofactorAuthentication":
@@ -789,9 +789,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "downloadFailed":
             MessageLookupByLibrary.simpleMessage("Download failed"),
         "downloading": MessageLookupByLibrary.simpleMessage("Downloading..."),
-        "dropSupportEmail": m29,
-        "duplicateFileCountWithStorageSaved": m30,
-        "duplicateItemsGroup": m31,
+        "dropSupportEmail": m30,
+        "duplicateFileCountWithStorageSaved": m31,
+        "duplicateItemsGroup": m32,
         "edit": MessageLookupByLibrary.simpleMessage("Edit"),
         "editLocation": MessageLookupByLibrary.simpleMessage("Edit location"),
         "editLocationTagTitle":
@@ -805,9 +805,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "email": MessageLookupByLibrary.simpleMessage("Email"),
         "emailAlreadyRegistered":
             MessageLookupByLibrary.simpleMessage("Email already registered."),
-        "emailChangedTo": m32,
-        "emailDoesNotHaveEnteAccount": m90,
-        "emailNoEnteAccount": m33,
+        "emailChangedTo": m33,
+        "emailDoesNotHaveEnteAccount": m34,
+        "emailNoEnteAccount": m35,
         "emailNotRegistered":
             MessageLookupByLibrary.simpleMessage("Email not registered."),
         "emailVerificationToggle":
@@ -888,7 +888,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Export your data"),
         "extraPhotosFound":
             MessageLookupByLibrary.simpleMessage("Extra photos found"),
-        "extraPhotosFoundFor": m34,
+        "extraPhotosFoundFor": m36,
         "faceNotClusteredYet": MessageLookupByLibrary.simpleMessage(
             "Face not clustered yet, please come back later"),
         "faceRecognition":
@@ -938,8 +938,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "fileTypes": MessageLookupByLibrary.simpleMessage("File types"),
         "fileTypesAndNames":
             MessageLookupByLibrary.simpleMessage("File types and names"),
-        "filesBackedUpFromDevice": m35,
-        "filesBackedUpInAlbum": m36,
+        "filesBackedUpFromDevice": m37,
+        "filesBackedUpInAlbum": m38,
         "filesDeleted": MessageLookupByLibrary.simpleMessage("Files deleted"),
         "filesSavedToGallery":
             MessageLookupByLibrary.simpleMessage("Files saved to gallery"),
@@ -959,22 +959,22 @@ class MessageLookup extends MessageLookupByLibrary {
         "freeStorageUsable":
             MessageLookupByLibrary.simpleMessage("Free storage usable"),
         "freeTrial": MessageLookupByLibrary.simpleMessage("Free trial"),
-        "freeTrialValidTill": m37,
-        "freeUpAccessPostDelete": m38,
-        "freeUpAmount": m39,
+        "freeTrialValidTill": m39,
+        "freeUpAccessPostDelete": m40,
+        "freeUpAmount": m41,
         "freeUpDeviceSpace":
             MessageLookupByLibrary.simpleMessage("Free up device space"),
         "freeUpDeviceSpaceDesc": MessageLookupByLibrary.simpleMessage(
             "Save space on your device by clearing files that have been already backed up."),
         "freeUpSpace": MessageLookupByLibrary.simpleMessage("Free up space"),
-        "freeUpSpaceSaving": m40,
+        "freeUpSpaceSaving": m42,
         "gallery": MessageLookupByLibrary.simpleMessage("Gallery"),
         "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage(
             "Up to 1000 memories shown in gallery"),
         "general": MessageLookupByLibrary.simpleMessage("General"),
         "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage(
             "Generating encryption keys..."),
-        "genericProgress": m41,
+        "genericProgress": m43,
         "goToSettings": MessageLookupByLibrary.simpleMessage("Go to settings"),
         "googlePlayId": MessageLookupByLibrary.simpleMessage("Google Play ID"),
         "grantFullAccessPrompt": MessageLookupByLibrary.simpleMessage(
@@ -1055,7 +1055,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "itLooksLikeSomethingWentWrongPleaseRetryAfterSome":
             MessageLookupByLibrary.simpleMessage(
                 "It looks like something went wrong. Please retry after some time. If the error persists, please contact our support team."),
-        "itemCount": m42,
+        "itemCount": m44,
         "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion":
             MessageLookupByLibrary.simpleMessage(
                 "Items show the number of days remaining before permanent deletion"),
@@ -1085,7 +1085,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "legacy": MessageLookupByLibrary.simpleMessage("Legacy"),
         "legacyAccounts":
             MessageLookupByLibrary.simpleMessage("Legacy accounts"),
-        "legacyInvite": m43,
+        "legacyInvite": m45,
         "legacyPageDesc": MessageLookupByLibrary.simpleMessage(
             "Legacy allows trusted contacts to access your account in your absence."),
         "legacyPageDesc2": MessageLookupByLibrary.simpleMessage(
@@ -1101,7 +1101,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("for faster sharing"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("Enabled"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("Expired"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry": MessageLookupByLibrary.simpleMessage("Link expiry"),
         "linkHasExpired":
             MessageLookupByLibrary.simpleMessage("Link has expired"),
@@ -1109,8 +1109,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "linkPerson": MessageLookupByLibrary.simpleMessage("Link person"),
         "linkPersonCaption": MessageLookupByLibrary.simpleMessage(
             "for better sharing experience"),
-        "linkPersonToEmail": m91,
-        "linkPersonToEmailConfirmation": m92,
+        "linkPersonToEmail": m47,
+        "linkPersonToEmailConfirmation": m48,
         "livePhotos": MessageLookupByLibrary.simpleMessage("Live Photos"),
         "loadMessage1": MessageLookupByLibrary.simpleMessage(
             "You can share your subscription with your family"),
@@ -1224,11 +1224,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "moreDetails": MessageLookupByLibrary.simpleMessage("More details"),
         "mostRecent": MessageLookupByLibrary.simpleMessage("Most recent"),
         "mostRelevant": MessageLookupByLibrary.simpleMessage("Most relevant"),
-        "moveItem": m45,
+        "moveItem": m49,
         "moveToAlbum": MessageLookupByLibrary.simpleMessage("Move to album"),
         "moveToHiddenAlbum":
             MessageLookupByLibrary.simpleMessage("Move to hidden album"),
-        "movedSuccessfullyTo": m46,
+        "movedSuccessfullyTo": m50,
         "movedToTrash": MessageLookupByLibrary.simpleMessage("Moved to trash"),
         "movingFilesToAlbum":
             MessageLookupByLibrary.simpleMessage("Moving files to album..."),
@@ -1278,10 +1278,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "noResults": MessageLookupByLibrary.simpleMessage("No results"),
         "noResultsFound":
             MessageLookupByLibrary.simpleMessage("No results found"),
-        "noSuggestionsForPerson": m47,
+        "noSuggestionsForPerson": m51,
         "noSystemLockFound":
             MessageLookupByLibrary.simpleMessage("No system lock found"),
-        "notPersonLabel": m48,
+        "notPersonLabel": m52,
         "nothingSharedWithYouYet":
             MessageLookupByLibrary.simpleMessage("Nothing shared with you yet"),
         "nothingToSeeHere":
@@ -1291,7 +1291,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "onDevice": MessageLookupByLibrary.simpleMessage("On device"),
         "onEnte": MessageLookupByLibrary.simpleMessage(
             "On <branding>ente</branding>"),
-        "onlyFamilyAdminCanChangeCode": m49,
+        "onlyFamilyAdminCanChangeCode": m53,
         "onlyThem": MessageLookupByLibrary.simpleMessage("Only them"),
         "oops": MessageLookupByLibrary.simpleMessage("Oops"),
         "oopsCouldNotSaveEdits":
@@ -1339,7 +1339,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "paymentFailed": MessageLookupByLibrary.simpleMessage("Payment failed"),
         "paymentFailedMessage": MessageLookupByLibrary.simpleMessage(
             "Unfortunately your payment failed. Please contact support and we\'ll help you out!"),
-        "paymentFailedTalkToProvider": m50,
+        "paymentFailedTalkToProvider": m54,
         "pendingItems": MessageLookupByLibrary.simpleMessage("Pending items"),
         "pendingSync": MessageLookupByLibrary.simpleMessage("Pending sync"),
         "people": MessageLookupByLibrary.simpleMessage("People"),
@@ -1361,14 +1361,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "photosAddedByYouWillBeRemovedFromTheAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Photos added by you will be removed from the album"),
-        "photosCount": m51,
+        "photosCount": m55,
         "pickCenterPoint":
             MessageLookupByLibrary.simpleMessage("Pick center point"),
         "pinAlbum": MessageLookupByLibrary.simpleMessage("Pin album"),
         "pinLock": MessageLookupByLibrary.simpleMessage("PIN lock"),
         "playOnTv": MessageLookupByLibrary.simpleMessage("Play album on TV"),
         "playOriginal": MessageLookupByLibrary.simpleMessage("Play original"),
-        "playStoreFreeTrialValidTill": m52,
+        "playStoreFreeTrialValidTill": m56,
         "playStream": MessageLookupByLibrary.simpleMessage("Play stream"),
         "playstoreSubscription":
             MessageLookupByLibrary.simpleMessage("PlayStore subscription"),
@@ -1381,14 +1381,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseContactSupportIfTheProblemPersists":
             MessageLookupByLibrary.simpleMessage(
                 "Please contact support if the problem persists"),
-        "pleaseEmailUsAt": m53,
+        "pleaseEmailUsAt": m57,
         "pleaseGrantPermissions":
             MessageLookupByLibrary.simpleMessage("Please grant permissions"),
         "pleaseLoginAgain":
             MessageLookupByLibrary.simpleMessage("Please login again"),
         "pleaseSelectQuickLinksToRemove": MessageLookupByLibrary.simpleMessage(
             "Please select quick links to remove"),
-        "pleaseSendTheLogsTo": m54,
+        "pleaseSendTheLogsTo": m58,
         "pleaseTryAgain":
             MessageLookupByLibrary.simpleMessage("Please try again"),
         "pleaseVerifyTheCodeYouHaveEntered":
@@ -1417,7 +1417,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "proceed": MessageLookupByLibrary.simpleMessage("Proceed"),
         "processed": MessageLookupByLibrary.simpleMessage("Processed"),
         "processing": MessageLookupByLibrary.simpleMessage("Processing"),
-        "processingImport": m55,
+        "processingImport": m59,
         "processingVideos":
             MessageLookupByLibrary.simpleMessage("Processing videos"),
         "publicLinkCreated":
@@ -1430,9 +1430,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "raiseTicket": MessageLookupByLibrary.simpleMessage("Raise ticket"),
         "rateTheApp": MessageLookupByLibrary.simpleMessage("Rate the app"),
         "rateUs": MessageLookupByLibrary.simpleMessage("Rate us"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
         "reassignMe": MessageLookupByLibrary.simpleMessage("Reassign \"Me\""),
-        "reassignedToName": m93,
+        "reassignedToName": m61,
         "reassigningLoading":
             MessageLookupByLibrary.simpleMessage("Reassigning..."),
         "recover": MessageLookupByLibrary.simpleMessage("Recover"),
@@ -1443,7 +1443,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Recover account"),
         "recoveryInitiated":
             MessageLookupByLibrary.simpleMessage("Recovery initiated"),
-        "recoveryInitiatedDesc": m57,
+        "recoveryInitiatedDesc": m62,
         "recoveryKey": MessageLookupByLibrary.simpleMessage("Recovery key"),
         "recoveryKeyCopiedToClipboard": MessageLookupByLibrary.simpleMessage(
             "Recovery key copied to clipboard"),
@@ -1457,12 +1457,12 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Recovery key verified"),
         "recoveryKeyVerifyReason": MessageLookupByLibrary.simpleMessage(
             "Your recovery key is the only way to recover your photos if you forget your password. You can find your recovery key in Settings > Account.\n\nPlease enter your recovery key here to verify that you have saved it correctly."),
-        "recoveryReady": m58,
+        "recoveryReady": m63,
         "recoverySuccessful":
             MessageLookupByLibrary.simpleMessage("Recovery successful!"),
         "recoveryWarning": MessageLookupByLibrary.simpleMessage(
             "A trusted contact is trying to access your account"),
-        "recoveryWarningBody": m59,
+        "recoveryWarningBody": m64,
         "recreatePasswordBody": MessageLookupByLibrary.simpleMessage(
             "The current device is not powerful enough to verify your password, but we can regenerate in a way that works with all devices.\n\nPlease login using your recovery key and regenerate your password (you can use the same one again if you wish)."),
         "recreatePasswordTitle":
@@ -1477,7 +1477,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "1. Give this code to your friends"),
         "referralStep2": MessageLookupByLibrary.simpleMessage(
             "2. They sign up for a paid plan"),
-        "referralStep3": m60,
+        "referralStep3": m65,
         "referrals": MessageLookupByLibrary.simpleMessage("Referrals"),
         "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage(
             "Referrals are currently paused"),
@@ -1506,7 +1506,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "removeLink": MessageLookupByLibrary.simpleMessage("Remove link"),
         "removeParticipant":
             MessageLookupByLibrary.simpleMessage("Remove participant"),
-        "removeParticipantBody": m61,
+        "removeParticipantBody": m66,
         "removePersonLabel":
             MessageLookupByLibrary.simpleMessage("Remove person label"),
         "removePublicLink":
@@ -1526,7 +1526,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "renameFile": MessageLookupByLibrary.simpleMessage("Rename file"),
         "renewSubscription":
             MessageLookupByLibrary.simpleMessage("Renew subscription"),
-        "renewsOn": m62,
+        "renewsOn": m67,
         "reportABug": MessageLookupByLibrary.simpleMessage("Report a bug"),
         "reportBug": MessageLookupByLibrary.simpleMessage("Report bug"),
         "resendEmail": MessageLookupByLibrary.simpleMessage("Resend email"),
@@ -1604,8 +1604,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Invite people, and you\'ll see all photos shared by them here"),
         "searchPersonsEmptySection": MessageLookupByLibrary.simpleMessage(
             "People will be shown here once processing and syncing is complete"),
-        "searchResultCount": m63,
-        "searchSectionsLengthMismatch": m64,
+        "searchResultCount": m68,
+        "searchSectionsLengthMismatch": m69,
         "security": MessageLookupByLibrary.simpleMessage("Security"),
         "seePublicAlbumLinksInApp": MessageLookupByLibrary.simpleMessage(
             "See public album links in app"),
@@ -1644,7 +1644,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Selected items will be deleted from all albums and moved to trash."),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "send": MessageLookupByLibrary.simpleMessage("Send"),
         "sendEmail": MessageLookupByLibrary.simpleMessage("Send email"),
         "sendInvite": MessageLookupByLibrary.simpleMessage("Send invite"),
@@ -1673,16 +1673,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "shareAnAlbumNow":
             MessageLookupByLibrary.simpleMessage("Share an album now"),
         "shareLink": MessageLookupByLibrary.simpleMessage("Share link"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage(
             "Share only with the people you want"),
         "shareTextConfirmOthersVerificationID": m7,
         "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage(
             "Download Ente so we can easily share original quality photos and videos\n\nhttps://ente.io"),
-        "shareTextReferralCode": m67,
+        "shareTextReferralCode": m72,
         "shareWithNonenteUsers":
             MessageLookupByLibrary.simpleMessage("Share with non-Ente users"),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "shareYourFirstAlbum":
             MessageLookupByLibrary.simpleMessage("Share your first album"),
         "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
@@ -1693,7 +1693,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("New shared photos"),
         "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage(
             "Receive notifications when someone adds a photo to a shared album that you\'re a part of"),
-        "sharedWith": m69,
+        "sharedWith": m74,
         "sharedWithMe": MessageLookupByLibrary.simpleMessage("Shared with me"),
         "sharedWithYou":
             MessageLookupByLibrary.simpleMessage("Shared with you"),
@@ -1708,11 +1708,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Sign out other devices"),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "I agree to the <u-terms>terms of service</u-terms> and <u-policy>privacy policy</u-policy>"),
-        "singleFileDeleteFromDevice": m70,
+        "singleFileDeleteFromDevice": m75,
         "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage(
             "It will be deleted from all albums."),
-        "singleFileInBothLocalAndRemote": m71,
-        "singleFileInRemoteOnly": m72,
+        "singleFileInBothLocalAndRemote": m76,
+        "singleFileInRemoteOnly": m77,
         "skip": MessageLookupByLibrary.simpleMessage("Skip"),
         "social": MessageLookupByLibrary.simpleMessage("Social"),
         "someItemsAreInBothEnteAndYourDevice":
@@ -1760,11 +1760,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageInGB": m1,
         "storageLimitExceeded":
             MessageLookupByLibrary.simpleMessage("Storage limit exceeded"),
-        "storageUsageInfo": m73,
+        "storageUsageInfo": m78,
         "streamDetails": MessageLookupByLibrary.simpleMessage("Stream details"),
         "strongStrength": MessageLookupByLibrary.simpleMessage("Strong"),
-        "subAlreadyLinkedErrMessage": m74,
-        "subWillBeCancelledOn": m75,
+        "subAlreadyLinkedErrMessage": m79,
+        "subWillBeCancelledOn": m80,
         "subscribe": MessageLookupByLibrary.simpleMessage("Subscribe"),
         "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage(
             "You need an active paid subscription to enable sharing."),
@@ -1781,7 +1781,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "suggestFeatures":
             MessageLookupByLibrary.simpleMessage("Suggest features"),
         "support": MessageLookupByLibrary.simpleMessage("Support"),
-        "syncProgress": m76,
+        "syncProgress": m81,
         "syncStopped": MessageLookupByLibrary.simpleMessage("Sync stopped"),
         "syncing": MessageLookupByLibrary.simpleMessage("Syncing..."),
         "systemTheme": MessageLookupByLibrary.simpleMessage("System"),
@@ -1790,7 +1790,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Tap to enter code"),
         "tapToUnlock": MessageLookupByLibrary.simpleMessage("Tap to unlock"),
         "tapToUpload": MessageLookupByLibrary.simpleMessage("Tap to upload"),
-        "tapToUploadIsIgnoredDue": m77,
+        "tapToUploadIsIgnoredDue": m82,
         "tempErrorContactSupportIfPersists": MessageLookupByLibrary.simpleMessage(
             "It looks like something went wrong. Please retry after some time. If the error persists, please contact our support team."),
         "terminate": MessageLookupByLibrary.simpleMessage("Terminate"),
@@ -1831,7 +1831,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("This image has no exif data"),
         "thisIsMeExclamation":
             MessageLookupByLibrary.simpleMessage("This is me!"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage(
             "This is your Verification ID"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -1855,11 +1855,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "total": MessageLookupByLibrary.simpleMessage("total"),
         "totalSize": MessageLookupByLibrary.simpleMessage("Total size"),
         "trash": MessageLookupByLibrary.simpleMessage("Trash"),
-        "trashDaysLeft": m79,
+        "trashDaysLeft": m84,
         "trim": MessageLookupByLibrary.simpleMessage("Trim"),
         "trustedContacts":
             MessageLookupByLibrary.simpleMessage("Trusted contacts"),
-        "trustedInviteBody": m80,
+        "trustedInviteBody": m85,
         "tryAgain": MessageLookupByLibrary.simpleMessage("Try again"),
         "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage(
             "Turn on backup to automatically upload files added to this device folder to Ente."),
@@ -1877,7 +1877,7 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Two-factor authentication successfully reset"),
         "twofactorSetup":
             MessageLookupByLibrary.simpleMessage("Two-factor setup"),
-        "typeOfGallerGallerytypeIsNotSupportedForRename": m81,
+        "typeOfGallerGallerytypeIsNotSupportedForRename": m86,
         "unarchive": MessageLookupByLibrary.simpleMessage("Unarchive"),
         "unarchiveAlbum":
             MessageLookupByLibrary.simpleMessage("Unarchive album"),
@@ -1900,10 +1900,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "updatingFolderSelection": MessageLookupByLibrary.simpleMessage(
             "Updating folder selection..."),
         "upgrade": MessageLookupByLibrary.simpleMessage("Upgrade"),
-        "uploadIsIgnoredDueToIgnorereason": m82,
+        "uploadIsIgnoredDueToIgnorereason": m87,
         "uploadingFilesToAlbum":
             MessageLookupByLibrary.simpleMessage("Uploading files to album..."),
-        "uploadingMultipleMemories": m83,
+        "uploadingMultipleMemories": m88,
         "uploadingSingleMemory":
             MessageLookupByLibrary.simpleMessage("Preserving 1 memory..."),
         "upto50OffUntil4thDec": MessageLookupByLibrary.simpleMessage(
@@ -1921,7 +1921,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "useSelectedPhoto":
             MessageLookupByLibrary.simpleMessage("Use selected photo"),
         "usedSpace": MessageLookupByLibrary.simpleMessage("Used space"),
-        "validTill": m84,
+        "validTill": m89,
         "verificationFailedPleaseTryAgain":
             MessageLookupByLibrary.simpleMessage(
                 "Verification failed, please try again"),
@@ -1929,7 +1929,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Verification ID"),
         "verify": MessageLookupByLibrary.simpleMessage("Verify"),
         "verifyEmail": MessageLookupByLibrary.simpleMessage("Verify email"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Verify"),
         "verifyPasskey": MessageLookupByLibrary.simpleMessage("Verify passkey"),
         "verifyPassword":
@@ -1955,7 +1955,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "viewRecoveryKey":
             MessageLookupByLibrary.simpleMessage("View recovery key"),
         "viewer": MessageLookupByLibrary.simpleMessage("Viewer"),
-        "viewersSuccessfullyAdded": m86,
+        "viewersSuccessfullyAdded": m91,
         "visitWebToManage": MessageLookupByLibrary.simpleMessage(
             "Please visit web.ente.io to manage your subscription"),
         "waitingForVerification":
@@ -1976,7 +1976,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Trusted contact can help in recovering your data."),
         "yearShort": MessageLookupByLibrary.simpleMessage("yr"),
         "yearly": MessageLookupByLibrary.simpleMessage("Yearly"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("Yes"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("Yes, cancel"),
         "yesConvertToViewer":
@@ -2008,7 +2008,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "You cannot share with yourself"),
         "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage(
             "You don\'t have any archived items."),
-        "youHaveSuccessfullyFreedUp": m88,
+        "youHaveSuccessfullyFreedUp": m93,
         "yourAccountHasBeenDeleted": MessageLookupByLibrary.simpleMessage(
             "Your account has been deleted"),
         "yourMap": MessageLookupByLibrary.simpleMessage("Your map"),
diff --git a/mobile/lib/generated/intl/messages_es.dart b/mobile/lib/generated/intl/messages_es.dart
index 1d44802a78..a7153053db 100644
--- a/mobile/lib/generated/intl/messages_es.dart
+++ b/mobile/lib/generated/intl/messages_es.dart
@@ -20,37 +20,39 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'es';
 
-  static String m9(count) =>
-      "${Intl.plural(count, zero: 'Añadir colaborador', one: 'Añadir colaborador', other: 'Añadir colaboradores')}";
+  static String m9(title) => "${title} (Yo)";
 
   static String m10(count) =>
+      "${Intl.plural(count, zero: 'Añadir colaborador', one: 'Añadir colaborador', other: 'Añadir colaboradores')}";
+
+  static String m11(count) =>
       "${Intl.plural(count, one: 'Agregar elemento', other: 'Agregar elementos')}";
 
-  static String m11(storageAmount, endDate) =>
+  static String m12(storageAmount, endDate) =>
       "Tu ${storageAmount} adicional es válido hasta ${endDate}";
 
-  static String m12(count) =>
+  static String m13(count) =>
       "${Intl.plural(count, zero: 'Añadir espectador', one: 'Añadir espectador', other: 'Añadir espectadores')}";
 
-  static String m13(emailOrName) => "Añadido por ${emailOrName}";
+  static String m14(emailOrName) => "Añadido por ${emailOrName}";
 
-  static String m14(albumName) => "Añadido exitosamente a  ${albumName}";
+  static String m15(albumName) => "Añadido exitosamente a  ${albumName}";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: 'No hay Participantes', one: '1 Participante', other: '${count} Participantes')}";
 
-  static String m16(versionValue) => "Versión: ${versionValue}";
+  static String m17(versionValue) => "Versión: ${versionValue}";
 
-  static String m17(freeAmount, storageUnit) =>
+  static String m18(freeAmount, storageUnit) =>
       "${freeAmount} ${storageUnit} gratis";
 
-  static String m18(paymentProvider) =>
+  static String m19(paymentProvider) =>
       "Por favor, cancela primero tu suscripción existente de ${paymentProvider}";
 
   static String m3(user) =>
       "${user} no podrá añadir más fotos a este álbum\n\nTodavía podrán eliminar las fotos ya añadidas por ellos";
 
-  static String m19(isFamilyMember, storageAmountInGb) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
       "${Intl.select(isFamilyMember, {
             'true':
                 'Tu familia ha obtenido ${storageAmountInGb} GB hasta el momento',
@@ -59,213 +61,222 @@ class MessageLookup extends MessageLookupByLibrary {
                 '¡Tú has obtenido ${storageAmountInGb} GB hasta el momento!',
           })}";
 
-  static String m20(albumName) =>
+  static String m21(albumName) =>
       "Enlace colaborativo creado para ${albumName}";
 
-  static String m21(count) =>
+  static String m22(count) =>
       "${Intl.plural(count, zero: '0 colaboradores añadidos', one: '1 colaborador añadido', other: '${count} colaboradores añadidos')}";
 
-  static String m22(email, numOfDays) =>
+  static String m23(email, numOfDays) =>
       "Estás a punto de añadir ${email} como un contacto de confianza. Esta persona podrá recuperar tu cuenta si no estás durante ${numOfDays} días.";
 
-  static String m23(familyAdminEmail) =>
+  static String m24(familyAdminEmail) =>
       "Por favor contacta con <green>${familyAdminEmail}</green> para administrar tu suscripción";
 
-  static String m24(provider) =>
+  static String m25(provider) =>
       "Por favor, contáctanos en support@ente.io para gestionar tu suscripción a ${provider}.";
 
-  static String m25(endpoint) => "Conectado a ${endpoint}";
+  static String m26(endpoint) => "Conectado a ${endpoint}";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: 'Elimina ${count} elemento', other: 'Elimina ${count} elementos')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "Borrando ${currentlyDeleting} / ${totalCount}";
 
-  static String m28(albumName) =>
+  static String m29(albumName) =>
       "Esto eliminará el enlace público para acceder a \"${albumName}\".";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "Por favor, envía un correo electrónico a ${supportEmail} desde tu dirección de correo electrónico que usó para registrarse";
 
-  static String m30(count, storageSaved) =>
+  static String m31(count, storageSaved) =>
       "¡Has limpiado ${Intl.plural(count, one: '${count} archivo duplicado', other: '${count} archivos duplicados')}, ahorrando (${storageSaved}!)";
 
-  static String m31(count, formattedSize) =>
+  static String m32(count, formattedSize) =>
       "${count} archivos, ${formattedSize} cada uno";
 
-  static String m32(newEmail) => "Correo cambiado a ${newEmail}";
+  static String m33(newEmail) => "Correo cambiado a ${newEmail}";
 
-  static String m33(email) =>
+  static String m34(email) => "${email} no tiene una cuenta de Ente.";
+
+  static String m35(email) =>
       "${email} no tiene una cuente en Ente.\n\nEnvíale una invitación para compartir fotos.";
 
-  static String m34(text) => "Fotos adicionales encontradas para ${text}";
+  static String m36(text) => "Fotos adicionales encontradas para ${text}";
 
-  static String m35(count, formattedNumber) =>
+  static String m37(count, formattedNumber) =>
       "Se ha realizado la copia de seguridad de ${Intl.plural(count, one: '1 archivo', other: '${formattedNumber} archivos')} de este dispositivo de forma segura";
 
-  static String m36(count, formattedNumber) =>
+  static String m38(count, formattedNumber) =>
       "Se ha realizado la copia de seguridad de ${Intl.plural(count, one: '1 archivo', other: '${formattedNumber} archivos')} de este álbum de forma segura";
 
   static String m4(storageAmountInGB) =>
       "${storageAmountInGB} GB cada vez que alguien se registra en un plan de pago y aplica tu código";
 
-  static String m37(endDate) => "Prueba gratuita válida hasta ${endDate}";
+  static String m39(endDate) => "Prueba gratuita válida hasta ${endDate}";
 
-  static String m38(count) =>
+  static String m40(count) =>
       "Aún puedes acceder ${Intl.plural(count, one: 'a él', other: 'a ellos')} en Ente mientras tengas una suscripción activa";
 
-  static String m39(sizeInMBorGB) => "Liberar ${sizeInMBorGB}";
+  static String m41(sizeInMBorGB) => "Liberar ${sizeInMBorGB}";
 
-  static String m40(count, formattedSize) =>
+  static String m42(count, formattedSize) =>
       "${Intl.plural(count, one: 'Se puede eliminar del dispositivo para liberar ${formattedSize}', other: 'Se pueden eliminar del dispositivo para liberar ${formattedSize}')}";
 
-  static String m41(currentlyProcessing, totalCount) =>
+  static String m43(currentlyProcessing, totalCount) =>
       "Procesando ${currentlyProcessing} / ${totalCount}";
 
-  static String m42(count) =>
+  static String m44(count) =>
       "${Intl.plural(count, one: '${count} elemento', other: '${count} elementos')}";
 
-  static String m43(email) =>
+  static String m45(email) =>
       "${email} te ha invitado a ser un contacto de confianza";
 
-  static String m44(expiryTime) => "El enlace caducará en ${expiryTime}";
+  static String m46(expiryTime) => "El enlace caducará en ${expiryTime}";
+
+  static String m47(email) => "Enlazar persona a ${email}";
+
+  static String m48(personName, email) =>
+      "Esto enlazará a ${personName} a ${email}";
 
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, zero: 'sin recuerdos', one: '${formattedCount} recuerdo', other: '${formattedCount} recuerdos')}";
 
-  static String m45(count) =>
+  static String m49(count) =>
       "${Intl.plural(count, one: 'Mover elemento', other: 'Mover elementos')}";
 
-  static String m46(albumName) => "Movido exitosamente a ${albumName}";
+  static String m50(albumName) => "Movido exitosamente a ${albumName}";
 
-  static String m47(personName) => "No hay sugerencias para ${personName}";
+  static String m51(personName) => "No hay sugerencias para ${personName}";
 
-  static String m48(name) => "¿No es ${name}?";
+  static String m52(name) => "¿No es ${name}?";
 
-  static String m49(familyAdminEmail) =>
+  static String m53(familyAdminEmail) =>
       "Por favor, contacta a ${familyAdminEmail} para cambiar tu código.";
 
   static String m0(passwordStrengthValue) =>
       "Seguridad de la contraseña: ${passwordStrengthValue}";
 
-  static String m50(providerName) =>
+  static String m54(providerName) =>
       "Por favor, habla con el soporte de ${providerName} si se te cobró";
 
-  static String m51(count) =>
+  static String m55(count) =>
       "${Intl.plural(count, zero: '0 fotos', one: '1 foto', other: '${count} fotos')}";
 
-  static String m52(endDate) =>
+  static String m56(endDate) =>
       "Prueba gratuita válida hasta ${endDate}.\nPuedes elegir un plan de pago después.";
 
-  static String m53(toEmail) =>
+  static String m57(toEmail) =>
       "Por favor, envíanos un correo electrónico a ${toEmail}";
 
-  static String m54(toEmail) => "Por favor, envía los registros a ${toEmail}";
+  static String m58(toEmail) => "Por favor, envía los registros a ${toEmail}";
 
-  static String m55(folderName) => "Procesando ${folderName}...";
+  static String m59(folderName) => "Procesando ${folderName}...";
 
-  static String m56(storeName) => "Puntúanos en ${storeName}";
+  static String m60(storeName) => "Puntúanos en ${storeName}";
 
-  static String m57(days, email) =>
+  static String m61(name) => "Te has reasignado a ${name}";
+
+  static String m62(days, email) =>
       "Puedes acceder a la cuenta después de ${days} días. Se enviará una notificación a ${email}.";
 
-  static String m58(email) =>
+  static String m63(email) =>
       "Ahora puedes recuperar la cuenta de ${email} estableciendo una nueva contraseña.";
 
-  static String m59(email) => "${email} está intentando recuperar tu cuenta.";
+  static String m64(email) => "${email} está intentando recuperar tu cuenta.";
 
-  static String m60(storageInGB) =>
+  static String m65(storageInGB) =>
       "3. Ambos obtienen ${storageInGB} GB* gratis";
 
-  static String m61(userEmail) =>
+  static String m66(userEmail) =>
       "${userEmail} será eliminado de este álbum compartido\n\nCualquier foto añadida por ellos también será eliminada del álbum";
 
-  static String m62(endDate) => "La suscripción se renueva el ${endDate}";
+  static String m67(endDate) => "La suscripción se renueva el ${endDate}";
 
-  static String m63(count) =>
+  static String m68(count) =>
       "${Intl.plural(count, one: '${count} resultado encontrado', other: '${count} resultados encontrados')}";
 
-  static String m64(snapshotLength, searchLength) =>
+  static String m69(snapshotLength, searchLength) =>
       "La longitud de las secciones no coincide: ${snapshotLength} != ${searchLength}";
 
   static String m6(count) => "${count} seleccionados";
 
-  static String m65(count, yourCount) =>
+  static String m70(count, yourCount) =>
       "${count} seleccionados (${yourCount} tuyos)";
 
-  static String m66(verificationID) =>
+  static String m71(verificationID) =>
       "Aquí está mi ID de verificación: ${verificationID} para ente.io.";
 
   static String m7(verificationID) =>
       "Hola, ¿puedes confirmar que esta es tu ID de verificación ente.io: ${verificationID}?";
 
-  static String m67(referralCode, referralStorageInGB) =>
+  static String m72(referralCode, referralStorageInGB) =>
       "Código de referido de Ente: ${referralCode} \n\nAñádelo en Ajustes → General → Referidos para obtener ${referralStorageInGB} GB gratis tras comprar un plan de pago.\n\nhttps://ente.io";
 
-  static String m68(numberOfPeople) =>
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: 'Compartir con personas específicas', one: 'Compartido con 1 persona', other: 'Compartido con ${numberOfPeople} personas')}";
 
-  static String m69(emailIDs) => "Compartido con ${emailIDs}";
+  static String m74(emailIDs) => "Compartido con ${emailIDs}";
 
-  static String m70(fileType) =>
+  static String m75(fileType) =>
       "Este ${fileType} se eliminará de tu dispositivo.";
 
-  static String m71(fileType) =>
+  static String m76(fileType) =>
       "Este ${fileType} está tanto en Ente como en tu dispositivo.";
 
-  static String m72(fileType) => "Este ${fileType} será eliminado de Ente.";
+  static String m77(fileType) => "Este ${fileType} será eliminado de Ente.";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} GB";
 
-  static String m73(
+  static String m78(
           usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) =>
       "${usedAmount} ${usedStorageUnit} de ${totalAmount} ${totalStorageUnit} usados";
 
-  static String m74(id) =>
+  static String m79(id) =>
       "Tu ${id} ya está vinculada a otra cuenta de Ente.\nSi deseas utilizar tu ${id} con esta cuenta, ponte en contacto con nuestro servicio de asistencia\'\'";
 
-  static String m75(endDate) => "Tu suscripción se cancelará el ${endDate}";
+  static String m80(endDate) => "Tu suscripción se cancelará el ${endDate}";
 
-  static String m76(completed, total) =>
+  static String m81(completed, total) =>
       "${completed}/${total} recuerdos conservados";
 
-  static String m77(ignoreReason) =>
+  static String m82(ignoreReason) =>
       "Toca para subir, la subida se está ignorando debido a ${ignoreReason}";
 
   static String m8(storageAmountInGB) =>
       "También obtienen ${storageAmountInGB} GB";
 
-  static String m78(email) => "Este es el ID de verificación de ${email}";
+  static String m83(email) => "Este es el ID de verificación de ${email}";
 
-  static String m79(count) =>
+  static String m84(count) =>
       "${Intl.plural(count, zero: 'Pronto', one: '1 día', other: '${count} días')}";
 
-  static String m80(email) =>
+  static String m85(email) =>
       "Has sido invitado a ser un contacto legado por ${email}.";
 
-  static String m81(galleryType) =>
+  static String m86(galleryType) =>
       "El tipo de galería ${galleryType} no es compatible con el renombrado";
 
-  static String m82(ignoreReason) =>
+  static String m87(ignoreReason) =>
       "La subida se ignoró debido a ${ignoreReason}";
 
-  static String m83(count) => "Preservando ${count} memorias...";
+  static String m88(count) => "Preservando ${count} memorias...";
 
-  static String m84(endDate) => "Válido hasta ${endDate}";
+  static String m89(endDate) => "Válido hasta ${endDate}";
 
-  static String m85(email) => "Verificar ${email}";
+  static String m90(email) => "Verificar ${email}";
 
-  static String m86(count) =>
+  static String m91(count) =>
       "${Intl.plural(count, zero: '0 espectadores añadidos', one: '1 espectador añadido', other: '${count} espectadores añadidos')}";
 
   static String m2(email) =>
       "Hemos enviado un correo a <green>${email}</green>";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, one: 'Hace ${count} año', other: 'Hace ${count} años')}";
 
-  static String m88(storageSaved) => "¡Has liberado ${storageSaved} con éxito!";
+  static String m93(storageSaved) => "¡Has liberado ${storageSaved} con éxito!";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
@@ -277,6 +288,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "account": MessageLookupByLibrary.simpleMessage("Cuenta"),
         "accountIsAlreadyConfigured": MessageLookupByLibrary.simpleMessage(
             "La cuenta ya está configurada."),
+        "accountOwnerPersonAppbarTitle": m9,
         "accountWelcomeBack":
             MessageLookupByLibrary.simpleMessage("¡Bienvenido de nuevo!"),
         "ackPasswordLostWarning": MessageLookupByLibrary.simpleMessage(
@@ -289,11 +301,11 @@ class MessageLookup extends MessageLookupByLibrary {
             "Agregar nuevo correo electrónico"),
         "addCollaborator":
             MessageLookupByLibrary.simpleMessage("Agregar colaborador"),
-        "addCollaborators": m9,
+        "addCollaborators": m10,
         "addFiles": MessageLookupByLibrary.simpleMessage("Añadir archivos"),
         "addFromDevice": MessageLookupByLibrary.simpleMessage(
             "Agregar desde el dispositivo"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocation":
             MessageLookupByLibrary.simpleMessage("Agregar ubicación"),
         "addLocationButton": MessageLookupByLibrary.simpleMessage("Añadir"),
@@ -306,7 +318,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Añadir nueva persona"),
         "addOnPageSubtitle": MessageLookupByLibrary.simpleMessage(
             "Detalles de los complementos"),
-        "addOnValidTill": m11,
+        "addOnValidTill": m12,
         "addOns": MessageLookupByLibrary.simpleMessage("Complementos"),
         "addPhotos": MessageLookupByLibrary.simpleMessage("Agregar fotos"),
         "addSelected":
@@ -318,12 +330,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "addTrustedContact": MessageLookupByLibrary.simpleMessage(
             "Añadir contacto de confianza"),
         "addViewer": MessageLookupByLibrary.simpleMessage("Añadir espectador"),
-        "addViewers": m12,
+        "addViewers": m13,
         "addYourPhotosNow":
             MessageLookupByLibrary.simpleMessage("Añade tus fotos ahora"),
         "addedAs": MessageLookupByLibrary.simpleMessage("Agregado como"),
-        "addedBy": m13,
-        "addedSuccessfullyTo": m14,
+        "addedBy": m14,
+        "addedSuccessfullyTo": m15,
         "addingToFavorites":
             MessageLookupByLibrary.simpleMessage("Añadiendo a favoritos..."),
         "advanced": MessageLookupByLibrary.simpleMessage("Avanzado"),
@@ -336,7 +348,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Después de una semana"),
         "after1Year": MessageLookupByLibrary.simpleMessage("Después de un año"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("Propietario"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumTitle": MessageLookupByLibrary.simpleMessage("Título del álbum"),
         "albumUpdated":
             MessageLookupByLibrary.simpleMessage("Álbum actualizado"),
@@ -386,7 +398,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Bloqueo de aplicación"),
         "appLockDescriptions": MessageLookupByLibrary.simpleMessage(
             "Escoge entre la pantalla de bloqueo por defecto de tu dispositivo y una pantalla de bloqueo personalizada con un PIN o contraseña."),
-        "appVersion": m16,
+        "appVersion": m17,
         "appleId": MessageLookupByLibrary.simpleMessage("ID de Apple"),
         "apply": MessageLookupByLibrary.simpleMessage("Aplicar"),
         "applyCodeTitle": MessageLookupByLibrary.simpleMessage("Usar código"),
@@ -469,7 +481,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoPairDesc": MessageLookupByLibrary.simpleMessage(
             "El emparejamiento automático funciona sólo con dispositivos compatibles con Chromecast."),
         "available": MessageLookupByLibrary.simpleMessage("Disponible"),
-        "availableStorageSpace": m17,
+        "availableStorageSpace": m18,
         "backedUpFolders": MessageLookupByLibrary.simpleMessage(
             "Carpetas con copia de seguridad"),
         "backup": MessageLookupByLibrary.simpleMessage("Copia de seguridad"),
@@ -511,7 +523,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Cancelar la recuperación"),
         "cancelAccountRecoveryBody": MessageLookupByLibrary.simpleMessage(
             "¿Estás seguro de que quieres cancelar la recuperación?"),
-        "cancelOtherSubscription": m18,
+        "cancelOtherSubscription": m19,
         "cancelSubscription":
             MessageLookupByLibrary.simpleMessage("Cancelar suscripción"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
@@ -564,7 +576,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Obtén almacenamiento gratuito"),
         "claimMore": MessageLookupByLibrary.simpleMessage("¡Obtén más!"),
         "claimed": MessageLookupByLibrary.simpleMessage("Obtenido"),
-        "claimedStorageSoFar": m19,
+        "claimedStorageSoFar": m20,
         "cleanUncategorized":
             MessageLookupByLibrary.simpleMessage("Limpiar sin categorizar"),
         "cleanUncategorizedDescription": MessageLookupByLibrary.simpleMessage(
@@ -593,12 +605,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Crea un enlace para permitir que otros pueda añadir y ver fotos en tu álbum compartido sin necesitar la aplicación Ente o una cuenta. Genial para recolectar fotos de eventos."),
         "collaborativeLink":
             MessageLookupByLibrary.simpleMessage("Enlace colaborativo"),
-        "collaborativeLinkCreatedFor": m20,
+        "collaborativeLinkCreatedFor": m21,
         "collaborator": MessageLookupByLibrary.simpleMessage("Colaborador"),
         "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Colaboradores pueden añadir fotos y videos al álbum compartido."),
-        "collaboratorsSuccessfullyAdded": m21,
+        "collaboratorsSuccessfullyAdded": m22,
         "collageLayout": MessageLookupByLibrary.simpleMessage("Disposición"),
         "collageSaved": MessageLookupByLibrary.simpleMessage(
             "Collage guardado en la galería"),
@@ -616,7 +628,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "¿Estás seguro de que deseas deshabilitar la autenticación de doble factor?"),
         "confirmAccountDeletion":
             MessageLookupByLibrary.simpleMessage("Confirmar borrado de cuenta"),
-        "confirmAddingTrustedContact": m22,
+        "confirmAddingTrustedContact": m23,
         "confirmDeletePrompt": MessageLookupByLibrary.simpleMessage(
             "Sí, quiero eliminar permanentemente esta cuenta y todos sus datos en todas las aplicaciones."),
         "confirmPassword":
@@ -629,10 +641,10 @@ class MessageLookup extends MessageLookupByLibrary {
             "Confirma tu clave de recuperación"),
         "connectToDevice":
             MessageLookupByLibrary.simpleMessage("Conectar a dispositivo"),
-        "contactFamilyAdmin": m23,
+        "contactFamilyAdmin": m24,
         "contactSupport":
             MessageLookupByLibrary.simpleMessage("Contactar con soporte"),
-        "contactToManageSubscription": m24,
+        "contactToManageSubscription": m25,
         "contacts": MessageLookupByLibrary.simpleMessage("Contactos"),
         "contents": MessageLookupByLibrary.simpleMessage("Contenidos"),
         "continueLabel": MessageLookupByLibrary.simpleMessage("Continuar"),
@@ -678,7 +690,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("El uso actual es de "),
         "currentlyRunning": MessageLookupByLibrary.simpleMessage("ejecutando"),
         "custom": MessageLookupByLibrary.simpleMessage("Personalizado"),
-        "customEndpoint": m25,
+        "customEndpoint": m26,
         "darkTheme": MessageLookupByLibrary.simpleMessage("Oscuro"),
         "dayToday": MessageLookupByLibrary.simpleMessage("Hoy"),
         "dayYesterday": MessageLookupByLibrary.simpleMessage("Ayer"),
@@ -716,12 +728,12 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Eliminar del dispositivo"),
         "deleteFromEnte":
             MessageLookupByLibrary.simpleMessage("Eliminar de Ente"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deleteLocation":
             MessageLookupByLibrary.simpleMessage("Borrar la ubicación"),
         "deletePhotos":
             MessageLookupByLibrary.simpleMessage("Borrar las fotos"),
-        "deleteProgress": m27,
+        "deleteProgress": m28,
         "deleteReason1": MessageLookupByLibrary.simpleMessage(
             "Falta una característica clave que necesito"),
         "deleteReason2": MessageLookupByLibrary.simpleMessage(
@@ -762,7 +774,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Los espectadores todavía pueden tomar capturas de pantalla o guardar una copia de tus fotos usando herramientas externas"),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("Por favor, ten en cuenta"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "disableTwofactor":
             MessageLookupByLibrary.simpleMessage("Deshabilitar dos factores"),
         "disablingTwofactorAuthentication":
@@ -799,15 +811,16 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "¿Quieres descartar las ediciones que has hecho?"),
         "done": MessageLookupByLibrary.simpleMessage("Hecho"),
+        "dontSave": MessageLookupByLibrary.simpleMessage("No guardar"),
         "doubleYourStorage":
             MessageLookupByLibrary.simpleMessage("Duplica tu almacenamiento"),
         "download": MessageLookupByLibrary.simpleMessage("Descargar"),
         "downloadFailed":
             MessageLookupByLibrary.simpleMessage("Descarga fallida"),
         "downloading": MessageLookupByLibrary.simpleMessage("Descargando..."),
-        "dropSupportEmail": m29,
-        "duplicateFileCountWithStorageSaved": m30,
-        "duplicateItemsGroup": m31,
+        "dropSupportEmail": m30,
+        "duplicateFileCountWithStorageSaved": m31,
+        "duplicateItemsGroup": m32,
         "edit": MessageLookupByLibrary.simpleMessage("Editar"),
         "editLocation":
             MessageLookupByLibrary.simpleMessage("Editar la ubicación"),
@@ -823,8 +836,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "email": MessageLookupByLibrary.simpleMessage("Correo electrónico"),
         "emailAlreadyRegistered": MessageLookupByLibrary.simpleMessage(
             "Correo electrónico ya registrado."),
-        "emailChangedTo": m32,
-        "emailNoEnteAccount": m33,
+        "emailChangedTo": m33,
+        "emailDoesNotHaveEnteAccount": m34,
+        "emailNoEnteAccount": m35,
         "emailNotRegistered": MessageLookupByLibrary.simpleMessage(
             "Correo electrónico no registrado."),
         "emailVerificationToggle": MessageLookupByLibrary.simpleMessage(
@@ -912,12 +926,13 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Exportar tus datos"),
         "extraPhotosFound": MessageLookupByLibrary.simpleMessage(
             "Fotos adicionales encontradas"),
-        "extraPhotosFoundFor": m34,
+        "extraPhotosFoundFor": m36,
         "faceNotClusteredYet": MessageLookupByLibrary.simpleMessage(
             "Cara no agrupada todavía, por favor vuelve más tarde"),
         "faceRecognition":
             MessageLookupByLibrary.simpleMessage("Reconocimiento facial"),
         "faces": MessageLookupByLibrary.simpleMessage("Caras"),
+        "failed": MessageLookupByLibrary.simpleMessage("Fallido"),
         "failedToApplyCode":
             MessageLookupByLibrary.simpleMessage("Error al aplicar el código"),
         "failedToCancel":
@@ -963,8 +978,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "fileTypes": MessageLookupByLibrary.simpleMessage("Tipos de archivos"),
         "fileTypesAndNames":
             MessageLookupByLibrary.simpleMessage("Tipos de archivo y nombres"),
-        "filesBackedUpFromDevice": m35,
-        "filesBackedUpInAlbum": m36,
+        "filesBackedUpFromDevice": m37,
+        "filesBackedUpInAlbum": m38,
         "filesDeleted":
             MessageLookupByLibrary.simpleMessage("Archivos eliminados"),
         "filesSavedToGallery": MessageLookupByLibrary.simpleMessage(
@@ -985,22 +1000,22 @@ class MessageLookup extends MessageLookupByLibrary {
         "freeStorageUsable": MessageLookupByLibrary.simpleMessage(
             "Almacenamiento libre disponible"),
         "freeTrial": MessageLookupByLibrary.simpleMessage("Prueba gratuita"),
-        "freeTrialValidTill": m37,
-        "freeUpAccessPostDelete": m38,
-        "freeUpAmount": m39,
+        "freeTrialValidTill": m39,
+        "freeUpAccessPostDelete": m40,
+        "freeUpAmount": m41,
         "freeUpDeviceSpace": MessageLookupByLibrary.simpleMessage(
             "Liberar espacio del dispositivo"),
         "freeUpDeviceSpaceDesc": MessageLookupByLibrary.simpleMessage(
             "Ahorra espacio en tu dispositivo limpiando archivos que tienen copia de seguridad."),
         "freeUpSpace": MessageLookupByLibrary.simpleMessage("Liberar espacio"),
-        "freeUpSpaceSaving": m40,
+        "freeUpSpaceSaving": m42,
         "gallery": MessageLookupByLibrary.simpleMessage("Galería"),
         "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage(
             "Hasta 1000 memorias mostradas en la galería"),
         "general": MessageLookupByLibrary.simpleMessage("General"),
         "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage(
             "Generando claves de cifrado..."),
-        "genericProgress": m41,
+        "genericProgress": m43,
         "goToSettings": MessageLookupByLibrary.simpleMessage("Ir a Ajustes"),
         "googlePlayId":
             MessageLookupByLibrary.simpleMessage("ID de Google Play"),
@@ -1061,6 +1076,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Elementos indexados"),
         "indexingIsPaused": MessageLookupByLibrary.simpleMessage(
             "La indexación está pausada. Se reanudará automáticamente cuando el dispositivo esté listo."),
+        "ineligible": MessageLookupByLibrary.simpleMessage("Inelegible"),
         "info": MessageLookupByLibrary.simpleMessage("Info"),
         "insecureDevice":
             MessageLookupByLibrary.simpleMessage("Dispositivo inseguro"),
@@ -1084,7 +1100,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "itLooksLikeSomethingWentWrongPleaseRetryAfterSome":
             MessageLookupByLibrary.simpleMessage(
                 "Parece que algo salió mal. Por favor, vuelve a intentarlo después de algún tiempo. Si el error persiste, ponte en contacto con nuestro equipo de soporte."),
-        "itemCount": m42,
+        "itemCount": m44,
         "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion":
             MessageLookupByLibrary.simpleMessage(
                 "Los artículos muestran el número de días restantes antes de ser borrados permanente"),
@@ -1092,6 +1108,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Los elementos seleccionados serán eliminados de este álbum"),
         "join": MessageLookupByLibrary.simpleMessage("Unir"),
         "joinAlbum": MessageLookupByLibrary.simpleMessage("Unir álbum"),
+        "joinAlbumConfirmationDialogBody": MessageLookupByLibrary.simpleMessage(
+            "Unirse a un álbum hará visible tu correo electrónico a sus participantes."),
         "joinAlbumSubtext":
             MessageLookupByLibrary.simpleMessage("para ver y añadir tus fotos"),
         "joinAlbumSubtextViewer": MessageLookupByLibrary.simpleMessage(
@@ -1115,7 +1133,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "legacy": MessageLookupByLibrary.simpleMessage("Legado"),
         "legacyAccounts":
             MessageLookupByLibrary.simpleMessage("Cuentas legadas"),
-        "legacyInvite": m43,
+        "legacyInvite": m45,
         "legacyPageDesc": MessageLookupByLibrary.simpleMessage(
             "Legado permite a los contactos de confianza acceder a su cuenta en su ausencia."),
         "legacyPageDesc2": MessageLookupByLibrary.simpleMessage(
@@ -1129,13 +1147,20 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Límite del dispositivo"),
         "linkEmail":
             MessageLookupByLibrary.simpleMessage("Vincular correo electrónico"),
+        "linkEmailToContactBannerCaption":
+            MessageLookupByLibrary.simpleMessage("para compartir más rápido"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("Habilitado"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("Vencido"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry": MessageLookupByLibrary.simpleMessage("Enlace vence"),
         "linkHasExpired":
             MessageLookupByLibrary.simpleMessage("El enlace ha caducado"),
         "linkNeverExpires": MessageLookupByLibrary.simpleMessage("Nunca"),
+        "linkPerson": MessageLookupByLibrary.simpleMessage("Vincular persona"),
+        "linkPersonCaption": MessageLookupByLibrary.simpleMessage(
+            "para una mejor experiencia compartida"),
+        "linkPersonToEmail": m47,
+        "linkPersonToEmailConfirmation": m48,
         "livePhotos": MessageLookupByLibrary.simpleMessage("Foto en vivo"),
         "loadMessage1": MessageLookupByLibrary.simpleMessage(
             "Puedes compartir tu suscripción con tu familia"),
@@ -1228,6 +1253,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "maps": MessageLookupByLibrary.simpleMessage("Mapas"),
         "mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"),
         "matrix": MessageLookupByLibrary.simpleMessage("Matrix"),
+        "me": MessageLookupByLibrary.simpleMessage("Yo"),
         "memoryCount": m5,
         "merchandise": MessageLookupByLibrary.simpleMessage("Mercancías"),
         "mergeWithExisting":
@@ -1258,11 +1284,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "moreDetails": MessageLookupByLibrary.simpleMessage("Más detalles"),
         "mostRecent": MessageLookupByLibrary.simpleMessage("Más reciente"),
         "mostRelevant": MessageLookupByLibrary.simpleMessage("Más relevante"),
-        "moveItem": m45,
+        "moveItem": m49,
         "moveToAlbum": MessageLookupByLibrary.simpleMessage("Mover al álbum"),
         "moveToHiddenAlbum":
             MessageLookupByLibrary.simpleMessage("Mover al álbum oculto"),
-        "movedSuccessfullyTo": m46,
+        "movedSuccessfullyTo": m50,
         "movedToTrash":
             MessageLookupByLibrary.simpleMessage("Movido a la papelera"),
         "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
@@ -1315,10 +1341,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "noResults": MessageLookupByLibrary.simpleMessage("Sin resultados"),
         "noResultsFound": MessageLookupByLibrary.simpleMessage(
             "No se han encontrado resultados"),
-        "noSuggestionsForPerson": m47,
+        "noSuggestionsForPerson": m51,
         "noSystemLockFound": MessageLookupByLibrary.simpleMessage(
             "Bloqueo de sistema no encontrado"),
-        "notPersonLabel": m48,
+        "notPersonLabel": m52,
         "nothingSharedWithYouYet": MessageLookupByLibrary.simpleMessage(
             "Aún no hay nada compartido contigo"),
         "nothingToSeeHere": MessageLookupByLibrary.simpleMessage(
@@ -1328,7 +1354,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "onDevice": MessageLookupByLibrary.simpleMessage("En el dispositivo"),
         "onEnte": MessageLookupByLibrary.simpleMessage(
             "En <branding>ente</branding>"),
-        "onlyFamilyAdminCanChangeCode": m49,
+        "onlyFamilyAdminCanChangeCode": m53,
         "onlyThem": MessageLookupByLibrary.simpleMessage("Solo ellos"),
         "oops": MessageLookupByLibrary.simpleMessage("Ups"),
         "oopsCouldNotSaveEdits": MessageLookupByLibrary.simpleMessage(
@@ -1351,8 +1377,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "O combinar con persona existente"),
         "orPickAnExistingOne":
             MessageLookupByLibrary.simpleMessage("O elige uno existente"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
+        "orPickFromYourContacts": MessageLookupByLibrary.simpleMessage(
+            "o elige de entre tus contactos"),
         "pair": MessageLookupByLibrary.simpleMessage("Emparejar"),
         "pairWithPin":
             MessageLookupByLibrary.simpleMessage("Emparejar con PIN"),
@@ -1379,7 +1405,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "paymentFailed": MessageLookupByLibrary.simpleMessage("Pago fallido"),
         "paymentFailedMessage": MessageLookupByLibrary.simpleMessage(
             "Lamentablemente tu pago falló. Por favor, ¡contacta con el soporte técnico y te ayudaremos!"),
-        "paymentFailedTalkToProvider": m50,
+        "paymentFailedTalkToProvider": m54,
         "pendingItems":
             MessageLookupByLibrary.simpleMessage("Elementos pendientes"),
         "pendingSync":
@@ -1404,14 +1430,18 @@ class MessageLookup extends MessageLookupByLibrary {
         "photosAddedByYouWillBeRemovedFromTheAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Las fotos añadidas por ti serán removidas del álbum"),
-        "photosCount": m51,
+        "photosCount": m55,
         "pickCenterPoint":
             MessageLookupByLibrary.simpleMessage("Elegir punto central"),
         "pinAlbum": MessageLookupByLibrary.simpleMessage("Fijar álbum"),
         "pinLock": MessageLookupByLibrary.simpleMessage("Bloqueo con Pin"),
         "playOnTv":
             MessageLookupByLibrary.simpleMessage("Reproducir álbum en TV"),
-        "playStoreFreeTrialValidTill": m52,
+        "playOriginal":
+            MessageLookupByLibrary.simpleMessage("Reproducir original"),
+        "playStoreFreeTrialValidTill": m56,
+        "playStream":
+            MessageLookupByLibrary.simpleMessage("Reproducir transmisión"),
         "playstoreSubscription":
             MessageLookupByLibrary.simpleMessage("Suscripción en la PlayStore"),
         "pleaseCheckYourInternetConnectionAndTryAgain":
@@ -1423,14 +1453,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseContactSupportIfTheProblemPersists":
             MessageLookupByLibrary.simpleMessage(
                 "Por favor, contacta a soporte técnico si el problema persiste"),
-        "pleaseEmailUsAt": m53,
+        "pleaseEmailUsAt": m57,
         "pleaseGrantPermissions":
             MessageLookupByLibrary.simpleMessage("Por favor, concede permiso"),
         "pleaseLoginAgain": MessageLookupByLibrary.simpleMessage(
             "Por favor, vuelve a iniciar sesión"),
         "pleaseSelectQuickLinksToRemove": MessageLookupByLibrary.simpleMessage(
             "Por favor, selecciona enlaces rápidos para eliminar"),
-        "pleaseSendTheLogsTo": m54,
+        "pleaseSendTheLogsTo": m58,
         "pleaseTryAgain": MessageLookupByLibrary.simpleMessage(
             "Por favor, inténtalo nuevamente"),
         "pleaseVerifyTheCodeYouHaveEntered":
@@ -1459,18 +1489,26 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Compartir en privado"),
         "proceed": MessageLookupByLibrary.simpleMessage("Continuar"),
         "processed": MessageLookupByLibrary.simpleMessage("Procesado"),
-        "processingImport": m55,
+        "processing": MessageLookupByLibrary.simpleMessage("Procesando"),
+        "processingImport": m59,
+        "processingVideos":
+            MessageLookupByLibrary.simpleMessage("Procesando vídeos"),
         "publicLinkCreated":
             MessageLookupByLibrary.simpleMessage("Enlace público creado"),
         "publicLinkEnabled":
             MessageLookupByLibrary.simpleMessage("Enlace público habilitado"),
+        "queued": MessageLookupByLibrary.simpleMessage("En cola"),
         "quickLinks": MessageLookupByLibrary.simpleMessage("Acceso rápido"),
         "radius": MessageLookupByLibrary.simpleMessage("Radio"),
         "raiseTicket": MessageLookupByLibrary.simpleMessage("Generar ticket"),
         "rateTheApp":
             MessageLookupByLibrary.simpleMessage("Evalúa la aplicación"),
         "rateUs": MessageLookupByLibrary.simpleMessage("Califícanos"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
+        "reassignMe": MessageLookupByLibrary.simpleMessage("Reasignar \"Yo\""),
+        "reassignedToName": m61,
+        "reassigningLoading":
+            MessageLookupByLibrary.simpleMessage("Reasignando..."),
         "recover": MessageLookupByLibrary.simpleMessage("Recuperar"),
         "recoverAccount":
             MessageLookupByLibrary.simpleMessage("Recuperar cuenta"),
@@ -1479,7 +1517,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Recuperar cuenta"),
         "recoveryInitiated":
             MessageLookupByLibrary.simpleMessage("Recuperación iniciada"),
-        "recoveryInitiatedDesc": m57,
+        "recoveryInitiatedDesc": m62,
         "recoveryKey":
             MessageLookupByLibrary.simpleMessage("Clave de recuperación"),
         "recoveryKeyCopiedToClipboard": MessageLookupByLibrary.simpleMessage(
@@ -1494,12 +1532,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Clave de recuperación verificada"),
         "recoveryKeyVerifyReason": MessageLookupByLibrary.simpleMessage(
             "Tu clave de recuperación es la única forma de recuperar tus fotos si olvidas tu contraseña. Puedes encontrar tu clave de recuperación en Ajustes > Cuenta.\n\nPor favor, introduce tu clave de recuperación aquí para verificar que la has guardado correctamente."),
-        "recoveryReady": m58,
+        "recoveryReady": m63,
         "recoverySuccessful":
             MessageLookupByLibrary.simpleMessage("¡Recuperación exitosa!"),
         "recoveryWarning": MessageLookupByLibrary.simpleMessage(
             "Un contacto de confianza está intentando acceder a tu cuenta"),
-        "recoveryWarningBody": m59,
+        "recoveryWarningBody": m64,
         "recreatePasswordBody": MessageLookupByLibrary.simpleMessage(
             "El dispositivo actual no es lo suficientemente potente para verificar su contraseña, pero podemos regenerarla de una manera que funcione con todos los dispositivos.\n\nPor favor inicie sesión usando su clave de recuperación y regenere su contraseña (puede volver a utilizar la misma si lo desea)."),
         "recreatePasswordTitle":
@@ -1514,7 +1552,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "1. Dale este código a tus amigos"),
         "referralStep2": MessageLookupByLibrary.simpleMessage(
             "2. Se suscriben a un plan de pago"),
-        "referralStep3": m60,
+        "referralStep3": m65,
         "referrals": MessageLookupByLibrary.simpleMessage("Referidos"),
         "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage(
             "Las referencias están actualmente en pausa"),
@@ -1545,7 +1583,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "removeLink": MessageLookupByLibrary.simpleMessage("Eliminar enlace"),
         "removeParticipant":
             MessageLookupByLibrary.simpleMessage("Quitar participante"),
-        "removeParticipantBody": m61,
+        "removeParticipantBody": m66,
         "removePersonLabel": MessageLookupByLibrary.simpleMessage(
             "Eliminar etiqueta de persona"),
         "removePublicLink":
@@ -1565,7 +1603,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "renameFile": MessageLookupByLibrary.simpleMessage("Renombrar archivo"),
         "renewSubscription":
             MessageLookupByLibrary.simpleMessage("Renovar suscripción"),
-        "renewsOn": m62,
+        "renewsOn": m67,
         "reportABug": MessageLookupByLibrary.simpleMessage("Reportar un error"),
         "reportBug": MessageLookupByLibrary.simpleMessage("Reportar error"),
         "resendEmail":
@@ -1599,6 +1637,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "safelyStored":
             MessageLookupByLibrary.simpleMessage("Almacenado con seguridad"),
         "save": MessageLookupByLibrary.simpleMessage("Guardar"),
+        "saveChangesBeforeLeavingQuestion":
+            MessageLookupByLibrary.simpleMessage(
+                "¿Guardar cambios antes de salir?"),
         "saveCollage": MessageLookupByLibrary.simpleMessage("Guardar collage"),
         "saveCopy": MessageLookupByLibrary.simpleMessage("Guardar copia"),
         "saveKey": MessageLookupByLibrary.simpleMessage("Guardar Clave"),
@@ -1645,8 +1686,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Invita a gente y verás todas las fotos compartidas aquí"),
         "searchPersonsEmptySection": MessageLookupByLibrary.simpleMessage(
             "Las personas se mostrarán aquí cuando se complete el procesado y la sincronización"),
-        "searchResultCount": m63,
-        "searchSectionsLengthMismatch": m64,
+        "searchResultCount": m68,
+        "searchSectionsLengthMismatch": m69,
         "security": MessageLookupByLibrary.simpleMessage("Seguridad"),
         "seePublicAlbumLinksInApp": MessageLookupByLibrary.simpleMessage(
             "Ver enlaces del álbum público en la aplicación"),
@@ -1670,8 +1711,12 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Seleccionar app de correo"),
         "selectMorePhotos":
             MessageLookupByLibrary.simpleMessage("Seleccionar más fotos"),
+        "selectPersonToLink": MessageLookupByLibrary.simpleMessage(
+            "Selecciona persona a vincular"),
         "selectReason":
             MessageLookupByLibrary.simpleMessage("Seleccionar motivo"),
+        "selectYourFace":
+            MessageLookupByLibrary.simpleMessage("Selecciona tu cara"),
         "selectYourPlan":
             MessageLookupByLibrary.simpleMessage("Elegir tu suscripción"),
         "selectedFilesAreNotOnEnte": MessageLookupByLibrary.simpleMessage(
@@ -1683,7 +1728,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Los archivos seleccionados serán eliminados de todos los álbumes y movidos a la papelera."),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "send": MessageLookupByLibrary.simpleMessage("Enviar"),
         "sendEmail":
             MessageLookupByLibrary.simpleMessage("Enviar correo electrónico"),
@@ -1717,16 +1762,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "shareAnAlbumNow":
             MessageLookupByLibrary.simpleMessage("Compartir un álbum ahora"),
         "shareLink": MessageLookupByLibrary.simpleMessage("Compartir enlace"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage(
             "Comparte sólo con la gente que quieres"),
         "shareTextConfirmOthersVerificationID": m7,
         "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage(
             "Descarga Ente para que podamos compartir fácilmente fotos y videos en calidad original.\n\nhttps://ente.io"),
-        "shareTextReferralCode": m67,
+        "shareTextReferralCode": m72,
         "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage(
             "Compartir con usuarios fuera de Ente"),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "shareYourFirstAlbum":
             MessageLookupByLibrary.simpleMessage("Comparte tu primer álbum"),
         "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
@@ -1738,7 +1783,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Nuevas fotos compartidas"),
         "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage(
             "Recibir notificaciones cuando alguien agrega una foto a un álbum compartido contigo"),
-        "sharedWith": m69,
+        "sharedWith": m74,
         "sharedWithMe":
             MessageLookupByLibrary.simpleMessage("Compartido conmigo"),
         "sharedWithYou":
@@ -1755,11 +1800,11 @@ class MessageLookup extends MessageLookupByLibrary {
             "Cerrar la sesión de otros dispositivos"),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "Estoy de acuerdo con los <u-terms>términos del servicio</u-terms> y <u-policy> la política de privacidad</u-policy>"),
-        "singleFileDeleteFromDevice": m70,
+        "singleFileDeleteFromDevice": m75,
         "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage(
             "Se borrará de todos los álbumes."),
-        "singleFileInBothLocalAndRemote": m71,
-        "singleFileInRemoteOnly": m72,
+        "singleFileInBothLocalAndRemote": m76,
+        "singleFileInRemoteOnly": m77,
         "skip": MessageLookupByLibrary.simpleMessage("Omitir"),
         "social": MessageLookupByLibrary.simpleMessage("Social"),
         "someItemsAreInBothEnteAndYourDevice":
@@ -1810,10 +1855,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageInGB": m1,
         "storageLimitExceeded":
             MessageLookupByLibrary.simpleMessage("Límite de datos excedido"),
-        "storageUsageInfo": m73,
+        "storageUsageInfo": m78,
+        "streamDetails":
+            MessageLookupByLibrary.simpleMessage("Detalles de la transmisión"),
         "strongStrength": MessageLookupByLibrary.simpleMessage("Segura"),
-        "subAlreadyLinkedErrMessage": m74,
-        "subWillBeCancelledOn": m75,
+        "subAlreadyLinkedErrMessage": m79,
+        "subWillBeCancelledOn": m80,
         "subscribe": MessageLookupByLibrary.simpleMessage("Suscribirse"),
         "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage(
             "Necesitas una suscripción activa de pago para habilitar el compartir."),
@@ -1830,7 +1877,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "suggestFeatures":
             MessageLookupByLibrary.simpleMessage("Sugerir una característica"),
         "support": MessageLookupByLibrary.simpleMessage("Soporte"),
-        "syncProgress": m76,
+        "syncProgress": m81,
         "syncStopped":
             MessageLookupByLibrary.simpleMessage("Sincronización detenida"),
         "syncing": MessageLookupByLibrary.simpleMessage("Sincronizando..."),
@@ -1841,7 +1888,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "tapToUnlock":
             MessageLookupByLibrary.simpleMessage("Toca para desbloquear"),
         "tapToUpload": MessageLookupByLibrary.simpleMessage("Toca para subir"),
-        "tapToUploadIsIgnoredDue": m77,
+        "tapToUploadIsIgnoredDue": m82,
         "tempErrorContactSupportIfPersists": MessageLookupByLibrary.simpleMessage(
             "Parece que algo salió mal. Por favor, vuelve a intentarlo después de algún tiempo. Si el error persiste, ponte en contacto con nuestro equipo de soporte."),
         "terminate": MessageLookupByLibrary.simpleMessage("Terminar"),
@@ -1881,7 +1928,9 @@ class MessageLookup extends MessageLookupByLibrary {
             "Este correo electrónico ya está en uso"),
         "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage(
             "Esta imagen no tiene datos exif"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsMeExclamation":
+            MessageLookupByLibrary.simpleMessage("¡Este soy yo!"),
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage(
             "Esta es tu ID de verificación"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -1905,11 +1954,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "total": MessageLookupByLibrary.simpleMessage("total"),
         "totalSize": MessageLookupByLibrary.simpleMessage("Tamaño total"),
         "trash": MessageLookupByLibrary.simpleMessage("Papelera"),
-        "trashDaysLeft": m79,
+        "trashDaysLeft": m84,
         "trim": MessageLookupByLibrary.simpleMessage("Ajustar duración"),
         "trustedContacts":
             MessageLookupByLibrary.simpleMessage("Contactos de confianza"),
-        "trustedInviteBody": m80,
+        "trustedInviteBody": m85,
         "tryAgain": MessageLookupByLibrary.simpleMessage("Inténtalo de nuevo"),
         "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage(
             "Activar la copia de seguridad para subir automáticamente archivos añadidos a la carpeta de este dispositivo a Ente."),
@@ -1927,7 +1976,7 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Autenticación de doble factor restablecida con éxito"),
         "twofactorSetup":
             MessageLookupByLibrary.simpleMessage("Configuración de dos pasos"),
-        "typeOfGallerGallerytypeIsNotSupportedForRename": m81,
+        "typeOfGallerGallerytypeIsNotSupportedForRename": m86,
         "unarchive": MessageLookupByLibrary.simpleMessage("Desarchivar"),
         "unarchiveAlbum":
             MessageLookupByLibrary.simpleMessage("Desarchivar álbum"),
@@ -1952,10 +2001,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "updatingFolderSelection": MessageLookupByLibrary.simpleMessage(
             "Actualizando la selección de carpeta..."),
         "upgrade": MessageLookupByLibrary.simpleMessage("Mejorar"),
-        "uploadIsIgnoredDueToIgnorereason": m82,
+        "uploadIsIgnoredDueToIgnorereason": m87,
         "uploadingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
             "Subiendo archivos al álbum..."),
-        "uploadingMultipleMemories": m83,
+        "uploadingMultipleMemories": m88,
         "uploadingSingleMemory":
             MessageLookupByLibrary.simpleMessage("Preservando 1 memoria..."),
         "upto50OffUntil4thDec": MessageLookupByLibrary.simpleMessage(
@@ -1974,7 +2023,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "useSelectedPhoto":
             MessageLookupByLibrary.simpleMessage("Usar foto seleccionada"),
         "usedSpace": MessageLookupByLibrary.simpleMessage("Espacio usado"),
-        "validTill": m84,
+        "validTill": m89,
         "verificationFailedPleaseTryAgain":
             MessageLookupByLibrary.simpleMessage(
                 "Verificación fallida, por favor inténtalo de nuevo"),
@@ -1983,7 +2032,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "verify": MessageLookupByLibrary.simpleMessage("Verificar"),
         "verifyEmail": MessageLookupByLibrary.simpleMessage(
             "Verificar correo electrónico"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Verificar"),
         "verifyPasskey":
             MessageLookupByLibrary.simpleMessage("Verificar clave de acceso"),
@@ -1995,6 +2044,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "videoInfo":
             MessageLookupByLibrary.simpleMessage("Información de video"),
         "videoSmallCase": MessageLookupByLibrary.simpleMessage("vídeo"),
+        "videoStreaming":
+            MessageLookupByLibrary.simpleMessage("Transmisión de vídeo"),
         "videos": MessageLookupByLibrary.simpleMessage("Vídeos"),
         "viewActiveSessions":
             MessageLookupByLibrary.simpleMessage("Ver sesiones activas"),
@@ -2011,7 +2062,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "viewRecoveryKey":
             MessageLookupByLibrary.simpleMessage("Ver código de recuperación"),
         "viewer": MessageLookupByLibrary.simpleMessage("Espectador"),
-        "viewersSuccessfullyAdded": m86,
+        "viewersSuccessfullyAdded": m91,
         "visitWebToManage": MessageLookupByLibrary.simpleMessage(
             "Por favor, visita web.ente.io para administrar tu suscripción"),
         "waitingForVerification":
@@ -2033,7 +2084,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Un contacto de confianza puede ayudar a recuperar sus datos."),
         "yearShort": MessageLookupByLibrary.simpleMessage("año"),
         "yearly": MessageLookupByLibrary.simpleMessage("Anualmente"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("Sí"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("Sí, cancelar"),
         "yesConvertToViewer":
@@ -2065,7 +2116,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "No puedes compartir contigo mismo"),
         "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage(
             "No tienes ningún elemento archivado."),
-        "youHaveSuccessfullyFreedUp": m88,
+        "youHaveSuccessfullyFreedUp": m93,
         "yourAccountHasBeenDeleted":
             MessageLookupByLibrary.simpleMessage("Tu cuenta ha sido eliminada"),
         "yourMap": MessageLookupByLibrary.simpleMessage("Tu mapa"),
diff --git a/mobile/lib/generated/intl/messages_et.dart b/mobile/lib/generated/intl/messages_et.dart
index 20fb528795..dc3a61a6ff 100644
--- a/mobile/lib/generated/intl/messages_et.dart
+++ b/mobile/lib/generated/intl/messages_et.dart
@@ -169,8 +169,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "oops": MessageLookupByLibrary.simpleMessage("Oih"),
         "oopsSomethingWentWrong":
             MessageLookupByLibrary.simpleMessage("Oih, midagi läks valesti"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "password": MessageLookupByLibrary.simpleMessage("Parool"),
         "photoSmallCase": MessageLookupByLibrary.simpleMessage("foto"),
         "pleaseTryAgain":
diff --git a/mobile/lib/generated/intl/messages_fa.dart b/mobile/lib/generated/intl/messages_fa.dart
index 3beb2c2f51..c705ca6393 100644
--- a/mobile/lib/generated/intl/messages_fa.dart
+++ b/mobile/lib/generated/intl/messages_fa.dart
@@ -20,24 +20,24 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'fa';
 
-  static String m16(versionValue) => "نسخه: ${versionValue}";
+  static String m17(versionValue) => "نسخه: ${versionValue}";
 
-  static String m17(freeAmount, storageUnit) =>
+  static String m18(freeAmount, storageUnit) =>
       "${freeAmount} ${storageUnit} رایگان";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "لطفا یک ایمیل از آدرس ایمیلی که ثبت نام کردید به ${supportEmail} ارسال کنید";
 
   static String m0(passwordStrengthValue) =>
       "قدرت رمز عبور: ${passwordStrengthValue}";
 
-  static String m56(storeName) => "به ما در ${storeName} امتیاز دهید";
+  static String m60(storeName) => "به ما در ${storeName} امتیاز دهید";
 
-  static String m73(
+  static String m78(
           usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) =>
       "${usedAmount} ${usedStorageUnit} از ${totalAmount} ${totalStorageUnit} استفاده شده";
 
-  static String m85(email) => "تایید ${email}";
+  static String m90(email) => "تایید ${email}";
 
   static String m2(email) =>
       "ما یک ایمیل به <green>${email}</green> ارسال کرده‌ایم";
@@ -75,7 +75,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "androidCancelButton": MessageLookupByLibrary.simpleMessage("لغو"),
         "androidIosWebDesktop": MessageLookupByLibrary.simpleMessage(
             "اندروید، آی‌اواس، وب، رایانه رومیزی"),
-        "appVersion": m16,
+        "appVersion": m17,
         "archive": MessageLookupByLibrary.simpleMessage("بایگانی"),
         "areYouSureYouWantToLogout": MessageLookupByLibrary.simpleMessage(
             "آیا برای خارج شدن مطمئن هستید؟"),
@@ -86,7 +86,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "authToViewYourActiveSessions": MessageLookupByLibrary.simpleMessage(
             "لطفاً برای مشاهده دستگاه‌های فعال خود احراز هویت کنید"),
         "available": MessageLookupByLibrary.simpleMessage("در دسترس"),
-        "availableStorageSpace": m17,
+        "availableStorageSpace": m18,
         "backedUpFolders":
             MessageLookupByLibrary.simpleMessage("پوشه‌های پشتیبان گیری شده"),
         "backup": MessageLookupByLibrary.simpleMessage("پشتیبان گیری"),
@@ -166,7 +166,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "discord": MessageLookupByLibrary.simpleMessage("دیسکورد"),
         "doThisLater": MessageLookupByLibrary.simpleMessage("بعداً انجام شود"),
         "downloading": MessageLookupByLibrary.simpleMessage("در حال دانلود..."),
-        "dropSupportEmail": m29,
+        "dropSupportEmail": m30,
         "editLocationTagTitle":
             MessageLookupByLibrary.simpleMessage("ویرایش مکان"),
         "email": MessageLookupByLibrary.simpleMessage("ایمیل"),
@@ -269,8 +269,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "notifications": MessageLookupByLibrary.simpleMessage("آگاه‌سازی‌ها"),
         "ok": MessageLookupByLibrary.simpleMessage("تایید"),
         "oops": MessageLookupByLibrary.simpleMessage("اوه"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "password": MessageLookupByLibrary.simpleMessage("رمز عبور"),
         "passwordChangedSuccessfully": MessageLookupByLibrary.simpleMessage(
             "رمز عبور با موفقیت تغییر کرد"),
@@ -294,7 +292,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("پشتیبان گیری خصوصی"),
         "privateSharing":
             MessageLookupByLibrary.simpleMessage("اشتراک گذاری خصوصی"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
         "recover": MessageLookupByLibrary.simpleMessage("بازیابی"),
         "recoverAccount":
             MessageLookupByLibrary.simpleMessage("بازیابی حساب کاربری"),
@@ -370,7 +368,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageBreakupFamily":
             MessageLookupByLibrary.simpleMessage("خانوادگی"),
         "storageBreakupYou": MessageLookupByLibrary.simpleMessage("شما"),
-        "storageUsageInfo": m73,
+        "storageUsageInfo": m78,
         "strongStrength": MessageLookupByLibrary.simpleMessage("قوی"),
         "support": MessageLookupByLibrary.simpleMessage("پشتیبانی"),
         "systemTheme": MessageLookupByLibrary.simpleMessage("سیستم"),
@@ -411,7 +409,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "از کلید بازیابی استفاده کنید"),
         "verify": MessageLookupByLibrary.simpleMessage("تایید"),
         "verifyEmail": MessageLookupByLibrary.simpleMessage("تایید ایمیل"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyIDLabel": MessageLookupByLibrary.simpleMessage("تایید"),
         "verifyPassword":
             MessageLookupByLibrary.simpleMessage("تایید رمز عبور"),
diff --git a/mobile/lib/generated/intl/messages_fr.dart b/mobile/lib/generated/intl/messages_fr.dart
index f90ca9f1f6..0e0b7ac0ac 100644
--- a/mobile/lib/generated/intl/messages_fr.dart
+++ b/mobile/lib/generated/intl/messages_fr.dart
@@ -20,263 +20,275 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'fr';
 
-  static String m9(count) =>
-      "${Intl.plural(count, zero: 'Ajouter un collaborateur', one: 'Ajouter un collaborateur', other: 'Ajouter des collaborateurs')}";
+  static String m9(title) => "${title} (Moi)";
 
   static String m10(count) =>
+      "${Intl.plural(count, zero: 'Ajouter un collaborateur', one: 'Ajouter un collaborateur', other: 'Ajouter des collaborateurs')}";
+
+  static String m11(count) =>
       "${Intl.plural(count, one: 'Ajoutez un objet', other: 'Ajoutez des objets')}";
 
-  static String m11(storageAmount, endDate) =>
+  static String m12(storageAmount, endDate) =>
       "Votre extension de ${storageAmount} est valable jusqu\'au ${endDate}";
 
-  static String m12(count) =>
+  static String m13(count) =>
       "${Intl.plural(count, zero: 'Ajouter un observateur', one: 'Ajouter un observateur', other: 'Ajouter des observateurs')}";
 
-  static String m13(emailOrName) => "Ajouté par ${emailOrName}";
+  static String m14(emailOrName) => "Ajouté par ${emailOrName}";
 
-  static String m14(albumName) => "Ajouté avec succès à  ${albumName}";
+  static String m15(albumName) => "Ajouté avec succès à  ${albumName}";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: 'Aucun Participant', one: '1 Participant', other: '${count} Participants')}";
 
-  static String m16(versionValue) => "Version : ${versionValue}";
+  static String m17(versionValue) => "Version : ${versionValue}";
 
-  static String m17(freeAmount, storageUnit) =>
+  static String m18(freeAmount, storageUnit) =>
       "${freeAmount} ${storageUnit} libre";
 
-  static String m18(paymentProvider) =>
+  static String m19(paymentProvider) =>
       "Veuillez d\'abord annuler votre abonnement existant de ${paymentProvider}";
 
   static String m3(user) =>
       "${user} ne pourra pas ajouter plus de photos à cet album\n\nIl pourra toujours supprimer les photos existantes ajoutées par eux";
 
-  static String m19(isFamilyMember, storageAmountInGb) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
       "${Intl.select(isFamilyMember, {
             'true':
-                'Votre famille a demandé ${storageAmountInGb} GB jusqu\'à présent',
+                'Votre famille a obtenu ${storageAmountInGb} Go jusqu\'à présent',
             'false':
-                'Vous avez réclamé ${storageAmountInGb} GB jusqu\'à présent',
+                'Vous avez obtenu ${storageAmountInGb} Go jusqu\'à présent',
             'other':
-                'Vous avez réclamé ${storageAmountInGb} GB jusqu\'à présent!',
+                'Vous avez obtenu ${storageAmountInGb} Go jusqu\'à présent !',
           })}";
 
-  static String m20(albumName) => "Lien collaboratif créé pour ${albumName}";
+  static String m21(albumName) => "Lien collaboratif créé pour ${albumName}";
 
-  static String m21(count) =>
+  static String m22(count) =>
       "${Intl.plural(count, zero: '0 collaborateur ajouté', one: '1 collaborateur ajouté', other: '${count} collaborateurs ajoutés')}";
 
-  static String m22(email, numOfDays) =>
+  static String m23(email, numOfDays) =>
       "Vous êtes sur le point d\'ajouter ${email} en tant que contact sûr. Il pourra récupérer votre compte si vous êtes absent pendant ${numOfDays} jours.";
 
-  static String m23(familyAdminEmail) =>
+  static String m24(familyAdminEmail) =>
       "Veuillez contacter <green>${familyAdminEmail}</green> pour gérer votre abonnement";
 
-  static String m24(provider) =>
+  static String m25(provider) =>
       "Veuillez nous contacter à support@ente.io pour gérer votre abonnement ${provider}.";
 
-  static String m25(endpoint) => "Connecté à ${endpoint}";
+  static String m26(endpoint) => "Connecté à ${endpoint}";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: 'Supprimer le fichier', other: 'Supprimer ${count} fichiers')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "Suppression de ${currentlyDeleting} / ${totalCount}";
 
-  static String m28(albumName) =>
+  static String m29(albumName) =>
       "Cela supprimera le lien public pour accéder à \"${albumName}\".";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "Veuillez envoyer un e-mail à ${supportEmail} depuis votre adresse enregistrée";
 
-  static String m30(count, storageSaved) =>
+  static String m31(count, storageSaved) =>
       "Vous avez nettoyé ${Intl.plural(count, one: '${count} fichier dupliqué', other: '${count} fichiers dupliqués')}, en libérant (${storageSaved}!)";
 
-  static String m31(count, formattedSize) =>
+  static String m32(count, formattedSize) =>
       "${count} fichiers, ${formattedSize} chacun";
 
-  static String m32(newEmail) => "L\'e-mail a été changé en ${newEmail}";
+  static String m33(newEmail) => "L\'email a été changé par ${newEmail}";
 
-  static String m33(email) =>
+  static String m34(email) => "${email} n\'a pas de compte Ente.";
+
+  static String m35(email) =>
       "${email} n\'a pas de compte Ente.\n\nEnvoyez une invitation pour partager des photos.";
 
-  static String m34(text) => "Photos supplémentaires trouvées pour ${text}";
+  static String m36(text) => "Photos supplémentaires trouvées pour ${text}";
 
-  static String m35(count, formattedNumber) =>
+  static String m37(count, formattedNumber) =>
       "${Intl.plural(count, one: '1 fichier sur cet appareil a été sauvegardé en toute sécurité', other: '${formattedNumber} fichiers sur cet appareil ont été sauvegardés en toute sécurité')}";
 
-  static String m36(count, formattedNumber) =>
+  static String m38(count, formattedNumber) =>
       "${Intl.plural(count, one: '1 fichier dans cet album a été sauvegardé en toute sécurité', other: '${formattedNumber} fichiers dans cet album ont été sauvegardés en toute sécurité')}";
 
   static String m4(storageAmountInGB) =>
       "${storageAmountInGB} Go chaque fois que quelqu\'un s\'inscrit à une offre payante et applique votre code";
 
-  static String m37(endDate) => "Essai gratuit valide jusqu’au ${endDate}";
+  static String m39(endDate) => "Essai gratuit valide jusqu’au ${endDate}";
 
-  static String m38(count) =>
+  static String m40(count) =>
       "Vous pouvez toujours ${Intl.plural(count, one: 'y', other: 'y')} accéder sur Ente tant que vous avez un abonnement actif";
 
-  static String m39(sizeInMBorGB) => "Libérer ${sizeInMBorGB}";
+  static String m41(sizeInMBorGB) => "Libérer ${sizeInMBorGB}";
 
-  static String m40(count, formattedSize) =>
+  static String m42(count, formattedSize) =>
       "${Intl.plural(count, one: 'Il peut être supprimé de l\'appareil pour libérer ${formattedSize}', other: 'Ils peuvent être supprimés de l\'appareil pour libérer ${formattedSize}')}";
 
-  static String m41(currentlyProcessing, totalCount) =>
+  static String m43(currentlyProcessing, totalCount) =>
       "Traitement en cours ${currentlyProcessing} / ${totalCount}";
 
-  static String m42(count) =>
+  static String m44(count) =>
       "${Intl.plural(count, one: '${count} objet', other: '${count} objets')}";
 
-  static String m43(email) =>
+  static String m45(email) =>
       "${email} vous a invité à être un contact de confiance";
 
-  static String m44(expiryTime) => "Le lien expirera le ${expiryTime}";
+  static String m46(expiryTime) => "Le lien expirera le ${expiryTime}";
+
+  static String m47(email) => "Associer la personne à ${email}";
+
+  static String m48(personName, email) =>
+      "Cela va associer ${personName} à ${email}";
 
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, one: '${formattedCount} souvenir', other: '${formattedCount} souvenirs')}";
 
-  static String m45(count) =>
+  static String m49(count) =>
       "${Intl.plural(count, one: 'Déplacez l\'objet', other: 'Déplacez des objets')}";
 
-  static String m46(albumName) => "Déplacé avec succès vers ${albumName}";
+  static String m50(albumName) => "Déplacé avec succès vers ${albumName}";
 
-  static String m47(personName) => "Aucune suggestion pour ${personName}";
+  static String m51(personName) => "Aucune suggestion pour ${personName}";
 
-  static String m48(name) => "Pas ${name}?";
+  static String m52(name) => "Pas ${name}?";
 
-  static String m49(familyAdminEmail) =>
+  static String m53(familyAdminEmail) =>
       "Veuillez contacter ${familyAdminEmail} pour modifier votre code.";
 
   static String m0(passwordStrengthValue) =>
       "Sécurité du mot de passe : ${passwordStrengthValue}";
 
-  static String m50(providerName) =>
+  static String m54(providerName) =>
       "Veuillez contacter le support ${providerName} si vous avez été facturé";
 
-  static String m51(count) =>
+  static String m55(count) =>
       "${Intl.plural(count, zero: '0 photo', one: '1 photo', other: '${count} photos')}";
 
-  static String m52(endDate) =>
+  static String m56(endDate) =>
       "Essai gratuit valable jusqu\'à ${endDate}.\nVous pouvez choisir un plan payant par la suite.";
 
-  static String m53(toEmail) => "Merci de nous envoyer un e-mail à ${toEmail}";
+  static String m57(toEmail) => "Merci de nous envoyer un email à ${toEmail}";
 
-  static String m54(toEmail) => "Envoyez les logs à ${toEmail}";
+  static String m58(toEmail) => "Envoyez les logs à ${toEmail}";
 
-  static String m55(folderName) => "Traitement de ${folderName}...";
+  static String m59(folderName) => "Traitement de ${folderName}...";
 
-  static String m56(storeName) => "Notez-nous sur ${storeName}";
+  static String m60(storeName) => "Laissez une note sur ${storeName}";
 
-  static String m57(days, email) =>
+  static String m61(name) => "Vous a réassigné à ${name}";
+
+  static String m62(days, email) =>
       "Vous pourrez accéder au compte d\'ici ${days} jours. Une notification sera envoyée à ${email}.";
 
-  static String m58(email) =>
+  static String m63(email) =>
       "Vous pouvez maintenant récupérer le compte de ${email} en définissant un nouveau mot de passe.";
 
-  static String m59(email) => "${email} tente de récupérer votre compte.";
+  static String m64(email) => "${email} tente de récupérer votre compte.";
 
-  static String m60(storageInGB) =>
-      "3. Vous recevez tous les deux ${storageInGB} GB* gratuits";
+  static String m65(storageInGB) =>
+      "3. Vous recevez tous les deux ${storageInGB} Go* gratuits";
 
-  static String m61(userEmail) =>
+  static String m66(userEmail) =>
       "${userEmail} sera retiré de cet album partagé\n\nToutes les photos ajoutées par eux seront également retirées de l\'album";
 
-  static String m62(endDate) => "Renouvellement le ${endDate}";
+  static String m67(endDate) => "Renouvellement le ${endDate}";
 
-  static String m63(count) =>
+  static String m68(count) =>
       "${Intl.plural(count, one: '${count} résultat trouvé', other: '${count} résultats trouvés')}";
 
-  static String m64(snapshotLength, searchLength) =>
+  static String m69(snapshotLength, searchLength) =>
       "Incompatibilité de longueur des sections : ${snapshotLength} != ${searchLength}";
 
   static String m6(count) => "${count} sélectionné(s)";
 
-  static String m65(count, yourCount) =>
+  static String m70(count, yourCount) =>
       "${count} sélectionné(s) (${yourCount} à vous)";
 
-  static String m66(verificationID) =>
+  static String m71(verificationID) =>
       "Voici mon ID de vérification : ${verificationID} pour ente.io.";
 
   static String m7(verificationID) =>
       "Hé, pouvez-vous confirmer qu\'il s\'agit de votre ID de vérification ente.io : ${verificationID}";
 
-  static String m67(referralCode, referralStorageInGB) =>
+  static String m72(referralCode, referralStorageInGB) =>
       "Code de parrainage Ente : ${referralCode} \n\nValidez le dans Paramètres → Général → Références pour obtenir ${referralStorageInGB} Go gratuitement après votre inscription à un plan payant\n\nhttps://ente.io";
 
-  static String m68(numberOfPeople) =>
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: 'Partagez avec des personnes spécifiques', one: 'Partagé avec 1 personne', other: 'Partagé avec ${numberOfPeople} personnes')}";
 
-  static String m69(emailIDs) => "Partagé avec ${emailIDs}";
+  static String m74(emailIDs) => "Partagé avec ${emailIDs}";
 
-  static String m70(fileType) =>
+  static String m75(fileType) =>
       "Elle ${fileType} sera supprimée de votre appareil.";
 
-  static String m71(fileType) =>
+  static String m76(fileType) =>
       "Cette ${fileType} est à la fois sur ente et sur votre appareil.";
 
-  static String m72(fileType) => "Cette ${fileType} sera supprimée de l\'Ente.";
+  static String m77(fileType) => "Cette ${fileType} sera supprimée de l\'Ente.";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} Go";
 
-  static String m73(
+  static String m78(
           usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) =>
       "${usedAmount} ${usedStorageUnit} sur ${totalAmount} ${totalStorageUnit} utilisés";
 
-  static String m74(id) =>
+  static String m79(id) =>
       "Votre ${id} est déjà lié à un autre compte Ente.\nSi vous souhaitez utiliser votre ${id} avec ce compte, veuillez contacter notre support";
 
-  static String m75(endDate) => "Votre abonnement sera annulé le ${endDate}";
+  static String m80(endDate) => "Votre abonnement sera annulé le ${endDate}";
 
-  static String m76(completed, total) =>
-      "${completed}/${total} souvenirs conservés";
+  static String m81(completed, total) =>
+      "${completed}/${total} souvenirs sauvegardés";
 
-  static String m77(ignoreReason) =>
+  static String m82(ignoreReason) =>
       "Appuyer pour envoyer, l\'envoi est actuellement ignoré en raison de ${ignoreReason}";
 
   static String m8(storageAmountInGB) =>
       "Ils obtiennent aussi ${storageAmountInGB} Go";
 
-  static String m78(email) => "Ceci est l\'ID de vérification de ${email}";
+  static String m83(email) => "Ceci est l\'ID de vérification de ${email}";
 
-  static String m79(count) =>
+  static String m84(count) =>
       "${Intl.plural(count, zero: 'Bientôt', one: '1 jour', other: '${count} jours')}";
 
-  static String m80(email) =>
+  static String m85(email) =>
       "Vous avez été invité(e) à être un(e) héritier(e) par ${email}.";
 
-  static String m81(galleryType) =>
+  static String m86(galleryType) =>
       "Les galeries de type \'${galleryType}\' ne peuvent être renommées";
 
-  static String m82(ignoreReason) =>
+  static String m87(ignoreReason) =>
       "L\'envoi est ignoré en raison de ${ignoreReason}";
 
-  static String m83(count) => "Sauvegarde ${count} souvenirs...";
+  static String m88(count) => "Sauvegarde de ${count} souvenirs...";
 
-  static String m84(endDate) => "Valable jusqu\'au ${endDate}";
+  static String m89(endDate) => "Valable jusqu\'au ${endDate}";
 
-  static String m85(email) => "Vérifier ${email}";
+  static String m90(email) => "Vérifier ${email}";
 
-  static String m86(count) =>
+  static String m91(count) =>
       "${Intl.plural(count, zero: '0 observateur ajouté', one: '1 observateur ajouté', other: '${count} observateurs ajoutés')}";
 
   static String m2(email) =>
-      "Nous avons envoyé un e-mail à <green>${email}</green>";
+      "Nous avons envoyé un email à <green>${email}</green>";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, one: 'il y a ${count} an', other: 'il y a ${count} ans')}";
 
-  static String m88(storageSaved) =>
+  static String m93(storageSaved) =>
       "Vous avez libéré ${storageSaved} avec succès !";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
         "aNewVersionOfEnteIsAvailable": MessageLookupByLibrary.simpleMessage(
             "Une nouvelle version de Ente est disponible."),
-        "about": MessageLookupByLibrary.simpleMessage("À propos"),
+        "about": MessageLookupByLibrary.simpleMessage("À propos d\'Ente"),
         "acceptTrustInvite":
             MessageLookupByLibrary.simpleMessage("Accepter l\'invitation"),
         "account": MessageLookupByLibrary.simpleMessage("Compte"),
         "accountIsAlreadyConfigured": MessageLookupByLibrary.simpleMessage(
             "Le compte est déjà configuré."),
+        "accountOwnerPersonAppbarTitle": m9,
         "accountWelcomeBack":
             MessageLookupByLibrary.simpleMessage("Bon retour parmi nous !"),
         "ackPasswordLostWarning": MessageLookupByLibrary.simpleMessage(
@@ -289,12 +301,12 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Ajouter un nouvel email"),
         "addCollaborator":
             MessageLookupByLibrary.simpleMessage("Ajouter un collaborateur"),
-        "addCollaborators": m9,
+        "addCollaborators": m10,
         "addFiles":
             MessageLookupByLibrary.simpleMessage("Ajouter des fichiers"),
         "addFromDevice":
             MessageLookupByLibrary.simpleMessage("Ajouter depuis l\'appareil"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocation":
             MessageLookupByLibrary.simpleMessage("Ajouter la localisation"),
         "addLocationButton": MessageLookupByLibrary.simpleMessage("Ajouter"),
@@ -307,7 +319,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Ajouter une nouvelle personne"),
         "addOnPageSubtitle": MessageLookupByLibrary.simpleMessage(
             "Détails des modules complémentaires"),
-        "addOnValidTill": m11,
+        "addOnValidTill": m12,
         "addOns":
             MessageLookupByLibrary.simpleMessage("Modules complémentaires"),
         "addPhotos": MessageLookupByLibrary.simpleMessage("Ajouter des photos"),
@@ -322,12 +334,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Ajouter un contact de confiance"),
         "addViewer":
             MessageLookupByLibrary.simpleMessage("Ajouter un observateur"),
-        "addViewers": m12,
+        "addViewers": m13,
         "addYourPhotosNow": MessageLookupByLibrary.simpleMessage(
             "Ajoutez vos photos maintenant"),
         "addedAs": MessageLookupByLibrary.simpleMessage("Ajouté comme"),
-        "addedBy": m13,
-        "addedSuccessfullyTo": m14,
+        "addedBy": m14,
+        "addedSuccessfullyTo": m15,
         "addingToFavorites":
             MessageLookupByLibrary.simpleMessage("Ajout aux favoris..."),
         "advanced": MessageLookupByLibrary.simpleMessage("Avancé"),
@@ -338,14 +350,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "after1Week": MessageLookupByLibrary.simpleMessage("Après 1 semaine"),
         "after1Year": MessageLookupByLibrary.simpleMessage("Après 1 an"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("Propriétaire"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumTitle": MessageLookupByLibrary.simpleMessage("Titre de l\'album"),
         "albumUpdated":
             MessageLookupByLibrary.simpleMessage("Album mis à jour"),
         "albums": MessageLookupByLibrary.simpleMessage("Albums"),
         "allClear": MessageLookupByLibrary.simpleMessage("✨ Tout est effacé"),
         "allMemoriesPreserved": MessageLookupByLibrary.simpleMessage(
-            "Tous les souvenirs sont conservés"),
+            "Tous les souvenirs sont sauvegardés"),
         "allPersonGroupingWillReset": MessageLookupByLibrary.simpleMessage(
             "Tous les groupements pour cette personne seront réinitialisés, et vous perdrez toutes les suggestions faites pour cette personne"),
         "allow": MessageLookupByLibrary.simpleMessage("Autoriser"),
@@ -386,7 +398,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Verrouillage de l\'application"),
         "appLockDescriptions": MessageLookupByLibrary.simpleMessage(
             "Choisissez entre l\'écran de verrouillage par défaut de votre appareil et un écran de verrouillage personnalisé avec un code PIN ou un mot de passe."),
-        "appVersion": m16,
+        "appVersion": m17,
         "appleId": MessageLookupByLibrary.simpleMessage("Apple ID"),
         "apply": MessageLookupByLibrary.simpleMessage("Appliquer"),
         "applyCodeTitle":
@@ -425,11 +437,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("dans un abri antiatomique"),
         "authToChangeEmailVerificationSetting":
             MessageLookupByLibrary.simpleMessage(
-                "Veuillez vous authentifier pour modifier votre adresse e-mail"),
+                "Authentifiez-vous pour modifier l\'authentification à deux facteurs par email"),
         "authToChangeLockscreenSetting": MessageLookupByLibrary.simpleMessage(
             "Veuillez vous authentifier pour modifier les paramètres de l\'écran de verrouillage"),
         "authToChangeYourEmail": MessageLookupByLibrary.simpleMessage(
-            "Veuillez vous authentifier pour modifier votre adresse e-mail"),
+            "Authentifiez-vous pour modifier votre adresse email"),
         "authToChangeYourPassword": MessageLookupByLibrary.simpleMessage(
             "Veuillez vous authentifier pour modifier votre mot de passe"),
         "authToConfigureTwofactorAuthentication":
@@ -444,11 +456,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "authToViewTrashedFiles": MessageLookupByLibrary.simpleMessage(
             "Veuillez vous authentifier pour voir vos fichiers mis à la corbeille"),
         "authToViewYourActiveSessions": MessageLookupByLibrary.simpleMessage(
-            "Veuillez vous authentifier pour voir vos sessions actives"),
+            "Authentifiez-vous pour voir les connexions actives"),
         "authToViewYourHiddenFiles": MessageLookupByLibrary.simpleMessage(
             "Veuillez vous authentifier pour voir vos fichiers cachés"),
         "authToViewYourMemories": MessageLookupByLibrary.simpleMessage(
-            "Veuillez vous authentifier pour voir vos souvenirs"),
+            "Authentifiez-vous pour voir vos souvenirs"),
         "authToViewYourRecoveryKey": MessageLookupByLibrary.simpleMessage(
             "Veuillez vous authentifier pour afficher votre clé de récupération"),
         "authenticating":
@@ -465,7 +477,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoLock":
             MessageLookupByLibrary.simpleMessage("Verrouillage automatique"),
         "autoLockFeatureDescription": MessageLookupByLibrary.simpleMessage(
-            "Délai après lequel l\'application se verrouille une fois qu\'elle a été mise en arrière-plan"),
+            "Délai après lequel l\'application se verrouille une fois qu\'elle est en arrière-plan"),
         "autoLogoutMessage": MessageLookupByLibrary.simpleMessage(
             "En raison d\'un problème technique, vous avez été déconnecté. Veuillez nous excuser pour le désagrément."),
         "autoPair":
@@ -473,7 +485,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoPairDesc": MessageLookupByLibrary.simpleMessage(
             "L\'appairage automatique ne fonctionne qu\'avec les appareils qui prennent en charge Chromecast."),
         "available": MessageLookupByLibrary.simpleMessage("Disponible"),
-        "availableStorageSpace": m17,
+        "availableStorageSpace": m18,
         "backedUpFolders":
             MessageLookupByLibrary.simpleMessage("Dossiers sauvegardés"),
         "backup": MessageLookupByLibrary.simpleMessage("Sauvegarde"),
@@ -515,7 +527,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Annuler la récupération"),
         "cancelAccountRecoveryBody": MessageLookupByLibrary.simpleMessage(
             "Êtes-vous sûr de vouloir annuler la récupération ?"),
-        "cancelOtherSubscription": m18,
+        "cancelOtherSubscription": m19,
         "cancelSubscription":
             MessageLookupByLibrary.simpleMessage("Annuler l\'abonnement"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
@@ -539,7 +551,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "changeLogBackupStatusTitle":
             MessageLookupByLibrary.simpleMessage("Statut de la Sauvegarde"),
         "changeLogDiscoverContent": MessageLookupByLibrary.simpleMessage(
-            "Vous cherchez des photos de vos cartes d\'identité, des notes ou même des memes? Allez dans l\'onglet de recherche et découvrez Découverte. Sur la base de notre recherche sémantique, vous trouverez des photos qui pourraient être importantes pour vous.\\n\\nUniquement disponible si vous avez activé l\'apprentissage automatique."),
+            "Vous cherchez des photos de vos papiers d\'identité, des notes ou même des \"memes\" ? Rendez-vous dans l\'onglet de recherche et explorez la fonction Découverte. Grâce à notre recherche sémantique vous trouverez des photos qui pourraient être importantes pour vous.\\n\\nDisponible uniquement si vous avez activé l\'apprentissage automatique."),
         "changeLogDiscoverTitle":
             MessageLookupByLibrary.simpleMessage("Découverte"),
         "changeLogMagicSearchImprovementContent":
@@ -559,17 +571,17 @@ class MessageLookup extends MessageLookupByLibrary {
         "checkForUpdates":
             MessageLookupByLibrary.simpleMessage("Vérifier les mises à jour"),
         "checkInboxAndSpamFolder": MessageLookupByLibrary.simpleMessage(
-            "Veuillez consulter votre boîte de réception (ainsi que les indésirables) pour compléter la vérification"),
+            "Consultez votre boîte de réception (et les indésirables) pour finaliser la vérification"),
         "checkStatus":
             MessageLookupByLibrary.simpleMessage("Vérifier le statut"),
         "checking": MessageLookupByLibrary.simpleMessage("Vérification..."),
         "checkingModels":
             MessageLookupByLibrary.simpleMessage("Vérification des modèles..."),
         "claimFreeStorage":
-            MessageLookupByLibrary.simpleMessage("Stockage gratuit obtenu"),
+            MessageLookupByLibrary.simpleMessage("Obtenez du stockage gratuit"),
         "claimMore": MessageLookupByLibrary.simpleMessage("Réclamez plus !"),
         "claimed": MessageLookupByLibrary.simpleMessage("Obtenu"),
-        "claimedStorageSoFar": m19,
+        "claimedStorageSoFar": m20,
         "cleanUncategorized": MessageLookupByLibrary.simpleMessage(
             "Effacer les éléments non classés"),
         "cleanUncategorizedDescription": MessageLookupByLibrary.simpleMessage(
@@ -600,12 +612,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Créez un lien pour permettre aux personnes d\'ajouter et de voir des photos dans votre album partagé sans avoir besoin d\'une application Ente ou d\'un compte. Idéal pour récupérer des photos d\'événement."),
         "collaborativeLink":
             MessageLookupByLibrary.simpleMessage("Lien collaboratif"),
-        "collaborativeLinkCreatedFor": m20,
+        "collaborativeLinkCreatedFor": m21,
         "collaborator": MessageLookupByLibrary.simpleMessage("Collaborateur"),
         "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Les collaborateurs peuvent ajouter des photos et des vidéos à l\'album partagé."),
-        "collaboratorsSuccessfullyAdded": m21,
+        "collaboratorsSuccessfullyAdded": m22,
         "collageLayout": MessageLookupByLibrary.simpleMessage("Disposition"),
         "collageSaved": MessageLookupByLibrary.simpleMessage(
             "Collage sauvegardé dans la galerie"),
@@ -623,7 +635,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Voulez-vous vraiment désactiver l\'authentification à deux facteurs ?"),
         "confirmAccountDeletion": MessageLookupByLibrary.simpleMessage(
             "Confirmer la suppression du compte"),
-        "confirmAddingTrustedContact": m22,
+        "confirmAddingTrustedContact": m23,
         "confirmDeletePrompt": MessageLookupByLibrary.simpleMessage(
             "Oui, je veux supprimer définitivement ce compte et ses données dans toutes les applications."),
         "confirmPassword":
@@ -636,10 +648,10 @@ class MessageLookup extends MessageLookupByLibrary {
             "Confirmer la clé de récupération"),
         "connectToDevice":
             MessageLookupByLibrary.simpleMessage("Connexion à l\'appareil"),
-        "contactFamilyAdmin": m23,
+        "contactFamilyAdmin": m24,
         "contactSupport":
             MessageLookupByLibrary.simpleMessage("Contacter l\'assistance"),
-        "contactToManageSubscription": m24,
+        "contactToManageSubscription": m25,
         "contacts": MessageLookupByLibrary.simpleMessage("Contacts"),
         "contents": MessageLookupByLibrary.simpleMessage("Contenus"),
         "continueLabel": MessageLookupByLibrary.simpleMessage("Continuer"),
@@ -648,7 +660,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "convertToAlbum":
             MessageLookupByLibrary.simpleMessage("Convertir en album"),
         "copyEmailAddress":
-            MessageLookupByLibrary.simpleMessage("Copier l’adresse e-mail"),
+            MessageLookupByLibrary.simpleMessage("Copier l’adresse email"),
         "copyLink": MessageLookupByLibrary.simpleMessage("Copier le lien"),
         "copypasteThisCodentoYourAuthenticatorApp":
             MessageLookupByLibrary.simpleMessage(
@@ -661,7 +673,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Impossible de mettre à jour l’abonnement"),
         "count": MessageLookupByLibrary.simpleMessage("Total"),
         "crashReporting":
-            MessageLookupByLibrary.simpleMessage("Rapports d\'erreurs"),
+            MessageLookupByLibrary.simpleMessage("Rapport d\'erreur"),
         "create": MessageLookupByLibrary.simpleMessage("Créer"),
         "createAccount":
             MessageLookupByLibrary.simpleMessage("Créer un compte"),
@@ -687,7 +699,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "currentlyRunning":
             MessageLookupByLibrary.simpleMessage("en cours d\'exécution"),
         "custom": MessageLookupByLibrary.simpleMessage("Personnaliser"),
-        "customEndpoint": m25,
+        "customEndpoint": m26,
         "darkTheme": MessageLookupByLibrary.simpleMessage("Sombre"),
         "dayToday": MessageLookupByLibrary.simpleMessage("Aujourd\'hui"),
         "dayYesterday": MessageLookupByLibrary.simpleMessage("Hier"),
@@ -728,12 +740,12 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Supprimer de l\'appareil"),
         "deleteFromEnte":
             MessageLookupByLibrary.simpleMessage("Supprimer de Ente"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deleteLocation":
             MessageLookupByLibrary.simpleMessage("Supprimer la localisation"),
         "deletePhotos":
             MessageLookupByLibrary.simpleMessage("Supprimer des photos"),
-        "deleteProgress": m27,
+        "deleteProgress": m28,
         "deleteReason1": MessageLookupByLibrary.simpleMessage(
             "Il manque une fonction clé dont j\'ai besoin"),
         "deleteReason2": MessageLookupByLibrary.simpleMessage(
@@ -761,10 +773,10 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Saisissez le code"),
         "deviceFilesAutoUploading": MessageLookupByLibrary.simpleMessage(
             "Les fichiers ajoutés à cet album seront automatiquement téléchargés sur Ente."),
-        "deviceLock":
-            MessageLookupByLibrary.simpleMessage("Verrouillage de l\'appareil"),
+        "deviceLock": MessageLookupByLibrary.simpleMessage(
+            "Verrouillage par défaut de l\'appareil"),
         "deviceLockExplanation": MessageLookupByLibrary.simpleMessage(
-            "Désactiver le verrouillage de l\'écran de l\'appareil lorsque ente est au premier plan et il y a une sauvegarde en cours. Ce n\'est normalement pas nécessaire, mais peut aider les gros téléchargements et les premières importations de grandes bibliothèques plus rapidement."),
+            "Désactiver le verrouillage de l\'écran lorsque Ente est au premier plan et qu\'une sauvegarde est en cours. Ce n\'est normalement pas nécessaire mais cela peut faciliter les gros téléchargements et les premières importations de grandes bibliothèques."),
         "deviceNotFound":
             MessageLookupByLibrary.simpleMessage("Appareil non trouvé"),
         "didYouKnow": MessageLookupByLibrary.simpleMessage("Le savais-tu ?"),
@@ -774,12 +786,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Les observateurs peuvent toujours prendre des captures d\'écran ou enregistrer une copie de vos photos en utilisant des outils externes"),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("Veuillez remarquer"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "disableTwofactor": MessageLookupByLibrary.simpleMessage(
-            "Désactiver la double-authentification"),
+            "Désactiver l\'authentification à deux facteurs"),
         "disablingTwofactorAuthentication":
             MessageLookupByLibrary.simpleMessage(
-                "Désactiver la double-authentification..."),
+                "Désactivation de l\'authentification à deux facteurs..."),
         "discord": MessageLookupByLibrary.simpleMessage("Discord"),
         "discover": MessageLookupByLibrary.simpleMessage("Découverte"),
         "discover_babies": MessageLookupByLibrary.simpleMessage("Bébés"),
@@ -811,6 +823,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Voulez-vous annuler les modifications que vous avez faites ?"),
         "done": MessageLookupByLibrary.simpleMessage("Terminé"),
+        "dontSave": MessageLookupByLibrary.simpleMessage("Ne pas enregistrer"),
         "doubleYourStorage": MessageLookupByLibrary.simpleMessage(
             "Doublez votre espace de stockage"),
         "download": MessageLookupByLibrary.simpleMessage("Télécharger"),
@@ -818,9 +831,9 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Échec du téléchargement"),
         "downloading":
             MessageLookupByLibrary.simpleMessage("Téléchargement en cours..."),
-        "dropSupportEmail": m29,
-        "duplicateFileCountWithStorageSaved": m30,
-        "duplicateItemsGroup": m31,
+        "dropSupportEmail": m30,
+        "duplicateFileCountWithStorageSaved": m31,
+        "duplicateItemsGroup": m32,
         "edit": MessageLookupByLibrary.simpleMessage("Éditer"),
         "editLocation":
             MessageLookupByLibrary.simpleMessage("Modifier l’emplacement"),
@@ -836,15 +849,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "eligible": MessageLookupByLibrary.simpleMessage("éligible"),
         "email": MessageLookupByLibrary.simpleMessage("E-mail"),
         "emailAlreadyRegistered":
-            MessageLookupByLibrary.simpleMessage("E-mail déjà enregistré."),
-        "emailChangedTo": m32,
-        "emailNoEnteAccount": m33,
+            MessageLookupByLibrary.simpleMessage("Email déjà enregistré."),
+        "emailChangedTo": m33,
+        "emailDoesNotHaveEnteAccount": m34,
+        "emailNoEnteAccount": m35,
         "emailNotRegistered":
-            MessageLookupByLibrary.simpleMessage("E-mail non enregistré."),
+            MessageLookupByLibrary.simpleMessage("Email inconnu."),
         "emailVerificationToggle": MessageLookupByLibrary.simpleMessage(
-            "Vérification de l\'adresse e-mail"),
-        "emailYourLogs":
-            MessageLookupByLibrary.simpleMessage("Envoyez vos logs par e-mail"),
+            "Authentification à deux facteurs par email"),
+        "emailYourLogs": MessageLookupByLibrary.simpleMessage(
+            "Envoyez vos journaux par email"),
         "emergencyContacts":
             MessageLookupByLibrary.simpleMessage("Contacts d\'urgence"),
         "empty": MessageLookupByLibrary.simpleMessage("Vider"),
@@ -852,9 +866,9 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Vider la corbeille ?"),
         "enable": MessageLookupByLibrary.simpleMessage("Activer"),
         "enableMLIndexingDesc": MessageLookupByLibrary.simpleMessage(
-            "Ente prend en charge l\'apprentissage automatique sur l\'appareil pour la reconnaissance faciale, la recherche magique et d\'autres fonctionnalités de recherche avancée"),
+            "Ente prend en charge l\'apprentissage automatique sur l\'appareil pour la reconnaissance des visages, la recherche magique et d\'autres fonctionnalités de recherche avancée"),
         "enableMachineLearningBanner": MessageLookupByLibrary.simpleMessage(
-            "Activer l\'apprentissage automatique pour la recherche magique et la reconnaissance faciale"),
+            "Activer l\'apprentissage automatique pour la reconnaissance des visages et la recherche magique"),
         "enableMaps": MessageLookupByLibrary.simpleMessage("Activer la carte"),
         "enableMapsDesc": MessageLookupByLibrary.simpleMessage(
             "Vos photos seront affichées sur une carte du monde.\n\nCette carte est hébergée par Open Street Map, et les emplacements exacts de vos photos ne sont jamais partagés.\n\nVous pouvez désactiver cette fonction à tout moment dans les Paramètres."),
@@ -874,22 +888,22 @@ class MessageLookup extends MessageLookupByLibrary {
         "entePhotosPerm": MessageLookupByLibrary.simpleMessage(
             "Ente <i>a besoin d\'une autorisation pour</i> préserver vos photos"),
         "enteSubscriptionPitch": MessageLookupByLibrary.simpleMessage(
-            "Ente conserve vos souvenirs, ils sont donc toujours disponibles pour vous, même si vous perdez votre appareil."),
+            "Ente conserve vos souvenirs pour qu\'ils soient toujours disponible, même si vous perdez cet appareil."),
         "enteSubscriptionShareWithFamily": MessageLookupByLibrary.simpleMessage(
             "Vous pouvez également ajouter votre famille à votre forfait."),
         "enterAlbumName":
             MessageLookupByLibrary.simpleMessage("Saisir un nom d\'album"),
         "enterCode": MessageLookupByLibrary.simpleMessage("Entrer le code"),
         "enterCodeDescription": MessageLookupByLibrary.simpleMessage(
-            "Entrez le code fourni par votre ami pour réclamer de l\'espace de stockage gratuit pour vous deux"),
+            "Entrez le code fourni par votre ami·e pour débloquer l\'espace de stockage gratuit"),
         "enterDateOfBirth":
             MessageLookupByLibrary.simpleMessage("Anniversaire (facultatif)"),
-        "enterEmail": MessageLookupByLibrary.simpleMessage("Entrer e-mail"),
+        "enterEmail": MessageLookupByLibrary.simpleMessage("Entrer un email"),
         "enterFileName":
             MessageLookupByLibrary.simpleMessage("Entrez le nom du fichier"),
         "enterName": MessageLookupByLibrary.simpleMessage("Saisir un nom"),
         "enterNewPasswordToEncrypt": MessageLookupByLibrary.simpleMessage(
-            "Saisir un nouveau mot de passe pour l\'utiliser pour chiffrer vos données"),
+            "Saisissez votre nouveau mot de passe qui sera utilisé pour chiffrer vos données"),
         "enterPassword":
             MessageLookupByLibrary.simpleMessage("Saisissez le mot de passe"),
         "enterPasswordToEncrypt": MessageLookupByLibrary.simpleMessage(
@@ -897,8 +911,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "enterPersonName": MessageLookupByLibrary.simpleMessage(
             "Entrez le nom d\'une personne"),
         "enterPin": MessageLookupByLibrary.simpleMessage("Saisir le code PIN"),
-        "enterReferralCode": MessageLookupByLibrary.simpleMessage(
-            "Entrez le code de parrainage"),
+        "enterReferralCode":
+            MessageLookupByLibrary.simpleMessage("Code de parrainage"),
         "enterThe6digitCodeFromnyourAuthenticatorApp":
             MessageLookupByLibrary.simpleMessage(
                 "Entrez le code à 6 chiffres de\nvotre application d\'authentification"),
@@ -922,12 +936,13 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Exportez vos données"),
         "extraPhotosFound": MessageLookupByLibrary.simpleMessage(
             "Photos supplémentaires trouvées"),
-        "extraPhotosFoundFor": m34,
+        "extraPhotosFoundFor": m36,
         "faceNotClusteredYet": MessageLookupByLibrary.simpleMessage(
             "Ce visage n\'a pas encore été regroupé, veuillez revenir plus tard"),
         "faceRecognition":
             MessageLookupByLibrary.simpleMessage("Reconnaissance faciale"),
         "faces": MessageLookupByLibrary.simpleMessage("Visages"),
+        "failed": MessageLookupByLibrary.simpleMessage("Échec"),
         "failedToApplyCode": MessageLookupByLibrary.simpleMessage(
             "Impossible d\'appliquer le code"),
         "failedToCancel":
@@ -935,7 +950,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "failedToDownloadVideo": MessageLookupByLibrary.simpleMessage(
             "Échec du téléchargement de la vidéo"),
         "failedToFetchActiveSessions": MessageLookupByLibrary.simpleMessage(
-            "Impossible de récupérer les sessions actives"),
+            "Impossible de récupérer les connexions actives"),
         "failedToFetchOriginalForEdit": MessageLookupByLibrary.simpleMessage(
             "Impossible de récupérer l\'original pour l\'édition"),
         "failedToFetchReferralDetails": MessageLookupByLibrary.simpleMessage(
@@ -973,8 +988,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "fileTypes": MessageLookupByLibrary.simpleMessage("Types de fichiers"),
         "fileTypesAndNames":
             MessageLookupByLibrary.simpleMessage("Types et noms de fichiers"),
-        "filesBackedUpFromDevice": m35,
-        "filesBackedUpInAlbum": m36,
+        "filesBackedUpFromDevice": m37,
+        "filesBackedUpInAlbum": m38,
         "filesDeleted":
             MessageLookupByLibrary.simpleMessage("Fichiers supprimés"),
         "filesSavedToGallery": MessageLookupByLibrary.simpleMessage(
@@ -993,25 +1008,25 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Stockage gratuit obtenu"),
         "freeStorageOnReferralSuccess": m4,
         "freeStorageUsable":
-            MessageLookupByLibrary.simpleMessage("Stockage gratuit utilisable"),
+            MessageLookupByLibrary.simpleMessage("Stockage gratuit disponible"),
         "freeTrial": MessageLookupByLibrary.simpleMessage("Essai gratuit"),
-        "freeTrialValidTill": m37,
-        "freeUpAccessPostDelete": m38,
-        "freeUpAmount": m39,
+        "freeTrialValidTill": m39,
+        "freeUpAccessPostDelete": m40,
+        "freeUpAmount": m41,
         "freeUpDeviceSpace": MessageLookupByLibrary.simpleMessage(
             "Libérer de l\'espace sur l\'appareil"),
         "freeUpDeviceSpaceDesc": MessageLookupByLibrary.simpleMessage(
             "Économisez de l\'espace sur votre appareil en effaçant les fichiers qui ont déjà été sauvegardés."),
         "freeUpSpace":
             MessageLookupByLibrary.simpleMessage("Libérer de l\'espace"),
-        "freeUpSpaceSaving": m40,
+        "freeUpSpaceSaving": m42,
         "gallery": MessageLookupByLibrary.simpleMessage("Galerie"),
         "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage(
             "Jusqu\'à 1000 souvenirs affichés dans la galerie"),
         "general": MessageLookupByLibrary.simpleMessage("Général"),
         "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage(
             "Génération des clés de chiffrement..."),
-        "genericProgress": m41,
+        "genericProgress": m43,
         "goToSettings":
             MessageLookupByLibrary.simpleMessage("Allez aux réglages"),
         "googlePlayId":
@@ -1029,7 +1044,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Nous ne suivons pas les installations d\'applications. Il serait utile que vous nous disiez comment vous nous avez trouvés !"),
         "hearUsWhereTitle": MessageLookupByLibrary.simpleMessage(
             "Comment avez-vous entendu parler de Ente? (facultatif)"),
-        "help": MessageLookupByLibrary.simpleMessage("Aide"),
+        "help": MessageLookupByLibrary.simpleMessage("Documentation"),
         "hidden": MessageLookupByLibrary.simpleMessage("Masqué"),
         "hide": MessageLookupByLibrary.simpleMessage("Masquer"),
         "hideContent":
@@ -1039,14 +1054,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "hideContentDescriptionIos": MessageLookupByLibrary.simpleMessage(
             "Masque le contenu de l\'application dans le sélecteur d\'application"),
         "hideSharedItemsFromHomeGallery": MessageLookupByLibrary.simpleMessage(
-            "Masquer les éléments partagés de la galerie d\'accueil"),
+            "Masquer les éléments partagés avec vous dans la galerie"),
         "hiding": MessageLookupByLibrary.simpleMessage("Masquage en cours..."),
         "hostedAtOsmFrance":
             MessageLookupByLibrary.simpleMessage("Hébergé chez OSM France"),
         "howItWorks":
             MessageLookupByLibrary.simpleMessage("Comment cela fonctionne"),
         "howToViewShareeVerificationID": MessageLookupByLibrary.simpleMessage(
-            "Demandez-leur d\'appuyer longuement sur leur adresse e-mail sur l\'écran des paramètres et de vérifier que les identifiants des deux appareils correspondent."),
+            "Demandez-leur d\'appuyer longuement sur leur adresse email dans l\'écran des paramètres pour vérifier que les identifiants des deux appareils correspondent."),
         "iOSGoToSettingsDescription": MessageLookupByLibrary.simpleMessage(
             "L\'authentification biométrique n\'est pas configurée sur votre appareil. Veuillez activer Touch ID ou Face ID sur votre téléphone."),
         "iOSLockOut": MessageLookupByLibrary.simpleMessage(
@@ -1075,6 +1090,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Éléments indexés"),
         "indexingIsPaused": MessageLookupByLibrary.simpleMessage(
             "L\'indexation est en pause. Elle reprendra automatiquement lorsque l\'appareil sera prêt."),
+        "ineligible": MessageLookupByLibrary.simpleMessage("Non compatible"),
         "info": MessageLookupByLibrary.simpleMessage("Info"),
         "insecureDevice":
             MessageLookupByLibrary.simpleMessage("Appareil non sécurisé"),
@@ -1093,13 +1109,13 @@ class MessageLookup extends MessageLookupByLibrary {
         "inviteToEnte":
             MessageLookupByLibrary.simpleMessage("Inviter à rejoindre Ente"),
         "inviteYourFriends":
-            MessageLookupByLibrary.simpleMessage("Invitez vos ami(e)s"),
-        "inviteYourFriendsToEnte":
-            MessageLookupByLibrary.simpleMessage("Invitez vos amis sur Ente"),
+            MessageLookupByLibrary.simpleMessage("Parrainez vos ami·e·s"),
+        "inviteYourFriendsToEnte": MessageLookupByLibrary.simpleMessage(
+            "Invitez vos ami·e·s sur Ente"),
         "itLooksLikeSomethingWentWrongPleaseRetryAfterSome":
             MessageLookupByLibrary.simpleMessage(
                 "Il semble qu\'une erreur s\'est produite. Veuillez réessayer après un certain temps. Si l\'erreur persiste, veuillez contacter notre équipe d\'assistance."),
-        "itemCount": m42,
+        "itemCount": m44,
         "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion":
             MessageLookupByLibrary.simpleMessage(
                 "Les éléments montrent le nombre de jours restants avant la suppression définitive"),
@@ -1107,6 +1123,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Les éléments sélectionnés seront supprimés de cet album"),
         "join": MessageLookupByLibrary.simpleMessage("Rejoindre"),
         "joinAlbum": MessageLookupByLibrary.simpleMessage("Rejoindre l\'album"),
+        "joinAlbumConfirmationDialogBody": MessageLookupByLibrary.simpleMessage(
+            "Rejoindre un album rendra votre e-mail visible à ses participants."),
         "joinAlbumSubtext": MessageLookupByLibrary.simpleMessage(
             "pour afficher et ajouter vos photos"),
         "joinAlbumSubtextViewer": MessageLookupByLibrary.simpleMessage(
@@ -1131,25 +1149,34 @@ class MessageLookup extends MessageLookupByLibrary {
         "legacy": MessageLookupByLibrary.simpleMessage("Héritage"),
         "legacyAccounts":
             MessageLookupByLibrary.simpleMessage("Comptes hérités"),
-        "legacyInvite": m43,
+        "legacyInvite": m45,
         "legacyPageDesc": MessageLookupByLibrary.simpleMessage(
             "L\'héritage permet aux contacts de confiance d\'accéder à votre compte en votre absence."),
         "legacyPageDesc2": MessageLookupByLibrary.simpleMessage(
-            "Les contacts de confiance peuvent initier la récupération du compte et, s\'ils ne sont pas bloqués dans les 30 jours qui suivent, peuvent réinitialiser votre mot de passe et accéder à votre compte."),
+            "Ces contacts peuvent initier la récupération du compte et, s\'ils ne sont pas bloqués dans les 30 jours qui suivent, peuvent réinitialiser votre mot de passe et accéder à votre compte."),
         "light": MessageLookupByLibrary.simpleMessage("Clair"),
         "lightTheme": MessageLookupByLibrary.simpleMessage("Clair"),
+        "link": MessageLookupByLibrary.simpleMessage("Lier"),
         "linkCopiedToClipboard": MessageLookupByLibrary.simpleMessage(
             "Lien copié dans le presse-papiers"),
         "linkDeviceLimit":
             MessageLookupByLibrary.simpleMessage("Limite d\'appareil"),
+        "linkEmail": MessageLookupByLibrary.simpleMessage("Lier l\'email"),
+        "linkEmailToContactBannerCaption":
+            MessageLookupByLibrary.simpleMessage("pour un partage plus rapide"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("Activé"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("Expiré"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry":
             MessageLookupByLibrary.simpleMessage("Expiration du lien"),
         "linkHasExpired":
             MessageLookupByLibrary.simpleMessage("Le lien a expiré"),
         "linkNeverExpires": MessageLookupByLibrary.simpleMessage("Jamais"),
+        "linkPerson": MessageLookupByLibrary.simpleMessage("Lier la personne"),
+        "linkPersonCaption": MessageLookupByLibrary.simpleMessage(
+            "pour une meilleure expérience de partage"),
+        "linkPersonToEmail": m47,
+        "linkPersonToEmailConfirmation": m48,
         "livePhotos": MessageLookupByLibrary.simpleMessage("Photos en direct"),
         "loadMessage1": MessageLookupByLibrary.simpleMessage(
             "Vous pouvez partager votre abonnement avec votre famille"),
@@ -1204,10 +1231,10 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Se connecter avec TOTP"),
         "logout": MessageLookupByLibrary.simpleMessage("Déconnexion"),
         "logsDialogBody": MessageLookupByLibrary.simpleMessage(
-            "Cela enverra des logs pour nous aider à déboguer votre problème. Veuillez noter que les noms de fichiers seront inclus pour aider à suivre les problèmes avec des fichiers spécifiques."),
+            "Les journaux seront envoyés pour nous aider à déboguer votre problème. Les noms de fichiers seront inclus pour aider à identifier les problèmes."),
         "longPressAnEmailToVerifyEndToEndEncryption":
             MessageLookupByLibrary.simpleMessage(
-                "Appuyez longuement sur un e-mail pour vérifier le chiffrement de bout en bout."),
+                "Appuyez longuement sur un email pour vérifier le chiffrement de bout en bout."),
         "longpressOnAnItemToViewInFullscreen":
             MessageLookupByLibrary.simpleMessage(
                 "Appuyez longuement sur un élément pour le voir en plein écran"),
@@ -1216,8 +1243,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "loopVideoOn":
             MessageLookupByLibrary.simpleMessage("Vidéo en boucle activée"),
         "lostDevice": MessageLookupByLibrary.simpleMessage("Appareil perdu ?"),
-        "machineLearning":
-            MessageLookupByLibrary.simpleMessage("Apprentissage automatique"),
+        "machineLearning": MessageLookupByLibrary.simpleMessage(
+            "Apprentissage automatique (IA locale)"),
         "magicSearch":
             MessageLookupByLibrary.simpleMessage("Recherche magique"),
         "magicSearchHint": MessageLookupByLibrary.simpleMessage(
@@ -1236,9 +1263,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "manualPairDesc": MessageLookupByLibrary.simpleMessage(
             "L\'appairage avec le code PIN fonctionne avec n\'importe quel écran sur lequel vous souhaitez voir votre album."),
         "map": MessageLookupByLibrary.simpleMessage("Carte"),
-        "maps": MessageLookupByLibrary.simpleMessage("Cartes"),
+        "maps": MessageLookupByLibrary.simpleMessage("Carte"),
         "mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"),
         "matrix": MessageLookupByLibrary.simpleMessage("Matrix"),
+        "me": MessageLookupByLibrary.simpleMessage("Moi"),
         "memoryCount": m5,
         "merchandise": MessageLookupByLibrary.simpleMessage("Boutique"),
         "mergeWithExisting":
@@ -1248,15 +1276,15 @@ class MessageLookup extends MessageLookupByLibrary {
         "mlConsent": MessageLookupByLibrary.simpleMessage(
             "Activer l\'apprentissage automatique"),
         "mlConsentConfirmation": MessageLookupByLibrary.simpleMessage(
-            "Je comprends, et souhaite activer l\'apprentissage automatique"),
+            "Je comprends et je souhaite activer l\'apprentissage automatique"),
         "mlConsentDescription": MessageLookupByLibrary.simpleMessage(
-            "Si vous activez l\'apprentissage automatique, Ente extraira des informations comme la géométrie des visages, incluant les photos partagées avec vous. \nCela se fera sur votre appareil, avec un cryptage de bout-en-bout de toutes les données biométriques générées."),
+            "Si vous activez l\'apprentissage automatique Ente extraira des informations comme la géométrie des visages, y compris dans les photos partagées avec vous. \nCela se fera localement sur votre appareil et avec un chiffrement bout-en-bout de toutes les données biométriques générées."),
         "mlConsentPrivacy": MessageLookupByLibrary.simpleMessage(
             "Veuillez cliquer ici pour plus de détails sur cette fonctionnalité dans notre politique de confidentialité"),
         "mlConsentTitle": MessageLookupByLibrary.simpleMessage(
             "Activer l\'apprentissage automatique ?"),
         "mlIndexingDescription": MessageLookupByLibrary.simpleMessage(
-            "Veuillez noter que l\'apprentissage automatique entraînera une augmentation de l\'utilisation de la bande passante et de la batterie, jusqu\'à ce que tous les éléments soient indexés. \nEnvisagez d\'utiliser l\'application de bureau pour une indexation plus rapide, tous les résultats seront automatiquement synchronisés."),
+            "Veuillez noter que l\'apprentissage automatique entraînera une augmentation de l\'utilisation de la connexion Internet et de la batterie jusqu\'à ce que tous les souvenirs soient indexés. \nVous pouvez utiliser l\'application de bureau Ente pour accélérer cette étape, tous les résultats seront synchronisés."),
         "mobileWebDesktop":
             MessageLookupByLibrary.simpleMessage("Mobile, Web, Ordinateur"),
         "moderateStrength": MessageLookupByLibrary.simpleMessage("Moyen"),
@@ -1270,12 +1298,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "mostRecent": MessageLookupByLibrary.simpleMessage("Les plus récents"),
         "mostRelevant":
             MessageLookupByLibrary.simpleMessage("Les plus pertinents"),
-        "moveItem": m45,
+        "moveItem": m49,
         "moveToAlbum":
             MessageLookupByLibrary.simpleMessage("Déplacer vers l\'album"),
         "moveToHiddenAlbum": MessageLookupByLibrary.simpleMessage(
             "Déplacer vers un album masqué"),
-        "movedSuccessfullyTo": m46,
+        "movedSuccessfullyTo": m50,
         "movedToTrash":
             MessageLookupByLibrary.simpleMessage("Déplacé dans la corbeille"),
         "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
@@ -1302,6 +1330,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "noDeviceThatCanBeDeleted": MessageLookupByLibrary.simpleMessage(
             "Vous n\'avez pas de fichiers sur cet appareil qui peuvent être supprimés"),
         "noDuplicates": MessageLookupByLibrary.simpleMessage("✨ Aucun doublon"),
+        "noEnteAccountExclamation":
+            MessageLookupByLibrary.simpleMessage("Aucun compte Ente !"),
         "noExifData":
             MessageLookupByLibrary.simpleMessage("Aucune donnée EXIF"),
         "noFacesFound":
@@ -1326,10 +1356,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "noResults": MessageLookupByLibrary.simpleMessage("Aucun résultat"),
         "noResultsFound":
             MessageLookupByLibrary.simpleMessage("Aucun résultat trouvé"),
-        "noSuggestionsForPerson": m47,
+        "noSuggestionsForPerson": m51,
         "noSystemLockFound":
             MessageLookupByLibrary.simpleMessage("Aucun verrou système trouvé"),
-        "notPersonLabel": m48,
+        "notPersonLabel": m52,
         "nothingSharedWithYouYet": MessageLookupByLibrary.simpleMessage(
             "Rien n\'a encore été partagé avec vous"),
         "nothingToSeeHere": MessageLookupByLibrary.simpleMessage(
@@ -1339,7 +1369,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "onDevice": MessageLookupByLibrary.simpleMessage("Sur votre appareil"),
         "onEnte": MessageLookupByLibrary.simpleMessage(
             "Sur <branding>Ente</branding>"),
-        "onlyFamilyAdminCanChangeCode": m49,
+        "onlyFamilyAdminCanChangeCode": m53,
         "onlyThem": MessageLookupByLibrary.simpleMessage("Seulement eux"),
         "oops": MessageLookupByLibrary.simpleMessage("Oups"),
         "oopsCouldNotSaveEdits": MessageLookupByLibrary.simpleMessage(
@@ -1363,8 +1393,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Ou fusionner avec une personne existante"),
         "orPickAnExistingOne": MessageLookupByLibrary.simpleMessage(
             "Ou sélectionner un email existant"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
+        "orPickFromYourContacts": MessageLookupByLibrary.simpleMessage(
+            "ou choisissez parmi vos contacts"),
         "pair": MessageLookupByLibrary.simpleMessage("Associer"),
         "pairWithPin":
             MessageLookupByLibrary.simpleMessage("Appairer avec le code PIN"),
@@ -1373,14 +1403,15 @@ class MessageLookup extends MessageLookupByLibrary {
         "panorama": MessageLookupByLibrary.simpleMessage("Panorama"),
         "passKeyPendingVerification": MessageLookupByLibrary.simpleMessage(
             "La vérification est toujours en attente"),
-        "passkey": MessageLookupByLibrary.simpleMessage("Code d\'accès"),
+        "passkey": MessageLookupByLibrary.simpleMessage(
+            "Authentification à deux facteurs avec une clé de sécurité"),
         "passkeyAuthTitle": MessageLookupByLibrary.simpleMessage(
-            "Vérification du code d\'accès"),
+            "Vérification de la clé de sécurité"),
         "password": MessageLookupByLibrary.simpleMessage("Mot de passe"),
         "passwordChangedSuccessfully": MessageLookupByLibrary.simpleMessage(
             "Le mot de passe a été modifié"),
-        "passwordLock":
-            MessageLookupByLibrary.simpleMessage("Mot de passe verrou"),
+        "passwordLock": MessageLookupByLibrary.simpleMessage(
+            "Verrouillage par mot de passe"),
         "passwordStrength": m0,
         "passwordStrengthInfo": MessageLookupByLibrary.simpleMessage(
             "La force du mot de passe est calculée en tenant compte de la longueur du mot de passe, des caractères utilisés et du fait que le mot de passe figure ou non parmi les 10 000 mots de passe les plus utilisés"),
@@ -1392,14 +1423,14 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Échec du paiement"),
         "paymentFailedMessage": MessageLookupByLibrary.simpleMessage(
             "Malheureusement votre paiement a échoué. Veuillez contacter le support et nous vous aiderons !"),
-        "paymentFailedTalkToProvider": m50,
+        "paymentFailedTalkToProvider": m54,
         "pendingItems":
             MessageLookupByLibrary.simpleMessage("Éléments en attente"),
         "pendingSync":
             MessageLookupByLibrary.simpleMessage("Synchronisation en attente"),
         "people": MessageLookupByLibrary.simpleMessage("Personnes"),
         "peopleUsingYourCode": MessageLookupByLibrary.simpleMessage(
-            "Personnes utilisant votre code"),
+            "Filleul·e·s utilisant votre code"),
         "permDeleteWarning": MessageLookupByLibrary.simpleMessage(
             "Tous les éléments de la corbeille seront définitivement supprimés\n\nCette action ne peut pas être annulée"),
         "permanentlyDelete":
@@ -1417,15 +1448,18 @@ class MessageLookup extends MessageLookupByLibrary {
         "photosAddedByYouWillBeRemovedFromTheAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Les photos ajoutées par vous seront retirées de l\'album"),
-        "photosCount": m51,
+        "photosCount": m55,
         "pickCenterPoint": MessageLookupByLibrary.simpleMessage(
             "Sélectionner le point central"),
         "pinAlbum": MessageLookupByLibrary.simpleMessage("Épingler l\'album"),
         "pinLock":
-            MessageLookupByLibrary.simpleMessage("Verrouillage du code PIN"),
+            MessageLookupByLibrary.simpleMessage("Verrouillage par code PIN"),
         "playOnTv":
             MessageLookupByLibrary.simpleMessage("Lire l\'album sur la TV"),
-        "playStoreFreeTrialValidTill": m52,
+        "playOriginal":
+            MessageLookupByLibrary.simpleMessage("Lire l\'original"),
+        "playStoreFreeTrialValidTill": m56,
+        "playStream": MessageLookupByLibrary.simpleMessage("Lire le stream"),
         "playstoreSubscription":
             MessageLookupByLibrary.simpleMessage("Abonnement au PlayStore"),
         "pleaseCheckYourInternetConnectionAndTryAgain":
@@ -1437,14 +1471,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseContactSupportIfTheProblemPersists":
             MessageLookupByLibrary.simpleMessage(
                 "Merci de contacter l\'assistance si cette erreur persiste"),
-        "pleaseEmailUsAt": m53,
+        "pleaseEmailUsAt": m57,
         "pleaseGrantPermissions": MessageLookupByLibrary.simpleMessage(
             "Veuillez accorder la permission"),
         "pleaseLoginAgain":
             MessageLookupByLibrary.simpleMessage("Veuillez vous reconnecter"),
         "pleaseSelectQuickLinksToRemove": MessageLookupByLibrary.simpleMessage(
             "Veuillez sélectionner les liens rapides à supprimer"),
-        "pleaseSendTheLogsTo": m54,
+        "pleaseSendTheLogsTo": m58,
         "pleaseTryAgain":
             MessageLookupByLibrary.simpleMessage("Veuillez réessayer"),
         "pleaseVerifyTheCodeYouHaveEntered":
@@ -1464,26 +1498,37 @@ class MessageLookup extends MessageLookupByLibrary {
             "Appuyez et maintenez enfoncé pour lire la vidéo"),
         "pressAndHoldToPlayVideoDetailed": MessageLookupByLibrary.simpleMessage(
             "Maintenez appuyé sur l\'image pour lire la vidéo"),
-        "privacy": MessageLookupByLibrary.simpleMessage("Confidentialité"),
+        "privacy": MessageLookupByLibrary.simpleMessage(
+            "Politique de confidentialité"),
         "privacyPolicyTitle": MessageLookupByLibrary.simpleMessage(
             "Politique de Confidentialité"),
         "privateBackups":
             MessageLookupByLibrary.simpleMessage("Sauvegardes privées"),
         "privateSharing": MessageLookupByLibrary.simpleMessage("Partage privé"),
         "proceed": MessageLookupByLibrary.simpleMessage("Procéder"),
-        "processed": MessageLookupByLibrary.simpleMessage("Traité"),
-        "processingImport": m55,
+        "processed": MessageLookupByLibrary.simpleMessage("Appris"),
+        "processing":
+            MessageLookupByLibrary.simpleMessage("Traitement en cours"),
+        "processingImport": m59,
+        "processingVideos":
+            MessageLookupByLibrary.simpleMessage("Traitement des vidéos"),
         "publicLinkCreated":
             MessageLookupByLibrary.simpleMessage("Lien public créé"),
         "publicLinkEnabled":
             MessageLookupByLibrary.simpleMessage("Lien public activé"),
+        "queued": MessageLookupByLibrary.simpleMessage("En file d\'attente"),
         "quickLinks": MessageLookupByLibrary.simpleMessage("Liens rapides"),
         "radius": MessageLookupByLibrary.simpleMessage("Rayon"),
         "raiseTicket": MessageLookupByLibrary.simpleMessage("Créer un ticket"),
         "rateTheApp":
             MessageLookupByLibrary.simpleMessage("Évaluer l\'application"),
         "rateUs": MessageLookupByLibrary.simpleMessage("Évaluez-nous"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
+        "reassignMe":
+            MessageLookupByLibrary.simpleMessage("Réassigner \"Moi\""),
+        "reassignedToName": m61,
+        "reassigningLoading":
+            MessageLookupByLibrary.simpleMessage("Réassignation..."),
         "recover": MessageLookupByLibrary.simpleMessage("Récupérer"),
         "recoverAccount":
             MessageLookupByLibrary.simpleMessage("Récupérer un compte"),
@@ -1492,26 +1537,26 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Récupérer un compte"),
         "recoveryInitiated":
             MessageLookupByLibrary.simpleMessage("Récupération initiée"),
-        "recoveryInitiatedDesc": m57,
+        "recoveryInitiatedDesc": m62,
         "recoveryKey": MessageLookupByLibrary.simpleMessage("Clé de secours"),
         "recoveryKeyCopiedToClipboard": MessageLookupByLibrary.simpleMessage(
             "Clé de secours copiée dans le presse-papiers"),
         "recoveryKeyOnForgotPassword": MessageLookupByLibrary.simpleMessage(
             "Si vous oubliez votre mot de passe, la seule façon de récupérer vos données sera grâce à cette clé."),
         "recoveryKeySaveDescription": MessageLookupByLibrary.simpleMessage(
-            "Nous ne stockons pas cette clé, veuillez garder cette clé de 24 mots dans un endroit sûr."),
+            "Nous ne la stockons pas, veuillez la conserver en lieu endroit sûr."),
         "recoveryKeySuccessBody": MessageLookupByLibrary.simpleMessage(
             "Génial ! Votre clé de récupération est valide. Merci de votre vérification.\n\nN\'oubliez pas de garder votre clé de récupération sauvegardée."),
         "recoveryKeyVerified": MessageLookupByLibrary.simpleMessage(
             "Clé de récupération vérifiée"),
         "recoveryKeyVerifyReason": MessageLookupByLibrary.simpleMessage(
             "Votre clé de récupération est la seule façon de récupérer vos photos si vous oubliez votre mot de passe. Vous pouvez trouver votre clé de récupération dans Paramètres > Compte.\n\nVeuillez saisir votre clé de récupération ici pour vous assurer de l\'avoir enregistré correctement."),
-        "recoveryReady": m58,
+        "recoveryReady": m63,
         "recoverySuccessful":
             MessageLookupByLibrary.simpleMessage("Restauration réussie !"),
         "recoveryWarning": MessageLookupByLibrary.simpleMessage(
             "Un contact de confiance tente d\'accéder à votre compte"),
-        "recoveryWarningBody": m59,
+        "recoveryWarningBody": m64,
         "recreatePasswordBody": MessageLookupByLibrary.simpleMessage(
             "L\'appareil actuel n\'est pas assez puissant pour vérifier votre mot de passe, mais nous pouvons le régénérer d\'une manière qui fonctionne avec tous les appareils.\n\nVeuillez vous connecter à l\'aide de votre clé de secours et régénérer votre mot de passe (vous pouvez réutiliser le même si vous le souhaitez)."),
         "recreatePasswordTitle":
@@ -1522,12 +1567,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "reenterPin":
             MessageLookupByLibrary.simpleMessage("Ressaisir le code PIN"),
         "referFriendsAnd2xYourPlan": MessageLookupByLibrary.simpleMessage(
-            "Parrainez des amis et doublez votre abonnement"),
+            "Parrainez vos ami·e·s et doublez votre stockage"),
         "referralStep1": MessageLookupByLibrary.simpleMessage(
-            "1. Donnez ce code à vos amis"),
+            "1. Donnez ce code à vos ami·e·s"),
         "referralStep2": MessageLookupByLibrary.simpleMessage(
-            "2. Ils s\'inscrivent à une offre payante"),
-        "referralStep3": m60,
+            "2. Ils souscrivent à une offre payante"),
+        "referralStep3": m65,
         "referrals": MessageLookupByLibrary.simpleMessage("Parrainages"),
         "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage(
             "Les recommandations sont actuellement en pause"),
@@ -1559,7 +1604,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "removeLink": MessageLookupByLibrary.simpleMessage("Supprimer le lien"),
         "removeParticipant":
             MessageLookupByLibrary.simpleMessage("Supprimer le participant"),
-        "removeParticipantBody": m61,
+        "removeParticipantBody": m66,
         "removePersonLabel": MessageLookupByLibrary.simpleMessage(
             "Supprimer le libellé d\'une personne"),
         "removePublicLink":
@@ -1581,11 +1626,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Renommer le fichier"),
         "renewSubscription":
             MessageLookupByLibrary.simpleMessage("Renouveler l’abonnement"),
-        "renewsOn": m62,
-        "reportABug": MessageLookupByLibrary.simpleMessage("Signaler un bug"),
-        "reportBug": MessageLookupByLibrary.simpleMessage("Signaler un bug"),
+        "renewsOn": m67,
+        "reportABug": MessageLookupByLibrary.simpleMessage("Signaler un bogue"),
+        "reportBug": MessageLookupByLibrary.simpleMessage("Signaler un bogue"),
         "resendEmail":
-            MessageLookupByLibrary.simpleMessage("Renvoyer l\'e-mail"),
+            MessageLookupByLibrary.simpleMessage("Renvoyer l\'email"),
         "resetIgnoredFiles": MessageLookupByLibrary.simpleMessage(
             "Réinitialiser les fichiers ignorés"),
         "resetPasswordTitle": MessageLookupByLibrary.simpleMessage(
@@ -1598,8 +1643,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Restaurer vers l\'album"),
         "restoringFiles": MessageLookupByLibrary.simpleMessage(
             "Restauration des fichiers..."),
-        "resumableUploads":
-            MessageLookupByLibrary.simpleMessage("Reprise des chargements"),
+        "resumableUploads": MessageLookupByLibrary.simpleMessage(
+            "Reprise automatique des transferts"),
         "retry": MessageLookupByLibrary.simpleMessage("Réessayer"),
         "review": MessageLookupByLibrary.simpleMessage("Suggestions"),
         "reviewDeduplicateItems": MessageLookupByLibrary.simpleMessage(
@@ -1614,6 +1659,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "safelyStored":
             MessageLookupByLibrary.simpleMessage("Stockage sécurisé"),
         "save": MessageLookupByLibrary.simpleMessage("Sauvegarder"),
+        "saveChangesBeforeLeavingQuestion":
+            MessageLookupByLibrary.simpleMessage(
+                "Enregistrer les modifications avant de quitter ?"),
         "saveCollage":
             MessageLookupByLibrary.simpleMessage("Enregistrer le collage"),
         "saveCopy":
@@ -1660,11 +1708,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "searchLocationEmptySection": MessageLookupByLibrary.simpleMessage(
             "Grouper les photos qui sont prises dans un certain angle d\'une photo"),
         "searchPeopleEmptySection": MessageLookupByLibrary.simpleMessage(
-            "Invitez des personnes, et vous verrez ici toutes les photos qu\'elles partagent"),
+            "Invitez quelqu\'un·e et vous verrez ici toutes les photos partagées"),
         "searchPersonsEmptySection": MessageLookupByLibrary.simpleMessage(
             "Les personnes seront affichées ici une fois le traitement terminé"),
-        "searchResultCount": m63,
-        "searchSectionsLengthMismatch": m64,
+        "searchResultCount": m68,
+        "searchSectionsLengthMismatch": m69,
         "security": MessageLookupByLibrary.simpleMessage("Sécurité"),
         "seePublicAlbumLinksInApp": MessageLookupByLibrary.simpleMessage(
             "Ouvrir les liens des albums publics dans l\'application"),
@@ -1678,8 +1726,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "selectAllShort": MessageLookupByLibrary.simpleMessage("Tout"),
         "selectCoverPhoto": MessageLookupByLibrary.simpleMessage(
             "Sélectionnez la photo de couverture"),
-        "selectFoldersForBackup": MessageLookupByLibrary.simpleMessage(
-            "Sélectionnez les dossiers à sauvegarder"),
+        "selectFoldersForBackup":
+            MessageLookupByLibrary.simpleMessage("Dossiers à sauvegarder"),
         "selectItemsToAdd": MessageLookupByLibrary.simpleMessage(
             "Sélectionner les éléments à ajouter"),
         "selectLanguage":
@@ -1688,20 +1736,24 @@ class MessageLookup extends MessageLookupByLibrary {
             "Sélectionnez l\'application mail"),
         "selectMorePhotos":
             MessageLookupByLibrary.simpleMessage("Sélectionner plus de photos"),
+        "selectPersonToLink": MessageLookupByLibrary.simpleMessage(
+            "Sélectionnez la personne à associer"),
         "selectReason":
             MessageLookupByLibrary.simpleMessage("Sélectionnez une raison"),
+        "selectYourFace":
+            MessageLookupByLibrary.simpleMessage("Sélectionnez votre visage"),
         "selectYourPlan":
             MessageLookupByLibrary.simpleMessage("Sélectionner votre offre"),
         "selectedFilesAreNotOnEnte": MessageLookupByLibrary.simpleMessage(
             "Les fichiers sélectionnés ne sont pas sur Ente"),
         "selectedFoldersWillBeEncryptedAndBackedUp":
             MessageLookupByLibrary.simpleMessage(
-                "Les dossiers sélectionnés seront cryptés et sauvegardés"),
+                "Les dossiers sélectionnés seront chiffrés et sauvegardés"),
         "selectedItemsWillBeDeletedFromAllAlbumsAndMoved":
             MessageLookupByLibrary.simpleMessage(
                 "Les éléments sélectionnés seront supprimés de tous les albums et déplacés dans la corbeille."),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "send": MessageLookupByLibrary.simpleMessage("Envoyer"),
         "sendEmail": MessageLookupByLibrary.simpleMessage("Envoyer un e-mail"),
         "sendInvite":
@@ -1735,16 +1787,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "shareAnAlbumNow": MessageLookupByLibrary.simpleMessage(
             "Partagez un album maintenant"),
         "shareLink": MessageLookupByLibrary.simpleMessage("Partager le lien"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage(
             "Partagez uniquement avec les personnes que vous souhaitez"),
         "shareTextConfirmOthersVerificationID": m7,
         "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage(
             "Téléchargez Ente pour pouvoir facilement partager des photos et vidéos en qualité originale\n\nhttps://ente.io"),
-        "shareTextReferralCode": m67,
+        "shareTextReferralCode": m72,
         "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage(
             "Partager avec des utilisateurs non-Ente"),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "shareYourFirstAlbum": MessageLookupByLibrary.simpleMessage(
             "Partagez votre premier album"),
         "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
@@ -1754,8 +1806,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "sharedPhotoNotifications":
             MessageLookupByLibrary.simpleMessage("Nouvelles photos partagées"),
         "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage(
-            "Recevoir des notifications quand quelqu\'un ajoute une photo à un album partagé dont vous faites partie"),
-        "sharedWith": m69,
+            "Recevoir des notifications quand quelqu\'un·e ajoute une photo à un album partagé dont vous faites partie"),
+        "sharedWith": m74,
         "sharedWithMe":
             MessageLookupByLibrary.simpleMessage("Partagés avec moi"),
         "sharedWithYou":
@@ -1773,13 +1825,13 @@ class MessageLookup extends MessageLookupByLibrary {
             "Déconnecter les autres appareils"),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "J\'accepte les <u-terms>conditions d\'utilisation</u-terms> et la <u-policy>politique de confidentialité</u-policy>"),
-        "singleFileDeleteFromDevice": m70,
+        "singleFileDeleteFromDevice": m75,
         "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage(
             "Elle sera supprimée de tous les albums."),
-        "singleFileInBothLocalAndRemote": m71,
-        "singleFileInRemoteOnly": m72,
+        "singleFileInBothLocalAndRemote": m76,
+        "singleFileInRemoteOnly": m77,
         "skip": MessageLookupByLibrary.simpleMessage("Ignorer"),
-        "social": MessageLookupByLibrary.simpleMessage("Réseaux sociaux"),
+        "social": MessageLookupByLibrary.simpleMessage("Retrouvez nous"),
         "someItemsAreInBothEnteAndYourDevice":
             MessageLookupByLibrary.simpleMessage(
                 "Certains éléments sont à la fois sur Ente et votre appareil."),
@@ -1828,10 +1880,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageInGB": m1,
         "storageLimitExceeded":
             MessageLookupByLibrary.simpleMessage("Limite de stockage atteinte"),
-        "storageUsageInfo": m73,
+        "storageUsageInfo": m78,
+        "streamDetails":
+            MessageLookupByLibrary.simpleMessage("Détails du stream"),
         "strongStrength": MessageLookupByLibrary.simpleMessage("Forte"),
-        "subAlreadyLinkedErrMessage": m74,
-        "subWillBeCancelledOn": m75,
+        "subAlreadyLinkedErrMessage": m79,
+        "subWillBeCancelledOn": m80,
         "subscribe": MessageLookupByLibrary.simpleMessage("S\'abonner"),
         "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage(
             "Vous avez besoin d\'un abonnement payant actif pour activer le partage."),
@@ -1845,10 +1899,10 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Désarchivé avec succès"),
         "successfullyUnhid":
             MessageLookupByLibrary.simpleMessage("Masquage réussi"),
-        "suggestFeatures": MessageLookupByLibrary.simpleMessage(
-            "Suggérer des fonctionnalités"),
+        "suggestFeatures":
+            MessageLookupByLibrary.simpleMessage("Suggérer une fonctionnalité"),
         "support": MessageLookupByLibrary.simpleMessage("Support"),
-        "syncProgress": m76,
+        "syncProgress": m81,
         "syncStopped":
             MessageLookupByLibrary.simpleMessage("Synchronisation arrêtée ?"),
         "syncing": MessageLookupByLibrary.simpleMessage(
@@ -1861,7 +1915,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Appuyer pour déverrouiller"),
         "tapToUpload":
             MessageLookupByLibrary.simpleMessage("Appuyer pour envoyer"),
-        "tapToUploadIsIgnoredDue": m77,
+        "tapToUploadIsIgnoredDue": m82,
         "tempErrorContactSupportIfPersists": MessageLookupByLibrary.simpleMessage(
             "Il semble qu\'une erreur s\'est produite. Veuillez réessayer après un certain temps. Si l\'erreur persiste, veuillez contacter notre équipe d\'assistance."),
         "terminate": MessageLookupByLibrary.simpleMessage("Se déconnecter"),
@@ -1901,7 +1955,9 @@ class MessageLookup extends MessageLookupByLibrary {
             "Cette adresse mail est déjà utilisé"),
         "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage(
             "Cette image n\'a pas de données exif"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsMeExclamation":
+            MessageLookupByLibrary.simpleMessage("C\'est moi !"),
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage(
             "Ceci est votre ID de vérification"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -1914,42 +1970,42 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Ceci supprimera les liens publics de tous les liens rapides sélectionnés."),
         "toEnableAppLockPleaseSetupDevicePasscodeOrScreen":
             MessageLookupByLibrary.simpleMessage(
-                "Pour activer le verrouillage d\'application, veuillez configurer le code d\'accès de l\'appareil ou le verrouillage de l\'écran dans les paramètres de votre système."),
+                "Pour activer le verrouillage de l\'application vous devez configurer le code d\'accès de l\'appareil ou le verrouillage de l\'écran dans les paramètres de votre système."),
         "toHideAPhotoOrVideo": MessageLookupByLibrary.simpleMessage(
             "Pour masquer une photo ou une vidéo:"),
         "toResetVerifyEmail": MessageLookupByLibrary.simpleMessage(
-            "Pour réinitialiser votre mot de passe, veuillez d\'abord vérifier votre e-mail."),
+            "Pour réinitialiser votre mot de passe, vérifiez d\'abord votre email."),
         "todaysLogs": MessageLookupByLibrary.simpleMessage("Journaux du jour"),
         "tooManyIncorrectAttempts": MessageLookupByLibrary.simpleMessage(
             "Trop de tentatives incorrectes"),
         "total": MessageLookupByLibrary.simpleMessage("total"),
         "totalSize": MessageLookupByLibrary.simpleMessage("Taille totale"),
         "trash": MessageLookupByLibrary.simpleMessage("Corbeille"),
-        "trashDaysLeft": m79,
+        "trashDaysLeft": m84,
         "trim": MessageLookupByLibrary.simpleMessage("Recadrer"),
         "trustedContacts":
             MessageLookupByLibrary.simpleMessage("Contacts de confiance"),
-        "trustedInviteBody": m80,
+        "trustedInviteBody": m85,
         "tryAgain": MessageLookupByLibrary.simpleMessage("Réessayer"),
         "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage(
             "Activez la sauvegarde pour charger automatiquement sur Ente les fichiers ajoutés à ce dossier de l\'appareil."),
         "twitter": MessageLookupByLibrary.simpleMessage("Twitter"),
         "twoMonthsFreeOnYearlyPlans": MessageLookupByLibrary.simpleMessage(
             "2 mois gratuits sur les forfaits annuels"),
-        "twofactor":
-            MessageLookupByLibrary.simpleMessage("Double authentification"),
+        "twofactor": MessageLookupByLibrary.simpleMessage(
+            "Authentification à deux facteurs (A2F)"),
         "twofactorAuthenticationHasBeenDisabled":
             MessageLookupByLibrary.simpleMessage(
                 "L\'authentification à deux facteurs a été désactivée"),
         "twofactorAuthenticationPageTitle":
             MessageLookupByLibrary.simpleMessage(
-                "Authentification à deux facteurs"),
+                "Authentification à deux facteurs (A2F)"),
         "twofactorAuthenticationSuccessfullyReset":
             MessageLookupByLibrary.simpleMessage(
                 "L\'authentification à deux facteurs a été réinitialisée avec succès "),
         "twofactorSetup": MessageLookupByLibrary.simpleMessage(
             "Configuration de l\'authentification à deux facteurs"),
-        "typeOfGallerGallerytypeIsNotSupportedForRename": m81,
+        "typeOfGallerGallerytypeIsNotSupportedForRename": m86,
         "unarchive": MessageLookupByLibrary.simpleMessage("Désarchiver"),
         "unarchiveAlbum":
             MessageLookupByLibrary.simpleMessage("Désarchiver l\'album"),
@@ -1977,16 +2033,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "updatingFolderSelection": MessageLookupByLibrary.simpleMessage(
             "Mise à jour de la sélection du dossier..."),
         "upgrade": MessageLookupByLibrary.simpleMessage("Améliorer"),
-        "uploadIsIgnoredDueToIgnorereason": m82,
+        "uploadIsIgnoredDueToIgnorereason": m87,
         "uploadingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
             "Envoi des fichiers vers l\'album..."),
-        "uploadingMultipleMemories": m83,
-        "uploadingSingleMemory":
-            MessageLookupByLibrary.simpleMessage("Sauvegarde 1 souvenir..."),
+        "uploadingMultipleMemories": m88,
+        "uploadingSingleMemory": MessageLookupByLibrary.simpleMessage(
+            "Sauvegarde d\'un souvenir..."),
         "upto50OffUntil4thDec": MessageLookupByLibrary.simpleMessage(
             "Jusqu\'à 50% de réduction, jusqu\'au 4ème déc."),
         "usableReferralStorageInfo": MessageLookupByLibrary.simpleMessage(
-            "Le stockage utilisable est limité par votre offre actuelle. Le stockage excédentaire deviendra automatiquement utilisable lorsque vous mettez à niveau votre offre."),
+            "Le stockage gratuit possible est limité par votre offre actuelle. Vous pouvez au maximum doubler votre espace de stockage gratuitement, le stockage supplémentaire deviendra donc automatiquement utilisable lorsque vous mettrez à niveau votre offre."),
         "useAsCover":
             MessageLookupByLibrary.simpleMessage("Utiliser comme couverture"),
         "useDifferentPlayerInfo": MessageLookupByLibrary.simpleMessage(
@@ -1998,7 +2054,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "useSelectedPhoto": MessageLookupByLibrary.simpleMessage(
             "Utiliser la photo sélectionnée"),
         "usedSpace": MessageLookupByLibrary.simpleMessage("Stockage utilisé"),
-        "validTill": m84,
+        "validTill": m89,
         "verificationFailedPleaseTryAgain":
             MessageLookupByLibrary.simpleMessage(
                 "La vérification a échouée, veuillez réessayer"),
@@ -2006,11 +2062,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("ID de vérification"),
         "verify": MessageLookupByLibrary.simpleMessage("Vérifier"),
         "verifyEmail":
-            MessageLookupByLibrary.simpleMessage("Vérifier l\'e-mail"),
-        "verifyEmailID": m85,
+            MessageLookupByLibrary.simpleMessage("Vérifier l\'email"),
+        "verifyEmailID": m90,
         "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Vérifier"),
         "verifyPasskey":
-            MessageLookupByLibrary.simpleMessage("Vérifier le code d\'accès"),
+            MessageLookupByLibrary.simpleMessage("Vérifier la clé de sécurité"),
         "verifyPassword":
             MessageLookupByLibrary.simpleMessage("Vérifier le mot de passe"),
         "verifying":
@@ -2019,9 +2075,11 @@ class MessageLookup extends MessageLookupByLibrary {
             "Vérification de la clé de récupération..."),
         "videoInfo": MessageLookupByLibrary.simpleMessage("Informations vidéo"),
         "videoSmallCase": MessageLookupByLibrary.simpleMessage("vidéo"),
+        "videoStreaming":
+            MessageLookupByLibrary.simpleMessage("Streaming vidéo"),
         "videos": MessageLookupByLibrary.simpleMessage("Vidéos"),
         "viewActiveSessions": MessageLookupByLibrary.simpleMessage(
-            "Afficher les sessions actives"),
+            "Afficher les connexions actives"),
         "viewAddOnButton": MessageLookupByLibrary.simpleMessage(
             "Afficher les modules complémentaires"),
         "viewAll": MessageLookupByLibrary.simpleMessage("Tout afficher"),
@@ -2036,9 +2094,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "viewRecoveryKey":
             MessageLookupByLibrary.simpleMessage("Voir la clé de récupération"),
         "viewer": MessageLookupByLibrary.simpleMessage("Observateur"),
-        "viewersSuccessfullyAdded": m86,
+        "viewersSuccessfullyAdded": m91,
         "visitWebToManage": MessageLookupByLibrary.simpleMessage(
-            "Veuillez visiter web.ente.io pour gérer votre abonnement"),
+            "Vous pouvez gérer votre abonnement sur web.ente.io"),
         "waitingForVerification": MessageLookupByLibrary.simpleMessage(
             "En attente de vérification..."),
         "waitingForWifi": MessageLookupByLibrary.simpleMessage(
@@ -2057,7 +2115,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Un contact de confiance peut vous aider à récupérer vos données."),
         "yearShort": MessageLookupByLibrary.simpleMessage("an"),
         "yearly": MessageLookupByLibrary.simpleMessage("Annuel"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("Oui"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("Oui, annuler"),
         "yesConvertToViewer": MessageLookupByLibrary.simpleMessage(
@@ -2090,7 +2148,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Vous ne pouvez pas partager avec vous-même"),
         "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage(
             "Vous n\'avez aucun élément archivé."),
-        "youHaveSuccessfullyFreedUp": m88,
+        "youHaveSuccessfullyFreedUp": m93,
         "yourAccountHasBeenDeleted":
             MessageLookupByLibrary.simpleMessage("Votre compte a été supprimé"),
         "yourMap": MessageLookupByLibrary.simpleMessage("Votre carte"),
diff --git a/mobile/lib/generated/intl/messages_gu.dart b/mobile/lib/generated/intl/messages_gu.dart
index 5d87accc44..6c1d7e4d90 100644
--- a/mobile/lib/generated/intl/messages_gu.dart
+++ b/mobile/lib/generated/intl/messages_gu.dart
@@ -21,8 +21,5 @@ class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'gu';
 
   final messages = _notInlinedMessages(_notInlinedMessages);
-  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts")
-      };
+  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{};
 }
diff --git a/mobile/lib/generated/intl/messages_he.dart b/mobile/lib/generated/intl/messages_he.dart
index e65eb92134..052f6c6fc7 100644
--- a/mobile/lib/generated/intl/messages_he.dart
+++ b/mobile/lib/generated/intl/messages_he.dart
@@ -20,113 +20,113 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'he';
 
-  static String m10(count) =>
+  static String m11(count) =>
       "${Intl.plural(count, one: 'הוסף פריט', two: 'הוסף פריטים', many: 'הוסף פריטים', other: 'הוסף פריטים')}";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: 'אין משתתפים', one: '1 משתתף', two: '2 משתתפים', other: '${count} משתתפים')}";
 
-  static String m18(paymentProvider) =>
+  static String m19(paymentProvider) =>
       "אנא בטל את המנוי הקיים מ-${paymentProvider} קודם";
 
   static String m3(user) =>
       "${user} לא יוכל להוסיף עוד תמונות לאלבום זה\n\nהם עדיין יכולו להסיר תמונות קיימות שנוספו על ידיהם";
 
-  static String m19(isFamilyMember, storageAmountInGb) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
       "${Intl.select(isFamilyMember, {
             'true': 'קיבלת ${storageAmountInGb} GB עד כה',
             'false': 'קיבלת ${storageAmountInGb} GB עד כה',
             'other': 'קיבלת ${storageAmountInGb} GB עד כה!',
           })}";
 
-  static String m23(familyAdminEmail) =>
+  static String m24(familyAdminEmail) =>
       "אנא צור קשר עם <green>${familyAdminEmail}</green> על מנת לנהל את המנוי שלך";
 
-  static String m24(provider) =>
+  static String m25(provider) =>
       "אנא צור איתנו קשר ב-support@ente.io על מנת לנהל את המנוי ${provider}.";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: 'מחק ${count} פריט', two: 'מחק ${count} פריטים', other: 'מחק ${count} פריטים')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "מוחק ${currentlyDeleting} / ${totalCount}";
 
-  static String m28(albumName) =>
+  static String m29(albumName) =>
       "זה יסיר את הלינק הפומבי שדרכו ניתן לגשת ל\"${albumName}\".";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "אנא תשלח דוא\"ל ל${supportEmail} מהכתובת דוא\"ל שנרשמת איתה";
 
-  static String m31(count, formattedSize) =>
+  static String m32(count, formattedSize) =>
       "${count} קבצים, כל אחד ${formattedSize}";
 
-  static String m33(email) =>
+  static String m35(email) =>
       "לא נמצא חשבון ente ל-${email}.\n\nשלח להם הזמנה על מנת לשתף תמונות.";
 
   static String m4(storageAmountInGB) =>
       "${storageAmountInGB} GB כל פעם שמישהו נרשם עבור תוכנית בתשלום ומחיל את הקוד שלך";
 
-  static String m37(endDate) => "ניסיון חינם בתוקף עד ל-${endDate}";
+  static String m39(endDate) => "ניסיון חינם בתוקף עד ל-${endDate}";
 
-  static String m42(count) =>
+  static String m44(count) =>
       "${Intl.plural(count, one: '${count} פריט', two: '${count} פריטים', many: '${count} פריטים', other: '${count} פריטים')}";
 
-  static String m44(expiryTime) => "תוקף הקישור יפוג ב-${expiryTime}";
+  static String m46(expiryTime) => "תוקף הקישור יפוג ב-${expiryTime}";
 
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, one: '${formattedCount} זכרון', two: '${formattedCount} זכרונות', many: '${formattedCount} זכרונות', other: '${formattedCount} זכרונות')}";
 
-  static String m45(count) =>
+  static String m49(count) =>
       "${Intl.plural(count, one: 'הזז פריט', two: 'הזז פריטים', many: 'הזז פריטים', other: 'הזז פריטים')}";
 
   static String m0(passwordStrengthValue) =>
       "חוזק הסיסמא: ${passwordStrengthValue}";
 
-  static String m50(providerName) =>
+  static String m54(providerName) =>
       "אנא דבר עם התמיכה של ${providerName} אם אתה חוייבת";
 
-  static String m56(storeName) => "דרג אותנו ב-${storeName}";
+  static String m60(storeName) => "דרג אותנו ב-${storeName}";
 
-  static String m60(storageInGB) => "3. שניכים מקבלים ${storageInGB} GB* בחינם";
+  static String m65(storageInGB) => "3. שניכים מקבלים ${storageInGB} GB* בחינם";
 
-  static String m61(userEmail) =>
+  static String m66(userEmail) =>
       "${userEmail} יוסר מהאלבום המשותף הזה\n\nגם תמונות שנוספו על ידיהם יוסרו מהאלבום";
 
   static String m6(count) => "${count} נבחרו";
 
-  static String m65(count, yourCount) => "${count} נבחרו (${yourCount} שלך)";
+  static String m70(count, yourCount) => "${count} נבחרו (${yourCount} שלך)";
 
-  static String m66(verificationID) =>
+  static String m71(verificationID) =>
       "הנה מזהה האימות שלי: ${verificationID} עבור ente.io.";
 
   static String m7(verificationID) =>
       "היי, תוכל לוודא שזה מזהה האימות שלך של ente.io: ${verificationID}";
 
-  static String m68(numberOfPeople) =>
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: 'שתף עם אנשים ספציפיים', one: 'שותף עם איש 1', two: 'שותף עם 2 אנשים', other: 'שותף עם ${numberOfPeople} אנשים')}";
 
-  static String m69(emailIDs) => "הושתף ע\"י ${emailIDs}";
+  static String m74(emailIDs) => "הושתף ע\"י ${emailIDs}";
 
-  static String m70(fileType) => "${fileType} יימחק מהמכשיר שלך.";
+  static String m75(fileType) => "${fileType} יימחק מהמכשיר שלך.";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} GB";
 
-  static String m75(endDate) => "המנוי שלך יבוטל ב-${endDate}";
+  static String m80(endDate) => "המנוי שלך יבוטל ב-${endDate}";
 
-  static String m76(completed, total) => "${completed}/${total} זכרונות נשמרו";
+  static String m81(completed, total) => "${completed}/${total} זכרונות נשמרו";
 
   static String m8(storageAmountInGB) => "הם גם יקבלו ${storageAmountInGB} GB";
 
-  static String m78(email) => "זה מזהה האימות של ${email}";
+  static String m83(email) => "זה מזהה האימות של ${email}";
 
-  static String m85(email) => "אמת ${email}";
+  static String m90(email) => "אמת ${email}";
 
   static String m2(email) => "שלחנו דוא\"ל ל<green>${email}</green>";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, one: 'לפני ${count} שנה', two: 'לפני ${count} שנים', many: 'לפני ${count} שנים', other: 'לפני ${count} שנים')}";
 
-  static String m88(storageSaved) => "הצלחת לפנות ${storageSaved}!";
+  static String m93(storageSaved) => "הצלחת לפנות ${storageSaved}!";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
@@ -141,7 +141,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "addANewEmail": MessageLookupByLibrary.simpleMessage("הוסף דוא\"ל חדש"),
         "addCollaborator":
             MessageLookupByLibrary.simpleMessage("הוסף משתף פעולה"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocationButton": MessageLookupByLibrary.simpleMessage("הוסף"),
         "addMore": MessageLookupByLibrary.simpleMessage("הוסף עוד"),
         "addPhotos": MessageLookupByLibrary.simpleMessage("הוסף תמונות"),
@@ -158,7 +158,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "after1Week": MessageLookupByLibrary.simpleMessage("אחרי שבוע 1"),
         "after1Year": MessageLookupByLibrary.simpleMessage("אחרי שנה 1"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("בעלים"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumTitle": MessageLookupByLibrary.simpleMessage("כותרת האלבום"),
         "albumUpdated": MessageLookupByLibrary.simpleMessage("האלבום עודכן"),
         "albums": MessageLookupByLibrary.simpleMessage("אלבומים"),
@@ -244,7 +244,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "canOnlyRemoveFilesOwnedByYou": MessageLookupByLibrary.simpleMessage(
             "יכול להסיר רק קבצים שבבעלותך"),
         "cancel": MessageLookupByLibrary.simpleMessage("בטל"),
-        "cancelOtherSubscription": m18,
+        "cancelOtherSubscription": m19,
         "cancelSubscription": MessageLookupByLibrary.simpleMessage("בטל מנוי"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
         "cannotDeleteSharedFiles": MessageLookupByLibrary.simpleMessage(
@@ -262,7 +262,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("תבע מקום אחסון בחינם"),
         "claimMore": MessageLookupByLibrary.simpleMessage("תבע עוד!"),
         "claimed": MessageLookupByLibrary.simpleMessage("נתבע"),
-        "claimedStorageSoFar": m19,
+        "claimedStorageSoFar": m20,
         "click": MessageLookupByLibrary.simpleMessage("• לחץ"),
         "close": MessageLookupByLibrary.simpleMessage("סגור"),
         "clubByCaptureTime":
@@ -302,10 +302,10 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("אמת את מפתח השחזור"),
         "confirmYourRecoveryKey":
             MessageLookupByLibrary.simpleMessage("אמת את מפתח השחזור"),
-        "contactFamilyAdmin": m23,
+        "contactFamilyAdmin": m24,
         "contactSupport":
             MessageLookupByLibrary.simpleMessage("צור קשר עם התמיכה"),
-        "contactToManageSubscription": m24,
+        "contactToManageSubscription": m25,
         "continueLabel": MessageLookupByLibrary.simpleMessage("המשך"),
         "continueOnFreeTrial":
             MessageLookupByLibrary.simpleMessage("המשך עם ניסיון חינמי"),
@@ -363,9 +363,9 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("למחוק אלבומים ריקים?"),
         "deleteFromBoth": MessageLookupByLibrary.simpleMessage("מחק משניהם"),
         "deleteFromDevice": MessageLookupByLibrary.simpleMessage("מחק מהמכשיר"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deletePhotos": MessageLookupByLibrary.simpleMessage("מחק תמונות"),
-        "deleteProgress": m27,
+        "deleteProgress": m28,
         "deleteReason1":
             MessageLookupByLibrary.simpleMessage("חסר מאפיין מרכזי שאני צריך"),
         "deleteReason2": MessageLookupByLibrary.simpleMessage(
@@ -390,7 +390,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "צופים יכולים עדיין לקחת צילומי מסך או לשמור עותק של התמונות שלך בעזרת כלים חיצוניים"),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("שים לב"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "disableTwofactor":
             MessageLookupByLibrary.simpleMessage("השבת דו-גורמי"),
         "discord": MessageLookupByLibrary.simpleMessage("Discord"),
@@ -401,12 +401,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "download": MessageLookupByLibrary.simpleMessage("הורד"),
         "downloadFailed": MessageLookupByLibrary.simpleMessage("ההורדה נכשלה"),
         "downloading": MessageLookupByLibrary.simpleMessage("מוריד..."),
-        "dropSupportEmail": m29,
-        "duplicateItemsGroup": m31,
+        "dropSupportEmail": m30,
+        "duplicateItemsGroup": m32,
         "edit": MessageLookupByLibrary.simpleMessage("ערוך"),
         "eligible": MessageLookupByLibrary.simpleMessage("זכאי"),
         "email": MessageLookupByLibrary.simpleMessage("דוא\"ל"),
-        "emailNoEnteAccount": m33,
+        "emailNoEnteAccount": m35,
         "emailVerificationToggle":
             MessageLookupByLibrary.simpleMessage("אימות מייל"),
         "empty": MessageLookupByLibrary.simpleMessage("ריק"),
@@ -479,7 +479,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "freeStorageUsable":
             MessageLookupByLibrary.simpleMessage("מקום אחסון שמיש"),
         "freeTrial": MessageLookupByLibrary.simpleMessage("ניסיון חינמי"),
-        "freeTrialValidTill": m37,
+        "freeTrialValidTill": m39,
         "freeUpDeviceSpace":
             MessageLookupByLibrary.simpleMessage("פנה אחסון במכשיר"),
         "freeUpSpace": MessageLookupByLibrary.simpleMessage("פנה מקום"),
@@ -517,7 +517,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "invite": MessageLookupByLibrary.simpleMessage("הזמן"),
         "inviteYourFriends":
             MessageLookupByLibrary.simpleMessage("הזמן את חברייך"),
-        "itemCount": m42,
+        "itemCount": m44,
         "itemsWillBeRemovedFromAlbum": MessageLookupByLibrary.simpleMessage(
             "הפריטים שנבחרו יוסרו מהאלבום הזה"),
         "keepPhotos": MessageLookupByLibrary.simpleMessage("השאר תמונות"),
@@ -539,7 +539,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("מגבלת כמות מכשירים"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("מאופשר"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("פג תוקף"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry": MessageLookupByLibrary.simpleMessage("תאריך תפוגה ללינק"),
         "linkHasExpired":
             MessageLookupByLibrary.simpleMessage("הקישור פג תוקף"),
@@ -571,7 +571,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("פלאפון, דפדפן, שולחן עבודה"),
         "moderateStrength": MessageLookupByLibrary.simpleMessage("מתונה"),
         "monthly": MessageLookupByLibrary.simpleMessage("חודשי"),
-        "moveItem": m45,
+        "moveItem": m49,
         "moveToAlbum": MessageLookupByLibrary.simpleMessage("הזז לאלבום"),
         "movedToTrash": MessageLookupByLibrary.simpleMessage("הועבר לאשפה"),
         "movingFilesToAlbum":
@@ -606,8 +606,6 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("אופציונלי, קצר ככל שתרצה..."),
         "orPickAnExistingOne":
             MessageLookupByLibrary.simpleMessage("או בחר באחד קיים"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "password": MessageLookupByLibrary.simpleMessage("סיסמא"),
         "passwordChangedSuccessfully":
             MessageLookupByLibrary.simpleMessage("הססמה הוחלפה בהצלחה"),
@@ -617,7 +615,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "אנחנו לא שומרים את הסיסמא הזו, לכן אם אתה שוכח אותה, <underline>אנחנו לא יכולים לפענח את המידע שלך</underline>"),
         "paymentDetails": MessageLookupByLibrary.simpleMessage("פרטי תשלום"),
         "paymentFailed": MessageLookupByLibrary.simpleMessage("התשלום נכשל"),
-        "paymentFailedTalkToProvider": m50,
+        "paymentFailedTalkToProvider": m54,
         "peopleUsingYourCode":
             MessageLookupByLibrary.simpleMessage("אנשים משתמשים בקוד שלך"),
         "permanentlyDelete":
@@ -659,7 +657,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "raiseTicket": MessageLookupByLibrary.simpleMessage("צור ticket"),
         "rateTheApp": MessageLookupByLibrary.simpleMessage("דרג את האפליקציה"),
         "rateUs": MessageLookupByLibrary.simpleMessage("דרג אותנו"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
         "recover": MessageLookupByLibrary.simpleMessage("שחזר"),
         "recoverAccount": MessageLookupByLibrary.simpleMessage("שחזר חשבון"),
         "recoverButton": MessageLookupByLibrary.simpleMessage("שחזר"),
@@ -685,7 +683,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "1. תמסור את הקוד הזה לחברייך"),
         "referralStep2": MessageLookupByLibrary.simpleMessage(
             "2. הם נרשמים עבור תוכנית בתשלום"),
-        "referralStep3": m60,
+        "referralStep3": m65,
         "referrals": MessageLookupByLibrary.simpleMessage("הפניות"),
         "referralsAreCurrentlyPaused":
             MessageLookupByLibrary.simpleMessage("הפניות כרגע מושהות"),
@@ -701,7 +699,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("הסר מהאלבום?"),
         "removeLink": MessageLookupByLibrary.simpleMessage("הסרת קישור"),
         "removeParticipant": MessageLookupByLibrary.simpleMessage("הסר משתתף"),
-        "removeParticipantBody": m61,
+        "removeParticipantBody": m66,
         "removePublicLink":
             MessageLookupByLibrary.simpleMessage("הסר לינק ציבורי"),
         "removeShareItemsWarning": MessageLookupByLibrary.simpleMessage(
@@ -753,7 +751,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "התיקיות שנבחרו יוצפנו ויגובו"),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "send": MessageLookupByLibrary.simpleMessage("שלח"),
         "sendEmail": MessageLookupByLibrary.simpleMessage("שלח דוא\"ל"),
         "sendInvite": MessageLookupByLibrary.simpleMessage("שלח הזמנה"),
@@ -772,7 +770,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "shareAnAlbumNow":
             MessageLookupByLibrary.simpleMessage("שתף אלבום עכשיו"),
         "shareLink": MessageLookupByLibrary.simpleMessage("שתף קישור"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareOnlyWithThePeopleYouWant":
             MessageLookupByLibrary.simpleMessage("שתף רק אם אנשים שאתה בוחר"),
         "shareTextConfirmOthersVerificationID": m7,
@@ -780,7 +778,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "הורד את ente על מנת שנוכל לשתף תמונות וסרטונים באיכות המקור באופן קל\n\nhttps://ente.io"),
         "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage(
             "שתף עם משתמשים שהם לא של ente"),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "shareYourFirstAlbum":
             MessageLookupByLibrary.simpleMessage("שתף את האלבום הראשון שלך"),
         "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
@@ -791,13 +789,13 @@ class MessageLookup extends MessageLookupByLibrary {
         "sharedPhotoNotificationsExplanation":
             MessageLookupByLibrary.simpleMessage(
                 "קבל התראות כשמישהו מוסיף תמונה לאלבום משותף שאתה חלק ממנו"),
-        "sharedWith": m69,
+        "sharedWith": m74,
         "sharedWithMe": MessageLookupByLibrary.simpleMessage("שותף איתי"),
         "sharing": MessageLookupByLibrary.simpleMessage("משתף..."),
         "showMemories": MessageLookupByLibrary.simpleMessage("הצג זכרונות"),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "אני מסכים ל<u-terms>תנאי שירות</u-terms> ול<u-policy>מדיניות הפרטיות</u-policy>"),
-        "singleFileDeleteFromDevice": m70,
+        "singleFileDeleteFromDevice": m75,
         "singleFileDeleteHighlight":
             MessageLookupByLibrary.simpleMessage("זה יימחק מכל האלבומים."),
         "skip": MessageLookupByLibrary.simpleMessage("דלג"),
@@ -830,14 +828,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageLimitExceeded":
             MessageLookupByLibrary.simpleMessage("גבול מקום האחסון נחרג"),
         "strongStrength": MessageLookupByLibrary.simpleMessage("חזקה"),
-        "subWillBeCancelledOn": m75,
+        "subWillBeCancelledOn": m80,
         "subscribe": MessageLookupByLibrary.simpleMessage("הרשם"),
         "subscription": MessageLookupByLibrary.simpleMessage("מנוי"),
         "success": MessageLookupByLibrary.simpleMessage("הצלחה"),
         "suggestFeatures":
             MessageLookupByLibrary.simpleMessage("הציעו מאפיינים"),
         "support": MessageLookupByLibrary.simpleMessage("תמיכה"),
-        "syncProgress": m76,
+        "syncProgress": m81,
         "syncing": MessageLookupByLibrary.simpleMessage("מסנכרן..."),
         "systemTheme": MessageLookupByLibrary.simpleMessage("מערכת"),
         "tapToCopy": MessageLookupByLibrary.simpleMessage("הקש כדי להעתיק"),
@@ -858,7 +856,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "זה יכול לשמש לשחזור החשבון שלך במקרה ותאבד את הגורם השני"),
         "thisDevice": MessageLookupByLibrary.simpleMessage("מכשיר זה"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId":
             MessageLookupByLibrary.simpleMessage("זה מזהה האימות שלך"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -902,7 +900,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "verificationId": MessageLookupByLibrary.simpleMessage("מזהה אימות"),
         "verify": MessageLookupByLibrary.simpleMessage("אמת"),
         "verifyEmail": MessageLookupByLibrary.simpleMessage("אימות דוא\"ל"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyIDLabel": MessageLookupByLibrary.simpleMessage("אמת"),
         "verifyPassword": MessageLookupByLibrary.simpleMessage("אמת סיסמא"),
         "verifyingRecoveryKey":
@@ -923,7 +921,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "weakStrength": MessageLookupByLibrary.simpleMessage("חלשה"),
         "welcomeBack": MessageLookupByLibrary.simpleMessage("ברוך שובך!"),
         "yearly": MessageLookupByLibrary.simpleMessage("שנתי"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("כן"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("כן, בטל"),
         "yesConvertToViewer":
@@ -946,7 +944,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "אתה לא יכול לשנמך לתוכנית הזו"),
         "youCannotShareWithYourself":
             MessageLookupByLibrary.simpleMessage("אתה לא יכול לשתף עם עצמך"),
-        "youHaveSuccessfullyFreedUp": m88,
+        "youHaveSuccessfullyFreedUp": m93,
         "yourAccountHasBeenDeleted":
             MessageLookupByLibrary.simpleMessage("החשבון שלך נמחק"),
         "yourPlanWasSuccessfullyDowngraded":
diff --git a/mobile/lib/generated/intl/messages_hi.dart b/mobile/lib/generated/intl/messages_hi.dart
index f018f5bac2..ff4756d8d4 100644
--- a/mobile/lib/generated/intl/messages_hi.dart
+++ b/mobile/lib/generated/intl/messages_hi.dart
@@ -81,8 +81,6 @@ class MessageLookup extends MessageLookupByLibrary {
             "हमारे एंड-टू-एंड एन्क्रिप्शन प्रोटोकॉल की प्रकृति के कारण, आपके डेटा को आपके पासवर्ड या रिकवरी कुंजी के बिना डिक्रिप्ट नहीं किया जा सकता है"),
         "ok": MessageLookupByLibrary.simpleMessage("ठीक है"),
         "oops": MessageLookupByLibrary.simpleMessage("ओह!"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "password": MessageLookupByLibrary.simpleMessage("पासवर्ड"),
         "recoverButton": MessageLookupByLibrary.simpleMessage("पुनः प्राप्त"),
         "recoverySuccessful":
diff --git a/mobile/lib/generated/intl/messages_hu.dart b/mobile/lib/generated/intl/messages_hu.dart
index 81c4eadaa4..fbe4a79ba1 100644
--- a/mobile/lib/generated/intl/messages_hu.dart
+++ b/mobile/lib/generated/intl/messages_hu.dart
@@ -38,8 +38,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "feedback": MessageLookupByLibrary.simpleMessage("Visszajelzés"),
         "invalidEmailAddress":
             MessageLookupByLibrary.simpleMessage("Érvénytelen e-mail cím"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "verify": MessageLookupByLibrary.simpleMessage("Hitelesítés")
       };
 }
diff --git a/mobile/lib/generated/intl/messages_id.dart b/mobile/lib/generated/intl/messages_id.dart
index bc3b312155..212d278a86 100644
--- a/mobile/lib/generated/intl/messages_id.dart
+++ b/mobile/lib/generated/intl/messages_id.dart
@@ -20,33 +20,33 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'id';
 
-  static String m9(count) =>
+  static String m10(count) =>
       "${Intl.plural(count, other: 'Tambahkan kolaborator')}";
 
-  static String m10(count) => "${Intl.plural(count, other: 'Tambahkan item')}";
+  static String m11(count) => "${Intl.plural(count, other: 'Tambahkan item')}";
 
-  static String m11(storageAmount, endDate) =>
+  static String m12(storageAmount, endDate) =>
       "Add-on ${storageAmount} kamu berlaku sampai ${endDate}";
 
-  static String m13(emailOrName) => "Ditambahkan oleh ${emailOrName}";
+  static String m14(emailOrName) => "Ditambahkan oleh ${emailOrName}";
 
-  static String m14(albumName) => "Berhasil ditambahkan ke ${albumName}";
+  static String m15(albumName) => "Berhasil ditambahkan ke ${albumName}";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: '0 Peserta', one: '1 Peserta', other: '${count} Peserta')}";
 
-  static String m16(versionValue) => "Versi: ${versionValue}";
+  static String m17(versionValue) => "Versi: ${versionValue}";
 
-  static String m17(freeAmount, storageUnit) =>
+  static String m18(freeAmount, storageUnit) =>
       "${freeAmount} ${storageUnit} tersedia";
 
-  static String m18(paymentProvider) =>
+  static String m19(paymentProvider) =>
       "Harap batalkan langganan kamu di ${paymentProvider} terlebih dahulu";
 
   static String m3(user) =>
       "${user} tidak akan dapat menambahkan foto lagi ke album ini\n\nIa masih dapat menghapus foto yang ditambahkan olehnya sendiri";
 
-  static String m19(isFamilyMember, storageAmountInGb) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
       "${Intl.select(isFamilyMember, {
             'true':
                 'Keluargamu saat ini telah memperoleh ${storageAmountInGb} GB',
@@ -54,153 +54,153 @@ class MessageLookup extends MessageLookupByLibrary {
             'other': 'Kamu saat ini telah memperoleh ${storageAmountInGb} GB!',
           })}";
 
-  static String m20(albumName) => "Link kolaborasi terbuat untuk ${albumName}";
+  static String m21(albumName) => "Link kolaborasi terbuat untuk ${albumName}";
 
-  static String m23(familyAdminEmail) =>
+  static String m24(familyAdminEmail) =>
       "Silakan hubungi <green>${familyAdminEmail}</green> untuk mengatur langgananmu";
 
-  static String m24(provider) =>
+  static String m25(provider) =>
       "Silakan hubungi kami di support@ente.io untuk mengatur langganan ${provider} kamu.";
 
-  static String m25(endpoint) => "Terhubung ke ${endpoint}";
+  static String m26(endpoint) => "Terhubung ke ${endpoint}";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: 'Hapus ${count} item', other: 'Hapus ${count} item')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "Menghapus ${currentlyDeleting} / ${totalCount}";
 
-  static String m28(albumName) =>
+  static String m29(albumName) =>
       "Ini akan menghapus link publik yang digunakan untuk mengakses \"${albumName}\".";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "Silakan kirimkan email ke ${supportEmail} dari alamat email terdaftar kamu";
 
-  static String m30(count, storageSaved) =>
+  static String m31(count, storageSaved) =>
       "Kamu telah menghapus ${Intl.plural(count, other: '${count} file duplikat')} dan membersihkan (${storageSaved}!)";
 
-  static String m32(newEmail) => "Email diubah menjadi ${newEmail}";
+  static String m33(newEmail) => "Email diubah menjadi ${newEmail}";
 
-  static String m33(email) =>
+  static String m35(email) =>
       "${email} tidak punya akun Ente.\n\nUndang dia untuk berbagi foto.";
 
-  static String m35(count, formattedNumber) =>
+  static String m37(count, formattedNumber) =>
       "${Intl.plural(count, other: '${formattedNumber} file')} di perangkat ini telah berhasil dicadangkan";
 
-  static String m36(count, formattedNumber) =>
+  static String m38(count, formattedNumber) =>
       "${Intl.plural(count, other: '${formattedNumber} file')} dalam album ini telah berhasil dicadangkan";
 
   static String m4(storageAmountInGB) =>
       "${storageAmountInGB} GB setiap kali orang mendaftar dengan paket berbayar lalu menerapkan kode milikmu";
 
-  static String m37(endDate) => "Percobaan gratis berlaku hingga ${endDate}";
+  static String m39(endDate) => "Percobaan gratis berlaku hingga ${endDate}";
 
-  static String m38(count) =>
+  static String m40(count) =>
       "Kamu masih bisa mengakses ${Intl.plural(count, other: 'filenya')} di Ente selama kamu masih berlangganan";
 
-  static String m39(sizeInMBorGB) => "Bersihkan ${sizeInMBorGB}";
+  static String m41(sizeInMBorGB) => "Bersihkan ${sizeInMBorGB}";
 
-  static String m40(count, formattedSize) =>
+  static String m42(count, formattedSize) =>
       "${Intl.plural(count, other: 'File tersebut bisa dihapus dari perangkat ini untuk membersihkan ${formattedSize}')}";
 
-  static String m41(currentlyProcessing, totalCount) =>
+  static String m43(currentlyProcessing, totalCount) =>
       "Memproses ${currentlyProcessing} / ${totalCount}";
 
-  static String m42(count) => "${Intl.plural(count, other: '${count} item')}";
+  static String m44(count) => "${Intl.plural(count, other: '${count} item')}";
 
-  static String m44(expiryTime) => "Link akan kedaluwarsa pada ${expiryTime}";
+  static String m46(expiryTime) => "Link akan kedaluwarsa pada ${expiryTime}";
 
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, zero: 'tiada kenangan', one: '${formattedCount} kenangan', other: '${formattedCount} kenangan')}";
 
-  static String m45(count) => "${Intl.plural(count, other: 'Pindahkan item')}";
+  static String m49(count) => "${Intl.plural(count, other: 'Pindahkan item')}";
 
-  static String m46(albumName) => "Berhasil dipindahkan ke ${albumName}";
+  static String m50(albumName) => "Berhasil dipindahkan ke ${albumName}";
 
-  static String m49(familyAdminEmail) =>
+  static String m53(familyAdminEmail) =>
       "Harap hubungi ${familyAdminEmail} untuk mengubah kode kamu.";
 
   static String m0(passwordStrengthValue) =>
       "Keamanan sandi: ${passwordStrengthValue}";
 
-  static String m50(providerName) =>
+  static String m54(providerName) =>
       "Harap hubungi dukungan ${providerName} jika kamu dikenai biaya";
 
-  static String m52(endDate) =>
+  static String m56(endDate) =>
       "Percobaan gratis berlaku hingga ${endDate}.\nKamu dapat memilih paket berbayar setelahnya.";
 
-  static String m53(toEmail) => "Silakan kirimi kami email di ${toEmail}";
+  static String m57(toEmail) => "Silakan kirimi kami email di ${toEmail}";
 
-  static String m54(toEmail) => "Silakan kirim log-nya ke \n${toEmail}";
+  static String m58(toEmail) => "Silakan kirim log-nya ke \n${toEmail}";
 
-  static String m56(storeName) => "Beri nilai di ${storeName}";
+  static String m60(storeName) => "Beri nilai di ${storeName}";
 
-  static String m60(storageInGB) =>
+  static String m65(storageInGB) =>
       "3. Kalian berdua mendapat ${storageInGB} GB* gratis";
 
-  static String m61(userEmail) =>
+  static String m66(userEmail) =>
       "${userEmail} akan dikeluarkan dari album berbagi ini\n\nSemua foto yang ia tambahkan juga akan dihapus dari album ini";
 
-  static String m62(endDate) => "Langganan akan diperpanjang pada ${endDate}";
+  static String m67(endDate) => "Langganan akan diperpanjang pada ${endDate}";
 
-  static String m63(count) =>
+  static String m68(count) =>
       "${Intl.plural(count, other: '${count} hasil ditemukan')}";
 
   static String m6(count) => "${count} terpilih";
 
-  static String m65(count, yourCount) =>
+  static String m70(count, yourCount) =>
       "${count} dipilih (${yourCount} milikmu)";
 
-  static String m66(verificationID) =>
+  static String m71(verificationID) =>
       "Ini ID Verifikasi saya di ente.io: ${verificationID}.";
 
   static String m7(verificationID) =>
       "Halo, bisakah kamu pastikan bahwa ini adalah ID Verifikasi ente.io milikmu: ${verificationID}";
 
-  static String m67(referralCode, referralStorageInGB) =>
+  static String m72(referralCode, referralStorageInGB) =>
       "Kode rujukan Ente: ${referralCode} \n\nTerapkan pada Pengaturan → Umum → Rujukan untuk mendapatkan ${referralStorageInGB} GB gratis setelah kamu mendaftar paket berbayar\n\nhttps://ente.io";
 
-  static String m68(numberOfPeople) =>
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: 'Bagikan dengan orang tertentu', one: 'Berbagi dengan 1 orang', other: 'Berbagi dengan ${numberOfPeople} orang')}";
 
-  static String m69(emailIDs) => "Dibagikan dengan ${emailIDs}";
+  static String m74(emailIDs) => "Dibagikan dengan ${emailIDs}";
 
-  static String m70(fileType) =>
+  static String m75(fileType) =>
       "${fileType} ini akan dihapus dari perangkat ini.";
 
-  static String m71(fileType) =>
+  static String m76(fileType) =>
       "${fileType} ini tersimpan di Ente dan juga di perangkat ini.";
 
-  static String m72(fileType) => "${fileType} ini akan dihapus dari Ente.";
+  static String m77(fileType) => "${fileType} ini akan dihapus dari Ente.";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} GB";
 
-  static String m73(
+  static String m78(
           usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) =>
       "${usedAmount} ${usedStorageUnit} dari ${totalAmount} ${totalStorageUnit} terpakai";
 
-  static String m74(id) =>
+  static String m79(id) =>
       "${id} kamu telah terhubung dengan akun Ente lain.\nJika kamu ingin menggunakan ${id} kamu untuk akun ini, silahkan hubungi tim bantuan kami";
 
-  static String m75(endDate) =>
+  static String m80(endDate) =>
       "Langganan kamu akan dibatalkan pada ${endDate}";
 
   static String m8(storageAmountInGB) =>
       "Ia juga mendapat ${storageAmountInGB} GB";
 
-  static String m78(email) => "Ini adalah ID Verifikasi milik ${email}";
+  static String m83(email) => "Ini adalah ID Verifikasi milik ${email}";
 
-  static String m84(endDate) => "Berlaku hingga ${endDate}";
+  static String m89(endDate) => "Berlaku hingga ${endDate}";
 
-  static String m85(email) => "Verifikasi ${email}";
+  static String m90(email) => "Verifikasi ${email}";
 
   static String m2(email) =>
       "Kami telah mengirimkan email ke <green>${email}</green>";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, other: '${count} tahun lalu')}";
 
-  static String m88(storageSaved) =>
+  static String m93(storageSaved) =>
       "Kamu telah berhasil membersihkan ${storageSaved}!";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
@@ -219,14 +219,14 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Tambah email baru"),
         "addCollaborator":
             MessageLookupByLibrary.simpleMessage("Tambah kolaborator"),
-        "addCollaborators": m9,
+        "addCollaborators": m10,
         "addFromDevice":
             MessageLookupByLibrary.simpleMessage("Tambahkan dari perangkat"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocation": MessageLookupByLibrary.simpleMessage("Tambah tempat"),
         "addLocationButton": MessageLookupByLibrary.simpleMessage("Tambah"),
         "addMore": MessageLookupByLibrary.simpleMessage("Tambah lagi"),
-        "addOnValidTill": m11,
+        "addOnValidTill": m12,
         "addPhotos": MessageLookupByLibrary.simpleMessage("Tambah foto"),
         "addSelected":
             MessageLookupByLibrary.simpleMessage("Tambahkan yang dipilih"),
@@ -236,8 +236,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Tambah ke album tersembunyi"),
         "addViewer": MessageLookupByLibrary.simpleMessage("Tambahkan pemirsa"),
         "addedAs": MessageLookupByLibrary.simpleMessage("Ditambahkan sebagai"),
-        "addedBy": m13,
-        "addedSuccessfullyTo": m14,
+        "addedBy": m14,
+        "addedSuccessfullyTo": m15,
         "addingToFavorites":
             MessageLookupByLibrary.simpleMessage("Menambahkan ke favorit..."),
         "advanced": MessageLookupByLibrary.simpleMessage("Lanjutan"),
@@ -248,7 +248,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "after1Week": MessageLookupByLibrary.simpleMessage("Setelah 1 minggu"),
         "after1Year": MessageLookupByLibrary.simpleMessage("Setelah 1 tahun"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("Pemilik"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumTitle": MessageLookupByLibrary.simpleMessage("Judul album"),
         "albumUpdated":
             MessageLookupByLibrary.simpleMessage("Album diperbarui"),
@@ -279,7 +279,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Android, iOS, Web, Desktop"),
         "androidSignInTitle":
             MessageLookupByLibrary.simpleMessage("Autentikasi diperlukan"),
-        "appVersion": m16,
+        "appVersion": m17,
         "appleId": MessageLookupByLibrary.simpleMessage("ID Apple"),
         "apply": MessageLookupByLibrary.simpleMessage("Terapkan"),
         "applyCodeTitle": MessageLookupByLibrary.simpleMessage("Terapkan kode"),
@@ -345,7 +345,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoPairDesc": MessageLookupByLibrary.simpleMessage(
             "Taut otomatis hanya tersedia di perangkat yang mendukung Chromecast."),
         "available": MessageLookupByLibrary.simpleMessage("Tersedia"),
-        "availableStorageSpace": m17,
+        "availableStorageSpace": m18,
         "backedUpFolders":
             MessageLookupByLibrary.simpleMessage("Folder yang dicadangkan"),
         "backup": MessageLookupByLibrary.simpleMessage("Pencadangan"),
@@ -368,7 +368,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "canOnlyRemoveFilesOwnedByYou": MessageLookupByLibrary.simpleMessage(
             "Hanya dapat menghapus berkas yang dimiliki oleh mu"),
         "cancel": MessageLookupByLibrary.simpleMessage("Batal"),
-        "cancelOtherSubscription": m18,
+        "cancelOtherSubscription": m19,
         "cancelSubscription":
             MessageLookupByLibrary.simpleMessage("Batalkan langganan"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
@@ -401,7 +401,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "claimMore":
             MessageLookupByLibrary.simpleMessage("Peroleh lebih banyak!"),
         "claimed": MessageLookupByLibrary.simpleMessage("Diperoleh"),
-        "claimedStorageSoFar": m19,
+        "claimedStorageSoFar": m20,
         "clearIndexes": MessageLookupByLibrary.simpleMessage("Hapus indeks"),
         "click": MessageLookupByLibrary.simpleMessage("• Click"),
         "close": MessageLookupByLibrary.simpleMessage("Tutup"),
@@ -417,7 +417,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Buat link untuk memungkinkan orang lain menambahkan dan melihat foto yang ada pada album bersama kamu tanpa memerlukan app atau akun Ente. Ideal untuk mengumpulkan foto pada suatu acara."),
         "collaborativeLink":
             MessageLookupByLibrary.simpleMessage("Link kolaborasi"),
-        "collaborativeLinkCreatedFor": m20,
+        "collaborativeLinkCreatedFor": m21,
         "collaborator": MessageLookupByLibrary.simpleMessage("Kolaborator"),
         "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum":
             MessageLookupByLibrary.simpleMessage(
@@ -443,10 +443,10 @@ class MessageLookup extends MessageLookupByLibrary {
             "Konfirmasi kunci pemulihan kamu"),
         "connectToDevice":
             MessageLookupByLibrary.simpleMessage("Hubungkan ke perangkat"),
-        "contactFamilyAdmin": m23,
+        "contactFamilyAdmin": m24,
         "contactSupport":
             MessageLookupByLibrary.simpleMessage("Hubungi dukungan"),
-        "contactToManageSubscription": m24,
+        "contactToManageSubscription": m25,
         "contacts": MessageLookupByLibrary.simpleMessage("Kontak"),
         "continueLabel": MessageLookupByLibrary.simpleMessage("Lanjut"),
         "continueOnFreeTrial": MessageLookupByLibrary.simpleMessage(
@@ -487,7 +487,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "currentUsageIs":
             MessageLookupByLibrary.simpleMessage("Pemakaian saat ini sebesar "),
         "custom": MessageLookupByLibrary.simpleMessage("Kustom"),
-        "customEndpoint": m25,
+        "customEndpoint": m26,
         "darkTheme": MessageLookupByLibrary.simpleMessage("Gelap"),
         "dayToday": MessageLookupByLibrary.simpleMessage("Hari Ini"),
         "dayYesterday": MessageLookupByLibrary.simpleMessage("Kemarin"),
@@ -516,9 +516,9 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Hapus dari perangkat ini"),
         "deleteFromEnte":
             MessageLookupByLibrary.simpleMessage("Hapus dari Ente"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deletePhotos": MessageLookupByLibrary.simpleMessage("Hapus foto"),
-        "deleteProgress": m27,
+        "deleteProgress": m28,
         "deleteReason1": MessageLookupByLibrary.simpleMessage(
             "Fitur penting yang saya perlukan tidak ada"),
         "deleteReason2": MessageLookupByLibrary.simpleMessage(
@@ -554,7 +554,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Orang yang melihat masih bisa mengambil tangkapan layar atau menyalin foto kamu menggunakan alat eksternal"),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("Perlu diketahui"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "disableTwofactor": MessageLookupByLibrary.simpleMessage(
             "Nonaktifkan autentikasi dua langkah"),
         "disablingTwofactorAuthentication":
@@ -589,8 +589,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "downloadFailed":
             MessageLookupByLibrary.simpleMessage("Gagal mengunduh"),
         "downloading": MessageLookupByLibrary.simpleMessage("Mengunduh..."),
-        "dropSupportEmail": m29,
-        "duplicateFileCountWithStorageSaved": m30,
+        "dropSupportEmail": m30,
+        "duplicateFileCountWithStorageSaved": m31,
         "edit": MessageLookupByLibrary.simpleMessage("Edit"),
         "editLocation": MessageLookupByLibrary.simpleMessage("Edit lokasi"),
         "editLocationTagTitle":
@@ -602,8 +602,8 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Perubahan lokasi hanya akan terlihat di Ente"),
         "eligible": MessageLookupByLibrary.simpleMessage("memenuhi syarat"),
         "email": MessageLookupByLibrary.simpleMessage("Email"),
-        "emailChangedTo": m32,
-        "emailNoEnteAccount": m33,
+        "emailChangedTo": m33,
+        "emailNoEnteAccount": m35,
         "emailVerificationToggle":
             MessageLookupByLibrary.simpleMessage("Verifikasi email"),
         "empty": MessageLookupByLibrary.simpleMessage("Kosongkan"),
@@ -700,8 +700,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "fileTypes": MessageLookupByLibrary.simpleMessage("Jenis file"),
         "fileTypesAndNames":
             MessageLookupByLibrary.simpleMessage("Nama dan jenis file"),
-        "filesBackedUpFromDevice": m35,
-        "filesBackedUpInAlbum": m36,
+        "filesBackedUpFromDevice": m37,
+        "filesBackedUpInAlbum": m38,
         "filesDeleted": MessageLookupByLibrary.simpleMessage("File terhapus"),
         "filesSavedToGallery":
             MessageLookupByLibrary.simpleMessage("File tersimpan ke galeri"),
@@ -719,19 +719,19 @@ class MessageLookup extends MessageLookupByLibrary {
         "freeStorageUsable": MessageLookupByLibrary.simpleMessage(
             "Kuota gratis yang dapat digunakan"),
         "freeTrial": MessageLookupByLibrary.simpleMessage("Percobaan gratis"),
-        "freeTrialValidTill": m37,
-        "freeUpAccessPostDelete": m38,
-        "freeUpAmount": m39,
+        "freeTrialValidTill": m39,
+        "freeUpAccessPostDelete": m40,
+        "freeUpAmount": m41,
         "freeUpDeviceSpace": MessageLookupByLibrary.simpleMessage(
             "Bersihkan penyimpanan perangkat"),
         "freeUpDeviceSpaceDesc": MessageLookupByLibrary.simpleMessage(
             "Hemat ruang penyimpanan di perangkatmu dengan membersihkan file yang sudah tercadangkan."),
         "freeUpSpace": MessageLookupByLibrary.simpleMessage("Bersihkan ruang"),
-        "freeUpSpaceSaving": m40,
+        "freeUpSpaceSaving": m42,
         "general": MessageLookupByLibrary.simpleMessage("Umum"),
         "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage(
             "Menghasilkan kunci enkripsi..."),
-        "genericProgress": m41,
+        "genericProgress": m43,
         "goToSettings": MessageLookupByLibrary.simpleMessage("Buka pengaturan"),
         "googlePlayId": MessageLookupByLibrary.simpleMessage("ID Google Play"),
         "grantFullAccessPrompt": MessageLookupByLibrary.simpleMessage(
@@ -791,7 +791,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "itLooksLikeSomethingWentWrongPleaseRetryAfterSome":
             MessageLookupByLibrary.simpleMessage(
                 "Sepertinya terjadi kesalahan. Silakan coba lagi setelah beberapa saat. Jika kesalahan terus terjadi, silakan hubungi tim dukungan kami."),
-        "itemCount": m42,
+        "itemCount": m44,
         "itemsWillBeRemovedFromAlbum": MessageLookupByLibrary.simpleMessage(
             "Item yang dipilih akan dihapus dari album ini"),
         "joinDiscord":
@@ -818,7 +818,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Batas perangkat"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("Aktif"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("Kedaluwarsa"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry":
             MessageLookupByLibrary.simpleMessage("Waktu kedaluwarsa link"),
         "linkHasExpired":
@@ -898,10 +898,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "moderateStrength": MessageLookupByLibrary.simpleMessage("Sedang"),
         "moments": MessageLookupByLibrary.simpleMessage("Momen"),
         "monthly": MessageLookupByLibrary.simpleMessage("Bulanan"),
-        "moveItem": m45,
+        "moveItem": m49,
         "moveToHiddenAlbum": MessageLookupByLibrary.simpleMessage(
             "Pindahkan ke album tersembunyi"),
-        "movedSuccessfullyTo": m46,
+        "movedSuccessfullyTo": m50,
         "movedToTrash":
             MessageLookupByLibrary.simpleMessage("Pindah ke sampah"),
         "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
@@ -952,7 +952,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "onDevice": MessageLookupByLibrary.simpleMessage("Di perangkat ini"),
         "onEnte": MessageLookupByLibrary.simpleMessage(
             "Di <branding>ente</branding>"),
-        "onlyFamilyAdminCanChangeCode": m49,
+        "onlyFamilyAdminCanChangeCode": m53,
         "oops": MessageLookupByLibrary.simpleMessage("Aduh"),
         "oopsCouldNotSaveEdits": MessageLookupByLibrary.simpleMessage(
             "Aduh, tidak dapat menyimpan perubahan"),
@@ -966,8 +966,6 @@ class MessageLookup extends MessageLookupByLibrary {
             "Opsional, pendek pun tak apa..."),
         "orPickAnExistingOne":
             MessageLookupByLibrary.simpleMessage("Atau pilih yang sudah ada"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "pair": MessageLookupByLibrary.simpleMessage("Tautkan"),
         "pairWithPin":
             MessageLookupByLibrary.simpleMessage("Tautkan dengan PIN"),
@@ -990,7 +988,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Pembayaran gagal"),
         "paymentFailedMessage": MessageLookupByLibrary.simpleMessage(
             "Sayangnya, pembayaranmu gagal. Silakan hubungi tim bantuan agar dapat kami bantu!"),
-        "paymentFailedTalkToProvider": m50,
+        "paymentFailedTalkToProvider": m54,
         "pendingItems": MessageLookupByLibrary.simpleMessage("Item menunggu"),
         "pendingSync":
             MessageLookupByLibrary.simpleMessage("Sinkronisasi tertunda"),
@@ -1013,7 +1011,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Foto yang telah kamu tambahkan akan dihapus dari album ini"),
         "playOnTv": MessageLookupByLibrary.simpleMessage("Putar album di TV"),
-        "playStoreFreeTrialValidTill": m52,
+        "playStoreFreeTrialValidTill": m56,
         "playstoreSubscription":
             MessageLookupByLibrary.simpleMessage("Langganan PlayStore"),
         "pleaseCheckYourInternetConnectionAndTryAgain":
@@ -1025,12 +1023,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseContactSupportIfTheProblemPersists":
             MessageLookupByLibrary.simpleMessage(
                 "Silakan hubungi tim bantuan jika masalah terus terjadi"),
-        "pleaseEmailUsAt": m53,
+        "pleaseEmailUsAt": m57,
         "pleaseGrantPermissions":
             MessageLookupByLibrary.simpleMessage("Harap berikan izin"),
         "pleaseLoginAgain":
             MessageLookupByLibrary.simpleMessage("Silakan masuk akun lagi"),
-        "pleaseSendTheLogsTo": m54,
+        "pleaseSendTheLogsTo": m58,
         "pleaseTryAgain":
             MessageLookupByLibrary.simpleMessage("Silakan coba lagi"),
         "pleaseVerifyTheCodeYouHaveEntered":
@@ -1064,7 +1062,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Buat tiket dukungan"),
         "rateTheApp": MessageLookupByLibrary.simpleMessage("Nilai app ini"),
         "rateUs": MessageLookupByLibrary.simpleMessage("Beri kami nilai"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
         "recover": MessageLookupByLibrary.simpleMessage("Pulihkan"),
         "recoverAccount": MessageLookupByLibrary.simpleMessage("Pulihkan akun"),
         "recoverButton": MessageLookupByLibrary.simpleMessage("Pulihkan"),
@@ -1092,7 +1090,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "1. Berikan kode ini ke teman kamu"),
         "referralStep2": MessageLookupByLibrary.simpleMessage(
             "2. Ia perlu daftar ke paket berbayar"),
-        "referralStep3": m60,
+        "referralStep3": m65,
         "referrals": MessageLookupByLibrary.simpleMessage("Referensi"),
         "referralsAreCurrentlyPaused":
             MessageLookupByLibrary.simpleMessage("Rujukan sedang dijeda"),
@@ -1114,7 +1112,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "removeLink": MessageLookupByLibrary.simpleMessage("Hapus link"),
         "removeParticipant":
             MessageLookupByLibrary.simpleMessage("Hapus peserta"),
-        "removeParticipantBody": m61,
+        "removeParticipantBody": m66,
         "removePersonLabel":
             MessageLookupByLibrary.simpleMessage("Hapus label orang"),
         "removePublicLink":
@@ -1130,7 +1128,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "renameFile": MessageLookupByLibrary.simpleMessage("Ubah nama file"),
         "renewSubscription":
             MessageLookupByLibrary.simpleMessage("Perpanjang langganan"),
-        "renewsOn": m62,
+        "renewsOn": m67,
         "reportABug": MessageLookupByLibrary.simpleMessage("Laporkan bug"),
         "reportBug": MessageLookupByLibrary.simpleMessage("Laporkan bug"),
         "resendEmail":
@@ -1181,7 +1179,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Album, nama dan jenis file"),
         "searchHint5": MessageLookupByLibrary.simpleMessage(
             "Segera tiba: Penelusuran wajah & ajaib ✨"),
-        "searchResultCount": m63,
+        "searchResultCount": m68,
         "security": MessageLookupByLibrary.simpleMessage("Keamanan"),
         "selectALocation": MessageLookupByLibrary.simpleMessage("Pilih lokasi"),
         "selectALocationFirst": MessageLookupByLibrary.simpleMessage(
@@ -1207,7 +1205,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Item terpilih akan dihapus dari semua album dan dipindahkan ke sampah."),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "send": MessageLookupByLibrary.simpleMessage("Kirim"),
         "sendEmail": MessageLookupByLibrary.simpleMessage("Kirim email"),
         "sendInvite": MessageLookupByLibrary.simpleMessage("Kirim undangan"),
@@ -1228,16 +1226,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "shareAnAlbumNow":
             MessageLookupByLibrary.simpleMessage("Bagikan album sekarang"),
         "shareLink": MessageLookupByLibrary.simpleMessage("Bagikan link"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage(
             "Bagikan hanya dengan orang yang kamu inginkan"),
         "shareTextConfirmOthersVerificationID": m7,
         "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage(
             "Unduh Ente agar kita bisa berbagi foto dan video kualitas asli dengan mudah\n\nhttps://ente.io"),
-        "shareTextReferralCode": m67,
+        "shareTextReferralCode": m72,
         "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage(
             "Bagikan ke pengguna non-Ente"),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "shareYourFirstAlbum":
             MessageLookupByLibrary.simpleMessage("Bagikan album pertamamu"),
         "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
@@ -1250,7 +1248,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Foto terbagi baru"),
         "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage(
             "Terima notifikasi apabila seseorang menambahkan foto ke album bersama yang kamu ikuti"),
-        "sharedWith": m69,
+        "sharedWith": m74,
         "sharedWithMe":
             MessageLookupByLibrary.simpleMessage("Dibagikan dengan saya"),
         "sharedWithYou":
@@ -1265,11 +1263,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Keluar di perangkat lain"),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "Saya menyetujui <u-terms>ketentuan layanan</u-terms> dan <u-policy>kebijakan privasi</u-policy> Ente"),
-        "singleFileDeleteFromDevice": m70,
+        "singleFileDeleteFromDevice": m75,
         "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage(
             "Ia akan dihapus dari semua album."),
-        "singleFileInBothLocalAndRemote": m71,
-        "singleFileInRemoteOnly": m72,
+        "singleFileInBothLocalAndRemote": m76,
+        "singleFileInRemoteOnly": m77,
         "skip": MessageLookupByLibrary.simpleMessage("Lewati"),
         "social": MessageLookupByLibrary.simpleMessage("Sosial"),
         "someItemsAreInBothEnteAndYourDevice":
@@ -1314,10 +1312,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageInGB": m1,
         "storageLimitExceeded": MessageLookupByLibrary.simpleMessage(
             "Batas penyimpanan terlampaui"),
-        "storageUsageInfo": m73,
+        "storageUsageInfo": m78,
         "strongStrength": MessageLookupByLibrary.simpleMessage("Kuat"),
-        "subAlreadyLinkedErrMessage": m74,
-        "subWillBeCancelledOn": m75,
+        "subAlreadyLinkedErrMessage": m79,
+        "subWillBeCancelledOn": m80,
         "subscribe": MessageLookupByLibrary.simpleMessage("Berlangganan"),
         "subscription": MessageLookupByLibrary.simpleMessage("Langganan"),
         "success": MessageLookupByLibrary.simpleMessage("Berhasil"),
@@ -1371,7 +1369,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Email ini telah digunakan"),
         "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage(
             "Gambar ini tidak memiliki data exif"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage(
             "Ini adalah ID Verifikasi kamu"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -1437,14 +1435,14 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Gunakan kunci pemulihan"),
         "useSelectedPhoto":
             MessageLookupByLibrary.simpleMessage("Gunakan foto terpilih"),
-        "validTill": m84,
+        "validTill": m89,
         "verificationFailedPleaseTryAgain":
             MessageLookupByLibrary.simpleMessage(
                 "Verifikasi gagal, silakan coba lagi"),
         "verificationId": MessageLookupByLibrary.simpleMessage("ID Verifikasi"),
         "verify": MessageLookupByLibrary.simpleMessage("Verifikasi"),
         "verifyEmail": MessageLookupByLibrary.simpleMessage("Verifikasi email"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyPasskey":
             MessageLookupByLibrary.simpleMessage("Verifikasi passkey"),
         "verifyPassword":
@@ -1480,7 +1478,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Selamat datang kembali!"),
         "whatsNew": MessageLookupByLibrary.simpleMessage("Hal yang baru"),
         "yearly": MessageLookupByLibrary.simpleMessage("Tahunan"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("Ya"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("Ya, batalkan"),
         "yesConvertToViewer":
@@ -1507,7 +1505,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Kamu tidak bisa berbagi dengan dirimu sendiri"),
         "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage(
             "Kamu tidak memiliki item di arsip."),
-        "youHaveSuccessfullyFreedUp": m88,
+        "youHaveSuccessfullyFreedUp": m93,
         "yourAccountHasBeenDeleted":
             MessageLookupByLibrary.simpleMessage("Akunmu telah dihapus"),
         "yourMap": MessageLookupByLibrary.simpleMessage("Peta kamu"),
diff --git a/mobile/lib/generated/intl/messages_it.dart b/mobile/lib/generated/intl/messages_it.dart
index 60bb38c10d..731c469b92 100644
--- a/mobile/lib/generated/intl/messages_it.dart
+++ b/mobile/lib/generated/intl/messages_it.dart
@@ -20,37 +20,37 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'it';
 
-  static String m9(count) =>
+  static String m10(count) =>
       "${Intl.plural(count, zero: 'Aggiungi collaboratore', one: 'Aggiungi collaboratore', other: 'Aggiungi collaboratori')}";
 
-  static String m10(count) =>
+  static String m11(count) =>
       "${Intl.plural(count, one: 'Aggiungi elemento', other: 'Aggiungi elementi')}";
 
-  static String m11(storageAmount, endDate) =>
+  static String m12(storageAmount, endDate) =>
       "Il tuo spazio aggiuntivo di ${storageAmount} è valido fino al ${endDate}";
 
-  static String m12(count) =>
+  static String m13(count) =>
       "${Intl.plural(count, zero: 'Aggiungi visualizzatore', one: 'Aggiungi visualizzatore', other: 'Aggiungi visualizzatori')}";
 
-  static String m13(emailOrName) => "Aggiunto da ${emailOrName}";
+  static String m14(emailOrName) => "Aggiunto da ${emailOrName}";
 
-  static String m14(albumName) => "Aggiunto con successo su ${albumName}";
+  static String m15(albumName) => "Aggiunto con successo su ${albumName}";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: 'Nessun partecipante', one: '1 Partecipante', other: '${count} Partecipanti')}";
 
-  static String m16(versionValue) => "Versione: ${versionValue}";
+  static String m17(versionValue) => "Versione: ${versionValue}";
 
-  static String m17(freeAmount, storageUnit) =>
+  static String m18(freeAmount, storageUnit) =>
       "${freeAmount} ${storageUnit} liberi";
 
-  static String m18(paymentProvider) =>
+  static String m19(paymentProvider) =>
       "Annulla prima il tuo abbonamento esistente da ${paymentProvider}";
 
   static String m3(user) =>
       "${user} non sarà più in grado di aggiungere altre foto a questo album\n\nSarà ancora in grado di rimuovere le foto esistenti aggiunte da lui o lei";
 
-  static String m19(isFamilyMember, storageAmountInGb) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
       "${Intl.select(isFamilyMember, {
             'true':
                 'Il tuo piano famiglia ha già richiesto ${storageAmountInGb} GB finora',
@@ -58,206 +58,206 @@ class MessageLookup extends MessageLookupByLibrary {
             'other': 'Hai già richiesto ${storageAmountInGb} GB finora!',
           })}";
 
-  static String m20(albumName) => "Link collaborativo creato per ${albumName}";
+  static String m21(albumName) => "Link collaborativo creato per ${albumName}";
 
-  static String m21(count) =>
+  static String m22(count) =>
       "${Intl.plural(count, zero: 'Aggiunti 0 collaboratori', one: 'Aggiunto 1 collaboratore', other: 'Aggiunti ${count} collaboratori')}";
 
-  static String m22(email, numOfDays) =>
+  static String m23(email, numOfDays) =>
       "Stai per aggiungere ${email} come contatto fidato. Potranno recuperare il tuo account se sei assente per ${numOfDays} giorni.";
 
-  static String m23(familyAdminEmail) =>
+  static String m24(familyAdminEmail) =>
       "Contatta <green>${familyAdminEmail}</green> per gestire il tuo abbonamento";
 
-  static String m24(provider) =>
+  static String m25(provider) =>
       "Scrivi all\'indirizzo support@ente.io per gestire il tuo abbonamento ${provider}.";
 
-  static String m25(endpoint) => "Connesso a ${endpoint}";
+  static String m26(endpoint) => "Connesso a ${endpoint}";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: 'Elimina ${count} elemento', other: 'Elimina ${count} elementi')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "Eliminazione di ${currentlyDeleting} / ${totalCount}";
 
-  static String m28(albumName) =>
+  static String m29(albumName) =>
       "Questo rimuoverà il link pubblico per accedere a \"${albumName}\".";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "Per favore invia un\'email a ${supportEmail} dall\'indirizzo email con cui ti sei registrato";
 
-  static String m30(count, storageSaved) =>
+  static String m31(count, storageSaved) =>
       "Hai ripulito ${Intl.plural(count, one: '${count} doppione', other: '${count} doppioni')}, salvando (${storageSaved}!)";
 
-  static String m31(count, formattedSize) =>
+  static String m32(count, formattedSize) =>
       "${count} file, ${formattedSize} l\'uno";
 
-  static String m32(newEmail) => "Email cambiata in ${newEmail}";
+  static String m33(newEmail) => "Email cambiata in ${newEmail}";
 
-  static String m33(email) =>
+  static String m35(email) =>
       "${email} non ha un account Ente.\n\nInvia un invito per condividere foto.";
 
-  static String m34(text) => "Trovate foto aggiuntive per ${text}";
+  static String m36(text) => "Trovate foto aggiuntive per ${text}";
 
-  static String m35(count, formattedNumber) =>
+  static String m37(count, formattedNumber) =>
       "${Intl.plural(count, one: '1 file', other: '${formattedNumber} file')} di quest\'album sono stati salvati in modo sicuro";
 
-  static String m36(count, formattedNumber) =>
+  static String m38(count, formattedNumber) =>
       "${Intl.plural(count, one: '1 file', other: '${formattedNumber} file')} di quest\'album sono stati salvati in modo sicuro";
 
   static String m4(storageAmountInGB) =>
       "${storageAmountInGB} GB ogni volta che qualcuno si iscrive a un piano a pagamento e applica il tuo codice";
 
-  static String m37(endDate) => "La prova gratuita termina il ${endDate}";
+  static String m39(endDate) => "La prova gratuita termina il ${endDate}";
 
-  static String m38(count) =>
+  static String m40(count) =>
       "Puoi ancora accedere a ${Intl.plural(count, one: '', other: 'loro')} su ente finché hai un abbonamento attivo";
 
-  static String m39(sizeInMBorGB) => "Libera ${sizeInMBorGB}";
+  static String m41(sizeInMBorGB) => "Libera ${sizeInMBorGB}";
 
-  static String m40(count, formattedSize) =>
+  static String m42(count, formattedSize) =>
       "${Intl.plural(count, one: 'Può essere cancellata per liberare ${formattedSize}', other: 'Possono essere cancellati per liberare ${formattedSize}')}";
 
-  static String m41(currentlyProcessing, totalCount) =>
+  static String m43(currentlyProcessing, totalCount) =>
       "Elaborazione ${currentlyProcessing} / ${totalCount}";
 
-  static String m42(count) =>
+  static String m44(count) =>
       "${Intl.plural(count, one: '${count} elemento', other: '${count} elementi')}";
 
-  static String m43(email) =>
+  static String m45(email) =>
       "${email} ti ha invitato a essere un contatto fidato";
 
-  static String m44(expiryTime) => "Il link scadrà il ${expiryTime}";
+  static String m46(expiryTime) => "Il link scadrà il ${expiryTime}";
 
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, one: '${formattedCount} ricordo', other: '${formattedCount} ricordi')}";
 
-  static String m45(count) =>
+  static String m49(count) =>
       "${Intl.plural(count, one: 'Sposta elemento', other: 'Sposta elementi')}";
 
-  static String m46(albumName) => "Spostato con successo su ${albumName}";
+  static String m50(albumName) => "Spostato con successo su ${albumName}";
 
-  static String m47(personName) => "Nessun suggerimento per ${personName}";
+  static String m51(personName) => "Nessun suggerimento per ${personName}";
 
-  static String m48(name) => "Non è ${name}?";
+  static String m52(name) => "Non è ${name}?";
 
-  static String m49(familyAdminEmail) =>
+  static String m53(familyAdminEmail) =>
       "Per favore contatta ${familyAdminEmail} per cambiare il tuo codice.";
 
   static String m0(passwordStrengthValue) =>
       "Sicurezza password: ${passwordStrengthValue}";
 
-  static String m50(providerName) =>
+  static String m54(providerName) =>
       "Si prega di parlare con il supporto di ${providerName} se ti è stato addebitato qualcosa";
 
-  static String m51(count) =>
+  static String m55(count) =>
       "${Intl.plural(count, zero: '0 foto', one: '1 foto', other: '${count} foto')}";
 
-  static String m52(endDate) =>
+  static String m56(endDate) =>
       "Prova gratuita valida fino al ${endDate}.\nIn seguito potrai scegliere un piano a pagamento.";
 
-  static String m53(toEmail) => "Per favore invia un\'email a ${toEmail}";
+  static String m57(toEmail) => "Per favore invia un\'email a ${toEmail}";
 
-  static String m54(toEmail) => "Invia i log a \n${toEmail}";
+  static String m58(toEmail) => "Invia i log a \n${toEmail}";
 
-  static String m55(folderName) => "Elaborando ${folderName}...";
+  static String m59(folderName) => "Elaborando ${folderName}...";
 
-  static String m56(storeName) => "Valutaci su ${storeName}";
+  static String m60(storeName) => "Valutaci su ${storeName}";
 
-  static String m57(days, email) =>
+  static String m62(days, email) =>
       "Puoi accedere all\'account dopo ${days} giorni. Una notifica verrà inviata a ${email}.";
 
-  static String m58(email) =>
+  static String m63(email) =>
       "Ora puoi recuperare l\'account di ${email} impostando una nuova password.";
 
-  static String m59(email) =>
+  static String m64(email) =>
       "${email} sta cercando di recuperare il tuo account.";
 
-  static String m60(storageInGB) =>
+  static String m65(storageInGB) =>
       "3. Ottenete entrambi ${storageInGB} GB* gratis";
 
-  static String m61(userEmail) =>
+  static String m66(userEmail) =>
       "${userEmail} verrà rimosso da questo album condiviso\n\nQualsiasi foto aggiunta dall\'utente verrà rimossa dall\'album";
 
-  static String m62(endDate) => "Si rinnova il ${endDate}";
+  static String m67(endDate) => "Si rinnova il ${endDate}";
 
-  static String m63(count) =>
+  static String m68(count) =>
       "${Intl.plural(count, one: '${count} risultato trovato', other: '${count} risultati trovati')}";
 
   static String m6(count) => "${count} selezionati";
 
-  static String m65(count, yourCount) =>
+  static String m70(count, yourCount) =>
       "${count} selezionato (${yourCount} tuoi)";
 
-  static String m66(verificationID) =>
+  static String m71(verificationID) =>
       "Ecco il mio ID di verifica: ${verificationID} per ente.io.";
 
   static String m7(verificationID) =>
       "Hey, puoi confermare che questo è il tuo ID di verifica: ${verificationID} su ente.io";
 
-  static String m67(referralCode, referralStorageInGB) =>
+  static String m72(referralCode, referralStorageInGB) =>
       "Codice invito Ente: ${referralCode} \n\nInseriscilo in Impostazioni → Generali → Inviti per ottenere ${referralStorageInGB} GB gratis dopo la sottoscrizione a un piano a pagamento\n\nhttps://ente.io";
 
-  static String m68(numberOfPeople) =>
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: 'Condividi con persone specifiche', one: 'Condividi con una persona', other: 'Condividi con ${numberOfPeople} persone')}";
 
-  static String m69(emailIDs) => "Condiviso con ${emailIDs}";
+  static String m74(emailIDs) => "Condiviso con ${emailIDs}";
 
-  static String m70(fileType) =>
+  static String m75(fileType) =>
       "Questo ${fileType} verrà eliminato dal tuo dispositivo.";
 
-  static String m71(fileType) =>
+  static String m76(fileType) =>
       "Questo ${fileType} è sia su Ente che sul tuo dispositivo.";
 
-  static String m72(fileType) => "Questo ${fileType} verrà eliminato da Ente.";
+  static String m77(fileType) => "Questo ${fileType} verrà eliminato da Ente.";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} GB";
 
-  static String m73(
+  static String m78(
           usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) =>
       "${usedAmount} ${usedStorageUnit} di ${totalAmount} ${totalStorageUnit} utilizzati";
 
-  static String m74(id) =>
+  static String m79(id) =>
       "Il tuo ${id} è già collegato a un altro account Ente.\nSe desideri utilizzare il tuo ${id} con questo account, per favore contatta il nostro supporto\'\'";
 
-  static String m75(endDate) => "L\'abbonamento verrà cancellato il ${endDate}";
+  static String m80(endDate) => "L\'abbonamento verrà cancellato il ${endDate}";
 
-  static String m76(completed, total) =>
+  static String m81(completed, total) =>
       "${completed}/${total} ricordi conservati";
 
-  static String m77(ignoreReason) =>
+  static String m82(ignoreReason) =>
       "Tocca per caricare, il caricamento è attualmente ignorato a causa di ${ignoreReason}";
 
   static String m8(storageAmountInGB) =>
       "Anche loro riceveranno ${storageAmountInGB} GB";
 
-  static String m78(email) => "Questo è l\'ID di verifica di ${email}";
+  static String m83(email) => "Questo è l\'ID di verifica di ${email}";
 
-  static String m79(count) =>
+  static String m84(count) =>
       "${Intl.plural(count, zero: 'Presto', one: '1 giorno', other: '${count} giorni')}";
 
-  static String m80(email) =>
+  static String m85(email) =>
       "Sei stato invitato a essere un contatto Legacy da ${email}.";
 
-  static String m82(ignoreReason) =>
+  static String m87(ignoreReason) =>
       "Il caricamento è ignorato a causa di ${ignoreReason}";
 
-  static String m83(count) => "Conservando ${count} ricordi...";
+  static String m88(count) => "Conservando ${count} ricordi...";
 
-  static String m84(endDate) => "Valido fino al ${endDate}";
+  static String m89(endDate) => "Valido fino al ${endDate}";
 
-  static String m85(email) => "Verifica ${email}";
+  static String m90(email) => "Verifica ${email}";
 
-  static String m86(count) =>
+  static String m91(count) =>
       "${Intl.plural(count, zero: 'Aggiunti 0 visualizzatori', one: 'Aggiunto 1 visualizzatore', other: 'Aggiunti ${count} visualizzatori')}";
 
   static String m2(email) =>
       "Abbiamo inviato una mail a <green>${email}</green>";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, one: '${count} anno fa', other: '${count} anni fa')}";
 
-  static String m88(storageSaved) =>
+  static String m93(storageSaved) =>
       "Hai liberato con successo ${storageSaved}!";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
@@ -282,11 +282,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Aggiungi una nuova email"),
         "addCollaborator":
             MessageLookupByLibrary.simpleMessage("Aggiungi collaboratore"),
-        "addCollaborators": m9,
+        "addCollaborators": m10,
         "addFiles": MessageLookupByLibrary.simpleMessage("Aggiungi File"),
         "addFromDevice":
             MessageLookupByLibrary.simpleMessage("Aggiungi dal dispositivo"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocation": MessageLookupByLibrary.simpleMessage("Aggiungi luogo"),
         "addLocationButton": MessageLookupByLibrary.simpleMessage("Aggiungi"),
         "addMore": MessageLookupByLibrary.simpleMessage("Aggiungi altri"),
@@ -298,7 +298,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Aggiungi nuova persona"),
         "addOnPageSubtitle": MessageLookupByLibrary.simpleMessage(
             "Dettagli dei componenti aggiuntivi"),
-        "addOnValidTill": m11,
+        "addOnValidTill": m12,
         "addOns": MessageLookupByLibrary.simpleMessage("Componenti aggiuntivi"),
         "addPhotos": MessageLookupByLibrary.simpleMessage("Aggiungi foto"),
         "addSelected":
@@ -312,12 +312,12 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Aggiungi contatto fidato"),
         "addViewer":
             MessageLookupByLibrary.simpleMessage("Aggiungi in sola lettura"),
-        "addViewers": m12,
+        "addViewers": m13,
         "addYourPhotosNow":
             MessageLookupByLibrary.simpleMessage("Aggiungi le tue foto ora"),
         "addedAs": MessageLookupByLibrary.simpleMessage("Aggiunto come"),
-        "addedBy": m13,
-        "addedSuccessfullyTo": m14,
+        "addedBy": m14,
+        "addedSuccessfullyTo": m15,
         "addingToFavorites":
             MessageLookupByLibrary.simpleMessage("Aggiunto ai preferiti..."),
         "advanced": MessageLookupByLibrary.simpleMessage("Avanzate"),
@@ -329,7 +329,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Dopo una settimana"),
         "after1Year": MessageLookupByLibrary.simpleMessage("Dopo un anno"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("Proprietario"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumTitle": MessageLookupByLibrary.simpleMessage("Titolo album"),
         "albumUpdated":
             MessageLookupByLibrary.simpleMessage("Album aggiornato"),
@@ -374,7 +374,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "appLock": MessageLookupByLibrary.simpleMessage("Blocco app"),
         "appLockDescriptions": MessageLookupByLibrary.simpleMessage(
             "Scegli tra la schermata di blocco predefinita del dispositivo e una schermata di blocco personalizzata con PIN o password."),
-        "appVersion": m16,
+        "appVersion": m17,
         "appleId": MessageLookupByLibrary.simpleMessage("Apple ID"),
         "apply": MessageLookupByLibrary.simpleMessage("Applica"),
         "applyCodeTitle":
@@ -458,7 +458,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoPairDesc": MessageLookupByLibrary.simpleMessage(
             "L\'associazione automatica funziona solo con i dispositivi che supportano Chromecast."),
         "available": MessageLookupByLibrary.simpleMessage("Disponibile"),
-        "availableStorageSpace": m17,
+        "availableStorageSpace": m18,
         "backedUpFolders":
             MessageLookupByLibrary.simpleMessage("Cartelle salvate"),
         "backup": MessageLookupByLibrary.simpleMessage("Backup"),
@@ -495,7 +495,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Annulla il recupero"),
         "cancelAccountRecoveryBody": MessageLookupByLibrary.simpleMessage(
             "Sei sicuro di voler annullare il recupero?"),
-        "cancelOtherSubscription": m18,
+        "cancelOtherSubscription": m19,
         "cancelSubscription":
             MessageLookupByLibrary.simpleMessage("Annulla abbonamento"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
@@ -544,7 +544,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Richiedi spazio gratuito"),
         "claimMore": MessageLookupByLibrary.simpleMessage("Richiedine di più!"),
         "claimed": MessageLookupByLibrary.simpleMessage("Riscattato"),
-        "claimedStorageSoFar": m19,
+        "claimedStorageSoFar": m20,
         "cleanUncategorized":
             MessageLookupByLibrary.simpleMessage("Pulisci Senza Categoria"),
         "cleanUncategorizedDescription": MessageLookupByLibrary.simpleMessage(
@@ -573,12 +573,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Crea un link per consentire alle persone di aggiungere e visualizzare foto nel tuo album condiviso senza bisogno di un\'applicazione o di un account Ente. Ottimo per raccogliere foto di un evento."),
         "collaborativeLink":
             MessageLookupByLibrary.simpleMessage("Link collaborativo"),
-        "collaborativeLinkCreatedFor": m20,
+        "collaborativeLinkCreatedFor": m21,
         "collaborator": MessageLookupByLibrary.simpleMessage("Collaboratore"),
         "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "I collaboratori possono aggiungere foto e video all\'album condiviso."),
-        "collaboratorsSuccessfullyAdded": m21,
+        "collaboratorsSuccessfullyAdded": m22,
         "collageLayout": MessageLookupByLibrary.simpleMessage("Disposizione"),
         "collageSaved": MessageLookupByLibrary.simpleMessage(
             "Collage salvato nella galleria"),
@@ -596,7 +596,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Sei sicuro di voler disattivare l\'autenticazione a due fattori?"),
         "confirmAccountDeletion": MessageLookupByLibrary.simpleMessage(
             "Conferma eliminazione account"),
-        "confirmAddingTrustedContact": m22,
+        "confirmAddingTrustedContact": m23,
         "confirmDeletePrompt": MessageLookupByLibrary.simpleMessage(
             "Sì, voglio eliminare definitivamente questo account e i dati associati a esso su tutte le applicazioni."),
         "confirmPassword":
@@ -609,10 +609,10 @@ class MessageLookup extends MessageLookupByLibrary {
             "Conferma la tua chiave di recupero"),
         "connectToDevice":
             MessageLookupByLibrary.simpleMessage("Connetti al dispositivo"),
-        "contactFamilyAdmin": m23,
+        "contactFamilyAdmin": m24,
         "contactSupport":
             MessageLookupByLibrary.simpleMessage("Contatta il supporto"),
-        "contactToManageSubscription": m24,
+        "contactToManageSubscription": m25,
         "contacts": MessageLookupByLibrary.simpleMessage("Contatti"),
         "contents": MessageLookupByLibrary.simpleMessage("Contenuti"),
         "continueLabel": MessageLookupByLibrary.simpleMessage("Continua"),
@@ -659,7 +659,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "currentlyRunning":
             MessageLookupByLibrary.simpleMessage("attualmente in esecuzione"),
         "custom": MessageLookupByLibrary.simpleMessage("Personalizza"),
-        "customEndpoint": m25,
+        "customEndpoint": m26,
         "darkTheme": MessageLookupByLibrary.simpleMessage("Scuro"),
         "dayToday": MessageLookupByLibrary.simpleMessage("Oggi"),
         "dayYesterday": MessageLookupByLibrary.simpleMessage("Ieri"),
@@ -697,11 +697,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Elimina dal dispositivo"),
         "deleteFromEnte":
             MessageLookupByLibrary.simpleMessage("Elimina da Ente"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deleteLocation":
             MessageLookupByLibrary.simpleMessage("Elimina posizione"),
         "deletePhotos": MessageLookupByLibrary.simpleMessage("Elimina foto"),
-        "deleteProgress": m27,
+        "deleteProgress": m28,
         "deleteReason1": MessageLookupByLibrary.simpleMessage(
             "Manca una caratteristica chiave di cui ho bisogno"),
         "deleteReason2": MessageLookupByLibrary.simpleMessage(
@@ -742,7 +742,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "I visualizzatori possono scattare screenshot o salvare una copia delle foto utilizzando strumenti esterni"),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("Nota bene"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "disableTwofactor": MessageLookupByLibrary.simpleMessage(
             "Disabilita autenticazione a due fattori"),
         "disablingTwofactorAuthentication":
@@ -785,9 +785,9 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Scaricamento fallito"),
         "downloading":
             MessageLookupByLibrary.simpleMessage("Scaricamento in corso..."),
-        "dropSupportEmail": m29,
-        "duplicateFileCountWithStorageSaved": m30,
-        "duplicateItemsGroup": m31,
+        "dropSupportEmail": m30,
+        "duplicateFileCountWithStorageSaved": m31,
+        "duplicateItemsGroup": m32,
         "edit": MessageLookupByLibrary.simpleMessage("Modifica"),
         "editLocation": MessageLookupByLibrary.simpleMessage("Modifica luogo"),
         "editLocationTagTitle":
@@ -799,8 +799,8 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Le modifiche alla posizione saranno visibili solo all\'interno di Ente"),
         "eligible": MessageLookupByLibrary.simpleMessage("idoneo"),
         "email": MessageLookupByLibrary.simpleMessage("Email"),
-        "emailChangedTo": m32,
-        "emailNoEnteAccount": m33,
+        "emailChangedTo": m33,
+        "emailNoEnteAccount": m35,
         "emailVerificationToggle":
             MessageLookupByLibrary.simpleMessage("Verifica Email"),
         "emailYourLogs": MessageLookupByLibrary.simpleMessage(
@@ -880,7 +880,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "exportYourData": MessageLookupByLibrary.simpleMessage("Esporta dati"),
         "extraPhotosFound":
             MessageLookupByLibrary.simpleMessage("Trovate foto aggiuntive"),
-        "extraPhotosFoundFor": m34,
+        "extraPhotosFoundFor": m36,
         "faceNotClusteredYet": MessageLookupByLibrary.simpleMessage(
             "Faccia non ancora raggruppata, per favore torna più tardi"),
         "faceRecognition":
@@ -930,8 +930,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "fileTypes": MessageLookupByLibrary.simpleMessage("Tipi di file"),
         "fileTypesAndNames":
             MessageLookupByLibrary.simpleMessage("Tipi e nomi di file"),
-        "filesBackedUpFromDevice": m35,
-        "filesBackedUpInAlbum": m36,
+        "filesBackedUpFromDevice": m37,
+        "filesBackedUpInAlbum": m38,
         "filesDeleted": MessageLookupByLibrary.simpleMessage("File eliminati"),
         "filesSavedToGallery":
             MessageLookupByLibrary.simpleMessage("File salvati nella galleria"),
@@ -951,22 +951,22 @@ class MessageLookup extends MessageLookupByLibrary {
         "freeStorageUsable":
             MessageLookupByLibrary.simpleMessage("Spazio libero utilizzabile"),
         "freeTrial": MessageLookupByLibrary.simpleMessage("Prova gratuita"),
-        "freeTrialValidTill": m37,
-        "freeUpAccessPostDelete": m38,
-        "freeUpAmount": m39,
+        "freeTrialValidTill": m39,
+        "freeUpAccessPostDelete": m40,
+        "freeUpAmount": m41,
         "freeUpDeviceSpace":
             MessageLookupByLibrary.simpleMessage("Libera spazio"),
         "freeUpDeviceSpaceDesc": MessageLookupByLibrary.simpleMessage(
             "Risparmia spazio sul tuo dispositivo cancellando i file che sono già stati salvati online."),
         "freeUpSpace": MessageLookupByLibrary.simpleMessage("Libera spazio"),
-        "freeUpSpaceSaving": m40,
+        "freeUpSpaceSaving": m42,
         "gallery": MessageLookupByLibrary.simpleMessage("Galleria"),
         "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage(
             "Fino a 1000 ricordi mostrati nella galleria"),
         "general": MessageLookupByLibrary.simpleMessage("Generali"),
         "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage(
             "Generazione delle chiavi di crittografia..."),
-        "genericProgress": m41,
+        "genericProgress": m43,
         "goToSettings":
             MessageLookupByLibrary.simpleMessage("Vai alle impostazioni"),
         "googlePlayId": MessageLookupByLibrary.simpleMessage("Google Play ID"),
@@ -1051,7 +1051,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "itLooksLikeSomethingWentWrongPleaseRetryAfterSome":
             MessageLookupByLibrary.simpleMessage(
                 "Sembra che qualcosa sia andato storto. Riprova tra un po\'. Se l\'errore persiste, contatta il nostro team di supporto."),
-        "itemCount": m42,
+        "itemCount": m44,
         "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion":
             MessageLookupByLibrary.simpleMessage(
                 "Gli elementi mostrano il numero di giorni rimanenti prima della cancellazione permanente"),
@@ -1077,7 +1077,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "legacy": MessageLookupByLibrary.simpleMessage("Legacy"),
         "legacyAccounts":
             MessageLookupByLibrary.simpleMessage("Account Legacy"),
-        "legacyInvite": m43,
+        "legacyInvite": m45,
         "legacyPageDesc": MessageLookupByLibrary.simpleMessage(
             "Legacy consente ai contatti fidati di accedere al tuo account in tua assenza."),
         "legacyPageDesc2": MessageLookupByLibrary.simpleMessage(
@@ -1090,7 +1090,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Limite dei dispositivi"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("Attivato"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("Scaduto"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry": MessageLookupByLibrary.simpleMessage("Scadenza del link"),
         "linkHasExpired":
             MessageLookupByLibrary.simpleMessage("Il link è scaduto"),
@@ -1211,12 +1211,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "moreDetails": MessageLookupByLibrary.simpleMessage("Più dettagli"),
         "mostRecent": MessageLookupByLibrary.simpleMessage("Più recenti"),
         "mostRelevant": MessageLookupByLibrary.simpleMessage("Più rilevanti"),
-        "moveItem": m45,
+        "moveItem": m49,
         "moveToAlbum":
             MessageLookupByLibrary.simpleMessage("Sposta nell\'album"),
         "moveToHiddenAlbum":
             MessageLookupByLibrary.simpleMessage("Sposta in album nascosto"),
-        "movedSuccessfullyTo": m46,
+        "movedSuccessfullyTo": m50,
         "movedToTrash":
             MessageLookupByLibrary.simpleMessage("Spostato nel cestino"),
         "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
@@ -1269,10 +1269,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "noResults": MessageLookupByLibrary.simpleMessage("Nessun risultato"),
         "noResultsFound":
             MessageLookupByLibrary.simpleMessage("Nessun risultato trovato"),
-        "noSuggestionsForPerson": m47,
+        "noSuggestionsForPerson": m51,
         "noSystemLockFound": MessageLookupByLibrary.simpleMessage(
             "Nessun blocco di sistema trovato"),
-        "notPersonLabel": m48,
+        "notPersonLabel": m52,
         "nothingSharedWithYouYet": MessageLookupByLibrary.simpleMessage(
             "Ancora nulla di condiviso con te"),
         "nothingToSeeHere":
@@ -1282,7 +1282,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "onDevice": MessageLookupByLibrary.simpleMessage("Sul dispositivo"),
         "onEnte": MessageLookupByLibrary.simpleMessage(
             "Su <branding>ente</branding>"),
-        "onlyFamilyAdminCanChangeCode": m49,
+        "onlyFamilyAdminCanChangeCode": m53,
         "onlyThem": MessageLookupByLibrary.simpleMessage("Solo loro"),
         "oops": MessageLookupByLibrary.simpleMessage("Oops"),
         "oopsCouldNotSaveEdits": MessageLookupByLibrary.simpleMessage(
@@ -1302,8 +1302,6 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("O unisci con esistente"),
         "orPickAnExistingOne": MessageLookupByLibrary.simpleMessage(
             "Oppure scegline una esistente"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "pair": MessageLookupByLibrary.simpleMessage("Abbina"),
         "pairWithPin": MessageLookupByLibrary.simpleMessage("Associa con PIN"),
         "pairingComplete":
@@ -1330,7 +1328,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Pagamento non riuscito"),
         "paymentFailedMessage": MessageLookupByLibrary.simpleMessage(
             "Purtroppo il tuo pagamento non è riuscito. Contatta l\'assistenza e ti aiuteremo!"),
-        "paymentFailedTalkToProvider": m50,
+        "paymentFailedTalkToProvider": m54,
         "pendingItems":
             MessageLookupByLibrary.simpleMessage("Elementi in sospeso"),
         "pendingSync":
@@ -1355,14 +1353,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "photosAddedByYouWillBeRemovedFromTheAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Le foto aggiunte da te verranno rimosse dall\'album"),
-        "photosCount": m51,
+        "photosCount": m55,
         "pickCenterPoint": MessageLookupByLibrary.simpleMessage(
             "Selezionare il punto centrale"),
         "pinAlbum": MessageLookupByLibrary.simpleMessage("Fissa l\'album"),
         "pinLock": MessageLookupByLibrary.simpleMessage("Blocco con PIN"),
         "playOnTv":
             MessageLookupByLibrary.simpleMessage("Riproduci album sulla TV"),
-        "playStoreFreeTrialValidTill": m52,
+        "playStoreFreeTrialValidTill": m56,
         "playstoreSubscription":
             MessageLookupByLibrary.simpleMessage("Abbonamento su PlayStore"),
         "pleaseCheckYourInternetConnectionAndTryAgain":
@@ -1374,14 +1372,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseContactSupportIfTheProblemPersists":
             MessageLookupByLibrary.simpleMessage(
                 "Riprova. Se il problema persiste, ti invitiamo a contattare l\'assistenza"),
-        "pleaseEmailUsAt": m53,
+        "pleaseEmailUsAt": m57,
         "pleaseGrantPermissions":
             MessageLookupByLibrary.simpleMessage("Concedi i permessi"),
         "pleaseLoginAgain": MessageLookupByLibrary.simpleMessage(
             "Effettua nuovamente l\'accesso"),
         "pleaseSelectQuickLinksToRemove": MessageLookupByLibrary.simpleMessage(
             "Si prega di selezionare i link rapidi da rimuovere"),
-        "pleaseSendTheLogsTo": m54,
+        "pleaseSendTheLogsTo": m58,
         "pleaseTryAgain": MessageLookupByLibrary.simpleMessage("Riprova"),
         "pleaseVerifyTheCodeYouHaveEntered":
             MessageLookupByLibrary.simpleMessage(
@@ -1406,7 +1404,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "privateSharing":
             MessageLookupByLibrary.simpleMessage("Condivisioni private"),
         "proceed": MessageLookupByLibrary.simpleMessage("Prosegui"),
-        "processingImport": m55,
+        "processingImport": m59,
         "publicLinkCreated":
             MessageLookupByLibrary.simpleMessage("Link pubblico creato"),
         "publicLinkEnabled":
@@ -1417,7 +1415,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "raiseTicket": MessageLookupByLibrary.simpleMessage("Invia ticket"),
         "rateTheApp": MessageLookupByLibrary.simpleMessage("Valuta l\'app"),
         "rateUs": MessageLookupByLibrary.simpleMessage("Lascia una recensione"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
         "recover": MessageLookupByLibrary.simpleMessage("Recupera"),
         "recoverAccount":
             MessageLookupByLibrary.simpleMessage("Recupera account"),
@@ -1426,7 +1424,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Recupera l\'account"),
         "recoveryInitiated":
             MessageLookupByLibrary.simpleMessage("Recupero avviato"),
-        "recoveryInitiatedDesc": m57,
+        "recoveryInitiatedDesc": m62,
         "recoveryKey":
             MessageLookupByLibrary.simpleMessage("Chiave di recupero"),
         "recoveryKeyCopiedToClipboard": MessageLookupByLibrary.simpleMessage(
@@ -1441,12 +1439,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Chiave di recupero verificata"),
         "recoveryKeyVerifyReason": MessageLookupByLibrary.simpleMessage(
             "Se hai dimenticato la password, la tua chiave di ripristino è l\'unico modo per recuperare le tue foto. La puoi trovare in Impostazioni > Account.\n\nInserisci la tua chiave di recupero per verificare di averla salvata correttamente."),
-        "recoveryReady": m58,
+        "recoveryReady": m63,
         "recoverySuccessful":
             MessageLookupByLibrary.simpleMessage("Recupero riuscito!"),
         "recoveryWarning": MessageLookupByLibrary.simpleMessage(
             "Un contatto fidato sta tentando di accedere al tuo account"),
-        "recoveryWarningBody": m59,
+        "recoveryWarningBody": m64,
         "recreatePasswordBody": MessageLookupByLibrary.simpleMessage(
             "Il dispositivo attuale non è abbastanza potente per verificare la tua password, ma la possiamo rigenerare in un modo che funzioni su tutti i dispositivi.\n\nEffettua il login utilizzando la tua chiave di recupero e rigenera la tua password (puoi utilizzare nuovamente la stessa se vuoi)."),
         "recreatePasswordTitle":
@@ -1462,7 +1460,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "1. Condividi questo codice con i tuoi amici"),
         "referralStep2": MessageLookupByLibrary.simpleMessage(
             "2. Si iscrivono per un piano a pagamento"),
-        "referralStep3": m60,
+        "referralStep3": m65,
         "referrals": MessageLookupByLibrary.simpleMessage("Invita un Amico"),
         "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage(
             "I referral code sono attualmente in pausa"),
@@ -1491,7 +1489,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "removeLink": MessageLookupByLibrary.simpleMessage("Elimina link"),
         "removeParticipant":
             MessageLookupByLibrary.simpleMessage("Rimuovi partecipante"),
-        "removeParticipantBody": m61,
+        "removeParticipantBody": m66,
         "removePersonLabel":
             MessageLookupByLibrary.simpleMessage("Rimuovi etichetta persona"),
         "removePublicLink":
@@ -1511,7 +1509,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "renameFile": MessageLookupByLibrary.simpleMessage("Rinomina file"),
         "renewSubscription":
             MessageLookupByLibrary.simpleMessage("Rinnova abbonamento"),
-        "renewsOn": m62,
+        "renewsOn": m67,
         "reportABug": MessageLookupByLibrary.simpleMessage("Segnala un bug"),
         "reportBug": MessageLookupByLibrary.simpleMessage("Segnala un bug"),
         "resendEmail": MessageLookupByLibrary.simpleMessage("Rinvia email"),
@@ -1588,7 +1586,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Invita persone e vedrai qui tutte le foto condivise da loro"),
         "searchPersonsEmptySection": MessageLookupByLibrary.simpleMessage(
             "Le persone saranno mostrate qui una volta che l\'elaborazione e la sincronizzazione saranno completate"),
-        "searchResultCount": m63,
+        "searchResultCount": m68,
         "security": MessageLookupByLibrary.simpleMessage("Sicurezza"),
         "selectALocation":
             MessageLookupByLibrary.simpleMessage("Seleziona un luogo"),
@@ -1619,7 +1617,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Gli elementi selezionati verranno eliminati da tutti gli album e spostati nel cestino."),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "send": MessageLookupByLibrary.simpleMessage("Invia"),
         "sendEmail": MessageLookupByLibrary.simpleMessage("Invia email"),
         "sendInvite": MessageLookupByLibrary.simpleMessage("Invita"),
@@ -1651,16 +1649,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "shareAnAlbumNow":
             MessageLookupByLibrary.simpleMessage("Condividi un album"),
         "shareLink": MessageLookupByLibrary.simpleMessage("Condividi link"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage(
             "Condividi solo con le persone che vuoi"),
         "shareTextConfirmOthersVerificationID": m7,
         "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage(
             "Scarica Ente in modo da poter facilmente condividere foto e video in qualità originale\n\nhttps://ente.io"),
-        "shareTextReferralCode": m67,
+        "shareTextReferralCode": m72,
         "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage(
             "Condividi con utenti che non hanno un account Ente"),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "shareYourFirstAlbum": MessageLookupByLibrary.simpleMessage(
             "Condividi il tuo primo album"),
         "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
@@ -1671,7 +1669,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Nuove foto condivise"),
         "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage(
             "Ricevi notifiche quando qualcuno aggiunge una foto a un album condiviso, di cui fai parte"),
-        "sharedWith": m69,
+        "sharedWith": m74,
         "sharedWithMe":
             MessageLookupByLibrary.simpleMessage("Condivisi con me"),
         "sharedWithYou":
@@ -1688,11 +1686,11 @@ class MessageLookup extends MessageLookupByLibrary {
             "Esci dagli altri dispositivi"),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "Accetto i <u-terms>termini di servizio</u-terms> e la <u-policy>politica sulla privacy</u-policy>"),
-        "singleFileDeleteFromDevice": m70,
+        "singleFileDeleteFromDevice": m75,
         "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage(
             "Verrà eliminato da tutti gli album."),
-        "singleFileInBothLocalAndRemote": m71,
-        "singleFileInRemoteOnly": m72,
+        "singleFileInBothLocalAndRemote": m76,
+        "singleFileInRemoteOnly": m77,
         "skip": MessageLookupByLibrary.simpleMessage("Salta"),
         "social": MessageLookupByLibrary.simpleMessage("Social"),
         "someItemsAreInBothEnteAndYourDevice":
@@ -1744,10 +1742,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageInGB": m1,
         "storageLimitExceeded": MessageLookupByLibrary.simpleMessage(
             "Limite d\'archiviazione superato"),
-        "storageUsageInfo": m73,
+        "storageUsageInfo": m78,
         "strongStrength": MessageLookupByLibrary.simpleMessage("Forte"),
-        "subAlreadyLinkedErrMessage": m74,
-        "subWillBeCancelledOn": m75,
+        "subAlreadyLinkedErrMessage": m79,
+        "subWillBeCancelledOn": m80,
         "subscribe": MessageLookupByLibrary.simpleMessage("Iscriviti"),
         "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage(
             "È necessario un abbonamento a pagamento attivo per abilitare la condivisione."),
@@ -1764,7 +1762,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "suggestFeatures":
             MessageLookupByLibrary.simpleMessage("Suggerisci una funzionalità"),
         "support": MessageLookupByLibrary.simpleMessage("Assistenza"),
-        "syncProgress": m76,
+        "syncProgress": m81,
         "syncStopped":
             MessageLookupByLibrary.simpleMessage("Sincronizzazione interrotta"),
         "syncing": MessageLookupByLibrary.simpleMessage(
@@ -1777,7 +1775,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Tocca per sbloccare"),
         "tapToUpload":
             MessageLookupByLibrary.simpleMessage("Premi per caricare"),
-        "tapToUploadIsIgnoredDue": m77,
+        "tapToUploadIsIgnoredDue": m82,
         "tempErrorContactSupportIfPersists": MessageLookupByLibrary.simpleMessage(
             "Sembra che qualcosa sia andato storto. Riprova tra un po\'. Se l\'errore persiste, contatta il nostro team di supporto."),
         "terminate": MessageLookupByLibrary.simpleMessage("Terminata"),
@@ -1815,7 +1813,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Questo indirizzo email è già registrato"),
         "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage(
             "Questa immagine non ha dati EXIF"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage(
             "Questo è il tuo ID di verifica"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -1839,11 +1837,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "total": MessageLookupByLibrary.simpleMessage("totale"),
         "totalSize": MessageLookupByLibrary.simpleMessage("Dimensioni totali"),
         "trash": MessageLookupByLibrary.simpleMessage("Cestino"),
-        "trashDaysLeft": m79,
+        "trashDaysLeft": m84,
         "trim": MessageLookupByLibrary.simpleMessage("Taglia"),
         "trustedContacts":
             MessageLookupByLibrary.simpleMessage("Contatti fidati"),
-        "trustedInviteBody": m80,
+        "trustedInviteBody": m85,
         "tryAgain": MessageLookupByLibrary.simpleMessage("Riprova"),
         "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage(
             "Attiva il backup per caricare automaticamente i file aggiunti a questa cartella del dispositivo su Ente."),
@@ -1889,10 +1887,10 @@ class MessageLookup extends MessageLookupByLibrary {
             "Aggiornamento della selezione delle cartelle..."),
         "upgrade":
             MessageLookupByLibrary.simpleMessage("Acquista altro spazio"),
-        "uploadIsIgnoredDueToIgnorereason": m82,
+        "uploadIsIgnoredDueToIgnorereason": m87,
         "uploadingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
             "Caricamento dei file nell\'album..."),
-        "uploadingMultipleMemories": m83,
+        "uploadingMultipleMemories": m88,
         "uploadingSingleMemory":
             MessageLookupByLibrary.simpleMessage("Conservando 1 ricordo..."),
         "upto50OffUntil4thDec": MessageLookupByLibrary.simpleMessage(
@@ -1911,7 +1909,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "useSelectedPhoto":
             MessageLookupByLibrary.simpleMessage("Usa la foto selezionata"),
         "usedSpace": MessageLookupByLibrary.simpleMessage("Spazio utilizzato"),
-        "validTill": m84,
+        "validTill": m89,
         "verificationFailedPleaseTryAgain":
             MessageLookupByLibrary.simpleMessage(
                 "Verifica fallita, per favore prova di nuovo"),
@@ -1919,7 +1917,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("ID di verifica"),
         "verify": MessageLookupByLibrary.simpleMessage("Verifica"),
         "verifyEmail": MessageLookupByLibrary.simpleMessage("Verifica email"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Verifica"),
         "verifyPasskey":
             MessageLookupByLibrary.simpleMessage("Verifica passkey"),
@@ -1947,7 +1945,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "viewRecoveryKey": MessageLookupByLibrary.simpleMessage(
             "Visualizza chiave di recupero"),
         "viewer": MessageLookupByLibrary.simpleMessage("Sola lettura"),
-        "viewersSuccessfullyAdded": m86,
+        "viewersSuccessfullyAdded": m91,
         "visitWebToManage": MessageLookupByLibrary.simpleMessage(
             "Visita web.ente.io per gestire il tuo abbonamento"),
         "waitingForVerification":
@@ -1968,7 +1966,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Un contatto fidato può aiutare a recuperare i tuoi dati."),
         "yearShort": MessageLookupByLibrary.simpleMessage("anno"),
         "yearly": MessageLookupByLibrary.simpleMessage("Annuale"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("Si"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("Sì, cancella"),
         "yesConvertToViewer": MessageLookupByLibrary.simpleMessage(
@@ -2000,7 +1998,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Non puoi condividere con te stesso"),
         "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage(
             "Non hai nulla di archiviato."),
-        "youHaveSuccessfullyFreedUp": m88,
+        "youHaveSuccessfullyFreedUp": m93,
         "yourAccountHasBeenDeleted": MessageLookupByLibrary.simpleMessage(
             "Il tuo account è stato eliminato"),
         "yourMap": MessageLookupByLibrary.simpleMessage("La tua mappa"),
diff --git a/mobile/lib/generated/intl/messages_ja.dart b/mobile/lib/generated/intl/messages_ja.dart
index a1dd9a319e..9b27ce5b45 100644
--- a/mobile/lib/generated/intl/messages_ja.dart
+++ b/mobile/lib/generated/intl/messages_ja.dart
@@ -20,201 +20,254 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'ja';
 
-  static String m9(count) =>
-      "${Intl.plural(count, zero: '共同編集者を追加', one: '共同編集者を追加', other: '共同編集者を追加')}";
+  static String m9(title) => "${title} (私)";
 
   static String m10(count) =>
+      "${Intl.plural(count, zero: '共同編集者を追加', one: '共同編集者を追加', other: '共同編集者を追加')}";
+
+  static String m11(count) =>
       "${Intl.plural(count, one: '項目を追加', other: '項目を追加')}";
 
-  static String m11(storageAmount, endDate) =>
+  static String m12(storageAmount, endDate) =>
       "あなたの ${storageAmount} アドオンは ${endDate} まで有効です";
 
-  static String m12(count) =>
+  static String m13(count) =>
       "${Intl.plural(count, zero: 'ビューアーを追加', one: 'ビューアーを追加', other: 'ビューアーを追加')}";
 
-  static String m13(emailOrName) => "${emailOrName} が追加";
+  static String m14(emailOrName) => "${emailOrName} が追加";
 
-  static String m14(albumName) => "${albumName} に追加しました";
+  static String m15(albumName) => "${albumName} に追加しました";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: '参加者なし', one: '1 参加者', other: '${count} 参加者')}";
 
-  static String m16(versionValue) => "バージョン: ${versionValue}";
+  static String m17(versionValue) => "バージョン: ${versionValue}";
 
-  static String m17(freeAmount, storageUnit) =>
+  static String m18(freeAmount, storageUnit) =>
       "${freeAmount} ${storageUnit} 無料";
 
-  static String m18(paymentProvider) =>
+  static String m19(paymentProvider) =>
       "まず${paymentProvider} から既存のサブスクリプションをキャンセルしてください";
 
   static String m3(user) =>
       "${user} は写真をアルバムに追加できなくなります\n\n※${user} が追加した写真は今後も${user} が削除できます";
 
-  static String m19(isFamilyMember, storageAmountInGb) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
       "${Intl.select(isFamilyMember, {
             'true': '家族は ${storageAmountInGb} GB 受け取っています',
             'false': 'あなたは ${storageAmountInGb} GB 受け取っています',
             'other': 'あなたは ${storageAmountInGb} GB受け取っています',
           })}";
 
-  static String m20(albumName) => "${albumName} のコラボレーションリンクを生成しました";
+  static String m21(albumName) => "${albumName} のコラボレーションリンクを生成しました";
 
-  static String m23(familyAdminEmail) =>
+  static String m22(count) =>
+      "${Intl.plural(count, zero: '${count}人のコラボレーターを追加', one: '${count}人のコラボレーターを追加', other: '${count}人のコラボレーターを追加')}";
+
+  static String m23(email, numOfDays) =>
+      "${email} を信頼する連絡先として追加しようとしています。 ${numOfDays} 日間あなたの利用がなくなった場合、アカウントを復旧することができるようになります。";
+
+  static String m24(familyAdminEmail) =>
       "サブスクリプションを管理するには、 <green>${familyAdminEmail}</green> に連絡してください";
 
-  static String m24(provider) =>
+  static String m25(provider) =>
       "${provider} サブスクリプションを管理するには、support@ente.io までご連絡ください。";
 
-  static String m25(endpoint) => "${endpoint} に接続しました";
+  static String m26(endpoint) => "${endpoint} に接続しました";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: '${count} 個の項目を削除', other: '${count} 個の項目を削除')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "${currentlyDeleting} / ${totalCount} を削除中";
 
-  static String m28(albumName) => "\"${albumName}\" にアクセスするための公開リンクが削除されます。";
+  static String m29(albumName) => "\"${albumName}\" にアクセスするための公開リンクが削除されます。";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "あなたの登録したメールアドレスから${supportEmail} にメールを送ってください";
 
-  static String m30(count, storageSaved) =>
+  static String m31(count, storageSaved) =>
       "お掃除しました ${Intl.plural(count, one: '${count} 個の重複ファイル', other: '${count} 個の重複ファイル')}, (${storageSaved}が開放されます！)";
 
-  static String m31(count, formattedSize) =>
+  static String m32(count, formattedSize) =>
       "${count} 個のファイル、それぞれ${formattedSize}";
 
-  static String m32(newEmail) => "メールアドレスが ${newEmail} に変更されました";
+  static String m33(newEmail) => "メールアドレスが ${newEmail} に変更されました";
 
-  static String m33(email) =>
+  static String m34(email) => "${email} は Ente アカウントを持っていません。";
+
+  static String m35(email) =>
       "${email} はEnteアカウントを持っていません。\n\n写真を共有するために「招待」を送信してください。";
 
-  static String m34(text) => "${text} の写真が見つかりました";
+  static String m36(text) => "${text} の写真が見つかりました";
 
-  static String m35(count, formattedNumber) =>
+  static String m37(count, formattedNumber) =>
       "${Intl.plural(count, other: '${formattedNumber} 個のファイル')} が安全にバックアップされました";
 
-  static String m36(count, formattedNumber) =>
+  static String m38(count, formattedNumber) =>
       "${Intl.plural(count, other: '${formattedNumber} ファイル')} が安全にバックアップされました";
 
   static String m4(storageAmountInGB) =>
       "誰かが有料プランにサインアップしてコードを適用する度に ${storageAmountInGB} GB";
 
-  static String m37(endDate) => "無料トライアルは${endDate} までです";
+  static String m39(endDate) => "無料トライアルは${endDate} までです";
 
-  static String m38(count) =>
+  static String m40(count) =>
       "あなたが有効なサブスクリプションを持っている限りEnte上の ${Intl.plural(count, other: 'それらに')} アクセスできます";
 
-  static String m39(sizeInMBorGB) => "${sizeInMBorGB} を解放する";
+  static String m41(sizeInMBorGB) => "${sizeInMBorGB} を解放する";
 
-  static String m40(count, formattedSize) =>
+  static String m42(count, formattedSize) =>
       "${Intl.plural(count, other: 'デバイスから削除して${formattedSize} 解放することができます')}";
 
-  static String m41(currentlyProcessing, totalCount) =>
+  static String m43(currentlyProcessing, totalCount) =>
       "${currentlyProcessing} / ${totalCount} を処理中";
 
-  static String m42(count) => "${Intl.plural(count, other: '${count}個のアイテム')}";
+  static String m44(count) => "${Intl.plural(count, other: '${count}個のアイテム')}";
 
-  static String m44(expiryTime) => "リンクは ${expiryTime} に期限切れになります";
+  static String m45(email) => "${email} があなたを信頼する連絡先として招待しました";
+
+  static String m46(expiryTime) => "リンクは ${expiryTime} に期限切れになります";
+
+  static String m47(email) => "この人物を ${email}に紐づけ";
+
+  static String m48(personName, email) => "${personName} を ${email} に紐づけします";
 
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, zero: '思い出なし', one: '${formattedCount} 思い出', other: '${formattedCount} 思い出')}";
 
-  static String m45(count) =>
+  static String m49(count) =>
       "${Intl.plural(count, one: '項目を移動', other: '項目を移動')}";
 
-  static String m46(albumName) => "${albumName} に移動しました";
+  static String m50(albumName) => "${albumName} に移動しました";
 
-  static String m48(name) => "${name} ではありませんか？";
+  static String m51(personName) => "${personName} の候補はありません";
 
-  static String m49(familyAdminEmail) =>
+  static String m52(name) => "${name} ではありませんか？";
+
+  static String m53(familyAdminEmail) =>
       "コードを変更するには、 ${familyAdminEmail} までご連絡ください。";
 
   static String m0(passwordStrengthValue) =>
       "パスワードの長さ: ${passwordStrengthValue}";
 
-  static String m50(providerName) => "請求された場合は、 ${providerName} のサポートに連絡してください";
+  static String m54(providerName) => "請求された場合は、 ${providerName} のサポートに連絡してください";
 
-  static String m52(endDate) =>
+  static String m55(count) =>
+      "${Intl.plural(count, zero: '0枚の写真', one: '1枚の写真', other: '${count} 枚の写真')}";
+
+  static String m56(endDate) =>
       "${endDate} まで無料トライアルが有効です。\nその後、有料プランを選択することができます。";
 
-  static String m53(toEmail) => "${toEmail} にメールでご連絡ください";
+  static String m57(toEmail) => "${toEmail} にメールでご連絡ください";
 
-  static String m54(toEmail) => "ログを以下のアドレスに送信してください \n${toEmail}";
+  static String m58(toEmail) => "ログを以下のアドレスに送信してください \n${toEmail}";
 
-  static String m55(folderName) => "${folderName} を処理中...";
+  static String m59(folderName) => "${folderName} を処理中...";
 
-  static String m56(storeName) => "${storeName} で評価";
+  static String m60(storeName) => "${storeName} で評価";
 
-  static String m60(storageInGB) => "3. お二人とも ${storageInGB} GB*を無料で手に入ります。";
+  static String m61(name) => "あなたを ${name} に紐づけました";
 
-  static String m61(userEmail) =>
+  static String m62(days, email) =>
+      "${days} 日後にアカウントにアクセスできます。通知は ${email}に送信されます。";
+
+  static String m63(email) => "${email}のアカウントを復元できるようになりました。新しいパスワードを設定してください。";
+
+  static String m64(email) => "${email} はあなたのアカウントを復元しようとしています。";
+
+  static String m65(storageInGB) => "3. お二人とも ${storageInGB} GB*を無料で手に入ります。";
+
+  static String m66(userEmail) =>
       "${userEmail} はこの共有アルバムから退出します\n\n${userEmail} が追加した写真もアルバムから削除されます";
 
-  static String m62(endDate) => "サブスクリプションは ${endDate} に更新します";
+  static String m67(endDate) => "サブスクリプションは ${endDate} に更新します";
 
-  static String m63(count) =>
+  static String m68(count) =>
       "${Intl.plural(count, one: '${count} 個の結果', other: '${count} 個の結果')}";
 
+  static String m69(snapshotLength, searchLength) =>
+      "セクションの長さの不一致: ${snapshotLength} != ${searchLength}";
+
   static String m6(count) => "${count} 個を選択";
 
-  static String m65(count, yourCount) => "${count} 個選択中（${yourCount} あなた）";
+  static String m70(count, yourCount) => "${count} 個選択中（${yourCount} あなた）";
 
-  static String m66(verificationID) => "私の確認ID: ente.ioの ${verificationID}";
+  static String m71(verificationID) => "私の確認ID: ente.ioの ${verificationID}";
 
   static String m7(verificationID) =>
       "これがあなたのente.io確認用IDであることを確認できますか？ ${verificationID}";
 
-  static String m67(referralCode, referralStorageInGB) =>
+  static String m72(referralCode, referralStorageInGB) =>
       "リフェラルコード: ${referralCode}\n\n設定→一般→リフェラルで使うことで${referralStorageInGB}が無料になります(あなたが有料プランに加入したあと)。\n\nhttps://ente.io";
 
-  static String m68(numberOfPeople) =>
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: '誰かと共有しましょう', one: '1人と共有されています', other: '${numberOfPeople} 人と共有されています')}";
 
-  static String m69(emailIDs) => "${emailIDs} と共有中";
+  static String m74(emailIDs) => "${emailIDs} と共有中";
 
-  static String m70(fileType) => "${fileType} はEnteから削除されます。";
+  static String m75(fileType) => "${fileType} はEnteから削除されます。";
 
-  static String m71(fileType) => "この ${fileType} はEnteとお使いのデバイスの両方にあります。";
+  static String m76(fileType) => "この ${fileType} はEnteとお使いのデバイスの両方にあります。";
 
-  static String m72(fileType) => "${fileType} はEnteから削除されます。";
+  static String m77(fileType) => "${fileType} はEnteから削除されます。";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} GB";
 
-  static String m73(
+  static String m78(
           usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) =>
       "${usedAmount} ${usedStorageUnit} / ${totalAmount} ${totalStorageUnit} 使用";
 
-  static String m74(id) =>
+  static String m79(id) =>
       "あなたの ${id} はすでに別のEnteアカウントにリンクされています。\nこのアカウントであなたの ${id} を使用したい場合は、サポートにお問い合わせください。";
 
-  static String m75(endDate) => "サブスクリプションは ${endDate} でキャンセルされます";
+  static String m80(endDate) => "サブスクリプションは ${endDate} でキャンセルされます";
 
-  static String m76(completed, total) => "${completed}/${total} のメモリが保存されました";
+  static String m81(completed, total) => "${completed}/${total} のメモリが保存されました";
+
+  static String m82(ignoreReason) =>
+      "アップロードするにはタップしてください。 以下の理由のためアップロードは現在無視されています: ${ignoreReason}";
 
   static String m8(storageAmountInGB) => "紹介者も ${storageAmountInGB} GB を得ます";
 
-  static String m78(email) => "これは ${email} の確認用ID";
+  static String m83(email) => "これは ${email} の確認用ID";
 
-  static String m83(count) => "${count} メモリを保存しています...";
+  static String m84(count) =>
+      "${Intl.plural(count, zero: '', one: '1日', other: '${count} 日')}";
 
-  static String m84(endDate) => "${endDate} まで";
+  static String m85(email) => "あなたは ${email}から信頼する連絡先になってもらうよう、お願いされています。";
 
-  static String m85(email) => "${email} を確認";
+  static String m86(galleryType) =>
+      "このギャラリーのタイプ ${galleryType} は名前の変更には対応していません";
+
+  static String m87(ignoreReason) => "以下の理由によりアップロードは無視されます: ${ignoreReason}";
+
+  static String m88(count) => "${count} メモリを保存しています...";
+
+  static String m89(endDate) => "${endDate} まで";
+
+  static String m90(email) => "${email} を確認";
+
+  static String m91(count) =>
+      "${Intl.plural(count, zero: '${count}人のビューアーを追加', one: '${count}人のビューアーを追加', other: '${count}人のビューアーを追加')}";
 
   static String m2(email) => "<green>${email}</green>にメールを送りました";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, one: '${count} 年前', other: '${count} 年前')}";
 
-  static String m88(storageSaved) => "${storageSaved} を解放しました";
+  static String m93(storageSaved) => "${storageSaved} を解放しました";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
         "aNewVersionOfEnteIsAvailable":
             MessageLookupByLibrary.simpleMessage("Enteの新しいバージョンが利用可能です。"),
         "about": MessageLookupByLibrary.simpleMessage("このアプリについて"),
+        "acceptTrustInvite": MessageLookupByLibrary.simpleMessage("招待を受け入れる"),
         "account": MessageLookupByLibrary.simpleMessage("アカウント"),
+        "accountIsAlreadyConfigured":
+            MessageLookupByLibrary.simpleMessage("アカウントが既に設定されています"),
+        "accountOwnerPersonAppbarTitle": m9,
         "accountWelcomeBack": MessageLookupByLibrary.simpleMessage("おかえりなさい！"),
         "ackPasswordLostWarning": MessageLookupByLibrary.simpleMessage(
             "もしパスワードを忘れたら、自身のデータを失うことを理解しました"),
@@ -223,9 +276,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "addAName": MessageLookupByLibrary.simpleMessage("名前を追加"),
         "addANewEmail": MessageLookupByLibrary.simpleMessage("新しいEメールアドレスを追加"),
         "addCollaborator": MessageLookupByLibrary.simpleMessage("コラボレーターを追加"),
-        "addCollaborators": m9,
+        "addCollaborators": m10,
+        "addFiles": MessageLookupByLibrary.simpleMessage("ファイルを追加"),
         "addFromDevice": MessageLookupByLibrary.simpleMessage("デバイスから追加"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocation": MessageLookupByLibrary.simpleMessage("位置情報を追加"),
         "addLocationButton": MessageLookupByLibrary.simpleMessage("追加"),
         "addMore": MessageLookupByLibrary.simpleMessage("さらに追加"),
@@ -235,19 +289,20 @@ class MessageLookup extends MessageLookupByLibrary {
         "addNew": MessageLookupByLibrary.simpleMessage("新規追加"),
         "addNewPerson": MessageLookupByLibrary.simpleMessage("新しい人物を追加"),
         "addOnPageSubtitle": MessageLookupByLibrary.simpleMessage("アドオンの詳細"),
-        "addOnValidTill": m11,
+        "addOnValidTill": m12,
         "addOns": MessageLookupByLibrary.simpleMessage("アドオン"),
         "addPhotos": MessageLookupByLibrary.simpleMessage("写真を追加"),
         "addSelected": MessageLookupByLibrary.simpleMessage("選んだものをアルバムに追加"),
         "addToAlbum": MessageLookupByLibrary.simpleMessage("アルバムに追加"),
         "addToEnte": MessageLookupByLibrary.simpleMessage("Enteに追加"),
         "addToHiddenAlbum": MessageLookupByLibrary.simpleMessage("非表示アルバムに追加"),
+        "addTrustedContact": MessageLookupByLibrary.simpleMessage("信頼する連絡先を追加"),
         "addViewer": MessageLookupByLibrary.simpleMessage("ビューアーを追加"),
-        "addViewers": m12,
+        "addViewers": m13,
         "addYourPhotosNow": MessageLookupByLibrary.simpleMessage("写真を今すぐ追加する"),
         "addedAs": MessageLookupByLibrary.simpleMessage("追加:"),
-        "addedBy": m13,
-        "addedSuccessfullyTo": m14,
+        "addedBy": m14,
+        "addedSuccessfullyTo": m15,
         "addingToFavorites":
             MessageLookupByLibrary.simpleMessage("お気に入りに追加しています..."),
         "advanced": MessageLookupByLibrary.simpleMessage("詳細"),
@@ -258,19 +313,27 @@ class MessageLookup extends MessageLookupByLibrary {
         "after1Week": MessageLookupByLibrary.simpleMessage("1週間後"),
         "after1Year": MessageLookupByLibrary.simpleMessage("1年後"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("所有者"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumTitle": MessageLookupByLibrary.simpleMessage("アルバムタイトル"),
         "albumUpdated": MessageLookupByLibrary.simpleMessage("アルバムが更新されました"),
         "albums": MessageLookupByLibrary.simpleMessage("アルバム"),
         "allClear": MessageLookupByLibrary.simpleMessage("✨ オールクリア"),
         "allMemoriesPreserved":
             MessageLookupByLibrary.simpleMessage("すべての思い出が保存されました"),
+        "allPersonGroupingWillReset": MessageLookupByLibrary.simpleMessage(
+            "この人のグループ化がリセットされ、この人かもしれない写真への提案もなくなります"),
+        "allow": MessageLookupByLibrary.simpleMessage("許可"),
         "allowAddPhotosDescription": MessageLookupByLibrary.simpleMessage(
             "リンクを持つ人が共有アルバムに写真を追加できるようにします。"),
         "allowAddingPhotos": MessageLookupByLibrary.simpleMessage("写真の追加を許可"),
+        "allowAppToOpenSharedAlbumLinks":
+            MessageLookupByLibrary.simpleMessage("共有アルバムリンクを開くことをアプリに許可する"),
         "allowDownloads": MessageLookupByLibrary.simpleMessage("ダウンロードを許可"),
         "allowPeopleToAddPhotos":
             MessageLookupByLibrary.simpleMessage("写真の追加をメンバーに許可する"),
+        "allowPermBody": MessageLookupByLibrary.simpleMessage(
+            "Enteがライブラリを表示およびバックアップできるように、端末の設定から写真へのアクセスを許可してください。"),
+        "allowPermTitle": MessageLookupByLibrary.simpleMessage("写真へのアクセスを許可"),
         "androidBiometricHint": MessageLookupByLibrary.simpleMessage("本人確認を行う"),
         "androidBiometricNotRecognized":
             MessageLookupByLibrary.simpleMessage("認識できません。再試行してください。"),
@@ -290,7 +353,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "appLock": MessageLookupByLibrary.simpleMessage("アプリのロック"),
         "appLockDescriptions": MessageLookupByLibrary.simpleMessage(
             "デバイスのデフォルトのロック画面と、カスタムロック画面のどちらを利用しますか？"),
-        "appVersion": m16,
+        "appVersion": m17,
         "appleId": MessageLookupByLibrary.simpleMessage("Apple ID"),
         "apply": MessageLookupByLibrary.simpleMessage("適用"),
         "applyCodeTitle": MessageLookupByLibrary.simpleMessage("コードを適用"),
@@ -311,6 +374,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("本当にログアウトしてよろしいですか？"),
         "areYouSureYouWantToRenew":
             MessageLookupByLibrary.simpleMessage("更新してもよろしいですか？"),
+        "areYouSureYouWantToResetThisPerson":
+            MessageLookupByLibrary.simpleMessage("この人を忘れてもよろしいですね？"),
         "askCancelReason": MessageLookupByLibrary.simpleMessage(
             "サブスクリプションはキャンセルされました。理由を教えていただけますか？"),
         "askDeleteReason":
@@ -330,8 +395,12 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("2段階認証を設定するには認証してください"),
         "authToInitiateAccountDeletion":
             MessageLookupByLibrary.simpleMessage("アカウントの削除をするためには認証が必要です"),
+        "authToManageLegacy":
+            MessageLookupByLibrary.simpleMessage("信頼する連絡先を管理するために認証してください"),
         "authToViewPasskey":
             MessageLookupByLibrary.simpleMessage("パスキーを表示するには認証してください"),
+        "authToViewTrashedFiles":
+            MessageLookupByLibrary.simpleMessage("削除したファイルを閲覧するには認証が必要です"),
         "authToViewYourActiveSessions":
             MessageLookupByLibrary.simpleMessage("アクティブなセッションを表示するためには認証が必要です"),
         "authToViewYourHiddenFiles":
@@ -358,11 +427,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoPairDesc": MessageLookupByLibrary.simpleMessage(
             "自動ペアリングは Chromecast に対応しているデバイスでのみ動作します。"),
         "available": MessageLookupByLibrary.simpleMessage("ご利用可能"),
-        "availableStorageSpace": m17,
+        "availableStorageSpace": m18,
         "backedUpFolders":
             MessageLookupByLibrary.simpleMessage("バックアップされたフォルダ"),
         "backup": MessageLookupByLibrary.simpleMessage("バックアップ"),
         "backupFailed": MessageLookupByLibrary.simpleMessage("バックアップ失敗"),
+        "backupFile": MessageLookupByLibrary.simpleMessage("バックアップファイル"),
         "backupOverMobileData":
             MessageLookupByLibrary.simpleMessage("モバイルデータを使ってバックアップ"),
         "backupSettings": MessageLookupByLibrary.simpleMessage("バックアップ設定"),
@@ -375,6 +445,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "blog": MessageLookupByLibrary.simpleMessage("ブログ"),
         "cachedData": MessageLookupByLibrary.simpleMessage("キャッシュデータ"),
         "calculating": MessageLookupByLibrary.simpleMessage("計算中..."),
+        "canNotOpenBody": MessageLookupByLibrary.simpleMessage(
+            "申し訳ありません。このアルバムをアプリで開くことができませんでした。"),
+        "canNotOpenTitle": MessageLookupByLibrary.simpleMessage("このアルバムは開けません"),
         "canNotUploadToAlbumsOwnedByOthers":
             MessageLookupByLibrary.simpleMessage("他の人が作ったアルバムにはアップロードできません"),
         "canOnlyCreateLinkForFilesOwnedByYou":
@@ -382,12 +455,17 @@ class MessageLookup extends MessageLookupByLibrary {
         "canOnlyRemoveFilesOwnedByYou":
             MessageLookupByLibrary.simpleMessage("あなたが所有しているファイルのみを削除できます"),
         "cancel": MessageLookupByLibrary.simpleMessage("キャンセル"),
-        "cancelOtherSubscription": m18,
+        "cancelAccountRecovery":
+            MessageLookupByLibrary.simpleMessage("リカバリをキャンセル"),
+        "cancelAccountRecoveryBody":
+            MessageLookupByLibrary.simpleMessage("リカバリをキャンセルしてもよろしいですか？"),
+        "cancelOtherSubscription": m19,
         "cancelSubscription":
             MessageLookupByLibrary.simpleMessage("サブスクリプションをキャンセル"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
         "cannotDeleteSharedFiles":
             MessageLookupByLibrary.simpleMessage("共有ファイルは削除できません"),
+        "castAlbum": MessageLookupByLibrary.simpleMessage("アルバムをキャスト"),
         "castIPMismatchBody":
             MessageLookupByLibrary.simpleMessage("TVと同じネットワーク上にいることを確認してください。"),
         "castIPMismatchTitle":
@@ -399,6 +477,19 @@ class MessageLookup extends MessageLookupByLibrary {
         "changeEmail": MessageLookupByLibrary.simpleMessage("Eメールを変更"),
         "changeLocationOfSelectedItems":
             MessageLookupByLibrary.simpleMessage("選択したアイテムの位置を変更しますか？"),
+        "changeLogBackupStatusContent": MessageLookupByLibrary.simpleMessage(
+            "私たちは、失敗と待機中を含む、Enteにアップロードされたすべてのファイルのログを追加しました。"),
+        "changeLogBackupStatusTitle":
+            MessageLookupByLibrary.simpleMessage("バックアップ ステータス"),
+        "changeLogDiscoverContent": MessageLookupByLibrary.simpleMessage(
+            "IDカード、メモなどの写真をお探しですか？検索タブに移動し、ディスカバーを確認してください。 \\n\\n機械学習を有効にしている場合にのみ利用できます。"),
+        "changeLogDiscoverTitle":
+            MessageLookupByLibrary.simpleMessage("ディスカバー"),
+        "changeLogMagicSearchImprovementContent":
+            MessageLookupByLibrary.simpleMessage(
+                "マジック検索が改善しました。もう、あなたが探しているものを見つけるのを待つ必要はありません。"),
+        "changeLogMagicSearchImprovementTitle":
+            MessageLookupByLibrary.simpleMessage("マジック検索の改善"),
         "changePassword": MessageLookupByLibrary.simpleMessage("パスワードを変更"),
         "changePasswordTitle": MessageLookupByLibrary.simpleMessage("パスワードを変更"),
         "changePermissions": MessageLookupByLibrary.simpleMessage("権限を変更する"),
@@ -409,11 +500,13 @@ class MessageLookup extends MessageLookupByLibrary {
             "メールボックスを確認してEメールの所有を証明してください(見つからない場合は、スパムの中も確認してください)"),
         "checkStatus": MessageLookupByLibrary.simpleMessage("ステータスの確認"),
         "checking": MessageLookupByLibrary.simpleMessage("確認中…"),
+        "checkingModels":
+            MessageLookupByLibrary.simpleMessage("モデルを確認しています..."),
         "claimFreeStorage":
             MessageLookupByLibrary.simpleMessage("無料のストレージを受け取る"),
         "claimMore": MessageLookupByLibrary.simpleMessage("もっと！"),
         "claimed": MessageLookupByLibrary.simpleMessage("受け取り済"),
-        "claimedStorageSoFar": m19,
+        "claimedStorageSoFar": m20,
         "cleanUncategorized":
             MessageLookupByLibrary.simpleMessage("未分類のクリーンアップ"),
         "cleanUncategorizedDescription": MessageLookupByLibrary.simpleMessage(
@@ -438,11 +531,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "collabLinkSectionDescription": MessageLookupByLibrary.simpleMessage(
             "Enteアプリやアカウントを持っていない人にも、共有アルバムに写真を追加したり表示したりできるリンクを作成します。"),
         "collaborativeLink": MessageLookupByLibrary.simpleMessage("共同作業リンク"),
-        "collaborativeLinkCreatedFor": m20,
+        "collaborativeLinkCreatedFor": m21,
         "collaborator": MessageLookupByLibrary.simpleMessage("コラボレーター"),
         "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "コラボレーターは共有アルバムに写真やビデオを追加できます。"),
+        "collaboratorsSuccessfullyAdded": m22,
         "collageLayout": MessageLookupByLibrary.simpleMessage("レイアウト"),
         "collageSaved":
             MessageLookupByLibrary.simpleMessage("コラージュをギャラリーに保存しました"),
@@ -459,6 +553,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("2 要素認証を無効にしてよろしいですか。"),
         "confirmAccountDeletion":
             MessageLookupByLibrary.simpleMessage("アカウント削除の確認"),
+        "confirmAddingTrustedContact": m23,
         "confirmDeletePrompt":
             MessageLookupByLibrary.simpleMessage("はい、アカウントとすべてのアプリのデータを削除します"),
         "confirmPassword": MessageLookupByLibrary.simpleMessage("パスワードを確認"),
@@ -468,9 +563,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "confirmYourRecoveryKey":
             MessageLookupByLibrary.simpleMessage("リカバリーキーを確認"),
         "connectToDevice": MessageLookupByLibrary.simpleMessage("デバイスに接続"),
-        "contactFamilyAdmin": m23,
+        "contactFamilyAdmin": m24,
         "contactSupport": MessageLookupByLibrary.simpleMessage("お問い合わせ"),
-        "contactToManageSubscription": m24,
+        "contactToManageSubscription": m25,
         "contacts": MessageLookupByLibrary.simpleMessage("連絡先"),
         "contents": MessageLookupByLibrary.simpleMessage("内容"),
         "continueLabel": MessageLookupByLibrary.simpleMessage("つづける"),
@@ -505,11 +600,13 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("重要なアップデートがあります"),
         "crop": MessageLookupByLibrary.simpleMessage("クロップ"),
         "currentUsageIs": MessageLookupByLibrary.simpleMessage("現在の使用状況 "),
+        "currentlyRunning": MessageLookupByLibrary.simpleMessage("現在実行中"),
         "custom": MessageLookupByLibrary.simpleMessage("カスタム"),
-        "customEndpoint": m25,
+        "customEndpoint": m26,
         "darkTheme": MessageLookupByLibrary.simpleMessage("ダーク"),
         "dayToday": MessageLookupByLibrary.simpleMessage("今日"),
         "dayYesterday": MessageLookupByLibrary.simpleMessage("昨日"),
+        "declineTrustInvite": MessageLookupByLibrary.simpleMessage("招待を拒否する"),
         "decrypting": MessageLookupByLibrary.simpleMessage("復号しています"),
         "decryptingVideo": MessageLookupByLibrary.simpleMessage("ビデオの復号化中..."),
         "deduplicateFiles": MessageLookupByLibrary.simpleMessage("重複ファイル"),
@@ -535,10 +632,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "deleteFromBoth": MessageLookupByLibrary.simpleMessage("両方から削除"),
         "deleteFromDevice": MessageLookupByLibrary.simpleMessage("デバイスから削除"),
         "deleteFromEnte": MessageLookupByLibrary.simpleMessage("Enteから削除"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deleteLocation": MessageLookupByLibrary.simpleMessage("位置情報を削除"),
         "deletePhotos": MessageLookupByLibrary.simpleMessage("写真を削除"),
-        "deleteProgress": m27,
+        "deleteProgress": m28,
         "deleteReason1": MessageLookupByLibrary.simpleMessage("いちばん必要な機能がない"),
         "deleteReason2":
             MessageLookupByLibrary.simpleMessage("アプリや特定の機能が想定通りに動かない"),
@@ -570,22 +667,22 @@ class MessageLookup extends MessageLookupByLibrary {
             "ビューアーはスクリーンショットを撮ったり、外部ツールを使用して写真のコピーを保存したりすることができます"),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("ご注意ください"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "disableTwofactor": MessageLookupByLibrary.simpleMessage("2段階認証を無効にする"),
         "disablingTwofactorAuthentication":
             MessageLookupByLibrary.simpleMessage("2要素認証を無効にしています..."),
         "discord": MessageLookupByLibrary.simpleMessage("Discord"),
-        "discover": MessageLookupByLibrary.simpleMessage("ディスカバー"),
+        "discover": MessageLookupByLibrary.simpleMessage("新たな発見"),
         "discover_babies": MessageLookupByLibrary.simpleMessage("赤ちゃん"),
         "discover_celebrations": MessageLookupByLibrary.simpleMessage("お祝い"),
         "discover_food": MessageLookupByLibrary.simpleMessage("食べ物"),
         "discover_greenery": MessageLookupByLibrary.simpleMessage("自然"),
         "discover_hills": MessageLookupByLibrary.simpleMessage("丘"),
-        "discover_identity": MessageLookupByLibrary.simpleMessage("アイデンティティ"),
+        "discover_identity": MessageLookupByLibrary.simpleMessage("身分証"),
         "discover_memes": MessageLookupByLibrary.simpleMessage("ミーム"),
         "discover_notes": MessageLookupByLibrary.simpleMessage("メモ"),
         "discover_pets": MessageLookupByLibrary.simpleMessage("ペット"),
-        "discover_receipts": MessageLookupByLibrary.simpleMessage("領収書"),
+        "discover_receipts": MessageLookupByLibrary.simpleMessage("レシート"),
         "discover_screenshots":
             MessageLookupByLibrary.simpleMessage("スクリーンショット"),
         "discover_selfies": MessageLookupByLibrary.simpleMessage("セルフィー"),
@@ -600,14 +697,15 @@ class MessageLookup extends MessageLookupByLibrary {
         "doYouWantToDiscardTheEditsYouHaveMade":
             MessageLookupByLibrary.simpleMessage("編集を破棄しますか？"),
         "done": MessageLookupByLibrary.simpleMessage("完了"),
+        "dontSave": MessageLookupByLibrary.simpleMessage("保存しない"),
         "doubleYourStorage":
             MessageLookupByLibrary.simpleMessage("ストレージを倍にしよう"),
         "download": MessageLookupByLibrary.simpleMessage("ダウンロード"),
         "downloadFailed": MessageLookupByLibrary.simpleMessage("ダウンロード失敗"),
         "downloading": MessageLookupByLibrary.simpleMessage("ダウンロード中…"),
-        "dropSupportEmail": m29,
-        "duplicateFileCountWithStorageSaved": m30,
-        "duplicateItemsGroup": m31,
+        "dropSupportEmail": m30,
+        "duplicateFileCountWithStorageSaved": m31,
+        "duplicateItemsGroup": m32,
         "edit": MessageLookupByLibrary.simpleMessage("編集"),
         "editLocation": MessageLookupByLibrary.simpleMessage("位置情報を編集"),
         "editLocationTagTitle": MessageLookupByLibrary.simpleMessage("位置情報を編集"),
@@ -617,16 +715,24 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("位置情報の編集はEnteでのみ表示されます"),
         "eligible": MessageLookupByLibrary.simpleMessage("対象となる"),
         "email": MessageLookupByLibrary.simpleMessage("Eメール"),
-        "emailChangedTo": m32,
-        "emailNoEnteAccount": m33,
+        "emailAlreadyRegistered":
+            MessageLookupByLibrary.simpleMessage("このメールアドレスはすでに登録されています。"),
+        "emailChangedTo": m33,
+        "emailDoesNotHaveEnteAccount": m34,
+        "emailNoEnteAccount": m35,
+        "emailNotRegistered":
+            MessageLookupByLibrary.simpleMessage("このメールアドレスはまだ登録されていません。"),
         "emailVerificationToggle":
             MessageLookupByLibrary.simpleMessage("メール確認"),
         "emailYourLogs": MessageLookupByLibrary.simpleMessage("ログをメールで送信"),
+        "emergencyContacts": MessageLookupByLibrary.simpleMessage("緊急連絡先"),
         "empty": MessageLookupByLibrary.simpleMessage("空"),
         "emptyTrash": MessageLookupByLibrary.simpleMessage("ゴミ箱を空にしますか？"),
         "enable": MessageLookupByLibrary.simpleMessage("有効化"),
         "enableMLIndexingDesc": MessageLookupByLibrary.simpleMessage(
             "Enteは顔認識、マジック検索、その他の高度な検索機能のため、あなたのデバイス上で機械学習をしています"),
+        "enableMachineLearningBanner":
+            MessageLookupByLibrary.simpleMessage("マジック検索と顔認識のため、機械学習を有効にする"),
         "enableMaps": MessageLookupByLibrary.simpleMessage("マップを有効にする"),
         "enableMapsDesc": MessageLookupByLibrary.simpleMessage(
             "世界地図上にあなたの写真を表示します。\n\n地図はOpenStreetMapを利用しており、あなたの写真の位置情報が外部に共有されることはありません。\n\nこの機能は設定から無効にすることができます"),
@@ -685,20 +791,29 @@ class MessageLookup extends MessageLookupByLibrary {
         "exportYourData": MessageLookupByLibrary.simpleMessage("データをエクスポート"),
         "extraPhotosFound":
             MessageLookupByLibrary.simpleMessage("追加の写真が見つかりました"),
-        "extraPhotosFoundFor": m34,
+        "extraPhotosFoundFor": m36,
+        "faceNotClusteredYet":
+            MessageLookupByLibrary.simpleMessage("顔がまだ集まっていません。後で戻ってきてください"),
         "faceRecognition": MessageLookupByLibrary.simpleMessage("顔認識"),
         "faces": MessageLookupByLibrary.simpleMessage("顔"),
+        "failed": MessageLookupByLibrary.simpleMessage("失敗"),
         "failedToApplyCode":
             MessageLookupByLibrary.simpleMessage("コードを適用できませんでした"),
         "failedToCancel": MessageLookupByLibrary.simpleMessage("キャンセルに失敗しました"),
         "failedToDownloadVideo":
             MessageLookupByLibrary.simpleMessage("ビデオをダウンロードできませんでした"),
+        "failedToFetchActiveSessions":
+            MessageLookupByLibrary.simpleMessage("アクティブなセッションの取得に失敗しました"),
         "failedToFetchOriginalForEdit":
             MessageLookupByLibrary.simpleMessage("編集前の状態の取得に失敗しました"),
         "failedToFetchReferralDetails": MessageLookupByLibrary.simpleMessage(
             "紹介の詳細を取得できません。後でもう一度お試しください。"),
         "failedToLoadAlbums":
             MessageLookupByLibrary.simpleMessage("アルバムの読み込みに失敗しました"),
+        "failedToPlayVideo":
+            MessageLookupByLibrary.simpleMessage("動画の再生に失敗しました"),
+        "failedToRefreshStripeSubscription":
+            MessageLookupByLibrary.simpleMessage("サブスクリプションの更新に失敗しました"),
         "failedToRenew": MessageLookupByLibrary.simpleMessage("更新に失敗しました"),
         "failedToVerifyPaymentStatus":
             MessageLookupByLibrary.simpleMessage("支払ステータスの確認に失敗しました"),
@@ -710,15 +825,18 @@ class MessageLookup extends MessageLookupByLibrary {
         "faqs": MessageLookupByLibrary.simpleMessage("よくある質問"),
         "favorite": MessageLookupByLibrary.simpleMessage("お気に入り"),
         "feedback": MessageLookupByLibrary.simpleMessage("フィードバック"),
+        "file": MessageLookupByLibrary.simpleMessage("ファイル"),
         "fileFailedToSaveToGallery":
             MessageLookupByLibrary.simpleMessage("ギャラリーへの保存に失敗しました"),
         "fileInfoAddDescHint": MessageLookupByLibrary.simpleMessage("説明を追加..."),
+        "fileNotUploadedYet":
+            MessageLookupByLibrary.simpleMessage("ファイルがまだアップロードされていません"),
         "fileSavedToGallery":
             MessageLookupByLibrary.simpleMessage("ファイルをギャラリーに保存しました"),
         "fileTypes": MessageLookupByLibrary.simpleMessage("ファイルの種類"),
         "fileTypesAndNames": MessageLookupByLibrary.simpleMessage("ファイルの種類と名前"),
-        "filesBackedUpFromDevice": m35,
-        "filesBackedUpInAlbum": m36,
+        "filesBackedUpFromDevice": m37,
+        "filesBackedUpInAlbum": m38,
         "filesDeleted": MessageLookupByLibrary.simpleMessage("削除されたファイル"),
         "filesSavedToGallery":
             MessageLookupByLibrary.simpleMessage("ギャラリーに保存されたファイル"),
@@ -733,21 +851,22 @@ class MessageLookup extends MessageLookupByLibrary {
         "freeStorageUsable":
             MessageLookupByLibrary.simpleMessage("無料のストレージが利用可能です"),
         "freeTrial": MessageLookupByLibrary.simpleMessage("無料トライアル"),
-        "freeTrialValidTill": m37,
-        "freeUpAccessPostDelete": m38,
-        "freeUpAmount": m39,
+        "freeTrialValidTill": m39,
+        "freeUpAccessPostDelete": m40,
+        "freeUpAmount": m41,
         "freeUpDeviceSpace":
             MessageLookupByLibrary.simpleMessage("デバイスの空き領域を解放する"),
         "freeUpDeviceSpaceDesc": MessageLookupByLibrary.simpleMessage(
             "すでにバックアップされているファイルを消去して、デバイスの容量を空けます。"),
         "freeUpSpace": MessageLookupByLibrary.simpleMessage("スペースを解放する"),
-        "freeUpSpaceSaving": m40,
+        "freeUpSpaceSaving": m42,
+        "gallery": MessageLookupByLibrary.simpleMessage("ギャラリー"),
         "galleryMemoryLimitInfo":
             MessageLookupByLibrary.simpleMessage("ギャラリーに表示されるメモリは最大1000個までです"),
         "general": MessageLookupByLibrary.simpleMessage("設定"),
         "generatingEncryptionKeys":
             MessageLookupByLibrary.simpleMessage("暗号化鍵を生成しています"),
-        "genericProgress": m41,
+        "genericProgress": m43,
         "goToSettings": MessageLookupByLibrary.simpleMessage("設定に移動"),
         "googlePlayId": MessageLookupByLibrary.simpleMessage("Google Play ID"),
         "grantFullAccessPrompt": MessageLookupByLibrary.simpleMessage(
@@ -770,6 +889,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "アプリ画面を非表示にし、スクリーンショットを無効にします"),
         "hideContentDescriptionIos":
             MessageLookupByLibrary.simpleMessage("アプリ切り替え時に、アプリの画面を非表示にします"),
+        "hideSharedItemsFromHomeGallery":
+            MessageLookupByLibrary.simpleMessage("ホームギャラリーから共有された写真等を非表示"),
         "hiding": MessageLookupByLibrary.simpleMessage("非表示にしています"),
         "hostedAtOsmFrance":
             MessageLookupByLibrary.simpleMessage("OSM Franceでホスト"),
@@ -782,8 +903,11 @@ class MessageLookup extends MessageLookupByLibrary {
             "生体認証が無効化されています。画面をロック・ロック解除して生体認証を有効化してください。"),
         "iOSOkButton": MessageLookupByLibrary.simpleMessage("OK"),
         "ignoreUpdate": MessageLookupByLibrary.simpleMessage("無視する"),
+        "ignored": MessageLookupByLibrary.simpleMessage("無視された"),
         "ignoredFolderUploadReason": MessageLookupByLibrary.simpleMessage(
             "このアルバムの一部のファイルは、以前にEnteから削除されたため、あえてアップロード時に無視されます"),
+        "imageNotAnalyzed":
+            MessageLookupByLibrary.simpleMessage("画像が分析されていません"),
         "immediately": MessageLookupByLibrary.simpleMessage("すぐに"),
         "importing": MessageLookupByLibrary.simpleMessage("インポート中..."),
         "incorrectCode": MessageLookupByLibrary.simpleMessage("誤ったコード"),
@@ -798,6 +922,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "indexedItems": MessageLookupByLibrary.simpleMessage("処理済みの項目"),
         "indexingIsPaused": MessageLookupByLibrary.simpleMessage(
             "インデックス作成は一時停止されています。デバイスの準備ができたら自動的に再開します。"),
+        "ineligible": MessageLookupByLibrary.simpleMessage("対象外"),
+        "info": MessageLookupByLibrary.simpleMessage("情報"),
         "insecureDevice": MessageLookupByLibrary.simpleMessage("安全でないデバイス"),
         "installManually": MessageLookupByLibrary.simpleMessage("手動でインストール"),
         "invalidEmailAddress":
@@ -816,11 +942,19 @@ class MessageLookup extends MessageLookupByLibrary {
         "itLooksLikeSomethingWentWrongPleaseRetryAfterSome":
             MessageLookupByLibrary.simpleMessage(
                 "問題が発生したようです。しばらくしてから再試行してください。エラーが解決しない場合は、サポートチームにお問い合わせください。"),
-        "itemCount": m42,
+        "itemCount": m44,
         "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion":
             MessageLookupByLibrary.simpleMessage("完全に削除されるまでの日数が項目に表示されます"),
         "itemsWillBeRemovedFromAlbum":
             MessageLookupByLibrary.simpleMessage("選択したアイテムはこのアルバムから削除されます"),
+        "join": MessageLookupByLibrary.simpleMessage("参加する"),
+        "joinAlbum": MessageLookupByLibrary.simpleMessage("アルバムに参加"),
+        "joinAlbumConfirmationDialogBody": MessageLookupByLibrary.simpleMessage(
+            "アルバムに参加すると、参加者にメールアドレスが公開されます。"),
+        "joinAlbumSubtext":
+            MessageLookupByLibrary.simpleMessage("写真を表示したり、追加したりするために"),
+        "joinAlbumSubtextViewer":
+            MessageLookupByLibrary.simpleMessage("これを共有アルバムに追加するために"),
         "joinDiscord": MessageLookupByLibrary.simpleMessage("Discordに参加"),
         "keepPhotos": MessageLookupByLibrary.simpleMessage("写真を残す"),
         "kiloMeterUnit": MessageLookupByLibrary.simpleMessage("km"),
@@ -834,17 +968,33 @@ class MessageLookup extends MessageLookupByLibrary {
         "leaveSharedAlbum":
             MessageLookupByLibrary.simpleMessage("共有アルバムを抜けてよいですか？"),
         "left": MessageLookupByLibrary.simpleMessage("左"),
+        "legacy": MessageLookupByLibrary.simpleMessage("レガシー"),
+        "legacyAccounts": MessageLookupByLibrary.simpleMessage("レガシーアカウント"),
+        "legacyInvite": m45,
+        "legacyPageDesc": MessageLookupByLibrary.simpleMessage(
+            "レガシーでは、信頼できる連絡先が不在時(あなたが亡くなった時など)にアカウントにアクセスできます。"),
+        "legacyPageDesc2": MessageLookupByLibrary.simpleMessage(
+            "信頼できる連絡先はアカウントの回復を開始することができます。30日以内にあなたが拒否しない場合は、その信頼する人がパスワードをリセットしてあなたのアカウントにアクセスできるようになります。"),
         "light": MessageLookupByLibrary.simpleMessage("ライト"),
         "lightTheme": MessageLookupByLibrary.simpleMessage("ライト"),
+        "link": MessageLookupByLibrary.simpleMessage("リンク"),
         "linkCopiedToClipboard":
             MessageLookupByLibrary.simpleMessage("リンクをクリップボードにコピーしました"),
         "linkDeviceLimit": MessageLookupByLibrary.simpleMessage("デバイスの制限"),
+        "linkEmail": MessageLookupByLibrary.simpleMessage("メールアドレスをリンクする"),
+        "linkEmailToContactBannerCaption":
+            MessageLookupByLibrary.simpleMessage("共有を高速化するために"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("有効"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("期限切れ"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry": MessageLookupByLibrary.simpleMessage("リンクの期限切れ"),
         "linkHasExpired": MessageLookupByLibrary.simpleMessage("リンクは期限切れです"),
         "linkNeverExpires": MessageLookupByLibrary.simpleMessage("なし"),
+        "linkPerson": MessageLookupByLibrary.simpleMessage("人を紐づけ"),
+        "linkPersonCaption":
+            MessageLookupByLibrary.simpleMessage("良い経験を分かち合うために"),
+        "linkPersonToEmail": m47,
+        "linkPersonToEmailConfirmation": m48,
         "livePhotos": MessageLookupByLibrary.simpleMessage("ライブフォト"),
         "loadMessage1":
             MessageLookupByLibrary.simpleMessage("サブスクリプションを家族と共有できます"),
@@ -891,6 +1041,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "セッションの有効期限が切れました。再度ログインしてください。"),
         "loginTerms": MessageLookupByLibrary.simpleMessage(
             "「ログイン」をクリックすることで、<u-terms>利用規約</u-terms>と<u-policy>プライバシーポリシー</u-policy>に同意します"),
+        "loginWithTOTP": MessageLookupByLibrary.simpleMessage("TOTPでログイン"),
         "logout": MessageLookupByLibrary.simpleMessage("ログアウト"),
         "logsDialogBody": MessageLookupByLibrary.simpleMessage(
             "これにより、問題のデバッグに役立つログが送信されます。 特定のファイルの問題を追跡するために、ファイル名が含まれることに注意してください。"),
@@ -907,6 +1058,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "magicSearchHint": MessageLookupByLibrary.simpleMessage(
             "マジック検索では、「花」、「赤い車」、「本人確認書類」などの写真に写っているもので検索できます。"),
         "manage": MessageLookupByLibrary.simpleMessage("管理"),
+        "manageDeviceStorage":
+            MessageLookupByLibrary.simpleMessage("端末のキャッシュを管理"),
+        "manageDeviceStorageDesc":
+            MessageLookupByLibrary.simpleMessage("端末上のキャッシュを確認・削除"),
         "manageFamily": MessageLookupByLibrary.simpleMessage("ファミリーの管理"),
         "manageLink": MessageLookupByLibrary.simpleMessage("リンクを管理"),
         "manageParticipants": MessageLookupByLibrary.simpleMessage("管理"),
@@ -918,6 +1073,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "maps": MessageLookupByLibrary.simpleMessage("地図"),
         "mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"),
         "matrix": MessageLookupByLibrary.simpleMessage("Matrix"),
+        "me": MessageLookupByLibrary.simpleMessage("自分"),
         "memoryCount": m5,
         "merchandise": MessageLookupByLibrary.simpleMessage("グッズ"),
         "mergeWithExisting": MessageLookupByLibrary.simpleMessage("既存の人物とまとめる"),
@@ -937,15 +1093,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "moderateStrength": MessageLookupByLibrary.simpleMessage("普通のパスワード"),
         "modifyYourQueryOrTrySearchingFor":
             MessageLookupByLibrary.simpleMessage("クエリを変更するか、以下のように検索してみてください"),
-        "moments": MessageLookupByLibrary.simpleMessage("モーメント"),
+        "moments": MessageLookupByLibrary.simpleMessage("日々の瞬間"),
+        "month": MessageLookupByLibrary.simpleMessage("月"),
         "monthly": MessageLookupByLibrary.simpleMessage("月額"),
         "moreDetails": MessageLookupByLibrary.simpleMessage("さらに詳細を表示"),
         "mostRecent": MessageLookupByLibrary.simpleMessage("新しい順"),
         "mostRelevant": MessageLookupByLibrary.simpleMessage("関連度順"),
-        "moveItem": m45,
+        "moveItem": m49,
         "moveToAlbum": MessageLookupByLibrary.simpleMessage("アルバムに移動"),
         "moveToHiddenAlbum": MessageLookupByLibrary.simpleMessage("隠しアルバムに移動"),
-        "movedSuccessfullyTo": m46,
+        "movedSuccessfullyTo": m50,
         "movedToTrash": MessageLookupByLibrary.simpleMessage("ごみ箱へ移動"),
         "movingFilesToAlbum":
             MessageLookupByLibrary.simpleMessage("アルバムにファイルを移動中"),
@@ -957,6 +1114,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Enteに接続できませんでした。ネットワーク設定を確認し、エラーが解決しない場合はサポートにお問い合わせください。"),
         "never": MessageLookupByLibrary.simpleMessage("なし"),
         "newAlbum": MessageLookupByLibrary.simpleMessage("新しいアルバム"),
+        "newLocation": MessageLookupByLibrary.simpleMessage("新しいロケーション"),
         "newPerson": MessageLookupByLibrary.simpleMessage("新しい人物"),
         "newToEnte": MessageLookupByLibrary.simpleMessage("Enteを初めて使用する"),
         "newest": MessageLookupByLibrary.simpleMessage("新しい順"),
@@ -969,7 +1127,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "noDeviceThatCanBeDeleted":
             MessageLookupByLibrary.simpleMessage("削除できるファイルがありません"),
         "noDuplicates": MessageLookupByLibrary.simpleMessage("✨ 重複なし"),
+        "noEnteAccountExclamation":
+            MessageLookupByLibrary.simpleMessage("アカウントがありません！"),
         "noExifData": MessageLookupByLibrary.simpleMessage("EXIFデータはありません"),
+        "noFacesFound": MessageLookupByLibrary.simpleMessage("顔が見つかりません"),
         "noHiddenPhotosOrVideos":
             MessageLookupByLibrary.simpleMessage("非表示の写真やビデオはありません"),
         "noImagesWithLocation":
@@ -987,9 +1148,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "noResults": MessageLookupByLibrary.simpleMessage("該当なし"),
         "noResultsFound":
             MessageLookupByLibrary.simpleMessage("一致する結果が見つかりませんでした"),
+        "noSuggestionsForPerson": m51,
         "noSystemLockFound":
             MessageLookupByLibrary.simpleMessage("システムロックが見つかりませんでした"),
-        "notPersonLabel": m48,
+        "notPersonLabel": m52,
         "nothingSharedWithYouYet":
             MessageLookupByLibrary.simpleMessage("あなたに共有されたものはありません"),
         "nothingToSeeHere":
@@ -998,13 +1160,19 @@ class MessageLookup extends MessageLookupByLibrary {
         "ok": MessageLookupByLibrary.simpleMessage("OK"),
         "onDevice": MessageLookupByLibrary.simpleMessage("デバイス上"),
         "onEnte": MessageLookupByLibrary.simpleMessage(
-            "<branding>Ente</branding>で保管"),
-        "onlyFamilyAdminCanChangeCode": m49,
+            "<branding>Ente</branding>が保管"),
+        "onlyFamilyAdminCanChangeCode": m53,
+        "onlyThem": MessageLookupByLibrary.simpleMessage("それらのみ"),
         "oops": MessageLookupByLibrary.simpleMessage("Oops"),
         "oopsCouldNotSaveEdits":
             MessageLookupByLibrary.simpleMessage("編集を保存できませんでした"),
         "oopsSomethingWentWrong":
             MessageLookupByLibrary.simpleMessage("問題が発生しました"),
+        "openAlbumInBrowser":
+            MessageLookupByLibrary.simpleMessage("ブラウザでアルバムを開く"),
+        "openAlbumInBrowserTitle": MessageLookupByLibrary.simpleMessage(
+            "このアルバムに写真を追加するには、Webアプリを使用してください"),
+        "openFile": MessageLookupByLibrary.simpleMessage("ファイルを開く"),
         "openSettings": MessageLookupByLibrary.simpleMessage("設定を開く"),
         "openTheItem": MessageLookupByLibrary.simpleMessage("• アイテムを開く"),
         "openstreetmapContributors":
@@ -1016,7 +1184,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "orPickAnExistingOne":
             MessageLookupByLibrary.simpleMessage("または既存のものを選択"),
         "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
+            MessageLookupByLibrary.simpleMessage("または連絡先から選択"),
         "pair": MessageLookupByLibrary.simpleMessage("ペアリング"),
         "pairWithPin": MessageLookupByLibrary.simpleMessage("PINを使ってペアリングする"),
         "pairingComplete": MessageLookupByLibrary.simpleMessage("ペアリング完了"),
@@ -1038,7 +1206,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "paymentFailed": MessageLookupByLibrary.simpleMessage("支払いに失敗しました"),
         "paymentFailedMessage": MessageLookupByLibrary.simpleMessage(
             "残念ながらお支払いに失敗しました。サポートにお問い合わせください。お手伝いします！"),
-        "paymentFailedTalkToProvider": m50,
+        "paymentFailedTalkToProvider": m54,
         "pendingItems": MessageLookupByLibrary.simpleMessage("処理待ちの項目"),
         "pendingSync": MessageLookupByLibrary.simpleMessage("同期を保留中"),
         "people": MessageLookupByLibrary.simpleMessage("人物"),
@@ -1056,11 +1224,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "photos": MessageLookupByLibrary.simpleMessage("写真"),
         "photosAddedByYouWillBeRemovedFromTheAlbum":
             MessageLookupByLibrary.simpleMessage("あなたの追加した写真はこのアルバムから削除されます"),
+        "photosCount": m55,
         "pickCenterPoint": MessageLookupByLibrary.simpleMessage("中心点を選択"),
         "pinAlbum": MessageLookupByLibrary.simpleMessage("アルバムをピンする"),
         "pinLock": MessageLookupByLibrary.simpleMessage("PINロック"),
         "playOnTv": MessageLookupByLibrary.simpleMessage("TVでアルバムを再生"),
-        "playStoreFreeTrialValidTill": m52,
+        "playOriginal": MessageLookupByLibrary.simpleMessage("元動画を再生"),
+        "playStoreFreeTrialValidTill": m56,
+        "playStream": MessageLookupByLibrary.simpleMessage("再生"),
         "playstoreSubscription":
             MessageLookupByLibrary.simpleMessage("PlayStoreサブスクリプション"),
         "pleaseCheckYourInternetConnectionAndTryAgain":
@@ -1070,13 +1241,13 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Support@ente.ioにお問い合わせください、お手伝いいたします。"),
         "pleaseContactSupportIfTheProblemPersists":
             MessageLookupByLibrary.simpleMessage("問題が解決しない場合はサポートにお問い合わせください"),
-        "pleaseEmailUsAt": m53,
+        "pleaseEmailUsAt": m57,
         "pleaseGrantPermissions":
             MessageLookupByLibrary.simpleMessage("権限を付与してください"),
         "pleaseLoginAgain": MessageLookupByLibrary.simpleMessage("もう一度試してください"),
         "pleaseSelectQuickLinksToRemove":
             MessageLookupByLibrary.simpleMessage("削除するクイックリンクを選択してください"),
-        "pleaseSendTheLogsTo": m54,
+        "pleaseSendTheLogsTo": m58,
         "pleaseTryAgain": MessageLookupByLibrary.simpleMessage("もう一度試してください"),
         "pleaseVerifyTheCodeYouHaveEntered":
             MessageLookupByLibrary.simpleMessage("入力したコードを確認してください"),
@@ -1096,20 +1267,32 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("プライバシーポリシー"),
         "privateBackups": MessageLookupByLibrary.simpleMessage("プライベートバックアップ"),
         "privateSharing": MessageLookupByLibrary.simpleMessage("プライベート共有"),
-        "processingImport": m55,
+        "proceed": MessageLookupByLibrary.simpleMessage("続行"),
+        "processed": MessageLookupByLibrary.simpleMessage("処理完了"),
+        "processing": MessageLookupByLibrary.simpleMessage("処理中"),
+        "processingImport": m59,
+        "processingVideos": MessageLookupByLibrary.simpleMessage("動画を処理中"),
         "publicLinkCreated":
             MessageLookupByLibrary.simpleMessage("公開リンクが作成されました"),
         "publicLinkEnabled":
             MessageLookupByLibrary.simpleMessage("公開リンクを有効にしました"),
+        "queued": MessageLookupByLibrary.simpleMessage("処理待ち"),
         "quickLinks": MessageLookupByLibrary.simpleMessage("クイックリンク"),
         "radius": MessageLookupByLibrary.simpleMessage("半径"),
         "raiseTicket": MessageLookupByLibrary.simpleMessage("サポートを受ける"),
         "rateTheApp": MessageLookupByLibrary.simpleMessage("アプリを評価"),
         "rateUs": MessageLookupByLibrary.simpleMessage("評価して下さい"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
+        "reassignMe": MessageLookupByLibrary.simpleMessage("\"自分\" を再割り当て"),
+        "reassignedToName": m61,
+        "reassigningLoading": MessageLookupByLibrary.simpleMessage("再割り当て中..."),
         "recover": MessageLookupByLibrary.simpleMessage("復元"),
         "recoverAccount": MessageLookupByLibrary.simpleMessage("アカウントを復元"),
         "recoverButton": MessageLookupByLibrary.simpleMessage("復元"),
+        "recoveryAccount": MessageLookupByLibrary.simpleMessage("アカウントを復元"),
+        "recoveryInitiated":
+            MessageLookupByLibrary.simpleMessage("リカバリが開始されました"),
+        "recoveryInitiatedDesc": m62,
         "recoveryKey": MessageLookupByLibrary.simpleMessage("リカバリーキー"),
         "recoveryKeyCopiedToClipboard":
             MessageLookupByLibrary.simpleMessage("リカバリーキーはクリップボードにコピーされました"),
@@ -1123,8 +1306,12 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("リカバリキーが確認されました"),
         "recoveryKeyVerifyReason": MessageLookupByLibrary.simpleMessage(
             "パスワードを忘れた場合、リカバリーキーは写真を復元するための唯一の方法になります。なお、設定 > アカウント でリカバリーキーを確認することができます。\n \n\nここにリカバリーキーを入力して、正しく保存できていることを確認してください。"),
+        "recoveryReady": m63,
         "recoverySuccessful":
             MessageLookupByLibrary.simpleMessage("復元に成功しました！"),
+        "recoveryWarning": MessageLookupByLibrary.simpleMessage(
+            "信頼する連絡先の持ち主があなたのアカウントにアクセスしようとしています"),
+        "recoveryWarningBody": m64,
         "recreatePasswordBody": MessageLookupByLibrary.simpleMessage(
             "このデバイスではパスワードを確認する能力が足りません。\n\n恐れ入りますが、リカバリーキーを入力してパスワードを再生成する必要があります。"),
         "recreatePasswordTitle":
@@ -1138,10 +1325,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "referralStep1":
             MessageLookupByLibrary.simpleMessage("1. このコードを友達に贈りましょう"),
         "referralStep2": MessageLookupByLibrary.simpleMessage("2. 友達が有料プランに登録"),
-        "referralStep3": m60,
+        "referralStep3": m65,
         "referrals": MessageLookupByLibrary.simpleMessage("リフェラル"),
         "referralsAreCurrentlyPaused":
             MessageLookupByLibrary.simpleMessage("リフェラルは現在一時停止しています"),
+        "rejectRecovery": MessageLookupByLibrary.simpleMessage("リカバリを拒否する"),
         "remindToEmptyDeviceTrash": MessageLookupByLibrary.simpleMessage(
             "また、空き領域を取得するには、「設定」→「ストレージ」から「最近削除した項目」を空にします"),
         "remindToEmptyEnteTrash": MessageLookupByLibrary.simpleMessage(
@@ -1159,9 +1347,10 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("アルバムから削除しますか？"),
         "removeFromFavorite":
             MessageLookupByLibrary.simpleMessage("お気に入りリストから外す"),
+        "removeInvite": MessageLookupByLibrary.simpleMessage("招待を削除"),
         "removeLink": MessageLookupByLibrary.simpleMessage("リンクを削除"),
         "removeParticipant": MessageLookupByLibrary.simpleMessage("参加者を削除"),
-        "removeParticipantBody": m61,
+        "removeParticipantBody": m66,
         "removePersonLabel": MessageLookupByLibrary.simpleMessage("人名を削除"),
         "removePublicLink": MessageLookupByLibrary.simpleMessage("公開リンクを削除"),
         "removePublicLinks": MessageLookupByLibrary.simpleMessage("公開リンクを削除"),
@@ -1169,6 +1358,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "削除したアイテムのいくつかは他の人によって追加されました。あなたはそれらへのアクセスを失います"),
         "removeWithQuestionMark":
             MessageLookupByLibrary.simpleMessage("削除しますか?"),
+        "removeYourselfAsTrustedContact":
+            MessageLookupByLibrary.simpleMessage("あなた自身を信頼できる連絡先から削除"),
         "removingFromFavorites":
             MessageLookupByLibrary.simpleMessage("お気に入りから削除しています..."),
         "rename": MessageLookupByLibrary.simpleMessage("名前変更"),
@@ -1176,7 +1367,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "renameFile": MessageLookupByLibrary.simpleMessage("ファイル名を変更"),
         "renewSubscription":
             MessageLookupByLibrary.simpleMessage("サブスクリプションの更新"),
-        "renewsOn": m62,
+        "renewsOn": m67,
         "reportABug": MessageLookupByLibrary.simpleMessage("バグを報告"),
         "reportBug": MessageLookupByLibrary.simpleMessage("バグを報告"),
         "resendEmail": MessageLookupByLibrary.simpleMessage("メールを再送信"),
@@ -1184,6 +1375,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("アップロード時に無視されるファイルをリセット"),
         "resetPasswordTitle":
             MessageLookupByLibrary.simpleMessage("パスワードをリセット"),
+        "resetPerson": MessageLookupByLibrary.simpleMessage("削除"),
         "resetToDefault": MessageLookupByLibrary.simpleMessage("初期設定にリセット"),
         "restore": MessageLookupByLibrary.simpleMessage("復元"),
         "restoreToAlbum": MessageLookupByLibrary.simpleMessage("アルバムに戻す"),
@@ -1200,6 +1392,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "rotateRight": MessageLookupByLibrary.simpleMessage("右に回転"),
         "safelyStored": MessageLookupByLibrary.simpleMessage("保管されています"),
         "save": MessageLookupByLibrary.simpleMessage("保存"),
+        "saveChangesBeforeLeavingQuestion":
+            MessageLookupByLibrary.simpleMessage("その前に変更を保存しますか？"),
         "saveCollage": MessageLookupByLibrary.simpleMessage("コラージュを保存"),
         "saveCopy": MessageLookupByLibrary.simpleMessage("コピーを保存"),
         "saveKey": MessageLookupByLibrary.simpleMessage("キーを保存"),
@@ -1221,6 +1415,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "写真情報に \"#trip\" のように説明を追加すれば、ここで簡単に見つけることができます"),
         "searchDatesEmptySection":
             MessageLookupByLibrary.simpleMessage("日付、月または年で検索"),
+        "searchDiscoverEmptySection":
+            MessageLookupByLibrary.simpleMessage("処理と同期が完了すると、画像がここに表示されます"),
         "searchFaceEmptySection":
             MessageLookupByLibrary.simpleMessage("学習が完了すると、ここに人が表示されます"),
         "searchFileTypesAndNamesEmptySection":
@@ -1235,20 +1431,30 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("当時の直近で撮影された写真をグループ化"),
         "searchPeopleEmptySection":
             MessageLookupByLibrary.simpleMessage("友達を招待すると、共有される写真はここから閲覧できます"),
-        "searchResultCount": m63,
+        "searchPersonsEmptySection":
+            MessageLookupByLibrary.simpleMessage("処理と同期が完了すると、ここに人々が表示されます"),
+        "searchResultCount": m68,
+        "searchSectionsLengthMismatch": m69,
         "security": MessageLookupByLibrary.simpleMessage("セキュリティ"),
+        "seePublicAlbumLinksInApp":
+            MessageLookupByLibrary.simpleMessage("アプリ内で公開アルバムのリンクを見る"),
         "selectALocation": MessageLookupByLibrary.simpleMessage("場所を選択"),
         "selectALocationFirst":
             MessageLookupByLibrary.simpleMessage("先に場所を選択してください"),
         "selectAlbum": MessageLookupByLibrary.simpleMessage("アルバムを選択"),
         "selectAll": MessageLookupByLibrary.simpleMessage("全て選択"),
+        "selectAllShort": MessageLookupByLibrary.simpleMessage("すべて"),
+        "selectCoverPhoto": MessageLookupByLibrary.simpleMessage("カバー写真を選択"),
         "selectFoldersForBackup":
             MessageLookupByLibrary.simpleMessage("バックアップするフォルダを選択"),
         "selectItemsToAdd":
             MessageLookupByLibrary.simpleMessage("追加するアイテムを選んでください"),
         "selectLanguage": MessageLookupByLibrary.simpleMessage("言語を選ぶ"),
+        "selectMailApp": MessageLookupByLibrary.simpleMessage("メールアプリを選択"),
         "selectMorePhotos": MessageLookupByLibrary.simpleMessage("さらに写真を選択"),
+        "selectPersonToLink": MessageLookupByLibrary.simpleMessage("リンクする人を選択"),
         "selectReason": MessageLookupByLibrary.simpleMessage(""),
+        "selectYourFace": MessageLookupByLibrary.simpleMessage("あなたの顔を選択"),
         "selectYourPlan": MessageLookupByLibrary.simpleMessage("プランを選びましょう"),
         "selectedFilesAreNotOnEnte":
             MessageLookupByLibrary.simpleMessage("選択したファイルはEnte上にありません"),
@@ -1258,13 +1464,15 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "選択したアイテムはすべてのアルバムから削除され、ゴミ箱に移動されます。"),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "send": MessageLookupByLibrary.simpleMessage("送信"),
         "sendEmail": MessageLookupByLibrary.simpleMessage("メールを送信する"),
         "sendInvite": MessageLookupByLibrary.simpleMessage("招待を送る"),
         "sendLink": MessageLookupByLibrary.simpleMessage("リンクを送信"),
         "serverEndpoint": MessageLookupByLibrary.simpleMessage("サーバーエンドポイント"),
         "sessionExpired": MessageLookupByLibrary.simpleMessage("セッション切れ"),
+        "sessionIdMismatch":
+            MessageLookupByLibrary.simpleMessage("セッションIDが一致しません"),
         "setAPassword": MessageLookupByLibrary.simpleMessage("パスワードを設定"),
         "setAs": MessageLookupByLibrary.simpleMessage("設定："),
         "setCover": MessageLookupByLibrary.simpleMessage("カバー画像をセット"),
@@ -1280,16 +1488,16 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("アルバムを開いて右上のシェアボタンをタップ"),
         "shareAnAlbumNow": MessageLookupByLibrary.simpleMessage("アルバムを共有"),
         "shareLink": MessageLookupByLibrary.simpleMessage("リンクの共有"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareOnlyWithThePeopleYouWant":
             MessageLookupByLibrary.simpleMessage("選んだ人と共有します"),
         "shareTextConfirmOthersVerificationID": m7,
         "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage(
             "Enteをダウンロードして、写真や動画の共有を簡単に！\n\nhttps://ente.io"),
-        "shareTextReferralCode": m67,
+        "shareTextReferralCode": m72,
         "shareWithNonenteUsers":
             MessageLookupByLibrary.simpleMessage("Enteを使っていない人に共有"),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "shareYourFirstAlbum":
             MessageLookupByLibrary.simpleMessage("アルバムの共有をしてみましょう"),
         "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
@@ -1300,7 +1508,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("新しい共有写真"),
         "sharedPhotoNotificationsExplanation":
             MessageLookupByLibrary.simpleMessage("誰かが写真を共有アルバムに追加した時に通知を受け取る"),
-        "sharedWith": m69,
+        "sharedWith": m74,
         "sharedWithMe": MessageLookupByLibrary.simpleMessage("あなたと共有されたアルバム"),
         "sharedWithYou": MessageLookupByLibrary.simpleMessage("あなたと共有されています"),
         "sharing": MessageLookupByLibrary.simpleMessage("共有中..."),
@@ -1314,11 +1522,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("他のデバイスからサインアウトする"),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "<u-terms>利用規約</u-terms>と<u-policy>プライバシーポリシー</u-policy>に同意します"),
-        "singleFileDeleteFromDevice": m70,
+        "singleFileDeleteFromDevice": m75,
         "singleFileDeleteHighlight":
             MessageLookupByLibrary.simpleMessage("全てのアルバムから削除されます。"),
-        "singleFileInBothLocalAndRemote": m71,
-        "singleFileInRemoteOnly": m72,
+        "singleFileInBothLocalAndRemote": m76,
+        "singleFileInRemoteOnly": m77,
         "skip": MessageLookupByLibrary.simpleMessage("スキップ"),
         "social": MessageLookupByLibrary.simpleMessage("SNS"),
         "someItemsAreInBothEnteAndYourDevice":
@@ -1349,6 +1557,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "sortNewestFirst": MessageLookupByLibrary.simpleMessage("新しい順"),
         "sortOldestFirst": MessageLookupByLibrary.simpleMessage("古い順"),
         "sparkleSuccess": MessageLookupByLibrary.simpleMessage("成功✨"),
+        "startAccountRecoveryTitle":
+            MessageLookupByLibrary.simpleMessage("リカバリを開始"),
         "startBackup": MessageLookupByLibrary.simpleMessage("バックアップを開始"),
         "status": MessageLookupByLibrary.simpleMessage("ステータス"),
         "stopCastingBody": MessageLookupByLibrary.simpleMessage("キャストを停止しますか？"),
@@ -1359,10 +1569,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageInGB": m1,
         "storageLimitExceeded":
             MessageLookupByLibrary.simpleMessage("ストレージの上限を超えました"),
-        "storageUsageInfo": m73,
+        "storageUsageInfo": m78,
+        "streamDetails": MessageLookupByLibrary.simpleMessage("動画の詳細"),
         "strongStrength": MessageLookupByLibrary.simpleMessage("強いパスワード"),
-        "subAlreadyLinkedErrMessage": m74,
-        "subWillBeCancelledOn": m75,
+        "subAlreadyLinkedErrMessage": m79,
+        "subWillBeCancelledOn": m80,
         "subscribe": MessageLookupByLibrary.simpleMessage("サブスクライブ"),
         "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage(
             "共有を有効にするには、有料サブスクリプションが必要です。"),
@@ -1376,13 +1587,15 @@ class MessageLookup extends MessageLookupByLibrary {
         "successfullyUnhid": MessageLookupByLibrary.simpleMessage("非表示を解除しました"),
         "suggestFeatures": MessageLookupByLibrary.simpleMessage("機能を提案"),
         "support": MessageLookupByLibrary.simpleMessage("サポート"),
-        "syncProgress": m76,
+        "syncProgress": m81,
         "syncStopped": MessageLookupByLibrary.simpleMessage("同期が停止しました"),
         "syncing": MessageLookupByLibrary.simpleMessage("同期中..."),
         "systemTheme": MessageLookupByLibrary.simpleMessage("システム"),
         "tapToCopy": MessageLookupByLibrary.simpleMessage("タップしてコピー"),
         "tapToEnterCode": MessageLookupByLibrary.simpleMessage("タップしてコードを入力"),
         "tapToUnlock": MessageLookupByLibrary.simpleMessage("タップして解除"),
+        "tapToUpload": MessageLookupByLibrary.simpleMessage("タップしてアップロード"),
+        "tapToUploadIsIgnoredDue": m82,
         "tempErrorContactSupportIfPersists": MessageLookupByLibrary.simpleMessage(
             "問題が発生したようです。しばらくしてから再試行してください。エラーが解決しない場合は、サポートチームにお問い合わせください。"),
         "terminate": MessageLookupByLibrary.simpleMessage("終了させる"),
@@ -1394,6 +1607,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("ありがとうございます！"),
         "theDownloadCouldNotBeCompleted":
             MessageLookupByLibrary.simpleMessage("ダウンロードを完了できませんでした"),
+        "theLinkYouAreTryingToAccessHasExpired":
+            MessageLookupByLibrary.simpleMessage("アクセスしようとしているリンクの期限が切れています。"),
         "theRecoveryKeyYouEnteredIsIncorrect":
             MessageLookupByLibrary.simpleMessage("入力したリカバリーキーが間違っています"),
         "theme": MessageLookupByLibrary.simpleMessage("テーマ"),
@@ -1415,7 +1630,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("このメールアドレスはすでに使用されています。"),
         "thisImageHasNoExifData":
             MessageLookupByLibrary.simpleMessage("この画像にEXIFデータはありません"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsMeExclamation": MessageLookupByLibrary.simpleMessage("これは私です"),
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId":
             MessageLookupByLibrary.simpleMessage("これはあなたの認証IDです"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -1438,7 +1654,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "total": MessageLookupByLibrary.simpleMessage("合計"),
         "totalSize": MessageLookupByLibrary.simpleMessage("合計サイズ"),
         "trash": MessageLookupByLibrary.simpleMessage("ゴミ箱"),
+        "trashDaysLeft": m84,
         "trim": MessageLookupByLibrary.simpleMessage("トリミング"),
+        "trustedContacts": MessageLookupByLibrary.simpleMessage("信頼する連絡先"),
+        "trustedInviteBody": m85,
         "tryAgain": MessageLookupByLibrary.simpleMessage("もう一度試してください"),
         "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage(
             "バックアップをオンにすると、このデバイスフォルダに追加されたファイルは自動的にEnteにアップロードされます。"),
@@ -1453,6 +1672,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "twofactorAuthenticationSuccessfullyReset":
             MessageLookupByLibrary.simpleMessage("2段階認証をリセットしました"),
         "twofactorSetup": MessageLookupByLibrary.simpleMessage("2段階認証のセットアップ"),
+        "typeOfGallerGallerytypeIsNotSupportedForRename": m86,
         "unarchive": MessageLookupByLibrary.simpleMessage("アーカイブ解除"),
         "unarchiveAlbum": MessageLookupByLibrary.simpleMessage("アルバムのアーカイブ解除"),
         "unarchiving": MessageLookupByLibrary.simpleMessage("アーカイブを解除中..."),
@@ -1472,9 +1692,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "updatingFolderSelection":
             MessageLookupByLibrary.simpleMessage("フォルダの選択を更新しています..."),
         "upgrade": MessageLookupByLibrary.simpleMessage("アップグレード"),
+        "uploadIsIgnoredDueToIgnorereason": m87,
         "uploadingFilesToAlbum":
             MessageLookupByLibrary.simpleMessage("アルバムにファイルをアップロード中"),
-        "uploadingMultipleMemories": m83,
+        "uploadingMultipleMemories": m88,
         "uploadingSingleMemory":
             MessageLookupByLibrary.simpleMessage("1メモリを保存しています..."),
         "upto50OffUntil4thDec":
@@ -1482,19 +1703,21 @@ class MessageLookup extends MessageLookupByLibrary {
         "usableReferralStorageInfo": MessageLookupByLibrary.simpleMessage(
             "使用可能なストレージは現在のプランによって制限されています。プランをアップグレードすると、あなたが手に入れたストレージが自動的に使用可能になります。"),
         "useAsCover": MessageLookupByLibrary.simpleMessage("カバー写真として使用"),
+        "useDifferentPlayerInfo": MessageLookupByLibrary.simpleMessage(
+            "この動画の再生に問題がありますか？別のプレイヤーを試すには、ここを長押ししてください。"),
         "usePublicLinksForPeopleNotOnEnte":
             MessageLookupByLibrary.simpleMessage(
                 "公開リンクを使用する(Enteを利用しない人と共有できます)"),
         "useRecoveryKey": MessageLookupByLibrary.simpleMessage("リカバリーキーを使用"),
         "useSelectedPhoto": MessageLookupByLibrary.simpleMessage("選択した写真を使用"),
         "usedSpace": MessageLookupByLibrary.simpleMessage("使用済み領域"),
-        "validTill": m84,
+        "validTill": m89,
         "verificationFailedPleaseTryAgain":
             MessageLookupByLibrary.simpleMessage("確認に失敗しました、再試行してください"),
         "verificationId": MessageLookupByLibrary.simpleMessage("確認用ID"),
         "verify": MessageLookupByLibrary.simpleMessage("確認"),
         "verifyEmail": MessageLookupByLibrary.simpleMessage("Eメールの確認"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyIDLabel": MessageLookupByLibrary.simpleMessage("確認"),
         "verifyPasskey": MessageLookupByLibrary.simpleMessage("パスキーを確認"),
         "verifyPassword": MessageLookupByLibrary.simpleMessage("パスワードの確認"),
@@ -1503,6 +1726,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("リカバリキーを確認中..."),
         "videoInfo": MessageLookupByLibrary.simpleMessage("ビデオ情報"),
         "videoSmallCase": MessageLookupByLibrary.simpleMessage("ビデオ"),
+        "videoStreaming": MessageLookupByLibrary.simpleMessage("動画ストリーミング"),
         "videos": MessageLookupByLibrary.simpleMessage("ビデオ"),
         "viewActiveSessions":
             MessageLookupByLibrary.simpleMessage("アクティブなセッションを表示"),
@@ -1516,11 +1740,13 @@ class MessageLookup extends MessageLookupByLibrary {
         "viewLogs": MessageLookupByLibrary.simpleMessage("ログを表示"),
         "viewRecoveryKey": MessageLookupByLibrary.simpleMessage("リカバリキーを表示"),
         "viewer": MessageLookupByLibrary.simpleMessage("ビューアー"),
+        "viewersSuccessfullyAdded": m91,
         "visitWebToManage": MessageLookupByLibrary.simpleMessage(
             "サブスクリプションを管理するにはweb.ente.ioをご覧ください"),
         "waitingForVerification":
             MessageLookupByLibrary.simpleMessage("確認を待っています..."),
         "waitingForWifi": MessageLookupByLibrary.simpleMessage("WiFi を待っています"),
+        "warning": MessageLookupByLibrary.simpleMessage("警告"),
         "weAreOpenSource":
             MessageLookupByLibrary.simpleMessage("私たちはオープンソースです！"),
         "weDontSupportEditingPhotosAndAlbumsThatYouDont":
@@ -1530,8 +1756,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "weakStrength": MessageLookupByLibrary.simpleMessage("弱いパスワード"),
         "welcomeBack": MessageLookupByLibrary.simpleMessage("おかえりなさい！"),
         "whatsNew": MessageLookupByLibrary.simpleMessage("最新情報"),
+        "whyAddTrustContact":
+            MessageLookupByLibrary.simpleMessage("信頼する連絡先は、データの復旧が必要な際に役立ちます。"),
+        "yearShort": MessageLookupByLibrary.simpleMessage("年"),
         "yearly": MessageLookupByLibrary.simpleMessage("年額"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("はい"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("キャンセル"),
         "yesConvertToViewer":
@@ -1542,6 +1771,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "yesLogout": MessageLookupByLibrary.simpleMessage("はい、ログアウトします"),
         "yesRemove": MessageLookupByLibrary.simpleMessage("削除"),
         "yesRenew": MessageLookupByLibrary.simpleMessage("はい、更新する"),
+        "yesResetPerson": MessageLookupByLibrary.simpleMessage("リセット"),
         "you": MessageLookupByLibrary.simpleMessage("あなた"),
         "youAreOnAFamilyPlan":
             MessageLookupByLibrary.simpleMessage("ファミリープランに入会しています！"),
@@ -1559,7 +1789,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("自分自身と共有することはできません"),
         "youDontHaveAnyArchivedItems":
             MessageLookupByLibrary.simpleMessage("アーカイブした項目はありません"),
-        "youHaveSuccessfullyFreedUp": m88,
+        "youHaveSuccessfullyFreedUp": m93,
         "yourAccountHasBeenDeleted":
             MessageLookupByLibrary.simpleMessage("アカウントは削除されました"),
         "yourMap": MessageLookupByLibrary.simpleMessage("あなたの地図"),
diff --git a/mobile/lib/generated/intl/messages_km.dart b/mobile/lib/generated/intl/messages_km.dart
index a63a4f6c2b..22d4231361 100644
--- a/mobile/lib/generated/intl/messages_km.dart
+++ b/mobile/lib/generated/intl/messages_km.dart
@@ -21,8 +21,5 @@ class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'km';
 
   final messages = _notInlinedMessages(_notInlinedMessages);
-  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts")
-      };
+  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{};
 }
diff --git a/mobile/lib/generated/intl/messages_ko.dart b/mobile/lib/generated/intl/messages_ko.dart
index c10e432148..e378d62fd9 100644
--- a/mobile/lib/generated/intl/messages_ko.dart
+++ b/mobile/lib/generated/intl/messages_ko.dart
@@ -40,8 +40,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "feedback": MessageLookupByLibrary.simpleMessage("피드백"),
         "invalidEmailAddress":
             MessageLookupByLibrary.simpleMessage("잘못된 이메일 주소"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "verify": MessageLookupByLibrary.simpleMessage("인증"),
         "yourAccountHasBeenDeleted":
             MessageLookupByLibrary.simpleMessage("계정이 삭제되었습니다.")
diff --git a/mobile/lib/generated/intl/messages_lt.dart b/mobile/lib/generated/intl/messages_lt.dart
index abbfcf486e..a821de29fb 100644
--- a/mobile/lib/generated/intl/messages_lt.dart
+++ b/mobile/lib/generated/intl/messages_lt.dart
@@ -20,195 +20,209 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'lt';
 
-  static String m9(count) =>
-      "${Intl.plural(count, one: 'Pridėti bendradarbį', few: 'Pridėti bendradarbius', many: 'Pridėti bendradarbio', other: 'Pridėti bendradarbių')}";
+  static String m9(title) => "${title} (Aš)";
 
   static String m10(count) =>
+      "${Intl.plural(count, one: 'Pridėti bendradarbį', few: 'Pridėti bendradarbius', many: 'Pridėti bendradarbio', other: 'Pridėti bendradarbių')}";
+
+  static String m11(count) =>
       "${Intl.plural(count, one: 'Pridėti elementą', few: 'Pridėti elementus', many: 'Pridėti elemento', other: 'Pridėti elementų')}";
 
-  static String m12(count) =>
+  static String m13(count) =>
       "${Intl.plural(count, one: 'Pridėti žiūrėtoją', few: 'Pridėti žiūrėtojus', many: 'Pridėti žiūrėtojo', other: 'Pridėti žiūrėtojų')}";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: 'Nėra dalyvių', one: '1 dalyvis', other: '${count} dalyviai')}";
 
-  static String m16(versionValue) => "Versija: ${versionValue}";
+  static String m17(versionValue) => "Versija: ${versionValue}";
 
-  static String m18(paymentProvider) =>
+  static String m19(paymentProvider) =>
       "Pirmiausia atsisakykite esamos prenumeratos iš ${paymentProvider}";
 
   static String m3(user) =>
       "${user} negalės pridėti daugiau nuotraukų į šį albumą\n\nJie vis tiek galės pašalinti esamas pridėtas nuotraukas";
 
-  static String m19(isFamilyMember, storageAmountInGb) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
       "${Intl.select(isFamilyMember, {
             'true': 'Jūsų šeima gavo ${storageAmountInGb} GB iki šiol',
             'false': 'Jūs gavote ${storageAmountInGb} GB iki šiol',
             'other': 'Jūs gavote ${storageAmountInGb} GB iki šiol.',
           })}";
 
-  static String m21(count) =>
+  static String m22(count) =>
       "${Intl.plural(count, zero: 'Pridėta 0 bendradarbių', one: 'Pridėtas 1 bendradarbis', other: 'Pridėta ${count} bendradarbių')}";
 
-  static String m22(email, numOfDays) =>
+  static String m23(email, numOfDays) =>
       "Ketinate pridėti ${email} kaip patikimą kontaktą. Jie galės atkurti jūsų paskyrą, jei jūsų nebus ${numOfDays} dienų.";
 
-  static String m25(endpoint) => "Prijungta prie ${endpoint}";
+  static String m25(provider) =>
+      "Susisiekite su mumis adresu support@ente.io, kad sutvarkytumėte savo ${provider} prenumeratą.";
 
-  static String m26(count) =>
+  static String m26(endpoint) => "Prijungta prie ${endpoint}";
+
+  static String m27(count) =>
       "${Intl.plural(count, one: 'Ištrinti ${count} elementą', few: 'Ištrinti ${count} elementus', many: 'Ištrinti ${count} elemento', other: 'Ištrinti ${count} elementų')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "Ištrinama ${currentlyDeleting} / ${totalCount}";
 
-  static String m28(albumName) =>
+  static String m29(albumName) =>
       "Tai pašalins viešą nuorodą, skirtą pasiekti „${albumName}“.";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "Iš savo registruoto el. pašto adreso atsiųskite el. laišką adresu ${supportEmail}";
 
-  static String m30(count, storageSaved) =>
+  static String m31(count, storageSaved) =>
       "Išvalėte ${Intl.plural(count, one: '${count} dubliuojantį failą', few: '${count} dubliuojančius failus', many: '${count} dubliuojančio failo', other: '${count} dubliuojančių failų')}, išsaugodami (${storageSaved}).";
 
-  static String m31(count, formattedSize) =>
+  static String m32(count, formattedSize) =>
       "${count} failai (-ų), kiekvienas ${formattedSize}";
 
-  static String m33(email) =>
+  static String m33(newEmail) => "El. paštas pakeistas į ${newEmail}";
+
+  static String m34(email) => "${email} neturi „Ente“ paskyros.";
+
+  static String m35(email) =>
       "${email} neturi „Ente“ paskyros.\n\nSiųskite jiems kvietimą bendrinti nuotraukas.";
 
-  static String m34(text) => "Rastos papildomos nuotraukos, skirtos ${text}";
+  static String m36(text) => "Rastos papildomos nuotraukos, skirtos ${text}";
 
   static String m4(storageAmountInGB) =>
       "${storageAmountInGB} GB kiekvieną kartą, kai kas nors užsiregistruoja mokamam planui ir pritaiko jūsų kodą.";
 
-  static String m37(endDate) =>
+  static String m39(endDate) =>
       "Nemokamas bandomasis laikotarpis galioja iki ${endDate}";
 
-  static String m39(sizeInMBorGB) => "Atlaisvinti ${sizeInMBorGB}";
+  static String m41(sizeInMBorGB) => "Atlaisvinti ${sizeInMBorGB}";
 
-  static String m41(currentlyProcessing, totalCount) =>
+  static String m43(currentlyProcessing, totalCount) =>
       "Apdorojama ${currentlyProcessing} / ${totalCount}";
 
-  static String m42(count) =>
+  static String m44(count) =>
       "${Intl.plural(count, one: '${count} elementas', few: '${count} elementai', many: '${count} elemento', other: '${count} elementų')}";
 
-  static String m43(email) => "${email} pakvietė jus būti patikimu kontaktu";
+  static String m45(email) => "${email} pakvietė jus būti patikimu kontaktu";
 
-  static String m44(expiryTime) => "Nuoroda nebegalios ${expiryTime}";
+  static String m46(expiryTime) => "Nuoroda nebegalios ${expiryTime}";
+
+  static String m48(personName, email) =>
+      "Tai susies ${personName} su ${email}.";
 
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, zero: 'nėra prisiminimų', one: '${formattedCount} prisiminimas', few: '${formattedCount} prisiminimai', many: '${formattedCount} prisiminimo', other: '${formattedCount} prisiminimų')}";
 
-  static String m45(count) =>
+  static String m49(count) =>
       "${Intl.plural(count, one: 'Perkelti elementą', few: 'Perkelti elementus', many: 'Perkelti elemento', other: 'Perkelti elementų')}";
 
-  static String m47(personName) => "Nėra pasiūlymų asmeniui ${personName}.";
+  static String m51(personName) => "Nėra pasiūlymų asmeniui ${personName}.";
 
-  static String m48(name) => "Ne ${name}?";
+  static String m52(name) => "Ne ${name}?";
 
-  static String m49(familyAdminEmail) =>
+  static String m53(familyAdminEmail) =>
       "Susisiekite su ${familyAdminEmail}, kad pakeistumėte savo kodą.";
 
   static String m0(passwordStrengthValue) =>
       "Slaptažodžio stiprumas: ${passwordStrengthValue}";
 
-  static String m50(providerName) =>
+  static String m54(providerName) =>
       "Kreipkitės į ${providerName} palaikymo komandą, jei jums buvo nuskaičiuota.";
 
-  static String m52(endDate) =>
+  static String m56(endDate) =>
       "Nemokama bandomoji versija galioja iki ${endDate}.\nVėliau galėsite pasirinkti mokamą planą.";
 
-  static String m54(toEmail) => "Siųskite žurnalus adresu\n${toEmail}";
+  static String m58(toEmail) => "Siųskite žurnalus adresu\n${toEmail}";
 
-  static String m55(folderName) => "Apdorojama ${folderName}...";
+  static String m59(folderName) => "Apdorojama ${folderName}...";
 
-  static String m56(storeName) => "Vertinti mus parduotuvėje „${storeName}“";
+  static String m60(storeName) => "Vertinti mus parduotuvėje „${storeName}“";
 
-  static String m57(days, email) =>
+  static String m61(name) => "Perskirstė jus į ${name}";
+
+  static String m62(days, email) =>
       "Paskyrą galėsite pasiekti po ${days} dienų. Pranešimas bus išsiųstas į ${email}.";
 
-  static String m58(email) =>
+  static String m63(email) =>
       "Dabar galite atkurti ${email} paskyrą nustatydami naują slaptažodį.";
 
-  static String m59(email) => "${email} bando atkurti jūsų paskyrą.";
+  static String m64(email) => "${email} bando atkurti jūsų paskyrą.";
 
-  static String m60(storageInGB) =>
+  static String m65(storageInGB) =>
       "3. Abu gaunate ${storageInGB} GB* nemokamai";
 
-  static String m61(userEmail) =>
+  static String m66(userEmail) =>
       "${userEmail} bus pašalintas iš šio bendrinamo albumo.\n\nVisos jų pridėtos nuotraukos taip pat bus pašalintos iš albumo.";
 
-  static String m62(endDate) => "Prenumerata atnaujinama ${endDate}";
+  static String m67(endDate) => "Prenumerata atnaujinama ${endDate}";
 
-  static String m63(count) =>
+  static String m68(count) =>
       "${Intl.plural(count, one: 'Rastas ${count} rezultatas', few: 'Rasti ${count} rezultatai', many: 'Rasta ${count} rezultato', other: 'Rasta ${count} rezultatų')}";
 
-  static String m64(snapshotLength, searchLength) =>
+  static String m69(snapshotLength, searchLength) =>
       "Sekcijų ilgio neatitikimas: ${snapshotLength} != ${searchLength}";
 
   static String m6(count) => "${count} pasirinkta";
 
-  static String m65(count, yourCount) =>
+  static String m70(count, yourCount) =>
       "${count} pasirinkta (${yourCount} jūsų)";
 
-  static String m66(verificationID) =>
+  static String m71(verificationID) =>
       "Štai mano patvirtinimo ID: ${verificationID}, skirta ente.io.";
 
   static String m7(verificationID) =>
       "Ei, ar galite patvirtinti, kad tai yra jūsų ente.io patvirtinimo ID: ${verificationID}";
 
-  static String m67(referralCode, referralStorageInGB) =>
+  static String m72(referralCode, referralStorageInGB) =>
       "„Ente“ rekomendacijos kodas: ${referralCode} \n\nTaikykite jį per Nustatymai → Bendrieji → Rekomendacijos, kad gautumėte ${referralStorageInGB} GB nemokamai po to, kai užsiregistruosite mokamam planui.\n\nhttps://ente.io";
 
-  static String m68(numberOfPeople) =>
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: 'Bendrinti su konkrečiais asmenimis', one: 'Bendrinta su 1 asmeniu', other: 'Bendrinta su ${numberOfPeople} asmenimis')}";
 
-  static String m70(fileType) =>
+  static String m75(fileType) =>
       "Šis ${fileType} bus ištrintas iš jūsų įrenginio.";
 
-  static String m71(fileType) =>
+  static String m76(fileType) =>
       "Šis ${fileType} yra ir saugykloje „Ente“ bei įrenginyje.";
 
-  static String m72(fileType) => "Šis ${fileType} bus ištrintas iš „Ente“.";
+  static String m77(fileType) => "Šis ${fileType} bus ištrintas iš „Ente“.";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} GB";
 
-  static String m74(id) =>
+  static String m79(id) =>
       "Jūsų ${id} jau susietas su kita „Ente“ paskyra.\nJei norite naudoti savo ${id} su šia paskyra, susisiekite su mūsų palaikymo komanda.";
 
-  static String m76(completed, total) =>
+  static String m81(completed, total) =>
       "${completed} / ${total} išsaugomi prisiminimai";
 
-  static String m77(ignoreReason) =>
+  static String m82(ignoreReason) =>
       "Palieskite, kad įkeltumėte. Įkėlimas šiuo metu ignoruojamas dėl ${ignoreReason}.";
 
   static String m8(storageAmountInGB) =>
       "Jie taip pat gauna ${storageAmountInGB} GB";
 
-  static String m78(email) => "Tai – ${email} patvirtinimo ID";
+  static String m83(email) => "Tai – ${email} patvirtinimo ID";
 
-  static String m79(count) =>
+  static String m84(count) =>
       "${Intl.plural(count, zero: 'Netrukus', one: '1 diena', other: '${count} dienų')}";
 
-  static String m80(email) =>
+  static String m85(email) =>
       "Buvote pakviesti tapti ${email} palikimo kontaktu.";
 
-  static String m81(galleryType) =>
+  static String m86(galleryType) =>
       "Galerijos tipas ${galleryType} nepalaikomas pervadinimui.";
 
-  static String m82(ignoreReason) =>
+  static String m87(ignoreReason) =>
       "Įkėlimas ignoruojamas dėl ${ignoreReason}.";
 
-  static String m84(endDate) => "Galioja iki ${endDate}";
+  static String m89(endDate) => "Galioja iki ${endDate}";
 
-  static String m85(email) => "Patvirtinti ${email}";
+  static String m90(email) => "Patvirtinti ${email}";
 
-  static String m86(count) =>
+  static String m91(count) =>
       "${Intl.plural(count, zero: 'Pridėta 0 žiūrėtojų', one: 'Pridėtas 1 žiūrėtojas', other: 'Pridėta ${count} žiūrėtojų')}";
 
   static String m2(email) => "Išsiuntėme laišką adresu <green>${email}</green>";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, one: 'prieš ${count} metus', few: 'prieš ${count} metus', many: 'prieš ${count} metų', other: 'prieš ${count} metų')}";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
@@ -221,6 +235,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "account": MessageLookupByLibrary.simpleMessage("Paskyra"),
         "accountIsAlreadyConfigured":
             MessageLookupByLibrary.simpleMessage("Paskyra jau sukonfigūruota."),
+        "accountOwnerPersonAppbarTitle": m9,
         "accountWelcomeBack":
             MessageLookupByLibrary.simpleMessage("Sveiki sugrįžę!"),
         "ackPasswordLostWarning": MessageLookupByLibrary.simpleMessage(
@@ -233,9 +248,9 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Pridėti naują el. paštą"),
         "addCollaborator":
             MessageLookupByLibrary.simpleMessage("Pridėti bendradarbį"),
-        "addCollaborators": m9,
+        "addCollaborators": m10,
         "addFiles": MessageLookupByLibrary.simpleMessage("Pridėti failus"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocation": MessageLookupByLibrary.simpleMessage("Pridėti vietovę"),
         "addLocationButton": MessageLookupByLibrary.simpleMessage("Pridėti"),
         "addMore": MessageLookupByLibrary.simpleMessage("Pridėti daugiau"),
@@ -253,7 +268,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "addTrustedContact":
             MessageLookupByLibrary.simpleMessage("Pridėti patikimą kontaktą"),
         "addViewer": MessageLookupByLibrary.simpleMessage("Pridėti žiūrėtoją"),
-        "addViewers": m12,
+        "addViewers": m13,
         "addedAs": MessageLookupByLibrary.simpleMessage("Pridėta kaip"),
         "addingToFavorites":
             MessageLookupByLibrary.simpleMessage("Pridedama prie mėgstamų..."),
@@ -266,10 +281,13 @@ class MessageLookup extends MessageLookupByLibrary {
         "after1Week": MessageLookupByLibrary.simpleMessage("Po 1 savaitės"),
         "after1Year": MessageLookupByLibrary.simpleMessage("Po 1 metų"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("Savininkas"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
+        "albumTitle":
+            MessageLookupByLibrary.simpleMessage("Albumo pavadinimas"),
         "albumUpdated":
             MessageLookupByLibrary.simpleMessage("Atnaujintas albumas"),
         "albums": MessageLookupByLibrary.simpleMessage("Albumai"),
+        "allClear": MessageLookupByLibrary.simpleMessage("✨ Viskas išvalyta"),
         "allMemoriesPreserved":
             MessageLookupByLibrary.simpleMessage("Išsaugoti visi prisiminimai"),
         "allPersonGroupingWillReset": MessageLookupByLibrary.simpleMessage(
@@ -309,7 +327,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "appLock": MessageLookupByLibrary.simpleMessage("Programos užraktas"),
         "appLockDescriptions": MessageLookupByLibrary.simpleMessage(
             "Pasirinkite tarp numatytojo įrenginio užrakinimo ekrano ir pasirinktinio užrakinimo ekrano su PIN kodu arba slaptažodžiu."),
-        "appVersion": m16,
+        "appVersion": m17,
         "appleId": MessageLookupByLibrary.simpleMessage("„Apple ID“"),
         "apply": MessageLookupByLibrary.simpleMessage("Taikyti"),
         "applyCodeTitle": MessageLookupByLibrary.simpleMessage("Taikyti kodą"),
@@ -375,6 +393,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoPairDesc": MessageLookupByLibrary.simpleMessage(
             "Automatinis susiejimas veikia tik su įrenginiais, kurie palaiko „Chromecast“."),
         "available": MessageLookupByLibrary.simpleMessage("Prieinama"),
+        "backedUpFolders": MessageLookupByLibrary.simpleMessage(
+            "Sukurtos atsarginės aplankų kopijos"),
         "backup":
             MessageLookupByLibrary.simpleMessage("Kurti atsarginę kopiją"),
         "backupFile": MessageLookupByLibrary.simpleMessage(
@@ -406,7 +426,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Atšaukti atkūrimą"),
         "cancelAccountRecoveryBody": MessageLookupByLibrary.simpleMessage(
             "Ar tikrai norite atšaukti atkūrimą?"),
-        "cancelOtherSubscription": m18,
+        "cancelOtherSubscription": m19,
         "cancelSubscription":
             MessageLookupByLibrary.simpleMessage("Atsisakyti prenumeratos"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
@@ -458,7 +478,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Gaukite nemokamos saugyklos"),
         "claimMore": MessageLookupByLibrary.simpleMessage("Gaukite daugiau!"),
         "claimed": MessageLookupByLibrary.simpleMessage("Gauta"),
-        "claimedStorageSoFar": m19,
+        "claimedStorageSoFar": m20,
         "cleanUncategorized":
             MessageLookupByLibrary.simpleMessage("Valyti nekategorizuotus"),
         "cleanUncategorizedDescription": MessageLookupByLibrary.simpleMessage(
@@ -485,7 +505,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Bendradarbiai gali pridėti nuotraukų ir vaizdo įrašų į bendrintą albumą."),
-        "collaboratorsSuccessfullyAdded": m21,
+        "collaboratorsSuccessfullyAdded": m22,
         "collect": MessageLookupByLibrary.simpleMessage("Rinkti"),
         "collectEventPhotos":
             MessageLookupByLibrary.simpleMessage("Rinkti įvykių nuotraukas"),
@@ -500,7 +520,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Ar tikrai norite išjungti dvigubą tapatybės nustatymą?"),
         "confirmAccountDeletion": MessageLookupByLibrary.simpleMessage(
             "Patvirtinti paskyros ištrynimą"),
-        "confirmAddingTrustedContact": m22,
+        "confirmAddingTrustedContact": m23,
         "confirmDeletePrompt": MessageLookupByLibrary.simpleMessage(
             "Taip, noriu negrįžtamai ištrinti šią paskyrą ir jos duomenis per visas programas"),
         "confirmPassword":
@@ -515,6 +535,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Prijungti prie įrenginio"),
         "contactSupport": MessageLookupByLibrary.simpleMessage(
             "Susisiekti su palaikymo komanda"),
+        "contactToManageSubscription": m25,
         "contacts": MessageLookupByLibrary.simpleMessage("Kontaktai"),
         "continueLabel": MessageLookupByLibrary.simpleMessage("Tęsti"),
         "continueOnFreeTrial": MessageLookupByLibrary.simpleMessage(
@@ -551,7 +572,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "currentlyRunning":
             MessageLookupByLibrary.simpleMessage("šiuo metu vykdoma"),
         "custom": MessageLookupByLibrary.simpleMessage("Pasirinktinis"),
-        "customEndpoint": m25,
+        "customEndpoint": m26,
         "darkTheme": MessageLookupByLibrary.simpleMessage("Tamsi"),
         "dayToday": MessageLookupByLibrary.simpleMessage("Šiandien"),
         "dayYesterday": MessageLookupByLibrary.simpleMessage("Vakar"),
@@ -587,12 +608,12 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Ištrinti iš įrenginio"),
         "deleteFromEnte":
             MessageLookupByLibrary.simpleMessage("Ištrinti iš „Ente“"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deleteLocation":
             MessageLookupByLibrary.simpleMessage("Ištrinti vietovę"),
         "deletePhotos":
             MessageLookupByLibrary.simpleMessage("Ištrinti nuotraukas"),
-        "deleteProgress": m27,
+        "deleteProgress": m28,
         "deleteReason1": MessageLookupByLibrary.simpleMessage(
             "Trūksta pagrindinės funkcijos, kurios man reikia"),
         "deleteReason2": MessageLookupByLibrary.simpleMessage(
@@ -628,9 +649,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Žiūrėtojai vis tiek gali daryti ekrano kopijas arba išsaugoti nuotraukų kopijas naudojant išorinius įrankius"),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("Atkreipkite dėmesį"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "disableTwofactor": MessageLookupByLibrary.simpleMessage(
             "Išjungti dvigubą tapatybės nustatymą"),
+        "disablingTwofactorAuthentication":
+            MessageLookupByLibrary.simpleMessage(
+                "Išjungiamas dvigubas tapatybės nustatymas..."),
         "discord": MessageLookupByLibrary.simpleMessage("„Discord“"),
         "discover": MessageLookupByLibrary.simpleMessage("Atraskite"),
         "discover_babies": MessageLookupByLibrary.simpleMessage("Kūdikiai"),
@@ -657,15 +681,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "doThisLater":
             MessageLookupByLibrary.simpleMessage("Daryti tai vėliau"),
         "done": MessageLookupByLibrary.simpleMessage("Atlikta"),
+        "dontSave": MessageLookupByLibrary.simpleMessage("Neišsaugoti"),
         "doubleYourStorage":
             MessageLookupByLibrary.simpleMessage("Padvigubinkite saugyklą"),
         "download": MessageLookupByLibrary.simpleMessage("Atsisiųsti"),
         "downloadFailed":
             MessageLookupByLibrary.simpleMessage("Atsisiuntimas nepavyko."),
         "downloading": MessageLookupByLibrary.simpleMessage("Atsisiunčiama..."),
-        "dropSupportEmail": m29,
-        "duplicateFileCountWithStorageSaved": m30,
-        "duplicateItemsGroup": m31,
+        "dropSupportEmail": m30,
+        "duplicateFileCountWithStorageSaved": m31,
+        "duplicateItemsGroup": m32,
         "edit": MessageLookupByLibrary.simpleMessage("Redaguoti"),
         "editLocation":
             MessageLookupByLibrary.simpleMessage("Redaguoti vietovę"),
@@ -679,7 +704,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "email": MessageLookupByLibrary.simpleMessage("El. paštas"),
         "emailAlreadyRegistered": MessageLookupByLibrary.simpleMessage(
             "El. paštas jau užregistruotas."),
-        "emailNoEnteAccount": m33,
+        "emailChangedTo": m33,
+        "emailDoesNotHaveEnteAccount": m34,
+        "emailNoEnteAccount": m35,
         "emailNotRegistered":
             MessageLookupByLibrary.simpleMessage("El. paštas neregistruotas."),
         "emailVerificationToggle":
@@ -701,6 +728,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "enableMapsDesc": MessageLookupByLibrary.simpleMessage(
             "Tai parodys jūsų nuotraukas pasaulio žemėlapyje.\n\nŠį žemėlapį talpina „OpenStreetMap“, o tiksliomis nuotraukų vietovėmis niekada nebendrinama.\n\nŠią funkciją bet kada galite išjungti iš nustatymų."),
         "enabled": MessageLookupByLibrary.simpleMessage("Įjungta"),
+        "encryptingBackup": MessageLookupByLibrary.simpleMessage(
+            "Šifruojama atsarginė kopija..."),
         "encryption": MessageLookupByLibrary.simpleMessage("Šifravimas"),
         "encryptionKeys":
             MessageLookupByLibrary.simpleMessage("Šifravimo raktai"),
@@ -759,12 +788,13 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Eksportuoti duomenis"),
         "extraPhotosFound": MessageLookupByLibrary.simpleMessage(
             "Rastos papildomos nuotraukos"),
-        "extraPhotosFoundFor": m34,
+        "extraPhotosFoundFor": m36,
         "faceNotClusteredYet": MessageLookupByLibrary.simpleMessage(
             "Veidas dar nesugrupuotas. Grįžkite vėliau."),
         "faceRecognition":
             MessageLookupByLibrary.simpleMessage("Veido atpažinimas"),
         "faces": MessageLookupByLibrary.simpleMessage("Veidai"),
+        "failed": MessageLookupByLibrary.simpleMessage("Nepavyko"),
         "failedToApplyCode":
             MessageLookupByLibrary.simpleMessage("Nepavyko pritaikyti kodo."),
         "failedToCancel":
@@ -811,15 +841,19 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Naudojama nemokama saugykla"),
         "freeTrial": MessageLookupByLibrary.simpleMessage(
             "Nemokamas bandomasis laikotarpis"),
-        "freeTrialValidTill": m37,
-        "freeUpAmount": m39,
+        "freeTrialValidTill": m39,
+        "freeUpAmount": m41,
+        "freeUpDeviceSpace":
+            MessageLookupByLibrary.simpleMessage("Atlaisvinti įrenginio vietą"),
+        "freeUpDeviceSpaceDesc": MessageLookupByLibrary.simpleMessage(
+            "Sutaupykite vietos savo įrenginyje išvalydami failus, kurių atsarginės kopijos jau buvo sukurtos."),
         "gallery": MessageLookupByLibrary.simpleMessage("Galerija"),
         "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage(
             "Galerijoje rodoma iki 1000 prisiminimų"),
         "general": MessageLookupByLibrary.simpleMessage("Bendrieji"),
         "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage(
             "Generuojami šifravimo raktai..."),
-        "genericProgress": m41,
+        "genericProgress": m43,
         "goToSettings":
             MessageLookupByLibrary.simpleMessage("Eiti į nustatymus"),
         "googlePlayId":
@@ -872,6 +906,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Indeksuoti elementai"),
         "indexingIsPaused": MessageLookupByLibrary.simpleMessage(
             "Indeksavimas pristabdytas. Jis bus automatiškai tęsiamas, kai įrenginys yra paruoštas."),
+        "ineligible": MessageLookupByLibrary.simpleMessage("Netinkami"),
         "info": MessageLookupByLibrary.simpleMessage("Informacija"),
         "insecureDevice":
             MessageLookupByLibrary.simpleMessage("Nesaugus įrenginys"),
@@ -894,7 +929,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "itLooksLikeSomethingWentWrongPleaseRetryAfterSome":
             MessageLookupByLibrary.simpleMessage(
                 "Atrodo, kad kažkas nutiko ne taip. Bandykite pakartotinai po kurio laiko. Jei klaida tęsiasi, susisiekite su mūsų palaikymo komanda."),
-        "itemCount": m42,
+        "itemCount": m44,
         "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion":
             MessageLookupByLibrary.simpleMessage(
                 "Elementai rodo likusių dienų skaičių iki visiško ištrynimo."),
@@ -903,6 +938,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "join": MessageLookupByLibrary.simpleMessage("Jungtis"),
         "joinAlbum":
             MessageLookupByLibrary.simpleMessage("Junkitės prie albumo"),
+        "joinAlbumConfirmationDialogBody": MessageLookupByLibrary.simpleMessage(
+            "Prisijungus prie albumo, jūsų el. paštas bus matomas jo dalyviams."),
         "joinAlbumSubtext": MessageLookupByLibrary.simpleMessage(
             "kad peržiūrėtumėte ir pridėtumėte savo nuotraukas"),
         "joinAlbumSubtextViewer": MessageLookupByLibrary.simpleMessage(
@@ -925,7 +962,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "legacy": MessageLookupByLibrary.simpleMessage("Palikimas"),
         "legacyAccounts":
             MessageLookupByLibrary.simpleMessage("Palikimo paskyros"),
-        "legacyInvite": m43,
+        "legacyInvite": m45,
         "legacyPageDesc": MessageLookupByLibrary.simpleMessage(
             "Palikimas leidžia patikimiems kontaktams pasiekti jūsų paskyrą jums nesant."),
         "legacyPageDesc2": MessageLookupByLibrary.simpleMessage(
@@ -938,12 +975,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "linkEmail": MessageLookupByLibrary.simpleMessage("Susieti el. paštą"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("Įjungta"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("Nebegalioja"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry":
             MessageLookupByLibrary.simpleMessage("Nuorodos galiojimo laikas"),
         "linkHasExpired":
             MessageLookupByLibrary.simpleMessage("Nuoroda nebegalioja"),
         "linkNeverExpires": MessageLookupByLibrary.simpleMessage("Niekada"),
+        "linkPerson": MessageLookupByLibrary.simpleMessage("Susiekite asmenį,"),
+        "linkPersonCaption": MessageLookupByLibrary.simpleMessage(
+            "kad geriau bendrintumėte patirtį"),
+        "linkPersonToEmailConfirmation": m48,
         "livePhotos": MessageLookupByLibrary.simpleMessage("Gyvos nuotraukos"),
         "loadMessage1": MessageLookupByLibrary.simpleMessage(
             "Galite bendrinti savo prenumeratą su šeima."),
@@ -982,6 +1023,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Vietos žymė grupuoja visas nuotraukas, kurios buvo padarytos tam tikru spinduliu nuo nuotraukos"),
         "locations": MessageLookupByLibrary.simpleMessage("Vietovės"),
         "lockButtonLabel": MessageLookupByLibrary.simpleMessage("Užrakinti"),
+        "lockscreen": MessageLookupByLibrary.simpleMessage("Ekrano užraktas"),
         "logInLabel": MessageLookupByLibrary.simpleMessage("Prisijungti"),
         "loggingOut": MessageLookupByLibrary.simpleMessage("Atsijungiama..."),
         "loginSessionExpired":
@@ -1025,6 +1067,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "maps": MessageLookupByLibrary.simpleMessage("Žemėlapiai"),
         "mastodon": MessageLookupByLibrary.simpleMessage("„Mastodon“"),
         "matrix": MessageLookupByLibrary.simpleMessage("„Matrix“"),
+        "me": MessageLookupByLibrary.simpleMessage("Aš"),
         "memoryCount": m5,
         "merchandise": MessageLookupByLibrary.simpleMessage("Atributika"),
         "mergeWithExisting":
@@ -1053,7 +1096,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Daugiau išsamios informacijos"),
         "mostRecent": MessageLookupByLibrary.simpleMessage("Naujausią"),
         "mostRelevant": MessageLookupByLibrary.simpleMessage("Aktualiausią"),
-        "moveItem": m45,
+        "moveItem": m49,
         "movedToTrash":
             MessageLookupByLibrary.simpleMessage("Perkelta į šiukšlinę"),
         "name": MessageLookupByLibrary.simpleMessage("Pavadinimą"),
@@ -1075,6 +1118,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "noDeviceFound":
             MessageLookupByLibrary.simpleMessage("Įrenginys nerastas"),
         "noDeviceLimit": MessageLookupByLibrary.simpleMessage("Jokio"),
+        "noDeviceThatCanBeDeleted": MessageLookupByLibrary.simpleMessage(
+            "Neturite šiame įrenginyje failų, kuriuos galima ištrinti."),
         "noDuplicates":
             MessageLookupByLibrary.simpleMessage("✨ Dublikatų nėra"),
         "noEnteAccountExclamation":
@@ -1094,10 +1139,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "noResults": MessageLookupByLibrary.simpleMessage("Rezultatų nėra."),
         "noResultsFound":
             MessageLookupByLibrary.simpleMessage("Rezultatų nerasta."),
-        "noSuggestionsForPerson": m47,
+        "noSuggestionsForPerson": m51,
         "noSystemLockFound":
             MessageLookupByLibrary.simpleMessage("Nerastas sistemos užraktas"),
-        "notPersonLabel": m48,
+        "notPersonLabel": m52,
         "nothingSharedWithYouYet": MessageLookupByLibrary.simpleMessage(
             "Kol kas su jumis niekuo nesibendrinama."),
         "nothingToSeeHere": MessageLookupByLibrary.simpleMessage(
@@ -1107,7 +1152,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "onDevice": MessageLookupByLibrary.simpleMessage("Įrenginyje"),
         "onEnte": MessageLookupByLibrary.simpleMessage(
             "Saugykloje <branding>ente</branding>"),
-        "onlyFamilyAdminCanChangeCode": m49,
+        "onlyFamilyAdminCanChangeCode": m53,
         "onlyThem": MessageLookupByLibrary.simpleMessage("Tik jiems"),
         "oops": MessageLookupByLibrary.simpleMessage("Ups"),
         "oopsSomethingWentWrong":
@@ -1123,8 +1168,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Arba sujunkite su esamais"),
         "orPickAnExistingOne":
             MessageLookupByLibrary.simpleMessage("Arba pasirinkite esamą"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
+        "orPickFromYourContacts": MessageLookupByLibrary.simpleMessage(
+            "arba pasirinkite iš savo kontaktų"),
         "pair": MessageLookupByLibrary.simpleMessage("Susieti"),
         "pairWithPin": MessageLookupByLibrary.simpleMessage("Susieti su PIN"),
         "pairingComplete":
@@ -1151,7 +1196,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Mokėjimas nepavyko"),
         "paymentFailedMessage": MessageLookupByLibrary.simpleMessage(
             "Deja, jūsų mokėjimas nepavyko. Susisiekite su palaikymo komanda ir mes jums padėsime!"),
-        "paymentFailedTalkToProvider": m50,
+        "paymentFailedTalkToProvider": m54,
         "pendingItems":
             MessageLookupByLibrary.simpleMessage("Laukiami elementai"),
         "pendingSync":
@@ -1175,19 +1220,26 @@ class MessageLookup extends MessageLookupByLibrary {
         "pinLock": MessageLookupByLibrary.simpleMessage("PIN užrakinimas"),
         "playOnTv": MessageLookupByLibrary.simpleMessage(
             "Paleisti albumą televizoriuje"),
-        "playStoreFreeTrialValidTill": m52,
+        "playOriginal":
+            MessageLookupByLibrary.simpleMessage("Leisti originalą"),
+        "playStoreFreeTrialValidTill": m56,
+        "playStream":
+            MessageLookupByLibrary.simpleMessage("Leisti srautinį perdavimą"),
         "playstoreSubscription":
             MessageLookupByLibrary.simpleMessage("„PlayStore“ prenumerata"),
         "pleaseCheckYourInternetConnectionAndTryAgain":
             MessageLookupByLibrary.simpleMessage(
                 "Patikrinkite savo interneto ryšį ir bandykite dar kartą."),
+        "pleaseContactSupportAndWeWillBeHappyToHelp":
+            MessageLookupByLibrary.simpleMessage(
+                "Susisiekite adresu support@ente.io ir mes mielai padėsime!"),
         "pleaseGrantPermissions":
             MessageLookupByLibrary.simpleMessage("Suteikite leidimus."),
         "pleaseLoginAgain":
             MessageLookupByLibrary.simpleMessage("Prisijunkite iš naujo."),
         "pleaseSelectQuickLinksToRemove": MessageLookupByLibrary.simpleMessage(
             "Pasirinkite sparčiąsias nuorodas, kad pašalintumėte"),
-        "pleaseSendTheLogsTo": m54,
+        "pleaseSendTheLogsTo": m58,
         "pleaseTryAgain":
             MessageLookupByLibrary.simpleMessage("Bandykite dar kartą."),
         "pleaseVerifyTheCodeYouHaveEntered":
@@ -1211,13 +1263,18 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Privatus bendrinimas"),
         "proceed": MessageLookupByLibrary.simpleMessage("Tęsti"),
         "processed": MessageLookupByLibrary.simpleMessage("Apdorota"),
-        "processingImport": m55,
+        "processing": MessageLookupByLibrary.simpleMessage("Apdorojama"),
+        "processingImport": m59,
+        "processingVideos":
+            MessageLookupByLibrary.simpleMessage("Apdorojami vaizdo įrašai"),
         "publicLinkEnabled":
             MessageLookupByLibrary.simpleMessage("Įjungta viešoji nuoroda"),
+        "queued": MessageLookupByLibrary.simpleMessage("Įtraukta eilėje"),
         "raiseTicket": MessageLookupByLibrary.simpleMessage("Sukurti paraišką"),
         "rateTheApp": MessageLookupByLibrary.simpleMessage("Vertinti programą"),
         "rateUs": MessageLookupByLibrary.simpleMessage("Vertinti mus"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
+        "reassignedToName": m61,
         "recover": MessageLookupByLibrary.simpleMessage("Atkurti"),
         "recoverAccount":
             MessageLookupByLibrary.simpleMessage("Atkurti paskyrą"),
@@ -1226,7 +1283,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Atkurti paskyrą"),
         "recoveryInitiated":
             MessageLookupByLibrary.simpleMessage("Pradėtas atkūrimas"),
-        "recoveryInitiatedDesc": m57,
+        "recoveryInitiatedDesc": m62,
         "recoveryKey": MessageLookupByLibrary.simpleMessage("Atkūrimo raktas"),
         "recoveryKeyCopiedToClipboard": MessageLookupByLibrary.simpleMessage(
             "Nukopijuotas atkūrimo raktas į iškarpinę"),
@@ -1240,12 +1297,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Patvirtintas atkūrimo raktas"),
         "recoveryKeyVerifyReason": MessageLookupByLibrary.simpleMessage(
             "Atkūrimo raktas – vienintelis būdas atkurti nuotraukas, jei pamiršote slaptažodį. Atkūrimo raktą galite rasti Nustatymose > Paskyra.\n\nĮveskite savo atkūrimo raktą čia, kad patvirtintumėte, ar teisingai jį išsaugojote."),
-        "recoveryReady": m58,
+        "recoveryReady": m63,
         "recoverySuccessful":
             MessageLookupByLibrary.simpleMessage("Atkūrimas sėkmingas."),
         "recoveryWarning": MessageLookupByLibrary.simpleMessage(
             "Patikimas kontaktas bando pasiekti jūsų paskyrą."),
-        "recoveryWarningBody": m59,
+        "recoveryWarningBody": m64,
         "recreatePasswordBody": MessageLookupByLibrary.simpleMessage(
             "Dabartinis įrenginys nėra pakankamai galingas, kad patvirtintų jūsų slaptažodį, bet mes galime iš naujo sugeneruoti taip, kad jis veiktų su visais įrenginiais.\n\nPrisijunkite naudojant atkūrimo raktą ir sugeneruokite iš naujo slaptažodį (jei norite, galite vėl naudoti tą patį)."),
         "recreatePasswordTitle":
@@ -1261,7 +1318,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "1. Duokite šį kodą savo draugams"),
         "referralStep2": MessageLookupByLibrary.simpleMessage(
             "2. Jie užsiregistruoja mokamą planą"),
-        "referralStep3": m60,
+        "referralStep3": m65,
         "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage(
             "Šiuo metu rekomendacijos yra pristabdytos"),
         "rejectRecovery":
@@ -1279,6 +1336,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "remove": MessageLookupByLibrary.simpleMessage("Šalinti"),
         "removeDuplicates":
             MessageLookupByLibrary.simpleMessage("Šalinti dublikatus"),
+        "removeDuplicatesDesc": MessageLookupByLibrary.simpleMessage(
+            "Peržiūrėkite ir pašalinkite failus, kurie yra tiksliai dublikatai."),
         "removeFromAlbum":
             MessageLookupByLibrary.simpleMessage("Šalinti iš albumo"),
         "removeFromAlbumTitle":
@@ -1290,7 +1349,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "removeLink": MessageLookupByLibrary.simpleMessage("Šalinti nuorodą"),
         "removeParticipant":
             MessageLookupByLibrary.simpleMessage("Šalinti dalyvį"),
-        "removeParticipantBody": m61,
+        "removeParticipantBody": m66,
         "removePersonLabel":
             MessageLookupByLibrary.simpleMessage("Šalinti asmens žymą"),
         "removePublicLink":
@@ -1309,7 +1368,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "renameFile": MessageLookupByLibrary.simpleMessage("Pervadinti failą"),
         "renewSubscription":
             MessageLookupByLibrary.simpleMessage("Atnaujinti prenumeratą"),
-        "renewsOn": m62,
+        "renewsOn": m67,
         "reportABug":
             MessageLookupByLibrary.simpleMessage("Pranešti apie riktą"),
         "reportBug":
@@ -1333,6 +1392,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "right": MessageLookupByLibrary.simpleMessage("Dešinė"),
         "rotate": MessageLookupByLibrary.simpleMessage("Sukti"),
         "safelyStored": MessageLookupByLibrary.simpleMessage("Saugiai saugoma"),
+        "saveChangesBeforeLeavingQuestion":
+            MessageLookupByLibrary.simpleMessage(
+                "Išsaugoti pakeitimus prieš išeinant?"),
         "saveKey": MessageLookupByLibrary.simpleMessage("Išsaugoti raktą"),
         "savePerson": MessageLookupByLibrary.simpleMessage("Išsaugoti asmenį"),
         "saveYourRecoveryKeyIfYouHaventAlready":
@@ -1345,6 +1407,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Skenuokite šį QR kodą\nsu autentifikatoriaus programa"),
         "search": MessageLookupByLibrary.simpleMessage("Ieškokite"),
+        "searchByAlbumNameHint":
+            MessageLookupByLibrary.simpleMessage("Albumo pavadinimas"),
         "searchByExamples": MessageLookupByLibrary.simpleMessage(
             "• Albumų pavadinimai (pvz., „Fotoaparatas“)\n• Failų tipai (pvz., „Vaizdo įrašai“, „.gif“)\n• Metai ir mėnesiai (pvz., „2022“, „sausis“)\n• Šventės (pvz., „Kalėdos“)\n• Nuotraukų aprašymai (pvz., „#džiaugsmas“)"),
         "searchCaptionEmptySection": MessageLookupByLibrary.simpleMessage(
@@ -1362,8 +1426,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Pakvieskite asmenis ir čia matysite visas jų bendrinamas nuotraukas."),
         "searchPersonsEmptySection": MessageLookupByLibrary.simpleMessage(
             "Asmenys bus rodomi čia, kai bus užbaigtas apdorojimas ir sinchronizavimas."),
-        "searchResultCount": m63,
-        "searchSectionsLengthMismatch": m64,
+        "searchResultCount": m68,
+        "searchSectionsLengthMismatch": m69,
         "security": MessageLookupByLibrary.simpleMessage("Saugumas"),
         "seePublicAlbumLinksInApp": MessageLookupByLibrary.simpleMessage(
             "Žiūrėti viešų albumų nuorodas programoje"),
@@ -1391,7 +1455,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Pasirinkti aplankai bus užšifruoti ir sukurtos atsarginės kopijos."),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "send": MessageLookupByLibrary.simpleMessage("Siųsti"),
         "sendEmail": MessageLookupByLibrary.simpleMessage("Siųsti el. laišką"),
         "sendInvite": MessageLookupByLibrary.simpleMessage("Siųsti kvietimą"),
@@ -1422,16 +1486,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "shareAnAlbumNow":
             MessageLookupByLibrary.simpleMessage("Bendrinti albumą dabar"),
         "shareLink": MessageLookupByLibrary.simpleMessage("Bendrinti nuorodą"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage(
             "Bendrinkite tik su tais asmenimis, su kuriais norite"),
         "shareTextConfirmOthersVerificationID": m7,
         "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage(
             "Atsisiųskite „Ente“, kad galėtume lengvai bendrinti originalios kokybės nuotraukas ir vaizdo įrašus.\n\nhttps://ente.io"),
-        "shareTextReferralCode": m67,
+        "shareTextReferralCode": m72,
         "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage(
             "Bendrinkite su ne „Ente“ naudotojais."),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
             "Sukurkite bendrinamus ir bendradarbiaujamus albumus su kitais „Ente“ naudotojais, įskaitant naudotojus nemokamuose planuose."),
         "sharedByYou":
@@ -1452,11 +1516,11 @@ class MessageLookup extends MessageLookupByLibrary {
             "Jei manote, kad kas nors gali žinoti jūsų slaptažodį, galite priverstinai atsijungti iš visų kitų įrenginių, naudojančių jūsų paskyrą."),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "Sutinku su <u-terms>paslaugų sąlygomis</u-terms> ir <u-policy> privatumo politika</u-policy>"),
-        "singleFileDeleteFromDevice": m70,
+        "singleFileDeleteFromDevice": m75,
         "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage(
             "Jis bus ištrintas iš visų albumų."),
-        "singleFileInBothLocalAndRemote": m71,
-        "singleFileInRemoteOnly": m72,
+        "singleFileInBothLocalAndRemote": m76,
+        "singleFileInRemoteOnly": m77,
         "skip": MessageLookupByLibrary.simpleMessage("Praleisti"),
         "social": MessageLookupByLibrary.simpleMessage("Socialinės"),
         "someOfTheFilesYouAreTryingToDeleteAre":
@@ -1500,8 +1564,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageInGB": m1,
         "storageLimitExceeded":
             MessageLookupByLibrary.simpleMessage("Viršyta saugyklos riba."),
+        "streamDetails": MessageLookupByLibrary.simpleMessage(
+            "Srautinio perdavimo išsami informacija"),
         "strongStrength": MessageLookupByLibrary.simpleMessage("Stipri"),
-        "subAlreadyLinkedErrMessage": m74,
+        "subAlreadyLinkedErrMessage": m79,
         "subscribe": MessageLookupByLibrary.simpleMessage("Prenumeruoti"),
         "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage(
             "Kad įjungtumėte bendrinimą, reikia aktyvios mokamos prenumeratos."),
@@ -1513,8 +1579,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Sėkmingai išarchyvuota"),
         "suggestFeatures":
             MessageLookupByLibrary.simpleMessage("Siūlyti funkcijas"),
-        "support": MessageLookupByLibrary.simpleMessage("Palaikymas"),
-        "syncProgress": m76,
+        "support": MessageLookupByLibrary.simpleMessage("Pagalba"),
+        "syncProgress": m81,
         "syncStopped": MessageLookupByLibrary.simpleMessage(
             "Sinchronizavimas sustabdytas"),
         "syncing": MessageLookupByLibrary.simpleMessage("Sinchronizuojama..."),
@@ -1527,7 +1593,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Palieskite, kad atrakintumėte"),
         "tapToUpload":
             MessageLookupByLibrary.simpleMessage("Palieskite, kad įkeltumėte"),
-        "tapToUploadIsIgnoredDue": m77,
+        "tapToUploadIsIgnoredDue": m82,
         "tempErrorContactSupportIfPersists": MessageLookupByLibrary.simpleMessage(
             "Atrodo, kad kažkas nutiko ne taip. Bandykite dar kartą po kurio laiko. Jei klaida tęsiasi, susisiekite su mūsų palaikymo komanda."),
         "terminate": MessageLookupByLibrary.simpleMessage("Baigti"),
@@ -1554,7 +1620,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Šis el. paštas jau naudojamas."),
         "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage(
             "Šis vaizdas neturi Exif duomenų"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsMeExclamation": MessageLookupByLibrary.simpleMessage("Tai aš!"),
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId":
             MessageLookupByLibrary.simpleMessage("Tai – jūsų patvirtinimo ID"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -1576,11 +1643,11 @@ class MessageLookup extends MessageLookupByLibrary {
             "Per daug neteisingų bandymų."),
         "total": MessageLookupByLibrary.simpleMessage("iš viso"),
         "trash": MessageLookupByLibrary.simpleMessage("Šiukšlinė"),
-        "trashDaysLeft": m79,
+        "trashDaysLeft": m84,
         "trim": MessageLookupByLibrary.simpleMessage("Trumpinti"),
         "trustedContacts":
             MessageLookupByLibrary.simpleMessage("Patikimi kontaktai"),
-        "trustedInviteBody": m80,
+        "trustedInviteBody": m85,
         "tryAgain": MessageLookupByLibrary.simpleMessage("Bandyti dar kartą"),
         "twitter": MessageLookupByLibrary.simpleMessage("„Twitter“"),
         "twoMonthsFreeOnYearlyPlans": MessageLookupByLibrary.simpleMessage(
@@ -1592,7 +1659,7 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Dvigubas tapatybės nustatymas"),
         "twofactorSetup": MessageLookupByLibrary.simpleMessage(
             "Dvigubo tapatybės nustatymo sąranka"),
-        "typeOfGallerGallerytypeIsNotSupportedForRename": m81,
+        "typeOfGallerGallerytypeIsNotSupportedForRename": m86,
         "unarchive": MessageLookupByLibrary.simpleMessage("Išarchyvuoti"),
         "unarchiveAlbum":
             MessageLookupByLibrary.simpleMessage("Išarchyvuoti albumą"),
@@ -1611,7 +1678,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "updatingFolderSelection": MessageLookupByLibrary.simpleMessage(
             "Atnaujinamas aplankų pasirinkimas..."),
         "upgrade": MessageLookupByLibrary.simpleMessage("Keisti planą"),
-        "uploadIsIgnoredDueToIgnorereason": m82,
+        "uploadIsIgnoredDueToIgnorereason": m87,
         "upto50OffUntil4thDec": MessageLookupByLibrary.simpleMessage(
             "Iki 50% nuolaida, gruodžio 4 d."),
         "usableReferralStorageInfo": MessageLookupByLibrary.simpleMessage(
@@ -1625,7 +1692,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "useRecoveryKey":
             MessageLookupByLibrary.simpleMessage("Naudoti atkūrimo raktą"),
         "usedSpace": MessageLookupByLibrary.simpleMessage("Naudojama vieta"),
-        "validTill": m84,
+        "validTill": m89,
         "verificationFailedPleaseTryAgain":
             MessageLookupByLibrary.simpleMessage(
                 "Patvirtinimas nepavyko. Bandykite dar kartą."),
@@ -1634,7 +1701,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "verify": MessageLookupByLibrary.simpleMessage("Patvirtinti"),
         "verifyEmail":
             MessageLookupByLibrary.simpleMessage("Patvirtinti el. paštą"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Patvirtinti"),
         "verifyPasskey":
             MessageLookupByLibrary.simpleMessage("Patvirtinti slaptaraktį"),
@@ -1646,15 +1713,20 @@ class MessageLookup extends MessageLookupByLibrary {
         "videoInfo":
             MessageLookupByLibrary.simpleMessage("Vaizdo įrašo informacija"),
         "videoSmallCase": MessageLookupByLibrary.simpleMessage("vaizdo įrašas"),
+        "videoStreaming": MessageLookupByLibrary.simpleMessage(
+            "Vaizdo įrašų srautinis perdavimas"),
         "videos": MessageLookupByLibrary.simpleMessage("Vaizdo įrašai"),
+        "viewActiveSessions":
+            MessageLookupByLibrary.simpleMessage("Peržiūrėti aktyvius seansus"),
         "viewAddOnButton":
             MessageLookupByLibrary.simpleMessage("Peržiūrėti priedus"),
         "viewAll": MessageLookupByLibrary.simpleMessage("Peržiūrėti viską"),
+        "viewLargeFiles": MessageLookupByLibrary.simpleMessage("Dideli failai"),
         "viewLogs": MessageLookupByLibrary.simpleMessage("Peržiūrėti žurnalus"),
         "viewRecoveryKey":
             MessageLookupByLibrary.simpleMessage("Peržiūrėti atkūrimo raktą"),
         "viewer": MessageLookupByLibrary.simpleMessage("Žiūrėtojas"),
-        "viewersSuccessfullyAdded": m86,
+        "viewersSuccessfullyAdded": m91,
         "visitWebToManage": MessageLookupByLibrary.simpleMessage(
             "Aplankykite web.ente.io, kad tvarkytumėte savo prenumeratą"),
         "waitingForVerification":
@@ -1675,7 +1747,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Patikimas kontaktas gali padėti atkurti jūsų duomenis."),
         "yearShort": MessageLookupByLibrary.simpleMessage("m."),
         "yearly": MessageLookupByLibrary.simpleMessage("Metinis"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("Taip"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("Taip, atsisakyti"),
         "yesConvertToViewer":
diff --git a/mobile/lib/generated/intl/messages_ml.dart b/mobile/lib/generated/intl/messages_ml.dart
index 6eacf1ed40..6a3eec447c 100644
--- a/mobile/lib/generated/intl/messages_ml.dart
+++ b/mobile/lib/generated/intl/messages_ml.dart
@@ -90,8 +90,6 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("ഇവിടൊന്നും കാണ്മാനില്ല! 👀"),
         "ok": MessageLookupByLibrary.simpleMessage("ശരി"),
         "oops": MessageLookupByLibrary.simpleMessage("അയ്യോ"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "password": MessageLookupByLibrary.simpleMessage("സങ്കേതക്കുറി"),
         "pleaseTryAgain":
             MessageLookupByLibrary.simpleMessage("ദയവായി വീണ്ടും ശ്രമിക്കുക"),
diff --git a/mobile/lib/generated/intl/messages_nl.dart b/mobile/lib/generated/intl/messages_nl.dart
index c76ec206ef..dbbee15728 100644
--- a/mobile/lib/generated/intl/messages_nl.dart
+++ b/mobile/lib/generated/intl/messages_nl.dart
@@ -20,37 +20,39 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'nl';
 
-  static String m9(count) =>
-      "${Intl.plural(count, zero: 'Voeg samenwerker toe', one: 'Voeg samenwerker toe', other: 'Voeg samenwerkers toe')}";
+  static String m9(title) => "${title} (Ik)";
 
   static String m10(count) =>
+      "${Intl.plural(count, zero: 'Voeg samenwerker toe', one: 'Voeg samenwerker toe', other: 'Voeg samenwerkers toe')}";
+
+  static String m11(count) =>
       "${Intl.plural(count, one: 'Bestand toevoegen', other: 'Bestanden toevoegen')}";
 
-  static String m11(storageAmount, endDate) =>
+  static String m12(storageAmount, endDate) =>
       "Jouw ${storageAmount} add-on is geldig tot ${endDate}";
 
-  static String m12(count) =>
+  static String m13(count) =>
       "${Intl.plural(count, one: 'Voeg kijker toe', other: 'Voeg kijkers toe')}";
 
-  static String m13(emailOrName) => "Toegevoegd door ${emailOrName}";
+  static String m14(emailOrName) => "Toegevoegd door ${emailOrName}";
 
-  static String m14(albumName) => "Succesvol toegevoegd aan  ${albumName}";
+  static String m15(albumName) => "Succesvol toegevoegd aan  ${albumName}";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: 'Geen deelnemers', one: '1 deelnemer', other: '${count} deelnemers')}";
 
-  static String m16(versionValue) => "Versie: ${versionValue}";
+  static String m17(versionValue) => "Versie: ${versionValue}";
 
-  static String m17(freeAmount, storageUnit) =>
+  static String m18(freeAmount, storageUnit) =>
       "${freeAmount} ${storageUnit} vrij";
 
-  static String m18(paymentProvider) =>
+  static String m19(paymentProvider) =>
       "Annuleer eerst uw bestaande abonnement bij ${paymentProvider}";
 
   static String m3(user) =>
       "${user} zal geen foto\'s meer kunnen toevoegen aan dit album\n\nDe gebruiker zal nog steeds bestaande foto\'s kunnen verwijderen die door hen zijn toegevoegd";
 
-  static String m19(isFamilyMember, storageAmountInGb) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
       "${Intl.select(isFamilyMember, {
             'true':
                 'Jouw familie heeft ${storageAmountInGb} GB geclaimd tot nu toe',
@@ -58,214 +60,223 @@ class MessageLookup extends MessageLookupByLibrary {
             'other': 'Je hebt ${storageAmountInGb} GB geclaimd tot nu toe!',
           })}";
 
-  static String m20(albumName) =>
+  static String m21(albumName) =>
       "Gezamenlijke link aangemaakt voor ${albumName}";
 
-  static String m21(count) =>
+  static String m22(count) =>
       "${Intl.plural(count, zero: '0 samenwerkers toegevoegd', one: '1 samenwerker toegevoegd', other: '${count} samenwerkers toegevoegd')}";
 
-  static String m22(email, numOfDays) =>
+  static String m23(email, numOfDays) =>
       "Je staat op het punt ${email} toe te voegen als vertrouwde contactpersoon. Ze kunnen je account herstellen als je ${numOfDays} dagen afwezig bent.";
 
-  static String m23(familyAdminEmail) =>
+  static String m24(familyAdminEmail) =>
       "Neem contact op met <green>${familyAdminEmail}</green> om uw abonnement te beheren";
 
-  static String m24(provider) =>
+  static String m25(provider) =>
       "Neem contact met ons op via support@ente.io om uw ${provider} abonnement te beheren.";
 
-  static String m25(endpoint) => "Verbonden met ${endpoint}";
+  static String m26(endpoint) => "Verbonden met ${endpoint}";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: 'Verwijder ${count} bestand', other: 'Verwijder ${count} bestanden')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "Verwijderen van ${currentlyDeleting} / ${totalCount}";
 
-  static String m28(albumName) =>
+  static String m29(albumName) =>
       "Dit verwijdert de openbare link voor toegang tot \"${albumName}\".";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "Stuur een e-mail naar ${supportEmail} vanaf het door jou geregistreerde e-mailadres";
 
-  static String m30(count, storageSaved) =>
+  static String m31(count, storageSaved) =>
       "Je hebt ${Intl.plural(count, one: '${count} dubbel bestand', other: '${count} dubbele bestanden')} opgeruimd, totaal (${storageSaved}!)";
 
-  static String m31(count, formattedSize) =>
+  static String m32(count, formattedSize) =>
       "${count} bestanden, elk ${formattedSize}";
 
-  static String m32(newEmail) => "E-mailadres gewijzigd naar ${newEmail}";
+  static String m33(newEmail) => "E-mailadres gewijzigd naar ${newEmail}";
 
-  static String m33(email) =>
+  static String m34(email) => "${email} heeft geen Ente account.";
+
+  static String m35(email) =>
       "${email} heeft geen Ente account.\n\nStuur ze een uitnodiging om foto\'s te delen.";
 
-  static String m34(text) => "Extra foto\'s gevonden voor ${text}";
+  static String m36(text) => "Extra foto\'s gevonden voor ${text}";
 
-  static String m35(count, formattedNumber) =>
+  static String m37(count, formattedNumber) =>
       "${Intl.plural(count, one: '1 bestand', other: '${formattedNumber} bestanden')} in dit album zijn veilig geback-upt";
 
-  static String m36(count, formattedNumber) =>
+  static String m38(count, formattedNumber) =>
       "${Intl.plural(count, one: '1 bestand', other: '${formattedNumber} bestanden')} in dit album is veilig geback-upt";
 
   static String m4(storageAmountInGB) =>
       "${storageAmountInGB} GB telkens als iemand zich aanmeldt voor een betaald abonnement en je code toepast";
 
-  static String m37(endDate) => "Gratis proefversie geldig tot ${endDate}";
+  static String m39(endDate) => "Gratis proefversie geldig tot ${endDate}";
 
-  static String m38(count) =>
+  static String m40(count) =>
       "Je hebt nog steeds toegang tot ${Intl.plural(count, one: 'het', other: 'ze')} op Ente zolang je een actief abonnement hebt";
 
-  static String m39(sizeInMBorGB) => "Maak ${sizeInMBorGB} vrij";
+  static String m41(sizeInMBorGB) => "Maak ${sizeInMBorGB} vrij";
 
-  static String m40(count, formattedSize) =>
+  static String m42(count, formattedSize) =>
       "${Intl.plural(count, one: 'Het kan verwijderd worden van het apparaat om ${formattedSize} vrij te maken', other: 'Ze kunnen verwijderd worden van het apparaat om ${formattedSize} vrij te maken')}";
 
-  static String m41(currentlyProcessing, totalCount) =>
+  static String m43(currentlyProcessing, totalCount) =>
       "Verwerken van ${currentlyProcessing} / ${totalCount}";
 
-  static String m42(count) =>
+  static String m44(count) =>
       "${Intl.plural(count, one: '${count} item', other: '${count} items')}";
 
-  static String m43(email) =>
+  static String m45(email) =>
       "${email} heeft je uitgenodigd om een vertrouwd contact te zijn";
 
-  static String m44(expiryTime) => "Link vervalt op ${expiryTime}";
+  static String m46(expiryTime) => "Link vervalt op ${expiryTime}";
+
+  static String m47(email) => "Link persoon aan ${email}";
+
+  static String m48(personName, email) =>
+      "Dit linkt ${personName} aan ${email}";
 
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, zero: 'geen herinneringen', one: '${formattedCount} herinnering', other: '${formattedCount} herinneringen')}";
 
-  static String m45(count) =>
+  static String m49(count) =>
       "${Intl.plural(count, one: 'Bestand verplaatsen', other: 'Bestanden verplaatsen')}";
 
-  static String m46(albumName) => "Succesvol verplaatst naar ${albumName}";
+  static String m50(albumName) => "Succesvol verplaatst naar ${albumName}";
 
-  static String m47(personName) => "Geen suggesties voor ${personName}";
+  static String m51(personName) => "Geen suggesties voor ${personName}";
 
-  static String m48(name) => "Niet ${name}?";
+  static String m52(name) => "Niet ${name}?";
 
-  static String m49(familyAdminEmail) =>
+  static String m53(familyAdminEmail) =>
       "Neem contact op met ${familyAdminEmail} om uw code te wijzigen.";
 
   static String m0(passwordStrengthValue) =>
       "Wachtwoord sterkte: ${passwordStrengthValue}";
 
-  static String m50(providerName) =>
+  static String m54(providerName) =>
       "Praat met ${providerName} klantenservice als u in rekening bent gebracht";
 
-  static String m51(count) =>
+  static String m55(count) =>
       "${Intl.plural(count, zero: '0 foto\'s', one: '1 foto', other: '${count} foto\'s')}";
 
-  static String m52(endDate) =>
+  static String m56(endDate) =>
       "Gratis proefperiode geldig tot ${endDate}.\nU kunt naderhand een betaald abonnement kiezen.";
 
-  static String m53(toEmail) => "Stuur ons een e-mail op ${toEmail}";
+  static String m57(toEmail) => "Stuur ons een e-mail op ${toEmail}";
 
-  static String m54(toEmail) =>
+  static String m58(toEmail) =>
       "Verstuur de logboeken alstublieft naar ${toEmail}";
 
-  static String m55(folderName) => "Verwerken van ${folderName}...";
+  static String m59(folderName) => "Verwerken van ${folderName}...";
 
-  static String m56(storeName) => "Beoordeel ons op ${storeName}";
+  static String m60(storeName) => "Beoordeel ons op ${storeName}";
 
-  static String m57(days, email) =>
+  static String m61(name) => "Toegewezen aan ${name}";
+
+  static String m62(days, email) =>
       "U krijgt toegang tot het account na ${days} dagen. Een melding zal worden verzonden naar ${email}.";
 
-  static String m58(email) =>
+  static String m63(email) =>
       "U kunt nu het account van ${email} herstellen door een nieuw wachtwoord in te stellen.";
 
-  static String m59(email) => "${email} probeert je account te herstellen.";
+  static String m64(email) => "${email} probeert je account te herstellen.";
 
-  static String m60(storageInGB) =>
+  static String m65(storageInGB) =>
       "Jullie krijgen allebei ${storageInGB} GB* gratis";
 
-  static String m61(userEmail) =>
+  static String m66(userEmail) =>
       "${userEmail} zal worden verwijderd uit dit gedeelde album\n\nAlle door hen toegevoegde foto\'s worden ook uit het album verwijderd";
 
-  static String m62(endDate) => "Wordt verlengd op ${endDate}";
+  static String m67(endDate) => "Wordt verlengd op ${endDate}";
 
-  static String m63(count) =>
+  static String m68(count) =>
       "${Intl.plural(count, one: '${count} resultaat gevonden', other: '${count} resultaten gevonden')}";
 
-  static String m64(snapshotLength, searchLength) =>
+  static String m69(snapshotLength, searchLength) =>
       "Lengte van secties komt niet overeen: ${snapshotLength} != ${searchLength}";
 
   static String m6(count) => "${count} geselecteerd";
 
-  static String m65(count, yourCount) =>
+  static String m70(count, yourCount) =>
       "${count} geselecteerd (${yourCount} van jou)";
 
-  static String m66(verificationID) =>
+  static String m71(verificationID) =>
       "Hier is mijn verificatie-ID: ${verificationID} voor ente.io.";
 
   static String m7(verificationID) =>
       "Hey, kunt u bevestigen dat dit uw ente.io verificatie-ID is: ${verificationID}";
 
-  static String m67(referralCode, referralStorageInGB) =>
+  static String m72(referralCode, referralStorageInGB) =>
       "Ente verwijzingscode: ${referralCode} \n\nPas het toe bij Instellingen → Algemeen → Verwijzingen om ${referralStorageInGB} GB gratis te krijgen nadat je je hebt aangemeld voor een betaald abonnement\n\nhttps://ente.io";
 
-  static String m68(numberOfPeople) =>
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: 'Deel met specifieke mensen', one: 'Gedeeld met 1 persoon', other: 'Gedeeld met ${numberOfPeople} mensen')}";
 
-  static String m69(emailIDs) => "Gedeeld met ${emailIDs}";
+  static String m74(emailIDs) => "Gedeeld met ${emailIDs}";
 
-  static String m70(fileType) =>
+  static String m75(fileType) =>
       "Deze ${fileType} zal worden verwijderd van jouw apparaat.";
 
-  static String m71(fileType) =>
+  static String m76(fileType) =>
       "Deze ${fileType} staat zowel in Ente als op jouw apparaat.";
 
-  static String m72(fileType) =>
+  static String m77(fileType) =>
       "Deze ${fileType} zal worden verwijderd uit Ente.";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} GB";
 
-  static String m73(
+  static String m78(
           usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) =>
       "${usedAmount} ${usedStorageUnit} van ${totalAmount} ${totalStorageUnit} gebruikt";
 
-  static String m74(id) =>
+  static String m79(id) =>
       "Jouw ${id} is al aan een ander Ente account gekoppeld.\nAls je jouw ${id} wilt gebruiken met dit account, neem dan contact op met onze klantenservice";
 
-  static String m75(endDate) => "Uw abonnement loopt af op ${endDate}";
+  static String m80(endDate) => "Uw abonnement loopt af op ${endDate}";
 
-  static String m76(completed, total) =>
+  static String m81(completed, total) =>
       "${completed}/${total} herinneringen bewaard";
 
-  static String m77(ignoreReason) =>
+  static String m82(ignoreReason) =>
       "Tik om te uploaden, upload wordt momenteel genegeerd vanwege ${ignoreReason}";
 
   static String m8(storageAmountInGB) =>
       "Zij krijgen ook ${storageAmountInGB} GB";
 
-  static String m78(email) => "Dit is de verificatie-ID van ${email}";
+  static String m83(email) => "Dit is de verificatie-ID van ${email}";
 
-  static String m79(count) =>
+  static String m84(count) =>
       "${Intl.plural(count, zero: 'Binnenkort', one: '1 dag', other: '${count} dagen')}";
 
-  static String m80(email) =>
+  static String m85(email) =>
       "Je bent uitgenodigd om een legacy contact van ${email} te zijn.";
 
-  static String m81(galleryType) =>
+  static String m86(galleryType) =>
       "Galerijtype ${galleryType} wordt niet ondersteund voor hernoemen";
 
-  static String m82(ignoreReason) =>
+  static String m87(ignoreReason) =>
       "Upload wordt genegeerd omdat ${ignoreReason}";
 
-  static String m83(count) => "${count} herinneringen veiligstellen...";
+  static String m88(count) => "${count} herinneringen veiligstellen...";
 
-  static String m84(endDate) => "Geldig tot ${endDate}";
+  static String m89(endDate) => "Geldig tot ${endDate}";
 
-  static String m85(email) => "Verifieer ${email}";
+  static String m90(email) => "Verifieer ${email}";
 
-  static String m86(count) =>
+  static String m91(count) =>
       "${Intl.plural(count, zero: '0 kijkers toegevoegd', one: '1 kijker toegevoegd', other: '${count} kijkers toegevoegd')}";
 
   static String m2(email) =>
       "We hebben een e-mail gestuurd naar <green>${email}</green>";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, one: '${count} jaar geleden', other: '${count} jaar geleden')}";
 
-  static String m88(storageSaved) =>
+  static String m93(storageSaved) =>
       "Je hebt ${storageSaved} succesvol vrijgemaakt!";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
@@ -278,6 +289,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "account": MessageLookupByLibrary.simpleMessage("Account"),
         "accountIsAlreadyConfigured": MessageLookupByLibrary.simpleMessage(
             "Account is al geconfigureerd."),
+        "accountOwnerPersonAppbarTitle": m9,
         "accountWelcomeBack":
             MessageLookupByLibrary.simpleMessage("Welkom terug!"),
         "ackPasswordLostWarning": MessageLookupByLibrary.simpleMessage(
@@ -290,11 +302,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Nieuw e-mailadres toevoegen"),
         "addCollaborator":
             MessageLookupByLibrary.simpleMessage("Samenwerker toevoegen"),
-        "addCollaborators": m9,
+        "addCollaborators": m10,
         "addFiles": MessageLookupByLibrary.simpleMessage("Bestanden toevoegen"),
         "addFromDevice":
             MessageLookupByLibrary.simpleMessage("Toevoegen vanaf apparaat"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocation":
             MessageLookupByLibrary.simpleMessage("Locatie toevoegen"),
         "addLocationButton": MessageLookupByLibrary.simpleMessage("Toevoegen"),
@@ -307,7 +319,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Nieuw persoon toevoegen"),
         "addOnPageSubtitle":
             MessageLookupByLibrary.simpleMessage("Details van add-ons"),
-        "addOnValidTill": m11,
+        "addOnValidTill": m12,
         "addOns": MessageLookupByLibrary.simpleMessage("Add-ons"),
         "addPhotos": MessageLookupByLibrary.simpleMessage("Foto\'s toevoegen"),
         "addSelected":
@@ -320,12 +332,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "addTrustedContact":
             MessageLookupByLibrary.simpleMessage("Vertrouwd contact toevoegen"),
         "addViewer": MessageLookupByLibrary.simpleMessage("Voeg kijker toe"),
-        "addViewers": m12,
+        "addViewers": m13,
         "addYourPhotosNow":
             MessageLookupByLibrary.simpleMessage("Voeg nu je foto\'s toe"),
         "addedAs": MessageLookupByLibrary.simpleMessage("Toegevoegd als"),
-        "addedBy": m13,
-        "addedSuccessfullyTo": m14,
+        "addedBy": m14,
+        "addedSuccessfullyTo": m15,
         "addingToFavorites":
             MessageLookupByLibrary.simpleMessage("Toevoegen aan favorieten..."),
         "advanced": MessageLookupByLibrary.simpleMessage("Geavanceerd"),
@@ -336,7 +348,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "after1Week": MessageLookupByLibrary.simpleMessage("Na 1 week"),
         "after1Year": MessageLookupByLibrary.simpleMessage("Na 1 jaar"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("Eigenaar"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumTitle": MessageLookupByLibrary.simpleMessage("Albumtitel"),
         "albumUpdated":
             MessageLookupByLibrary.simpleMessage("Album bijgewerkt"),
@@ -384,7 +396,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "appLock": MessageLookupByLibrary.simpleMessage("App-vergrendeling"),
         "appLockDescriptions": MessageLookupByLibrary.simpleMessage(
             "Kies tussen het standaard vergrendelscherm van uw apparaat en een aangepast vergrendelscherm met een pincode of wachtwoord."),
-        "appVersion": m16,
+        "appVersion": m17,
         "appleId": MessageLookupByLibrary.simpleMessage("Apple ID"),
         "apply": MessageLookupByLibrary.simpleMessage("Toepassen"),
         "applyCodeTitle":
@@ -469,7 +481,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoPairDesc": MessageLookupByLibrary.simpleMessage(
             "Automatisch koppelen werkt alleen met apparaten die Chromecast ondersteunen."),
         "available": MessageLookupByLibrary.simpleMessage("Beschikbaar"),
-        "availableStorageSpace": m17,
+        "availableStorageSpace": m18,
         "backedUpFolders":
             MessageLookupByLibrary.simpleMessage("Back-up mappen"),
         "backup": MessageLookupByLibrary.simpleMessage("Back-up"),
@@ -479,7 +491,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Back-up maken via mobiele data"),
         "backupSettings":
             MessageLookupByLibrary.simpleMessage("Back-up instellingen"),
-        "backupStatus": MessageLookupByLibrary.simpleMessage("Back-upstatus"),
+        "backupStatus": MessageLookupByLibrary.simpleMessage("Back-up status"),
         "backupStatusDescription": MessageLookupByLibrary.simpleMessage(
             "Items die zijn geback-upt, worden hier getoond"),
         "backupVideos":
@@ -507,7 +519,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Herstel annuleren"),
         "cancelAccountRecoveryBody": MessageLookupByLibrary.simpleMessage(
             "Weet je zeker dat je het herstel wilt annuleren?"),
-        "cancelOtherSubscription": m18,
+        "cancelOtherSubscription": m19,
         "cancelSubscription":
             MessageLookupByLibrary.simpleMessage("Abonnement opzeggen"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
@@ -559,7 +571,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Claim gratis opslag"),
         "claimMore": MessageLookupByLibrary.simpleMessage("Claim meer!"),
         "claimed": MessageLookupByLibrary.simpleMessage("Geclaimd"),
-        "claimedStorageSoFar": m19,
+        "claimedStorageSoFar": m20,
         "cleanUncategorized":
             MessageLookupByLibrary.simpleMessage("Ongecategoriseerd opschonen"),
         "cleanUncategorizedDescription": MessageLookupByLibrary.simpleMessage(
@@ -588,12 +600,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Maak een link waarmee mensen foto\'s in jouw gedeelde album kunnen toevoegen en bekijken zonder dat ze daarvoor een Ente app of account nodig hebben. Handig voor het verzamelen van foto\'s van evenementen."),
         "collaborativeLink":
             MessageLookupByLibrary.simpleMessage("Gezamenlijke link"),
-        "collaborativeLinkCreatedFor": m20,
+        "collaborativeLinkCreatedFor": m21,
         "collaborator": MessageLookupByLibrary.simpleMessage("Samenwerker"),
         "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Samenwerkers kunnen foto\'s en video\'s toevoegen aan het gedeelde album."),
-        "collaboratorsSuccessfullyAdded": m21,
+        "collaboratorsSuccessfullyAdded": m22,
         "collageLayout": MessageLookupByLibrary.simpleMessage("Layout"),
         "collageSaved": MessageLookupByLibrary.simpleMessage(
             "Collage opgeslagen in gallerij"),
@@ -611,7 +623,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Weet u zeker dat u tweestapsverificatie wilt uitschakelen?"),
         "confirmAccountDeletion": MessageLookupByLibrary.simpleMessage(
             "Account verwijderen bevestigen"),
-        "confirmAddingTrustedContact": m22,
+        "confirmAddingTrustedContact": m23,
         "confirmDeletePrompt": MessageLookupByLibrary.simpleMessage(
             "Ja, ik wil mijn account en de bijbehorende gegevens verspreid over alle apps permanent verwijderen."),
         "confirmPassword":
@@ -624,10 +636,10 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Bevestig herstelsleutel"),
         "connectToDevice": MessageLookupByLibrary.simpleMessage(
             "Verbinding maken met apparaat"),
-        "contactFamilyAdmin": m23,
+        "contactFamilyAdmin": m24,
         "contactSupport":
             MessageLookupByLibrary.simpleMessage("Contacteer klantenservice"),
-        "contactToManageSubscription": m24,
+        "contactToManageSubscription": m25,
         "contacts": MessageLookupByLibrary.simpleMessage("Contacten"),
         "contents": MessageLookupByLibrary.simpleMessage("Inhoud"),
         "continueLabel": MessageLookupByLibrary.simpleMessage("Doorgaan"),
@@ -674,7 +686,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "currentlyRunning":
             MessageLookupByLibrary.simpleMessage("momenteel bezig"),
         "custom": MessageLookupByLibrary.simpleMessage("Aangepast"),
-        "customEndpoint": m25,
+        "customEndpoint": m26,
         "darkTheme": MessageLookupByLibrary.simpleMessage("Donker"),
         "dayToday": MessageLookupByLibrary.simpleMessage("Vandaag"),
         "dayYesterday": MessageLookupByLibrary.simpleMessage("Gisteren"),
@@ -712,12 +724,12 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Verwijder van apparaat"),
         "deleteFromEnte":
             MessageLookupByLibrary.simpleMessage("Verwijder van Ente"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deleteLocation":
             MessageLookupByLibrary.simpleMessage("Verwijder locatie"),
         "deletePhotos":
             MessageLookupByLibrary.simpleMessage("Foto\'s verwijderen"),
-        "deleteProgress": m27,
+        "deleteProgress": m28,
         "deleteReason1": MessageLookupByLibrary.simpleMessage(
             "Ik mis een belangrijke functie"),
         "deleteReason2": MessageLookupByLibrary.simpleMessage(
@@ -758,7 +770,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Kijkers kunnen nog steeds screenshots maken of een kopie van je foto\'s opslaan met behulp van externe tools"),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("Let op"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "disableTwofactor": MessageLookupByLibrary.simpleMessage(
             "Tweestapsverificatie uitschakelen"),
         "disablingTwofactorAuthentication":
@@ -794,15 +806,16 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Wilt u de bewerkingen die u hebt gemaakt annuleren?"),
         "done": MessageLookupByLibrary.simpleMessage("Voltooid"),
+        "dontSave": MessageLookupByLibrary.simpleMessage("Niet opslaan"),
         "doubleYourStorage":
             MessageLookupByLibrary.simpleMessage("Verdubbel uw opslagruimte"),
         "download": MessageLookupByLibrary.simpleMessage("Downloaden"),
         "downloadFailed":
             MessageLookupByLibrary.simpleMessage("Download mislukt"),
         "downloading": MessageLookupByLibrary.simpleMessage("Downloaden..."),
-        "dropSupportEmail": m29,
-        "duplicateFileCountWithStorageSaved": m30,
-        "duplicateItemsGroup": m31,
+        "dropSupportEmail": m30,
+        "duplicateFileCountWithStorageSaved": m31,
+        "duplicateItemsGroup": m32,
         "edit": MessageLookupByLibrary.simpleMessage("Bewerken"),
         "editLocation":
             MessageLookupByLibrary.simpleMessage("Locatie bewerken"),
@@ -818,8 +831,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "email": MessageLookupByLibrary.simpleMessage("E-mail"),
         "emailAlreadyRegistered":
             MessageLookupByLibrary.simpleMessage("E-mail is al geregistreerd."),
-        "emailChangedTo": m32,
-        "emailNoEnteAccount": m33,
+        "emailChangedTo": m33,
+        "emailDoesNotHaveEnteAccount": m34,
+        "emailNoEnteAccount": m35,
         "emailNotRegistered":
             MessageLookupByLibrary.simpleMessage("E-mail niet geregistreerd."),
         "emailVerificationToggle":
@@ -888,7 +902,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "enterValidEmail": MessageLookupByLibrary.simpleMessage(
             "Voer een geldig e-mailadres in."),
         "enterYourEmailAddress":
-            MessageLookupByLibrary.simpleMessage("Voer uw e-mailadres in"),
+            MessageLookupByLibrary.simpleMessage("Voer je e-mailadres in"),
         "enterYourPassword":
             MessageLookupByLibrary.simpleMessage("Voer je wachtwoord in"),
         "enterYourRecoveryKey":
@@ -906,12 +920,13 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Exporteer je gegevens"),
         "extraPhotosFound":
             MessageLookupByLibrary.simpleMessage("Extra foto\'s gevonden"),
-        "extraPhotosFoundFor": m34,
+        "extraPhotosFoundFor": m36,
         "faceNotClusteredYet": MessageLookupByLibrary.simpleMessage(
             "Gezicht nog niet geclusterd, kom later terug"),
         "faceRecognition":
             MessageLookupByLibrary.simpleMessage("Gezichtsherkenning"),
         "faces": MessageLookupByLibrary.simpleMessage("Gezichten"),
+        "failed": MessageLookupByLibrary.simpleMessage("Mislukt"),
         "failedToApplyCode":
             MessageLookupByLibrary.simpleMessage("Code toepassen mislukt"),
         "failedToCancel":
@@ -958,8 +973,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "fileTypes": MessageLookupByLibrary.simpleMessage("Bestandstype"),
         "fileTypesAndNames":
             MessageLookupByLibrary.simpleMessage("Bestandstypen en namen"),
-        "filesBackedUpFromDevice": m35,
-        "filesBackedUpInAlbum": m36,
+        "filesBackedUpFromDevice": m37,
+        "filesBackedUpInAlbum": m38,
         "filesDeleted":
             MessageLookupByLibrary.simpleMessage("Bestanden verwijderd"),
         "filesSavedToGallery": MessageLookupByLibrary.simpleMessage(
@@ -980,22 +995,22 @@ class MessageLookup extends MessageLookupByLibrary {
         "freeStorageUsable":
             MessageLookupByLibrary.simpleMessage("Gratis opslag bruikbaar"),
         "freeTrial": MessageLookupByLibrary.simpleMessage("Gratis proefversie"),
-        "freeTrialValidTill": m37,
-        "freeUpAccessPostDelete": m38,
-        "freeUpAmount": m39,
+        "freeTrialValidTill": m39,
+        "freeUpAccessPostDelete": m40,
+        "freeUpAmount": m41,
         "freeUpDeviceSpace":
             MessageLookupByLibrary.simpleMessage("Apparaatruimte vrijmaken"),
         "freeUpDeviceSpaceDesc": MessageLookupByLibrary.simpleMessage(
             "Bespaar ruimte op je apparaat door bestanden die al geback-upt zijn te wissen."),
         "freeUpSpace": MessageLookupByLibrary.simpleMessage("Ruimte vrijmaken"),
-        "freeUpSpaceSaving": m40,
+        "freeUpSpaceSaving": m42,
         "gallery": MessageLookupByLibrary.simpleMessage("Galerij"),
         "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage(
             "Tot 1000 herinneringen getoond in de galerij"),
         "general": MessageLookupByLibrary.simpleMessage("Algemeen"),
         "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage(
             "Encryptiesleutels genereren..."),
-        "genericProgress": m41,
+        "genericProgress": m43,
         "goToSettings":
             MessageLookupByLibrary.simpleMessage("Ga naar instellingen"),
         "googlePlayId": MessageLookupByLibrary.simpleMessage("Google Play ID"),
@@ -1054,6 +1069,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Geïndexeerde bestanden"),
         "indexingIsPaused": MessageLookupByLibrary.simpleMessage(
             "Indexeren is gepauzeerd. Het zal automatisch hervatten wanneer het apparaat klaar is."),
+        "ineligible": MessageLookupByLibrary.simpleMessage("Ongerechtigd"),
         "info": MessageLookupByLibrary.simpleMessage("Info"),
         "insecureDevice":
             MessageLookupByLibrary.simpleMessage("Onveilig apparaat"),
@@ -1078,7 +1094,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "itLooksLikeSomethingWentWrongPleaseRetryAfterSome":
             MessageLookupByLibrary.simpleMessage(
                 "Het lijkt erop dat er iets fout is gegaan. Probeer het later opnieuw. Als de fout zich blijft voordoen, neem dan contact op met ons supportteam."),
-        "itemCount": m42,
+        "itemCount": m44,
         "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion":
             MessageLookupByLibrary.simpleMessage(
                 "Bestanden tonen het aantal resterende dagen voordat ze permanent worden verwijderd"),
@@ -1087,6 +1103,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "join": MessageLookupByLibrary.simpleMessage("Deelnemen"),
         "joinAlbum":
             MessageLookupByLibrary.simpleMessage("Deelnemen aan album"),
+        "joinAlbumConfirmationDialogBody": MessageLookupByLibrary.simpleMessage(
+            "Deelnemen aan een album maakt je e-mail zichtbaar voor de deelnemers."),
         "joinAlbumSubtext": MessageLookupByLibrary.simpleMessage(
             "om je foto\'s te bekijken en toe te voegen"),
         "joinAlbumSubtextViewer": MessageLookupByLibrary.simpleMessage(
@@ -1108,24 +1126,33 @@ class MessageLookup extends MessageLookupByLibrary {
         "legacy": MessageLookupByLibrary.simpleMessage("Legacy"),
         "legacyAccounts":
             MessageLookupByLibrary.simpleMessage("Legacy accounts"),
-        "legacyInvite": m43,
+        "legacyInvite": m45,
         "legacyPageDesc": MessageLookupByLibrary.simpleMessage(
             "Legacy geeft vertrouwde contacten toegang tot je account bij afwezigheid."),
         "legacyPageDesc2": MessageLookupByLibrary.simpleMessage(
             "Vertrouwde contacten kunnen accountherstel starten, en indien deze niet binnen 30 dagen wordt geblokkeerd, je wachtwoord resetten en toegang krijgen tot je account."),
         "light": MessageLookupByLibrary.simpleMessage("Licht"),
         "lightTheme": MessageLookupByLibrary.simpleMessage("Licht"),
+        "link": MessageLookupByLibrary.simpleMessage("Link"),
         "linkCopiedToClipboard": MessageLookupByLibrary.simpleMessage(
             "Link gekopieerd naar klembord"),
         "linkDeviceLimit":
             MessageLookupByLibrary.simpleMessage("Apparaat limiet"),
+        "linkEmail": MessageLookupByLibrary.simpleMessage("Link email"),
+        "linkEmailToContactBannerCaption":
+            MessageLookupByLibrary.simpleMessage("voor sneller delen"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("Ingeschakeld"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("Verlopen"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry": MessageLookupByLibrary.simpleMessage("Vervaldatum"),
         "linkHasExpired":
             MessageLookupByLibrary.simpleMessage("Link is vervallen"),
         "linkNeverExpires": MessageLookupByLibrary.simpleMessage("Nooit"),
+        "linkPerson": MessageLookupByLibrary.simpleMessage("Link persoon"),
+        "linkPersonCaption": MessageLookupByLibrary.simpleMessage(
+            "voor een betere ervaring met delen"),
+        "linkPersonToEmail": m47,
+        "linkPersonToEmailConfirmation": m48,
         "livePhotos": MessageLookupByLibrary.simpleMessage("Live foto"),
         "loadMessage1": MessageLookupByLibrary.simpleMessage(
             "U kunt uw abonnement met uw familie delen"),
@@ -1214,6 +1241,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "maps": MessageLookupByLibrary.simpleMessage("Kaarten"),
         "mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"),
         "matrix": MessageLookupByLibrary.simpleMessage("Matrix"),
+        "me": MessageLookupByLibrary.simpleMessage("Ik"),
         "memoryCount": m5,
         "merchandise": MessageLookupByLibrary.simpleMessage("Merchandise"),
         "mergeWithExisting":
@@ -1244,12 +1272,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "moreDetails": MessageLookupByLibrary.simpleMessage("Meer details"),
         "mostRecent": MessageLookupByLibrary.simpleMessage("Meest recent"),
         "mostRelevant": MessageLookupByLibrary.simpleMessage("Meest relevant"),
-        "moveItem": m45,
+        "moveItem": m49,
         "moveToAlbum":
             MessageLookupByLibrary.simpleMessage("Verplaats naar album"),
         "moveToHiddenAlbum": MessageLookupByLibrary.simpleMessage(
             "Verplaatsen naar verborgen album"),
-        "movedSuccessfullyTo": m46,
+        "movedSuccessfullyTo": m50,
         "movedToTrash":
             MessageLookupByLibrary.simpleMessage("Naar prullenbak verplaatst"),
         "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
@@ -1277,6 +1305,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Je hebt geen bestanden op dit apparaat die verwijderd kunnen worden"),
         "noDuplicates":
             MessageLookupByLibrary.simpleMessage("✨ Geen duplicaten"),
+        "noEnteAccountExclamation":
+            MessageLookupByLibrary.simpleMessage("Geen Ente account!"),
         "noExifData":
             MessageLookupByLibrary.simpleMessage("Geen EXIF gegevens"),
         "noFacesFound":
@@ -1301,10 +1331,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "noResults": MessageLookupByLibrary.simpleMessage("Geen resultaten"),
         "noResultsFound":
             MessageLookupByLibrary.simpleMessage("Geen resultaten gevonden"),
-        "noSuggestionsForPerson": m47,
+        "noSuggestionsForPerson": m51,
         "noSystemLockFound": MessageLookupByLibrary.simpleMessage(
             "Geen systeemvergrendeling gevonden"),
-        "notPersonLabel": m48,
+        "notPersonLabel": m52,
         "nothingSharedWithYouYet":
             MessageLookupByLibrary.simpleMessage("Nog niets met je gedeeld"),
         "nothingToSeeHere":
@@ -1314,7 +1344,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "onDevice": MessageLookupByLibrary.simpleMessage("Op het apparaat"),
         "onEnte": MessageLookupByLibrary.simpleMessage(
             "Op <branding>ente</branding>"),
-        "onlyFamilyAdminCanChangeCode": m49,
+        "onlyFamilyAdminCanChangeCode": m53,
         "onlyThem": MessageLookupByLibrary.simpleMessage("Alleen hen"),
         "oops": MessageLookupByLibrary.simpleMessage("Oeps"),
         "oopsCouldNotSaveEdits": MessageLookupByLibrary.simpleMessage(
@@ -1338,7 +1368,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "orPickAnExistingOne":
             MessageLookupByLibrary.simpleMessage("Of kies een bestaande"),
         "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
+            MessageLookupByLibrary.simpleMessage("of kies uit je contacten"),
         "pair": MessageLookupByLibrary.simpleMessage("Koppelen"),
         "pairWithPin": MessageLookupByLibrary.simpleMessage("Koppelen met PIN"),
         "pairingComplete":
@@ -1364,7 +1394,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Betaling mislukt"),
         "paymentFailedMessage": MessageLookupByLibrary.simpleMessage(
             "Helaas is je betaling mislukt. Neem contact op met support zodat we je kunnen helpen!"),
-        "paymentFailedTalkToProvider": m50,
+        "paymentFailedTalkToProvider": m54,
         "pendingItems":
             MessageLookupByLibrary.simpleMessage("Bestanden in behandeling"),
         "pendingSync": MessageLookupByLibrary.simpleMessage(
@@ -1388,7 +1418,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "photosAddedByYouWillBeRemovedFromTheAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Foto\'s toegevoegd door u zullen worden verwijderd uit het album"),
-        "photosCount": m51,
+        "photosCount": m55,
         "pickCenterPoint":
             MessageLookupByLibrary.simpleMessage("Kies middelpunt"),
         "pinAlbum":
@@ -1396,7 +1426,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "pinLock": MessageLookupByLibrary.simpleMessage("PIN vergrendeling"),
         "playOnTv":
             MessageLookupByLibrary.simpleMessage("Album afspelen op TV"),
-        "playStoreFreeTrialValidTill": m52,
+        "playOriginal":
+            MessageLookupByLibrary.simpleMessage("Origineel afspelen"),
+        "playStoreFreeTrialValidTill": m56,
+        "playStream": MessageLookupByLibrary.simpleMessage("Stream afspelen"),
         "playstoreSubscription":
             MessageLookupByLibrary.simpleMessage("PlayStore abonnement"),
         "pleaseCheckYourInternetConnectionAndTryAgain":
@@ -1408,14 +1441,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseContactSupportIfTheProblemPersists":
             MessageLookupByLibrary.simpleMessage(
                 "Neem contact op met klantenservice als het probleem aanhoudt"),
-        "pleaseEmailUsAt": m53,
+        "pleaseEmailUsAt": m57,
         "pleaseGrantPermissions": MessageLookupByLibrary.simpleMessage(
             "Geef alstublieft toestemming"),
         "pleaseLoginAgain":
             MessageLookupByLibrary.simpleMessage("Log opnieuw in"),
         "pleaseSelectQuickLinksToRemove": MessageLookupByLibrary.simpleMessage(
             "Selecteer snelle links om te verwijderen"),
-        "pleaseSendTheLogsTo": m54,
+        "pleaseSendTheLogsTo": m58,
         "pleaseTryAgain":
             MessageLookupByLibrary.simpleMessage("Probeer het nog eens"),
         "pleaseVerifyTheCodeYouHaveEntered":
@@ -1443,17 +1476,26 @@ class MessageLookup extends MessageLookupByLibrary {
         "privateSharing": MessageLookupByLibrary.simpleMessage("Privé delen"),
         "proceed": MessageLookupByLibrary.simpleMessage("Verder"),
         "processed": MessageLookupByLibrary.simpleMessage("Verwerkt"),
-        "processingImport": m55,
+        "processing": MessageLookupByLibrary.simpleMessage("Verwerken"),
+        "processingImport": m59,
+        "processingVideos":
+            MessageLookupByLibrary.simpleMessage("Video\'s verwerken"),
         "publicLinkCreated":
             MessageLookupByLibrary.simpleMessage("Publieke link aangemaakt"),
         "publicLinkEnabled":
             MessageLookupByLibrary.simpleMessage("Publieke link ingeschakeld"),
+        "queued": MessageLookupByLibrary.simpleMessage("In wachtrij"),
         "quickLinks": MessageLookupByLibrary.simpleMessage("Snelle links"),
         "radius": MessageLookupByLibrary.simpleMessage("Straal"),
         "raiseTicket": MessageLookupByLibrary.simpleMessage("Meld probleem"),
         "rateTheApp": MessageLookupByLibrary.simpleMessage("Beoordeel de app"),
         "rateUs": MessageLookupByLibrary.simpleMessage("Beoordeel ons"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
+        "reassignMe":
+            MessageLookupByLibrary.simpleMessage("\"Ik\" opnieuw toewijzen"),
+        "reassignedToName": m61,
+        "reassigningLoading":
+            MessageLookupByLibrary.simpleMessage("Opnieuw toewijzen..."),
         "recover": MessageLookupByLibrary.simpleMessage("Herstellen"),
         "recoverAccount":
             MessageLookupByLibrary.simpleMessage("Account herstellen"),
@@ -1462,7 +1504,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Account herstellen"),
         "recoveryInitiated":
             MessageLookupByLibrary.simpleMessage("Herstel gestart"),
-        "recoveryInitiatedDesc": m57,
+        "recoveryInitiatedDesc": m62,
         "recoveryKey": MessageLookupByLibrary.simpleMessage("Herstelsleutel"),
         "recoveryKeyCopiedToClipboard": MessageLookupByLibrary.simpleMessage(
             "Herstelsleutel gekopieerd naar klembord"),
@@ -1476,12 +1518,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Herstel sleutel geverifieerd"),
         "recoveryKeyVerifyReason": MessageLookupByLibrary.simpleMessage(
             "Je herstelsleutel is de enige manier om je foto\'s te herstellen als je je wachtwoord bent vergeten. Je vindt je herstelsleutel in Instellingen > Account.\n\nVoer hier je herstelsleutel in om te controleren of je hem correct hebt opgeslagen."),
-        "recoveryReady": m58,
+        "recoveryReady": m63,
         "recoverySuccessful":
             MessageLookupByLibrary.simpleMessage("Herstel succesvol!"),
         "recoveryWarning": MessageLookupByLibrary.simpleMessage(
             "Een vertrouwd contact probeert toegang te krijgen tot je account"),
-        "recoveryWarningBody": m59,
+        "recoveryWarningBody": m64,
         "recreatePasswordBody": MessageLookupByLibrary.simpleMessage(
             "Het huidige apparaat is niet krachtig genoeg om je wachtwoord te verifiëren, dus moeten we de code een keer opnieuw genereren op een manier die met alle apparaten werkt.\n\nLog in met behulp van uw herstelcode en genereer opnieuw uw wachtwoord (je kunt dezelfde indien gewenst opnieuw gebruiken)."),
         "recreatePasswordTitle": MessageLookupByLibrary.simpleMessage(
@@ -1497,7 +1539,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "1. Geef deze code aan je vrienden"),
         "referralStep2": MessageLookupByLibrary.simpleMessage(
             "2. Ze registreren voor een betaald plan"),
-        "referralStep3": m60,
+        "referralStep3": m65,
         "referrals": MessageLookupByLibrary.simpleMessage("Referenties"),
         "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage(
             "Verwijzingen zijn momenteel gepauzeerd"),
@@ -1529,7 +1571,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "removeLink": MessageLookupByLibrary.simpleMessage("Verwijder link"),
         "removeParticipant":
             MessageLookupByLibrary.simpleMessage("Deelnemer verwijderen"),
-        "removeParticipantBody": m61,
+        "removeParticipantBody": m66,
         "removePersonLabel":
             MessageLookupByLibrary.simpleMessage("Verwijder persoonslabel"),
         "removePublicLink":
@@ -1551,7 +1593,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Bestandsnaam wijzigen"),
         "renewSubscription":
             MessageLookupByLibrary.simpleMessage("Abonnement verlengen"),
-        "renewsOn": m62,
+        "renewsOn": m67,
         "reportABug": MessageLookupByLibrary.simpleMessage("Een fout melden"),
         "reportBug": MessageLookupByLibrary.simpleMessage("Fout melden"),
         "resendEmail":
@@ -1583,6 +1625,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "safelyStored":
             MessageLookupByLibrary.simpleMessage("Veilig opgeslagen"),
         "save": MessageLookupByLibrary.simpleMessage("Opslaan"),
+        "saveChangesBeforeLeavingQuestion":
+            MessageLookupByLibrary.simpleMessage(
+                "Wijzigingen opslaan voor verlaten?"),
         "saveCollage": MessageLookupByLibrary.simpleMessage("Sla collage op"),
         "saveCopy": MessageLookupByLibrary.simpleMessage("Kopie opslaan"),
         "saveKey": MessageLookupByLibrary.simpleMessage("Bewaar sleutel"),
@@ -1629,8 +1674,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Nodig mensen uit, en je ziet alle foto\'s die door hen worden gedeeld hier"),
         "searchPersonsEmptySection": MessageLookupByLibrary.simpleMessage(
             "Personen worden hier getoond zodra verwerking en synchroniseren voltooid is"),
-        "searchResultCount": m63,
-        "searchSectionsLengthMismatch": m64,
+        "searchResultCount": m68,
+        "searchSectionsLengthMismatch": m69,
         "security": MessageLookupByLibrary.simpleMessage("Beveiliging"),
         "seePublicAlbumLinksInApp": MessageLookupByLibrary.simpleMessage(
             "Bekijk publieke album links in de app"),
@@ -1653,7 +1698,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Selecteer mail app"),
         "selectMorePhotos":
             MessageLookupByLibrary.simpleMessage("Selecteer meer foto\'s"),
+        "selectPersonToLink":
+            MessageLookupByLibrary.simpleMessage("Kies persoon om te linken"),
         "selectReason": MessageLookupByLibrary.simpleMessage("Selecteer reden"),
+        "selectYourFace":
+            MessageLookupByLibrary.simpleMessage("Selecteer je gezicht"),
         "selectYourPlan":
             MessageLookupByLibrary.simpleMessage("Kies uw abonnement"),
         "selectedFilesAreNotOnEnte": MessageLookupByLibrary.simpleMessage(
@@ -1665,7 +1714,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Geselecteerde bestanden worden verwijderd uit alle albums en verplaatst naar de prullenbak."),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "send": MessageLookupByLibrary.simpleMessage("Verzenden"),
         "sendEmail": MessageLookupByLibrary.simpleMessage("E-mail versturen"),
         "sendInvite":
@@ -1697,16 +1746,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "shareAnAlbumNow":
             MessageLookupByLibrary.simpleMessage("Deel nu een album"),
         "shareLink": MessageLookupByLibrary.simpleMessage("Link delen"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage(
             "Deel alleen met de mensen die u wilt"),
         "shareTextConfirmOthersVerificationID": m7,
         "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage(
             "Download Ente zodat we gemakkelijk foto\'s en video\'s in originele kwaliteit kunnen delen\n\nhttps://ente.io"),
-        "shareTextReferralCode": m67,
+        "shareTextReferralCode": m72,
         "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage(
             "Delen met niet-Ente gebruikers"),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "shareYourFirstAlbum":
             MessageLookupByLibrary.simpleMessage("Deel jouw eerste album"),
         "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
@@ -1717,7 +1766,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Nieuwe gedeelde foto\'s"),
         "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage(
             "Ontvang meldingen wanneer iemand een foto toevoegt aan een gedeeld album waar je deel van uitmaakt"),
-        "sharedWith": m69,
+        "sharedWith": m74,
         "sharedWithMe": MessageLookupByLibrary.simpleMessage("Gedeeld met mij"),
         "sharedWithYou":
             MessageLookupByLibrary.simpleMessage("Gedeeld met jou"),
@@ -1733,11 +1782,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Log uit op andere apparaten"),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "Ik ga akkoord met de <u-terms>gebruiksvoorwaarden</u-terms> en <u-policy>privacybeleid</u-policy>"),
-        "singleFileDeleteFromDevice": m70,
+        "singleFileDeleteFromDevice": m75,
         "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage(
             "Het wordt uit alle albums verwijderd."),
-        "singleFileInBothLocalAndRemote": m71,
-        "singleFileInRemoteOnly": m72,
+        "singleFileInBothLocalAndRemote": m76,
+        "singleFileInRemoteOnly": m77,
         "skip": MessageLookupByLibrary.simpleMessage("Overslaan"),
         "social": MessageLookupByLibrary.simpleMessage("Sociale media"),
         "someItemsAreInBothEnteAndYourDevice": MessageLookupByLibrary.simpleMessage(
@@ -1785,10 +1834,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageInGB": m1,
         "storageLimitExceeded":
             MessageLookupByLibrary.simpleMessage("Opslaglimiet overschreden"),
-        "storageUsageInfo": m73,
+        "storageUsageInfo": m78,
+        "streamDetails": MessageLookupByLibrary.simpleMessage("Stream details"),
         "strongStrength": MessageLookupByLibrary.simpleMessage("Sterk"),
-        "subAlreadyLinkedErrMessage": m74,
-        "subWillBeCancelledOn": m75,
+        "subAlreadyLinkedErrMessage": m79,
+        "subWillBeCancelledOn": m80,
         "subscribe": MessageLookupByLibrary.simpleMessage("Abonneer"),
         "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage(
             "Je hebt een actief betaald abonnement nodig om delen mogelijk te maken."),
@@ -1805,7 +1855,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "suggestFeatures":
             MessageLookupByLibrary.simpleMessage("Features voorstellen"),
         "support": MessageLookupByLibrary.simpleMessage("Ondersteuning"),
-        "syncProgress": m76,
+        "syncProgress": m81,
         "syncStopped":
             MessageLookupByLibrary.simpleMessage("Synchronisatie gestopt"),
         "syncing": MessageLookupByLibrary.simpleMessage("Synchroniseren..."),
@@ -1817,7 +1867,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Tik om te ontgrendelen"),
         "tapToUpload":
             MessageLookupByLibrary.simpleMessage("Tik om te uploaden"),
-        "tapToUploadIsIgnoredDue": m77,
+        "tapToUploadIsIgnoredDue": m82,
         "tempErrorContactSupportIfPersists": MessageLookupByLibrary.simpleMessage(
             "Het lijkt erop dat er iets fout is gegaan. Probeer het later opnieuw. Als de fout zich blijft voordoen, neem dan contact op met ons supportteam."),
         "terminate": MessageLookupByLibrary.simpleMessage("Beëindigen"),
@@ -1857,7 +1907,9 @@ class MessageLookup extends MessageLookupByLibrary {
             "Dit e-mailadres is al in gebruik"),
         "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage(
             "Deze foto heeft geen exif gegevens"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsMeExclamation":
+            MessageLookupByLibrary.simpleMessage("Dit ben ik!"),
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId":
             MessageLookupByLibrary.simpleMessage("Dit is uw verificatie-ID"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -1882,11 +1934,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "total": MessageLookupByLibrary.simpleMessage("totaal"),
         "totalSize": MessageLookupByLibrary.simpleMessage("Totale grootte"),
         "trash": MessageLookupByLibrary.simpleMessage("Prullenbak"),
-        "trashDaysLeft": m79,
+        "trashDaysLeft": m84,
         "trim": MessageLookupByLibrary.simpleMessage("Knippen"),
         "trustedContacts":
             MessageLookupByLibrary.simpleMessage("Vertrouwde contacten"),
-        "trustedInviteBody": m80,
+        "trustedInviteBody": m85,
         "tryAgain": MessageLookupByLibrary.simpleMessage("Probeer opnieuw"),
         "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage(
             "Schakel back-up in om bestanden die toegevoegd zijn aan deze map op dit apparaat automatisch te uploaden."),
@@ -1905,7 +1957,7 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Tweestapsverificatie succesvol gereset"),
         "twofactorSetup":
             MessageLookupByLibrary.simpleMessage("Tweestapsverificatie"),
-        "typeOfGallerGallerytypeIsNotSupportedForRename": m81,
+        "typeOfGallerGallerytypeIsNotSupportedForRename": m86,
         "unarchive": MessageLookupByLibrary.simpleMessage("Uit archief halen"),
         "unarchiveAlbum":
             MessageLookupByLibrary.simpleMessage("Album uit archief halen"),
@@ -1931,10 +1983,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "updatingFolderSelection":
             MessageLookupByLibrary.simpleMessage("Map selectie bijwerken..."),
         "upgrade": MessageLookupByLibrary.simpleMessage("Upgraden"),
-        "uploadIsIgnoredDueToIgnorereason": m82,
+        "uploadIsIgnoredDueToIgnorereason": m87,
         "uploadingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
             "Bestanden worden geüpload naar album..."),
-        "uploadingMultipleMemories": m83,
+        "uploadingMultipleMemories": m88,
         "uploadingSingleMemory": MessageLookupByLibrary.simpleMessage(
             "1 herinnering veiligstellen..."),
         "upto50OffUntil4thDec": MessageLookupByLibrary.simpleMessage(
@@ -1952,7 +2004,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "useSelectedPhoto":
             MessageLookupByLibrary.simpleMessage("Gebruik geselecteerde foto"),
         "usedSpace": MessageLookupByLibrary.simpleMessage("Gebruikte ruimte"),
-        "validTill": m84,
+        "validTill": m89,
         "verificationFailedPleaseTryAgain":
             MessageLookupByLibrary.simpleMessage(
                 "Verificatie mislukt, probeer het opnieuw"),
@@ -1960,7 +2012,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Verificatie ID"),
         "verify": MessageLookupByLibrary.simpleMessage("Verifiëren"),
         "verifyEmail": MessageLookupByLibrary.simpleMessage("Bevestig e-mail"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Verifiëren"),
         "verifyPasskey":
             MessageLookupByLibrary.simpleMessage("Bevestig passkey"),
@@ -1971,6 +2023,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Herstelsleutel verifiëren..."),
         "videoInfo": MessageLookupByLibrary.simpleMessage("Video-info"),
         "videoSmallCase": MessageLookupByLibrary.simpleMessage("video"),
+        "videoStreaming":
+            MessageLookupByLibrary.simpleMessage("Video streamen"),
         "videos": MessageLookupByLibrary.simpleMessage("Video\'s"),
         "viewActiveSessions":
             MessageLookupByLibrary.simpleMessage("Actieve sessies bekijken"),
@@ -1987,7 +2041,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "viewRecoveryKey":
             MessageLookupByLibrary.simpleMessage("Toon herstelsleutel"),
         "viewer": MessageLookupByLibrary.simpleMessage("Kijker"),
-        "viewersSuccessfullyAdded": m86,
+        "viewersSuccessfullyAdded": m91,
         "visitWebToManage": MessageLookupByLibrary.simpleMessage(
             "Bezoek alstublieft web.ente.io om uw abonnement te beheren"),
         "waitingForVerification":
@@ -2008,7 +2062,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Vertrouwde contacten kunnen helpen bij het herstellen van je data."),
         "yearShort": MessageLookupByLibrary.simpleMessage("jr"),
         "yearly": MessageLookupByLibrary.simpleMessage("Jaarlijks"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("Ja"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("Ja, opzeggen"),
         "yesConvertToViewer":
@@ -2040,7 +2094,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Je kunt niet met jezelf delen"),
         "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage(
             "U heeft geen gearchiveerde bestanden."),
-        "youHaveSuccessfullyFreedUp": m88,
+        "youHaveSuccessfullyFreedUp": m93,
         "yourAccountHasBeenDeleted":
             MessageLookupByLibrary.simpleMessage("Je account is verwijderd"),
         "yourMap": MessageLookupByLibrary.simpleMessage("Jouw kaart"),
diff --git a/mobile/lib/generated/intl/messages_no.dart b/mobile/lib/generated/intl/messages_no.dart
index d54454d5c6..7b10ae5ab3 100644
--- a/mobile/lib/generated/intl/messages_no.dart
+++ b/mobile/lib/generated/intl/messages_no.dart
@@ -20,28 +20,28 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'no';
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: 'Ingen deltakere', one: '1 deltaker', other: '${count} deltakere')}";
 
   static String m3(user) =>
       "${user} vil ikke kunne legge til flere bilder til dette albumet\n\nDe vil fortsatt kunne fjerne eksisterende bilder lagt til av dem";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: 'Slett ${count} element', other: 'Slett ${count} elementer')}";
 
-  static String m28(albumName) =>
+  static String m29(albumName) =>
       "Dette fjerner den offentlige lenken for tilgang til \"${albumName}\".";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "Vennligst send en e-post til ${supportEmail} fra din registrerte e-postadresse";
 
-  static String m31(count, formattedSize) =>
+  static String m32(count, formattedSize) =>
       "${count} filer, ${formattedSize} hver";
 
-  static String m42(count) =>
+  static String m44(count) =>
       "${Intl.plural(count, one: '${count} element', other: '${count} elementer')}";
 
-  static String m44(expiryTime) => "Lenken utløper på ${expiryTime}";
+  static String m46(expiryTime) => "Lenken utløper på ${expiryTime}";
 
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, zero: 'ingen minner', one: '${formattedCount} minne', other: '${formattedCount} minner')}";
@@ -51,20 +51,20 @@ class MessageLookup extends MessageLookupByLibrary {
 
   static String m6(count) => "${count} valgt";
 
-  static String m65(count, yourCount) => "${count} valgt (${yourCount} dine)";
+  static String m70(count, yourCount) => "${count} valgt (${yourCount} dine)";
 
-  static String m66(verificationID) =>
+  static String m71(verificationID) =>
       "Her er min verifiserings-ID: ${verificationID} for ente.io.";
 
   static String m7(verificationID) =>
       "Hei, kan du bekrefte at dette er din ente.io verifiserings-ID: ${verificationID}";
 
-  static String m68(numberOfPeople) =>
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: 'Del med bestemte personer', one: 'Delt med 1 person', other: 'Delt med ${numberOfPeople} personer')}";
 
-  static String m78(email) => "Dette er ${email} sin verifiserings-ID";
+  static String m83(email) => "Dette er ${email} sin verifiserings-ID";
 
-  static String m85(email) => "Verifiser ${email}";
+  static String m90(email) => "Verifiser ${email}";
 
   static String m2(email) =>
       "Vi har sendt en e-post til <green>${email}</green>";
@@ -91,7 +91,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "after1Week": MessageLookupByLibrary.simpleMessage("Etter 1 uke"),
         "after1Year": MessageLookupByLibrary.simpleMessage("Etter 1 år"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("Eier"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumUpdated": MessageLookupByLibrary.simpleMessage("Album oppdatert"),
         "albums": MessageLookupByLibrary.simpleMessage("Album"),
         "allowAddPhotosDescription": MessageLookupByLibrary.simpleMessage(
@@ -164,7 +164,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Slett fra begge"),
         "deleteFromDevice":
             MessageLookupByLibrary.simpleMessage("Slett fra enhet"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deletePhotos": MessageLookupByLibrary.simpleMessage("Slett bilder"),
         "deleteReason1": MessageLookupByLibrary.simpleMessage(
             "Det mangler en hovedfunksjon jeg trenger"),
@@ -180,12 +180,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Seere kan fremdeles ta skjermbilder eller lagre en kopi av bildene dine ved bruk av eksterne verktøy"),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("Vær oppmerksom på"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "doThisLater":
             MessageLookupByLibrary.simpleMessage("Gjør dette senere"),
         "done": MessageLookupByLibrary.simpleMessage("Ferdig"),
-        "dropSupportEmail": m29,
-        "duplicateItemsGroup": m31,
+        "dropSupportEmail": m30,
+        "duplicateItemsGroup": m32,
         "email": MessageLookupByLibrary.simpleMessage("E-post"),
         "encryption": MessageLookupByLibrary.simpleMessage("Kryptering"),
         "encryptionKeys":
@@ -245,14 +245,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "invalidKey": MessageLookupByLibrary.simpleMessage("Ugyldig nøkkel"),
         "invalidRecoveryKey": MessageLookupByLibrary.simpleMessage(
             "Gjenopprettingsnøkkelen du har skrevet inn er ikke gyldig. Kontroller at den inneholder 24 ord og kontroller stavemåten av hvert ord.\n\nHvis du har angitt en eldre gjenopprettingskode, må du kontrollere at den er 64 tegn lang, og kontrollere hvert av dem."),
-        "itemCount": m42,
+        "itemCount": m44,
         "keepPhotos": MessageLookupByLibrary.simpleMessage("Behold Bilder"),
         "kindlyHelpUsWithThisInformation": MessageLookupByLibrary.simpleMessage(
             "Vær vennlig og hjelp oss med denne informasjonen"),
         "linkDeviceLimit": MessageLookupByLibrary.simpleMessage("Enhetsgrense"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("Aktivert"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("Utløpt"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry": MessageLookupByLibrary.simpleMessage("Lenkeutløp"),
         "linkHasExpired":
             MessageLookupByLibrary.simpleMessage("Lenken har utløpt"),
@@ -284,8 +284,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "oops": MessageLookupByLibrary.simpleMessage("Oisann"),
         "orPickAnExistingOne":
             MessageLookupByLibrary.simpleMessage("Eller velg en eksisterende"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "password": MessageLookupByLibrary.simpleMessage("Passord"),
         "passwordChangedSuccessfully":
             MessageLookupByLibrary.simpleMessage("Passordet ble endret"),
@@ -357,7 +355,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Valgte mapper vil bli kryptert og sikkerhetskopiert"),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "sendEmail": MessageLookupByLibrary.simpleMessage("Send e-post"),
         "sendInvite": MessageLookupByLibrary.simpleMessage("Send invitasjon"),
         "sendLink": MessageLookupByLibrary.simpleMessage("Send lenke"),
@@ -367,9 +365,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "setupComplete":
             MessageLookupByLibrary.simpleMessage("Oppsett fullført"),
         "shareALink": MessageLookupByLibrary.simpleMessage("Del en lenke"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareTextConfirmOthersVerificationID": m7,
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "sharedPhotoNotifications":
             MessageLookupByLibrary.simpleMessage("Nye delte bilder"),
         "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage(
@@ -407,7 +405,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Dette kan brukes til å gjenopprette kontoen din hvis du mister din andre faktor"),
         "thisDevice": MessageLookupByLibrary.simpleMessage("Denne enheten"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage(
             "Dette er din bekreftelses-ID"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -434,7 +432,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "verify": MessageLookupByLibrary.simpleMessage("Bekreft"),
         "verifyEmail":
             MessageLookupByLibrary.simpleMessage("Bekreft e-postadresse"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyPassword":
             MessageLookupByLibrary.simpleMessage("Bekreft passord"),
         "verifyingRecoveryKey": MessageLookupByLibrary.simpleMessage(
diff --git a/mobile/lib/generated/intl/messages_pl.dart b/mobile/lib/generated/intl/messages_pl.dart
index 5b921f075b..ec1a492722 100644
--- a/mobile/lib/generated/intl/messages_pl.dart
+++ b/mobile/lib/generated/intl/messages_pl.dart
@@ -20,37 +20,37 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'pl';
 
-  static String m9(count) =>
+  static String m10(count) =>
       "${Intl.plural(count, one: 'Dodaj współuczestnika', few: 'Dodaj współuczestników', many: 'Dodaj współuczestników', other: 'Dodaj współuczestników')}";
 
-  static String m10(count) =>
+  static String m11(count) =>
       "${Intl.plural(count, one: 'Dodaj element', few: 'Dodaj elementy', other: 'Dodaj elementów')}";
 
-  static String m11(storageAmount, endDate) =>
+  static String m12(storageAmount, endDate) =>
       "Twój dodatek ${storageAmount} jest ważny do ${endDate}";
 
-  static String m12(count) =>
+  static String m13(count) =>
       "${Intl.plural(count, one: 'Dodaj widza', few: 'Dodaj widzów', many: 'Dodaj widzów', other: 'Dodaj widzów')}";
 
-  static String m13(emailOrName) => "Dodane przez ${emailOrName}";
+  static String m14(emailOrName) => "Dodane przez ${emailOrName}";
 
-  static String m14(albumName) => "Pomyślnie dodano do  ${albumName}";
+  static String m15(albumName) => "Pomyślnie dodano do  ${albumName}";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: 'Brak Uczestników', one: '1 Uczestnik', other: '${count} Uczestników')}";
 
-  static String m16(versionValue) => "Wersja: ${versionValue}";
+  static String m17(versionValue) => "Wersja: ${versionValue}";
 
-  static String m17(freeAmount, storageUnit) =>
+  static String m18(freeAmount, storageUnit) =>
       "${freeAmount} ${storageUnit} wolne";
 
-  static String m18(paymentProvider) =>
+  static String m19(paymentProvider) =>
       "Prosimy najpierw anulować istniejącą subskrypcję z ${paymentProvider}";
 
   static String m3(user) =>
       "${user} nie będzie mógł dodać więcej zdjęć do tego albumu\n\nJednak nadal będą mogli usunąć istniejące zdjęcia, które dodali";
 
-  static String m19(isFamilyMember, storageAmountInGb) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
       "${Intl.select(isFamilyMember, {
             'true':
                 'Twoja rodzina odebrała ${storageAmountInGb} GB do tej pory',
@@ -58,213 +58,213 @@ class MessageLookup extends MessageLookupByLibrary {
             'other': 'Odebrałeś ${storageAmountInGb} GB do tej pory!',
           })}";
 
-  static String m20(albumName) => "Utworzono link współpracy dla ${albumName}";
+  static String m21(albumName) => "Utworzono link współpracy dla ${albumName}";
 
-  static String m21(count) =>
+  static String m22(count) =>
       "${Intl.plural(count, zero: 'Dodano 0 współuczestników', one: 'Dodano 1 współuczestnika', other: 'Dodano ${count} współuczestników')}";
 
-  static String m22(email, numOfDays) =>
+  static String m23(email, numOfDays) =>
       "Zamierzasz dodać ${email} jako zaufany kontakt. Będą mogli odzyskać Twoje konto, jeśli jesteś nieobecny przez ${numOfDays} dni.";
 
-  static String m23(familyAdminEmail) =>
+  static String m24(familyAdminEmail) =>
       "Prosimy skontaktować się z <green>${familyAdminEmail}</green>, by zarzadząć swoją subskrypcją";
 
-  static String m24(provider) =>
+  static String m25(provider) =>
       "Skontaktuj się z nami pod adresem support@ente.io, aby zarządzać subskrypcją ${provider}.";
 
-  static String m25(endpoint) => "Połączono z ${endpoint}";
+  static String m26(endpoint) => "Połączono z ${endpoint}";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: 'Usuń ${count} element', few: 'Usuń ${count} elementy', many: 'Usuń ${count} elementów', other: 'Usuń ${count} elementu')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "Usuwanie ${currentlyDeleting} / ${totalCount}";
 
-  static String m28(albumName) =>
+  static String m29(albumName) =>
       "Spowoduje to usunięcie publicznego linku dostępu do \"${albumName}\".";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "Wyślij wiadomość e-mail na ${supportEmail} z zarejestrowanego adresu e-mail";
 
-  static String m30(count, storageSaved) =>
+  static String m31(count, storageSaved) =>
       "Wyczyszczono ${Intl.plural(count, one: '${count} zdduplikowany plik', other: '${count} zdduplikowane pliki')}, oszczędzając (${storageSaved}!)";
 
-  static String m31(count, formattedSize) =>
+  static String m32(count, formattedSize) =>
       "${count} plików, każdy po ${formattedSize}";
 
-  static String m32(newEmail) => "Adres e-mail został zmieniony na ${newEmail}";
+  static String m33(newEmail) => "Adres e-mail został zmieniony na ${newEmail}";
 
-  static String m33(email) =>
+  static String m35(email) =>
       "${email} nie posiada konta Ente.\n\nWyślij im zaproszenie do udostępniania zdjęć.";
 
-  static String m34(text) => "Znaleziono dodatkowe zdjęcia dla ${text}";
+  static String m36(text) => "Znaleziono dodatkowe zdjęcia dla ${text}";
 
-  static String m35(count, formattedNumber) =>
+  static String m37(count, formattedNumber) =>
       "${Intl.plural(count, one: '1 plikowi', other: '${formattedNumber} plikom')} na tym urządzeniu została bezpiecznie utworzona kopia zapasowa";
 
-  static String m36(count, formattedNumber) =>
+  static String m38(count, formattedNumber) =>
       "${Intl.plural(count, one: '1 plikowi', other: '${formattedNumber} plikom')} w tym albumie została bezpiecznie utworzona kopia zapasowa";
 
   static String m4(storageAmountInGB) =>
       "${storageAmountInGB} GB za każdym razem, gdy ktoś zarejestruje się w płatnym planie i użyje twojego kodu";
 
-  static String m37(endDate) => "Okres próbny ważny do ${endDate}";
+  static String m39(endDate) => "Okres próbny ważny do ${endDate}";
 
-  static String m38(count) =>
+  static String m40(count) =>
       "Nadal możesz mieć dostęp ${Intl.plural(count, one: 'do tego', other: 'do tych')} na Ente tak długo, jak masz aktywną subskrypcję";
 
-  static String m39(sizeInMBorGB) => "Zwolnij ${sizeInMBorGB}";
+  static String m41(sizeInMBorGB) => "Zwolnij ${sizeInMBorGB}";
 
-  static String m40(count, formattedSize) =>
+  static String m42(count, formattedSize) =>
       "${Intl.plural(count, one: 'Można to usunąć z urządzenia, aby zwolnić ${formattedSize}', other: 'Można je usunąć z urządzenia, aby zwolnić ${formattedSize}')}";
 
-  static String m41(currentlyProcessing, totalCount) =>
+  static String m43(currentlyProcessing, totalCount) =>
       "Przetwarzanie ${currentlyProcessing} / ${totalCount}";
 
-  static String m42(count) =>
+  static String m44(count) =>
       "${Intl.plural(count, one: '${count} element', few: '${count} elementy', many: '${count} elementów', other: '${count} elementu')}";
 
-  static String m43(email) =>
+  static String m45(email) =>
       "${email} zaprosił Cię do zostania zaufanym kontaktem";
 
-  static String m44(expiryTime) => "Link wygaśnie ${expiryTime}";
+  static String m46(expiryTime) => "Link wygaśnie ${expiryTime}";
 
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, zero: 'brak wspomnień', one: '${formattedCount} wspomnienie', few: '${formattedCount} wspomnienia', other: '${formattedCount} wspomnień')}";
 
-  static String m45(count) =>
+  static String m49(count) =>
       "${Intl.plural(count, one: 'Przenieś element', few: 'Przenieś elementy', other: 'Przenieś elementów')}";
 
-  static String m46(albumName) => "Pomyślnie przeniesiono do ${albumName}";
+  static String m50(albumName) => "Pomyślnie przeniesiono do ${albumName}";
 
-  static String m47(personName) => "Brak sugestii dla ${personName}";
+  static String m51(personName) => "Brak sugestii dla ${personName}";
 
-  static String m48(name) => "Nie ${name}?";
+  static String m52(name) => "Nie ${name}?";
 
-  static String m49(familyAdminEmail) =>
+  static String m53(familyAdminEmail) =>
       "Skontaktuj się z ${familyAdminEmail}, aby zmienić swój kod.";
 
   static String m0(passwordStrengthValue) =>
       "Siła hasła: ${passwordStrengthValue}";
 
-  static String m50(providerName) =>
+  static String m54(providerName) =>
       "Porozmawiaj ze wsparciem ${providerName} jeśli zostałeś obciążony";
 
-  static String m51(count) =>
+  static String m55(count) =>
       "${Intl.plural(count, zero: '0 zdjęć', one: '1 zdjęcie', few: '${count} zdjęcia', other: '${count} zdjęć')}";
 
-  static String m52(endDate) =>
+  static String m56(endDate) =>
       "Bezpłatny okres próbny ważny do ${endDate}.\nNastępnie możesz wybrać płatny plan.";
 
-  static String m53(toEmail) =>
+  static String m57(toEmail) =>
       "Prosimy o kontakt mailowy pod adresem ${toEmail}";
 
-  static String m54(toEmail) => "Prosimy wysłać logi do ${toEmail}";
+  static String m58(toEmail) => "Prosimy wysłać logi do ${toEmail}";
 
-  static String m55(folderName) => "Przetwarzanie ${folderName}...";
+  static String m59(folderName) => "Przetwarzanie ${folderName}...";
 
-  static String m56(storeName) => "Oceń nas na ${storeName}";
+  static String m60(storeName) => "Oceń nas na ${storeName}";
 
-  static String m57(days, email) =>
+  static String m62(days, email) =>
       "Możesz uzyskać dostęp do konta po dniu ${days} dni. Powiadomienie zostanie wysłane na ${email}.";
 
-  static String m58(email) =>
+  static String m63(email) =>
       "Możesz teraz odzyskać konto ${email} poprzez ustawienie nowego hasła.";
 
-  static String m59(email) => "${email} próbuje odzyskać Twoje konto.";
+  static String m64(email) => "${email} próbuje odzyskać Twoje konto.";
 
-  static String m60(storageInGB) =>
+  static String m65(storageInGB) =>
       "3. Oboje otrzymujecie ${storageInGB} GB* za darmo";
 
-  static String m61(userEmail) =>
+  static String m66(userEmail) =>
       "${userEmail} zostanie usunięty z tego udostępnionego albumu\n\nWszelkie dodane przez nich zdjęcia zostaną usunięte z albumu";
 
-  static String m62(endDate) => "Subskrypcja odnowi się ${endDate}";
+  static String m67(endDate) => "Subskrypcja odnowi się ${endDate}";
 
-  static String m63(count) =>
+  static String m68(count) =>
       "${Intl.plural(count, one: 'Znaleziono ${count} wynik', few: 'Znaleziono ${count} wyniki', other: 'Znaleziono ${count} wyników')}";
 
-  static String m64(snapshotLength, searchLength) =>
+  static String m69(snapshotLength, searchLength) =>
       "Niezgodność długości sekcji: ${snapshotLength} != ${searchLength}";
 
   static String m6(count) => "Wybrano ${count}";
 
-  static String m65(count, yourCount) =>
+  static String m70(count, yourCount) =>
       "Wybrano ${count} (twoich ${yourCount})";
 
-  static String m66(verificationID) =>
+  static String m71(verificationID) =>
       "Oto mój identyfikator weryfikacyjny: ${verificationID} dla ente.io.";
 
   static String m7(verificationID) =>
       "Hej, czy możesz potwierdzić, że to jest Twój identyfikator weryfikacyjny ente.io: ${verificationID}";
 
-  static String m67(referralCode, referralStorageInGB) =>
+  static String m72(referralCode, referralStorageInGB) =>
       "Kod polecający: ${referralCode} \n\nZastosuj go w: Ustawienia → Ogólne → Polecanie, aby otrzymać ${referralStorageInGB} GB za darmo po zarejestrowaniu się w płatnym planie\n\nhttps://ente.io";
 
-  static String m68(numberOfPeople) =>
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: 'Udostępnione określonym osobom', one: 'Udostępnione 1 osobie', other: 'Udostępnione ${numberOfPeople} osobom')}";
 
-  static String m69(emailIDs) => "Udostępnione z ${emailIDs}";
+  static String m74(emailIDs) => "Udostępnione z ${emailIDs}";
 
-  static String m70(fileType) =>
+  static String m75(fileType) =>
       "Ten ${fileType} zostanie usunięty z Twojego urządzenia.";
 
-  static String m71(fileType) =>
+  static String m76(fileType) =>
       "Ten ${fileType} jest zarówno w Ente, jak i na twoim urządzeniu.";
 
-  static String m72(fileType) => "Ten ${fileType} zostanie usunięty z Ente.";
+  static String m77(fileType) => "Ten ${fileType} zostanie usunięty z Ente.";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} GB";
 
-  static String m73(
+  static String m78(
           usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) =>
       "Użyto ${usedAmount} ${usedStorageUnit} z ${totalAmount} ${totalStorageUnit}";
 
-  static String m74(id) =>
+  static String m79(id) =>
       "Twoje ${id} jest już połączony z innym kontem Ente.\nJeśli chcesz użyć swojego ${id} za pomocą tego konta, skontaktuj się z naszym wsparciem technicznym";
 
-  static String m75(endDate) =>
+  static String m80(endDate) =>
       "Twoja subskrypcja zostanie anulowana dnia ${endDate}";
 
-  static String m76(completed, total) =>
+  static String m81(completed, total) =>
       "Zachowano ${completed}/${total} wspomnień";
 
-  static String m77(ignoreReason) =>
+  static String m82(ignoreReason) =>
       "Naciśnij, aby przesłać, przesyłanie jest obecnie ignorowane z powodu ${ignoreReason}";
 
   static String m8(storageAmountInGB) =>
       "Oni również otrzymują ${storageAmountInGB} GB";
 
-  static String m78(email) => "To jest identyfikator weryfikacyjny ${email}";
+  static String m83(email) => "To jest identyfikator weryfikacyjny ${email}";
 
-  static String m79(count) =>
+  static String m84(count) =>
       "${Intl.plural(count, zero: 'Wkrótce', one: '1 dzień', few: '${count} dni', other: '${count} dni')}";
 
-  static String m80(email) =>
+  static String m85(email) =>
       "Zostałeś zaproszony do bycia dziedzicznym kontaktem przez ${email}.";
 
-  static String m81(galleryType) =>
+  static String m86(galleryType) =>
       "Typ galerii ${galleryType} nie jest obsługiwany dla zmiany nazwy";
 
-  static String m82(ignoreReason) =>
+  static String m87(ignoreReason) =>
       "Przesyłanie jest ignorowane z powodu ${ignoreReason}";
 
-  static String m83(count) => "Zachowywanie ${count} wspomnień...";
+  static String m88(count) => "Zachowywanie ${count} wspomnień...";
 
-  static String m84(endDate) => "Ważne do ${endDate}";
+  static String m89(endDate) => "Ważne do ${endDate}";
 
-  static String m85(email) => "Zweryfikuj ${email}";
+  static String m90(email) => "Zweryfikuj ${email}";
 
-  static String m86(count) =>
+  static String m91(count) =>
       "${Intl.plural(count, zero: 'Dodano 0 widzów', one: 'Dodano 1 widza', other: 'Dodano ${count} widzów')}";
 
   static String m2(email) =>
       "Wysłaliśmy wiadomość na adres <green>${email}</green>";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, one: '${count} rok temu', few: '${count} lata temu', many: '${count} lat temu', other: '${count} lata temu')}";
 
-  static String m88(storageSaved) => "Pomyślnie zwolniłeś/aś ${storageSaved}!";
+  static String m93(storageSaved) => "Pomyślnie zwolniłeś/aś ${storageSaved}!";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
@@ -287,11 +287,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Dodaj nowy adres e-mail"),
         "addCollaborator":
             MessageLookupByLibrary.simpleMessage("Dodaj współuczestnika"),
-        "addCollaborators": m9,
+        "addCollaborators": m10,
         "addFiles": MessageLookupByLibrary.simpleMessage("Dodaj Pliki"),
         "addFromDevice":
             MessageLookupByLibrary.simpleMessage("Dodaj z urządzenia"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocation":
             MessageLookupByLibrary.simpleMessage("Dodaj lokalizację"),
         "addLocationButton": MessageLookupByLibrary.simpleMessage("Dodaj"),
@@ -304,7 +304,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Dodaj nową osobę"),
         "addOnPageSubtitle":
             MessageLookupByLibrary.simpleMessage("Szczegóły dodatków"),
-        "addOnValidTill": m11,
+        "addOnValidTill": m12,
         "addOns": MessageLookupByLibrary.simpleMessage("Dodatki"),
         "addPhotos": MessageLookupByLibrary.simpleMessage("Dodaj zdjęcia"),
         "addSelected": MessageLookupByLibrary.simpleMessage("Dodaj zaznaczone"),
@@ -315,12 +315,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "addTrustedContact":
             MessageLookupByLibrary.simpleMessage("Dodaj Zaufany Kontakt"),
         "addViewer": MessageLookupByLibrary.simpleMessage("Dodaj widza"),
-        "addViewers": m12,
+        "addViewers": m13,
         "addYourPhotosNow":
             MessageLookupByLibrary.simpleMessage("Dodaj swoje zdjęcia teraz"),
         "addedAs": MessageLookupByLibrary.simpleMessage("Dodano jako"),
-        "addedBy": m13,
-        "addedSuccessfullyTo": m14,
+        "addedBy": m14,
+        "addedSuccessfullyTo": m15,
         "addingToFavorites":
             MessageLookupByLibrary.simpleMessage("Dodawanie do ulubionych..."),
         "advanced": MessageLookupByLibrary.simpleMessage("Zaawansowane"),
@@ -332,7 +332,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "after1Week": MessageLookupByLibrary.simpleMessage("Po 1 tygodniu"),
         "after1Year": MessageLookupByLibrary.simpleMessage("Po 1 roku"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("Właściciel"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumTitle": MessageLookupByLibrary.simpleMessage("Tytuł albumu"),
         "albumUpdated":
             MessageLookupByLibrary.simpleMessage("Album został zaktualizowany"),
@@ -383,7 +383,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Blokada dostępu do aplikacji"),
         "appLockDescriptions": MessageLookupByLibrary.simpleMessage(
             "Wybierz między domyślnym ekranem blokady urządzenia a niestandardowym ekranem blokady z kodem PIN lub hasłem."),
-        "appVersion": m16,
+        "appVersion": m17,
         "appleId": MessageLookupByLibrary.simpleMessage("Apple ID"),
         "apply": MessageLookupByLibrary.simpleMessage("Zastosuj"),
         "applyCodeTitle": MessageLookupByLibrary.simpleMessage("Użyj kodu"),
@@ -435,6 +435,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Prosimy uwierzytelnić się, aby zarządzać zaufanymi kontaktami"),
         "authToViewPasskey": MessageLookupByLibrary.simpleMessage(
             "Prosimy uwierzytelnić się, aby wyświetlić swój klucz dostępu"),
+        "authToViewTrashedFiles": MessageLookupByLibrary.simpleMessage(
+            "Prosimy uwierzytelnić się, aby wyświetlić swoje pliki w koszu"),
         "authToViewYourActiveSessions": MessageLookupByLibrary.simpleMessage(
             "Prosimy uwierzytelnić się, aby wyświetlić swoje aktywne sesje"),
         "authToViewYourHiddenFiles": MessageLookupByLibrary.simpleMessage(
@@ -465,7 +467,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoPairDesc": MessageLookupByLibrary.simpleMessage(
             "Automatyczne parowanie działa tylko z urządzeniami obsługującymi Chromecast."),
         "available": MessageLookupByLibrary.simpleMessage("Dostępne"),
-        "availableStorageSpace": m17,
+        "availableStorageSpace": m18,
         "backedUpFolders":
             MessageLookupByLibrary.simpleMessage("Foldery kopii zapasowej"),
         "backup": MessageLookupByLibrary.simpleMessage("Kopia zapasowa"),
@@ -490,6 +492,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "cachedData":
             MessageLookupByLibrary.simpleMessage("Dane w pamięci podręcznej"),
         "calculating": MessageLookupByLibrary.simpleMessage("Obliczanie..."),
+        "canNotOpenBody": MessageLookupByLibrary.simpleMessage(
+            "Przepraszamy, ten album nie może zostać otwarty w aplikacji."),
+        "canNotOpenTitle": MessageLookupByLibrary.simpleMessage(
+            "Nie można otworzyć tego albumu"),
         "canNotUploadToAlbumsOwnedByOthers":
             MessageLookupByLibrary.simpleMessage(
                 "Nie można przesłać do albumów należących do innych"),
@@ -503,7 +509,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Anuluj odzyskiwanie"),
         "cancelAccountRecoveryBody": MessageLookupByLibrary.simpleMessage(
             "Czy na pewno chcesz anulować odzyskiwanie?"),
-        "cancelOtherSubscription": m18,
+        "cancelOtherSubscription": m19,
         "cancelSubscription":
             MessageLookupByLibrary.simpleMessage("Anuluj subskrypcję"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
@@ -555,7 +561,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Odbierz bezpłatną przestrzeń dyskową"),
         "claimMore": MessageLookupByLibrary.simpleMessage("Zdobądź więcej!"),
         "claimed": MessageLookupByLibrary.simpleMessage("Odebrano"),
-        "claimedStorageSoFar": m19,
+        "claimedStorageSoFar": m20,
         "cleanUncategorized":
             MessageLookupByLibrary.simpleMessage("Wyczyść Nieskategoryzowane"),
         "cleanUncategorizedDescription": MessageLookupByLibrary.simpleMessage(
@@ -585,12 +591,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Utwórz link, aby umożliwić innym dodawanie i przeglądanie zdjęć w udostępnionym albumie bez konieczności korzystania z aplikacji lub konta Ente. Świetne rozwiązanie do gromadzenia zdjęć ze wspólnych wydarzeń."),
         "collaborativeLink":
             MessageLookupByLibrary.simpleMessage("Link do współpracy"),
-        "collaborativeLinkCreatedFor": m20,
+        "collaborativeLinkCreatedFor": m21,
         "collaborator": MessageLookupByLibrary.simpleMessage("Współuczestnik"),
         "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Współuczestnicy mogą dodawać zdjęcia i wideo do udostępnionego albumu."),
-        "collaboratorsSuccessfullyAdded": m21,
+        "collaboratorsSuccessfullyAdded": m22,
         "collageLayout": MessageLookupByLibrary.simpleMessage("Układ"),
         "collageSaved":
             MessageLookupByLibrary.simpleMessage("Kolaż zapisano w galerii"),
@@ -607,7 +613,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Czy na pewno chcesz wyłączyć uwierzytelnianie dwustopniowe?"),
         "confirmAccountDeletion":
             MessageLookupByLibrary.simpleMessage("Potwierdź usunięcie konta"),
-        "confirmAddingTrustedContact": m22,
+        "confirmAddingTrustedContact": m23,
         "confirmDeletePrompt": MessageLookupByLibrary.simpleMessage(
             "Tak, chcę trwale usunąć to konto i jego dane ze wszystkich aplikacji."),
         "confirmPassword":
@@ -620,10 +626,10 @@ class MessageLookup extends MessageLookupByLibrary {
             "Potwierdź klucz odzyskiwania"),
         "connectToDevice":
             MessageLookupByLibrary.simpleMessage("Połącz z urządzeniem"),
-        "contactFamilyAdmin": m23,
+        "contactFamilyAdmin": m24,
         "contactSupport": MessageLookupByLibrary.simpleMessage(
             "Skontaktuj się z pomocą techniczną"),
-        "contactToManageSubscription": m24,
+        "contactToManageSubscription": m25,
         "contacts": MessageLookupByLibrary.simpleMessage("Kontakty"),
         "contents": MessageLookupByLibrary.simpleMessage("Zawartość"),
         "continueLabel": MessageLookupByLibrary.simpleMessage("Kontynuuj"),
@@ -669,7 +675,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "currentlyRunning":
             MessageLookupByLibrary.simpleMessage("aktualnie uruchomiony"),
         "custom": MessageLookupByLibrary.simpleMessage("Niestandardowy"),
-        "customEndpoint": m25,
+        "customEndpoint": m26,
         "darkTheme": MessageLookupByLibrary.simpleMessage("Ciemny"),
         "dayToday": MessageLookupByLibrary.simpleMessage("Dzisiaj"),
         "dayYesterday": MessageLookupByLibrary.simpleMessage("Wczoraj"),
@@ -704,11 +710,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "deleteFromDevice":
             MessageLookupByLibrary.simpleMessage("Usuń z urządzenia"),
         "deleteFromEnte": MessageLookupByLibrary.simpleMessage("Usuń z Ente"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deleteLocation":
             MessageLookupByLibrary.simpleMessage("Usuń lokalizację"),
         "deletePhotos": MessageLookupByLibrary.simpleMessage("Usuń zdjęcia"),
-        "deleteProgress": m27,
+        "deleteProgress": m28,
         "deleteReason1": MessageLookupByLibrary.simpleMessage(
             "Brakuje kluczowej funkcji, której potrzebuję"),
         "deleteReason2": MessageLookupByLibrary.simpleMessage(
@@ -748,7 +754,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Widzowie mogą nadal robić zrzuty ekranu lub zapisywać kopie zdjęć za pomocą programów trzecich"),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("Uwaga"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "disableTwofactor": MessageLookupByLibrary.simpleMessage(
             "Wyłącz uwierzytelnianie dwustopniowe"),
         "disablingTwofactorAuthentication":
@@ -791,9 +797,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "downloadFailed":
             MessageLookupByLibrary.simpleMessage("Pobieranie nie powiodło się"),
         "downloading": MessageLookupByLibrary.simpleMessage("Pobieranie..."),
-        "dropSupportEmail": m29,
-        "duplicateFileCountWithStorageSaved": m30,
-        "duplicateItemsGroup": m31,
+        "dropSupportEmail": m30,
+        "duplicateFileCountWithStorageSaved": m31,
+        "duplicateItemsGroup": m32,
         "edit": MessageLookupByLibrary.simpleMessage("Edytuj"),
         "editLocation":
             MessageLookupByLibrary.simpleMessage("Edytuj lokalizację"),
@@ -806,8 +812,12 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Edycje lokalizacji będą widoczne tylko w Ente"),
         "eligible": MessageLookupByLibrary.simpleMessage("kwalifikujący się"),
         "email": MessageLookupByLibrary.simpleMessage("Adres e-mail"),
-        "emailChangedTo": m32,
-        "emailNoEnteAccount": m33,
+        "emailAlreadyRegistered": MessageLookupByLibrary.simpleMessage(
+            "Adres e-mail jest już zarejestrowany."),
+        "emailChangedTo": m33,
+        "emailNoEnteAccount": m35,
+        "emailNotRegistered": MessageLookupByLibrary.simpleMessage(
+            "Adres e-mail nie jest zarejestrowany."),
         "emailVerificationToggle":
             MessageLookupByLibrary.simpleMessage("Weryfikacja e-mail"),
         "emailYourLogs":
@@ -888,7 +898,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Eksportuj swoje dane"),
         "extraPhotosFound": MessageLookupByLibrary.simpleMessage(
             "Znaleziono dodatkowe zdjęcia"),
-        "extraPhotosFoundFor": m34,
+        "extraPhotosFoundFor": m36,
         "faceNotClusteredYet": MessageLookupByLibrary.simpleMessage(
             "Twarz jeszcze nie zgrupowana, prosimy wrócić później"),
         "faceRecognition":
@@ -940,8 +950,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "fileTypes": MessageLookupByLibrary.simpleMessage("Rodzaje plików"),
         "fileTypesAndNames":
             MessageLookupByLibrary.simpleMessage("Typy plików i nazwy"),
-        "filesBackedUpFromDevice": m35,
-        "filesBackedUpInAlbum": m36,
+        "filesBackedUpFromDevice": m37,
+        "filesBackedUpInAlbum": m38,
         "filesDeleted": MessageLookupByLibrary.simpleMessage("Pliki usunięto"),
         "filesSavedToGallery":
             MessageLookupByLibrary.simpleMessage("Pliki zapisane do galerii"),
@@ -962,21 +972,22 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Darmowa pamięć użyteczna"),
         "freeTrial":
             MessageLookupByLibrary.simpleMessage("Darmowy okres próbny"),
-        "freeTrialValidTill": m37,
-        "freeUpAccessPostDelete": m38,
-        "freeUpAmount": m39,
+        "freeTrialValidTill": m39,
+        "freeUpAccessPostDelete": m40,
+        "freeUpAmount": m41,
         "freeUpDeviceSpace": MessageLookupByLibrary.simpleMessage(
             "Zwolnij miejsce na urządzeniu"),
         "freeUpDeviceSpaceDesc": MessageLookupByLibrary.simpleMessage(
             "Oszczędzaj miejsce na urządzeniu poprzez wyczyszczenie plików, które zostały już przesłane."),
         "freeUpSpace": MessageLookupByLibrary.simpleMessage("Zwolnij miejsce"),
-        "freeUpSpaceSaving": m40,
+        "freeUpSpaceSaving": m42,
+        "gallery": MessageLookupByLibrary.simpleMessage("Galeria"),
         "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage(
             "W galerii wyświetlane jest do 1000 pamięci"),
         "general": MessageLookupByLibrary.simpleMessage("Ogólne"),
         "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage(
             "Generowanie kluczy szyfrujących..."),
-        "genericProgress": m41,
+        "genericProgress": m43,
         "goToSettings":
             MessageLookupByLibrary.simpleMessage("Przejdź do ustawień"),
         "googlePlayId":
@@ -1059,12 +1070,18 @@ class MessageLookup extends MessageLookupByLibrary {
         "itLooksLikeSomethingWentWrongPleaseRetryAfterSome":
             MessageLookupByLibrary.simpleMessage(
                 "Wygląda na to, że coś poszło nie tak. Spróbuj ponownie po pewnym czasie. Jeśli błąd będzie się powtarzał, skontaktuj się z naszym zespołem pomocy technicznej."),
-        "itemCount": m42,
+        "itemCount": m44,
         "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion":
             MessageLookupByLibrary.simpleMessage(
                 "Elementy pokazują liczbę dni pozostałych przed trwałym usunięciem"),
         "itemsWillBeRemovedFromAlbum": MessageLookupByLibrary.simpleMessage(
             "Wybrane elementy zostaną usunięte z tego albumu"),
+        "join": MessageLookupByLibrary.simpleMessage("Dołącz"),
+        "joinAlbum": MessageLookupByLibrary.simpleMessage("Dołącz do albumu"),
+        "joinAlbumSubtext": MessageLookupByLibrary.simpleMessage(
+            "aby wyświetlić i dodać swoje zdjęcia"),
+        "joinAlbumSubtextViewer": MessageLookupByLibrary.simpleMessage(
+            "aby dodać to do udostępnionych albumów"),
         "joinDiscord":
             MessageLookupByLibrary.simpleMessage("Dołącz do serwera Discord"),
         "keepPhotos": MessageLookupByLibrary.simpleMessage("Zachowaj Zdjęcia"),
@@ -1083,7 +1100,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "legacy": MessageLookupByLibrary.simpleMessage("Dziedzictwo"),
         "legacyAccounts":
             MessageLookupByLibrary.simpleMessage("Odziedziczone konta"),
-        "legacyInvite": m43,
+        "legacyInvite": m45,
         "legacyPageDesc": MessageLookupByLibrary.simpleMessage(
             "Dziedzictwo pozwala zaufanym kontaktom na dostęp do Twojego konta w razie Twojej nieobecności."),
         "legacyPageDesc2": MessageLookupByLibrary.simpleMessage(
@@ -1094,9 +1111,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Link skopiowany do schowka"),
         "linkDeviceLimit":
             MessageLookupByLibrary.simpleMessage("Limit urządzeń"),
+        "linkEmail":
+            MessageLookupByLibrary.simpleMessage("Połącz adres e-mail"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("Aktywny"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("Wygasł"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry": MessageLookupByLibrary.simpleMessage("Wygaśnięcie linku"),
         "linkHasExpired": MessageLookupByLibrary.simpleMessage("Link wygasł"),
         "linkNeverExpires": MessageLookupByLibrary.simpleMessage("Nigdy"),
@@ -1222,12 +1241,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "mostRecent": MessageLookupByLibrary.simpleMessage("Od najnowszych"),
         "mostRelevant":
             MessageLookupByLibrary.simpleMessage("Najbardziej trafne"),
-        "moveItem": m45,
+        "moveItem": m49,
         "moveToAlbum":
             MessageLookupByLibrary.simpleMessage("Przenieś do albumu"),
         "moveToHiddenAlbum":
             MessageLookupByLibrary.simpleMessage("Przenieś do ukrytego albumu"),
-        "movedSuccessfullyTo": m46,
+        "movedSuccessfullyTo": m50,
         "movedToTrash":
             MessageLookupByLibrary.simpleMessage("Przeniesiono do kosza"),
         "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
@@ -1255,6 +1274,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Nie masz żadnych plików na tym urządzeniu, które można usunąć"),
         "noDuplicates":
             MessageLookupByLibrary.simpleMessage("✨ Brak duplikatów"),
+        "noEnteAccountExclamation":
+            MessageLookupByLibrary.simpleMessage("Brak konta Ente!"),
         "noExifData": MessageLookupByLibrary.simpleMessage("Brak danych EXIF"),
         "noFacesFound":
             MessageLookupByLibrary.simpleMessage("Nie znaleziono twarzy"),
@@ -1278,10 +1299,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "noResults": MessageLookupByLibrary.simpleMessage("Brak wyników"),
         "noResultsFound":
             MessageLookupByLibrary.simpleMessage("Nie znaleziono wyników"),
-        "noSuggestionsForPerson": m47,
+        "noSuggestionsForPerson": m51,
         "noSystemLockFound": MessageLookupByLibrary.simpleMessage(
             "Nie znaleziono blokady systemowej"),
-        "notPersonLabel": m48,
+        "notPersonLabel": m52,
         "nothingSharedWithYouYet": MessageLookupByLibrary.simpleMessage(
             "Nic Ci jeszcze nie udostępniono"),
         "nothingToSeeHere": MessageLookupByLibrary.simpleMessage(
@@ -1291,7 +1312,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "onDevice": MessageLookupByLibrary.simpleMessage("Na urządzeniu"),
         "onEnte":
             MessageLookupByLibrary.simpleMessage("W <branding>ente</branding>"),
-        "onlyFamilyAdminCanChangeCode": m49,
+        "onlyFamilyAdminCanChangeCode": m53,
         "onlyThem": MessageLookupByLibrary.simpleMessage("Tylko te"),
         "oops": MessageLookupByLibrary.simpleMessage("Ups"),
         "oopsCouldNotSaveEdits": MessageLookupByLibrary.simpleMessage(
@@ -1314,8 +1335,6 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Lub złącz z istniejącymi"),
         "orPickAnExistingOne":
             MessageLookupByLibrary.simpleMessage("Lub wybierz istniejący"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "pair": MessageLookupByLibrary.simpleMessage("Sparuj"),
         "pairWithPin": MessageLookupByLibrary.simpleMessage("Sparuj kodem PIN"),
         "pairingComplete":
@@ -1341,7 +1360,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Płatność się nie powiodła"),
         "paymentFailedMessage": MessageLookupByLibrary.simpleMessage(
             "Niestety Twoja płatność nie powiodła się. Skontaktuj się z pomocą techniczną, a my Ci pomożemy!"),
-        "paymentFailedTalkToProvider": m50,
+        "paymentFailedTalkToProvider": m54,
         "pendingItems":
             MessageLookupByLibrary.simpleMessage("Oczekujące elementy"),
         "pendingSync":
@@ -1365,14 +1384,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "photosAddedByYouWillBeRemovedFromTheAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Zdjęcia dodane przez Ciebie zostaną usunięte z albumu"),
-        "photosCount": m51,
+        "photosCount": m55,
         "pickCenterPoint":
             MessageLookupByLibrary.simpleMessage("Wybierz punkt środkowy"),
         "pinAlbum": MessageLookupByLibrary.simpleMessage("Przypnij album"),
         "pinLock": MessageLookupByLibrary.simpleMessage("Blokada PIN"),
         "playOnTv": MessageLookupByLibrary.simpleMessage(
             "Odtwórz album na telewizorze"),
-        "playStoreFreeTrialValidTill": m52,
+        "playStoreFreeTrialValidTill": m56,
         "playstoreSubscription":
             MessageLookupByLibrary.simpleMessage("Subskrypcja PlayStore"),
         "pleaseCheckYourInternetConnectionAndTryAgain":
@@ -1384,14 +1403,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseContactSupportIfTheProblemPersists":
             MessageLookupByLibrary.simpleMessage(
                 "Skontaktuj się z pomocą techniczną, jeśli problem będzie się powtarzał"),
-        "pleaseEmailUsAt": m53,
+        "pleaseEmailUsAt": m57,
         "pleaseGrantPermissions": MessageLookupByLibrary.simpleMessage(
             "Prosimy przyznać uprawnienia"),
         "pleaseLoginAgain":
             MessageLookupByLibrary.simpleMessage("Zaloguj się ponownie"),
         "pleaseSelectQuickLinksToRemove": MessageLookupByLibrary.simpleMessage(
             "Prosimy wybrać szybkie linki do usunięcia"),
-        "pleaseSendTheLogsTo": m54,
+        "pleaseSendTheLogsTo": m58,
         "pleaseTryAgain":
             MessageLookupByLibrary.simpleMessage("Spróbuj ponownie"),
         "pleaseVerifyTheCodeYouHaveEntered":
@@ -1418,7 +1437,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "privateSharing":
             MessageLookupByLibrary.simpleMessage("Udostępnianie prywatne"),
         "proceed": MessageLookupByLibrary.simpleMessage("Kontynuuj"),
-        "processingImport": m55,
+        "processed": MessageLookupByLibrary.simpleMessage("Przetworzone"),
+        "processingImport": m59,
         "publicLinkCreated":
             MessageLookupByLibrary.simpleMessage("Utworzono publiczny link"),
         "publicLinkEnabled":
@@ -1428,7 +1448,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "raiseTicket": MessageLookupByLibrary.simpleMessage("Zgłoś"),
         "rateTheApp": MessageLookupByLibrary.simpleMessage("Oceń aplikację"),
         "rateUs": MessageLookupByLibrary.simpleMessage("Oceń nas"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
         "recover": MessageLookupByLibrary.simpleMessage("Odzyskaj"),
         "recoverAccount":
             MessageLookupByLibrary.simpleMessage("Odzyskaj konto"),
@@ -1437,7 +1457,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Odzyskaj konto"),
         "recoveryInitiated":
             MessageLookupByLibrary.simpleMessage("Odzyskiwanie rozpoczęte"),
-        "recoveryInitiatedDesc": m57,
+        "recoveryInitiatedDesc": m62,
         "recoveryKey":
             MessageLookupByLibrary.simpleMessage("Klucz odzyskiwania"),
         "recoveryKeyCopiedToClipboard": MessageLookupByLibrary.simpleMessage(
@@ -1452,12 +1472,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Klucz odzyskiwania zweryfikowany"),
         "recoveryKeyVerifyReason": MessageLookupByLibrary.simpleMessage(
             "Twój klucz odzyskiwania jest jedynym sposobem na odzyskanie zdjęć, jeśli zapomnisz hasła. Klucz odzyskiwania można znaleźć w Ustawieniach > Konto.\n\nWprowadź tutaj swój klucz odzyskiwania, aby sprawdzić, czy został zapisany poprawnie."),
-        "recoveryReady": m58,
+        "recoveryReady": m63,
         "recoverySuccessful":
             MessageLookupByLibrary.simpleMessage("Odzyskano pomyślnie!"),
         "recoveryWarning": MessageLookupByLibrary.simpleMessage(
             "Zaufany kontakt próbuje uzyskać dostęp do Twojego konta"),
-        "recoveryWarningBody": m59,
+        "recoveryWarningBody": m64,
         "recreatePasswordBody": MessageLookupByLibrary.simpleMessage(
             "Obecne urządzenie nie jest wystarczająco wydajne, aby zweryfikować hasło, ale możemy je wygenerować w sposób działający na wszystkich urządzeniach.\n\nZaloguj się przy użyciu klucza odzyskiwania i wygeneruj nowe hasło (jeśli chcesz, możesz ponownie użyć tego samego)."),
         "recreatePasswordTitle":
@@ -1473,7 +1493,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "1. Przekaż ten kod swoim znajomym"),
         "referralStep2":
             MessageLookupByLibrary.simpleMessage("2. Wykupują płatny plan"),
-        "referralStep3": m60,
+        "referralStep3": m65,
         "referrals": MessageLookupByLibrary.simpleMessage("Polecenia"),
         "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage(
             "Wysyłanie poleceń jest obecnie wstrzymane"),
@@ -1503,7 +1523,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "removeLink": MessageLookupByLibrary.simpleMessage("Usuń link"),
         "removeParticipant":
             MessageLookupByLibrary.simpleMessage("Usuń użytkownika"),
-        "removeParticipantBody": m61,
+        "removeParticipantBody": m66,
         "removePersonLabel":
             MessageLookupByLibrary.simpleMessage("Usuń etykietę osoby"),
         "removePublicLink":
@@ -1524,7 +1544,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "renameFile": MessageLookupByLibrary.simpleMessage("Zmień nazwę pliku"),
         "renewSubscription":
             MessageLookupByLibrary.simpleMessage("Odnów subskrypcję"),
-        "renewsOn": m62,
+        "renewsOn": m67,
         "reportABug": MessageLookupByLibrary.simpleMessage("Zgłoś błąd"),
         "reportBug": MessageLookupByLibrary.simpleMessage("Zgłoś błąd"),
         "resendEmail":
@@ -1602,8 +1622,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Zaproś ludzi, a zobaczysz tutaj wszystkie udostępnione przez nich zdjęcia"),
         "searchPersonsEmptySection": MessageLookupByLibrary.simpleMessage(
             "Osoby będą wyświetlane tutaj po zakończeniu przetwarzania i synchronizacji"),
-        "searchResultCount": m63,
-        "searchSectionsLengthMismatch": m64,
+        "searchResultCount": m68,
+        "searchSectionsLengthMismatch": m69,
         "security": MessageLookupByLibrary.simpleMessage("Bezpieczeństwo"),
         "seePublicAlbumLinksInApp": MessageLookupByLibrary.simpleMessage(
             "Zobacz publiczne linki do albumów w aplikacji"),
@@ -1637,7 +1657,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Wybrane elementy zostaną usunięte ze wszystkich albumów i przeniesione do kosza."),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "send": MessageLookupByLibrary.simpleMessage("Wyślij"),
         "sendEmail": MessageLookupByLibrary.simpleMessage("Wyślij e-mail"),
         "sendInvite":
@@ -1666,16 +1686,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "shareAnAlbumNow":
             MessageLookupByLibrary.simpleMessage("Udostępnij teraz album"),
         "shareLink": MessageLookupByLibrary.simpleMessage("Udostępnij link"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage(
             "Udostępnij tylko ludziom, którym chcesz"),
         "shareTextConfirmOthersVerificationID": m7,
         "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage(
             "Pobierz Ente, abyśmy mogli łatwo udostępniać zdjęcia i wideo w oryginalnej jakości\n\nhttps://ente.io"),
-        "shareTextReferralCode": m67,
+        "shareTextReferralCode": m72,
         "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage(
             "Udostępnij użytkownikom bez konta Ente"),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "shareYourFirstAlbum": MessageLookupByLibrary.simpleMessage(
             "Udostępnij swój pierwszy album"),
         "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
@@ -1688,7 +1708,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Nowe udostępnione zdjęcia"),
         "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage(
             "Otrzymuj powiadomienia, gdy ktoś doda zdjęcie do udostępnionego albumu, którego jesteś częścią"),
-        "sharedWith": m69,
+        "sharedWith": m74,
         "sharedWithMe":
             MessageLookupByLibrary.simpleMessage("Udostępnione ze mną"),
         "sharedWithYou":
@@ -1705,11 +1725,11 @@ class MessageLookup extends MessageLookupByLibrary {
             "Wyloguj z pozostałych urządzeń"),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "Akceptuję <u-terms>warunki korzystania z usługi</u-terms> i <u-policy>politykę prywatności</u-policy>"),
-        "singleFileDeleteFromDevice": m70,
+        "singleFileDeleteFromDevice": m75,
         "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage(
             "To zostanie usunięte ze wszystkich albumów."),
-        "singleFileInBothLocalAndRemote": m71,
-        "singleFileInRemoteOnly": m72,
+        "singleFileInBothLocalAndRemote": m76,
+        "singleFileInRemoteOnly": m77,
         "skip": MessageLookupByLibrary.simpleMessage("Pomiń"),
         "social": MessageLookupByLibrary.simpleMessage("Społeczność"),
         "someItemsAreInBothEnteAndYourDevice":
@@ -1760,10 +1780,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageInGB": m1,
         "storageLimitExceeded":
             MessageLookupByLibrary.simpleMessage("Przekroczono limit pamięci"),
-        "storageUsageInfo": m73,
+        "storageUsageInfo": m78,
         "strongStrength": MessageLookupByLibrary.simpleMessage("Silne"),
-        "subAlreadyLinkedErrMessage": m74,
-        "subWillBeCancelledOn": m75,
+        "subAlreadyLinkedErrMessage": m79,
+        "subWillBeCancelledOn": m80,
         "subscribe": MessageLookupByLibrary.simpleMessage("Subskrybuj"),
         "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage(
             "Potrzebujesz aktywnej płatnej subskrypcji, aby włączyć udostępnianie."),
@@ -1780,7 +1800,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "suggestFeatures":
             MessageLookupByLibrary.simpleMessage("Zaproponuj funkcje"),
         "support": MessageLookupByLibrary.simpleMessage("Wsparcie techniczne"),
-        "syncProgress": m76,
+        "syncProgress": m81,
         "syncStopped":
             MessageLookupByLibrary.simpleMessage("Synchronizacja zatrzymana"),
         "syncing": MessageLookupByLibrary.simpleMessage("Synchronizowanie..."),
@@ -1793,7 +1813,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Naciśnij, aby odblokować"),
         "tapToUpload":
             MessageLookupByLibrary.simpleMessage("Naciśnij, aby przesłać"),
-        "tapToUploadIsIgnoredDue": m77,
+        "tapToUploadIsIgnoredDue": m82,
         "tempErrorContactSupportIfPersists": MessageLookupByLibrary.simpleMessage(
             "Wygląda na to, że coś poszło nie tak. Spróbuj ponownie po pewnym czasie. Jeśli błąd będzie się powtarzał, skontaktuj się z naszym zespołem pomocy technicznej."),
         "terminate": MessageLookupByLibrary.simpleMessage("Zakończ"),
@@ -1833,7 +1853,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Ten e-mail jest już używany"),
         "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage(
             "Ten obraz nie posiada danych exif"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage(
             "To jest Twój Identyfikator Weryfikacji"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -1857,11 +1877,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "total": MessageLookupByLibrary.simpleMessage("ogółem"),
         "totalSize": MessageLookupByLibrary.simpleMessage("Całkowity rozmiar"),
         "trash": MessageLookupByLibrary.simpleMessage("Kosz"),
-        "trashDaysLeft": m79,
+        "trashDaysLeft": m84,
         "trim": MessageLookupByLibrary.simpleMessage("Przytnij"),
         "trustedContacts":
             MessageLookupByLibrary.simpleMessage("Zaufane kontakty"),
-        "trustedInviteBody": m80,
+        "trustedInviteBody": m85,
         "tryAgain": MessageLookupByLibrary.simpleMessage("Spróbuj ponownie"),
         "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage(
             "Włącz kopię zapasową, aby automatycznie przesyłać pliki dodane do folderu urządzenia do Ente."),
@@ -1881,7 +1901,7 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Pomyślnie zresetowano uwierzytelnianie dwustopniowe"),
         "twofactorSetup": MessageLookupByLibrary.simpleMessage(
             "Uwierzytelnianie dwustopniowe"),
-        "typeOfGallerGallerytypeIsNotSupportedForRename": m81,
+        "typeOfGallerGallerytypeIsNotSupportedForRename": m86,
         "unarchive":
             MessageLookupByLibrary.simpleMessage("Przywróć z archiwum"),
         "unarchiveAlbum":
@@ -1906,10 +1926,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "updatingFolderSelection": MessageLookupByLibrary.simpleMessage(
             "Aktualizowanie wyboru folderu..."),
         "upgrade": MessageLookupByLibrary.simpleMessage("Ulepsz"),
-        "uploadIsIgnoredDueToIgnorereason": m82,
+        "uploadIsIgnoredDueToIgnorereason": m87,
         "uploadingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
             "Przesyłanie plików do albumu..."),
-        "uploadingMultipleMemories": m83,
+        "uploadingMultipleMemories": m88,
         "uploadingSingleMemory": MessageLookupByLibrary.simpleMessage(
             "Zachowywanie 1 wspomnienia..."),
         "upto50OffUntil4thDec": MessageLookupByLibrary.simpleMessage(
@@ -1927,7 +1947,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "useSelectedPhoto":
             MessageLookupByLibrary.simpleMessage("Użyj zaznaczone zdjęcie"),
         "usedSpace": MessageLookupByLibrary.simpleMessage("Zajęta przestrzeń"),
-        "validTill": m84,
+        "validTill": m89,
         "verificationFailedPleaseTryAgain":
             MessageLookupByLibrary.simpleMessage(
                 "Weryfikacja nie powiodła się, spróbuj ponownie"),
@@ -1936,7 +1956,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "verify": MessageLookupByLibrary.simpleMessage("Zweryfikuj"),
         "verifyEmail":
             MessageLookupByLibrary.simpleMessage("Zweryfikuj adres e-mail"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Zweryfikuj"),
         "verifyPasskey":
             MessageLookupByLibrary.simpleMessage("Zweryfikuj klucz dostępu"),
@@ -1962,7 +1982,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "viewRecoveryKey":
             MessageLookupByLibrary.simpleMessage("Zobacz klucz odzyskiwania"),
         "viewer": MessageLookupByLibrary.simpleMessage("Widz"),
-        "viewersSuccessfullyAdded": m86,
+        "viewersSuccessfullyAdded": m91,
         "visitWebToManage": MessageLookupByLibrary.simpleMessage(
             "Odwiedź stronę web.ente.io, aby zarządzać subskrypcją"),
         "waitingForVerification": MessageLookupByLibrary.simpleMessage(
@@ -1983,7 +2003,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Zaufany kontakt może pomóc w odzyskaniu Twoich danych."),
         "yearShort": MessageLookupByLibrary.simpleMessage("r"),
         "yearly": MessageLookupByLibrary.simpleMessage("Rocznie"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("Tak"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("Tak, anuluj"),
         "yesConvertToViewer":
@@ -2015,7 +2035,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Nie możesz udostępnić samemu sobie"),
         "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage(
             "Nie masz żadnych zarchiwizowanych elementów."),
-        "youHaveSuccessfullyFreedUp": m88,
+        "youHaveSuccessfullyFreedUp": m93,
         "yourAccountHasBeenDeleted": MessageLookupByLibrary.simpleMessage(
             "Twoje konto zostało usunięte"),
         "yourMap": MessageLookupByLibrary.simpleMessage("Twoja mapa"),
diff --git a/mobile/lib/generated/intl/messages_pt.dart b/mobile/lib/generated/intl/messages_pt.dart
index a5db557219..d62416e7fb 100644
--- a/mobile/lib/generated/intl/messages_pt.dart
+++ b/mobile/lib/generated/intl/messages_pt.dart
@@ -20,247 +20,258 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'pt';
 
-  static String m9(count) =>
-      "${Intl.plural(count, one: 'Adicionar colaborador', other: 'Adicionar colaboradores')}";
+  static String m9(title) => "${title} (Eu)";
 
   static String m10(count) =>
+      "${Intl.plural(count, one: 'Adicionar colaborador', other: 'Adicionar colaboradores')}";
+
+  static String m11(count) =>
       "${Intl.plural(count, one: 'Adicionar item', other: 'Adicionar itens')}";
 
-  static String m11(storageAmount, endDate) =>
+  static String m12(storageAmount, endDate) =>
       "Seu complemento ${storageAmount} é válido até ${endDate}";
 
-  static String m12(count) =>
+  static String m13(count) =>
       "${Intl.plural(count, one: 'Adicionar visualizador', other: 'Adicionar visualizadores')}";
 
-  static String m13(emailOrName) => "Adicionado por ${emailOrName}";
+  static String m14(emailOrName) => "Adicionado por ${emailOrName}";
 
-  static String m14(albumName) => "Adicionado com sucesso a  ${albumName}";
+  static String m15(albumName) => "Adicionado com sucesso a  ${albumName}";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: 'Nenhum participante', one: '1 participante', other: '${count} participantes')}";
 
-  static String m16(versionValue) => "Versão: ${versionValue}";
+  static String m17(versionValue) => "Versão: ${versionValue}";
 
-  static String m17(freeAmount, storageUnit) =>
+  static String m18(freeAmount, storageUnit) =>
       "${freeAmount} ${storageUnit} livre";
 
-  static String m18(paymentProvider) =>
+  static String m19(paymentProvider) =>
       "Primeiramente cancele sua assinatura existente do ${paymentProvider}";
 
   static String m3(user) =>
       "${user} Não poderá adicionar mais fotos a este álbum\n\nEles ainda conseguirão remover fotos existentes adicionadas por eles";
 
-  static String m19(isFamilyMember, storageAmountInGb) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
       "${Intl.select(isFamilyMember, {
             'true': 'Sua família reinvidicou ${storageAmountInGb} GB até então',
             'false': 'Você reinvindicou ${storageAmountInGb} GB até então',
             'other': 'Você reinvindicou ${storageAmountInGb} GB até então!',
           })}";
 
-  static String m20(albumName) => "Link colaborativo criado para ${albumName}";
+  static String m21(albumName) => "Link colaborativo criado para ${albumName}";
 
-  static String m21(count) =>
+  static String m22(count) =>
       "${Intl.plural(count, zero: 'Adicionado 0 colaboradores', one: 'Adicionado 1 colaborador', other: 'Adicionado ${count} colaboradores')}";
 
-  static String m22(email, numOfDays) =>
+  static String m23(email, numOfDays) =>
       "Você está prestes a adicionar ${email} como contato confiável. Eles poderão recuperar sua conta se você estiver ausente por ${numOfDays} dias.";
 
-  static String m23(familyAdminEmail) =>
+  static String m24(familyAdminEmail) =>
       "Entre em contato com <green>${familyAdminEmail}</green> para gerenciar sua assinatura";
 
-  static String m24(provider) =>
+  static String m25(provider) =>
       "Entre em contato conosco em support@ente.io para gerenciar sua assinatura ${provider}.";
 
-  static String m25(endpoint) => "Conectado à ${endpoint}";
+  static String m26(endpoint) => "Conectado à ${endpoint}";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: 'Excluir ${count} item', other: 'Excluir ${count} itens')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "Excluindo ${currentlyDeleting} / ${totalCount}";
 
-  static String m28(albumName) =>
+  static String m29(albumName) =>
       "Isso removerá o link público para acessar \"${albumName}\".";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "Envie um e-mail para ${supportEmail} a partir do seu endereço de e-mail registrado";
 
-  static String m30(count, storageSaved) =>
+  static String m31(count, storageSaved) =>
       "Você limpou ${Intl.plural(count, one: '${count} arquivo duplicado', other: '${count} arquivos duplicados')}, salvando (${storageSaved}!)";
 
-  static String m31(count, formattedSize) =>
+  static String m32(count, formattedSize) =>
       "${count} arquivos, ${formattedSize} cada";
 
-  static String m32(newEmail) => "E-mail alterado para ${newEmail}";
+  static String m33(newEmail) => "E-mail alterado para ${newEmail}";
 
-  static String m33(email) =>
+  static String m34(email) => "${email} não possui uma conta Ente.";
+
+  static String m35(email) =>
       "${email} não tem uma conta Ente.\n\nEnvie-os um convite para compartilhar fotos.";
 
-  static String m34(text) => "Fotos adicionais encontradas para ${text}";
+  static String m36(text) => "Fotos adicionais encontradas para ${text}";
 
-  static String m35(count, formattedNumber) =>
+  static String m37(count, formattedNumber) =>
       "${Intl.plural(count, one: '1 arquivo', other: '${formattedNumber} arquivos')} deste dispositivo foi copiado com segurança";
 
-  static String m36(count, formattedNumber) =>
+  static String m38(count, formattedNumber) =>
       "${Intl.plural(count, one: '1 arquivo', other: '${formattedNumber} arquivos')} deste álbum foi copiado com segurança";
 
   static String m4(storageAmountInGB) =>
       "${storageAmountInGB} GB cada vez que alguém se inscrever a um plano pago e aplicar seu código";
 
-  static String m37(endDate) => "A avaliação grátis acaba em ${endDate}";
+  static String m39(endDate) => "A avaliação grátis acaba em ${endDate}";
 
-  static String m38(count) =>
+  static String m40(count) =>
       "Você ainda pode acessá-${Intl.plural(count, one: 'lo', other: 'los')} no Ente, contanto que você tenha uma assinatura ativa";
 
-  static String m39(sizeInMBorGB) => "Liberar ${sizeInMBorGB}";
+  static String m41(sizeInMBorGB) => "Liberar ${sizeInMBorGB}";
 
-  static String m40(count, formattedSize) =>
+  static String m42(count, formattedSize) =>
       "${Intl.plural(count, one: 'Ele pode ser excluído do dispositivo para liberar ${formattedSize}', other: 'Eles podem ser excluídos do dispositivo para liberar ${formattedSize}')}";
 
-  static String m41(currentlyProcessing, totalCount) =>
+  static String m43(currentlyProcessing, totalCount) =>
       "Processando ${currentlyProcessing} / ${totalCount}";
 
-  static String m42(count) =>
+  static String m44(count) =>
       "${Intl.plural(count, one: '${count} item', other: '${count} itens')}";
 
-  static String m43(email) =>
+  static String m45(email) =>
       "${email} convidou você para ser um contato confiável";
 
-  static String m44(expiryTime) => "O link expirará em ${expiryTime}";
+  static String m46(expiryTime) => "O link expirará em ${expiryTime}";
+
+  static String m47(email) => "Vincular pessoa a ${email}";
+
+  static String m48(personName, email) =>
+      "Isso vinculará ${personName} a ${email}";
 
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, zero: 'sem memórias', one: '${formattedCount} memória', other: '${formattedCount} memórias')}";
 
-  static String m45(count) =>
+  static String m49(count) =>
       "${Intl.plural(count, one: 'Mover item', other: 'Mover itens')}";
 
-  static String m46(albumName) => "Movido com sucesso para ${albumName}";
+  static String m50(albumName) => "Movido com sucesso para ${albumName}";
 
-  static String m47(personName) => "Sem sugestões para ${personName}";
+  static String m51(personName) => "Sem sugestões para ${personName}";
 
-  static String m48(name) => "Não é ${name}?";
+  static String m52(name) => "Não é ${name}?";
 
-  static String m49(familyAdminEmail) =>
+  static String m53(familyAdminEmail) =>
       "Entre em contato com ${familyAdminEmail} para alterar o seu código.";
 
   static String m0(passwordStrengthValue) =>
       "Força da senha: ${passwordStrengthValue}";
 
-  static String m50(providerName) =>
+  static String m54(providerName) =>
       "Fale com o suporte ${providerName} se você foi cobrado";
 
-  static String m51(count) =>
+  static String m55(count) =>
       "${Intl.plural(count, zero: '0 fotos', one: '1 foto', other: '${count} fotos')}";
 
-  static String m52(endDate) =>
+  static String m56(endDate) =>
       "Avaliação grátis válida até ${endDate}.\nVocê pode alterar para um plano pago depois.";
 
-  static String m53(toEmail) => "Envie-nos um e-mail para ${toEmail}";
+  static String m57(toEmail) => "Envie-nos um e-mail para ${toEmail}";
 
-  static String m54(toEmail) => "Envie os registros para \n${toEmail}";
+  static String m58(toEmail) => "Envie os registros para \n${toEmail}";
 
-  static String m55(folderName) => "Processando ${folderName}...";
+  static String m59(folderName) => "Processando ${folderName}...";
 
-  static String m56(storeName) => "Avalie-nos no ${storeName}";
+  static String m60(storeName) => "Avalie-nos no ${storeName}";
 
-  static String m57(days, email) =>
+  static String m61(name) => "Atribuído a ${name}";
+
+  static String m62(days, email) =>
       "Você poderá acessar a conta após ${days} dias.  Uma notificação será enviada para ${email}.";
 
-  static String m58(email) =>
+  static String m63(email) =>
       "Você pode recuperar a conta com e-mail ${email} por definir uma nova senha.";
 
-  static String m59(email) => "${email} está tentando recuperar sua conta.";
+  static String m64(email) => "${email} está tentando recuperar sua conta.";
 
-  static String m60(storageInGB) =>
+  static String m65(storageInGB) =>
       "3. Ambos os dois ganham ${storageInGB} GB* grátis";
 
-  static String m61(userEmail) =>
+  static String m66(userEmail) =>
       "${userEmail} será removido deste álbum compartilhado\n\nQuaisquer fotos adicionadas por eles também serão removidas do álbum";
 
-  static String m62(endDate) => "Renovação de assinatura em ${endDate}";
+  static String m67(endDate) => "Renovação de assinatura em ${endDate}";
 
-  static String m63(count) =>
+  static String m68(count) =>
       "${Intl.plural(count, one: '${count} resultado encontrado', other: '${count} resultados encontrados')}";
 
-  static String m64(snapshotLength, searchLength) =>
+  static String m69(snapshotLength, searchLength) =>
       "Incompatibilidade de comprimento de seções: ${snapshotLength} != ${searchLength}";
 
   static String m6(count) => "${count} selecionado(s)";
 
-  static String m65(count, yourCount) =>
+  static String m70(count, yourCount) =>
       "${count} selecionado(s) (${yourCount} seus)";
 
-  static String m66(verificationID) =>
+  static String m71(verificationID) =>
       "Aqui está meu ID de verificação para o ente.io: ${verificationID}";
 
   static String m7(verificationID) =>
       "Ei, você pode confirmar se este ID de verificação do ente.io é seu?: ${verificationID}";
 
-  static String m67(referralCode, referralStorageInGB) =>
+  static String m72(referralCode, referralStorageInGB) =>
       "Código de referência do Ente: ${referralCode} \n\nAplique-o em Configurações → Geral → Referências para obter ${referralStorageInGB} GB grátis após a sua inscrição num plano pago\n\nhttps://ente.io";
 
-  static String m68(numberOfPeople) =>
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: 'Compartilhe com pessoas específicas', one: 'Compartilhado com 1 pessoa', other: 'Compartilhado com ${numberOfPeople} pessoas')}";
 
-  static String m69(emailIDs) => "Compartilhado com ${emailIDs}";
+  static String m74(emailIDs) => "Compartilhado com ${emailIDs}";
 
-  static String m70(fileType) =>
+  static String m75(fileType) =>
       "Este ${fileType} será excluído do dispositivo.";
 
-  static String m71(fileType) =>
+  static String m76(fileType) =>
       "Este ${fileType} está no Ente e em seu dispositivo.";
 
-  static String m72(fileType) => "Este ${fileType} será excluído do Ente.";
+  static String m77(fileType) => "Este ${fileType} será excluído do Ente.";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} GB";
 
-  static String m73(
+  static String m78(
           usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) =>
       "${usedAmount} ${usedStorageUnit} de ${totalAmount} ${totalStorageUnit} usado";
 
-  static String m74(id) =>
+  static String m79(id) =>
       "Seu ${id} já está vinculado a outra conta Ente. Se você gostaria de usar seu ${id} com esta conta, entre em contato conosco\"";
 
-  static String m75(endDate) => "Sua assinatura será cancelada em ${endDate}";
+  static String m80(endDate) => "Sua assinatura será cancelada em ${endDate}";
 
-  static String m76(completed, total) =>
+  static String m81(completed, total) =>
       "${completed}/${total} memórias preservadas";
 
-  static String m77(ignoreReason) =>
+  static String m82(ignoreReason) =>
       "Toque para enviar, atualmente o envio é ignorado devido a ${ignoreReason}";
 
   static String m8(storageAmountInGB) =>
       "Eles também recebem ${storageAmountInGB} GB";
 
-  static String m78(email) => "Este é o ID de verificação de ${email}";
+  static String m83(email) => "Este é o ID de verificação de ${email}";
 
-  static String m79(count) =>
+  static String m84(count) =>
       "${Intl.plural(count, zero: 'Em breve', one: '1 dia', other: '${count} dias')}";
 
-  static String m80(email) =>
+  static String m85(email) =>
       "Você foi convidado para ser um contato legado por ${email}.";
 
-  static String m81(galleryType) =>
+  static String m86(galleryType) =>
       "O tipo de galeria ${galleryType} não é suportado para renomear";
 
-  static String m82(ignoreReason) =>
+  static String m87(ignoreReason) =>
       "O envio é ignorado devido a ${ignoreReason}";
 
-  static String m83(count) => "Preservando ${count} memórias...";
+  static String m88(count) => "Preservando ${count} memórias...";
 
-  static String m84(endDate) => "Válido até ${endDate}";
+  static String m89(endDate) => "Válido até ${endDate}";
 
-  static String m85(email) => "Verificar ${email}";
+  static String m90(email) => "Verificar ${email}";
 
-  static String m86(count) =>
+  static String m91(count) =>
       "${Intl.plural(count, zero: 'Adicionado 0 visualizadores', one: 'Adicionado 1 visualizador', other: 'Adicionado ${count} visualizadores')}";
 
-  static String m2(email) => "Nós enviamos um e-mail à <green>${email}</green>";
+  static String m2(email) => "Enviamos um e-mail à <green>${email}</green>";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, one: '${count} ano atrás', other: '${count} anos atrás')}";
 
-  static String m88(storageSaved) =>
+  static String m93(storageSaved) =>
       "Você liberou ${storageSaved} com sucesso!";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
@@ -273,6 +284,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "account": MessageLookupByLibrary.simpleMessage("Conta"),
         "accountIsAlreadyConfigured": MessageLookupByLibrary.simpleMessage(
             "A conta já está configurada."),
+        "accountOwnerPersonAppbarTitle": m9,
         "accountWelcomeBack":
             MessageLookupByLibrary.simpleMessage("Bem-vindo(a) de volta!"),
         "ackPasswordLostWarning": MessageLookupByLibrary.simpleMessage(
@@ -285,11 +297,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Adicionar um novo e-mail"),
         "addCollaborator":
             MessageLookupByLibrary.simpleMessage("Adicionar colaborador"),
-        "addCollaborators": m9,
+        "addCollaborators": m10,
         "addFiles": MessageLookupByLibrary.simpleMessage("Adicionar arquivos"),
         "addFromDevice":
             MessageLookupByLibrary.simpleMessage("Adicionar do dispositivo"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocation":
             MessageLookupByLibrary.simpleMessage("Adicionar localização"),
         "addLocationButton": MessageLookupByLibrary.simpleMessage("Adicionar"),
@@ -302,7 +314,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Adicionar nova pessoa"),
         "addOnPageSubtitle":
             MessageLookupByLibrary.simpleMessage("Detalhes dos complementos"),
-        "addOnValidTill": m11,
+        "addOnValidTill": m12,
         "addOns": MessageLookupByLibrary.simpleMessage("Complementos"),
         "addPhotos": MessageLookupByLibrary.simpleMessage("Adicionar fotos"),
         "addSelected":
@@ -316,12 +328,12 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Adicionar contato confiável"),
         "addViewer":
             MessageLookupByLibrary.simpleMessage("Adicionar visualizador"),
-        "addViewers": m12,
+        "addViewers": m13,
         "addYourPhotosNow":
             MessageLookupByLibrary.simpleMessage("Adicione suas fotos agora"),
         "addedAs": MessageLookupByLibrary.simpleMessage("Adicionado como"),
-        "addedBy": m13,
-        "addedSuccessfullyTo": m14,
+        "addedBy": m14,
+        "addedSuccessfullyTo": m15,
         "addingToFavorites": MessageLookupByLibrary.simpleMessage(
             "Adicionando aos favoritos..."),
         "advanced": MessageLookupByLibrary.simpleMessage("Avançado"),
@@ -332,7 +344,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "after1Week": MessageLookupByLibrary.simpleMessage("Após 1 semana"),
         "after1Year": MessageLookupByLibrary.simpleMessage("Após 1 ano"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("Proprietário"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumTitle": MessageLookupByLibrary.simpleMessage("Título do álbum"),
         "albumUpdated":
             MessageLookupByLibrary.simpleMessage("Álbum atualizado"),
@@ -380,7 +392,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Bloqueio do aplicativo"),
         "appLockDescriptions": MessageLookupByLibrary.simpleMessage(
             "Escolha entre a tela de bloqueio padrão do seu dispositivo e uma tela de bloqueio personalizada com PIN ou senha."),
-        "appVersion": m16,
+        "appVersion": m17,
         "appleId": MessageLookupByLibrary.simpleMessage("ID da Apple"),
         "apply": MessageLookupByLibrary.simpleMessage("Aplicar"),
         "applyCodeTitle":
@@ -463,7 +475,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoPairDesc": MessageLookupByLibrary.simpleMessage(
             "O pareamento automático só funciona com dispositivos que suportam o Chromecast."),
         "available": MessageLookupByLibrary.simpleMessage("Disponível"),
-        "availableStorageSpace": m17,
+        "availableStorageSpace": m18,
         "backedUpFolders": MessageLookupByLibrary.simpleMessage(
             "Pastas copiadas com segurança"),
         "backup": MessageLookupByLibrary.simpleMessage("Cópia de segurança"),
@@ -505,7 +517,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Cancelar recuperação"),
         "cancelAccountRecoveryBody": MessageLookupByLibrary.simpleMessage(
             "Deseja mesmo cancelar a recuperação de conta?"),
-        "cancelOtherSubscription": m18,
+        "cancelOtherSubscription": m19,
         "cancelSubscription":
             MessageLookupByLibrary.simpleMessage("Cancelar assinatura"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
@@ -555,7 +567,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Reivindicar armazenamento grátis"),
         "claimMore": MessageLookupByLibrary.simpleMessage("Reivindique mais!"),
         "claimed": MessageLookupByLibrary.simpleMessage("Reivindicado"),
-        "claimedStorageSoFar": m19,
+        "claimedStorageSoFar": m20,
         "cleanUncategorized":
             MessageLookupByLibrary.simpleMessage("Limpar não categorizado"),
         "cleanUncategorizedDescription": MessageLookupByLibrary.simpleMessage(
@@ -584,12 +596,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Crie um link para permitir que as pessoas adicionem e vejam fotos no seu álbum compartilhado sem a necessidade do aplicativo ou uma conta Ente. Ótimo para colecionar fotos de eventos."),
         "collaborativeLink":
             MessageLookupByLibrary.simpleMessage("Link colaborativo"),
-        "collaborativeLinkCreatedFor": m20,
+        "collaborativeLinkCreatedFor": m21,
         "collaborator": MessageLookupByLibrary.simpleMessage("Colaborador"),
         "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Os colaboradores podem adicionar fotos e vídeos ao álbum compartilhado."),
-        "collaboratorsSuccessfullyAdded": m21,
+        "collaboratorsSuccessfullyAdded": m22,
         "collageLayout": MessageLookupByLibrary.simpleMessage("Layout"),
         "collageSaved":
             MessageLookupByLibrary.simpleMessage("Colagem salva na galeria"),
@@ -606,7 +618,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Você tem certeza que queira desativar a autenticação de dois fatores?"),
         "confirmAccountDeletion":
             MessageLookupByLibrary.simpleMessage("Confirmar exclusão da conta"),
-        "confirmAddingTrustedContact": m22,
+        "confirmAddingTrustedContact": m23,
         "confirmDeletePrompt": MessageLookupByLibrary.simpleMessage(
             "Sim, eu quero permanentemente excluir esta conta e os dados em todos os aplicativos."),
         "confirmPassword":
@@ -619,10 +631,10 @@ class MessageLookup extends MessageLookupByLibrary {
             "Confirme sua chave de recuperação"),
         "connectToDevice":
             MessageLookupByLibrary.simpleMessage("Conectar ao dispositivo"),
-        "contactFamilyAdmin": m23,
+        "contactFamilyAdmin": m24,
         "contactSupport":
             MessageLookupByLibrary.simpleMessage("Contatar suporte"),
-        "contactToManageSubscription": m24,
+        "contactToManageSubscription": m25,
         "contacts": MessageLookupByLibrary.simpleMessage("Contatos"),
         "contents": MessageLookupByLibrary.simpleMessage("Conteúdos"),
         "continueLabel": MessageLookupByLibrary.simpleMessage("Continuar"),
@@ -667,7 +679,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "currentlyRunning":
             MessageLookupByLibrary.simpleMessage("Atualmente executando"),
         "custom": MessageLookupByLibrary.simpleMessage("Personalizado"),
-        "customEndpoint": m25,
+        "customEndpoint": m26,
         "darkTheme": MessageLookupByLibrary.simpleMessage("Escuro"),
         "dayToday": MessageLookupByLibrary.simpleMessage("Hoje"),
         "dayYesterday": MessageLookupByLibrary.simpleMessage("Ontem"),
@@ -694,7 +706,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "deleteConfirmDialogBody": MessageLookupByLibrary.simpleMessage(
             "Esta conta está vinculada aos outros aplicativos do Ente, se você usar algum. Seus dados baixados, entre todos os aplicativos do Ente, serão programados para exclusão, e sua conta será permanentemente excluída."),
         "deleteEmailRequest": MessageLookupByLibrary.simpleMessage(
-            "Por favor, envie um e-mail à <warning>account-deletion@ente.io</warning> do seu endereço de e-mail registrado."),
+            "Por favor, envie um e-mail a <warning>account-deletion@ente.io</warning> do seu endereço de e-mail registrado."),
         "deleteEmptyAlbums":
             MessageLookupByLibrary.simpleMessage("Excluir álbuns vazios"),
         "deleteEmptyAlbumsWithQuestionMark":
@@ -705,11 +717,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Excluir do dispositivo"),
         "deleteFromEnte":
             MessageLookupByLibrary.simpleMessage("Excluir do Ente"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deleteLocation":
             MessageLookupByLibrary.simpleMessage("Excluir localização"),
         "deletePhotos": MessageLookupByLibrary.simpleMessage("Excluir fotos"),
-        "deleteProgress": m27,
+        "deleteProgress": m28,
         "deleteReason1": MessageLookupByLibrary.simpleMessage(
             "Está faltando um recurso-chave que eu preciso"),
         "deleteReason2": MessageLookupByLibrary.simpleMessage(
@@ -750,7 +762,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Os visualizadores podem fazer capturas de tela ou salvar uma cópia de suas fotos usando ferramentas externas"),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("Por favor, saiba que"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "disableTwofactor": MessageLookupByLibrary.simpleMessage(
             "Desativar autenticação de dois fatores"),
         "disablingTwofactorAuthentication":
@@ -787,15 +799,16 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Você quer descartar as edições que você fez?"),
         "done": MessageLookupByLibrary.simpleMessage("Concluído"),
+        "dontSave": MessageLookupByLibrary.simpleMessage("Não salvar"),
         "doubleYourStorage":
             MessageLookupByLibrary.simpleMessage("Duplique seu armazenamento"),
         "download": MessageLookupByLibrary.simpleMessage("Baixar"),
         "downloadFailed":
             MessageLookupByLibrary.simpleMessage("Falhou ao baixar"),
         "downloading": MessageLookupByLibrary.simpleMessage("Baixando..."),
-        "dropSupportEmail": m29,
-        "duplicateFileCountWithStorageSaved": m30,
-        "duplicateItemsGroup": m31,
+        "dropSupportEmail": m30,
+        "duplicateFileCountWithStorageSaved": m31,
+        "duplicateItemsGroup": m32,
         "edit": MessageLookupByLibrary.simpleMessage("Editar"),
         "editLocation":
             MessageLookupByLibrary.simpleMessage("Editar localização"),
@@ -810,8 +823,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "email": MessageLookupByLibrary.simpleMessage("E-mail"),
         "emailAlreadyRegistered":
             MessageLookupByLibrary.simpleMessage("E-mail já registrado."),
-        "emailChangedTo": m32,
-        "emailNoEnteAccount": m33,
+        "emailChangedTo": m33,
+        "emailDoesNotHaveEnteAccount": m34,
+        "emailNoEnteAccount": m35,
         "emailNotRegistered":
             MessageLookupByLibrary.simpleMessage("E-mail não registrado."),
         "emailVerificationToggle":
@@ -845,7 +859,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Ente pode criptografar e preservar arquivos apenas se você conceder acesso a eles"),
         "entePhotosPerm": MessageLookupByLibrary.simpleMessage(
-            "Ente <i>precisa de sua permissão para</i> preservar suas fotos"),
+            "Ente <i>precisa de permissão para</i> preservar suas fotos"),
         "enteSubscriptionPitch": MessageLookupByLibrary.simpleMessage(
             "O Ente preserva suas memórias, então eles sempre estão disponíveis para você, mesmo se você perder o dispositivo."),
         "enteSubscriptionShareWithFamily": MessageLookupByLibrary.simpleMessage(
@@ -896,12 +910,13 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Exportar dados"),
         "extraPhotosFound": MessageLookupByLibrary.simpleMessage(
             "Fotos adicionais encontradas"),
-        "extraPhotosFoundFor": m34,
+        "extraPhotosFoundFor": m36,
         "faceNotClusteredYet": MessageLookupByLibrary.simpleMessage(
             "Rosto não agrupado ainda, volte aqui mais tarde"),
         "faceRecognition":
             MessageLookupByLibrary.simpleMessage("Reconhecimento facial"),
         "faces": MessageLookupByLibrary.simpleMessage("Rostos"),
+        "failed": MessageLookupByLibrary.simpleMessage("Falhou"),
         "failedToApplyCode":
             MessageLookupByLibrary.simpleMessage("Falhou ao aplicar código"),
         "failedToCancel":
@@ -947,8 +962,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "fileTypes": MessageLookupByLibrary.simpleMessage("Tipos de arquivo"),
         "fileTypesAndNames":
             MessageLookupByLibrary.simpleMessage("Tipos de arquivo e nomes"),
-        "filesBackedUpFromDevice": m35,
-        "filesBackedUpInAlbum": m36,
+        "filesBackedUpFromDevice": m37,
+        "filesBackedUpInAlbum": m38,
         "filesDeleted":
             MessageLookupByLibrary.simpleMessage("Arquivos excluídos"),
         "filesSavedToGallery":
@@ -970,22 +985,22 @@ class MessageLookup extends MessageLookupByLibrary {
         "freeStorageUsable":
             MessageLookupByLibrary.simpleMessage("Armazenamento disponível"),
         "freeTrial": MessageLookupByLibrary.simpleMessage("Avaliação grátis"),
-        "freeTrialValidTill": m37,
-        "freeUpAccessPostDelete": m38,
-        "freeUpAmount": m39,
+        "freeTrialValidTill": m39,
+        "freeUpAccessPostDelete": m40,
+        "freeUpAmount": m41,
         "freeUpDeviceSpace": MessageLookupByLibrary.simpleMessage(
             "Liberar espaço no dispositivo"),
         "freeUpDeviceSpaceDesc": MessageLookupByLibrary.simpleMessage(
             "Economize espaço em seu dispositivo por limpar arquivos já salvos com segurança."),
         "freeUpSpace": MessageLookupByLibrary.simpleMessage("Liberar espaço"),
-        "freeUpSpaceSaving": m40,
+        "freeUpSpaceSaving": m42,
         "gallery": MessageLookupByLibrary.simpleMessage("Galeria"),
         "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage(
             "Até 1.000 memórias exibidas na galeria"),
         "general": MessageLookupByLibrary.simpleMessage("Geral"),
         "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage(
             "Gerando chaves de criptografia..."),
-        "genericProgress": m41,
+        "genericProgress": m43,
         "goToSettings": MessageLookupByLibrary.simpleMessage("Ir às opções"),
         "googlePlayId":
             MessageLookupByLibrary.simpleMessage("ID do Google Play"),
@@ -1044,6 +1059,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "indexedItems": MessageLookupByLibrary.simpleMessage("Itens indexados"),
         "indexingIsPaused": MessageLookupByLibrary.simpleMessage(
             "A indexação parou, ela será retomada automaticamente quando o dispositivo estiver pronto."),
+        "ineligible": MessageLookupByLibrary.simpleMessage("Inelegível"),
         "info": MessageLookupByLibrary.simpleMessage("Info"),
         "insecureDevice":
             MessageLookupByLibrary.simpleMessage("Dispositivo inseguro"),
@@ -1068,7 +1084,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "itLooksLikeSomethingWentWrongPleaseRetryAfterSome":
             MessageLookupByLibrary.simpleMessage(
                 "Parece que algo deu errado. Tente novamente mais tarde. Caso o erro persistir, por favor, entre em contato com nossa equipe."),
-        "itemCount": m42,
+        "itemCount": m44,
         "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion":
             MessageLookupByLibrary.simpleMessage(
                 "Os itens exibem o número de dias restantes antes da exclusão permanente"),
@@ -1076,6 +1092,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Os itens selecionados serão removidos deste álbum"),
         "join": MessageLookupByLibrary.simpleMessage("Unir-se"),
         "joinAlbum": MessageLookupByLibrary.simpleMessage("Unir-se ao álbum"),
+        "joinAlbumConfirmationDialogBody": MessageLookupByLibrary.simpleMessage(
+            "Unir-se ao álbum fará que seu e-mail seja visível a todos do álbum."),
         "joinAlbumSubtext": MessageLookupByLibrary.simpleMessage(
             "para visualizar e adicionar suas fotos"),
         "joinAlbumSubtextViewer": MessageLookupByLibrary.simpleMessage(
@@ -1097,12 +1115,13 @@ class MessageLookup extends MessageLookupByLibrary {
             "Sair do álbum compartilhado?"),
         "left": MessageLookupByLibrary.simpleMessage("Esquerda"),
         "legacy": MessageLookupByLibrary.simpleMessage("Legado"),
-        "legacyAccounts": MessageLookupByLibrary.simpleMessage("Contas legado"),
-        "legacyInvite": m43,
+        "legacyAccounts":
+            MessageLookupByLibrary.simpleMessage("Contas legadas"),
+        "legacyInvite": m45,
         "legacyPageDesc": MessageLookupByLibrary.simpleMessage(
             "O legado permite que contatos confiáveis acessem sua conta em sua ausência."),
         "legacyPageDesc2": MessageLookupByLibrary.simpleMessage(
-            "Contatos confiáveis podem iniciar recuperação de conta, e se não for cancelado dentro de 30 dias, redefina sua senha e acesse sua conta."),
+            "Contatos confiáveis podem iniciar recuperação de conta. Se não cancelado dentro de 30 dias, redefina sua senha e acesse sua conta."),
         "light": MessageLookupByLibrary.simpleMessage("Brilho"),
         "lightTheme": MessageLookupByLibrary.simpleMessage("Claro"),
         "link": MessageLookupByLibrary.simpleMessage("Vincular"),
@@ -1111,13 +1130,20 @@ class MessageLookup extends MessageLookupByLibrary {
         "linkDeviceLimit":
             MessageLookupByLibrary.simpleMessage("Limite do dispositivo"),
         "linkEmail": MessageLookupByLibrary.simpleMessage("Vincular e-mail"),
+        "linkEmailToContactBannerCaption":
+            MessageLookupByLibrary.simpleMessage("para compartilhar rápido"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("Ativado"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("Expirado"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry": MessageLookupByLibrary.simpleMessage("Expiração do link"),
         "linkHasExpired":
             MessageLookupByLibrary.simpleMessage("O link expirou"),
         "linkNeverExpires": MessageLookupByLibrary.simpleMessage("Nunca"),
+        "linkPerson": MessageLookupByLibrary.simpleMessage("Vincular pessoa"),
+        "linkPersonCaption": MessageLookupByLibrary.simpleMessage(
+            "para melhor experiência de compartilhamento"),
+        "linkPersonToEmail": m47,
+        "linkPersonToEmailConfirmation": m48,
         "livePhotos": MessageLookupByLibrary.simpleMessage("Fotos animadas"),
         "loadMessage1": MessageLookupByLibrary.simpleMessage(
             "Você pode compartilhar sua assinatura com seus familiares"),
@@ -1207,6 +1233,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "maps": MessageLookupByLibrary.simpleMessage("Mapas"),
         "mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"),
         "matrix": MessageLookupByLibrary.simpleMessage("Matrix"),
+        "me": MessageLookupByLibrary.simpleMessage("Eu"),
         "memoryCount": m5,
         "merchandise": MessageLookupByLibrary.simpleMessage("Produtos"),
         "mergeWithExisting":
@@ -1236,12 +1263,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "moreDetails": MessageLookupByLibrary.simpleMessage("Mais detalhes"),
         "mostRecent": MessageLookupByLibrary.simpleMessage("Mais recente"),
         "mostRelevant": MessageLookupByLibrary.simpleMessage("Mais relevante"),
-        "moveItem": m45,
+        "moveItem": m49,
         "moveToAlbum":
             MessageLookupByLibrary.simpleMessage("Mover para o álbum"),
         "moveToHiddenAlbum":
             MessageLookupByLibrary.simpleMessage("Mover ao álbum oculto"),
-        "movedSuccessfullyTo": m46,
+        "movedSuccessfullyTo": m50,
         "movedToTrash":
             MessageLookupByLibrary.simpleMessage("Movido para a lixeira"),
         "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
@@ -1294,10 +1321,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "noResults": MessageLookupByLibrary.simpleMessage("Nenhum resultado"),
         "noResultsFound":
             MessageLookupByLibrary.simpleMessage("Nenhum resultado encontrado"),
-        "noSuggestionsForPerson": m47,
+        "noSuggestionsForPerson": m51,
         "noSystemLockFound": MessageLookupByLibrary.simpleMessage(
             "Nenhum bloqueio do sistema encontrado"),
-        "notPersonLabel": m48,
+        "notPersonLabel": m52,
         "nothingSharedWithYouYet": MessageLookupByLibrary.simpleMessage(
             "Nada compartilhado com você ainda"),
         "nothingToSeeHere":
@@ -1307,7 +1334,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "onDevice": MessageLookupByLibrary.simpleMessage("No dispositivo"),
         "onEnte": MessageLookupByLibrary.simpleMessage(
             "No <branding>ente</branding>"),
-        "onlyFamilyAdminCanChangeCode": m49,
+        "onlyFamilyAdminCanChangeCode": m53,
         "onlyThem": MessageLookupByLibrary.simpleMessage("Apenas eles"),
         "oops": MessageLookupByLibrary.simpleMessage("Ops"),
         "oopsCouldNotSaveEdits": MessageLookupByLibrary.simpleMessage(
@@ -1330,8 +1357,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Ou mesclar com existente"),
         "orPickAnExistingOne":
             MessageLookupByLibrary.simpleMessage("Ou escolha um existente"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
+        "orPickFromYourContacts": MessageLookupByLibrary.simpleMessage(
+            "ou escolher dos seus contatos"),
         "pair": MessageLookupByLibrary.simpleMessage("Parear"),
         "pairWithPin": MessageLookupByLibrary.simpleMessage("Parear com PIN"),
         "pairingComplete":
@@ -1358,7 +1385,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("O pagamento falhou"),
         "paymentFailedMessage": MessageLookupByLibrary.simpleMessage(
             "Infelizmente o pagamento falhou. Entre em contato com o suporte e nós ajudaremos você!"),
-        "paymentFailedTalkToProvider": m50,
+        "paymentFailedTalkToProvider": m54,
         "pendingItems": MessageLookupByLibrary.simpleMessage("Itens pendentes"),
         "pendingSync":
             MessageLookupByLibrary.simpleMessage("Sincronização pendente"),
@@ -1381,14 +1408,18 @@ class MessageLookup extends MessageLookupByLibrary {
         "photosAddedByYouWillBeRemovedFromTheAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Suas fotos adicionadas serão removidas do álbum"),
-        "photosCount": m51,
+        "photosCount": m55,
         "pickCenterPoint":
             MessageLookupByLibrary.simpleMessage("Escolha o ponto central"),
         "pinAlbum": MessageLookupByLibrary.simpleMessage("Fixar álbum"),
         "pinLock": MessageLookupByLibrary.simpleMessage("Bloqueio por PIN"),
         "playOnTv":
             MessageLookupByLibrary.simpleMessage("Reproduzir álbum na TV"),
-        "playStoreFreeTrialValidTill": m52,
+        "playOriginal":
+            MessageLookupByLibrary.simpleMessage("Reproduzir original"),
+        "playStoreFreeTrialValidTill": m56,
+        "playStream":
+            MessageLookupByLibrary.simpleMessage("Reproduzir transmissão"),
         "playstoreSubscription":
             MessageLookupByLibrary.simpleMessage("Assinatura da PlayStore"),
         "pleaseCheckYourInternetConnectionAndTryAgain":
@@ -1400,14 +1431,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseContactSupportIfTheProblemPersists":
             MessageLookupByLibrary.simpleMessage(
                 "Por favor, contate o suporte se o problema persistir"),
-        "pleaseEmailUsAt": m53,
+        "pleaseEmailUsAt": m57,
         "pleaseGrantPermissions": MessageLookupByLibrary.simpleMessage(
             "Por favor, conceda as permissões"),
         "pleaseLoginAgain":
             MessageLookupByLibrary.simpleMessage("Registre-se novamente"),
         "pleaseSelectQuickLinksToRemove": MessageLookupByLibrary.simpleMessage(
             "Selecione links rápidos para remover"),
-        "pleaseSendTheLogsTo": m54,
+        "pleaseSendTheLogsTo": m58,
         "pleaseTryAgain":
             MessageLookupByLibrary.simpleMessage("Tente novamente"),
         "pleaseVerifyTheCodeYouHaveEntered":
@@ -1434,18 +1465,26 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Compartilhamento privado"),
         "proceed": MessageLookupByLibrary.simpleMessage("Continuar"),
         "processed": MessageLookupByLibrary.simpleMessage("Processado"),
-        "processingImport": m55,
+        "processing": MessageLookupByLibrary.simpleMessage("Processando"),
+        "processingImport": m59,
+        "processingVideos":
+            MessageLookupByLibrary.simpleMessage("Processando vídeos"),
         "publicLinkCreated":
             MessageLookupByLibrary.simpleMessage("Link público criado"),
         "publicLinkEnabled":
             MessageLookupByLibrary.simpleMessage("Link público ativo"),
+        "queued": MessageLookupByLibrary.simpleMessage("Na fila"),
         "quickLinks": MessageLookupByLibrary.simpleMessage("Links rápidos"),
         "radius": MessageLookupByLibrary.simpleMessage("Raio"),
         "raiseTicket": MessageLookupByLibrary.simpleMessage("Abrir ticket"),
         "rateTheApp":
             MessageLookupByLibrary.simpleMessage("Avalie o aplicativo"),
         "rateUs": MessageLookupByLibrary.simpleMessage("Avaliar"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
+        "reassignMe": MessageLookupByLibrary.simpleMessage("Reatribuir \"Eu\""),
+        "reassignedToName": m61,
+        "reassigningLoading":
+            MessageLookupByLibrary.simpleMessage("Reatribuindo..."),
         "recover": MessageLookupByLibrary.simpleMessage("Recuperar"),
         "recoverAccount":
             MessageLookupByLibrary.simpleMessage("Recuperar conta"),
@@ -1454,7 +1493,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Recuperar conta"),
         "recoveryInitiated":
             MessageLookupByLibrary.simpleMessage("A recuperação iniciou"),
-        "recoveryInitiatedDesc": m57,
+        "recoveryInitiatedDesc": m62,
         "recoveryKey":
             MessageLookupByLibrary.simpleMessage("Chave de recuperação"),
         "recoveryKeyCopiedToClipboard": MessageLookupByLibrary.simpleMessage(
@@ -1469,12 +1508,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Chave de recuperação verificada"),
         "recoveryKeyVerifyReason": MessageLookupByLibrary.simpleMessage(
             "Sua chave de recuperação é a única maneira de recuperar suas fotos se você esqueceu sua senha. Você pode encontrar sua chave de recuperação em Opções > Conta.\n\nInsira sua chave de recuperação aqui para verificar se você a salvou corretamente."),
-        "recoveryReady": m58,
+        "recoveryReady": m63,
         "recoverySuccessful":
             MessageLookupByLibrary.simpleMessage("Recuperação com sucesso!"),
         "recoveryWarning": MessageLookupByLibrary.simpleMessage(
             "Um contato confiável está tentando acessar sua conta"),
-        "recoveryWarningBody": m59,
+        "recoveryWarningBody": m64,
         "recreatePasswordBody": MessageLookupByLibrary.simpleMessage(
             "O dispositivo atual não é poderoso o suficiente para verificar sua senha, no entanto, nós podemos regenerar numa maneira que funciona em todos os dispositivos.\n\nEntre usando a chave de recuperação e regenere sua senha (você pode usar a mesma novamente se desejar)."),
         "recreatePasswordTitle":
@@ -1489,7 +1528,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "1. Envie este código aos seus amigos"),
         "referralStep2": MessageLookupByLibrary.simpleMessage(
             "2. Eles então se inscrevem num plano pago"),
-        "referralStep3": m60,
+        "referralStep3": m65,
         "referrals": MessageLookupByLibrary.simpleMessage("Referências"),
         "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage(
             "As referências estão atualmente pausadas"),
@@ -1518,7 +1557,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "removeLink": MessageLookupByLibrary.simpleMessage("Remover link"),
         "removeParticipant":
             MessageLookupByLibrary.simpleMessage("Remover participante"),
-        "removeParticipantBody": m61,
+        "removeParticipantBody": m66,
         "removePersonLabel":
             MessageLookupByLibrary.simpleMessage("Remover etiqueta da pessoa"),
         "removePublicLink":
@@ -1538,7 +1577,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "renameFile": MessageLookupByLibrary.simpleMessage("Renomear arquivo"),
         "renewSubscription":
             MessageLookupByLibrary.simpleMessage("Renovar assinatura"),
-        "renewsOn": m62,
+        "renewsOn": m67,
         "reportABug": MessageLookupByLibrary.simpleMessage("Informar um erro"),
         "reportBug": MessageLookupByLibrary.simpleMessage("Informar erro"),
         "resendEmail": MessageLookupByLibrary.simpleMessage("Reenviar e-mail"),
@@ -1571,6 +1610,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "safelyStored":
             MessageLookupByLibrary.simpleMessage("Armazenado com segurança"),
         "save": MessageLookupByLibrary.simpleMessage("Salvar"),
+        "saveChangesBeforeLeavingQuestion":
+            MessageLookupByLibrary.simpleMessage(
+                "Salvar mudanças antes de sair?"),
         "saveCollage": MessageLookupByLibrary.simpleMessage("Salvar colagem"),
         "saveCopy": MessageLookupByLibrary.simpleMessage("Salvar cópia"),
         "saveKey": MessageLookupByLibrary.simpleMessage("Salvar chave"),
@@ -1617,8 +1659,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Convide pessoas e você verá todas as fotos compartilhadas por elas aqui"),
         "searchPersonsEmptySection": MessageLookupByLibrary.simpleMessage(
             "As pessoas serão exibidas aqui quando o processamento e sincronização for concluído"),
-        "searchResultCount": m63,
-        "searchSectionsLengthMismatch": m64,
+        "searchResultCount": m68,
+        "searchSectionsLengthMismatch": m69,
         "security": MessageLookupByLibrary.simpleMessage("Segurança"),
         "seePublicAlbumLinksInApp": MessageLookupByLibrary.simpleMessage(
             "Ver links de álbum compartilhado no aplicativo"),
@@ -1641,7 +1683,11 @@ class MessageLookup extends MessageLookupByLibrary {
             "Selecionar aplicativo de e-mail"),
         "selectMorePhotos":
             MessageLookupByLibrary.simpleMessage("Selecionar mais fotos"),
+        "selectPersonToLink": MessageLookupByLibrary.simpleMessage(
+            "Selecione a pessoa para vincular"),
         "selectReason": MessageLookupByLibrary.simpleMessage("Diga o motivo"),
+        "selectYourFace":
+            MessageLookupByLibrary.simpleMessage("Selecione seu rosto"),
         "selectYourPlan":
             MessageLookupByLibrary.simpleMessage("Selecione seu plano"),
         "selectedFilesAreNotOnEnte": MessageLookupByLibrary.simpleMessage(
@@ -1653,7 +1699,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Os itens selecionados serão excluídos de todos os álbuns e movidos para a lixeira."),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "send": MessageLookupByLibrary.simpleMessage("Enviar"),
         "sendEmail": MessageLookupByLibrary.simpleMessage("Enviar e-mail"),
         "sendInvite": MessageLookupByLibrary.simpleMessage("Enviar convite"),
@@ -1683,16 +1729,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "shareAnAlbumNow":
             MessageLookupByLibrary.simpleMessage("Compartilhar um álbum agora"),
         "shareLink": MessageLookupByLibrary.simpleMessage("Compartilhar link"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage(
             "Compartilhar apenas com as pessoas que você quiser"),
         "shareTextConfirmOthersVerificationID": m7,
         "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage(
             "Baixe o Ente para que nós possamos compartilhar com facilidade fotos e vídeos de qualidade original\n\nhttps://ente.io"),
-        "shareTextReferralCode": m67,
+        "shareTextReferralCode": m72,
         "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage(
             "Compartilhar com usuários não ente"),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "shareYourFirstAlbum": MessageLookupByLibrary.simpleMessage(
             "Compartilhar seu primeiro álbum"),
         "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
@@ -1705,7 +1751,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Novas fotos compartilhadas"),
         "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage(
             "Receber notificações quando alguém adicionar uma foto a um álbum compartilhado que você faz parte"),
-        "sharedWith": m69,
+        "sharedWith": m74,
         "sharedWithMe":
             MessageLookupByLibrary.simpleMessage("Compartilhado comigo"),
         "sharedWithYou":
@@ -1722,11 +1768,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Sair em outros dispositivos"),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "Eu concordo com os <u-terms>termos de serviço</u-terms> e a <u-policy>política de privacidade</u-policy>"),
-        "singleFileDeleteFromDevice": m70,
+        "singleFileDeleteFromDevice": m75,
         "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage(
             "Ele será excluído de todos os álbuns."),
-        "singleFileInBothLocalAndRemote": m71,
-        "singleFileInRemoteOnly": m72,
+        "singleFileInBothLocalAndRemote": m76,
+        "singleFileInRemoteOnly": m77,
         "skip": MessageLookupByLibrary.simpleMessage("Pular"),
         "social": MessageLookupByLibrary.simpleMessage("Redes sociais"),
         "someItemsAreInBothEnteAndYourDevice":
@@ -1777,10 +1823,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageInGB": m1,
         "storageLimitExceeded": MessageLookupByLibrary.simpleMessage(
             "Limite de armazenamento excedido"),
-        "storageUsageInfo": m73,
+        "storageUsageInfo": m78,
+        "streamDetails":
+            MessageLookupByLibrary.simpleMessage("Detalhes da transmissão"),
         "strongStrength": MessageLookupByLibrary.simpleMessage("Forte"),
-        "subAlreadyLinkedErrMessage": m74,
-        "subWillBeCancelledOn": m75,
+        "subAlreadyLinkedErrMessage": m79,
+        "subWillBeCancelledOn": m80,
         "subscribe": MessageLookupByLibrary.simpleMessage("Inscrever-se"),
         "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage(
             "Você precisa de uma inscrição paga ativa para ativar o compartilhamento."),
@@ -1797,7 +1845,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "suggestFeatures":
             MessageLookupByLibrary.simpleMessage("Sugerir recurso"),
         "support": MessageLookupByLibrary.simpleMessage("Suporte"),
-        "syncProgress": m76,
+        "syncProgress": m81,
         "syncStopped":
             MessageLookupByLibrary.simpleMessage("Sincronização interrompida"),
         "syncing": MessageLookupByLibrary.simpleMessage("Sincronizando..."),
@@ -1809,7 +1857,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Toque para desbloquear"),
         "tapToUpload":
             MessageLookupByLibrary.simpleMessage("Toque para enviar"),
-        "tapToUploadIsIgnoredDue": m77,
+        "tapToUploadIsIgnoredDue": m82,
         "tempErrorContactSupportIfPersists": MessageLookupByLibrary.simpleMessage(
             "Parece que algo deu errado. Tente novamente mais tarde. Caso o erro persistir, por favor, entre em contato com nossa equipe."),
         "terminate": MessageLookupByLibrary.simpleMessage("Encerrar"),
@@ -1847,7 +1895,9 @@ class MessageLookup extends MessageLookupByLibrary {
             "Este e-mail já está sendo usado"),
         "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage(
             "Esta imagem não possui dados EXIF"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsMeExclamation":
+            MessageLookupByLibrary.simpleMessage("Este é você!"),
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage(
             "Este é o seu ID de verificação"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -1871,11 +1921,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "total": MessageLookupByLibrary.simpleMessage("total"),
         "totalSize": MessageLookupByLibrary.simpleMessage("Tamanho total"),
         "trash": MessageLookupByLibrary.simpleMessage("Lixeira"),
-        "trashDaysLeft": m79,
+        "trashDaysLeft": m84,
         "trim": MessageLookupByLibrary.simpleMessage("Recortar"),
         "trustedContacts":
             MessageLookupByLibrary.simpleMessage("Contatos confiáveis"),
-        "trustedInviteBody": m80,
+        "trustedInviteBody": m85,
         "tryAgain": MessageLookupByLibrary.simpleMessage("Tente novamente"),
         "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage(
             "Ative a cópia de segurança para automaticamente enviar arquivos adicionados à pasta do dispositivo para o Ente."),
@@ -1894,7 +1944,7 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Autenticação de dois fatores redefinida com sucesso"),
         "twofactorSetup": MessageLookupByLibrary.simpleMessage(
             "Configuração de dois fatores"),
-        "typeOfGallerGallerytypeIsNotSupportedForRename": m81,
+        "typeOfGallerGallerytypeIsNotSupportedForRename": m86,
         "unarchive": MessageLookupByLibrary.simpleMessage("Desarquivar"),
         "unarchiveAlbum":
             MessageLookupByLibrary.simpleMessage("Desarquivar álbum"),
@@ -1917,10 +1967,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "updatingFolderSelection": MessageLookupByLibrary.simpleMessage(
             "Atualizando seleção de pasta..."),
         "upgrade": MessageLookupByLibrary.simpleMessage("Atualizar"),
-        "uploadIsIgnoredDueToIgnorereason": m82,
+        "uploadIsIgnoredDueToIgnorereason": m87,
         "uploadingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
             "Enviando arquivos para o álbum..."),
-        "uploadingMultipleMemories": m83,
+        "uploadingMultipleMemories": m88,
         "uploadingSingleMemory":
             MessageLookupByLibrary.simpleMessage("Preservando 1 memória..."),
         "upto50OffUntil4thDec": MessageLookupByLibrary.simpleMessage(
@@ -1938,7 +1988,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "useSelectedPhoto":
             MessageLookupByLibrary.simpleMessage("Usar foto selecionada"),
         "usedSpace": MessageLookupByLibrary.simpleMessage("Espaço usado"),
-        "validTill": m84,
+        "validTill": m89,
         "verificationFailedPleaseTryAgain":
             MessageLookupByLibrary.simpleMessage(
                 "Falha na verificação. Tente novamente"),
@@ -1946,7 +1996,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("ID de verificação"),
         "verify": MessageLookupByLibrary.simpleMessage("Verificar"),
         "verifyEmail": MessageLookupByLibrary.simpleMessage("Verificar e-mail"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Verificar"),
         "verifyPasskey":
             MessageLookupByLibrary.simpleMessage("Verificar chave de acesso"),
@@ -1958,6 +2008,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "videoInfo":
             MessageLookupByLibrary.simpleMessage("Informações do vídeo"),
         "videoSmallCase": MessageLookupByLibrary.simpleMessage("vídeo"),
+        "videoStreaming":
+            MessageLookupByLibrary.simpleMessage("Transmissão de vídeo"),
         "videos": MessageLookupByLibrary.simpleMessage("Vídeos"),
         "viewActiveSessions":
             MessageLookupByLibrary.simpleMessage("Ver sessões ativas"),
@@ -1974,7 +2026,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "viewRecoveryKey":
             MessageLookupByLibrary.simpleMessage("Ver chave de recuperação"),
         "viewer": MessageLookupByLibrary.simpleMessage("Visualizador"),
-        "viewersSuccessfullyAdded": m86,
+        "viewersSuccessfullyAdded": m91,
         "visitWebToManage": MessageLookupByLibrary.simpleMessage(
             "Visite o web.ente.io para gerenciar sua assinatura"),
         "waitingForVerification":
@@ -1996,7 +2048,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Um contato confiável pode ajudá-lo em recuperar seus dados."),
         "yearShort": MessageLookupByLibrary.simpleMessage("ano"),
         "yearly": MessageLookupByLibrary.simpleMessage("Anual"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("Sim"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("Sim"),
         "yesConvertToViewer": MessageLookupByLibrary.simpleMessage(
@@ -2029,7 +2081,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Você não pode compartilhar consigo mesmo"),
         "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage(
             "Você não tem nenhum item arquivado."),
-        "youHaveSuccessfullyFreedUp": m88,
+        "youHaveSuccessfullyFreedUp": m93,
         "yourAccountHasBeenDeleted":
             MessageLookupByLibrary.simpleMessage("Sua conta foi excluída"),
         "yourMap": MessageLookupByLibrary.simpleMessage("Seu mapa"),
diff --git a/mobile/lib/generated/intl/messages_ro.dart b/mobile/lib/generated/intl/messages_ro.dart
index 8b0e700e7f..9cac867247 100644
--- a/mobile/lib/generated/intl/messages_ro.dart
+++ b/mobile/lib/generated/intl/messages_ro.dart
@@ -20,37 +20,37 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'ro';
 
-  static String m9(count) =>
+  static String m10(count) =>
       "${Intl.plural(count, one: 'Adăugați un colaborator', few: 'Adăugați colaboratori', other: 'Adăugați colaboratori')}";
 
-  static String m10(count) =>
+  static String m11(count) =>
       "${Intl.plural(count, one: 'Adăugați articolul', few: 'Adăugați articolele', other: 'Adăugați articolele')}";
 
-  static String m11(storageAmount, endDate) =>
+  static String m12(storageAmount, endDate) =>
       "Suplimentul de ${storageAmount} este valabil până pe ${endDate}";
 
-  static String m12(count) =>
+  static String m13(count) =>
       "${Intl.plural(count, one: 'Adăugați observator', few: 'Adăugați observatori', other: 'Adăugați observatori')}";
 
-  static String m13(emailOrName) => "Adăugat de ${emailOrName}";
+  static String m14(emailOrName) => "Adăugat de ${emailOrName}";
 
-  static String m14(albumName) => "S-au adăugat cu succes la ${albumName}";
+  static String m15(albumName) => "S-au adăugat cu succes la ${albumName}";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: 'Fără participanți', one: '1 participant', other: '${count} de participanți')}";
 
-  static String m16(versionValue) => "Versiune: ${versionValue}";
+  static String m17(versionValue) => "Versiune: ${versionValue}";
 
-  static String m17(freeAmount, storageUnit) =>
+  static String m18(freeAmount, storageUnit) =>
       "${freeAmount} ${storageUnit} liber";
 
-  static String m18(paymentProvider) =>
+  static String m19(paymentProvider) =>
       "Vă rugăm să vă anulați mai întâi abonamentul existent de la ${paymentProvider}";
 
   static String m3(user) =>
       "${user} nu va putea să mai adauge fotografii la acest album\n\nVa putea să elimine fotografii existente adăugate de el/ea";
 
-  static String m19(isFamilyMember, storageAmountInGb) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
       "${Intl.select(isFamilyMember, {
             'true':
                 'Familia dvs. a revendicat ${storageAmountInGb} GB până acum',
@@ -58,214 +58,214 @@ class MessageLookup extends MessageLookupByLibrary {
             'other': 'Ați revendicat ${storageAmountInGb} de GB până acum!',
           })}";
 
-  static String m20(albumName) => "Link colaborativ creat pentru ${albumName}";
+  static String m21(albumName) => "Link colaborativ creat pentru ${albumName}";
 
-  static String m21(count) =>
+  static String m22(count) =>
       "${Intl.plural(count, zero: 'S-au adăugat 0 colaboratori', one: 'S-a adăugat 1 colaborator', few: 'S-au adăugat ${count} colaboratori', other: 'S-au adăugat ${count} de colaboratori')}";
 
-  static String m22(email, numOfDays) =>
+  static String m23(email, numOfDays) =>
       "Sunteți pe cale să adăugați ${email} ca persoană de contact de încredere. Acesta va putea să vă recupereze contul dacă lipsiți timp de ${numOfDays} de zile.";
 
-  static String m23(familyAdminEmail) =>
+  static String m24(familyAdminEmail) =>
       "Vă rugăm să contactați <green>${familyAdminEmail}</green> pentru a gestiona abonamentul";
 
-  static String m24(provider) =>
+  static String m25(provider) =>
       "Vă rugăm să ne contactați la support@ente.io pentru a vă gestiona abonamentul ${provider}.";
 
-  static String m25(endpoint) => "Conectat la ${endpoint}";
+  static String m26(endpoint) => "Conectat la ${endpoint}";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: 'Ștergeți ${count} articol', other: 'Ștergeți ${count} de articole')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "Se șterg ${currentlyDeleting} / ${totalCount}";
 
-  static String m28(albumName) =>
+  static String m29(albumName) =>
       "Urmează să eliminați linkul public pentru accesarea „${albumName}”.";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "Vă rugăm să trimiteți un e-mail la ${supportEmail} de pe adresa de e-mail înregistrată";
 
-  static String m30(count, storageSaved) =>
+  static String m31(count, storageSaved) =>
       "Ați curățat ${Intl.plural(count, one: '${count} dublură', few: '${count} dubluri', other: '${count} de dubluri')}, economisind (${storageSaved}!)";
 
-  static String m31(count, formattedSize) =>
+  static String m32(count, formattedSize) =>
       "${count} fișiere, ${formattedSize} fiecare";
 
-  static String m32(newEmail) => "E-mail modificat în ${newEmail}";
+  static String m33(newEmail) => "E-mail modificat în ${newEmail}";
 
-  static String m33(email) =>
+  static String m35(email) =>
       "${email} nu are un cont Ente.\n\nTrimiteți-le o invitație pentru a distribui fotografii.";
 
-  static String m34(text) => "S-au găsit fotografii extra pentru ${text}";
+  static String m36(text) => "S-au găsit fotografii extra pentru ${text}";
 
-  static String m35(count, formattedNumber) =>
+  static String m37(count, formattedNumber) =>
       "${Intl.plural(count, one: 'Un fișier de pe acest dispozitiv a fost deja salvat în siguranță', few: '${formattedNumber} fișiere de pe acest dispozitiv au fost deja salvate în siguranță', other: '${formattedNumber} de fișiere de pe acest dispozitiv fost deja salvate în siguranță')}";
 
-  static String m36(count, formattedNumber) =>
+  static String m38(count, formattedNumber) =>
       "${Intl.plural(count, one: 'Un fișier din acest album a fost deja salvat în siguranță', few: '${formattedNumber} fișiere din acest album au fost deja salvate în siguranță', other: '${formattedNumber} de fișiere din acest album au fost deja salvate în siguranță')}";
 
   static String m4(storageAmountInGB) =>
       "${storageAmountInGB} GB de fiecare dată când cineva se înscrie pentru un plan plătit și aplică codul dvs.";
 
-  static String m37(endDate) =>
+  static String m39(endDate) =>
       "Perioadă de încercare valabilă până pe ${endDate}";
 
-  static String m38(count) =>
+  static String m40(count) =>
       "Încă ${Intl.plural(count, one: 'îl puteți', few: 'le puteți', other: 'le puteți')} accesa pe Ente cât timp aveți un abonament activ";
 
-  static String m39(sizeInMBorGB) => "Eliberați ${sizeInMBorGB}";
+  static String m41(sizeInMBorGB) => "Eliberați ${sizeInMBorGB}";
 
-  static String m40(count, formattedSize) =>
+  static String m42(count, formattedSize) =>
       "${Intl.plural(count, one: 'Poate fi șters de pe dispozitiv pentru a elibera ${formattedSize}', few: 'Pot fi șterse de pe dispozitiv pentru a elibera ${formattedSize}', other: 'Pot fi șterse de pe dispozitiv pentru a elibera ${formattedSize}')}";
 
-  static String m41(currentlyProcessing, totalCount) =>
+  static String m43(currentlyProcessing, totalCount) =>
       "Se procesează ${currentlyProcessing} / ${totalCount}";
 
-  static String m42(count) =>
+  static String m44(count) =>
       "${Intl.plural(count, one: '${count} articol', few: '${count} articole', other: '${count} de articole')}";
 
-  static String m43(email) =>
+  static String m45(email) =>
       "${email} v-a invitat să fiți un contact de încredere";
 
-  static String m44(expiryTime) => "Linkul va expira pe ${expiryTime}";
+  static String m46(expiryTime) => "Linkul va expira pe ${expiryTime}";
 
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, one: '${formattedCount} amintire', few: '${formattedCount} amintiri', other: '${formattedCount} de amintiri')}";
 
-  static String m45(count) =>
+  static String m49(count) =>
       "${Intl.plural(count, one: 'Mutați articolul', few: 'Mutați articole', other: 'Mutați articolele')}";
 
-  static String m46(albumName) => "S-au mutat cu succes în ${albumName}";
+  static String m50(albumName) => "S-au mutat cu succes în ${albumName}";
 
-  static String m47(personName) => "Nicio sugestie pentru ${personName}";
+  static String m51(personName) => "Nicio sugestie pentru ${personName}";
 
-  static String m48(name) => "Nu este ${name}?";
+  static String m52(name) => "Nu este ${name}?";
 
-  static String m49(familyAdminEmail) =>
+  static String m53(familyAdminEmail) =>
       "Vă rugăm să contactați ${familyAdminEmail} pentru a vă schimba codul.";
 
   static String m0(passwordStrengthValue) =>
       "Complexitatea parolei: ${passwordStrengthValue}";
 
-  static String m50(providerName) =>
+  static String m54(providerName) =>
       "Vă rugăm să vorbiți cu asistența ${providerName} dacă ați fost taxat";
 
-  static String m51(count) =>
+  static String m55(count) =>
       "${Intl.plural(count, zero: '0 fotografii', one: '1 fotografie', few: '${count} fotografii', other: '${count} de fotografii')}";
 
-  static String m52(endDate) =>
+  static String m56(endDate) =>
       "Perioada de încercare gratuită valabilă până pe ${endDate}.\nUlterior, puteți opta pentru un plan plătit.";
 
-  static String m53(toEmail) =>
+  static String m57(toEmail) =>
       "Vă rugăm să ne trimiteți un e-mail la ${toEmail}";
 
-  static String m54(toEmail) =>
+  static String m58(toEmail) =>
       "Vă rugăm să trimiteți jurnalele la \n${toEmail}";
 
-  static String m55(folderName) => "Se procesează ${folderName}...";
+  static String m59(folderName) => "Se procesează ${folderName}...";
 
-  static String m56(storeName) => "Evaluați-ne pe ${storeName}";
+  static String m60(storeName) => "Evaluați-ne pe ${storeName}";
 
-  static String m57(days, email) =>
+  static String m62(days, email) =>
       "Puteți accesa contul după ${days} zile. O notificare va fi trimisă la ${email}.";
 
-  static String m58(email) =>
+  static String m63(email) =>
       "Acum puteți recupera contul ${email} setând o nouă parolă.";
 
-  static String m59(email) => "${email} încearcă să vă recupereze contul.";
+  static String m64(email) => "${email} încearcă să vă recupereze contul.";
 
-  static String m60(storageInGB) =>
+  static String m65(storageInGB) =>
       "3. Amândoi primiți ${storageInGB} GB* gratuit";
 
-  static String m61(userEmail) =>
+  static String m66(userEmail) =>
       "${userEmail} va fi eliminat din acest album distribuit\n\nOrice fotografii adăugate de acesta vor fi, de asemenea, eliminate din album";
 
-  static String m62(endDate) => "Abonamentul se reînnoiește pe ${endDate}";
+  static String m67(endDate) => "Abonamentul se reînnoiește pe ${endDate}";
 
-  static String m63(count) =>
+  static String m68(count) =>
       "${Intl.plural(count, one: '${count} rezultat găsit', few: '${count} rezultate găsite', other: '${count} de rezultate găsite')}";
 
-  static String m64(snapshotLength, searchLength) =>
+  static String m69(snapshotLength, searchLength) =>
       "Lungimea secțiunilor nu se potrivesc: ${snapshotLength} != ${searchLength}";
 
   static String m6(count) => "${count} selectate";
 
-  static String m65(count, yourCount) =>
+  static String m70(count, yourCount) =>
       "${count} selectate (${yourCount} ale dvs.)";
 
-  static String m66(verificationID) =>
+  static String m71(verificationID) =>
       "Acesta este ID-ul meu de verificare: ${verificationID} pentru ente.io.";
 
   static String m7(verificationID) =>
       "Poți confirma că acesta este ID-ul tău de verificare ente.io: ${verificationID}";
 
-  static String m67(referralCode, referralStorageInGB) =>
+  static String m72(referralCode, referralStorageInGB) =>
       "Codul de recomandare Ente: ${referralCode}\n\nAplică-l în Setări → General → Recomandări pentru a obține ${referralStorageInGB} GB gratuit după ce te înscrii pentru un plan plătit\n\nhttps://ente.io";
 
-  static String m68(numberOfPeople) =>
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: 'Distribuiți cu anumite persoane', one: 'Distribuit cu o persoană', other: 'Distribuit cu ${numberOfPeople} de persoane')}";
 
-  static String m69(emailIDs) => "Distribuit cu ${emailIDs}";
+  static String m74(emailIDs) => "Distribuit cu ${emailIDs}";
 
-  static String m70(fileType) =>
+  static String m75(fileType) =>
       "Fișierul de tip ${fileType} va fi șters din dispozitivul dvs.";
 
-  static String m71(fileType) =>
+  static String m76(fileType) =>
       "Fișierul de tip ${fileType} este atât în Ente, cât și în dispozitivul dvs.";
 
-  static String m72(fileType) =>
+  static String m77(fileType) =>
       "Fișierul de tip ${fileType} va fi șters din Ente.";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} GB";
 
-  static String m73(
+  static String m78(
           usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) =>
       "${usedAmount} ${usedStorageUnit} din ${totalAmount} ${totalStorageUnit} utilizat";
 
-  static String m74(id) =>
+  static String m79(id) =>
       "${id} este deja legat la un alt cont Ente.\nDacă doriți să folosiți ${id} cu acest cont, vă rugăm să contactați asistența noastră";
 
-  static String m75(endDate) => "Abonamentul dvs. va fi anulat pe ${endDate}";
+  static String m80(endDate) => "Abonamentul dvs. va fi anulat pe ${endDate}";
 
-  static String m76(completed, total) =>
+  static String m81(completed, total) =>
       "${completed}/${total} amintiri salvate";
 
-  static String m77(ignoreReason) =>
+  static String m82(ignoreReason) =>
       "Atingeți pentru a încărca, încărcarea este ignorată în prezent datorită ${ignoreReason}";
 
   static String m8(storageAmountInGB) =>
       "De asemenea, va primii ${storageAmountInGB} GB";
 
-  static String m78(email) => "Acesta este ID-ul de verificare al ${email}";
+  static String m83(email) => "Acesta este ID-ul de verificare al ${email}";
 
-  static String m79(count) =>
+  static String m84(count) =>
       "${Intl.plural(count, zero: 'Curând', one: 'O zi', other: '${count} de zile')}";
 
-  static String m80(email) =>
+  static String m85(email) =>
       "Ați fost învitat să fiți un contact de moștenire de către ${email}.";
 
-  static String m81(galleryType) =>
+  static String m86(galleryType) =>
       "Tipul de galerie ${galleryType} nu este acceptat pentru redenumire";
 
-  static String m82(ignoreReason) =>
+  static String m87(ignoreReason) =>
       "Încărcare ignorată din motivul ${ignoreReason}";
 
-  static String m83(count) => "Se salvează ${count} amintiri...";
+  static String m88(count) => "Se salvează ${count} amintiri...";
 
-  static String m84(endDate) => "Valabil până pe ${endDate}";
+  static String m89(endDate) => "Valabil până pe ${endDate}";
 
-  static String m85(email) => "Verificare ${email}";
+  static String m90(email) => "Verificare ${email}";
 
-  static String m86(count) =>
+  static String m91(count) =>
       "${Intl.plural(count, zero: 'S-au adăugat 0 observatori', one: 'S-a adăugat 1 observator', few: 'S-au adăugat ${count} observatori', other: 'S-au adăugat ${count} de observatori')}";
 
   static String m2(email) => "Am trimis un e-mail la <green>${email}</green>";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, one: 'acum ${count} an', few: 'acum ${count} ani', other: 'acum ${count} de ani')}";
 
-  static String m88(storageSaved) => "Ați eliberat cu succes ${storageSaved}!";
+  static String m93(storageSaved) => "Ați eliberat cu succes ${storageSaved}!";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
@@ -289,11 +289,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Adăugați un e-mail nou"),
         "addCollaborator":
             MessageLookupByLibrary.simpleMessage("Adăugare colaborator"),
-        "addCollaborators": m9,
+        "addCollaborators": m10,
         "addFiles": MessageLookupByLibrary.simpleMessage("Adăugați fișiere"),
         "addFromDevice":
             MessageLookupByLibrary.simpleMessage("Adăugați de pe dispozitiv"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocation": MessageLookupByLibrary.simpleMessage("Adăugare locație"),
         "addLocationButton": MessageLookupByLibrary.simpleMessage("Adăugare"),
         "addMore": MessageLookupByLibrary.simpleMessage("Adăugați mai mulți"),
@@ -305,7 +305,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Adăugare persoană nouă"),
         "addOnPageSubtitle":
             MessageLookupByLibrary.simpleMessage("Detaliile suplimentelor"),
-        "addOnValidTill": m11,
+        "addOnValidTill": m12,
         "addOns": MessageLookupByLibrary.simpleMessage("Suplimente"),
         "addPhotos":
             MessageLookupByLibrary.simpleMessage("Adăugați fotografii"),
@@ -319,12 +319,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Adăugare contact de încredere"),
         "addViewer":
             MessageLookupByLibrary.simpleMessage("Adăugare observator"),
-        "addViewers": m12,
+        "addViewers": m13,
         "addYourPhotosNow": MessageLookupByLibrary.simpleMessage(
             "Adăugați-vă fotografiile acum"),
         "addedAs": MessageLookupByLibrary.simpleMessage("Adăugat ca"),
-        "addedBy": m13,
-        "addedSuccessfullyTo": m14,
+        "addedBy": m14,
+        "addedSuccessfullyTo": m15,
         "addingToFavorites":
             MessageLookupByLibrary.simpleMessage("Se adaugă la favorite..."),
         "advanced": MessageLookupByLibrary.simpleMessage("Avansat"),
@@ -335,7 +335,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "after1Week": MessageLookupByLibrary.simpleMessage("După o săptămâna"),
         "after1Year": MessageLookupByLibrary.simpleMessage("După un an"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("Proprietar"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumTitle": MessageLookupByLibrary.simpleMessage("Titlu album"),
         "albumUpdated":
             MessageLookupByLibrary.simpleMessage("Album actualizat"),
@@ -384,7 +384,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "appLock": MessageLookupByLibrary.simpleMessage("Blocare aplicație"),
         "appLockDescriptions": MessageLookupByLibrary.simpleMessage(
             "Alegeți între ecranul de blocare implicit al dispozitivului dvs. și un ecran de blocare personalizat cu PIN sau parolă."),
-        "appVersion": m16,
+        "appVersion": m17,
         "appleId": MessageLookupByLibrary.simpleMessage("Apple ID"),
         "apply": MessageLookupByLibrary.simpleMessage("Aplicare"),
         "applyCodeTitle":
@@ -467,7 +467,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoPairDesc": MessageLookupByLibrary.simpleMessage(
             "Asocierea automată funcționează numai cu dispozitive care acceptă Chromecast."),
         "available": MessageLookupByLibrary.simpleMessage("Disponibil"),
-        "availableStorageSpace": m17,
+        "availableStorageSpace": m18,
         "backedUpFolders":
             MessageLookupByLibrary.simpleMessage("Foldere salvate"),
         "backup": MessageLookupByLibrary.simpleMessage("Copie de rezervă"),
@@ -508,7 +508,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Anulare recuperare"),
         "cancelAccountRecoveryBody": MessageLookupByLibrary.simpleMessage(
             "Sunteți sigur că doriți să anulați recuperarea?"),
-        "cancelOtherSubscription": m18,
+        "cancelOtherSubscription": m19,
         "cancelSubscription":
             MessageLookupByLibrary.simpleMessage("Anulare abonament"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
@@ -563,7 +563,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "claimMore":
             MessageLookupByLibrary.simpleMessage("Revendicați mai multe!"),
         "claimed": MessageLookupByLibrary.simpleMessage("Revendicat"),
-        "claimedStorageSoFar": m19,
+        "claimedStorageSoFar": m20,
         "cleanUncategorized":
             MessageLookupByLibrary.simpleMessage("Curățare Necategorisite"),
         "cleanUncategorizedDescription": MessageLookupByLibrary.simpleMessage(
@@ -594,12 +594,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Creați un link pentru a permite oamenilor să adauge și să vizualizeze fotografii în albumul dvs. distribuit, fără a avea nevoie de o aplicație sau un cont Ente. Excelent pentru colectarea fotografiilor de la evenimente."),
         "collaborativeLink":
             MessageLookupByLibrary.simpleMessage("Link colaborativ"),
-        "collaborativeLinkCreatedFor": m20,
+        "collaborativeLinkCreatedFor": m21,
         "collaborator": MessageLookupByLibrary.simpleMessage("Colaborator"),
         "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Colaboratorii pot adăuga fotografii și videoclipuri la albumul distribuit."),
-        "collaboratorsSuccessfullyAdded": m21,
+        "collaboratorsSuccessfullyAdded": m22,
         "collageLayout": MessageLookupByLibrary.simpleMessage("Aspect"),
         "collageSaved":
             MessageLookupByLibrary.simpleMessage("Colaj salvat în galerie"),
@@ -617,7 +617,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Sigur doriți dezactivarea autentificării cu doi factori?"),
         "confirmAccountDeletion": MessageLookupByLibrary.simpleMessage(
             "Confirmați ștergerea contului"),
-        "confirmAddingTrustedContact": m22,
+        "confirmAddingTrustedContact": m23,
         "confirmDeletePrompt": MessageLookupByLibrary.simpleMessage(
             "Da, doresc să șterg definitiv acest cont și toate datele sale din toate aplicațiile."),
         "confirmPassword":
@@ -630,10 +630,10 @@ class MessageLookup extends MessageLookupByLibrary {
             "Confirmați cheia de recuperare"),
         "connectToDevice":
             MessageLookupByLibrary.simpleMessage("Conectați-vă la dispozitiv"),
-        "contactFamilyAdmin": m23,
+        "contactFamilyAdmin": m24,
         "contactSupport": MessageLookupByLibrary.simpleMessage(
             "Contactați serviciul de asistență"),
-        "contactToManageSubscription": m24,
+        "contactToManageSubscription": m25,
         "contacts": MessageLookupByLibrary.simpleMessage("Contacte"),
         "contents": MessageLookupByLibrary.simpleMessage("Conținuturi"),
         "continueLabel": MessageLookupByLibrary.simpleMessage("Continuare"),
@@ -679,7 +679,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "currentlyRunning":
             MessageLookupByLibrary.simpleMessage("rulează în prezent"),
         "custom": MessageLookupByLibrary.simpleMessage("Particularizat"),
-        "customEndpoint": m25,
+        "customEndpoint": m26,
         "darkTheme": MessageLookupByLibrary.simpleMessage("Întunecată"),
         "dayToday": MessageLookupByLibrary.simpleMessage("Astăzi"),
         "dayYesterday": MessageLookupByLibrary.simpleMessage("Ieri"),
@@ -716,12 +716,12 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Ștergeți de pe dispozitiv"),
         "deleteFromEnte":
             MessageLookupByLibrary.simpleMessage("Ștergeți din Ente"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deleteLocation":
             MessageLookupByLibrary.simpleMessage("Ștergeți locația"),
         "deletePhotos":
             MessageLookupByLibrary.simpleMessage("Ștergeți fotografiile"),
-        "deleteProgress": m27,
+        "deleteProgress": m28,
         "deleteReason1": MessageLookupByLibrary.simpleMessage(
             "Lipsește o funcție cheie de care am nevoie"),
         "deleteReason2": MessageLookupByLibrary.simpleMessage(
@@ -729,7 +729,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "deleteReason3": MessageLookupByLibrary.simpleMessage(
             "Am găsit un alt serviciu care îmi place mai mult"),
         "deleteReason4":
-            MessageLookupByLibrary.simpleMessage("Motivul meu nu este listat"),
+            MessageLookupByLibrary.simpleMessage("Motivul meu nu apare"),
         "deleteRequestSLAText": MessageLookupByLibrary.simpleMessage(
             "Solicitarea dvs. va fi procesată în 72 de ore."),
         "deleteSharedAlbum": MessageLookupByLibrary.simpleMessage(
@@ -762,7 +762,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Observatorii pot să facă capturi de ecran sau să salveze o copie a fotografiilor dvs. folosind instrumente externe"),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("Rețineți"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "disableTwofactor": MessageLookupByLibrary.simpleMessage(
             "Dezactivați al doilea factor"),
         "disablingTwofactorAuthentication":
@@ -803,9 +803,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "downloadFailed":
             MessageLookupByLibrary.simpleMessage("Descărcarea nu a reușit"),
         "downloading": MessageLookupByLibrary.simpleMessage("Se descarcă..."),
-        "dropSupportEmail": m29,
-        "duplicateFileCountWithStorageSaved": m30,
-        "duplicateItemsGroup": m31,
+        "dropSupportEmail": m30,
+        "duplicateFileCountWithStorageSaved": m31,
+        "duplicateItemsGroup": m32,
         "edit": MessageLookupByLibrary.simpleMessage("Editare"),
         "editLocation": MessageLookupByLibrary.simpleMessage("Editare locaţie"),
         "editLocationTagTitle":
@@ -819,8 +819,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "email": MessageLookupByLibrary.simpleMessage("E-mail"),
         "emailAlreadyRegistered":
             MessageLookupByLibrary.simpleMessage("E-mail deja înregistrat."),
-        "emailChangedTo": m32,
-        "emailNoEnteAccount": m33,
+        "emailChangedTo": m33,
+        "emailNoEnteAccount": m35,
         "emailNotRegistered": MessageLookupByLibrary.simpleMessage(
             "E-mailul nu este înregistrat."),
         "emailVerificationToggle": MessageLookupByLibrary.simpleMessage(
@@ -907,7 +907,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Export de date"),
         "extraPhotosFound":
             MessageLookupByLibrary.simpleMessage("S-au găsit fotografii extra"),
-        "extraPhotosFoundFor": m34,
+        "extraPhotosFoundFor": m36,
         "faceNotClusteredYet": MessageLookupByLibrary.simpleMessage(
             "Fața nu este încă grupată, vă rugăm să reveniți mai târziu"),
         "faceRecognition":
@@ -958,8 +958,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "fileTypes": MessageLookupByLibrary.simpleMessage("Tipuri de fișiere"),
         "fileTypesAndNames": MessageLookupByLibrary.simpleMessage(
             "Tipuri de fișiere și denumiri"),
-        "filesBackedUpFromDevice": m35,
-        "filesBackedUpInAlbum": m36,
+        "filesBackedUpFromDevice": m37,
+        "filesBackedUpInAlbum": m38,
         "filesDeleted": MessageLookupByLibrary.simpleMessage("Fișiere șterse"),
         "filesSavedToGallery":
             MessageLookupByLibrary.simpleMessage("Fișiere salvate în galerie"),
@@ -979,22 +979,22 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Spațiu gratuit utilizabil"),
         "freeTrial": MessageLookupByLibrary.simpleMessage(
             "Perioadă de încercare gratuită"),
-        "freeTrialValidTill": m37,
-        "freeUpAccessPostDelete": m38,
-        "freeUpAmount": m39,
+        "freeTrialValidTill": m39,
+        "freeUpAccessPostDelete": m40,
+        "freeUpAmount": m41,
         "freeUpDeviceSpace": MessageLookupByLibrary.simpleMessage(
             "Eliberați spațiu pe dispozitiv"),
         "freeUpDeviceSpaceDesc": MessageLookupByLibrary.simpleMessage(
             "Economisiți spațiu pe dispozitivul dvs. prin ștergerea fișierelor cărora li s-a făcut copie de rezervă."),
         "freeUpSpace": MessageLookupByLibrary.simpleMessage("Eliberați spațiu"),
-        "freeUpSpaceSaving": m40,
+        "freeUpSpaceSaving": m42,
         "gallery": MessageLookupByLibrary.simpleMessage("Galerie"),
         "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage(
             "Până la 1000 de amintiri afișate în galerie"),
         "general": MessageLookupByLibrary.simpleMessage("General"),
         "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage(
             "Se generează cheile de criptare..."),
-        "genericProgress": m41,
+        "genericProgress": m43,
         "goToSettings":
             MessageLookupByLibrary.simpleMessage("Mergeți la setări"),
         "googlePlayId": MessageLookupByLibrary.simpleMessage("ID Google Play"),
@@ -1078,7 +1078,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "itLooksLikeSomethingWentWrongPleaseRetryAfterSome":
             MessageLookupByLibrary.simpleMessage(
                 "Se pare că ceva nu a mers bine. Vă rugăm să încercați din nou după ceva timp. Dacă eroarea persistă, vă rugăm să contactați echipa noastră de asistență."),
-        "itemCount": m42,
+        "itemCount": m44,
         "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion":
             MessageLookupByLibrary.simpleMessage(
                 "Articolele afișează numărul de zile rămase până la ștergerea definitivă"),
@@ -1110,7 +1110,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "legacy": MessageLookupByLibrary.simpleMessage("Moștenire"),
         "legacyAccounts":
             MessageLookupByLibrary.simpleMessage("Conturi de moștenire"),
-        "legacyInvite": m43,
+        "legacyInvite": m45,
         "legacyPageDesc": MessageLookupByLibrary.simpleMessage(
             "Moștenirea permite contactelor de încredere să vă acceseze contul în absența dvs."),
         "legacyPageDesc2": MessageLookupByLibrary.simpleMessage(
@@ -1123,7 +1123,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Limită de dispozitive"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("Activat"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("Expirat"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry":
             MessageLookupByLibrary.simpleMessage("Expirarea linkului"),
         "linkHasExpired":
@@ -1251,11 +1251,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "mostRecent": MessageLookupByLibrary.simpleMessage("Cele mai recente"),
         "mostRelevant":
             MessageLookupByLibrary.simpleMessage("Cele mai relevante"),
-        "moveItem": m45,
+        "moveItem": m49,
         "moveToAlbum": MessageLookupByLibrary.simpleMessage("Mutare în album"),
         "moveToHiddenAlbum":
             MessageLookupByLibrary.simpleMessage("Mutați în albumul ascuns"),
-        "movedSuccessfullyTo": m46,
+        "movedSuccessfullyTo": m50,
         "movedToTrash":
             MessageLookupByLibrary.simpleMessage("S-a mutat în coșul de gunoi"),
         "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
@@ -1307,10 +1307,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "noResults": MessageLookupByLibrary.simpleMessage("Niciun rezultat"),
         "noResultsFound":
             MessageLookupByLibrary.simpleMessage("Nu s-au găsit rezultate"),
-        "noSuggestionsForPerson": m47,
+        "noSuggestionsForPerson": m51,
         "noSystemLockFound": MessageLookupByLibrary.simpleMessage(
             "Nu s-a găsit nicio blocare de sistem"),
-        "notPersonLabel": m48,
+        "notPersonLabel": m52,
         "nothingSharedWithYouYet": MessageLookupByLibrary.simpleMessage(
             "Nimic distribuit cu dvs. încă"),
         "nothingToSeeHere":
@@ -1320,7 +1320,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "onDevice": MessageLookupByLibrary.simpleMessage("Pe dispozitiv"),
         "onEnte": MessageLookupByLibrary.simpleMessage(
             "Pe <branding>ente</branding>"),
-        "onlyFamilyAdminCanChangeCode": m49,
+        "onlyFamilyAdminCanChangeCode": m53,
         "onlyThem": MessageLookupByLibrary.simpleMessage("Numai el/ea"),
         "oops": MessageLookupByLibrary.simpleMessage("Ups"),
         "oopsCouldNotSaveEdits": MessageLookupByLibrary.simpleMessage(
@@ -1344,8 +1344,6 @@ class MessageLookup extends MessageLookupByLibrary {
             "Sau îmbinați cu cele existente"),
         "orPickAnExistingOne":
             MessageLookupByLibrary.simpleMessage("Sau alegeți unul existent"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "pair": MessageLookupByLibrary.simpleMessage("Asociere"),
         "pairWithPin": MessageLookupByLibrary.simpleMessage("Asociere cu PIN"),
         "pairingComplete":
@@ -1372,7 +1370,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Plata nu a reușit"),
         "paymentFailedMessage": MessageLookupByLibrary.simpleMessage(
             "Din păcate, plata dvs. nu a reușit. Vă rugăm să contactați asistență și vom fi bucuroși să vă ajutăm!"),
-        "paymentFailedTalkToProvider": m50,
+        "paymentFailedTalkToProvider": m54,
         "pendingItems":
             MessageLookupByLibrary.simpleMessage("Elemente în așteptare"),
         "pendingSync":
@@ -1396,13 +1394,13 @@ class MessageLookup extends MessageLookupByLibrary {
         "photosAddedByYouWillBeRemovedFromTheAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Fotografiile adăugate de dvs. vor fi eliminate din album"),
-        "photosCount": m51,
+        "photosCount": m55,
         "pickCenterPoint":
             MessageLookupByLibrary.simpleMessage("Alegeți punctul central"),
         "pinAlbum": MessageLookupByLibrary.simpleMessage("Fixați albumul"),
         "pinLock": MessageLookupByLibrary.simpleMessage("Blocare PIN"),
         "playOnTv": MessageLookupByLibrary.simpleMessage("Redare album pe TV"),
-        "playStoreFreeTrialValidTill": m52,
+        "playStoreFreeTrialValidTill": m56,
         "playstoreSubscription":
             MessageLookupByLibrary.simpleMessage("Abonament PlayStore"),
         "pleaseCheckYourInternetConnectionAndTryAgain":
@@ -1414,14 +1412,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseContactSupportIfTheProblemPersists":
             MessageLookupByLibrary.simpleMessage(
                 "Vă rugăm să contactați asistența dacă problema persistă"),
-        "pleaseEmailUsAt": m53,
+        "pleaseEmailUsAt": m57,
         "pleaseGrantPermissions": MessageLookupByLibrary.simpleMessage(
             "Vă rugăm să acordați permisiuni"),
         "pleaseLoginAgain": MessageLookupByLibrary.simpleMessage(
             "Vă rugăm, autentificați-vă din nou"),
         "pleaseSelectQuickLinksToRemove": MessageLookupByLibrary.simpleMessage(
             "Vă rugăm să selectați linkurile rapide de eliminat"),
-        "pleaseSendTheLogsTo": m54,
+        "pleaseSendTheLogsTo": m58,
         "pleaseTryAgain": MessageLookupByLibrary.simpleMessage(
             "Vă rugăm să încercați din nou"),
         "pleaseVerifyTheCodeYouHaveEntered":
@@ -1451,7 +1449,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Distribuire privată"),
         "proceed": MessageLookupByLibrary.simpleMessage("Continuați"),
         "processed": MessageLookupByLibrary.simpleMessage("Procesate"),
-        "processingImport": m55,
+        "processingImport": m59,
         "publicLinkCreated":
             MessageLookupByLibrary.simpleMessage("Link public creat"),
         "publicLinkEnabled":
@@ -1463,7 +1461,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "rateTheApp":
             MessageLookupByLibrary.simpleMessage("Evaluați aplicația"),
         "rateUs": MessageLookupByLibrary.simpleMessage("Evaluați-ne"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
         "recover": MessageLookupByLibrary.simpleMessage("Recuperare"),
         "recoverAccount":
             MessageLookupByLibrary.simpleMessage("Recuperare cont"),
@@ -1472,7 +1470,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Recuperare cont"),
         "recoveryInitiated":
             MessageLookupByLibrary.simpleMessage("Recuperare inițiată"),
-        "recoveryInitiatedDesc": m57,
+        "recoveryInitiatedDesc": m62,
         "recoveryKey":
             MessageLookupByLibrary.simpleMessage("Cheie de recuperare"),
         "recoveryKeyCopiedToClipboard": MessageLookupByLibrary.simpleMessage(
@@ -1487,12 +1485,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Cheie de recuperare verificată"),
         "recoveryKeyVerifyReason": MessageLookupByLibrary.simpleMessage(
             "Cheia dvs. de recuperare este singura modalitate de a vă recupera fotografiile dacă uitați parola. Puteți găsi cheia dvs. de recuperare în Setări > Cont.\n\nVă rugăm să introduceți aici cheia de recuperare pentru a verifica dacă ați salvat-o corect."),
-        "recoveryReady": m58,
+        "recoveryReady": m63,
         "recoverySuccessful":
             MessageLookupByLibrary.simpleMessage("Recuperare reușită!"),
         "recoveryWarning": MessageLookupByLibrary.simpleMessage(
             "Un contact de încredere încearcă să vă acceseze contul"),
-        "recoveryWarningBody": m59,
+        "recoveryWarningBody": m64,
         "recreatePasswordBody": MessageLookupByLibrary.simpleMessage(
             "Dispozitivul actual nu este suficient de puternic pentru a vă verifica parola, dar o putem regenera într-un mod care să funcționeze cu toate dispozitivele.\n\nVă rugăm să vă conectați utilizând cheia de recuperare și să vă regenerați parola (dacă doriți, o puteți utiliza din nou pe aceeași)."),
         "recreatePasswordTitle":
@@ -1508,7 +1506,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "1. Dați acest cod prietenilor"),
         "referralStep2": MessageLookupByLibrary.simpleMessage(
             "2. Aceștia se înscriu la un plan cu plată"),
-        "referralStep3": m60,
+        "referralStep3": m65,
         "referrals": MessageLookupByLibrary.simpleMessage("Recomandări"),
         "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage(
             "Recomandările sunt momentan întrerupte"),
@@ -1540,7 +1538,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "removeLink": MessageLookupByLibrary.simpleMessage("Eliminați linkul"),
         "removeParticipant":
             MessageLookupByLibrary.simpleMessage("Eliminați participantul"),
-        "removeParticipantBody": m61,
+        "removeParticipantBody": m66,
         "removePersonLabel": MessageLookupByLibrary.simpleMessage(
             "Eliminați eticheta persoanei"),
         "removePublicLink":
@@ -1561,7 +1559,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Redenumiți fișierul"),
         "renewSubscription":
             MessageLookupByLibrary.simpleMessage("Reînnoire abonament"),
-        "renewsOn": m62,
+        "renewsOn": m67,
         "reportABug":
             MessageLookupByLibrary.simpleMessage("Raportați o eroare"),
         "reportBug": MessageLookupByLibrary.simpleMessage("Raportare eroare"),
@@ -1642,8 +1640,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Invitați persoane și veți vedea aici toate fotografiile distribuite de acestea"),
         "searchPersonsEmptySection": MessageLookupByLibrary.simpleMessage(
             "Persoanele vor fi afișate aici odată ce procesarea și sincronizarea este completă"),
-        "searchResultCount": m63,
-        "searchSectionsLengthMismatch": m64,
+        "searchResultCount": m68,
+        "searchSectionsLengthMismatch": m69,
         "security": MessageLookupByLibrary.simpleMessage("Securitate"),
         "seePublicAlbumLinksInApp": MessageLookupByLibrary.simpleMessage(
             "Vedeți linkurile albumelor publice în aplicație"),
@@ -1679,7 +1677,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Articolele selectate vor fi șterse din toate albumele și mutate în coșul de gunoi."),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "send": MessageLookupByLibrary.simpleMessage("Trimitere"),
         "sendEmail": MessageLookupByLibrary.simpleMessage("Trimiteți e-mail"),
         "sendInvite":
@@ -1712,16 +1710,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "shareAnAlbumNow":
             MessageLookupByLibrary.simpleMessage("Distribuiți un album acum"),
         "shareLink": MessageLookupByLibrary.simpleMessage("Distribuiți linkul"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage(
             "Distribuiți numai cu persoanele pe care le doriți"),
         "shareTextConfirmOthersVerificationID": m7,
         "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage(
             "Descarcă Ente pentru a putea distribui cu ușurință fotografii și videoclipuri în calitate originală\n\nhttps://ente.io"),
-        "shareTextReferralCode": m67,
+        "shareTextReferralCode": m72,
         "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage(
             "Distribuiți cu utilizatori din afara Ente"),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "shareYourFirstAlbum":
             MessageLookupByLibrary.simpleMessage("Distribuiți primul album"),
         "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
@@ -1734,7 +1732,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Fotografii partajate noi"),
         "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage(
             "Primiți notificări atunci când cineva adaugă o fotografie la un album distribuit din care faceți parte"),
-        "sharedWith": m69,
+        "sharedWith": m74,
         "sharedWithMe": MessageLookupByLibrary.simpleMessage("Distribuit mie"),
         "sharedWithYou":
             MessageLookupByLibrary.simpleMessage("Distribuite cu dvs."),
@@ -1750,11 +1748,11 @@ class MessageLookup extends MessageLookupByLibrary {
             "Deconectați alte dispozitive"),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "Sunt de acord cu <u-terms>termenii de prestare ai serviciului</u-terms> și <u-policy>politica de confidențialitate</u-policy>"),
-        "singleFileDeleteFromDevice": m70,
+        "singleFileDeleteFromDevice": m75,
         "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage(
             "Acesta va fi șters din toate albumele."),
-        "singleFileInBothLocalAndRemote": m71,
-        "singleFileInRemoteOnly": m72,
+        "singleFileInBothLocalAndRemote": m76,
+        "singleFileInRemoteOnly": m77,
         "skip": MessageLookupByLibrary.simpleMessage("Omiteți"),
         "social": MessageLookupByLibrary.simpleMessage("Rețele socializare"),
         "someItemsAreInBothEnteAndYourDevice":
@@ -1805,10 +1803,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageInGB": m1,
         "storageLimitExceeded":
             MessageLookupByLibrary.simpleMessage("Limita de spațiu depășită"),
-        "storageUsageInfo": m73,
+        "storageUsageInfo": m78,
         "strongStrength": MessageLookupByLibrary.simpleMessage("Puternică"),
-        "subAlreadyLinkedErrMessage": m74,
-        "subWillBeCancelledOn": m75,
+        "subAlreadyLinkedErrMessage": m79,
+        "subWillBeCancelledOn": m80,
         "subscribe": MessageLookupByLibrary.simpleMessage("Abonare"),
         "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage(
             "Aveți nevoie de un abonament plătit activ pentru a activa distribuirea."),
@@ -1825,7 +1823,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "suggestFeatures":
             MessageLookupByLibrary.simpleMessage("Sugerați funcționalități"),
         "support": MessageLookupByLibrary.simpleMessage("Asistență"),
-        "syncProgress": m76,
+        "syncProgress": m81,
         "syncStopped":
             MessageLookupByLibrary.simpleMessage("Sincronizare oprită"),
         "syncing": MessageLookupByLibrary.simpleMessage("Sincronizare..."),
@@ -1838,7 +1836,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Atingeți pentru a debloca"),
         "tapToUpload":
             MessageLookupByLibrary.simpleMessage("Atingeți pentru a încărca"),
-        "tapToUploadIsIgnoredDue": m77,
+        "tapToUploadIsIgnoredDue": m82,
         "tempErrorContactSupportIfPersists": MessageLookupByLibrary.simpleMessage(
             "Se pare că ceva nu a mers bine. Vă rugăm să încercați din nou după ceva timp. Dacă eroarea persistă, vă rugăm să contactați echipa noastră de asistență."),
         "terminate": MessageLookupByLibrary.simpleMessage("Terminare"),
@@ -1877,7 +1875,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Această adresă de e-mail este deja folosită"),
         "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage(
             "Această imagine nu are date exif"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage(
             "Acesta este ID-ul dvs. de verificare"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -1902,11 +1900,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "total": MessageLookupByLibrary.simpleMessage("total"),
         "totalSize": MessageLookupByLibrary.simpleMessage("Dimensiune totală"),
         "trash": MessageLookupByLibrary.simpleMessage("Coș de gunoi"),
-        "trashDaysLeft": m79,
+        "trashDaysLeft": m84,
         "trim": MessageLookupByLibrary.simpleMessage("Decupare"),
         "trustedContacts":
             MessageLookupByLibrary.simpleMessage("Contacte de încredere"),
-        "trustedInviteBody": m80,
+        "trustedInviteBody": m85,
         "tryAgain": MessageLookupByLibrary.simpleMessage("Încercați din nou"),
         "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage(
             "Activați copia de rezervă pentru a încărca automat fișierele adăugate la acest dosar de pe dispozitiv în Ente."),
@@ -1925,7 +1923,7 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Autentificarea cu doi factori a fost resetată cu succes"),
         "twofactorSetup":
             MessageLookupByLibrary.simpleMessage("Configurare doi factori"),
-        "typeOfGallerGallerytypeIsNotSupportedForRename": m81,
+        "typeOfGallerGallerytypeIsNotSupportedForRename": m86,
         "unarchive": MessageLookupByLibrary.simpleMessage("Dezarhivare"),
         "unarchiveAlbum":
             MessageLookupByLibrary.simpleMessage("Dezarhivare album"),
@@ -1951,10 +1949,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "updatingFolderSelection": MessageLookupByLibrary.simpleMessage(
             "Se actualizează selecția dosarelor..."),
         "upgrade": MessageLookupByLibrary.simpleMessage("Îmbunătățire"),
-        "uploadIsIgnoredDueToIgnorereason": m82,
+        "uploadIsIgnoredDueToIgnorereason": m87,
         "uploadingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
             "Se încarcă fișiere în album..."),
-        "uploadingMultipleMemories": m83,
+        "uploadingMultipleMemories": m88,
         "uploadingSingleMemory":
             MessageLookupByLibrary.simpleMessage("Se salvează o amintire..."),
         "upto50OffUntil4thDec": MessageLookupByLibrary.simpleMessage(
@@ -1972,7 +1970,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "useSelectedPhoto": MessageLookupByLibrary.simpleMessage(
             "Folosiți fotografia selectată"),
         "usedSpace": MessageLookupByLibrary.simpleMessage("Spațiu utilizat"),
-        "validTill": m84,
+        "validTill": m89,
         "verificationFailedPleaseTryAgain":
             MessageLookupByLibrary.simpleMessage(
                 "Verificare eșuată, încercați din nou"),
@@ -1981,7 +1979,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "verify": MessageLookupByLibrary.simpleMessage("Verificare"),
         "verifyEmail":
             MessageLookupByLibrary.simpleMessage("Verificare e-mail"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Verificare"),
         "verifyPasskey":
             MessageLookupByLibrary.simpleMessage("Verificați cheia de acces"),
@@ -2007,7 +2005,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "viewRecoveryKey": MessageLookupByLibrary.simpleMessage(
             "Vizualizați cheia de recuperare"),
         "viewer": MessageLookupByLibrary.simpleMessage("Observator"),
-        "viewersSuccessfullyAdded": m86,
+        "viewersSuccessfullyAdded": m91,
         "visitWebToManage": MessageLookupByLibrary.simpleMessage(
             "Vă rugăm să vizitați web.ente.io pentru a vă gestiona abonamentul"),
         "waitingForVerification":
@@ -2029,7 +2027,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Contactul de încredere vă poate ajuta la recuperarea datelor."),
         "yearShort": MessageLookupByLibrary.simpleMessage("an"),
         "yearly": MessageLookupByLibrary.simpleMessage("Anual"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("Da"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("Da, anulează"),
         "yesConvertToViewer":
@@ -2061,7 +2059,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Nu poți distribui cu tine însuți"),
         "youDontHaveAnyArchivedItems":
             MessageLookupByLibrary.simpleMessage("Nu aveți articole arhivate."),
-        "youHaveSuccessfullyFreedUp": m88,
+        "youHaveSuccessfullyFreedUp": m93,
         "yourAccountHasBeenDeleted":
             MessageLookupByLibrary.simpleMessage("Contul dvs. a fost șters"),
         "yourMap": MessageLookupByLibrary.simpleMessage("Harta dvs."),
diff --git a/mobile/lib/generated/intl/messages_ru.dart b/mobile/lib/generated/intl/messages_ru.dart
index ed0f726786..467a9f780e 100644
--- a/mobile/lib/generated/intl/messages_ru.dart
+++ b/mobile/lib/generated/intl/messages_ru.dart
@@ -20,217 +20,217 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'ru';
 
-  static String m9(count) =>
+  static String m10(count) =>
       "${Intl.plural(count, one: 'Добавьте соавтора', few: 'Добавьте соавторов', many: 'Добавьте соавторов', other: 'Добавьте соавторов')}";
 
-  static String m10(count) =>
+  static String m11(count) =>
       "${Intl.plural(count, one: 'Добавить элемент', other: 'Добавить элементы')}";
 
-  static String m11(storageAmount, endDate) =>
+  static String m12(storageAmount, endDate) =>
       "Ваше дополнение ${storageAmount} действительно по ${endDate}";
 
-  static String m12(count) =>
+  static String m13(count) =>
       "${Intl.plural(count, one: 'Добавьте зрителя', few: 'Добавьте зрителей', many: 'Добавьте зрителей', other: 'Добавьте зрителей')}";
 
-  static String m13(emailOrName) => "Добавлено ${emailOrName}";
+  static String m14(emailOrName) => "Добавлено ${emailOrName}";
 
-  static String m14(albumName) => "Успешно добавлено в ${albumName}";
+  static String m15(albumName) => "Успешно добавлено в ${albumName}";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: 'Нет Участников', one: '1 Участник', other: '${count} Участника')}";
 
-  static String m16(versionValue) => "Версия: ${versionValue}";
+  static String m17(versionValue) => "Версия: ${versionValue}";
 
-  static String m17(freeAmount, storageUnit) =>
+  static String m18(freeAmount, storageUnit) =>
       "${freeAmount} ${storageUnit} свободно";
 
-  static String m18(paymentProvider) =>
+  static String m19(paymentProvider) =>
       "Пожалуйста, сначала отмените вашу существующую подписку от ${paymentProvider}";
 
   static String m3(user) =>
       "${user} больше не сможет добавлять фотографии в этот альбом\n\nОни все еще смогут удалять существующие фотографии, добавленные ими";
 
-  static String m19(isFamilyMember, storageAmountInGb) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
       "${Intl.select(isFamilyMember, {
             'true': 'Ваша семья получила ${storageAmountInGb} ГБ',
             'false': 'Вы уже получили ${storageAmountInGb} ГБ',
             'other': 'Вы уже получили ${storageAmountInGb} ГБ!',
           })}";
 
-  static String m20(albumName) => "Совместная ссылка создана для ${albumName}";
+  static String m21(albumName) => "Совместная ссылка создана для ${albumName}";
 
-  static String m21(count) =>
+  static String m22(count) =>
       "${Intl.plural(count, zero: 'Добавлено 0 соавторов', one: 'Добавлен 1 соавтор', other: 'Добавлено ${count} соавторов')}";
 
-  static String m23(familyAdminEmail) =>
+  static String m24(familyAdminEmail) =>
       "Пожалуйста, свяжитесь с <green>${familyAdminEmail}</green> для управления подпиской";
 
-  static String m24(provider) =>
+  static String m25(provider) =>
       "Пожалуйста, свяжитесь с нами по адресу support@ente.io для управления подпиской ${provider}.";
 
-  static String m25(endpoint) => "Подключено к ${endpoint}";
+  static String m26(endpoint) => "Подключено к ${endpoint}";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: 'Удалена ${count} штука', other: 'Удалено ${count} штук')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "Удаление ${currentlyDeleting} / ${totalCount}";
 
-  static String m28(albumName) =>
+  static String m29(albumName) =>
       "Это удалит публичную ссылку для доступа к \"${albumName}\".";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "Пожалуйста, отправьте электронное письмо на адрес ${supportEmail} с вашего зарегистрированного адреса электронной почты";
 
-  static String m30(count, storageSaved) =>
+  static String m31(count, storageSaved) =>
       "Вы привели себя в порядок ${Intl.plural(count, one: '${count} duplicate file', other: '${count} duplicate files')}, экономия (${storageSaved}!)\n";
 
-  static String m31(count, formattedSize) =>
+  static String m32(count, formattedSize) =>
       "${count} файлов, ${formattedSize}";
 
-  static String m32(newEmail) =>
+  static String m33(newEmail) =>
       "Адрес электронной почты изменен на ${newEmail}";
 
-  static String m33(email) =>
+  static String m35(email) =>
       "У ${email} нет учетной записи Ente.\n\nОтправьте им приглашение для обмена фотографиями.";
 
-  static String m34(text) => "Дополнительные фотографии найдены для ${text}";
+  static String m36(text) => "Дополнительные фотографии найдены для ${text}";
 
-  static String m35(count, formattedNumber) =>
+  static String m37(count, formattedNumber) =>
       "${Intl.plural(count, one: 'для 1 файла было создан бекап', other: 'для ${formattedNumber} файлов были созданы бекапы')}";
 
-  static String m36(count, formattedNumber) =>
+  static String m38(count, formattedNumber) =>
       "${Intl.plural(count, one: 'для 1 файла было создан бекап', other: 'для ${formattedNumber} файлов были созданы бекапы')}";
 
   static String m4(storageAmountInGB) =>
       "${storageAmountInGB} Гигабайт каждый раз когда кто-то подписывается на платный план и применяет ваш код";
 
-  static String m37(endDate) =>
+  static String m39(endDate) =>
       "Бесплатная пробная версия действительна до ${endDate}";
 
-  static String m38(count) =>
+  static String m40(count) =>
       "Вы все еще можете получить доступ к ${Intl.plural(count, one: 'ниму', other: 'ним')} на Ente, пока у вас есть активная подписка";
 
-  static String m39(sizeInMBorGB) => "Освободите ${sizeInMBorGB}";
+  static String m41(sizeInMBorGB) => "Освободите ${sizeInMBorGB}";
 
-  static String m40(count, formattedSize) =>
+  static String m42(count, formattedSize) =>
       "${Intl.plural(count, one: 'Это можно удалить с устройства, чтобы освободить ${formattedSize}', other: 'Их можно удалить с устройства, чтобы освободить ${formattedSize}')}";
 
-  static String m41(currentlyProcessing, totalCount) =>
+  static String m43(currentlyProcessing, totalCount) =>
       "Обработка ${currentlyProcessing} / ${totalCount}";
 
-  static String m42(count) =>
+  static String m44(count) =>
       "${Intl.plural(count, one: '${count} штука', other: '${count} штук')}";
 
-  static String m44(expiryTime) => "Ссылка истечёт через ${expiryTime}";
+  static String m46(expiryTime) => "Ссылка истечёт через ${expiryTime}";
 
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, zero: 'нет воспоминаний', one: '${formattedCount} воспоминание', other: '${formattedCount} воспоминаний')}";
 
-  static String m45(count) =>
+  static String m49(count) =>
       "${Intl.plural(count, one: 'Переместить элемент', other: 'Переместить элементы')}";
 
-  static String m46(albumName) => "Успешно перемещено в ${albumName}";
+  static String m50(albumName) => "Успешно перемещено в ${albumName}";
 
-  static String m47(personName) => "Нет предложений для ${personName}";
+  static String m51(personName) => "Нет предложений для ${personName}";
 
-  static String m48(name) => "Не ${name}?";
+  static String m52(name) => "Не ${name}?";
 
   static String m0(passwordStrengthValue) =>
       "Мощность пароля: ${passwordStrengthValue}";
 
-  static String m50(providerName) =>
+  static String m54(providerName) =>
       "Если с вас сняли оплату, обратитесь в службу поддержки ${providerName}";
 
-  static String m51(count) =>
+  static String m55(count) =>
       "${Intl.plural(count, zero: '0 photo', one: '1 photo', other: '${count} photos')}";
 
-  static String m52(endDate) =>
+  static String m56(endDate) =>
       "Бесплатный пробный период до ${endDate}.\nПосле, вы сможете выбрать платный план.";
 
-  static String m53(toEmail) => "Пожалуйста, напишите нам на ${toEmail}";
+  static String m57(toEmail) => "Пожалуйста, напишите нам на ${toEmail}";
 
-  static String m54(toEmail) => "Пожалуйста, отправьте логи на \n${toEmail}";
+  static String m58(toEmail) => "Пожалуйста, отправьте логи на \n${toEmail}";
 
-  static String m55(folderName) => "Обработка ${folderName}...";
+  static String m59(folderName) => "Обработка ${folderName}...";
 
-  static String m56(storeName) => "Оцените нас в ${storeName}";
+  static String m60(storeName) => "Оцените нас в ${storeName}";
 
-  static String m60(storageInGB) =>
+  static String m65(storageInGB) =>
       "3. Вы оба получаете ${storageInGB} Гигабайт* бесплатно";
 
-  static String m61(userEmail) =>
+  static String m66(userEmail) =>
       "${userEmail} будет удален из этого общего альбома\n\nВсе добавленные им фотографии также будут удалены из альбома";
 
-  static String m62(endDate) => "Обновление подписки на ${endDate}";
+  static String m67(endDate) => "Обновление подписки на ${endDate}";
 
-  static String m63(count) =>
+  static String m68(count) =>
       "${Intl.plural(count, one: '${count} результат найден', other: '${count} результатов найдено')}";
 
   static String m6(count) => "${count} выбрано";
 
-  static String m65(count, yourCount) => "${count} выбрано (${yourCount} ваши)";
+  static String m70(count, yourCount) => "${count} выбрано (${yourCount} ваши)";
 
-  static String m66(verificationID) =>
+  static String m71(verificationID) =>
       "Вот мой проверочный ID: ${verificationID} для ente.io.";
 
   static String m7(verificationID) =>
       "Эй, вы можете подтвердить, что это ваш идентификатор подтверждения ente.io: ${verificationID}";
 
-  static String m67(referralCode, referralStorageInGB) =>
+  static String m72(referralCode, referralStorageInGB) =>
       "Реферальный код Ente: ${referralCode} \n\nПримените его в разделе «Настройки» → «Основные» → «Рефералы», чтобы получить ${referralStorageInGB} Гигабайт бесплатно после того как вы подпишетесь на платный план";
 
-  static String m68(numberOfPeople) =>
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: 'Поделится с конкретными людьми', one: 'Поделено с 1 человеком', other: 'Поделено с ${numberOfPeople} людьми')}";
 
-  static String m69(emailIDs) => "Поделиться с ${emailIDs}";
+  static String m74(emailIDs) => "Поделиться с ${emailIDs}";
 
-  static String m70(fileType) =>
+  static String m75(fileType) =>
       "Это ${fileType} будет удалено с вашего устройства.";
 
-  static String m71(fileType) =>
+  static String m76(fileType) =>
       "Этот ${fileType} есть и в Ente, и на вашем устройстве.";
 
-  static String m72(fileType) => "Этот ${fileType} будет удалён из Ente.";
+  static String m77(fileType) => "Этот ${fileType} будет удалён из Ente.";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} Гигабайт";
 
-  static String m73(
+  static String m78(
           usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) =>
       "${usedAmount} ${usedStorageUnit} из ${totalAmount} ${totalStorageUnit} использовано";
 
-  static String m74(id) =>
+  static String m79(id) =>
       "Ваш ${id} уже связан с другой учетной записью Ente.\nЕсли вы хотите использовать ${id} с этой учетной записью, пожалуйста, свяжитесь с нашей службой поддержки";
 
-  static String m75(endDate) => "Ваша подписка будет отменена ${endDate}";
+  static String m80(endDate) => "Ваша подписка будет отменена ${endDate}";
 
-  static String m76(completed, total) => "${completed}/${total} сохранено";
+  static String m81(completed, total) => "${completed}/${total} сохранено";
 
   static String m8(storageAmountInGB) =>
       "Они тоже получат ${storageAmountInGB} Гигабайт";
 
-  static String m78(email) =>
+  static String m83(email) =>
       "Этот идентификатор подтверждения пользователя ${email}";
 
-  static String m81(galleryType) =>
+  static String m86(galleryType) =>
       "Тип галереи ${galleryType} не поддерживается для переименования";
 
-  static String m82(ignoreReason) =>
+  static String m87(ignoreReason) =>
       "Загрузка игнорируется из-за ${ignoreReason}";
 
-  static String m84(endDate) => "Действителен по ${endDate}";
+  static String m89(endDate) => "Действителен по ${endDate}";
 
-  static String m85(email) => "Подтвердить ${email}";
+  static String m90(email) => "Подтвердить ${email}";
 
-  static String m86(count) =>
+  static String m91(count) =>
       "${Intl.plural(count, zero: 'Добавлено 0 зрителей', one: 'Добавлен 1 зритель', other: 'Добавлено ${count} зрителей')}";
 
   static String m2(email) => "Мы отправили письмо на <green>${email}</green>";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, one: '${count} год назад', other: '${count} лет назад')}";
 
-  static String m88(storageSaved) => "Вы успешно освободили ${storageSaved}!";
+  static String m93(storageSaved) => "Вы успешно освободили ${storageSaved}!";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
@@ -254,11 +254,11 @@ class MessageLookup extends MessageLookupByLibrary {
             "Добавить новый адрес эл. почты"),
         "addCollaborator":
             MessageLookupByLibrary.simpleMessage("Добавить соавтора"),
-        "addCollaborators": m9,
+        "addCollaborators": m10,
         "addFiles": MessageLookupByLibrary.simpleMessage("Добавить файлы"),
         "addFromDevice":
             MessageLookupByLibrary.simpleMessage("Добавить с устройства"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocation": MessageLookupByLibrary.simpleMessage("Добавить место"),
         "addLocationButton": MessageLookupByLibrary.simpleMessage("Добавить"),
         "addMore": MessageLookupByLibrary.simpleMessage("Добавить еще"),
@@ -270,7 +270,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Добавить новую персону"),
         "addOnPageSubtitle":
             MessageLookupByLibrary.simpleMessage("Подробнее о расширениях"),
-        "addOnValidTill": m11,
+        "addOnValidTill": m12,
         "addOns": MessageLookupByLibrary.simpleMessage("Расширения"),
         "addPhotos":
             MessageLookupByLibrary.simpleMessage("Добавить фотографии"),
@@ -284,12 +284,12 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Добавить доверенный контакт"),
         "addViewer":
             MessageLookupByLibrary.simpleMessage("Добавить наблюдателя"),
-        "addViewers": m12,
+        "addViewers": m13,
         "addYourPhotosNow":
             MessageLookupByLibrary.simpleMessage("Добавьте ваши фотографии"),
         "addedAs": MessageLookupByLibrary.simpleMessage("Добавлено как"),
-        "addedBy": m13,
-        "addedSuccessfullyTo": m14,
+        "addedBy": m14,
+        "addedSuccessfullyTo": m15,
         "addingToFavorites":
             MessageLookupByLibrary.simpleMessage("Добавление в избранное..."),
         "advanced": MessageLookupByLibrary.simpleMessage("Дополнительно"),
@@ -301,7 +301,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "after1Week": MessageLookupByLibrary.simpleMessage("Через неделю"),
         "after1Year": MessageLookupByLibrary.simpleMessage("Через 1 год"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("Владелец"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumTitle": MessageLookupByLibrary.simpleMessage("Название альбома"),
         "albumUpdated": MessageLookupByLibrary.simpleMessage("Альбом обновлен"),
         "albums": MessageLookupByLibrary.simpleMessage("Альбомы"),
@@ -346,7 +346,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Блокировка приложения"),
         "appLockDescriptions": MessageLookupByLibrary.simpleMessage(
             "Выберите между экраном блокировки вашего устройства и пользовательским экраном блокировки с PIN-кодом или паролем."),
-        "appVersion": m16,
+        "appVersion": m17,
         "appleId": MessageLookupByLibrary.simpleMessage("Apple ID"),
         "apply": MessageLookupByLibrary.simpleMessage("Применить"),
         "applyCodeTitle": MessageLookupByLibrary.simpleMessage("Применить код"),
@@ -425,7 +425,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoPairDesc": MessageLookupByLibrary.simpleMessage(
             "Автоматическое подключение работает только с устройствами, поддерживающими Chromecast."),
         "available": MessageLookupByLibrary.simpleMessage("Доступно"),
-        "availableStorageSpace": m17,
+        "availableStorageSpace": m18,
         "backedUpFolders":
             MessageLookupByLibrary.simpleMessage("Резервное копирование папок"),
         "backup": MessageLookupByLibrary.simpleMessage("Резервное копирование"),
@@ -456,7 +456,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "canOnlyRemoveFilesOwnedByYou": MessageLookupByLibrary.simpleMessage(
             "Можно удалять только файлы, принадлежащие вам"),
         "cancel": MessageLookupByLibrary.simpleMessage("Отменить"),
-        "cancelOtherSubscription": m18,
+        "cancelOtherSubscription": m19,
         "cancelSubscription":
             MessageLookupByLibrary.simpleMessage("Отменить подписку"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
@@ -510,7 +510,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Получить бесплатное хранилище"),
         "claimMore": MessageLookupByLibrary.simpleMessage("Получите больше!"),
         "claimed": MessageLookupByLibrary.simpleMessage("Получено"),
-        "claimedStorageSoFar": m19,
+        "claimedStorageSoFar": m20,
         "cleanUncategorized":
             MessageLookupByLibrary.simpleMessage("Очистить \"Без Категории\""),
         "cleanUncategorizedDescription": MessageLookupByLibrary.simpleMessage(
@@ -538,12 +538,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Создайте ссылку, чтобы позволить людям добавлять и просматривать фотографии в вашем общем альбоме без приложения или учетной записи Ente. Отлично подходит для сбора фотографий событий."),
         "collaborativeLink":
             MessageLookupByLibrary.simpleMessage("Совместная ссылка"),
-        "collaborativeLinkCreatedFor": m20,
+        "collaborativeLinkCreatedFor": m21,
         "collaborator": MessageLookupByLibrary.simpleMessage("Соавтор"),
         "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Соавторы могут добавлять фотографии и видео в общий альбом."),
-        "collaboratorsSuccessfullyAdded": m21,
+        "collaboratorsSuccessfullyAdded": m22,
         "collageLayout": MessageLookupByLibrary.simpleMessage("Разметка"),
         "collageSaved":
             MessageLookupByLibrary.simpleMessage("Коллаж сохранен в галерее"),
@@ -573,10 +573,10 @@ class MessageLookup extends MessageLookupByLibrary {
             "Подтвердите ваш ключ восстановления"),
         "connectToDevice":
             MessageLookupByLibrary.simpleMessage("Подключиться к устройству"),
-        "contactFamilyAdmin": m23,
+        "contactFamilyAdmin": m24,
         "contactSupport":
             MessageLookupByLibrary.simpleMessage("Связаться с поддержкой"),
-        "contactToManageSubscription": m24,
+        "contactToManageSubscription": m25,
         "contacts": MessageLookupByLibrary.simpleMessage("Контакты"),
         "contents": MessageLookupByLibrary.simpleMessage("Содержимое"),
         "continueLabel": MessageLookupByLibrary.simpleMessage("Далее"),
@@ -623,7 +623,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "currentlyRunning":
             MessageLookupByLibrary.simpleMessage("сейчас запущено"),
         "custom": MessageLookupByLibrary.simpleMessage("Свой"),
-        "customEndpoint": m25,
+        "customEndpoint": m26,
         "darkTheme": MessageLookupByLibrary.simpleMessage("Темная тема"),
         "dayToday": MessageLookupByLibrary.simpleMessage("Сегодня"),
         "dayYesterday": MessageLookupByLibrary.simpleMessage("Вчера"),
@@ -661,11 +661,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Удалить с устройства"),
         "deleteFromEnte":
             MessageLookupByLibrary.simpleMessage("Удалить из Ente"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deleteLocation":
             MessageLookupByLibrary.simpleMessage("Удалить местоположение"),
         "deletePhotos": MessageLookupByLibrary.simpleMessage("Удалить фото"),
-        "deleteProgress": m27,
+        "deleteProgress": m28,
         "deleteReason1": MessageLookupByLibrary.simpleMessage(
             "У вас отсутствует важная функция, которая мне нужна"),
         "deleteReason2": MessageLookupByLibrary.simpleMessage(
@@ -704,7 +704,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Наблюдатели все еще могут делать скриншоты или копировать ваши фотографии с помощью других инструментов"),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("Обратите внимание"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "disableTwofactor": MessageLookupByLibrary.simpleMessage(
             "Отключить двухфакторную аутентификацию"),
         "disablingTwofactorAuthentication":
@@ -737,9 +737,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "downloadFailed":
             MessageLookupByLibrary.simpleMessage("Загрузка не удалась"),
         "downloading": MessageLookupByLibrary.simpleMessage("Скачивание..."),
-        "dropSupportEmail": m29,
-        "duplicateFileCountWithStorageSaved": m30,
-        "duplicateItemsGroup": m31,
+        "dropSupportEmail": m30,
+        "duplicateFileCountWithStorageSaved": m31,
+        "duplicateItemsGroup": m32,
         "edit": MessageLookupByLibrary.simpleMessage("Редактировать"),
         "editLocation":
             MessageLookupByLibrary.simpleMessage("Изменить местоположение"),
@@ -754,8 +754,8 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Редактирования в местоположении будут видны только внутри Ente"),
         "eligible": MessageLookupByLibrary.simpleMessage("подходящий"),
         "email": MessageLookupByLibrary.simpleMessage("Электронная почта"),
-        "emailChangedTo": m32,
-        "emailNoEnteAccount": m33,
+        "emailChangedTo": m33,
+        "emailNoEnteAccount": m35,
         "emailVerificationToggle":
             MessageLookupByLibrary.simpleMessage("Вход с кодом на почту"),
         "emailYourLogs": MessageLookupByLibrary.simpleMessage(
@@ -835,7 +835,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Экспорт данных"),
         "extraPhotosFound": MessageLookupByLibrary.simpleMessage(
             "Найдены дополнительные фотографии"),
-        "extraPhotosFoundFor": m34,
+        "extraPhotosFoundFor": m36,
         "faceNotClusteredYet": MessageLookupByLibrary.simpleMessage(
             "Лицо еще не кластеризовано, пожалуйста, вернитесь позже"),
         "faceRecognition":
@@ -885,8 +885,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "fileTypes": MessageLookupByLibrary.simpleMessage("Типы файлов"),
         "fileTypesAndNames":
             MessageLookupByLibrary.simpleMessage("Типы файлов и имена"),
-        "filesBackedUpFromDevice": m35,
-        "filesBackedUpInAlbum": m36,
+        "filesBackedUpFromDevice": m37,
+        "filesBackedUpInAlbum": m38,
         "filesDeleted": MessageLookupByLibrary.simpleMessage("Файлы удалены"),
         "filesSavedToGallery":
             MessageLookupByLibrary.simpleMessage("Файлы сохранены в галерею"),
@@ -904,21 +904,21 @@ class MessageLookup extends MessageLookupByLibrary {
             "Бесплатного хранилища можно использовать"),
         "freeTrial":
             MessageLookupByLibrary.simpleMessage("Бесплатный пробный период"),
-        "freeTrialValidTill": m37,
-        "freeUpAccessPostDelete": m38,
-        "freeUpAmount": m39,
+        "freeTrialValidTill": m39,
+        "freeUpAccessPostDelete": m40,
+        "freeUpAmount": m41,
         "freeUpDeviceSpace": MessageLookupByLibrary.simpleMessage(
             "Освободите место на устройстве"),
         "freeUpDeviceSpaceDesc": MessageLookupByLibrary.simpleMessage(
             "Сохраните место на вашем устройстве, очистив уже сохраненные файлы."),
         "freeUpSpace": MessageLookupByLibrary.simpleMessage("Освободить место"),
-        "freeUpSpaceSaving": m40,
+        "freeUpSpaceSaving": m42,
         "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage(
             "До 1000 воспоминаний, отображаемых в галерее"),
         "general": MessageLookupByLibrary.simpleMessage("Общее"),
         "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage(
             "Генерируем ключи шифрования..."),
-        "genericProgress": m41,
+        "genericProgress": m43,
         "goToSettings":
             MessageLookupByLibrary.simpleMessage("Перейти в настройки"),
         "googlePlayId": MessageLookupByLibrary.simpleMessage("Google Play ID"),
@@ -1001,7 +1001,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "itLooksLikeSomethingWentWrongPleaseRetryAfterSome":
             MessageLookupByLibrary.simpleMessage(
                 "Похоже, что-то пошло не так. Пожалуйста, повторите попытку через некоторое время. Если ошибка повторится, обратитесь в нашу службу поддержки."),
-        "itemCount": m42,
+        "itemCount": m44,
         "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion":
             MessageLookupByLibrary.simpleMessage(
                 "Элементы показывают количество дней, оставшихся до окончательного удаления"),
@@ -1032,7 +1032,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Лимит устройств"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("Разрешён"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("Истекшая"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry":
             MessageLookupByLibrary.simpleMessage("Срок действия ссылки истек"),
         "linkHasExpired":
@@ -1154,12 +1154,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "mostRecent": MessageLookupByLibrary.simpleMessage("Недавние"),
         "mostRelevant":
             MessageLookupByLibrary.simpleMessage("Сначала актуальные"),
-        "moveItem": m45,
+        "moveItem": m49,
         "moveToAlbum":
             MessageLookupByLibrary.simpleMessage("Переместить в альбом"),
         "moveToHiddenAlbum": MessageLookupByLibrary.simpleMessage(
             "Переместить в скрытый альбом"),
-        "movedSuccessfullyTo": m46,
+        "movedSuccessfullyTo": m50,
         "movedToTrash":
             MessageLookupByLibrary.simpleMessage("Перемещено в корзину"),
         "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
@@ -1211,10 +1211,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "noResults": MessageLookupByLibrary.simpleMessage("Ничего не найденo"),
         "noResultsFound":
             MessageLookupByLibrary.simpleMessage("Ничего не найдено"),
-        "noSuggestionsForPerson": m47,
+        "noSuggestionsForPerson": m51,
         "noSystemLockFound": MessageLookupByLibrary.simpleMessage(
             "Системная блокировка не найдена"),
-        "notPersonLabel": m48,
+        "notPersonLabel": m52,
         "nothingSharedWithYouYet": MessageLookupByLibrary.simpleMessage(
             "Пока никто не поделился с вами"),
         "nothingToSeeHere":
@@ -1247,8 +1247,6 @@ class MessageLookup extends MessageLookupByLibrary {
             "Или объединить с существующими"),
         "orPickAnExistingOne": MessageLookupByLibrary.simpleMessage(
             "Или выберите уже существующий"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "pair": MessageLookupByLibrary.simpleMessage("Спарить"),
         "pairWithPin": MessageLookupByLibrary.simpleMessage("Соединить с PIN"),
         "pairingComplete":
@@ -1274,7 +1272,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "paymentFailed": MessageLookupByLibrary.simpleMessage("Сбой платежа"),
         "paymentFailedMessage": MessageLookupByLibrary.simpleMessage(
             "К сожалению, ваш платеж не был выполнен. Пожалуйста, свяжитесь со службой поддержки, и мы вам поможем!"),
-        "paymentFailedTalkToProvider": m50,
+        "paymentFailedTalkToProvider": m54,
         "pendingItems":
             MessageLookupByLibrary.simpleMessage("Отложенные элементы"),
         "pendingSync":
@@ -1298,14 +1296,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "photosAddedByYouWillBeRemovedFromTheAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Добавленные вами фотографии будут удалены из альбома"),
-        "photosCount": m51,
+        "photosCount": m55,
         "pickCenterPoint":
             MessageLookupByLibrary.simpleMessage("Указать центральную точку"),
         "pinAlbum": MessageLookupByLibrary.simpleMessage("Закрепить альбом"),
         "pinLock": MessageLookupByLibrary.simpleMessage("Блокировка PIN-кодом"),
         "playOnTv":
             MessageLookupByLibrary.simpleMessage("Воспроизвести альбом на ТВ"),
-        "playStoreFreeTrialValidTill": m52,
+        "playStoreFreeTrialValidTill": m56,
         "playstoreSubscription":
             MessageLookupByLibrary.simpleMessage("Подписка на PlayStore"),
         "pleaseCheckYourInternetConnectionAndTryAgain":
@@ -1317,14 +1315,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseContactSupportIfTheProblemPersists":
             MessageLookupByLibrary.simpleMessage(
                 "Если проблема не устранена, обратитесь в службу поддержки"),
-        "pleaseEmailUsAt": m53,
+        "pleaseEmailUsAt": m57,
         "pleaseGrantPermissions":
             MessageLookupByLibrary.simpleMessage("Предоставьте разрешение"),
         "pleaseLoginAgain":
             MessageLookupByLibrary.simpleMessage("Пожалуйста, войдите снова"),
         "pleaseSelectQuickLinksToRemove": MessageLookupByLibrary.simpleMessage(
             "Пожалуйста, выберите быстрые ссылки для удаления"),
-        "pleaseSendTheLogsTo": m54,
+        "pleaseSendTheLogsTo": m58,
         "pleaseTryAgain": MessageLookupByLibrary.simpleMessage(
             "Пожалуйста, попробуйте ещё раз"),
         "pleaseVerifyTheCodeYouHaveEntered":
@@ -1351,7 +1349,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "privateBackups":
             MessageLookupByLibrary.simpleMessage("Приватные резервные копии"),
         "privateSharing": MessageLookupByLibrary.simpleMessage("Личный доступ"),
-        "processingImport": m55,
+        "processingImport": m59,
         "publicLinkCreated":
             MessageLookupByLibrary.simpleMessage("Публичная ссылка создана"),
         "publicLinkEnabled":
@@ -1362,7 +1360,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "rateTheApp":
             MessageLookupByLibrary.simpleMessage("Оценить приложение"),
         "rateUs": MessageLookupByLibrary.simpleMessage("Оцените нас"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
         "recover": MessageLookupByLibrary.simpleMessage("Восстановить"),
         "recoverAccount":
             MessageLookupByLibrary.simpleMessage("Восстановить аккаунт"),
@@ -1400,7 +1398,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "1. Дайте этот код своим друзьям"),
         "referralStep2": MessageLookupByLibrary.simpleMessage(
             "2. Они подписываются на платный план"),
-        "referralStep3": m60,
+        "referralStep3": m65,
         "referrals": MessageLookupByLibrary.simpleMessage("Рефералы"),
         "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage(
             "Рефералы в настоящее время приостановлены"),
@@ -1431,7 +1429,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "removeLink": MessageLookupByLibrary.simpleMessage("Удалить ссылку"),
         "removeParticipant":
             MessageLookupByLibrary.simpleMessage("Исключить участника"),
-        "removeParticipantBody": m61,
+        "removeParticipantBody": m66,
         "removePersonLabel":
             MessageLookupByLibrary.simpleMessage("Удалить метку человека"),
         "removePublicLink":
@@ -1453,7 +1451,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Переименовать файл"),
         "renewSubscription":
             MessageLookupByLibrary.simpleMessage("Продлить подписку"),
-        "renewsOn": m62,
+        "renewsOn": m67,
         "reportABug":
             MessageLookupByLibrary.simpleMessage("Сообщить об ошибке"),
         "reportBug": MessageLookupByLibrary.simpleMessage("Сообщить об ошибке"),
@@ -1529,7 +1527,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Групповые фотографии, сделанные в некотором радиусе от фотографии"),
         "searchPeopleEmptySection": MessageLookupByLibrary.simpleMessage(
             "Пригласите людей, и вы увидите все фотографии, которыми они поделились здесь"),
-        "searchResultCount": m63,
+        "searchResultCount": m68,
         "security": MessageLookupByLibrary.simpleMessage("Безопасность"),
         "seePublicAlbumLinksInApp": MessageLookupByLibrary.simpleMessage(
             "Смотреть ссылки публичного альбома в приложении"),
@@ -1563,7 +1561,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Выбранные элементы будут удалены из всех альбомов и перемещены в корзину."),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "send": MessageLookupByLibrary.simpleMessage("Отправить"),
         "sendEmail": MessageLookupByLibrary.simpleMessage(
             "Отправить электронное письмо"),
@@ -1598,16 +1596,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "shareAnAlbumNow":
             MessageLookupByLibrary.simpleMessage("Поделиться альбомом сейчас"),
         "shareLink": MessageLookupByLibrary.simpleMessage("Поделиться ссылкой"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage(
             "Поделитесь только с теми людьми, с которыми вы хотите"),
         "shareTextConfirmOthersVerificationID": m7,
         "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage(
             "Скачай Ente, чтобы мы могли легко поделиться фотографиями и видео без сжатия\n\nhttps://ente.io"),
-        "shareTextReferralCode": m67,
+        "shareTextReferralCode": m72,
         "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage(
             "Поделится с пользователями без Ente"),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "shareYourFirstAlbum":
             MessageLookupByLibrary.simpleMessage("Поделиться первым альбомом"),
         "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
@@ -1618,7 +1616,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Новые общие фотографии"),
         "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage(
             "Получать уведомления, когда кто-то добавляет фото в общий альбом, в котором вы состоите"),
-        "sharedWith": m69,
+        "sharedWith": m74,
         "sharedWithMe":
             MessageLookupByLibrary.simpleMessage("Поделиться со мной"),
         "sharedWithYou":
@@ -1635,11 +1633,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Выйти из других устройств"),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "Я согласен с <u-terms>условиями предоставления услуг</u-terms> и <u-policy>политикой конфиденциальности</u-policy>"),
-        "singleFileDeleteFromDevice": m70,
+        "singleFileDeleteFromDevice": m75,
         "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage(
             "Он будет удален из всех альбомов."),
-        "singleFileInBothLocalAndRemote": m71,
-        "singleFileInRemoteOnly": m72,
+        "singleFileInBothLocalAndRemote": m76,
+        "singleFileInRemoteOnly": m77,
         "skip": MessageLookupByLibrary.simpleMessage("Пропустить"),
         "social": MessageLookupByLibrary.simpleMessage("Соцсети"),
         "someItemsAreInBothEnteAndYourDevice": MessageLookupByLibrary.simpleMessage(
@@ -1687,10 +1685,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageInGB": m1,
         "storageLimitExceeded":
             MessageLookupByLibrary.simpleMessage("Превышен предел хранения"),
-        "storageUsageInfo": m73,
+        "storageUsageInfo": m78,
         "strongStrength": MessageLookupByLibrary.simpleMessage("Сильный"),
-        "subAlreadyLinkedErrMessage": m74,
-        "subWillBeCancelledOn": m75,
+        "subAlreadyLinkedErrMessage": m79,
+        "subWillBeCancelledOn": m80,
         "subscribe": MessageLookupByLibrary.simpleMessage("Подписаться"),
         "subscription": MessageLookupByLibrary.simpleMessage("Подписка"),
         "success": MessageLookupByLibrary.simpleMessage("Успешно"),
@@ -1705,7 +1703,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "suggestFeatures":
             MessageLookupByLibrary.simpleMessage("Предложить идею"),
         "support": MessageLookupByLibrary.simpleMessage("Поддержка"),
-        "syncProgress": m76,
+        "syncProgress": m81,
         "syncStopped":
             MessageLookupByLibrary.simpleMessage("Синхронизация остановлена"),
         "syncing": MessageLookupByLibrary.simpleMessage("Синхронизация..."),
@@ -1755,7 +1753,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Этот адрес электронной почты уже используется"),
         "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage(
             "Это изображение не имеет exif данных"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage(
             "Это ваш идентификатор подтверждения"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -1799,7 +1797,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Двухфакторная аутентификация успешно сброшена"),
         "twofactorSetup": MessageLookupByLibrary.simpleMessage("Вход с 2FA"),
-        "typeOfGallerGallerytypeIsNotSupportedForRename": m81,
+        "typeOfGallerGallerytypeIsNotSupportedForRename": m86,
         "unarchive": MessageLookupByLibrary.simpleMessage("Разархивировать"),
         "unarchiveAlbum":
             MessageLookupByLibrary.simpleMessage("Разархивировать альбом"),
@@ -1823,7 +1821,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "updatingFolderSelection":
             MessageLookupByLibrary.simpleMessage("Обновление выбора папки..."),
         "upgrade": MessageLookupByLibrary.simpleMessage("Обновить"),
-        "uploadIsIgnoredDueToIgnorereason": m82,
+        "uploadIsIgnoredDueToIgnorereason": m87,
         "uploadingFilesToAlbum":
             MessageLookupByLibrary.simpleMessage("Загрузка файлов в альбом..."),
         "upto50OffUntil4thDec": MessageLookupByLibrary.simpleMessage(
@@ -1840,7 +1838,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "useSelectedPhoto":
             MessageLookupByLibrary.simpleMessage("Использовать выбранное фото"),
         "usedSpace": MessageLookupByLibrary.simpleMessage("Использовано места"),
-        "validTill": m84,
+        "validTill": m89,
         "verificationFailedPleaseTryAgain":
             MessageLookupByLibrary.simpleMessage(
                 "Проверка не удалась, попробуйте еще раз"),
@@ -1849,7 +1847,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "verify": MessageLookupByLibrary.simpleMessage("Подтвердить"),
         "verifyEmail": MessageLookupByLibrary.simpleMessage(
             "Подтвердить электронную почту"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Подтверждение"),
         "verifyPasskey":
             MessageLookupByLibrary.simpleMessage("Подтвердить ключ"),
@@ -1873,7 +1871,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "viewRecoveryKey": MessageLookupByLibrary.simpleMessage(
             "Просмотреть ключ восстановления"),
         "viewer": MessageLookupByLibrary.simpleMessage("Наблюдатель"),
-        "viewersSuccessfullyAdded": m86,
+        "viewersSuccessfullyAdded": m91,
         "visitWebToManage": MessageLookupByLibrary.simpleMessage(
             "Пожалуйста, посетите web.ente.io для управления вашей подпиской"),
         "waitingForVerification":
@@ -1891,7 +1889,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "whatsNew": MessageLookupByLibrary.simpleMessage("Что нового"),
         "yearShort": MessageLookupByLibrary.simpleMessage("г."),
         "yearly": MessageLookupByLibrary.simpleMessage("Ежегодно"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("Да"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("Да, отменить"),
         "yesConvertToViewer":
@@ -1923,7 +1921,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Вы не можете поделиться с самим собой"),
         "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage(
             "У вас нет архивных элементов."),
-        "youHaveSuccessfullyFreedUp": m88,
+        "youHaveSuccessfullyFreedUp": m93,
         "yourAccountHasBeenDeleted":
             MessageLookupByLibrary.simpleMessage("Ваш аккаунт был удален"),
         "yourMap": MessageLookupByLibrary.simpleMessage("Ваша карта"),
diff --git a/mobile/lib/generated/intl/messages_sl.dart b/mobile/lib/generated/intl/messages_sl.dart
index 41b9782537..d41d848b0f 100644
--- a/mobile/lib/generated/intl/messages_sl.dart
+++ b/mobile/lib/generated/intl/messages_sl.dart
@@ -21,8 +21,5 @@ class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'sl';
 
   final messages = _notInlinedMessages(_notInlinedMessages);
-  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts")
-      };
+  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{};
 }
diff --git a/mobile/lib/generated/intl/messages_sv.dart b/mobile/lib/generated/intl/messages_sv.dart
index 61e22c9a5b..25fbbccdd6 100644
--- a/mobile/lib/generated/intl/messages_sv.dart
+++ b/mobile/lib/generated/intl/messages_sv.dart
@@ -20,71 +20,94 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'sv';
 
-  static String m10(count) =>
+  static String m11(count) =>
       "${Intl.plural(count, one: 'Lägg till objekt', other: 'Lägg till objekt')}";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: 'Inga deltagare', one: '1 deltagare', other: '${count} deltagare')}";
 
-  static String m16(versionValue) => "Version: ${versionValue}";
+  static String m17(versionValue) => "Version: ${versionValue}";
 
-  static String m17(freeAmount, storageUnit) =>
+  static String m18(freeAmount, storageUnit) =>
       "${freeAmount} ${storageUnit} gratis";
 
   static String m3(user) =>
       "${user} kommer inte att kunna lägga till fler foton till detta album\n\nDe kommer fortfarande att kunna ta bort befintliga foton som lagts till av dem";
 
-  static String m26(count) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
+      "${Intl.select(isFamilyMember, {
+            'true': 'Din familj har begärt ${storageAmountInGb} GB',
+            'false': '${storageAmountInGb}',
+            'other': 'Du har begärt ${storageAmountInGb} GB!',
+          })}";
+
+  static String m27(count) =>
       "${Intl.plural(count, one: 'Radera ${count} objekt', other: 'Radera ${count} objekt')}";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "Vänligen skicka ett e-postmeddelande till ${supportEmail} från din registrerade e-postadress";
 
-  static String m33(email) =>
+  static String m32(count, formattedSize) =>
+      "${count} filer, ${formattedSize} vardera";
+
+  static String m35(email) =>
       "${email} har inte ett Ente-konto.\n\nSkicka dem en inbjudan för att dela bilder.";
 
-  static String m42(count) =>
+  static String m4(storageAmountInGB) =>
+      "${storageAmountInGB} GB varje gång någon registrerar sig för en betalplan och tillämpar din kod";
+
+  static String m44(count) =>
       "${Intl.plural(count, one: '${count} objekt', other: '${count} objekt')}";
 
-  static String m44(expiryTime) => "Länken upphör att gälla ${expiryTime}";
+  static String m46(expiryTime) => "Länken upphör att gälla ${expiryTime}";
 
-  static String m45(count) =>
+  static String m49(count) =>
       "${Intl.plural(count, one: 'Flytta objekt', other: 'Flytta objekt')}";
 
-  static String m48(name) => "Inte ${name}?";
+  static String m52(name) => "Inte ${name}?";
 
-  static String m49(familyAdminEmail) =>
+  static String m53(familyAdminEmail) =>
       "Kontakta ${familyAdminEmail} för att ändra din kod.";
 
   static String m0(passwordStrengthValue) =>
       "Lösenordsstyrka: ${passwordStrengthValue}";
 
-  static String m56(storeName) => "Betygsätt oss på ${storeName}";
+  static String m60(storeName) => "Betygsätt oss på ${storeName}";
 
-  static String m63(count) =>
+  static String m65(storageInGB) => "3. Ni får båda ${storageInGB} GB* gratis";
+
+  static String m66(userEmail) =>
+      "${userEmail} kommer att tas bort från detta delade album\n\nAlla bilder som lagts till av dem kommer också att tas bort från albumet";
+
+  static String m68(count) =>
       "${Intl.plural(count, one: '${count} resultat hittades', other: '${count} resultat hittades')}";
 
-  static String m66(verificationID) =>
+  static String m71(verificationID) =>
       "Här är mitt verifierings-ID: ${verificationID} för ente.io.";
 
   static String m7(verificationID) =>
       "Hallå, kan du bekräfta att detta är ditt ente.io verifierings-ID: ${verificationID}";
 
-  static String m68(numberOfPeople) =>
+  static String m72(referralCode, referralStorageInGB) =>
+      "Ente värvningskod: ${referralCode} \n\nTillämpa den i Inställningar → Allmänt → Hänvisningar för att få ${referralStorageInGB} GB gratis när du registrerar dig för en betalplan\n\nhttps://ente.io";
+
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: 'Dela med specifika personer', one: 'Delad med en person', other: 'Delad med ${numberOfPeople} personer')}";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} GB";
 
-  static String m78(email) => "Detta är ${email}s verifierings-ID";
+  static String m8(storageAmountInGB) => "De får också ${storageAmountInGB} GB";
 
-  static String m83(count) => "Bevarar ${count} minnen...";
+  static String m83(email) => "Detta är ${email}s verifierings-ID";
 
-  static String m85(email) => "Bekräfta ${email}";
+  static String m88(count) => "Bevarar ${count} minnen...";
+
+  static String m90(email) => "Bekräfta ${email}";
 
   static String m2(email) =>
       "Vi har skickat ett e-postmeddelande till <green>${email}</green>";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, one: '${count} år sedan', other: '${count} år sedan')}";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
@@ -106,20 +129,22 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Lägg till samarbetspartner"),
         "addFromDevice":
             MessageLookupByLibrary.simpleMessage("Lägg till från enhet"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocationButton": MessageLookupByLibrary.simpleMessage("Lägg till"),
         "addMore": MessageLookupByLibrary.simpleMessage("Lägg till fler"),
         "addName": MessageLookupByLibrary.simpleMessage("Lägg till namn"),
         "addPhotos": MessageLookupByLibrary.simpleMessage("Lägg till foton"),
         "addViewer": MessageLookupByLibrary.simpleMessage("Lägg till bildvy"),
         "addedAs": MessageLookupByLibrary.simpleMessage("Lades till som"),
+        "addingToFavorites": MessageLookupByLibrary.simpleMessage(
+            "Lägger till bland favoriter..."),
         "after1Day": MessageLookupByLibrary.simpleMessage("Om en dag"),
         "after1Hour": MessageLookupByLibrary.simpleMessage("Om en timme"),
         "after1Month": MessageLookupByLibrary.simpleMessage("Om en månad"),
         "after1Week": MessageLookupByLibrary.simpleMessage("Om en vecka"),
         "after1Year": MessageLookupByLibrary.simpleMessage("Om ett år"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("Ägare"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumUpdated":
             MessageLookupByLibrary.simpleMessage("Album uppdaterat"),
         "albums": MessageLookupByLibrary.simpleMessage("Album"),
@@ -130,7 +155,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "allowDownloads":
             MessageLookupByLibrary.simpleMessage("Tillåt nedladdningar"),
         "androidCancelButton": MessageLookupByLibrary.simpleMessage("Avbryt"),
-        "appVersion": m16,
+        "appVersion": m17,
         "apply": MessageLookupByLibrary.simpleMessage("Verkställ"),
         "applyCodeTitle": MessageLookupByLibrary.simpleMessage("Använd kod"),
         "areYouSureYouWantToLogout": MessageLookupByLibrary.simpleMessage(
@@ -140,8 +165,18 @@ class MessageLookup extends MessageLookupByLibrary {
         "authenticationFailedPleaseTryAgain":
             MessageLookupByLibrary.simpleMessage(
                 "Autentisering misslyckades, försök igen"),
-        "availableStorageSpace": m17,
+        "availableStorageSpace": m18,
+        "backupSettings": MessageLookupByLibrary.simpleMessage(
+            "Säkerhetskopieringsinställningar"),
+        "backupStatus":
+            MessageLookupByLibrary.simpleMessage("Säkerhetskopieringsstatus"),
         "blog": MessageLookupByLibrary.simpleMessage("Blogg"),
+        "canNotOpenBody": MessageLookupByLibrary.simpleMessage(
+            "Tyvärr kan detta album inte öppnas i appen."),
+        "canNotOpenTitle": MessageLookupByLibrary.simpleMessage(
+            "Kan inte öppna det här albumet"),
+        "canOnlyRemoveFilesOwnedByYou": MessageLookupByLibrary.simpleMessage(
+            "Kan endast ta bort filer som ägs av dig"),
         "cancel": MessageLookupByLibrary.simpleMessage("Avbryt"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
         "change": MessageLookupByLibrary.simpleMessage("Ändra"),
@@ -153,14 +188,25 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Ändra lösenord"),
         "changePermissions":
             MessageLookupByLibrary.simpleMessage("Ändra behörighet?"),
+        "changeYourReferralCode":
+            MessageLookupByLibrary.simpleMessage("Ändra din värvningskod"),
         "checkInboxAndSpamFolder": MessageLookupByLibrary.simpleMessage(
             "Kontrollera din inkorg (och skräppost) för att slutföra verifieringen"),
+        "claimFreeStorage":
+            MessageLookupByLibrary.simpleMessage("Hämta kostnadsfri lagring"),
+        "claimMore": MessageLookupByLibrary.simpleMessage("Begär mer!"),
         "claimed": MessageLookupByLibrary.simpleMessage("Nyttjad"),
+        "claimedStorageSoFar": m20,
+        "clearIndexes": MessageLookupByLibrary.simpleMessage("Rensa index"),
         "close": MessageLookupByLibrary.simpleMessage("Stäng"),
         "codeAppliedPageTitle":
             MessageLookupByLibrary.simpleMessage("Kod tillämpad"),
+        "codeChangeLimitReached": MessageLookupByLibrary.simpleMessage(
+            "Tyvärr, du har nått gränsen för kodändringar."),
         "codeCopiedToClipboard": MessageLookupByLibrary.simpleMessage(
             "Koden har kopierats till urklipp"),
+        "codeUsedByYou":
+            MessageLookupByLibrary.simpleMessage("Kod som används av dig"),
         "collabLinkSectionDescription": MessageLookupByLibrary.simpleMessage(
             "Skapa en länk så att personer kan lägga till och visa foton i ditt delade album utan att behöva en Ente app eller konto. Perfekt för att samla in bilder från evenemang."),
         "collaborativeLink":
@@ -175,6 +221,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "confirm": MessageLookupByLibrary.simpleMessage("Bekräfta"),
         "confirmAccountDeletion":
             MessageLookupByLibrary.simpleMessage("Bekräfta radering av konto"),
+        "confirmDeletePrompt": MessageLookupByLibrary.simpleMessage(
+            "Ja, jag vill permanent ta bort detta konto och data i alla appar."),
         "confirmPassword":
             MessageLookupByLibrary.simpleMessage("Bekräfta lösenord"),
         "confirmRecoveryKey": MessageLookupByLibrary.simpleMessage(
@@ -199,6 +247,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Skapa eller välj album"),
         "createPublicLink":
             MessageLookupByLibrary.simpleMessage("Skapa offentlig länk"),
+        "creatingLink": MessageLookupByLibrary.simpleMessage("Skapar länk..."),
         "custom": MessageLookupByLibrary.simpleMessage("Anpassad"),
         "darkTheme": MessageLookupByLibrary.simpleMessage("Mörkt"),
         "decrypting": MessageLookupByLibrary.simpleMessage("Dekrypterar..."),
@@ -209,12 +258,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "deleteAccountPermanentlyButton":
             MessageLookupByLibrary.simpleMessage("Radera kontot permanent"),
         "deleteAlbum": MessageLookupByLibrary.simpleMessage("Radera album"),
+        "deleteAlbumDialog": MessageLookupByLibrary.simpleMessage(
+            "Ta också bort foton (och videor) som finns i detta album från <bold>alla</bold> andra album som de är en del av?"),
         "deleteAll": MessageLookupByLibrary.simpleMessage("Radera alla"),
         "deleteEmailRequest": MessageLookupByLibrary.simpleMessage(
             "Vänligen skicka ett e-postmeddelande till <warning>account-deletion@ente.io</warning> från din registrerade e-postadress."),
         "deleteFromDevice":
             MessageLookupByLibrary.simpleMessage("Radera från enhet"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deletePhotos": MessageLookupByLibrary.simpleMessage("Radera foton"),
         "deleteReason1": MessageLookupByLibrary.simpleMessage(
             "Det saknas en viktig funktion som jag behöver"),
@@ -226,6 +277,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Min orsak finns inte med"),
         "deleteRequestSLAText": MessageLookupByLibrary.simpleMessage(
             "Din begäran kommer att hanteras inom 72 timmar."),
+        "deleteSharedAlbum":
+            MessageLookupByLibrary.simpleMessage("Radera delat album?"),
+        "deleteSharedAlbumDialogBody": MessageLookupByLibrary.simpleMessage(
+            "Albumet kommer att raderas för alla\n\nDu kommer att förlora åtkomst till delade foton i detta album som ägs av andra"),
+        "details": MessageLookupByLibrary.simpleMessage("Uppgifter"),
         "disableDownloadWarningBody": MessageLookupByLibrary.simpleMessage(
             "Besökare kan fortfarande ta skärmdumpar eller spara en kopia av dina foton med hjälp av externa verktyg"),
         "disableDownloadWarningTitle":
@@ -235,10 +291,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "discover_receipts": MessageLookupByLibrary.simpleMessage("Kvitton"),
         "doThisLater": MessageLookupByLibrary.simpleMessage("Gör detta senare"),
         "done": MessageLookupByLibrary.simpleMessage("Klar"),
-        "dropSupportEmail": m29,
+        "dropSupportEmail": m30,
+        "duplicateItemsGroup": m32,
         "edit": MessageLookupByLibrary.simpleMessage("Redigera"),
+        "eligible": MessageLookupByLibrary.simpleMessage("berättigad"),
         "email": MessageLookupByLibrary.simpleMessage("E-post"),
-        "emailNoEnteAccount": m33,
+        "emailAlreadyRegistered": MessageLookupByLibrary.simpleMessage(
+            "E-postadress redan registrerad."),
+        "emailNoEnteAccount": m35,
+        "emailNotRegistered": MessageLookupByLibrary.simpleMessage(
+            "E-postadressen är inte registrerad."),
         "encryption": MessageLookupByLibrary.simpleMessage("Kryptering"),
         "encryptionKeys":
             MessageLookupByLibrary.simpleMessage("Krypteringsnycklar"),
@@ -275,12 +337,20 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Exportera din data"),
         "failedToApplyCode": MessageLookupByLibrary.simpleMessage(
             "Det gick inte att använda koden"),
+        "failedToFetchReferralDetails": MessageLookupByLibrary.simpleMessage(
+            "Det gick inte att hämta hänvisningsdetaljer. Försök igen senare."),
+        "faq": MessageLookupByLibrary.simpleMessage("Vanliga frågor och svar"),
         "feedback": MessageLookupByLibrary.simpleMessage("Feedback"),
         "fileInfoAddDescHint":
             MessageLookupByLibrary.simpleMessage("Lägg till en beskrivning..."),
         "fileTypes": MessageLookupByLibrary.simpleMessage("Filtyper"),
         "forgotPassword":
             MessageLookupByLibrary.simpleMessage("Glömt lösenord"),
+        "freeStorageClaimed":
+            MessageLookupByLibrary.simpleMessage("Gratis lagring begärd"),
+        "freeStorageOnReferralSuccess": m4,
+        "freeStorageUsable": MessageLookupByLibrary.simpleMessage(
+            "Gratis lagringsutrymme som kan användas"),
         "freeTrial": MessageLookupByLibrary.simpleMessage("Gratis provperiod"),
         "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage(
             "Skapar krypteringsnycklar..."),
@@ -309,11 +379,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "invalidKey": MessageLookupByLibrary.simpleMessage("Ogiltig nyckel"),
         "invalidRecoveryKey": MessageLookupByLibrary.simpleMessage(
             "Återställningsnyckeln du angav är inte giltig. Kontrollera att den innehåller 24 ord och kontrollera stavningen av varje ord.\n\nOm du har angett en äldre återställnings kod, se till att den är 64 tecken lång, och kontrollera var och en av bokstäverna."),
+        "inviteToEnte":
+            MessageLookupByLibrary.simpleMessage("Bjud in till Ente"),
         "inviteYourFriends":
             MessageLookupByLibrary.simpleMessage("Bjud in dina vänner"),
         "inviteYourFriendsToEnte": MessageLookupByLibrary.simpleMessage(
             "Bjud in dina vänner till Ente"),
-        "itemCount": m42,
+        "itemCount": m44,
+        "itemsWillBeRemovedFromAlbum": MessageLookupByLibrary.simpleMessage(
+            "Valda objekt kommer att tas bort från detta album"),
+        "keepPhotos": MessageLookupByLibrary.simpleMessage("Behåll foton"),
         "kiloMeterUnit": MessageLookupByLibrary.simpleMessage("km"),
         "kindlyHelpUsWithThisInformation": MessageLookupByLibrary.simpleMessage(
             "Vänligen hjälp oss med denna information"),
@@ -323,7 +398,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "linkDeviceLimit": MessageLookupByLibrary.simpleMessage("Enhetsgräns"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("Aktiverat"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("Upphört"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry": MessageLookupByLibrary.simpleMessage("Länken upphör"),
         "linkHasExpired":
             MessageLookupByLibrary.simpleMessage("Länk har upphört att gälla"),
@@ -350,7 +425,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "mlConsentTitle":
             MessageLookupByLibrary.simpleMessage("Aktivera maskininlärning?"),
         "moderateStrength": MessageLookupByLibrary.simpleMessage("Måttligt"),
-        "moveItem": m45,
+        "moveItem": m49,
         "moveToAlbum":
             MessageLookupByLibrary.simpleMessage("Flytta till album"),
         "movingFilesToAlbum":
@@ -372,14 +447,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "noResults": MessageLookupByLibrary.simpleMessage("Inga resultat"),
         "noResultsFound":
             MessageLookupByLibrary.simpleMessage("Inga resultat hittades"),
-        "notPersonLabel": m48,
+        "notPersonLabel": m52,
         "ok": MessageLookupByLibrary.simpleMessage("OK"),
-        "onlyFamilyAdminCanChangeCode": m49,
+        "onlyFamilyAdminCanChangeCode": m53,
         "oops": MessageLookupByLibrary.simpleMessage("Hoppsan"),
+        "oopsSomethingWentWrong":
+            MessageLookupByLibrary.simpleMessage("Oj, något gick fel"),
         "orPickAnExistingOne":
             MessageLookupByLibrary.simpleMessage("Eller välj en befintlig"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "passkey": MessageLookupByLibrary.simpleMessage("Nyckel"),
         "password": MessageLookupByLibrary.simpleMessage("Lösenord"),
         "passwordChangedSuccessfully":
@@ -388,6 +463,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "passwordStrength": m0,
         "passwordWarning": MessageLookupByLibrary.simpleMessage(
             "Vi lagrar inte detta lösenord, så om du glömmer bort det, <underline>kan vi inte dekryptera dina data</underline>"),
+        "peopleUsingYourCode": MessageLookupByLibrary.simpleMessage(
+            "Personer som använder din kod"),
         "photoSmallCase": MessageLookupByLibrary.simpleMessage("foto"),
         "pleaseCheckYourInternetConnectionAndTryAgain":
             MessageLookupByLibrary.simpleMessage(
@@ -400,7 +477,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Integritetspolicy"),
         "publicLinkEnabled":
             MessageLookupByLibrary.simpleMessage("Offentlig länk aktiverad"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
         "recover": MessageLookupByLibrary.simpleMessage("Återställ"),
         "recoverAccount":
             MessageLookupByLibrary.simpleMessage("Återställ konto"),
@@ -417,6 +494,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Grymt! Din återställningsnyckel är giltig. Tack för att du verifierade.\n\nKom ihåg att hålla din återställningsnyckel säker med backups."),
         "recoveryKeyVerified": MessageLookupByLibrary.simpleMessage(
             "Återställningsnyckel verifierad"),
+        "recoveryKeyVerifyReason": MessageLookupByLibrary.simpleMessage(
+            "Din återställningsnyckel är det enda sättet att återställa dina foton om du glömmer ditt lösenord. Du hittar din återställningsnyckel i Inställningar > Säkerhet.\n\nAnge din återställningsnyckel här för att verifiera att du har sparat den ordentligt."),
         "recoverySuccessful":
             MessageLookupByLibrary.simpleMessage("Återställning lyckades!"),
         "recreatePasswordBody": MessageLookupByLibrary.simpleMessage(
@@ -424,10 +503,28 @@ class MessageLookup extends MessageLookupByLibrary {
         "recreatePasswordTitle":
             MessageLookupByLibrary.simpleMessage("Återskapa lösenord"),
         "reddit": MessageLookupByLibrary.simpleMessage("Reddit"),
+        "referralStep1": MessageLookupByLibrary.simpleMessage(
+            "1. Ge denna kod till dina vänner"),
+        "referralStep2": MessageLookupByLibrary.simpleMessage(
+            "2. De registrerar sig för en betalplan"),
+        "referralStep3": m65,
+        "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage(
+            "Hänvisningar är för närvarande pausade"),
         "remove": MessageLookupByLibrary.simpleMessage("Ta bort"),
+        "removeFromAlbum":
+            MessageLookupByLibrary.simpleMessage("Ta bort från album"),
+        "removeFromAlbumTitle":
+            MessageLookupByLibrary.simpleMessage("Ta bort från album?"),
         "removeLink": MessageLookupByLibrary.simpleMessage("Radera länk"),
         "removeParticipant":
             MessageLookupByLibrary.simpleMessage("Ta bort användaren"),
+        "removeParticipantBody": m66,
+        "removeShareItemsWarning": MessageLookupByLibrary.simpleMessage(
+            "Några av de objekt som du tar bort lades av andra personer, och du kommer att förlora tillgång till dem"),
+        "removeWithQuestionMark":
+            MessageLookupByLibrary.simpleMessage("Ta bort?"),
+        "removingFromFavorites":
+            MessageLookupByLibrary.simpleMessage("Tar bort från favoriter..."),
         "renewSubscription":
             MessageLookupByLibrary.simpleMessage("Förnya prenumeration"),
         "resendEmail": MessageLookupByLibrary.simpleMessage(
@@ -454,10 +551,16 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Albumnamn"),
         "searchFileTypesAndNamesEmptySection":
             MessageLookupByLibrary.simpleMessage("Filtyper och namn"),
-        "searchResultCount": m63,
+        "searchResultCount": m68,
         "selectAlbum": MessageLookupByLibrary.simpleMessage("Välj album"),
+        "selectAll": MessageLookupByLibrary.simpleMessage("Markera allt"),
+        "selectFoldersForBackup": MessageLookupByLibrary.simpleMessage(
+            "Välj mappar för säkerhetskopiering"),
         "selectLanguage": MessageLookupByLibrary.simpleMessage("Välj språk"),
         "selectReason": MessageLookupByLibrary.simpleMessage("Välj anledning"),
+        "selectedFoldersWillBeEncryptedAndBackedUp":
+            MessageLookupByLibrary.simpleMessage(
+                "Valda mappar kommer att krypteras och säkerhetskopieras"),
         "send": MessageLookupByLibrary.simpleMessage("Skicka"),
         "sendEmail": MessageLookupByLibrary.simpleMessage("Skicka e-post"),
         "sendInvite": MessageLookupByLibrary.simpleMessage("Skicka inbjudan"),
@@ -471,17 +574,19 @@ class MessageLookup extends MessageLookupByLibrary {
         "share": MessageLookupByLibrary.simpleMessage("Dela"),
         "shareALink": MessageLookupByLibrary.simpleMessage("Dela en länk"),
         "shareLink": MessageLookupByLibrary.simpleMessage("Dela länk"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareTextConfirmOthersVerificationID": m7,
         "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage(
             "Ladda ner Ente så att vi enkelt kan dela bilder och videor med originell kvalitet\n\nhttps://ente.io"),
+        "shareTextReferralCode": m72,
         "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage(
             "Dela med icke-Ente användare"),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "shareYourFirstAlbum":
             MessageLookupByLibrary.simpleMessage("Dela ditt första album"),
         "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
             "Skapa delade och samarbetande album med andra Ente användare, inklusive användare med gratisnivån."),
+        "showMemories": MessageLookupByLibrary.simpleMessage("Visa minnen"),
         "showPerson": MessageLookupByLibrary.simpleMessage("Visa person"),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "Jag samtycker till <u-terms>användarvillkoren</u-terms> och <u-policy>integritetspolicyn</u-policy>"),
@@ -495,6 +600,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Något gick fel, vänligen försök igen"),
         "sorry": MessageLookupByLibrary.simpleMessage("Förlåt"),
+        "sorryCouldNotAddToFavorites": MessageLookupByLibrary.simpleMessage(
+            "Tyvärr, kunde inte lägga till i favoriterna!"),
+        "sorryCouldNotRemoveFromFavorites":
+            MessageLookupByLibrary.simpleMessage(
+                "Tyvärr kunde inte ta bort från favoriter!"),
         "sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease":
             MessageLookupByLibrary.simpleMessage(
                 "Tyvärr, vi kunde inte generera säkra nycklar på den här enheten.\n\nVänligen registrera dig från en annan enhet."),
@@ -505,6 +615,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageInGB": m1,
         "strongStrength": MessageLookupByLibrary.simpleMessage("Starkt"),
         "subscribe": MessageLookupByLibrary.simpleMessage("Prenumerera"),
+        "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage(
+            "Du behöver en aktiv betald prenumeration för att möjliggöra delning."),
         "subscription": MessageLookupByLibrary.simpleMessage("Prenumeration"),
         "tapToCopy":
             MessageLookupByLibrary.simpleMessage("tryck för att kopiera"),
@@ -520,11 +632,12 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Återställningsnyckeln du angav är felaktig"),
         "theme": MessageLookupByLibrary.simpleMessage("Tema"),
+        "theyAlsoGetXGb": m8,
         "thisCanBeUsedToRecoverYourAccountIfYou":
             MessageLookupByLibrary.simpleMessage(
                 "Detta kan användas för att återställa ditt konto om du förlorar din andra faktor"),
         "thisDevice": MessageLookupByLibrary.simpleMessage("Den här enheten"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage(
             "Detta är ditt verifierings-ID"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -534,6 +647,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Detta kommer att logga ut dig från denna enhet!"),
         "toResetVerifyEmail": MessageLookupByLibrary.simpleMessage(
             "För att återställa ditt lösenord måste du först bekräfta din e-postadress."),
+        "total": MessageLookupByLibrary.simpleMessage("totalt"),
         "trash": MessageLookupByLibrary.simpleMessage("Papperskorg"),
         "tryAgain": MessageLookupByLibrary.simpleMessage("Försök igen"),
         "twitter": MessageLookupByLibrary.simpleMessage("Twitter"),
@@ -544,11 +658,18 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Tvåfaktorsautentisering"),
         "twofactorSetup":
             MessageLookupByLibrary.simpleMessage("Tvåfaktorskonfiguration"),
+        "unavailableReferralCode": MessageLookupByLibrary.simpleMessage(
+            "Tyvärr är denna kod inte tillgänglig."),
+        "unselectAll": MessageLookupByLibrary.simpleMessage("Avmarkera alla"),
         "update": MessageLookupByLibrary.simpleMessage("Uppdatera"),
+        "updatingFolderSelection":
+            MessageLookupByLibrary.simpleMessage("Uppdaterar mappval..."),
         "upgrade": MessageLookupByLibrary.simpleMessage("Uppgradera"),
-        "uploadingMultipleMemories": m83,
+        "uploadingMultipleMemories": m88,
         "uploadingSingleMemory":
             MessageLookupByLibrary.simpleMessage("Bevarar 1 minne..."),
+        "usableReferralStorageInfo": MessageLookupByLibrary.simpleMessage(
+            "Användbart lagringsutrymme begränsas av din nuvarande plan. Överskrider du lagringsutrymmet kommer automatiskt att kunna använda det när du uppgraderar din plan."),
         "useAsCover": MessageLookupByLibrary.simpleMessage("Använd som omslag"),
         "useRecoveryKey":
             MessageLookupByLibrary.simpleMessage("Använd återställningsnyckel"),
@@ -557,7 +678,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "verify": MessageLookupByLibrary.simpleMessage("Bekräfta"),
         "verifyEmail":
             MessageLookupByLibrary.simpleMessage("Bekräfta e-postadress"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyPasskey":
             MessageLookupByLibrary.simpleMessage("Verifiera nyckel"),
         "verifyPassword":
@@ -578,15 +699,18 @@ class MessageLookup extends MessageLookupByLibrary {
         "welcomeBack":
             MessageLookupByLibrary.simpleMessage("Välkommen tillbaka!"),
         "whatsNew": MessageLookupByLibrary.simpleMessage("Nyheter"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("Ja"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("Ja, avbryt"),
         "yesConvertToViewer":
             MessageLookupByLibrary.simpleMessage("Ja, konvertera till bildvy"),
         "yesDelete": MessageLookupByLibrary.simpleMessage("Ja, radera"),
         "yesLogout": MessageLookupByLibrary.simpleMessage("Ja, logga ut"),
+        "yesRemove": MessageLookupByLibrary.simpleMessage("Ja, ta bort"),
         "yesRenew": MessageLookupByLibrary.simpleMessage("Ja, förnya"),
         "you": MessageLookupByLibrary.simpleMessage("Du"),
+        "youCanAtMaxDoubleYourStorage": MessageLookupByLibrary.simpleMessage(
+            "* Du kan max fördubbla ditt lagringsutrymme"),
         "yourAccountHasBeenDeleted":
             MessageLookupByLibrary.simpleMessage("Ditt konto har raderats")
       };
diff --git a/mobile/lib/generated/intl/messages_ta.dart b/mobile/lib/generated/intl/messages_ta.dart
index bcf99a6fa4..30c00c6d72 100644
--- a/mobile/lib/generated/intl/messages_ta.dart
+++ b/mobile/lib/generated/intl/messages_ta.dart
@@ -48,8 +48,6 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("தவறான மின்னஞ்சல் முகவரி"),
         "kindlyHelpUsWithThisInformation": MessageLookupByLibrary.simpleMessage(
             "இந்த தகவலுடன் தயவுசெய்து எங்களுக்கு உதவுங்கள்"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "verify": MessageLookupByLibrary.simpleMessage("சரிபார்க்கவும்")
       };
 }
diff --git a/mobile/lib/generated/intl/messages_te.dart b/mobile/lib/generated/intl/messages_te.dart
index 23005c447f..5e415c9da0 100644
--- a/mobile/lib/generated/intl/messages_te.dart
+++ b/mobile/lib/generated/intl/messages_te.dart
@@ -21,8 +21,5 @@ class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'te';
 
   final messages = _notInlinedMessages(_notInlinedMessages);
-  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts")
-      };
+  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{};
 }
diff --git a/mobile/lib/generated/intl/messages_th.dart b/mobile/lib/generated/intl/messages_th.dart
index 1d13b1ef24..1c54ec61e3 100644
--- a/mobile/lib/generated/intl/messages_th.dart
+++ b/mobile/lib/generated/intl/messages_th.dart
@@ -20,30 +20,30 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'th';
 
-  static String m10(count) => "${Intl.plural(count, other: 'เพิ่มรายการ')}";
+  static String m11(count) => "${Intl.plural(count, other: 'เพิ่มรายการ')}";
 
-  static String m16(versionValue) => "รุ่น: ${versionValue}";
+  static String m17(versionValue) => "รุ่น: ${versionValue}";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: 'ลบ ${count} รายการ', other: 'ลบ ${count} รายการ')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "กำลังลบ ${currentlyDeleting} / ${totalCount}";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "กรุณาส่งอีเมลไปที่ ${supportEmail} จากที่อยู่อีเมลที่คุณลงทะเบียนไว้";
 
-  static String m41(currentlyProcessing, totalCount) =>
+  static String m43(currentlyProcessing, totalCount) =>
       "กำลังประมวลผล ${currentlyProcessing} / ${totalCount}";
 
-  static String m42(count) => "${Intl.plural(count, other: '${count} รายการ')}";
+  static String m44(count) => "${Intl.plural(count, other: '${count} รายการ')}";
 
-  static String m45(count) => "${Intl.plural(count, other: 'ย้ายรายการ')}";
+  static String m49(count) => "${Intl.plural(count, other: 'ย้ายรายการ')}";
 
   static String m0(passwordStrengthValue) =>
       "ความแข็งแรงของรหัสผ่าน: ${passwordStrengthValue}";
 
-  static String m73(
+  static String m78(
           usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) =>
       "ใช้ไป ${usedAmount} ${usedStorageUnit} จาก ${totalAmount} ${totalStorageUnit}";
 
@@ -60,7 +60,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "addANewEmail": MessageLookupByLibrary.simpleMessage("เพิ่มอีเมลใหม่"),
         "addCollaborator":
             MessageLookupByLibrary.simpleMessage("เพิ่มผู้ทำงานร่วมกัน"),
-        "addItem": m10,
+        "addItem": m11,
         "addMore": MessageLookupByLibrary.simpleMessage("เพิ่มอีก"),
         "addToAlbum": MessageLookupByLibrary.simpleMessage("เพิ่มไปยังอัลบั้ม"),
         "addViewer": MessageLookupByLibrary.simpleMessage("เพิ่มผู้ชม"),
@@ -77,7 +77,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "androidBiometricSuccess":
             MessageLookupByLibrary.simpleMessage("สำเร็จ"),
         "androidCancelButton": MessageLookupByLibrary.simpleMessage("ยกเลิก"),
-        "appVersion": m16,
+        "appVersion": m17,
         "apply": MessageLookupByLibrary.simpleMessage("นำไปใช้"),
         "askDeleteReason": MessageLookupByLibrary.simpleMessage(
             "เหตุผลหลักที่คุณลบบัญชีคืออะไร?"),
@@ -130,8 +130,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "deleteEmptyAlbumsWithQuestionMark":
             MessageLookupByLibrary.simpleMessage(
                 "ลบอัลบั้มที่ว่างเปล่าหรือไม่?"),
-        "deleteItemCount": m26,
-        "deleteProgress": m27,
+        "deleteItemCount": m27,
+        "deleteProgress": m28,
         "deleteReason1": MessageLookupByLibrary.simpleMessage(
             "ขาดคุณสมบัติสำคัญที่ฉันต้องการ"),
         "deleteReason2": MessageLookupByLibrary.simpleMessage(
@@ -143,7 +143,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "deleteRequestSLAText": MessageLookupByLibrary.simpleMessage(
             "คำขอของคุณจะได้รับการดำเนินการภายใน 72 ชั่วโมง"),
         "doThisLater": MessageLookupByLibrary.simpleMessage("ทำในภายหลัง"),
-        "dropSupportEmail": m29,
+        "dropSupportEmail": m30,
         "edit": MessageLookupByLibrary.simpleMessage("แก้ไข"),
         "editLocationTagTitle":
             MessageLookupByLibrary.simpleMessage("แก้ไขตำแหน่ง"),
@@ -172,7 +172,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("เพิ่มคำอธิบาย..."),
         "forgotPassword": MessageLookupByLibrary.simpleMessage("ลืมรหัสผ่าน"),
         "freeTrial": MessageLookupByLibrary.simpleMessage("ทดลองใช้ฟรี"),
-        "genericProgress": m41,
+        "genericProgress": m43,
         "goToSettings": MessageLookupByLibrary.simpleMessage("ไปที่การตั้งค่า"),
         "hide": MessageLookupByLibrary.simpleMessage("ซ่อน"),
         "hostedAtOsmFrance":
@@ -195,7 +195,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "invalidKey": MessageLookupByLibrary.simpleMessage("รหัสไม่ถูกต้อง"),
         "invalidRecoveryKey": MessageLookupByLibrary.simpleMessage(
             "คีย์การกู้คืนที่คุณป้อนไม่ถูกต้อง โปรดตรวจสอบให้แน่ใจว่ามี 24 คำ และตรวจสอบการสะกดของแต่ละคำ\n\nหากคุณป้อนรหัสกู้คืนที่เก่ากว่า ตรวจสอบให้แน่ใจว่ามีความยาว 64 ตัวอักษร และตรวจสอบแต่ละตัวอักษร"),
-        "itemCount": m42,
+        "itemCount": m44,
         "kindlyHelpUsWithThisInformation":
             MessageLookupByLibrary.simpleMessage("กรุณาช่วยเราด้วยข้อมูลนี้"),
         "lastUpdated": MessageLookupByLibrary.simpleMessage("อัปเดตล่าสุด"),
@@ -213,7 +213,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "map": MessageLookupByLibrary.simpleMessage("แผนที่"),
         "maps": MessageLookupByLibrary.simpleMessage("แผนที่"),
         "moderateStrength": MessageLookupByLibrary.simpleMessage("ปานกลาง"),
-        "moveItem": m45,
+        "moveItem": m49,
         "moveToAlbum": MessageLookupByLibrary.simpleMessage("ย้ายไปยังอัลบั้ม"),
         "name": MessageLookupByLibrary.simpleMessage("ชื่อ"),
         "newest": MessageLookupByLibrary.simpleMessage("ใหม่สุด"),
@@ -231,8 +231,6 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("ผู้มีส่วนร่วม OpenStreetMap"),
         "orPickAnExistingOne":
             MessageLookupByLibrary.simpleMessage("หรือเลือกที่มีอยู่แล้ว"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "password": MessageLookupByLibrary.simpleMessage("รหัสผ่าน"),
         "passwordChangedSuccessfully":
             MessageLookupByLibrary.simpleMessage("เปลี่ยนรหัสผ่านสำเร็จ"),
@@ -308,7 +306,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageBreakupFamily":
             MessageLookupByLibrary.simpleMessage("ครอบครัว"),
         "storageBreakupYou": MessageLookupByLibrary.simpleMessage("คุณ"),
-        "storageUsageInfo": m73,
+        "storageUsageInfo": m78,
         "strongStrength": MessageLookupByLibrary.simpleMessage("แข็งแรง"),
         "syncStopped": MessageLookupByLibrary.simpleMessage("หยุดการซิงค์แล้ว"),
         "syncing": MessageLookupByLibrary.simpleMessage("กำลังซิงค์..."),
diff --git a/mobile/lib/generated/intl/messages_ti.dart b/mobile/lib/generated/intl/messages_ti.dart
index 5088ccbb47..775cc78213 100644
--- a/mobile/lib/generated/intl/messages_ti.dart
+++ b/mobile/lib/generated/intl/messages_ti.dart
@@ -21,8 +21,5 @@ class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'ti';
 
   final messages = _notInlinedMessages(_notInlinedMessages);
-  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts")
-      };
+  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{};
 }
diff --git a/mobile/lib/generated/intl/messages_tr.dart b/mobile/lib/generated/intl/messages_tr.dart
index 8c0278036b..2391638089 100644
--- a/mobile/lib/generated/intl/messages_tr.dart
+++ b/mobile/lib/generated/intl/messages_tr.dart
@@ -20,214 +20,316 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'tr';
 
-  static String m9(count) =>
-      "${Intl.plural(count, zero: 'Ortak çalışan ekle', one: 'Ortak çalışan ekle', other: 'Ortak çalışan ekle')}";
+  static String m9(title) => "${title} (Ben)";
 
   static String m10(count) =>
+      "${Intl.plural(count, zero: 'Ortak çalışan ekle', one: 'Ortak çalışan ekle', other: 'Ortak çalışan ekle')}";
+
+  static String m11(count) =>
       "${Intl.plural(count, one: 'Öğeyi taşı', other: 'Öğeleri taşı')}";
 
-  static String m11(storageAmount, endDate) =>
+  static String m12(storageAmount, endDate) =>
       "${storageAmount} eklentiniz ${endDate} tarihine kadar geçerlidir";
 
-  static String m12(count) =>
+  static String m13(count) =>
       "${Intl.plural(count, zero: 'Görüntüleyen ekle', one: 'Görüntüleyen ekle', other: 'Görüntüleyen ekle')}";
 
-  static String m13(emailOrName) => "${emailOrName} tarafından eklendi";
+  static String m14(emailOrName) => "${emailOrName} tarafından eklendi";
 
-  static String m14(albumName) => "${albumName} albümüne başarıyla eklendi";
+  static String m15(albumName) => "${albumName} albümüne başarıyla eklendi";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: 'Katılımcı Yok', one: '1 Katılımcı', other: '${count} Katılımcı')}";
 
-  static String m16(versionValue) => "Sürüm: ${versionValue}";
+  static String m17(versionValue) => "Sürüm: ${versionValue}";
 
-  static String m18(paymentProvider) =>
+  static String m18(freeAmount, storageUnit) =>
+      "${freeAmount} ${storageUnit} ücretsiz";
+
+  static String m19(paymentProvider) =>
       "Lütfen önce mevcut aboneliğinizi ${paymentProvider} adresinden iptal edin";
 
   static String m3(user) =>
       "${user}, bu albüme daha fazla fotoğraf ekleyemeyecek.\n\nAncak, kendi eklediği mevcut fotoğrafları kaldırmaya devam edebilecektir";
 
-  static String m19(isFamilyMember, storageAmountInGb) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
       "${Intl.select(isFamilyMember, {
             'true': 'Şu ana kadar aileniz ${storageAmountInGb} GB aldı',
             'false': 'Şu ana kadar ${storageAmountInGb} GB aldınız',
             'other': 'Şu ana kadar ${storageAmountInGb} GB aldınız!',
           })}";
 
-  static String m20(albumName) =>
+  static String m21(albumName) =>
       "${albumName} için ortak çalışma bağlantısı oluşturuldu";
 
-  static String m23(familyAdminEmail) =>
+  static String m22(count) =>
+      "${Intl.plural(count, zero: '0 işbirlikçi eklendi', one: '1 işbirlikçi eklendi', other: '${count} işbirlikçi eklendi')}";
+
+  static String m23(email, numOfDays) =>
+      "Güvenilir bir kişi olarak ${email} eklemek üzeresiniz. Eğer ${numOfDays} gün boyunca yoksanız hesabınızı kurtarabilecekler.";
+
+  static String m24(familyAdminEmail) =>
       "Aboneliğinizi yönetmek için lütfen <green>${familyAdminEmail}</green> ile iletişime geçin";
 
-  static String m24(provider) =>
+  static String m25(provider) =>
       "Lütfen ${provider} aboneliğinizi yönetmek için support@ente.io adresinden bizimle iletişime geçin.";
 
-  static String m25(endpoint) => "${endpoint}\'e bağlanıldı";
+  static String m26(endpoint) => "${endpoint}\'e bağlanıldı";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: 'Delete ${count} item', other: 'Delete ${count} items')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "Siliniyor ${currentlyDeleting} / ${totalCount}";
 
-  static String m28(albumName) =>
+  static String m29(albumName) =>
       "Bu, \"${albumName}\"e erişim için olan genel bağlantıyı kaldıracaktır.";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "Lütfen kayıtlı e-posta adresinizden ${supportEmail} adresine bir e-posta gönderin";
 
-  static String m30(count, storageSaved) =>
+  static String m31(count, storageSaved) =>
       "You have cleaned up ${Intl.plural(count, one: '${count} duplicate file', other: '${count} duplicate files')}, saving (${storageSaved}!)";
 
-  static String m31(count, formattedSize) =>
+  static String m32(count, formattedSize) =>
       "${count} dosyalar, ${formattedSize} her biri";
 
-  static String m32(newEmail) => "E-posta ${newEmail} olarak değiştirildi";
+  static String m33(newEmail) => "E-posta ${newEmail} olarak değiştirildi";
 
-  static String m33(email) =>
+  static String m34(email) => "${email} bir Ente hesabına sahip değil";
+
+  static String m35(email) =>
       "${email}, Ente hesabı bulunmamaktadır.\n\nOnlarla fotoğraf paylaşımı için bir davet gönder.";
 
-  static String m35(count, formattedNumber) =>
+  static String m36(text) => "${text} için ekstra fotoğraflar bulundu";
+
+  static String m37(count, formattedNumber) =>
       "Bu cihazdaki ${Intl.plural(count, one: '1 file', other: '${formattedNumber} dosya')} güvenli bir şekilde yedeklendi";
 
-  static String m36(count, formattedNumber) =>
+  static String m38(count, formattedNumber) =>
       "Bu albümdeki ${Intl.plural(count, one: '1 file', other: '${formattedNumber} dosya')} güvenli bir şekilde yedeklendi";
 
   static String m4(storageAmountInGB) =>
       "Birisinin davet kodunuzu uygulayıp ücretli hesap açtığı her seferede ${storageAmountInGB} GB";
 
-  static String m37(endDate) => "Ücretsiz deneme ${endDate} sona erir";
+  static String m39(endDate) => "Ücretsiz deneme ${endDate} sona erir";
 
-  static String m39(sizeInMBorGB) => "${sizeInMBorGB} yer açın";
+  static String m40(count) =>
+      "Aktif bir aboneliğiniz olduğu sürece ente\'de ${Intl.plural(count, one: 'it', other: 'them')} erişimine devam edebilirsiniz";
 
-  static String m40(count, formattedSize) =>
+  static String m41(sizeInMBorGB) => "${sizeInMBorGB} yer açın";
+
+  static String m42(count, formattedSize) =>
       "${Intl.plural(count, one: 'Yer açmak için cihazdan silinebilir ${formattedSize}', other: 'Yer açmak için cihazdan silinebilir ${formattedSize}')}";
 
-  static String m41(currentlyProcessing, totalCount) =>
+  static String m43(currentlyProcessing, totalCount) =>
       "Siliniyor ${currentlyProcessing} / ${totalCount}";
 
-  static String m42(count) =>
+  static String m44(count) =>
       "${Intl.plural(count, one: '${count} öğe', other: '${count} öğeler')}";
 
-  static String m44(expiryTime) =>
+  static String m45(email) =>
+      "${email} sizi güvenilir bir kişi olmaya davet etti";
+
+  static String m46(expiryTime) =>
       "Bu bağlantı ${expiryTime} dan sonra geçersiz olacaktır";
 
+  static String m47(email) => "Kişiyi ${email} adresine bağlayın";
+
+  static String m48(personName, email) =>
+      "Bu, ${personName} ile ${email} arasında bağlantı kuracaktır.";
+
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, zero: 'anı yok', one: '${formattedCount} anı', other: '${formattedCount} anılar')}";
 
-  static String m45(count) =>
+  static String m49(count) =>
       "${Intl.plural(count, one: 'Öğeyi taşı', other: 'Öğeleri taşı')}";
 
-  static String m46(albumName) => "${albumName} adlı albüme başarıyla taşındı";
+  static String m50(albumName) => "${albumName} adlı albüme başarıyla taşındı";
+
+  static String m51(personName) => "${personName} için öneri yok";
+
+  static String m52(name) => "${name} değil mi?";
+
+  static String m53(familyAdminEmail) =>
+      "Kodunuzu değiştirmek için lütfen ${familyAdminEmail} ile iletişime geçin.";
 
   static String m0(passwordStrengthValue) =>
       "Şifrenin güçlülük seviyesi: ${passwordStrengthValue}";
 
-  static String m50(providerName) =>
+  static String m54(providerName) =>
       "Sizden ücret alındıysa lütfen ${providerName} destek ekibiyle görüşün";
 
-  static String m53(toEmail) => "Lütfen bize ${toEmail} adresinden ulaşın";
+  static String m55(count) =>
+      "${Intl.plural(count, zero: '0 fotoğraf', one: '1 fotoğraf', other: '${count} fotoğraflar')}";
 
-  static String m54(toEmail) =>
+  static String m56(endDate) =>
+      "Ücretsiz deneme süresi ${endDate} tarihine kadar geçerlidir.\nDaha sonra ücretli bir plan seçebilirsiniz.";
+
+  static String m57(toEmail) => "Lütfen bize ${toEmail} adresinden ulaşın";
+
+  static String m58(toEmail) =>
       "Lütfen günlükleri şu adrese gönderin\n${toEmail}";
 
-  static String m56(storeName) => "Bizi ${storeName} üzerinden değerlendirin";
+  static String m59(folderName) => "İşleniyor ${folderName}...";
 
-  static String m60(storageInGB) => "3. Hepimiz ${storageInGB} GB* bedava alın";
+  static String m60(storeName) => "Bizi ${storeName} üzerinden değerlendirin";
 
-  static String m61(userEmail) =>
+  static String m61(name) => "Sizi ${name}\'e yeniden atadım";
+
+  static String m62(days, email) =>
+      "Hesabınıza ${days} gün sonra erişebilirsiniz. ${email} adresine bir bildirim gönderilecektir.";
+
+  static String m63(email) =>
+      "Artık yeni bir parola belirleyerek ${email} hesabını kurtarabilirsiniz.";
+
+  static String m64(email) => "${email} hesabınızı kurtarmaya çalışıyor.";
+
+  static String m65(storageInGB) => "3. Hepimiz ${storageInGB} GB* bedava alın";
+
+  static String m66(userEmail) =>
       "${userEmail} bu paylaşılan albümden kaldırılacaktır\n\nOnlar tarafından eklenen tüm fotoğraflar da albümden kaldırılacaktır";
 
-  static String m62(endDate) => "Abonelik ${endDate} tarihinde yenilenir";
+  static String m67(endDate) => "Abonelik ${endDate} tarihinde yenilenir";
 
-  static String m63(count) =>
+  static String m68(count) =>
       "${Intl.plural(count, one: '${count} yıl önce', other: '${count} yıl önce')}";
 
+  static String m69(snapshotLength, searchLength) =>
+      "Bölüm uzunluğu uyuşmazlığı: ${snapshotLength} != ${searchLength}";
+
   static String m6(count) => "${count} seçildi";
 
-  static String m65(count, yourCount) =>
+  static String m70(count, yourCount) =>
       "Seçilenler: ${count} (${yourCount} sizin seçiminiz)";
 
-  static String m66(verificationID) =>
+  static String m71(verificationID) =>
       "İşte ente.io için doğrulama kimliğim: ${verificationID}.";
 
   static String m7(verificationID) =>
       "Merhaba, bu ente.io doğrulama kimliğinizin doğruluğunu onaylayabilir misiniz: ${verificationID}";
 
-  static String m68(numberOfPeople) =>
+  static String m72(referralCode, referralStorageInGB) =>
+      "Ente davet kodu: ${referralCode} \n\nÜcretli hesaba başvurduktan sonra ${referralStorageInGB} GB bedava almak için \nAyarlar → Genel → Davetlerde bu kodu girin\n\nhttps://ente.io";
+
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: 'Belirli kişilerle paylaş', one: '1 kişiyle paylaşıldı', other: '${numberOfPeople} kişiyle paylaşıldı')}";
 
-  static String m69(emailIDs) => "${emailIDs} ile paylaşıldı";
+  static String m74(emailIDs) => "${emailIDs} ile paylaşıldı";
 
-  static String m70(fileType) => "Bu ${fileType}, cihazınızdan silinecek.";
+  static String m75(fileType) => "Bu ${fileType}, cihazınızdan silinecek.";
+
+  static String m76(fileType) =>
+      "${fileType} Ente ve cihazınızdan silinecektir.";
+
+  static String m77(fileType) => "${fileType} Ente\'den silinecektir.";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} GB";
 
-  static String m73(
+  static String m78(
           usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) =>
       "${usedAmount} ${usedStorageUnit} / ${totalAmount} ${totalStorageUnit} kullanıldı";
 
-  static String m75(endDate) =>
+  static String m79(id) =>
+      "${id}\'niz zaten başka bir ente hesabına bağlı.\n${id} numaranızı bu hesapla kullanmak istiyorsanız lütfen desteğimizle iletişime geçin\'\'";
+
+  static String m80(endDate) =>
       "Aboneliğiniz ${endDate} tarihinde iptal edilecektir";
 
-  static String m76(completed, total) => "${completed}/${total} anı korundu";
+  static String m81(completed, total) => "${completed}/${total} anı korundu";
+
+  static String m82(ignoreReason) =>
+      "Yüklemek için dokunun, yükleme şu anda ${ignoreReason} nedeniyle yok sayılıyor";
 
   static String m8(storageAmountInGB) =>
       "Aynı zamanda ${storageAmountInGB} GB alıyorlar";
 
-  static String m78(email) => "Bu, ${email}\'in Doğrulama Kimliği";
+  static String m83(email) => "Bu, ${email}\'in Doğrulama Kimliği";
 
-  static String m84(endDate) => "${endDate} tarihine kadar geçerli";
+  static String m84(count) =>
+      "${Intl.plural(count, zero: 'yakında', one: '1 gün', other: '${count} gün')}";
 
-  static String m85(email) => "${email} doğrula";
+  static String m85(email) =>
+      "${email} ile eski bir irtibat kişisi olmaya davet edildiniz.";
+
+  static String m86(galleryType) =>
+      "Galeri türü ${galleryType} yeniden adlandırma için desteklenmiyor";
+
+  static String m87(ignoreReason) =>
+      "Yükleme ${ignoreReason} nedeniyle yok sayıldı";
+
+  static String m88(count) => "${count} anı korunuyor...";
+
+  static String m89(endDate) => "${endDate} tarihine kadar geçerli";
+
+  static String m90(email) => "${email} doğrula";
+
+  static String m91(count) =>
+      "${Intl.plural(count, zero: '0 Görüntüleyen eklendi', one: '1 Görüntüleyen eklendi', other: '${count} Görüntüleyen eklendi')}";
 
   static String m2(email) =>
       "E-postayı <green>${email}</green> adresine gönderdik";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, one: '${count} yıl önce', other: '${count} yıl önce')}";
 
-  static String m88(storageSaved) =>
+  static String m93(storageSaved) =>
       "Başarılı bir şekilde ${storageSaved} alanını boşalttınız!";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
+        "aNewVersionOfEnteIsAvailable": MessageLookupByLibrary.simpleMessage(
+            "Ente için yeni bir sürüm mevcut."),
         "about": MessageLookupByLibrary.simpleMessage("Hakkında"),
+        "acceptTrustInvite":
+            MessageLookupByLibrary.simpleMessage("Daveti Kabul Et"),
         "account": MessageLookupByLibrary.simpleMessage("Hesap"),
+        "accountIsAlreadyConfigured": MessageLookupByLibrary.simpleMessage(
+            "Hesap zaten yapılandırılmıştır."),
+        "accountOwnerPersonAppbarTitle": m9,
         "accountWelcomeBack":
             MessageLookupByLibrary.simpleMessage("Tekrar hoş geldiniz!"),
         "ackPasswordLostWarning": MessageLookupByLibrary.simpleMessage(
             "Şifremi kaybedersem, verilerim <underline>uçtan uca şifrelendiği</underline> için verilerimi kaybedebileceğimi farkındayım."),
         "activeSessions":
             MessageLookupByLibrary.simpleMessage("Aktif oturumlar"),
+        "add": MessageLookupByLibrary.simpleMessage("Ekle"),
+        "addAName": MessageLookupByLibrary.simpleMessage("Bir Ad Ekle"),
         "addANewEmail":
             MessageLookupByLibrary.simpleMessage("Yeni e-posta ekle"),
         "addCollaborator":
             MessageLookupByLibrary.simpleMessage("Düzenleyici ekle"),
-        "addCollaborators": m9,
+        "addCollaborators": m10,
+        "addFiles": MessageLookupByLibrary.simpleMessage("Dosyaları Ekle"),
         "addFromDevice": MessageLookupByLibrary.simpleMessage("Cihazdan ekle"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocation": MessageLookupByLibrary.simpleMessage("Konum Ekle"),
         "addLocationButton": MessageLookupByLibrary.simpleMessage("Ekle"),
         "addMore": MessageLookupByLibrary.simpleMessage("Daha fazla ekle"),
+        "addName": MessageLookupByLibrary.simpleMessage("İsim Ekle"),
+        "addNameOrMerge": MessageLookupByLibrary.simpleMessage(
+            "İsim ekleyin veya birleştirin"),
         "addNew": MessageLookupByLibrary.simpleMessage("Yeni ekle"),
+        "addNewPerson": MessageLookupByLibrary.simpleMessage("Yeni kişi ekle"),
         "addOnPageSubtitle":
             MessageLookupByLibrary.simpleMessage("Eklentilerin ayrıntıları"),
-        "addOnValidTill": m11,
+        "addOnValidTill": m12,
         "addOns": MessageLookupByLibrary.simpleMessage("Eklentiler"),
         "addPhotos": MessageLookupByLibrary.simpleMessage("Fotoğraf ekle"),
         "addSelected": MessageLookupByLibrary.simpleMessage("Seçileni ekle"),
         "addToAlbum": MessageLookupByLibrary.simpleMessage("Albüme ekle"),
+        "addToEnte": MessageLookupByLibrary.simpleMessage("Ente\'ye ekle"),
         "addToHiddenAlbum":
             MessageLookupByLibrary.simpleMessage("Gizli albüme ekle"),
+        "addTrustedContact":
+            MessageLookupByLibrary.simpleMessage("Güvenilir kişi ekle"),
         "addViewer": MessageLookupByLibrary.simpleMessage("Görüntüleyici ekle"),
-        "addViewers": m12,
+        "addViewers": m13,
         "addYourPhotosNow": MessageLookupByLibrary.simpleMessage(
             "Fotoğraflarınızı şimdi ekleyin"),
         "addedAs": MessageLookupByLibrary.simpleMessage("Eklendi"),
-        "addedBy": m13,
-        "addedSuccessfullyTo": m14,
+        "addedBy": m14,
+        "addedSuccessfullyTo": m15,
         "addingToFavorites":
             MessageLookupByLibrary.simpleMessage("Favorilere ekleniyor..."),
         "advanced": MessageLookupByLibrary.simpleMessage("Gelişmiş"),
@@ -238,7 +340,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "after1Week": MessageLookupByLibrary.simpleMessage("1 hafta sonra"),
         "after1Year": MessageLookupByLibrary.simpleMessage("1 yıl sonra"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("Sahip"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumTitle": MessageLookupByLibrary.simpleMessage("Albüm Başlığı"),
         "albumUpdated":
             MessageLookupByLibrary.simpleMessage("Albüm güncellendi"),
@@ -246,14 +348,23 @@ class MessageLookup extends MessageLookupByLibrary {
         "allClear": MessageLookupByLibrary.simpleMessage("✨ Tamamen temizle"),
         "allMemoriesPreserved":
             MessageLookupByLibrary.simpleMessage("Tüm anılar saklandı"),
+        "allPersonGroupingWillReset": MessageLookupByLibrary.simpleMessage(
+            "Bu kişi için tüm gruplamalar sıfırlanacak ve bu kişi için yaptığınız tüm önerileri kaybedeceksiniz"),
+        "allow": MessageLookupByLibrary.simpleMessage("İzin ver"),
         "allowAddPhotosDescription": MessageLookupByLibrary.simpleMessage(
             "Bağlantıya sahip olan kişilere, paylaşılan albüme fotoğraf eklemelerine izin ver."),
         "allowAddingPhotos":
             MessageLookupByLibrary.simpleMessage("Fotoğraf eklemeye izin ver"),
+        "allowAppToOpenSharedAlbumLinks": MessageLookupByLibrary.simpleMessage(
+            "Uygulamanın paylaşılan albüm bağlantılarını açmasına izin ver"),
         "allowDownloads":
             MessageLookupByLibrary.simpleMessage("İndirmeye izin ver"),
         "allowPeopleToAddPhotos": MessageLookupByLibrary.simpleMessage(
             "Kullanıcıların fotoğraf eklemesine izin ver"),
+        "allowPermBody": MessageLookupByLibrary.simpleMessage(
+            "Ente\'nin kitaplığınızı görüntüleyebilmesi ve yedekleyebilmesi için lütfen Ayarlar\'dan fotoğraflarınıza erişime izin verin."),
+        "allowPermTitle": MessageLookupByLibrary.simpleMessage(
+            "Fotoğraflara erişime izin verin"),
         "androidBiometricHint":
             MessageLookupByLibrary.simpleMessage("Kimliği doğrula"),
         "androidBiometricNotRecognized":
@@ -275,7 +386,10 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Android, iOS, Web, Masaüstü"),
         "androidSignInTitle":
             MessageLookupByLibrary.simpleMessage("Kimlik doğrulaması gerekli"),
-        "appVersion": m16,
+        "appLock": MessageLookupByLibrary.simpleMessage("Uygulama kilidi"),
+        "appLockDescriptions": MessageLookupByLibrary.simpleMessage(
+            "Cihazınızın varsayılan kilit ekranı ile PIN veya parola içeren özel bir kilit ekranı arasında seçim yapın."),
+        "appVersion": m17,
         "appleId": MessageLookupByLibrary.simpleMessage("Apple kimliği"),
         "apply": MessageLookupByLibrary.simpleMessage("Uygula"),
         "applyCodeTitle": MessageLookupByLibrary.simpleMessage("Kodu girin"),
@@ -298,6 +412,9 @@ class MessageLookup extends MessageLookupByLibrary {
             "Çıkış yapmak istediğinize emin misiniz?"),
         "areYouSureYouWantToRenew": MessageLookupByLibrary.simpleMessage(
             "Yenilemek istediğinize emin misiniz?"),
+        "areYouSureYouWantToResetThisPerson":
+            MessageLookupByLibrary.simpleMessage(
+                "Bu kişiyi sıfırlamak istediğinden emin misin?"),
         "askCancelReason": MessageLookupByLibrary.simpleMessage(
             "Aboneliğiniz iptal edilmiştir. Bunun sebebini paylaşmak ister misiniz?"),
         "askDeleteReason": MessageLookupByLibrary.simpleMessage(
@@ -320,6 +437,12 @@ class MessageLookup extends MessageLookupByLibrary {
                 "İki faktörlü kimlik doğrulamayı yapılandırmak için lütfen kimlik doğrulaması yapın"),
         "authToInitiateAccountDeletion": MessageLookupByLibrary.simpleMessage(
             "Hesap silme işlemini başlatmak için lütfen kimlik doğrulaması yapın"),
+        "authToManageLegacy": MessageLookupByLibrary.simpleMessage(
+            "Güvenilir kişilerinizi yönetmek için lütfen kimlik doğrulaması yapın"),
+        "authToViewPasskey": MessageLookupByLibrary.simpleMessage(
+            "Geçiş anahtarınızı görüntülemek için lütfen kimlik doğrulaması yapın"),
+        "authToViewTrashedFiles": MessageLookupByLibrary.simpleMessage(
+            "Çöp dosyalarınızı görüntülemek için lütfen kimlik doğrulaması yapın"),
         "authToViewYourActiveSessions": MessageLookupByLibrary.simpleMessage(
             "Aktif oturumlarınızı görüntülemek için lütfen kimliğinizi doğrulayın"),
         "authToViewYourHiddenFiles": MessageLookupByLibrary.simpleMessage(
@@ -335,24 +458,47 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Kimlik doğrulama başarısız oldu, lütfen tekrar deneyin"),
         "authenticationSuccessful":
             MessageLookupByLibrary.simpleMessage("Kimlik doğrulama başarılı!"),
+        "autoCastDialogBody": MessageLookupByLibrary.simpleMessage(
+            "Mevcut Cast cihazlarını burada görebilirsiniz."),
+        "autoCastiOSPermission": MessageLookupByLibrary.simpleMessage(
+            "Ayarlar\'da Ente Photos uygulaması için Yerel Ağ izinlerinin açık olduğundan emin olun."),
+        "autoLock": MessageLookupByLibrary.simpleMessage("Otomatik Kilit"),
+        "autoLockFeatureDescription": MessageLookupByLibrary.simpleMessage(
+            "Uygulamayı arka plana attıktan sonra kilitlendiği süre"),
+        "autoLogoutMessage": MessageLookupByLibrary.simpleMessage(
+            "Teknik aksaklık nedeniyle oturumunuz kapatıldı. Verdiğimiz rahatsızlıktan dolayı özür dileriz."),
+        "autoPair": MessageLookupByLibrary.simpleMessage("Otomatik eşle"),
+        "autoPairDesc": MessageLookupByLibrary.simpleMessage(
+            "Otomatik eşleştirme yalnızca Chromecast destekleyen cihazlarla çalışır."),
         "available": MessageLookupByLibrary.simpleMessage("Mevcut"),
+        "availableStorageSpace": m18,
         "backedUpFolders":
             MessageLookupByLibrary.simpleMessage("Yedeklenmiş klasörler"),
         "backup": MessageLookupByLibrary.simpleMessage("Yedekle"),
         "backupFailed":
             MessageLookupByLibrary.simpleMessage("Yedekleme başarısız oldu"),
+        "backupFile": MessageLookupByLibrary.simpleMessage("Yedek Dosyası"),
         "backupOverMobileData":
             MessageLookupByLibrary.simpleMessage("Mobil veri ile yedekle"),
         "backupSettings":
             MessageLookupByLibrary.simpleMessage("Yedekleme seçenekleri"),
+        "backupStatus":
+            MessageLookupByLibrary.simpleMessage("Yedekleme durumu"),
+        "backupStatusDescription": MessageLookupByLibrary.simpleMessage(
+            "Eklenen öğeler burada görünecek"),
         "backupVideos":
             MessageLookupByLibrary.simpleMessage("Videolari yedekle"),
+        "birthday": MessageLookupByLibrary.simpleMessage("Doğum Günü"),
         "blackFridaySale":
             MessageLookupByLibrary.simpleMessage("Muhteşem Cuma kampanyası"),
         "blog": MessageLookupByLibrary.simpleMessage("Blog"),
         "cachedData":
             MessageLookupByLibrary.simpleMessage("Ön belleğe alınan veri"),
         "calculating": MessageLookupByLibrary.simpleMessage("Hesaplanıyor..."),
+        "canNotOpenBody": MessageLookupByLibrary.simpleMessage(
+            "Üzgünüz, Bu albüm uygulama içinde açılamadı."),
+        "canNotOpenTitle":
+            MessageLookupByLibrary.simpleMessage("Albüm açılamadı"),
         "canNotUploadToAlbumsOwnedByOthers":
             MessageLookupByLibrary.simpleMessage(
                 "Başkalarına ait albümlere yüklenemez"),
@@ -362,35 +508,64 @@ class MessageLookup extends MessageLookupByLibrary {
         "canOnlyRemoveFilesOwnedByYou": MessageLookupByLibrary.simpleMessage(
             "Yalnızca size ait dosyaları kaldırabilir"),
         "cancel": MessageLookupByLibrary.simpleMessage("İptal Et"),
-        "cancelOtherSubscription": m18,
+        "cancelAccountRecovery":
+            MessageLookupByLibrary.simpleMessage("Kurtarma işlemini iptal et"),
+        "cancelAccountRecoveryBody": MessageLookupByLibrary.simpleMessage(
+            "Kurtarmayı iptal etmek istediğinize emin misiniz?"),
+        "cancelOtherSubscription": m19,
         "cancelSubscription":
             MessageLookupByLibrary.simpleMessage("Abonelik iptali"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
         "cannotDeleteSharedFiles":
             MessageLookupByLibrary.simpleMessage("Dosyalar silinemiyor"),
+        "castAlbum": MessageLookupByLibrary.simpleMessage("Yayın albümü"),
+        "castIPMismatchBody": MessageLookupByLibrary.simpleMessage(
+            "Lütfen TV ile aynı ağda olduğunuzdan emin olun."),
+        "castIPMismatchTitle": MessageLookupByLibrary.simpleMessage(
+            "Albüm yüklenirken hata oluştu"),
         "castInstruction": MessageLookupByLibrary.simpleMessage(
             "Eşleştirmek istediğiniz cihazda cast.ente.io adresini ziyaret edin.\n\nAlbümü TV\'nizde oynatmak için aşağıdaki kodu girin."),
         "centerPoint": MessageLookupByLibrary.simpleMessage("Merkez noktası"),
+        "change": MessageLookupByLibrary.simpleMessage("Değiştir"),
         "changeEmail":
             MessageLookupByLibrary.simpleMessage("E-posta adresini değiştir"),
         "changeLocationOfSelectedItems": MessageLookupByLibrary.simpleMessage(
             "Seçilen öğelerin konumu değiştirilsin mi?"),
+        "changeLogBackupStatusContent": MessageLookupByLibrary.simpleMessage(
+            "Ente\'ye yüklenen tüm dosyaların, hatalar ve sıraya alınanlar da dahil olmak üzere bir günlüğünü ekledik."),
+        "changeLogBackupStatusTitle":
+            MessageLookupByLibrary.simpleMessage("Yedekleme Durumu"),
+        "changeLogDiscoverContent": MessageLookupByLibrary.simpleMessage(
+            "Kimlik kartlarınızın, notlarınızın ve hatta memlerinizin fotoğraflarını mı arıyorsunuz? Arama sekmesine gidin ve Keşfet\'e göz atın. Anlamsal aramamıza dayanarak, sizin için önemli olabilecek fotoğrafları bulabileceğiniz bir yerdir.\\n\\n Sadece Makine Öğrenimini etkinleştirdiyseniz kullanılabilir."),
+        "changeLogDiscoverTitle":
+            MessageLookupByLibrary.simpleMessage("Keşfet"),
+        "changeLogMagicSearchImprovementContent":
+            MessageLookupByLibrary.simpleMessage(
+                "Sihirli aramayı çok daha hızlı olacak şekilde geliştirdik, böylece aradığınızı bulmak için beklemek zorunda kalmazsınız."),
+        "changeLogMagicSearchImprovementTitle":
+            MessageLookupByLibrary.simpleMessage("Sihirli Arama İyileştirme"),
         "changePassword":
             MessageLookupByLibrary.simpleMessage("Sifrenizi değiştirin"),
         "changePasswordTitle":
             MessageLookupByLibrary.simpleMessage("Parolanızı değiştirin"),
         "changePermissions":
             MessageLookupByLibrary.simpleMessage("İzinleri değiştir?"),
+        "changeYourReferralCode": MessageLookupByLibrary.simpleMessage(
+            "Referans kodunuzu değiştirin"),
         "checkForUpdates":
             MessageLookupByLibrary.simpleMessage("Güncellemeleri kontol et"),
         "checkInboxAndSpamFolder": MessageLookupByLibrary.simpleMessage(
             "Lütfen doğrulama işlemini tamamlamak için gelen kutunuzu (ve spam klasörünüzü) kontrol edin"),
+        "checkStatus":
+            MessageLookupByLibrary.simpleMessage("Durumu kontrol et"),
         "checking": MessageLookupByLibrary.simpleMessage("Kontrol ediliyor..."),
+        "checkingModels": MessageLookupByLibrary.simpleMessage(
+            "Modelleri kontrol ediyorum..."),
         "claimFreeStorage":
             MessageLookupByLibrary.simpleMessage("Bedava alan talep edin"),
         "claimMore": MessageLookupByLibrary.simpleMessage("Arttır!"),
         "claimed": MessageLookupByLibrary.simpleMessage("Alındı"),
-        "claimedStorageSoFar": m19,
+        "claimedStorageSoFar": m20,
         "cleanUncategorized":
             MessageLookupByLibrary.simpleMessage("Temiz Genel"),
         "cleanUncategorizedDescription": MessageLookupByLibrary.simpleMessage(
@@ -406,32 +581,44 @@ class MessageLookup extends MessageLookupByLibrary {
             "Yakalama zamanına göre kulüp"),
         "clubByFileName":
             MessageLookupByLibrary.simpleMessage("Dosya adına göre kulüp"),
+        "clusteringProgress":
+            MessageLookupByLibrary.simpleMessage("Kümeleme ilerlemesi"),
         "codeAppliedPageTitle":
             MessageLookupByLibrary.simpleMessage("Kod kabul edildi"),
+        "codeChangeLimitReached": MessageLookupByLibrary.simpleMessage(
+            "Üzgünüz, kod değişikliklerinin sınırına ulaştınız."),
         "codeCopiedToClipboard":
             MessageLookupByLibrary.simpleMessage("Kodunuz panoya kopyalandı"),
         "codeUsedByYou":
             MessageLookupByLibrary.simpleMessage("Sizin kullandığınız kod"),
+        "collabLinkSectionDescription": MessageLookupByLibrary.simpleMessage(
+            "Ente aplikasyonu veya hesabı olmadan insanların paylaşılan albümde fotoğraf ekleyip görüntülemelerine izin vermek için bir bağlantı oluşturun. Grup veya etkinlik fotoğraflarını toplamak için harika bir seçenek."),
         "collaborativeLink":
             MessageLookupByLibrary.simpleMessage("Organizasyon bağlantısı"),
-        "collaborativeLinkCreatedFor": m20,
+        "collaborativeLinkCreatedFor": m21,
         "collaborator": MessageLookupByLibrary.simpleMessage("Düzenleyici"),
         "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Düzenleyiciler, paylaşılan albüme fotoğraf ve videolar ekleyebilir."),
+        "collaboratorsSuccessfullyAdded": m22,
         "collageLayout": MessageLookupByLibrary.simpleMessage("Düzen"),
         "collageSaved": MessageLookupByLibrary.simpleMessage(
             "Kolajınız galeriye kaydedildi"),
+        "collect": MessageLookupByLibrary.simpleMessage("Topla"),
         "collectEventPhotos": MessageLookupByLibrary.simpleMessage(
             "Etkinlik fotoğraflarını topla"),
         "collectPhotos":
             MessageLookupByLibrary.simpleMessage("Fotoğrafları topla"),
+        "collectPhotosDescription": MessageLookupByLibrary.simpleMessage(
+            "Arkadaşlarınızın orijinal kalitede fotoğraf yükleyebileceği bir bağlantı oluşturun."),
         "color": MessageLookupByLibrary.simpleMessage("Renk"),
+        "configuration": MessageLookupByLibrary.simpleMessage("Yapılandırma"),
         "confirm": MessageLookupByLibrary.simpleMessage("Onayla"),
         "confirm2FADisable": MessageLookupByLibrary.simpleMessage(
             "İki adımlı kimlik doğrulamasını devre dışı bırakmak istediğinize emin misiniz?"),
         "confirmAccountDeletion":
             MessageLookupByLibrary.simpleMessage("Hesap silme işlemini onayla"),
+        "confirmAddingTrustedContact": m23,
         "confirmDeletePrompt": MessageLookupByLibrary.simpleMessage(
             "Evet, bu hesabı ve verilerini tüm uygulamalardan kalıcı olarak silmek istiyorum."),
         "confirmPassword":
@@ -442,10 +629,12 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Kurtarma anahtarını doğrula"),
         "confirmYourRecoveryKey": MessageLookupByLibrary.simpleMessage(
             "Kurtarma anahtarını doğrulayın"),
-        "contactFamilyAdmin": m23,
+        "connectToDevice":
+            MessageLookupByLibrary.simpleMessage("Cihaza bağlanın"),
+        "contactFamilyAdmin": m24,
         "contactSupport":
             MessageLookupByLibrary.simpleMessage("Destek ile iletişim"),
-        "contactToManageSubscription": m24,
+        "contactToManageSubscription": m25,
         "contacts": MessageLookupByLibrary.simpleMessage("Kişiler"),
         "contents": MessageLookupByLibrary.simpleMessage("İçerikler"),
         "continueLabel": MessageLookupByLibrary.simpleMessage("Devam edin"),
@@ -472,6 +661,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Hesap oluşturun"),
         "createAlbumActionHint": MessageLookupByLibrary.simpleMessage(
             "Fotoğrafları seçmek için uzun basın ve + düğmesine tıklayarak bir albüm oluşturun"),
+        "createCollaborativeLink":
+            MessageLookupByLibrary.simpleMessage("Ortak bağlantı oluşturun"),
         "createCollage": MessageLookupByLibrary.simpleMessage("Kolaj oluştur"),
         "createNewAccount":
             MessageLookupByLibrary.simpleMessage("Yeni bir hesap oluşturun"),
@@ -483,13 +674,18 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Bağlantı oluşturuluyor..."),
         "criticalUpdateAvailable":
             MessageLookupByLibrary.simpleMessage("Kritik güncelleme mevcut"),
+        "crop": MessageLookupByLibrary.simpleMessage("Kırp"),
         "currentUsageIs":
             MessageLookupByLibrary.simpleMessage("Güncel kullanımınız "),
+        "currentlyRunning":
+            MessageLookupByLibrary.simpleMessage("şu anda çalışıyor"),
         "custom": MessageLookupByLibrary.simpleMessage("Kişisel"),
-        "customEndpoint": m25,
+        "customEndpoint": m26,
         "darkTheme": MessageLookupByLibrary.simpleMessage("Karanlık"),
         "dayToday": MessageLookupByLibrary.simpleMessage("Bugün"),
         "dayYesterday": MessageLookupByLibrary.simpleMessage("Dün"),
+        "declineTrustInvite":
+            MessageLookupByLibrary.simpleMessage("Daveti Reddet"),
         "decrypting":
             MessageLookupByLibrary.simpleMessage("Şifre çözülüyor..."),
         "decryptingVideo": MessageLookupByLibrary.simpleMessage(
@@ -508,6 +704,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "deleteAlbumsDialogBody": MessageLookupByLibrary.simpleMessage(
             "Bu, tüm boş albümleri silecektir. Bu, albüm listenizdeki dağınıklığı azaltmak istediğinizde kullanışlıdır."),
         "deleteAll": MessageLookupByLibrary.simpleMessage("Hepsini Sil"),
+        "deleteConfirmDialogBody": MessageLookupByLibrary.simpleMessage(
+            "Kullandığınız Ente uygulamaları varsa bu hesap diğer Ente uygulamalarıyla bağlantılıdır. Tüm Ente uygulamalarına yüklediğiniz veriler ve hesabınız kalıcı olarak silinecektir."),
         "deleteEmailRequest": MessageLookupByLibrary.simpleMessage(
             "Lütfen kayıtlı e-posta adresinizden <warning>account-deletion@ente.io</warning>\'a e-posta gönderiniz."),
         "deleteEmptyAlbums":
@@ -518,11 +716,12 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Her ikisinden de sil"),
         "deleteFromDevice":
             MessageLookupByLibrary.simpleMessage("Cihazınızdan silin"),
-        "deleteItemCount": m26,
+        "deleteFromEnte": MessageLookupByLibrary.simpleMessage("Ente\'den Sil"),
+        "deleteItemCount": m27,
         "deleteLocation": MessageLookupByLibrary.simpleMessage("Konumu sil"),
         "deletePhotos":
             MessageLookupByLibrary.simpleMessage("Fotoğrafları sil"),
-        "deleteProgress": m27,
+        "deleteProgress": m28,
         "deleteReason1": MessageLookupByLibrary.simpleMessage(
             "İhtiyacım olan önemli bir özellik eksik"),
         "deleteReason2": MessageLookupByLibrary.simpleMessage(
@@ -547,6 +746,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "developerSettingsWarning": MessageLookupByLibrary.simpleMessage(
             "Geliştirici ayarlarını değiştirmek istediğinizden emin misiniz?"),
         "deviceCodeHint": MessageLookupByLibrary.simpleMessage("Kodu girin"),
+        "deviceFilesAutoUploading": MessageLookupByLibrary.simpleMessage(
+            "Bu cihazın albümüne eklenen dosyalar otomatik olarak ente\'ye yüklenecektir."),
+        "deviceLock": MessageLookupByLibrary.simpleMessage("Cihaz kilidi"),
+        "deviceLockExplanation": MessageLookupByLibrary.simpleMessage(
+            "Ente uygulaması önplanda calıştığında ve bir yedekleme işlemi devam ettiğinde, cihaz ekran kilidini devre dışı bırakın. Bu genellikle gerekli olmasa da, büyük dosyaların yüklenmesi ve büyük kütüphanelerin başlangıçta içe aktarılması sürecini hızlandırabilir."),
         "deviceNotFound":
             MessageLookupByLibrary.simpleMessage("Cihaz bulunamadı"),
         "didYouKnow": MessageLookupByLibrary.simpleMessage("Biliyor musun?"),
@@ -556,13 +760,34 @@ class MessageLookup extends MessageLookupByLibrary {
             "Görüntüleyiciler, hala harici araçlar kullanarak ekran görüntüsü alabilir veya fotoğraflarınızın bir kopyasını kaydedebilir. Lütfen bunu göz önünde bulundurunuz"),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("Lütfen dikkate alın"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "disableTwofactor": MessageLookupByLibrary.simpleMessage(
             "İki Aşamalı Doğrulamayı Devre Dışı Bırak"),
         "disablingTwofactorAuthentication":
             MessageLookupByLibrary.simpleMessage(
                 "İki aşamalı doğrulamayı devre dışı bırak..."),
         "discord": MessageLookupByLibrary.simpleMessage("Discord"),
+        "discover": MessageLookupByLibrary.simpleMessage("Keşfet"),
+        "discover_babies": MessageLookupByLibrary.simpleMessage("Bebekler"),
+        "discover_celebrations":
+            MessageLookupByLibrary.simpleMessage("Kutlamalar "),
+        "discover_food": MessageLookupByLibrary.simpleMessage("Yiyecek"),
+        "discover_greenery": MessageLookupByLibrary.simpleMessage("Yeşillik"),
+        "discover_hills": MessageLookupByLibrary.simpleMessage("Tepeler"),
+        "discover_identity": MessageLookupByLibrary.simpleMessage("Kimlik"),
+        "discover_memes": MessageLookupByLibrary.simpleMessage("Mimler"),
+        "discover_notes": MessageLookupByLibrary.simpleMessage("Notlar"),
+        "discover_pets":
+            MessageLookupByLibrary.simpleMessage("Evcil Hayvanlar"),
+        "discover_receipts": MessageLookupByLibrary.simpleMessage("Makbuzlar"),
+        "discover_screenshots":
+            MessageLookupByLibrary.simpleMessage("Ekran Görüntüleri"),
+        "discover_selfies": MessageLookupByLibrary.simpleMessage("Özçekimler"),
+        "discover_sunset": MessageLookupByLibrary.simpleMessage("Gün batımı"),
+        "discover_visiting_cards":
+            MessageLookupByLibrary.simpleMessage("Ziyaret Kartları"),
+        "discover_wallpapers":
+            MessageLookupByLibrary.simpleMessage("Duvar Kağıtları"),
         "dismiss": MessageLookupByLibrary.simpleMessage("Reddet"),
         "distanceInKMUnit": MessageLookupByLibrary.simpleMessage("km"),
         "doNotSignOut": MessageLookupByLibrary.simpleMessage("Çıkış yapma"),
@@ -571,19 +796,21 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Yaptığınız düzenlemeleri silmek istiyor musunuz?"),
         "done": MessageLookupByLibrary.simpleMessage("Bitti"),
+        "dontSave": MessageLookupByLibrary.simpleMessage("Kaydetme"),
         "doubleYourStorage": MessageLookupByLibrary.simpleMessage(
             "Depolama alanınızı ikiye katlayın"),
         "download": MessageLookupByLibrary.simpleMessage("İndir"),
         "downloadFailed":
             MessageLookupByLibrary.simpleMessage("İndirme başarısız"),
         "downloading": MessageLookupByLibrary.simpleMessage("İndiriliyor..."),
-        "dropSupportEmail": m29,
-        "duplicateFileCountWithStorageSaved": m30,
-        "duplicateItemsGroup": m31,
+        "dropSupportEmail": m30,
+        "duplicateFileCountWithStorageSaved": m31,
+        "duplicateItemsGroup": m32,
         "edit": MessageLookupByLibrary.simpleMessage("Düzenle"),
         "editLocation": MessageLookupByLibrary.simpleMessage("Konumu düzenle"),
         "editLocationTagTitle":
             MessageLookupByLibrary.simpleMessage("Konumu düzenle"),
+        "editPerson": MessageLookupByLibrary.simpleMessage("Kişiyi Düzenle"),
         "editsSaved":
             MessageLookupByLibrary.simpleMessage("Düzenleme kaydedildi"),
         "editsToLocationWillOnlyBeSeenWithinEnte":
@@ -591,19 +818,32 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Konumda yapılan düzenlemeler yalnızca Ente\'de görülecektir"),
         "eligible": MessageLookupByLibrary.simpleMessage("uygun"),
         "email": MessageLookupByLibrary.simpleMessage("E-Posta"),
-        "emailChangedTo": m32,
-        "emailNoEnteAccount": m33,
+        "emailAlreadyRegistered": MessageLookupByLibrary.simpleMessage(
+            "Bu e-posta adresi zaten kayıtlı."),
+        "emailChangedTo": m33,
+        "emailDoesNotHaveEnteAccount": m34,
+        "emailNoEnteAccount": m35,
+        "emailNotRegistered": MessageLookupByLibrary.simpleMessage(
+            "Bu e-posta adresi sistemde kayıtlı değil."),
         "emailVerificationToggle":
             MessageLookupByLibrary.simpleMessage("E-posta doğrulama"),
         "emailYourLogs": MessageLookupByLibrary.simpleMessage(
             "Günlüklerinizi e-postayla gönderin"),
+        "emergencyContacts": MessageLookupByLibrary.simpleMessage(
+            "Acil Durum İletişim Bilgileri"),
         "empty": MessageLookupByLibrary.simpleMessage("Boşalt"),
         "emptyTrash":
             MessageLookupByLibrary.simpleMessage("Çöp kutusu boşaltılsın mı?"),
+        "enable": MessageLookupByLibrary.simpleMessage("Etkinleştir"),
+        "enableMLIndexingDesc": MessageLookupByLibrary.simpleMessage(
+            "Ente, yüz tanıma, sihirli arama ve diğer gelişmiş arama özellikleri için cihaz üzerinde makine öğrenimini destekler"),
+        "enableMachineLearningBanner": MessageLookupByLibrary.simpleMessage(
+            "Sihirli arama ve yüz tanıma için makine öğrenimini etkinleştirin"),
         "enableMaps":
             MessageLookupByLibrary.simpleMessage("Haritaları Etkinleştir"),
         "enableMapsDesc": MessageLookupByLibrary.simpleMessage(
             "Bu, fotoğraflarınızı bir dünya haritasında gösterecektir.\n\nBu harita Open Street Map tarafından barındırılmaktadır ve fotoğraflarınızın tam konumları hiçbir zaman paylaşılmaz.\n\nBu özelliği istediğiniz zaman Ayarlar\'dan devre dışı bırakabilirsiniz."),
+        "enabled": MessageLookupByLibrary.simpleMessage("Etkin"),
         "encryptingBackup":
             MessageLookupByLibrary.simpleMessage("Yedekleme şifreleniyor..."),
         "encryption": MessageLookupByLibrary.simpleMessage("Şifreleme"),
@@ -613,8 +853,13 @@ class MessageLookup extends MessageLookupByLibrary {
             "Fatura başarıyla güncellendi"),
         "endtoendEncryptedByDefault": MessageLookupByLibrary.simpleMessage(
             "Varsayılan olarak uçtan uca şifrelenmiş"),
+        "enteCanEncryptAndPreserveFilesOnlyIfYouGrant":
+            MessageLookupByLibrary.simpleMessage(
+                "Ente dosyaları yalnızca erişim izni verdiğiniz takdirde şifreleyebilir ve koruyabilir"),
         "entePhotosPerm": MessageLookupByLibrary.simpleMessage(
             "Ente fotoğrafları saklamak için <i>iznine ihtiyaç duyuyor</i>"),
+        "enteSubscriptionPitch": MessageLookupByLibrary.simpleMessage(
+            "Ente anılarınızı korur, böylece cihazınızı kaybetseniz bile anılarınıza her zaman ulaşabilirsiniz."),
         "enteSubscriptionShareWithFamily": MessageLookupByLibrary.simpleMessage(
             "Aileniz de planınıza eklenebilir."),
         "enterAlbumName":
@@ -622,16 +867,22 @@ class MessageLookup extends MessageLookupByLibrary {
         "enterCode": MessageLookupByLibrary.simpleMessage("Kodu giriniz"),
         "enterCodeDescription": MessageLookupByLibrary.simpleMessage(
             "Arkadaşınız tarafından sağlanan kodu girerek hem sizin hem de arkadaşınızın ücretsiz depolamayı talep etmek için girin"),
+        "enterDateOfBirth":
+            MessageLookupByLibrary.simpleMessage("Doğum Günü (isteğe bağlı)"),
         "enterEmail":
             MessageLookupByLibrary.simpleMessage("E-postanızı giriniz"),
         "enterFileName":
             MessageLookupByLibrary.simpleMessage("Dosya adını girin"),
+        "enterName": MessageLookupByLibrary.simpleMessage("İsim girin"),
         "enterNewPasswordToEncrypt": MessageLookupByLibrary.simpleMessage(
             "Verilerinizi şifrelemek için kullanabileceğimiz yeni bir şifre girin"),
         "enterPassword":
             MessageLookupByLibrary.simpleMessage("Şifrenizi girin"),
         "enterPasswordToEncrypt": MessageLookupByLibrary.simpleMessage(
             "Verilerinizi şifrelemek için kullanabileceğimiz bir şifre girin"),
+        "enterPersonName":
+            MessageLookupByLibrary.simpleMessage("Kişi ismini giriniz"),
+        "enterPin": MessageLookupByLibrary.simpleMessage("PIN Girin"),
         "enterReferralCode":
             MessageLookupByLibrary.simpleMessage("Davet kodunuzu girin"),
         "enterThe6digitCodeFromnyourAuthenticatorApp":
@@ -656,65 +907,94 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Günlüğü dışa aktar"),
         "exportYourData":
             MessageLookupByLibrary.simpleMessage("Veriyi dışarı aktar"),
+        "extraPhotosFound":
+            MessageLookupByLibrary.simpleMessage("Ekstra fotoğraflar bulundu"),
+        "extraPhotosFoundFor": m36,
+        "faceNotClusteredYet": MessageLookupByLibrary.simpleMessage(
+            "Yüz henüz kümelenmedi, lütfen daha sonra tekrar gelin"),
+        "faceRecognition": MessageLookupByLibrary.simpleMessage("Yüz Tanıma"),
         "faces": MessageLookupByLibrary.simpleMessage("Yüzler"),
+        "failed": MessageLookupByLibrary.simpleMessage("Başarısız oldu"),
         "failedToApplyCode":
             MessageLookupByLibrary.simpleMessage("Uygulanırken hata oluştu"),
         "failedToCancel": MessageLookupByLibrary.simpleMessage(
             "İptal edilirken sorun oluştu"),
         "failedToDownloadVideo":
             MessageLookupByLibrary.simpleMessage("Video indirilemedi"),
+        "failedToFetchActiveSessions": MessageLookupByLibrary.simpleMessage(
+            "Etkin oturumlar getirilemedi"),
         "failedToFetchOriginalForEdit": MessageLookupByLibrary.simpleMessage(
             "Düzenleme için orijinal getirilemedi"),
         "failedToFetchReferralDetails": MessageLookupByLibrary.simpleMessage(
             "Davet ayrıntıları çekilemedi. Iütfen daha sonra deneyin."),
         "failedToLoadAlbums": MessageLookupByLibrary.simpleMessage(
             "Albüm yüklenirken hata oluştu"),
+        "failedToPlayVideo":
+            MessageLookupByLibrary.simpleMessage("Video oynatılamadı"),
+        "failedToRefreshStripeSubscription":
+            MessageLookupByLibrary.simpleMessage("Abonelik yenilenemedi"),
         "failedToRenew": MessageLookupByLibrary.simpleMessage(
             "Abonelik yenilenirken hata oluştu"),
         "failedToVerifyPaymentStatus":
             MessageLookupByLibrary.simpleMessage("Ödeme durumu doğrulanamadı"),
+        "familyPlanOverview": MessageLookupByLibrary.simpleMessage(
+            "Ekstra ödeme yapmadan mevcut planınıza 5 aile üyesi ekleyin.\n\nHer üyenin kendine ait özel alanı vardır ve paylaşılmadıkça birbirlerinin dosyalarını göremezler.\n\nAile planları ücretli ente aboneliğine sahip müşteriler tarafından kullanılabilir.\n\nBaşlamak için şimdi abone olun!"),
         "familyPlanPortalTitle": MessageLookupByLibrary.simpleMessage("Aile"),
         "familyPlans": MessageLookupByLibrary.simpleMessage("Aile Planı"),
         "faq": MessageLookupByLibrary.simpleMessage("Sıkça sorulan sorular"),
         "faqs": MessageLookupByLibrary.simpleMessage("Sık sorulanlar"),
         "favorite": MessageLookupByLibrary.simpleMessage("Favori"),
         "feedback": MessageLookupByLibrary.simpleMessage("Geri Bildirim"),
+        "file": MessageLookupByLibrary.simpleMessage("Dosya"),
         "fileFailedToSaveToGallery": MessageLookupByLibrary.simpleMessage(
             "Dosya galeriye kaydedilemedi"),
         "fileInfoAddDescHint":
             MessageLookupByLibrary.simpleMessage("Bir açıklama ekle..."),
+        "fileNotUploadedYet":
+            MessageLookupByLibrary.simpleMessage("Dosya henüz yüklenmedi"),
         "fileSavedToGallery":
             MessageLookupByLibrary.simpleMessage("Video galeriye kaydedildi"),
         "fileTypes": MessageLookupByLibrary.simpleMessage("Dosya türü"),
         "fileTypesAndNames":
             MessageLookupByLibrary.simpleMessage("Dosya türleri ve adları"),
-        "filesBackedUpFromDevice": m35,
-        "filesBackedUpInAlbum": m36,
+        "filesBackedUpFromDevice": m37,
+        "filesBackedUpInAlbum": m38,
         "filesDeleted":
             MessageLookupByLibrary.simpleMessage("Dosyalar silinmiş"),
+        "filesSavedToGallery": MessageLookupByLibrary.simpleMessage(
+            "Dosyalar galeriye kaydedildi"),
+        "findPeopleByName": MessageLookupByLibrary.simpleMessage(
+            "Kişileri isimlere göre çabucak bulun"),
+        "findThemQuickly":
+            MessageLookupByLibrary.simpleMessage("Onları çabucak bulun"),
         "flip": MessageLookupByLibrary.simpleMessage("Çevir"),
         "forYourMemories":
             MessageLookupByLibrary.simpleMessage("anıların için"),
         "forgotPassword":
             MessageLookupByLibrary.simpleMessage("Şifremi unuttum"),
+        "foundFaces": MessageLookupByLibrary.simpleMessage("Yüzler bulundu"),
         "freeStorageClaimed":
             MessageLookupByLibrary.simpleMessage("Alınan bedava alan"),
         "freeStorageOnReferralSuccess": m4,
         "freeStorageUsable":
             MessageLookupByLibrary.simpleMessage("Kullanılabilir bedava alan"),
         "freeTrial": MessageLookupByLibrary.simpleMessage("Ücretsiz deneme"),
-        "freeTrialValidTill": m37,
-        "freeUpAmount": m39,
+        "freeTrialValidTill": m39,
+        "freeUpAccessPostDelete": m40,
+        "freeUpAmount": m41,
         "freeUpDeviceSpace":
             MessageLookupByLibrary.simpleMessage("Cihaz alanını boşaltın"),
+        "freeUpDeviceSpaceDesc": MessageLookupByLibrary.simpleMessage(
+            "Zaten yedeklenmiş dosyaları temizleyerek cihazınızda yer kazanın."),
         "freeUpSpace": MessageLookupByLibrary.simpleMessage("Boş alan"),
-        "freeUpSpaceSaving": m40,
+        "freeUpSpaceSaving": m42,
+        "gallery": MessageLookupByLibrary.simpleMessage("Galeri"),
         "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage(
             "Galeride 1000\'e kadar anı gösterilir"),
         "general": MessageLookupByLibrary.simpleMessage("Genel"),
         "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage(
             "Şifreleme anahtarı oluşturuluyor..."),
-        "genericProgress": m41,
+        "genericProgress": m43,
         "goToSettings": MessageLookupByLibrary.simpleMessage("Ayarlara git"),
         "googlePlayId":
             MessageLookupByLibrary.simpleMessage("Google play kimliği"),
@@ -724,6 +1004,9 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("İzinleri değiştir"),
         "groupNearbyPhotos": MessageLookupByLibrary.simpleMessage(
             "Yakındaki fotoğrafları gruplandır"),
+        "guestView": MessageLookupByLibrary.simpleMessage("Misafir Görünümü"),
+        "guestViewEnablePreSteps": MessageLookupByLibrary.simpleMessage(
+            "Misafir görünümünü etkinleştirmek için lütfen sistem ayarlarınızda cihaz şifresi veya ekran kilidi ayarlayın."),
         "hearUsExplanation": MessageLookupByLibrary.simpleMessage(
             "Biz uygulama kurulumlarını takip etmiyoruz. Bizi nereden duyduğunuzdan bahsetmeniz bize çok yardımcı olacak!"),
         "hearUsWhereTitle": MessageLookupByLibrary.simpleMessage(
@@ -731,6 +1014,13 @@ class MessageLookup extends MessageLookupByLibrary {
         "help": MessageLookupByLibrary.simpleMessage("Yardım"),
         "hidden": MessageLookupByLibrary.simpleMessage("Gizle"),
         "hide": MessageLookupByLibrary.simpleMessage("Gizle"),
+        "hideContent": MessageLookupByLibrary.simpleMessage("İçeriği gizle"),
+        "hideContentDescriptionAndroid": MessageLookupByLibrary.simpleMessage(
+            "Uygulama değiştiricide bulunan uygulama içeriğini gizler ve ekran görüntülerini devre dışı bırakır"),
+        "hideContentDescriptionIos": MessageLookupByLibrary.simpleMessage(
+            "Uygulama değiştiricideki uygulama içeriğini gizler"),
+        "hideSharedItemsFromHomeGallery": MessageLookupByLibrary.simpleMessage(
+            "Paylaşılan öğeleri ana galeriden gizle"),
         "hiding": MessageLookupByLibrary.simpleMessage("Gizleniyor..."),
         "hostedAtOsmFrance":
             MessageLookupByLibrary.simpleMessage("OSM Fransa\'da ağırlandı"),
@@ -743,6 +1033,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Biyometrik kimlik doğrulama devre dışı. Etkinleştirmek için lütfen ekranınızı kilitleyin ve kilidini açın."),
         "iOSOkButton": MessageLookupByLibrary.simpleMessage("Tamam"),
         "ignoreUpdate": MessageLookupByLibrary.simpleMessage("Yoksay"),
+        "ignored": MessageLookupByLibrary.simpleMessage("yoksayıldı"),
+        "ignoredFolderUploadReason": MessageLookupByLibrary.simpleMessage(
+            "Bu albümdeki bazı dosyalar daha önce ente\'den silindiğinden yükleme işleminde göz ardı edildi."),
+        "imageNotAnalyzed":
+            MessageLookupByLibrary.simpleMessage("Görüntü analiz edilmedi"),
+        "immediately": MessageLookupByLibrary.simpleMessage("Hemen"),
         "importing":
             MessageLookupByLibrary.simpleMessage("İçeri aktarılıyor...."),
         "incorrectCode": MessageLookupByLibrary.simpleMessage("Yanlış kod"),
@@ -756,6 +1052,10 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Yanlış kurtarma kodu"),
         "indexedItems":
             MessageLookupByLibrary.simpleMessage("Yeni öğeleri indeksle"),
+        "indexingIsPaused": MessageLookupByLibrary.simpleMessage(
+            "İndeksleme duraklatılmıştır. Cihaz hazır olduğunda otomatik olarak devam edecektir."),
+        "ineligible": MessageLookupByLibrary.simpleMessage("Uygun Değil"),
+        "info": MessageLookupByLibrary.simpleMessage("Bilgi"),
         "insecureDevice":
             MessageLookupByLibrary.simpleMessage("Güvenilir olmayan cihaz"),
         "installManually":
@@ -770,17 +1070,29 @@ class MessageLookup extends MessageLookupByLibrary {
         "invalidRecoveryKey": MessageLookupByLibrary.simpleMessage(
             "Girdiğiniz kurtarma anahtarı geçerli değil. Lütfen anahtarın 24 kelime içerdiğinden ve her bir kelimenin doğru şekilde yazıldığından emin olun.\n\nEğer eski bir kurtarma kodu girdiyseniz, o zaman kodun 64 karakter uzunluğunda olduğunu kontrol edin."),
         "invite": MessageLookupByLibrary.simpleMessage("Davet et"),
+        "inviteToEnte":
+            MessageLookupByLibrary.simpleMessage("Ente\'ye davet edin"),
         "inviteYourFriends":
             MessageLookupByLibrary.simpleMessage("Arkadaşlarını davet et"),
+        "inviteYourFriendsToEnte": MessageLookupByLibrary.simpleMessage(
+            "Katılmaları için arkadaşlarınızı davet edin"),
         "itLooksLikeSomethingWentWrongPleaseRetryAfterSome":
             MessageLookupByLibrary.simpleMessage(
                 "Bir şeyler ters gitmiş gibi görünüyor. Lütfen bir süre sonra tekrar deneyin. Hata devam ederse, lütfen destek ekibimizle iletişime geçin."),
-        "itemCount": m42,
+        "itemCount": m44,
         "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion":
             MessageLookupByLibrary.simpleMessage(
                 "Öğeler, kalıcı olarak silinmeden önce kalan gün sayısını gösterir"),
         "itemsWillBeRemovedFromAlbum": MessageLookupByLibrary.simpleMessage(
             "Seçilen öğeler bu albümden kaldırılacak"),
+        "join": MessageLookupByLibrary.simpleMessage("Katıl"),
+        "joinAlbum": MessageLookupByLibrary.simpleMessage("Albüme Katılın"),
+        "joinAlbumConfirmationDialogBody": MessageLookupByLibrary.simpleMessage(
+            "Bir albüme katılmak, e-postanızın katılımcılar tarafından görülebilmesini sağlayacaktır."),
+        "joinAlbumSubtext": MessageLookupByLibrary.simpleMessage(
+            "fotoğraflarınızı görüntülemek ve eklemek için"),
+        "joinAlbumSubtextViewer": MessageLookupByLibrary.simpleMessage(
+            "bunu paylaşılan albümlere eklemek için"),
         "joinDiscord": MessageLookupByLibrary.simpleMessage("Discord\'a Katıl"),
         "keepPhotos":
             MessageLookupByLibrary.simpleMessage("Fotoğrafları sakla"),
@@ -797,19 +1109,37 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Aile planından ayrıl"),
         "leaveSharedAlbum": MessageLookupByLibrary.simpleMessage(
             "Paylaşılan albüm silinsin mi?"),
+        "left": MessageLookupByLibrary.simpleMessage("Sol"),
+        "legacy": MessageLookupByLibrary.simpleMessage("Geleneksel"),
+        "legacyAccounts":
+            MessageLookupByLibrary.simpleMessage("Geleneksel hesaplar"),
+        "legacyInvite": m45,
+        "legacyPageDesc": MessageLookupByLibrary.simpleMessage(
+            "Geleneksel yol, güvendiğiniz kişilerin yokluğunuzda hesabınıza erişmesine olanak tanır."),
+        "legacyPageDesc2": MessageLookupByLibrary.simpleMessage(
+            "Güvenilir kişiler hesap kurtarma işlemini başlatabilir ve 30 gün içinde engellenmezse şifrenizi sıfırlayabilir ve hesabınıza erişebilir."),
         "light": MessageLookupByLibrary.simpleMessage("Aydınlık"),
         "lightTheme": MessageLookupByLibrary.simpleMessage("Aydınlık"),
+        "link": MessageLookupByLibrary.simpleMessage("Bağlantı"),
         "linkCopiedToClipboard":
             MessageLookupByLibrary.simpleMessage("Link panoya kopyalandı"),
         "linkDeviceLimit": MessageLookupByLibrary.simpleMessage("Cihaz limiti"),
+        "linkEmail": MessageLookupByLibrary.simpleMessage("E-posta bağlantısı"),
+        "linkEmailToContactBannerCaption":
+            MessageLookupByLibrary.simpleMessage("d"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("Geçerli"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("Süresi dolmuş"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry":
             MessageLookupByLibrary.simpleMessage("Linkin geçerliliği"),
         "linkHasExpired":
             MessageLookupByLibrary.simpleMessage("Bağlantının süresi dolmuş"),
         "linkNeverExpires": MessageLookupByLibrary.simpleMessage("Asla"),
+        "linkPerson": MessageLookupByLibrary.simpleMessage("Bağlantı kişisi"),
+        "linkPersonCaption": MessageLookupByLibrary.simpleMessage(
+            "daha iyi paylaşım deneyimi için"),
+        "linkPersonToEmail": m47,
+        "linkPersonToEmailConfirmation": m48,
         "livePhotos": MessageLookupByLibrary.simpleMessage("Canlı Fotoğraf"),
         "loadMessage1": MessageLookupByLibrary.simpleMessage(
             "Aboneliğinizi ailenizle paylaşabilirsiniz"),
@@ -837,7 +1167,13 @@ class MessageLookup extends MessageLookupByLibrary {
             "Fotoğraflarınız yükleniyor..."),
         "loadingModel":
             MessageLookupByLibrary.simpleMessage("Modeller indiriliyor..."),
+        "loadingYourPhotos": MessageLookupByLibrary.simpleMessage(
+            "Fotoğraflarınız yükleniyor..."),
         "localGallery": MessageLookupByLibrary.simpleMessage("Yerel galeri"),
+        "localIndexing":
+            MessageLookupByLibrary.simpleMessage("Yerel indeksleme"),
+        "localSyncErrorMessage": MessageLookupByLibrary.simpleMessage(
+            "Yerel fotoğraf senkronizasyonu beklenenden daha uzun sürdüğü için bir şeyler ters gitmiş gibi görünüyor. Lütfen destek ekibimize ulaşın"),
         "location": MessageLookupByLibrary.simpleMessage("Konum"),
         "locationName": MessageLookupByLibrary.simpleMessage("Konum Adı"),
         "locationTagFeatureDescription": MessageLookupByLibrary.simpleMessage(
@@ -848,8 +1184,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "logInLabel": MessageLookupByLibrary.simpleMessage("Giriş yap"),
         "loggingOut":
             MessageLookupByLibrary.simpleMessage("Çıkış yapılıyor..."),
+        "loginSessionExpired":
+            MessageLookupByLibrary.simpleMessage("Oturum süresi doldu"),
+        "loginSessionExpiredDetails": MessageLookupByLibrary.simpleMessage(
+            "Oturum süreniz doldu. Tekrar giriş yapın."),
         "loginTerms": MessageLookupByLibrary.simpleMessage(
             "\"Giriş yap\" düğmesine tıklayarak, <u-terms>Hizmet Şartları</u-terms>\'nı ve <u-policy>Gizlilik Politikası</u-policy>\'nı kabul ediyorum"),
+        "loginWithTOTP":
+            MessageLookupByLibrary.simpleMessage("TOTP ile giriş yap"),
         "logout": MessageLookupByLibrary.simpleMessage("Çıkış yap"),
         "logsDialogBody": MessageLookupByLibrary.simpleMessage(
             "Bu, sorununuzu gidermemize yardımcı olmak için günlükleri gönderecektir. Belirli dosyalarla ilgili sorunların izlenmesine yardımcı olmak için dosya adlarının ekleneceğini lütfen unutmayın."),
@@ -859,23 +1201,52 @@ class MessageLookup extends MessageLookupByLibrary {
         "longpressOnAnItemToViewInFullscreen":
             MessageLookupByLibrary.simpleMessage(
                 "Tam ekranda görüntülemek için bir öğeye uzun basın"),
+        "loopVideoOff":
+            MessageLookupByLibrary.simpleMessage("Video Döngüsü Kapalı"),
+        "loopVideoOn":
+            MessageLookupByLibrary.simpleMessage("Video Döngüsü Açık"),
         "lostDevice":
             MessageLookupByLibrary.simpleMessage("Cihazı kayıp mı ettiniz?"),
         "machineLearning":
             MessageLookupByLibrary.simpleMessage("Makine öğrenimi"),
         "magicSearch": MessageLookupByLibrary.simpleMessage("Sihirli arama"),
+        "magicSearchHint": MessageLookupByLibrary.simpleMessage(
+            "Sihirli arama, fotoğrafları içeriklerine göre aramanıza olanak tanır, örneğin \'çiçek\', \'kırmızı araba\', \'kimlik belgeleri\'"),
         "manage": MessageLookupByLibrary.simpleMessage("Yönet"),
+        "manageDeviceStorage":
+            MessageLookupByLibrary.simpleMessage("Cihaz önbelliğini yönet"),
+        "manageDeviceStorageDesc": MessageLookupByLibrary.simpleMessage(
+            "Yerel önbellek depolama alanını gözden geçirin ve temizleyin."),
         "manageFamily": MessageLookupByLibrary.simpleMessage("Aileyi yönet"),
         "manageLink": MessageLookupByLibrary.simpleMessage("Linki yönet"),
         "manageParticipants": MessageLookupByLibrary.simpleMessage("Yönet"),
         "manageSubscription":
             MessageLookupByLibrary.simpleMessage("Abonelikleri yönet"),
+        "manualPairDesc": MessageLookupByLibrary.simpleMessage(
+            "PIN ile eşleştirme, albümünüzü görüntülemek istediğiniz herhangi bir ekranla çalışır."),
         "map": MessageLookupByLibrary.simpleMessage("Harita"),
         "maps": MessageLookupByLibrary.simpleMessage("Haritalar"),
         "mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"),
         "matrix": MessageLookupByLibrary.simpleMessage("Matrix"),
+        "me": MessageLookupByLibrary.simpleMessage("Ben"),
         "memoryCount": m5,
         "merchandise": MessageLookupByLibrary.simpleMessage("Ürünler"),
+        "mergeWithExisting":
+            MessageLookupByLibrary.simpleMessage("Var olan ile birleştir."),
+        "mergedPhotos":
+            MessageLookupByLibrary.simpleMessage("Birleştirilmiş fotoğraflar"),
+        "mlConsent": MessageLookupByLibrary.simpleMessage(
+            "Makine öğrenimini etkinleştir"),
+        "mlConsentConfirmation": MessageLookupByLibrary.simpleMessage(
+            "Anladım, ve makine öğrenimini etkinleştirmek istiyorum"),
+        "mlConsentDescription": MessageLookupByLibrary.simpleMessage(
+            "Makine öğrenimini etkinleştirirseniz, Ente sizinle paylaşılanlar da dahil olmak üzere dosyalardan yüz geometrisi gibi bilgileri çıkarır.\n\nBu, cihazınızda gerçekleşecek ve oluşturulan tüm biyometrik bilgiler uçtan uca şifrelenecektir."),
+        "mlConsentPrivacy": MessageLookupByLibrary.simpleMessage(
+            "Gizlilik politikamızdaki bu özellik hakkında daha fazla ayrıntı için lütfen buraya tıklayın"),
+        "mlConsentTitle": MessageLookupByLibrary.simpleMessage(
+            "Makine öğrenimi etkinleştirilsin mi?"),
+        "mlIndexingDescription": MessageLookupByLibrary.simpleMessage(
+            "Tüm öğeler dizine eklenene kadar makine öğreniminin daha yüksek bant genişliği ve pil kullanımı ile sonuçlanacağını lütfen unutmayın. Daha hızlı indeksleme için masaüstü uygulamasını kullanmayı düşünün, tüm sonuçlar otomatik olarak senkronize edilecektir."),
         "mobileWebDesktop":
             MessageLookupByLibrary.simpleMessage("Mobil, Web, Masaüstü"),
         "moderateStrength": MessageLookupByLibrary.simpleMessage("Ilımlı"),
@@ -883,33 +1254,47 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Sorgunuzu değiştirin veya aramayı deneyin"),
         "moments": MessageLookupByLibrary.simpleMessage("Anlar"),
+        "month": MessageLookupByLibrary.simpleMessage("ay"),
         "monthly": MessageLookupByLibrary.simpleMessage("Aylık"),
-        "moveItem": m45,
+        "moreDetails": MessageLookupByLibrary.simpleMessage("Daha fazla detay"),
+        "mostRecent": MessageLookupByLibrary.simpleMessage("En son"),
+        "mostRelevant": MessageLookupByLibrary.simpleMessage("En alakalı"),
+        "moveItem": m49,
         "moveToAlbum": MessageLookupByLibrary.simpleMessage("Albüme taşı"),
         "moveToHiddenAlbum":
             MessageLookupByLibrary.simpleMessage("Gizli albüme ekle"),
-        "movedSuccessfullyTo": m46,
+        "movedSuccessfullyTo": m50,
         "movedToTrash":
             MessageLookupByLibrary.simpleMessage("Cöp kutusuna taşı"),
         "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
             "Dosyalar albüme taşınıyor..."),
         "name": MessageLookupByLibrary.simpleMessage("İsim"),
+        "nameTheAlbum": MessageLookupByLibrary.simpleMessage("Albüm İsmi"),
         "networkConnectionRefusedErr": MessageLookupByLibrary.simpleMessage(
             "Ente\'ye bağlanılamıyor. Lütfen bir süre sonra tekrar deneyin. Hata devam ederse lütfen desteğe başvurun."),
         "networkHostLookUpErr": MessageLookupByLibrary.simpleMessage(
             "Ente\'ye bağlanılamıyor. Lütfen ağ ayarlarınızı kontrol edin ve hata devam ederse destek ekibiyle iletişime geçin."),
         "never": MessageLookupByLibrary.simpleMessage("Asla"),
         "newAlbum": MessageLookupByLibrary.simpleMessage("Yeni albüm"),
+        "newLocation": MessageLookupByLibrary.simpleMessage("Yeni konum"),
+        "newPerson": MessageLookupByLibrary.simpleMessage("Yeni Kişi"),
+        "newToEnte": MessageLookupByLibrary.simpleMessage("Ente\'de yeniyim"),
         "newest": MessageLookupByLibrary.simpleMessage("En yeni"),
+        "next": MessageLookupByLibrary.simpleMessage("Sonraki"),
         "no": MessageLookupByLibrary.simpleMessage("Hayır"),
         "noAlbumsSharedByYouYet": MessageLookupByLibrary.simpleMessage(
             "Henüz paylaştığınız albüm yok"),
+        "noDeviceFound":
+            MessageLookupByLibrary.simpleMessage("Aygıt bulunamadı"),
         "noDeviceLimit": MessageLookupByLibrary.simpleMessage("Yok"),
         "noDeviceThatCanBeDeleted": MessageLookupByLibrary.simpleMessage(
             "Bu cihazda silinebilecek hiçbir dosyanız yok"),
         "noDuplicates":
             MessageLookupByLibrary.simpleMessage("Yinelenenleri kaldır"),
+        "noEnteAccountExclamation":
+            MessageLookupByLibrary.simpleMessage("Ente hesabı yok!"),
         "noExifData": MessageLookupByLibrary.simpleMessage("EXIF verisi yok"),
+        "noFacesFound": MessageLookupByLibrary.simpleMessage("Yüz bulunamadı"),
         "noHiddenPhotosOrVideos": MessageLookupByLibrary.simpleMessage(
             "Gizli fotoğraf veya video yok"),
         "noImagesWithLocation":
@@ -921,6 +1306,8 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Şu anda hiçbir fotoğraf yedeklenmiyor"),
         "noPhotosFoundHere":
             MessageLookupByLibrary.simpleMessage("Burada fotoğraf bulunamadı"),
+        "noQuickLinksSelected":
+            MessageLookupByLibrary.simpleMessage("Hızlı bağlantılar seçilmedi"),
         "noRecoveryKey":
             MessageLookupByLibrary.simpleMessage("Kurtarma kodunuz yok mu?"),
         "noRecoveryKeyNoDecryption": MessageLookupByLibrary.simpleMessage(
@@ -928,6 +1315,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "noResults": MessageLookupByLibrary.simpleMessage("Sonuç bulunamadı"),
         "noResultsFound":
             MessageLookupByLibrary.simpleMessage("Hiçbir sonuç bulunamadı"),
+        "noSuggestionsForPerson": m51,
+        "noSystemLockFound":
+            MessageLookupByLibrary.simpleMessage("Sistem kilidi bulunamadı"),
+        "notPersonLabel": m52,
         "nothingSharedWithYouYet": MessageLookupByLibrary.simpleMessage(
             "Henüz sizinle paylaşılan bir şey yok"),
         "nothingToSeeHere": MessageLookupByLibrary.simpleMessage(
@@ -937,22 +1328,38 @@ class MessageLookup extends MessageLookupByLibrary {
         "onDevice": MessageLookupByLibrary.simpleMessage("Bu cihaz"),
         "onEnte": MessageLookupByLibrary.simpleMessage(
             "<branding>ente</branding> üzerinde"),
+        "onlyFamilyAdminCanChangeCode": m53,
+        "onlyThem": MessageLookupByLibrary.simpleMessage("Sadece onlar"),
         "oops": MessageLookupByLibrary.simpleMessage("Hay aksi"),
         "oopsCouldNotSaveEdits": MessageLookupByLibrary.simpleMessage(
             "Hata! Düzenlemeler kaydedilemedi"),
         "oopsSomethingWentWrong": MessageLookupByLibrary.simpleMessage(
             "Hoop, Birşeyler yanlış gitti"),
+        "openAlbumInBrowser":
+            MessageLookupByLibrary.simpleMessage("Albümü tarayıcıda aç"),
+        "openAlbumInBrowserTitle": MessageLookupByLibrary.simpleMessage(
+            "Bu albüme fotoğraf eklemek için lütfen web uygulamasını kullanın"),
+        "openFile": MessageLookupByLibrary.simpleMessage("Dosyayı aç"),
         "openSettings": MessageLookupByLibrary.simpleMessage("Ayarları Açın"),
         "openTheItem": MessageLookupByLibrary.simpleMessage("• Öğeyi açın"),
         "openstreetmapContributors": MessageLookupByLibrary.simpleMessage(
             "© OpenStreetMap katkıda bululanlar"),
         "optionalAsShortAsYouLike": MessageLookupByLibrary.simpleMessage(
             "İsteğe bağlı, istediğiniz kadar kısa..."),
+        "orMergeWithExistingPerson": MessageLookupByLibrary.simpleMessage(
+            "Ya da mevcut olan ile birleştirin"),
         "orPickAnExistingOne":
             MessageLookupByLibrary.simpleMessage("Veya mevcut birini seçiniz"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
+        "orPickFromYourContacts": MessageLookupByLibrary.simpleMessage(
+            "veya kişilerinizden birini seçin"),
         "pair": MessageLookupByLibrary.simpleMessage("Eşleştir"),
+        "pairWithPin":
+            MessageLookupByLibrary.simpleMessage("PIN ile eşleştirin"),
+        "pairingComplete":
+            MessageLookupByLibrary.simpleMessage("Eşleştirme tamamlandı"),
+        "panorama": MessageLookupByLibrary.simpleMessage("Panorama"),
+        "passKeyPendingVerification":
+            MessageLookupByLibrary.simpleMessage("Doğrulama hala bekliyor"),
         "passkey": MessageLookupByLibrary.simpleMessage("Parola Anahtarı"),
         "passkeyAuthTitle":
             MessageLookupByLibrary.simpleMessage("Geçiş anahtarı doğrulaması"),
@@ -961,6 +1368,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Şifreniz başarılı bir şekilde değiştirildi"),
         "passwordLock": MessageLookupByLibrary.simpleMessage("Sifre kilidi"),
         "passwordStrength": m0,
+        "passwordStrengthInfo": MessageLookupByLibrary.simpleMessage(
+            "Parola gücü, parolanın uzunluğu, kullanılan karakterler ve parolanın en çok kullanılan ilk 10.000 parola arasında yer alıp almadığı dikkate alınarak hesaplanır"),
         "passwordWarning": MessageLookupByLibrary.simpleMessage(
             "Şifrelerinizi saklamıyoruz, bu yüzden unutursanız, <underline>verilerinizi deşifre edemeyiz</underline>"),
         "paymentDetails":
@@ -969,10 +1378,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Ödeme başarısız oldu"),
         "paymentFailedMessage": MessageLookupByLibrary.simpleMessage(
             "Maalesef ödemeniz başarısız oldu. Lütfen destekle iletişime geçin, size yardımcı olacağız!"),
-        "paymentFailedTalkToProvider": m50,
+        "paymentFailedTalkToProvider": m54,
         "pendingItems": MessageLookupByLibrary.simpleMessage("Bekleyen Öğeler"),
         "pendingSync":
             MessageLookupByLibrary.simpleMessage("Senkronizasyon bekleniyor"),
+        "people": MessageLookupByLibrary.simpleMessage("Kişiler"),
         "peopleUsingYourCode":
             MessageLookupByLibrary.simpleMessage("Kodunuzu kullananlar"),
         "permDeleteWarning": MessageLookupByLibrary.simpleMessage(
@@ -981,6 +1391,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Kalıcı olarak sil"),
         "permanentlyDeleteFromDevice": MessageLookupByLibrary.simpleMessage(
             "Cihazdan kalıcı olarak silinsin mi?"),
+        "personName": MessageLookupByLibrary.simpleMessage("Kişi Adı"),
         "photoDescriptions":
             MessageLookupByLibrary.simpleMessage("Fotoğraf Açıklaması"),
         "photoGridSize":
@@ -990,10 +1401,15 @@ class MessageLookup extends MessageLookupByLibrary {
         "photosAddedByYouWillBeRemovedFromTheAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Eklediğiniz fotoğraflar albümden kaldırılacak"),
+        "photosCount": m55,
         "pickCenterPoint":
             MessageLookupByLibrary.simpleMessage("Merkez noktasını seçin"),
         "pinAlbum": MessageLookupByLibrary.simpleMessage("Albümü sabitle"),
+        "pinLock": MessageLookupByLibrary.simpleMessage("Pin kilidi"),
         "playOnTv": MessageLookupByLibrary.simpleMessage("Albümü TV\'de oynat"),
+        "playOriginal": MessageLookupByLibrary.simpleMessage("Orijinali oynat"),
+        "playStoreFreeTrialValidTill": m56,
+        "playStream": MessageLookupByLibrary.simpleMessage("Akışı oynat"),
         "playstoreSubscription":
             MessageLookupByLibrary.simpleMessage("PlayStore aboneliği"),
         "pleaseCheckYourInternetConnectionAndTryAgain":
@@ -1005,12 +1421,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseContactSupportIfTheProblemPersists":
             MessageLookupByLibrary.simpleMessage(
                 "Bu hata devam ederse lütfen desteğe başvurun"),
-        "pleaseEmailUsAt": m53,
+        "pleaseEmailUsAt": m57,
         "pleaseGrantPermissions":
             MessageLookupByLibrary.simpleMessage("Lütfen izin ver"),
         "pleaseLoginAgain":
             MessageLookupByLibrary.simpleMessage("Lütfen tekrar giriş yapın"),
-        "pleaseSendTheLogsTo": m54,
+        "pleaseSelectQuickLinksToRemove": MessageLookupByLibrary.simpleMessage(
+            "Lütfen kaldırmak için hızlı bağlantıları seçin"),
+        "pleaseSendTheLogsTo": m58,
         "pleaseTryAgain":
             MessageLookupByLibrary.simpleMessage("Lütfen tekrar deneyiniz"),
         "pleaseVerifyTheCodeYouHaveEntered":
@@ -1037,20 +1455,37 @@ class MessageLookup extends MessageLookupByLibrary {
         "privateBackups":
             MessageLookupByLibrary.simpleMessage("Özel yedeklemeler"),
         "privateSharing": MessageLookupByLibrary.simpleMessage("Özel paylaşım"),
+        "proceed": MessageLookupByLibrary.simpleMessage("Devam edin"),
+        "processed": MessageLookupByLibrary.simpleMessage("İşlenen"),
+        "processing": MessageLookupByLibrary.simpleMessage("İşleniyor"),
+        "processingImport": m59,
+        "processingVideos":
+            MessageLookupByLibrary.simpleMessage("Videolar işleniyor"),
         "publicLinkCreated": MessageLookupByLibrary.simpleMessage(
             "Herkese açık link oluşturuldu"),
         "publicLinkEnabled": MessageLookupByLibrary.simpleMessage(
             "Herkese açık bağlantı aktive edildi"),
+        "queued": MessageLookupByLibrary.simpleMessage("Kuyrukta"),
         "quickLinks": MessageLookupByLibrary.simpleMessage("Hızlı Erişim"),
         "radius": MessageLookupByLibrary.simpleMessage("Yarıçap"),
         "raiseTicket": MessageLookupByLibrary.simpleMessage("Bileti artır"),
         "rateTheApp":
             MessageLookupByLibrary.simpleMessage("Uygulamaya puan verin"),
         "rateUs": MessageLookupByLibrary.simpleMessage("Bizi değerlendirin"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
+        "reassignMe":
+            MessageLookupByLibrary.simpleMessage("\"Ben \"i yeniden atayın"),
+        "reassignedToName": m61,
+        "reassigningLoading":
+            MessageLookupByLibrary.simpleMessage("Yeniden atama..."),
         "recover": MessageLookupByLibrary.simpleMessage("Kurtarma"),
         "recoverAccount": MessageLookupByLibrary.simpleMessage("Hesabı kurtar"),
         "recoverButton": MessageLookupByLibrary.simpleMessage("Kurtar"),
+        "recoveryAccount":
+            MessageLookupByLibrary.simpleMessage("Hesabı kurtar"),
+        "recoveryInitiated":
+            MessageLookupByLibrary.simpleMessage("Kurtarma başlatıldı"),
+        "recoveryInitiatedDesc": m62,
         "recoveryKey":
             MessageLookupByLibrary.simpleMessage("Kurtarma anahtarı"),
         "recoveryKeyCopiedToClipboard": MessageLookupByLibrary.simpleMessage(
@@ -1063,23 +1498,35 @@ class MessageLookup extends MessageLookupByLibrary {
             "Harika! Kurtarma anahtarınız geçerlidir. Doğrulama için teşekkür ederim.\n\nLütfen kurtarma anahtarınızı güvenli bir şekilde yedeklediğinizden emin olun."),
         "recoveryKeyVerified":
             MessageLookupByLibrary.simpleMessage("Kurtarma kodu doğrulandı"),
+        "recoveryKeyVerifyReason": MessageLookupByLibrary.simpleMessage(
+            "Kurtarma anahtarınız, şifrenizi unutmanız durumunda fotoğraflarınızı kurtarmanın tek yoludur. Kurtarma anahtarınızı Ayarlar > Hesap bölümünde bulabilirsiniz.\n\nDoğru kaydettiğinizi doğrulamak için lütfen kurtarma anahtarınızı buraya girin."),
+        "recoveryReady": m63,
         "recoverySuccessful":
             MessageLookupByLibrary.simpleMessage("Kurtarma başarılı!"),
+        "recoveryWarning": MessageLookupByLibrary.simpleMessage(
+            "Güvenilir bir kişi hesabınıza erişmeye çalışıyor"),
+        "recoveryWarningBody": m64,
         "recreatePasswordBody": MessageLookupByLibrary.simpleMessage(
             "Cihazınız, şifrenizi doğrulamak için yeterli güce sahip değil, ancak tüm cihazlarda çalışacak şekilde yeniden oluşturabiliriz.\n\nLütfen kurtarma anahtarınızı kullanarak giriş yapın ve şifrenizi yeniden oluşturun (istediğiniz takdirde aynı şifreyi tekrar kullanabilirsiniz)."),
         "recreatePasswordTitle": MessageLookupByLibrary.simpleMessage(
             "Sifrenizi tekrardan oluşturun"),
         "reddit": MessageLookupByLibrary.simpleMessage("Reddit"),
+        "reenterPassword":
+            MessageLookupByLibrary.simpleMessage("Şifrenizi tekrar girin"),
+        "reenterPin":
+            MessageLookupByLibrary.simpleMessage("PIN\'inizi tekrar girin"),
         "referFriendsAnd2xYourPlan": MessageLookupByLibrary.simpleMessage(
             "Arkadaşlarınıza önerin ve planınızı 2 katına çıkarın"),
         "referralStep1": MessageLookupByLibrary.simpleMessage(
             "1. Bu kodu arkadaşlarınıza verin"),
         "referralStep2": MessageLookupByLibrary.simpleMessage(
             "2. Ücretli bir plan için kaydolsunlar"),
-        "referralStep3": m60,
+        "referralStep3": m65,
         "referrals": MessageLookupByLibrary.simpleMessage("Referanslar"),
         "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage(
             "Davetler şu anda durmuş durumda"),
+        "rejectRecovery":
+            MessageLookupByLibrary.simpleMessage("Kurtarmayı reddet"),
         "remindToEmptyDeviceTrash": MessageLookupByLibrary.simpleMessage(
             "Ayrıca boşalan alanı talep etmek için \"Ayarlar\" -> \"Depolama\" bölümünden \"Son Silinenler \"i boşaltın"),
         "remindToEmptyEnteTrash": MessageLookupByLibrary.simpleMessage(
@@ -1092,20 +1539,32 @@ class MessageLookup extends MessageLookupByLibrary {
         "remove": MessageLookupByLibrary.simpleMessage("Kaldır"),
         "removeDuplicates":
             MessageLookupByLibrary.simpleMessage("Yinelenenleri kaldır"),
+        "removeDuplicatesDesc": MessageLookupByLibrary.simpleMessage(
+            "Tam olarak yinelenen dosyaları gözden geçirin ve kaldırın."),
         "removeFromAlbum":
             MessageLookupByLibrary.simpleMessage("Albümden çıkar"),
         "removeFromAlbumTitle":
             MessageLookupByLibrary.simpleMessage("Albümden çıkarılsın mı?"),
+        "removeFromFavorite":
+            MessageLookupByLibrary.simpleMessage("Favorilerden Kaldır"),
+        "removeInvite":
+            MessageLookupByLibrary.simpleMessage("Davetiyeyi kaldır"),
         "removeLink": MessageLookupByLibrary.simpleMessage("Linki kaldır"),
         "removeParticipant":
             MessageLookupByLibrary.simpleMessage("Katılımcıyı kaldır"),
-        "removeParticipantBody": m61,
+        "removeParticipantBody": m66,
+        "removePersonLabel":
+            MessageLookupByLibrary.simpleMessage("Kişi etiketini kaldırın"),
         "removePublicLink":
             MessageLookupByLibrary.simpleMessage("Herkese açık link oluştur"),
+        "removePublicLinks":
+            MessageLookupByLibrary.simpleMessage("Herkese açık link oluştur"),
         "removeShareItemsWarning": MessageLookupByLibrary.simpleMessage(
             "Kaldırdığınız öğelerden bazıları başkaları tarafından eklenmiştir ve bunlara erişiminizi kaybedeceksiniz"),
         "removeWithQuestionMark":
             MessageLookupByLibrary.simpleMessage("Kaldır?"),
+        "removeYourselfAsTrustedContact": MessageLookupByLibrary.simpleMessage(
+            "Kendinizi güvenilir kişi olarak kaldırın"),
         "removingFromFavorites":
             MessageLookupByLibrary.simpleMessage("Favorilerimden kaldır..."),
         "rename": MessageLookupByLibrary.simpleMessage("Yeniden adlandır"),
@@ -1115,7 +1574,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Dosyayı yeniden adlandır"),
         "renewSubscription":
             MessageLookupByLibrary.simpleMessage("Abonelik yenileme"),
-        "renewsOn": m62,
+        "renewsOn": m67,
         "reportABug": MessageLookupByLibrary.simpleMessage("Hatayı bildir"),
         "reportBug": MessageLookupByLibrary.simpleMessage("Hata bildir"),
         "resendEmail":
@@ -1124,31 +1583,46 @@ class MessageLookup extends MessageLookupByLibrary {
             "Yok sayılan dosyaları sıfırla"),
         "resetPasswordTitle":
             MessageLookupByLibrary.simpleMessage("Parolanızı sıfırlayın"),
+        "resetPerson": MessageLookupByLibrary.simpleMessage("Kaldır"),
         "resetToDefault":
             MessageLookupByLibrary.simpleMessage("Varsayılana sıfırla"),
         "restore": MessageLookupByLibrary.simpleMessage("Yenile"),
         "restoreToAlbum": MessageLookupByLibrary.simpleMessage("Albümü yenile"),
         "restoringFiles":
             MessageLookupByLibrary.simpleMessage("Dosyalar geri yükleniyor..."),
+        "resumableUploads":
+            MessageLookupByLibrary.simpleMessage("Devam edilebilir yüklemeler"),
         "retry": MessageLookupByLibrary.simpleMessage("Tekrar dene"),
+        "review": MessageLookupByLibrary.simpleMessage("Gözden Geçir"),
         "reviewDeduplicateItems": MessageLookupByLibrary.simpleMessage(
             "Lütfen kopya olduğunu düşündüğünüz öğeleri inceleyin ve silin."),
+        "reviewSuggestions":
+            MessageLookupByLibrary.simpleMessage("Önerileri inceleyin"),
+        "right": MessageLookupByLibrary.simpleMessage("Sağ"),
+        "rotate": MessageLookupByLibrary.simpleMessage("Döndür"),
         "rotateLeft": MessageLookupByLibrary.simpleMessage("Sola döndür"),
         "rotateRight": MessageLookupByLibrary.simpleMessage("Sağa döndür"),
         "safelyStored":
             MessageLookupByLibrary.simpleMessage("Güvenle saklanır"),
         "save": MessageLookupByLibrary.simpleMessage("Kaydet"),
+        "saveChangesBeforeLeavingQuestion":
+            MessageLookupByLibrary.simpleMessage(
+                "Ayrılmadan önce değişiklikleri kaydedin mi?"),
         "saveCollage": MessageLookupByLibrary.simpleMessage("Kolajı kaydet"),
         "saveCopy": MessageLookupByLibrary.simpleMessage("Kopyasını kaydet"),
         "saveKey": MessageLookupByLibrary.simpleMessage("Anahtarı kaydet"),
+        "savePerson": MessageLookupByLibrary.simpleMessage("Kişiyi Kaydet"),
         "saveYourRecoveryKeyIfYouHaventAlready":
             MessageLookupByLibrary.simpleMessage(
                 "Henüz yapmadıysanız kurtarma anahtarınızı kaydetmeyi unutmayın"),
         "saving": MessageLookupByLibrary.simpleMessage("Kaydediliyor..."),
+        "savingEdits": MessageLookupByLibrary.simpleMessage(
+            "Düzenlemeler kaydediliyor..."),
         "scanCode": MessageLookupByLibrary.simpleMessage("Kodu tarayın"),
         "scanThisBarcodeWithnyourAuthenticatorApp":
             MessageLookupByLibrary.simpleMessage(
                 "Kimlik doğrulama uygulamanız ile kodu tarayın"),
+        "search": MessageLookupByLibrary.simpleMessage("Ara"),
         "searchAlbumsEmptySection":
             MessageLookupByLibrary.simpleMessage("Albümler"),
         "searchByAlbumNameHint":
@@ -1159,6 +1633,10 @@ class MessageLookup extends MessageLookupByLibrary {
             "Fotoğraf bilgilerini burada hızlı bir şekilde bulmak için \"#trip\" gibi açıklamalar ekleyin"),
         "searchDatesEmptySection": MessageLookupByLibrary.simpleMessage(
             "Tarihe, aya veya yıla göre arama yapın"),
+        "searchDiscoverEmptySection": MessageLookupByLibrary.simpleMessage(
+            "İşleme ve senkronizasyon tamamlandığında görüntüler burada gösterilecektir"),
+        "searchFaceEmptySection": MessageLookupByLibrary.simpleMessage(
+            "İndeksleme yapıldıktan sonra insanlar burada gösterilecek"),
         "searchFileTypesAndNamesEmptySection":
             MessageLookupByLibrary.simpleMessage("Dosya türleri ve adları"),
         "searchHint1":
@@ -1174,25 +1652,41 @@ class MessageLookup extends MessageLookupByLibrary {
             "Bir fotoğrafın belli bir yarıçapında çekilen fotoğrafları gruplandırın"),
         "searchPeopleEmptySection": MessageLookupByLibrary.simpleMessage(
             "İnsanları davet ettiğinizde onların paylaştığı tüm fotoğrafları burada göreceksiniz"),
-        "searchResultCount": m63,
+        "searchPersonsEmptySection": MessageLookupByLibrary.simpleMessage(
+            "İşleme ve senkronizasyon tamamlandığında kişiler burada gösterilecektir"),
+        "searchResultCount": m68,
+        "searchSectionsLengthMismatch": m69,
         "security": MessageLookupByLibrary.simpleMessage("Güvenlik"),
+        "seePublicAlbumLinksInApp": MessageLookupByLibrary.simpleMessage(
+            "Uygulamadaki herkese açık albüm bağlantılarını görün"),
         "selectALocation":
             MessageLookupByLibrary.simpleMessage("Bir konum seçin"),
         "selectALocationFirst":
             MessageLookupByLibrary.simpleMessage("Önce yeni yer seçin"),
         "selectAlbum": MessageLookupByLibrary.simpleMessage("Albüm seçin"),
         "selectAll": MessageLookupByLibrary.simpleMessage("Hepsini seç"),
+        "selectAllShort": MessageLookupByLibrary.simpleMessage("Tümü"),
+        "selectCoverPhoto":
+            MessageLookupByLibrary.simpleMessage("Kapak fotoğrafı seçin"),
         "selectFoldersForBackup": MessageLookupByLibrary.simpleMessage(
             "Yedekleme için klasörleri seçin"),
         "selectItemsToAdd":
             MessageLookupByLibrary.simpleMessage("Eklenecek eşyaları seçin"),
         "selectLanguage": MessageLookupByLibrary.simpleMessage("Dil Seçin"),
+        "selectMailApp":
+            MessageLookupByLibrary.simpleMessage("Mail Uygulamasını Seç"),
         "selectMorePhotos":
             MessageLookupByLibrary.simpleMessage("Daha Fazla Fotoğraf Seç"),
+        "selectPersonToLink": MessageLookupByLibrary.simpleMessage(
+            "Bağlantı kurulacak kişiyi seçin"),
         "selectReason":
             MessageLookupByLibrary.simpleMessage("Ayrılma nedeninizi seçin"),
+        "selectYourFace":
+            MessageLookupByLibrary.simpleMessage("Yüzünüzü seçin"),
         "selectYourPlan":
             MessageLookupByLibrary.simpleMessage("Planınızı seçin"),
+        "selectedFilesAreNotOnEnte": MessageLookupByLibrary.simpleMessage(
+            "Seçilen dosyalar Ente\'de değil"),
         "selectedFoldersWillBeEncryptedAndBackedUp":
             MessageLookupByLibrary.simpleMessage(
                 "Seçilen klasörler şifrelenecek ve yedeklenecektir"),
@@ -1200,7 +1694,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Seçilen öğeler tüm albümlerden silinecek ve çöp kutusuna taşınacak."),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "send": MessageLookupByLibrary.simpleMessage("Gönder"),
         "sendEmail": MessageLookupByLibrary.simpleMessage("E-posta gönder"),
         "sendInvite": MessageLookupByLibrary.simpleMessage("Davet kodu gönder"),
@@ -1209,10 +1703,16 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Sunucu uç noktası"),
         "sessionExpired":
             MessageLookupByLibrary.simpleMessage("Oturum süresi doldu"),
+        "sessionIdMismatch":
+            MessageLookupByLibrary.simpleMessage("Oturum kimliği uyuşmazlığı"),
         "setAPassword": MessageLookupByLibrary.simpleMessage("Şifre ayarla"),
         "setAs": MessageLookupByLibrary.simpleMessage("Şu şekilde ayarla"),
         "setCover": MessageLookupByLibrary.simpleMessage("Kapak Belirle"),
         "setLabel": MessageLookupByLibrary.simpleMessage("Ayarla"),
+        "setNewPassword":
+            MessageLookupByLibrary.simpleMessage("Yeni şifre belirle"),
+        "setNewPin":
+            MessageLookupByLibrary.simpleMessage("Yeni PIN belirleyin"),
         "setPasswordTitle":
             MessageLookupByLibrary.simpleMessage("Parola ayarlayın"),
         "setRadius": MessageLookupByLibrary.simpleMessage("Yarıçapı ayarla"),
@@ -1225,15 +1725,20 @@ class MessageLookup extends MessageLookupByLibrary {
         "shareAnAlbumNow":
             MessageLookupByLibrary.simpleMessage("Şimdi bir albüm paylaşın"),
         "shareLink": MessageLookupByLibrary.simpleMessage("Linki paylaş"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage(
             "Yalnızca istediğiniz kişilerle paylaşın"),
         "shareTextConfirmOthersVerificationID": m7,
+        "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage(
+            "Orijinal kalitede fotoğraf ve videoları kolayca paylaşabilmemiz için Ente\'yi indirin\n\nhttps://ente.io"),
+        "shareTextReferralCode": m72,
         "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage(
             "Ente kullanıcısı olmayanlar için paylaş"),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "shareYourFirstAlbum":
             MessageLookupByLibrary.simpleMessage("İlk albümünüzü paylaşın"),
+        "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
+            "Diğer Ente kullanıcılarıyla paylaşılan ve topluluk albümleri oluşturun, bu arada ücretsiz planlara sahip kullanıcıları da içerir."),
         "sharedByMe":
             MessageLookupByLibrary.simpleMessage("Benim paylaştıklarım"),
         "sharedByYou": MessageLookupByLibrary.simpleMessage("Paylaştıklarınız"),
@@ -1241,13 +1746,14 @@ class MessageLookup extends MessageLookupByLibrary {
             "Paylaşılan fotoğrafları ekle"),
         "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage(
             "Birisi sizin de parçası olduğunuz paylaşılan bir albüme fotoğraf eklediğinde bildirim alın"),
-        "sharedWith": m69,
+        "sharedWith": m74,
         "sharedWithMe":
             MessageLookupByLibrary.simpleMessage("Benimle paylaşılan"),
         "sharedWithYou":
             MessageLookupByLibrary.simpleMessage("Sizinle paylaşıldı"),
         "sharing": MessageLookupByLibrary.simpleMessage("Paylaşılıyor..."),
         "showMemories": MessageLookupByLibrary.simpleMessage("Anıları göster"),
+        "showPerson": MessageLookupByLibrary.simpleMessage("Kişiyi Göster"),
         "signOutFromOtherDevices":
             MessageLookupByLibrary.simpleMessage("Diğer cihazlardan çıkış yap"),
         "signOutOtherBody": MessageLookupByLibrary.simpleMessage(
@@ -1256,11 +1762,16 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Diğer cihazlardan çıkış yap"),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "<u-terms>Hizmet Şartları</u-terms>\'nı ve <u-policy>Gizlilik Politikası</u-policy>\'nı kabul ediyorum"),
-        "singleFileDeleteFromDevice": m70,
+        "singleFileDeleteFromDevice": m75,
         "singleFileDeleteHighlight":
             MessageLookupByLibrary.simpleMessage("Tüm albümlerden silinecek."),
+        "singleFileInBothLocalAndRemote": m76,
+        "singleFileInRemoteOnly": m77,
         "skip": MessageLookupByLibrary.simpleMessage("Geç"),
         "social": MessageLookupByLibrary.simpleMessage("Sosyal Medya"),
+        "someItemsAreInBothEnteAndYourDevice":
+            MessageLookupByLibrary.simpleMessage(
+                "Bazı öğeler hem Ente\'de hem de cihazınızda bulunur."),
         "someOfTheFilesYouAreTryingToDeleteAre":
             MessageLookupByLibrary.simpleMessage(
                 "Silmeye çalıştığınız dosyalardan bazıları yalnızca cihazınızda mevcuttur ve silindiği takdirde kurtarılamaz"),
@@ -1284,24 +1795,36 @@ class MessageLookup extends MessageLookupByLibrary {
         "sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease":
             MessageLookupByLibrary.simpleMessage(
                 "Üzgünüm, bu cihazda güvenli anahtarlarını oluşturamadık.\n\nLütfen başka bir cihazdan giriş yapmayı deneyiniz."),
+        "sort": MessageLookupByLibrary.simpleMessage("Sırala"),
         "sortAlbumsBy": MessageLookupByLibrary.simpleMessage("Sırala"),
         "sortNewestFirst":
             MessageLookupByLibrary.simpleMessage("Yeniden eskiye"),
         "sortOldestFirst": MessageLookupByLibrary.simpleMessage("Önce en eski"),
         "sparkleSuccess": MessageLookupByLibrary.simpleMessage("✨ Başarılı"),
+        "startAccountRecoveryTitle":
+            MessageLookupByLibrary.simpleMessage("Kurtarmayı başlat"),
         "startBackup":
             MessageLookupByLibrary.simpleMessage("Yedeklemeyi başlat"),
         "status": MessageLookupByLibrary.simpleMessage("Durum"),
+        "stopCastingBody": MessageLookupByLibrary.simpleMessage(
+            "Yansıtmayı durdurmak istiyor musunuz?"),
+        "stopCastingTitle":
+            MessageLookupByLibrary.simpleMessage("Yayını durdur"),
         "storage": MessageLookupByLibrary.simpleMessage("Depolama"),
         "storageBreakupFamily": MessageLookupByLibrary.simpleMessage("Aile"),
         "storageBreakupYou": MessageLookupByLibrary.simpleMessage("Sen"),
         "storageInGB": m1,
         "storageLimitExceeded":
             MessageLookupByLibrary.simpleMessage("Depolama sınırı aşıldı"),
-        "storageUsageInfo": m73,
+        "storageUsageInfo": m78,
+        "streamDetails":
+            MessageLookupByLibrary.simpleMessage("Yayın detayları"),
         "strongStrength": MessageLookupByLibrary.simpleMessage("Güçlü"),
-        "subWillBeCancelledOn": m75,
+        "subAlreadyLinkedErrMessage": m79,
+        "subWillBeCancelledOn": m80,
         "subscribe": MessageLookupByLibrary.simpleMessage("Abone ol"),
+        "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage(
+            "Paylaşımı etkinleştirmek için aktif bir ücretli aboneliğe ihtiyacınız var."),
         "subscription": MessageLookupByLibrary.simpleMessage("Abonelik"),
         "success": MessageLookupByLibrary.simpleMessage("Başarılı"),
         "successfullyArchived":
@@ -1315,7 +1838,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "suggestFeatures":
             MessageLookupByLibrary.simpleMessage("Özellik önerin"),
         "support": MessageLookupByLibrary.simpleMessage("Destek"),
-        "syncProgress": m76,
+        "syncProgress": m81,
         "syncStopped":
             MessageLookupByLibrary.simpleMessage("Senkronizasyon durduruldu"),
         "syncing": MessageLookupByLibrary.simpleMessage("Eşitleniyor..."),
@@ -1324,6 +1847,10 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("kopyalamak için dokunun"),
         "tapToEnterCode":
             MessageLookupByLibrary.simpleMessage("Kodu girmek icin tıklayın"),
+        "tapToUnlock": MessageLookupByLibrary.simpleMessage("Açmak için dokun"),
+        "tapToUpload":
+            MessageLookupByLibrary.simpleMessage("Yüklemek için tıklayın"),
+        "tapToUploadIsIgnoredDue": m82,
         "tempErrorContactSupportIfPersists": MessageLookupByLibrary.simpleMessage(
             "Bir şeyler ters gitmiş gibi görünüyor. Lütfen bir süre sonra tekrar deneyin. Hata devam ederse, lütfen destek ekibimizle iletişime geçin."),
         "terminate": MessageLookupByLibrary.simpleMessage("Sonlandır"),
@@ -1336,6 +1863,9 @@ class MessageLookup extends MessageLookupByLibrary {
             "Abone olduğunuz için teşekkürler!"),
         "theDownloadCouldNotBeCompleted": MessageLookupByLibrary.simpleMessage(
             "İndirme işlemi tamamlanamadı"),
+        "theLinkYouAreTryingToAccessHasExpired":
+            MessageLookupByLibrary.simpleMessage(
+                "Erişmeye çalıştığınız bağlantının süresi dolmuştur."),
         "theRecoveryKeyYouEnteredIsIncorrect":
             MessageLookupByLibrary.simpleMessage(
                 "Girdiğiniz kurtarma kodu yanlış"),
@@ -1359,7 +1889,9 @@ class MessageLookup extends MessageLookupByLibrary {
             "Bu e-posta zaten kullanılıyor"),
         "thisImageHasNoExifData":
             MessageLookupByLibrary.simpleMessage("Bu görselde exif verisi yok"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsMeExclamation":
+            MessageLookupByLibrary.simpleMessage("Bu benim!"),
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId":
             MessageLookupByLibrary.simpleMessage("Doğrulama kimliğiniz"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -1367,16 +1899,31 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Bu, sizi aşağıdaki cihazdan çıkış yapacak:"),
         "thisWillLogYouOutOfThisDevice": MessageLookupByLibrary.simpleMessage(
             "Bu cihazdaki oturumunuz kapatılacak!"),
+        "thisWillRemovePublicLinksOfAllSelectedQuickLinks":
+            MessageLookupByLibrary.simpleMessage(
+                "Bu, seçilen tüm hızlı bağlantıların genel bağlantılarını kaldıracaktır."),
+        "toEnableAppLockPleaseSetupDevicePasscodeOrScreen":
+            MessageLookupByLibrary.simpleMessage(
+                "Uygulama kilidini etkinleştirmek için lütfen sistem ayarlarınızda cihaz şifresi veya ekran kilidi ayarlayın."),
         "toHideAPhotoOrVideo": MessageLookupByLibrary.simpleMessage(
             "Bir fotoğrafı veya videoyu gizlemek için"),
         "toResetVerifyEmail": MessageLookupByLibrary.simpleMessage(
             "Şifrenizi sıfılamak için lütfen e-postanızı girin."),
         "todaysLogs":
             MessageLookupByLibrary.simpleMessage("Bugünün günlükleri"),
+        "tooManyIncorrectAttempts":
+            MessageLookupByLibrary.simpleMessage("Çok fazla hatalı deneme"),
         "total": MessageLookupByLibrary.simpleMessage("total"),
         "totalSize": MessageLookupByLibrary.simpleMessage("Toplam boyut"),
         "trash": MessageLookupByLibrary.simpleMessage("Cöp kutusu"),
+        "trashDaysLeft": m84,
+        "trim": MessageLookupByLibrary.simpleMessage("Kes"),
+        "trustedContacts":
+            MessageLookupByLibrary.simpleMessage("Güvenilir kişiler"),
+        "trustedInviteBody": m85,
         "tryAgain": MessageLookupByLibrary.simpleMessage("Tekrar deneyiniz"),
+        "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage(
+            "Bu cihaz klasörüne eklenen dosyaları otomatik olarak ente\'ye yüklemek için yedeklemeyi açın."),
         "twitter": MessageLookupByLibrary.simpleMessage("Twitter"),
         "twoMonthsFreeOnYearlyPlans": MessageLookupByLibrary.simpleMessage(
             "Yıllık planlarda 2 ay ücretsiz"),
@@ -1391,11 +1938,14 @@ class MessageLookup extends MessageLookupByLibrary {
                 "İki faktörlü kimlik doğrulama başarıyla sıfırlandı"),
         "twofactorSetup":
             MessageLookupByLibrary.simpleMessage("Cift faktör ayarı"),
+        "typeOfGallerGallerytypeIsNotSupportedForRename": m86,
         "unarchive": MessageLookupByLibrary.simpleMessage("Arşivden cıkar"),
         "unarchiveAlbum":
             MessageLookupByLibrary.simpleMessage("Arşivden Çıkar"),
         "unarchiving":
             MessageLookupByLibrary.simpleMessage("Arşivden çıkarılıyor..."),
+        "unavailableReferralCode": MessageLookupByLibrary.simpleMessage(
+            "Üzgünüz, bu kod mevcut değil."),
         "uncategorized": MessageLookupByLibrary.simpleMessage("Kategorisiz"),
         "unhide": MessageLookupByLibrary.simpleMessage("Gizleme"),
         "unhideToAlbum": MessageLookupByLibrary.simpleMessage("Albümü gizleme"),
@@ -1413,18 +1963,29 @@ class MessageLookup extends MessageLookupByLibrary {
         "updatingFolderSelection": MessageLookupByLibrary.simpleMessage(
             "Klasör seçimi güncelleniyor..."),
         "upgrade": MessageLookupByLibrary.simpleMessage("Yükselt"),
+        "uploadIsIgnoredDueToIgnorereason": m87,
         "uploadingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
             "Dosyalar albüme taşınıyor..."),
+        "uploadingMultipleMemories": m88,
+        "uploadingSingleMemory":
+            MessageLookupByLibrary.simpleMessage("1 anı korunuyor..."),
         "upto50OffUntil4thDec": MessageLookupByLibrary.simpleMessage(
             "4 Aralık\'a kadar %50\'ye varan indirim."),
         "usableReferralStorageInfo": MessageLookupByLibrary.simpleMessage(
             "Kullanılabilir depolama alanı mevcut planınızla sınırlıdır. Talep edilen fazla depolama alanı, planınızı yükselttiğinizde otomatik olarak kullanılabilir hale gelecektir."),
+        "useAsCover":
+            MessageLookupByLibrary.simpleMessage("Kapak olarak kullanın"),
+        "useDifferentPlayerInfo": MessageLookupByLibrary.simpleMessage(
+            "Bu videoyu oynatmakta sorun mu yaşıyorsunuz? Farklı bir oynatıcı denemek için buraya uzun basın."),
+        "usePublicLinksForPeopleNotOnEnte":
+            MessageLookupByLibrary.simpleMessage(
+                "Ente\'de olmayan kişiler için genel bağlantıları kullanın"),
         "useRecoveryKey":
             MessageLookupByLibrary.simpleMessage("Kurtarma anahtarını kullan"),
         "useSelectedPhoto":
             MessageLookupByLibrary.simpleMessage("Seçilen fotoğrafı kullan"),
         "usedSpace": MessageLookupByLibrary.simpleMessage("Kullanılan alan"),
-        "validTill": m84,
+        "validTill": m89,
         "verificationFailedPleaseTryAgain":
             MessageLookupByLibrary.simpleMessage(
                 "Doğrulama başarısız oldu, lütfen tekrar deneyin"),
@@ -1433,7 +1994,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "verify": MessageLookupByLibrary.simpleMessage("Doğrula"),
         "verifyEmail":
             MessageLookupByLibrary.simpleMessage("E-posta adresini doğrulayın"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Doğrula"),
         "verifyPasskey":
             MessageLookupByLibrary.simpleMessage("Şifrenizi doğrulayın"),
@@ -1442,7 +2003,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "verifying": MessageLookupByLibrary.simpleMessage("Doğrulanıyor..."),
         "verifyingRecoveryKey": MessageLookupByLibrary.simpleMessage(
             "Kurtarma kodu doğrulanıyor..."),
+        "videoInfo": MessageLookupByLibrary.simpleMessage("Video Bilgileri"),
         "videoSmallCase": MessageLookupByLibrary.simpleMessage("video"),
+        "videoStreaming": MessageLookupByLibrary.simpleMessage("Video akışı"),
         "videos": MessageLookupByLibrary.simpleMessage("Videolar"),
         "viewActiveSessions":
             MessageLookupByLibrary.simpleMessage("Aktif oturumları görüntüle"),
@@ -1451,16 +2014,22 @@ class MessageLookup extends MessageLookupByLibrary {
         "viewAll": MessageLookupByLibrary.simpleMessage("Tümünü görüntüle"),
         "viewAllExifData": MessageLookupByLibrary.simpleMessage(
             "Tüm EXIF verilerini görüntüle"),
+        "viewLargeFiles":
+            MessageLookupByLibrary.simpleMessage("Büyük dosyalar"),
+        "viewLargeFilesDesc": MessageLookupByLibrary.simpleMessage(
+            "En fazla depolama alanı tüketen dosyaları görüntüleyin."),
         "viewLogs": MessageLookupByLibrary.simpleMessage("Günlükleri göster"),
         "viewRecoveryKey": MessageLookupByLibrary.simpleMessage(
             "Kurtarma anahtarını görüntüle"),
         "viewer": MessageLookupByLibrary.simpleMessage("Görüntüleyici"),
+        "viewersSuccessfullyAdded": m91,
         "visitWebToManage": MessageLookupByLibrary.simpleMessage(
             "Aboneliğinizi yönetmek için lütfen web.ente.io adresini ziyaret edin"),
         "waitingForVerification":
             MessageLookupByLibrary.simpleMessage("Doğrulama bekleniyor..."),
         "waitingForWifi":
             MessageLookupByLibrary.simpleMessage("WiFi bekleniyor..."),
+        "warning": MessageLookupByLibrary.simpleMessage("Uyarı"),
         "weAreOpenSource":
             MessageLookupByLibrary.simpleMessage("Biz açık kaynağız!"),
         "weDontSupportEditingPhotosAndAlbumsThatYouDont":
@@ -1470,8 +2039,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "weakStrength": MessageLookupByLibrary.simpleMessage("Zayıf"),
         "welcomeBack":
             MessageLookupByLibrary.simpleMessage("Tekrardan hoşgeldin!"),
+        "whatsNew": MessageLookupByLibrary.simpleMessage("Yenilikler"),
+        "whyAddTrustContact": MessageLookupByLibrary.simpleMessage("."),
+        "yearShort": MessageLookupByLibrary.simpleMessage("yıl"),
         "yearly": MessageLookupByLibrary.simpleMessage("Yıllık"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("Evet"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("Evet, iptal et"),
         "yesConvertToViewer": MessageLookupByLibrary.simpleMessage(
@@ -1483,6 +2055,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Evet, oturumu kapat"),
         "yesRemove": MessageLookupByLibrary.simpleMessage("Evet, sil"),
         "yesRenew": MessageLookupByLibrary.simpleMessage("Evet, yenile"),
+        "yesResetPerson":
+            MessageLookupByLibrary.simpleMessage("Evet, kişiyi sıfırla"),
         "you": MessageLookupByLibrary.simpleMessage("Sen"),
         "youAreOnAFamilyPlan":
             MessageLookupByLibrary.simpleMessage("Aile planı kullanıyorsunuz!"),
@@ -1502,7 +2076,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Kendinizle paylaşamazsınız"),
         "youDontHaveAnyArchivedItems":
             MessageLookupByLibrary.simpleMessage("Arşivlenmiş öğeniz yok."),
-        "youHaveSuccessfullyFreedUp": m88,
+        "youHaveSuccessfullyFreedUp": m93,
         "yourAccountHasBeenDeleted":
             MessageLookupByLibrary.simpleMessage("Hesabınız silindi"),
         "yourMap": MessageLookupByLibrary.simpleMessage("Haritalarınız"),
diff --git a/mobile/lib/generated/intl/messages_uk.dart b/mobile/lib/generated/intl/messages_uk.dart
index a2a1e6b966..8ade27d080 100644
--- a/mobile/lib/generated/intl/messages_uk.dart
+++ b/mobile/lib/generated/intl/messages_uk.dart
@@ -20,246 +20,246 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'uk';
 
-  static String m9(count) =>
+  static String m10(count) =>
       "${Intl.plural(count, one: 'Додано співавтора', other: 'Додано співавторів')}";
 
-  static String m10(count) =>
+  static String m11(count) =>
       "${Intl.plural(count, one: 'Додавання елемента', other: 'Додавання елементів')}";
 
-  static String m11(storageAmount, endDate) =>
+  static String m12(storageAmount, endDate) =>
       "Ваше доповнення ${storageAmount} діє до ${endDate}";
 
-  static String m12(count) =>
+  static String m13(count) =>
       "${Intl.plural(count, one: 'Додано глядача', other: 'Додано глядачів')}";
 
-  static String m13(emailOrName) => "Додано ${emailOrName}";
+  static String m14(emailOrName) => "Додано ${emailOrName}";
 
-  static String m14(albumName) => "Успішно додано до «${albumName}»";
+  static String m15(albumName) => "Успішно додано до «${albumName}»";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: 'Немає учасників', one: '1 учасник', other: '${count} учасників')}";
 
-  static String m16(versionValue) => "Версія: ${versionValue}";
+  static String m17(versionValue) => "Версія: ${versionValue}";
 
-  static String m17(freeAmount, storageUnit) =>
+  static String m18(freeAmount, storageUnit) =>
       "${freeAmount} ${storageUnit} вільно";
 
-  static String m18(paymentProvider) =>
+  static String m19(paymentProvider) =>
       "Спочатку скасуйте вашу передплату від ${paymentProvider}";
 
   static String m3(user) =>
       "${user} не зможе додавати більше фотографій до цього альбому\n\nВони все ще зможуть видаляти додані ними фотографії";
 
-  static String m19(isFamilyMember, storageAmountInGb) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
       "${Intl.select(isFamilyMember, {
             'true': 'Ваша сім\'я отримала ${storageAmountInGb} ГБ',
             'false': 'Ви отримали ${storageAmountInGb} ГБ',
             'other': 'Ви отримали ${storageAmountInGb} ГБ!',
           })}";
 
-  static String m20(albumName) =>
+  static String m21(albumName) =>
       "Створено спільне посилання для «${albumName}»";
 
-  static String m21(count) =>
+  static String m22(count) =>
       "${Intl.plural(count, zero: 'Додано 0 співавторів', one: 'Додано 1 співавтор', few: 'Додано ${count} співаторів', many: 'Додано ${count} співаторів', other: 'Додано ${count} співавторів')}";
 
-  static String m22(email, numOfDays) =>
+  static String m23(email, numOfDays) =>
       "Ви збираєтеся додати ${email} як довірений контакт. Вони зможуть відновити ваш обліковий запис, якщо ви будете відсутні протягом ${numOfDays} днів.";
 
-  static String m23(familyAdminEmail) =>
+  static String m24(familyAdminEmail) =>
       "Зв\'яжіться з <green>${familyAdminEmail}</green> для керування вашою передплатою";
 
-  static String m24(provider) =>
+  static String m25(provider) =>
       "Зв\'яжіться з нами за адресою support@ente.io для управління вашою передплатою ${provider}.";
 
-  static String m25(endpoint) => "Під\'єднано до ${endpoint}";
+  static String m26(endpoint) => "Під\'єднано до ${endpoint}";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: 'Видалено ${count} елемент', few: 'Видалено ${count} елементи', many: 'Видалено ${count} елементів', other: 'Видалено ${count} елементів')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "Видалення ${currentlyDeleting} / ${totalCount}";
 
-  static String m28(albumName) =>
+  static String m29(albumName) =>
       "Це видалить публічне посилання для доступу до «${albumName}».";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "Надішліть листа на ${supportEmail} з вашої зареєстрованої поштової адреси";
 
-  static String m30(count, storageSaved) =>
+  static String m31(count, storageSaved) =>
       "Ви очистили ${Intl.plural(count, one: '${count} дублікат файлу', other: '${count} дублікатів файлів')}, збережено (${storageSaved}!)";
 
-  static String m31(count, formattedSize) =>
+  static String m32(count, formattedSize) =>
       "${count} файлів, кожен по ${formattedSize}";
 
-  static String m32(newEmail) => "Поштову адресу змінено на ${newEmail}";
+  static String m33(newEmail) => "Поштову адресу змінено на ${newEmail}";
 
-  static String m33(email) =>
+  static String m35(email) =>
       "У ${email} немає облікового запису Ente.\n\nНадішліть їм запрошення для обміну фотографіями.";
 
-  static String m34(text) => "Знайдено додаткові фотографії для ${text}";
+  static String m36(text) => "Знайдено додаткові фотографії для ${text}";
 
-  static String m35(count, formattedNumber) =>
+  static String m37(count, formattedNumber) =>
       "${Intl.plural(count, one: 'Для 1 файлу', other: 'Для ${formattedNumber} файлів')} на цьому пристрої було створено резервну копію";
 
-  static String m36(count, formattedNumber) =>
+  static String m38(count, formattedNumber) =>
       "${Intl.plural(count, one: 'Для 1 файлу', few: 'Для ${formattedNumber} файлів', many: 'Для ${formattedNumber} файлів', other: 'Для ${formattedNumber} файлів')} у цьому альбомі було створено резервну копію";
 
   static String m4(storageAmountInGB) =>
       "${storageAmountInGB} ГБ щоразу, коли хтось оформлює передплату і застосовує ваш код";
 
-  static String m37(endDate) => "Безплатна пробна версія діє до ${endDate}";
+  static String m39(endDate) => "Безплатна пробна версія діє до ${endDate}";
 
-  static String m38(count) =>
+  static String m40(count) =>
       "Ви все ще можете отримати доступ до ${Intl.plural(count, one: 'нього', other: 'них')} в Ente, доки у вас активна передплата";
 
-  static String m39(sizeInMBorGB) => "Звільніть ${sizeInMBorGB}";
+  static String m41(sizeInMBorGB) => "Звільніть ${sizeInMBorGB}";
 
-  static String m40(count, formattedSize) =>
+  static String m42(count, formattedSize) =>
       "${Intl.plural(count, one: 'Його можна видалити з пристрою, щоб звільнити ${formattedSize}', other: 'Їх можна видалити з пристрою, щоб звільнити ${formattedSize}')}";
 
-  static String m41(currentlyProcessing, totalCount) =>
+  static String m43(currentlyProcessing, totalCount) =>
       "Обробка ${currentlyProcessing} / ${totalCount}";
 
-  static String m42(count) =>
+  static String m44(count) =>
       "${Intl.plural(count, one: '${count} елемент', few: '${count} елементи', many: '${count} елементів', other: '${count} елементів')}";
 
-  static String m43(email) => "${email} запросив вас стати довіреною особою";
+  static String m45(email) => "${email} запросив вас стати довіреною особою";
 
-  static String m44(expiryTime) => "Посилання закінчується через ${expiryTime}";
+  static String m46(expiryTime) => "Посилання закінчується через ${expiryTime}";
 
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, zero: 'немає спогадів', one: '${formattedCount} спогад', other: '${formattedCount} спогадів')}";
 
-  static String m45(count) =>
+  static String m49(count) =>
       "${Intl.plural(count, one: 'Переміщення елемента', other: 'Переміщення елементів')}";
 
-  static String m46(albumName) => "Успішно перенесено до «${albumName}»";
+  static String m50(albumName) => "Успішно перенесено до «${albumName}»";
 
-  static String m47(personName) => "Немає пропозицій для ${personName}";
+  static String m51(personName) => "Немає пропозицій для ${personName}";
 
-  static String m48(name) => "Не ${name}?";
+  static String m52(name) => "Не ${name}?";
 
-  static String m49(familyAdminEmail) =>
+  static String m53(familyAdminEmail) =>
       "Зв\'яжіться з ${familyAdminEmail}, щоб змінити код.";
 
   static String m0(passwordStrengthValue) =>
       "Надійність пароля: ${passwordStrengthValue}";
 
-  static String m50(providerName) =>
+  static String m54(providerName) =>
       "Зверніться до ${providerName}, якщо було знято платіж";
 
-  static String m51(count) =>
+  static String m55(count) =>
       "${Intl.plural(count, zero: '0 фото', one: '1 фото', few: '${count} фото', many: '${count} фото', other: '${count} фото')}";
 
-  static String m52(endDate) =>
+  static String m56(endDate) =>
       "Безплатна пробна версія діє до ${endDate}.\nПісля цього ви можете обрати платний план.";
 
-  static String m53(toEmail) => "Напишіть нам на ${toEmail}";
+  static String m57(toEmail) => "Напишіть нам на ${toEmail}";
 
-  static String m54(toEmail) => "Надішліть журнали на \n${toEmail}";
+  static String m58(toEmail) => "Надішліть журнали на \n${toEmail}";
 
-  static String m55(folderName) => "Оброблюємо «${folderName}»...";
+  static String m59(folderName) => "Оброблюємо «${folderName}»...";
 
-  static String m56(storeName) => "Оцініть нас в ${storeName}";
+  static String m60(storeName) => "Оцініть нас в ${storeName}";
 
-  static String m57(days, email) =>
+  static String m62(days, email) =>
       "Ви зможете отримати доступ до облікового запису через ${days} днів. Повідомлення буде надіслано на ${email}.";
 
-  static String m58(email) =>
+  static String m63(email) =>
       "Тепер ви можете відновити обліковий запис ${email}, встановивши новий пароль.";
 
-  static String m59(email) =>
+  static String m64(email) =>
       "${email} намагається відновити ваш обліковий запис.";
 
-  static String m60(storageInGB) =>
+  static String m65(storageInGB) =>
       "3. Ви обоє отримуєте ${storageInGB} ГБ* безплатно";
 
-  static String m61(userEmail) =>
+  static String m66(userEmail) =>
       "${userEmail} буде видалено з цього спільного альбому\n\nБудь-які додані вами фото, будуть також видалені з альбому";
 
-  static String m62(endDate) => "Передплата поновиться ${endDate}";
+  static String m67(endDate) => "Передплата поновиться ${endDate}";
 
-  static String m63(count) =>
+  static String m68(count) =>
       "${Intl.plural(count, one: 'Знайдено ${count} результат', few: 'Знайдено ${count} результати', many: 'Знайдено ${count} результатів', other: 'Знайдено ${count} результати')}";
 
-  static String m64(snapshotLength, searchLength) =>
+  static String m69(snapshotLength, searchLength) =>
       "Невідповідність довжини розділів: ${snapshotLength} != ${searchLength}";
 
   static String m6(count) => "${count} вибрано";
 
-  static String m65(count, yourCount) => "${count} вибрано (${yourCount} ваші)";
+  static String m70(count, yourCount) => "${count} вибрано (${yourCount} ваші)";
 
-  static String m66(verificationID) =>
+  static String m71(verificationID) =>
       "Ось мій ідентифікатор підтвердження: ${verificationID} для ente.io.";
 
   static String m7(verificationID) =>
       "Гей, ви можете підтвердити, що це ваш ідентифікатор підтвердження: ${verificationID}";
 
-  static String m67(referralCode, referralStorageInGB) =>
+  static String m72(referralCode, referralStorageInGB) =>
       "Реферальний код Ente: ${referralCode} \n\nЗастосуйте його в «Налаштування» → «Загальні» → «Реферали», щоб отримати ${referralStorageInGB} ГБ безплатно після переходу на платний тариф\n\nhttps://ente.io";
 
-  static String m68(numberOfPeople) =>
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: 'Поділитися з конкретними людьми', one: 'Поділитися з 1 особою', other: 'Поділитися з ${numberOfPeople} людьми')}";
 
-  static String m69(emailIDs) => "Поділилися з ${emailIDs}";
+  static String m74(emailIDs) => "Поділилися з ${emailIDs}";
 
-  static String m70(fileType) => "Цей ${fileType} буде видалено з пристрою.";
+  static String m75(fileType) => "Цей ${fileType} буде видалено з пристрою.";
 
-  static String m71(fileType) =>
+  static String m76(fileType) =>
       "Цей ${fileType} знаходиться і в Ente, і на вашому пристрої.";
 
-  static String m72(fileType) => "Цей ${fileType} буде видалено з Ente.";
+  static String m77(fileType) => "Цей ${fileType} буде видалено з Ente.";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} ГБ";
 
-  static String m73(
+  static String m78(
           usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) =>
       "${usedAmount} ${usedStorageUnit} з ${totalAmount} ${totalStorageUnit} використано";
 
-  static String m74(id) =>
+  static String m79(id) =>
       "Ваш ${id} вже пов\'язаний з іншим обліковим записом Ente.\nЯкщо ви хочете використовувати свій ${id} з цим обліковим записом, зверніться до нашої служби підтримки";
 
-  static String m75(endDate) => "Вашу передплату буде скасовано ${endDate}";
+  static String m80(endDate) => "Вашу передплату буде скасовано ${endDate}";
 
-  static String m76(completed, total) =>
+  static String m81(completed, total) =>
       "${completed} / ${total} спогадів збережено";
 
-  static String m77(ignoreReason) =>
+  static String m82(ignoreReason) =>
       "Натисніть, щоб завантажити; завантаження наразі ігнорується через: ${ignoreReason}";
 
   static String m8(storageAmountInGB) =>
       "Вони також отримують ${storageAmountInGB} ГБ";
 
-  static String m78(email) => "Це ідентифікатор підтвердження пошти ${email}";
+  static String m83(email) => "Це ідентифікатор підтвердження пошти ${email}";
 
-  static String m79(count) =>
+  static String m84(count) =>
       "${Intl.plural(count, zero: 'Незабаром', one: '1 день', other: '${count} днів')}";
 
-  static String m80(email) =>
+  static String m85(email) =>
       "Ви отримали запрошення стати спадковим контактом від ${email}.";
 
-  static String m81(galleryType) =>
+  static String m86(galleryType) =>
       "Тип галереї «${galleryType}» не підтримується для перейменування";
 
-  static String m82(ignoreReason) =>
+  static String m87(ignoreReason) =>
       "Завантаження проігноровано через: ${ignoreReason}";
 
-  static String m83(count) => "Збереження ${count} спогадів...";
+  static String m88(count) => "Збереження ${count} спогадів...";
 
-  static String m84(endDate) => "Діє до ${endDate}";
+  static String m89(endDate) => "Діє до ${endDate}";
 
-  static String m85(email) => "Підтвердити ${email}";
+  static String m90(email) => "Підтвердити ${email}";
 
-  static String m86(count) =>
+  static String m91(count) =>
       "${Intl.plural(count, zero: 'Додано 0 користувачів', one: 'Додано 1 користувач', few: 'Додано ${count} користувача', many: 'Додано ${count} користувачів', other: 'Додано ${count} користувачів')}";
 
   static String m2(email) => "Ми надіслали листа на <green>${email}</green>";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, one: '${count} рік тому', few: '${count} роки тому', many: '${count} років тому', other: '${count} років тому')}";
 
-  static String m88(storageSaved) => "Ви успішно звільнили ${storageSaved}!";
+  static String m93(storageSaved) => "Ви успішно звільнили ${storageSaved}!";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
@@ -283,11 +283,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Додати нову пошту"),
         "addCollaborator":
             MessageLookupByLibrary.simpleMessage("Додати співавтора"),
-        "addCollaborators": m9,
+        "addCollaborators": m10,
         "addFiles": MessageLookupByLibrary.simpleMessage("Додати файли"),
         "addFromDevice":
             MessageLookupByLibrary.simpleMessage("Додати з пристрою"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocation":
             MessageLookupByLibrary.simpleMessage("Додати розташування"),
         "addLocationButton": MessageLookupByLibrary.simpleMessage("Додати"),
@@ -300,7 +300,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Додати нову особу"),
         "addOnPageSubtitle":
             MessageLookupByLibrary.simpleMessage("Подробиці доповнень"),
-        "addOnValidTill": m11,
+        "addOnValidTill": m12,
         "addOns": MessageLookupByLibrary.simpleMessage("Доповнення"),
         "addPhotos": MessageLookupByLibrary.simpleMessage("Додати фотографії"),
         "addSelected": MessageLookupByLibrary.simpleMessage("Додати вибране"),
@@ -311,12 +311,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "addTrustedContact":
             MessageLookupByLibrary.simpleMessage("Додати довірений контакт"),
         "addViewer": MessageLookupByLibrary.simpleMessage("Додати глядача"),
-        "addViewers": m12,
+        "addViewers": m13,
         "addYourPhotosNow":
             MessageLookupByLibrary.simpleMessage("Додайте свої фотографії"),
         "addedAs": MessageLookupByLibrary.simpleMessage("Додано як"),
-        "addedBy": m13,
-        "addedSuccessfullyTo": m14,
+        "addedBy": m14,
+        "addedSuccessfullyTo": m15,
         "addingToFavorites":
             MessageLookupByLibrary.simpleMessage("Додавання до обраного..."),
         "advanced": MessageLookupByLibrary.simpleMessage("Додатково"),
@@ -327,7 +327,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "after1Week": MessageLookupByLibrary.simpleMessage("Через 1 тиждень"),
         "after1Year": MessageLookupByLibrary.simpleMessage("Через 1 рік"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("Власник"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumTitle": MessageLookupByLibrary.simpleMessage("Назва альбому"),
         "albumUpdated": MessageLookupByLibrary.simpleMessage("Альбом оновлено"),
         "albums": MessageLookupByLibrary.simpleMessage("Альбоми"),
@@ -377,7 +377,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Блокування застосунку"),
         "appLockDescriptions": MessageLookupByLibrary.simpleMessage(
             "Виберіть між типовим екраном блокування вашого пристрою та власним екраном блокування з PIN-кодом або паролем."),
-        "appVersion": m16,
+        "appVersion": m17,
         "appleId": MessageLookupByLibrary.simpleMessage("Apple ID"),
         "apply": MessageLookupByLibrary.simpleMessage("Застосувати"),
         "applyCodeTitle":
@@ -460,7 +460,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoPairDesc": MessageLookupByLibrary.simpleMessage(
             "Автоматичне створення пари працює лише з пристроями, що підтримують Chromecast."),
         "available": MessageLookupByLibrary.simpleMessage("Доступно"),
-        "availableStorageSpace": m17,
+        "availableStorageSpace": m18,
         "backedUpFolders":
             MessageLookupByLibrary.simpleMessage("Резервне копіювання тек"),
         "backup": MessageLookupByLibrary.simpleMessage("Резервне копіювання"),
@@ -497,7 +497,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Скасувати відновлення"),
         "cancelAccountRecoveryBody": MessageLookupByLibrary.simpleMessage(
             "Ви впевнені, що хочете скасувати відновлення?"),
-        "cancelOtherSubscription": m18,
+        "cancelOtherSubscription": m19,
         "cancelSubscription":
             MessageLookupByLibrary.simpleMessage("Скасувати передплату"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
@@ -549,7 +549,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Отримайте безплатне сховище"),
         "claimMore": MessageLookupByLibrary.simpleMessage("Отримайте більше!"),
         "claimed": MessageLookupByLibrary.simpleMessage("Отримано"),
-        "claimedStorageSoFar": m19,
+        "claimedStorageSoFar": m20,
         "cleanUncategorized":
             MessageLookupByLibrary.simpleMessage("Очистити «Без категорії»"),
         "cleanUncategorizedDescription": MessageLookupByLibrary.simpleMessage(
@@ -579,12 +579,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Створіть посилання, щоб дозволити людям додавати й переглядати фотографії у вашому спільному альбомі без використання застосунку Ente або облікового запису. Чудово підходить для збору фотографій з подій."),
         "collaborativeLink":
             MessageLookupByLibrary.simpleMessage("Спільне посилання"),
-        "collaborativeLinkCreatedFor": m20,
+        "collaborativeLinkCreatedFor": m21,
         "collaborator": MessageLookupByLibrary.simpleMessage("Співавтор"),
         "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Співавтори можуть додавати фотографії та відео до спільного альбому."),
-        "collaboratorsSuccessfullyAdded": m21,
+        "collaboratorsSuccessfullyAdded": m22,
         "collageLayout": MessageLookupByLibrary.simpleMessage("Макет"),
         "collageSaved":
             MessageLookupByLibrary.simpleMessage("Колаж збережено до галереї"),
@@ -602,7 +602,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Ви впевнені, що хочете вимкнути двоетапну перевірку?"),
         "confirmAccountDeletion": MessageLookupByLibrary.simpleMessage(
             "Підтвердьте видалення облікового запису"),
-        "confirmAddingTrustedContact": m22,
+        "confirmAddingTrustedContact": m23,
         "confirmDeletePrompt": MessageLookupByLibrary.simpleMessage(
             "Так, я хочу безповоротно видалити цей обліковий запис та його дані з усіх застосунків."),
         "confirmPassword":
@@ -615,10 +615,10 @@ class MessageLookup extends MessageLookupByLibrary {
             "Підтвердіть ваш ключ відновлення"),
         "connectToDevice":
             MessageLookupByLibrary.simpleMessage("Під\'єднатися до пристрою"),
-        "contactFamilyAdmin": m23,
+        "contactFamilyAdmin": m24,
         "contactSupport": MessageLookupByLibrary.simpleMessage(
             "Звернутися до служби підтримки"),
-        "contactToManageSubscription": m24,
+        "contactToManageSubscription": m25,
         "contacts": MessageLookupByLibrary.simpleMessage("Контакти"),
         "contents": MessageLookupByLibrary.simpleMessage("Вміст"),
         "continueLabel": MessageLookupByLibrary.simpleMessage("Продовжити"),
@@ -665,7 +665,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "currentlyRunning":
             MessageLookupByLibrary.simpleMessage("зараз працює"),
         "custom": MessageLookupByLibrary.simpleMessage("Власне"),
-        "customEndpoint": m25,
+        "customEndpoint": m26,
         "darkTheme": MessageLookupByLibrary.simpleMessage("Темна"),
         "dayToday": MessageLookupByLibrary.simpleMessage("Сьогодні"),
         "dayYesterday": MessageLookupByLibrary.simpleMessage("Вчора"),
@@ -703,11 +703,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Видалити з пристрою"),
         "deleteFromEnte":
             MessageLookupByLibrary.simpleMessage("Видалити з Ente"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deleteLocation":
             MessageLookupByLibrary.simpleMessage("Видалити розташування"),
         "deletePhotos": MessageLookupByLibrary.simpleMessage("Видалити фото"),
-        "deleteProgress": m27,
+        "deleteProgress": m28,
         "deleteReason1": MessageLookupByLibrary.simpleMessage(
             "Мені бракує ключової функції"),
         "deleteReason2": MessageLookupByLibrary.simpleMessage(
@@ -746,7 +746,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Переглядачі все ще можуть робити знімки екрана або зберігати копію ваших фотографій за допомогою зовнішніх інструментів"),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("Зверніть увагу"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "disableTwofactor": MessageLookupByLibrary.simpleMessage(
             "Вимкнути двоетапну перевірку"),
         "disablingTwofactorAuthentication":
@@ -789,9 +789,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "downloadFailed":
             MessageLookupByLibrary.simpleMessage("Не вдалося завантажити"),
         "downloading": MessageLookupByLibrary.simpleMessage("Завантаження..."),
-        "dropSupportEmail": m29,
-        "duplicateFileCountWithStorageSaved": m30,
-        "duplicateItemsGroup": m31,
+        "dropSupportEmail": m30,
+        "duplicateFileCountWithStorageSaved": m31,
+        "duplicateItemsGroup": m32,
         "edit": MessageLookupByLibrary.simpleMessage("Редагувати"),
         "editLocation":
             MessageLookupByLibrary.simpleMessage("Змінити розташування"),
@@ -805,8 +805,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "eligible": MessageLookupByLibrary.simpleMessage("придатний"),
         "email":
             MessageLookupByLibrary.simpleMessage("Адреса електронної пошти"),
-        "emailChangedTo": m32,
-        "emailNoEnteAccount": m33,
+        "emailChangedTo": m33,
+        "emailNoEnteAccount": m35,
         "emailVerificationToggle":
             MessageLookupByLibrary.simpleMessage("Підтвердження через пошту"),
         "emailYourLogs": MessageLookupByLibrary.simpleMessage(
@@ -888,7 +888,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Експортувати дані"),
         "extraPhotosFound": MessageLookupByLibrary.simpleMessage(
             "Знайдено додаткові фотографії"),
-        "extraPhotosFoundFor": m34,
+        "extraPhotosFoundFor": m36,
         "faceNotClusteredYet": MessageLookupByLibrary.simpleMessage(
             "Обличчя ще не згруповані, поверніться пізніше"),
         "faceRecognition":
@@ -938,8 +938,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "fileTypes": MessageLookupByLibrary.simpleMessage("Типи файлів"),
         "fileTypesAndNames":
             MessageLookupByLibrary.simpleMessage("Типи та назви файлів"),
-        "filesBackedUpFromDevice": m35,
-        "filesBackedUpInAlbum": m36,
+        "filesBackedUpFromDevice": m37,
+        "filesBackedUpInAlbum": m38,
         "filesDeleted": MessageLookupByLibrary.simpleMessage("Файли видалено"),
         "filesSavedToGallery":
             MessageLookupByLibrary.simpleMessage("Файли збережено до галереї"),
@@ -960,21 +960,21 @@ class MessageLookup extends MessageLookupByLibrary {
             "Безплатне сховище можна використовувати"),
         "freeTrial":
             MessageLookupByLibrary.simpleMessage("Безплатний пробний період"),
-        "freeTrialValidTill": m37,
-        "freeUpAccessPostDelete": m38,
-        "freeUpAmount": m39,
+        "freeTrialValidTill": m39,
+        "freeUpAccessPostDelete": m40,
+        "freeUpAmount": m41,
         "freeUpDeviceSpace":
             MessageLookupByLibrary.simpleMessage("Звільніть місце на пристрої"),
         "freeUpDeviceSpaceDesc": MessageLookupByLibrary.simpleMessage(
             "Збережіть місце на вашому пристрої, очистивши файли, які вже збережено."),
         "freeUpSpace": MessageLookupByLibrary.simpleMessage("Звільнити місце"),
-        "freeUpSpaceSaving": m40,
+        "freeUpSpaceSaving": m42,
         "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage(
             "До 1000 спогадів, показаних у галереї"),
         "general": MessageLookupByLibrary.simpleMessage("Загальні"),
         "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage(
             "Створення ключів шифрування..."),
-        "genericProgress": m41,
+        "genericProgress": m43,
         "goToSettings":
             MessageLookupByLibrary.simpleMessage("Перейти до налаштувань"),
         "googlePlayId": MessageLookupByLibrary.simpleMessage("Google Play ID"),
@@ -1055,7 +1055,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "itLooksLikeSomethingWentWrongPleaseRetryAfterSome":
             MessageLookupByLibrary.simpleMessage(
                 "Схоже, що щось пішло не так. Спробуйте ще раз через деякий час. Якщо помилка не зникне, зв\'яжіться з нашою командою підтримки."),
-        "itemCount": m42,
+        "itemCount": m44,
         "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion":
             MessageLookupByLibrary.simpleMessage(
                 "Елементи показують кількість днів, що залишилися до остаточного видалення"),
@@ -1079,7 +1079,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "legacy": MessageLookupByLibrary.simpleMessage("Спадок"),
         "legacyAccounts":
             MessageLookupByLibrary.simpleMessage("Облікові записи «Спадку»"),
-        "legacyInvite": m43,
+        "legacyInvite": m45,
         "legacyPageDesc": MessageLookupByLibrary.simpleMessage(
             "«Спадок» дозволяє довіреним контактам отримати доступ до вашого облікового запису під час вашої відсутності."),
         "legacyPageDesc2": MessageLookupByLibrary.simpleMessage(
@@ -1092,7 +1092,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Досягнуто ліміту пристроїв"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("Увімкнено"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("Закінчився"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry": MessageLookupByLibrary.simpleMessage(
             "Термін дії посилання закінчився"),
         "linkHasExpired":
@@ -1219,12 +1219,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "moreDetails": MessageLookupByLibrary.simpleMessage("Детальніше"),
         "mostRecent": MessageLookupByLibrary.simpleMessage("Останні"),
         "mostRelevant": MessageLookupByLibrary.simpleMessage("Найактуальніші"),
-        "moveItem": m45,
+        "moveItem": m49,
         "moveToAlbum":
             MessageLookupByLibrary.simpleMessage("Перемістити до альбому"),
         "moveToHiddenAlbum": MessageLookupByLibrary.simpleMessage(
             "Перемістити до прихованого альбому"),
-        "movedSuccessfullyTo": m46,
+        "movedSuccessfullyTo": m50,
         "movedToTrash":
             MessageLookupByLibrary.simpleMessage("Переміщено у смітник"),
         "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
@@ -1276,10 +1276,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "noResults": MessageLookupByLibrary.simpleMessage("Немає результатів"),
         "noResultsFound":
             MessageLookupByLibrary.simpleMessage("Нічого не знайдено"),
-        "noSuggestionsForPerson": m47,
+        "noSuggestionsForPerson": m51,
         "noSystemLockFound": MessageLookupByLibrary.simpleMessage(
             "Не знайдено системного блокування"),
-        "notPersonLabel": m48,
+        "notPersonLabel": m52,
         "nothingSharedWithYouYet": MessageLookupByLibrary.simpleMessage(
             "Поки що з вами ніхто не поділився"),
         "nothingToSeeHere": MessageLookupByLibrary.simpleMessage(
@@ -1289,7 +1289,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "onDevice": MessageLookupByLibrary.simpleMessage("На пристрої"),
         "onEnte":
             MessageLookupByLibrary.simpleMessage("В <branding>Ente</branding>"),
-        "onlyFamilyAdminCanChangeCode": m49,
+        "onlyFamilyAdminCanChangeCode": m53,
         "onlyThem": MessageLookupByLibrary.simpleMessage("Тільки вони"),
         "oops": MessageLookupByLibrary.simpleMessage("От халепа"),
         "oopsCouldNotSaveEdits": MessageLookupByLibrary.simpleMessage(
@@ -1313,8 +1313,6 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Або об\'єднати з наявними"),
         "orPickAnExistingOne":
             MessageLookupByLibrary.simpleMessage("Або виберіть наявну"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "pair": MessageLookupByLibrary.simpleMessage("Створити пару"),
         "pairWithPin":
             MessageLookupByLibrary.simpleMessage("Під’єднатися через PIN-код"),
@@ -1342,7 +1340,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Не вдалося оплатити"),
         "paymentFailedMessage": MessageLookupByLibrary.simpleMessage(
             "На жаль, ваш платіж не вдався. Зв\'яжіться зі службою підтримки і ми вам допоможемо!"),
-        "paymentFailedTalkToProvider": m50,
+        "paymentFailedTalkToProvider": m54,
         "pendingItems":
             MessageLookupByLibrary.simpleMessage("Елементи на розгляді"),
         "pendingSync":
@@ -1366,14 +1364,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "photosAddedByYouWillBeRemovedFromTheAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Додані вами фотографії будуть видалені з альбому"),
-        "photosCount": m51,
+        "photosCount": m55,
         "pickCenterPoint":
             MessageLookupByLibrary.simpleMessage("Вкажіть центральну точку"),
         "pinAlbum": MessageLookupByLibrary.simpleMessage("Закріпити альбом"),
         "pinLock": MessageLookupByLibrary.simpleMessage("Блокування PIN-кодом"),
         "playOnTv":
             MessageLookupByLibrary.simpleMessage("Відтворити альбом на ТБ"),
-        "playStoreFreeTrialValidTill": m52,
+        "playStoreFreeTrialValidTill": m56,
         "playstoreSubscription":
             MessageLookupByLibrary.simpleMessage("Передплата Play Store"),
         "pleaseCheckYourInternetConnectionAndTryAgain":
@@ -1385,14 +1383,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseContactSupportIfTheProblemPersists":
             MessageLookupByLibrary.simpleMessage(
                 "Зверніться до служби підтримки, якщо проблема не зникне"),
-        "pleaseEmailUsAt": m53,
+        "pleaseEmailUsAt": m57,
         "pleaseGrantPermissions":
             MessageLookupByLibrary.simpleMessage("Надайте дозволи"),
         "pleaseLoginAgain":
             MessageLookupByLibrary.simpleMessage("Увійдіть знову"),
         "pleaseSelectQuickLinksToRemove": MessageLookupByLibrary.simpleMessage(
             "Виберіть посилання для видалення"),
-        "pleaseSendTheLogsTo": m54,
+        "pleaseSendTheLogsTo": m58,
         "pleaseTryAgain":
             MessageLookupByLibrary.simpleMessage("Спробуйте ще раз"),
         "pleaseVerifyTheCodeYouHaveEntered":
@@ -1419,7 +1417,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "privateSharing":
             MessageLookupByLibrary.simpleMessage("Приватне поширення"),
         "proceed": MessageLookupByLibrary.simpleMessage("Продовжити"),
-        "processingImport": m55,
+        "processingImport": m59,
         "publicLinkCreated":
             MessageLookupByLibrary.simpleMessage("Публічне посилання створено"),
         "publicLinkEnabled": MessageLookupByLibrary.simpleMessage(
@@ -1430,7 +1428,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "rateTheApp":
             MessageLookupByLibrary.simpleMessage("Оцініть застосунок"),
         "rateUs": MessageLookupByLibrary.simpleMessage("Оцініть нас"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
         "recover": MessageLookupByLibrary.simpleMessage("Відновити"),
         "recoverAccount":
             MessageLookupByLibrary.simpleMessage("Відновити обліковий запис"),
@@ -1439,7 +1437,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Відновити обліковий запис"),
         "recoveryInitiated":
             MessageLookupByLibrary.simpleMessage("Почато відновлення"),
-        "recoveryInitiatedDesc": m57,
+        "recoveryInitiatedDesc": m62,
         "recoveryKey": MessageLookupByLibrary.simpleMessage("Ключ відновлення"),
         "recoveryKeyCopiedToClipboard": MessageLookupByLibrary.simpleMessage(
             "Ключ відновлення скопійовано в буфер обміну"),
@@ -1453,12 +1451,12 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Ключ відновлення перевірено"),
         "recoveryKeyVerifyReason": MessageLookupByLibrary.simpleMessage(
             "Ключ відновлення — це єдиний спосіб відновити фотографії, якщо ви забули пароль. Ви можете знайти свій ключ в розділі «Налаштування» > «Обліковий запис».\n\nВведіть ключ відновлення тут, щоб перевірити, чи правильно ви його зберегли."),
-        "recoveryReady": m58,
+        "recoveryReady": m63,
         "recoverySuccessful":
             MessageLookupByLibrary.simpleMessage("Відновлення успішне!"),
         "recoveryWarning": MessageLookupByLibrary.simpleMessage(
             "Довірений контакт намагається отримати доступ до вашого облікового запису"),
-        "recoveryWarningBody": m59,
+        "recoveryWarningBody": m64,
         "recreatePasswordBody": MessageLookupByLibrary.simpleMessage(
             "Ваш пристрій недостатньо потужний для перевірки пароля, але ми можемо відновити його таким чином, щоб він працював на всіх пристроях.\n\nУвійдіть за допомогою ключа відновлення та відновіть свій пароль (за бажанням ви можете використати той самий ключ знову)."),
         "recreatePasswordTitle":
@@ -1474,7 +1472,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("1. Дайте цей код друзям"),
         "referralStep2": MessageLookupByLibrary.simpleMessage(
             "2. Вони оформлюють передплату"),
-        "referralStep3": m60,
+        "referralStep3": m65,
         "referrals": MessageLookupByLibrary.simpleMessage("Реферали"),
         "referralsAreCurrentlyPaused":
             MessageLookupByLibrary.simpleMessage("Реферали зараз призупинені"),
@@ -1506,7 +1504,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Вилучити посилання"),
         "removeParticipant":
             MessageLookupByLibrary.simpleMessage("Видалити учасника"),
-        "removeParticipantBody": m61,
+        "removeParticipantBody": m66,
         "removePersonLabel":
             MessageLookupByLibrary.simpleMessage("Видалити мітку особи"),
         "removePublicLink":
@@ -1528,7 +1526,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Перейменувати файл"),
         "renewSubscription":
             MessageLookupByLibrary.simpleMessage("Поновити передплату"),
-        "renewsOn": m62,
+        "renewsOn": m67,
         "reportABug":
             MessageLookupByLibrary.simpleMessage("Повідомити про помилку"),
         "reportBug":
@@ -1608,8 +1606,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Запросіть людей, і ви побачите всі фотографії, якими вони поділилися, тут"),
         "searchPersonsEmptySection": MessageLookupByLibrary.simpleMessage(
             "Люди будуть показані тут після завершення оброблення та синхронізації"),
-        "searchResultCount": m63,
-        "searchSectionsLengthMismatch": m64,
+        "searchResultCount": m68,
+        "searchSectionsLengthMismatch": m69,
         "security": MessageLookupByLibrary.simpleMessage("Безпека"),
         "seePublicAlbumLinksInApp": MessageLookupByLibrary.simpleMessage(
             "Посилання на публічні альбоми в застосунку"),
@@ -1642,7 +1640,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Вибрані елементи будуть видалені з усіх альбомів і переміщені в смітник."),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "send": MessageLookupByLibrary.simpleMessage("Надіслати"),
         "sendEmail": MessageLookupByLibrary.simpleMessage(
             "Надіслати електронного листа"),
@@ -1679,16 +1677,16 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Поділитися альбомом зараз"),
         "shareLink":
             MessageLookupByLibrary.simpleMessage("Поділитися посиланням"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage(
             "Поділіться тільки з тими людьми, якими ви хочете"),
         "shareTextConfirmOthersVerificationID": m7,
         "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage(
             "Завантажте Ente для того, щоб легко поділитися фотографіями оригінальної якості та відео\n\nhttps://ente.io"),
-        "shareTextReferralCode": m67,
+        "shareTextReferralCode": m72,
         "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage(
             "Поділитися з користувачами без Ente"),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "shareYourFirstAlbum": MessageLookupByLibrary.simpleMessage(
             "Поділитися вашим першим альбомом"),
         "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
@@ -1699,7 +1697,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Нові спільні фотографії"),
         "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage(
             "Отримувати сповіщення, коли хтось додасть фото до спільного альбому, в якому ви перебуваєте"),
-        "sharedWith": m69,
+        "sharedWith": m74,
         "sharedWithMe":
             MessageLookupByLibrary.simpleMessage("Поділитися зі мною"),
         "sharedWithYou":
@@ -1716,11 +1714,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Вийти на інших пристроях"),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "Я приймаю <u-terms>умови використання</u-terms> і <u-policy>політику приватності</u-policy>"),
-        "singleFileDeleteFromDevice": m70,
+        "singleFileDeleteFromDevice": m75,
         "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage(
             "Воно буде видалено з усіх альбомів."),
-        "singleFileInBothLocalAndRemote": m71,
-        "singleFileInRemoteOnly": m72,
+        "singleFileInBothLocalAndRemote": m76,
+        "singleFileInRemoteOnly": m77,
         "skip": MessageLookupByLibrary.simpleMessage("Пропустити"),
         "social": MessageLookupByLibrary.simpleMessage("Соцмережі"),
         "someItemsAreInBothEnteAndYourDevice":
@@ -1771,10 +1769,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageInGB": m1,
         "storageLimitExceeded":
             MessageLookupByLibrary.simpleMessage("Перевищено ліміт сховища"),
-        "storageUsageInfo": m73,
+        "storageUsageInfo": m78,
         "strongStrength": MessageLookupByLibrary.simpleMessage("Надійний"),
-        "subAlreadyLinkedErrMessage": m74,
-        "subWillBeCancelledOn": m75,
+        "subAlreadyLinkedErrMessage": m79,
+        "subWillBeCancelledOn": m80,
         "subscribe": MessageLookupByLibrary.simpleMessage("Передплачувати"),
         "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage(
             "Вам потрібна активна передплата, щоб увімкнути спільне поширення."),
@@ -1791,7 +1789,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "suggestFeatures":
             MessageLookupByLibrary.simpleMessage("Запропонувати нові функції"),
         "support": MessageLookupByLibrary.simpleMessage("Підтримка"),
-        "syncProgress": m76,
+        "syncProgress": m81,
         "syncStopped":
             MessageLookupByLibrary.simpleMessage("Синхронізацію зупинено"),
         "syncing": MessageLookupByLibrary.simpleMessage("Синхронізуємо..."),
@@ -1804,7 +1802,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Торкніться, щоби розблокувати"),
         "tapToUpload":
             MessageLookupByLibrary.simpleMessage("Натисніть, щоб завантажити"),
-        "tapToUploadIsIgnoredDue": m77,
+        "tapToUploadIsIgnoredDue": m82,
         "tempErrorContactSupportIfPersists": MessageLookupByLibrary.simpleMessage(
             "Схоже, що щось пішло не так. Спробуйте ще раз через деякий час. Якщо помилка не зникне, зв\'яжіться з нашою командою підтримки."),
         "terminate": MessageLookupByLibrary.simpleMessage("Припинити"),
@@ -1843,7 +1841,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Ця поштова адреса вже використовується"),
         "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage(
             "Це зображення не має даних exif"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage(
             "Це ваш Ідентифікатор підтвердження"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -1868,11 +1866,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "total": MessageLookupByLibrary.simpleMessage("всього"),
         "totalSize": MessageLookupByLibrary.simpleMessage("Загальний розмір"),
         "trash": MessageLookupByLibrary.simpleMessage("Смітник"),
-        "trashDaysLeft": m79,
+        "trashDaysLeft": m84,
         "trim": MessageLookupByLibrary.simpleMessage("Вирізати"),
         "trustedContacts":
             MessageLookupByLibrary.simpleMessage("Довірені контакти"),
-        "trustedInviteBody": m80,
+        "trustedInviteBody": m85,
         "tryAgain": MessageLookupByLibrary.simpleMessage("Спробувати знову"),
         "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage(
             "Увімкніть резервну копію для автоматичного завантаження файлів, доданих до теки пристрою в Ente."),
@@ -1890,7 +1888,7 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Двоетапну перевірку успішно скинуто"),
         "twofactorSetup": MessageLookupByLibrary.simpleMessage(
             "Налаштування двоетапної перевірки"),
-        "typeOfGallerGallerytypeIsNotSupportedForRename": m81,
+        "typeOfGallerGallerytypeIsNotSupportedForRename": m86,
         "unarchive": MessageLookupByLibrary.simpleMessage("Розархівувати"),
         "unarchiveAlbum":
             MessageLookupByLibrary.simpleMessage("Розархівувати альбом"),
@@ -1913,10 +1911,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "updatingFolderSelection":
             MessageLookupByLibrary.simpleMessage("Оновлення вибору теки..."),
         "upgrade": MessageLookupByLibrary.simpleMessage("Покращити"),
-        "uploadIsIgnoredDueToIgnorereason": m82,
+        "uploadIsIgnoredDueToIgnorereason": m87,
         "uploadingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
             "Завантажуємо файли до альбому..."),
-        "uploadingMultipleMemories": m83,
+        "uploadingMultipleMemories": m88,
         "uploadingSingleMemory":
             MessageLookupByLibrary.simpleMessage("Зберігаємо 1 спогад..."),
         "upto50OffUntil4thDec":
@@ -1935,7 +1933,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "useSelectedPhoto":
             MessageLookupByLibrary.simpleMessage("Використати вибране фото"),
         "usedSpace": MessageLookupByLibrary.simpleMessage("Використано місця"),
-        "validTill": m84,
+        "validTill": m89,
         "verificationFailedPleaseTryAgain":
             MessageLookupByLibrary.simpleMessage(
                 "Перевірка не вдалася, спробуйте ще раз"),
@@ -1944,7 +1942,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "verify": MessageLookupByLibrary.simpleMessage("Підтвердити"),
         "verifyEmail":
             MessageLookupByLibrary.simpleMessage("Підтвердити пошту"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Підтвердження"),
         "verifyPasskey":
             MessageLookupByLibrary.simpleMessage("Підтвердити ключ доступу"),
@@ -1971,7 +1969,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "viewRecoveryKey": MessageLookupByLibrary.simpleMessage(
             "Переглянути ключ відновлення"),
         "viewer": MessageLookupByLibrary.simpleMessage("Глядач"),
-        "viewersSuccessfullyAdded": m86,
+        "viewersSuccessfullyAdded": m91,
         "visitWebToManage": MessageLookupByLibrary.simpleMessage(
             "Відвідайте web.ente.io, щоб керувати передплатою"),
         "waitingForVerification":
@@ -1992,7 +1990,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Довірений контакт може допомогти у відновленні ваших даних."),
         "yearShort": MessageLookupByLibrary.simpleMessage("рік"),
         "yearly": MessageLookupByLibrary.simpleMessage("Щороку"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("Так"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("Так, скасувати"),
         "yesConvertToViewer":
@@ -2025,7 +2023,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Ви не можете поділитися із собою"),
         "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage(
             "У вас немає жодних архівних елементів."),
-        "youHaveSuccessfullyFreedUp": m88,
+        "youHaveSuccessfullyFreedUp": m93,
         "yourAccountHasBeenDeleted": MessageLookupByLibrary.simpleMessage(
             "Ваш обліковий запис видалено"),
         "yourMap": MessageLookupByLibrary.simpleMessage("Ваша мапа"),
diff --git a/mobile/lib/generated/intl/messages_vi.dart b/mobile/lib/generated/intl/messages_vi.dart
index 647d8d1dd7..e10f51ea1c 100644
--- a/mobile/lib/generated/intl/messages_vi.dart
+++ b/mobile/lib/generated/intl/messages_vi.dart
@@ -20,37 +20,37 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'vi';
 
-  static String m9(count) =>
+  static String m10(count) =>
       "${Intl.plural(count, zero: 'Thêm cộng tác viên', one: 'Thêm cộng tác viên', other: 'Thêm cộng tác viên')}";
 
-  static String m10(count) =>
+  static String m11(count) =>
       "${Intl.plural(count, one: 'Thêm mục', other: 'Thêm các mục')}";
 
-  static String m11(storageAmount, endDate) =>
+  static String m12(storageAmount, endDate) =>
       "Gói bổ sung ${storageAmount} của bạn có hiệu lực đến ${endDate}";
 
-  static String m12(count) =>
+  static String m13(count) =>
       "${Intl.plural(count, zero: 'Thêm người xem', one: 'Thêm người xem', other: 'Thêm người xem')}";
 
-  static String m13(emailOrName) => "Được thêm bởi ${emailOrName}";
+  static String m14(emailOrName) => "Được thêm bởi ${emailOrName}";
 
-  static String m14(albumName) => "Đã thêm thành công vào ${albumName}";
+  static String m15(albumName) => "Đã thêm thành công vào ${albumName}";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: 'Không có người tham gia', one: '1 người tham gia', other: '${count} Người tham gia')}";
 
-  static String m16(versionValue) => "Phiên bản: ${versionValue}";
+  static String m17(versionValue) => "Phiên bản: ${versionValue}";
 
-  static String m17(freeAmount, storageUnit) =>
+  static String m18(freeAmount, storageUnit) =>
       "${freeAmount} ${storageUnit} còn trống";
 
-  static String m18(paymentProvider) =>
+  static String m19(paymentProvider) =>
       "Vui lòng hủy đăng ký hiện tại của bạn từ ${paymentProvider} trước";
 
   static String m3(user) =>
       "${user} sẽ không thể thêm ảnh mới vào album này\n\nHọ vẫn có thể xóa các ảnh đã thêm trước đó";
 
-  static String m19(isFamilyMember, storageAmountInGb) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
       "${Intl.select(isFamilyMember, {
             'true':
                 'Gia đình bạn đã yêu cầu ${storageAmountInGb} GB cho đến nay',
@@ -58,213 +58,213 @@ class MessageLookup extends MessageLookupByLibrary {
             'other': 'Bạn đã yêu cầu ${storageAmountInGb} GB cho đến nay!',
           })}";
 
-  static String m20(albumName) =>
+  static String m21(albumName) =>
       "Liên kết hợp tác đã được tạo cho ${albumName}";
 
-  static String m21(count) =>
+  static String m22(count) =>
       "${Intl.plural(count, zero: 'Đã thêm 0 cộng tác viên', one: 'Đã thêm 1 cộng tác viên', other: 'Đã thêm ${count} cộng tác viên')}";
 
-  static String m22(email, numOfDays) =>
+  static String m23(email, numOfDays) =>
       "Bạn sắp thêm ${email} làm liên hệ tin cậy. Họ sẽ có thể khôi phục tài khoản của bạn nếu bạn không hoạt động trong ${numOfDays} ngày.";
 
-  static String m23(familyAdminEmail) =>
+  static String m24(familyAdminEmail) =>
       "Vui lòng liên hệ với <green>${familyAdminEmail}</green> để quản lý đăng ký của bạn";
 
-  static String m24(provider) =>
+  static String m25(provider) =>
       "Vui lòng liên hệ với chúng tôi tại support@ente.io để quản lý đăng ký ${provider} của bạn.";
 
-  static String m25(endpoint) => "Đã kết nối với ${endpoint}";
+  static String m26(endpoint) => "Đã kết nối với ${endpoint}";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: 'Xóa ${count} mục', other: 'Xóa ${count} mục')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "Đang xóa ${currentlyDeleting} / ${totalCount}";
 
-  static String m28(albumName) =>
+  static String m29(albumName) =>
       "Điều này sẽ xóa liên kết công khai để truy cập \"${albumName}\".";
 
-  static String m29(supportEmail) =>
+  static String m30(supportEmail) =>
       "Vui lòng gửi email đến ${supportEmail} từ địa chỉ email đã đăng ký của bạn";
 
-  static String m30(count, storageSaved) =>
+  static String m31(count, storageSaved) =>
       "Bạn đã dọn dẹp ${Intl.plural(count, one: '${count} tệp trùng lặp', other: '${count} tệp trùng lặp')}, tiết kiệm (${storageSaved}!)";
 
-  static String m31(count, formattedSize) =>
+  static String m32(count, formattedSize) =>
       "${count} tệp, ${formattedSize} mỗi tệp";
 
-  static String m32(newEmail) => "Email đã được thay đổi thành ${newEmail}";
+  static String m33(newEmail) => "Email đã được thay đổi thành ${newEmail}";
 
-  static String m33(email) =>
+  static String m35(email) =>
       "${email} không có tài khoản Ente.\n\nGửi cho họ một lời mời để chia sẻ ảnh.";
 
-  static String m34(text) => "Extra photos found for ${text}";
+  static String m36(text) => "Extra photos found for ${text}";
 
-  static String m35(count, formattedNumber) =>
+  static String m37(count, formattedNumber) =>
       "${Intl.plural(count, one: '1 tệp', other: '${formattedNumber} tệp')} trên thiết bị này đã được sao lưu an toàn";
 
-  static String m36(count, formattedNumber) =>
+  static String m38(count, formattedNumber) =>
       "${Intl.plural(count, one: '1 tệp', other: '${formattedNumber} tệp')} trong album này đã được sao lưu an toàn";
 
   static String m4(storageAmountInGB) =>
       "${storageAmountInGB} GB mỗi khi ai đó đăng ký gói trả phí và áp dụng mã của bạn";
 
-  static String m37(endDate) => "Dùng thử miễn phí có hiệu lực đến ${endDate}";
+  static String m39(endDate) => "Dùng thử miễn phí có hiệu lực đến ${endDate}";
 
-  static String m38(count) =>
+  static String m40(count) =>
       "Bạn vẫn có thể truy cập ${Intl.plural(count, one: 'nó', other: 'chúng')} trên Ente miễn là bạn có một đăng ký hoạt động";
 
-  static String m39(sizeInMBorGB) => "Giải phóng ${sizeInMBorGB}";
+  static String m41(sizeInMBorGB) => "Giải phóng ${sizeInMBorGB}";
 
-  static String m40(count, formattedSize) =>
+  static String m42(count, formattedSize) =>
       "${Intl.plural(count, one: 'Nó có thể được xóa khỏi thiết bị để giải phóng ${formattedSize}', other: 'Chúng có thể được xóa khỏi thiết bị để giải phóng ${formattedSize}')}";
 
-  static String m41(currentlyProcessing, totalCount) =>
+  static String m43(currentlyProcessing, totalCount) =>
       "Đang xử lý ${currentlyProcessing} / ${totalCount}";
 
-  static String m42(count) =>
+  static String m44(count) =>
       "${Intl.plural(count, one: '${count} mục', other: '${count} mục')}";
 
-  static String m43(email) =>
+  static String m45(email) =>
       "${email} đã mời bạn trở thành một liên hệ tin cậy";
 
-  static String m44(expiryTime) => "Liên kết sẽ hết hạn vào ${expiryTime}";
+  static String m46(expiryTime) => "Liên kết sẽ hết hạn vào ${expiryTime}";
 
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, zero: 'không có kỷ niệm', one: '${formattedCount} kỷ niệm', other: '${formattedCount} kỷ niệm')}";
 
-  static String m45(count) =>
+  static String m49(count) =>
       "${Intl.plural(count, one: 'Di chuyển mục', other: 'Di chuyển các mục')}";
 
-  static String m46(albumName) => "Đã di chuyển thành công đến ${albumName}";
+  static String m50(albumName) => "Đã di chuyển thành công đến ${albumName}";
 
-  static String m47(personName) => "Không có gợi ý cho ${personName}";
+  static String m51(personName) => "Không có gợi ý cho ${personName}";
 
-  static String m48(name) => "Không phải ${name}?";
+  static String m52(name) => "Không phải ${name}?";
 
-  static String m49(familyAdminEmail) =>
+  static String m53(familyAdminEmail) =>
       "Vui lòng liên hệ ${familyAdminEmail} để thay đổi mã của bạn.";
 
   static String m0(passwordStrengthValue) =>
       "Độ mạnh mật khẩu: ${passwordStrengthValue}";
 
-  static String m50(providerName) =>
+  static String m54(providerName) =>
       "Vui lòng nói chuyện với bộ phận hỗ trợ ${providerName} nếu bạn đã bị tính phí";
 
-  static String m51(count) =>
+  static String m55(count) =>
       "${Intl.plural(count, zero: 'không có hình ảnh', one: '1 hình ảnh', other: '${count} hình ảnh')}";
 
-  static String m52(endDate) =>
+  static String m56(endDate) =>
       "Dùng thử miễn phí có hiệu lực đến ${endDate}.\nBạn có thể chọn gói trả phí sau đó.";
 
-  static String m53(toEmail) =>
+  static String m57(toEmail) =>
       "Vui lòng gửi email cho chúng tôi tại ${toEmail}";
 
-  static String m54(toEmail) => "Vui lòng gửi nhật ký đến \n${toEmail}";
+  static String m58(toEmail) => "Vui lòng gửi nhật ký đến \n${toEmail}";
 
-  static String m55(folderName) => "Đang xử lý ${folderName}...";
+  static String m59(folderName) => "Đang xử lý ${folderName}...";
 
-  static String m56(storeName) => "Đánh giá chúng tôi trên ${storeName}";
+  static String m60(storeName) => "Đánh giá chúng tôi trên ${storeName}";
 
-  static String m57(days, email) =>
+  static String m62(days, email) =>
       "Bạn có thể truy cập tài khoản sau ${days} ngày. Một thông báo sẽ được gửi đến ${email}.";
 
-  static String m58(email) =>
+  static String m63(email) =>
       "Bạn có thể khôi phục tài khoản của ${email} bằng cách đặt lại mật khẩu mới.";
 
-  static String m59(email) =>
+  static String m64(email) =>
       "${email} đang cố gắng khôi phục tài khoản của bạn.";
 
-  static String m60(storageInGB) =>
+  static String m65(storageInGB) =>
       "3. Cả hai bạn đều nhận ${storageInGB} GB* miễn phí";
 
-  static String m61(userEmail) =>
+  static String m66(userEmail) =>
       "${userEmail} sẽ bị xóa khỏi album chia sẻ này\n\nBất kỳ ảnh nào được thêm bởi họ cũng sẽ bị xóa khỏi album";
 
-  static String m62(endDate) => "Đăng ký sẽ được gia hạn vào ${endDate}";
+  static String m67(endDate) => "Đăng ký sẽ được gia hạn vào ${endDate}";
 
-  static String m63(count) =>
+  static String m68(count) =>
       "${Intl.plural(count, one: '${count} kết quả được tìm thấy', other: '${count} kết quả được tìm thấy')}";
 
-  static String m64(snapshotLength, searchLength) =>
+  static String m69(snapshotLength, searchLength) =>
       "Độ dài các phần không khớp: ${snapshotLength} != ${searchLength}";
 
   static String m6(count) => "${count} đã chọn";
 
-  static String m65(count, yourCount) =>
+  static String m70(count, yourCount) =>
       "${count} đã chọn (${yourCount} của bạn)";
 
-  static String m66(verificationID) =>
+  static String m71(verificationID) =>
       "Đây là ID xác minh của tôi: ${verificationID} cho ente.io.";
 
   static String m7(verificationID) =>
       "Chào, bạn có thể xác nhận rằng đây là ID xác minh ente.io của bạn: ${verificationID}";
 
-  static String m67(referralCode, referralStorageInGB) =>
+  static String m72(referralCode, referralStorageInGB) =>
       "Mã giới thiệu Ente: ${referralCode} \n\nÁp dụng nó trong Cài đặt → Chung → Giới thiệu để nhận ${referralStorageInGB} GB miễn phí sau khi bạn đăng ký gói trả phí\n\nhttps://ente.io";
 
-  static String m68(numberOfPeople) =>
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: 'Chia sẻ với những người cụ thể', one: 'Chia sẻ với 1 người', other: 'Chia sẻ với ${numberOfPeople} người')}";
 
-  static String m69(emailIDs) => "Chia sẻ với ${emailIDs}";
+  static String m74(emailIDs) => "Chia sẻ với ${emailIDs}";
 
-  static String m70(fileType) =>
+  static String m75(fileType) =>
       "Tệp ${fileType} này sẽ bị xóa khỏi thiết bị của bạn.";
 
-  static String m71(fileType) =>
+  static String m76(fileType) =>
       "Tệp ${fileType} này có trong cả Ente và thiết bị của bạn.";
 
-  static String m72(fileType) => "Tệp ${fileType} này sẽ bị xóa khỏi Ente.";
+  static String m77(fileType) => "Tệp ${fileType} này sẽ bị xóa khỏi Ente.";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} GB";
 
-  static String m73(
+  static String m78(
           usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) =>
       "${usedAmount} ${usedStorageUnit} trong tổng số ${totalAmount} ${totalStorageUnit} đã sử dụng";
 
-  static String m74(id) =>
+  static String m79(id) =>
       "ID ${id} của bạn đã được liên kết với một tài khoản Ente khác.\nNếu bạn muốn sử dụng ID ${id} này với tài khoản này, vui lòng liên hệ với bộ phận hỗ trợ của chúng tôi.";
 
-  static String m75(endDate) => "Đăng ký của bạn sẽ bị hủy vào ${endDate}";
+  static String m80(endDate) => "Đăng ký của bạn sẽ bị hủy vào ${endDate}";
 
-  static String m76(completed, total) =>
+  static String m81(completed, total) =>
       "${completed}/${total} kỷ niệm đã được lưu giữ";
 
-  static String m77(ignoreReason) =>
+  static String m82(ignoreReason) =>
       "Nhấn để tải lên, tải lên hiện tại bị bỏ qua do ${ignoreReason}";
 
   static String m8(storageAmountInGB) =>
       "Họ cũng nhận được ${storageAmountInGB} GB";
 
-  static String m78(email) => "Đây là ID xác minh của ${email}";
+  static String m83(email) => "Đây là ID xác minh của ${email}";
 
-  static String m79(count) =>
+  static String m84(count) =>
       "${Intl.plural(count, zero: 'Soon', one: '1 day', other: '${count} days')}";
 
-  static String m80(email) =>
+  static String m85(email) =>
       "Bạn đã được mời làm người liên hệ thừa kế bởi ${email}.";
 
-  static String m81(galleryType) =>
+  static String m86(galleryType) =>
       "Loại thư viện ${galleryType} không được hỗ trợ để đổi tên";
 
-  static String m82(ignoreReason) => "Tải lên bị bỏ qua do ${ignoreReason}";
+  static String m87(ignoreReason) => "Tải lên bị bỏ qua do ${ignoreReason}";
 
-  static String m83(count) => "Đang lưu giữ ${count} kỷ niệm...";
+  static String m88(count) => "Đang lưu giữ ${count} kỷ niệm...";
 
-  static String m84(endDate) => "Có hiệu lực đến ${endDate}";
+  static String m89(endDate) => "Có hiệu lực đến ${endDate}";
 
-  static String m85(email) => "Xác minh ${email}";
+  static String m90(email) => "Xác minh ${email}";
 
-  static String m86(count) =>
+  static String m91(count) =>
       "${Intl.plural(count, zero: 'Đã thêm 0 người xem', one: 'Đã thêm 1 người xem', other: 'Đã thêm ${count} người xem')}";
 
   static String m2(email) =>
       "Chúng tôi đã gửi một email đến <green>${email}</green>";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, one: '${count} năm trước', other: '${count} năm trước')}";
 
-  static String m88(storageSaved) =>
+  static String m93(storageSaved) =>
       "Bạn đã giải phóng thành công ${storageSaved}!";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
@@ -289,11 +289,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Thêm một email mới"),
         "addCollaborator":
             MessageLookupByLibrary.simpleMessage("Thêm cộng tác viên"),
-        "addCollaborators": m9,
+        "addCollaborators": m10,
         "addFiles": MessageLookupByLibrary.simpleMessage("Thêm tệp"),
         "addFromDevice":
             MessageLookupByLibrary.simpleMessage("Thêm từ thiết bị"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocation": MessageLookupByLibrary.simpleMessage("Thêm vị trí"),
         "addLocationButton": MessageLookupByLibrary.simpleMessage("Thêm"),
         "addMore": MessageLookupByLibrary.simpleMessage("Thêm nữa"),
@@ -304,7 +304,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "addNewPerson": MessageLookupByLibrary.simpleMessage("Thêm người mới"),
         "addOnPageSubtitle": MessageLookupByLibrary.simpleMessage(
             "Chi tiết về tiện ích mở rộng"),
-        "addOnValidTill": m11,
+        "addOnValidTill": m12,
         "addOns": MessageLookupByLibrary.simpleMessage("Tiện ích mở rộng"),
         "addPhotos": MessageLookupByLibrary.simpleMessage("Thêm ảnh"),
         "addSelected": MessageLookupByLibrary.simpleMessage("Thêm đã chọn"),
@@ -315,12 +315,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "addTrustedContact":
             MessageLookupByLibrary.simpleMessage("Thêm liên hệ tin cậy"),
         "addViewer": MessageLookupByLibrary.simpleMessage("Thêm người xem"),
-        "addViewers": m12,
+        "addViewers": m13,
         "addYourPhotosNow": MessageLookupByLibrary.simpleMessage(
             "Thêm ảnh của bạn ngay bây giờ"),
         "addedAs": MessageLookupByLibrary.simpleMessage("Đã thêm như"),
-        "addedBy": m13,
-        "addedSuccessfullyTo": m14,
+        "addedBy": m14,
+        "addedSuccessfullyTo": m15,
         "addingToFavorites": MessageLookupByLibrary.simpleMessage(
             "Đang thêm vào mục yêu thích..."),
         "advanced": MessageLookupByLibrary.simpleMessage("Nâng cao"),
@@ -331,7 +331,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "after1Week": MessageLookupByLibrary.simpleMessage("Sau 1 tuần"),
         "after1Year": MessageLookupByLibrary.simpleMessage("Sau 1 năm"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("Chủ sở hữu"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumTitle": MessageLookupByLibrary.simpleMessage("Tiêu đề album"),
         "albumUpdated":
             MessageLookupByLibrary.simpleMessage("Album đã được cập nhật"),
@@ -380,7 +380,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "appLock": MessageLookupByLibrary.simpleMessage("Khóa ứng dụng"),
         "appLockDescriptions": MessageLookupByLibrary.simpleMessage(
             "Chọn giữa màn hình khóa mặc định của thiết bị và màn hình khóa tùy chỉnh với PIN hoặc mật khẩu."),
-        "appVersion": m16,
+        "appVersion": m17,
         "appleId": MessageLookupByLibrary.simpleMessage("ID Apple"),
         "apply": MessageLookupByLibrary.simpleMessage("Áp dụng"),
         "applyCodeTitle": MessageLookupByLibrary.simpleMessage("Áp dụng mã"),
@@ -462,7 +462,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoPairDesc": MessageLookupByLibrary.simpleMessage(
             "Ghép nối tự động chỉ hoạt động với các thiết bị hỗ trợ Chromecast."),
         "available": MessageLookupByLibrary.simpleMessage("Có sẵn"),
-        "availableStorageSpace": m17,
+        "availableStorageSpace": m18,
         "backedUpFolders":
             MessageLookupByLibrary.simpleMessage("Thư mục đã sao lưu"),
         "backup": MessageLookupByLibrary.simpleMessage("Sao lưu"),
@@ -502,7 +502,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Hủy khôi phục"),
         "cancelAccountRecoveryBody": MessageLookupByLibrary.simpleMessage(
             "Bạn có chắc chắn muốn hủy khôi phục không?"),
-        "cancelOtherSubscription": m18,
+        "cancelOtherSubscription": m19,
         "cancelSubscription":
             MessageLookupByLibrary.simpleMessage("Hủy đăng ký"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
@@ -553,7 +553,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Yêu cầu lưu trữ miễn phí"),
         "claimMore": MessageLookupByLibrary.simpleMessage("Yêu cầu thêm!"),
         "claimed": MessageLookupByLibrary.simpleMessage("Đã yêu cầu"),
-        "claimedStorageSoFar": m19,
+        "claimedStorageSoFar": m20,
         "cleanUncategorized":
             MessageLookupByLibrary.simpleMessage("Dọn dẹp chưa phân loại"),
         "cleanUncategorizedDescription": MessageLookupByLibrary.simpleMessage(
@@ -582,12 +582,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Tạo một liên kết để cho phép mọi người thêm và xem ảnh trong album chia sẻ của bạn mà không cần ứng dụng hoặc tài khoản Ente. Tuyệt vời để thu thập ảnh sự kiện."),
         "collaborativeLink":
             MessageLookupByLibrary.simpleMessage("Liên kết hợp tác"),
-        "collaborativeLinkCreatedFor": m20,
+        "collaborativeLinkCreatedFor": m21,
         "collaborator": MessageLookupByLibrary.simpleMessage("Cộng tác viên"),
         "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Cộng tác viên có thể thêm ảnh và video vào album chia sẻ."),
-        "collaboratorsSuccessfullyAdded": m21,
+        "collaboratorsSuccessfullyAdded": m22,
         "collageLayout": MessageLookupByLibrary.simpleMessage("Bố cục"),
         "collageSaved": MessageLookupByLibrary.simpleMessage(
             "Ảnh ghép đã được lưu vào thư viện"),
@@ -604,7 +604,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Bạn có chắc chắn muốn vô hiệu hóa xác thực hai yếu tố không?"),
         "confirmAccountDeletion":
             MessageLookupByLibrary.simpleMessage("Xác nhận xóa tài khoản"),
-        "confirmAddingTrustedContact": m22,
+        "confirmAddingTrustedContact": m23,
         "confirmDeletePrompt": MessageLookupByLibrary.simpleMessage(
             "Có, tôi muốn xóa vĩnh viễn tài khoản này và dữ liệu của nó trên tất cả các ứng dụng."),
         "confirmPassword":
@@ -617,10 +617,10 @@ class MessageLookup extends MessageLookupByLibrary {
             "Xác nhận khóa khôi phục của bạn"),
         "connectToDevice":
             MessageLookupByLibrary.simpleMessage("Kết nối với thiết bị"),
-        "contactFamilyAdmin": m23,
+        "contactFamilyAdmin": m24,
         "contactSupport":
             MessageLookupByLibrary.simpleMessage("Liên hệ hỗ trợ"),
-        "contactToManageSubscription": m24,
+        "contactToManageSubscription": m25,
         "contacts": MessageLookupByLibrary.simpleMessage("Danh bạ"),
         "contents": MessageLookupByLibrary.simpleMessage("Nội dung"),
         "continueLabel": MessageLookupByLibrary.simpleMessage("Tiếp tục"),
@@ -664,7 +664,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Sử dụng hiện tại là "),
         "currentlyRunning": MessageLookupByLibrary.simpleMessage("đang chạy"),
         "custom": MessageLookupByLibrary.simpleMessage("Tùy chỉnh"),
-        "customEndpoint": m25,
+        "customEndpoint": m26,
         "darkTheme": MessageLookupByLibrary.simpleMessage("Tối"),
         "dayToday": MessageLookupByLibrary.simpleMessage("Hôm nay"),
         "dayYesterday": MessageLookupByLibrary.simpleMessage("Hôm qua"),
@@ -700,10 +700,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "deleteFromDevice":
             MessageLookupByLibrary.simpleMessage("Xóa khỏi thiết bị"),
         "deleteFromEnte": MessageLookupByLibrary.simpleMessage("Xóa khỏi Ente"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deleteLocation": MessageLookupByLibrary.simpleMessage("Xóa vị trí"),
         "deletePhotos": MessageLookupByLibrary.simpleMessage("Xóa ảnh"),
-        "deleteProgress": m27,
+        "deleteProgress": m28,
         "deleteReason1": MessageLookupByLibrary.simpleMessage(
             "Nó thiếu một tính năng quan trọng mà tôi cần"),
         "deleteReason2": MessageLookupByLibrary.simpleMessage(
@@ -741,7 +741,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Người xem vẫn có thể chụp màn hình hoặc lưu bản sao ảnh của bạn bằng các công cụ bên ngoài"),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("Xin lưu ý"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "disableTwofactor": MessageLookupByLibrary.simpleMessage(
             "Vô hiệu hóa xác thực hai yếu tố"),
         "disablingTwofactorAuthentication":
@@ -783,9 +783,9 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Tải xuống thất bại"),
         "downloading":
             MessageLookupByLibrary.simpleMessage("Đang tải xuống..."),
-        "dropSupportEmail": m29,
-        "duplicateFileCountWithStorageSaved": m30,
-        "duplicateItemsGroup": m31,
+        "dropSupportEmail": m30,
+        "duplicateFileCountWithStorageSaved": m31,
+        "duplicateItemsGroup": m32,
         "edit": MessageLookupByLibrary.simpleMessage("Chỉnh sửa"),
         "editLocation":
             MessageLookupByLibrary.simpleMessage("Chỉnh sửa vị trí"),
@@ -801,8 +801,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "email": MessageLookupByLibrary.simpleMessage("Email"),
         "emailAlreadyRegistered":
             MessageLookupByLibrary.simpleMessage("Email đã được đăng kí."),
-        "emailChangedTo": m32,
-        "emailNoEnteAccount": m33,
+        "emailChangedTo": m33,
+        "emailNoEnteAccount": m35,
         "emailNotRegistered":
             MessageLookupByLibrary.simpleMessage("Email chưa được đăng kí."),
         "emailVerificationToggle":
@@ -883,7 +883,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Xuất dữ liệu của bạn"),
         "extraPhotosFound":
             MessageLookupByLibrary.simpleMessage("Tìm thấy ảnh bổ sung"),
-        "extraPhotosFoundFor": m34,
+        "extraPhotosFoundFor": m36,
         "faceNotClusteredYet": MessageLookupByLibrary.simpleMessage(
             "Khuôn mặt chưa được phân cụm, vui lòng quay lại sau"),
         "faceRecognition":
@@ -932,8 +932,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "fileTypes": MessageLookupByLibrary.simpleMessage("Loại tệp"),
         "fileTypesAndNames":
             MessageLookupByLibrary.simpleMessage("Loại tệp và tên"),
-        "filesBackedUpFromDevice": m35,
-        "filesBackedUpInAlbum": m36,
+        "filesBackedUpFromDevice": m37,
+        "filesBackedUpInAlbum": m38,
         "filesDeleted": MessageLookupByLibrary.simpleMessage("Tệp đã bị xóa"),
         "filesSavedToGallery": MessageLookupByLibrary.simpleMessage(
             "Các tệp đã được lưu vào thư viện"),
@@ -953,23 +953,23 @@ class MessageLookup extends MessageLookupByLibrary {
         "freeStorageUsable": MessageLookupByLibrary.simpleMessage(
             "Lưu trữ miễn phí có thể sử dụng"),
         "freeTrial": MessageLookupByLibrary.simpleMessage("Dùng thử miễn phí"),
-        "freeTrialValidTill": m37,
-        "freeUpAccessPostDelete": m38,
-        "freeUpAmount": m39,
+        "freeTrialValidTill": m39,
+        "freeUpAccessPostDelete": m40,
+        "freeUpAmount": m41,
         "freeUpDeviceSpace": MessageLookupByLibrary.simpleMessage(
             "Giải phóng không gian thiết bị"),
         "freeUpDeviceSpaceDesc": MessageLookupByLibrary.simpleMessage(
             "Tiết kiệm không gian trên thiết bị của bạn bằng cách xóa các tệp đã được sao lưu."),
         "freeUpSpace":
             MessageLookupByLibrary.simpleMessage("Giải phóng không gian"),
-        "freeUpSpaceSaving": m40,
+        "freeUpSpaceSaving": m42,
         "gallery": MessageLookupByLibrary.simpleMessage("Thư viện"),
         "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage(
             "Tối đa 1000 kỷ niệm được hiển thị trong thư viện"),
         "general": MessageLookupByLibrary.simpleMessage("Chung"),
         "generatingEncryptionKeys":
             MessageLookupByLibrary.simpleMessage("Đang tạo khóa mã hóa..."),
-        "genericProgress": m41,
+        "genericProgress": m43,
         "goToSettings": MessageLookupByLibrary.simpleMessage("Đi đến cài đặt"),
         "googlePlayId": MessageLookupByLibrary.simpleMessage("ID Google Play"),
         "grantFullAccessPrompt": MessageLookupByLibrary.simpleMessage(
@@ -1050,7 +1050,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "itLooksLikeSomethingWentWrongPleaseRetryAfterSome":
             MessageLookupByLibrary.simpleMessage(
                 "Có vẻ như đã xảy ra sự cố. Vui lòng thử lại sau một thời gian. Nếu lỗi vẫn tiếp diễn, vui lòng liên hệ với đội ngũ hỗ trợ của chúng tôi."),
-        "itemCount": m42,
+        "itemCount": m44,
         "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion":
             MessageLookupByLibrary.simpleMessage(
                 "Các mục cho biết số ngày còn lại trước khi xóa vĩnh viễn"),
@@ -1080,7 +1080,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "legacy": MessageLookupByLibrary.simpleMessage("Thừa kế"),
         "legacyAccounts":
             MessageLookupByLibrary.simpleMessage("Tài khoản thừa kế"),
-        "legacyInvite": m43,
+        "legacyInvite": m45,
         "legacyPageDesc": MessageLookupByLibrary.simpleMessage(
             "Thừa kế cho phép các liên hệ tin cậy truy cập tài khoản của bạn khi bạn không hoạt động."),
         "legacyPageDesc2": MessageLookupByLibrary.simpleMessage(
@@ -1093,7 +1093,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Giới hạn thiết bị"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("Đã bật"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("Hết hạn"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry": MessageLookupByLibrary.simpleMessage("Hết hạn liên kết"),
         "linkHasExpired":
             MessageLookupByLibrary.simpleMessage("Liên kết đã hết hạn"),
@@ -1213,11 +1213,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "moreDetails": MessageLookupByLibrary.simpleMessage("Thêm chi tiết"),
         "mostRecent": MessageLookupByLibrary.simpleMessage("Mới nhất"),
         "mostRelevant": MessageLookupByLibrary.simpleMessage("Liên quan nhất"),
-        "moveItem": m45,
+        "moveItem": m49,
         "moveToAlbum": MessageLookupByLibrary.simpleMessage("Chuyển đến album"),
         "moveToHiddenAlbum":
             MessageLookupByLibrary.simpleMessage("Di chuyển đến album ẩn"),
-        "movedSuccessfullyTo": m46,
+        "movedSuccessfullyTo": m50,
         "movedToTrash":
             MessageLookupByLibrary.simpleMessage("Đã chuyển vào thùng rác"),
         "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage(
@@ -1270,10 +1270,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "noResults": MessageLookupByLibrary.simpleMessage("Không có kết quả"),
         "noResultsFound":
             MessageLookupByLibrary.simpleMessage("Không tìm thấy kết quả"),
-        "noSuggestionsForPerson": m47,
+        "noSuggestionsForPerson": m51,
         "noSystemLockFound": MessageLookupByLibrary.simpleMessage(
             "Không tìm thấy khóa hệ thống"),
-        "notPersonLabel": m48,
+        "notPersonLabel": m52,
         "nothingSharedWithYouYet": MessageLookupByLibrary.simpleMessage(
             "Chưa có gì được chia sẻ với bạn"),
         "nothingToSeeHere": MessageLookupByLibrary.simpleMessage(
@@ -1283,7 +1283,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "onDevice": MessageLookupByLibrary.simpleMessage("Trên thiết bị"),
         "onEnte": MessageLookupByLibrary.simpleMessage(
             "Trên <branding>ente</branding>"),
-        "onlyFamilyAdminCanChangeCode": m49,
+        "onlyFamilyAdminCanChangeCode": m53,
         "onlyThem": MessageLookupByLibrary.simpleMessage("Chỉ họ"),
         "oops": MessageLookupByLibrary.simpleMessage("Ôi"),
         "oopsCouldNotSaveEdits":
@@ -1305,8 +1305,6 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Hoặc hợp nhất với hiện có"),
         "orPickAnExistingOne":
             MessageLookupByLibrary.simpleMessage("Hoặc chọn một cái có sẵn"),
-        "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
         "pair": MessageLookupByLibrary.simpleMessage("Ghép nối"),
         "pairWithPin": MessageLookupByLibrary.simpleMessage("Ghép nối với PIN"),
         "pairingComplete":
@@ -1333,7 +1331,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Thanh toán thất bại"),
         "paymentFailedMessage": MessageLookupByLibrary.simpleMessage(
             "Rất tiếc, thanh toán của bạn đã thất bại. Vui lòng liên hệ với bộ phận hỗ trợ và chúng tôi sẽ giúp bạn!"),
-        "paymentFailedTalkToProvider": m50,
+        "paymentFailedTalkToProvider": m54,
         "pendingItems":
             MessageLookupByLibrary.simpleMessage("Các mục đang chờ"),
         "pendingSync":
@@ -1356,13 +1354,13 @@ class MessageLookup extends MessageLookupByLibrary {
         "photosAddedByYouWillBeRemovedFromTheAlbum":
             MessageLookupByLibrary.simpleMessage(
                 "Ảnh bạn đã thêm sẽ bị xóa khỏi album"),
-        "photosCount": m51,
+        "photosCount": m55,
         "pickCenterPoint":
             MessageLookupByLibrary.simpleMessage("Chọn điểm trung tâm"),
         "pinAlbum": MessageLookupByLibrary.simpleMessage("Ghim album"),
         "pinLock": MessageLookupByLibrary.simpleMessage("Khóa PIN"),
         "playOnTv": MessageLookupByLibrary.simpleMessage("Phát album trên TV"),
-        "playStoreFreeTrialValidTill": m52,
+        "playStoreFreeTrialValidTill": m56,
         "playstoreSubscription":
             MessageLookupByLibrary.simpleMessage("Đăng ký PlayStore"),
         "pleaseCheckYourInternetConnectionAndTryAgain":
@@ -1374,14 +1372,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseContactSupportIfTheProblemPersists":
             MessageLookupByLibrary.simpleMessage(
                 "Vui lòng liên hệ với bộ phận hỗ trợ nếu vấn đề vẫn tiếp diễn"),
-        "pleaseEmailUsAt": m53,
+        "pleaseEmailUsAt": m57,
         "pleaseGrantPermissions":
             MessageLookupByLibrary.simpleMessage("Vui lòng cấp quyền"),
         "pleaseLoginAgain":
             MessageLookupByLibrary.simpleMessage("Vui lòng đăng nhập lại"),
         "pleaseSelectQuickLinksToRemove": MessageLookupByLibrary.simpleMessage(
             "Vui lòng chọn liên kết nhanh để xóa"),
-        "pleaseSendTheLogsTo": m54,
+        "pleaseSendTheLogsTo": m58,
         "pleaseTryAgain":
             MessageLookupByLibrary.simpleMessage("Vui lòng thử lại"),
         "pleaseVerifyTheCodeYouHaveEntered":
@@ -1410,7 +1408,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Chia sẻ riêng tư"),
         "proceed": MessageLookupByLibrary.simpleMessage("Tiếp tục"),
         "processed": MessageLookupByLibrary.simpleMessage("Đã xử lý"),
-        "processingImport": m55,
+        "processingImport": m59,
         "publicLinkCreated": MessageLookupByLibrary.simpleMessage(
             "Liên kết công khai đã được tạo"),
         "publicLinkEnabled": MessageLookupByLibrary.simpleMessage(
@@ -1420,7 +1418,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "raiseTicket": MessageLookupByLibrary.simpleMessage("Tạo vé"),
         "rateTheApp": MessageLookupByLibrary.simpleMessage("Đánh giá ứng dụng"),
         "rateUs": MessageLookupByLibrary.simpleMessage("Đánh giá chúng tôi"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
         "recover": MessageLookupByLibrary.simpleMessage("Khôi phục"),
         "recoverAccount":
             MessageLookupByLibrary.simpleMessage("Khôi phục tài khoản"),
@@ -1429,7 +1427,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Khôi phục tài khoản"),
         "recoveryInitiated": MessageLookupByLibrary.simpleMessage(
             "Quá trình khôi phục đã được khởi động"),
-        "recoveryInitiatedDesc": m57,
+        "recoveryInitiatedDesc": m62,
         "recoveryKey": MessageLookupByLibrary.simpleMessage("Khóa khôi phục"),
         "recoveryKeyCopiedToClipboard": MessageLookupByLibrary.simpleMessage(
             "Khóa khôi phục đã được sao chép vào clipboard"),
@@ -1443,12 +1441,12 @@ class MessageLookup extends MessageLookupByLibrary {
             "Khóa khôi phục đã được xác minh"),
         "recoveryKeyVerifyReason": MessageLookupByLibrary.simpleMessage(
             "Khóa khôi phục của bạn là cách duy nhất để khôi phục ảnh của bạn nếu bạn quên mật khẩu. Bạn có thể tìm thấy khóa khôi phục của mình trong Cài đặt > Tài khoản.\n\nVui lòng nhập khóa khôi phục của bạn ở đây để xác minh rằng bạn đã lưu nó đúng cách."),
-        "recoveryReady": m58,
+        "recoveryReady": m63,
         "recoverySuccessful":
             MessageLookupByLibrary.simpleMessage("Khôi phục thành công!"),
         "recoveryWarning": MessageLookupByLibrary.simpleMessage(
             "Một liên hệ tin cậy đang cố gắng truy cập tài khoản của bạn"),
-        "recoveryWarningBody": m59,
+        "recoveryWarningBody": m64,
         "recreatePasswordBody": MessageLookupByLibrary.simpleMessage(
             "Thiết bị hiện tại không đủ mạnh để xác minh mật khẩu của bạn, nhưng chúng tôi có thể tạo lại theo cách hoạt động với tất cả các thiết bị.\n\nVui lòng đăng nhập bằng khóa khôi phục của bạn và tạo lại mật khẩu (bạn có thể sử dụng lại mật khẩu cũ nếu muốn)."),
         "recreatePasswordTitle":
@@ -1463,7 +1461,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "1. Đưa mã này cho bạn bè của bạn"),
         "referralStep2":
             MessageLookupByLibrary.simpleMessage("2. Họ đăng ký gói trả phí"),
-        "referralStep3": m60,
+        "referralStep3": m65,
         "referrals": MessageLookupByLibrary.simpleMessage("Giới thiệu"),
         "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage(
             "Giới thiệu hiện đang tạm dừng"),
@@ -1492,7 +1490,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "removeLink": MessageLookupByLibrary.simpleMessage("Xóa liên kết"),
         "removeParticipant":
             MessageLookupByLibrary.simpleMessage("Xóa người tham gia"),
-        "removeParticipantBody": m61,
+        "removeParticipantBody": m66,
         "removePersonLabel":
             MessageLookupByLibrary.simpleMessage("Xóa nhãn người"),
         "removePublicLink":
@@ -1511,7 +1509,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "renameFile": MessageLookupByLibrary.simpleMessage("Đổi tên tệp"),
         "renewSubscription":
             MessageLookupByLibrary.simpleMessage("Gia hạn đăng ký"),
-        "renewsOn": m62,
+        "renewsOn": m67,
         "reportABug": MessageLookupByLibrary.simpleMessage("Báo cáo lỗi"),
         "reportBug": MessageLookupByLibrary.simpleMessage("Báo cáo lỗi"),
         "resendEmail": MessageLookupByLibrary.simpleMessage("Gửi lại email"),
@@ -1587,8 +1585,8 @@ class MessageLookup extends MessageLookupByLibrary {
             "Mời mọi người, và bạn sẽ thấy tất cả ảnh được chia sẻ bởi họ ở đây"),
         "searchPersonsEmptySection": MessageLookupByLibrary.simpleMessage(
             "Người sẽ được hiển thị ở đây sau khi hoàn tất xử lý và đồng bộ"),
-        "searchResultCount": m63,
-        "searchSectionsLengthMismatch": m64,
+        "searchResultCount": m68,
+        "searchSectionsLengthMismatch": m69,
         "security": MessageLookupByLibrary.simpleMessage("Bảo mật"),
         "seePublicAlbumLinksInApp": MessageLookupByLibrary.simpleMessage(
             "Xem liên kết album công khai trong ứng dụng"),
@@ -1622,7 +1620,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage(
                 "Các mục đã chọn sẽ bị xóa khỏi tất cả các album và chuyển vào thùng rác."),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "send": MessageLookupByLibrary.simpleMessage("Gửi"),
         "sendEmail": MessageLookupByLibrary.simpleMessage("Gửi email"),
         "sendInvite": MessageLookupByLibrary.simpleMessage("Gửi lời mời"),
@@ -1653,16 +1651,16 @@ class MessageLookup extends MessageLookupByLibrary {
         "shareAnAlbumNow": MessageLookupByLibrary.simpleMessage(
             "Chia sẻ một album ngay bây giờ"),
         "shareLink": MessageLookupByLibrary.simpleMessage("Chia sẻ liên kết"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage(
             "Chia sẻ chỉ với những người bạn muốn"),
         "shareTextConfirmOthersVerificationID": m7,
         "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage(
             "Tải Ente để chúng ta có thể dễ dàng chia sẻ ảnh và video chất lượng gốc\n\nhttps://ente.io"),
-        "shareTextReferralCode": m67,
+        "shareTextReferralCode": m72,
         "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage(
             "Chia sẻ với người dùng không phải Ente"),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "shareYourFirstAlbum": MessageLookupByLibrary.simpleMessage(
             "Chia sẻ album đầu tiên của bạn"),
         "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
@@ -1674,7 +1672,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Ảnh chia sẻ mới"),
         "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage(
             "Nhận thông báo khi ai đó thêm ảnh vào album chia sẻ mà bạn tham gia"),
-        "sharedWith": m69,
+        "sharedWith": m74,
         "sharedWithMe": MessageLookupByLibrary.simpleMessage("Chia sẻ với tôi"),
         "sharedWithYou":
             MessageLookupByLibrary.simpleMessage("Được chia sẻ với bạn"),
@@ -1690,11 +1688,11 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Đăng xuất các thiết bị khác"),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "Tôi đồng ý với <u-terms>các điều khoản dịch vụ</u-terms> và <u-policy>chính sách bảo mật</u-policy>"),
-        "singleFileDeleteFromDevice": m70,
+        "singleFileDeleteFromDevice": m75,
         "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage(
             "Nó sẽ bị xóa khỏi tất cả các album."),
-        "singleFileInBothLocalAndRemote": m71,
-        "singleFileInRemoteOnly": m72,
+        "singleFileInBothLocalAndRemote": m76,
+        "singleFileInRemoteOnly": m77,
         "skip": MessageLookupByLibrary.simpleMessage("Bỏ qua"),
         "social": MessageLookupByLibrary.simpleMessage("Xã hội"),
         "someItemsAreInBothEnteAndYourDevice":
@@ -1744,10 +1742,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageInGB": m1,
         "storageLimitExceeded":
             MessageLookupByLibrary.simpleMessage("Vượt quá giới hạn lưu trữ"),
-        "storageUsageInfo": m73,
+        "storageUsageInfo": m78,
         "strongStrength": MessageLookupByLibrary.simpleMessage("Mạnh"),
-        "subAlreadyLinkedErrMessage": m74,
-        "subWillBeCancelledOn": m75,
+        "subAlreadyLinkedErrMessage": m79,
+        "subWillBeCancelledOn": m80,
         "subscribe": MessageLookupByLibrary.simpleMessage("Đăng ký"),
         "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage(
             "Bạn cần một đăng ký trả phí hoạt động để kích hoạt chia sẻ."),
@@ -1764,7 +1762,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "suggestFeatures":
             MessageLookupByLibrary.simpleMessage("Gợi ý tính năng"),
         "support": MessageLookupByLibrary.simpleMessage("Hỗ trợ"),
-        "syncProgress": m76,
+        "syncProgress": m81,
         "syncStopped":
             MessageLookupByLibrary.simpleMessage("Đồng bộ hóa đã dừng"),
         "syncing": MessageLookupByLibrary.simpleMessage("Đang đồng bộ hóa..."),
@@ -1774,7 +1772,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Chạm để nhập mã"),
         "tapToUnlock": MessageLookupByLibrary.simpleMessage("Nhấn để mở khóa"),
         "tapToUpload": MessageLookupByLibrary.simpleMessage("Nhấn để tải lên"),
-        "tapToUploadIsIgnoredDue": m77,
+        "tapToUploadIsIgnoredDue": m82,
         "tempErrorContactSupportIfPersists": MessageLookupByLibrary.simpleMessage(
             "Có vẻ như đã xảy ra sự cố. Vui lòng thử lại sau một thời gian. Nếu lỗi vẫn tiếp diễn, vui lòng liên hệ với đội ngũ hỗ trợ."),
         "terminate": MessageLookupByLibrary.simpleMessage("Kết thúc"),
@@ -1814,7 +1812,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Email này đã được sử dụng"),
         "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage(
             "Hình ảnh này không có dữ liệu exif"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId":
             MessageLookupByLibrary.simpleMessage("Đây là ID xác minh của bạn"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -1838,11 +1836,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "total": MessageLookupByLibrary.simpleMessage("tổng"),
         "totalSize": MessageLookupByLibrary.simpleMessage("Tổng kích thước"),
         "trash": MessageLookupByLibrary.simpleMessage("Thùng rác"),
-        "trashDaysLeft": m79,
+        "trashDaysLeft": m84,
         "trim": MessageLookupByLibrary.simpleMessage("Cắt"),
         "trustedContacts":
             MessageLookupByLibrary.simpleMessage("Liên hệ tin cậy"),
-        "trustedInviteBody": m80,
+        "trustedInviteBody": m85,
         "tryAgain": MessageLookupByLibrary.simpleMessage("Thử lại"),
         "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage(
             "Bật sao lưu để tự động tải lên các tệp được thêm vào thư mục thiết bị này lên Ente."),
@@ -1861,7 +1859,7 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Xác thực hai yếu tố đã được đặt lại thành công"),
         "twofactorSetup":
             MessageLookupByLibrary.simpleMessage("Cài đặt hai yếu tố"),
-        "typeOfGallerGallerytypeIsNotSupportedForRename": m81,
+        "typeOfGallerGallerytypeIsNotSupportedForRename": m86,
         "unarchive": MessageLookupByLibrary.simpleMessage("Khôi phục"),
         "unarchiveAlbum":
             MessageLookupByLibrary.simpleMessage("Khôi phục album"),
@@ -1885,10 +1883,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "updatingFolderSelection": MessageLookupByLibrary.simpleMessage(
             "Đang cập nhật lựa chọn thư mục..."),
         "upgrade": MessageLookupByLibrary.simpleMessage("Nâng cấp"),
-        "uploadIsIgnoredDueToIgnorereason": m82,
+        "uploadIsIgnoredDueToIgnorereason": m87,
         "uploadingFilesToAlbum":
             MessageLookupByLibrary.simpleMessage("Đang tải tệp lên album..."),
-        "uploadingMultipleMemories": m83,
+        "uploadingMultipleMemories": m88,
         "uploadingSingleMemory":
             MessageLookupByLibrary.simpleMessage("Đang lưu giữ 1 kỷ niệm..."),
         "upto50OffUntil4thDec": MessageLookupByLibrary.simpleMessage(
@@ -1906,14 +1904,14 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Sử dụng ảnh đã chọn"),
         "usedSpace":
             MessageLookupByLibrary.simpleMessage("Không gian đã sử dụng"),
-        "validTill": m84,
+        "validTill": m89,
         "verificationFailedPleaseTryAgain":
             MessageLookupByLibrary.simpleMessage(
                 "Xác minh không thành công, vui lòng thử lại"),
         "verificationId": MessageLookupByLibrary.simpleMessage("ID xác minh"),
         "verify": MessageLookupByLibrary.simpleMessage("Xác minh"),
         "verifyEmail": MessageLookupByLibrary.simpleMessage("Xác minh email"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Xác minh"),
         "verifyPasskey":
             MessageLookupByLibrary.simpleMessage("Xác minh mã khóa"),
@@ -1939,7 +1937,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "viewRecoveryKey":
             MessageLookupByLibrary.simpleMessage("Xem khóa khôi phục"),
         "viewer": MessageLookupByLibrary.simpleMessage("Người xem"),
-        "viewersSuccessfullyAdded": m86,
+        "viewersSuccessfullyAdded": m91,
         "visitWebToManage": MessageLookupByLibrary.simpleMessage(
             "Vui lòng truy cập web.ente.io để quản lý đăng ký của bạn"),
         "waitingForVerification":
@@ -1961,7 +1959,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Liên hệ tin cậy có thể giúp khôi phục dữ liệu của bạn."),
         "yearShort": MessageLookupByLibrary.simpleMessage("năm"),
         "yearly": MessageLookupByLibrary.simpleMessage("Hàng năm"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("Có"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("Có, hủy"),
         "yesConvertToViewer":
@@ -1993,7 +1991,7 @@ class MessageLookup extends MessageLookupByLibrary {
             "Bạn không thể chia sẻ với chính mình"),
         "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage(
             "Bạn không có mục nào đã lưu trữ."),
-        "youHaveSuccessfullyFreedUp": m88,
+        "youHaveSuccessfullyFreedUp": m93,
         "yourAccountHasBeenDeleted":
             MessageLookupByLibrary.simpleMessage("Tài khoản của bạn đã bị xóa"),
         "yourMap": MessageLookupByLibrary.simpleMessage("Bản đồ của bạn"),
diff --git a/mobile/lib/generated/intl/messages_zh.dart b/mobile/lib/generated/intl/messages_zh.dart
index e79aef918c..6ffd2b00fb 100644
--- a/mobile/lib/generated/intl/messages_zh.dart
+++ b/mobile/lib/generated/intl/messages_zh.dart
@@ -20,224 +20,234 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'zh';
 
-  static String m9(count) =>
-      "${Intl.plural(count, zero: '添加协作者', one: '添加协作者', other: '添加协作者')}";
+  static String m9(title) => "${title} (我)";
 
   static String m10(count) =>
+      "${Intl.plural(count, zero: '添加协作者', one: '添加协作者', other: '添加协作者')}";
+
+  static String m11(count) =>
       "${Intl.plural(count, one: '添加一个项目', other: '添加一些项目')}";
 
-  static String m11(storageAmount, endDate) =>
+  static String m12(storageAmount, endDate) =>
       "您的 ${storageAmount} 插件有效期至 ${endDate}";
 
-  static String m12(count) =>
+  static String m13(count) =>
       "${Intl.plural(count, zero: '添加查看者', one: '添加查看者', other: '添加查看者')}";
 
-  static String m13(emailOrName) => "由 ${emailOrName} 添加";
+  static String m14(emailOrName) => "由 ${emailOrName} 添加";
 
-  static String m14(albumName) => "成功添加到  ${albumName}";
+  static String m15(albumName) => "成功添加到  ${albumName}";
 
-  static String m15(count) =>
+  static String m16(count) =>
       "${Intl.plural(count, zero: '无参与者', one: '1个参与者', other: '${count} 个参与者')}";
 
-  static String m16(versionValue) => "版本: ${versionValue}";
+  static String m17(versionValue) => "版本: ${versionValue}";
 
-  static String m17(freeAmount, storageUnit) =>
+  static String m18(freeAmount, storageUnit) =>
       "${freeAmount} ${storageUnit} 空闲";
 
-  static String m18(paymentProvider) => "请先取消您现有的订阅 ${paymentProvider}";
+  static String m19(paymentProvider) => "请先取消您现有的订阅 ${paymentProvider}";
 
   static String m3(user) => "${user} 将无法添加更多照片到此相册\n\n他们仍然能够删除他们添加的现有照片";
 
-  static String m19(isFamilyMember, storageAmountInGb) =>
+  static String m20(isFamilyMember, storageAmountInGb) =>
       "${Intl.select(isFamilyMember, {
             'true': '到目前为止，您的家庭已经领取了 ${storageAmountInGb} GB',
             'false': '到目前为止，您已经领取了 ${storageAmountInGb} GB',
             'other': '到目前为止，您已经领取了${storageAmountInGb} GB',
           })}";
 
-  static String m20(albumName) => "为 ${albumName} 创建了协作链接";
+  static String m21(albumName) => "为 ${albumName} 创建了协作链接";
 
-  static String m21(count) =>
+  static String m22(count) =>
       "${Intl.plural(count, zero: '已添加 0 位协作者', one: '已添加 1 位协作者', other: '已添加 ${count} 位协作者')}";
 
-  static String m22(email, numOfDays) =>
+  static String m23(email, numOfDays) =>
       "您即将添加 ${email} 作为可信联系人。如果您离开了 ${numOfDays} 天，他们将能够恢复您的帐户。";
 
-  static String m23(familyAdminEmail) =>
+  static String m24(familyAdminEmail) =>
       "请联系 <green>${familyAdminEmail}</green> 来管理您的订阅";
 
-  static String m24(provider) =>
+  static String m25(provider) =>
       "请通过support@ente.io 用英语联系我们来管理您的 ${provider} 订阅。";
 
-  static String m25(endpoint) => "已连接至 ${endpoint}";
+  static String m26(endpoint) => "已连接至 ${endpoint}";
 
-  static String m26(count) =>
+  static String m27(count) =>
       "${Intl.plural(count, one: '删除 ${count} 个项目', other: '删除 ${count} 个项目')}";
 
-  static String m27(currentlyDeleting, totalCount) =>
+  static String m28(currentlyDeleting, totalCount) =>
       "正在删除 ${currentlyDeleting} /共 ${totalCount}";
 
-  static String m28(albumName) => "这将删除用于访问\"${albumName}\"的公开链接。";
+  static String m29(albumName) => "这将删除用于访问\"${albumName}\"的公开链接。";
 
-  static String m29(supportEmail) => "请从您注册的邮箱发送一封邮件到 ${supportEmail}";
+  static String m30(supportEmail) => "请从您注册的邮箱发送一封邮件到 ${supportEmail}";
 
-  static String m30(count, storageSaved) =>
+  static String m31(count, storageSaved) =>
       "您已经清理了 ${Intl.plural(count, other: '${count} 个重复文件')}, 释放了 (${storageSaved}!)";
 
-  static String m31(count, formattedSize) =>
+  static String m32(count, formattedSize) =>
       "${count} 个文件，每个文件 ${formattedSize}";
 
-  static String m32(newEmail) => "电子邮件已更改为 ${newEmail}";
+  static String m33(newEmail) => "电子邮件已更改为 ${newEmail}";
 
-  static String m33(email) => "${email} 没有 Ente 帐户。\n\n向他们发出共享照片的邀请。";
+  static String m34(email) => "${email} 没有 Ente 账户。";
 
-  static String m34(text) => "为 ${text} 找到额外照片";
+  static String m35(email) => "${email} 没有 Ente 帐户。\n\n向他们发出共享照片的邀请。";
 
-  static String m35(count, formattedNumber) =>
+  static String m36(text) => "为 ${text} 找到额外照片";
+
+  static String m37(count, formattedNumber) =>
       "此设备上的 ${Intl.plural(count, one: '1 个文件', other: '${formattedNumber} 个文件')} 已安全备份";
 
-  static String m36(count, formattedNumber) =>
+  static String m38(count, formattedNumber) =>
       "此相册中的 ${Intl.plural(count, one: '1 个文件', other: '${formattedNumber} 个文件')} 已安全备份";
 
   static String m4(storageAmountInGB) =>
       "每当有人使用您的代码注册付费计划时您将获得${storageAmountInGB} GB";
 
-  static String m37(endDate) => "免费试用有效期至 ${endDate}";
+  static String m39(endDate) => "免费试用有效期至 ${endDate}";
 
-  static String m38(count) =>
+  static String m40(count) =>
       "只要您有有效的订阅，您仍然可以在 Ente 上访问 ${Intl.plural(count, one: '它', other: '它们')}";
 
-  static String m39(sizeInMBorGB) => "释放 ${sizeInMBorGB}";
+  static String m41(sizeInMBorGB) => "释放 ${sizeInMBorGB}";
 
-  static String m40(count, formattedSize) =>
+  static String m42(count, formattedSize) =>
       "${Intl.plural(count, one: '它可以从设备中删除以释放 ${formattedSize}', other: '它们可以从设备中删除以释放 ${formattedSize}')}";
 
-  static String m41(currentlyProcessing, totalCount) =>
+  static String m43(currentlyProcessing, totalCount) =>
       "正在处理 ${currentlyProcessing} / ${totalCount}";
 
-  static String m42(count) =>
+  static String m44(count) =>
       "${Intl.plural(count, one: '${count} 个项目', other: '${count} 个项目')}";
 
-  static String m43(email) => "${email} 已邀请您成为可信联系人";
+  static String m45(email) => "${email} 已邀请您成为可信联系人";
 
-  static String m44(expiryTime) => "链接将在 ${expiryTime} 过期";
+  static String m46(expiryTime) => "链接将在 ${expiryTime} 过期";
+
+  static String m47(email) => "将人员链接到 ${email}";
+
+  static String m48(personName, email) => "这将会将 ${personName} 链接到 ${email}";
 
   static String m5(count, formattedCount) =>
       "${Intl.plural(count, zero: '没有回忆', one: '${formattedCount} 个回忆', other: '${formattedCount} 个回忆')}";
 
-  static String m45(count) =>
+  static String m49(count) =>
       "${Intl.plural(count, one: '移动一个项目', other: '移动一些项目')}";
 
-  static String m46(albumName) => "成功移动到 ${albumName}";
+  static String m50(albumName) => "成功移动到 ${albumName}";
 
-  static String m47(personName) => "没有针对 ${personName} 的建议";
+  static String m51(personName) => "没有针对 ${personName} 的建议";
 
-  static String m48(name) => "不是 ${name}？";
+  static String m52(name) => "不是 ${name}？";
 
-  static String m49(familyAdminEmail) => "请联系${familyAdminEmail} 以更改您的代码。";
+  static String m53(familyAdminEmail) => "请联系${familyAdminEmail} 以更改您的代码。";
 
   static String m0(passwordStrengthValue) => "密码强度： ${passwordStrengthValue}";
 
-  static String m50(providerName) => "如果您被收取费用，请用英语与 ${providerName} 的客服聊天";
+  static String m54(providerName) => "如果您被收取费用，请用英语与 ${providerName} 的客服聊天";
 
-  static String m51(count) =>
+  static String m55(count) =>
       "${Intl.plural(count, zero: '0 张照片', one: '1 张照片', other: '${count} 张照片')}";
 
-  static String m52(endDate) => "免费试用有效期至 ${endDate}。\n在此之后您可以选择付费计划。";
+  static String m56(endDate) => "免费试用有效期至 ${endDate}。\n在此之后您可以选择付费计划。";
 
-  static String m53(toEmail) => "请给我们发送电子邮件至 ${toEmail}";
+  static String m57(toEmail) => "请给我们发送电子邮件至 ${toEmail}";
 
-  static String m54(toEmail) => "请将日志发送至 \n${toEmail}";
+  static String m58(toEmail) => "请将日志发送至 \n${toEmail}";
 
-  static String m55(folderName) => "正在处理 ${folderName}...";
+  static String m59(folderName) => "正在处理 ${folderName}...";
 
-  static String m56(storeName) => "在 ${storeName} 上给我们评分";
+  static String m60(storeName) => "在 ${storeName} 上给我们评分";
 
-  static String m57(days, email) => "您可以在 ${days} 天后访问该账户。通知将发送至 ${email}。";
+  static String m61(name) => "已将您重新分配给 ${name}";
 
-  static String m58(email) => "您现在可以通过设置新密码来恢复 ${email} 的账户。";
+  static String m62(days, email) => "您可以在 ${days} 天后访问该账户。通知将发送至 ${email}。";
 
-  static String m59(email) => "${email} 正在尝试恢复您的账户。";
+  static String m63(email) => "您现在可以通过设置新密码来恢复 ${email} 的账户。";
 
-  static String m60(storageInGB) => "3. 你和朋友都将免费获得 ${storageInGB} GB*";
+  static String m64(email) => "${email} 正在尝试恢复您的账户。";
 
-  static String m61(userEmail) =>
+  static String m65(storageInGB) => "3. 你和朋友都将免费获得 ${storageInGB} GB*";
+
+  static String m66(userEmail) =>
       "${userEmail} 将从这个共享相册中删除\n\nTA们添加的任何照片也将从相册中删除";
 
-  static String m62(endDate) => "在 ${endDate} 前续费";
+  static String m67(endDate) => "在 ${endDate} 前续费";
 
-  static String m63(count) =>
+  static String m68(count) =>
       "${Intl.plural(count, other: '已找到 ${count} 个结果')}";
 
-  static String m64(snapshotLength, searchLength) =>
+  static String m69(snapshotLength, searchLength) =>
       "部分长度不匹配：${snapshotLength} != ${searchLength}";
 
   static String m6(count) => "已选择 ${count} 个";
 
-  static String m65(count, yourCount) => "选择了 ${count} 个 (您的 ${yourCount} 个)";
+  static String m70(count, yourCount) => "选择了 ${count} 个 (您的 ${yourCount} 个)";
 
-  static String m66(verificationID) => "这是我的ente.io 的验证 ID： ${verificationID}。";
+  static String m71(verificationID) => "这是我的ente.io 的验证 ID： ${verificationID}。";
 
   static String m7(verificationID) =>
       "嘿，你能确认这是你的 ente.io 验证 ID吗：${verificationID}";
 
-  static String m67(referralCode, referralStorageInGB) =>
+  static String m72(referralCode, referralStorageInGB) =>
       "Ente 推荐代码：${referralCode}\n\n在 \"设置\"→\"通用\"→\"推荐 \"中应用它，即可在注册付费计划后免费获得 ${referralStorageInGB} GB 存储空间\n\nhttps://ente.io";
 
-  static String m68(numberOfPeople) =>
+  static String m73(numberOfPeople) =>
       "${Intl.plural(numberOfPeople, zero: '与特定人员共享', one: '与 1 人共享', other: '与 ${numberOfPeople} 人共享')}";
 
-  static String m69(emailIDs) => "与 ${emailIDs} 共享";
+  static String m74(emailIDs) => "与 ${emailIDs} 共享";
 
-  static String m70(fileType) => "此 ${fileType} 将从您的设备中删除。";
+  static String m75(fileType) => "此 ${fileType} 将从您的设备中删除。";
 
-  static String m71(fileType) => "${fileType} 已同时存在于 Ente 和您的设备中。";
+  static String m76(fileType) => "${fileType} 已同时存在于 Ente 和您的设备中。";
 
-  static String m72(fileType) => "${fileType} 将从 Ente 中删除。";
+  static String m77(fileType) => "${fileType} 将从 Ente 中删除。";
 
   static String m1(storageAmountInGB) => "${storageAmountInGB} GB";
 
-  static String m73(
+  static String m78(
           usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) =>
       "已使用 ${usedAmount} ${usedStorageUnit} / ${totalAmount} ${totalStorageUnit}";
 
-  static String m74(id) =>
+  static String m79(id) =>
       "您的 ${id} 已链接到另一个 Ente 账户。\n如果您想在此账户中使用您的 ${id} ，请联系我们的支持人员";
 
-  static String m75(endDate) => "您的订阅将于 ${endDate} 取消";
+  static String m80(endDate) => "您的订阅将于 ${endDate} 取消";
 
-  static String m76(completed, total) => "已保存的回忆 ${completed}/共 ${total}";
+  static String m81(completed, total) => "已保存的回忆 ${completed}/共 ${total}";
 
-  static String m77(ignoreReason) => "点按上传，由于${ignoreReason}，目前上传已被忽略";
+  static String m82(ignoreReason) => "点按上传，由于${ignoreReason}，目前上传已被忽略";
 
   static String m8(storageAmountInGB) => "他们也会获得 ${storageAmountInGB} GB";
 
-  static String m78(email) => "这是 ${email} 的验证ID";
+  static String m83(email) => "这是 ${email} 的验证ID";
 
-  static String m79(count) =>
+  static String m84(count) =>
       "${Intl.plural(count, zero: '马上', one: '1 天', other: '${count} 天')}";
 
-  static String m80(email) => "您已受邀通过 ${email} 成为遗产联系人。";
+  static String m85(email) => "您已受邀通过 ${email} 成为遗产联系人。";
 
-  static String m81(galleryType) => "相册类型 ${galleryType} 不支持重命名";
+  static String m86(galleryType) => "相册类型 ${galleryType} 不支持重命名";
 
-  static String m82(ignoreReason) => "由于 ${ignoreReason}，上传被忽略";
+  static String m87(ignoreReason) => "由于 ${ignoreReason}，上传被忽略";
 
-  static String m83(count) => "正在保存 ${count} 个回忆...";
+  static String m88(count) => "正在保存 ${count} 个回忆...";
 
-  static String m84(endDate) => "有效期至 ${endDate}";
+  static String m89(endDate) => "有效期至 ${endDate}";
 
-  static String m85(email) => "验证 ${email}";
+  static String m90(email) => "验证 ${email}";
 
-  static String m86(count) =>
+  static String m91(count) =>
       "${Intl.plural(count, zero: '已添加 0 位查看者', one: '已添加 1 位查看者', other: '已添加 ${count} 位查看者')}";
 
   static String m2(email) => "我们已经发送邮件到 <green>${email}</green>";
 
-  static String m87(count) =>
+  static String m92(count) =>
       "${Intl.plural(count, one: '${count} 年前', other: '${count} 年前')}";
 
-  static String m88(storageSaved) => "您已成功释放了 ${storageSaved}！";
+  static String m93(storageSaved) => "您已成功释放了 ${storageSaved}！";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
@@ -248,6 +258,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "account": MessageLookupByLibrary.simpleMessage("账户"),
         "accountIsAlreadyConfigured":
             MessageLookupByLibrary.simpleMessage("账户已配置。"),
+        "accountOwnerPersonAppbarTitle": m9,
         "accountWelcomeBack": MessageLookupByLibrary.simpleMessage("欢迎回来！"),
         "ackPasswordLostWarning": MessageLookupByLibrary.simpleMessage(
             "我明白，如果我丢失密码，我可能会丢失我的数据，因为我的数据是 <underline>端到端加密的</underline>。"),
@@ -256,10 +267,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "addAName": MessageLookupByLibrary.simpleMessage("添加一个名称"),
         "addANewEmail": MessageLookupByLibrary.simpleMessage("添加新的电子邮件"),
         "addCollaborator": MessageLookupByLibrary.simpleMessage("添加协作者"),
-        "addCollaborators": m9,
+        "addCollaborators": m10,
         "addFiles": MessageLookupByLibrary.simpleMessage("添加文件"),
         "addFromDevice": MessageLookupByLibrary.simpleMessage("从设备添加"),
-        "addItem": m10,
+        "addItem": m11,
         "addLocation": MessageLookupByLibrary.simpleMessage("添加地点"),
         "addLocationButton": MessageLookupByLibrary.simpleMessage("添加"),
         "addMore": MessageLookupByLibrary.simpleMessage("添加更多"),
@@ -268,7 +279,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "addNew": MessageLookupByLibrary.simpleMessage("新建"),
         "addNewPerson": MessageLookupByLibrary.simpleMessage("添加新人物"),
         "addOnPageSubtitle": MessageLookupByLibrary.simpleMessage("附加组件详情"),
-        "addOnValidTill": m11,
+        "addOnValidTill": m12,
         "addOns": MessageLookupByLibrary.simpleMessage("附加组件"),
         "addPhotos": MessageLookupByLibrary.simpleMessage("添加照片"),
         "addSelected": MessageLookupByLibrary.simpleMessage("添加所选项"),
@@ -277,11 +288,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "addToHiddenAlbum": MessageLookupByLibrary.simpleMessage("添加到隐藏相册"),
         "addTrustedContact": MessageLookupByLibrary.simpleMessage("添加可信联系人"),
         "addViewer": MessageLookupByLibrary.simpleMessage("添加查看者"),
-        "addViewers": m12,
+        "addViewers": m13,
         "addYourPhotosNow": MessageLookupByLibrary.simpleMessage("立即添加您的照片"),
         "addedAs": MessageLookupByLibrary.simpleMessage("已添加为"),
-        "addedBy": m13,
-        "addedSuccessfullyTo": m14,
+        "addedBy": m14,
+        "addedSuccessfullyTo": m15,
         "addingToFavorites": MessageLookupByLibrary.simpleMessage("正在添加到收藏..."),
         "advanced": MessageLookupByLibrary.simpleMessage("高级设置"),
         "advancedSettings": MessageLookupByLibrary.simpleMessage("高级设置"),
@@ -291,7 +302,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "after1Week": MessageLookupByLibrary.simpleMessage("1 周后"),
         "after1Year": MessageLookupByLibrary.simpleMessage("1 年后"),
         "albumOwner": MessageLookupByLibrary.simpleMessage("所有者"),
-        "albumParticipantsCount": m15,
+        "albumParticipantsCount": m16,
         "albumTitle": MessageLookupByLibrary.simpleMessage("相册标题"),
         "albumUpdated": MessageLookupByLibrary.simpleMessage("相册已更新"),
         "albums": MessageLookupByLibrary.simpleMessage("相册"),
@@ -331,7 +342,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "appLock": MessageLookupByLibrary.simpleMessage("应用锁"),
         "appLockDescriptions": MessageLookupByLibrary.simpleMessage(
             "在设备的默认锁定屏幕和带有 PIN 或密码的自定义锁定屏幕之间进行选择。"),
-        "appVersion": m16,
+        "appVersion": m17,
         "appleId": MessageLookupByLibrary.simpleMessage("Apple ID"),
         "apply": MessageLookupByLibrary.simpleMessage("应用"),
         "applyCodeTitle": MessageLookupByLibrary.simpleMessage("应用代码"),
@@ -405,7 +416,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "autoPairDesc":
             MessageLookupByLibrary.simpleMessage("自动配对仅适用于支持 Chromecast 的设备。"),
         "available": MessageLookupByLibrary.simpleMessage("可用"),
-        "availableStorageSpace": m17,
+        "availableStorageSpace": m18,
         "backedUpFolders": MessageLookupByLibrary.simpleMessage("已备份的文件夹"),
         "backup": MessageLookupByLibrary.simpleMessage("备份"),
         "backupFailed": MessageLookupByLibrary.simpleMessage("备份失败"),
@@ -435,7 +446,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "cancelAccountRecovery": MessageLookupByLibrary.simpleMessage("取消恢复"),
         "cancelAccountRecoveryBody":
             MessageLookupByLibrary.simpleMessage("您真的要取消恢复吗？"),
-        "cancelOtherSubscription": m18,
+        "cancelOtherSubscription": m19,
         "cancelSubscription": MessageLookupByLibrary.simpleMessage("取消订阅"),
         "cannotAddMorePhotosAfterBecomingViewer": m3,
         "cannotDeleteSharedFiles":
@@ -477,7 +488,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "claimFreeStorage": MessageLookupByLibrary.simpleMessage("领取免费存储"),
         "claimMore": MessageLookupByLibrary.simpleMessage("领取更多！"),
         "claimed": MessageLookupByLibrary.simpleMessage("已领取"),
-        "claimedStorageSoFar": m19,
+        "claimedStorageSoFar": m20,
         "cleanUncategorized": MessageLookupByLibrary.simpleMessage("清除未分类的"),
         "cleanUncategorizedDescription":
             MessageLookupByLibrary.simpleMessage("从“未分类”中删除其他相册中存在的所有文件"),
@@ -499,11 +510,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "collabLinkSectionDescription": MessageLookupByLibrary.simpleMessage(
             "创建一个链接来让他人无需 Ente 应用程序或账户即可在您的共享相册中添加和查看照片。非常适合收集活动照片。"),
         "collaborativeLink": MessageLookupByLibrary.simpleMessage("协作链接"),
-        "collaborativeLinkCreatedFor": m20,
+        "collaborativeLinkCreatedFor": m21,
         "collaborator": MessageLookupByLibrary.simpleMessage("协作者"),
         "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum":
             MessageLookupByLibrary.simpleMessage("协作者可以将照片和视频添加到共享相册中。"),
-        "collaboratorsSuccessfullyAdded": m21,
+        "collaboratorsSuccessfullyAdded": m22,
         "collageLayout": MessageLookupByLibrary.simpleMessage("布局"),
         "collageSaved": MessageLookupByLibrary.simpleMessage("拼贴已保存到相册"),
         "collect": MessageLookupByLibrary.simpleMessage("收集"),
@@ -518,7 +529,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("您确定要禁用双重认证吗？"),
         "confirmAccountDeletion":
             MessageLookupByLibrary.simpleMessage("确认删除账户"),
-        "confirmAddingTrustedContact": m22,
+        "confirmAddingTrustedContact": m23,
         "confirmDeletePrompt":
             MessageLookupByLibrary.simpleMessage("是的，我想永久删除此账户及其所有关联的应用程序的数据。"),
         "confirmPassword": MessageLookupByLibrary.simpleMessage("请确认密码"),
@@ -527,9 +538,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "confirmYourRecoveryKey":
             MessageLookupByLibrary.simpleMessage("确认您的恢复密钥"),
         "connectToDevice": MessageLookupByLibrary.simpleMessage("连接到设备"),
-        "contactFamilyAdmin": m23,
+        "contactFamilyAdmin": m24,
         "contactSupport": MessageLookupByLibrary.simpleMessage("联系支持"),
-        "contactToManageSubscription": m24,
+        "contactToManageSubscription": m25,
         "contacts": MessageLookupByLibrary.simpleMessage("联系人"),
         "contents": MessageLookupByLibrary.simpleMessage("内容"),
         "continueLabel": MessageLookupByLibrary.simpleMessage("继续"),
@@ -563,7 +574,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "currentUsageIs": MessageLookupByLibrary.simpleMessage("当前用量 "),
         "currentlyRunning": MessageLookupByLibrary.simpleMessage("目前正在运行"),
         "custom": MessageLookupByLibrary.simpleMessage("自定义"),
-        "customEndpoint": m25,
+        "customEndpoint": m26,
         "darkTheme": MessageLookupByLibrary.simpleMessage("深色"),
         "dayToday": MessageLookupByLibrary.simpleMessage("今天"),
         "dayYesterday": MessageLookupByLibrary.simpleMessage("昨天"),
@@ -593,10 +604,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "deleteFromBoth": MessageLookupByLibrary.simpleMessage("同时从两者中删除"),
         "deleteFromDevice": MessageLookupByLibrary.simpleMessage("从设备中删除"),
         "deleteFromEnte": MessageLookupByLibrary.simpleMessage("从 Ente 中删除"),
-        "deleteItemCount": m26,
+        "deleteItemCount": m27,
         "deleteLocation": MessageLookupByLibrary.simpleMessage("删除位置"),
         "deletePhotos": MessageLookupByLibrary.simpleMessage("删除照片"),
-        "deleteProgress": m27,
+        "deleteProgress": m28,
         "deleteReason1": MessageLookupByLibrary.simpleMessage("找不到我想要的功能"),
         "deleteReason2":
             MessageLookupByLibrary.simpleMessage("应用或某个功能没有按我的预期运行"),
@@ -627,7 +638,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("查看者仍然可以使用外部工具截图或保存您的照片副本"),
         "disableDownloadWarningTitle":
             MessageLookupByLibrary.simpleMessage("请注意"),
-        "disableLinkMessage": m28,
+        "disableLinkMessage": m29,
         "disableTwofactor": MessageLookupByLibrary.simpleMessage("禁用双重认证"),
         "disablingTwofactorAuthentication":
             MessageLookupByLibrary.simpleMessage("正在禁用双重认证..."),
@@ -655,14 +666,15 @@ class MessageLookup extends MessageLookupByLibrary {
         "doYouWantToDiscardTheEditsYouHaveMade":
             MessageLookupByLibrary.simpleMessage("您想要放弃您所做的编辑吗？"),
         "done": MessageLookupByLibrary.simpleMessage("已完成"),
+        "dontSave": MessageLookupByLibrary.simpleMessage("不保存"),
         "doubleYourStorage":
             MessageLookupByLibrary.simpleMessage("将您的存储空间增加一倍"),
         "download": MessageLookupByLibrary.simpleMessage("下载"),
         "downloadFailed": MessageLookupByLibrary.simpleMessage("下載失敗"),
         "downloading": MessageLookupByLibrary.simpleMessage("正在下载..."),
-        "dropSupportEmail": m29,
-        "duplicateFileCountWithStorageSaved": m30,
-        "duplicateItemsGroup": m31,
+        "dropSupportEmail": m30,
+        "duplicateFileCountWithStorageSaved": m31,
+        "duplicateItemsGroup": m32,
         "edit": MessageLookupByLibrary.simpleMessage("编辑"),
         "editLocation": MessageLookupByLibrary.simpleMessage("编辑位置"),
         "editLocationTagTitle": MessageLookupByLibrary.simpleMessage("编辑位置"),
@@ -674,8 +686,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "email": MessageLookupByLibrary.simpleMessage("电子邮件地址"),
         "emailAlreadyRegistered":
             MessageLookupByLibrary.simpleMessage("此电子邮件地址已被注册。"),
-        "emailChangedTo": m32,
-        "emailNoEnteAccount": m33,
+        "emailChangedTo": m33,
+        "emailDoesNotHaveEnteAccount": m34,
+        "emailNoEnteAccount": m35,
         "emailNotRegistered":
             MessageLookupByLibrary.simpleMessage("此电子邮件地址未被注册。"),
         "emailVerificationToggle":
@@ -742,11 +755,12 @@ class MessageLookup extends MessageLookupByLibrary {
         "exportLogs": MessageLookupByLibrary.simpleMessage("导出日志"),
         "exportYourData": MessageLookupByLibrary.simpleMessage("导出您的数据"),
         "extraPhotosFound": MessageLookupByLibrary.simpleMessage("发现额外照片"),
-        "extraPhotosFoundFor": m34,
+        "extraPhotosFoundFor": m36,
         "faceNotClusteredYet":
             MessageLookupByLibrary.simpleMessage("人脸尚未聚类，请稍后再来"),
         "faceRecognition": MessageLookupByLibrary.simpleMessage("人脸识别"),
         "faces": MessageLookupByLibrary.simpleMessage("人脸"),
+        "failed": MessageLookupByLibrary.simpleMessage("失败"),
         "failedToApplyCode": MessageLookupByLibrary.simpleMessage("无法使用此代码"),
         "failedToCancel": MessageLookupByLibrary.simpleMessage("取消失败"),
         "failedToDownloadVideo": MessageLookupByLibrary.simpleMessage("视频下载失败"),
@@ -779,8 +793,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "fileSavedToGallery": MessageLookupByLibrary.simpleMessage("文件已保存到相册"),
         "fileTypes": MessageLookupByLibrary.simpleMessage("文件类型"),
         "fileTypesAndNames": MessageLookupByLibrary.simpleMessage("文件类型和名称"),
-        "filesBackedUpFromDevice": m35,
-        "filesBackedUpInAlbum": m36,
+        "filesBackedUpFromDevice": m37,
+        "filesBackedUpInAlbum": m38,
         "filesDeleted": MessageLookupByLibrary.simpleMessage("文件已删除"),
         "filesSavedToGallery":
             MessageLookupByLibrary.simpleMessage("多个文件已保存到相册"),
@@ -794,21 +808,21 @@ class MessageLookup extends MessageLookupByLibrary {
         "freeStorageOnReferralSuccess": m4,
         "freeStorageUsable": MessageLookupByLibrary.simpleMessage("可用的免费存储"),
         "freeTrial": MessageLookupByLibrary.simpleMessage("免费试用"),
-        "freeTrialValidTill": m37,
-        "freeUpAccessPostDelete": m38,
-        "freeUpAmount": m39,
+        "freeTrialValidTill": m39,
+        "freeUpAccessPostDelete": m40,
+        "freeUpAmount": m41,
         "freeUpDeviceSpace": MessageLookupByLibrary.simpleMessage("释放设备空间"),
         "freeUpDeviceSpaceDesc":
             MessageLookupByLibrary.simpleMessage("通过清除已备份的文件来节省设备空间。"),
         "freeUpSpace": MessageLookupByLibrary.simpleMessage("释放空间"),
-        "freeUpSpaceSaving": m40,
+        "freeUpSpaceSaving": m42,
         "gallery": MessageLookupByLibrary.simpleMessage("图库"),
         "galleryMemoryLimitInfo":
             MessageLookupByLibrary.simpleMessage("在图库中显示最多1000个回忆"),
         "general": MessageLookupByLibrary.simpleMessage("通用"),
         "generatingEncryptionKeys":
             MessageLookupByLibrary.simpleMessage("正在生成加密密钥..."),
-        "genericProgress": m41,
+        "genericProgress": m43,
         "goToSettings": MessageLookupByLibrary.simpleMessage("前往设置"),
         "googlePlayId": MessageLookupByLibrary.simpleMessage("Google Play ID"),
         "grantFullAccessPrompt":
@@ -860,6 +874,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "indexedItems": MessageLookupByLibrary.simpleMessage("已索引项目"),
         "indexingIsPaused":
             MessageLookupByLibrary.simpleMessage("索引已暂停。当设备准备就绪时，它将自动恢复。"),
+        "ineligible": MessageLookupByLibrary.simpleMessage("不合格"),
         "info": MessageLookupByLibrary.simpleMessage("详情"),
         "insecureDevice": MessageLookupByLibrary.simpleMessage("设备不安全"),
         "installManually": MessageLookupByLibrary.simpleMessage("手动安装"),
@@ -879,13 +894,15 @@ class MessageLookup extends MessageLookupByLibrary {
         "itLooksLikeSomethingWentWrongPleaseRetryAfterSome":
             MessageLookupByLibrary.simpleMessage(
                 "看起来出了点问题。 请稍后重试。 如果错误仍然存在，请联系我们的支持团队。"),
-        "itemCount": m42,
+        "itemCount": m44,
         "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion":
             MessageLookupByLibrary.simpleMessage("项目显示永久删除前剩余的天数"),
         "itemsWillBeRemovedFromAlbum":
             MessageLookupByLibrary.simpleMessage("所选项目将从此相册中移除"),
         "join": MessageLookupByLibrary.simpleMessage("加入"),
         "joinAlbum": MessageLookupByLibrary.simpleMessage("加入相册"),
+        "joinAlbumConfirmationDialogBody":
+            MessageLookupByLibrary.simpleMessage("加入相册将使相册的参与者可以看到您的电子邮件地址。"),
         "joinAlbumSubtext": MessageLookupByLibrary.simpleMessage("来查看和添加您的照片"),
         "joinAlbumSubtextViewer":
             MessageLookupByLibrary.simpleMessage("来将其添加到共享相册"),
@@ -903,22 +920,30 @@ class MessageLookup extends MessageLookupByLibrary {
         "left": MessageLookupByLibrary.simpleMessage("向左"),
         "legacy": MessageLookupByLibrary.simpleMessage("遗产"),
         "legacyAccounts": MessageLookupByLibrary.simpleMessage("遗产账户"),
-        "legacyInvite": m43,
+        "legacyInvite": m45,
         "legacyPageDesc":
             MessageLookupByLibrary.simpleMessage("遗产允许信任的联系人在您不在时访问您的账户。"),
         "legacyPageDesc2": MessageLookupByLibrary.simpleMessage(
             "可信联系人可以启动账户恢复，如果 30 天内没有被阻止，则可以重置密码并访问您的账户。"),
         "light": MessageLookupByLibrary.simpleMessage("亮度"),
         "lightTheme": MessageLookupByLibrary.simpleMessage("浅色"),
+        "link": MessageLookupByLibrary.simpleMessage("链接"),
         "linkCopiedToClipboard":
             MessageLookupByLibrary.simpleMessage("链接已复制到剪贴板"),
         "linkDeviceLimit": MessageLookupByLibrary.simpleMessage("设备限制"),
+        "linkEmail": MessageLookupByLibrary.simpleMessage("链接邮箱"),
+        "linkEmailToContactBannerCaption":
+            MessageLookupByLibrary.simpleMessage("来实现更快的共享"),
         "linkEnabled": MessageLookupByLibrary.simpleMessage("已启用"),
         "linkExpired": MessageLookupByLibrary.simpleMessage("已过期"),
-        "linkExpiresOn": m44,
+        "linkExpiresOn": m46,
         "linkExpiry": MessageLookupByLibrary.simpleMessage("链接过期"),
         "linkHasExpired": MessageLookupByLibrary.simpleMessage("链接已过期"),
         "linkNeverExpires": MessageLookupByLibrary.simpleMessage("永不"),
+        "linkPerson": MessageLookupByLibrary.simpleMessage("链接人员"),
+        "linkPersonCaption": MessageLookupByLibrary.simpleMessage("来感受更好的共享体验"),
+        "linkPersonToEmail": m47,
+        "linkPersonToEmailConfirmation": m48,
         "livePhotos": MessageLookupByLibrary.simpleMessage("实况照片"),
         "loadMessage1": MessageLookupByLibrary.simpleMessage("您可以与家庭分享您的订阅"),
         "loadMessage2":
@@ -990,6 +1015,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "maps": MessageLookupByLibrary.simpleMessage("地图"),
         "mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"),
         "matrix": MessageLookupByLibrary.simpleMessage("Matrix"),
+        "me": MessageLookupByLibrary.simpleMessage("我"),
         "memoryCount": m5,
         "merchandise": MessageLookupByLibrary.simpleMessage("商品"),
         "mergeWithExisting": MessageLookupByLibrary.simpleMessage("与现有的合并"),
@@ -1015,10 +1041,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "moreDetails": MessageLookupByLibrary.simpleMessage("更多详情"),
         "mostRecent": MessageLookupByLibrary.simpleMessage("最近"),
         "mostRelevant": MessageLookupByLibrary.simpleMessage("最相关"),
-        "moveItem": m45,
+        "moveItem": m49,
         "moveToAlbum": MessageLookupByLibrary.simpleMessage("移动到相册"),
         "moveToHiddenAlbum": MessageLookupByLibrary.simpleMessage("移至隐藏相册"),
-        "movedSuccessfullyTo": m46,
+        "movedSuccessfullyTo": m50,
         "movedToTrash": MessageLookupByLibrary.simpleMessage("已移至回收站"),
         "movingFilesToAlbum":
             MessageLookupByLibrary.simpleMessage("正在将文件移动到相册..."),
@@ -1043,6 +1069,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "noDeviceThatCanBeDeleted":
             MessageLookupByLibrary.simpleMessage("您在此设备上没有可被删除的文件"),
         "noDuplicates": MessageLookupByLibrary.simpleMessage("✨ 没有重复内容"),
+        "noEnteAccountExclamation":
+            MessageLookupByLibrary.simpleMessage("没有 Ente 账户！"),
         "noExifData": MessageLookupByLibrary.simpleMessage("无 EXIF 数据"),
         "noFacesFound": MessageLookupByLibrary.simpleMessage("未找到任何面部"),
         "noHiddenPhotosOrVideos":
@@ -1059,9 +1087,9 @@ class MessageLookup extends MessageLookupByLibrary {
             "由于我们端到端加密协议的性质，如果没有您的密码或恢复密钥，您的数据将无法解密"),
         "noResults": MessageLookupByLibrary.simpleMessage("无结果"),
         "noResultsFound": MessageLookupByLibrary.simpleMessage("未找到任何结果"),
-        "noSuggestionsForPerson": m47,
+        "noSuggestionsForPerson": m51,
         "noSystemLockFound": MessageLookupByLibrary.simpleMessage("未找到系统锁"),
-        "notPersonLabel": m48,
+        "notPersonLabel": m52,
         "nothingSharedWithYouYet":
             MessageLookupByLibrary.simpleMessage("尚未与您共享任何内容"),
         "nothingToSeeHere": MessageLookupByLibrary.simpleMessage("这里空空如也! 👀"),
@@ -1070,7 +1098,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "onDevice": MessageLookupByLibrary.simpleMessage("在设备上"),
         "onEnte": MessageLookupByLibrary.simpleMessage(
             "在 <branding>ente</branding> 上"),
-        "onlyFamilyAdminCanChangeCode": m49,
+        "onlyFamilyAdminCanChangeCode": m53,
         "onlyThem": MessageLookupByLibrary.simpleMessage("仅限他们"),
         "oops": MessageLookupByLibrary.simpleMessage("哎呀"),
         "oopsCouldNotSaveEdits":
@@ -1092,7 +1120,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "orPickAnExistingOne":
             MessageLookupByLibrary.simpleMessage("或者选择一个现有的"),
         "orPickFromYourContacts":
-            MessageLookupByLibrary.simpleMessage("or pick from your contacts"),
+            MessageLookupByLibrary.simpleMessage("或从您的联系人中选择"),
         "pair": MessageLookupByLibrary.simpleMessage("配对"),
         "pairWithPin": MessageLookupByLibrary.simpleMessage("用 PIN 配对"),
         "pairingComplete": MessageLookupByLibrary.simpleMessage("配对完成"),
@@ -1114,7 +1142,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "paymentFailed": MessageLookupByLibrary.simpleMessage("支付失败"),
         "paymentFailedMessage": MessageLookupByLibrary.simpleMessage(
             "不幸的是，您的付款失败。请联系支持人员，我们将为您提供帮助！"),
-        "paymentFailedTalkToProvider": m50,
+        "paymentFailedTalkToProvider": m54,
         "pendingItems": MessageLookupByLibrary.simpleMessage("待处理项目"),
         "pendingSync": MessageLookupByLibrary.simpleMessage("正在等待同步"),
         "people": MessageLookupByLibrary.simpleMessage("人物"),
@@ -1131,12 +1159,14 @@ class MessageLookup extends MessageLookupByLibrary {
         "photos": MessageLookupByLibrary.simpleMessage("照片"),
         "photosAddedByYouWillBeRemovedFromTheAlbum":
             MessageLookupByLibrary.simpleMessage("您添加的照片将从相册中移除"),
-        "photosCount": m51,
+        "photosCount": m55,
         "pickCenterPoint": MessageLookupByLibrary.simpleMessage("选择中心点"),
         "pinAlbum": MessageLookupByLibrary.simpleMessage("置顶相册"),
         "pinLock": MessageLookupByLibrary.simpleMessage("PIN 锁定"),
         "playOnTv": MessageLookupByLibrary.simpleMessage("在电视上播放相册"),
-        "playStoreFreeTrialValidTill": m52,
+        "playOriginal": MessageLookupByLibrary.simpleMessage("播放原内容"),
+        "playStoreFreeTrialValidTill": m56,
+        "playStream": MessageLookupByLibrary.simpleMessage("播放流"),
         "playstoreSubscription":
             MessageLookupByLibrary.simpleMessage("PlayStore 订阅"),
         "pleaseCheckYourInternetConnectionAndTryAgain":
@@ -1146,12 +1176,12 @@ class MessageLookup extends MessageLookupByLibrary {
                 "请用英语联系 support@ente.io ，我们将乐意提供帮助！"),
         "pleaseContactSupportIfTheProblemPersists":
             MessageLookupByLibrary.simpleMessage("如果问题仍然存在，请联系支持"),
-        "pleaseEmailUsAt": m53,
+        "pleaseEmailUsAt": m57,
         "pleaseGrantPermissions": MessageLookupByLibrary.simpleMessage("请授予权限"),
         "pleaseLoginAgain": MessageLookupByLibrary.simpleMessage("请重新登录"),
         "pleaseSelectQuickLinksToRemove":
             MessageLookupByLibrary.simpleMessage("请选择要删除的快速链接"),
-        "pleaseSendTheLogsTo": m54,
+        "pleaseSendTheLogsTo": m58,
         "pleaseTryAgain": MessageLookupByLibrary.simpleMessage("请重试"),
         "pleaseVerifyTheCodeYouHaveEntered":
             MessageLookupByLibrary.simpleMessage("请验证您输入的代码"),
@@ -1172,21 +1202,27 @@ class MessageLookup extends MessageLookupByLibrary {
         "privateSharing": MessageLookupByLibrary.simpleMessage("私人分享"),
         "proceed": MessageLookupByLibrary.simpleMessage("继续"),
         "processed": MessageLookupByLibrary.simpleMessage("已处理"),
-        "processingImport": m55,
+        "processing": MessageLookupByLibrary.simpleMessage("正在处理"),
+        "processingImport": m59,
+        "processingVideos": MessageLookupByLibrary.simpleMessage("正在处理视频"),
         "publicLinkCreated": MessageLookupByLibrary.simpleMessage("公共链接已创建"),
         "publicLinkEnabled": MessageLookupByLibrary.simpleMessage("公开链接已启用"),
+        "queued": MessageLookupByLibrary.simpleMessage("已入列"),
         "quickLinks": MessageLookupByLibrary.simpleMessage("快速链接"),
         "radius": MessageLookupByLibrary.simpleMessage("半径"),
         "raiseTicket": MessageLookupByLibrary.simpleMessage("提升工单"),
         "rateTheApp": MessageLookupByLibrary.simpleMessage("为此应用评分"),
         "rateUs": MessageLookupByLibrary.simpleMessage("给我们评分"),
-        "rateUsOnStore": m56,
+        "rateUsOnStore": m60,
+        "reassignMe": MessageLookupByLibrary.simpleMessage("重新分配“我”"),
+        "reassignedToName": m61,
+        "reassigningLoading": MessageLookupByLibrary.simpleMessage("正在重新分配..."),
         "recover": MessageLookupByLibrary.simpleMessage("恢复"),
         "recoverAccount": MessageLookupByLibrary.simpleMessage("恢复账户"),
         "recoverButton": MessageLookupByLibrary.simpleMessage("恢复"),
         "recoveryAccount": MessageLookupByLibrary.simpleMessage("恢复账户"),
         "recoveryInitiated": MessageLookupByLibrary.simpleMessage("已启动恢复"),
-        "recoveryInitiatedDesc": m57,
+        "recoveryInitiatedDesc": m62,
         "recoveryKey": MessageLookupByLibrary.simpleMessage("恢复密钥"),
         "recoveryKeyCopiedToClipboard":
             MessageLookupByLibrary.simpleMessage("恢复密钥已复制到剪贴板"),
@@ -1199,11 +1235,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "recoveryKeyVerified": MessageLookupByLibrary.simpleMessage("恢复密钥已验证"),
         "recoveryKeyVerifyReason": MessageLookupByLibrary.simpleMessage(
             "如果您忘记了密码，恢复密钥是恢复照片的唯一方法。您可以在“设置”>“账户”中找到恢复密钥。\n\n请在此处输入恢复密钥，以验证您是否已正确保存。"),
-        "recoveryReady": m58,
+        "recoveryReady": m63,
         "recoverySuccessful": MessageLookupByLibrary.simpleMessage("恢复成功!"),
         "recoveryWarning":
             MessageLookupByLibrary.simpleMessage("一位可信联系人正在尝试访问您的账户"),
-        "recoveryWarningBody": m59,
+        "recoveryWarningBody": m64,
         "recreatePasswordBody": MessageLookupByLibrary.simpleMessage(
             "当前设备的功能不足以验证您的密码，但我们可以以适用于所有设备的方式重新生成。\n\n请使用您的恢复密钥登录并重新生成您的密码（如果您希望，可以再次使用相同的密码）。"),
         "recreatePasswordTitle": MessageLookupByLibrary.simpleMessage("重新创建密码"),
@@ -1214,7 +1250,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("把我们推荐给你的朋友然后获得延长一倍的订阅计划"),
         "referralStep1": MessageLookupByLibrary.simpleMessage("1. 将此代码提供给您的朋友"),
         "referralStep2": MessageLookupByLibrary.simpleMessage("2. 他们注册一个付费计划"),
-        "referralStep3": m60,
+        "referralStep3": m65,
         "referrals": MessageLookupByLibrary.simpleMessage("推荐"),
         "referralsAreCurrentlyPaused":
             MessageLookupByLibrary.simpleMessage("推荐已暂停"),
@@ -1237,7 +1273,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "removeInvite": MessageLookupByLibrary.simpleMessage("移除邀请"),
         "removeLink": MessageLookupByLibrary.simpleMessage("移除链接"),
         "removeParticipant": MessageLookupByLibrary.simpleMessage("移除参与者"),
-        "removeParticipantBody": m61,
+        "removeParticipantBody": m66,
         "removePersonLabel": MessageLookupByLibrary.simpleMessage("移除人物标签"),
         "removePublicLink": MessageLookupByLibrary.simpleMessage("删除公开链接"),
         "removePublicLinks": MessageLookupByLibrary.simpleMessage("删除公开链接"),
@@ -1252,7 +1288,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "renameAlbum": MessageLookupByLibrary.simpleMessage("重命名相册"),
         "renameFile": MessageLookupByLibrary.simpleMessage("重命名文件"),
         "renewSubscription": MessageLookupByLibrary.simpleMessage("续费订阅"),
-        "renewsOn": m62,
+        "renewsOn": m67,
         "reportABug": MessageLookupByLibrary.simpleMessage("报告错误"),
         "reportBug": MessageLookupByLibrary.simpleMessage("报告错误"),
         "resendEmail": MessageLookupByLibrary.simpleMessage("重新发送电子邮件"),
@@ -1275,6 +1311,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "rotateRight": MessageLookupByLibrary.simpleMessage("向右旋转"),
         "safelyStored": MessageLookupByLibrary.simpleMessage("安全存储"),
         "save": MessageLookupByLibrary.simpleMessage("保存"),
+        "saveChangesBeforeLeavingQuestion":
+            MessageLookupByLibrary.simpleMessage("离开之前要保存更改吗？"),
         "saveCollage": MessageLookupByLibrary.simpleMessage("保存拼贴"),
         "saveCopy": MessageLookupByLibrary.simpleMessage("保存副本"),
         "saveKey": MessageLookupByLibrary.simpleMessage("保存密钥"),
@@ -1312,8 +1350,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("邀请他人，您将在此看到他们分享的所有照片"),
         "searchPersonsEmptySection":
             MessageLookupByLibrary.simpleMessage("处理和同步完成后，人物将显示在此处"),
-        "searchResultCount": m63,
-        "searchSectionsLengthMismatch": m64,
+        "searchResultCount": m68,
+        "searchSectionsLengthMismatch": m69,
         "security": MessageLookupByLibrary.simpleMessage("安全"),
         "seePublicAlbumLinksInApp":
             MessageLookupByLibrary.simpleMessage("在应用程序中查看公开相册链接"),
@@ -1330,7 +1368,9 @@ class MessageLookup extends MessageLookupByLibrary {
         "selectLanguage": MessageLookupByLibrary.simpleMessage("选择语言"),
         "selectMailApp": MessageLookupByLibrary.simpleMessage("选择邮件应用"),
         "selectMorePhotos": MessageLookupByLibrary.simpleMessage("选择更多照片"),
+        "selectPersonToLink": MessageLookupByLibrary.simpleMessage("选择要链接的人"),
         "selectReason": MessageLookupByLibrary.simpleMessage("选择原因"),
+        "selectYourFace": MessageLookupByLibrary.simpleMessage("选择你的脸"),
         "selectYourPlan": MessageLookupByLibrary.simpleMessage("选择您的计划"),
         "selectedFilesAreNotOnEnte":
             MessageLookupByLibrary.simpleMessage("所选文件不在 Ente 上"),
@@ -1339,7 +1379,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "selectedItemsWillBeDeletedFromAllAlbumsAndMoved":
             MessageLookupByLibrary.simpleMessage("所选项目将从所有相册中删除并移动到回收站。"),
         "selectedPhotos": m6,
-        "selectedPhotosWithYours": m65,
+        "selectedPhotosWithYours": m70,
         "send": MessageLookupByLibrary.simpleMessage("发送"),
         "sendEmail": MessageLookupByLibrary.simpleMessage("发送电子邮件"),
         "sendInvite": MessageLookupByLibrary.simpleMessage("发送邀请"),
@@ -1362,16 +1402,16 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("打开相册并点击右上角的分享按钮进行分享"),
         "shareAnAlbumNow": MessageLookupByLibrary.simpleMessage("立即分享相册"),
         "shareLink": MessageLookupByLibrary.simpleMessage("分享链接"),
-        "shareMyVerificationID": m66,
+        "shareMyVerificationID": m71,
         "shareOnlyWithThePeopleYouWant":
             MessageLookupByLibrary.simpleMessage("仅与您想要的人分享"),
         "shareTextConfirmOthersVerificationID": m7,
         "shareTextRecommendUsingEnte":
             MessageLookupByLibrary.simpleMessage("下载 Ente，让我们轻松共享高质量的原始照片和视频"),
-        "shareTextReferralCode": m67,
+        "shareTextReferralCode": m72,
         "shareWithNonenteUsers":
             MessageLookupByLibrary.simpleMessage("与非 Ente 用户共享"),
-        "shareWithPeopleSectionTitle": m68,
+        "shareWithPeopleSectionTitle": m73,
         "shareYourFirstAlbum":
             MessageLookupByLibrary.simpleMessage("分享您的第一个相册"),
         "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage(
@@ -1382,7 +1422,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("新共享的照片"),
         "sharedPhotoNotificationsExplanation":
             MessageLookupByLibrary.simpleMessage("当有人将照片添加到您所属的共享相册时收到通知"),
-        "sharedWith": m69,
+        "sharedWith": m74,
         "sharedWithMe": MessageLookupByLibrary.simpleMessage("与我共享"),
         "sharedWithYou": MessageLookupByLibrary.simpleMessage("已与您共享"),
         "sharing": MessageLookupByLibrary.simpleMessage("正在分享..."),
@@ -1395,11 +1435,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "signOutOtherDevices": MessageLookupByLibrary.simpleMessage("登出其他设备"),
         "signUpTerms": MessageLookupByLibrary.simpleMessage(
             "我同意 <u-terms>服务条款</u-terms> 和 <u-policy>隐私政策</u-policy>"),
-        "singleFileDeleteFromDevice": m70,
+        "singleFileDeleteFromDevice": m75,
         "singleFileDeleteHighlight":
             MessageLookupByLibrary.simpleMessage("它将从所有相册中删除。"),
-        "singleFileInBothLocalAndRemote": m71,
-        "singleFileInRemoteOnly": m72,
+        "singleFileInBothLocalAndRemote": m76,
+        "singleFileInRemoteOnly": m77,
         "skip": MessageLookupByLibrary.simpleMessage("跳过"),
         "social": MessageLookupByLibrary.simpleMessage("社交"),
         "someItemsAreInBothEnteAndYourDevice":
@@ -1437,10 +1477,11 @@ class MessageLookup extends MessageLookupByLibrary {
         "storageBreakupYou": MessageLookupByLibrary.simpleMessage("您"),
         "storageInGB": m1,
         "storageLimitExceeded": MessageLookupByLibrary.simpleMessage("已超出存储限制"),
-        "storageUsageInfo": m73,
+        "storageUsageInfo": m78,
+        "streamDetails": MessageLookupByLibrary.simpleMessage("流详情"),
         "strongStrength": MessageLookupByLibrary.simpleMessage("强"),
-        "subAlreadyLinkedErrMessage": m74,
-        "subWillBeCancelledOn": m75,
+        "subAlreadyLinkedErrMessage": m79,
+        "subWillBeCancelledOn": m80,
         "subscribe": MessageLookupByLibrary.simpleMessage("订阅"),
         "subscribeToEnableSharing":
             MessageLookupByLibrary.simpleMessage("您需要有效的付费订阅才能启用共享。"),
@@ -1453,7 +1494,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "successfullyUnhid": MessageLookupByLibrary.simpleMessage("已成功取消隐藏"),
         "suggestFeatures": MessageLookupByLibrary.simpleMessage("建议新功能"),
         "support": MessageLookupByLibrary.simpleMessage("支持"),
-        "syncProgress": m76,
+        "syncProgress": m81,
         "syncStopped": MessageLookupByLibrary.simpleMessage("同步已停止"),
         "syncing": MessageLookupByLibrary.simpleMessage("正在同步···"),
         "systemTheme": MessageLookupByLibrary.simpleMessage("适应系统"),
@@ -1461,7 +1502,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "tapToEnterCode": MessageLookupByLibrary.simpleMessage("点击以输入代码"),
         "tapToUnlock": MessageLookupByLibrary.simpleMessage("点击解锁"),
         "tapToUpload": MessageLookupByLibrary.simpleMessage("点按上传"),
-        "tapToUploadIsIgnoredDue": m77,
+        "tapToUploadIsIgnoredDue": m82,
         "tempErrorContactSupportIfPersists":
             MessageLookupByLibrary.simpleMessage(
                 "看起来出了点问题。 请稍后重试。 如果错误仍然存在，请联系我们的支持团队。"),
@@ -1495,7 +1536,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("这个邮箱地址已经被使用"),
         "thisImageHasNoExifData":
             MessageLookupByLibrary.simpleMessage("此图像没有Exif 数据"),
-        "thisIsPersonVerificationId": m78,
+        "thisIsMeExclamation": MessageLookupByLibrary.simpleMessage("这就是我！"),
+        "thisIsPersonVerificationId": m83,
         "thisIsYourVerificationId":
             MessageLookupByLibrary.simpleMessage("这是您的验证 ID"),
         "thisWillLogYouOutOfTheFollowingDevice":
@@ -1515,10 +1557,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "total": MessageLookupByLibrary.simpleMessage("总计"),
         "totalSize": MessageLookupByLibrary.simpleMessage("总大小"),
         "trash": MessageLookupByLibrary.simpleMessage("回收站"),
-        "trashDaysLeft": m79,
+        "trashDaysLeft": m84,
         "trim": MessageLookupByLibrary.simpleMessage("修剪"),
         "trustedContacts": MessageLookupByLibrary.simpleMessage("可信联系人"),
-        "trustedInviteBody": m80,
+        "trustedInviteBody": m85,
         "tryAgain": MessageLookupByLibrary.simpleMessage("请再试一次"),
         "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage(
             "打开备份可自动上传添加到此设备文件夹的文件至 Ente。"),
@@ -1533,7 +1575,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "twofactorAuthenticationSuccessfullyReset":
             MessageLookupByLibrary.simpleMessage("成功重置双重认证"),
         "twofactorSetup": MessageLookupByLibrary.simpleMessage("双重认证设置"),
-        "typeOfGallerGallerytypeIsNotSupportedForRename": m81,
+        "typeOfGallerGallerytypeIsNotSupportedForRename": m86,
         "unarchive": MessageLookupByLibrary.simpleMessage("取消存档"),
         "unarchiveAlbum": MessageLookupByLibrary.simpleMessage("取消存档相册"),
         "unarchiving": MessageLookupByLibrary.simpleMessage("正在取消存档..."),
@@ -1553,10 +1595,10 @@ class MessageLookup extends MessageLookupByLibrary {
         "updatingFolderSelection":
             MessageLookupByLibrary.simpleMessage("正在更新文件夹选择..."),
         "upgrade": MessageLookupByLibrary.simpleMessage("升级"),
-        "uploadIsIgnoredDueToIgnorereason": m82,
+        "uploadIsIgnoredDueToIgnorereason": m87,
         "uploadingFilesToAlbum":
             MessageLookupByLibrary.simpleMessage("正在将文件上传到相册..."),
-        "uploadingMultipleMemories": m83,
+        "uploadingMultipleMemories": m88,
         "uploadingSingleMemory":
             MessageLookupByLibrary.simpleMessage("正在保存 1 个回忆..."),
         "upto50OffUntil4thDec":
@@ -1571,13 +1613,13 @@ class MessageLookup extends MessageLookupByLibrary {
         "useRecoveryKey": MessageLookupByLibrary.simpleMessage("使用恢复密钥"),
         "useSelectedPhoto": MessageLookupByLibrary.simpleMessage("使用所选照片"),
         "usedSpace": MessageLookupByLibrary.simpleMessage("已用空间"),
-        "validTill": m84,
+        "validTill": m89,
         "verificationFailedPleaseTryAgain":
             MessageLookupByLibrary.simpleMessage("验证失败，请重试"),
         "verificationId": MessageLookupByLibrary.simpleMessage("验证 ID"),
         "verify": MessageLookupByLibrary.simpleMessage("验证"),
         "verifyEmail": MessageLookupByLibrary.simpleMessage("验证电子邮件"),
-        "verifyEmailID": m85,
+        "verifyEmailID": m90,
         "verifyIDLabel": MessageLookupByLibrary.simpleMessage("验证"),
         "verifyPasskey": MessageLookupByLibrary.simpleMessage("验证通行密钥"),
         "verifyPassword": MessageLookupByLibrary.simpleMessage("验证密码"),
@@ -1586,6 +1628,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("正在验证恢复密钥..."),
         "videoInfo": MessageLookupByLibrary.simpleMessage("视频详情"),
         "videoSmallCase": MessageLookupByLibrary.simpleMessage("视频"),
+        "videoStreaming": MessageLookupByLibrary.simpleMessage("影音流"),
         "videos": MessageLookupByLibrary.simpleMessage("视频"),
         "viewActiveSessions": MessageLookupByLibrary.simpleMessage("查看活动会话"),
         "viewAddOnButton": MessageLookupByLibrary.simpleMessage("查看附加组件"),
@@ -1597,7 +1640,7 @@ class MessageLookup extends MessageLookupByLibrary {
         "viewLogs": MessageLookupByLibrary.simpleMessage("查看日志"),
         "viewRecoveryKey": MessageLookupByLibrary.simpleMessage("查看恢复密钥"),
         "viewer": MessageLookupByLibrary.simpleMessage("查看者"),
-        "viewersSuccessfullyAdded": m86,
+        "viewersSuccessfullyAdded": m91,
         "visitWebToManage":
             MessageLookupByLibrary.simpleMessage("请访问 web.ente.io 来管理您的订阅"),
         "waitingForVerification":
@@ -1615,7 +1658,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("可信联系人可以帮助恢复您的数据。"),
         "yearShort": MessageLookupByLibrary.simpleMessage("年"),
         "yearly": MessageLookupByLibrary.simpleMessage("每年"),
-        "yearsAgo": m87,
+        "yearsAgo": m92,
         "yes": MessageLookupByLibrary.simpleMessage("是"),
         "yesCancel": MessageLookupByLibrary.simpleMessage("是的，取消"),
         "yesConvertToViewer": MessageLookupByLibrary.simpleMessage("是的，转换为查看者"),
@@ -1642,7 +1685,7 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("莫开玩笑，您不能与自己分享"),
         "youDontHaveAnyArchivedItems":
             MessageLookupByLibrary.simpleMessage("您没有任何存档的项目。"),
-        "youHaveSuccessfullyFreedUp": m88,
+        "youHaveSuccessfullyFreedUp": m93,
         "yourAccountHasBeenDeleted":
             MessageLookupByLibrary.simpleMessage("您的账户已删除"),
         "yourMap": MessageLookupByLibrary.simpleMessage("您的地图"),

From 2ff97c29ffe669656c78156628a1f557e0057d8c Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 25 Feb 2025 13:36:25 +0530
Subject: [PATCH 505/796] [mob] Limit retry to noStatusCode

---
 mobile/lib/utils/file_uploader.dart | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/mobile/lib/utils/file_uploader.dart b/mobile/lib/utils/file_uploader.dart
index 78b31ff4f9..bcef6f4c86 100644
--- a/mobile/lib/utils/file_uploader.dart
+++ b/mobile/lib/utils/file_uploader.dart
@@ -1185,12 +1185,15 @@ class FileUploader {
       file.metadataDecryptionHeader = metadataDecryptionHeader;
       return file;
     } on DioException catch (e) {
-      if (e.response?.statusCode == 413) {
+      final int statusCode = e.response?.statusCode ?? -1;
+      if (statusCode == 413) {
         throw FileTooLargeForPlanError();
-      } else if (e.response?.statusCode == 426) {
+      } else if (statusCode == 426) {
         _onStorageLimitExceeded();
-      } else if (attempt < kMaximumUploadAttempts) {
-        _logger.info("Upload file failed, will retry in 3 seconds");
+      } else if (attempt < kMaximumUploadAttempts && statusCode == -1) {
+        // retry when DioException contains no response/status code
+        _logger
+            .info("Upload file (${file.tag}) failed, will retry in 3 seconds");
         await Future.delayed(const Duration(seconds: 3));
         return _uploadFile(
           file,
@@ -1209,6 +1212,8 @@ class FileUploader {
           attempt: attempt + 1,
           pubMetadata: pubMetadata,
         );
+      } else {
+        _logger.severe("Failed to upload file ${file.tag}", e);
       }
       rethrow;
     }
@@ -1253,10 +1258,12 @@ class FileUploader {
       file.metadataDecryptionHeader = metadataDecryptionHeader;
       return file;
     } on DioException catch (e) {
-      if (e.response?.statusCode == 426) {
+      final int statusCode = e.response?.statusCode ?? -1;
+      if (statusCode == 426) {
         _onStorageLimitExceeded();
-      } else if (attempt < kMaximumUploadAttempts) {
-        _logger.info("Update file failed, will retry in 3 seconds");
+      } else if (attempt < kMaximumUploadAttempts && statusCode == -1) {
+        _logger
+            .info("Update file (${file.tag}) failed, will retry in 3 seconds");
         await Future.delayed(const Duration(seconds: 3));
         return _updateFile(
           file,
@@ -1270,6 +1277,8 @@ class FileUploader {
           metadataDecryptionHeader,
           attempt: attempt + 1,
         );
+      } else {
+        _logger.severe("Failed to update file ${file.tag}", e);
       }
       rethrow;
     }

From fc429d88c577ede24236ec1c7607fc407412724c Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 25 Feb 2025 14:43:31 +0530
Subject: [PATCH 506/796] chore: add proguard rules

---
 mobile/android/app/proguard-rules.pro | 15 +++++++++++++++
 mobile/pubspec.yaml                   |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/mobile/android/app/proguard-rules.pro b/mobile/android/app/proguard-rules.pro
index 066c0d1874..e8654cd3b3 100644
--- a/mobile/android/app/proguard-rules.pro
+++ b/mobile/android/app/proguard-rules.pro
@@ -4,3 +4,18 @@
 -keepattributes LineNumberTable,SourceFile
 
 -keep class org.chromium.net.** { *; }
+# Please add these rules to your existing keep rules in order to suppress warnings.
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn androidx.window.extensions.WindowExtensions
+-dontwarn androidx.window.extensions.WindowExtensionsProvider
+-dontwarn androidx.window.extensions.area.ExtensionWindowAreaPresentation
+-dontwarn androidx.window.extensions.layout.DisplayFeature
+-dontwarn androidx.window.extensions.layout.FoldingFeature
+-dontwarn androidx.window.extensions.layout.WindowLayoutComponent
+-dontwarn androidx.window.extensions.layout.WindowLayoutInfo
+-dontwarn androidx.window.sidecar.SidecarDeviceState
+-dontwarn androidx.window.sidecar.SidecarDisplayFeature
+-dontwarn androidx.window.sidecar.SidecarInterface$SidecarCallback
+-dontwarn androidx.window.sidecar.SidecarInterface
+-dontwarn androidx.window.sidecar.SidecarProvider
+-dontwarn androidx.window.sidecar.SidecarWindowLayoutInfo
\ No newline at end of file
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index a8044a896d..6bd5cbf986 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -188,8 +188,8 @@ dependencies:
       url: https://github.com/KasemJaffer/receive_sharing_intent.git
   screenshot: ^3.0.0
   scrollable_positioned_list: ^0.3.5
-  sentry: ^8.0.0
-  sentry_flutter: ^8.0.0
+  sentry: ^8.13.2
+  sentry_flutter: ^8.13.2
   share_plus: ^10.0.2
   shared_preferences: ^2.0.5
   simple_cluster: ^0.3.0

From 5659b935555faa15726f237875131eb0aa9bf3d6 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 25 Feb 2025 14:48:24 +0530
Subject: [PATCH 507/796] fix: add code to append preview

---
 mobile/lib/main.dart                               |  2 --
 mobile/lib/services/filedata/filedata_service.dart |  6 ++++++
 mobile/lib/services/preview_video_store.dart       | 11 +++++++----
 mobile/lib/services/sync_service.dart              |  5 ++++-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index b2e00dfbdf..662f2b9339 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -40,7 +40,6 @@ import 'package:photos/services/machine_learning/ml_service.dart';
 import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';
 import 'package:photos/services/memories_service.dart';
 import "package:photos/services/notification_service.dart";
-import "package:photos/services/preview_video_store.dart";
 import 'package:photos/services/push_service.dart';
 import 'package:photos/services/remote_sync_service.dart';
 import 'package:photos/services/search_service.dart';
@@ -281,7 +280,6 @@ Future<void> _init(bool isBackground, {String via = ''}) async {
       });
     }
     _logger.info("PushService/HomeWidget done $tlog");
-    PreviewVideoStore.instance.init(preferences);
     unawaited(SemanticSearchService.instance.init());
     unawaited(MLService.instance.init());
     await PersonService.init(
diff --git a/mobile/lib/services/filedata/filedata_service.dart b/mobile/lib/services/filedata/filedata_service.dart
index 424bf0210b..22fa04e557 100644
--- a/mobile/lib/services/filedata/filedata_service.dart
+++ b/mobile/lib/services/filedata/filedata_service.dart
@@ -29,6 +29,12 @@ class FileDataService {
     _prefs = prefs;
   }
 
+  void appendPreview(int id) {
+    if (previewIds?.containsKey(id) ?? false) return;
+    previewIds ??= {};
+    previewIds?[id] = PreviewInfo(objectId: "dummy", objectSize: 0);
+  }
+
   Future<void> putFileData(EnteFile file, FileDataEntity data) async {
     data.validate();
     final ChaChaEncryptionResult encryptionResult = await gzipAndEncryptJson(
diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index afdeb7f26f..2792bcde1c 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -41,6 +41,8 @@ class PreviewVideoStore {
   final LinkedHashMap<int, PreviewItem> _items = LinkedHashMap();
   LinkedHashMap<int, PreviewItem> get previews => _items;
 
+  bool initSuccess = false;
+
   PreviewVideoStore._privateConstructor();
 
   static final PreviewVideoStore instance =
@@ -58,9 +60,9 @@ class PreviewVideoStore {
   void init(SharedPreferences prefs) {
     _prefs = prefs;
 
-    FileDataService.instance.syncFDStatus().then(
-          (_) => _putFilesForPreviewCreation(),
-        );
+    if (!initSuccess) {
+      _putFilesForPreviewCreation();
+    }
   }
 
   late final SharedPreferences _prefs;
@@ -340,7 +342,7 @@ class PreviewVideoStore {
 
       if (error == null) {
         // update previewIds
-        FileDataService.instance.syncFDStatus().ignore();
+        FileDataService.instance.appendPreview(enteFile.uploadedFileID!);
 
         _items[enteFile.uploadedFileID!] = PreviewItem(
           status: PreviewItemStatus.uploaded,
@@ -695,6 +697,7 @@ class PreviewVideoStore {
     // take first file and put it for stream generation
     final file = allFiles.removeAt(0);
     fileQueue.addAll(allFiles);
+    initSuccess = true;
     await chunkAndUploadVideo(null, file);
   }
 }
diff --git a/mobile/lib/services/sync_service.dart b/mobile/lib/services/sync_service.dart
index f015c9a82c..8134807c04 100644
--- a/mobile/lib/services/sync_service.dart
+++ b/mobile/lib/services/sync_service.dart
@@ -22,6 +22,7 @@ import "package:photos/services/filedata/filedata_service.dart";
 import "package:photos/services/files_service.dart";
 import 'package:photos/services/local_sync_service.dart';
 import 'package:photos/services/notification_service.dart';
+import "package:photos/services/preview_video_store.dart";
 import 'package:photos/services/remote_sync_service.dart';
 import 'package:photos/utils/file_uploader.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -87,7 +88,9 @@ class SyncService {
     _existingSync = Completer<bool>();
     bool successful = false;
     try {
-      FileDataService.instance.syncFDStatus().ignore();
+      FileDataService.instance.syncFDStatus().then((_) {
+        PreviewVideoStore.instance.init(_prefs);
+      }).ignore();
       await _doSync();
       if (_lastSyncStatusEvent != null &&
           _lastSyncStatusEvent!.status !=

From a5cb78bf9557f1b67f6ab0603afa570ff8cb423e Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Tue, 25 Feb 2025 14:48:25 +0530
Subject: [PATCH 508/796] [mob][photos] memories cache first iteration

---
 mobile/lib/models/people_memory.dart          |  21 +-
 mobile/lib/models/smart_memory.dart           |  21 +
 mobile/lib/service_locator.dart               |   9 +
 .../services/machine_learning/ml_service.dart |   4 +
 .../lib/services/memories_cache_service.dart  | 365 ++++++++++++++++++
 .../lib/services/smart_memories_service.dart  |   6 +-
 .../lib/ui/home/memories/memories_widget.dart |   1 -
 .../debug/ml_debug_section_widget.dart        |  17 +
 8 files changed, 435 insertions(+), 9 deletions(-)
 create mode 100644 mobile/lib/services/memories_cache_service.dart

diff --git a/mobile/lib/models/people_memory.dart b/mobile/lib/models/people_memory.dart
index 8b4dddde1e..ecb639137d 100644
--- a/mobile/lib/models/people_memory.dart
+++ b/mobile/lib/models/people_memory.dart
@@ -8,14 +8,23 @@ enum PeopleMemoryType {
   lastTimeYouSawThem,
 }
 
-enum PeopleActivity {
-  party,
-  hiking,
-  feast,
-  selfies,
-  sports
+PeopleMemoryType peopleMemoryTypeFromString(String type) {
+  switch (type) {
+    case "youAndThem":
+      return PeopleMemoryType.youAndThem;
+    case "doingSomethingTogether":
+      return PeopleMemoryType.doingSomethingTogether;
+    case "spotlight":
+      return PeopleMemoryType.spotlight;
+    case "lastTimeYouSawThem":
+      return PeopleMemoryType.lastTimeYouSawThem;
+    default:
+      throw ArgumentError("Invalid people memory type: $type");
+  }
 }
 
+enum PeopleActivity { party, hiking, feast, selfies, sports }
+
 String activityQuery(PeopleActivity activity) {
   switch (activity) {
     case PeopleActivity.party:
diff --git a/mobile/lib/models/smart_memory.dart b/mobile/lib/models/smart_memory.dart
index fa5f2524a7..aa42e111f8 100644
--- a/mobile/lib/models/smart_memory.dart
+++ b/mobile/lib/models/smart_memory.dart
@@ -7,6 +7,21 @@ enum MemoryType {
   filler,
 }
 
+MemoryType memoryTypeFromString(String type) {
+  switch (type) {
+    case "people":
+      return MemoryType.people;
+    case "trips":
+      return MemoryType.trips;
+    case "time":
+      return MemoryType.time;
+    case "filler":
+      return MemoryType.filler;
+    default:
+      throw ArgumentError("Invalid memory type: $type");
+  }
+}
+
 abstract class SmartMemory {
   final List<Memory> memories;
   final MemoryType type;
@@ -14,6 +29,11 @@ abstract class SmartMemory {
   int? firstCreationTime;
   int? lastCreationTime;
 
+  int? firstDateToShow;
+  int? lastDateToShow;
+  // TODO: lau: actually use this in calculated filters
+
+
   SmartMemory(
     this.memories,
     this.type, {
@@ -21,6 +41,7 @@ abstract class SmartMemory {
     this.firstCreationTime,
     this.lastCreationTime,
   }) : name = name != null ? name + "(I)" : null;
+  // TODO: lau: remove (I) from name when opening up the feature flag
 
   int averageCreationTime() {
     if (firstCreationTime != null && lastCreationTime != null) {
diff --git a/mobile/lib/service_locator.dart b/mobile/lib/service_locator.dart
index d33bef747e..037e7c9a7e 100644
--- a/mobile/lib/service_locator.dart
+++ b/mobile/lib/service_locator.dart
@@ -10,6 +10,7 @@ import "package:photos/services/location_service.dart";
 import "package:photos/services/machine_learning/face_ml/face_recognition_service.dart";
 import "package:photos/services/machine_learning/machine_learning_controller.dart";
 import "package:photos/services/magic_cache_service.dart";
+import "package:photos/services/memories_cache_service.dart";
 import "package:photos/services/storage_bonus_service.dart";
 import "package:photos/services/trash_sync_service.dart";
 import "package:photos/services/update_service.dart";
@@ -118,6 +119,14 @@ MagicCacheService get magicCacheService {
   return _magicCacheService!;
 }
 
+MemoriesCacheService? _memoriesCacheService;
+MemoriesCacheService get memoriesCacheService {
+  _memoriesCacheService ??= MemoriesCacheService(
+    ServiceLocator.instance.prefs,
+  );
+  return _memoriesCacheService!;
+}
+
 BillingService? _billingService;
 BillingService get billingService {
   _billingService ??= BillingService(
diff --git a/mobile/lib/services/machine_learning/ml_service.dart b/mobile/lib/services/machine_learning/ml_service.dart
index d6dcdb3bfc..df8a11163e 100644
--- a/mobile/lib/services/machine_learning/ml_service.dart
+++ b/mobile/lib/services/machine_learning/ml_service.dart
@@ -143,6 +143,8 @@ class MLService {
       if (_mlControllerStatus == true) {
         // refresh discover section
         magicCacheService.updateCache(forced: force).ignore();
+        // refresh memories section
+        memoriesCacheService.updateCache(forced: force).ignore();
       }
       if (canFetch()) {
         await fetchAndIndexAllImages();
@@ -153,6 +155,8 @@ class MLService {
       if (_mlControllerStatus == true) {
         // refresh discover section
         magicCacheService.updateCache().ignore();
+        // refresh memories section
+        memoriesCacheService.updateCache(forced: force).ignore();
       }
     } catch (e, s) {
       _logger.severe("runAllML failed", e, s);
diff --git a/mobile/lib/services/memories_cache_service.dart b/mobile/lib/services/memories_cache_service.dart
new file mode 100644
index 0000000000..9517fcb4b7
--- /dev/null
+++ b/mobile/lib/services/memories_cache_service.dart
@@ -0,0 +1,365 @@
+import "dart:convert";
+import "dart:io" show File;
+
+import "package:flutter/foundation.dart" show kDebugMode;
+import "package:logging/logging.dart";
+import "package:path_provider/path_provider.dart";
+import "package:photos/extensions/stop_watch.dart";
+import "package:photos/models/location/location.dart";
+import "package:photos/models/people_memory.dart";
+import "package:photos/models/smart_memory.dart";
+import "package:photos/models/trip_memory.dart";
+import "package:photos/services/location_service.dart";
+import "package:photos/services/smart_memories_service.dart";
+import "package:shared_preferences/shared_preferences.dart";
+
+class MemoriesCache {
+  final List<ToShowMemory> toShowMemories;
+  final List<PeopleShownLogs> peopleShownLogs;
+  final List<TripsShownLogs> tripsShownLogs;
+
+  MemoriesCache({
+    required this.toShowMemories,
+    required this.peopleShownLogs,
+    required this.tripsShownLogs,
+  });
+
+  factory MemoriesCache.fromJson(Map<String, dynamic> json) {
+    return MemoriesCache(
+      toShowMemories: ToShowMemory.decodeJsonToList(json['toShowMemories']),
+      peopleShownLogs:
+          PeopleShownLogs.decodeJsonToList(json['peopleShownLogs']),
+      tripsShownLogs: TripsShownLogs.decodeJsonToList(json['tripsShownLogs']),
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'toShowMemories': ToShowMemory.encodeListToJson(toShowMemories),
+      'peopleShownLogs': PeopleShownLogs.encodeListToJson(peopleShownLogs),
+      'tripsShownLogs': TripsShownLogs.encodeListToJson(tripsShownLogs),
+    };
+  }
+
+  static String encodeToJsonString(MemoriesCache cache) {
+    return jsonEncode(cache.toJson());
+  }
+
+  static MemoriesCache decodeFromJsonString(String jsonString) {
+    return MemoriesCache.fromJson(jsonDecode(jsonString));
+  }
+}
+
+class ToShowMemory {
+  final String title;
+  final List<int> fileUploadedIDs;
+  final MemoryType type;
+  final int firstTimeToShow;
+  final int lastTimeToShow;
+
+  bool get shouldShowNow {
+    final now = DateTime.now().microsecondsSinceEpoch;
+    return now >= firstTimeToShow && now <= lastTimeToShow;
+  }
+
+  ToShowMemory(
+    this.title,
+    this.fileUploadedIDs,
+    this.type,
+    this.firstTimeToShow,
+    this.lastTimeToShow,
+  );
+
+  factory ToShowMemory.fromJson(Map<String, dynamic> json) {
+    return ToShowMemory(
+      json['title'],
+      List<int>.from(json['fileUploadedIDs']),
+      memoryTypeFromString(json['type']),
+      json['firstTimeToShow'],
+      json['lastTimeToShow'],
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'title': title,
+      'fileUploadedIDs': fileUploadedIDs.toList(),
+      'type': type.toString().split('.').last,
+      'firstTimeToShow': firstTimeToShow,
+      'lastTimeToShow': lastTimeToShow,
+    };
+  }
+
+  static String encodeListToJson(List<ToShowMemory> toShowMemories) {
+    final jsonList = toShowMemories.map((memory) => memory.toJson()).toList();
+    return jsonEncode(jsonList);
+  }
+
+  static List<ToShowMemory> decodeJsonToList(String jsonString) {
+    final jsonList = jsonDecode(jsonString) as List;
+    return jsonList.map((json) => ToShowMemory.fromJson(json)).toList();
+  }
+}
+
+class PeopleShownLogs {
+  final String personID;
+  final PeopleMemoryType peopleMemoryType;
+  final int lastTimeShown;
+
+  PeopleShownLogs(
+    this.personID,
+    this.peopleMemoryType,
+    this.lastTimeShown,
+  );
+
+  factory PeopleShownLogs.fromJson(Map<String, dynamic> json) {
+    return PeopleShownLogs(
+      json['personID'],
+      peopleMemoryTypeFromString(json['peopleMemoryType']),
+      json['lastTimeShown'],
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'personID': personID,
+      'peopleMemoryType': peopleMemoryType.toString().split('.').last,
+      'lastTimeShown': lastTimeShown,
+    };
+  }
+
+  static String encodeListToJson(List<PeopleShownLogs> shownLogs) {
+    final jsonList = shownLogs.map((log) => log.toJson()).toList();
+    return jsonEncode(jsonList);
+  }
+
+  static List<PeopleShownLogs> decodeJsonToList(String jsonString) {
+    final jsonList = jsonDecode(jsonString) as List;
+    return jsonList.map((json) => PeopleShownLogs.fromJson(json)).toList();
+  }
+}
+
+class TripsShownLogs {
+  final Location location;
+  final int lastTimeShown;
+
+  TripsShownLogs(
+    this.location,
+    this.lastTimeShown,
+  );
+
+  factory TripsShownLogs.fromJson(Map<String, dynamic> json) {
+    return TripsShownLogs(
+      Location(
+        latitude: json['location']['latitude'],
+        longitude: json['location']['longitude'],
+      ),
+      json['lastTimeShown'],
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'location': {
+        'latitude': location.latitude!,
+        'longitude': location.longitude!,
+      },
+      'lastTimeShown': lastTimeShown,
+    };
+  }
+
+  static String encodeListToJson(List<TripsShownLogs> shownLogs) {
+    final jsonList = shownLogs.map((log) => log.toJson()).toList();
+    return jsonEncode(jsonList);
+  }
+
+  static List<TripsShownLogs> decodeJsonToList(String jsonString) {
+    final jsonList = jsonDecode(jsonString) as List;
+    return jsonList.map((json) => TripsShownLogs.fromJson(json)).toList();
+  }
+}
+
+class MemoriesCacheService {
+  static const _lastMemoriesCacheUpdateTimeKey = "lastMemoriesCacheUpdateTime";
+
+  /// Delay is for cache update to be done not during app init, during which a
+  /// lot of other things are happening.
+  static const _kCacheUpdateDelay = Duration(seconds: 10);
+
+  static const _kUpdateFrequency = Duration(days: 7);
+
+  final SharedPreferences _prefs;
+  late final Logger _logger = Logger("MemoriesCacheService");
+
+  Future<MemoriesCache?>? _memoriesCacheFuture;
+  bool _shouldUpdate = false;
+  bool _isUpdateInProgress = false;
+
+  MemoriesCacheService(this._prefs) {
+    _logger.fine("MemoriesCacheService constructor");
+    Future.delayed(_kCacheUpdateDelay, () {
+      _updateCacheIfTheTimeHasCome();
+    });
+  }
+
+  Future<void> _resetLastMemoriesCacheUpdateTime() async {
+    await _prefs.setInt(
+      _lastMemoriesCacheUpdateTimeKey,
+      DateTime.now().microsecondsSinceEpoch,
+    );
+  }
+
+  int get lastMemoriesCacheUpdateTime {
+    return _prefs.getInt(_lastMemoriesCacheUpdateTimeKey) ?? 0;
+  }
+
+  Future<void> _updateCacheIfTheTimeHasCome() async {
+    if (lastMemoriesCacheUpdateTime <
+        DateTime.now().subtract(_kUpdateFrequency).microsecondsSinceEpoch) {
+      _shouldUpdate = true;
+    }
+  }
+
+  Future<String> _getCachePath() async {
+    return (await getApplicationSupportDirectory()).path +
+        "/cache//test1/memories_cache";
+    // TODO: lau: remove the test1 directory after testing
+  }
+
+  Future<void> updateCache({bool forced = false}) async {
+    if (!SmartMemoriesService.instance.enableSmartMemories) {
+      return;
+    }
+    try {
+      if ((!_shouldUpdate && !forced) || _isUpdateInProgress) {
+        _logger.info(
+          "No update needed as shouldUpdate: $_shouldUpdate, forced: $forced and isUpdateInProgress $_isUpdateInProgress",
+        );
+        return;
+      }
+      _logger.info("updating memories cache");
+      _isUpdateInProgress = true;
+      final EnteWatch? w = kDebugMode ? EnteWatch("memoriesCacheWatch") : null;
+      w?.start();
+      final memories = await SmartMemoriesService.instance.getMemories(null);
+      w?.log("calculated new memories");
+      final oldCache = await getMemoriesCache();
+      w?.log("gotten old cache");
+      final MemoriesCache memoryCache =
+          getCacheFromMemories(memories, oldCache);
+      w?.log("gotten cache from memories");
+      final file = File(await _getCachePath());
+      if (!file.existsSync()) {
+        file.createSync(recursive: true);
+      }
+      _memoriesCacheFuture = Future.value(memoryCache);
+      await file.writeAsBytes(
+        MemoriesCache.encodeToJsonString(memoryCache).codeUnits,
+      );
+      w?.log("cacheWritten");
+      await _resetLastMemoriesCacheUpdateTime();
+      w?.logAndReset('done');
+      _shouldUpdate = false;
+    } catch (e, s) {
+      _logger.info("Error updating memories cache", e, s);
+    } finally {
+      _isUpdateInProgress = false;
+    }
+  }
+
+  MemoriesCache getCacheFromMemories(
+    List<SmartMemory> memories,
+    MemoriesCache? oldCache,
+  ) {
+    final List<ToShowMemory> toShowMemories = [];
+    final List<PeopleShownLogs> peopleShownLogs = [];
+    final List<TripsShownLogs> tripsShownLogs = [];
+    final now = DateTime.now().microsecondsSinceEpoch;
+    for (final memory in memories) {
+      if (memory.lastDateToShow != null && memory.lastDateToShow! < now) {
+        if (memory is PeopleMemory) {
+          peopleShownLogs.add(
+            PeopleShownLogs(
+              memory.personID,
+              memory.peopleMemoryType,
+              memory.lastDateToShow!,
+            ),
+          );
+        } else if (memory is TripMemory) {
+          tripsShownLogs.add(
+            TripsShownLogs(
+              memory.location,
+              memory.lastDateToShow!,
+            ),
+          );
+        }
+      } else {
+        if (memory.firstDateToShow != null && memory.lastDateToShow != null) {
+          toShowMemories.add(
+            ToShowMemory(
+              memory.name!,
+              memory.memories.map((m) => m.file.uploadedFileID!).toList(),
+              memory.type,
+              memory.firstDateToShow!,
+              memory.lastDateToShow!,
+            ),
+          );
+        } else {
+          _logger.severe('Memory has no first or last date to show');
+        }
+      }
+    }
+    if (oldCache != null) {
+      for (final shownPerson in oldCache.peopleShownLogs) {
+        if (peopleShownLogs.any(
+          (person) =>
+              (person.personID == shownPerson.personID) &&
+              (person.peopleMemoryType == shownPerson.peopleMemoryType),
+        )) {
+          continue;
+        }
+        peopleShownLogs.add(shownPerson);
+      }
+      for (final shownTrip in oldCache.tripsShownLogs) {
+        if (tripsShownLogs.any(
+          (trip) => isFileInsideLocationTag(
+            shownTrip.location,
+            trip.location,
+            10.0,
+          ),
+        )) {
+          continue;
+        }
+        tripsShownLogs.add(shownTrip);
+      }
+    }
+    return MemoriesCache(
+      toShowMemories: toShowMemories,
+      peopleShownLogs: peopleShownLogs,
+      tripsShownLogs: tripsShownLogs,
+    );
+  }
+
+  Future<MemoriesCache?> getMemoriesCache() async {
+    if (_memoriesCacheFuture != null) {
+      return _memoriesCacheFuture!;
+    }
+    _memoriesCacheFuture = _readResultFromDisk();
+    return _memoriesCacheFuture!;
+  }
+
+  Future<MemoriesCache?> _readResultFromDisk() async {
+    _logger.info("Reading memories cache result from disk");
+    final file = File(await _getCachePath());
+    if (!file.existsSync()) {
+      _logger.info("No memories cache found");
+      return null;
+    }
+    final jsonString = file.readAsStringSync();
+    return MemoriesCache.decodeFromJsonString(jsonString);
+  }
+
+  Future<void> clearMemoriesCache() async {
+    await File(await _getCachePath()).delete();
+  }
+}
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 97e960bb75..9f5ad6558f 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -1091,7 +1091,8 @@ class SmartMemoriesService {
       int offset = 0;
       for (int i = 0; i < numBuckets; i++) {
         final int bucketSize = quotient + (i < remainder ? 1 : 0);
-        timeBuckets.add(sortedTimeMemories.sublist(offset, offset + bucketSize));
+        timeBuckets
+            .add(sortedTimeMemories.sublist(offset, offset + bucketSize));
         offset += bucketSize;
       }
 
@@ -1163,7 +1164,8 @@ class SmartMemoriesService {
           .sort((a, b) => b.file.creationTime!.compareTo(a.file.creationTime!));
 
       _logger.finest(
-          'People memories selection done, returning ${finalSelection.length} memories',);
+        'People memories selection done, returning ${finalSelection.length} memories',
+      );
       return finalSelection;
     } catch (e, s) {
       _logger.severe('Error in _bestSelectionPeople', e, s);
diff --git a/mobile/lib/ui/home/memories/memories_widget.dart b/mobile/lib/ui/home/memories/memories_widget.dart
index 655f4896c5..76a74a0e72 100644
--- a/mobile/lib/ui/home/memories/memories_widget.dart
+++ b/mobile/lib/ui/home/memories/memories_widget.dart
@@ -6,7 +6,6 @@ import "package:photos/core/event_bus.dart";
 import "package:photos/events/memories_setting_changed.dart";
 import 'package:photos/models/memory.dart';
 import "package:photos/models/smart_memory.dart";
-import "package:photos/service_locator.dart";
 import 'package:photos/services/memories_service.dart';
 import "package:photos/services/smart_memories_service.dart";
 import "package:photos/ui/common/loading_widget.dart";
diff --git a/mobile/lib/ui/settings/debug/ml_debug_section_widget.dart b/mobile/lib/ui/settings/debug/ml_debug_section_widget.dart
index d89ee548a1..ad5f85ce15 100644
--- a/mobile/lib/ui/settings/debug/ml_debug_section_widget.dart
+++ b/mobile/lib/ui/settings/debug/ml_debug_section_widget.dart
@@ -285,6 +285,23 @@ class _MLDebugSectionWidgetState extends State<MLDebugSectionWidget> {
           },
         ),
         sectionOptionSpacing,
+        MenuItemWidget(
+          captionedTextWidget: const CaptionedTextWidget(
+            title: "Update memories",
+          ),
+          pressedColor: getEnteColorScheme(context).fillFaint,
+          trailingIcon: Icons.chevron_right_outlined,
+          trailingIconIsMuted: true,
+          onTap: () async {
+            try {
+              await memoriesCacheService.updateCache(forced: true);
+            } catch (e, s) {
+              logger.warning('Update memories failed', e, s);
+              await showGenericErrorDialog(context: context, error: e);
+            }
+          },
+        ),
+        sectionOptionSpacing,
         MenuItemWidget(
           captionedTextWidget: const CaptionedTextWidget(
             title: "Sync person mappings ",

From 840fc3c061abdea89cf305f05839f587a7b3aadf Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 25 Feb 2025 15:02:44 +0530
Subject: [PATCH 509/796] [mob] Check lock again before reporting file

---
 mobile/lib/core/errors.dart         | 2 ++
 mobile/lib/utils/file_uploader.dart | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/mobile/lib/core/errors.dart b/mobile/lib/core/errors.dart
index b6d16802c3..0c0d16949a 100644
--- a/mobile/lib/core/errors.dart
+++ b/mobile/lib/core/errors.dart
@@ -58,6 +58,8 @@ bool isHandledSyncError(Object errObj) {
 
 class LockAlreadyAcquiredError extends Error {}
 
+class LockFreedError extends Error{}
+
 class UnauthorizedError extends Error {}
 
 class RequestCancelledError extends Error {}
diff --git a/mobile/lib/utils/file_uploader.dart b/mobile/lib/utils/file_uploader.dart
index bcef6f4c86..98c9d49fc2 100644
--- a/mobile/lib/utils/file_uploader.dart
+++ b/mobile/lib/utils/file_uploader.dart
@@ -751,6 +751,11 @@ class FileUploader {
       if (SyncService.instance.shouldStopSync()) {
         throw SyncStopRequestedError();
       }
+      final stillLocked = await _uploadLocks.isLocked(lockKey, _processType.toString());
+      if (!stillLocked) {
+        _logger.warning('file ${file.tag} report paused is missing');
+        throw LockFreedError();
+      }
 
       EnteFile remoteFile;
       if (isUpdatedFile) {

From d1a5e94886ab5612406469a66b856bedbade90ea Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 25 Feb 2025 15:04:26 +0530
Subject: [PATCH 510/796] fix: aspect ratio resolution

---
 mobile/lib/ui/viewer/file/video_widget_native.dart | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/ui/viewer/file/video_widget_native.dart b/mobile/lib/ui/viewer/file/video_widget_native.dart
index a660c5bfee..5da199b965 100644
--- a/mobile/lib/ui/viewer/file/video_widget_native.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_native.dart
@@ -588,6 +588,8 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
   }
 
   Future<void> _setAspectRatioFromVideoProps() async {
+    if (aspectRatio != null && duration != null) return;
+
     if (widget.playlistData != null && widget.selectedPreview) {
       aspectRatio = widget.playlistData!.width! / widget.playlistData!.height!;
       if (widget.file.duration != null &&
@@ -597,7 +599,6 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
       _logger.info("Getting aspect ratio from preview video");
       return;
     }
-    if (aspectRatio != 1) return;
     final videoProps = await getVideoPropsAsync(File(_filePath!));
     if (videoProps != null) {
       duration = videoProps.propData?["duration"];

From 655bbd36dab96d27ddd38b338f75a7b818b11a49 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 25 Feb 2025 15:04:38 +0530
Subject: [PATCH 511/796] chore: bump version code

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 6bd5cbf986..617bafbfed 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.99+1004
+version: 0.9.99+1005
 publish_to: none
 
 environment:

From 0b56575939223023c3f2d51a1127ae6b338443b1 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 25 Feb 2025 15:27:36 +0530
Subject: [PATCH 512/796] fix: add more proguard rules

---
 mobile/android/app/proguard-rules.pro | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/mobile/android/app/proguard-rules.pro b/mobile/android/app/proguard-rules.pro
index e8654cd3b3..f131957d9b 100644
--- a/mobile/android/app/proguard-rules.pro
+++ b/mobile/android/app/proguard-rules.pro
@@ -4,6 +4,8 @@
 -keepattributes LineNumberTable,SourceFile
 
 -keep class org.chromium.net.** { *; }
+
+# App was failing without these
 # Please add these rules to your existing keep rules in order to suppress warnings.
 # This is generated automatically by the Android Gradle plugin.
 -dontwarn androidx.window.extensions.WindowExtensions
@@ -18,4 +20,20 @@
 -dontwarn androidx.window.sidecar.SidecarInterface$SidecarCallback
 -dontwarn androidx.window.sidecar.SidecarInterface
 -dontwarn androidx.window.sidecar.SidecarProvider
--dontwarn androidx.window.sidecar.SidecarWindowLayoutInfo
\ No newline at end of file
+-dontwarn androidx.window.sidecar.SidecarWindowLayoutInfo
+-dontwarn androidx.compose.ui.Modifier
+-dontwarn androidx.compose.ui.layout.LayoutCoordinates
+-dontwarn androidx.compose.ui.layout.LayoutCoordinatesKt
+-dontwarn androidx.compose.ui.layout.ModifierInfo
+-dontwarn androidx.compose.ui.node.LayoutNode
+-dontwarn androidx.compose.ui.node.NodeCoordinator
+-dontwarn androidx.compose.ui.node.Owner
+-dontwarn androidx.compose.ui.semantics.AccessibilityAction
+-dontwarn androidx.compose.ui.semantics.SemanticsActions
+-dontwarn androidx.compose.ui.semantics.SemanticsConfiguration
+-dontwarn androidx.compose.ui.semantics.SemanticsConfigurationKt
+-dontwarn androidx.compose.ui.semantics.SemanticsProperties
+-dontwarn androidx.compose.ui.semantics.SemanticsPropertyKey
+-dontwarn androidx.compose.ui.text.TextLayoutInput
+-dontwarn androidx.compose.ui.text.TextLayoutResult
+-dontwarn androidx.compose.ui.text.TextStyle
\ No newline at end of file

From 19073951c8e85d7407ec00afc177593b078e7520 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 25 Feb 2025 15:29:12 +0530
Subject: [PATCH 513/796] fix: shuffle deck

---
 mobile/lib/main.dart                         |  2 ++
 mobile/lib/services/preview_video_store.dart | 10 ++++++----
 mobile/lib/services/remote_sync_service.dart |  7 ++++++-
 mobile/lib/services/sync_service.dart        |  5 -----
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index 662f2b9339..b2e00dfbdf 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -40,6 +40,7 @@ import 'package:photos/services/machine_learning/ml_service.dart';
 import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';
 import 'package:photos/services/memories_service.dart';
 import "package:photos/services/notification_service.dart";
+import "package:photos/services/preview_video_store.dart";
 import 'package:photos/services/push_service.dart';
 import 'package:photos/services/remote_sync_service.dart';
 import 'package:photos/services/search_service.dart';
@@ -280,6 +281,7 @@ Future<void> _init(bool isBackground, {String via = ''}) async {
       });
     }
     _logger.info("PushService/HomeWidget done $tlog");
+    PreviewVideoStore.instance.init(preferences);
     unawaited(SemanticSearchService.instance.init());
     unawaited(MLService.instance.init());
     await PersonService.init(
diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 2792bcde1c..53ce4607d5 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -59,10 +59,6 @@ class PreviewVideoStore {
 
   void init(SharedPreferences prefs) {
     _prefs = prefs;
-
-    if (!initSuccess) {
-      _putFilesForPreviewCreation();
-    }
   }
 
   late final SharedPreferences _prefs;
@@ -700,4 +696,10 @@ class PreviewVideoStore {
     initSuccess = true;
     await chunkAndUploadVideo(null, file);
   }
+
+  void queueFiles() {
+    if (!initSuccess) {
+      _putFilesForPreviewCreation();
+    }
+  }
 }
diff --git a/mobile/lib/services/remote_sync_service.dart b/mobile/lib/services/remote_sync_service.dart
index e3bb5b463d..c2f9f64fd2 100644
--- a/mobile/lib/services/remote_sync_service.dart
+++ b/mobile/lib/services/remote_sync_service.dart
@@ -25,9 +25,11 @@ import 'package:photos/models/upload_strategy.dart';
 import "package:photos/service_locator.dart";
 import 'package:photos/services/app_lifecycle_service.dart';
 import 'package:photos/services/collections_service.dart';
+import "package:photos/services/filedata/filedata_service.dart";
 import 'package:photos/services/ignored_files_service.dart';
 import 'package:photos/services/local_file_update_service.dart';
 import "package:photos/services/notification_service.dart";
+import "package:photos/services/preview_video_store.dart";
 import 'package:photos/services/sync_service.dart';
 import 'package:photos/utils/diff_fetcher.dart';
 import 'package:photos/utils/file_uploader.dart';
@@ -124,6 +126,10 @@ class RemoteSyncService {
         await _prefs.setBool(_isFirstRemoteSyncDone, true);
         await syncDeviceCollectionFilesForUpload();
       }
+
+      FileDataService.instance.syncFDStatus().then((_) {
+        PreviewVideoStore.instance.queueFiles();
+      }).ignore();
       final filesToBeUploaded = await _getFilesToBeUploaded();
       final hasUploadedFiles = await _uploadFiles(filesToBeUploaded);
       if (filesToBeUploaded.isNotEmpty) {
@@ -308,7 +314,6 @@ class RemoteSyncService {
   Future<void> joinAndSyncCollection(
     BuildContext context,
     int collectionID,
-  
   ) async {
     await _collectionsService.joinPublicCollection(context, collectionID);
     await _collectionsService.sync();
diff --git a/mobile/lib/services/sync_service.dart b/mobile/lib/services/sync_service.dart
index 8134807c04..bf42fecf26 100644
--- a/mobile/lib/services/sync_service.dart
+++ b/mobile/lib/services/sync_service.dart
@@ -18,11 +18,9 @@ import 'package:photos/events/sync_status_update_event.dart';
 import 'package:photos/events/trigger_logout_event.dart';
 import 'package:photos/models/backup_status.dart';
 import 'package:photos/models/file/file_type.dart';
-import "package:photos/services/filedata/filedata_service.dart";
 import "package:photos/services/files_service.dart";
 import 'package:photos/services/local_sync_service.dart';
 import 'package:photos/services/notification_service.dart';
-import "package:photos/services/preview_video_store.dart";
 import 'package:photos/services/remote_sync_service.dart';
 import 'package:photos/utils/file_uploader.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -88,9 +86,6 @@ class SyncService {
     _existingSync = Completer<bool>();
     bool successful = false;
     try {
-      FileDataService.instance.syncFDStatus().then((_) {
-        PreviewVideoStore.instance.init(_prefs);
-      }).ignore();
       await _doSync();
       if (_lastSyncStatusEvent != null &&
           _lastSyncStatusEvent!.status !=

From 05cec775aa5615a11380f99d6ecb98d892681c03 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 25 Feb 2025 15:29:25 +0530
Subject: [PATCH 514/796] chore: bump version

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 617bafbfed..1c2c31d50d 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.99+1005
+version: 0.9.99+1006
 publish_to: none
 
 environment:

From 7b6fe4a9d7c1587570f7b899b692c63345782d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Ignacio=20Torres?= <andresitorresm@gmail.com>
Date: Tue, 25 Feb 2025 02:11:10 -0800
Subject: [PATCH 515/796] [auth] Add custom icons for No-IP, Prey Project,
 Workflowy + extra name for Nintendo Account (#5127)

## Description

Added three new custom icons:

- No-IP
- Prey Project
- Workflowy

Additionally add one more alternate name for the Nintendo custom icon:
Nintendo Account.

These are a few of the services I noticed had no icons after migrating
my 2FA codes to Ente.

## Tests

Icon change only, no code changes.
---
 .../custom-icons/_data/custom-icons.json      | 22 ++++++++++++++++++-
 auth/assets/custom-icons/icons/noip.svg       | 22 +++++++++++++++++++
 .../custom-icons/icons/prey_project.svg       |  1 +
 auth/assets/custom-icons/icons/workflowy.svg  |  8 +++++++
 4 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 auth/assets/custom-icons/icons/noip.svg
 create mode 100644 auth/assets/custom-icons/icons/prey_project.svg
 create mode 100644 auth/assets/custom-icons/icons/workflowy.svg

diff --git a/auth/assets/custom-icons/_data/custom-icons.json b/auth/assets/custom-icons/_data/custom-icons.json
index b092f40c2c..5eea155f5f 100644
--- a/auth/assets/custom-icons/_data/custom-icons.json
+++ b/auth/assets/custom-icons/_data/custom-icons.json
@@ -749,7 +749,8 @@
     {
       "title": "nintendo",
       "altNames": [
-        "任天堂"
+        "任天堂",
+        "Nintendo Account"
       ]
     },
     {
@@ -766,6 +767,15 @@
     {
       "title": "Notesnook"
     },
+    {
+      "title": "NoIp",
+      "slug": "noip",
+      "altNames": [
+        "No IP",
+        "No-IP",
+        "noip.com"
+      ]
+    },
     {
       "title": "Notion"
     },
@@ -851,6 +861,13 @@
         "PostScanMail"
       ]
     },
+    {
+      "title": "Prey Project",
+      "slug": "prey_project",
+      "altNames": [
+        "PreyProject"
+      ]
+    },
     {
       "title": "Privacy Guides",
       "slug": "privacyguides"
@@ -1184,6 +1201,9 @@
     {
       "title": "Wolvesville"
     },
+    {
+      "title": "Workflowy"
+    },
     {
       "title": "WorkOS",
       "altNames": [
diff --git a/auth/assets/custom-icons/icons/noip.svg b/auth/assets/custom-icons/icons/noip.svg
new file mode 100644
index 0000000000..c15b4caa5f
--- /dev/null
+++ b/auth/assets/custom-icons/icons/noip.svg
@@ -0,0 +1,22 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" width="100%" viewBox="0 0 200 200" enable-background="new 0 0 200 200" xml:space="preserve">
+<path fill="#E9EAE8" opacity="1.000000" stroke="none" d=" M1.000001,121.000000   C1.000000,107.979103 1.000000,94.958214 1.330396,81.781845   C2.105629,80.808945 2.781408,80.039177 2.961370,79.167091   C6.970184,59.740398 16.508305,43.142090 30.377947,29.382053   C43.761433,16.104332 59.986267,7.182058 78.573097,2.942371   C79.482437,2.734949 80.195526,1.667158 81.000000,1.000001   C94.020897,1.000000 107.041786,1.000000 120.216652,1.335631   C126.713715,3.778750 133.179947,5.577904 139.376389,8.052591   C156.703827,14.972685 171.012131,25.956200 181.986893,41.089684   C190.099167,52.275986 196.134094,64.470306 199.117294,78.069069   C199.211044,78.496483 200.348892,78.694855 201.000000,79.000000   C201.000000,93.354225 201.000000,107.708458 200.669632,122.218155   C199.894424,123.189087 199.220856,123.956680 199.038727,124.827095   C195.802597,140.292557 188.666824,153.987869 178.511795,165.781891   C164.123367,182.492554 146.476486,194.499832 124.422401,199.082748   C123.840591,199.203659 123.469414,200.338181 123.000000,201.000000   C108.645775,201.000000 94.291542,201.000000 79.781174,200.674042   C78.977226,199.905136 78.385597,199.219894 77.673386,199.054794   C61.298405,195.258774 46.725803,187.667160 34.294682,176.602264   C18.003170,162.101318 7.102591,144.135208 2.914476,122.432388   C2.802733,121.853340 1.661271,121.473000 1.000001,121.000000  M162.957382,65.141830   C157.650208,70.691360 152.343033,76.240898 146.301605,81.755386   C145.732269,82.047028 145.042847,82.218056 144.611099,82.647896   C132.762451,94.444138 120.925987,106.252800 109.147583,118.119026   C108.427895,118.844093 108.202583,120.059868 107.093681,121.126122   C94.730469,133.412537 82.367249,145.698959 69.317253,158.025375   C62.966175,164.528809 56.615101,171.032227 49.973309,177.833344   C51.968117,178.908905 53.966496,179.986389 56.373127,181.619629   C60.931099,183.466125 65.489067,185.312622 70.530418,187.664200   C78.728378,189.429962 86.926338,191.195740 96.041878,193.048172   C135.589554,194.037872 165.346161,177.209564 183.339188,142.206635   C198.044006,113.600494 197.050034,84.312935 180.956207,55.283768   C179.868546,53.520458 178.780869,51.757149 177.222046,49.229988   C172.345459,54.885849 167.967255,59.963684 162.957382,65.141830  M108.466240,57.866222   C108.959000,57.471405 109.451752,57.076591 110.380226,56.193321   C112.081604,54.903320 113.950760,53.783173 115.456879,52.295490   C124.572472,43.291451 133.611420,34.209698 142.658142,25.136135   C143.883804,23.906826 145.009445,22.577780 146.408920,21.045849   C134.481003,14.180294 122.154709,10.443705 109.110474,9.413567   C92.088882,8.069327 75.690033,10.494845 59.889217,19.071775   C52.575058,24.411427 45.260902,29.751078 37.284908,35.186230   C4.630878,65.629463 1.719374,115.370926 21.645718,146.481766   C27.512495,140.245255 33.273243,134.121445 39.623917,127.697594   C47.726917,119.475052 55.829922,111.252510 64.624794,103.006409   C66.467079,100.992920 68.309372,98.979439 70.717163,96.651299   C82.356544,85.062904 94.022423,73.500809 105.590721,61.841888   C106.646294,60.778049 107.076263,59.093464 107.883652,57.776287   C107.883652,57.776287 107.786400,57.842323 108.466240,57.866222  z"/>
+<path fill="#ffffff" opacity="1.000000" stroke="none" d=" M80.531342,1.000001   C80.195526,1.667158 79.482437,2.734949 78.573097,2.942371   C59.986267,7.182058 43.761433,16.104332 30.377947,29.382053   C16.508305,43.142090 6.970184,59.740398 2.961370,79.167091   C2.781408,80.039177 2.105629,80.808945 1.330396,81.313187   C1.000000,54.406445 1.000000,27.812887 1.000000,1.000000   C27.353823,1.000000 53.708252,1.000000 80.531342,1.000001  z"/>
+<path fill="#ffffff" opacity="1.000000" stroke="none" d=" M201.000000,78.531342   C200.348892,78.694855 199.211044,78.496483 199.117294,78.069069   C196.134094,64.470306 190.099167,52.275986 181.986893,41.089684   C171.012131,25.956200 156.703827,14.972685 139.376389,8.052591   C133.179947,5.577904 126.713715,3.778750 120.685310,1.335631   C147.592621,1.000000 174.185257,1.000000 201.000000,1.000000   C201.000000,26.687134 201.000000,52.374908 201.000000,78.531342  z"/>
+<path fill="#ffffff" opacity="1.000000" stroke="none" d=" M1.000001,121.468658   C1.661271,121.473000 2.802733,121.853340 2.914476,122.432388   C7.102591,144.135208 18.003170,162.101318 34.294682,176.602264   C46.725803,187.667160 61.298405,195.258774 77.673386,199.054794   C78.385597,199.219894 78.977226,199.905136 79.312515,200.674042   C53.072189,201.000000 27.144375,201.000000 1.000000,201.000000   C1.000000,174.646164 1.000000,148.291748 1.000001,121.468658  z"/>
+<path fill="#ffffff" opacity="1.000000" stroke="none" d=" M123.468658,201.000000   C123.469414,200.338181 123.840591,199.203659 124.422401,199.082748   C146.476486,194.499832 164.123367,182.492554 178.511795,165.781891   C188.666824,153.987869 195.802597,140.292557 199.038727,124.827095   C199.220856,123.956680 199.894424,123.189087 200.669632,122.686813   C201.000000,148.926880 201.000000,174.853760 201.000000,201.000000   C175.312851,201.000000 149.625092,201.000000 123.468658,201.000000  z"/>
+<path fill="#90BF02" opacity="1.000000" stroke="none" d=" M70.151657,96.965950   C68.309372,98.979439 66.467079,100.992920 64.276588,102.547241   C63.928383,86.369431 63.928383,70.650787 63.928383,54.871948   C55.257160,54.871948 47.224957,54.871948 39.033997,54.871948   C39.033997,79.516510 39.033997,103.757080 39.033997,127.997643   C33.273243,134.121445 27.512495,140.245255 21.645718,146.481766   C1.719374,115.370926 4.630878,65.629463 37.719608,35.462364   C39.135883,36.852516 39.984581,38.130096 41.121098,39.053391   C47.414471,44.166069 58.368134,43.270470 63.330196,37.318970   C67.946770,31.781837 66.780022,24.056263 60.570244,19.044075   C75.690033,10.494845 92.088882,8.069327 109.110474,9.413567   C122.154709,10.443705 134.481003,14.180294 146.408920,21.045849   C145.009445,22.577780 143.883804,23.906826 142.658142,25.136135   C133.611420,34.209698 124.572472,43.291451 115.456879,52.295490   C113.950760,53.783173 112.081604,54.903320 109.848991,56.507885   C108.807304,57.162407 108.296852,57.502369 107.786400,57.842323   C107.786400,57.842323 107.883652,57.776287 107.499512,57.814442   C103.123413,60.609695 99.131447,63.366795 95.061790,66.177551   C94.532784,62.603703 94.002762,59.023003 93.451675,55.299969   C85.547775,55.299969 77.881607,55.299969 70.151657,55.299969   C70.151657,69.433502 70.151657,83.199722 70.151657,96.965950  z"/>
+<path fill="#90BE02" opacity="1.000000" stroke="none" d=" M181.064896,55.965897   C197.050034,84.312935 198.044006,113.600494 183.339188,142.206635   C165.346161,177.209564 135.589554,194.037872 95.558487,192.539490   C95.011642,175.365601 94.948189,158.700363 94.957329,141.656860   C95.029930,139.761459 95.029930,138.244339 95.029930,136.217133   C96.400269,137.088867 97.162216,137.573578 98.053833,138.371689   C101.904762,140.815338 105.425377,143.476242 109.385910,144.973618   C120.098732,149.023911 131.263062,149.217529 142.344849,146.892456   C159.790939,143.232071 172.455902,133.383316 177.684326,116.021088   C182.850937,98.864090 180.467819,82.760155 167.840240,68.827202   C167.809296,68.599007 167.711411,68.148964 168.030243,67.993683   C172.587692,63.880894 176.826294,59.923397 181.064896,55.965897  z"/>
+<path fill="#FFFFFF" opacity="1.000000" stroke="none" d=" M39.328957,127.847618   C39.033997,103.757080 39.033997,79.516510 39.033997,54.871948   C47.224957,54.871948 55.257160,54.871948 63.928383,54.871948   C63.928383,70.650787 63.928383,86.369431 63.930653,102.559021   C55.829922,111.252510 47.726917,119.475052 39.328957,127.847618  z"/>
+<path fill="#FFFFFF" opacity="1.000000" stroke="none" d=" M94.884727,142.035141   C94.948189,158.700363 95.011642,175.365601 95.099701,192.496170   C86.926338,191.195740 78.728378,189.429962 70.271156,186.931229   C69.954536,179.802521 69.897171,173.406799 69.921326,166.764832   C70.056465,166.354218 70.110100,166.189819 70.436935,165.848373   C78.768333,157.792603 86.826530,149.913879 94.884727,142.035141  z"/>
+<path fill="#FFFFFE" opacity="1.000000" stroke="none" d=" M70.434410,96.808624   C70.151657,83.199722 70.151657,69.433502 70.151657,55.299969   C77.881607,55.299969 85.547775,55.299969 93.451675,55.299969   C94.002762,59.023003 94.532784,62.603703 95.061790,66.177551   C99.131447,63.366795 103.123413,60.609695 107.456062,57.774864   C107.076263,59.093464 106.646294,60.778049 105.590721,61.841888   C94.022423,73.500809 82.356544,85.062904 70.434410,96.808624  z"/>
+<path fill="#FEFEFD" opacity="1.000000" stroke="none" d=" M60.229729,19.057926   C66.780022,24.056263 67.946770,31.781837 63.330196,37.318970   C58.368134,43.270470 47.414471,44.166069 41.121098,39.053391   C39.984581,38.130096 39.135883,36.852516 38.050526,35.414612   C45.260902,29.751078 52.575058,24.411427 60.229729,19.057926  z"/>
+<path fill="#E5E5E4" opacity="1.000000" stroke="none" d=" M94.957329,141.656860   C86.826530,149.913879 78.768333,157.792603 70.368210,165.406586   C70.018867,162.756363 70.011452,160.370865 70.004036,157.985382   C82.367249,145.698959 94.730469,133.412537 107.756348,121.164223   C109.639374,121.798706 110.859749,122.395088 112.115219,123.158279   C112.150314,123.325104 112.155739,123.666389 112.012955,123.992271   C107.221497,128.898193 102.572823,133.478241 97.924149,138.058289   C97.162216,137.573578 96.400269,137.088867 95.029930,136.217133   C95.029930,138.244339 95.029930,139.761459 94.957329,141.656860  z"/>
+<path fill="#81AB00" opacity="1.000000" stroke="none" d=" M112.080116,122.991463   C110.859749,122.395088 109.639374,121.798706 108.083130,121.124825   C108.202583,120.059868 108.427895,118.844093 109.147583,118.119026   C120.925987,106.252800 132.762451,94.444138 144.611099,82.647896   C145.042847,82.218056 145.732269,82.047028 146.827606,82.054634   C148.247528,83.549278 149.141449,84.744675 149.880432,86.239487   C138.292679,98.049911 126.875618,109.576714 115.395844,121.040718   C114.517334,121.918007 113.195747,122.351624 112.080116,122.991463  z"/>
+<path fill="#90BE03" opacity="1.000000" stroke="none" d=" M69.839813,167.011063   C69.897171,173.406799 69.954536,179.802521 70.029465,186.678680   C65.489067,185.312622 60.931099,183.466125 56.322063,181.041183   C60.793938,175.978851 65.316872,171.494949 69.839813,167.011063  z"/>
+<path fill="#82AC01" opacity="1.000000" stroke="none" d=" M69.921326,166.764832   C65.316872,171.494949 60.793938,175.978851 56.117935,180.763306   C53.966496,179.986389 51.968117,178.908905 49.973309,177.833344   C56.615101,171.032227 62.966175,164.528809 69.660645,158.005371   C70.011452,160.370865 70.018867,162.756363 70.095001,165.583633   C70.110100,166.189819 70.056465,166.354218 69.921326,166.764832  z"/>
+<path fill="#E3E4E0" opacity="1.000000" stroke="none" d=" M150.035370,85.940079   C149.141449,84.744675 148.247528,83.549278 147.194733,82.072159   C152.343033,76.240898 157.650208,70.691360 163.580933,65.209869   C165.373459,66.234924 166.542435,67.191940 167.711411,68.148964   C167.711411,68.148964 167.809296,68.599007 167.557053,68.983429   C161.830566,74.973953 156.356323,80.580055 150.670471,86.124481   C150.458832,86.062805 150.035370,85.940079 150.035370,85.940079  z"/>
+<path fill="#82AC02" opacity="1.000000" stroke="none" d=" M168.030243,67.993683   C166.542435,67.191940 165.373459,66.234924 163.896759,65.159714   C167.967255,59.963684 172.345459,54.885849 177.222046,49.229988   C178.780869,51.757149 179.868546,53.520458 181.010559,55.624832   C176.826294,59.923397 172.587692,63.880894 168.030243,67.993683  z"/>
+<path fill="#FFFFFE" opacity="1.000000" stroke="none" d=" M108.126320,57.854275   C108.296852,57.502369 108.807304,57.162407 109.631134,56.752113   C109.451752,57.076591 108.959000,57.471405 108.126320,57.854275  z"/>
+<path fill="#FEFEFC" opacity="1.000000" stroke="none" d=" M150.882095,86.186157   C156.356323,80.580055 161.830566,74.973953 167.587982,69.211624   C180.467819,82.760155 182.850937,98.864090 177.684326,116.021088   C172.455902,133.383316 159.790939,143.232071 142.344849,146.892456   C131.263062,149.217529 120.098732,149.023911 109.385910,144.973618   C105.425377,143.476242 101.904762,140.815338 98.053833,138.371689   C102.572823,133.478241 107.221497,128.898193 112.397583,124.067833   C114.508804,124.310890 116.064545,124.938728 117.680908,125.276192   C129.675720,127.780441 140.746811,126.206741 149.044968,116.391853   C156.985992,106.999374 156.451813,96.634232 150.882095,86.186157  z"/>
+<path fill="#90BF02" opacity="1.000000" stroke="none" d=" M150.670471,86.124481   C156.451813,96.634232 156.985992,106.999374 149.044968,116.391853   C140.746811,126.206741 129.675720,127.780441 117.680908,125.276192   C116.064545,124.938728 114.508804,124.310890 112.540359,123.741951   C112.155739,123.666389 112.150314,123.325104 112.115219,123.158279   C113.195747,122.351624 114.517334,121.918007 115.395844,121.040718   C126.875618,109.576714 138.292679,98.049911 149.880432,86.239487   C150.035370,85.940079 150.458832,86.062805 150.670471,86.124481  z"/>
+</svg>
\ No newline at end of file
diff --git a/auth/assets/custom-icons/icons/prey_project.svg b/auth/assets/custom-icons/icons/prey_project.svg
new file mode 100644
index 0000000000..cc3c19b8c2
--- /dev/null
+++ b/auth/assets/custom-icons/icons/prey_project.svg
@@ -0,0 +1 @@
+<svg enable-background="new 0 0 512 512" height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><path d="m256.024 29.736-80.851 46.679 53.892 31.112 26.887-15.556 27.017 15.548 53.881-31.119z" fill="#3c77b9"/><path d="m256.036 512 202.079-116.681-.006-124.454-53.912 31.115.019 62.224-148.204 85.569-148.221-85.586-.005-62.221-53.871-31.102v124.442z" fill="#3c77b9"/><path d="m215.607 301.986-53.91 31.117 94.318 54.433 94.288-54.443-53.879-31.118 188.657-108.927-.041-62.184 26.96-15.564-.021-77.759-229.045 132.233-26.929-15.554-26.949 15.554-229.056-132.222v77.789l26.98 15.574-.01 62.153z" fill="#1f2938"/></svg>
\ No newline at end of file
diff --git a/auth/assets/custom-icons/icons/workflowy.svg b/auth/assets/custom-icons/icons/workflowy.svg
new file mode 100644
index 0000000000..df6419cdba
--- /dev/null
+++ b/auth/assets/custom-icons/icons/workflowy.svg
@@ -0,0 +1,8 @@
+<svg width="34" height="34" viewBox="0 0 34 34" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.625 2.77295H30.3256C31.8396 2.77295 33.0669 3.99814 33.0669 5.5095C33.0669 7.02087 31.8396 8.24604 30.3256 8.24604H6.625V2.77295Z" fill="#B2CADB"/>
+<path d="M12.4502 14.5747H30.3256C31.8396 14.5747 33.0669 15.7999 33.0669 17.3113C33.0669 18.8226 31.8396 20.0478 30.3256 20.0478H12.4502V14.5747Z" fill="#B2CADB"/>
+<path d="M6.625 26.376H30.3256C31.8396 26.376 33.0669 27.6012 33.0669 29.1125C33.0669 30.6239 31.8396 31.8491 30.3256 31.8491H6.625V26.376Z" fill="#B2CADB"/>
+<path d="M4.74009 10.2417C7.35797 10.2417 9.48018 8.12317 9.48018 5.50979C9.48018 2.8964 7.35797 0.777832 4.74009 0.777832C2.12221 0.777832 0 2.8964 0 5.50979C0 8.12317 2.12221 10.2417 4.74009 10.2417Z" fill="#47525B"/>
+<path d="M13.4208 22.043C16.0387 22.043 18.1609 19.9244 18.1609 17.3111C18.1609 14.6977 16.0387 12.5791 13.4208 12.5791C10.8029 12.5791 8.68066 14.6977 8.68066 17.3111C8.68066 19.9244 10.8029 22.043 13.4208 22.043Z" fill="#47525B"/>
+<path d="M4.74009 33.8448C7.35797 33.8448 9.48018 31.7262 9.48018 29.1128C9.48018 26.4994 7.35797 24.3809 4.74009 24.3809C2.12221 24.3809 0 26.4994 0 29.1128C0 31.7262 2.12221 33.8448 4.74009 33.8448Z" fill="#47525B"/>
+</svg>

From b62f82c81e83a6b70cb881307d17bfcc240eb333 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 25 Feb 2025 15:42:00 +0530
Subject: [PATCH 516/796] Minor fix

---
 server/pkg/controller/usage.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/server/pkg/controller/usage.go b/server/pkg/controller/usage.go
index 30209a7634..ff4e19256e 100644
--- a/server/pkg/controller/usage.go
+++ b/server/pkg/controller/usage.go
@@ -34,7 +34,7 @@ const hundredMBInBytes = 100 * 1024 * 1024
 // uploaded or not. If size is not passed, it validates if current usage is less than subscription storage.
 func (c *UsageController) CanUploadFile(ctx context.Context, userID int64, size *int64, app ente.App) error {
 	// check if size is nil or less than 100 MB
-	if app != ente.Locker && size == nil || *size < hundredMBInBytes {
+	if app != ente.Locker && (size == nil || *size < hundredMBInBytes) {
 		c.mu.Lock()
 		canUpload, ok := c.UploadResultCache[userID]
 		c.mu.Unlock()
@@ -155,6 +155,5 @@ func (c *UsageController) canUploadFile(ctx context.Context, userID int64, size
 
 		}
 	}
-
 	return nil
 }

From 1eed650812611ae4693a07e320865b2cf264af4f Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 25 Feb 2025 15:47:41 +0530
Subject: [PATCH 517/796] [server] Return custom errors

---
 server/ente/errors.go                        | 12 ++++++++++++
 server/pkg/controller/file.go                |  6 +++---
 server/pkg/controller/filedata/controller.go |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/server/ente/errors.go b/server/ente/errors.go
index aac78f6f73..56d341571a 100644
--- a/server/ente/errors.go
+++ b/server/ente/errors.go
@@ -24,6 +24,12 @@ var ErrIncorrectTOTP = errors.New("incorrect TOTP")
 // ErrNotFound is returned when the requested resource was not found
 var ErrNotFound = errors.New("not found")
 
+var ErrCollectionDeleted = &ApiError{
+	Code:           "COLLECTION_DELETED",
+	Message:        "",
+	HttpStatusCode: http.StatusNotFound,
+}
+
 var ErrFileLimitReached = errors.New("file limit reached")
 
 // ErrBadRequest is returned when a bad request is encountered
@@ -153,6 +159,12 @@ var ErrNotFoundError = ApiError{
 	HttpStatusCode: http.StatusNotFound,
 }
 
+var ErrObjSizeFetchFailed = &ApiError{
+	Code:           "OBJECT_SIZE_FETCH_FAILED",
+	Message:        "",
+	HttpStatusCode: http.StatusServiceUnavailable,
+}
+
 var ErrUserNotFound = &ApiError{
 	Code:           "USER_NOT_FOUND",
 	Message:        "User is either deleted or not found",
diff --git a/server/pkg/controller/file.go b/server/pkg/controller/file.go
index 210c2e10fe..4deb658fc6 100644
--- a/server/pkg/controller/file.go
+++ b/server/pkg/controller/file.go
@@ -97,7 +97,7 @@ func (c *FileController) validateFileCreateOrUpdateReq(userID int64, file ente.F
 			return stacktrace.Propagate(ente.ErrPermissionDenied, "collection doesn't belong to user")
 		}
 		if collection.IsDeleted {
-			return stacktrace.Propagate(ente.ErrNotFound, "collection has been deleted")
+			return stacktrace.Propagate(ente.ErrCollectionDeleted, "collection has been deleted")
 		}
 		if file.OwnerID != userID {
 			return stacktrace.Propagate(ente.ErrPermissionDenied, "file ownerID doesn't match with userID")
@@ -136,11 +136,11 @@ func (c *FileController) Create(ctx *gin.Context, userID int64, file ente.File,
 
 	if fileResult.err != nil {
 		log.Error("Could not find size of file: " + file.File.ObjectKey)
-		return file, stacktrace.Propagate(fileResult.err, "")
+		return file, stacktrace.Propagate(ente.ErrObjSizeFetchFailed, fileResult.err.Error())
 	}
 	if thumbResult.err != nil {
 		log.Error("Could not find size of thumbnail: " + file.Thumbnail.ObjectKey)
-		return file, stacktrace.Propagate(thumbResult.err, "")
+		return file, stacktrace.Propagate(ente.ErrObjSizeFetchFailed, thumbResult.err.Error())
 	}
 	fileSize := fileResult.size
 	thumbnailSize := thumbResult.size
diff --git a/server/pkg/controller/filedata/controller.go b/server/pkg/controller/filedata/controller.go
index cf779f814e..b834b73875 100644
--- a/server/pkg/controller/filedata/controller.go
+++ b/server/pkg/controller/filedata/controller.go
@@ -141,7 +141,7 @@ func (c *Controller) GetFileData(ctx *gin.Context, req fileData.GetFileData) (*f
 		return nil, stacktrace.Propagate(err, "")
 	}
 	if len(doRows) == 0 || doRows[0].IsDeleted {
-		return nil, stacktrace.Propagate(ente.ErrNotFound, "")
+		return nil, stacktrace.Propagate(&ente.ErrNotFoundError, "")
 	}
 	s3MetaObject, err := c.fetchS3FileMetadata(context.Background(), doRows[0], doRows[0].LatestBucket)
 	if err != nil {

From f7f5e924aa28bdba46446836270fc20ae3723ad0 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 25 Feb 2025 16:25:24 +0530
Subject: [PATCH 518/796] fix: add new table for stream upload errors

---
 mobile/lib/db/upload_locks_db.dart           | 79 ++++++++++++++++++
 mobile/lib/services/preview_video_store.dart | 85 ++++++++++++++++----
 2 files changed, 150 insertions(+), 14 deletions(-)

diff --git a/mobile/lib/db/upload_locks_db.dart b/mobile/lib/db/upload_locks_db.dart
index 0c4b112634..32ff836402 100644
--- a/mobile/lib/db/upload_locks_db.dart
+++ b/mobile/lib/db/upload_locks_db.dart
@@ -45,6 +45,15 @@ class UploadLocksDB {
     columnPartStatus: "part_status",
   );
 
+  static const _streamUploadErrorTable = (
+    table: "stream_upload_error",
+    columnID: "id",
+    columnUploadedFileID: "uploaded_file_id",
+    columnErrorMessage: "error_message",
+    columnLastAttemptedAt: "last_attempted_at",
+    columnCreatedAt: "created_at",
+  );
+
   static final initializationScript = [
     ..._createUploadLocksTable(),
   ];
@@ -118,6 +127,15 @@ class UploadLocksDB {
                   PRIMARY KEY (${_partsTable.columnObjectKey}, ${_partsTable.columnPartNumber})
                 )
                 ''',
+      '''
+                CREATE TABLE IF NOT EXISTS ${_streamUploadErrorTable.table} (
+                  ${_streamUploadErrorTable.columnID} INTEGER PRIMARY KEY,
+                  ${_streamUploadErrorTable.columnUploadedFileID} INTEGER NOT NULL,
+                  ${_streamUploadErrorTable.columnErrorMessage} TEXT NOT NULL,
+                  ${_streamUploadErrorTable.columnLastAttemptedAt} INTEGER NOT NULL,
+                  ${_streamUploadErrorTable.columnCreatedAt} INTEGER DEFAULT CURRENT_TIMESTAMP NOT NULL
+                )
+                ''',
     ];
   }
 
@@ -291,6 +309,67 @@ class UploadLocksDB {
     );
   }
 
+  Future<void> createStreamEntry(
+    int uploadedFileID,
+    String errorMessage,
+  ) async {
+    final db = await UploadLocksDB.instance.database;
+
+    await db.insert(
+      _streamUploadErrorTable.table,
+      {
+        _streamUploadErrorTable.columnUploadedFileID: uploadedFileID,
+        _streamUploadErrorTable.columnErrorMessage: errorMessage,
+        _streamUploadErrorTable.columnLastAttemptedAt:
+            DateTime.now().millisecondsSinceEpoch,
+      },
+    );
+  }
+
+  Future<void> updateStreamStatus(
+    int uploadedFileID,
+    String errorMessage,
+  ) async {
+    final db = await instance.database;
+    await db.update(
+      _streamUploadErrorTable.table,
+      {
+        _streamUploadErrorTable.columnErrorMessage: errorMessage,
+        _streamUploadErrorTable.columnLastAttemptedAt:
+            DateTime.now().millisecondsSinceEpoch,
+      },
+      where: '${_streamUploadErrorTable.columnUploadedFileID} = ?',
+      whereArgs: [uploadedFileID],
+    );
+  }
+
+  Future<int> deleteStreamUploadErrorEntry(int uploadedFileID) async {
+    final db = await instance.database;
+    return await db.delete(
+      _streamUploadErrorTable.table,
+      where: '${_streamUploadErrorTable.columnUploadedFileID} = ?',
+      whereArgs: [uploadedFileID],
+    );
+  }
+
+  Future<Map<int, String>> getStreamUploadError() {
+    return instance.database.then((db) async {
+      final rows = await db.query(
+        _streamUploadErrorTable.table,
+        columns: [
+          _streamUploadErrorTable.columnUploadedFileID,
+          _streamUploadErrorTable.columnErrorMessage,
+        ],
+      );
+      final map = <int, String>{};
+      for (final row in rows) {
+        map[row[_streamUploadErrorTable.columnUploadedFileID] as int] =
+            row[_streamUploadErrorTable.columnErrorMessage] as String;
+      }
+      return map;
+    });
+  }
+
   Future<void> createTrackUploadsEntry(
     String localId,
     String fileHash,
diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 53ce4607d5..4845cd0e1b 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -20,6 +20,7 @@ import "package:photos/core/configuration.dart";
 import "package:photos/core/event_bus.dart";
 import "package:photos/core/network/network.dart";
 import 'package:photos/db/files_db.dart';
+import "package:photos/db/upload_locks_db.dart";
 import "package:photos/events/preview_updated_event.dart";
 import "package:photos/events/video_streaming_changed.dart";
 import "package:photos/models/base/id.dart";
@@ -34,12 +35,16 @@ import "package:photos/utils/exif_util.dart";
 import "package:photos/utils/file_key.dart";
 import "package:photos/utils/file_util.dart";
 import "package:photos/utils/gzip.dart";
+import "package:photos/utils/network_util.dart";
 import "package:photos/utils/toast_util.dart";
 import "package:shared_preferences/shared_preferences.dart";
 
+const _maxRetryCount = 3;
+
 class PreviewVideoStore {
   final LinkedHashMap<int, PreviewItem> _items = LinkedHashMap();
   LinkedHashMap<int, PreviewItem> get previews => _items;
+  late Set<int> _failureFiles;
 
   bool initSuccess = false;
 
@@ -110,9 +115,11 @@ class PreviewVideoStore {
       return;
     }
 
+    Object? error;
+    bool removeFile = false;
     try {
       if (!enteFile.isUploaded) {
-        _removeFile(enteFile);
+        removeFile = true;
         return;
       }
 
@@ -124,14 +131,14 @@ class PreviewVideoStore {
         if (ctx != null && ctx.mounted) {
           showShortToast(ctx, 'Video preview already exists');
         }
-        _removeFile(enteFile);
+        removeFile = true;
         return;
       } catch (e, s) {
         if (e is DioException && e.response?.statusCode == 404) {
           _logger.info("No preview found for $enteFile");
         } else {
           _logger.warning("Failed to get playlist for $enteFile", e, s);
-          _retryFile(enteFile, e);
+          error = e;
           return;
         }
       }
@@ -139,7 +146,7 @@ class PreviewVideoStore {
       // elimination case for <=10 MB with H.264
       var (props, result, file) = await _checkFileForPreviewCreation(enteFile);
       if (result) {
-        _removeFile(enteFile);
+        removeFile = true;
         return;
       }
 
@@ -174,7 +181,7 @@ class PreviewVideoStore {
       // get file
       file ??= await getFile(enteFile, isOrigin: true);
       if (file == null) {
-        _retryFile(enteFile, "Unable to fetch file");
+        error = "Unable to fetch file";
         return;
       }
 
@@ -270,8 +277,6 @@ class PreviewVideoStore {
 
       final returnCode = await session.getReturnCode();
 
-      String? error;
-
       if (ReturnCode.isSuccess(returnCode)) {
         try {
           _items[enteFile.uploadedFileID!] = PreviewItem(
@@ -346,11 +351,18 @@ class PreviewVideoStore {
           retryCount: _items[enteFile.uploadedFileID!]!.retryCount,
           collectionID: enteFile.collectionID ?? 0,
         );
-      } else {
-        _retryFile(enteFile, error);
+        _removeFromLocks(enteFile).ignore();
+        Bus.instance.fire(PreviewUpdatedEvent(_items));
       }
-      Bus.instance.fire(PreviewUpdatedEvent(_items));
     } finally {
+      if (error != null) {
+        _retryFile(enteFile, error);
+        Bus.instance.fire(PreviewUpdatedEvent(_items));
+      } else if (removeFile) {
+        _removeFile(enteFile);
+        _removeFromLocks(enteFile).ignore();
+        Bus.instance.fire(PreviewUpdatedEvent(_items));
+      }
       // reset uploading status if this was getting processed
       if (uploadingFileId == enteFile.uploadedFileID!) {
         uploadingFileId = -1;
@@ -365,13 +377,23 @@ class PreviewVideoStore {
     }
   }
 
+  Future<void> _removeFromLocks(EnteFile enteFile) async {
+    final bool isFailurePresent =
+        _failureFiles.contains(enteFile.uploadedFileID!);
+
+    if (isFailurePresent) {
+      await UploadLocksDB.instance
+          .deleteStreamUploadErrorEntry(enteFile.uploadedFileID!);
+      _failureFiles.remove(enteFile.uploadedFileID!);
+    }
+  }
+
   void _removeFile(EnteFile enteFile) {
     _items.remove(enteFile.uploadedFileID!);
-    Bus.instance.fire(PreviewUpdatedEvent(_items));
   }
 
   void _retryFile(EnteFile enteFile, Object error) {
-    if (_items[enteFile.uploadedFileID!]!.retryCount < 3) {
+    if (_items[enteFile.uploadedFileID!]!.retryCount < _maxRetryCount) {
       _items[enteFile.uploadedFileID!] = PreviewItem(
         status: PreviewItemStatus.retry,
         file: enteFile,
@@ -387,6 +409,22 @@ class PreviewVideoStore {
         collectionID: enteFile.collectionID ?? 0,
         error: error,
       );
+
+      final bool isFailurePresent =
+          _failureFiles.contains(enteFile.uploadedFileID!);
+
+      if (isFailurePresent) {
+        UploadLocksDB.instance.updateStreamStatus(
+          enteFile.uploadedFileID!,
+          error.toString(),
+        );
+      } else {
+        UploadLocksDB.instance.createStreamEntry(
+          enteFile.uploadedFileID!,
+          error.toString(),
+        );
+        _failureFiles.add(enteFile.uploadedFileID!);
+      }
     }
   }
 
@@ -639,11 +677,17 @@ class PreviewVideoStore {
 
   // generate stream for all files after cutoff date
   Future<void> _putFilesForPreviewCreation() async {
-    if (!isVideoStreamingEnabled) return;
+    if (!isVideoStreamingEnabled || !await canUseHighBandwidth()) return;
 
     final cutoff = videoStreamingCutoff;
     if (cutoff == null) return;
 
+    Map<int, String> failureFiles = {};
+    try {
+      failureFiles = await UploadLocksDB.instance.getStreamUploadError();
+      _failureFiles = {...failureFiles.keys};
+    } catch (_) {}
+
     final files = await FilesDB.instance.getAllFilesAfterDate(
       fileType: FileType.video,
       beginDate: cutoff,
@@ -668,16 +712,29 @@ class PreviewVideoStore {
       final enteFile = allFiles[i];
       // elimination case for <=10 MB with H.264
       final (_, result, _) = await _checkFileForPreviewCreation(enteFile);
-      if (result) {
+      final isFailure = _failureFiles.contains(enteFile.uploadedFileID!);
+
+      if (isFailure) {
+        _items[enteFile.uploadedFileID!] = PreviewItem(
+          status: PreviewItemStatus.failed,
+          file: enteFile,
+          collectionID: enteFile.collectionID ?? 0,
+          retryCount: _maxRetryCount,
+          error: failureFiles[enteFile.uploadedFileID!],
+        );
+      }
+      if (result || isFailure) {
         allFiles.removeAt(i);
         n--;
         continue;
       }
+
       _items[enteFile.uploadedFileID!] = PreviewItem(
         status: PreviewItemStatus.inQueue,
         file: enteFile,
         collectionID: enteFile.collectionID ?? 0,
       );
+
       i++;
     }
 

From 837d2bbf77bba3b19c6dfa272327d0319aef007e Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 25 Feb 2025 17:06:11 +0530
Subject: [PATCH 519/796] fix: failure previewed case and fire bus event

---
 mobile/lib/services/preview_video_store.dart | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 4845cd0e1b..787d3e5891 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -686,6 +686,13 @@ class PreviewVideoStore {
     try {
       failureFiles = await UploadLocksDB.instance.getStreamUploadError();
       _failureFiles = {...failureFiles.keys};
+
+      // handle case when failures are already previewed
+      for (final failure in _failureFiles) {
+        if (previews.containsKey(failure)) {
+          UploadLocksDB.instance.deleteStreamUploadErrorEntry(failure).ignore();
+        }
+      }
     } catch (_) {}
 
     final files = await FilesDB.instance.getAllFilesAfterDate(
@@ -738,13 +745,12 @@ class PreviewVideoStore {
       i++;
     }
 
+    Bus.instance.fire(PreviewUpdatedEvent(_items));
     if (allFiles.isEmpty) {
       _logger.info("[init] No preview to cache");
       return;
     }
 
-    Bus.instance.fire(PreviewUpdatedEvent(_items));
-
     _logger.info("[init] Processing ${allFiles.length} items for streaming");
 
     // take first file and put it for stream generation

From e61d212ad05c9d71dd0112dd1869d21e1ff250ef Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Tue, 25 Feb 2025 17:13:09 +0530
Subject: [PATCH 520/796] [mob][photos] Handle errors/exceptions in
 getThumbnailFileOfPerson

---
 .../face_ml/person/person_service.dart        | 63 ++++++++++---------
 .../person_selection_action_widgets.dart      |  1 +
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/mobile/lib/services/machine_learning/face_ml/person/person_service.dart b/mobile/lib/services/machine_learning/face_ml/person/person_service.dart
index 1af4e69af5..69ba7bfde9 100644
--- a/mobile/lib/services/machine_learning/face_ml/person/person_service.dart
+++ b/mobile/lib/services/machine_learning/face_ml/person/person_service.dart
@@ -487,40 +487,45 @@ class PersonService {
   Future<EnteFile?> getThumbnailFileOfPerson(
     PersonEntity person,
   ) async {
-    if (person.data.hasAvatar()) {
-      final avatarFileID = tryGetFileIdFromFaceId(person.data.avatarFaceID!);
-      if (avatarFileID != null) {
-        final file = (await FilesDB.instance
-            .getFileIDToFileFromIDs([avatarFileID]))[avatarFileID];
-        if (file != null) {
-          return file;
-        } else {
-          logger.severe("Avatar File not found for face ${person.data}");
+    try {
+      if (person.data.hasAvatar()) {
+        final avatarFileID = tryGetFileIdFromFaceId(person.data.avatarFaceID!);
+        if (avatarFileID != null) {
+          final file = (await FilesDB.instance
+              .getFileIDToFileFromIDs([avatarFileID]))[avatarFileID];
+          if (file != null) {
+            return file;
+          } else {
+            logger.severe("Avatar File not found for face ${person.data}");
+          }
         }
       }
-    }
 
-    final clustersToFiles =
-        await SearchService.instance.getClusterFilesForPersonID(
-      person.remoteID,
-    );
-
-    EnteFile? resultFile;
-    // iterate over all clusters and get the first file
-    for (final clusterFiles in clustersToFiles.values) {
-      for (final file in clusterFiles) {
-        resultFile ??= file;
-        if (resultFile.creationTime! < file.creationTime!) {
-          resultFile = file;
-        }
-      }
-    }
-    if (resultFile == null) {
-      logger.warning(
-        "Person ${kDebugMode ? person.data.name : person.remoteID} has no files",
+      final clustersToFiles =
+          await SearchService.instance.getClusterFilesForPersonID(
+        person.remoteID,
       );
+
+      EnteFile? resultFile;
+      // iterate over all clusters and get the first file
+      for (final clusterFiles in clustersToFiles.values) {
+        for (final file in clusterFiles) {
+          resultFile ??= file;
+          if (resultFile.creationTime! < file.creationTime!) {
+            resultFile = file;
+          }
+        }
+      }
+      if (resultFile == null) {
+        logger.warning(
+          "Person ${kDebugMode ? person.data.name : person.remoteID} has no files",
+        );
+        return null;
+      }
+      return resultFile;
+    } catch (e, s) {
+      logger.severe("Error in getThumbnailFileOfPerson", e, s);
       return null;
     }
-    return resultFile;
   }
 }
diff --git a/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart b/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart
index 128b44c9df..41af361c12 100644
--- a/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart
+++ b/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart
@@ -94,6 +94,7 @@ class _LinkContactToPersonSelectionPageState
             _logger.severe(
               "Failed to load _personEntitiesWithThumnailFile",
               snapshot.error,
+              snapshot.stackTrace,
             );
             return const Center(child: Icon(Icons.error_outline_rounded));
           } else if (!snapshot.hasData || snapshot.data!.isEmpty) {

From fdf4a3d336711bc7f201a4a3d788c1449e4a38ce Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Tue, 25 Feb 2025 17:15:45 +0530
Subject: [PATCH 521/796] [mob][photos] Unify all caching in cache service only

---
 mobile/lib/core/configuration.dart            |   4 +-
 mobile/lib/models/smart_memory.dart           |  12 +-
 .../lib/services/memories_cache_service.dart  | 137 ++++++++++++++++--
 mobile/lib/services/search_service.dart       |   2 +-
 .../lib/services/smart_memories_service.dart  |  70 +--------
 .../lib/ui/home/memories/memories_widget.dart |   8 +-
 6 files changed, 132 insertions(+), 101 deletions(-)

diff --git a/mobile/lib/core/configuration.dart b/mobile/lib/core/configuration.dart
index b27e153e4b..bd34f00b37 100644
--- a/mobile/lib/core/configuration.dart
+++ b/mobile/lib/core/configuration.dart
@@ -22,6 +22,7 @@ import 'package:photos/events/user_logged_out_event.dart';
 import 'package:photos/models/key_attributes.dart';
 import 'package:photos/models/key_gen_result.dart';
 import 'package:photos/models/private_key_attributes.dart';
+import "package:photos/service_locator.dart";
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/favorites_service.dart';
 import "package:photos/services/home_widget_service.dart";
@@ -29,7 +30,6 @@ import 'package:photos/services/ignored_files_service.dart';
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
 import 'package:photos/services/memories_service.dart';
 import 'package:photos/services/search_service.dart';
-import "package:photos/services/smart_memories_service.dart";
 import 'package:photos/services/sync_service.dart';
 import 'package:photos/utils/crypto_util.dart';
 import 'package:photos/utils/file_uploader.dart';
@@ -217,7 +217,7 @@ class Configuration {
       CollectionsService.instance.clearCache();
       FavoritesService.instance.clearCache();
       MemoriesService.instance.clearCache();
-      SmartMemoriesService.instance.clearCache();
+      unawaited(memoriesCacheService.clearMemoriesCache());
       SearchService.instance.clearCache();
       PersonService.instance.clearCache();
       unawaited(HomeWidgetService.instance.clearHomeWidget());
diff --git a/mobile/lib/models/smart_memory.dart b/mobile/lib/models/smart_memory.dart
index aa42e111f8..f85ea9be22 100644
--- a/mobile/lib/models/smart_memory.dart
+++ b/mobile/lib/models/smart_memory.dart
@@ -22,7 +22,7 @@ MemoryType memoryTypeFromString(String type) {
   }
 }
 
-abstract class SmartMemory {
+class SmartMemory {
   final List<Memory> memories;
   final MemoryType type;
   String? name;
@@ -33,13 +33,14 @@ abstract class SmartMemory {
   int? lastDateToShow;
   // TODO: lau: actually use this in calculated filters
 
-
   SmartMemory(
     this.memories,
     this.type, {
     name,
     this.firstCreationTime,
     this.lastCreationTime,
+    this.firstDateToShow,
+    this.lastDateToShow,
   }) : name = name != null ? name + "(I)" : null;
   // TODO: lau: remove (I) from name when opening up the feature flag
 
@@ -59,11 +60,4 @@ abstract class SmartMemory {
     lastCreationTime ??= creationTimes.last;
     return (firstCreationTime! + lastCreationTime!) ~/ 2;
   }
-
-  SmartMemory copyWith({
-    List<Memory>? memories,
-    String? name,
-    int? firstCreationTime,
-    int? lastCreationTime,
-  });
 }
diff --git a/mobile/lib/services/memories_cache_service.dart b/mobile/lib/services/memories_cache_service.dart
index 9517fcb4b7..9a78725489 100644
--- a/mobile/lib/services/memories_cache_service.dart
+++ b/mobile/lib/services/memories_cache_service.dart
@@ -1,15 +1,23 @@
+import "dart:async";
 import "dart:convert";
 import "dart:io" show File;
 
 import "package:flutter/foundation.dart" show kDebugMode;
 import "package:logging/logging.dart";
 import "package:path_provider/path_provider.dart";
+import "package:photos/core/event_bus.dart";
+import "package:photos/db/memories_db.dart";
+import "package:photos/events/files_updated_event.dart";
 import "package:photos/extensions/stop_watch.dart";
+import "package:photos/models/file/file.dart";
 import "package:photos/models/location/location.dart";
+import "package:photos/models/memory.dart";
 import "package:photos/models/people_memory.dart";
 import "package:photos/models/smart_memory.dart";
 import "package:photos/models/trip_memory.dart";
+import "package:photos/service_locator.dart";
 import "package:photos/services/location_service.dart";
+import "package:photos/services/search_service.dart";
 import "package:photos/services/smart_memories_service.dart";
 import "package:shared_preferences/shared_preferences.dart";
 
@@ -181,24 +189,50 @@ class TripsShownLogs {
 
 class MemoriesCacheService {
   static const _lastMemoriesCacheUpdateTimeKey = "lastMemoriesCacheUpdateTime";
+  static const _showAnyMemoryKey = "memories.enabled";
 
   /// Delay is for cache update to be done not during app init, during which a
   /// lot of other things are happening.
   static const _kCacheUpdateDelay = Duration(seconds: 10);
-
   static const _kUpdateFrequency = Duration(days: 7);
 
   final SharedPreferences _prefs;
   late final Logger _logger = Logger("MemoriesCacheService");
 
-  Future<MemoriesCache?>? _memoriesCacheFuture;
+  final _memoriesDB = MemoriesDB.instance;
+
+  List<SmartMemory>? _cachedMemories;
   bool _shouldUpdate = false;
   bool _isUpdateInProgress = false;
 
+  late Map<int, int> _seenTimes;
+
   MemoriesCacheService(this._prefs) {
     _logger.fine("MemoriesCacheService constructor");
+
     Future.delayed(_kCacheUpdateDelay, () {
-      _updateCacheIfTheTimeHasCome();
+      _checkIfTimeToUpdateCache();
+    });
+
+    unawaited(_memoriesDB.getSeenTimes().then((value) => _seenTimes = value));
+    unawaited(
+      _memoriesDB.clearMemoriesSeenBeforeTime(
+        DateTime.now().subtract(_kUpdateFrequency).microsecondsSinceEpoch,
+      ),
+    );
+
+    Bus.instance.on<FilesUpdatedEvent>().where((event) {
+      return event.type == EventType.deletedFromEverywhere;
+    }).listen((event) {
+      if (_cachedMemories == null) return;
+      final generatedIDs = event.updatedFiles
+          .where((element) => element.generatedID != null)
+          .map((e) => e.generatedID!)
+          .toSet();
+      for (final memory in _cachedMemories!) {
+        memory.memories
+            .removeWhere((m) => generatedIDs.contains(m.file.generatedID));
+      }
     });
   }
 
@@ -213,7 +247,13 @@ class MemoriesCacheService {
     return _prefs.getInt(_lastMemoriesCacheUpdateTimeKey) ?? 0;
   }
 
-  Future<void> _updateCacheIfTheTimeHasCome() async {
+  bool get showAnyMemories {
+    return _prefs.getBool(_showAnyMemoryKey) ?? true;
+  }
+
+  bool get enableSmartMemories => flagService.showSmartMemories;
+
+  Future<void> _checkIfTimeToUpdateCache() async {
     if (lastMemoriesCacheUpdateTime <
         DateTime.now().subtract(_kUpdateFrequency).microsecondsSinceEpoch) {
       _shouldUpdate = true;
@@ -226,8 +266,26 @@ class MemoriesCacheService {
     // TODO: lau: remove the test1 directory after testing
   }
 
+  Future markMemoryAsSeen(Memory memory) async {
+    memory.markSeen();
+    await _memoriesDB.markMemoryAsSeen(
+      memory,
+      DateTime.now().microsecondsSinceEpoch,
+    );
+    if (_cachedMemories != null && memory.file.generatedID != null) {
+      final generatedID = memory.file.generatedID!;
+      for (final smartMemory in _cachedMemories!) {
+        for (final mem in smartMemory.memories) {
+          if (mem.file.generatedID == generatedID) {
+            mem.markSeen();
+          }
+        }
+      }
+    }
+  }
+
   Future<void> updateCache({bool forced = false}) async {
-    if (!SmartMemoriesService.instance.enableSmartMemories) {
+    if (!showAnyMemories || !enableSmartMemories) {
       return;
     }
     try {
@@ -241,18 +299,18 @@ class MemoriesCacheService {
       _isUpdateInProgress = true;
       final EnteWatch? w = kDebugMode ? EnteWatch("memoriesCacheWatch") : null;
       w?.start();
-      final memories = await SmartMemoriesService.instance.getMemories(null);
+      final memories = await SmartMemoriesService.instance.calcMemories();
       w?.log("calculated new memories");
-      final oldCache = await getMemoriesCache();
+      final oldCache = await _readCacheFromDisk();
       w?.log("gotten old cache");
       final MemoriesCache memoryCache =
-          getCacheFromMemories(memories, oldCache);
+          _fromMemoriesToCache(memories, oldCache);
       w?.log("gotten cache from memories");
       final file = File(await _getCachePath());
       if (!file.existsSync()) {
         file.createSync(recursive: true);
       }
-      _memoriesCacheFuture = Future.value(memoryCache);
+      _cachedMemories = memories;
       await file.writeAsBytes(
         MemoriesCache.encodeToJsonString(memoryCache).codeUnits,
       );
@@ -267,7 +325,7 @@ class MemoriesCacheService {
     }
   }
 
-  MemoriesCache getCacheFromMemories(
+  MemoriesCache _fromMemoriesToCache(
     List<SmartMemory> memories,
     MemoriesCache? oldCache,
   ) {
@@ -340,15 +398,61 @@ class MemoriesCacheService {
     );
   }
 
-  Future<MemoriesCache?> getMemoriesCache() async {
-    if (_memoriesCacheFuture != null) {
-      return _memoriesCacheFuture!;
+  Future<List<SmartMemory>> _fromCacheToMemories(MemoriesCache cache) async {
+    final List<SmartMemory> memories = [];
+    final allFiles = Set<EnteFile>.from(
+      await SearchService.instance.getAllFilesForSearch(),
+    );
+    final allFileIdsToFile = <int, EnteFile>{};
+    for (final file in allFiles) {
+      if (file.uploadedFileID != null) {
+        allFileIdsToFile[file.uploadedFileID!] = file;
+      }
     }
-    _memoriesCacheFuture = _readResultFromDisk();
-    return _memoriesCacheFuture!;
+
+    for (final ToShowMemory memory in cache.toShowMemories) {
+      if (memory.shouldShowNow) {
+        memories.add(
+          SmartMemory(
+            memory.fileUploadedIDs
+                .map(
+                  (fileID) =>
+                      Memory.fromFile(allFileIdsToFile[fileID]!, _seenTimes),
+                )
+                .toList(),
+            memory.type,
+            name: memory.title,
+            firstDateToShow: memory.firstTimeToShow,
+            lastDateToShow: memory.lastTimeToShow,
+          ),
+        );
+      }
+    }
+    return memories;
   }
 
-  Future<MemoriesCache?> _readResultFromDisk() async {
+  Future<List<SmartMemory>> _getMemoriesFromCache() async {
+    final cache = await _readCacheFromDisk();
+    if (cache == null) {
+      // TODO: lau: if there's no cache, maybe we fall back to old memories?
+      return [];
+    }
+    final result = await _fromCacheToMemories(cache);
+    return result;
+  }
+
+  Future<List<SmartMemory>> getMemories(int? limit) async {
+    if (!showAnyMemories) {
+      return [];
+    }
+    if (_cachedMemories != null) {
+      return _cachedMemories!;
+    }
+    _cachedMemories = await _getMemoriesFromCache();
+    return _cachedMemories!;
+  }
+
+  Future<MemoriesCache?> _readCacheFromDisk() async {
     _logger.info("Reading memories cache result from disk");
     final file = File(await _getCachePath());
     if (!file.existsSync()) {
@@ -361,5 +465,6 @@ class MemoriesCacheService {
 
   Future<void> clearMemoriesCache() async {
     await File(await _getCachePath()).delete();
+    _cachedMemories = null;
   }
 }
diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 222246f815..312cba45be 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1194,7 +1194,7 @@ class SearchService {
     BuildContext context,
     int? limit,
   ) async {
-    final memories = await SmartMemoriesService.instance.getMemories(limit);
+    final memories = await memoriesCacheService.getMemories(limit);
     final searchResults = <GenericSearchResult>[];
     for (final memory in memories) {
       final name = memory.name ?? "memory";
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 9f5ad6558f..11e3c52160 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -7,10 +7,8 @@ import "package:logging/logging.dart";
 import "package:ml_linalg/vector.dart";
 import "package:photos/core/configuration.dart";
 import "package:photos/core/constants.dart";
-import "package:photos/core/event_bus.dart";
 import "package:photos/db/memories_db.dart";
 import "package:photos/db/ml/db.dart";
-import "package:photos/events/files_updated_event.dart";
 import "package:photos/l10n/l10n.dart";
 import "package:photos/models/base_location.dart";
 import "package:photos/models/file/extensions/file_props.dart";
@@ -30,7 +28,6 @@ import "package:photos/services/location_service.dart";
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
 import "package:photos/services/machine_learning/ml_computer.dart";
 import "package:photos/services/machine_learning/ml_result.dart";
-import "package:photos/services/memories_service.dart";
 import "package:photos/services/search_service.dart";
 
 class SmartMemoriesService {
@@ -42,17 +39,12 @@ class SmartMemoriesService {
   Locale? _locale;
   late Map<int, int> _seenTimes;
 
-  List<SmartMemory>? _cachedMemories;
-  Future<List<SmartMemory>>? _future;
-
   Vector? _clipPositiveTextVector;
   static const String clipPositiveQuery =
       'Photo of a precious and nostalgic memory radiating warmth, vibrant energy, or quiet beauty — alive with color, light, or emotion';
 
   final Map<PeopleActivity, Vector> _clipPeopleActivityVectors = {};
 
-  static const int _calculationWindowDays = 14;
-
   static const _clipSimilarImageThreshold = 0.75;
   static const _clipActivityQueryThreshold = 0.25;
 
@@ -65,25 +57,6 @@ class SmartMemoriesService {
     if (_isInit) return;
     _locale = await getLocale();
 
-    unawaited(
-      _memoriesDB.clearMemoriesSeenBeforeTime(
-        DateTime.now().microsecondsSinceEpoch -
-            (_calculationWindowDays * microSecondsInDay),
-      ),
-    );
-    Bus.instance.on<FilesUpdatedEvent>().where((event) {
-      return event.type == EventType.deletedFromEverywhere;
-    }).listen((event) {
-      if (_cachedMemories == null) return;
-      final generatedIDs = event.updatedFiles
-          .where((element) => element.generatedID != null)
-          .map((e) => e.generatedID!)
-          .toSet();
-      for (final memory in _cachedMemories!) {
-        memory.memories
-            .removeWhere((m) => generatedIDs.contains(m.file.generatedID));
-      }
-    });
     unawaited(
       MLComputer.instance.runClipText(clipPositiveQuery).then((embedding) {
         _clipPositiveTextVector ??= Vector.fromList(embedding);
@@ -103,47 +76,8 @@ class SmartMemoriesService {
     _logger.info("Smart memories service initialized");
   }
 
-  bool get enableSmartMemories => flagService.showSmartMemories;
-
-  void clearCache() {
-    _cachedMemories = null;
-    _future = null;
-  }
-
-  Future markMemoryAsSeen(Memory memory) async {
-    memory.markSeen();
-    await _memoriesDB.markMemoryAsSeen(
-      memory,
-      DateTime.now().microsecondsSinceEpoch,
-    );
-    if (_cachedMemories != null && memory.file.generatedID != null) {
-      final generatedID = memory.file.generatedID!;
-      for (final smartMemory in _cachedMemories!) {
-        for (final mem in smartMemory.memories) {
-          if (mem.file.generatedID == generatedID) {
-            mem.markSeen();
-          }
-        }
-      }
-    }
-  }
-
-  Future<List<SmartMemory>> getMemories(int? limit) async {
-    if (!MemoriesService.instance.showMemories) {
-      return [];
-    }
-    if (_cachedMemories != null) {
-      return _cachedMemories!;
-    }
-    if (_future != null) {
-      return _future!;
-    }
-    _future = _calcMemories();
-    return _future!;
-  }
-
   // One general method to get all memories, which calls on internal methods for each separate memory type
-  Future<List<SmartMemory>> _calcMemories() async {
+  Future<List<SmartMemory>> calcMemories() async {
     try {
       await init();
       final List<SmartMemory> memories = [];
@@ -178,8 +112,6 @@ class SmartMemoriesService {
       // _deductUsedMemories(allFiles, fillerMemories);
       // memories.addAll(fillerMemories);
       // _logger.finest("All files length: ${allFiles.length}");
-
-      _cachedMemories = memories;
       return memories;
     } catch (e, s) {
       _logger.severe("Error calculating smart memories", e, s);
diff --git a/mobile/lib/ui/home/memories/memories_widget.dart b/mobile/lib/ui/home/memories/memories_widget.dart
index 76a74a0e72..e15a0c88b2 100644
--- a/mobile/lib/ui/home/memories/memories_widget.dart
+++ b/mobile/lib/ui/home/memories/memories_widget.dart
@@ -6,8 +6,8 @@ import "package:photos/core/event_bus.dart";
 import "package:photos/events/memories_setting_changed.dart";
 import 'package:photos/models/memory.dart';
 import "package:photos/models/smart_memory.dart";
+import "package:photos/service_locator.dart";
 import 'package:photos/services/memories_service.dart';
-import "package:photos/services/smart_memories_service.dart";
 import "package:photos/ui/common/loading_widget.dart";
 import 'package:photos/ui/home/memories/memory_cover_widget.dart';
 
@@ -57,11 +57,11 @@ class _MemoriesWidgetState extends State<MemoriesWidget> {
     if (!MemoriesService.instance.showMemories) {
       return const SizedBox.shrink();
     }
-    if (SmartMemoriesService.instance.enableSmartMemories) {
+    if (memoriesCacheService.enableSmartMemories) {
       return FutureBuilder<List<SmartMemory>>(
-        future: SmartMemoriesService.instance.getMemories(
+        future: memoriesCacheService.getMemories(
           null,
-        ), // This is where I should hook in my feature flag [showSmartMemories]
+        ),
         builder: (context, snapshot) {
           if (snapshot.hasData && snapshot.data!.isEmpty) {
             return const SizedBox.shrink();

From 1e05c9d701ad1b84653b9d95bfa5ca8856aecc23 Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Tue, 25 Feb 2025 18:56:39 +0530
Subject: [PATCH 522/796] [mob][photos] Log stacktrace

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

diff --git a/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart b/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart
index 41af361c12..aafc6b7c8a 100644
--- a/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart
+++ b/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart
@@ -269,6 +269,7 @@ class _ReassignMeSelectionPageState extends State<ReassignMeSelectionPage> {
             _logger.severe(
               "Failed to load _personEntitiesWithThumnailFile",
               snapshot.error,
+              snapshot.stackTrace,
             );
             return const Center(child: Icon(Icons.error_outline_rounded));
           } else if (!snapshot.hasData || snapshot.data!.isEmpty) {

From 72bcd8e45089125dac17cba671db84fc7ef6edae Mon Sep 17 00:00:00 2001
From: Neeraj <neeraj.gupta983@gmail.com>
Date: Tue, 25 Feb 2025 21:41:45 +0530
Subject: [PATCH 523/796] [server] Wait for fileData put & fail fetch if more
 than 5 object fails (#5174)

## Description

## Tests
---
 server/pkg/controller/filedata/controller.go | 44 +++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/server/pkg/controller/filedata/controller.go b/server/pkg/controller/filedata/controller.go
index cf779f814e..3717f39244 100644
--- a/server/pkg/controller/filedata/controller.go
+++ b/server/pkg/controller/filedata/controller.go
@@ -104,27 +104,27 @@ func (c *Controller) InsertOrUpdateMetadata(ctx *gin.Context, req *fileData.PutF
 		Client:           network.GetClientInfo(ctx),
 	}
 	// Start a goroutine to handle the upload and insert operations
-	go func() {
-		logger := log.WithField("objectKey", objectKey).WithField("fileID", req.FileID).WithField("type", req.Type)
-		size, uploadErr := c.uploadObject(obj, objectKey, bucketID)
-		if uploadErr != nil {
-			logger.WithError(uploadErr).Error("upload failed")
-			return
-		}
+	//go func() {
+	logger := log.WithField("objectKey", objectKey).WithField("fileID", req.FileID).WithField("type", req.Type)
+	size, uploadErr := c.uploadObject(obj, objectKey, bucketID)
+	if uploadErr != nil {
+		logger.WithError(uploadErr).Error("upload failed")
+		return uploadErr
+	}
 
-		row := fileData.Row{
-			FileID:       req.FileID,
-			Type:         req.Type,
-			UserID:       fileOwnerID,
-			Size:         size,
-			LatestBucket: bucketID,
-		}
-		dbInsertErr := c.Repo.InsertOrUpdate(context.Background(), row)
-		if dbInsertErr != nil {
-			logger.WithError(dbInsertErr).Error("insert or update failed")
-			return
-		}
-	}()
+	row := fileData.Row{
+		FileID:       req.FileID,
+		Type:         req.Type,
+		UserID:       fileOwnerID,
+		Size:         size,
+		LatestBucket: bucketID,
+	}
+	dbInsertErr := c.Repo.InsertOrUpdate(context.Background(), row)
+	if dbInsertErr != nil {
+		logger.WithError(dbInsertErr).Error("insert or update failed")
+		return uploadErr
+	}
+	//}()
 	return nil
 }
 
@@ -199,6 +199,10 @@ func (c *Controller) GetFilesData(ctx *gin.Context, req fileData.GetFilesData) (
 			})
 		}
 	}
+	if len(errFileIds) > 5 {
+		log.WithField("errFileIds", errFileIds).Error("Failed to fetch metadata for some files")
+		return nil, stacktrace.Propagate(errors.New("failed to fetch metadata for some files"), "")
+	}
 
 	return &fileData.GetFilesDataResponse{
 		Data:                fetchedEmbeddings,

From 83b322770de008c9b1f0455a08bf50bade77b3e9 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 25 Feb 2025 22:10:36 +0530
Subject: [PATCH 524/796] [server] Add missing bucketId

---
 server/pkg/controller/filedata/controller.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/pkg/controller/filedata/controller.go b/server/pkg/controller/filedata/controller.go
index 3717f39244..7ebb97bf80 100644
--- a/server/pkg/controller/filedata/controller.go
+++ b/server/pkg/controller/filedata/controller.go
@@ -59,7 +59,7 @@ func New(repo *fileDataRepo.Repository,
 	fileRepo *repo.FileRepository,
 	collectionRepo *repo.CollectionRepository,
 ) *Controller {
-	embeddingDcs := []string{s3Config.GetHotBackblazeDC(), s3Config.GetHotWasabiDC(), s3Config.GetWasabiDerivedDC(), s3Config.GetDerivedStorageDataCenter(), "b5"}
+	embeddingDcs := []string{s3Config.GetHotBackblazeDC(), s3Config.GetHotWasabiDC(), s3Config.GetWasabiDerivedDC(), s3Config.GetDerivedStorageDataCenter(), "b5", "b6"}
 	cache := make(map[string]*s3manager.Downloader, len(embeddingDcs))
 	for i := range embeddingDcs {
 		s3Client := s3Config.GetS3Client(embeddingDcs[i])

From c0086efdbc757ad550d96a7747770f3017f031ad Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 25 Feb 2025 22:30:39 +0530
Subject: [PATCH 525/796] [server] Prefer b6 for read

---
 server/pkg/controller/filedata/controller.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/server/pkg/controller/filedata/controller.go b/server/pkg/controller/filedata/controller.go
index 7ebb97bf80..74cc9ec443 100644
--- a/server/pkg/controller/filedata/controller.go
+++ b/server/pkg/controller/filedata/controller.go
@@ -222,6 +222,13 @@ func (c *Controller) getS3FileMetadataParallel(dbRows []fileData.Row) ([]bulkS3M
 			defer wg.Done()
 			defer func() { <-globalFileFetchSemaphore }() // Release back to global semaphore
 			dc := row.LatestBucket
+			// :todo:neeraj make it configurable
+			// treat b6 as preferred bucket for reading
+			if dc == "b5" {
+				if array.StringInList("b6", row.ReplicatedBuckets) {
+					dc = "b6"
+				}
+			}
 			s3FileMetadata, err := c.fetchS3FileMetadata(context.Background(), row, dc)
 			if err != nil {
 				log.WithField("bucket", dc).

From 8fb5f44b62219739dfee3f05552500212c08cd13 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 25 Feb 2025 22:44:05 +0530
Subject: [PATCH 526/796] [server] Swallow mldata fetch err

---
 server/pkg/controller/filedata/controller.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/server/pkg/controller/filedata/controller.go b/server/pkg/controller/filedata/controller.go
index 74cc9ec443..6f7c6d858f 100644
--- a/server/pkg/controller/filedata/controller.go
+++ b/server/pkg/controller/filedata/controller.go
@@ -199,10 +199,6 @@ func (c *Controller) GetFilesData(ctx *gin.Context, req fileData.GetFilesData) (
 			})
 		}
 	}
-	if len(errFileIds) > 5 {
-		log.WithField("errFileIds", errFileIds).Error("Failed to fetch metadata for some files")
-		return nil, stacktrace.Propagate(errors.New("failed to fetch metadata for some files"), "")
-	}
 
 	return &fileData.GetFilesDataResponse{
 		Data:                fetchedEmbeddings,

From 1b1c5c0e7bf257c006f09ce3ed2a064674eb6648 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 26 Feb 2025 13:20:07 +0530
Subject: [PATCH 527/796] [mob][photos] cleanup init

---
 mobile/lib/main.dart                           |  2 --
 mobile/lib/services/search_service.dart        |  1 -
 .../lib/services/smart_memories_service.dart   | 18 ++++--------------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index 970f9615a0..70deb70cd7 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -43,7 +43,6 @@ import "package:photos/services/preview_video_store.dart";
 import 'package:photos/services/push_service.dart';
 import 'package:photos/services/remote_sync_service.dart';
 import 'package:photos/services/search_service.dart';
-import "package:photos/services/smart_memories_service.dart";
 import "package:photos/services/sync_service.dart";
 import "package:photos/services/user_service.dart";
 import 'package:photos/ui/tools/app_lock.dart';
@@ -253,7 +252,6 @@ Future<void> _init(bool isBackground, {String via = ''}) async {
 
     FavoritesService.instance.initFav().ignore();
     MemoriesService.instance.init(preferences);
-    unawaited(SmartMemoriesService.instance.init());
     LocalFileUpdateService.instance.init(preferences);
     SearchService.instance.init();
     FileDataService.instance.init(preferences);
diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 312cba45be..fc77669555 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -42,7 +42,6 @@ import "package:photos/services/location_service.dart";
 import "package:photos/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart";
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
 import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';
-import "package:photos/services/smart_memories_service.dart";
 import "package:photos/services/user_remote_flag_service.dart";
 import "package:photos/services/user_service.dart";
 import "package:photos/states/location_screen_state.dart";
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 11e3c52160..6e2f8ab771 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -57,19 +57,12 @@ class SmartMemoriesService {
     if (_isInit) return;
     _locale = await getLocale();
 
-    unawaited(
-      MLComputer.instance.runClipText(clipPositiveQuery).then((embedding) {
-        _clipPositiveTextVector ??= Vector.fromList(embedding);
-      }),
+    _clipPositiveTextVector ??= Vector.fromList(
+      await MLComputer.instance.runClipText(clipPositiveQuery),
     );
     for (final peopleActivity in PeopleActivity.values) {
-      unawaited(
-        MLComputer.instance
-            .runClipText(activityQuery(peopleActivity))
-            .then((embedding) {
-          _clipPeopleActivityVectors[peopleActivity] =
-              Vector.fromList(embedding);
-        }),
+      _clipPeopleActivityVectors[peopleActivity] = Vector.fromList(
+        await MLComputer.instance.runClipText(activityQuery(peopleActivity)),
       );
     }
     _isInit = true;
@@ -87,9 +80,6 @@ class SmartMemoriesService {
       _seenTimes = await _memoriesDB.getSeenTimes();
       _logger.finest("All files length: ${allFiles.length}");
 
-      // Pause 10 seconds TODO: lau: remove this later
-      await Future.delayed(const Duration(seconds: 10));
-
       final peopleMemories = await _getPeopleResults(allFiles, null);
       _deductUsedMemories(allFiles, peopleMemories);
       memories.addAll(peopleMemories);

From 8ce9baf92003bdc0a1bedc2be20c58c611e12d74 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Wed, 26 Feb 2025 13:59:03 +0530
Subject: [PATCH 528/796] fix: stop then dispose for now

---
 mobile/lib/ui/viewer/file/video_widget_native.dart | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mobile/lib/ui/viewer/file/video_widget_native.dart b/mobile/lib/ui/viewer/file/video_widget_native.dart
index 5da199b965..a74cba0132 100644
--- a/mobile/lib/ui/viewer/file/video_widget_native.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_native.dart
@@ -160,6 +160,11 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
 
   @override
   void dispose() {
+    _subscription?.cancel();
+    _controller?.stop();
+    _controller?.dispose();
+    _controller = null;
+
     //https://github.com/fluttercandies/flutter_photo_manager/blob/8afba2745ebaac6af8af75de9cbded9157bc2690/README.md#clear-caches
     if (_shouldClearCache) {
       _logger.info("Clearing cache");
@@ -181,15 +186,12 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
     removeCallBack(widget.file);
     _progressNotifier.dispose();
     WidgetsBinding.instance.removeObserver(this);
-    _subscription?.cancel();
     _isPlaybackReady.dispose();
     _showControls.dispose();
     _isSeeking.removeListener(_seekListener);
     _isSeeking.dispose();
     _debouncer.cancelDebounceTimer();
     _elTooltipController.dispose();
-    _controller?.dispose();
-    _controller = null;
     super.dispose();
   }
 

From ec594acafc219a0167fe4aedc76f21580191c852 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 14:00:09 +0530
Subject: [PATCH 529/796] photosd-v1.7.10

---
 desktop/CHANGELOG.md | 3 +--
 desktop/package.json | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/desktop/CHANGELOG.md b/desktop/CHANGELOG.md
index 730cc92606..d18860ab89 100644
--- a/desktop/CHANGELOG.md
+++ b/desktop/CHANGELOG.md
@@ -1,11 +1,10 @@
 # CHANGELOG
 
-## v1.7.10 (Unreleased)
+## v1.7.10
 
 - Speed up selection for large libraries.
 - Support Japanese translations.
 - Fix video thumbnail generation on drag and drop.
-- .
 
 ## v1.7.9
 
diff --git a/desktop/package.json b/desktop/package.json
index ccf8eff772..3eca3ae8b1 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ente",
-    "version": "1.7.10-beta",
+    "version": "1.7.10",
     "private": true,
     "description": "Desktop client for Ente Photos",
     "repository": "github:ente-io/photos-desktop",

From c2833d11b039a63a214985ee4f2bfed8fc20fb0d Mon Sep 17 00:00:00 2001
From: Neeraj <neeraj.gupta983@gmail.com>
Date: Wed, 26 Feb 2025 14:00:17 +0530
Subject: [PATCH 530/796] [server] Panic instead of fatal err (#5178)

---
 server/pkg/controller/user/userauth.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/pkg/controller/user/userauth.go b/server/pkg/controller/user/userauth.go
index e7934b8c6a..8d66023e98 100644
--- a/server/pkg/controller/user/userauth.go
+++ b/server/pkg/controller/user/userauth.go
@@ -346,7 +346,7 @@ func (c *UserController) AddTokenAndNotify(userID int64, app ente.App, token str
 			return
 		}
 		emailSendErr := emailUtil.SendTemplatedEmail([]string{user.Email}, "Ente", "team@ente.io", emailCtrl.LoginSuccessSubject, emailCtrl.LoginSuccessTemplate, map[string]interface{}{
-      "Date":    t.Now().UTC().Format("02 Jan, 2006 15:04"),
+			"Date": t.Now().UTC().Format("02 Jan, 2006 15:04"),
 		}, nil)
 		if emailSendErr != nil {
 			log.WithError(emailSendErr).Error("Failed to send email")
@@ -479,7 +479,7 @@ func (c *UserController) onVerificationSuccess(context *gin.Context, email strin
 func convertStringToBytes(s string) []byte {
 	b, err := base64.StdEncoding.DecodeString(s)
 	if err != nil {
-		log.Fatal(err)
+		panic(fmt.Sprintf("failed to base64dDecode string %s", s))
 	}
 	return b
 }

From d0ef4f234db3a18e396dfdde70608d0b99153381 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Wed, 26 Feb 2025 14:04:28 +0530
Subject: [PATCH 531/796] [server] Prefer reading from b5

---
 server/pkg/controller/filedata/controller.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/pkg/controller/filedata/controller.go b/server/pkg/controller/filedata/controller.go
index 6f7c6d858f..6b68e26187 100644
--- a/server/pkg/controller/filedata/controller.go
+++ b/server/pkg/controller/filedata/controller.go
@@ -219,10 +219,10 @@ func (c *Controller) getS3FileMetadataParallel(dbRows []fileData.Row) ([]bulkS3M
 			defer func() { <-globalFileFetchSemaphore }() // Release back to global semaphore
 			dc := row.LatestBucket
 			// :todo:neeraj make it configurable
-			// treat b6 as preferred bucket for reading
-			if dc == "b5" {
-				if array.StringInList("b6", row.ReplicatedBuckets) {
-					dc = "b6"
+			// treat b5 as preferred bucket for reading
+			if dc == "b6" {
+				if array.StringInList("b5", row.ReplicatedBuckets) {
+					dc = "b5"
 				}
 			}
 			s3FileMetadata, err := c.fetchS3FileMetadata(context.Background(), row, dc)

From b68870693557f1eede1023ba1c5a4b766cb12ab6 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Wed, 26 Feb 2025 14:20:28 +0530
Subject: [PATCH 532/796] [server] Enchance logging for metadata failure

---
 server/pkg/controller/filedata/controller.go | 50 +++++++++++++-------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/server/pkg/controller/filedata/controller.go b/server/pkg/controller/filedata/controller.go
index 6b68e26187..fe1b217d5e 100644
--- a/server/pkg/controller/filedata/controller.go
+++ b/server/pkg/controller/filedata/controller.go
@@ -17,6 +17,7 @@ import (
 	"github.com/ente-io/museum/pkg/utils/network"
 	"github.com/ente-io/museum/pkg/utils/s3config"
 	"github.com/ente-io/stacktrace"
+	"github.com/gin-contrib/requestid"
 	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
 	"sync"
@@ -143,7 +144,13 @@ func (c *Controller) GetFileData(ctx *gin.Context, req fileData.GetFileData) (*f
 	if len(doRows) == 0 || doRows[0].IsDeleted {
 		return nil, stacktrace.Propagate(ente.ErrNotFound, "")
 	}
-	s3MetaObject, err := c.fetchS3FileMetadata(context.Background(), doRows[0], doRows[0].LatestBucket)
+	ctxLogger := log.WithFields(log.Fields{
+		"objectKey":     doRows[0].S3FileMetadataObjectKey(),
+		"latest_bucket": doRows[0].LatestBucket,
+		"req_id":        requestid.Get(ctx),
+		"file_id":       req.FileID,
+	})
+	s3MetaObject, err := c.fetchS3FileMetadata(context.Background(), doRows[0], ctxLogger)
 	if err != nil {
 		return nil, stacktrace.Propagate(err, "")
 	}
@@ -180,7 +187,7 @@ func (c *Controller) GetFilesData(ctx *gin.Context, req fileData.GetFilesData) (
 	}
 	pendingIndexFileIds := array.FindMissingElementsInSecondList(req.FileIDs, dbFileIds)
 	// Fetch missing doRows in parallel
-	s3MetaFetchResults, err := c.getS3FileMetadataParallel(activeRows)
+	s3MetaFetchResults, err := c.getS3FileMetadataParallel(ctx, activeRows)
 	if err != nil {
 		return nil, stacktrace.Propagate(err, "")
 	}
@@ -207,7 +214,7 @@ func (c *Controller) GetFilesData(ctx *gin.Context, req fileData.GetFilesData) (
 	}, nil
 }
 
-func (c *Controller) getS3FileMetadataParallel(dbRows []fileData.Row) ([]bulkS3MetaFetchResult, error) {
+func (c *Controller) getS3FileMetadataParallel(ctx *gin.Context, dbRows []fileData.Row) ([]bulkS3MetaFetchResult, error) {
 	var wg sync.WaitGroup
 	embeddingObjects := make([]bulkS3MetaFetchResult, len(dbRows))
 	for i := range dbRows {
@@ -217,17 +224,17 @@ func (c *Controller) getS3FileMetadataParallel(dbRows []fileData.Row) ([]bulkS3M
 		go func(i int, row fileData.Row) {
 			defer wg.Done()
 			defer func() { <-globalFileFetchSemaphore }() // Release back to global semaphore
-			dc := row.LatestBucket
-			// :todo:neeraj make it configurable
-			// treat b5 as preferred bucket for reading
-			if dc == "b6" {
-				if array.StringInList("b5", row.ReplicatedBuckets) {
-					dc = "b5"
-				}
-			}
-			s3FileMetadata, err := c.fetchS3FileMetadata(context.Background(), row, dc)
+
+			ctxLogger := log.WithFields(log.Fields{
+				"objectKey":     row.S3FileMetadataObjectKey(),
+				"req_id":        requestid.Get(ctx),
+				"latest_bucket": row.LatestBucket,
+				"file_id":       row.FileID,
+			})
+
+			s3FileMetadata, err := c.fetchS3FileMetadata(context.Background(), row, ctxLogger)
 			if err != nil {
-				log.WithField("bucket", dc).
+				ctxLogger.
 					Error("error fetching  object: "+row.S3FileMetadataObjectKey(), err)
 				embeddingObjects[i] = bulkS3MetaFetchResult{
 					err:     err,
@@ -246,10 +253,17 @@ func (c *Controller) getS3FileMetadataParallel(dbRows []fileData.Row) ([]bulkS3M
 	return embeddingObjects, nil
 }
 
-func (c *Controller) fetchS3FileMetadata(ctx context.Context, row fileData.Row, dc string) (*fileData.S3FileMetadata, error) {
+func (c *Controller) fetchS3FileMetadata(ctx context.Context, row fileData.Row, ctxLogger *log.Entry) (*fileData.S3FileMetadata, error) {
+	dc := row.LatestBucket
+	// :todo:neeraj make it configurable
+	// treat b5 as preferred bucket for reading
+	if dc == "b6" {
+		if array.StringInList("b5", row.ReplicatedBuckets) {
+			dc = "b5"
+		}
+	}
 	opt := _defaultFetchConfig
 	objectKey := row.S3FileMetadataObjectKey()
-	ctxLogger := log.WithField("objectKey", objectKey).WithField("dc", row.LatestBucket)
 	totalAttempts := opt.RetryCount + 1
 	timeout := opt.InitialTimeout
 	for i := 0; i < totalAttempts; i++ {
@@ -269,13 +283,13 @@ func (c *Controller) fetchS3FileMetadata(ctx context.Context, row fileData.Row,
 			cancel() // Ensure cancel is called to release resources
 			if err == nil {
 				if i > 0 {
-					ctxLogger.Infof("Fetched object after %d attempts", i)
+					ctxLogger.WithField("dc", dc).Infof("Fetched object after %d attempts", i)
 				}
 				return &obj, nil
 			}
 			// Check if the error is due to context timeout or cancellation
 			if err == nil && fetchCtx.Err() != nil {
-				ctxLogger.Error("Fetch timed out or cancelled: ", fetchCtx.Err())
+				ctxLogger.WithField("dc", dc).Error("Fetch timed out or cancelled: ", fetchCtx.Err())
 			} else {
 				// check if the error is due to object not found
 				if s3Err, ok := err.(awserr.RequestFailure); ok {
@@ -283,7 +297,7 @@ func (c *Controller) fetchS3FileMetadata(ctx context.Context, row fileData.Row,
 						return nil, stacktrace.Propagate(errors.New("object not found"), "")
 					}
 				}
-				ctxLogger.Error("Failed to fetch object: ", err)
+				ctxLogger.WithField("dc", dc).Error("Failed to fetch object: ", err)
 			}
 		}
 	}

From d494bb8d38275a725549ba29545e9e025a774318 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Wed, 26 Feb 2025 14:25:45 +0530
Subject: [PATCH 533/796] [server] doc

---
 server/pkg/controller/filedata/controller.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/pkg/controller/filedata/controller.go b/server/pkg/controller/filedata/controller.go
index fe1b217d5e..eca74f7aa0 100644
--- a/server/pkg/controller/filedata/controller.go
+++ b/server/pkg/controller/filedata/controller.go
@@ -255,8 +255,9 @@ func (c *Controller) getS3FileMetadataParallel(ctx *gin.Context, dbRows []fileDa
 
 func (c *Controller) fetchS3FileMetadata(ctx context.Context, row fileData.Row, ctxLogger *log.Entry) (*fileData.S3FileMetadata, error) {
 	dc := row.LatestBucket
-	// :todo:neeraj make it configurable
-	// treat b5 as preferred bucket for reading
+	// :todo:neeraj make it configurable to
+	// specify preferred dc to read from
+	// and fallback logic to read from different bucket when we fail to read from preferred dc
 	if dc == "b6" {
 		if array.StringInList("b5", row.ReplicatedBuckets) {
 			dc = "b5"

From 98ebf98d1794c20c4b15d42f1e346d4156b7a58c Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Wed, 26 Feb 2025 14:32:17 +0530
Subject: [PATCH 534/796] [server] Bump default worker for filedata replication

---
 server/pkg/controller/filedata/replicate.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/pkg/controller/filedata/replicate.go b/server/pkg/controller/filedata/replicate.go
index a17323282b..2f4a7a8b8e 100644
--- a/server/pkg/controller/filedata/replicate.go
+++ b/server/pkg/controller/filedata/replicate.go
@@ -29,7 +29,7 @@ func (c *Controller) StartReplication() error {
 
 	workerCount := viper.GetInt("replication.file-data.worker-count")
 	if workerCount == 0 {
-		workerCount = 6
+		workerCount = 10
 	}
 	err := c.createTemporaryStorage()
 	if err != nil {

From 3b1ec81db8e8c85f7ac6fe4594c3f45d8d085cf0 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 14:45:25 +0530
Subject: [PATCH 535/796] photosd-next

---
 desktop/CHANGELOG.md | 4 ++++
 desktop/package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/desktop/CHANGELOG.md b/desktop/CHANGELOG.md
index d18860ab89..bbefd6c513 100644
--- a/desktop/CHANGELOG.md
+++ b/desktop/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## v1.7.11 (Unreleased)
+
+- .
+
 ## v1.7.10
 
 - Speed up selection for large libraries.
diff --git a/desktop/package.json b/desktop/package.json
index 3eca3ae8b1..4570c525b0 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ente",
-    "version": "1.7.10",
+    "version": "1.7.11-beta",
     "private": true,
     "description": "Desktop client for Ente Photos",
     "repository": "github:ente-io/photos-desktop",

From 4b03d1bd0c29246af72f1640ee56f991be17c571 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 13:59:48 +0530
Subject: [PATCH 536/796] Prune

---
 web/packages/gallery/components/FileInfo.tsx | 39 +++++++++-----------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index e7af9061c4..8c919ab0b1 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -714,29 +714,24 @@ const CreationTime: React.FC<CreationTimeProps> = ({
 
     return (
         <>
-            <FlexWrapper>
-                <InfoItem
-                    icon={<CalendarTodayIcon />}
-                    title={formattedDate(originalDate)}
-                    caption={formattedTime(originalDate)}
-                    trailingButton={
-                        allowEdits && (
-                            <EditButton
-                                onClick={openEditMode}
-                                loading={loading}
-                            />
-                        )
-                    }
+            <InfoItem
+                icon={<CalendarTodayIcon />}
+                title={formattedDate(originalDate)}
+                caption={formattedTime(originalDate)}
+                trailingButton={
+                    allowEdits && (
+                        <EditButton onClick={openEditMode} loading={loading} />
+                    )
+                }
+            />
+            {isInEditMode && (
+                <PhotoDateTimePicker
+                    initialValue={originalDate}
+                    disabled={loading}
+                    onAccept={saveEdits}
+                    onClose={closeEditMode}
                 />
-                {isInEditMode && (
-                    <PhotoDateTimePicker
-                        initialValue={originalDate}
-                        disabled={loading}
-                        onAccept={saveEdits}
-                        onClose={closeEditMode}
-                    />
-                )}
-            </FlexWrapper>
+            )}
         </>
     );
 };

From 4afa486c194356124199eb7500416349dd4327dc Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 14:11:47 +0530
Subject: [PATCH 537/796] R

---
 web/apps/photos/src/components/FixCreationTime.tsx            | 4 ++--
 web/packages/gallery/components/FileInfo.tsx                  | 4 ++--
 .../{PhotoDateTimePicker.tsx => FileDateTimePicker.tsx}       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename web/packages/new/photos/components/{PhotoDateTimePicker.tsx => FileDateTimePicker.tsx} (98%)

diff --git a/web/apps/photos/src/components/FixCreationTime.tsx b/web/apps/photos/src/components/FixCreationTime.tsx
index 171433cb46..cf3028e434 100644
--- a/web/apps/photos/src/components/FixCreationTime.tsx
+++ b/web/apps/photos/src/components/FixCreationTime.tsx
@@ -11,7 +11,7 @@ import {
     type ParsedMetadataDate,
 } from "@/media/file-metadata";
 import { FileType } from "@/media/file-type";
-import { PhotoDateTimePicker } from "@/new/photos/components/PhotoDateTimePicker";
+import { FileDateTimePicker } from "@/new/photos/components/FileDateTimePicker";
 import {
     Dialog,
     DialogContent,
@@ -205,7 +205,7 @@ const OptionsForm: React.FC<OptionsFormProps> = ({
                         />
                     </RadioGroup>
                     {values.option == "custom" && (
-                        <PhotoDateTimePicker
+                        <FileDateTimePicker
                             onAccept={(customDate) =>
                                 setValues({ option: "custom", customDate })
                             }
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 8c919ab0b1..b2bb6aed69 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -40,9 +40,9 @@ import {
     type ParsedMetadataDate,
 } from "@/media/file-metadata";
 import { FileType } from "@/media/file-type";
+import { FileDateTimePicker } from "@/new/photos/components/FileDateTimePicker";
 import { ChipButton } from "@/new/photos/components/mui/ChipButton";
 import { FilePeopleList } from "@/new/photos/components/PeopleList";
-import { PhotoDateTimePicker } from "@/new/photos/components/PhotoDateTimePicker";
 import {
     confirmDisableMapsDialogAttributes,
     confirmEnableMapsDialogAttributes,
@@ -725,7 +725,7 @@ const CreationTime: React.FC<CreationTimeProps> = ({
                 }
             />
             {isInEditMode && (
-                <PhotoDateTimePicker
+                <FileDateTimePicker
                     initialValue={originalDate}
                     disabled={loading}
                     onAccept={saveEdits}
diff --git a/web/packages/new/photos/components/PhotoDateTimePicker.tsx b/web/packages/new/photos/components/FileDateTimePicker.tsx
similarity index 98%
rename from web/packages/new/photos/components/PhotoDateTimePicker.tsx
rename to web/packages/new/photos/components/FileDateTimePicker.tsx
index e035ba11c4..beade12cfb 100644
--- a/web/packages/new/photos/components/PhotoDateTimePicker.tsx
+++ b/web/packages/new/photos/components/FileDateTimePicker.tsx
@@ -8,7 +8,7 @@ import dayjs, { Dayjs } from "dayjs";
 import React, { useState } from "react";
 import { aboveFileViewerContentZ } from "./utils/z-index";
 
-interface PhotoDateTimePickerProps {
+interface FileDateTimePickerProps {
     /**
      * The initial date to preselect in the date/time picker.
      *
@@ -45,7 +45,7 @@ interface PhotoDateTimePickerProps {
  * UTC offset. For more discussion of the caveats and nuances around this, see
  * [Note: Photos are always in local date/time].
  */
-export const PhotoDateTimePicker: React.FC<PhotoDateTimePickerProps> = ({
+export const FileDateTimePicker: React.FC<FileDateTimePickerProps> = ({
     initialValue,
     disabled,
     onAccept,

From 052367cccbf9ed2042bd0b4d36fa6921b74caf2a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 14:33:26 +0530
Subject: [PATCH 538/796] Move to base context

---
 .../src/components/AuthenticateUser.tsx       |  4 +--
 .../Collections/CollectionHeader.tsx          |  5 ++-
 .../photos/src/components/DeleteAccount.tsx   |  4 +--
 web/apps/photos/src/components/Upload.tsx     |  5 ++-
 web/apps/photos/src/pages/_app.tsx            | 28 +++-------------
 web/apps/photos/src/pages/gallery.tsx         |  4 +--
 web/packages/base/context.ts                  | 32 +++++++++++++++++++
 .../new/photos/components/PlanSelector.tsx    |  3 +-
 web/packages/new/photos/pages/duplicates.tsx  |  4 +--
 web/packages/new/photos/types/context.ts      |  4 ---
 10 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/web/apps/photos/src/components/AuthenticateUser.tsx b/web/apps/photos/src/components/AuthenticateUser.tsx
index 285ec85cab..578bcb9a25 100644
--- a/web/apps/photos/src/components/AuthenticateUser.tsx
+++ b/web/apps/photos/src/components/AuthenticateUser.tsx
@@ -6,7 +6,6 @@ import {
 import type { ModalVisibilityProps } from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
 import log from "@/base/log";
-import { usePhotosAppContext } from "@/new/photos/types/context";
 import VerifyMasterPasswordForm, {
     type VerifyMasterPasswordFormProps,
 } from "@ente/shared/components/VerifyMasterPasswordForm";
@@ -33,8 +32,7 @@ export const AuthenticateUser: React.FC<AuthenticateUserProps> = ({
     onClose,
     onAuthenticate,
 }) => {
-    const { logout, showMiniDialog } = useBaseContext();
-    const { onGenericError } = usePhotosAppContext();
+    const { logout, showMiniDialog, onGenericError } = useBaseContext();
     const [user, setUser] = useState<User>();
     const [keyAttributes, setKeyAttributes] = useState<KeyAttributes>();
 
diff --git a/web/apps/photos/src/components/Collections/CollectionHeader.tsx b/web/apps/photos/src/components/Collections/CollectionHeader.tsx
index 6ef5ab400d..4935dea01f 100644
--- a/web/apps/photos/src/components/Collections/CollectionHeader.tsx
+++ b/web/apps/photos/src/components/Collections/CollectionHeader.tsx
@@ -129,9 +129,8 @@ const CollectionOptions: React.FC<CollectionHeaderProps> = ({
     setFilesDownloadProgressAttributesCreator,
     isActiveCollectionDownloadInProgress,
 }) => {
-    const { showMiniDialog } = useBaseContext();
-    const { showLoadingBar, hideLoadingBar, onGenericError } =
-        usePhotosAppContext();
+    const { showMiniDialog, onGenericError } = useBaseContext();
+    const { showLoadingBar, hideLoadingBar } = usePhotosAppContext();
     const { syncWithRemote } = useContext(GalleryContext);
     const overFlowMenuIconRef = useRef<SVGSVGElement>(null);
 
diff --git a/web/apps/photos/src/components/DeleteAccount.tsx b/web/apps/photos/src/components/DeleteAccount.tsx
index 3fadc1354c..02958fc769 100644
--- a/web/apps/photos/src/components/DeleteAccount.tsx
+++ b/web/apps/photos/src/components/DeleteAccount.tsx
@@ -9,7 +9,6 @@ import {
     DropdownInput,
     type DropdownOption,
 } from "@/new/photos/components/DropdownInput";
-import { usePhotosAppContext } from "@/new/photos/types/context";
 import { initiateEmail } from "@/new/photos/utils/web";
 import { getData, LS_KEYS } from "@ente/shared/storage/localStorage";
 import { getActualKey } from "@ente/shared/user";
@@ -49,8 +48,7 @@ export const DeleteAccount: React.FC<DeleteAccountProps> = ({
     onClose,
     onAuthenticateUser,
 }) => {
-    const { logout, showMiniDialog } = useBaseContext();
-    const { onGenericError } = usePhotosAppContext();
+    const { logout, showMiniDialog, onGenericError } = useBaseContext();
 
     const [loading, setLoading] = useState(false);
     const deleteAccountChallenge = useRef<string | undefined>(undefined);
diff --git a/web/apps/photos/src/components/Upload.tsx b/web/apps/photos/src/components/Upload.tsx
index 44cb1cf277..14542a8313 100644
--- a/web/apps/photos/src/components/Upload.tsx
+++ b/web/apps/photos/src/components/Upload.tsx
@@ -131,9 +131,8 @@ export const Upload: React.FC<UploadProps> = ({
     showSessionExpiredMessage,
     ...props
 }) => {
-    const { showMiniDialog } = useBaseContext();
-    const { showNotification, onGenericError, watchFolderView } =
-        usePhotosAppContext();
+    const { showMiniDialog, onGenericError } = useBaseContext();
+    const { showNotification, watchFolderView } = usePhotosAppContext();
     const galleryContext = useContext(GalleryContext);
     const publicCollectionGalleryContext = useContext(
         PublicCollectionGalleryContext,
diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index 009a8c459c..000cf2d037 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -6,17 +6,14 @@ import {
     TranslucentLoadingOverlay,
 } from "@/base/components/loaders";
 import { AttributedMiniDialog } from "@/base/components/MiniDialog";
-import {
-    genericErrorDialogAttributes,
-    useAttributedMiniDialog,
-} from "@/base/components/utils/dialog";
+import { useAttributedMiniDialog } from "@/base/components/utils/dialog";
 import {
     useIsRouteChangeInProgress,
     useSetupI18n,
     useSetupLogs,
 } from "@/base/components/utils/hooks-app";
 import { photosTheme } from "@/base/components/utils/theme";
-import { BaseContext } from "@/base/context";
+import { BaseContext, deriveBaseContext } from "@/base/context";
 import log from "@/base/log";
 import { logStartupBanner } from "@/base/log-web";
 import { AppUpdate } from "@/base/types/ipc";
@@ -146,20 +143,8 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
         });
     }, []);
 
-    const onGenericError = useCallback((e: unknown) => {
-        log.error(e);
-        // The generic error handler is sometimes called in the context of
-        // actions that were initiated by a confirmation dialog action handler
-        // themselves, then we need to let the current one close.
-        //
-        // See: [Note: Chained MiniDialogs]
-        setTimeout(() => {
-            showMiniDialog(genericErrorDialogAttributes());
-        }, 0);
-    }, []);
-
     const baseContext = useMemo(
-        () => ({ logout, showMiniDialog }),
+        () => deriveBaseContext({ logout, showMiniDialog }),
         [logout, showMiniDialog],
     );
     const appContext = useMemo(
@@ -168,19 +153,14 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
             hideLoadingBar,
             watchFolderView,
             setWatchFolderView,
-            showMiniDialog,
             showNotification,
-            onGenericError,
-            logout,
         }),
         [
             showLoadingBar,
             hideLoadingBar,
             watchFolderView,
-            showMiniDialog,
+            setWatchFolderView,
             showNotification,
-            onGenericError,
-            logout,
         ],
     );
 
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index d2a7b6a01c..224e6e644c 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -164,8 +164,8 @@ export const GalleryContext = createContext<GalleryContextType>(
  *           Photo List           v
  */
 const Page: React.FC = () => {
-    const { logout, showMiniDialog } = useBaseContext();
-    const { showLoadingBar, hideLoadingBar, onGenericError, watchFolderView } =
+    const { logout, showMiniDialog, onGenericError } = useBaseContext();
+    const { showLoadingBar, hideLoadingBar, watchFolderView } =
         usePhotosAppContext();
 
     const isOffline = useIsOffline();
diff --git a/web/packages/base/context.ts b/web/packages/base/context.ts
index 96e1fe302b..073202846a 100644
--- a/web/packages/base/context.ts
+++ b/web/packages/base/context.ts
@@ -1,5 +1,7 @@
 import type { MiniDialogAttributes } from "@/base/components/MiniDialog";
 import { createContext, useContext } from "react";
+import { genericErrorDialogAttributes } from "./components/utils/dialog";
+import log from "./log";
 
 /**
  * The type of the context expected to be present in the React tree for all apps
@@ -20,6 +22,10 @@ export interface BaseContextT {
      * customized by providing appropriate {@link MiniDialogAttributes}.
      */
     showMiniDialog: (attributes: MiniDialogAttributes) => void;
+    /**
+     * Log the given error and show a generic error {@link MiniDialog}.
+     */
+    onGenericError: (error: unknown) => void;
 }
 
 /**
@@ -33,3 +39,29 @@ export const BaseContext = createContext<BaseContextT | undefined>(undefined);
  * available to all React components that refer to the base package.
  */
 export const useBaseContext = (): BaseContextT => useContext(BaseContext)!;
+
+/**
+ * A helper function to create a {@link BaseContext} by deriving derivable
+ * context values from the minimal subset.
+ *
+ * In simpler words, it automatically provides a definition of
+ * {@link onGenericError} using the given {@link showMiniDialog} prop.
+ */
+export const deriveBaseContext = ({
+    logout,
+    showMiniDialog,
+}: Omit<BaseContextT, "onGenericError">): BaseContextT => {
+    const onGenericError = (e: unknown) => {
+        log.error(e);
+        // The generic error handler is sometimes called in the context of
+        // actions that were initiated by a confirmation dialog action handler
+        // themselves, then we need to let the current one close.
+        //
+        // See: [Note: Chained MiniDialogs]
+        setTimeout(() => {
+            showMiniDialog(genericErrorDialogAttributes());
+        }, 0);
+    };
+
+    return { logout, showMiniDialog, onGenericError };
+};
diff --git a/web/packages/new/photos/components/PlanSelector.tsx b/web/packages/new/photos/components/PlanSelector.tsx
index e9194cdfb7..4bee7dbc7a 100644
--- a/web/packages/new/photos/components/PlanSelector.tsx
+++ b/web/packages/new/photos/components/PlanSelector.tsx
@@ -57,7 +57,6 @@ import Typography from "@mui/material/Typography";
 import { t } from "i18next";
 import React, { useCallback, useEffect, useState } from "react";
 import { Trans } from "react-i18next";
-import { usePhotosAppContext } from "../types/context";
 
 type PlanSelectorProps = ModalVisibilityProps & {
     setLoading: (loading: boolean) => void;
@@ -682,7 +681,7 @@ function ManageSubscription({
     subscription,
     hasAddOnBonus,
 }: ManageSubscriptionProps) {
-    const { onGenericError } = usePhotosAppContext();
+    const { onGenericError } = useBaseContext();
 
     const openFamilyPortal = async () => {
         setLoading(true);
diff --git a/web/packages/new/photos/pages/duplicates.tsx b/web/packages/new/photos/pages/duplicates.tsx
index 491281e01f..dad00bcc46 100644
--- a/web/packages/new/photos/pages/duplicates.tsx
+++ b/web/packages/new/photos/pages/duplicates.tsx
@@ -8,6 +8,7 @@ import {
     OverflowMenuOption,
 } from "@/base/components/OverflowMenu";
 import { Ellipsized2LineTypography } from "@/base/components/Typography";
+import { useBaseContext } from "@/base/context";
 import log from "@/base/log";
 import { formattedByteSize } from "@/new/photos/utils/units";
 import ArrowBackIcon from "@mui/icons-material/ArrowBack";
@@ -54,10 +55,9 @@ import {
     removeSelectedDuplicateGroups,
     type DuplicateGroup,
 } from "../services/dedup";
-import { usePhotosAppContext } from "../types/context";
 
 const Page: React.FC = () => {
-    const { onGenericError } = usePhotosAppContext();
+    const { onGenericError } = useBaseContext();
 
     const [state, dispatch] = useReducer(dedupReducer, initialDedupState);
 
diff --git a/web/packages/new/photos/types/context.ts b/web/packages/new/photos/types/context.ts
index 85d78cbadc..61954e298b 100644
--- a/web/packages/new/photos/types/context.ts
+++ b/web/packages/new/photos/types/context.ts
@@ -19,10 +19,6 @@ export interface PhotosAppContextT {
      * using the provided {@link NotificationAttributes}.
      */
     showNotification: (attributes: NotificationAttributes) => void;
-    /**
-     * Show a generic error dialog, and log the given error.
-     */
-    onGenericError: (error: unknown) => void;
     watchFolderView: boolean;
     setWatchFolderView: (isOpen: boolean) => void;
 }

From 2fee6e87f96c97fd0602b23d8751078adcb676b7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 14:35:50 +0530
Subject: [PATCH 539/796] Use

---
 web/packages/gallery/components/FileInfo.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index b2bb6aed69..a9bbfa4ba3 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -663,6 +663,8 @@ const CreationTime: React.FC<CreationTimeProps> = ({
     allowEdits,
     scheduleUpdate,
 }) => {
+    const { onGenericError } = useBaseContext();
+
     const [loading, setLoading] = useState(false);
     const [isInEditMode, setIsInEditMode] = useState(false);
 
@@ -705,7 +707,7 @@ const CreationTime: React.FC<CreationTimeProps> = ({
                 scheduleUpdate();
             }
         } catch (e) {
-            log.error("failed to update creationTime", e);
+            onGenericError(e);
         } finally {
             closeEditMode();
             setLoading(false);

From 9327cb114c4947f7b239493bb914c499fd270e82 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 15:30:43 +0530
Subject: [PATCH 540/796] rejig

---
 web/packages/gallery/components/FileInfo.tsx  | 45 +++++++++----------
 .../photos/components/FileDateTimePicker.tsx  | 17 +++----
 2 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index a9bbfa4ba3..d81d721dfe 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -665,11 +665,8 @@ const CreationTime: React.FC<CreationTimeProps> = ({
 }) => {
     const { onGenericError } = useBaseContext();
 
-    const [loading, setLoading] = useState(false);
-    const [isInEditMode, setIsInEditMode] = useState(false);
-
-    const openEditMode = () => setIsInEditMode(true);
-    const closeEditMode = () => setIsInEditMode(false);
+    const [isEditing, setIsEditing] = useState(false);
+    const [isSaving, setIsSaving] = useState(false);
 
     const originalDate = fileCreationPhotoDate(
         file,
@@ -677,9 +674,13 @@ const CreationTime: React.FC<CreationTimeProps> = ({
     );
 
     const saveEdits = async (pickedTime: ParsedMetadataDate) => {
-        try {
-            setLoading(true);
-            if (isInEditMode) {
+        setIsEditing(false);
+        setIsSaving(true);
+
+        const { dateTime, timestamp: editedTime } = pickedTime;
+        if (editedTime != originalDate.getTime()) {
+            // If not same as before.
+            try {
                 // [Note: Don't modify offsetTime when editing date via picker]
                 //
                 // Use the updated date time (both in its canonical dateTime
@@ -692,26 +693,18 @@ const CreationTime: React.FC<CreationTimeProps> = ({
                 // editor, we can provide functionality for the user to edit the
                 // associated offset, but right now it is not even surfaced, so
                 // don't also potentially overwrite it.
-                const { dateTime, timestamp } = pickedTime;
-                if (timestamp == originalDate.getTime()) {
-                    // Same as before.
-                    closeEditMode();
-                    return;
-                }
-
                 await updateRemotePublicMagicMetadata(file, {
                     dateTime,
-                    editedTime: timestamp,
+                    editedTime,
                 });
 
                 scheduleUpdate();
+            } catch (e) {
+                onGenericError(e);
             }
-        } catch (e) {
-            onGenericError(e);
-        } finally {
-            closeEditMode();
-            setLoading(false);
         }
+
+        setIsSaving(false);
     };
 
     return (
@@ -722,16 +715,18 @@ const CreationTime: React.FC<CreationTimeProps> = ({
                 caption={formattedTime(originalDate)}
                 trailingButton={
                     allowEdits && (
-                        <EditButton onClick={openEditMode} loading={loading} />
+                        <EditButton
+                            onClick={() => setIsEditing(true)}
+                            loading={isSaving}
+                        />
                     )
                 }
             />
-            {isInEditMode && (
+            {isEditing && (
                 <FileDateTimePicker
                     initialValue={originalDate}
-                    disabled={loading}
                     onAccept={saveEdits}
-                    onClose={closeEditMode}
+                    onDidClose={() => setIsEditing(false)}
                 />
             )}
         </>
diff --git a/web/packages/new/photos/components/FileDateTimePicker.tsx b/web/packages/new/photos/components/FileDateTimePicker.tsx
index beade12cfb..329bfd6061 100644
--- a/web/packages/new/photos/components/FileDateTimePicker.tsx
+++ b/web/packages/new/photos/components/FileDateTimePicker.tsx
@@ -15,19 +15,17 @@ interface FileDateTimePickerProps {
      * If not provided, the current date/time is used.
      */
     initialValue?: Date;
-    /**
-     * If true, then the picker shows provided date/time but doesn't allow
-     * editing it.
-     */
-    disabled?: boolean;
     /**
      * Callback invoked when the user makes and confirms a date/time.
      */
     onAccept: (date: ParsedMetadataDate) => void;
     /**
      * Optional callback invoked when the picker has been closed.
+     *
+     * > Note: This is only informational, for the caller to update their state.
+     * > The picker has already been closed at this point.
      */
-    onClose?: () => void;
+    onDidClose?: () => void;
 }
 
 /**
@@ -47,9 +45,8 @@ interface FileDateTimePickerProps {
  */
 export const FileDateTimePicker: React.FC<FileDateTimePickerProps> = ({
     initialValue,
-    disabled,
     onAccept,
-    onClose,
+    onDidClose,
 }) => {
     const [open, setOpen] = useState(true);
     const [value, setValue] = useState<Dayjs | null>(dayjs(initialValue));
@@ -61,8 +58,9 @@ export const FileDateTimePicker: React.FC<FileDateTimePickerProps> = ({
     };
 
     const handleClose = () => {
+        console.log("handleClose");
         setOpen(false);
-        onClose?.();
+        onDidClose?.();
     };
 
     return (
@@ -73,7 +71,6 @@ export const FileDateTimePicker: React.FC<FileDateTimePickerProps> = ({
                 open={open}
                 onClose={handleClose}
                 onOpen={() => setOpen(true)}
-                disabled={disabled}
                 disableFuture={true}
                 /* The dialog grows too big on the default portrait mode with
                    our theme customizations. So we instead use the landscape

From bc23f1dec9b04e32173f27dcad7da8d70fe0a7a7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 15:33:42 +0530
Subject: [PATCH 541/796] R

---
 web/packages/gallery/components/FileInfo.tsx | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index d81d721dfe..29f99b1e75 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -231,12 +231,7 @@ export const FileInfo: React.FC<FileInfoProps> = ({
                 />
                 <CreationTime {...{ file, allowEdits, scheduleUpdate }} />
                 <FileName
-                    {...{
-                        file,
-                        exifInfo: annotatedExif,
-                        allowEdits,
-                        scheduleUpdate,
-                    }}
+                    {...{ file, annotatedExif, allowEdits, scheduleUpdate }}
                 />
 
                 {annotatedExif?.takenOnDevice && (
@@ -735,12 +730,12 @@ const CreationTime: React.FC<CreationTimeProps> = ({
 
 type FileNameProps = Pick<FileInfoProps, "allowEdits" | "scheduleUpdate"> & {
     file: EnteFile;
-    exifInfo: AnnotatedExif | undefined;
+    annotatedExif: AnnotatedExif | undefined;
 };
 
 const FileName: React.FC<FileNameProps> = ({
     file,
-    exifInfo,
+    annotatedExif,
     allowEdits,
     scheduleUpdate,
 }) => {
@@ -779,7 +774,7 @@ const FileName: React.FC<FileNameProps> = ({
                     )
                 }
                 title={[fileName, extension].join(".")}
-                caption={getCaption(file, exifInfo)}
+                caption={getCaption(file, annotatedExif)}
                 trailingButton={
                     allowEdits && <EditButton onClick={openEditMode} />
                 }

From 3468bdea7b87ca17be85dc1fb18c20232008ebda Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 16:11:12 +0530
Subject: [PATCH 542/796] Fix

---
 web/apps/accounts/src/pages/_app.tsx                        | 4 ++--
 web/apps/auth/src/pages/_app.tsx                            | 4 ++--
 web/packages/new/photos/components/gallery/PeopleHeader.tsx | 4 +---
 web/packages/new/photos/components/utils/use-wrap-async.ts  | 5 +++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/web/apps/accounts/src/pages/_app.tsx b/web/apps/accounts/src/pages/_app.tsx
index d7203ba239..b7428eb4dc 100644
--- a/web/apps/accounts/src/pages/_app.tsx
+++ b/web/apps/accounts/src/pages/_app.tsx
@@ -6,7 +6,7 @@ import { AttributedMiniDialog } from "@/base/components/MiniDialog";
 import { useAttributedMiniDialog } from "@/base/components/utils/dialog";
 import { useSetupI18n, useSetupLogs } from "@/base/components/utils/hooks-app";
 import { photosTheme } from "@/base/components/utils/theme";
-import { BaseContext } from "@/base/context";
+import { BaseContext, deriveBaseContext } from "@/base/context";
 import "@fontsource-variable/inter";
 import { CssBaseline } from "@mui/material";
 import { ThemeProvider } from "@mui/material/styles";
@@ -29,7 +29,7 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
     }, []);
 
     const baseContext = useMemo(
-        () => ({ logout, showMiniDialog }),
+        () => deriveBaseContext({ logout, showMiniDialog }),
         [logout, showMiniDialog],
     );
 
diff --git a/web/apps/auth/src/pages/_app.tsx b/web/apps/auth/src/pages/_app.tsx
index fb135bde64..ba6939fb20 100644
--- a/web/apps/auth/src/pages/_app.tsx
+++ b/web/apps/auth/src/pages/_app.tsx
@@ -13,7 +13,7 @@ import {
     useSetupLogs,
 } from "@/base/components/utils/hooks-app";
 import { authTheme } from "@/base/components/utils/theme";
-import { BaseContext } from "@/base/context";
+import { BaseContext, deriveBaseContext } from "@/base/context";
 import { logStartupBanner } from "@/base/log-web";
 import HTTPService from "@ente/shared/network/HTTPService";
 import { LS_KEYS, getData } from "@ente/shared/storage/localStorage";
@@ -43,7 +43,7 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
     }, []);
 
     const baseContext = useMemo(
-        () => ({ logout, showMiniDialog }),
+        () => deriveBaseContext({ logout, showMiniDialog }),
         [logout, showMiniDialog],
     );
 
diff --git a/web/packages/new/photos/components/gallery/PeopleHeader.tsx b/web/packages/new/photos/components/gallery/PeopleHeader.tsx
index e9df72dea7..606f09d96c 100644
--- a/web/packages/new/photos/components/gallery/PeopleHeader.tsx
+++ b/web/packages/new/photos/components/gallery/PeopleHeader.tsx
@@ -60,7 +60,6 @@ import {
 import { t } from "i18next";
 import React, { useEffect, useReducer, useState } from "react";
 import type { FaceCluster } from "../../services/ml/cluster";
-import { usePhotosAppContext } from "../../types/context";
 import { SuggestionFaceList } from "../PeopleList";
 import {
     ItemCard,
@@ -546,8 +545,7 @@ const SuggestionsDialog: React.FC<SuggestionsDialogProps> = ({
     onClose,
     person,
 }) => {
-    const { showMiniDialog } = useBaseContext();
-    const { onGenericError } = usePhotosAppContext();
+    const { showMiniDialog, onGenericError } = useBaseContext();
 
     const [state, dispatch] = useReducer(
         suggestionsDialogReducer,
diff --git a/web/packages/new/photos/components/utils/use-wrap-async.ts b/web/packages/new/photos/components/utils/use-wrap-async.ts
index 05852ec084..77ca17bef3 100644
--- a/web/packages/new/photos/components/utils/use-wrap-async.ts
+++ b/web/packages/new/photos/components/utils/use-wrap-async.ts
@@ -1,3 +1,4 @@
+import { useBaseContext } from "@/base/context";
 import { useCallback } from "react";
 import { usePhotosAppContext } from "../../types/context";
 
@@ -19,8 +20,8 @@ import { usePhotosAppContext } from "../../types/context";
 export const useWrapAsyncOperation = <T extends unknown[]>(
     f: (...args: T) => Promise<void>,
 ) => {
-    const { showLoadingBar, hideLoadingBar, onGenericError } =
-        usePhotosAppContext();
+    const { onGenericError } = useBaseContext();
+    const { showLoadingBar, hideLoadingBar } = usePhotosAppContext();
     return useCallback(
         async (...args: T) => {
             showLoadingBar();

From 9fc5483eb8df7f7d728dae3a1babff7939e22963 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 16:14:29 +0530
Subject: [PATCH 543/796] Shorten

---
 web/apps/accounts/src/pages/_app.tsx | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/web/apps/accounts/src/pages/_app.tsx b/web/apps/accounts/src/pages/_app.tsx
index b7428eb4dc..785150f50d 100644
--- a/web/apps/accounts/src/pages/_app.tsx
+++ b/web/apps/accounts/src/pages/_app.tsx
@@ -12,7 +12,7 @@ import { CssBaseline } from "@mui/material";
 import { ThemeProvider } from "@mui/material/styles";
 import { t } from "i18next";
 import type { AppProps } from "next/app";
-import React, { useCallback, useMemo } from "react";
+import React, { useMemo } from "react";
 
 const App: React.FC<AppProps> = ({ Component, pageProps }) => {
     useSetupLogs({ disableDiskLogs: true });
@@ -20,13 +20,11 @@ const App: React.FC<AppProps> = ({ Component, pageProps }) => {
     const isI18nReady = useSetupI18n();
     const { showMiniDialog, miniDialogProps } = useAttributedMiniDialog();
 
-    const logout = useCallback(() => {
-        // No code in the accounts app is currently expected to reach a code
-        // path where they would need to "logout". In any case, the accounts app
-        // doesn't store any user specific persistent state that'd need to be
-        // cleared, so there really isn't anything to do here.
-        assertionFailed();
-    }, []);
+    // No code in the accounts app is currently expected to reach a code path
+    // where they would need to "logout". Also, the accounts app doesn't store
+    // any user specific persistent state that'd need to be cleared, so there
+    // really isn't anything to do here even if we needed to.
+    const logout = assertionFailed;
 
     const baseContext = useMemo(
         () => deriveBaseContext({ logout, showMiniDialog }),

From cc2be30f53cbc4585338d06252c352075b8cc226 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 16:25:06 +0530
Subject: [PATCH 544/796] Scope

---
 .../accounts/components/utils/second-factor-choice.ts       | 6 +++---
 web/packages/accounts/eslint.config.mjs                     | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/packages/accounts/components/utils/second-factor-choice.ts b/web/packages/accounts/components/utils/second-factor-choice.ts
index 6694568b48..d31fc9a6a5 100644
--- a/web/packages/accounts/components/utils/second-factor-choice.ts
+++ b/web/packages/accounts/components/utils/second-factor-choice.ts
@@ -51,10 +51,10 @@ export const useSecondFactorChoiceIfNeeded = () => {
             // ID will be in a V2 attribute during a transient migration period.
             //
             // Note the use of || instead of ?? since _twoFactorSessionIDV1 will
-            // be an empty string, not undefined, if it is unset. We might need
-            // to add a `xxx-eslint-disable
-            // @typescript-eslint/prefer-nullish-coalescing` here too later.
+            // be an empty string, not undefined, if it is unset. This is
+            // intentional, so disable the eslint rule too.
             const _twoFactorSessionID =
+                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                 _twoFactorSessionIDV1 || _twoFactorSessionIDV2;
 
             let passkeySessionID: string | undefined;
diff --git a/web/packages/accounts/eslint.config.mjs b/web/packages/accounts/eslint.config.mjs
index 447b0f36d4..d721f5eb56 100644
--- a/web/packages/accounts/eslint.config.mjs
+++ b/web/packages/accounts/eslint.config.mjs
@@ -8,7 +8,6 @@ export default [
              * "This rule requires the `strictNullChecks` compiler option to be
              * turned on to function correctly"
              */
-            "@typescript-eslint/prefer-nullish-coalescing": "off",
             "@typescript-eslint/no-unnecessary-condition": "off",
             "@typescript-eslint/no-unsafe-assignment": "off",
             "@typescript-eslint/no-explicit-any": "off",

From 1c1fe7f1df301903e9c3d94ab03e3e3e1c1d19b0 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 16:29:34 +0530
Subject: [PATCH 545/796] Scope

---
 web/packages/accounts/components/Verify2FACodeForm.tsx | 2 +-
 web/packages/accounts/eslint.config.mjs                | 7 +------
 web/packages/accounts/pages/change-email.tsx           | 2 +-
 web/packages/accounts/pages/change-password.tsx        | 2 +-
 web/packages/accounts/pages/credentials.tsx            | 5 +++--
 web/packages/accounts/pages/generate.tsx               | 2 +-
 web/packages/accounts/pages/login.tsx                  | 2 +-
 web/packages/accounts/pages/passkeys/finish.tsx        | 2 +-
 web/packages/accounts/pages/recover.tsx                | 2 +-
 web/packages/accounts/pages/signup.tsx                 | 2 +-
 web/packages/accounts/pages/two-factor/recover.tsx     | 2 ++
 web/packages/accounts/pages/two-factor/verify.tsx      | 2 +-
 web/packages/accounts/pages/verify.tsx                 | 2 +-
 13 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/web/packages/accounts/components/Verify2FACodeForm.tsx b/web/packages/accounts/components/Verify2FACodeForm.tsx
index d83dba61cb..b52ab6a3cb 100644
--- a/web/packages/accounts/components/Verify2FACodeForm.tsx
+++ b/web/packages/accounts/components/Verify2FACodeForm.tsx
@@ -71,7 +71,7 @@ export const Verify2FACodeForm: React.FC<Verify2FACodeFormProps> = ({
 
     useEffect(() => {
         if (values.otp.length == 6 && !isSubmitting) void submitForm();
-    }, [values, isSubmitting]);
+    }, [values, isSubmitting, submitForm]);
 
     return (
         <form onSubmit={handleSubmit}>
diff --git a/web/packages/accounts/eslint.config.mjs b/web/packages/accounts/eslint.config.mjs
index d721f5eb56..c2a6fbb566 100644
--- a/web/packages/accounts/eslint.config.mjs
+++ b/web/packages/accounts/eslint.config.mjs
@@ -4,10 +4,7 @@ export default [
     ...config,
     {
         rules: {
-            /* TODO:
-             * "This rule requires the `strictNullChecks` compiler option to be
-             * turned on to function correctly"
-             */
+            /* TODO: */
             "@typescript-eslint/no-unnecessary-condition": "off",
             "@typescript-eslint/no-unsafe-assignment": "off",
             "@typescript-eslint/no-explicit-any": "off",
@@ -15,8 +12,6 @@ export default [
             "@typescript-eslint/no-unsafe-member-access": "off",
             "@typescript-eslint/no-unsafe-argument": "off",
             "@typescript-eslint/no-unsafe-call": "off",
-            /** TODO: Disabled as we migrate, try to prune these again */
-            "react-hooks/exhaustive-deps": "off",
         },
     },
 ];
diff --git a/web/packages/accounts/pages/change-email.tsx b/web/packages/accounts/pages/change-email.tsx
index cbf6618f9e..cc965f02b7 100644
--- a/web/packages/accounts/pages/change-email.tsx
+++ b/web/packages/accounts/pages/change-email.tsx
@@ -27,7 +27,7 @@ const Page: React.FC = () => {
         if (!user?.token) {
             void router.push("/");
         }
-    }, []);
+    }, [router]);
 
     return (
         <AccountsPageContents>
diff --git a/web/packages/accounts/pages/change-password.tsx b/web/packages/accounts/pages/change-password.tsx
index d8cc197faa..e19d6aff7a 100644
--- a/web/packages/accounts/pages/change-password.tsx
+++ b/web/packages/accounts/pages/change-password.tsx
@@ -50,7 +50,7 @@ const Page: React.FC = () => {
         } else {
             setToken(user.token);
         }
-    }, []);
+    }, [router]);
 
     const onSubmit: SetPasswordFormProps["callback"] = async (
         passphrase,
diff --git a/web/packages/accounts/pages/credentials.tsx b/web/packages/accounts/pages/credentials.tsx
index 76c2b50829..db8cd75a7a 100644
--- a/web/packages/accounts/pages/credentials.tsx
+++ b/web/packages/accounts/pages/credentials.tsx
@@ -199,9 +199,10 @@ const Page: React.FC = () => {
             }
         };
         void main();
+        // TODO: validateSession is a dependency, but add that only after we've
+        // wrapped items from the callback (like logout) in useCallback too.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
-    // TODO: ^ validateSession is a dependency, but add that only after we've
-    // wrapped items from the callback (like logout) in useCallback too.
 
     const getKeyAttributes: VerifyMasterPasswordFormProps["getKeyAttributes"] =
         async (kek: string) => {
diff --git a/web/packages/accounts/pages/generate.tsx b/web/packages/accounts/pages/generate.tsx
index 5794a98171..8010e7e378 100644
--- a/web/packages/accounts/pages/generate.tsx
+++ b/web/packages/accounts/pages/generate.tsx
@@ -65,7 +65,7 @@ const Page: React.FC = () => {
             setToken(user.token);
             setLoading(false);
         }
-    }, []);
+    }, [router]);
 
     const onSubmit: SetPasswordFormProps["callback"] = async (
         passphrase,
diff --git a/web/packages/accounts/pages/login.tsx b/web/packages/accounts/pages/login.tsx
index 5e26b9cd2a..a4927b61c9 100644
--- a/web/packages/accounts/pages/login.tsx
+++ b/web/packages/accounts/pages/login.tsx
@@ -20,7 +20,7 @@ const Page: React.FC = () => {
             void router.push(PAGES.VERIFY);
         }
         setLoading(false);
-    }, []);
+    }, [router]);
 
     const onSignUp = () => void router.push(PAGES.SIGNUP);
 
diff --git a/web/packages/accounts/pages/passkeys/finish.tsx b/web/packages/accounts/pages/passkeys/finish.tsx
index 1ef91aaad8..258d062b94 100644
--- a/web/packages/accounts/pages/passkeys/finish.tsx
+++ b/web/packages/accounts/pages/passkeys/finish.tsx
@@ -33,7 +33,7 @@ const Page: React.FC = () => {
         void saveCredentialsAndNavigateTo(passkeySessionID, response).then(
             (slug: string) => router.push(slug),
         );
-    }, []);
+    }, [router]);
 
     return <LoadingIndicator />;
 };
diff --git a/web/packages/accounts/pages/recover.tsx b/web/packages/accounts/pages/recover.tsx
index 29c92dcb02..7c69ea44a6 100644
--- a/web/packages/accounts/pages/recover.tsx
+++ b/web/packages/accounts/pages/recover.tsx
@@ -59,7 +59,7 @@ const Page: React.FC = () => {
         } else {
             setKeyAttributes(keyAttributes);
         }
-    }, []);
+    }, [router]);
 
     const recover: SingleInputFormProps["callback"] = async (
         recoveryKey: string,
diff --git a/web/packages/accounts/pages/signup.tsx b/web/packages/accounts/pages/signup.tsx
index 89033339b5..4920053c24 100644
--- a/web/packages/accounts/pages/signup.tsx
+++ b/web/packages/accounts/pages/signup.tsx
@@ -20,7 +20,7 @@ const Page: React.FC = () => {
             void router.push(PAGES.VERIFY);
         }
         setLoading(false);
-    }, []);
+    }, [router]);
 
     const onLogin = () => void router.push(PAGES.LOGIN);
 
diff --git a/web/packages/accounts/pages/two-factor/recover.tsx b/web/packages/accounts/pages/two-factor/recover.tsx
index 6c6925a84d..274042ecdd 100644
--- a/web/packages/accounts/pages/two-factor/recover.tsx
+++ b/web/packages/accounts/pages/two-factor/recover.tsx
@@ -92,6 +92,8 @@ const Page: React.FC<RecoverPageProps> = ({ twoFactorType }) => {
             }
         };
         void main();
+        // TODO:
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
     const recover: SingleInputFormProps["callback"] = async (
diff --git a/web/packages/accounts/pages/two-factor/verify.tsx b/web/packages/accounts/pages/two-factor/verify.tsx
index e1e13af0c0..8434969600 100644
--- a/web/packages/accounts/pages/two-factor/verify.tsx
+++ b/web/packages/accounts/pages/two-factor/verify.tsx
@@ -40,7 +40,7 @@ const Page: React.FC = () => {
         } else {
             setSessionID(user.twoFactorSessionID);
         }
-    }, []);
+    }, [router]);
 
     const handleSubmit = async (otp: string) => {
         try {
diff --git a/web/packages/accounts/pages/verify.tsx b/web/packages/accounts/pages/verify.tsx
index 3c1f0047ba..12eef1ac20 100644
--- a/web/packages/accounts/pages/verify.tsx
+++ b/web/packages/accounts/pages/verify.tsx
@@ -74,7 +74,7 @@ const Page: React.FC = () => {
             }
         };
         void main();
-    }, []);
+    }, [router]);
 
     const onSubmit: SingleInputFormProps["callback"] = async (
         ott,

From 7545047647055659132aecc863f5e3ea3d103083 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 16:48:41 +0530
Subject: [PATCH 546/796] abstract

---
 web/packages/gallery/components/FileInfo.tsx | 74 +++++++++-----------
 1 file changed, 32 insertions(+), 42 deletions(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 29f99b1e75..7963e26608 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -238,7 +238,11 @@ export const FileInfo: React.FC<FileInfoProps> = ({
                     <InfoItem
                         icon={<CameraOutlinedIcon />}
                         title={annotatedExif.takenOnDevice}
-                        caption={<BasicDeviceCamera {...{ annotatedExif }} />}
+                        caption={createMultipartCaption(
+                            annotatedExif.fNumber,
+                            annotatedExif.exposureTime,
+                            annotatedExif.iso,
+                        )}
                     />
                 )}
 
@@ -763,18 +767,26 @@ const FileName: React.FC<FileNameProps> = ({
         scheduleUpdate();
     };
 
+    const icon =
+        file.metadata.fileType === FileType.video ? (
+            <VideocamOutlinedIcon />
+        ) : (
+            <PhotoOutlinedIcon />
+        );
+
+    const fileSize = file.info?.fileSize;
+    const caption = createMultipartCaption(
+        annotatedExif?.megaPixels,
+        annotatedExif?.resolution,
+        fileSize ? formattedByteSize(fileSize) : undefined,
+    );
+
     return (
         <>
             <InfoItem
-                icon={
-                    file.metadata.fileType === FileType.video ? (
-                        <VideocamOutlinedIcon />
-                    ) : (
-                        <PhotoOutlinedIcon />
-                    )
-                }
+                icon={icon}
                 title={[fileName, extension].join(".")}
-                caption={getCaption(file, annotatedExif)}
+                caption={caption}
                 trailingButton={
                     allowEdits && <EditButton onClick={openEditMode} />
                 }
@@ -790,29 +802,17 @@ const FileName: React.FC<FileNameProps> = ({
     );
 };
 
-const getCaption = (file: EnteFile, exifInfo: AnnotatedExif | undefined) => {
-    const megaPixels = exifInfo?.megaPixels;
-    const resolution = exifInfo?.resolution;
-    const fileSize = file.info?.fileSize;
-
-    const captionParts = [];
-    if (megaPixels) {
-        captionParts.push(megaPixels);
-    }
-    if (resolution) {
-        captionParts.push(resolution);
-    }
-    if (fileSize) {
-        captionParts.push(formattedByteSize(fileSize));
-    }
-    return (
-        <FlexWrapper gap={1}>
-            {captionParts.map((caption) => (
-                <Box key={caption}> {caption}</Box>
-            ))}
-        </FlexWrapper>
-    );
-};
+const createMultipartCaption = (
+    p1: string | undefined,
+    p2: string | undefined,
+    p3: string | undefined,
+) => (
+    <Stack direction="row" sx={{ gap: 1 }}>
+        {p1 && <div>{p1}</div>}
+        {p2 && <div>{p2}</div>}
+        {p3 && <div>{p3}</div>}
+    </Stack>
+);
 
 interface FileNameEditDialogProps {
     isInEditMode: boolean;
@@ -862,16 +862,6 @@ const FileNameEditDialog: React.FC<FileNameEditDialogProps> = ({
     );
 };
 
-const BasicDeviceCamera: React.FC<{ annotatedExif: AnnotatedExif }> = ({
-    annotatedExif,
-}) => (
-    <Stack direction="row" sx={{ gap: 1 }}>
-        <Box>{annotatedExif.fNumber}</Box>
-        <Box>{annotatedExif.exposureTime}</Box>
-        <Box>{annotatedExif.iso}</Box>
-    </Stack>
-);
-
 const openStreetMapLink = ({ latitude, longitude }: Location) =>
     `https://www.openstreetmap.org/?mlat=${latitude}&mlon=${longitude}#map=15/${latitude}/${longitude}`;
 

From 82082e2cbfaf2010d55fe98cd24c68f45965a521 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 16:55:37 +0530
Subject: [PATCH 547/796] Move

---
 .../src/components/PhotoViewer/index.tsx      |  3 +--
 web/packages/gallery/components/FileInfo.tsx  | 13 ++++++++++++-
 .../gallery/components/viewer/FileViewer.tsx  |  8 ++++++--
 .../gallery/components/viewer/data-source.ts  | 19 ++-----------------
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index ef6b0ed8a1..3454d11ae7 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -9,8 +9,7 @@ import {
 } from "@/base/components/utils/modal";
 import { lowercaseExtension } from "@/base/file-name";
 import log from "@/base/log";
-import { FileInfo } from "@/gallery/components/FileInfo";
-import { type FileInfoExif } from "@/gallery/components/viewer/data-source";
+import { FileInfo, type FileInfoExif } from "@/gallery/components/FileInfo";
 import { downloadManager } from "@/gallery/services/download";
 import { extractRawExif, parseExif } from "@/gallery/services/exif";
 import type { Collection } from "@/media/collection";
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 7963e26608..629f47375f 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -37,6 +37,7 @@ import {
     fileLocation,
     filePublicMagicMetadata,
     updateRemotePublicMagicMetadata,
+    type ParsedMetadata,
     type ParsedMetadataDate,
 } from "@/media/file-metadata";
 import { FileType } from "@/media/file-type";
@@ -89,7 +90,6 @@ import { Formik } from "formik";
 import { t } from "i18next";
 import React, { useEffect, useMemo, useRef, useState } from "react";
 import * as Yup from "yup";
-import type { FileInfoExif } from "./viewer/data-source";
 
 // Re-uses images from ~leaflet package.
 import "leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css";
@@ -101,6 +101,17 @@ const leaflet = haveWindow()
       (require("leaflet") as typeof import("leaflet"))
     : null;
 
+/**
+ * Exif data for a file, in a form suitable for use by {@link FileInfo}.
+ *
+ * TODO: Indicate missing exif (e.g. videos) better, both in the data type, and
+ * in the UI (e.g. by omitting the entire row).
+ */
+export interface FileInfoExif {
+    tags: RawExifTags | undefined;
+    parsed: ParsedMetadata | undefined;
+}
+
 export type FileInfoProps = ModalVisibilityProps & {
     /**
      * The file whose information we are showing.
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 07756ec357..4c21d1dab3 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -18,11 +18,15 @@ import {
     type ModalVisibilityProps,
 } from "@/base/components/utils/modal";
 import type { LocalUser } from "@/base/local-user";
-import { FileInfo, type FileInfoProps } from "@/gallery/components/FileInfo";
+import {
+    FileInfo,
+    type FileInfoExif,
+    type FileInfoProps,
+} from "@/gallery/components/FileInfo";
 import type { EnteFile } from "@/media/file.js";
 import { Button, styled } from "@mui/material";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { fileInfoExifForFile, type FileInfoExif } from "./data-source";
+import { fileInfoExifForFile } from "./data-source";
 import {
     FileViewerPhotoSwipe,
     type FileViewerAnnotatedFile,
diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 2d215deca3..715d152805 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -1,15 +1,11 @@
 import log from "@/base/log";
+import type { FileInfoExif } from "@/gallery/components/FileInfo";
 import {
     downloadManager,
     type LivePhotoSourceURL,
 } from "@/gallery/services/download";
-import {
-    extractRawExif,
-    parseExif,
-    type RawExifTags,
-} from "@/gallery/services/exif";
+import { extractRawExif, parseExif } from "@/gallery/services/exif";
 import type { EnteFile } from "@/media/file";
-import type { ParsedMetadata } from "@/media/file-metadata";
 import { FileType } from "@/media/file-type";
 import { ensureString } from "@/utils/ensure";
 
@@ -103,17 +99,6 @@ export type ItemData = PhotoSwipeSlideData & {
     fetchFailed?: boolean;
 };
 
-/**
- * Exif data for a file, in a form suitable for use by {@link FileInfo}.
- *
- * TODO(PS): Indicate missing exif (e.g. videos) better, both in the data type,
- * and in the UI (e.g. by omitting the entire row).
- */
-export interface FileInfoExif {
-    tags: RawExifTags | undefined;
-    parsed: ParsedMetadata | undefined;
-}
-
 /**
  * This module stores and serves data required by our custom PhotoSwipe
  * instance, effectively acting as an in-memory cache.

From cd3bd1cdbb0887386ffb1c4768b8f420df9f7cfe Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 16:59:09 +0530
Subject: [PATCH 548/796] Move

---
 web/apps/photos/src/components/SubscriptionCard.tsx | 2 +-
 web/packages/gallery/components/FileInfo.tsx        | 2 +-
 web/packages/{new/photos => gallery}/utils/units.ts | 0
 web/packages/new/photos/components/PlanSelector.tsx | 2 +-
 web/packages/new/photos/pages/duplicates.tsx        | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename web/packages/{new/photos => gallery}/utils/units.ts (100%)

diff --git a/web/apps/photos/src/components/SubscriptionCard.tsx b/web/apps/photos/src/components/SubscriptionCard.tsx
index b389edd62b..7af6d8d5dc 100644
--- a/web/apps/photos/src/components/SubscriptionCard.tsx
+++ b/web/apps/photos/src/components/SubscriptionCard.tsx
@@ -1,5 +1,6 @@
 import { Overlay } from "@/base/components/containers";
 import type { ButtonishProps } from "@/base/components/mui";
+import { bytesInGB, formattedStorageByteSize } from "@/gallery/utils/units";
 import { UnstyledButton } from "@/new/photos/components/UnstyledButton";
 import type { UserDetails } from "@/new/photos/services/user-details";
 import {
@@ -7,7 +8,6 @@ import {
     familyUsage,
     isPartOfFamilyWithOtherMembers,
 } from "@/new/photos/services/user-details";
-import { bytesInGB, formattedStorageByteSize } from "@/new/photos/utils/units";
 import ChevronRightIcon from "@mui/icons-material/ChevronRight";
 import CircleIcon from "@mui/icons-material/Circle";
 import {
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 629f47375f..7666f1e6f6 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -31,6 +31,7 @@ import {
     changeFileName,
     updateExistingFilePubMetadata,
 } from "@/gallery/services/file";
+import { formattedByteSize } from "@/gallery/utils/units";
 import { type EnteFile } from "@/media/file";
 import {
     fileCreationPhotoDate,
@@ -59,7 +60,6 @@ import {
     type AnnotatedFaceID,
 } from "@/new/photos/services/ml";
 import { updateMapEnabled } from "@/new/photos/services/settings";
-import { formattedByteSize } from "@/new/photos/utils/units";
 import { FlexWrapper } from "@ente/shared/components/Container";
 import SingleInputForm, {
     type SingleInputFormProps,
diff --git a/web/packages/new/photos/utils/units.ts b/web/packages/gallery/utils/units.ts
similarity index 100%
rename from web/packages/new/photos/utils/units.ts
rename to web/packages/gallery/utils/units.ts
diff --git a/web/packages/new/photos/components/PlanSelector.tsx b/web/packages/new/photos/components/PlanSelector.tsx
index 4bee7dbc7a..7fc646286d 100644
--- a/web/packages/new/photos/components/PlanSelector.tsx
+++ b/web/packages/new/photos/components/PlanSelector.tsx
@@ -8,6 +8,7 @@ import {
 import type { ModalVisibilityProps } from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
 import log from "@/base/log";
+import { bytesInGB, formattedStorageByteSize } from "@/gallery/utils/units";
 import { useUserDetailsSnapshot } from "@/new/photos/components/utils/use-snapshot";
 import { useWrapAsyncOperation } from "@/new/photos/components/utils/use-wrap-async";
 import type {
@@ -33,7 +34,6 @@ import {
     redirectToPaymentsApp,
     userDetailsAddOnBonuses,
 } from "@/new/photos/services/user-details";
-import { bytesInGB, formattedStorageByteSize } from "@/new/photos/utils/units";
 import { openURL } from "@/new/photos/utils/web";
 import ArrowForwardIcon from "@mui/icons-material/ArrowForward";
 import ChevronRightIcon from "@mui/icons-material/ChevronRight";
diff --git a/web/packages/new/photos/pages/duplicates.tsx b/web/packages/new/photos/pages/duplicates.tsx
index dad00bcc46..9e017adca5 100644
--- a/web/packages/new/photos/pages/duplicates.tsx
+++ b/web/packages/new/photos/pages/duplicates.tsx
@@ -10,7 +10,7 @@ import {
 import { Ellipsized2LineTypography } from "@/base/components/Typography";
 import { useBaseContext } from "@/base/context";
 import log from "@/base/log";
-import { formattedByteSize } from "@/new/photos/utils/units";
+import { formattedByteSize } from "@/gallery/utils/units";
 import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import DoneIcon from "@mui/icons-material/Done";
 import RemoveCircleOutlineIcon from "@mui/icons-material/RemoveCircleOutline";

From 847e6474370aa58520bbe11cd495958ff2d731ef Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 17:01:04 +0530
Subject: [PATCH 549/796] Inline

---
 web/packages/gallery/components/FileInfo.tsx          | 10 +++++++++-
 web/packages/new/photos/components/mui/ChipButton.tsx |  8 --------
 2 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 web/packages/new/photos/components/mui/ChipButton.tsx

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 7666f1e6f6..51824dc887 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -43,7 +43,6 @@ import {
 } from "@/media/file-metadata";
 import { FileType } from "@/media/file-type";
 import { FileDateTimePicker } from "@/new/photos/components/FileDateTimePicker";
-import { ChipButton } from "@/new/photos/components/mui/ChipButton";
 import { FilePeopleList } from "@/new/photos/components/PeopleList";
 import {
     confirmDisableMapsDialogAttributes,
@@ -77,6 +76,7 @@ import TextSnippetOutlinedIcon from "@mui/icons-material/TextSnippetOutlined";
 import VideocamOutlinedIcon from "@mui/icons-material/VideocamOutlined";
 import {
     Box,
+    Button,
     CircularProgress,
     IconButton,
     Link,
@@ -84,6 +84,7 @@ import {
     styled,
     TextField,
     Typography,
+    type ButtonProps,
     type DialogProps,
 } from "@mui/material";
 import { Formik } from "formik";
@@ -1045,3 +1046,10 @@ const ExifItem = styled("div")`
     flex-direction: column;
     gap: 4px;
 `;
+
+const ChipButton = styled((props: ButtonProps) => (
+    <Button color="secondary" {...props} />
+))(({ theme }) => ({
+    ...theme.typography.small,
+    padding: "8px",
+}));
diff --git a/web/packages/new/photos/components/mui/ChipButton.tsx b/web/packages/new/photos/components/mui/ChipButton.tsx
deleted file mode 100644
index 2bf7ec7e6b..0000000000
--- a/web/packages/new/photos/components/mui/ChipButton.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Button, type ButtonProps, styled } from "@mui/material";
-
-export const ChipButton = styled((props: ButtonProps) => (
-    <Button color="secondary" {...props} />
-))(({ theme }) => ({
-    ...theme.typography.small,
-    padding: "8px",
-}));

From 3e527e3c41a1eb5c58fc849207afa3610c212aed Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 17:16:10 +0530
Subject: [PATCH 550/796] Rearrange

---
 web/packages/gallery/components/FileInfo.tsx | 87 +++++++++-----------
 1 file changed, 41 insertions(+), 46 deletions(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 51824dc887..7dbea1b971 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -559,17 +559,20 @@ const Caption: React.FC<CaptionProps> = ({
     scheduleUpdate,
     refreshPhotoswipe,
 }) => {
+    const { onGenericError } = useBaseContext();
+
     const [caption, setCaption] = useState(file.pubMagicMetadata?.data.caption);
+    const [isSaving, setIsSaving] = useState(false);
 
-    const [loading, setLoading] = useState(false);
+    const onSubmit = async (values: CaptionFormValues) => {
+        const newCaption = values.caption;
+        if (caption == newCaption) {
+            return;
+        }
 
-    const saveEdits = async (newCaption: string) => {
+        setIsSaving(true);
+        setCaption(newCaption);
         try {
-            if (caption === newCaption) {
-                return;
-            }
-            setCaption(newCaption);
-
             const updatedFile = await changeCaption(file, newCaption);
             updateExistingFilePubMetadata(file, updatedFile);
             // @ts-ignore
@@ -577,17 +580,9 @@ const Caption: React.FC<CaptionProps> = ({
             refreshPhotoswipe();
             scheduleUpdate();
         } catch (e) {
-            log.error("failed to update caption", e);
-        }
-    };
-
-    const onSubmit = async (values: CaptionFormValues) => {
-        try {
-            setLoading(true);
-            await saveEdits(values.caption);
-        } finally {
-            setLoading(false);
+            onGenericError(e);
         }
+        setIsSaving(false);
     };
 
     if (!caption?.length && !allowEdits) {
@@ -628,12 +623,12 @@ const Caption: React.FC<CaptionProps> = ({
                             onChange={handleChange("caption")}
                             error={Boolean(errors.caption)}
                             helperText={errors.caption}
-                            disabled={!allowEdits || loading}
+                            disabled={!allowEdits || isSaving}
                         />
                         {values.caption !== caption && (
                             <FlexWrapper justifyContent={"flex-end"}>
-                                <IconButton type="submit" disabled={loading}>
-                                    {loading ? (
+                                <IconButton type="submit" disabled={isSaving}>
+                                    {isSaving ? (
                                         <CircularProgress
                                             size={"18px"}
                                             color="inherit"
@@ -649,7 +644,7 @@ const Caption: React.FC<CaptionProps> = ({
                                             touched: { caption: false },
                                         })
                                     }
-                                    disabled={loading}
+                                    disabled={isSaving}
                                 >
                                     <CloseIcon />
                                 </IconButton>
@@ -686,35 +681,35 @@ const CreationTime: React.FC<CreationTimeProps> = ({
 
     const saveEdits = async (pickedTime: ParsedMetadataDate) => {
         setIsEditing(false);
-        setIsSaving(true);
 
         const { dateTime, timestamp: editedTime } = pickedTime;
-        if (editedTime != originalDate.getTime()) {
-            // If not same as before.
-            try {
-                // [Note: Don't modify offsetTime when editing date via picker]
-                //
-                // Use the updated date time (both in its canonical dateTime
-                // form, and also as in the epoch timestamp), but don't use the
-                // offset.
-                //
-                // The offset here will be the offset of the computer where this
-                // user is making this edit, not the offset of the place where
-                // the photo was taken. In a future iteration of the date time
-                // editor, we can provide functionality for the user to edit the
-                // associated offset, but right now it is not even surfaced, so
-                // don't also potentially overwrite it.
-                await updateRemotePublicMagicMetadata(file, {
-                    dateTime,
-                    editedTime,
-                });
-
-                scheduleUpdate();
-            } catch (e) {
-                onGenericError(e);
-            }
+        if (editedTime == originalDate.getTime()) {
+            // Same as before.
+            return;
         }
 
+        setIsSaving(true);
+        try {
+            // [Note: Don't modify offsetTime when editing date via picker]
+            //
+            // Use the updated date time (both in its canonical dateTime form,
+            // and also as in the epoch timestamp), but don't use the offset.
+            //
+            // The offset here will be the offset of the computer where this
+            // user is making this edit, not the offset of the place where the
+            // photo was taken. In a future iteration of the date time editor,
+            // we can provide functionality for the user to edit the associated
+            // offset, but right now it is not even surfaced, so don't also
+            // potentially overwrite it.
+            await updateRemotePublicMagicMetadata(file, {
+                dateTime,
+                editedTime,
+            });
+
+            scheduleUpdate();
+        } catch (e) {
+            onGenericError(e);
+        }
         setIsSaving(false);
     };
 

From 930bd4ce2ebd3439488ad54eac268657ac098422 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 17:27:34 +0530
Subject: [PATCH 551/796] Unwrap

---
 web/packages/gallery/components/FileInfo.tsx | 116 +++++++++----------
 1 file changed, 53 insertions(+), 63 deletions(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 7dbea1b971..ab48b259d8 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -87,7 +87,7 @@ import {
     type ButtonProps,
     type DialogProps,
 } from "@mui/material";
-import { Formik } from "formik";
+import { useFormik } from "formik";
 import { t } from "i18next";
 import React, { useEffect, useMemo, useRef, useState } from "react";
 import * as Yup from "yup";
@@ -540,7 +540,7 @@ const EditButton: React.FC<EditButtonProps> = ({ onClick, loading }) => (
 );
 
 interface CaptionFormValues {
-    caption: string;
+    caption: string | undefined;
 }
 
 type CaptionProps = Pick<
@@ -566,6 +566,7 @@ const Caption: React.FC<CaptionProps> = ({
 
     const onSubmit = async (values: CaptionFormValues) => {
         const newCaption = values.caption;
+        if (!newCaption) return;
         if (caption == newCaption) {
             return;
         }
@@ -585,74 +586,63 @@ const Caption: React.FC<CaptionProps> = ({
         setIsSaving(false);
     };
 
+    const { values, errors, handleChange, handleSubmit, resetForm } =
+        useFormik<CaptionFormValues>({
+            initialValues: { caption },
+            validationSchema: Yup.object().shape({
+                caption: Yup.string().max(5000, t("caption_character_limit")),
+            }),
+            validateOnBlur: false,
+            onSubmit,
+        });
+
     if (!caption?.length && !allowEdits) {
         return <></>;
     }
 
     return (
         <Box sx={{ p: 1 }}>
-            <Formik<CaptionFormValues>
-                // @ts-ignore
-                initialValues={{ caption }}
-                validationSchema={Yup.object().shape({
-                    caption: Yup.string().max(
-                        5000,
-                        t("caption_character_limit"),
-                    ),
-                })}
-                validateOnBlur={false}
-                onSubmit={onSubmit}
-            >
-                {({
-                    values,
-                    errors,
-                    handleChange,
-                    handleSubmit,
-                    resetForm,
-                }) => (
-                    <form noValidate onSubmit={handleSubmit}>
-                        <TextField
-                            hiddenLabel
-                            fullWidth
-                            id="caption"
-                            name="caption"
-                            type="text"
-                            multiline
-                            placeholder={t("caption_placeholder")}
-                            value={values.caption}
-                            onChange={handleChange("caption")}
-                            error={Boolean(errors.caption)}
-                            helperText={errors.caption}
-                            disabled={!allowEdits || isSaving}
-                        />
-                        {values.caption !== caption && (
-                            <FlexWrapper justifyContent={"flex-end"}>
-                                <IconButton type="submit" disabled={isSaving}>
-                                    {isSaving ? (
-                                        <CircularProgress
-                                            size={"18px"}
-                                            color="inherit"
-                                        />
-                                    ) : (
-                                        <DoneIcon />
-                                    )}
-                                </IconButton>
-                                <IconButton
-                                    onClick={() =>
-                                        resetForm({
-                                            values: { caption: caption ?? "" },
-                                            touched: { caption: false },
-                                        })
-                                    }
-                                    disabled={isSaving}
-                                >
-                                    <CloseIcon />
-                                </IconButton>
-                            </FlexWrapper>
-                        )}
-                    </form>
+            <form noValidate onSubmit={handleSubmit}>
+                <TextField
+                    hiddenLabel
+                    fullWidth
+                    id="caption"
+                    name="caption"
+                    type="text"
+                    multiline
+                    placeholder={t("caption_placeholder")}
+                    value={values.caption}
+                    onChange={handleChange("caption")}
+                    error={Boolean(errors.caption)}
+                    helperText={errors.caption}
+                    disabled={!allowEdits || isSaving}
+                />
+                {values.caption !== caption && (
+                    <FlexWrapper justifyContent={"flex-end"}>
+                        <IconButton type="submit" disabled={isSaving}>
+                            {isSaving ? (
+                                <CircularProgress
+                                    size={"18px"}
+                                    color="inherit"
+                                />
+                            ) : (
+                                <DoneIcon />
+                            )}
+                        </IconButton>
+                        <IconButton
+                            onClick={() =>
+                                resetForm({
+                                    values: { caption: caption ?? "" },
+                                    touched: { caption: false },
+                                })
+                            }
+                            disabled={isSaving}
+                        >
+                            <CloseIcon />
+                        </IconButton>
+                    </FlexWrapper>
                 )}
-            </Formik>
+            </form>
         </Box>
     );
 };

From 1bd44351d9b07f942f3fb2d3e107471693c02c78 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 25 Feb 2025 17:34:26 +0530
Subject: [PATCH 552/796] Unnest

---
 web/packages/gallery/components/FileInfo.tsx | 85 ++++++++++----------
 1 file changed, 42 insertions(+), 43 deletions(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index ab48b259d8..2aa845713a 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -601,52 +601,51 @@ const Caption: React.FC<CaptionProps> = ({
     }
 
     return (
-        <Box sx={{ p: 1 }}>
-            <form noValidate onSubmit={handleSubmit}>
-                <TextField
-                    hiddenLabel
-                    fullWidth
-                    id="caption"
-                    name="caption"
-                    type="text"
-                    multiline
-                    placeholder={t("caption_placeholder")}
-                    value={values.caption}
-                    onChange={handleChange("caption")}
-                    error={Boolean(errors.caption)}
-                    helperText={errors.caption}
-                    disabled={!allowEdits || isSaving}
-                />
-                {values.caption !== caption && (
-                    <FlexWrapper justifyContent={"flex-end"}>
-                        <IconButton type="submit" disabled={isSaving}>
-                            {isSaving ? (
-                                <CircularProgress
-                                    size={"18px"}
-                                    color="inherit"
-                                />
-                            ) : (
-                                <DoneIcon />
-                            )}
-                        </IconButton>
-                        <IconButton
-                            onClick={() =>
-                                resetForm({
-                                    values: { caption: caption ?? "" },
-                                    touched: { caption: false },
-                                })
-                            }
-                            disabled={isSaving}
-                        >
-                            <CloseIcon />
-                        </IconButton>
-                    </FlexWrapper>
-                )}
-            </form>
-        </Box>
+        <CaptionForm noValidate onSubmit={handleSubmit}>
+            <TextField
+                hiddenLabel
+                fullWidth
+                id="caption"
+                name="caption"
+                type="text"
+                multiline
+                placeholder={t("caption_placeholder")}
+                value={values.caption}
+                onChange={handleChange("caption")}
+                error={Boolean(errors.caption)}
+                helperText={errors.caption}
+                disabled={!allowEdits || isSaving}
+            />
+            {values.caption !== caption && (
+                <FlexWrapper justifyContent={"flex-end"}>
+                    <IconButton type="submit" disabled={isSaving}>
+                        {isSaving ? (
+                            <CircularProgress size={"18px"} color="inherit" />
+                        ) : (
+                            <DoneIcon />
+                        )}
+                    </IconButton>
+                    <IconButton
+                        onClick={() =>
+                            resetForm({
+                                values: { caption: caption ?? "" },
+                                touched: { caption: false },
+                            })
+                        }
+                        disabled={isSaving}
+                    >
+                        <CloseIcon />
+                    </IconButton>
+                </FlexWrapper>
+            )}
+        </CaptionForm>
     );
 };
 
+const CaptionForm = styled("form")(({ theme }) => ({
+    padding: theme.spacing(1),
+}));
+
 type CreationTimeProps = Pick<
     FileInfoProps,
     "allowEdits" | "scheduleUpdate"

From d5987dd882ae152df8f01226413db7d1d209cc9f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 10:53:24 +0530
Subject: [PATCH 553/796] rework rename dialog

---
 .../base/components/SingleInputDialog.tsx     |   4 +-
 .../base/components/SingleInputForm.tsx       |   9 +-
 web/packages/gallery/components/FileInfo.tsx  | 128 +++++++++---------
 3 files changed, 72 insertions(+), 69 deletions(-)

diff --git a/web/packages/base/components/SingleInputDialog.tsx b/web/packages/base/components/SingleInputDialog.tsx
index aa45ab65ad..6e9d42724c 100644
--- a/web/packages/base/components/SingleInputDialog.tsx
+++ b/web/packages/base/components/SingleInputDialog.tsx
@@ -13,8 +13,8 @@ type SingleInputDialogProps = ModalVisibilityProps &
  * A dialog that can be used to ask for a single text input using a
  * {@link SingleInputForm}.
  *
- * If the submission handler provided to this component resolves successfully,
- * then the dialog is closed.
+ * The dialog closes when the promise returned by the {@link onSubmit} callback
+ * fulfills.
  *
  * See also: {@link CollectionNamer}, its older sibling.
  */
diff --git a/web/packages/base/components/SingleInputForm.tsx b/web/packages/base/components/SingleInputForm.tsx
index 5b97c50109..8ab4adbb60 100644
--- a/web/packages/base/components/SingleInputForm.tsx
+++ b/web/packages/base/components/SingleInputForm.tsx
@@ -8,7 +8,7 @@ import React from "react";
 
 export type SingleInputFormProps = Pick<
     TextFieldProps,
-    "label" | "placeholder" | "autoComplete" | "autoFocus"
+    "label" | "placeholder" | "autoComplete" | "autoFocus" | "slotProps"
 > & {
     /**
      * The initial value, if any, to prefill in the input.
@@ -43,9 +43,8 @@ export type SingleInputFormProps = Pick<
  * A TextField and two buttons.
  *
  * A common requirement is taking a single textual input from the user. This is
- * a form suitable for that purpose - it is form containing a single MUI
- * {@link TextField}, with two accompanying buttons; one to submit, and one to
- * cancel.
+ * a form suitable for that purpose. It contains a single MUI {@link TextField}
+ * and two accompanying buttons; one to submit, and one to cancel.
  *
  * Submission is handled as an async function, during which the input is
  * disabled and a loading indicator is shown. Errors during submission are shown
@@ -107,7 +106,7 @@ export const SingleInputForm: React.FC<SingleInputFormProps> = ({
                 </FocusVisibleButton>
                 <LoadingButton
                     fullWidth
-                    color="accent"
+                    color="primary"
                     type="submit"
                     loading={formik.isSubmitting}
                 >
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 2aa845713a..44064bee0b 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -12,6 +12,7 @@ import { TitledMiniDialog } from "@/base/components/MiniDialog";
 import { type ButtonishProps } from "@/base/components/mui";
 import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
 import { SidebarDrawer } from "@/base/components/mui/SidebarDrawer";
+import { SingleInputForm } from "@/base/components/SingleInputForm";
 import { Titlebar } from "@/base/components/Titlebar";
 import { EllipsizedTypography } from "@/base/components/Typography";
 import {
@@ -22,7 +23,6 @@ import { useBaseContext } from "@/base/context";
 import { haveWindow } from "@/base/env";
 import { nameAndExtension } from "@/base/file-name";
 import { formattedDate, formattedTime } from "@/base/i18n-date";
-import log from "@/base/log";
 import type { Location } from "@/base/types";
 import { CopyButton } from "@/gallery/components/FileInfoComponents";
 import { tagNumericValue, type RawExifTags } from "@/gallery/services/exif";
@@ -60,9 +60,6 @@ import {
 } from "@/new/photos/services/ml";
 import { updateMapEnabled } from "@/new/photos/services/settings";
 import { FlexWrapper } from "@ente/shared/components/Container";
-import SingleInputForm, {
-    type SingleInputFormProps,
-} from "@ente/shared/components/SingleInputForm";
 import CalendarTodayIcon from "@mui/icons-material/CalendarToday";
 import CameraOutlinedIcon from "@mui/icons-material/CameraOutlined";
 import CloseIcon from "@mui/icons-material/Close";
@@ -79,6 +76,7 @@ import {
     Button,
     CircularProgress,
     IconButton,
+    InputAdornment,
     Link,
     Stack,
     styled,
@@ -739,26 +737,13 @@ const FileName: React.FC<FileNameProps> = ({
     allowEdits,
     scheduleUpdate,
 }) => {
-    const [isInEditMode, setIsInEditMode] = useState(false);
-    const openEditMode = () => setIsInEditMode(true);
-    const closeEditMode = () => setIsInEditMode(false);
-    const [fileName, setFileName] = useState<string>();
-    const [extension, setExtension] = useState<string>();
+    const { show: showRename, props: renameVisibilityProps } =
+        useModalVisibility();
 
-    useEffect(() => {
-        const [filename, extension] = nameAndExtension(file.metadata.title);
-        setFileName(filename);
-        setExtension(extension);
-    }, [file]);
+    const fileName = file.metadata.title;
 
-    const saveEdits = async (newFilename: string) => {
-        if (fileName === newFilename) {
-            closeEditMode();
-            return;
-        }
-        setFileName(newFilename);
-        const newTitle = [newFilename, extension].join(".");
-        const updatedFile = await changeFileName(file, newTitle);
+    const handleRename = async (newFileName: string) => {
+        const updatedFile = await changeFileName(file, newFileName);
         updateExistingFilePubMetadata(file, updatedFile);
         scheduleUpdate();
     };
@@ -781,18 +766,16 @@ const FileName: React.FC<FileNameProps> = ({
         <>
             <InfoItem
                 icon={icon}
-                title={[fileName, extension].join(".")}
+                title={fileName}
                 caption={caption}
                 trailingButton={
-                    allowEdits && <EditButton onClick={openEditMode} />
+                    allowEdits && <EditButton onClick={showRename} />
                 }
             />
-            <FileNameEditDialog
-                isInEditMode={isInEditMode}
-                closeEditMode={closeEditMode}
-                filename={fileName!}
-                extension={extension}
-                saveEdits={saveEdits}
+            <RenameFileDialog
+                {...renameVisibilityProps}
+                fileName={fileName}
+                onRename={handleRename}
             />
         </>
     );
@@ -810,49 +793,70 @@ const createMultipartCaption = (
     </Stack>
 );
 
-interface FileNameEditDialogProps {
-    isInEditMode: boolean;
-    closeEditMode: () => void;
-    filename: string;
-    extension: string | undefined;
-    saveEdits: (name: string) => Promise<void>;
-}
+type RenameFileDialogProps = ModalVisibilityProps & {
+    /**
+     * The current name of the file.
+     */
+    fileName: string;
+    /**
+     * Called when the user makes a change to the existing name and activates the
+     * rename button on the dialog.
+     *
+     * @param newFileName The changed name. The extension currently cannot be
+     * modified, but it is guaranteed the name component of {@link newFileName}
+     * will be different from that of the {@link fileName} prop of the dialog.
+     *
+     * Until the promise settles, the dialog will show an activity indicator. If
+     * the promise rejects, it will also show an error. If the promise is
+     * fulfilled, then the dialog will also be closed.
+     *
+     * The dialog will also be closed if the user activates the rename button
+     * without changing the name.
+     */
+    onRename: (newFileName: string) => Promise<void>;
+};
 
-const FileNameEditDialog: React.FC<FileNameEditDialogProps> = ({
-    isInEditMode,
-    closeEditMode,
-    filename,
-    extension,
-    saveEdits,
+const RenameFileDialog: React.FC<RenameFileDialogProps> = ({
+    open,
+    onClose,
+    fileName,
+    onRename,
 }) => {
-    const onSubmit: SingleInputFormProps["callback"] = async (
-        filename,
-        setFieldError,
-    ) => {
-        try {
-            await saveEdits(filename);
-            closeEditMode();
-        } catch (e) {
-            log.error(e);
-            setFieldError(t("generic_error_retry"));
+    const [name, extension] = nameAndExtension(fileName);
+
+    const handleSubmit = async (newName: string) => {
+        const newFileName = [newName, extension].filter((x) => !!x).join(".");
+        if (newFileName != fileName) {
+            await onRename(newFileName);
         }
+        onClose();
     };
+
     return (
         <TitledMiniDialog
+            {...{ open, onClose }}
             sx={{ zIndex: aboveFileViewerContentZ }}
-            open={isInEditMode}
-            onClose={closeEditMode}
             title={t("rename_file")}
         >
             <SingleInputForm
-                initialValue={filename}
-                callback={onSubmit}
+                label={t("file_name")}
                 placeholder={t("enter_file_name")}
-                buttonText={t("rename")}
-                fieldType="text"
-                caption={extension}
-                secondaryButtonAction={closeEditMode}
-                submitButtonProps={{ sx: { mt: 1, mb: 2 } }}
+                autoFocus
+                initialValue={name}
+                submitButtonTitle={t("rename")}
+                onSubmit={handleSubmit}
+                onCancel={onClose}
+                slotProps={{
+                    input: {
+                        // Align the adornment text to the input text.
+                        sx: { alignItems: "baseline" },
+                        endAdornment: extension && (
+                            <InputAdornment position="end">
+                                {`.${extension}`}
+                            </InputAdornment>
+                        ),
+                    },
+                }}
             />
         </TitledMiniDialog>
     );

From d0f30a119888596153afd45c1378503df6bab3d9 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 12:06:01 +0530
Subject: [PATCH 554/796] Wider

---
 web/packages/gallery/components/FileInfo.tsx | 56 +++++++++++---------
 1 file changed, 32 insertions(+), 24 deletions(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 44064bee0b..4898225c1e 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -8,7 +8,6 @@ Plan of action:
 */
 
 import { LinkButtonUndecorated } from "@/base/components/LinkButton";
-import { TitledMiniDialog } from "@/base/components/MiniDialog";
 import { type ButtonishProps } from "@/base/components/mui";
 import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
 import { SidebarDrawer } from "@/base/components/mui/SidebarDrawer";
@@ -75,6 +74,9 @@ import {
     Box,
     Button,
     CircularProgress,
+    Dialog,
+    DialogContent,
+    DialogTitle,
     IconButton,
     InputAdornment,
     Link,
@@ -833,32 +835,38 @@ const RenameFileDialog: React.FC<RenameFileDialogProps> = ({
     };
 
     return (
-        <TitledMiniDialog
+        <Dialog
             {...{ open, onClose }}
             sx={{ zIndex: aboveFileViewerContentZ }}
-            title={t("rename_file")}
+            fullWidth
+            maxWidth="xs"
         >
-            <SingleInputForm
-                label={t("file_name")}
-                placeholder={t("enter_file_name")}
-                autoFocus
-                initialValue={name}
-                submitButtonTitle={t("rename")}
-                onSubmit={handleSubmit}
-                onCancel={onClose}
-                slotProps={{
-                    input: {
-                        // Align the adornment text to the input text.
-                        sx: { alignItems: "baseline" },
-                        endAdornment: extension && (
-                            <InputAdornment position="end">
-                                {`.${extension}`}
-                            </InputAdornment>
-                        ),
-                    },
-                }}
-            />
-        </TitledMiniDialog>
+            <DialogTitle sx={{ "&&&": { paddingBlock: "26px 0px" } }}>
+                {t("rename_file")}
+            </DialogTitle>
+            <DialogContent>
+                <SingleInputForm
+                    label={t("file_name")}
+                    placeholder={t("enter_file_name")}
+                    autoFocus
+                    initialValue={name}
+                    submitButtonTitle={t("rename")}
+                    onSubmit={handleSubmit}
+                    onCancel={onClose}
+                    slotProps={{
+                        input: {
+                            // Align the adornment text to the input text.
+                            sx: { alignItems: "baseline" },
+                            endAdornment: extension && (
+                                <InputAdornment position="end">
+                                    {`.${extension}`}
+                                </InputAdornment>
+                            ),
+                        },
+                    }}
+                />
+            </DialogContent>
+        </Dialog>
     );
 };
 

From a157273b42f8d5a65abc5877de2f2182b340ef09 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 12:54:31 +0530
Subject: [PATCH 555/796] Remove spurious error on saving edited file in
 desktop

---
 web/apps/photos/src/services/upload/uploadManager.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/web/apps/photos/src/services/upload/uploadManager.ts b/web/apps/photos/src/services/upload/uploadManager.ts
index 46e72fa316..42f05604f8 100644
--- a/web/apps/photos/src/services/upload/uploadManager.ts
+++ b/web/apps/photos/src/services/upload/uploadManager.ts
@@ -844,8 +844,15 @@ const markUploaded = async (electron: Electron, item: ClusteredUploadItem) => {
         } else if (p && typeof p == "object" && "path" in p) {
             electron.markUploadedFiles([p.path]);
         } else {
-            throw new Error(
-                "Attempting to mark upload completion of unexpected desktop upload items",
+            // We can come here when the user saves an image they've edited, in
+            // which case `item` will be a web File object which won't have a
+            // path. Such a la carte uploads don't mark the file as pending
+            // anyways, so there isn't anything to do also.
+            //
+            // Keeping a log here, though really the upper layers of the code
+            // need to be reworked so that we don't even get here in such cases.
+            log.info(
+                "Ignoring attempt to mark upload completion of (likely edited) item",
             );
         }
     }

From 33e7ccb9ae30f91479729ac8c90805d0ddaee911 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 13:52:24 +0530
Subject: [PATCH 556/796] Extract

---
 web/packages/gallery/components/FileInfo.tsx | 83 ++++++++++++--------
 1 file changed, 51 insertions(+), 32 deletions(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 4898225c1e..37a1dbc30a 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -230,7 +230,7 @@ export const FileInfo: React.FC<FileInfoProps> = ({
     }
 
     return (
-        <FileInfoSidebar open={open} onClose={onClose}>
+        <FileInfoSidebar {...{ open, onClose }}>
             <Titlebar onClose={onClose} title={t("info")} backIsClose />
             <Stack sx={{ pt: 1, pb: 3, gap: "20px" }}>
                 <Caption
@@ -329,37 +329,14 @@ export const FileInfo: React.FC<FileInfoProps> = ({
                     fileCollectionIDs &&
                     allCollectionsNameByID &&
                     onSelectCollection && (
-                        <InfoItem icon={<FolderOutlinedIcon />}>
-                            <Stack
-                                direction="row"
-                                sx={{
-                                    gap: 1,
-                                    flexWrap: "wrap",
-                                    justifyContent: "flex-start",
-                                    alignItems: "flex-start",
-                                }}
-                            >
-                                {fileCollectionIDs
-                                    .get(file.id)
-                                    ?.filter((collectionID) =>
-                                        allCollectionsNameByID.has(
-                                            collectionID,
-                                        ),
-                                    )
-                                    .map((collectionID) => (
-                                        <ChipButton
-                                            key={collectionID}
-                                            onClick={() =>
-                                                onSelectCollection(collectionID)
-                                            }
-                                        >
-                                            {allCollectionsNameByID.get(
-                                                collectionID,
-                                            )}
-                                        </ChipButton>
-                                    ))}
-                            </Stack>
-                        </InfoItem>
+                        <Albums
+                            {...{
+                                file,
+                                fileCollectionIDs,
+                                allCollectionsNameByID,
+                                onSelectCollection,
+                            }}
+                        />
                     )}
             </Stack>
             <RawExif
@@ -1043,6 +1020,48 @@ const ExifItem = styled("div")`
     gap: 4px;
 `;
 
+type AlbumsProps = Required<
+    Pick<
+        FileInfoProps,
+        "fileCollectionIDs" | "allCollectionsNameByID" | "onSelectCollection"
+    >
+> & {
+    file: EnteFile;
+};
+
+const Albums: React.FC<AlbumsProps> = ({
+    file,
+    fileCollectionIDs,
+    allCollectionsNameByID,
+    onSelectCollection,
+}) => (
+    <InfoItem icon={<FolderOutlinedIcon />}>
+        <Stack
+            direction="row"
+            sx={{
+                gap: 1,
+                flexWrap: "wrap",
+                justifyContent: "flex-start",
+                alignItems: "flex-start",
+            }}
+        >
+            {fileCollectionIDs
+                .get(file.id)
+                ?.filter((collectionID) =>
+                    allCollectionsNameByID.has(collectionID),
+                )
+                .map((collectionID) => (
+                    <ChipButton
+                        key={collectionID}
+                        onClick={() => onSelectCollection(collectionID)}
+                    >
+                        {allCollectionsNameByID.get(collectionID)}
+                    </ChipButton>
+                ))}
+        </Stack>
+    </InfoItem>
+);
+
 const ChipButton = styled((props: ButtonProps) => (
     <Button color="secondary" {...props} />
 ))(({ theme }) => ({

From 96b9743270cc3b2cd08fb77333ac18b43842926b Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 14:59:31 +0530
Subject: [PATCH 557/796] cap1

---
 web/packages/gallery/components/FileInfo.tsx | 69 ++++++++++----------
 1 file changed, 36 insertions(+), 33 deletions(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 37a1dbc30a..64665c49bb 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -87,7 +87,7 @@ import {
     type ButtonProps,
     type DialogProps,
 } from "@mui/material";
-import { useFormik } from "formik";
+import { useFormik, type FormikHelpers } from "formik";
 import { t } from "i18next";
 import React, { useEffect, useMemo, useRef, useState } from "react";
 import * as Yup from "yup";
@@ -538,42 +538,45 @@ const Caption: React.FC<CaptionProps> = ({
 }) => {
     const { onGenericError } = useBaseContext();
 
-    const [caption, setCaption] = useState(file.pubMagicMetadata?.data.caption);
     const [isSaving, setIsSaving] = useState(false);
 
-    const onSubmit = async (values: CaptionFormValues) => {
-        const newCaption = values.caption;
-        if (!newCaption) return;
-        if (caption == newCaption) {
-            return;
-        }
+    const caption = file.pubMagicMetadata?.data.caption ?? "";
 
-        setIsSaving(true);
-        setCaption(newCaption);
-        try {
-            const updatedFile = await changeCaption(file, newCaption);
-            updateExistingFilePubMetadata(file, updatedFile);
-            // @ts-ignore
-            file.title = file.pubMagicMetadata.data.caption;
-            refreshPhotoswipe();
-            scheduleUpdate();
-        } catch (e) {
-            onGenericError(e);
-        }
-        setIsSaving(false);
-    };
+    const formik = useFormik<CaptionFormValues>({
+        initialValues: { caption },
+        validationSchema: Yup.object().shape({
+            caption: Yup.string().max(5000, t("caption_character_limit")),
+        }),
+        validateOnBlur: false,
+        onSubmit: async (
+            values: CaptionFormValues,
+            { setFieldError }: FormikHelpers<CaptionFormValues>,
+        ) => {
+            // TODO
+            const newCaption = values.caption!;
+            if (newCaption == caption) {
+                // Same as before.
+                return;
+            }
 
-    const { values, errors, handleChange, handleSubmit, resetForm } =
-        useFormik<CaptionFormValues>({
-            initialValues: { caption },
-            validationSchema: Yup.object().shape({
-                caption: Yup.string().max(5000, t("caption_character_limit")),
-            }),
-            validateOnBlur: false,
-            onSubmit,
-        });
+            setIsSaving(true);
+            try {
+                const updatedFile = await changeCaption(file, newCaption);
+                updateExistingFilePubMetadata(file, updatedFile);
+                // @ts-ignore
+                file.title = file.pubMagicMetadata.data.caption;
+                refreshPhotoswipe();
+                scheduleUpdate();
+            } catch (e) {
+                setFieldError("caption", t("generic_error"));
+            }
+            setIsSaving(false);
+        },
+    });
 
-    if (!caption?.length && !allowEdits) {
+    const { values, errors, handleChange, handleSubmit, resetForm } = formik;
+
+    if (!caption.length && !allowEdits) {
         return <></>;
     }
 
@@ -605,7 +608,7 @@ const Caption: React.FC<CaptionProps> = ({
                     <IconButton
                         onClick={() =>
                             resetForm({
-                                values: { caption: caption ?? "" },
+                                values: { caption },
                                 touched: { caption: false },
                             })
                         }

From 26c4481658a5eaa254212d36c75138adc938de0c Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 15:05:45 +0530
Subject: [PATCH 558/796] cap2

---
 web/packages/gallery/components/FileInfo.tsx | 27 ++++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 64665c49bb..21bff68936 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -58,7 +58,6 @@ import {
     type AnnotatedFaceID,
 } from "@/new/photos/services/ml";
 import { updateMapEnabled } from "@/new/photos/services/settings";
-import { FlexWrapper } from "@ente/shared/components/Container";
 import CalendarTodayIcon from "@mui/icons-material/CalendarToday";
 import CameraOutlinedIcon from "@mui/icons-material/CameraOutlined";
 import CloseIcon from "@mui/icons-material/Close";
@@ -93,6 +92,7 @@ import React, { useEffect, useMemo, useRef, useState } from "react";
 import * as Yup from "yup";
 
 // Re-uses images from ~leaflet package.
+import log from "@/base/log";
 import "leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css";
 import "leaflet/dist/leaflet.css";
 // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-unused-expressions
@@ -536,8 +536,6 @@ const Caption: React.FC<CaptionProps> = ({
     scheduleUpdate,
     refreshPhotoswipe,
 }) => {
-    const { onGenericError } = useBaseContext();
-
     const [isSaving, setIsSaving] = useState(false);
 
     const caption = file.pubMagicMetadata?.data.caption ?? "";
@@ -565,11 +563,12 @@ const Caption: React.FC<CaptionProps> = ({
                 updateExistingFilePubMetadata(file, updatedFile);
                 // @ts-ignore
                 file.title = file.pubMagicMetadata.data.caption;
-                refreshPhotoswipe();
-                scheduleUpdate();
             } catch (e) {
+                log.error("Failed to update caption", e);
                 setFieldError("caption", t("generic_error"));
             }
+            refreshPhotoswipe();
+            scheduleUpdate();
             setIsSaving(false);
         },
     });
@@ -583,24 +582,25 @@ const Caption: React.FC<CaptionProps> = ({
     return (
         <CaptionForm noValidate onSubmit={handleSubmit}>
             <TextField
-                hiddenLabel
-                fullWidth
                 id="caption"
                 name="caption"
                 type="text"
                 multiline
+                aria-label={t("description")}
+                hiddenLabel
+                fullWidth
                 placeholder={t("caption_placeholder")}
                 value={values.caption}
                 onChange={handleChange("caption")}
-                error={Boolean(errors.caption)}
+                error={!!errors.caption}
                 helperText={errors.caption}
                 disabled={!allowEdits || isSaving}
             />
-            {values.caption !== caption && (
-                <FlexWrapper justifyContent={"flex-end"}>
+            {values.caption != caption && (
+                <Stack direction="row" sx={{ justifyContent: "flex-end" }}>
                     <IconButton type="submit" disabled={isSaving}>
                         {isSaving ? (
-                            <CircularProgress size={"18px"} color="inherit" />
+                            <CircularProgress size="18px" color="inherit" />
                         ) : (
                             <DoneIcon />
                         )}
@@ -616,7 +616,7 @@ const Caption: React.FC<CaptionProps> = ({
                     >
                         <CloseIcon />
                     </IconButton>
-                </FlexWrapper>
+                </Stack>
             )}
         </CaptionForm>
     );
@@ -674,11 +674,10 @@ const CreationTime: React.FC<CreationTimeProps> = ({
                 dateTime,
                 editedTime,
             });
-
-            scheduleUpdate();
         } catch (e) {
             onGenericError(e);
         }
+        scheduleUpdate();
         setIsSaving(false);
     };
 

From c70fa4391c587b228cb0eac14c5a1f4eed87a494 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 15:22:02 +0530
Subject: [PATCH 559/796] cap fin

---
 web/packages/gallery/components/FileInfo.tsx | 51 +++++++-------------
 1 file changed, 17 insertions(+), 34 deletions(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 21bff68936..271aa98a92 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -22,6 +22,7 @@ import { useBaseContext } from "@/base/context";
 import { haveWindow } from "@/base/env";
 import { nameAndExtension } from "@/base/file-name";
 import { formattedDate, formattedTime } from "@/base/i18n-date";
+import log from "@/base/log";
 import type { Location } from "@/base/types";
 import { CopyButton } from "@/gallery/components/FileInfoComponents";
 import { tagNumericValue, type RawExifTags } from "@/gallery/services/exif";
@@ -86,13 +87,11 @@ import {
     type ButtonProps,
     type DialogProps,
 } from "@mui/material";
-import { useFormik, type FormikHelpers } from "formik";
+import { useFormik } from "formik";
 import { t } from "i18next";
 import React, { useEffect, useMemo, useRef, useState } from "react";
-import * as Yup from "yup";
 
 // Re-uses images from ~leaflet package.
-import log from "@/base/log";
 import "leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css";
 import "leaflet/dist/leaflet.css";
 // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-unused-expressions
@@ -516,10 +515,6 @@ const EditButton: React.FC<EditButtonProps> = ({ onClick, loading }) => (
     </IconButton>
 );
 
-interface CaptionFormValues {
-    caption: string | undefined;
-}
-
 type CaptionProps = Pick<
     FileInfoProps,
     "allowEdits" | "scheduleUpdate" | "refreshPhotoswipe"
@@ -540,23 +535,14 @@ const Caption: React.FC<CaptionProps> = ({
 
     const caption = file.pubMagicMetadata?.data.caption ?? "";
 
-    const formik = useFormik<CaptionFormValues>({
+    const formik = useFormik<{ caption: string }>({
         initialValues: { caption },
-        validationSchema: Yup.object().shape({
-            caption: Yup.string().max(5000, t("caption_character_limit")),
-        }),
-        validateOnBlur: false,
-        onSubmit: async (
-            values: CaptionFormValues,
-            { setFieldError }: FormikHelpers<CaptionFormValues>,
-        ) => {
-            // TODO
-            const newCaption = values.caption!;
-            if (newCaption == caption) {
-                // Same as before.
-                return;
-            }
-
+        validate: ({ caption }) =>
+            caption.length > 5000
+                ? { caption: t("caption_character_limit") }
+                : {},
+        onSubmit: async ({ caption: newCaption }, { setFieldError }) => {
+            if (newCaption == caption) return;
             setIsSaving(true);
             try {
                 const updatedFile = await changeCaption(file, newCaption);
@@ -580,7 +566,7 @@ const Caption: React.FC<CaptionProps> = ({
     }
 
     return (
-        <CaptionForm noValidate onSubmit={handleSubmit}>
+        <CaptionForm onSubmit={handleSubmit}>
             <TextField
                 id="caption"
                 name="caption"
@@ -598,22 +584,19 @@ const Caption: React.FC<CaptionProps> = ({
             />
             {values.caption != caption && (
                 <Stack direction="row" sx={{ justifyContent: "flex-end" }}>
-                    <IconButton type="submit" disabled={isSaving}>
+                    <IconButton
+                        type="submit"
+                        disabled={isSaving}
+                        // Prevent layout shift when we're showing progress.
+                        sx={{ minWidth: "48px" }}
+                    >
                         {isSaving ? (
                             <CircularProgress size="18px" color="inherit" />
                         ) : (
                             <DoneIcon />
                         )}
                     </IconButton>
-                    <IconButton
-                        onClick={() =>
-                            resetForm({
-                                values: { caption },
-                                touched: { caption: false },
-                            })
-                        }
-                        disabled={isSaving}
-                    >
+                    <IconButton onClick={() => resetForm()} disabled={isSaving}>
                         <CloseIcon />
                     </IconButton>
                 </Stack>

From 00939ff2b8b2b4da0e009c698a99eebdf9a3ce08 Mon Sep 17 00:00:00 2001
From: Crowdin Bot <support+bot@crowdin.com>
Date: Wed, 26 Feb 2025 10:10:18 +0000
Subject: [PATCH 560/796] New Crowdin translations by GitHub Action

---
 web/packages/base/locales/ja-JP/translation.json | 6 +++---
 web/packages/base/locales/ru-RU/translation.json | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/packages/base/locales/ja-JP/translation.json b/web/packages/base/locales/ja-JP/translation.json
index 858c664895..7cbe8c539c 100644
--- a/web/packages/base/locales/ja-JP/translation.json
+++ b/web/packages/base/locales/ja-JP/translation.json
@@ -66,7 +66,7 @@
         "5": "バックアップが完了しました"
     },
     "FILE_NOT_UPLOADED_LIST": "次のファイルはアップロードされませんでした",
-    "initial_load_delay_warning": "最初の負荷に時間がかかる場合があります",
+    "initial_load_delay_warning": "最初の読み込みには時間がかかる場合があります",
     "no_account": "アカウントがありませんか",
     "existing_account": "既にアカウントをお持ちの方",
     "create": "作成",
@@ -458,7 +458,7 @@
     "upgrade_now": "今すぐアップグレード",
     "renew_now": "今すぐ更新",
     "storage": "ストレージ",
-    "used": "使用中",
+    "used": "used",
     "you": "あなた",
     "family": "ファミリー",
     "free": "free",
@@ -519,7 +519,7 @@
     "passphrase_strength_strong": "パスワード強度: 強い",
     "preferences": "設定",
     "language": "言語",
-    "advanced": "アドバンスド",
+    "advanced": "高度な設定",
     "export_directory_does_not_exist": "無効なエクスポートディレクトリ",
     "export_directory_does_not_exist_message": "<p>選択したエクスポートディレクトリは存在しません。</p><p>有効なディレクトリを選択してください。</p>",
     "storage_unit": {
diff --git a/web/packages/base/locales/ru-RU/translation.json b/web/packages/base/locales/ru-RU/translation.json
index 72b201dd78..d8f2c015dc 100644
--- a/web/packages/base/locales/ru-RU/translation.json
+++ b/web/packages/base/locales/ru-RU/translation.json
@@ -430,7 +430,7 @@
     "lock": "Замок",
     "file": "Файл",
     "folder": "Папка",
-    "google_takeout": "Еда на вынос из Google",
+    "google_takeout": "Загрузить из Google",
     "deduplicate_files": "Проверить файлы на дубликаты",
     "remove_duplicates": "Удалить дубликаты",
     "total_size": "Общий размер",

From e7d0977346f1cd9e074ae846aa55431800134210 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 15:47:07 +0530
Subject: [PATCH 561/796] [web] Consolidated duplicated translation key

---
 web/packages/base/locales/ar-SA/translation.json | 1 -
 web/packages/base/locales/be-BY/translation.json | 3 +--
 web/packages/base/locales/bg-BG/translation.json | 1 -
 web/packages/base/locales/ca-ES/translation.json | 1 -
 web/packages/base/locales/cs-CZ/translation.json | 1 -
 web/packages/base/locales/da-DK/translation.json | 1 -
 web/packages/base/locales/de-DE/translation.json | 1 -
 web/packages/base/locales/el-GR/translation.json | 1 -
 web/packages/base/locales/en-US/translation.json | 1 -
 web/packages/base/locales/es-ES/translation.json | 1 -
 web/packages/base/locales/et-EE/translation.json | 1 -
 web/packages/base/locales/fa-IR/translation.json | 1 -
 web/packages/base/locales/fi-FI/translation.json | 3 +--
 web/packages/base/locales/fr-FR/translation.json | 1 -
 web/packages/base/locales/gu-IN/translation.json | 1 -
 web/packages/base/locales/hi-IN/translation.json | 1 -
 web/packages/base/locales/hu-HU/translation.json | 1 -
 web/packages/base/locales/id-ID/translation.json | 1 -
 web/packages/base/locales/is-IS/translation.json | 1 -
 web/packages/base/locales/it-IT/translation.json | 1 -
 web/packages/base/locales/ja-JP/translation.json | 1 -
 web/packages/base/locales/ko-KR/translation.json | 3 +--
 web/packages/base/locales/lt-LT/translation.json | 1 -
 web/packages/base/locales/ml-IN/translation.json | 1 -
 web/packages/base/locales/nl-NL/translation.json | 1 -
 web/packages/base/locales/pl-PL/translation.json | 1 -
 web/packages/base/locales/pt-BR/translation.json | 1 -
 web/packages/base/locales/pt-PT/translation.json | 1 -
 web/packages/base/locales/ro-RO/translation.json | 1 -
 web/packages/base/locales/ru-RU/translation.json | 2 --
 web/packages/base/locales/sl-SI/translation.json | 1 -
 web/packages/base/locales/sv-SE/translation.json | 1 -
 web/packages/base/locales/ta-IN/translation.json | 1 -
 web/packages/base/locales/te-IN/translation.json | 1 -
 web/packages/base/locales/th-TH/translation.json | 1 -
 web/packages/base/locales/ti-ER/translation.json | 1 -
 web/packages/base/locales/tr-TR/translation.json | 3 +--
 web/packages/base/locales/uk-UA/translation.json | 1 -
 web/packages/base/locales/vi-VN/translation.json | 1 -
 web/packages/base/locales/zh-CN/translation.json | 1 -
 web/packages/base/locales/zh-HK/translation.json | 1 -
 web/packages/gallery/components/FileInfo.tsx     | 2 +-
 42 files changed, 5 insertions(+), 47 deletions(-)

diff --git a/web/packages/base/locales/ar-SA/translation.json b/web/packages/base/locales/ar-SA/translation.json
index e152a97313..ea5e46f77d 100644
--- a/web/packages/base/locales/ar-SA/translation.json
+++ b/web/packages/base/locales/ar-SA/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "إنشاء ألبومات",
     "enter_album_name": "اسم الألبوم",
     "close_key": "إغلاق (Esc)",
-    "enter_file_name": "إسم الملف",
     "close": "إغلاق",
     "yes": "",
     "no": "لا",
diff --git a/web/packages/base/locales/be-BY/translation.json b/web/packages/base/locales/be-BY/translation.json
index 01bdba40e8..9da59ce6e9 100644
--- a/web/packages/base/locales/be-BY/translation.json
+++ b/web/packages/base/locales/be-BY/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "Назва файла",
     "close": "Закрыць",
     "yes": "",
     "no": "Не",
@@ -250,7 +249,7 @@
     "people_suggestions_empty": "",
     "info": "",
     "info_key": "",
-    "file_name": "",
+    "file_name": "Назва файла",
     "caption_placeholder": "",
     "location": "",
     "view_on_map": "",
diff --git a/web/packages/base/locales/bg-BG/translation.json b/web/packages/base/locales/bg-BG/translation.json
index 9ed4650e5c..51f0fe3746 100644
--- a/web/packages/base/locales/bg-BG/translation.json
+++ b/web/packages/base/locales/bg-BG/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "",
     "yes": "",
     "no": "",
diff --git a/web/packages/base/locales/ca-ES/translation.json b/web/packages/base/locales/ca-ES/translation.json
index 7a74514e05..a429ed19f7 100644
--- a/web/packages/base/locales/ca-ES/translation.json
+++ b/web/packages/base/locales/ca-ES/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "",
     "yes": "",
     "no": "",
diff --git a/web/packages/base/locales/cs-CZ/translation.json b/web/packages/base/locales/cs-CZ/translation.json
index 7a74514e05..a429ed19f7 100644
--- a/web/packages/base/locales/cs-CZ/translation.json
+++ b/web/packages/base/locales/cs-CZ/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "",
     "yes": "",
     "no": "",
diff --git a/web/packages/base/locales/da-DK/translation.json b/web/packages/base/locales/da-DK/translation.json
index b684b4930f..32ca2ba14b 100644
--- a/web/packages/base/locales/da-DK/translation.json
+++ b/web/packages/base/locales/da-DK/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "",
     "yes": "",
     "no": "",
diff --git a/web/packages/base/locales/de-DE/translation.json b/web/packages/base/locales/de-DE/translation.json
index bd3c6f6710..0e758fc41a 100644
--- a/web/packages/base/locales/de-DE/translation.json
+++ b/web/packages/base/locales/de-DE/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "Alben erstellen",
     "enter_album_name": "Albumname",
     "close_key": "Schließen (Esc)",
-    "enter_file_name": "Dateiname",
     "close": "Schließen",
     "yes": "",
     "no": "Nein",
diff --git a/web/packages/base/locales/el-GR/translation.json b/web/packages/base/locales/el-GR/translation.json
index 0b678d49e6..d3e4edb38b 100644
--- a/web/packages/base/locales/el-GR/translation.json
+++ b/web/packages/base/locales/el-GR/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "Όνομα άλμπουμ",
     "close_key": "Κλείσιμο (Esc)",
-    "enter_file_name": "Όνομα αρχείου",
     "close": "Κλείσιμο",
     "yes": "",
     "no": "Όχι",
diff --git a/web/packages/base/locales/en-US/translation.json b/web/packages/base/locales/en-US/translation.json
index 0f54e19c3a..d0f1c2c557 100644
--- a/web/packages/base/locales/en-US/translation.json
+++ b/web/packages/base/locales/en-US/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "Create albums",
     "enter_album_name": "Album name",
     "close_key": "Close (Esc)",
-    "enter_file_name": "File name",
     "close": "Close",
     "yes": "Yes",
     "no": "No",
diff --git a/web/packages/base/locales/es-ES/translation.json b/web/packages/base/locales/es-ES/translation.json
index 61c31cf65e..e749f4c2d2 100644
--- a/web/packages/base/locales/es-ES/translation.json
+++ b/web/packages/base/locales/es-ES/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "Crear álbumes",
     "enter_album_name": "Nombre del álbum",
     "close_key": "Cerrar (Esc)",
-    "enter_file_name": "Nombre del archivo",
     "close": "Cerrar",
     "yes": "Sí",
     "no": "No",
diff --git a/web/packages/base/locales/et-EE/translation.json b/web/packages/base/locales/et-EE/translation.json
index 7a74514e05..a429ed19f7 100644
--- a/web/packages/base/locales/et-EE/translation.json
+++ b/web/packages/base/locales/et-EE/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "",
     "yes": "",
     "no": "",
diff --git a/web/packages/base/locales/fa-IR/translation.json b/web/packages/base/locales/fa-IR/translation.json
index 89d9d7dad9..7ee1eff8e6 100644
--- a/web/packages/base/locales/fa-IR/translation.json
+++ b/web/packages/base/locales/fa-IR/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "",
     "yes": "",
     "no": "",
diff --git a/web/packages/base/locales/fi-FI/translation.json b/web/packages/base/locales/fi-FI/translation.json
index 1f0a537415..4d3d45c598 100644
--- a/web/packages/base/locales/fi-FI/translation.json
+++ b/web/packages/base/locales/fi-FI/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "Luo albumit",
     "enter_album_name": "Albumin nimi",
     "close_key": "Sulje (Esc)",
-    "enter_file_name": "Tiedoston nimi",
     "close": "Sulje",
     "yes": "Kyllä",
     "no": "Ei",
@@ -250,7 +249,7 @@
     "people_suggestions_empty": "",
     "info": "",
     "info_key": "",
-    "file_name": "",
+    "file_name": "Tiedoston nimi",
     "caption_placeholder": "",
     "location": "",
     "view_on_map": "Näytä OpenStreetMapissa",
diff --git a/web/packages/base/locales/fr-FR/translation.json b/web/packages/base/locales/fr-FR/translation.json
index af6a65ddc8..47878e670b 100644
--- a/web/packages/base/locales/fr-FR/translation.json
+++ b/web/packages/base/locales/fr-FR/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "Créer des albums",
     "enter_album_name": "Nom de l'album",
     "close_key": "Fermer (Échap)",
-    "enter_file_name": "Nom du fichier",
     "close": "Fermer",
     "yes": "Oui",
     "no": "Non",
diff --git a/web/packages/base/locales/gu-IN/translation.json b/web/packages/base/locales/gu-IN/translation.json
index 7a74514e05..a429ed19f7 100644
--- a/web/packages/base/locales/gu-IN/translation.json
+++ b/web/packages/base/locales/gu-IN/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "",
     "yes": "",
     "no": "",
diff --git a/web/packages/base/locales/hi-IN/translation.json b/web/packages/base/locales/hi-IN/translation.json
index 7a74514e05..a429ed19f7 100644
--- a/web/packages/base/locales/hi-IN/translation.json
+++ b/web/packages/base/locales/hi-IN/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "",
     "yes": "",
     "no": "",
diff --git a/web/packages/base/locales/hu-HU/translation.json b/web/packages/base/locales/hu-HU/translation.json
index 7a74514e05..a429ed19f7 100644
--- a/web/packages/base/locales/hu-HU/translation.json
+++ b/web/packages/base/locales/hu-HU/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "",
     "yes": "",
     "no": "",
diff --git a/web/packages/base/locales/id-ID/translation.json b/web/packages/base/locales/id-ID/translation.json
index 8bed0abddf..63352f91c8 100644
--- a/web/packages/base/locales/id-ID/translation.json
+++ b/web/packages/base/locales/id-ID/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "Nama album",
     "close_key": "Tutup (Esc)",
-    "enter_file_name": "Nama file",
     "close": "Tutup",
     "yes": "",
     "no": "Tidak",
diff --git a/web/packages/base/locales/is-IS/translation.json b/web/packages/base/locales/is-IS/translation.json
index 09b5cc454c..29fa75d441 100644
--- a/web/packages/base/locales/is-IS/translation.json
+++ b/web/packages/base/locales/is-IS/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "Loka",
     "yes": "",
     "no": "Nei",
diff --git a/web/packages/base/locales/it-IT/translation.json b/web/packages/base/locales/it-IT/translation.json
index ef1f9d8d2b..188d9d75b7 100644
--- a/web/packages/base/locales/it-IT/translation.json
+++ b/web/packages/base/locales/it-IT/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "Crea album",
     "enter_album_name": "Nome album",
     "close_key": "Chiudi (Esc)",
-    "enter_file_name": "Nome del file",
     "close": "Chiudi",
     "yes": "",
     "no": "No",
diff --git a/web/packages/base/locales/ja-JP/translation.json b/web/packages/base/locales/ja-JP/translation.json
index 7cbe8c539c..01e792e36c 100644
--- a/web/packages/base/locales/ja-JP/translation.json
+++ b/web/packages/base/locales/ja-JP/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "アルバムを作成",
     "enter_album_name": "アルバムの名前",
     "close_key": "閉じる (Esc)",
-    "enter_file_name": "ファイル名",
     "close": "閉じる",
     "yes": "はい",
     "no": "いいえ",
diff --git a/web/packages/base/locales/ko-KR/translation.json b/web/packages/base/locales/ko-KR/translation.json
index fa583d9f9d..3840c135a1 100644
--- a/web/packages/base/locales/ko-KR/translation.json
+++ b/web/packages/base/locales/ko-KR/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "앨범 이름",
     "close_key": "닫기 (Esc)",
-    "enter_file_name": "파일 이름",
     "close": "닫기",
     "yes": "",
     "no": "아니오",
@@ -250,7 +249,7 @@
     "people_suggestions_empty": "",
     "info": "",
     "info_key": "",
-    "file_name": "",
+    "file_name": "파일 이름",
     "caption_placeholder": "",
     "location": "",
     "view_on_map": "",
diff --git a/web/packages/base/locales/lt-LT/translation.json b/web/packages/base/locales/lt-LT/translation.json
index eeb9ce7cb3..4ebdfe19b7 100644
--- a/web/packages/base/locales/lt-LT/translation.json
+++ b/web/packages/base/locales/lt-LT/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "Kurti albumus",
     "enter_album_name": "Albumo pavadinimas",
     "close_key": "Užverti (Gr)",
-    "enter_file_name": "Failo pavadinimas",
     "close": "Užverti",
     "yes": "Taip",
     "no": "Ne",
diff --git a/web/packages/base/locales/ml-IN/translation.json b/web/packages/base/locales/ml-IN/translation.json
index 7a74514e05..a429ed19f7 100644
--- a/web/packages/base/locales/ml-IN/translation.json
+++ b/web/packages/base/locales/ml-IN/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "",
     "yes": "",
     "no": "",
diff --git a/web/packages/base/locales/nl-NL/translation.json b/web/packages/base/locales/nl-NL/translation.json
index 6a7e1d0c44..981d447c86 100644
--- a/web/packages/base/locales/nl-NL/translation.json
+++ b/web/packages/base/locales/nl-NL/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "Albums aanmaken",
     "enter_album_name": "Albumnaam",
     "close_key": "Sluiten (Esc)",
-    "enter_file_name": "Bestandsnaam",
     "close": "Sluiten",
     "yes": "Ja",
     "no": "Nee",
diff --git a/web/packages/base/locales/pl-PL/translation.json b/web/packages/base/locales/pl-PL/translation.json
index e7b87172e7..3980083caa 100644
--- a/web/packages/base/locales/pl-PL/translation.json
+++ b/web/packages/base/locales/pl-PL/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "Utwórz albumy",
     "enter_album_name": "Nazwa albumu",
     "close_key": "Zamknij (Esc)",
-    "enter_file_name": "Nazwa pliku",
     "close": "Zamknij",
     "yes": "Tak",
     "no": "Nie",
diff --git a/web/packages/base/locales/pt-BR/translation.json b/web/packages/base/locales/pt-BR/translation.json
index 2803a0a546..03c478813d 100644
--- a/web/packages/base/locales/pt-BR/translation.json
+++ b/web/packages/base/locales/pt-BR/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "Criar álbuns",
     "enter_album_name": "Nome do álbum",
     "close_key": "Fechar (Esc)",
-    "enter_file_name": "Nome do arquivo",
     "close": "Fechar",
     "yes": "Sim",
     "no": "Não",
diff --git a/web/packages/base/locales/pt-PT/translation.json b/web/packages/base/locales/pt-PT/translation.json
index 71c43361ed..55cb7a681a 100644
--- a/web/packages/base/locales/pt-PT/translation.json
+++ b/web/packages/base/locales/pt-PT/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "Criar álbuns",
     "enter_album_name": "Nome do álbum",
     "close_key": "Fechar (Esc)",
-    "enter_file_name": "Nome do ficheiro",
     "close": "Fechar",
     "yes": "Sim",
     "no": "Não",
diff --git a/web/packages/base/locales/ro-RO/translation.json b/web/packages/base/locales/ro-RO/translation.json
index 7a74514e05..a429ed19f7 100644
--- a/web/packages/base/locales/ro-RO/translation.json
+++ b/web/packages/base/locales/ro-RO/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "",
     "yes": "",
     "no": "",
diff --git a/web/packages/base/locales/ru-RU/translation.json b/web/packages/base/locales/ru-RU/translation.json
index d8f2c015dc..91dcf118d1 100644
--- a/web/packages/base/locales/ru-RU/translation.json
+++ b/web/packages/base/locales/ru-RU/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "Создать альбомы",
     "enter_album_name": "Название альбома",
     "close_key": "Закрыть (Esc)",
-    "enter_file_name": "Имя файла",
     "close": "Закрыть",
     "yes": "Да",
     "no": "Нет",
@@ -250,7 +249,6 @@
     "people_suggestions_empty": "Больше нет предложений фотографий",
     "info": "Информация",
     "info_key": "Информация (I)",
-    "file_name": "Имя файла",
     "caption_placeholder": "Добавить описание",
     "location": "Местоположение",
     "view_on_map": "Просмотр на OpenStreetMap",
diff --git a/web/packages/base/locales/sl-SI/translation.json b/web/packages/base/locales/sl-SI/translation.json
index 7a74514e05..a429ed19f7 100644
--- a/web/packages/base/locales/sl-SI/translation.json
+++ b/web/packages/base/locales/sl-SI/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "",
     "yes": "",
     "no": "",
diff --git a/web/packages/base/locales/sv-SE/translation.json b/web/packages/base/locales/sv-SE/translation.json
index aaf2a59b25..eca462ca5c 100644
--- a/web/packages/base/locales/sv-SE/translation.json
+++ b/web/packages/base/locales/sv-SE/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "Skapa album",
     "enter_album_name": "Albumnamn",
     "close_key": "Stäng (Esc)",
-    "enter_file_name": "Filnamn",
     "close": "Stäng",
     "yes": "Ja",
     "no": "Nej",
diff --git a/web/packages/base/locales/ta-IN/translation.json b/web/packages/base/locales/ta-IN/translation.json
index 7a74514e05..a429ed19f7 100644
--- a/web/packages/base/locales/ta-IN/translation.json
+++ b/web/packages/base/locales/ta-IN/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "",
     "yes": "",
     "no": "",
diff --git a/web/packages/base/locales/te-IN/translation.json b/web/packages/base/locales/te-IN/translation.json
index 7a74514e05..a429ed19f7 100644
--- a/web/packages/base/locales/te-IN/translation.json
+++ b/web/packages/base/locales/te-IN/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "",
     "yes": "",
     "no": "",
diff --git a/web/packages/base/locales/th-TH/translation.json b/web/packages/base/locales/th-TH/translation.json
index 7a74514e05..a429ed19f7 100644
--- a/web/packages/base/locales/th-TH/translation.json
+++ b/web/packages/base/locales/th-TH/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "",
     "yes": "",
     "no": "",
diff --git a/web/packages/base/locales/ti-ER/translation.json b/web/packages/base/locales/ti-ER/translation.json
index 7a74514e05..a429ed19f7 100644
--- a/web/packages/base/locales/ti-ER/translation.json
+++ b/web/packages/base/locales/ti-ER/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "",
     "yes": "",
     "no": "",
diff --git a/web/packages/base/locales/tr-TR/translation.json b/web/packages/base/locales/tr-TR/translation.json
index 43bb4fcb38..723ab520c7 100644
--- a/web/packages/base/locales/tr-TR/translation.json
+++ b/web/packages/base/locales/tr-TR/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "Albüm oluştur",
     "enter_album_name": "Albüm adı",
     "close_key": "Kapat (Esc)",
-    "enter_file_name": "Dosya adı",
     "close": "Kapat",
     "yes": "",
     "no": "Hayır",
@@ -250,7 +249,7 @@
     "people_suggestions_empty": "",
     "info": "",
     "info_key": "",
-    "file_name": "",
+    "file_name": "Dosya adı",
     "caption_placeholder": "",
     "location": "",
     "view_on_map": "",
diff --git a/web/packages/base/locales/uk-UA/translation.json b/web/packages/base/locales/uk-UA/translation.json
index 7fa2470521..4b5061e376 100644
--- a/web/packages/base/locales/uk-UA/translation.json
+++ b/web/packages/base/locales/uk-UA/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "Створити альбоми",
     "enter_album_name": "Назва альбому",
     "close_key": "Закрити (Esc)",
-    "enter_file_name": "Назва файлу",
     "close": "Закрити",
     "yes": "Так",
     "no": "Ні",
diff --git a/web/packages/base/locales/vi-VN/translation.json b/web/packages/base/locales/vi-VN/translation.json
index 152cf6e7fb..616bdff3b7 100644
--- a/web/packages/base/locales/vi-VN/translation.json
+++ b/web/packages/base/locales/vi-VN/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "Tạo album",
     "enter_album_name": "Tên album",
     "close_key": "Đóng (Esc)",
-    "enter_file_name": "Tên tệp",
     "close": "Đóng",
     "yes": "Có",
     "no": "Không",
diff --git a/web/packages/base/locales/zh-CN/translation.json b/web/packages/base/locales/zh-CN/translation.json
index 1053e68ee9..7cab66cf88 100644
--- a/web/packages/base/locales/zh-CN/translation.json
+++ b/web/packages/base/locales/zh-CN/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "创建相册",
     "enter_album_name": "相册名称",
     "close_key": "关闭 (或按Esc键)",
-    "enter_file_name": "文件名",
     "close": "关闭",
     "yes": "是",
     "no": "否",
diff --git a/web/packages/base/locales/zh-HK/translation.json b/web/packages/base/locales/zh-HK/translation.json
index 7a74514e05..a429ed19f7 100644
--- a/web/packages/base/locales/zh-HK/translation.json
+++ b/web/packages/base/locales/zh-HK/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "",
     "yes": "",
     "no": "",
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 271aa98a92..7be8d32ea3 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -809,7 +809,7 @@ const RenameFileDialog: React.FC<RenameFileDialogProps> = ({
             <DialogContent>
                 <SingleInputForm
                     label={t("file_name")}
-                    placeholder={t("enter_file_name")}
+                    placeholder={t("file_name")}
                     autoFocus
                     initialValue={name}
                     submitButtonTitle={t("rename")}

From 4455a3c79338bc16f95d0ae86798882347d1930d Mon Sep 17 00:00:00 2001
From: Crowdin Bot <support+bot@crowdin.com>
Date: Wed, 26 Feb 2025 10:23:03 +0000
Subject: [PATCH 562/796] New Crowdin translations by GitHub Action

---
 web/packages/base/locales/km-KH/translation.json | 1 -
 web/packages/base/locales/ru-RU/translation.json | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/packages/base/locales/km-KH/translation.json b/web/packages/base/locales/km-KH/translation.json
index 7a74514e05..a429ed19f7 100644
--- a/web/packages/base/locales/km-KH/translation.json
+++ b/web/packages/base/locales/km-KH/translation.json
@@ -45,7 +45,6 @@
     "create_albums": "",
     "enter_album_name": "",
     "close_key": "",
-    "enter_file_name": "",
     "close": "",
     "yes": "",
     "no": "",
diff --git a/web/packages/base/locales/ru-RU/translation.json b/web/packages/base/locales/ru-RU/translation.json
index 91dcf118d1..95eb4d7fbb 100644
--- a/web/packages/base/locales/ru-RU/translation.json
+++ b/web/packages/base/locales/ru-RU/translation.json
@@ -249,6 +249,7 @@
     "people_suggestions_empty": "Больше нет предложений фотографий",
     "info": "Информация",
     "info_key": "Информация (I)",
+    "file_name": "Имя файла",
     "caption_placeholder": "Добавить описание",
     "location": "Местоположение",
     "view_on_map": "Просмотр на OpenStreetMap",

From 359bbd262831e4d95ba8283bd665b0aa717b46b2 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 16:18:56 +0530
Subject: [PATCH 563/796] Unindent

---
 .../photos/src/components/DeleteAccount.tsx   | 201 ++++++++----------
 1 file changed, 90 insertions(+), 111 deletions(-)

diff --git a/web/apps/photos/src/components/DeleteAccount.tsx b/web/apps/photos/src/components/DeleteAccount.tsx
index 02958fc769..1e5fe6f4d8 100644
--- a/web/apps/photos/src/components/DeleteAccount.tsx
+++ b/web/apps/photos/src/components/DeleteAccount.tsx
@@ -21,18 +21,13 @@ import {
     TextField,
     Typography,
 } from "@mui/material";
-import { Formik, type FormikHelpers } from "formik";
+import { useFormik } from "formik";
 import { t } from "i18next";
 import React, { useRef, useState } from "react";
 import { Trans } from "react-i18next";
 import { deleteAccount, getAccountDeleteChallenge } from "services/userService";
 import * as Yup from "yup";
 
-interface FormValues {
-    reason: string;
-    feedback: string;
-}
-
 type DeleteAccountProps = ModalVisibilityProps & {
     /**
      * Called when the user should be authenticated again.
@@ -58,41 +53,47 @@ export const DeleteAccount: React.FC<DeleteAccountProps> = ({
         { reason: string; feedback: string } | undefined
     >(undefined);
 
-    const initiateDelete = async (
-        { reason, feedback }: FormValues,
-        { setFieldError }: FormikHelpers<FormValues>,
-    ) => {
-        try {
-            feedback = feedback.trim();
-            if (feedback.length === 0) {
-                switch (reason) {
-                    case "found_another_service":
-                        setFieldError(
-                            "feedback",
-                            t("feedback_required_found_another_service"),
-                        );
-                        break;
-                    default:
-                        setFieldError("feedback", t("feedback_required"));
+    const { values, errors, handleChange, handleSubmit } = useFormik({
+        initialValues: { reason: "", feedback: "" },
+        validationSchema: Yup.object().shape({
+            reason: Yup.string().required(t("required")),
+        }),
+        validateOnChange: false,
+        validateOnBlur: false,
+        onSubmit: async ({ reason, feedback }, { setFieldError }) => {
+            try {
+                feedback = feedback.trim();
+                if (feedback.length === 0) {
+                    switch (reason) {
+                        case "found_another_service":
+                            setFieldError(
+                                "feedback",
+                                t("feedback_required_found_another_service"),
+                            );
+                            break;
+                        default:
+                            setFieldError("feedback", t("feedback_required"));
+                    }
+                    return;
                 }
-                return;
+                setLoading(true);
+                reasonAndFeedbackRef.current = { reason, feedback };
+                const deleteChallengeResponse =
+                    await getAccountDeleteChallenge();
+                deleteAccountChallenge.current =
+                    deleteChallengeResponse.encryptedChallenge;
+                if (deleteChallengeResponse.allowDelete) {
+                    onAuthenticateUser().then(confirmAccountDeletion);
+                } else {
+                    askToMailForDeletion();
+                }
+            } catch (e) {
+                onGenericError(e);
+            } finally {
+                setLoading(false);
             }
-            setLoading(true);
-            reasonAndFeedbackRef.current = { reason, feedback };
-            const deleteChallengeResponse = await getAccountDeleteChallenge();
-            deleteAccountChallenge.current =
-                deleteChallengeResponse.encryptedChallenge;
-            if (deleteChallengeResponse.allowDelete) {
-                onAuthenticateUser().then(confirmAccountDeletion);
-            } else {
-                askToMailForDeletion();
-            }
-        } catch (e) {
-            onGenericError(e);
-        } finally {
-            setLoading(false);
-        }
-    };
+        },
+    });
 
     const confirmAccountDeletion = () =>
         showMiniDialog({
@@ -144,78 +145,56 @@ export const DeleteAccount: React.FC<DeleteAccountProps> = ({
             onClose={onClose}
             title={t("delete_account")}
         >
-            <Formik<FormValues>
-                initialValues={{
-                    reason: "",
-                    feedback: "",
-                }}
-                validationSchema={Yup.object().shape({
-                    reason: Yup.string().required(t("required")),
-                })}
-                validateOnChange={false}
-                validateOnBlur={false}
-                onSubmit={initiateDelete}
-            >
-                {({
-                    values,
-                    errors,
-                    handleChange,
-                    handleSubmit,
-                }): React.JSX.Element => (
-                    <form noValidate onSubmit={handleSubmit}>
-                        <Stack sx={{ gap: "24px" }}>
-                            <Stack sx={{ gap: "4px" }}>
-                                <Typography>
-                                    {t("delete_account_reason_label")}
-                                </Typography>
-                                <DropdownInput
-                                    options={deleteReasonOptions()}
-                                    placeholder={t(
-                                        "delete_account_reason_placeholder",
-                                    )}
-                                    selected={values.reason}
-                                    onSelect={handleChange("reason")}
-                                />
-                                {errors.reason && (
-                                    <Typography
-                                        variant="small"
-                                        sx={{ px: 1, color: "critical.main" }}
-                                    >
-                                        {errors.reason}
-                                    </Typography>
-                                )}
-                            </Stack>
-                            <FeedbackInput
-                                value={values.feedback}
-                                onChange={handleChange("feedback")}
-                                errorMessage={errors.feedback}
-                            />
-                            <ConfirmationCheckboxInput
-                                checked={acceptDataDeletion}
-                                onChange={setAcceptDataDeletion}
-                            />
-                            <Stack sx={{ gap: "8px" }}>
-                                <LoadingButton
-                                    type="submit"
-                                    fullWidth
-                                    color="critical"
-                                    disabled={!acceptDataDeletion}
-                                    loading={loading}
-                                >
-                                    {t("delete_account_confirm")}
-                                </LoadingButton>
-                                <FocusVisibleButton
-                                    fullWidth
-                                    color="secondary"
-                                    onClick={onClose}
-                                >
-                                    {t("cancel")}
-                                </FocusVisibleButton>
-                            </Stack>
-                        </Stack>
-                    </form>
-                )}
-            </Formik>
+            <form noValidate onSubmit={handleSubmit}>
+                <Stack sx={{ gap: "24px" }}>
+                    <Stack sx={{ gap: "4px" }}>
+                        <Typography>
+                            {t("delete_account_reason_label")}
+                        </Typography>
+                        <DropdownInput
+                            options={deleteReasonOptions()}
+                            placeholder={t("delete_account_reason_placeholder")}
+                            selected={values.reason}
+                            onSelect={handleChange("reason")}
+                        />
+                        {errors.reason && (
+                            <Typography
+                                variant="small"
+                                sx={{ px: 1, color: "critical.main" }}
+                            >
+                                {errors.reason}
+                            </Typography>
+                        )}
+                    </Stack>
+                    <FeedbackInput
+                        value={values.feedback}
+                        onChange={handleChange("feedback")}
+                        errorMessage={errors.feedback}
+                    />
+                    <ConfirmationCheckboxInput
+                        checked={acceptDataDeletion}
+                        onChange={setAcceptDataDeletion}
+                    />
+                    <Stack sx={{ gap: "8px" }}>
+                        <LoadingButton
+                            type="submit"
+                            fullWidth
+                            color="critical"
+                            disabled={!acceptDataDeletion}
+                            loading={loading}
+                        >
+                            {t("delete_account_confirm")}
+                        </LoadingButton>
+                        <FocusVisibleButton
+                            fullWidth
+                            color="secondary"
+                            onClick={onClose}
+                        >
+                            {t("cancel")}
+                        </FocusVisibleButton>
+                    </Stack>
+                </Stack>
+            </form>
         </TitledMiniDialog>
     );
 };

From bb613cd384b6ef34259e1bb38659c594f2033751 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 16:23:16 +0530
Subject: [PATCH 564/796] validate

---
 web/apps/photos/src/components/DeleteAccount.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/web/apps/photos/src/components/DeleteAccount.tsx b/web/apps/photos/src/components/DeleteAccount.tsx
index 1e5fe6f4d8..00d1ce050e 100644
--- a/web/apps/photos/src/components/DeleteAccount.tsx
+++ b/web/apps/photos/src/components/DeleteAccount.tsx
@@ -58,8 +58,6 @@ export const DeleteAccount: React.FC<DeleteAccountProps> = ({
         validationSchema: Yup.object().shape({
             reason: Yup.string().required(t("required")),
         }),
-        validateOnChange: false,
-        validateOnBlur: false,
         onSubmit: async ({ reason, feedback }, { setFieldError }) => {
             try {
                 feedback = feedback.trim();
@@ -145,7 +143,7 @@ export const DeleteAccount: React.FC<DeleteAccountProps> = ({
             onClose={onClose}
             title={t("delete_account")}
         >
-            <form noValidate onSubmit={handleSubmit}>
+            <form onSubmit={handleSubmit}>
                 <Stack sx={{ gap: "24px" }}>
                     <Stack sx={{ gap: "4px" }}>
                         <Typography>

From 5e583da6f09be2b26ac2238aa13a428ba146e144 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 16:28:36 +0530
Subject: [PATCH 565/796] unyup

---
 .../photos/src/components/DeleteAccount.tsx   | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/web/apps/photos/src/components/DeleteAccount.tsx b/web/apps/photos/src/components/DeleteAccount.tsx
index 00d1ce050e..32030bc850 100644
--- a/web/apps/photos/src/components/DeleteAccount.tsx
+++ b/web/apps/photos/src/components/DeleteAccount.tsx
@@ -26,7 +26,6 @@ import { t } from "i18next";
 import React, { useRef, useState } from "react";
 import { Trans } from "react-i18next";
 import { deleteAccount, getAccountDeleteChallenge } from "services/userService";
-import * as Yup from "yup";
 
 type DeleteAccountProps = ModalVisibilityProps & {
     /**
@@ -55,25 +54,21 @@ export const DeleteAccount: React.FC<DeleteAccountProps> = ({
 
     const { values, errors, handleChange, handleSubmit } = useFormik({
         initialValues: { reason: "", feedback: "" },
-        validationSchema: Yup.object().shape({
-            reason: Yup.string().required(t("required")),
-        }),
-        onSubmit: async ({ reason, feedback }, { setFieldError }) => {
+        validate: ({ reason, feedback }) => {
+            if (!reason) return { reason: t("required") };
+            if (!feedback.trim().length) {
+                return {
+                    feedback:
+                        reason == "found_another_service"
+                            ? t("feedback_required_found_another_service")
+                            : t("feedback_required"),
+                };
+            }
+            return {};
+        },
+        onSubmit: async ({ reason, feedback }) => {
             try {
                 feedback = feedback.trim();
-                if (feedback.length === 0) {
-                    switch (reason) {
-                        case "found_another_service":
-                            setFieldError(
-                                "feedback",
-                                t("feedback_required_found_another_service"),
-                            );
-                            break;
-                        default:
-                            setFieldError("feedback", t("feedback_required"));
-                    }
-                    return;
-                }
                 setLoading(true);
                 reasonAndFeedbackRef.current = { reason, feedback };
                 const deleteChallengeResponse =

From c32974cf952fb42cc413a06b943d257dab8a1a39 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 26 Feb 2025 16:37:27 +0530
Subject: [PATCH 566/796] [mob][photos] Log old memories properly

---
 mobile/lib/models/people_memory.dart          |   6 +
 mobile/lib/models/smart_memory.dart           |  23 +++-
 mobile/lib/models/time_memory.dart            |   8 ++
 mobile/lib/models/trip_memory.dart            |   6 +
 .../lib/services/memories_cache_service.dart  | 122 ++++++++++++++++--
 5 files changed, 150 insertions(+), 15 deletions(-)

diff --git a/mobile/lib/models/people_memory.dart b/mobile/lib/models/people_memory.dart
index ecb639137d..3a59cc155d 100644
--- a/mobile/lib/models/people_memory.dart
+++ b/mobile/lib/models/people_memory.dart
@@ -66,6 +66,8 @@ class PeopleMemory extends SmartMemory {
     super.name,
     super.firstCreationTime,
     super.lastCreationTime,
+    super.firstDateToShow,
+    super.lastDateToShow,
   }) : super(memories, MemoryType.people);
 
   @override
@@ -76,6 +78,8 @@ class PeopleMemory extends SmartMemory {
     String? name,
     int? firstCreationTime,
     int? lastCreationTime,
+    int? firstDateToShow,
+    int? lastDateToShow,
   }) {
     return PeopleMemory(
       memories ?? super.memories,
@@ -84,6 +88,8 @@ class PeopleMemory extends SmartMemory {
       name: name ?? super.name,
       firstCreationTime: firstCreationTime ?? super.firstCreationTime,
       lastCreationTime: lastCreationTime ?? super.lastCreationTime,
+      firstDateToShow: firstDateToShow ?? super.firstDateToShow,
+      lastDateToShow: lastDateToShow ?? super.lastDateToShow,
     );
   }
 }
diff --git a/mobile/lib/models/smart_memory.dart b/mobile/lib/models/smart_memory.dart
index f85ea9be22..a9e99d4608 100644
--- a/mobile/lib/models/smart_memory.dart
+++ b/mobile/lib/models/smart_memory.dart
@@ -25,12 +25,13 @@ MemoryType memoryTypeFromString(String type) {
 class SmartMemory {
   final List<Memory> memories;
   final MemoryType type;
-  String? name;
+  String name;
   int? firstCreationTime;
   int? lastCreationTime;
 
   int? firstDateToShow;
   int? lastDateToShow;
+  // TODO: lau: make the above two non-nullable!!!
   // TODO: lau: actually use this in calculated filters
 
   SmartMemory(
@@ -44,6 +45,26 @@ class SmartMemory {
   }) : name = name != null ? name + "(I)" : null;
   // TODO: lau: remove (I) from name when opening up the feature flag
 
+  bool isOld() {
+    if (firstDateToShow == null || lastDateToShow == null) {
+      return false;
+    }
+    final now = DateTime.now().microsecondsSinceEpoch;
+    return lastDateToShow! < now;
+  }
+  
+  bool hasShowTime() {
+    return firstDateToShow != null && lastDateToShow != null;
+  }
+
+  bool shouldShowNow() {
+    if (!hasShowTime()) {
+      return false;
+    }
+    final int now = DateTime.now().microsecondsSinceEpoch;
+    return now >= firstDateToShow! && now <= lastDateToShow!;
+  }
+
   int averageCreationTime() {
     if (firstCreationTime != null && lastCreationTime != null) {
       return (firstCreationTime! + lastCreationTime!) ~/ 2;
diff --git a/mobile/lib/models/time_memory.dart b/mobile/lib/models/time_memory.dart
index e90dabe187..761c84a55e 100644
--- a/mobile/lib/models/time_memory.dart
+++ b/mobile/lib/models/time_memory.dart
@@ -7,12 +7,16 @@ class TimeMemory extends SmartMemory {
     String? name,
     int? firstCreationTime,
     int? lastCreationTime,
+    int? firstDateToShow,
+    int? lastDateToShow,
   }) : super(
           memories,
           MemoryType.time,
           name: name,
           firstCreationTime: firstCreationTime,
           lastCreationTime: lastCreationTime,
+          firstDateToShow: firstDateToShow,
+          lastDateToShow: lastDateToShow,
         );
 
   @override
@@ -21,12 +25,16 @@ class TimeMemory extends SmartMemory {
     String? name,
     int? firstCreationTime,
     int? lastCreationTime,
+    int? firstDateToShow,
+    int? lastDateToShow,
   }) {
     return TimeMemory(
       memories ?? this.memories,
       name: name ?? this.name,
       firstCreationTime: firstCreationTime ?? super.firstCreationTime,
       lastCreationTime: lastCreationTime ?? super.lastCreationTime,
+      firstDateToShow: firstDateToShow ?? super.firstDateToShow,
+      lastDateToShow: lastDateToShow ?? super.lastDateToShow,
     );
   }
 }
diff --git a/mobile/lib/models/trip_memory.dart b/mobile/lib/models/trip_memory.dart
index 2ff4e339e0..244e77e86d 100644
--- a/mobile/lib/models/trip_memory.dart
+++ b/mobile/lib/models/trip_memory.dart
@@ -11,6 +11,8 @@ class TripMemory extends SmartMemory {
     super.name,
     super.firstCreationTime,
     super.lastCreationTime,
+    super.firstDateToShow,
+    super.lastDateToShow,
   }) : super(memories, MemoryType.trips);
 
   @override
@@ -20,6 +22,8 @@ class TripMemory extends SmartMemory {
     String? name,
     int? firstCreationTime,
     int? lastCreationTime,
+    int? firstDateToShow,
+    int? lastDateToShow,
   }) {
     return TripMemory(
       memories ?? super.memories,
@@ -27,6 +31,8 @@ class TripMemory extends SmartMemory {
       name: name ?? super.name,
       firstCreationTime: firstCreationTime ?? super.firstCreationTime,
       lastCreationTime: lastCreationTime ?? super.lastCreationTime,
+      firstDateToShow: firstDateToShow ?? super.firstDateToShow,
+      lastDateToShow: lastDateToShow ?? super.lastDateToShow,
     );
   }
 }
diff --git a/mobile/lib/services/memories_cache_service.dart b/mobile/lib/services/memories_cache_service.dart
index 9a78725489..3acc3c0611 100644
--- a/mobile/lib/services/memories_cache_service.dart
+++ b/mobile/lib/services/memories_cache_service.dart
@@ -65,18 +65,60 @@ class ToShowMemory {
   final int firstTimeToShow;
   final int lastTimeToShow;
 
+  final String? personID;
+  final PeopleMemoryType? peopleMemoryType;
+  final Location? location;
+
   bool get shouldShowNow {
     final now = DateTime.now().microsecondsSinceEpoch;
     return now >= firstTimeToShow && now <= lastTimeToShow;
   }
 
+  bool get isOld {
+    final now = DateTime.now().microsecondsSinceEpoch;
+    return now > lastTimeToShow;
+  }
+
   ToShowMemory(
     this.title,
     this.fileUploadedIDs,
     this.type,
     this.firstTimeToShow,
-    this.lastTimeToShow,
-  );
+    this.lastTimeToShow, {
+    this.personID,
+    this.peopleMemoryType,
+    this.location,
+  }) : assert(
+          (type == MemoryType.people &&
+                  personID != null &&
+                  peopleMemoryType != null) ||
+              (type == MemoryType.trips && location != null) ||
+              (type != MemoryType.people && type != MemoryType.trips),
+          "PersonID and peopleMemoryType must be provided for people memory type, and location must be provided for trips memory type",
+        );
+
+  factory ToShowMemory.fromSmartMemory(SmartMemory memory) {
+    assert(memory.firstDateToShow != null && memory.lastDateToShow != null);
+    String? personID;
+    PeopleMemoryType? peopleMemoryType;
+    Location? location;
+    if (memory is PeopleMemory) {
+      personID = memory.personID;
+      peopleMemoryType = memory.peopleMemoryType;
+    } else if (memory is TripMemory) {
+      location = memory.location;
+    }
+    return ToShowMemory(
+      memory.name,
+      memory.memories.map((m) => m.file.uploadedFileID!).toList(),
+      memory.type,
+      memory.firstDateToShow!,
+      memory.lastDateToShow!,
+      personID: personID,
+      peopleMemoryType: peopleMemoryType,
+      location: location,
+    );
+  }
 
   factory ToShowMemory.fromJson(Map<String, dynamic> json) {
     return ToShowMemory(
@@ -85,6 +127,14 @@ class ToShowMemory {
       memoryTypeFromString(json['type']),
       json['firstTimeToShow'],
       json['lastTimeToShow'],
+      personID: json['personID'],
+      peopleMemoryType: peopleMemoryTypeFromString(json['peopleMemoryType']),
+      location: json['location'] != null
+          ? Location(
+              latitude: json['location']['latitude'],
+              longitude: json['location']['longitude'],
+            )
+          : null,
     );
   }
 
@@ -95,6 +145,14 @@ class ToShowMemory {
       'type': type.toString().split('.').last,
       'firstTimeToShow': firstTimeToShow,
       'lastTimeToShow': lastTimeToShow,
+      'personID': personID,
+      'peopleMemoryType': peopleMemoryType.toString().split('.').last,
+      'location': location != null
+          ? {
+              'latitude': location!.latitude!,
+              'longitude': location!.longitude!,
+            }
+          : null,
     };
   }
 
@@ -120,6 +178,19 @@ class PeopleShownLogs {
     this.lastTimeShown,
   );
 
+  factory PeopleShownLogs.fromOldCacheMemory(ToShowMemory memory) {
+    assert(
+      memory.type == MemoryType.people &&
+          memory.personID != null &&
+          memory.peopleMemoryType != null,
+    );
+    return PeopleShownLogs(
+      memory.personID!,
+      memory.peopleMemoryType!,
+      memory.lastTimeToShow,
+    );
+  }
+
   factory PeopleShownLogs.fromJson(Map<String, dynamic> json) {
     return PeopleShownLogs(
       json['personID'],
@@ -156,6 +227,14 @@ class TripsShownLogs {
     this.lastTimeShown,
   );
 
+  factory TripsShownLogs.fromOldCacheMemory(ToShowMemory memory) {
+    assert(memory.type == MemoryType.trips && memory.location != null);
+    return TripsShownLogs(
+      memory.location!,
+      memory.lastTimeToShow,
+    );
+  }
+
   factory TripsShownLogs.fromJson(Map<String, dynamic> json) {
     return TripsShownLogs(
       Location(
@@ -332,9 +411,8 @@ class MemoriesCacheService {
     final List<ToShowMemory> toShowMemories = [];
     final List<PeopleShownLogs> peopleShownLogs = [];
     final List<TripsShownLogs> tripsShownLogs = [];
-    final now = DateTime.now().microsecondsSinceEpoch;
     for (final memory in memories) {
-      if (memory.lastDateToShow != null && memory.lastDateToShow! < now) {
+      if (memory.isOld()) {
         if (memory is PeopleMemory) {
           peopleShownLogs.add(
             PeopleShownLogs(
@@ -352,16 +430,8 @@ class MemoriesCacheService {
           );
         }
       } else {
-        if (memory.firstDateToShow != null && memory.lastDateToShow != null) {
-          toShowMemories.add(
-            ToShowMemory(
-              memory.name!,
-              memory.memories.map((m) => m.file.uploadedFileID!).toList(),
-              memory.type,
-              memory.firstDateToShow!,
-              memory.lastDateToShow!,
-            ),
-          );
+        if (memory.hasShowTime()) {
+          toShowMemories.add(ToShowMemory.fromSmartMemory(memory));
         } else {
           _logger.severe('Memory has no first or last date to show');
         }
@@ -390,6 +460,30 @@ class MemoriesCacheService {
         }
         tripsShownLogs.add(shownTrip);
       }
+      for (final oldMemory in oldCache.toShowMemories) {
+        if (oldMemory.isOld) {
+          if (oldMemory.type == MemoryType.people) {
+            if (!peopleShownLogs.any(
+              (person) =>
+                  (person.personID == oldMemory.personID) &&
+                  (person.peopleMemoryType == oldMemory.peopleMemoryType),
+            )) {
+              peopleShownLogs
+                  .add(PeopleShownLogs.fromOldCacheMemory(oldMemory));
+            }
+          } else if (oldMemory.type == MemoryType.trips) {
+            if (!tripsShownLogs.any(
+              (trip) => isFileInsideLocationTag(
+                oldMemory.location!,
+                trip.location,
+                10.0,
+              ),
+            )) {
+              tripsShownLogs.add(TripsShownLogs.fromOldCacheMemory(oldMemory));
+            }
+          }
+        }
+      }
     }
     return MemoriesCache(
       toShowMemories: toShowMemories,

From 059275a4862298eb4a46246a52a583b238da80c1 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 16:39:08 +0530
Subject: [PATCH 567/796] fetch

---
 .../photos/src/components/DeleteAccount.tsx   |  3 ++-
 web/apps/photos/src/services/userService.ts   | 23 -------------------
 web/packages/new/photos/services/user.ts      | 18 +++++++++++++++
 3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/web/apps/photos/src/components/DeleteAccount.tsx b/web/apps/photos/src/components/DeleteAccount.tsx
index 32030bc850..d2fe559707 100644
--- a/web/apps/photos/src/components/DeleteAccount.tsx
+++ b/web/apps/photos/src/components/DeleteAccount.tsx
@@ -9,6 +9,7 @@ import {
     DropdownInput,
     type DropdownOption,
 } from "@/new/photos/components/DropdownInput";
+import { getAccountDeleteChallenge } from "@/new/photos/services/user";
 import { initiateEmail } from "@/new/photos/utils/web";
 import { getData, LS_KEYS } from "@ente/shared/storage/localStorage";
 import { getActualKey } from "@ente/shared/user";
@@ -25,7 +26,7 @@ import { useFormik } from "formik";
 import { t } from "i18next";
 import React, { useRef, useState } from "react";
 import { Trans } from "react-i18next";
-import { deleteAccount, getAccountDeleteChallenge } from "services/userService";
+import { deleteAccount } from "services/userService";
 
 type DeleteAccountProps = ModalVisibilityProps & {
     /**
diff --git a/web/apps/photos/src/services/userService.ts b/web/apps/photos/src/services/userService.ts
index bb70ec8b87..ba089377bf 100644
--- a/web/apps/photos/src/services/userService.ts
+++ b/web/apps/photos/src/services/userService.ts
@@ -81,29 +81,6 @@ export const getUserDetailsV2 = async (): Promise<UserDetails> => {
     }
 };
 
-export interface DeleteChallengeResponse {
-    allowDelete: boolean;
-    encryptedChallenge: string;
-}
-
-export const getAccountDeleteChallenge = async () => {
-    try {
-        const token = getToken();
-
-        const resp = await HTTPService.get(
-            await apiURL("/users/delete-challenge"),
-            null,
-            {
-                "X-Auth-Token": token,
-            },
-        );
-        return resp.data as DeleteChallengeResponse;
-    } catch (e) {
-        log.error("failed to get account delete challenge", e);
-        throw e;
-    }
-};
-
 export const deleteAccount = async (
     challenge: string,
     reason: string,
diff --git a/web/packages/new/photos/services/user.ts b/web/packages/new/photos/services/user.ts
index 4e0be7cf62..fa416f6f45 100644
--- a/web/packages/new/photos/services/user.ts
+++ b/web/packages/new/photos/services/user.ts
@@ -1,5 +1,6 @@
 import { authenticatedRequestHeaders, ensureOk } from "@/base/http";
 import { apiURL } from "@/base/origins";
+import { nullToUndefined } from "@/utils/transform";
 import { z } from "zod";
 
 /**
@@ -23,3 +24,20 @@ export const disable2FA = async () =>
             headers: await authenticatedRequestHeaders(),
         }),
     );
+
+const DeleteChallengeResponse = z.object({
+    // allowDelete indicates whether the user is allowed to delete their account
+    // via app (some special-cased accounts might need to contact support).
+    allowDelete: z.boolean(),
+    // An encrypted challenge that the client needs to decrypt before proceeding
+    // with account deletion.
+    encryptedChallenge: z.string().nullable().transform(nullToUndefined),
+});
+
+export const getAccountDeleteChallenge = async () => {
+    const res = await fetch(await apiURL("/users/delete-challenge"), {
+        headers: await authenticatedRequestHeaders(),
+    });
+    ensureOk(res);
+    return DeleteChallengeResponse.parse(await res.json());
+};

From 1be2286279cde836adfdd8e9873669477d6c250a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 16:52:10 +0530
Subject: [PATCH 568/796] Move

---
 .../photos/src/components/DeleteAccount.tsx   | 22 +---------------
 web/packages/new/photos/services/user.ts      |  4 +--
 web/packages/shared/crypto/helpers.ts         | 26 +++++++++++++++++++
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/web/apps/photos/src/components/DeleteAccount.tsx b/web/apps/photos/src/components/DeleteAccount.tsx
index d2fe559707..b7f59e9207 100644
--- a/web/apps/photos/src/components/DeleteAccount.tsx
+++ b/web/apps/photos/src/components/DeleteAccount.tsx
@@ -4,15 +4,13 @@ import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import { LoadingButton } from "@/base/components/mui/LoadingButton";
 import type { ModalVisibilityProps } from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
-import { sharedCryptoWorker } from "@/base/crypto";
 import {
     DropdownInput,
     type DropdownOption,
 } from "@/new/photos/components/DropdownInput";
 import { getAccountDeleteChallenge } from "@/new/photos/services/user";
 import { initiateEmail } from "@/new/photos/utils/web";
-import { getData, LS_KEYS } from "@ente/shared/storage/localStorage";
-import { getActualKey } from "@ente/shared/user";
+import { decryptDeleteAccountChallenge } from "@ente/shared/crypto/helpers";
 import {
     Checkbox,
     FormControlLabel,
@@ -276,21 +274,3 @@ const ConfirmationCheckboxInput: React.FC<ConfirmationCheckboxInputProps> = ({
         />
     </FormGroup>
 );
-
-async function decryptDeleteAccountChallenge(encryptedChallenge: string) {
-    const cryptoWorker = await sharedCryptoWorker();
-    const masterKey = await getActualKey();
-    const keyAttributes = getData(LS_KEYS.KEY_ATTRIBUTES);
-    const secretKey = await cryptoWorker.decryptB64(
-        keyAttributes.encryptedSecretKey,
-        keyAttributes.secretKeyDecryptionNonce,
-        masterKey,
-    );
-    const b64DecryptedChallenge = await cryptoWorker.boxSealOpen(
-        encryptedChallenge,
-        keyAttributes.publicKey,
-        secretKey,
-    );
-    const utf8DecryptedChallenge = atob(b64DecryptedChallenge);
-    return utf8DecryptedChallenge;
-}
diff --git a/web/packages/new/photos/services/user.ts b/web/packages/new/photos/services/user.ts
index fa416f6f45..5858a037a8 100644
--- a/web/packages/new/photos/services/user.ts
+++ b/web/packages/new/photos/services/user.ts
@@ -29,8 +29,8 @@ const DeleteChallengeResponse = z.object({
     // allowDelete indicates whether the user is allowed to delete their account
     // via app (some special-cased accounts might need to contact support).
     allowDelete: z.boolean(),
-    // An encrypted challenge that the client needs to decrypt before proceeding
-    // with account deletion.
+    // An encrypted challenge that the client needs to decrypt and provide in
+    // the actual account deletion request.
     encryptedChallenge: z.string().nullable().transform(nullToUndefined),
 });
 
diff --git a/web/packages/shared/crypto/helpers.ts b/web/packages/shared/crypto/helpers.ts
index 15abcad3e1..a5ed61d8c5 100644
--- a/web/packages/shared/crypto/helpers.ts
+++ b/web/packages/shared/crypto/helpers.ts
@@ -180,3 +180,29 @@ async function createNewRecoveryKey() {
 
     return recoveryKey;
 }
+
+/**
+ * Decrypt the {@link encryptedChallenge} sent by remote during the delete
+ * account flow ({@link getAccountDeleteChallenge}), returning a value that can
+ * then directly be passed to the actual delete account request
+ * ({@link deleteAccount}).
+ */
+export const decryptDeleteAccountChallenge = async (
+    encryptedChallenge: string,
+) => {
+    const cryptoWorker = await sharedCryptoWorker();
+    const masterKey = await getActualKey();
+    const keyAttributes = getData(LS_KEYS.KEY_ATTRIBUTES);
+    const secretKey = await cryptoWorker.decryptB64(
+        keyAttributes.encryptedSecretKey,
+        keyAttributes.secretKeyDecryptionNonce,
+        masterKey,
+    );
+    const b64DecryptedChallenge = await cryptoWorker.boxSealOpen(
+        encryptedChallenge,
+        keyAttributes.publicKey,
+        secretKey,
+    );
+    const utf8DecryptedChallenge = atob(b64DecryptedChallenge);
+    return utf8DecryptedChallenge;
+};

From 504a8bdab6943adbf345b2b422c88f442744d0e4 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 16:55:15 +0530
Subject: [PATCH 569/796] Use newer

---
 web/apps/auth/src/pages/auth.tsx                      |  2 +-
 .../accounts/components/utils/use-redirect.ts         |  2 +-
 web/packages/base/{session-store.ts => session.ts}    |  2 +-
 web/packages/new/photos/services/ml/index.ts          |  2 +-
 web/packages/new/photos/services/search/index.ts      |  2 +-
 web/packages/shared/crypto/helpers.ts                 | 11 +++++++----
 6 files changed, 12 insertions(+), 9 deletions(-)
 rename web/packages/base/{session-store.ts => session.ts} (96%)

diff --git a/web/apps/auth/src/pages/auth.tsx b/web/apps/auth/src/pages/auth.tsx
index 1e40413c17..8e03adf9f0 100644
--- a/web/apps/auth/src/pages/auth.tsx
+++ b/web/apps/auth/src/pages/auth.tsx
@@ -11,7 +11,7 @@ import {
 import { useBaseContext } from "@/base/context";
 import { isHTTP401Error } from "@/base/http";
 import log from "@/base/log";
-import { masterKeyFromSessionIfLoggedIn } from "@/base/session-store";
+import { masterKeyFromSessionIfLoggedIn } from "@/base/session";
 import { AUTH_PAGES as PAGES } from "@ente/shared/constants/pages";
 import LogoutOutlinedIcon from "@mui/icons-material/LogoutOutlined";
 import {
diff --git a/web/packages/accounts/components/utils/use-redirect.ts b/web/packages/accounts/components/utils/use-redirect.ts
index 981debc5bd..6307dc439e 100644
--- a/web/packages/accounts/components/utils/use-redirect.ts
+++ b/web/packages/accounts/components/utils/use-redirect.ts
@@ -1,4 +1,4 @@
-import { haveCredentialsInSession } from "@/base/session-store";
+import { haveCredentialsInSession } from "@/base/session";
 import { useRouter } from "next/router";
 import { useEffect } from "react";
 import { stashRedirect } from "../../services/redirect";
diff --git a/web/packages/base/session-store.ts b/web/packages/base/session.ts
similarity index 96%
rename from web/packages/base/session-store.ts
rename to web/packages/base/session.ts
index 6b9b38387f..b3c2e7fd82 100644
--- a/web/packages/base/session-store.ts
+++ b/web/packages/base/session.ts
@@ -3,7 +3,7 @@ import { decryptBox } from "./crypto";
 import { toB64 } from "./crypto/libsodium";
 
 /**
- * Return the decrypted user's master key from session storage.
+ * Return the user's decrypted master key from session storage.
  *
  * Precondition: The user should be logged in.
  */
diff --git a/web/packages/new/photos/services/ml/index.ts b/web/packages/new/photos/services/ml/index.ts
index 4a6bf3850a..89a08dc041 100644
--- a/web/packages/new/photos/services/ml/index.ts
+++ b/web/packages/new/photos/services/ml/index.ts
@@ -6,7 +6,7 @@ import { isDesktop } from "@/base/app";
 import { blobCache } from "@/base/blob-cache";
 import { ensureElectron } from "@/base/electron";
 import log from "@/base/log";
-import { masterKeyFromSession } from "@/base/session-store";
+import { masterKeyFromSession } from "@/base/session";
 import type { Electron } from "@/base/types/ipc";
 import { ComlinkWorker } from "@/base/worker/comlink-worker";
 import type { UploadItem } from "@/gallery/services/upload";
diff --git a/web/packages/new/photos/services/search/index.ts b/web/packages/new/photos/services/search/index.ts
index 88b9bc9598..41526e5023 100644
--- a/web/packages/new/photos/services/search/index.ts
+++ b/web/packages/new/photos/services/search/index.ts
@@ -1,5 +1,5 @@
 import log from "@/base/log";
-import { masterKeyFromSession } from "@/base/session-store";
+import { masterKeyFromSession } from "@/base/session";
 import { ComlinkWorker } from "@/base/worker/comlink-worker";
 import { FileType } from "@/media/file-type";
 import i18n, { t } from "i18next";
diff --git a/web/packages/shared/crypto/helpers.ts b/web/packages/shared/crypto/helpers.ts
index a5ed61d8c5..024f1ac0c2 100644
--- a/web/packages/shared/crypto/helpers.ts
+++ b/web/packages/shared/crypto/helpers.ts
@@ -1,6 +1,7 @@
 import { setRecoveryKey } from "@/accounts/services/user";
 import { sharedCryptoWorker } from "@/base/crypto";
 import log from "@/base/log";
+import { masterKeyFromSession } from "@/base/session";
 import {
     LS_KEYS,
     getData,
@@ -191,11 +192,13 @@ export const decryptDeleteAccountChallenge = async (
     encryptedChallenge: string,
 ) => {
     const cryptoWorker = await sharedCryptoWorker();
-    const masterKey = await getActualKey();
+    const masterKey = await masterKeyFromSession();
     const keyAttributes = getData(LS_KEYS.KEY_ATTRIBUTES);
-    const secretKey = await cryptoWorker.decryptB64(
-        keyAttributes.encryptedSecretKey,
-        keyAttributes.secretKeyDecryptionNonce,
+    const secretKey = await cryptoWorker.decryptBoxB64(
+        {
+            encryptedData: keyAttributes.encryptedSecretKey,
+            nonce: keyAttributes.secretKeyDecryptionNonce,
+        },
         masterKey,
     );
     const b64DecryptedChallenge = await cryptoWorker.boxSealOpen(

From 9103d738745e533b42f9bf3489ed0010c098c6b4 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 17:06:01 +0530
Subject: [PATCH 570/796] touched

---
 .../photos/src/components/DeleteAccount.tsx   | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/web/apps/photos/src/components/DeleteAccount.tsx b/web/apps/photos/src/components/DeleteAccount.tsx
index b7f59e9207..f165c589a4 100644
--- a/web/apps/photos/src/components/DeleteAccount.tsx
+++ b/web/apps/photos/src/components/DeleteAccount.tsx
@@ -51,7 +51,7 @@ export const DeleteAccount: React.FC<DeleteAccountProps> = ({
         { reason: string; feedback: string } | undefined
     >(undefined);
 
-    const { values, errors, handleChange, handleSubmit } = useFormik({
+    const { values, touched, errors, handleChange, handleSubmit } = useFormik({
         initialValues: { reason: "", feedback: "" },
         validate: ({ reason, feedback }) => {
             if (!reason) return { reason: t("required") };
@@ -149,7 +149,7 @@ export const DeleteAccount: React.FC<DeleteAccountProps> = ({
                             selected={values.reason}
                             onSelect={handleChange("reason")}
                         />
-                        {errors.reason && (
+                        {touched.reason && errors.reason && (
                             <Typography
                                 variant="small"
                                 sx={{ px: 1, color: "critical.main" }}
@@ -161,7 +161,9 @@ export const DeleteAccount: React.FC<DeleteAccountProps> = ({
                     <FeedbackInput
                         value={values.feedback}
                         onChange={handleChange("feedback")}
-                        errorMessage={errors.feedback}
+                        errorMessage={
+                            touched.feedback ? errors.feedback : undefined
+                        }
                     />
                     <ConfirmationCheckboxInput
                         checked={acceptDataDeletion}
@@ -212,7 +214,7 @@ const deleteReasonOptions = (): DropdownOption<DeleteReason>[] =>
 
 interface FeedbackInputProps {
     value: string;
-    errorMessage?: string;
+    errorMessage?: string | undefined;
     onChange: (value: string) => void;
 }
 
@@ -242,9 +244,14 @@ const FeedbackInput: React.FC<FeedbackInputProps> = ({
                 },
             }}
         />
-        <Typography variant="small" sx={{ px: "8px", color: "critical.main" }}>
-            {errorMessage}
-        </Typography>
+        {errorMessage && (
+            <Typography
+                variant="small"
+                sx={{ px: "8px", color: "critical.main" }}
+            >
+                {errorMessage}
+            </Typography>
+        )}
     </Stack>
 );
 

From e32b23409cbdca0b8a944a75514d026f3d3fae63 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 26 Feb 2025 17:14:16 +0530
Subject: [PATCH 571/796] [mob][photos] fallback on old memories

---
 .../lib/ui/home/memories/memories_widget.dart | 68 +++++++++++--------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/mobile/lib/ui/home/memories/memories_widget.dart b/mobile/lib/ui/home/memories/memories_widget.dart
index e15a0c88b2..19557fdebb 100644
--- a/mobile/lib/ui/home/memories/memories_widget.dart
+++ b/mobile/lib/ui/home/memories/memories_widget.dart
@@ -58,37 +58,45 @@ class _MemoriesWidgetState extends State<MemoriesWidget> {
       return const SizedBox.shrink();
     }
     if (memoriesCacheService.enableSmartMemories) {
-      return FutureBuilder<List<SmartMemory>>(
-        future: memoriesCacheService.getMemories(
-          null,
-        ),
-        builder: (context, snapshot) {
-          if (snapshot.hasData && snapshot.data!.isEmpty) {
-            return const SizedBox.shrink();
-          }
-          if (snapshot.hasError || !snapshot.hasData) {
-            return SizedBox(
-              height: _maxHeight + 12 + 10,
-              child: const EnteLoadingWidget(),
-            );
-          } else {
-            return Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                const SizedBox(
-                  height: 12,
-                ),
-                _buildSmartMemories(snapshot.data!),
-                const SizedBox(height: 10),
-              ],
-            ).animate().fadeIn(
-                  duration: const Duration(milliseconds: 250),
-                  curve: Curves.easeInOutCirc,
-                );
-          }
-        },
-      );
+      return _smartMemories();
     }
+    return _oldMemories();
+  }
+
+  Widget _smartMemories() {
+    return FutureBuilder<List<SmartMemory>>(
+      future: memoriesCacheService.getMemories(
+        null,
+      ),
+      builder: (context, snapshot) {
+        if (snapshot.hasData && snapshot.data!.isEmpty) {
+          return _oldMemories();
+        }
+        if (snapshot.hasError || !snapshot.hasData) {
+          return SizedBox(
+            height: _maxHeight + 12 + 10,
+            child: const EnteLoadingWidget(),
+          );
+        } else {
+          return Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              const SizedBox(
+                height: 12,
+              ),
+              _buildSmartMemories(snapshot.data!),
+              const SizedBox(height: 10),
+            ],
+          ).animate().fadeIn(
+                duration: const Duration(milliseconds: 250),
+                curve: Curves.easeInOutCirc,
+              );
+        }
+      },
+    );
+  }
+
+  Widget _oldMemories() {
     return FutureBuilder<List<Memory>>(
       future: MemoriesService.instance.getMemories(),
       builder: (context, snapshot) {

From 818fba943561d66c7636baaa3acb5d8fb3ae65a2 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 18:40:47 +0530
Subject: [PATCH 572/796] Prune

---
 .../photos/src/components/DeleteAccount.tsx   | 47 +++++++++----------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/web/apps/photos/src/components/DeleteAccount.tsx b/web/apps/photos/src/components/DeleteAccount.tsx
index f165c589a4..19cf20f0cd 100644
--- a/web/apps/photos/src/components/DeleteAccount.tsx
+++ b/web/apps/photos/src/components/DeleteAccount.tsx
@@ -1,4 +1,3 @@
-import { assertionFailed } from "@/base/assert";
 import { TitledMiniDialog } from "@/base/components/MiniDialog";
 import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton";
 import { LoadingButton } from "@/base/components/mui/LoadingButton";
@@ -22,7 +21,7 @@ import {
 } from "@mui/material";
 import { useFormik } from "formik";
 import { t } from "i18next";
-import React, { useRef, useState } from "react";
+import React, { useState } from "react";
 import { Trans } from "react-i18next";
 import { deleteAccount } from "services/userService";
 
@@ -43,13 +42,8 @@ export const DeleteAccount: React.FC<DeleteAccountProps> = ({
 }) => {
     const { logout, showMiniDialog, onGenericError } = useBaseContext();
 
-    const [loading, setLoading] = useState(false);
-    const deleteAccountChallenge = useRef<string | undefined>(undefined);
-
     const [acceptDataDeletion, setAcceptDataDeletion] = useState(false);
-    const reasonAndFeedbackRef = useRef<
-        { reason: string; feedback: string } | undefined
-    >(undefined);
+    const [loading, setLoading] = useState(false);
 
     const { values, touched, errors, handleChange, handleSubmit } = useFormik({
         initialValues: { reason: "", feedback: "" },
@@ -69,13 +63,18 @@ export const DeleteAccount: React.FC<DeleteAccountProps> = ({
             try {
                 feedback = feedback.trim();
                 setLoading(true);
-                reasonAndFeedbackRef.current = { reason, feedback };
-                const deleteChallengeResponse =
+                const { allowDelete, encryptedChallenge } =
                     await getAccountDeleteChallenge();
-                deleteAccountChallenge.current =
-                    deleteChallengeResponse.encryptedChallenge;
-                if (deleteChallengeResponse.allowDelete) {
-                    onAuthenticateUser().then(confirmAccountDeletion);
+                if (allowDelete && encryptedChallenge) {
+                    onAuthenticateUser().then(() =>
+                        confirmAccountDeletion(() =>
+                            solveChallengeAndDeleteAccount(
+                                encryptedChallenge,
+                                reason,
+                                feedback,
+                            ),
+                        ),
+                    );
                 } else {
                     askToMailForDeletion();
                 }
@@ -87,14 +86,14 @@ export const DeleteAccount: React.FC<DeleteAccountProps> = ({
         },
     });
 
-    const confirmAccountDeletion = () =>
+    const confirmAccountDeletion = (onConfirm: () => void) =>
         showMiniDialog({
             title: t("delete_account"),
             message: <Trans i18nKey="delete_account_confirm_message" />,
             continue: {
                 text: t("delete"),
                 color: "critical",
-                action: solveChallengeAndDeleteAccount,
+                action: onConfirm,
             },
         });
 
@@ -118,15 +117,13 @@ export const DeleteAccount: React.FC<DeleteAccountProps> = ({
         });
     };
 
-    const solveChallengeAndDeleteAccount = async () => {
-        if (!deleteAccountChallenge.current || !reasonAndFeedbackRef.current) {
-            assertionFailed();
-            return;
-        }
-        const decryptedChallenge = await decryptDeleteAccountChallenge(
-            deleteAccountChallenge.current,
-        );
-        const { reason, feedback } = reasonAndFeedbackRef.current;
+    const solveChallengeAndDeleteAccount = async (
+        encryptedChallenge: string,
+        reason: string,
+        feedback: string,
+    ) => {
+        const decryptedChallenge =
+            await decryptDeleteAccountChallenge(encryptedChallenge);
         await deleteAccount(decryptedChallenge, reason, feedback);
         logout();
     };

From cba85799f0effa901deece2e451f00028521aa52 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 18:46:38 +0530
Subject: [PATCH 573/796] del api

---
 .../photos/src/components/DeleteAccount.tsx   |  6 +++--
 web/apps/photos/src/services/userService.ts   | 25 -------------------
 web/packages/new/photos/services/user.ts      | 20 +++++++++++++++
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/web/apps/photos/src/components/DeleteAccount.tsx b/web/apps/photos/src/components/DeleteAccount.tsx
index 19cf20f0cd..d3ff921b9c 100644
--- a/web/apps/photos/src/components/DeleteAccount.tsx
+++ b/web/apps/photos/src/components/DeleteAccount.tsx
@@ -7,7 +7,10 @@ import {
     DropdownInput,
     type DropdownOption,
 } from "@/new/photos/components/DropdownInput";
-import { getAccountDeleteChallenge } from "@/new/photos/services/user";
+import {
+    deleteAccount,
+    getAccountDeleteChallenge,
+} from "@/new/photos/services/user";
 import { initiateEmail } from "@/new/photos/utils/web";
 import { decryptDeleteAccountChallenge } from "@ente/shared/crypto/helpers";
 import {
@@ -23,7 +26,6 @@ import { useFormik } from "formik";
 import { t } from "i18next";
 import React, { useState } from "react";
 import { Trans } from "react-i18next";
-import { deleteAccount } from "services/userService";
 
 type DeleteAccountProps = ModalVisibilityProps & {
     /**
diff --git a/web/apps/photos/src/services/userService.ts b/web/apps/photos/src/services/userService.ts
index ba089377bf..64a9a0c8d8 100644
--- a/web/apps/photos/src/services/userService.ts
+++ b/web/apps/photos/src/services/userService.ts
@@ -80,28 +80,3 @@ export const getUserDetailsV2 = async (): Promise<UserDetails> => {
         throw e;
     }
 };
-
-export const deleteAccount = async (
-    challenge: string,
-    reason: string,
-    feedback: string,
-) => {
-    try {
-        const token = getToken();
-        if (!token) {
-            return;
-        }
-
-        await HTTPService.delete(
-            await apiURL("/users/delete"),
-            { challenge, reason, feedback },
-            null,
-            {
-                "X-Auth-Token": token,
-            },
-        );
-    } catch (e) {
-        log.error("deleteAccount api call failed", e);
-        throw e;
-    }
-};
diff --git a/web/packages/new/photos/services/user.ts b/web/packages/new/photos/services/user.ts
index 5858a037a8..7ddacbd12a 100644
--- a/web/packages/new/photos/services/user.ts
+++ b/web/packages/new/photos/services/user.ts
@@ -41,3 +41,23 @@ export const getAccountDeleteChallenge = async () => {
     ensureOk(res);
     return DeleteChallengeResponse.parse(await res.json());
 };
+
+/**
+ * Delete the logged in user's account on remote.
+ *
+ * @param challenge Decrypted value of the challenge previously obtained via
+ * {@link getAccountDeleteChallenge}. The decryption algorithm is implemented in
+ * {@link decryptDeleteAccountChallenge}.
+ */
+export const deleteAccount = async (
+    challenge: string,
+    reason: string,
+    feedback: string,
+) =>
+    ensureOk(
+        await fetch(await apiURL("/users/delete"), {
+            method: "DELETE",
+            headers: await authenticatedRequestHeaders(),
+            body: JSON.stringify({ challenge, reason, feedback }),
+        }),
+    );

From 30137095400460bde38b9e24f62a81cf95eeb46a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 18:49:02 +0530
Subject: [PATCH 574/796] Move

---
 web/apps/photos/src/components/Sidebar.tsx                      | 2 +-
 .../src => packages/new/photos}/components/DeleteAccount.tsx    | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename web/{apps/photos/src => packages/new/photos}/components/DeleteAccount.tsx (100%)

diff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsx
index 0aadc8f6e5..fba039ffb2 100644
--- a/web/apps/photos/src/components/Sidebar.tsx
+++ b/web/apps/photos/src/components/Sidebar.tsx
@@ -37,6 +37,7 @@ import log from "@/base/log";
 import { savedLogs } from "@/base/log-web";
 import { customAPIHost } from "@/base/origins";
 import { downloadString } from "@/base/utils/web";
+import { DeleteAccount } from "@/new/photos/components/DeleteAccount";
 import { DropdownInput } from "@/new/photos/components/DropdownInput";
 import { MLSettings } from "@/new/photos/components/sidebar/MLSettings";
 import { TwoFactorSettings } from "@/new/photos/components/sidebar/TwoFactorSettings";
@@ -109,7 +110,6 @@ import {
     useColorScheme,
 } from "@mui/material";
 import Typography from "@mui/material/Typography";
-import { DeleteAccount } from "components/DeleteAccount";
 import { WatchFolder } from "components/WatchFolder";
 import { t } from "i18next";
 import { useRouter } from "next/router";
diff --git a/web/apps/photos/src/components/DeleteAccount.tsx b/web/packages/new/photos/components/DeleteAccount.tsx
similarity index 100%
rename from web/apps/photos/src/components/DeleteAccount.tsx
rename to web/packages/new/photos/components/DeleteAccount.tsx

From 833b564acc2c7f7765e48bee1f4ce39432962d24 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 26 Feb 2025 18:53:10 +0530
Subject: [PATCH 575/796] Promise

---
 .../new/photos/components/DeleteAccount.tsx   | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/web/packages/new/photos/components/DeleteAccount.tsx b/web/packages/new/photos/components/DeleteAccount.tsx
index d3ff921b9c..e8a4d2c180 100644
--- a/web/packages/new/photos/components/DeleteAccount.tsx
+++ b/web/packages/new/photos/components/DeleteAccount.tsx
@@ -62,42 +62,43 @@ export const DeleteAccount: React.FC<DeleteAccountProps> = ({
             return {};
         },
         onSubmit: async ({ reason, feedback }) => {
+            feedback = feedback.trim();
+            setLoading(true);
             try {
-                feedback = feedback.trim();
-                setLoading(true);
                 const { allowDelete, encryptedChallenge } =
                     await getAccountDeleteChallenge();
                 if (allowDelete && encryptedChallenge) {
-                    onAuthenticateUser().then(() =>
-                        confirmAccountDeletion(() =>
+                    await onAuthenticateUser()
+                        .then(confirmAccountDeletion)
+                        .then(() =>
                             solveChallengeAndDeleteAccount(
                                 encryptedChallenge,
                                 reason,
                                 feedback,
                             ),
-                        ),
-                    );
+                        );
                 } else {
                     askToMailForDeletion();
                 }
             } catch (e) {
                 onGenericError(e);
-            } finally {
-                setLoading(false);
             }
+            setLoading(false);
         },
     });
 
-    const confirmAccountDeletion = (onConfirm: () => void) =>
-        showMiniDialog({
-            title: t("delete_account"),
-            message: <Trans i18nKey="delete_account_confirm_message" />,
-            continue: {
-                text: t("delete"),
-                color: "critical",
-                action: onConfirm,
-            },
-        });
+    const confirmAccountDeletion = () =>
+        new Promise<void>((resolve) =>
+            showMiniDialog({
+                title: t("delete_account"),
+                message: <Trans i18nKey="delete_account_confirm_message" />,
+                continue: {
+                    text: t("delete"),
+                    color: "critical",
+                    action: resolve,
+                },
+            }),
+        );
 
     const askToMailForDeletion = () => {
         const emailID = "account-deletion@ente.io";

From afc8fbf7b21f9ae2a5bc0dc87a536fb7101d4e71 Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Wed, 26 Feb 2025 19:41:57 +0530
Subject: [PATCH 576/796] [mob][photos] If free up space fails the first time,
 retry after removing non-existing assets (only for android)

---
 mobile/lib/ui/tools/free_space_page.dart | 11 +++-
 mobile/lib/utils/delete_file_util.dart   | 79 +++++++++++++++++++++++-
 2 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/ui/tools/free_space_page.dart b/mobile/lib/ui/tools/free_space_page.dart
index 3b60096d1f..a8d6a42742 100644
--- a/mobile/lib/ui/tools/free_space_page.dart
+++ b/mobile/lib/ui/tools/free_space_page.dart
@@ -1,3 +1,5 @@
+import "dart:io";
+
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:logging/logging.dart';
@@ -6,6 +8,7 @@ import 'package:photos/models/backup_status.dart';
 import 'package:photos/ui/common/gradient_button.dart';
 import 'package:photos/utils/data_util.dart';
 import 'package:photos/utils/delete_file_util.dart';
+import "package:photos/utils/toast_util.dart";
 
 class FreeSpacePage extends StatefulWidget {
   final BackupStatus status;
@@ -163,9 +166,15 @@ class _FreeSpacePageState extends State<FreeSpacePage> {
   }
 
   Future<void> _freeStorage(BackupStatus status) async {
-    final result = await deleteLocalFiles(context, status.localIDs);
+    bool result = await deleteLocalFiles(context, status.localIDs);
+    if (result == false && Platform.isAndroid) {
+      result = await retryFreeUpSpaceAfterRemovingNonExistingAssets(context);
+    }
+
     if (result) {
       Navigator.of(context).pop(true);
+    } else {
+      showToast(context, S.of(context).couldNotFreeUpSpace);
     }
   }
 }
diff --git a/mobile/lib/utils/delete_file_util.dart b/mobile/lib/utils/delete_file_util.dart
index 03e5455a88..a715c3f154 100644
--- a/mobile/lib/utils/delete_file_util.dart
+++ b/mobile/lib/utils/delete_file_util.dart
@@ -14,10 +14,12 @@ import "package:photos/events/force_reload_trash_page_event.dart";
 import 'package:photos/events/local_photos_updated_event.dart';
 import "package:photos/generated/l10n.dart";
 import 'package:photos/models/api/collection/trash_item_request.dart';
+import "package:photos/models/backup_status.dart";
 import 'package:photos/models/file/file.dart';
 import "package:photos/models/files_split.dart";
 import 'package:photos/models/selected_files.dart';
 import "package:photos/service_locator.dart";
+import "package:photos/services/local_sync_service.dart";
 import 'package:photos/services/remote_sync_service.dart';
 import 'package:photos/services/sync_service.dart';
 import 'package:photos/ui/common/linear_progress_dialog.dart';
@@ -333,6 +335,8 @@ Future<bool> deleteLocalFiles(
   final List<String> alreadyDeletedIDs = []; // to ignore already deleted files
 
   try {
+    final dialog = createProgressDialog(context, "Loading...");
+    await dialog.show();
     for (final file in files) {
       if (!(await _localFileExist(file))) {
         _logger.warning("Already deleted " + file.toString());
@@ -347,6 +351,8 @@ Future<bool> deleteLocalFiles(
     deletedIDs.addAll(alreadyDeletedIDs);
     deletedIDs.addAll(await _tryDeleteSharedMediaFiles(localSharedMediaIDs));
 
+    await dialog.hide();
+
     final bool shouldDeleteInBatches =
         await isAndroidSDKVersionLowerThan(android11SDKINT);
     if (shouldDeleteInBatches) {
@@ -389,7 +395,78 @@ Future<bool> deleteLocalFiles(
     }
   } catch (e, s) {
     _logger.severe("Could not delete local files", e, s);
-    showToast(context, S.of(context).couldNotFreeUpSpace);
+    return false;
+  }
+}
+
+/// Only to be used on Android
+Future<bool> retryFreeUpSpaceAfterRemovingNonExistingAssets(
+  BuildContext context,
+) async {
+  _logger.info("Retrying free up space after removing non-existing assets");
+  try {
+    final dialog =
+        createProgressDialog(context, "Please wait, this will take a while...");
+    await dialog.show();
+
+    final stopwatch = Stopwatch()..start();
+    final res = await PhotoManager.editor.android.removeAllNoExistsAsset();
+    if (res == false) {
+      _logger.warning("Failed to remove non-existing assets");
+    }
+    _logger.info(
+      "removeAllNoExistsAsset took: ${stopwatch.elapsedMilliseconds}ms",
+    );
+    await LocalSyncService.instance.sync();
+
+    late final BackupStatus status;
+    final List<String> deletedIDs = [];
+    final List<String> localAssetIDs = [];
+    final List<String> localSharedMediaIDs = [];
+    status = await SyncService.instance.getBackupStatus();
+
+    for (String localID in status.localIDs) {
+      if (localID.startsWith(oldSharedMediaIdentifier) ||
+          localID.startsWith(sharedMediaIdentifier)) {
+        localSharedMediaIDs.add(localID);
+      } else {
+        localAssetIDs.add(localID);
+      }
+    }
+    deletedIDs.addAll(await _tryDeleteSharedMediaFiles(localSharedMediaIDs));
+
+    await dialog.hide();
+
+    final bool shouldDeleteInBatches =
+        await isAndroidSDKVersionLowerThan(android11SDKINT);
+    if (shouldDeleteInBatches) {
+      _logger.info("Deleting in batches");
+      deletedIDs
+          .addAll(await deleteLocalFilesInBatches(context, localAssetIDs));
+    } else {
+      _logger.info("Deleting in one shot");
+      deletedIDs
+          .addAll(await _deleteLocalFilesInOneShot(context, localAssetIDs));
+    }
+
+    if (deletedIDs.isNotEmpty) {
+      final deletedFiles = await FilesDB.instance.getLocalFiles(deletedIDs);
+      await FilesDB.instance.deleteLocalFiles(deletedIDs);
+      _logger.info(deletedFiles.length.toString() + " files deleted locally");
+      Bus.instance.fire(
+        LocalPhotosUpdatedEvent(deletedFiles, source: "deleteLocal"),
+      );
+      return true;
+    } else {
+      //On android 10, even if files were deleted, deletedIDs is empty.
+      //This is a workaround so that users are not shown an error message on
+      //android 10
+      if (!await isAndroidSDKVersionLowerThan(android11SDKINT)) {
+        return false;
+      }
+      return true;
+    }
+  } catch (e) {
     return false;
   }
 }

From 5307c1fda60a4f750e471e35086ed40d01fbb43f Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Wed, 26 Feb 2025 19:48:49 +0530
Subject: [PATCH 577/796] [mob][photos] Bump up build number

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 7b9da3ccd5..7e480d60da 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.99+1003
+version: 0.9.99+1004
 publish_to: none
 
 environment:

From 9b2af45f163b8a7f9424b94c30360e4f5ae7b0a6 Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Wed, 26 Feb 2025 19:56:43 +0530
Subject: [PATCH 578/796] [mob][photos] Bump up build number

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 7e480d60da..d1dfd6af1c 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.99+1004
+version: 0.9.99+1007
 publish_to: none
 
 environment:

From 4e6e3e7abf1276129fca251264f7cbdde51ab55c Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 27 Feb 2025 09:18:14 +0530
Subject: [PATCH 579/796] [desktop] Improve export_status.json writes

---
 desktop/src/main/ipc.ts                      |  7 +++++++
 desktop/src/main/services/fs.ts              |  6 ++++++
 desktop/src/preload.ts                       |  4 ++++
 web/apps/photos/src/services/export/index.ts |  2 +-
 web/packages/base/types/ipc.ts               | 12 ++++++++++++
 5 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/desktop/src/main/ipc.ts b/desktop/src/main/ipc.ts
index ff98e2ec88..b0a2eccf0c 100644
--- a/desktop/src/main/ipc.ts
+++ b/desktop/src/main/ipc.ts
@@ -41,6 +41,7 @@ import {
     fsRm,
     fsRmdir,
     fsWriteFile,
+    fsWriteFileViaBackup,
 } from "./services/fs";
 import { convertToJPEG, generateImageThumbnail } from "./services/image";
 import { logout } from "./services/logout";
@@ -154,6 +155,12 @@ export const attachIPCHandlers = () => {
         fsWriteFile(path, contents),
     );
 
+    ipcMain.handle(
+        "fsWriteFileViaBackup",
+        (_, path: string, contents: string) =>
+            fsWriteFileViaBackup(path, contents),
+    );
+
     ipcMain.handle("fsIsDir", (_, dirPath: string) => fsIsDir(dirPath));
 
     ipcMain.handle("fsFindFiles", (_, folderPath: string) =>
diff --git a/desktop/src/main/services/fs.ts b/desktop/src/main/services/fs.ts
index cdbded0beb..6cfe101ebf 100644
--- a/desktop/src/main/services/fs.ts
+++ b/desktop/src/main/services/fs.ts
@@ -24,6 +24,12 @@ export const fsReadTextFile = async (filePath: string) =>
 export const fsWriteFile = (path: string, contents: string) =>
     fs.writeFile(path, contents, { flush: true });
 
+export const fsWriteFileViaBackup = async (path: string, contents: string) => {
+    const backupPath = path + ".backup";
+    await fs.writeFile(backupPath, contents, { flush: true });
+    return fs.rename(backupPath, path);
+};
+
 export const fsIsDir = async (dirPath: string) => {
     if (!existsSync(dirPath)) return false;
     const stat = await fs.stat(dirPath);
diff --git a/desktop/src/preload.ts b/desktop/src/preload.ts
index cb9d594511..3fab447722 100644
--- a/desktop/src/preload.ts
+++ b/desktop/src/preload.ts
@@ -178,6 +178,9 @@ const fsReadTextFile = (path: string) =>
 const fsWriteFile = (path: string, contents: string) =>
     ipcRenderer.invoke("fsWriteFile", path, contents);
 
+const fsWriteFileViaBackup = (path: string, contents: string) =>
+    ipcRenderer.invoke("fsWriteFileViaBackup", path, contents);
+
 const fsIsDir = (dirPath: string) => ipcRenderer.invoke("fsIsDir", dirPath);
 
 // - Conversion
@@ -373,6 +376,7 @@ contextBridge.exposeInMainWorld("electron", {
         rm: fsRm,
         readTextFile: fsReadTextFile,
         writeFile: fsWriteFile,
+        writeFileViaBackup: fsWriteFileViaBackup,
         isDir: fsIsDir,
         findFiles: fsFindFiles,
     },
diff --git a/web/apps/photos/src/services/export/index.ts b/web/apps/photos/src/services/export/index.ts
index bd5394c792..4ffc035aaa 100644
--- a/web/apps/photos/src/services/export/index.ts
+++ b/web/apps/photos/src/services/export/index.ts
@@ -888,7 +888,7 @@ class ExportService {
         try {
             const exportRecord = await this.getExportRecord(folder);
             const newRecord: ExportRecord = { ...exportRecord, ...newData };
-            await ensureElectron().fs.writeFile(
+            await ensureElectron().fs.writeFileViaBackup(
                 joinPath(folder, exportRecordFileName),
                 JSON.stringify(newRecord, null, 2),
             );
diff --git a/web/packages/base/types/ipc.ts b/web/packages/base/types/ipc.ts
index 5a1e39bddb..07f6b79db7 100644
--- a/web/packages/base/types/ipc.ts
+++ b/web/packages/base/types/ipc.ts
@@ -259,6 +259,18 @@ export interface Electron {
          */
         writeFile: (path: string, contents: string) => Promise<void>;
 
+        /**
+         * A variant of {@link writeFile} that first writes the file to a backup
+         * file, and then renames the backup file to the actual path. This both
+         * makes the write atomic (as far as the node's fs.rename guarantees
+         * atomicity), and also keeps the backup file around for recovery if
+         * something goes wrong during the rename.
+         *
+         * This behaviour of this function is tailored around for writes to the
+         * "export_status.json" during exports.
+         */
+        writeFileViaBackup: (path: string, contents: string) => Promise<void>;
+
         /**
          * Return true if there is an item at {@link dirPath}, and it is as
          * directory.

From 06b84e8067d698916ef9294bc228e17ee3db3f8b Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 27 Feb 2025 11:01:20 +0530
Subject: [PATCH 580/796] Temporary workbench

---
 web/apps/photos/src/pages/_app.tsx                   | 4 ++--
 web/apps/photos/src/styles/global.css                | 3 ++-
 web/packages/gallery/components/viewer/photoswipe.ts | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index 000cf2d037..aad64be0cf 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -48,9 +48,9 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { resumeExportsIfNeeded } from "services/export";
 import { photosLogout } from "services/logout";
 
-import "photoswipe/dist/photoswipe.css";
+// import "photoswipe/dist/photoswipe.css";
 // TODO(PS): Note, auto hide only works with the new CSS.
-// import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
+import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
 
 import "styles/global.css";
 
diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index aced5adc91..3eb8dd8d62 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -12,7 +12,7 @@ body {
     flex-direction: column;
     height: 100%;
 }
-
+@media DISABLED {
 .pswp__button--custom {
     width: 48px;
     height: 48px;
@@ -114,6 +114,7 @@ body {
 .pswp__caption--empty {
     display: none;
 }
+}
 
 .pswp-ente {
     /* The default z-index for PhotoSwipe is 10k, way beyond everything else.
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index a680c515ad..b1d9053f60 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -31,7 +31,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 let PhotoSwipe;
 if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     // TODO(PS): Comment me before merging into main.
-    // PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
+    PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
 
 type FileViewerPhotoSwipeOptions = {

From 7fc03a71e7f084aca751da9d3c249082eaf2a882 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 27 Feb 2025 11:12:04 +0530
Subject: [PATCH 581/796] Fix npe

---
 web/packages/gallery/components/FileInfo.tsx          | 2 ++
 web/packages/gallery/components/viewer/FileViewer.tsx | 2 +-
 web/packages/gallery/components/viewer/photoswipe.ts  | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 7be8d32ea3..ec49c17b17 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -7,6 +7,7 @@ Plan of action:
   and photos/FileInfo to deal with the @/new/photos imports here.
 */
 
+import { assertionFailed } from "@/base/assert";
 import { LinkButtonUndecorated } from "@/base/components/LinkButton";
 import { type ButtonishProps } from "@/base/components/mui";
 import { ActivityIndicator } from "@/base/components/mui/ActivityIndicator";
@@ -225,6 +226,7 @@ export const FileInfo: React.FC<FileInfoProps> = ({
         onSelectPerson?.(personID);
 
     if (!file) {
+        if (open) assertionFailed();
         return <></>;
     }
 
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 4c21d1dab3..0f536fe25a 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -189,7 +189,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
             <Button>Test</Button>
             <FileInfo
                 {...fileInfoVisibilityProps}
-                file={activeAnnotatedFile.file}
+                file={activeAnnotatedFile?.file}
                 exif={activeFileExif}
                 onSelectCollection={handleSelectCollection}
                 onSelectPerson={handleSelectPerson}
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index b1d9053f60..0c67c70521 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -221,7 +221,7 @@ export class FileViewerPhotoSwipe {
                 // The above condition implies that annotation can never be
                 // undefined, but it doesn't seem to be enough to convince
                 // TypeScript. Writing the condition in a more unnatural way
-                // `(annotation && annotation?.fileID == file.id)` works, but
+                // `(!(annotation && annotation?.fileID == file.id))` works, but
                 // instead we use a non-null assertion here.
                 annotation: annotation!,
             };
@@ -231,7 +231,7 @@ export class FileViewerPhotoSwipe {
 
         const withCurrentAnnotatedFile =
             (cb: (af: AnnotatedFile) => void) => () =>
-                cb(currentFileAnnotation());
+                cb(currentAnnotatedFile());
 
         // Provide data about slides to PhotoSwipe via callbacks
         // https://photoswipe.com/data-sources/#dynamically-generated-data

From 89afa9fbc72d5aca3007a2184e23ea7021ac32f7 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 27 Feb 2025 11:15:06 +0530
Subject: [PATCH 582/796] [mob][photos] Separate cache model

---
 mobile/lib/models/memories_cache.dart         | 253 ++++++++++++++++++
 .../lib/services/memories_cache_service.dart  | 248 +----------------
 2 files changed, 254 insertions(+), 247 deletions(-)
 create mode 100644 mobile/lib/models/memories_cache.dart

diff --git a/mobile/lib/models/memories_cache.dart b/mobile/lib/models/memories_cache.dart
new file mode 100644
index 0000000000..246ccb1eaa
--- /dev/null
+++ b/mobile/lib/models/memories_cache.dart
@@ -0,0 +1,253 @@
+
+
+import "dart:convert";
+
+import "package:photos/models/location/location.dart";
+import "package:photos/models/people_memory.dart";
+import "package:photos/models/smart_memory.dart";
+import "package:photos/models/trip_memory.dart";
+
+class MemoriesCache {
+  final List<ToShowMemory> toShowMemories;
+  final List<PeopleShownLogs> peopleShownLogs;
+  final List<TripsShownLogs> tripsShownLogs;
+
+  MemoriesCache({
+    required this.toShowMemories,
+    required this.peopleShownLogs,
+    required this.tripsShownLogs,
+  });
+
+  factory MemoriesCache.fromJson(Map<String, dynamic> json) {
+    return MemoriesCache(
+      toShowMemories: ToShowMemory.decodeJsonToList(json['toShowMemories']),
+      peopleShownLogs:
+          PeopleShownLogs.decodeJsonToList(json['peopleShownLogs']),
+      tripsShownLogs: TripsShownLogs.decodeJsonToList(json['tripsShownLogs']),
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'toShowMemories': ToShowMemory.encodeListToJson(toShowMemories),
+      'peopleShownLogs': PeopleShownLogs.encodeListToJson(peopleShownLogs),
+      'tripsShownLogs': TripsShownLogs.encodeListToJson(tripsShownLogs),
+    };
+  }
+
+  static String encodeToJsonString(MemoriesCache cache) {
+    return jsonEncode(cache.toJson());
+  }
+
+  static MemoriesCache decodeFromJsonString(String jsonString) {
+    return MemoriesCache.fromJson(jsonDecode(jsonString));
+  }
+}
+
+class ToShowMemory {
+  final String title;
+  final List<int> fileUploadedIDs;
+  final MemoryType type;
+  final int firstTimeToShow;
+  final int lastTimeToShow;
+
+  final String? personID;
+  final PeopleMemoryType? peopleMemoryType;
+  final Location? location;
+
+  bool get shouldShowNow {
+    final now = DateTime.now().microsecondsSinceEpoch;
+    return now >= firstTimeToShow && now <= lastTimeToShow;
+  }
+
+  bool get isOld {
+    final now = DateTime.now().microsecondsSinceEpoch;
+    return now > lastTimeToShow;
+  }
+
+  ToShowMemory(
+    this.title,
+    this.fileUploadedIDs,
+    this.type,
+    this.firstTimeToShow,
+    this.lastTimeToShow, {
+    this.personID,
+    this.peopleMemoryType,
+    this.location,
+  }) : assert(
+          (type == MemoryType.people &&
+                  personID != null &&
+                  peopleMemoryType != null) ||
+              (type == MemoryType.trips && location != null) ||
+              (type != MemoryType.people && type != MemoryType.trips),
+          "PersonID and peopleMemoryType must be provided for people memory type, and location must be provided for trips memory type",
+        );
+
+  factory ToShowMemory.fromSmartMemory(SmartMemory memory) {
+    assert(memory.firstDateToShow != null && memory.lastDateToShow != null);
+    String? personID;
+    PeopleMemoryType? peopleMemoryType;
+    Location? location;
+    if (memory is PeopleMemory) {
+      personID = memory.personID;
+      peopleMemoryType = memory.peopleMemoryType;
+    } else if (memory is TripMemory) {
+      location = memory.location;
+    }
+    return ToShowMemory(
+      memory.name,
+      memory.memories.map((m) => m.file.uploadedFileID!).toList(),
+      memory.type,
+      memory.firstDateToShow!,
+      memory.lastDateToShow!,
+      personID: personID,
+      peopleMemoryType: peopleMemoryType,
+      location: location,
+    );
+  }
+
+  factory ToShowMemory.fromJson(Map<String, dynamic> json) {
+    return ToShowMemory(
+      json['title'],
+      List<int>.from(json['fileUploadedIDs']),
+      memoryTypeFromString(json['type']),
+      json['firstTimeToShow'],
+      json['lastTimeToShow'],
+      personID: json['personID'],
+      peopleMemoryType: peopleMemoryTypeFromString(json['peopleMemoryType']),
+      location: json['location'] != null
+          ? Location(
+              latitude: json['location']['latitude'],
+              longitude: json['location']['longitude'],
+            )
+          : null,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'title': title,
+      'fileUploadedIDs': fileUploadedIDs.toList(),
+      'type': type.toString().split('.').last,
+      'firstTimeToShow': firstTimeToShow,
+      'lastTimeToShow': lastTimeToShow,
+      'personID': personID,
+      'peopleMemoryType': peopleMemoryType.toString().split('.').last,
+      'location': location != null
+          ? {
+              'latitude': location!.latitude!,
+              'longitude': location!.longitude!,
+            }
+          : null,
+    };
+  }
+
+  static String encodeListToJson(List<ToShowMemory> toShowMemories) {
+    final jsonList = toShowMemories.map((memory) => memory.toJson()).toList();
+    return jsonEncode(jsonList);
+  }
+
+  static List<ToShowMemory> decodeJsonToList(String jsonString) {
+    final jsonList = jsonDecode(jsonString) as List;
+    return jsonList.map((json) => ToShowMemory.fromJson(json)).toList();
+  }
+}
+
+class PeopleShownLogs {
+  final String personID;
+  final PeopleMemoryType peopleMemoryType;
+  final int lastTimeShown;
+
+  PeopleShownLogs(
+    this.personID,
+    this.peopleMemoryType,
+    this.lastTimeShown,
+  );
+
+  factory PeopleShownLogs.fromOldCacheMemory(ToShowMemory memory) {
+    assert(
+      memory.type == MemoryType.people &&
+          memory.personID != null &&
+          memory.peopleMemoryType != null,
+    );
+    return PeopleShownLogs(
+      memory.personID!,
+      memory.peopleMemoryType!,
+      memory.lastTimeToShow,
+    );
+  }
+
+  factory PeopleShownLogs.fromJson(Map<String, dynamic> json) {
+    return PeopleShownLogs(
+      json['personID'],
+      peopleMemoryTypeFromString(json['peopleMemoryType']),
+      json['lastTimeShown'],
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'personID': personID,
+      'peopleMemoryType': peopleMemoryType.toString().split('.').last,
+      'lastTimeShown': lastTimeShown,
+    };
+  }
+
+  static String encodeListToJson(List<PeopleShownLogs> shownLogs) {
+    final jsonList = shownLogs.map((log) => log.toJson()).toList();
+    return jsonEncode(jsonList);
+  }
+
+  static List<PeopleShownLogs> decodeJsonToList(String jsonString) {
+    final jsonList = jsonDecode(jsonString) as List;
+    return jsonList.map((json) => PeopleShownLogs.fromJson(json)).toList();
+  }
+}
+
+class TripsShownLogs {
+  final Location location;
+  final int lastTimeShown;
+
+  TripsShownLogs(
+    this.location,
+    this.lastTimeShown,
+  );
+
+  factory TripsShownLogs.fromOldCacheMemory(ToShowMemory memory) {
+    assert(memory.type == MemoryType.trips && memory.location != null);
+    return TripsShownLogs(
+      memory.location!,
+      memory.lastTimeToShow,
+    );
+  }
+
+  factory TripsShownLogs.fromJson(Map<String, dynamic> json) {
+    return TripsShownLogs(
+      Location(
+        latitude: json['location']['latitude'],
+        longitude: json['location']['longitude'],
+      ),
+      json['lastTimeShown'],
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'location': {
+        'latitude': location.latitude!,
+        'longitude': location.longitude!,
+      },
+      'lastTimeShown': lastTimeShown,
+    };
+  }
+
+  static String encodeListToJson(List<TripsShownLogs> shownLogs) {
+    final jsonList = shownLogs.map((log) => log.toJson()).toList();
+    return jsonEncode(jsonList);
+  }
+
+  static List<TripsShownLogs> decodeJsonToList(String jsonString) {
+    final jsonList = jsonDecode(jsonString) as List;
+    return jsonList.map((json) => TripsShownLogs.fromJson(json)).toList();
+  }
+}
\ No newline at end of file
diff --git a/mobile/lib/services/memories_cache_service.dart b/mobile/lib/services/memories_cache_service.dart
index 3acc3c0611..7315df50e7 100644
--- a/mobile/lib/services/memories_cache_service.dart
+++ b/mobile/lib/services/memories_cache_service.dart
@@ -1,5 +1,4 @@
 import "dart:async";
-import "dart:convert";
 import "dart:io" show File;
 
 import "package:flutter/foundation.dart" show kDebugMode;
@@ -10,7 +9,7 @@ import "package:photos/db/memories_db.dart";
 import "package:photos/events/files_updated_event.dart";
 import "package:photos/extensions/stop_watch.dart";
 import "package:photos/models/file/file.dart";
-import "package:photos/models/location/location.dart";
+import "package:photos/models/memories_cache.dart";
 import "package:photos/models/memory.dart";
 import "package:photos/models/people_memory.dart";
 import "package:photos/models/smart_memory.dart";
@@ -21,251 +20,6 @@ import "package:photos/services/search_service.dart";
 import "package:photos/services/smart_memories_service.dart";
 import "package:shared_preferences/shared_preferences.dart";
 
-class MemoriesCache {
-  final List<ToShowMemory> toShowMemories;
-  final List<PeopleShownLogs> peopleShownLogs;
-  final List<TripsShownLogs> tripsShownLogs;
-
-  MemoriesCache({
-    required this.toShowMemories,
-    required this.peopleShownLogs,
-    required this.tripsShownLogs,
-  });
-
-  factory MemoriesCache.fromJson(Map<String, dynamic> json) {
-    return MemoriesCache(
-      toShowMemories: ToShowMemory.decodeJsonToList(json['toShowMemories']),
-      peopleShownLogs:
-          PeopleShownLogs.decodeJsonToList(json['peopleShownLogs']),
-      tripsShownLogs: TripsShownLogs.decodeJsonToList(json['tripsShownLogs']),
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return {
-      'toShowMemories': ToShowMemory.encodeListToJson(toShowMemories),
-      'peopleShownLogs': PeopleShownLogs.encodeListToJson(peopleShownLogs),
-      'tripsShownLogs': TripsShownLogs.encodeListToJson(tripsShownLogs),
-    };
-  }
-
-  static String encodeToJsonString(MemoriesCache cache) {
-    return jsonEncode(cache.toJson());
-  }
-
-  static MemoriesCache decodeFromJsonString(String jsonString) {
-    return MemoriesCache.fromJson(jsonDecode(jsonString));
-  }
-}
-
-class ToShowMemory {
-  final String title;
-  final List<int> fileUploadedIDs;
-  final MemoryType type;
-  final int firstTimeToShow;
-  final int lastTimeToShow;
-
-  final String? personID;
-  final PeopleMemoryType? peopleMemoryType;
-  final Location? location;
-
-  bool get shouldShowNow {
-    final now = DateTime.now().microsecondsSinceEpoch;
-    return now >= firstTimeToShow && now <= lastTimeToShow;
-  }
-
-  bool get isOld {
-    final now = DateTime.now().microsecondsSinceEpoch;
-    return now > lastTimeToShow;
-  }
-
-  ToShowMemory(
-    this.title,
-    this.fileUploadedIDs,
-    this.type,
-    this.firstTimeToShow,
-    this.lastTimeToShow, {
-    this.personID,
-    this.peopleMemoryType,
-    this.location,
-  }) : assert(
-          (type == MemoryType.people &&
-                  personID != null &&
-                  peopleMemoryType != null) ||
-              (type == MemoryType.trips && location != null) ||
-              (type != MemoryType.people && type != MemoryType.trips),
-          "PersonID and peopleMemoryType must be provided for people memory type, and location must be provided for trips memory type",
-        );
-
-  factory ToShowMemory.fromSmartMemory(SmartMemory memory) {
-    assert(memory.firstDateToShow != null && memory.lastDateToShow != null);
-    String? personID;
-    PeopleMemoryType? peopleMemoryType;
-    Location? location;
-    if (memory is PeopleMemory) {
-      personID = memory.personID;
-      peopleMemoryType = memory.peopleMemoryType;
-    } else if (memory is TripMemory) {
-      location = memory.location;
-    }
-    return ToShowMemory(
-      memory.name,
-      memory.memories.map((m) => m.file.uploadedFileID!).toList(),
-      memory.type,
-      memory.firstDateToShow!,
-      memory.lastDateToShow!,
-      personID: personID,
-      peopleMemoryType: peopleMemoryType,
-      location: location,
-    );
-  }
-
-  factory ToShowMemory.fromJson(Map<String, dynamic> json) {
-    return ToShowMemory(
-      json['title'],
-      List<int>.from(json['fileUploadedIDs']),
-      memoryTypeFromString(json['type']),
-      json['firstTimeToShow'],
-      json['lastTimeToShow'],
-      personID: json['personID'],
-      peopleMemoryType: peopleMemoryTypeFromString(json['peopleMemoryType']),
-      location: json['location'] != null
-          ? Location(
-              latitude: json['location']['latitude'],
-              longitude: json['location']['longitude'],
-            )
-          : null,
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return {
-      'title': title,
-      'fileUploadedIDs': fileUploadedIDs.toList(),
-      'type': type.toString().split('.').last,
-      'firstTimeToShow': firstTimeToShow,
-      'lastTimeToShow': lastTimeToShow,
-      'personID': personID,
-      'peopleMemoryType': peopleMemoryType.toString().split('.').last,
-      'location': location != null
-          ? {
-              'latitude': location!.latitude!,
-              'longitude': location!.longitude!,
-            }
-          : null,
-    };
-  }
-
-  static String encodeListToJson(List<ToShowMemory> toShowMemories) {
-    final jsonList = toShowMemories.map((memory) => memory.toJson()).toList();
-    return jsonEncode(jsonList);
-  }
-
-  static List<ToShowMemory> decodeJsonToList(String jsonString) {
-    final jsonList = jsonDecode(jsonString) as List;
-    return jsonList.map((json) => ToShowMemory.fromJson(json)).toList();
-  }
-}
-
-class PeopleShownLogs {
-  final String personID;
-  final PeopleMemoryType peopleMemoryType;
-  final int lastTimeShown;
-
-  PeopleShownLogs(
-    this.personID,
-    this.peopleMemoryType,
-    this.lastTimeShown,
-  );
-
-  factory PeopleShownLogs.fromOldCacheMemory(ToShowMemory memory) {
-    assert(
-      memory.type == MemoryType.people &&
-          memory.personID != null &&
-          memory.peopleMemoryType != null,
-    );
-    return PeopleShownLogs(
-      memory.personID!,
-      memory.peopleMemoryType!,
-      memory.lastTimeToShow,
-    );
-  }
-
-  factory PeopleShownLogs.fromJson(Map<String, dynamic> json) {
-    return PeopleShownLogs(
-      json['personID'],
-      peopleMemoryTypeFromString(json['peopleMemoryType']),
-      json['lastTimeShown'],
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return {
-      'personID': personID,
-      'peopleMemoryType': peopleMemoryType.toString().split('.').last,
-      'lastTimeShown': lastTimeShown,
-    };
-  }
-
-  static String encodeListToJson(List<PeopleShownLogs> shownLogs) {
-    final jsonList = shownLogs.map((log) => log.toJson()).toList();
-    return jsonEncode(jsonList);
-  }
-
-  static List<PeopleShownLogs> decodeJsonToList(String jsonString) {
-    final jsonList = jsonDecode(jsonString) as List;
-    return jsonList.map((json) => PeopleShownLogs.fromJson(json)).toList();
-  }
-}
-
-class TripsShownLogs {
-  final Location location;
-  final int lastTimeShown;
-
-  TripsShownLogs(
-    this.location,
-    this.lastTimeShown,
-  );
-
-  factory TripsShownLogs.fromOldCacheMemory(ToShowMemory memory) {
-    assert(memory.type == MemoryType.trips && memory.location != null);
-    return TripsShownLogs(
-      memory.location!,
-      memory.lastTimeToShow,
-    );
-  }
-
-  factory TripsShownLogs.fromJson(Map<String, dynamic> json) {
-    return TripsShownLogs(
-      Location(
-        latitude: json['location']['latitude'],
-        longitude: json['location']['longitude'],
-      ),
-      json['lastTimeShown'],
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return {
-      'location': {
-        'latitude': location.latitude!,
-        'longitude': location.longitude!,
-      },
-      'lastTimeShown': lastTimeShown,
-    };
-  }
-
-  static String encodeListToJson(List<TripsShownLogs> shownLogs) {
-    final jsonList = shownLogs.map((log) => log.toJson()).toList();
-    return jsonEncode(jsonList);
-  }
-
-  static List<TripsShownLogs> decodeJsonToList(String jsonString) {
-    final jsonList = jsonDecode(jsonString) as List;
-    return jsonList.map((json) => TripsShownLogs.fromJson(json)).toList();
-  }
-}
-
 class MemoriesCacheService {
   static const _lastMemoriesCacheUpdateTimeKey = "lastMemoriesCacheUpdateTime";
   static const _showAnyMemoryKey = "memories.enabled";

From d3acd79de644df760d12cd97f78716553088b970 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 27 Feb 2025 11:39:25 +0530
Subject: [PATCH 583/796] [mob][photos] Simplify

---
 .../lib/services/memories_cache_service.dart  | 57 +++----------------
 1 file changed, 7 insertions(+), 50 deletions(-)

diff --git a/mobile/lib/services/memories_cache_service.dart b/mobile/lib/services/memories_cache_service.dart
index 7315df50e7..a6b8204641 100644
--- a/mobile/lib/services/memories_cache_service.dart
+++ b/mobile/lib/services/memories_cache_service.dart
@@ -11,9 +11,7 @@ import "package:photos/extensions/stop_watch.dart";
 import "package:photos/models/file/file.dart";
 import "package:photos/models/memories_cache.dart";
 import "package:photos/models/memory.dart";
-import "package:photos/models/people_memory.dart";
 import "package:photos/models/smart_memory.dart";
-import "package:photos/models/trip_memory.dart";
 import "package:photos/service_locator.dart";
 import "package:photos/services/location_service.dart";
 import "package:photos/services/search_service.dart";
@@ -136,8 +134,7 @@ class MemoriesCacheService {
       w?.log("calculated new memories");
       final oldCache = await _readCacheFromDisk();
       w?.log("gotten old cache");
-      final MemoriesCache memoryCache =
-          _fromMemoriesToCache(memories, oldCache);
+      final MemoriesCache memoryCache = _toCache(memories, oldCache);
       w?.log("gotten cache from memories");
       final file = File(await _getCachePath());
       if (!file.existsSync()) {
@@ -158,7 +155,7 @@ class MemoriesCacheService {
     }
   }
 
-  MemoriesCache _fromMemoriesToCache(
+  MemoriesCache _toCache(
     List<SmartMemory> memories,
     MemoriesCache? oldCache,
   ) {
@@ -166,54 +163,15 @@ class MemoriesCacheService {
     final List<PeopleShownLogs> peopleShownLogs = [];
     final List<TripsShownLogs> tripsShownLogs = [];
     for (final memory in memories) {
-      if (memory.isOld()) {
-        if (memory is PeopleMemory) {
-          peopleShownLogs.add(
-            PeopleShownLogs(
-              memory.personID,
-              memory.peopleMemoryType,
-              memory.lastDateToShow!,
-            ),
-          );
-        } else if (memory is TripMemory) {
-          tripsShownLogs.add(
-            TripsShownLogs(
-              memory.location,
-              memory.lastDateToShow!,
-            ),
-          );
-        }
+      if (memory.hasShowTime()) {
+        toShowMemories.add(ToShowMemory.fromSmartMemory(memory));
       } else {
-        if (memory.hasShowTime()) {
-          toShowMemories.add(ToShowMemory.fromSmartMemory(memory));
-        } else {
-          _logger.severe('Memory has no first or last date to show');
-        }
+        _logger.severe('Memory has no first or last date to show');
       }
     }
     if (oldCache != null) {
-      for (final shownPerson in oldCache.peopleShownLogs) {
-        if (peopleShownLogs.any(
-          (person) =>
-              (person.personID == shownPerson.personID) &&
-              (person.peopleMemoryType == shownPerson.peopleMemoryType),
-        )) {
-          continue;
-        }
-        peopleShownLogs.add(shownPerson);
-      }
-      for (final shownTrip in oldCache.tripsShownLogs) {
-        if (tripsShownLogs.any(
-          (trip) => isFileInsideLocationTag(
-            shownTrip.location,
-            trip.location,
-            10.0,
-          ),
-        )) {
-          continue;
-        }
-        tripsShownLogs.add(shownTrip);
-      }
+      peopleShownLogs.addAll(oldCache.peopleShownLogs);
+      tripsShownLogs.addAll(oldCache.tripsShownLogs);
       for (final oldMemory in oldCache.toShowMemories) {
         if (oldMemory.isOld) {
           if (oldMemory.type == MemoryType.people) {
@@ -282,7 +240,6 @@ class MemoriesCacheService {
   Future<List<SmartMemory>> _getMemoriesFromCache() async {
     final cache = await _readCacheFromDisk();
     if (cache == null) {
-      // TODO: lau: if there's no cache, maybe we fall back to old memories?
       return [];
     }
     final result = await _fromCacheToMemories(cache);

From 7d84ed3e8ba1675c4e48a481c323669a80f50e50 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 27 Feb 2025 11:40:44 +0530
Subject: [PATCH 584/796] [mob][photos] Rename

---
 mobile/lib/models/memories_cache.dart         | 53 +++++++++----------
 .../lib/services/memories_cache_service.dart  |  9 ++--
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/mobile/lib/models/memories_cache.dart b/mobile/lib/models/memories_cache.dart
index 246ccb1eaa..32b14416e4 100644
--- a/mobile/lib/models/memories_cache.dart
+++ b/mobile/lib/models/memories_cache.dart
@@ -1,5 +1,3 @@
-
-
 import "dart:convert";
 
 import "package:photos/models/location/location.dart";
@@ -9,8 +7,8 @@ import "package:photos/models/trip_memory.dart";
 
 class MemoriesCache {
   final List<ToShowMemory> toShowMemories;
-  final List<PeopleShownLogs> peopleShownLogs;
-  final List<TripsShownLogs> tripsShownLogs;
+  final List<PeopleShownLog> peopleShownLogs;
+  final List<TripsShownLog> tripsShownLogs;
 
   MemoriesCache({
     required this.toShowMemories,
@@ -21,17 +19,16 @@ class MemoriesCache {
   factory MemoriesCache.fromJson(Map<String, dynamic> json) {
     return MemoriesCache(
       toShowMemories: ToShowMemory.decodeJsonToList(json['toShowMemories']),
-      peopleShownLogs:
-          PeopleShownLogs.decodeJsonToList(json['peopleShownLogs']),
-      tripsShownLogs: TripsShownLogs.decodeJsonToList(json['tripsShownLogs']),
+      peopleShownLogs: PeopleShownLog.decodeJsonToList(json['peopleShownLogs']),
+      tripsShownLogs: TripsShownLog.decodeJsonToList(json['tripsShownLogs']),
     );
   }
 
   Map<String, dynamic> toJson() {
     return {
       'toShowMemories': ToShowMemory.encodeListToJson(toShowMemories),
-      'peopleShownLogs': PeopleShownLogs.encodeListToJson(peopleShownLogs),
-      'tripsShownLogs': TripsShownLogs.encodeListToJson(tripsShownLogs),
+      'peopleShownLogs': PeopleShownLog.encodeListToJson(peopleShownLogs),
+      'tripsShownLogs': TripsShownLog.encodeListToJson(tripsShownLogs),
     };
   }
 
@@ -153,32 +150,32 @@ class ToShowMemory {
   }
 }
 
-class PeopleShownLogs {
+class PeopleShownLog {
   final String personID;
   final PeopleMemoryType peopleMemoryType;
   final int lastTimeShown;
 
-  PeopleShownLogs(
+  PeopleShownLog(
     this.personID,
     this.peopleMemoryType,
     this.lastTimeShown,
   );
 
-  factory PeopleShownLogs.fromOldCacheMemory(ToShowMemory memory) {
+  factory PeopleShownLog.fromOldCacheMemory(ToShowMemory memory) {
     assert(
       memory.type == MemoryType.people &&
           memory.personID != null &&
           memory.peopleMemoryType != null,
     );
-    return PeopleShownLogs(
+    return PeopleShownLog(
       memory.personID!,
       memory.peopleMemoryType!,
       memory.lastTimeToShow,
     );
   }
 
-  factory PeopleShownLogs.fromJson(Map<String, dynamic> json) {
-    return PeopleShownLogs(
+  factory PeopleShownLog.fromJson(Map<String, dynamic> json) {
+    return PeopleShownLog(
       json['personID'],
       peopleMemoryTypeFromString(json['peopleMemoryType']),
       json['lastTimeShown'],
@@ -193,36 +190,36 @@ class PeopleShownLogs {
     };
   }
 
-  static String encodeListToJson(List<PeopleShownLogs> shownLogs) {
+  static String encodeListToJson(List<PeopleShownLog> shownLogs) {
     final jsonList = shownLogs.map((log) => log.toJson()).toList();
     return jsonEncode(jsonList);
   }
 
-  static List<PeopleShownLogs> decodeJsonToList(String jsonString) {
+  static List<PeopleShownLog> decodeJsonToList(String jsonString) {
     final jsonList = jsonDecode(jsonString) as List;
-    return jsonList.map((json) => PeopleShownLogs.fromJson(json)).toList();
+    return jsonList.map((json) => PeopleShownLog.fromJson(json)).toList();
   }
 }
 
-class TripsShownLogs {
+class TripsShownLog {
   final Location location;
   final int lastTimeShown;
 
-  TripsShownLogs(
+  TripsShownLog(
     this.location,
     this.lastTimeShown,
   );
 
-  factory TripsShownLogs.fromOldCacheMemory(ToShowMemory memory) {
+  factory TripsShownLog.fromOldCacheMemory(ToShowMemory memory) {
     assert(memory.type == MemoryType.trips && memory.location != null);
-    return TripsShownLogs(
+    return TripsShownLog(
       memory.location!,
       memory.lastTimeToShow,
     );
   }
 
-  factory TripsShownLogs.fromJson(Map<String, dynamic> json) {
-    return TripsShownLogs(
+  factory TripsShownLog.fromJson(Map<String, dynamic> json) {
+    return TripsShownLog(
       Location(
         latitude: json['location']['latitude'],
         longitude: json['location']['longitude'],
@@ -241,13 +238,13 @@ class TripsShownLogs {
     };
   }
 
-  static String encodeListToJson(List<TripsShownLogs> shownLogs) {
+  static String encodeListToJson(List<TripsShownLog> shownLogs) {
     final jsonList = shownLogs.map((log) => log.toJson()).toList();
     return jsonEncode(jsonList);
   }
 
-  static List<TripsShownLogs> decodeJsonToList(String jsonString) {
+  static List<TripsShownLog> decodeJsonToList(String jsonString) {
     final jsonList = jsonDecode(jsonString) as List;
-    return jsonList.map((json) => TripsShownLogs.fromJson(json)).toList();
+    return jsonList.map((json) => TripsShownLog.fromJson(json)).toList();
   }
-}
\ No newline at end of file
+}
diff --git a/mobile/lib/services/memories_cache_service.dart b/mobile/lib/services/memories_cache_service.dart
index a6b8204641..40a3b565af 100644
--- a/mobile/lib/services/memories_cache_service.dart
+++ b/mobile/lib/services/memories_cache_service.dart
@@ -160,8 +160,8 @@ class MemoriesCacheService {
     MemoriesCache? oldCache,
   ) {
     final List<ToShowMemory> toShowMemories = [];
-    final List<PeopleShownLogs> peopleShownLogs = [];
-    final List<TripsShownLogs> tripsShownLogs = [];
+    final List<PeopleShownLog> peopleShownLogs = [];
+    final List<TripsShownLog> tripsShownLogs = [];
     for (final memory in memories) {
       if (memory.hasShowTime()) {
         toShowMemories.add(ToShowMemory.fromSmartMemory(memory));
@@ -180,8 +180,7 @@ class MemoriesCacheService {
                   (person.personID == oldMemory.personID) &&
                   (person.peopleMemoryType == oldMemory.peopleMemoryType),
             )) {
-              peopleShownLogs
-                  .add(PeopleShownLogs.fromOldCacheMemory(oldMemory));
+              peopleShownLogs.add(PeopleShownLog.fromOldCacheMemory(oldMemory));
             }
           } else if (oldMemory.type == MemoryType.trips) {
             if (!tripsShownLogs.any(
@@ -191,7 +190,7 @@ class MemoriesCacheService {
                 10.0,
               ),
             )) {
-              tripsShownLogs.add(TripsShownLogs.fromOldCacheMemory(oldMemory));
+              tripsShownLogs.add(TripsShownLog.fromOldCacheMemory(oldMemory));
             }
           }
         }

From 75800f41e4bb814b3820b9bec6983b73d5f72edf Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 27 Feb 2025 11:45:44 +0530
Subject: [PATCH 585/796] [mob][photos] Try catch

---
 .../lib/services/memories_cache_service.dart  | 57 ++++++++++---------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/mobile/lib/services/memories_cache_service.dart b/mobile/lib/services/memories_cache_service.dart
index 40a3b565af..698063b625 100644
--- a/mobile/lib/services/memories_cache_service.dart
+++ b/mobile/lib/services/memories_cache_service.dart
@@ -204,36 +204,41 @@ class MemoriesCacheService {
   }
 
   Future<List<SmartMemory>> _fromCacheToMemories(MemoriesCache cache) async {
-    final List<SmartMemory> memories = [];
-    final allFiles = Set<EnteFile>.from(
-      await SearchService.instance.getAllFilesForSearch(),
-    );
-    final allFileIdsToFile = <int, EnteFile>{};
-    for (final file in allFiles) {
-      if (file.uploadedFileID != null) {
-        allFileIdsToFile[file.uploadedFileID!] = file;
+    try {
+      final List<SmartMemory> memories = [];
+      final allFiles = Set<EnteFile>.from(
+        await SearchService.instance.getAllFilesForSearch(),
+      );
+      final allFileIdsToFile = <int, EnteFile>{};
+      for (final file in allFiles) {
+        if (file.uploadedFileID != null) {
+          allFileIdsToFile[file.uploadedFileID!] = file;
+        }
       }
-    }
 
-    for (final ToShowMemory memory in cache.toShowMemories) {
-      if (memory.shouldShowNow) {
-        memories.add(
-          SmartMemory(
-            memory.fileUploadedIDs
-                .map(
-                  (fileID) =>
-                      Memory.fromFile(allFileIdsToFile[fileID]!, _seenTimes),
-                )
-                .toList(),
-            memory.type,
-            name: memory.title,
-            firstDateToShow: memory.firstTimeToShow,
-            lastDateToShow: memory.lastTimeToShow,
-          ),
-        );
+      for (final ToShowMemory memory in cache.toShowMemories) {
+        if (memory.shouldShowNow) {
+          memories.add(
+            SmartMemory(
+              memory.fileUploadedIDs
+                  .map(
+                    (fileID) =>
+                        Memory.fromFile(allFileIdsToFile[fileID]!, _seenTimes),
+                  )
+                  .toList(),
+              memory.type,
+              name: memory.title,
+              firstDateToShow: memory.firstTimeToShow,
+              lastDateToShow: memory.lastTimeToShow,
+            ),
+          );
+        }
       }
+      return memories;
+    } catch (e, s) {
+      _logger.severe("Error converting cache to memories", e, s);
+      return [];
     }
-    return memories;
   }
 
   Future<List<SmartMemory>> _getMemoriesFromCache() async {

From 7e10c077d30c8c9a8c7f2d05d7f33c1727be1e6f Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 27 Feb 2025 11:51:39 +0530
Subject: [PATCH 586/796] [mob][photos] Logging

---
 mobile/lib/services/memories_cache_service.dart | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/services/memories_cache_service.dart b/mobile/lib/services/memories_cache_service.dart
index 698063b625..5f491159fb 100644
--- a/mobile/lib/services/memories_cache_service.dart
+++ b/mobile/lib/services/memories_cache_service.dart
@@ -128,7 +128,8 @@ class MemoriesCacheService {
       }
       _logger.info("updating memories cache");
       _isUpdateInProgress = true;
-      final EnteWatch? w = kDebugMode ? EnteWatch("memoriesCacheWatch") : null;
+      final EnteWatch? w =
+          kDebugMode ? EnteWatch("MemoriesCacheService") : null;
       w?.start();
       final memories = await SmartMemoriesService.instance.calcMemories();
       w?.log("calculated new memories");
@@ -205,6 +206,7 @@ class MemoriesCacheService {
 
   Future<List<SmartMemory>> _fromCacheToMemories(MemoriesCache cache) async {
     try {
+      _logger.info('Processing disk cache memories to smart memories');
       final List<SmartMemory> memories = [];
       final allFiles = Set<EnteFile>.from(
         await SearchService.instance.getAllFilesForSearch(),
@@ -234,6 +236,7 @@ class MemoriesCacheService {
           );
         }
       }
+      _logger.info('Processing of disk cache memories done');
       return memories;
     } catch (e, s) {
       _logger.severe("Error converting cache to memories", e, s);

From ee201ff24bf4b133b1d95c0b142890a408343241 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 27 Feb 2025 11:59:34 +0530
Subject: [PATCH 587/796] use orig

---
 .../gallery/components/viewer/data-source.ts  | 32 ++++++++++++++-----
 web/packages/gallery/services/download.ts     | 21 +++++++++---
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 715d152805..ced982eee2 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -64,6 +64,14 @@ export type ItemData = PhotoSwipeSlideData & {
      *   portion of the live photo.
      */
     imageURL?: string;
+    /**
+     * The original image associated with the file, as a Blob.
+     *
+     * - For images, this will be the original image itself.
+     * - For live photos, this will be the image component of the live photo.
+     * - For videos, this will be not be present.
+     */
+    originalImageBlob?: Blob;
     /**
      * The renderable object URL of the video associated with the file.
      *
@@ -283,8 +291,9 @@ const enqueueUpdates = async (file: EnteFile) => {
                 const sourceURLs =
                     await downloadManager.renderableSourceURLs(file);
                 const imageURL = ensureString(sourceURLs.url);
+                const originalImageBlob = sourceURLs.originalImageBlob!;
                 const itemData = await withDimensions(imageURL);
-                update({ ...itemData, imageURL });
+                update({ ...itemData, imageURL, originalImageBlob });
                 break;
             }
 
@@ -301,8 +310,16 @@ const enqueueUpdates = async (file: EnteFile) => {
                     await downloadManager.renderableSourceURLs(file);
                 const livePhotoSourceURLs =
                     sourceURLs.url as LivePhotoSourceURL;
-                const imageURL = await livePhotoSourceURLs.image();
-                const imageData = await withDimensions(ensureString(imageURL));
+                const imageURL = ensureString(
+                    await livePhotoSourceURLs.image(),
+                );
+                const originalImageBlob =
+                    (await livePhotoSourceURLs.originalImageBlob())!;
+                const imageData = {
+                    ...(await withDimensions(imageURL)),
+                    imageURL,
+                    originalImageBlob,
+                };
                 update(imageData);
                 const videoURL = await livePhotoSourceURLs.video();
                 update({ ...imageData, videoURL });
@@ -390,7 +407,7 @@ export const fileInfoExifForFile = (
  *
  * This function is expected to be called when an item is loaded as PhotoSwipe
  * content. It can be safely called multiple times - it will ignore calls until
- * the item has an associated {@link imageURL}, and it will also ignore calls
+ * the item has an associated {@link originalImageBlob}, and it will also ignore calls
  * that are made after exif data has already been extracted.
  *
  * If required, it will extract the exif data from the file, massage it to a
@@ -401,7 +418,7 @@ export const fileInfoExifForFile = (
  * See also {@link forgetExifForItemData}.
  */
 export const updateFileInfoExifIfNeeded = async (itemData: ItemData) => {
-    const { fileID, fileType, imageURL } = itemData;
+    const { fileID, fileType, originalImageBlob } = itemData;
 
     // We already have it available.
     if (_state.fileInfoExifByFileID.has(fileID)) return;
@@ -418,11 +435,10 @@ export const updateFileInfoExifIfNeeded = async (itemData: ItemData) => {
     }
 
     // This is not a video, but the original image is not available yet.
-    if (!imageURL) return;
+    if (!originalImageBlob) return;
 
     try {
-        const blob = await (await fetch(imageURL)).blob();
-        const file = new File([blob], "");
+        const file = new File([originalImageBlob], "");
         const tags = await extractRawExif(file);
         const parsed = parseExif(tags);
         return updateNotifyAndReturn({ tags, parsed });
diff --git a/web/packages/gallery/services/download.ts b/web/packages/gallery/services/download.ts
index b36a06cc51..6d811cee09 100644
--- a/web/packages/gallery/services/download.ts
+++ b/web/packages/gallery/services/download.ts
@@ -26,6 +26,7 @@ import { decodeLivePhoto } from "@/media/live-photo";
 
 export interface LivePhotoSourceURL {
     image: () => Promise<string | undefined>;
+    originalImageBlob: () => Promise<Blob | undefined>;
     video: () => Promise<string | undefined>;
 }
 
@@ -52,7 +53,7 @@ export interface LoadedLivePhotoSourceURL {
  */
 export interface RenderableSourceURLs {
     url: string | LivePhotoSourceURL | LoadedLivePhotoSourceURL;
-    originalImageURL?: string | undefined;
+    originalImageBlob?: Blob | undefined;
     type: "normal" | "livePhoto";
     /**
      * `true` if there is potential conversion that can still be applied.
@@ -598,7 +599,9 @@ const createRenderableSourceURLs = async (
             : undefined;
 
     let url: RenderableSourceURLs["url"] | undefined;
-    let originalImageURL: RenderableSourceURLs["originalImageURL"] | undefined;
+    let originalImageBlob:
+        | RenderableSourceURLs["originalImageBlob"]
+        | undefined;
     let type: RenderableSourceURLs["type"] = "normal";
     let mimeType: string | undefined;
     let canForceConvert = false;
@@ -609,7 +612,7 @@ const createRenderableSourceURLs = async (
             const convertedBlob = await renderableImageBlob(fileBlob, fileName);
             const convertedURL = existingOrNewObjectURL(convertedBlob);
             url = convertedURL;
-            originalImageURL = originalFileURL;
+            originalImageBlob = fileBlob;
             mimeType = convertedBlob.type;
             break;
         }
@@ -646,7 +649,7 @@ const createRenderableSourceURLs = async (
     // @ts-ignore
     return {
         url: url!,
-        originalImageURL,
+        originalImageBlob,
         type,
         mimeType,
         canForceConvert,
@@ -671,6 +674,15 @@ async function getRenderableLivePhotoURL(
         }
     };
 
+    const getOriginalImageBlob = async () => {
+        try {
+            return new Blob([livePhoto.imageData]);
+        } catch {
+            //ignore and return null
+            return undefined;
+        }
+    };
+
     const getRenderableLivePhotoVideoURL = async () => {
         try {
             const videoBlob = new Blob([livePhoto.videoData]);
@@ -689,6 +701,7 @@ async function getRenderableLivePhotoURL(
 
     return {
         image: getRenderableLivePhotoImageURL,
+        originalImageBlob: getOriginalImageBlob,
         video: getRenderableLivePhotoVideoURL,
     };
 }

From 9c6bfaa4605314890b9f6be39e90e2aea1578828 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 27 Feb 2025 12:15:37 +0530
Subject: [PATCH 588/796] Undo the effects of contentDestroy

---
 web/packages/gallery/components/viewer/photoswipe.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 0c67c70521..40a6e0963d 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -354,12 +354,10 @@ export class FileViewerPhotoSwipe {
             updateFileInfoExifIfNeeded(e.content.data),
         );
 
-        // pswp.on("change", (e) => {
-        //     const itemData = pswp.currSlide.content.data;
-        //     exifForItemData(itemData).then((data) =>
-        //         console.log("exif data", data),
-        //     );
-        // });
+        pswp.on("change", (e) => {
+            const itemData = pswp.currSlide.content.data;
+            updateFileInfoExifIfNeeded(itemData);
+        });
 
         pswp.on("contentDestroy", (e) => forgetExifForItemData(e.content.data));
 

From d50391ea136cae5e1ac43007f33587051fa13369 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 27 Feb 2025 12:19:58 +0530
Subject: [PATCH 589/796] not async

---
 web/packages/gallery/components/viewer/data-source.ts | 2 +-
 web/packages/gallery/services/download.ts             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index ced982eee2..dc0901cca5 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -314,7 +314,7 @@ const enqueueUpdates = async (file: EnteFile) => {
                     await livePhotoSourceURLs.image(),
                 );
                 const originalImageBlob =
-                    (await livePhotoSourceURLs.originalImageBlob())!;
+                    livePhotoSourceURLs.originalImageBlob()!;
                 const imageData = {
                     ...(await withDimensions(imageURL)),
                     imageURL,
diff --git a/web/packages/gallery/services/download.ts b/web/packages/gallery/services/download.ts
index 6d811cee09..c0dc2b1ce6 100644
--- a/web/packages/gallery/services/download.ts
+++ b/web/packages/gallery/services/download.ts
@@ -26,7 +26,7 @@ import { decodeLivePhoto } from "@/media/live-photo";
 
 export interface LivePhotoSourceURL {
     image: () => Promise<string | undefined>;
-    originalImageBlob: () => Promise<Blob | undefined>;
+    originalImageBlob: () => Blob | undefined;
     video: () => Promise<string | undefined>;
 }
 
@@ -674,7 +674,7 @@ async function getRenderableLivePhotoURL(
         }
     };
 
-    const getOriginalImageBlob = async () => {
+    const getOriginalImageBlob = () => {
         try {
             return new Blob([livePhoto.imageData]);
         } catch {

From 7cecf848411b868500bf7f5b542d853e62ca4dd1 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Thu, 27 Feb 2025 12:39:40 +0530
Subject: [PATCH 590/796] [mob][photos] Time as parameter

---
 .../lib/services/memories_cache_service.dart  |  7 +++++-
 .../lib/services/smart_memories_service.dart  | 24 ++++++-------------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/mobile/lib/services/memories_cache_service.dart b/mobile/lib/services/memories_cache_service.dart
index 5f491159fb..8080dd61b1 100644
--- a/mobile/lib/services/memories_cache_service.dart
+++ b/mobile/lib/services/memories_cache_service.dart
@@ -131,7 +131,12 @@ class MemoriesCacheService {
       final EnteWatch? w =
           kDebugMode ? EnteWatch("MemoriesCacheService") : null;
       w?.start();
-      final memories = await SmartMemoriesService.instance.calcMemories();
+      // calculate memories for this period and for the next period
+      final now = DateTime.now();
+      final next = now.add(_kUpdateFrequency);
+      final List<SmartMemory> memories = [];
+      memories.addAll(await SmartMemoriesService.instance.calcMemories(now));
+      memories.addAll(await SmartMemoriesService.instance.calcMemories(next));
       w?.log("calculated new memories");
       final oldCache = await _readCacheFromDisk();
       w?.log("gotten old cache");
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 6e2f8ab771..1597d7f5b5 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -70,7 +70,7 @@ class SmartMemoriesService {
   }
 
   // One general method to get all memories, which calls on internal methods for each separate memory type
-  Future<List<SmartMemory>> calcMemories() async {
+  Future<List<SmartMemory>> calcMemories(DateTime now) async {
     try {
       await init();
       final List<SmartMemory> memories = [];
@@ -80,19 +80,19 @@ class SmartMemoriesService {
       _seenTimes = await _memoriesDB.getSeenTimes();
       _logger.finest("All files length: ${allFiles.length}");
 
-      final peopleMemories = await _getPeopleResults(allFiles, null);
+      final peopleMemories = await _getPeopleResults(allFiles, now);
       _deductUsedMemories(allFiles, peopleMemories);
       memories.addAll(peopleMemories);
       _logger.finest("All files length: ${allFiles.length}");
 
       // Trip memories
-      final tripMemories = await _getTripsResults(allFiles, null);
+      final tripMemories = await _getTripsResults(allFiles, now);
       _deductUsedMemories(allFiles, tripMemories);
       memories.addAll(tripMemories);
       _logger.finest("All files length: ${allFiles.length}");
 
       // Time memories
-      final timeMemories = await _onThisDayOrWeekResults(allFiles, null);
+      final timeMemories = await _onThisDayOrWeekResults(allFiles, now);
       _deductUsedMemories(allFiles, timeMemories);
       memories.addAll(timeMemories);
       _logger.finest("All files length: ${allFiles.length}");
@@ -122,7 +122,7 @@ class SmartMemoriesService {
 
   Future<List<PeopleMemory>> _getPeopleResults(
     Iterable<EnteFile> allFiles,
-    int? limit, // TODO: lau: implement limit
+    DateTime currentTime,
   ) async {
     final List<PeopleMemory> memoryResults = [];
     if (allFiles.isEmpty) return [];
@@ -132,7 +132,6 @@ class SmartMemoriesService {
         allFileIdsToFile[file.uploadedFileID!] = file;
       }
     }
-    final currentTime = DateTime.now().toLocal();
 
     // Get ordered list of important people (all named, from most to least files)
     final persons = await PersonService.instance.getPersons();
@@ -356,13 +355,12 @@ class SmartMemoriesService {
 
   Future<List<TripMemory>> _getTripsResults(
     Iterable<EnteFile> allFiles,
-    int? limit,
+    DateTime currentTime,
   ) async {
     final List<TripMemory> memoryResults = [];
     final Iterable<LocalEntity<LocationTag>> locationTagEntities =
         (await locationService.getLocationTags());
     if (allFiles.isEmpty) return [];
-    final currentTime = DateTime.now().toLocal();
     final currentMonth = currentTime.month;
     final cutOffTime = currentTime.subtract(const Duration(days: 365));
 
@@ -684,9 +682,6 @@ class SmartMemoriesService {
             name: name,
           ),
         );
-        if (limit != null && memoryResults.length >= limit) {
-          return memoryResults;
-        }
       }
     }
     // Otherwise, if no trips happened in the current month,
@@ -738,12 +733,11 @@ class SmartMemoriesService {
 
   Future<List<TimeMemory>> _onThisDayOrWeekResults(
     Iterable<EnteFile> allFiles,
-    int? limit,
+    DateTime currentTime,
   ) async {
     final List<TimeMemory> memoryResult = [];
     if (allFiles.isEmpty) return [];
 
-    final currentTime = DateTime.now().toLocal();
     final currentDayMonth = currentTime.month * 100 + currentTime.day;
     final currentWeek = _getWeekNumber(currentTime);
     final currentMonth = currentTime.month;
@@ -814,8 +808,6 @@ class SmartMemoriesService {
           );
         }
       }
-
-      if (limit != null && memoryResult.length >= limit) return memoryResult;
     }
 
     // process to find significant weeks (only if there are no significant days)
@@ -876,8 +868,6 @@ class SmartMemoriesService {
       }
     }
 
-    if (limit != null && memoryResult.length >= limit) return memoryResult;
-
     // process to find fillers (months)
     const wantedMemories = 3;
     final neededMemories = wantedMemories - memoryResult.length;

From 51effed5a350af8cbe22e96f1a208027062bc02e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 27 Feb 2025 12:51:21 +0530
Subject: [PATCH 591/796] Other props

---
 web/apps/photos/src/components/PhotoFrame.tsx | 16 ++++----
 .../gallery/components/viewer/FileViewer.tsx  | 38 ++++++++++++++++++-
 .../gallery/components/viewer/photoswipe.ts   |  7 ++++
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index c9dca97a4b..95058a0e77 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -1,3 +1,4 @@
+import { useModalVisibility } from "@/base/components/utils/modal";
 import { isSameDay } from "@/base/date";
 import { formattedDate } from "@/base/i18n-date";
 import log from "@/base/log";
@@ -179,9 +180,8 @@ const PhotoFrame = ({
     const [isShiftKeyPressed, setIsShiftKeyPressed] = useState(false);
     const router = useRouter();
 
-    // const { show: showPhotoSwipe, props: photoSwipeVisibilityProps } =
-    //     useModalVisibility();
-    const [open5, setOpen5] = useState(false);
+    const { show: showFileViewer, props: fileViewerVisibilityProps } =
+        useModalVisibility();
 
     const [displayFiles, setDisplayFiles] = useState<DisplayFile[] | undefined>(
         undefined,
@@ -281,7 +281,7 @@ const PhotoFrame = ({
 
     const handleClose = (needUpdate) => {
         if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
-            setOpen5(false);
+            throw new Error("Not implemented");
         } else {
             setOpen(false);
             needUpdate && syncWithRemote();
@@ -292,8 +292,7 @@ const PhotoFrame = ({
     const onThumbnailClick = (index: number) => () => {
         setCurrentIndex(index);
         if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
-            // showPhotoSwipe();
-            setOpen5(true);
+            showFileViewer();
         } else {
             setOpen(true);
             setIsPhotoSwipeOpen?.(true);
@@ -529,13 +528,14 @@ const PhotoFrame = ({
         <Container>
             {process.env.NEXT_PUBLIC_ENTE_WIP_PS5 && (
                 <FileViewer
+                    {...fileViewerVisibilityProps}
                     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                     /* @ts-ignore TODO(PS): test */
-                    open={open5}
-                    onClose={handleClose}
                     user={galleryContext.user ?? undefined}
                     files={files}
                     initialIndex={currentIndex}
+                    disableDownload={!enableDownload}
+                    onTriggerSyncWithRemote={() => void syncWithRemote()}
                     {...{
                         fileCollectionIDs,
                         allCollectionsNameByID,
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 0f536fe25a..db7fa86bcc 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -69,6 +69,21 @@ export type FileViewerProps = ModalVisibilityProps & {
      * If true then the viewer does not show controls for downloading the file.
      */
     disableDownload?: boolean;
+    /**
+     * Called when there was some update performed within the file viewer that
+     * necessitates us to sync with remote again to fetch the latest updates.
+     *
+     * This is called lazily, and at most once, when the file viewer is closing
+     * if any changes were made in the file info panel of the file viewer for
+     * any of the files that the user was viewing (e.g. if they changed the
+     * caption). Those changes have already been applied to both remote and to
+     * the in-memory file object used by the file viewer; this callback is to
+     * trigger a sync so that our local database also gets up to speed.
+     *
+     * If we're in a context where edits are not possible, e.g. {@link user} is
+     * not defined, then this prop is not used.
+     */
+    onTriggerSyncWithRemote?: () => void;
 } & Pick<
         FileInfoProps,
         | "fileCollectionIDs"
@@ -89,6 +104,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
     disableDownload,
     fileCollectionIDs,
     allCollectionsNameByID,
+    onTriggerSyncWithRemote,
     onSelectCollection,
     onSelectPerson,
 }) => {
@@ -110,9 +126,20 @@ const FileViewer: React.FC<FileViewerProps> = ({
         FileInfoExif | undefined
     >(undefined);
 
+    // If `true`, then we need to trigger a sync with remote when we close.
+    const [needsSync, setNeedsSync] = useState(false);
+
     const { show: showFileInfo, props: fileInfoVisibilityProps } =
         useModalVisibility();
 
+    const handleClose = () => {
+        if (needsSync) {
+            onTriggerSyncWithRemote?.();
+            setNeedsSync(false);
+        }
+        onClose();
+    };
+
     const handleAnnotate = useCallback(
         (file: EnteFile) => {
             const fileID = file.id;
@@ -157,7 +184,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
             files,
             initialIndex,
             disableDownload,
-            onClose,
+            onClose: handleClose,
             onAnnotate: handleAnnotate,
             onViewInfo: handleViewInfo,
         });
@@ -184,6 +211,10 @@ const FileViewer: React.FC<FileViewerProps> = ({
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [open, onClose, handleViewInfo]);
 
+    const handleRefreshPhotoswipe = useCallback(() => {
+        pswpRef.current.refreshCurrentSlideContent();
+    }, []);
+
     return (
         <Container>
             <Button>Test</Button>
@@ -191,6 +222,11 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 {...fileInfoVisibilityProps}
                 file={activeAnnotatedFile?.file}
                 exif={activeFileExif}
+                allowEdits={!!activeAnnotatedFile?.annotation.isOwnFile}
+                allowMap={!!user}
+                showCollections={!!user}
+                scheduleUpdate={() => setNeedsSync(true)}
+                refreshPhotoswipe={handleRefreshPhotoswipe}
                 onSelectCollection={handleSelectCollection}
                 onSelectPerson={handleSelectPerson}
                 {...{ fileCollectionIDs, allCollectionsNameByID }}
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 40a6e0963d..b068e27ab5 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -444,6 +444,13 @@ export class FileViewerPhotoSwipe {
         this.pswp.close();
     }
 
+    /**
+     * Reload the current slide, asking the data source for its data afresh.
+     */
+    refreshCurrentSlideContent() {
+        this.pswp.refreshSlideContent(this.pswp.currIndex);
+    }
+
     updateFiles(files: EnteFile[]) {
         // TODO(PS)
     }

From 25935f6219d93eb83f976b0a543b0fdfe0acf187 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 27 Feb 2025 13:06:24 +0530
Subject: [PATCH 592/796] Remaining fi props

---
 web/apps/photos/src/components/PhotoFrame.tsx |  9 +++-
 .../gallery/components/viewer/FileViewer.tsx  | 54 ++++++++++++-------
 2 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 95058a0e77..830739cc0b 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -20,7 +20,7 @@ import { t } from "i18next";
 import { useRouter } from "next/router";
 import { GalleryContext } from "pages/gallery";
 import PhotoSwipe from "photoswipe";
-import { useContext, useEffect, useState } from "react";
+import { useCallback, useContext, useEffect, useState } from "react";
 import AutoSizer from "react-virtualized-auto-sizer";
 import {
     SelectedState,
@@ -256,6 +256,11 @@ const PhotoFrame = ({
         }
     }, [selected]);
 
+    const handleTriggerSyncWithRemote = useCallback(
+        () => void syncWithRemote(),
+        [syncWithRemote],
+    );
+
     if (!displayFiles) {
         return <div />;
     }
@@ -535,7 +540,7 @@ const PhotoFrame = ({
                     files={files}
                     initialIndex={currentIndex}
                     disableDownload={!enableDownload}
-                    onTriggerSyncWithRemote={() => void syncWithRemote()}
+                    onTriggerSyncWithRemote={handleTriggerSyncWithRemote}
                     {...{
                         fileCollectionIDs,
                         allCollectionsNameByID,
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index db7fa86bcc..00af6a74da 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -18,6 +18,7 @@ import {
     type ModalVisibilityProps,
 } from "@/base/components/utils/modal";
 import type { LocalUser } from "@/base/local-user";
+import log from "@/base/log";
 import {
     FileInfo,
     type FileInfoExif,
@@ -25,7 +26,7 @@ import {
 } from "@/gallery/components/FileInfo";
 import type { EnteFile } from "@/media/file.js";
 import { Button, styled } from "@mui/material";
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { fileInfoExifForFile } from "./data-source";
 import {
     FileViewerPhotoSwipe,
@@ -127,18 +128,18 @@ const FileViewer: React.FC<FileViewerProps> = ({
     >(undefined);
 
     // If `true`, then we need to trigger a sync with remote when we close.
-    const [needsSync, setNeedsSync] = useState(false);
+    const [, setNeedsSync] = useState(false);
 
     const { show: showFileInfo, props: fileInfoVisibilityProps } =
         useModalVisibility();
 
-    const handleClose = () => {
-        if (needsSync) {
-            onTriggerSyncWithRemote?.();
-            setNeedsSync(false);
-        }
+    const handleClose = useCallback(() => {
+        setNeedsSync((needSync) => {
+            if (needSync) onTriggerSyncWithRemote?.();
+            return false;
+        });
         onClose();
-    };
+    }, [onTriggerSyncWithRemote, onClose]);
 
     const handleAnnotate = useCallback(
         (file: EnteFile) => {
@@ -162,19 +163,28 @@ const FileViewer: React.FC<FileViewerProps> = ({
         [showFileInfo],
     );
 
-    const handleSelectCollection = (collectionID: number) => {
-        onSelectCollection(collectionID);
-        onClose();
-    };
+    const handleScheduleUpdate = useCallback(() => setNeedsSync(true), []);
 
-    const handleSelectPerson = onSelectPerson
-        ? (personID: string) => {
-              onSelectPerson(personID);
-              onClose();
-          }
-        : undefined;
+    const handleSelectCollection = useCallback(
+        (collectionID: number) => {
+            onSelectCollection(collectionID);
+            onClose();
+        },
+        [onSelectCollection, onClose],
+    );
+
+    const handleSelectPerson = useMemo(() => {
+        return onSelectPerson
+            ? (personID: string) => {
+                  onSelectPerson(personID);
+                  onClose();
+              }
+            : undefined;
+    }, [onSelectPerson, onClose]);
 
     useEffect(() => {
+        log.debug(() => ["viewer", { action: "useEffect", open }]);
+
         if (!open) {
             // The close state will be handled by the cleanup function.
             return;
@@ -191,6 +201,10 @@ const FileViewer: React.FC<FileViewerProps> = ({
         pswpRef.current = pswp;
 
         return () => {
+            log.debug(() => [
+                "viewer",
+                { action: "useEffect/cleanup", pswpRef: pswpRef.current },
+            ]);
             pswpRef.current?.closeIfNeeded();
             pswpRef.current = undefined;
         };
@@ -215,6 +229,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
         pswpRef.current.refreshCurrentSlideContent();
     }, []);
 
+    log.debug(() => ["viewer", { action: "render", pswpRef: pswpRef.current }]);
+
     return (
         <Container>
             <Button>Test</Button>
@@ -225,7 +241,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 allowEdits={!!activeAnnotatedFile?.annotation.isOwnFile}
                 allowMap={!!user}
                 showCollections={!!user}
-                scheduleUpdate={() => setNeedsSync(true)}
+                scheduleUpdate={handleScheduleUpdate}
                 refreshPhotoswipe={handleRefreshPhotoswipe}
                 onSelectCollection={handleSelectCollection}
                 onSelectPerson={handleSelectPerson}

From b06b8a5794e9ebc19ccf713ac24c092a9634e19e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 27 Feb 2025 13:12:49 +0530
Subject: [PATCH 593/796] Manage fi open/close

---
 .../gallery/components/viewer/FileViewer.tsx  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 00af6a74da..3d45de58b8 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -13,10 +13,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     throw new Error("Whoa");
 }
 
-import {
-    useModalVisibility,
-    type ModalVisibilityProps,
-} from "@/base/components/utils/modal";
+import { type ModalVisibilityProps } from "@/base/components/utils/modal";
 import type { LocalUser } from "@/base/local-user";
 import log from "@/base/log";
 import {
@@ -127,17 +124,17 @@ const FileViewer: React.FC<FileViewerProps> = ({
         FileInfoExif | undefined
     >(undefined);
 
+    const [openFileInfo, setOpenFileInfo] = useState(false);
+
     // If `true`, then we need to trigger a sync with remote when we close.
     const [, setNeedsSync] = useState(false);
 
-    const { show: showFileInfo, props: fileInfoVisibilityProps } =
-        useModalVisibility();
-
     const handleClose = useCallback(() => {
         setNeedsSync((needSync) => {
             if (needSync) onTriggerSyncWithRemote?.();
             return false;
         });
+        setOpenFileInfo(false);
         onClose();
     }, [onTriggerSyncWithRemote, onClose]);
 
@@ -158,11 +155,13 @@ const FileViewer: React.FC<FileViewerProps> = ({
                     setActiveFileExif(exif),
                 ),
             );
-            showFileInfo();
+            setOpenFileInfo(true);
         },
-        [showFileInfo],
+        [],
     );
 
+    const handleInfoClose = useCallback(() => setOpenFileInfo(false), []);
+
     const handleScheduleUpdate = useCallback(() => setNeedsSync(true), []);
 
     const handleSelectCollection = useCallback(
@@ -235,7 +234,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
         <Container>
             <Button>Test</Button>
             <FileInfo
-                {...fileInfoVisibilityProps}
+                open={openFileInfo}
+                onClose={handleInfoClose}
                 file={activeAnnotatedFile?.file}
                 exif={activeFileExif}
                 allowEdits={!!activeAnnotatedFile?.annotation.isOwnFile}

From 65614adc1ac5f5a19fa6dee3b03dbdc0564072d5 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Thu, 27 Feb 2025 14:15:42 +0530
Subject: [PATCH 594/796] fix: build it finally

---
 mobile/android/app/proguard-rules.pro | 33 ---------------------------
 mobile/android/build.gradle           | 18 +++++++++++----
 2 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/mobile/android/app/proguard-rules.pro b/mobile/android/app/proguard-rules.pro
index f131957d9b..066c0d1874 100644
--- a/mobile/android/app/proguard-rules.pro
+++ b/mobile/android/app/proguard-rules.pro
@@ -4,36 +4,3 @@
 -keepattributes LineNumberTable,SourceFile
 
 -keep class org.chromium.net.** { *; }
-
-# App was failing without these
-# Please add these rules to your existing keep rules in order to suppress warnings.
-# This is generated automatically by the Android Gradle plugin.
--dontwarn androidx.window.extensions.WindowExtensions
--dontwarn androidx.window.extensions.WindowExtensionsProvider
--dontwarn androidx.window.extensions.area.ExtensionWindowAreaPresentation
--dontwarn androidx.window.extensions.layout.DisplayFeature
--dontwarn androidx.window.extensions.layout.FoldingFeature
--dontwarn androidx.window.extensions.layout.WindowLayoutComponent
--dontwarn androidx.window.extensions.layout.WindowLayoutInfo
--dontwarn androidx.window.sidecar.SidecarDeviceState
--dontwarn androidx.window.sidecar.SidecarDisplayFeature
--dontwarn androidx.window.sidecar.SidecarInterface$SidecarCallback
--dontwarn androidx.window.sidecar.SidecarInterface
--dontwarn androidx.window.sidecar.SidecarProvider
--dontwarn androidx.window.sidecar.SidecarWindowLayoutInfo
--dontwarn androidx.compose.ui.Modifier
--dontwarn androidx.compose.ui.layout.LayoutCoordinates
--dontwarn androidx.compose.ui.layout.LayoutCoordinatesKt
--dontwarn androidx.compose.ui.layout.ModifierInfo
--dontwarn androidx.compose.ui.node.LayoutNode
--dontwarn androidx.compose.ui.node.NodeCoordinator
--dontwarn androidx.compose.ui.node.Owner
--dontwarn androidx.compose.ui.semantics.AccessibilityAction
--dontwarn androidx.compose.ui.semantics.SemanticsActions
--dontwarn androidx.compose.ui.semantics.SemanticsConfiguration
--dontwarn androidx.compose.ui.semantics.SemanticsConfigurationKt
--dontwarn androidx.compose.ui.semantics.SemanticsProperties
--dontwarn androidx.compose.ui.semantics.SemanticsPropertyKey
--dontwarn androidx.compose.ui.text.TextLayoutInput
--dontwarn androidx.compose.ui.text.TextLayoutResult
--dontwarn androidx.compose.ui.text.TextStyle
\ No newline at end of file
diff --git a/mobile/android/build.gradle b/mobile/android/build.gradle
index 1a2fc3752d..22fba3524f 100644
--- a/mobile/android/build.gradle
+++ b/mobile/android/build.gradle
@@ -12,17 +12,25 @@ allprojects {
             url "${project(':background_fetch').projectDir}/libs"
         }
     }
-    ext {
-        compileSdkVersion   = 35
-        targetSdkVersion    = 35
-        appCompatVersion    = "1.7.0"
-    }
 }
 
 rootProject.buildDir = "../build"
 
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
+    afterEvaluate { project ->
+        if (project.plugins.hasPlugin("com.android.application") ||
+                project.plugins.hasPlugin("com.android.library")) {
+            project.android {
+                compileSdkVersion 35
+                buildToolsVersion "35.0.0"
+            }
+        }
+    }
+}
+subprojects {
     project.evaluationDependsOn(":app")
 }
 

From 11c7d5f0de42f53864d54febeac13b3d914374c5 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Thu, 27 Feb 2025 14:51:12 +0530
Subject: [PATCH 595/796] fix: keep things light

---
 mobile/android/build.gradle | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/mobile/android/build.gradle b/mobile/android/build.gradle
index 22fba3524f..af2e0d701b 100644
--- a/mobile/android/build.gradle
+++ b/mobile/android/build.gradle
@@ -18,19 +18,6 @@ rootProject.buildDir = "../build"
 
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
-    afterEvaluate { project ->
-        if (project.plugins.hasPlugin("com.android.application") ||
-                project.plugins.hasPlugin("com.android.library")) {
-            project.android {
-                compileSdkVersion 35
-                buildToolsVersion "35.0.0"
-            }
-        }
-    }
-}
-subprojects {
     project.evaluationDependsOn(":app")
 }
 

From 42cb7902c672f640aa0eb8dfd78fa1465edb1c5c Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Thu, 27 Feb 2025 14:51:21 +0530
Subject: [PATCH 596/796] chore: bump things

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 1c2c31d50d..8e4eae13a8 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.99+1006
+version: 0.9.99+1007
 publish_to: none
 
 environment:

From 5576f8379c5319c774091c75ca02150bd9acece6 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 27 Feb 2025 15:31:03 +0530
Subject: [PATCH 597/796] Fix close animation

---
 web/packages/gallery/components/viewer/FileViewer.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 3d45de58b8..3791d14f46 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -167,19 +167,19 @@ const FileViewer: React.FC<FileViewerProps> = ({
     const handleSelectCollection = useCallback(
         (collectionID: number) => {
             onSelectCollection(collectionID);
-            onClose();
+            handleClose();
         },
-        [onSelectCollection, onClose],
+        [onSelectCollection, handleClose],
     );
 
     const handleSelectPerson = useMemo(() => {
         return onSelectPerson
             ? (personID: string) => {
                   onSelectPerson(personID);
-                  onClose();
+                  handleClose();
               }
             : undefined;
-    }, [onSelectPerson, onClose]);
+    }, [onSelectPerson, handleClose]);
 
     useEffect(() => {
         log.debug(() => ["viewer", { action: "useEffect", open }]);

From e1d08899a5e77108b2d707b9f98b78d55b7237eb Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 27 Feb 2025 15:39:31 +0530
Subject: [PATCH 598/796] Scaffold

---
 .../gallery/components/viewer/FileViewer.tsx  | 38 +++++++++++++++++++
 .../gallery/components/viewer/photoswipe.ts   |  4 ++
 2 files changed, 42 insertions(+)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 3791d14f46..c802121102 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -22,6 +22,7 @@ import {
     type FileInfoProps,
 } from "@/gallery/components/FileInfo";
 import type { EnteFile } from "@/media/file.js";
+import { ImageEditorOverlay } from "@/new/photos/components/ImageEditorOverlay";
 import { Button, styled } from "@mui/material";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { fileInfoExifForFile } from "./data-source";
@@ -125,6 +126,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
     >(undefined);
 
     const [openFileInfo, setOpenFileInfo] = useState(false);
+    const [openImageEditor, setOpenImageEditor] = useState(false);
 
     // If `true`, then we need to trigger a sync with remote when we close.
     const [, setNeedsSync] = useState(false);
@@ -135,6 +137,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
             return false;
         });
         setOpenFileInfo(false);
+        setOpenImageEditor(false);
         onClose();
     }, [onTriggerSyncWithRemote, onClose]);
 
@@ -181,6 +184,34 @@ const FileViewer: React.FC<FileViewerProps> = ({
             : undefined;
     }, [onSelectPerson, handleClose]);
 
+    const handleEditImage = useCallback(
+        (annotatedFile: FileViewerAnnotatedFile) => {
+            setActiveAnnotatedFile(annotatedFile);
+            setActiveFileExif(undefined);
+            setOpenImageEditor(true);
+        },
+        [],
+    );
+
+    const handleImageEditorClose = useCallback(
+        () => setOpenImageEditor(false),
+        [],
+    );
+
+    const handleSaveEditedCopy = (
+        editedFile: File,
+        collection: Collection,
+        enteFile: EnteFile,
+    ) => {
+        console.log(editedFile, collection, enteFile);
+        throw new Error("TODO");
+        // uploadManager.prepareForNewUpload();
+        // uploadManager.showUploadProgressDialog();
+        // uploadManager.uploadFile(editedFile, collection, enteFile);
+        handleImageEditorClose();
+        handleClose();
+    };
+
     useEffect(() => {
         log.debug(() => ["viewer", { action: "useEffect", open }]);
 
@@ -196,6 +227,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
             onClose: handleClose,
             onAnnotate: handleAnnotate,
             onViewInfo: handleViewInfo,
+            onEditImage: handleEditImage
         });
         pswpRef.current = pswp;
 
@@ -247,6 +279,12 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 onSelectPerson={handleSelectPerson}
                 {...{ fileCollectionIDs, allCollectionsNameByID }}
             />
+            <ImageEditorOverlay
+                open={openImageEditor}
+                onClose={handleImageEditorClose}
+                file={activeAnnotatedFile?.file}
+                onSaveEditedCopy={handleSaveEditedCopy}
+            />
         </Container>
     );
 };
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index b068e27ab5..2c5fd9a386 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -48,6 +48,10 @@ type FileViewerPhotoSwipeOptions = {
      * Called when the user activates the info action on a file.
      */
     onViewInfo: (annotatedFile: FileViewerAnnotatedFile) => void;
+    /**
+     * Called when the user activates the edit action on an image.
+     */
+    onEditImage: (annotatedFile: FileViewerAnnotatedFile) => void;
 } & Pick<FileViewerProps, "files" | "initialIndex" | "disableDownload">;
 
 /**

From 074a4d96a612debfff81835ba72a65e1919851b3 Mon Sep 17 00:00:00 2001
From: Jay <118880285+Jishnuraj9@users.noreply.github.com>
Date: Thu, 27 Feb 2025 15:39:48 +0530
Subject: [PATCH 599/796] docs-edit hiding

---
 docs/docs/photos/faq/hidden-and-archive.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/docs/photos/faq/hidden-and-archive.md b/docs/docs/photos/faq/hidden-and-archive.md
index bdfb6f1b08..d9106da121 100644
--- a/docs/docs/photos/faq/hidden-and-archive.md
+++ b/docs/docs/photos/faq/hidden-and-archive.md
@@ -19,9 +19,6 @@ Keep in mind that hidden items will still show up in the "On device" albums
 within Ente as long as they are present in your native gallery. But once you
 remove them from your device, they'll stop showing up here.
 
-Hiding is currently only supported in the Ente mobile app, and items hidden from
-the mobile app will not be visible in the web and desktop app.
-
 For more details, see [features/hide](/photos/features/hide).
 
 ### Archive

From daada5e1c85bea6b45be5320237caffc5b39b21c Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Thu, 27 Feb 2025 15:59:14 +0530
Subject: [PATCH 600/796] fix: disable full r8 mode

---
 mobile/android/gradle.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mobile/android/gradle.properties b/mobile/android/gradle.properties
index ed508580fa..69e42b7481 100644
--- a/mobile/android/gradle.properties
+++ b/mobile/android/gradle.properties
@@ -1,3 +1,4 @@
 org.gradle.jvmargs=-Xmx4608m
 android.useAndroidX=true
 android.enableJetifier=true
+android.enableR8.fullMode=false
\ No newline at end of file

From 0803ef4da67a4e2951cae4757fd2e9565e5b7f9a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 27 Feb 2025 15:55:38 +0530
Subject: [PATCH 601/796] Btn

---
 web/packages/base/components/utils/theme.ts   |  3 +-
 .../gallery/components/viewer/FileViewer.tsx  | 29 ++++++++++++--
 .../gallery/components/viewer/icons.tsx       |  2 +
 .../gallery/components/viewer/photoswipe.ts   | 40 ++++++++++++++++++-
 4 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/web/packages/base/components/utils/theme.ts b/web/packages/base/components/utils/theme.ts
index 080e5eef74..04c38e9859 100644
--- a/web/packages/base/components/utils/theme.ts
+++ b/web/packages/base/components/utils/theme.ts
@@ -546,7 +546,8 @@ const components: Components = {
             // This is required to prevent console errors about aria-hiding a
             // focused button when the dialog is closed.
             //
-            // https://github.com/mui/material-ui/issues/43106#issuecomment-2314809028
+            // - https://github.com/mui/material-ui/issues/43106#issuecomment-2314809028
+            // - https://issues.chromium.org/issues/392121909
             closeAfterTransition: false,
         },
         styleOverrides: {
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index c802121102..23ead0d31f 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -13,7 +13,9 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     throw new Error("Whoa");
 }
 
+import { isDesktop } from "@/base/app";
 import { type ModalVisibilityProps } from "@/base/components/utils/modal";
+import { lowercaseExtension } from "@/base/file-name";
 import type { LocalUser } from "@/base/local-user";
 import log from "@/base/log";
 import {
@@ -21,7 +23,9 @@ import {
     type FileInfoExif,
     type FileInfoProps,
 } from "@/gallery/components/FileInfo";
+import { FileType } from "@/media/file-type";
 import type { EnteFile } from "@/media/file.js";
+import { isHEICExtension, needsJPEGConversion } from "@/media/formats";
 import { ImageEditorOverlay } from "@/new/photos/components/ImageEditorOverlay";
 import { Button, styled } from "@mui/material";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -145,7 +149,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
         (file: EnteFile) => {
             const fileID = file.id;
             const isOwnFile = file.ownerID == user?.id;
-            return { fileID, isOwnFile };
+            const isEditableImage = fileIsEditableImage(file);
+            return { fileID, isOwnFile, isEditableImage };
         },
         [user],
     );
@@ -227,7 +232,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
             onClose: handleClose,
             onAnnotate: handleAnnotate,
             onViewInfo: handleViewInfo,
-            onEditImage: handleEditImage
+            onEditImage: handleEditImage,
         });
         pswpRef.current = pswp;
 
@@ -289,6 +294,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
     );
 };
 
+export default FileViewer;
+
 const Container = styled("div")`
     border: 1px solid red;
 
@@ -298,4 +305,20 @@ const Container = styled("div")`
     }
 `;
 
-export default FileViewer;
+const fileIsEditableImage = (file: EnteFile) => {
+    // Only images are editable.
+    if (file.metadata.fileType !== FileType.image) return false;
+
+    const extension = lowercaseExtension(file.metadata.title);
+    // Assume it is editable;
+    let isRenderable = true;
+    if (extension && needsJPEGConversion(extension)) {
+        // See if the file is on the whitelist of extensions that we know
+        // will not be directly renderable.
+        if (!isDesktop) {
+            // On the web, we only support HEIC conversion.
+            isRenderable = isHEICExtension(extension);
+        }
+    }
+    return isRenderable;
+};
diff --git a/web/packages/gallery/components/viewer/icons.tsx b/web/packages/gallery/components/viewer/icons.tsx
index 5b8201f459..d3739be83d 100644
--- a/web/packages/gallery/components/viewer/icons.tsx
+++ b/web/packages/gallery/components/viewer/icons.tsx
@@ -21,6 +21,8 @@ const paths = {
     info: '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8" transform="translate(3.5, 3.5)"',
     // "@mui/icons-material/ErrorOutline"
     error: '<path d="M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2M12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8" transform="translate(7, 5.7) scale(0.85)"',
+    // "@mui/icons-material/Edit"
+    edit: '<path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34a.996.996 0 0 0-1.41 0l-1.83 1.83 3.75 3.75z" transform="translate(3, 3) scale(0.97)"',
 };
 
 /**
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 2c5fd9a386..0e53b70492 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -5,6 +5,7 @@ import log from "@/base/log";
 import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import { t } from "i18next";
+import { pt } from "@/base/i18n";
 import {
     forgetExif,
     forgetExifForItemData,
@@ -50,8 +51,13 @@ type FileViewerPhotoSwipeOptions = {
     onViewInfo: (annotatedFile: FileViewerAnnotatedFile) => void;
     /**
      * Called when the user activates the edit action on an image.
+     *
+     * If this callback is not provided, then the edit button is never shown. If
+     * this callback is provided, then the visibility of the edit button is
+     * determined by the {@link isEditableImage} property of
+     * {@link FileViewerFileAnnotation} for the file.
      */
-    onEditImage: (annotatedFile: FileViewerAnnotatedFile) => void;
+    onEditImage?: (annotatedFile: FileViewerAnnotatedFile) => void;
 } & Pick<FileViewerProps, "files" | "initialIndex" | "disableDownload">;
 
 /**
@@ -69,6 +75,13 @@ export interface FileViewerFileAnnotation {
      * `true` if this file is owned by the logged in user (if any).
      */
     isOwnFile: boolean;
+    /**
+     * `true` if this is an image which can be edited.
+     *
+     * The edit button is shown when this is true. See also the
+     * {@link onEditImage} option for {@link FileViewerPhotoSwipe} constructor.
+     */
+    isEditableImage: boolean;
 }
 
 /**
@@ -147,6 +160,7 @@ export class FileViewerPhotoSwipe {
         onClose,
         onAnnotate,
         onViewInfo,
+        onEditImage,
     }: FileViewerPhotoSwipeOptions) {
         this.files = files;
         this.opts = { disableDownload };
@@ -405,11 +419,33 @@ export class FileViewerPhotoSwipe {
             pswp.ui.registerElement({
                 name: "info",
                 title: t("info"),
-                order: 15,
+                order: 16,
                 isButton: true,
                 html: createPSRegisterElementIconHTML("info"),
                 onClick: withCurrentAnnotatedFile(onViewInfo),
             });
+
+            if (onEditImage) {
+                pswp.ui.registerElement({
+                    name: "edit",
+                    // TODO(PS):
+                    // title: t("edit_image"),
+                    title: pt("Edit image"),
+                    order: 15,
+                    isButton: true,
+                    html: createPSRegisterElementIconHTML("edit"),
+                    onClick: withCurrentAnnotatedFile(onEditImage),
+                    onInit: (buttonElement, pswp) => {
+                        pswp.on("change", () => {
+                            const { annotation } = currentAnnotatedFile();
+                            buttonElement.classList.toggle(
+                                "pswp--ui-visible",
+                                annotation.isEditableImage,
+                            );
+                        });
+                    },
+                });
+            }
         });
 
         // Modify the default UI elements.

From cf96c4dc44a1d829430e99f147c089c9074131fd Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Thu, 27 Feb 2025 16:30:24 +0530
Subject: [PATCH 602/796] chore: bump version

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 8e4eae13a8..da267d3f33 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.99+1007
+version: 0.9.99+1008
 publish_to: none
 
 environment:

From 0bfd35523380f6fb919269bd350190b16217fc4a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 27 Feb 2025 16:23:47 +0530
Subject: [PATCH 603/796] Save

---
 web/apps/photos/src/components/PhotoFrame.tsx | 12 ++++
 .../gallery/components/viewer/FileViewer.tsx  | 57 +++++++++++--------
 .../photos/components/ImageEditorOverlay.tsx  |  2 +-
 3 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 830739cc0b..ebbff43ad7 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -9,6 +9,7 @@ import {
     type LoadedLivePhotoSourceURL,
     type RenderableSourceURLs,
 } from "@/gallery/services/download";
+import type { Collection } from "@/media/collection";
 import { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import { FileViewer } from "@/new/photos/components/FileViewerComponents";
@@ -22,6 +23,7 @@ import { GalleryContext } from "pages/gallery";
 import PhotoSwipe from "photoswipe";
 import { useCallback, useContext, useEffect, useState } from "react";
 import AutoSizer from "react-virtualized-auto-sizer";
+import uploadManager from "services/upload/uploadManager";
 import {
     SelectedState,
     SetFilesDownloadProgressAttributesCreator,
@@ -261,6 +263,15 @@ const PhotoFrame = ({
         [syncWithRemote],
     );
 
+    const handleSaveEditedImageCopy = useCallback(
+        (editedFile: File, collection: Collection, enteFile: EnteFile) => {
+            uploadManager.prepareForNewUpload();
+            uploadManager.showUploadProgressDialog();
+            uploadManager.uploadFile(editedFile, collection, enteFile);
+        },
+        [],
+    );
+
     if (!displayFiles) {
         return <div />;
     }
@@ -541,6 +552,7 @@ const PhotoFrame = ({
                     initialIndex={currentIndex}
                     disableDownload={!enableDownload}
                     onTriggerSyncWithRemote={handleTriggerSyncWithRemote}
+                    onSaveEditedImageCopy={handleSaveEditedImageCopy}
                     {...{
                         fileCollectionIDs,
                         allCollectionsNameByID,
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 23ead0d31f..d891c08cbe 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -23,10 +23,14 @@ import {
     type FileInfoExif,
     type FileInfoProps,
 } from "@/gallery/components/FileInfo";
+import type { Collection } from "@/media/collection";
 import { FileType } from "@/media/file-type";
 import type { EnteFile } from "@/media/file.js";
 import { isHEICExtension, needsJPEGConversion } from "@/media/formats";
-import { ImageEditorOverlay } from "@/new/photos/components/ImageEditorOverlay";
+import {
+    ImageEditorOverlay,
+    type ImageEditorOverlayProps,
+} from "@/new/photos/components/ImageEditorOverlay";
 import { Button, styled } from "@mui/material";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { fileInfoExifForFile } from "./data-source";
@@ -87,6 +91,16 @@ export type FileViewerProps = ModalVisibilityProps & {
      * not defined, then this prop is not used.
      */
     onTriggerSyncWithRemote?: () => void;
+    /**
+     * Called when the user edits an image in the image editor and asks us to
+     * save their edits as a copy.
+     *
+     * Editing is disabled if this is not provided.
+     *
+     * See {@link onSaveEditedCopy} in the {@link ImageEditorOverlay} props for
+     * documentation about the parameters.
+     */
+    onSaveEditedImageCopy?: ImageEditorOverlayProps["onSaveEditedCopy"];
 } & Pick<
         FileInfoProps,
         | "fileCollectionIDs"
@@ -107,9 +121,10 @@ const FileViewer: React.FC<FileViewerProps> = ({
     disableDownload,
     fileCollectionIDs,
     allCollectionsNameByID,
-    onTriggerSyncWithRemote,
     onSelectCollection,
     onSelectPerson,
+    onTriggerSyncWithRemote,
+    onSaveEditedImageCopy,
 }) => {
     const pswpRef = useRef<FileViewerPhotoSwipe | undefined>();
 
@@ -189,33 +204,29 @@ const FileViewer: React.FC<FileViewerProps> = ({
             : undefined;
     }, [onSelectPerson, handleClose]);
 
-    const handleEditImage = useCallback(
-        (annotatedFile: FileViewerAnnotatedFile) => {
-            setActiveAnnotatedFile(annotatedFile);
-            setActiveFileExif(undefined);
-            setOpenImageEditor(true);
-        },
-        [],
-    );
+    const handleEditImage = useMemo(() => {
+        return onSaveEditedImageCopy
+            ? (annotatedFile: FileViewerAnnotatedFile) => {
+                  setActiveAnnotatedFile(annotatedFile);
+                  setActiveFileExif(undefined);
+                  setOpenImageEditor(true);
+              }
+            : undefined;
+    }, [onSaveEditedImageCopy]);
 
     const handleImageEditorClose = useCallback(
         () => setOpenImageEditor(false),
         [],
     );
 
-    const handleSaveEditedCopy = (
-        editedFile: File,
-        collection: Collection,
-        enteFile: EnteFile,
-    ) => {
-        console.log(editedFile, collection, enteFile);
-        throw new Error("TODO");
-        // uploadManager.prepareForNewUpload();
-        // uploadManager.showUploadProgressDialog();
-        // uploadManager.uploadFile(editedFile, collection, enteFile);
-        handleImageEditorClose();
-        handleClose();
-    };
+    const handleSaveEditedCopy = useCallback(
+        (editedFile: File, collection: Collection, enteFile: EnteFile) => {
+            onSaveEditedImageCopy(editedFile, collection, enteFile);
+            handleImageEditorClose();
+            handleClose();
+        },
+        [onSaveEditedImageCopy, handleImageEditorClose, handleClose],
+    );
 
     useEffect(() => {
         log.debug(() => ["viewer", { action: "useEffect", open }]);
diff --git a/web/packages/new/photos/components/ImageEditorOverlay.tsx b/web/packages/new/photos/components/ImageEditorOverlay.tsx
index 3f5afc3e81..7bd37bb5c6 100644
--- a/web/packages/new/photos/components/ImageEditorOverlay.tsx
+++ b/web/packages/new/photos/components/ImageEditorOverlay.tsx
@@ -62,7 +62,7 @@ import React, {
     type RefObject,
 } from "react";
 
-type ImageEditorOverlayProps = ModalVisibilityProps & {
+export type ImageEditorOverlayProps = ModalVisibilityProps & {
     /**
      * The (Ente) file to edit.
      */

From e9633e48ab2e750df61dfe293adbf8dde90b3ea6 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Thu, 27 Feb 2025 16:57:35 +0530
Subject: [PATCH 604/796] fix: separation is the key

---
 mobile/android/build.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mobile/android/build.gradle b/mobile/android/build.gradle
index af2e0d701b..35258232be 100644
--- a/mobile/android/build.gradle
+++ b/mobile/android/build.gradle
@@ -18,6 +18,8 @@ rootProject.buildDir = "../build"
 
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
     project.evaluationDependsOn(":app")
 }
 

From e87d596b4c0b171cddce0fe29ee94115b6339fc7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 27 Feb 2025 17:07:58 +0530
Subject: [PATCH 605/796] fav 1

---
 web/apps/photos/src/components/PhotoFrame.tsx |   1 +
 .../gallery/components/viewer/FileViewer.tsx  |  29 +++-
 .../gallery/components/viewer/photoswipe.ts   | 124 ++++++++++++------
 3 files changed, 108 insertions(+), 46 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index ebbff43ad7..5bb808cce8 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -554,6 +554,7 @@ const PhotoFrame = ({
                     onTriggerSyncWithRemote={handleTriggerSyncWithRemote}
                     onSaveEditedImageCopy={handleSaveEditedImageCopy}
                     {...{
+                        favoriteFileIDs,
                         fileCollectionIDs,
                         allCollectionsNameByID,
                         onSelectCollection,
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index d891c08cbe..01526a2c86 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -76,6 +76,13 @@ export type FileViewerProps = ModalVisibilityProps & {
      * If true then the viewer does not show controls for downloading the file.
      */
     disableDownload?: boolean;
+    /**
+     * File IDs of all the files that the user has marked as a favorite.
+     *
+     * If this is not provided then the favorite toggle button will not be shown
+     * in the file actions.
+     */
+    favoriteFileIDs?: Set<number>;
     /**
      * Called when there was some update performed within the file viewer that
      * necessitates us to sync with remote again to fetch the latest updates.
@@ -119,6 +126,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
     files,
     initialIndex,
     disableDownload,
+    favoriteFileIDs,
     fileCollectionIDs,
     allCollectionsNameByID,
     onSelectCollection,
@@ -162,14 +170,27 @@ const FileViewer: React.FC<FileViewerProps> = ({
 
     const handleAnnotate = useCallback(
         (file: EnteFile) => {
+            log.debug(() => ["viewer", { action: "annotate", file }]);
             const fileID = file.id;
             const isOwnFile = file.ownerID == user?.id;
-            const isEditableImage = fileIsEditableImage(file);
-            return { fileID, isOwnFile, isEditableImage };
+            const isFavorite = favoriteFileIDs?.has(file.id);
+            const isEditableImage = onSaveEditedImageCopy
+                ? fileIsEditableImage(file)
+                : undefined;
+            return { fileID, isOwnFile, isFavorite, isEditableImage };
         },
-        [user],
+        [user, favoriteFileIDs, onSaveEditedImageCopy],
     );
 
+    const handleToggleFavorite = useMemo(() => {
+        return favoriteFileIDs
+            ? (annotatedFile: FileViewerAnnotatedFile) => {
+                  setActiveAnnotatedFile(annotatedFile);
+                  console.log("handleToggleFavorite", annotatedFile);
+              }
+            : undefined;
+    }, [favoriteFileIDs]);
+
     const handleViewInfo = useCallback(
         (annotatedFile: FileViewerAnnotatedFile) => {
             setActiveAnnotatedFile(annotatedFile);
@@ -208,7 +229,6 @@ const FileViewer: React.FC<FileViewerProps> = ({
         return onSaveEditedImageCopy
             ? (annotatedFile: FileViewerAnnotatedFile) => {
                   setActiveAnnotatedFile(annotatedFile);
-                  setActiveFileExif(undefined);
                   setOpenImageEditor(true);
               }
             : undefined;
@@ -242,6 +262,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
             disableDownload,
             onClose: handleClose,
             onAnnotate: handleAnnotate,
+            onToggleFavorite: handleToggleFavorite,
             onViewInfo: handleViewInfo,
             onEditImage: handleEditImage,
         });
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 0e53b70492..a40458c5f2 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -1,11 +1,11 @@
 /* eslint-disable */
 // @ts-nocheck
 
+import { pt } from "@/base/i18n";
 import log from "@/base/log";
 import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import { t } from "i18next";
-import { pt } from "@/base/i18n";
 import {
     forgetExif,
     forgetExifForItemData,
@@ -35,31 +35,6 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
 
-type FileViewerPhotoSwipeOptions = {
-    /**
-     * Called when the file viewer is closed.
-     */
-    onClose: () => void;
-    /**
-     * Called whenever the slide changes to obtain the derived data for the file
-     * that is about to be displayed.
-     */
-    onAnnotate: (file: EnteFile) => FileViewerFileAnnotation;
-    /**
-     * Called when the user activates the info action on a file.
-     */
-    onViewInfo: (annotatedFile: FileViewerAnnotatedFile) => void;
-    /**
-     * Called when the user activates the edit action on an image.
-     *
-     * If this callback is not provided, then the edit button is never shown. If
-     * this callback is provided, then the visibility of the edit button is
-     * determined by the {@link isEditableImage} property of
-     * {@link FileViewerFileAnnotation} for the file.
-     */
-    onEditImage?: (annotatedFile: FileViewerAnnotatedFile) => void;
-} & Pick<FileViewerProps, "files" | "initialIndex" | "disableDownload">;
-
 /**
  * Derived data for a file that is needed to display the file viewer controls
  * etc associated with the file.
@@ -75,15 +50,59 @@ export interface FileViewerFileAnnotation {
      * `true` if this file is owned by the logged in user (if any).
      */
     isOwnFile: boolean;
+    /**
+     * `true` if this file has been marked as a favorite by the user.
+     *
+     * It will not be provided if favorite functionality is not available.
+     *
+     * Otherwise it determines the toggle state of the toggle favorite button.
+     */
+    isFavorite?: boolean;
     /**
      * `true` if this is an image which can be edited.
      *
-     * The edit button is shown when this is true. See also the
+     * It will not be provided if editing is not available.
+     *
+     * Otherwise the edit button is shown when this is true. See also the
      * {@link onEditImage} option for {@link FileViewerPhotoSwipe} constructor.
      */
-    isEditableImage: boolean;
+    isEditableImage?: boolean;
 }
 
+type FileViewerPhotoSwipeOptions = {
+    /**
+     * Called when the file viewer is closed.
+     */
+    onClose: () => void;
+    /**
+     * Called whenever the slide changes to obtain the derived data for the file
+     * that is about to be displayed.
+     */
+    onAnnotate: (file: EnteFile) => FileViewerFileAnnotation;
+    /**
+     * Called when the user activates the toggle favorite action on a file.
+     *
+     * If this callback is not provided, then the toggle favorite button is not
+     * shown. If this callback is provided, then the current toggle state of the
+     * favorite button is determined by the {@link isFavorite} property of
+     * {@link FileViewerFileAnnotation} for the file.
+     */
+    onToggleFavorite?: (annotatedFile: FileViewerAnnotatedFile) => void;
+    /**
+     * Called when the user activates the info action on a file.
+     */
+    onViewInfo: (annotatedFile: FileViewerAnnotatedFile) => void;
+    /**
+     * Called when the user activates the edit action on an image.
+     *
+     * If this callback is not provided, then the edit button is never shown. If
+     * this callback is provided, then the visibility of the edit button is
+     * determined by the {@link isEditableImage} property of
+     * {@link FileViewerFileAnnotation} for the file.
+     */
+    onEditImage?: (annotatedFile: FileViewerAnnotatedFile) => void;
+} & Pick<FileViewerProps, "files" | "initialIndex" | "disableDownload">;
+
 /**
  * A file and its annotation, in a nice cosy box.
  */
@@ -159,6 +178,7 @@ export class FileViewerPhotoSwipe {
         disableDownload,
         onClose,
         onAnnotate,
+        onToggleFavorite,
         onViewInfo,
         onEditImage,
     }: FileViewerPhotoSwipeOptions) {
@@ -416,14 +436,26 @@ export class FileViewerPhotoSwipe {
                     });
                 },
             });
-            pswp.ui.registerElement({
-                name: "info",
-                title: t("info"),
-                order: 16,
-                isButton: true,
-                html: createPSRegisterElementIconHTML("info"),
-                onClick: withCurrentAnnotatedFile(onViewInfo),
-            });
+
+            if (onToggleFavorite) {
+                pswp.ui.registerElement({
+                    name: "favorite",
+                    title: t("favorite"),
+                    order: 15,
+                    isButton: true,
+                    html: createPSRegisterElementIconHTML("favorite"),
+                    onClick: withCurrentAnnotatedFile(onToggleFavorite),
+                    onInit: (buttonElement, pswp) => {
+                        // TODO:
+                        // pswp.on("change", () =>
+                        //     buttonElement.classList.toggle(
+                        //         "pswp--ui-visible",
+                        //         currentFileAnnotation().isFavorite,
+                        //     ),
+                        // );
+                    },
+                });
+            }
 
             if (onEditImage) {
                 pswp.ui.registerElement({
@@ -431,21 +463,29 @@ export class FileViewerPhotoSwipe {
                     // TODO(PS):
                     // title: t("edit_image"),
                     title: pt("Edit image"),
-                    order: 15,
+                    order: 16,
                     isButton: true,
                     html: createPSRegisterElementIconHTML("edit"),
                     onClick: withCurrentAnnotatedFile(onEditImage),
                     onInit: (buttonElement, pswp) => {
-                        pswp.on("change", () => {
-                            const { annotation } = currentAnnotatedFile();
+                        pswp.on("change", () =>
                             buttonElement.classList.toggle(
                                 "pswp--ui-visible",
-                                annotation.isEditableImage,
-                            );
-                        });
+                                currentFileAnnotation().isEditableImage,
+                            ),
+                        );
                     },
                 });
             }
+
+            pswp.ui.registerElement({
+                name: "info",
+                title: t("info"),
+                order: 17,
+                isButton: true,
+                html: createPSRegisterElementIconHTML("info"),
+                onClick: withCurrentAnnotatedFile(onViewInfo),
+            });
         });
 
         // Modify the default UI elements.

From e453f5bf36cc3aa7b8b60ea2bfec3e5c68787b51 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 27 Feb 2025 17:19:54 +0530
Subject: [PATCH 606/796] icons

---
 .../gallery/components/viewer/icons.tsx       |  4 +
 .../gallery/components/viewer/photoswipe.ts   | 73 +++++++++++--------
 2 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/web/packages/gallery/components/viewer/icons.tsx b/web/packages/gallery/components/viewer/icons.tsx
index d3739be83d..a0a295a498 100644
--- a/web/packages/gallery/components/viewer/icons.tsx
+++ b/web/packages/gallery/components/viewer/icons.tsx
@@ -23,6 +23,10 @@ const paths = {
     error: '<path d="M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2M12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8" transform="translate(7, 5.7) scale(0.85)"',
     // "@mui/icons-material/Edit"
     edit: '<path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34a.996.996 0 0 0-1.41 0l-1.83 1.83 3.75 3.75z" transform="translate(3, 3) scale(0.97)"',
+    // "@mui/icons-material/FavoriteBorderRounded"
+    favorite: '<path d="M19.66 3.99c-2.64-1.8-5.9-.96-7.66 1.1-1.76-2.06-5.02-2.91-7.66-1.1-1.4.96-2.28 2.58-2.34 4.29-.14 3.88 3.3 6.99 8.55 11.76l.1.09c.76.69 1.93.69 2.69-.01l.11-.1c5.25-4.76 8.68-7.87 8.55-11.75-.06-1.7-.94-3.32-2.34-4.28M12.1 18.55l-.1.1-.1-.1C7.14 14.24 4 11.39 4 8.5 4 6.5 5.5 5 7.5 5c1.54 0 3.04.99 3.57 2.36h1.87C13.46 5.99 14.96 5 16.5 5c2 0 3.5 1.5 3.5 3.5 0 2.89-3.14 5.74-7.9 10.05" transform="translate(3, 3)"',
+    // "@mui/icons-material/FavoriteRounded"
+    unfavorite: '<path d="M13.35 20.13c-.76.69-1.93.69-2.69-.01l-.11-.1C5.3 15.27 1.87 12.16 2 8.28c.06-1.7.93-3.33 2.34-4.29 2.64-1.8 5.9-.96 7.66 1.1 1.76-2.06 5.02-2.91 7.66-1.1 1.41.96 2.28 2.59 2.34 4.29.14 3.88-3.3 6.99-8.55 11.76z" transform="translate(3, 3)"',
 };
 
 /**
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index a40458c5f2..5510456b0a 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -53,20 +53,17 @@ export interface FileViewerFileAnnotation {
     /**
      * `true` if this file has been marked as a favorite by the user.
      *
-     * It will not be provided if favorite functionality is not available.
-     *
+     * The toggle favorite button will not be shown if this is not defined.
      * Otherwise it determines the toggle state of the toggle favorite button.
      */
-    isFavorite?: boolean;
+    isFavorite?: boolean | undefined;
     /**
      * `true` if this is an image which can be edited.
      *
-     * It will not be provided if editing is not available.
-     *
-     * Otherwise the edit button is shown when this is true. See also the
+     * The edit button is shown when this is true. See also the
      * {@link onEditImage} option for {@link FileViewerPhotoSwipe} constructor.
      */
-    isEditableImage?: boolean;
+    isEditableImage?: boolean | undefined;
 }
 
 type FileViewerPhotoSwipeOptions = {
@@ -83,9 +80,10 @@ type FileViewerPhotoSwipeOptions = {
      * Called when the user activates the toggle favorite action on a file.
      *
      * If this callback is not provided, then the toggle favorite button is not
-     * shown. If this callback is provided, then the current toggle state of the
-     * favorite button is determined by the {@link isFavorite} property of
-     * {@link FileViewerFileAnnotation} for the file.
+     * shown. If this callback is provided, then the favorite button is shown if
+     * the {@link isFavorite} property of {@link FileViewerFileAnnotation} for
+     * the file is provided. In that case, the value of the {@link isFavorite}
+     * property will determine the current toggle state of the favorite button.
      */
     onToggleFavorite?: (annotatedFile: FileViewerAnnotatedFile) => void;
     /**
@@ -438,25 +436,51 @@ export class FileViewerPhotoSwipe {
             });
 
             if (onToggleFavorite) {
+                // Only one of these two will end up being shown, so they can
+                // safely share the same order.
                 pswp.ui.registerElement({
                     name: "favorite",
-                    title: t("favorite"),
-                    order: 15,
+                    title: t("favorite_key"),
+                    order: 8,
                     isButton: true,
                     html: createPSRegisterElementIconHTML("favorite"),
                     onClick: withCurrentAnnotatedFile(onToggleFavorite),
                     onInit: (buttonElement, pswp) => {
-                        // TODO:
-                        // pswp.on("change", () =>
-                        //     buttonElement.classList.toggle(
-                        //         "pswp--ui-visible",
-                        //         currentFileAnnotation().isFavorite,
-                        //     ),
-                        // );
+                        pswp.on("change", () =>
+                            buttonElement.classList.toggle(
+                                "pswp--ui-visible",
+                                currentFileAnnotation().isFavorite === false,
+                            ),
+                        );
+                    },
+                });
+                pswp.ui.registerElement({
+                    name: "unfavorite",
+                    title: t("unfavorite_key"),
+                    order: 8,
+                    isButton: true,
+                    html: createPSRegisterElementIconHTML("unfavorite"),
+                    onClick: withCurrentAnnotatedFile(onToggleFavorite),
+                    onInit: (buttonElement, pswp) => {
+                        pswp.on("change", () =>
+                            buttonElement.classList.toggle(
+                                "pswp--ui-visible",
+                                currentFileAnnotation().isFavorite === true,
+                            ),
+                        );
                     },
                 });
             }
 
+            pswp.ui.registerElement({
+                name: "info",
+                title: t("info"),
+                order: 9,
+                isButton: true,
+                html: createPSRegisterElementIconHTML("info"),
+                onClick: withCurrentAnnotatedFile(onViewInfo),
+            });
+
             if (onEditImage) {
                 pswp.ui.registerElement({
                     name: "edit",
@@ -471,21 +495,12 @@ export class FileViewerPhotoSwipe {
                         pswp.on("change", () =>
                             buttonElement.classList.toggle(
                                 "pswp--ui-visible",
-                                currentFileAnnotation().isEditableImage,
+                                !!currentFileAnnotation().isEditableImage,
                             ),
                         );
                     },
                 });
             }
-
-            pswp.ui.registerElement({
-                name: "info",
-                title: t("info"),
-                order: 17,
-                isButton: true,
-                html: createPSRegisterElementIconHTML("info"),
-                onClick: withCurrentAnnotatedFile(onViewInfo),
-            });
         });
 
         // Modify the default UI elements.

From 215ed6d6c83f721dab648c9a00bc0f67eab640bf Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 27 Feb 2025 17:50:01 +0530
Subject: [PATCH 607/796] Fix toggle

---
 .../gallery/components/viewer/photoswipe.ts   | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 5510456b0a..c2999cbe11 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -407,6 +407,11 @@ export class FileViewerPhotoSwipe {
             onClose();
         });
 
+        const showIf = (element: HTMLElement, condition: boolean) =>
+            condition
+                ? element.classList.remove("pswp--ui-visible")
+                : element.classList.add("pswp--ui-visible");
+
         // Add our custom UI elements to inside the PhotoSwipe dialog.
         //
         // API docs for registerElement:
@@ -445,14 +450,13 @@ export class FileViewerPhotoSwipe {
                     isButton: true,
                     html: createPSRegisterElementIconHTML("favorite"),
                     onClick: withCurrentAnnotatedFile(onToggleFavorite),
-                    onInit: (buttonElement, pswp) => {
+                    onInit: (buttonElement) =>
                         pswp.on("change", () =>
-                            buttonElement.classList.toggle(
-                                "pswp--ui-visible",
+                            showIf(
+                                buttonElement,
                                 currentFileAnnotation().isFavorite === false,
                             ),
-                        );
-                    },
+                        ),
                 });
                 pswp.ui.registerElement({
                     name: "unfavorite",
@@ -461,14 +465,13 @@ export class FileViewerPhotoSwipe {
                     isButton: true,
                     html: createPSRegisterElementIconHTML("unfavorite"),
                     onClick: withCurrentAnnotatedFile(onToggleFavorite),
-                    onInit: (buttonElement, pswp) => {
+                    onInit: (buttonElement) =>
                         pswp.on("change", () =>
-                            buttonElement.classList.toggle(
-                                "pswp--ui-visible",
+                            showIf(
+                                buttonElement,
                                 currentFileAnnotation().isFavorite === true,
                             ),
-                        );
-                    },
+                        ),
                 });
             }
 
@@ -491,14 +494,13 @@ export class FileViewerPhotoSwipe {
                     isButton: true,
                     html: createPSRegisterElementIconHTML("edit"),
                     onClick: withCurrentAnnotatedFile(onEditImage),
-                    onInit: (buttonElement, pswp) => {
+                    onInit: (buttonElement) =>
                         pswp.on("change", () =>
-                            buttonElement.classList.toggle(
-                                "pswp--ui-visible",
+                            showIf(
+                                buttonElement,
                                 !!currentFileAnnotation().isEditableImage,
                             ),
-                        );
-                    },
+                        ),
                 });
             }
         });

From 70abbeebc293a384cf805dc9867cad4d775a084c Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 27 Feb 2025 18:22:37 +0530
Subject: [PATCH 608/796] Fix hiding

---
 web/apps/photos/src/components/PhotoFrame.tsx |  2 ++
 .../gallery/components/viewer/FileViewer.tsx  | 31 ++++++++++++++++---
 .../gallery/components/viewer/icons.tsx       |  6 ++--
 .../gallery/components/viewer/photoswipe.ts   |  4 +--
 4 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 5bb808cce8..8270ce9b20 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -550,6 +550,8 @@ const PhotoFrame = ({
                     user={galleryContext.user ?? undefined}
                     files={files}
                     initialIndex={currentIndex}
+                    isInTrashSection={activeCollectionID === TRASH_SECTION}
+                    isInHiddenSection={isInHiddenSection}
                     disableDownload={!enableDownload}
                     onTriggerSyncWithRemote={handleTriggerSyncWithRemote}
                     onSaveEditedImageCopy={handleSaveEditedImageCopy}
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 01526a2c86..5ecb18f79c 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -72,6 +72,14 @@ export type FileViewerProps = ModalVisibilityProps & {
      * provided within the file viewer itself.
      */
     initialIndex: number;
+    /**
+     * `true` when we are viewing files in the Trash.
+     */
+    isInTrashSection?: boolean;
+    /**
+     * `true` when we are viewing files in the hidden section.
+     */
+    isInHiddenSection?: boolean;
     /**
      * If true then the viewer does not show controls for downloading the file.
      */
@@ -125,6 +133,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
     user,
     files,
     initialIndex,
+    isInTrashSection,
+    isInHiddenSection,
     disableDownload,
     favoriteFileIDs,
     fileCollectionIDs,
@@ -173,13 +183,24 @@ const FileViewer: React.FC<FileViewerProps> = ({
             log.debug(() => ["viewer", { action: "annotate", file }]);
             const fileID = file.id;
             const isOwnFile = file.ownerID == user?.id;
-            const isFavorite = favoriteFileIDs?.has(file.id);
-            const isEditableImage = onSaveEditedImageCopy
-                ? fileIsEditableImage(file)
+            const canFavoriteOrEdit =
+                isOwnFile && !isInTrashSection && !isInHiddenSection;
+            const isFavorite = canFavoriteOrEdit
+                ? favoriteFileIDs?.has(file.id)
                 : undefined;
+            const isEditableImage =
+                onSaveEditedImageCopy && canFavoriteOrEdit
+                    ? fileIsEditableImage(file)
+                    : undefined;
             return { fileID, isOwnFile, isFavorite, isEditableImage };
         },
-        [user, favoriteFileIDs, onSaveEditedImageCopy],
+        [
+            user,
+            isInTrashSection,
+            isInHiddenSection,
+            favoriteFileIDs,
+            onSaveEditedImageCopy,
+        ],
     );
 
     const handleToggleFavorite = useMemo(() => {
@@ -282,7 +303,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
         // - Updates to initialIndex can be safely ignored: they don't matter,
         //   only their initial value at the time of open mattered.
         //
-        // - Updates to disableDownload are not expected after open. We could've
+        // - Updates to other properties are not expected after open. We could've
         //   also added it to the dependencies array, not adding it was a more
         //   conservative choice to be on the safer side and trigger too few
         //   instead of too many updates.
diff --git a/web/packages/gallery/components/viewer/icons.tsx b/web/packages/gallery/components/viewer/icons.tsx
index a0a295a498..99628399f4 100644
--- a/web/packages/gallery/components/viewer/icons.tsx
+++ b/web/packages/gallery/components/viewer/icons.tsx
@@ -24,9 +24,11 @@ const paths = {
     // "@mui/icons-material/Edit"
     edit: '<path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34a.996.996 0 0 0-1.41 0l-1.83 1.83 3.75 3.75z" transform="translate(3, 3) scale(0.97)"',
     // "@mui/icons-material/FavoriteBorderRounded"
-    favorite: '<path d="M19.66 3.99c-2.64-1.8-5.9-.96-7.66 1.1-1.76-2.06-5.02-2.91-7.66-1.1-1.4.96-2.28 2.58-2.34 4.29-.14 3.88 3.3 6.99 8.55 11.76l.1.09c.76.69 1.93.69 2.69-.01l.11-.1c5.25-4.76 8.68-7.87 8.55-11.75-.06-1.7-.94-3.32-2.34-4.28M12.1 18.55l-.1.1-.1-.1C7.14 14.24 4 11.39 4 8.5 4 6.5 5.5 5 7.5 5c1.54 0 3.04.99 3.57 2.36h1.87C13.46 5.99 14.96 5 16.5 5c2 0 3.5 1.5 3.5 3.5 0 2.89-3.14 5.74-7.9 10.05" transform="translate(3, 3)"',
+    favorite:
+        '<path d="M19.66 3.99c-2.64-1.8-5.9-.96-7.66 1.1-1.76-2.06-5.02-2.91-7.66-1.1-1.4.96-2.28 2.58-2.34 4.29-.14 3.88 3.3 6.99 8.55 11.76l.1.09c.76.69 1.93.69 2.69-.01l.11-.1c5.25-4.76 8.68-7.87 8.55-11.75-.06-1.7-.94-3.32-2.34-4.28M12.1 18.55l-.1.1-.1-.1C7.14 14.24 4 11.39 4 8.5 4 6.5 5.5 5 7.5 5c1.54 0 3.04.99 3.57 2.36h1.87C13.46 5.99 14.96 5 16.5 5c2 0 3.5 1.5 3.5 3.5 0 2.89-3.14 5.74-7.9 10.05" transform="translate(3, 3)"',
     // "@mui/icons-material/FavoriteRounded"
-    unfavorite: '<path d="M13.35 20.13c-.76.69-1.93.69-2.69-.01l-.11-.1C5.3 15.27 1.87 12.16 2 8.28c.06-1.7.93-3.33 2.34-4.29 2.64-1.8 5.9-.96 7.66 1.1 1.76-2.06 5.02-2.91 7.66-1.1 1.41.96 2.28 2.59 2.34 4.29.14 3.88-3.3 6.99-8.55 11.76z" transform="translate(3, 3)"',
+    unfavorite:
+        '<path d="M13.35 20.13c-.76.69-1.93.69-2.69-.01l-.11-.1C5.3 15.27 1.87 12.16 2 8.28c.06-1.7.93-3.33 2.34-4.29 2.64-1.8 5.9-.96 7.66 1.1 1.76-2.06 5.02-2.91 7.66-1.1 1.41.96 2.28 2.59 2.34 4.29.14 3.88-3.3 6.99-8.55 11.76z" transform="translate(3, 3)"',
 };
 
 /**
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index c2999cbe11..adc8fd606a 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -409,8 +409,8 @@ export class FileViewerPhotoSwipe {
 
         const showIf = (element: HTMLElement, condition: boolean) =>
             condition
-                ? element.classList.remove("pswp--ui-visible")
-                : element.classList.add("pswp--ui-visible");
+                ? element.classList.remove("pswp__hidden")
+                : element.classList.add("pswp__hidden");
 
         // Add our custom UI elements to inside the PhotoSwipe dialog.
         //

From e75165d01e7e547e3219288a8a8c5f0dd44a9001 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 27 Feb 2025 18:28:44 +0530
Subject: [PATCH 609/796] Prep for merge

Revert "Temporary workbench"

This reverts commit 06b84e8067d698916ef9294bc228e17ee3db3f8b.
---
 web/apps/photos/src/pages/_app.tsx                   | 4 ++--
 web/apps/photos/src/styles/global.css                | 3 +--
 web/packages/gallery/components/viewer/photoswipe.ts | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index aad64be0cf..000cf2d037 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -48,9 +48,9 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { resumeExportsIfNeeded } from "services/export";
 import { photosLogout } from "services/logout";
 
-// import "photoswipe/dist/photoswipe.css";
+import "photoswipe/dist/photoswipe.css";
 // TODO(PS): Note, auto hide only works with the new CSS.
-import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
+// import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
 
 import "styles/global.css";
 
diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 3eb8dd8d62..aced5adc91 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -12,7 +12,7 @@ body {
     flex-direction: column;
     height: 100%;
 }
-@media DISABLED {
+
 .pswp__button--custom {
     width: 48px;
     height: 48px;
@@ -114,7 +114,6 @@ body {
 .pswp__caption--empty {
     display: none;
 }
-}
 
 .pswp-ente {
     /* The default z-index for PhotoSwipe is 10k, way beyond everything else.
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index adc8fd606a..6452938321 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -32,7 +32,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 let PhotoSwipe;
 if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     // TODO(PS): Comment me before merging into main.
-    PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
+    // PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
 
 /**

From 8e08a0d71d2b32fe56fdd2e6acd80ad7a09f0a8f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 05:46:02 +0530
Subject: [PATCH 610/796] Temporary workbench

Revert "Prep for merge"

This reverts commit e75165d01e7e547e3219288a8a8c5f0dd44a9001.
---
 web/apps/photos/src/pages/_app.tsx                   | 4 ++--
 web/apps/photos/src/styles/global.css                | 3 ++-
 web/packages/gallery/components/viewer/photoswipe.ts | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index 000cf2d037..aad64be0cf 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -48,9 +48,9 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { resumeExportsIfNeeded } from "services/export";
 import { photosLogout } from "services/logout";
 
-import "photoswipe/dist/photoswipe.css";
+// import "photoswipe/dist/photoswipe.css";
 // TODO(PS): Note, auto hide only works with the new CSS.
-// import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
+import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
 
 import "styles/global.css";
 
diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index aced5adc91..3eb8dd8d62 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -12,7 +12,7 @@ body {
     flex-direction: column;
     height: 100%;
 }
-
+@media DISABLED {
 .pswp__button--custom {
     width: 48px;
     height: 48px;
@@ -114,6 +114,7 @@ body {
 .pswp__caption--empty {
     display: none;
 }
+}
 
 .pswp-ente {
     /* The default z-index for PhotoSwipe is 10k, way beyond everything else.
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 6452938321..adc8fd606a 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -32,7 +32,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 let PhotoSwipe;
 if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     // TODO(PS): Comment me before merging into main.
-    // PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
+    PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
 
 /**

From b11636bfdfcbba30abeb5d77a2b66aa57239ee23 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 05:59:01 +0530
Subject: [PATCH 611/796] zoom left

---
 web/packages/gallery/components/viewer/photoswipe.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index adc8fd606a..dee195aba8 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -423,6 +423,17 @@ export class FileViewerPhotoSwipe {
         // - zoom: 10
         // - close: 20
         pswp.on("uiRegister", () => {
+            // Move the zoom button to the left so that it is in the same place
+            // as the other items like preloader or the error indicator that
+            // come and go as files get loaded.
+            //
+            // We cannot use the PhotoSwipe "uiElement" filter to modify the
+            // order since that only allows us to edit the DOM element, not the
+            // underlying UI element data.
+            pswp.ui.uiElementsData.find((e) => e.name == "zoom").order = 6;
+
+            // Register our custom elements...
+
             pswp.ui.registerElement({
                 name: "error",
                 order: 6,

From 2fbc26c9eb5db3814c3b3f4f54ac07b4e32970f1 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 06:17:20 +0530
Subject: [PATCH 612/796] scale

---
 web/apps/photos/src/styles/global.css | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 3eb8dd8d62..1b45cfe9ed 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -149,10 +149,24 @@ body {
     height: 60px;
     /* Unlike the loading indicator, "display" is used to toggle visibility, and
       the opacity is fixed to be similar to that of the counter. */
-    opacity: 0.85;
     display: none;
+    opacity: 0.85;
 }
 
 .pswp-ente .pswp__error--active {
     display: initial;
 }
+
+/* Scale the built in controls to better fit our requirements */
+.pswp-ente .pswp__button--zoom .pswp__icn {
+    transform: scale(0.85);
+}
+
+.pswp-ente .pswp__button--arrow--prev .pswp__icn {
+    transform: scale(0.8);
+}
+
+.pswp-ente .pswp__button--arrow--next .pswp__icn {
+    /* default is a horizontal flip, transform: scale(-1, 1); */
+    transform: scale(-0.8, 0.8);
+}

From 561b0ea71e4f1e05e0ca4c62b5a9b135e41651c5 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 06:32:46 +0530
Subject: [PATCH 613/796] more

---
 web/packages/gallery/components/viewer/icons.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/packages/gallery/components/viewer/icons.tsx b/web/packages/gallery/components/viewer/icons.tsx
index 99628399f4..6481d0814c 100644
--- a/web/packages/gallery/components/viewer/icons.tsx
+++ b/web/packages/gallery/components/viewer/icons.tsx
@@ -29,6 +29,8 @@ const paths = {
     // "@mui/icons-material/FavoriteRounded"
     unfavorite:
         '<path d="M13.35 20.13c-.76.69-1.93.69-2.69-.01l-.11-.1C5.3 15.27 1.87 12.16 2 8.28c.06-1.7.93-3.33 2.34-4.29 2.64-1.8 5.9-.96 7.66 1.1 1.76-2.06 5.02-2.91 7.66-1.1 1.41.96 2.28 2.59 2.34 4.29.14 3.88-3.3 6.99-8.55 11.76z" transform="translate(3, 3)"',
+    // "@mui/icons-material/MoreVert"
+    more: '<path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2m0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2"',
 };
 
 /**

From 66f43a9c9a9c97678c4a7cdce7c5c3dc00c5cc0b Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 08:08:56 +0530
Subject: [PATCH 614/796] more 2

---
 web/packages/gallery/components/viewer/icons.tsx   |  5 ++++-
 .../gallery/components/viewer/photoswipe.ts        | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/web/packages/gallery/components/viewer/icons.tsx b/web/packages/gallery/components/viewer/icons.tsx
index 6481d0814c..3f98051fff 100644
--- a/web/packages/gallery/components/viewer/icons.tsx
+++ b/web/packages/gallery/components/viewer/icons.tsx
@@ -29,8 +29,11 @@ const paths = {
     // "@mui/icons-material/FavoriteRounded"
     unfavorite:
         '<path d="M13.35 20.13c-.76.69-1.93.69-2.69-.01l-.11-.1C5.3 15.27 1.87 12.16 2 8.28c.06-1.7.93-3.33 2.34-4.29 2.64-1.8 5.9-.96 7.66 1.1 1.76-2.06 5.02-2.91 7.66-1.1 1.41.96 2.28 2.59 2.34 4.29.14 3.88-3.3 6.99-8.55 11.76z" transform="translate(3, 3)"',
+    // TODO(PS): Remove me
     // "@mui/icons-material/MoreVert"
-    more: '<path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2m0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2"',
+    moreV: '<path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2m0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2"',
+    // "@mui/icons-material/MoreHoriz"
+    more: '<path d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2" transform="translate(3, 4)"',
 };
 
 /**
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index dee195aba8..3bac4f85a2 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -495,7 +495,8 @@ export class FileViewerPhotoSwipe {
                 onClick: withCurrentAnnotatedFile(onViewInfo),
             });
 
-            if (onEditImage) {
+            // TODO(PS):
+            if (onEditImage && false) {
                 pswp.ui.registerElement({
                     name: "edit",
                     // TODO(PS):
@@ -514,6 +515,17 @@ export class FileViewerPhotoSwipe {
                         ),
                 });
             }
+
+            pswp.ui.registerElement({
+                name: "more",
+                // TODO(PS):
+                title: pt("More"),
+                order: 17,
+                isButton: true,
+                html: createPSRegisterElementIconHTML("more"),
+                onClick: withCurrentAnnotatedFile(onViewInfo),
+            });
+
         });
 
         // Modify the default UI elements.

From df86904e6a11ac5836f40e26da93e5aff5656da1 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 08:26:10 +0530
Subject: [PATCH 615/796] fav 1

---
 web/apps/photos/src/components/PhotoFrame.tsx |  1 +
 .../gallery/components/viewer/FileViewer.tsx  | 60 ++++++++++++++++---
 2 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 8270ce9b20..87367976a8 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -557,6 +557,7 @@ const PhotoFrame = ({
                     onSaveEditedImageCopy={handleSaveEditedImageCopy}
                     {...{
                         favoriteFileIDs,
+                        markUnsyncedFavoriteUpdate,
                         fileCollectionIDs,
                         allCollectionsNameByID,
                         onSelectCollection,
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 5ecb18f79c..eb01c66ba7 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -14,6 +14,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 }
 
 import { isDesktop } from "@/base/app";
+import { assertionFailed } from "@/base/assert";
 import { type ModalVisibilityProps } from "@/base/components/utils/modal";
 import { lowercaseExtension } from "@/base/file-name";
 import type { LocalUser } from "@/base/local-user";
@@ -31,6 +32,7 @@ import {
     ImageEditorOverlay,
     type ImageEditorOverlayProps,
 } from "@/new/photos/components/ImageEditorOverlay";
+import { wait } from "@/utils/promise";
 import { Button, styled } from "@mui/material";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { fileInfoExifForFile } from "./data-source";
@@ -39,6 +41,18 @@ import {
     type FileViewerAnnotatedFile,
 } from "./photoswipe";
 
+// TODO
+// import {
+//     addToFavorites,
+//     removeFromFavorites,
+// } from "apps/photos/services/collectionService";
+const addToFavorites = async (file: EnteFile) => {
+    console.log(file);
+    await wait(3000);
+    throw new Error("test");
+};
+const removeFromFavorites = addToFavorites;
+
 export type FileViewerProps = ModalVisibilityProps & {
     /**
      * The currently logged in user, if any.
@@ -106,6 +120,20 @@ export type FileViewerProps = ModalVisibilityProps & {
      * not defined, then this prop is not used.
      */
     onTriggerSyncWithRemote?: () => void;
+    /**
+     * Called when the viewer wants to update the in-memory, unsynced, favorite
+     * status of a file.
+     *
+     * For more details, see {@link unsyncedFavoriteUpdates} in the gallery
+     * reducer's documentation.
+     *
+     * If this is not provided then the favorite toggle button will not be shown
+     * in the file actions.
+     */
+    onMarkUnsyncedFavoriteUpdate?: (
+        fileID: number,
+        isFavorite: boolean,
+    ) => void;
     /**
      * Called when the user edits an image in the image editor and asks us to
      * save their edits as a copy.
@@ -142,6 +170,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
     onSelectCollection,
     onSelectPerson,
     onTriggerSyncWithRemote,
+    onMarkUnsyncedFavoriteUpdate,
     onSaveEditedImageCopy,
 }) => {
     const pswpRef = useRef<FileViewerPhotoSwipe | undefined>();
@@ -183,13 +212,14 @@ const FileViewer: React.FC<FileViewerProps> = ({
             log.debug(() => ["viewer", { action: "annotate", file }]);
             const fileID = file.id;
             const isOwnFile = file.ownerID == user?.id;
-            const canFavoriteOrEdit =
+            const canModify =
                 isOwnFile && !isInTrashSection && !isInHiddenSection;
-            const isFavorite = canFavoriteOrEdit
-                ? favoriteFileIDs?.has(file.id)
-                : undefined;
+            const isFavorite =
+                favoriteFileIDs && onMarkUnsyncedFavoriteUpdate && canModify
+                    ? favoriteFileIDs.has(file.id)
+                    : undefined;
             const isEditableImage =
-                onSaveEditedImageCopy && canFavoriteOrEdit
+                onSaveEditedImageCopy && canModify
                     ? fileIsEditableImage(file)
                     : undefined;
             return { fileID, isOwnFile, isFavorite, isEditableImage };
@@ -199,18 +229,30 @@ const FileViewer: React.FC<FileViewerProps> = ({
             isInTrashSection,
             isInHiddenSection,
             favoriteFileIDs,
+            onMarkUnsyncedFavoriteUpdate,
             onSaveEditedImageCopy,
         ],
     );
 
     const handleToggleFavorite = useMemo(() => {
         return favoriteFileIDs
-            ? (annotatedFile: FileViewerAnnotatedFile) => {
-                  setActiveAnnotatedFile(annotatedFile);
-                  console.log("handleToggleFavorite", annotatedFile);
+            ? ({ file, annotation }: FileViewerAnnotatedFile) => {
+                  const isFavorite = annotation.isFavorite;
+                  if (isFavorite === undefined) {
+                      assertionFailed();
+                      return;
+                  }
+
+                  onMarkUnsyncedFavoriteUpdate(file.id, !isFavorite);
+                  void (isFavorite ? removeFromFavorites : addToFavorites)(
+                      file,
+                  ).catch((e: unknown) => {
+                      log.error("Failed to remove favorite", e);
+                      onMarkUnsyncedFavoriteUpdate(file.id, undefined);
+                  });
               }
             : undefined;
-    }, [favoriteFileIDs]);
+    }, [favoriteFileIDs, onMarkUnsyncedFavoriteUpdate]);
 
     const handleViewInfo = useCallback(
         (annotatedFile: FileViewerAnnotatedFile) => {

From 67206b013b85008f329aee5b1cbb1b5042cd2f35 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 08:31:24 +0530
Subject: [PATCH 616/796] stable ident

---
 web/apps/photos/src/components/PhotoFrame.tsx |  2 +-
 web/apps/photos/src/pages/gallery.tsx         | 32 +++++++++++--------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 87367976a8..ecb84371bf 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -554,10 +554,10 @@ const PhotoFrame = ({
                     isInHiddenSection={isInHiddenSection}
                     disableDownload={!enableDownload}
                     onTriggerSyncWithRemote={handleTriggerSyncWithRemote}
+                    onMarkUnsyncedFavoriteUpdate={markUnsyncedFavoriteUpdate}
                     onSaveEditedImageCopy={handleSaveEditedImageCopy}
                     {...{
                         favoriteFileIDs,
-                        markUnsyncedFavoriteUpdate,
                         fileCollectionIDs,
                         allCollectionsNameByID,
                         onSelectCollection,
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 224e6e644c..d4a08eed7f 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -793,6 +793,20 @@ const Page: React.FC = () => {
         });
     };
 
+    const handleSelectCollection = useCallback(
+        (collectionID: number) =>
+            dispatch({
+                type: "showNormalOrHiddenCollectionSummary",
+                collectionSummaryID: collectionID,
+            }),
+        [],
+    );
+
+    const handleSelectPerson = useCallback(
+        (personID: string) => dispatch({ type: "showPerson", personID }),
+        [],
+    );
+
     const handleOpenCollectionSelector = useCallback(
         (attributes: CollectionSelectorAttributes) => {
             setCollectionSelectorAttributes(attributes);
@@ -934,9 +948,7 @@ const Page: React.FC = () => {
                             onSelectPeople={() =>
                                 dispatch({ type: "showPeople" })
                             }
-                            onSelectPerson={(personID) =>
-                                dispatch({ type: "showPerson", personID })
-                            }
+                            onSelectPerson={handleSelectPerson}
                         />
                     )}
                 </NavbarBase>
@@ -959,8 +971,7 @@ const Page: React.FC = () => {
                                 ? state.view.visiblePeople
                                 : undefined) ?? [],
                         activePerson,
-                        onSelectPerson: (personID) =>
-                            dispatch({ type: "showPerson", personID }),
+                        onSelectPerson: handleSelectPerson,
                         setCollectionNamerAttributes,
                         setPhotoListHeader,
                         setFilesDownloadProgressAttributesCreator,
@@ -1049,15 +1060,8 @@ const Page: React.FC = () => {
                             setFilesDownloadProgressAttributesCreator
                         }
                         selectable={true}
-                        onSelectCollection={(collectionID) =>
-                            dispatch({
-                                type: "showNormalOrHiddenCollectionSummary",
-                                collectionSummaryID: collectionID,
-                            })
-                        }
-                        onSelectPerson={(personID) => {
-                            dispatch({ type: "showPerson", personID });
-                        }}
+                        onSelectCollection={handleSelectCollection}
+                        onSelectPerson={handleSelectPerson}
                     />
                 )}
                 <Export

From 067e44e10a55a59158375a8a30c9e6cfc60d78f8 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 08:45:40 +0530
Subject: [PATCH 617/796] st 2

---
 web/apps/photos/src/components/PhotoFrame.tsx | 18 +++++++----
 .../src/components/PhotoViewer/index.tsx      | 18 +++++------
 web/apps/photos/src/pages/gallery.tsx         | 32 ++++++++++++-------
 .../gallery/components/viewer/FileViewer.tsx  | 22 +++++++++----
 4 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index ecb84371bf..b68f603744 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -121,7 +121,10 @@ export type PhotoFrameProps = Pick<
      *
      * Not set in the context of the shared albums app.
      */
-    markUnsyncedFavoriteUpdate?: (fileID: number, isFavorite: boolean) => void;
+    onMarkUnsyncedFavoriteUpdate?: (
+        fileID: number,
+        isFavorite: boolean,
+    ) => void;
     /**
      * Called when the component wants to mark the given files as deleted in the
      * the in-memory, unsynced, state maintained by the top level gallery.
@@ -131,7 +134,7 @@ export type PhotoFrameProps = Pick<
      *
      * Not set in the context of the shared albums app.
      */
-    markTempDeleted?: (files: EnteFile[]) => void;
+    onMarkTempDeleted?: (files: EnteFile[]) => void;
     /** This will be set if mode is not "people". */
     activeCollectionID: number;
     /** This will be set if mode is "people". */
@@ -155,8 +158,8 @@ const PhotoFrame = ({
     setSelected,
     selected,
     favoriteFileIDs,
-    markUnsyncedFavoriteUpdate,
-    markTempDeleted,
+    onMarkUnsyncedFavoriteUpdate,
+    onMarkTempDeleted,
     activeCollectionID,
     activePersonID,
     enableDownload,
@@ -554,12 +557,13 @@ const PhotoFrame = ({
                     isInHiddenSection={isInHiddenSection}
                     disableDownload={!enableDownload}
                     onTriggerSyncWithRemote={handleTriggerSyncWithRemote}
-                    onMarkUnsyncedFavoriteUpdate={markUnsyncedFavoriteUpdate}
                     onSaveEditedImageCopy={handleSaveEditedImageCopy}
                     {...{
                         favoriteFileIDs,
                         fileCollectionIDs,
                         allCollectionsNameByID,
+                        onMarkUnsyncedFavoriteUpdate,
+                        onMarkTempDeleted,
                         onSelectCollection,
                         onSelectPerson,
                     }}
@@ -592,8 +596,8 @@ const PhotoFrame = ({
                 enableDownload={enableDownload}
                 {...{
                     favoriteFileIDs,
-                    markUnsyncedFavoriteUpdate,
-                    markTempDeleted,
+                    onMarkUnsyncedFavoriteUpdate,
+                    onMarkTempDeleted,
                     setFilesDownloadProgressAttributesCreator,
                     fileCollectionIDs,
                     allCollectionsNameByID,
diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index 3454d11ae7..2868a0f5d4 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -76,8 +76,8 @@ import { PublicCollectionGalleryContext } from "utils/publicCollectionGallery";
 export type PhotoViewerProps = Pick<
     PhotoFrameProps,
     | "favoriteFileIDs"
-    | "markUnsyncedFavoriteUpdate"
-    | "markTempDeleted"
+    | "onMarkUnsyncedFavoriteUpdate"
+    | "onMarkTempDeleted"
     | "fileCollectionIDs"
     | "allCollectionsNameByID"
     | "onSelectCollection"
@@ -132,8 +132,8 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
     gettingData,
     forceConvertItem,
     favoriteFileIDs,
-    markUnsyncedFavoriteUpdate,
-    markTempDeleted,
+    onMarkUnsyncedFavoriteUpdate,
+    onMarkTempDeleted,
     isTrashCollection,
     isInHiddenSection,
     enableDownload,
@@ -511,16 +511,16 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
         const isFavorite = favoriteFileIDs!.has(file.id);
 
         if (!isFavorite) {
-            markUnsyncedFavoriteUpdate(file.id, true);
+            onMarkUnsyncedFavoriteUpdate(file.id, true);
             void addToFavorites(file).catch((e: unknown) => {
                 log.error("Failed to add favorite", e);
-                markUnsyncedFavoriteUpdate(file.id, undefined);
+                onMarkUnsyncedFavoriteUpdate(file.id, undefined);
             });
         } else {
-            markUnsyncedFavoriteUpdate(file.id, false);
+            onMarkUnsyncedFavoriteUpdate(file.id, false);
             void removeFromFavorites(file).catch((e: unknown) => {
                 log.error("Failed to remove favorite", e);
-                markUnsyncedFavoriteUpdate(file.id, undefined);
+                onMarkUnsyncedFavoriteUpdate(file.id, undefined);
             });
         }
 
@@ -538,7 +538,7 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
     const handleDeleteFile = async () => {
         const file = fileToDelete!;
         await moveToTrash([file]);
-        markTempDeleted?.([file]);
+        onMarkTempDeleted?.([file]);
         updateItems(items.filter((item) => item.id !== file.id));
         setFileToDelete(undefined);
         needUpdate.current = true;
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index d4a08eed7f..5b88e5e9e3 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -695,7 +695,7 @@ const Page: React.FC = () => {
                 await handleFileOps(
                     ops,
                     toProcessFiles,
-                    (files) => dispatch({ type: "markTempDeleted", files }),
+                    handleMarkTempDeleted,
                     () => dispatch({ type: "clearTempDeleted" }),
                     (files) => dispatch({ type: "markTempHidden", files }),
                     () => dispatch({ type: "clearTempHidden" }),
@@ -793,6 +793,21 @@ const Page: React.FC = () => {
         });
     };
 
+    const handleMarkUnsyncedFavoriteUpdate = useCallback(
+        (fileID: number, isFavorite: boolean) =>
+            dispatch({
+                type: "markUnsyncedFavoriteUpdate",
+                fileID,
+                isFavorite,
+            }),
+        [],
+    );
+
+    const handleMarkTempDeleted = useCallback(
+        (files: EnteFile[]) => dispatch({ type: "markTempDeleted", files }),
+        [],
+    );
+
     const handleSelectCollection = useCallback(
         (collectionID: number) =>
             dispatch({
@@ -1032,20 +1047,11 @@ const Page: React.FC = () => {
                         mode={barMode}
                         modePlus={isInSearchMode ? "search" : barMode}
                         files={filteredFiles}
+                        // TODO: Warning: Doesn't have stable identity.
                         syncWithRemote={syncWithRemote}
                         setSelected={setSelected}
                         selected={selected}
                         favoriteFileIDs={state.favoriteFileIDs}
-                        markUnsyncedFavoriteUpdate={(fileID, isFavorite) =>
-                            dispatch({
-                                type: "markUnsyncedFavoriteUpdate",
-                                fileID,
-                                isFavorite,
-                            })
-                        }
-                        markTempDeleted={(files) =>
-                            dispatch({ type: "markTempDeleted", files })
-                        }
                         setIsPhotoSwipeOpen={setIsPhotoSwipeOpen}
                         activeCollectionID={activeCollectionID}
                         activePersonID={activePerson?.id}
@@ -1060,6 +1066,10 @@ const Page: React.FC = () => {
                             setFilesDownloadProgressAttributesCreator
                         }
                         selectable={true}
+                        onMarkUnsyncedFavoriteUpdate={
+                            handleMarkUnsyncedFavoriteUpdate
+                        }
+                        onMarkTempDeleted={handleMarkTempDeleted}
                         onSelectCollection={handleSelectCollection}
                         onSelectPerson={handleSelectPerson}
                     />
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index eb01c66ba7..fdb262bac1 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -122,18 +122,26 @@ export type FileViewerProps = ModalVisibilityProps & {
     onTriggerSyncWithRemote?: () => void;
     /**
      * Called when the viewer wants to update the in-memory, unsynced, favorite
-     * status of a file.
+     * status of a file maintained by the top level gallery. For more details,
+     * see {@link unsyncedFavoriteUpdates} in the gallery reducer's
+     * documentation.
      *
-     * For more details, see {@link unsyncedFavoriteUpdates} in the gallery
-     * reducer's documentation.
-     *
-     * If this is not provided then the favorite toggle button will not be shown
-     * in the file actions.
+     * If this is not provided then the toggle favorite action will not be
+     * shown.
      */
     onMarkUnsyncedFavoriteUpdate?: (
         fileID: number,
         isFavorite: boolean,
     ) => void;
+    /**
+     * Called when the viewer wants to mark the given files as deleted in the
+     * the in-memory, unsynced, state maintained by the top level gallery. For
+     * more details, see {@link unsyncedFavoriteUpdates} in the gallery
+     * reducer's documentation.
+     *
+     * If this is not provided then the delete action will not be shown.
+     */
+    onMarkTempDeleted?: (files: EnteFile[]) => void;
     /**
      * Called when the user edits an image in the image editor and asks us to
      * save their edits as a copy.
@@ -171,6 +179,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
     onSelectPerson,
     onTriggerSyncWithRemote,
     onMarkUnsyncedFavoriteUpdate,
+    // TODO
+    // onMarkTempDeleted,
     onSaveEditedImageCopy,
 }) => {
     const pswpRef = useRef<FileViewerPhotoSwipe | undefined>();

From 15a4e3cd982230e5f8596fa852254db5f94b8ca0 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 09:20:19 +0530
Subject: [PATCH 618/796] wip delegate

---
 .../gallery/components/viewer/FileViewer.tsx  | 75 ++++++++++++-------
 .../gallery/components/viewer/photoswipe.ts   | 55 +++++++++-----
 2 files changed, 85 insertions(+), 45 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index fdb262bac1..da73c2b1b5 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -183,7 +183,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
     // onMarkTempDeleted,
     onSaveEditedImageCopy,
 }) => {
-    const pswpRef = useRef<FileViewerPhotoSwipe | undefined>();
+    const psRef = useRef<FileViewerPhotoSwipe | undefined>();
+    const psDelegateRef = useRef<FileViewerPhotoSwipeDelegate | undefined>();
 
     // Whenever we get a callback from our custom PhotoSwipe instance, we also
     // get the active file on which that action was performed as an argument.
@@ -321,34 +322,56 @@ const FileViewer: React.FC<FileViewerProps> = ({
         [onSaveEditedImageCopy, handleImageEditorClose, handleClose],
     );
 
-    useEffect(() => {
-        log.debug(() => ["viewer", { action: "useEffect", open }]);
+    useEffect(() => (
+        psDelegateRef.current.onClose = handleClose;
+        onAnnotate: handleAnnotate,
+        onToggleFavorite: handleToggleFavorite,
+        onViewInfo: handleViewInfo,
+        onEditImage: handleEditImage,
+    }), [
+        handleClose,
+        onAnnotate: handleAnnotate,
+        onToggleFavorite: handleToggleFavorite,
+        onViewInfo: handleViewInfo,
+        onEditImage: handleEditImage,
+
+    ]);
+    useEffect(() => {
+        if (open && !psRef.current) {
+                // We're open, but we don't have a PhotoSwipe instance. Create
+                // one. This will show the file viewer dialog.
+                //
+                // Before creating it, also create a delegate. The delegate has
+                // a stable identity so that PhotoSwipe callbacks can be routed
+                // via it. When any of the
+                // callbacks change, we update the props of the delegate instead
+                // of changing the delegate itself.
+                log.debug(() => ["viewer", "open"]);
+                const delegate = {
+                    onClose: handleClose,
+                    onAnnotate: handleAnnotate,
+                    onToggleFavorite: handleToggleFavorite,
+                    onViewInfo: handleViewInfo,
+                    onEditImage: handleEditImage,
+                }
+                const pswp = new FileViewerPhotoSwipe({
+                    files,
+                    initialIndex,
+                    disableDownload,
+                    delegate,
+                });
+                psRef.current = pswp;
+                psDelegateRef.current = delegate;
+
+        } else if (!open && psRef.current) {
+            // We're closed, but we still have a PhotoSwipe instance. Cleanup.
+            log.debug(() => ["viewer", "close"]);
+            psRef.current?.closeIfNeeded();
+            psRef.current = undefined;
+            psDelegateRef.current = undefined;
 
-        if (!open) {
-            // The close state will be handled by the cleanup function.
-            return;
         }
 
-        const pswp = new FileViewerPhotoSwipe({
-            files,
-            initialIndex,
-            disableDownload,
-            onClose: handleClose,
-            onAnnotate: handleAnnotate,
-            onToggleFavorite: handleToggleFavorite,
-            onViewInfo: handleViewInfo,
-            onEditImage: handleEditImage,
-        });
-        pswpRef.current = pswp;
-
-        return () => {
-            log.debug(() => [
-                "viewer",
-                { action: "useEffect/cleanup", pswpRef: pswpRef.current },
-            ]);
-            pswpRef.current?.closeIfNeeded();
-            pswpRef.current = undefined;
-        };
         // The hook is missing dependencies; this is intentional - we don't want
         // to recreate the PhotoSwipe dialog when these dependencies change.
         //
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 3bac4f85a2..f014d645fd 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -1,6 +1,7 @@
 /* eslint-disable */
 // @ts-nocheck
 
+import { assertionFailed } from "@/base/assert";
 import { pt } from "@/base/i18n";
 import log from "@/base/log";
 import type { EnteFile } from "@/media/file";
@@ -66,7 +67,7 @@ export interface FileViewerFileAnnotation {
     isEditableImage?: boolean | undefined;
 }
 
-type FileViewerPhotoSwipeOptions = {
+interface FileViewerPhotoSwipeDelegate {
     /**
      * Called when the file viewer is closed.
      */
@@ -99,7 +100,20 @@ type FileViewerPhotoSwipeOptions = {
      * {@link FileViewerFileAnnotation} for the file.
      */
     onEditImage?: (annotatedFile: FileViewerAnnotatedFile) => void;
-} & Pick<FileViewerProps, "files" | "initialIndex" | "disableDownload">;
+}
+
+type FileViewerPhotoSwipeOptions = Pick<
+    FileViewerProps,
+    "files" | "initialIndex" | "disableDownload"
+> & {
+    /**
+     * Callbacks.
+     *
+     * The extra level of indirection allows these to be updated without
+     * recreating us.
+     */
+    delegate: FileViewerPhotoSwipeDelegate;
+};
 
 /**
  * A file and its annotation, in a nice cosy box.
@@ -140,6 +154,10 @@ export class FileViewerPhotoSwipe {
      * The options with which we were initialized.
      */
     private opts: Pick<FileViewerPhotoSwipeOptions, "disableDownload">;
+    /**
+     * An object to which we should route various callbacks.
+     */
+    private delegate: FileViewerPhotoSwipeDelegate;
     /**
      * An interval that invokes a periodic check of whether we should the hide
      * controls if the user does not perform any pointer events for a while.
@@ -174,11 +192,7 @@ export class FileViewerPhotoSwipe {
         files,
         initialIndex,
         disableDownload,
-        onClose,
-        onAnnotate,
-        onToggleFavorite,
-        onViewInfo,
-        onEditImage,
+        delegate,
     }: FileViewerPhotoSwipeOptions) {
         this.files = files;
         this.opts = { disableDownload };
@@ -249,7 +263,7 @@ export class FileViewerPhotoSwipe {
             const file = currentFile();
             let annotation = this.activeFileAnnotation;
             if (annotation?.fileID != file.id) {
-                annotation = onAnnotate(file);
+                annotation = delegate.onAnnotate(file);
                 this.activeFileAnnotation = annotation;
             }
             return {
@@ -266,8 +280,8 @@ export class FileViewerPhotoSwipe {
         const currentFileAnnotation = () => currentAnnotatedFile().annotation;
 
         const withCurrentAnnotatedFile =
-            (cb: (af: AnnotatedFile) => void) => () =>
-                cb(currentAnnotatedFile());
+            (cb: ((af: AnnotatedFile) => void) | undefined) => () =>
+                cb ? cb(currentAnnotatedFile()) : assertionFailed();
 
         // Provide data about slides to PhotoSwipe via callbacks
         // https://photoswipe.com/data-sources/#dynamically-generated-data
@@ -404,7 +418,7 @@ export class FileViewerPhotoSwipe {
             forgetFailedItems();
             forgetExif();
             // Let our parent know that we have been closed.
-            onClose();
+            delegate.onClose();
         });
 
         const showIf = (element: HTMLElement, condition: boolean) =>
@@ -451,7 +465,7 @@ export class FileViewerPhotoSwipe {
                 },
             });
 
-            if (onToggleFavorite) {
+            if (delegate.onToggleFavorite) {
                 // Only one of these two will end up being shown, so they can
                 // safely share the same order.
                 pswp.ui.registerElement({
@@ -460,7 +474,9 @@ export class FileViewerPhotoSwipe {
                     order: 8,
                     isButton: true,
                     html: createPSRegisterElementIconHTML("favorite"),
-                    onClick: withCurrentAnnotatedFile(onToggleFavorite),
+                    onClick: withCurrentAnnotatedFile(
+                        delegate.onToggleFavorite,
+                    ),
                     onInit: (buttonElement) =>
                         pswp.on("change", () =>
                             showIf(
@@ -475,7 +491,9 @@ export class FileViewerPhotoSwipe {
                     order: 8,
                     isButton: true,
                     html: createPSRegisterElementIconHTML("unfavorite"),
-                    onClick: withCurrentAnnotatedFile(onToggleFavorite),
+                    onClick: withCurrentAnnotatedFile(
+                        delegate.onToggleFavorite,
+                    ),
                     onInit: (buttonElement) =>
                         pswp.on("change", () =>
                             showIf(
@@ -492,11 +510,11 @@ export class FileViewerPhotoSwipe {
                 order: 9,
                 isButton: true,
                 html: createPSRegisterElementIconHTML("info"),
-                onClick: withCurrentAnnotatedFile(onViewInfo),
+                onClick: withCurrentAnnotatedFile(delegate.onViewInfo),
             });
 
             // TODO(PS):
-            if (onEditImage && false) {
+            if (delegate.onEditImage && false) {
                 pswp.ui.registerElement({
                     name: "edit",
                     // TODO(PS):
@@ -505,7 +523,7 @@ export class FileViewerPhotoSwipe {
                     order: 16,
                     isButton: true,
                     html: createPSRegisterElementIconHTML("edit"),
-                    onClick: withCurrentAnnotatedFile(onEditImage),
+                    onClick: withCurrentAnnotatedFile(delegate.onEditImage),
                     onInit: (buttonElement) =>
                         pswp.on("change", () =>
                             showIf(
@@ -523,9 +541,8 @@ export class FileViewerPhotoSwipe {
                 order: 17,
                 isButton: true,
                 html: createPSRegisterElementIconHTML("more"),
-                onClick: withCurrentAnnotatedFile(onViewInfo),
+                onClick: withCurrentAnnotatedFile(delegate.onViewInfo),
             });
-
         });
 
         // Modify the default UI elements.

From 15b49816ccba009940ff8b9c28d8735150e37a09 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 09:53:56 +0530
Subject: [PATCH 619/796] d2

---
 .../gallery/components/viewer/FileViewer.tsx  | 128 ++++++++++--------
 .../gallery/components/viewer/photoswipe.ts   |   2 +-
 2 files changed, 69 insertions(+), 61 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index da73c2b1b5..904fa13fde 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -39,6 +39,7 @@ import { fileInfoExifForFile } from "./data-source";
 import {
     FileViewerPhotoSwipe,
     type FileViewerAnnotatedFile,
+    type FileViewerPhotoSwipeDelegate,
 } from "./photoswipe";
 
 // TODO
@@ -183,8 +184,27 @@ const FileViewer: React.FC<FileViewerProps> = ({
     // onMarkTempDeleted,
     onSaveEditedImageCopy,
 }) => {
-    const psRef = useRef<FileViewerPhotoSwipe | undefined>();
-    const psDelegateRef = useRef<FileViewerPhotoSwipeDelegate | undefined>();
+    // [Note: FileViewer architecture]
+    //
+    // There are 3 parties involved.
+    //
+    // 1. Us, "FileViewer". We're a React component.
+    //
+    // 2. The custom PhotoSwipe wrapper, "FileViewerPhotoSwipe". It is a class,
+    //    and its currently active instance is maintained in `psRef`.
+    //
+    // 3. The delegate, "FileViewerPhotoSwipeDelegate". The delegate acts as a
+    //    bridge between us and `psRef`. It is created once as an object with a
+    //    stable identity (and stored in `psDelegateRef`), but its properties
+    //    keep changing as our props change.
+    //
+    // The `psRef` is recreated each time open / close changes. The
+    // `psDelegateRef` remains the same.
+
+    const psRef = useRef<FileViewerPhotoSwipe | undefined>(undefined);
+    const psDelegateRef = useRef<FileViewerPhotoSwipeDelegate | undefined>(
+        undefined,
+    );
 
     // Whenever we get a callback from our custom PhotoSwipe instance, we also
     // get the active file on which that action was performed as an argument.
@@ -322,78 +342,66 @@ const FileViewer: React.FC<FileViewerProps> = ({
         [onSaveEditedImageCopy, handleImageEditorClose, handleClose],
     );
 
-    useEffect(() => (
-        psDelegateRef.current.onClose = handleClose;
-        onAnnotate: handleAnnotate,
-        onToggleFavorite: handleToggleFavorite,
-        onViewInfo: handleViewInfo,
-        onEditImage: handleEditImage,
-    }), [
-        handleClose,
-        onAnnotate: handleAnnotate,
-        onToggleFavorite: handleToggleFavorite,
-        onViewInfo: handleViewInfo,
-        onEditImage: handleEditImage,
+    // Initial value of psDelegateRef.
+    if (!psDelegateRef.current) {
+        psDelegateRef.current = {
+            onClose: handleClose,
+            onAnnotate: handleAnnotate,
+            onToggleFavorite: handleToggleFavorite,
+            onViewInfo: handleViewInfo,
+            onEditImage: handleEditImage,
+        };
+    }
 
+    // Updates to callbacks held by psDelegateRef.
+    useEffect(() => {
+        const delegate = psDelegateRef.current!;
+        delegate.onClose = handleClose;
+        delegate.onAnnotate = handleAnnotate;
+        delegate.onToggleFavorite = handleToggleFavorite;
+        delegate.onViewInfo = handleViewInfo;
+        delegate.onEditImage = handleEditImage;
+    }, [
+        handleClose,
+        handleAnnotate,
+        handleToggleFavorite,
+        handleViewInfo,
+        handleEditImage,
     ]);
+
     useEffect(() => {
         if (open && !psRef.current) {
-                // We're open, but we don't have a PhotoSwipe instance. Create
-                // one. This will show the file viewer dialog.
-                //
-                // Before creating it, also create a delegate. The delegate has
-                // a stable identity so that PhotoSwipe callbacks can be routed
-                // via it. When any of the
-                // callbacks change, we update the props of the delegate instead
-                // of changing the delegate itself.
-                log.debug(() => ["viewer", "open"]);
-                const delegate = {
-                    onClose: handleClose,
-                    onAnnotate: handleAnnotate,
-                    onToggleFavorite: handleToggleFavorite,
-                    onViewInfo: handleViewInfo,
-                    onEditImage: handleEditImage,
-                }
-                const pswp = new FileViewerPhotoSwipe({
-                    files,
-                    initialIndex,
-                    disableDownload,
-                    delegate,
-                });
-                psRef.current = pswp;
-                psDelegateRef.current = delegate;
-
+            // We're open, but we don't have a PhotoSwipe instance. Create
+            // one. This will show the file viewer dialog.
+            //
+            // Before creating it, also create a delegate. The delegate has
+            // a stable identity so that PhotoSwipe callbacks can be routed
+            // via it. When any of the
+            // callbacks change, we update the props of the delegate instead
+            // of changing the delegate itself.
+            log.debug(() => ["viewer", "open"]);
+            const pswp = new FileViewerPhotoSwipe({
+                files,
+                initialIndex,
+                disableDownload,
+                delegate: psDelegateRef.current!,
+            });
+            psRef.current = pswp;
         } else if (!open && psRef.current) {
             // We're closed, but we still have a PhotoSwipe instance. Cleanup.
             log.debug(() => ["viewer", "close"]);
-            psRef.current?.closeIfNeeded();
+            psRef.current.closeIfNeeded();
             psRef.current = undefined;
-            psDelegateRef.current = undefined;
-
         }
-
-        // The hook is missing dependencies; this is intentional - we don't want
-        // to recreate the PhotoSwipe dialog when these dependencies change.
-        //
-        // - Updates to initialIndex can be safely ignored: they don't matter,
-        //   only their initial value at the time of open mattered.
-        //
-        // - Updates to other properties are not expected after open. We could've
-        //   also added it to the dependencies array, not adding it was a more
-        //   conservative choice to be on the safer side and trigger too few
-        //   instead of too many updates.
-        //
-        // - Updates to files matter, but these are conveyed separately.
-        //   TODO(PS):
-        //
+        // TODO: How to relay files updates?
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [open, onClose, handleViewInfo]);
+    }, [open, onClose, initialIndex, disableDownload]);
 
     const handleRefreshPhotoswipe = useCallback(() => {
-        pswpRef.current.refreshCurrentSlideContent();
+        psRef.current.refreshCurrentSlideContent();
     }, []);
 
-    log.debug(() => ["viewer", { action: "render", pswpRef: pswpRef.current }]);
+    log.debug(() => ["viewer", { action: "render", psRef: psRef.current }]);
 
     return (
         <Container>
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index f014d645fd..1a8011d846 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -67,7 +67,7 @@ export interface FileViewerFileAnnotation {
     isEditableImage?: boolean | undefined;
 }
 
-interface FileViewerPhotoSwipeDelegate {
+export interface FileViewerPhotoSwipeDelegate {
     /**
      * Called when the file viewer is closed.
      */

From 502507abf562e03a83aa061c65bb911f6c2be062 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 10:45:54 +0530
Subject: [PATCH 620/796] d3

---
 .../gallery/components/viewer/FileViewer.tsx  |  61 +++--
 .../gallery/components/viewer/photoswipe.ts   | 221 ++++++++++--------
 2 files changed, 164 insertions(+), 118 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 904fa13fde..cc4f9cc19b 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -14,7 +14,6 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 }
 
 import { isDesktop } from "@/base/app";
-import { assertionFailed } from "@/base/assert";
 import { type ModalVisibilityProps } from "@/base/components/utils/modal";
 import { lowercaseExtension } from "@/base/file-name";
 import type { LocalUser } from "@/base/local-user";
@@ -32,7 +31,6 @@ import {
     ImageEditorOverlay,
     type ImageEditorOverlayProps,
 } from "@/new/photos/components/ImageEditorOverlay";
-import { wait } from "@/utils/promise";
 import { Button, styled } from "@mui/material";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { fileInfoExifForFile } from "./data-source";
@@ -47,12 +45,13 @@ import {
 //     addToFavorites,
 //     removeFromFavorites,
 // } from "apps/photos/services/collectionService";
-const addToFavorites = async (file: EnteFile) => {
-    console.log(file);
-    await wait(3000);
-    throw new Error("test");
-};
-const removeFromFavorites = addToFavorites;
+// import { wait } from "@/utils/promise";
+// const addToFavorites = async (file: EnteFile) => {
+//     console.log(file);
+//     await wait(3000);
+//     throw new Error("test");
+// };
+// const removeFromFavorites = addToFavorites;
 
 export type FileViewerProps = ModalVisibilityProps & {
     /**
@@ -268,22 +267,25 @@ const FileViewer: React.FC<FileViewerProps> = ({
     const handleToggleFavorite = useMemo(() => {
         return favoriteFileIDs
             ? ({ file, annotation }: FileViewerAnnotatedFile) => {
-                  const isFavorite = annotation.isFavorite;
-                  if (isFavorite === undefined) {
-                      assertionFailed();
-                      return;
-                  }
+                  console.log({ file, annotation });
+                  // TODO
+                  //   const isFavorite = annotation.isFavorite;
+                  //   if (isFavorite === undefined) {
+                  //       assertionFailed();
+                  //       return;
+                  //   }
 
-                  onMarkUnsyncedFavoriteUpdate(file.id, !isFavorite);
-                  void (isFavorite ? removeFromFavorites : addToFavorites)(
-                      file,
-                  ).catch((e: unknown) => {
-                      log.error("Failed to remove favorite", e);
-                      onMarkUnsyncedFavoriteUpdate(file.id, undefined);
-                  });
+                  //   onMarkUnsyncedFavoriteUpdate(file.id, !isFavorite);
+                  //   void (isFavorite ? removeFromFavorites : addToFavorites)(
+                  //       file,
+                  //   ).catch((e: unknown) => {
+                  //       log.error("Failed to remove favorite", e);
+                  //       onMarkUnsyncedFavoriteUpdate(file.id, undefined);
+                  //   });
               }
             : undefined;
-    }, [favoriteFileIDs, onMarkUnsyncedFavoriteUpdate]);
+        // }, [favoriteFileIDs, onMarkUnsyncedFavoriteUpdate]);
+    }, [favoriteFileIDs]);
 
     const handleViewInfo = useCallback(
         (annotatedFile: FileViewerAnnotatedFile) => {
@@ -383,7 +385,12 @@ const FileViewer: React.FC<FileViewerProps> = ({
             const pswp = new FileViewerPhotoSwipe({
                 files,
                 initialIndex,
+                showModifyActions: !!user,
                 disableDownload,
+                onClose: handleClose,
+                onAnnotate: handleAnnotate,
+                onViewInfo: handleViewInfo,
+                onEditImage: handleEditImage,
                 delegate: psDelegateRef.current!,
             });
             psRef.current = pswp;
@@ -395,7 +402,17 @@ const FileViewer: React.FC<FileViewerProps> = ({
         }
         // TODO: How to relay files updates?
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [open, onClose, initialIndex, disableDownload]);
+    }, [
+        open,
+        onClose,
+        user,
+        initialIndex,
+        disableDownload,
+        handleClose,
+        handleAnnotate,
+        handleViewInfo,
+        handleEditImage,
+    ]);
 
     const handleRefreshPhotoswipe = useCallback(() => {
         psRef.current.refreshCurrentSlideContent();
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 1a8011d846..dc0fe62ad7 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -1,7 +1,6 @@
 /* eslint-disable */
 // @ts-nocheck
 
-import { assertionFailed } from "@/base/assert";
 import { pt } from "@/base/i18n";
 import log from "@/base/log";
 import type { EnteFile } from "@/media/file";
@@ -52,31 +51,23 @@ export interface FileViewerFileAnnotation {
      */
     isOwnFile: boolean;
     /**
-     * `true` if this file has been marked as a favorite by the user.
-     *
-     * The toggle favorite button will not be shown if this is not defined.
-     * Otherwise it determines the toggle state of the toggle favorite button.
+     * `true` if the toggle favorite action should be shown for this file.
      */
-    isFavorite?: boolean | undefined;
+    showFavorite: boolean;
     /**
      * `true` if this is an image which can be edited.
      *
      * The edit button is shown when this is true. See also the
      * {@link onEditImage} option for {@link FileViewerPhotoSwipe} constructor.
      */
-    isEditableImage?: boolean | undefined;
+    isEditableImage: boolean;
 }
 
 export interface FileViewerPhotoSwipeDelegate {
     /**
-     * Called when the file viewer is closed.
+     * Called to obtain the latest list of files.
      */
-    onClose: () => void;
-    /**
-     * Called whenever the slide changes to obtain the derived data for the file
-     * that is about to be displayed.
-     */
-    onAnnotate: (file: EnteFile) => FileViewerFileAnnotation;
+    onGetFiles?: unknown; // TODO
     /**
      * Called when the user activates the toggle favorite action on a file.
      *
@@ -87,6 +78,38 @@ export interface FileViewerPhotoSwipeDelegate {
      * property will determine the current toggle state of the favorite button.
      */
     onToggleFavorite?: (annotatedFile: FileViewerAnnotatedFile) => void;
+    // TODO(PS)
+    /**
+     * `true` if this file has been marked as a favorite by the user.
+     *
+     * The toggle favorite button will not be shown if this is not defined.
+     * Otherwise it determines the toggle state of the toggle favorite button.
+     */
+    isFavorite?: boolean | undefined;
+}
+
+type FileViewerPhotoSwipeOptions = {
+    /**
+     * `true` if various actions that modify the file should be shown.
+     *
+     * This is the static variant of various per file annotations. If this is
+     * not `true`, then various actions like favorite, delete etc are never
+     * shown. If this is `true`, then their visibility depends on the
+     * corresponding annotation.
+     *
+     * For example, the favorite action is shown only if both this and the
+     * {@link showFavorite} file annotation are true.
+     */
+    showModifyActions: boolean;
+    /**
+     * Called when the file viewer is closed.
+     */
+    onClose: () => void;
+    /**
+     * Called whenever the slide is initially displayed or changes, to obtain
+     * various derived data for the file that is about to be displayed.
+     */
+    onAnnotate: (file: EnteFile) => FileViewerFileAnnotation;
     /**
      * Called when the user activates the info action on a file.
      */
@@ -94,26 +117,21 @@ export interface FileViewerPhotoSwipeDelegate {
     /**
      * Called when the user activates the edit action on an image.
      *
-     * If this callback is not provided, then the edit button is never shown. If
-     * this callback is provided, then the visibility of the edit button is
-     * determined by the {@link isEditableImage} property of
-     * {@link FileViewerFileAnnotation} for the file.
+     * If this callback is not provided, then the edit action is never shown. If
+     * this callback is provided (and {@link showModifyActions} is `true`), then
+     * the visibility of the edit action is determined by the
+     * {@link isEditableImage} property of the {@link FileViewerFileAnnotation}
+     * for the file.
      */
     onEditImage?: (annotatedFile: FileViewerAnnotatedFile) => void;
-}
-
-type FileViewerPhotoSwipeOptions = Pick<
-    FileViewerProps,
-    "files" | "initialIndex" | "disableDownload"
-> & {
     /**
-     * Callbacks.
+     * Dynamic callbacks.
      *
      * The extra level of indirection allows these to be updated without
      * recreating us.
      */
     delegate: FileViewerPhotoSwipeDelegate;
-};
+} & Pick<FileViewerProps, "files" | "initialIndex" | "disableDownload">;
 
 /**
  * A file and its annotation, in a nice cosy box.
@@ -155,7 +173,7 @@ export class FileViewerPhotoSwipe {
      */
     private opts: Pick<FileViewerPhotoSwipeOptions, "disableDownload">;
     /**
-     * An object to which we should route various callbacks.
+     * An object via which we should route various dynamic callbacks.
      */
     private delegate: FileViewerPhotoSwipeDelegate;
     /**
@@ -192,10 +210,16 @@ export class FileViewerPhotoSwipe {
         files,
         initialIndex,
         disableDownload,
+        showModifyActions,
+        onClose,
+        onAnnotate,
+        onViewInfo,
+        onEditImage,
         delegate,
     }: FileViewerPhotoSwipeOptions) {
         this.files = files;
         this.opts = { disableDownload };
+        this.delegate = delegate;
         this.lastActivityDate = new Date();
 
         const pswp = new PhotoSwipe({
@@ -255,34 +279,6 @@ export class FileViewerPhotoSwipe {
 
         this.pswp = pswp;
 
-        // Helper routines to obtain the file at `currIndex`.
-
-        const currentFile = () => this.files[pswp.currIndex]!;
-
-        const currentAnnotatedFile = () => {
-            const file = currentFile();
-            let annotation = this.activeFileAnnotation;
-            if (annotation?.fileID != file.id) {
-                annotation = delegate.onAnnotate(file);
-                this.activeFileAnnotation = annotation;
-            }
-            return {
-                file,
-                // The above condition implies that annotation can never be
-                // undefined, but it doesn't seem to be enough to convince
-                // TypeScript. Writing the condition in a more unnatural way
-                // `(!(annotation && annotation?.fileID == file.id))` works, but
-                // instead we use a non-null assertion here.
-                annotation: annotation!,
-            };
-        };
-
-        const currentFileAnnotation = () => currentAnnotatedFile().annotation;
-
-        const withCurrentAnnotatedFile =
-            (cb: ((af: AnnotatedFile) => void) | undefined) => () =>
-                cb ? cb(currentAnnotatedFile()) : assertionFailed();
-
         // Provide data about slides to PhotoSwipe via callbacks
         // https://photoswipe.com/data-sources/#dynamically-generated-data
 
@@ -291,11 +287,11 @@ export class FileViewerPhotoSwipe {
         });
 
         pswp.addFilter("itemData", (_, index) => {
-            const file = files[index]!;
+            const file = this.files[index]!;
 
-            let itemData = itemDataForFile(file, () => {
-                this.pswp.refreshSlideContent(index);
-            });
+            let itemData = itemDataForFile(file, () =>
+                pswp.refreshSlideContent(index),
+            );
 
             const { fileType, videoURL, ...rest } = itemData;
             if (fileType === FileType.video && videoURL) {
@@ -381,7 +377,9 @@ export class FileViewerPhotoSwipe {
             //   more than 2 slides and then back, or if they reopen the viewer.
             //
             // See: [Note: File viewer error handling]
-            forgetFailedItemDataForFile(currentFile());
+            // TODO
+            console.log(this.currentFile(), e);
+            forgetFailedItemDataForFile(this.currentFile());
 
             // Pause the video element, if any, when we move away from the
             // slide.
@@ -405,7 +403,7 @@ export class FileViewerPhotoSwipe {
         );
 
         pswp.on("change", (e) => {
-            const itemData = pswp.currSlide.content.data;
+            const itemData = this.pswp.currSlide.content.data;
             updateFileInfoExifIfNeeded(itemData);
         });
 
@@ -418,7 +416,7 @@ export class FileViewerPhotoSwipe {
             forgetFailedItems();
             forgetExif();
             // Let our parent know that we have been closed.
-            delegate.onClose();
+            onClose();
         });
 
         const showIf = (element: HTMLElement, condition: boolean) =>
@@ -465,25 +463,26 @@ export class FileViewerPhotoSwipe {
                 },
             });
 
-            if (delegate.onToggleFavorite) {
-                // Only one of these two will end up being shown, so they can
-                // safely share the same order.
+            if (showModifyActions) {
+                // Only one of these two ("favorite" or "unfavorite") will end
+                // up being shown, so they can safely share the same order.
                 pswp.ui.registerElement({
                     name: "favorite",
                     title: t("favorite_key"),
                     order: 8,
                     isButton: true,
                     html: createPSRegisterElementIconHTML("favorite"),
-                    onClick: withCurrentAnnotatedFile(
-                        delegate.onToggleFavorite,
-                    ),
-                    onInit: (buttonElement) =>
-                        pswp.on("change", () =>
-                            showIf(
-                                buttonElement,
-                                currentFileAnnotation().isFavorite === false,
-                            ),
-                        ),
+                    // TODO
+                    // onClick: withCurrentAnnotatedFile(
+                    //     delegate.onToggleFavorite,
+                    // ),
+                    // onInit: (buttonElement) =>
+                    //     pswp.on("change", () =>
+                    //         showIf(
+                    //             buttonElement,
+                    //             currentFileAnnotation().isFavorite === false,
+                    //         ),
+                    //     ),
                 });
                 pswp.ui.registerElement({
                     name: "unfavorite",
@@ -491,16 +490,17 @@ export class FileViewerPhotoSwipe {
                     order: 8,
                     isButton: true,
                     html: createPSRegisterElementIconHTML("unfavorite"),
-                    onClick: withCurrentAnnotatedFile(
-                        delegate.onToggleFavorite,
-                    ),
-                    onInit: (buttonElement) =>
-                        pswp.on("change", () =>
-                            showIf(
-                                buttonElement,
-                                currentFileAnnotation().isFavorite === true,
-                            ),
-                        ),
+                    // TODO
+                    // onClick: withCurrentAnnotatedFile(
+                    //     delegate.onToggleFavorite,
+                    // ),
+                    // onInit: (buttonElement) =>
+                    //     pswp.on("change", () =>
+                    //         showIf(
+                    //             buttonElement,
+                    //             currentFileAnnotation().isFavorite === true,
+                    //         ),
+                    //     ),
                 });
             }
 
@@ -510,11 +510,11 @@ export class FileViewerPhotoSwipe {
                 order: 9,
                 isButton: true,
                 html: createPSRegisterElementIconHTML("info"),
-                onClick: withCurrentAnnotatedFile(delegate.onViewInfo),
+                onClick: () => onViewInfo(this.currentAnnotatedFile()),
             });
 
             // TODO(PS):
-            if (delegate.onEditImage && false) {
+            if (showModifyActions && onEditImage && false) {
                 pswp.ui.registerElement({
                     name: "edit",
                     // TODO(PS):
@@ -523,14 +523,15 @@ export class FileViewerPhotoSwipe {
                     order: 16,
                     isButton: true,
                     html: createPSRegisterElementIconHTML("edit"),
-                    onClick: withCurrentAnnotatedFile(delegate.onEditImage),
-                    onInit: (buttonElement) =>
-                        pswp.on("change", () =>
-                            showIf(
-                                buttonElement,
-                                !!currentFileAnnotation().isEditableImage,
-                            ),
-                        ),
+                    // TODO
+                    // onClick: withCurrentAnnotatedFile(delegate.onEditImage),
+                    // onInit: (buttonElement) =>
+                    //     pswp.on("change", () =>
+                    //         showIf(
+                    //             buttonElement,
+                    //             !!currentFileAnnotation().isEditableImage,
+                    //         ),
+                    //     ),
                 });
             }
 
@@ -541,7 +542,7 @@ export class FileViewerPhotoSwipe {
                 order: 17,
                 isButton: true,
                 html: createPSRegisterElementIconHTML("more"),
-                onClick: withCurrentAnnotatedFile(delegate.onViewInfo),
+                // onClick: withCurrentAnnotatedFile(delegate.onViewInfo),
             });
         });
 
@@ -592,6 +593,34 @@ export class FileViewerPhotoSwipe {
         // TODO(PS)
     }
 
+    // Various helper routines to obtain the file at `currIndex`.
+
+    private currentFile() {
+        return this.files[this.pswp.currIndex]!;
+    }
+
+    private currentAnnotatedFile() {
+        const file = this.currentFile();
+        let annotation = this.activeFileAnnotation;
+        if (annotation?.fileID != file.id) {
+            annotation = this.delegate.onAnnotate(file);
+            this.activeFileAnnotation = annotation;
+        }
+        return {
+            file,
+            // The above condition implies that annotation can never be
+            // undefined, but it doesn't seem to be enough to convince
+            // TypeScript. Writing the condition in a more unnatural way
+            // `(!(annotation && annotation?.fileID == file.id))` works, but
+            // instead we use a non-null assertion here.
+            annotation: annotation!,
+        };
+    }
+
+    private currentFileAnnotation() {
+        return this.currentAnnotatedFile().annotation;
+    }
+
     private clearAutoHideIntervalIfNeeded() {
         if (this.autoHideCheckIntervalId) {
             clearInterval(this.autoHideCheckIntervalId);

From 093ba4895d9e8c6bc48c0eaba3275548c170849e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 12:16:33 +0530
Subject: [PATCH 621/796] d4

---
 web/apps/photos/src/components/PhotoFrame.tsx |   6 +-
 .../gallery/components/viewer/FileViewer.tsx  | 215 +++++++-----------
 .../gallery/components/viewer/photoswipe.ts   | 139 ++++++-----
 3 files changed, 155 insertions(+), 205 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index b68f603744..d15a2c42b4 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -553,17 +553,15 @@ const PhotoFrame = ({
                     user={galleryContext.user ?? undefined}
                     files={files}
                     initialIndex={currentIndex}
-                    isInTrashSection={activeCollectionID === TRASH_SECTION}
-                    isInHiddenSection={isInHiddenSection}
                     disableDownload={!enableDownload}
+                    isInHiddenSection={isInHiddenSection}
+                    isInTrashSection={activeCollectionID === TRASH_SECTION}
                     onTriggerSyncWithRemote={handleTriggerSyncWithRemote}
                     onSaveEditedImageCopy={handleSaveEditedImageCopy}
                     {...{
                         favoriteFileIDs,
                         fileCollectionIDs,
                         allCollectionsNameByID,
-                        onMarkUnsyncedFavoriteUpdate,
-                        onMarkTempDeleted,
                         onSelectCollection,
                         onSelectPerson,
                     }}
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index cc4f9cc19b..57c4831fd4 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -37,6 +37,7 @@ import { fileInfoExifForFile } from "./data-source";
 import {
     FileViewerPhotoSwipe,
     type FileViewerAnnotatedFile,
+    type FileViewerFileAnnotation,
     type FileViewerPhotoSwipeDelegate,
 } from "./photoswipe";
 
@@ -120,28 +121,6 @@ export type FileViewerProps = ModalVisibilityProps & {
      * not defined, then this prop is not used.
      */
     onTriggerSyncWithRemote?: () => void;
-    /**
-     * Called when the viewer wants to update the in-memory, unsynced, favorite
-     * status of a file maintained by the top level gallery. For more details,
-     * see {@link unsyncedFavoriteUpdates} in the gallery reducer's
-     * documentation.
-     *
-     * If this is not provided then the toggle favorite action will not be
-     * shown.
-     */
-    onMarkUnsyncedFavoriteUpdate?: (
-        fileID: number,
-        isFavorite: boolean,
-    ) => void;
-    /**
-     * Called when the viewer wants to mark the given files as deleted in the
-     * the in-memory, unsynced, state maintained by the top level gallery. For
-     * more details, see {@link unsyncedFavoriteUpdates} in the gallery
-     * reducer's documentation.
-     *
-     * If this is not provided then the delete action will not be shown.
-     */
-    onMarkTempDeleted?: (files: EnteFile[]) => void;
     /**
      * Called when the user edits an image in the image editor and asks us to
      * save their edits as a copy.
@@ -175,39 +154,36 @@ const FileViewer: React.FC<FileViewerProps> = ({
     favoriteFileIDs,
     fileCollectionIDs,
     allCollectionsNameByID,
+    onTriggerSyncWithRemote,
     onSelectCollection,
     onSelectPerson,
-    onTriggerSyncWithRemote,
-    onMarkUnsyncedFavoriteUpdate,
-    // TODO
-    // onMarkTempDeleted,
     onSaveEditedImageCopy,
 }) => {
-    // [Note: FileViewer architecture]
-    //
-    // There are 3 parties involved.
+    // There are 3 things involved in this dance:
     //
     // 1. Us, "FileViewer". We're a React component.
+    // 2. The custom PhotoSwipe wrapper, "FileViewerPhotoSwipe". It is a class.
+    // 3. The delegate, "FileViewerPhotoSwipeDelegate".
     //
-    // 2. The custom PhotoSwipe wrapper, "FileViewerPhotoSwipe". It is a class,
-    //    and its currently active instance is maintained in `psRef`.
+    // The delegate acts as a bridge between us and (our custom) photoswipe
+    // class, to avoid recreating the class each time a "dynamic" prop changes.
+    // The delegate has a stable identity, we just keep updating the callback
+    // functions that it holds.
     //
-    // 3. The delegate, "FileViewerPhotoSwipeDelegate". The delegate acts as a
-    //    bridge between us and `psRef`. It is created once as an object with a
-    //    stable identity (and stored in `psDelegateRef`), but its properties
-    //    keep changing as our props change.
-    //
-    // The `psRef` is recreated each time open / close changes. The
-    // `psDelegateRef` remains the same.
-
-    const psRef = useRef<FileViewerPhotoSwipe | undefined>(undefined);
-    const psDelegateRef = useRef<FileViewerPhotoSwipeDelegate | undefined>(
+    // The word "dynamic" here means a prop on whose change we should not
+    // recreate the photoswipe dialog.
+    const delegateRef = useRef<FileViewerPhotoSwipeDelegate | undefined>(
         undefined,
     );
 
+    // We also need to maintain a ref to the currently displayed dialog since we
+    // might need to ask it to refresh its contents.
+    const psRef = useRef<FileViewerPhotoSwipe | undefined>(undefined);
+
     // Whenever we get a callback from our custom PhotoSwipe instance, we also
-    // get the active file on which that action was performed as an argument.
-    // Save it as a prop so that the rest of our React tree can use it.
+    // get the active file on which that action was performed as an argument. We
+    // save it as the `activeAnnotatedFile` state so that the rest of our React
+    // tree can use it.
     //
     // This is not guaranteed, or even intended, to be in sync with the active
     // file shown within the file viewer. All that this guarantees is this will
@@ -215,8 +191,9 @@ const FileViewer: React.FC<FileViewerProps> = ({
     const [activeAnnotatedFile, setActiveAnnotatedFile] = useState<
         FileViewerAnnotatedFile | undefined
     >(undefined);
-    // With semantics similar to activeFile, this is the exif data associated
-    // with the activeAnnotatedFile, if any.
+
+    // With semantics similar to `activeAnnotatedFile`, this is the exif data
+    // associated with the `activeAnnotatedFile`, if any.
     const [activeFileExif, setActiveFileExif] = useState<
         FileInfoExif | undefined
     >(undefined);
@@ -238,55 +215,22 @@ const FileViewer: React.FC<FileViewerProps> = ({
     }, [onTriggerSyncWithRemote, onClose]);
 
     const handleAnnotate = useCallback(
-        (file: EnteFile) => {
+        (file: EnteFile): FileViewerFileAnnotation => {
             log.debug(() => ["viewer", { action: "annotate", file }]);
             const fileID = file.id;
             const isOwnFile = file.ownerID == user?.id;
             const canModify =
                 isOwnFile && !isInTrashSection && !isInHiddenSection;
-            const isFavorite =
-                favoriteFileIDs && onMarkUnsyncedFavoriteUpdate && canModify
-                    ? favoriteFileIDs.has(file.id)
-                    : undefined;
+            const showFavorite = canModify;
             const isEditableImage =
                 onSaveEditedImageCopy && canModify
                     ? fileIsEditableImage(file)
                     : undefined;
-            return { fileID, isOwnFile, isFavorite, isEditableImage };
+            return { fileID, isOwnFile, showFavorite, isEditableImage };
         },
-        [
-            user,
-            isInTrashSection,
-            isInHiddenSection,
-            favoriteFileIDs,
-            onMarkUnsyncedFavoriteUpdate,
-            onSaveEditedImageCopy,
-        ],
+        [user, isInTrashSection, isInHiddenSection, onSaveEditedImageCopy],
     );
 
-    const handleToggleFavorite = useMemo(() => {
-        return favoriteFileIDs
-            ? ({ file, annotation }: FileViewerAnnotatedFile) => {
-                  console.log({ file, annotation });
-                  // TODO
-                  //   const isFavorite = annotation.isFavorite;
-                  //   if (isFavorite === undefined) {
-                  //       assertionFailed();
-                  //       return;
-                  //   }
-
-                  //   onMarkUnsyncedFavoriteUpdate(file.id, !isFavorite);
-                  //   void (isFavorite ? removeFromFavorites : addToFavorites)(
-                  //       file,
-                  //   ).catch((e: unknown) => {
-                  //       log.error("Failed to remove favorite", e);
-                  //       onMarkUnsyncedFavoriteUpdate(file.id, undefined);
-                  //   });
-              }
-            : undefined;
-        // }, [favoriteFileIDs, onMarkUnsyncedFavoriteUpdate]);
-    }, [favoriteFileIDs]);
-
     const handleViewInfo = useCallback(
         (annotatedFile: FileViewerAnnotatedFile) => {
             setActiveAnnotatedFile(annotatedFile);
@@ -344,70 +288,85 @@ const FileViewer: React.FC<FileViewerProps> = ({
         [onSaveEditedImageCopy, handleImageEditorClose, handleClose],
     );
 
-    // Initial value of psDelegateRef.
-    if (!psDelegateRef.current) {
-        psDelegateRef.current = {
-            onClose: handleClose,
-            onAnnotate: handleAnnotate,
-            onToggleFavorite: handleToggleFavorite,
-            onViewInfo: handleViewInfo,
-            onEditImage: handleEditImage,
-        };
+    const haveUser = !!user;
+    const showModifyActions = haveUser;
+
+    const getFiles = useCallback(() => files, [files]);
+
+    const isFavorite = useMemo(() => {
+        return showModifyActions && favoriteFileIDs
+            ? (annotatedFile: FileViewerAnnotatedFile): boolean =>
+                  favoriteFileIDs.has(annotatedFile.file.id)
+            : undefined;
+    }, [showModifyActions, favoriteFileIDs]);
+
+    const toggleFavorite = useMemo(() => {
+        return favoriteFileIDs
+            ? ({ file, annotation }: FileViewerAnnotatedFile) => {
+                  console.log({ file, annotation });
+                  // TODO
+                  //   const isFavorite = annotation.isFavorite;
+                  //   if (isFavorite === undefined) {
+                  //       assertionFailed();
+                  //       return;
+                  //   }
+
+                  //   onMarkUnsyncedFavoriteUpdate(file.id, !isFavorite);
+                  //   void (isFavorite ? removeFromFavorites : addToFavorites)(
+                  //       file,
+                  //   ).catch((e: unknown) => {
+                  //       log.error("Failed to remove favorite", e);
+                  //       onMarkUnsyncedFavoriteUpdate(file.id, undefined);
+                  //   });
+              }
+            : undefined;
+        // }, [favoriteFileIDs, onMarkUnsyncedFavoriteUpdate]);
+    }, [favoriteFileIDs]);
+
+    // Initial value of delegate.
+    if (!delegateRef.current) {
+        delegateRef.current = { getFiles, isFavorite, toggleFavorite };
     }
 
-    // Updates to callbacks held by psDelegateRef.
+    // Updates to delegate callbacks.
     useEffect(() => {
-        const delegate = psDelegateRef.current!;
-        delegate.onClose = handleClose;
-        delegate.onAnnotate = handleAnnotate;
-        delegate.onToggleFavorite = handleToggleFavorite;
-        delegate.onViewInfo = handleViewInfo;
-        delegate.onEditImage = handleEditImage;
-    }, [
-        handleClose,
-        handleAnnotate,
-        handleToggleFavorite,
-        handleViewInfo,
-        handleEditImage,
-    ]);
+        const delegate = delegateRef.current!;
+        delegate.getFiles = getFiles;
+        delegate.isFavorite = isFavorite;
+        delegate.toggleFavorite = toggleFavorite;
+    }, [getFiles, isFavorite, toggleFavorite]);
 
     useEffect(() => {
-        if (open && !psRef.current) {
-            // We're open, but we don't have a PhotoSwipe instance. Create
-            // one. This will show the file viewer dialog.
-            //
-            // Before creating it, also create a delegate. The delegate has
-            // a stable identity so that PhotoSwipe callbacks can be routed
-            // via it. When any of the
-            // callbacks change, we update the props of the delegate instead
-            // of changing the delegate itself.
-            log.debug(() => ["viewer", "open"]);
+        if (open) {
+            // We're open. Create psRef. This will show the file viewer dialog.
+            log.debug(() => ["viewer", { action: "open" }]);
+
             const pswp = new FileViewerPhotoSwipe({
-                files,
                 initialIndex,
-                showModifyActions: !!user,
                 disableDownload,
+                showModifyActions,
+                delegate: delegateRef.current!,
                 onClose: handleClose,
                 onAnnotate: handleAnnotate,
                 onViewInfo: handleViewInfo,
                 onEditImage: handleEditImage,
-                delegate: psDelegateRef.current!,
             });
+
             psRef.current = pswp;
-        } else if (!open && psRef.current) {
-            // We're closed, but we still have a PhotoSwipe instance. Cleanup.
-            log.debug(() => ["viewer", "close"]);
-            psRef.current.closeIfNeeded();
-            psRef.current = undefined;
+
+            return () => {
+                // Close dialog in the effect callback.
+                log.debug(() => ["viewer", { action: "close" }]);
+                pswp.closeIfNeeded();
+            };
         }
-        // TODO: How to relay files updates?
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         open,
         onClose,
         user,
         initialIndex,
         disableDownload,
+        showModifyActions,
         handleClose,
         handleAnnotate,
         handleViewInfo,
@@ -415,7 +374,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
     ]);
 
     const handleRefreshPhotoswipe = useCallback(() => {
-        psRef.current.refreshCurrentSlideContent();
+        psRef.current!.refreshCurrentSlideContent();
     }, []);
 
     log.debug(() => ["viewer", { action: "render", psRef: psRef.current }]);
@@ -429,8 +388,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 file={activeAnnotatedFile?.file}
                 exif={activeFileExif}
                 allowEdits={!!activeAnnotatedFile?.annotation.isOwnFile}
-                allowMap={!!user}
-                showCollections={!!user}
+                allowMap={haveUser}
+                showCollections={haveUser}
                 scheduleUpdate={handleScheduleUpdate}
                 refreshPhotoswipe={handleRefreshPhotoswipe}
                 onSelectCollection={handleSelectCollection}
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index dc0fe62ad7..f8bf5e1a09 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -14,7 +14,6 @@ import {
     itemDataForFile,
     updateFileInfoExifIfNeeded,
 } from "./data-source";
-import type { FileViewerProps } from "./FileViewer";
 import { createPSRegisterElementIconHTML } from "./icons";
 
 // TODO(PS): WIP gallery using upstream photoswipe
@@ -66,29 +65,39 @@ export interface FileViewerFileAnnotation {
 export interface FileViewerPhotoSwipeDelegate {
     /**
      * Called to obtain the latest list of files.
+     *
+     * [Note: Changes to underlying files when file viewer is open]
+     *
+     * The list of files shown by the viewer might change while the viewer is
+     * open. We do not actively refresh the viewer when this happens since that
+     * would result in the user's zoom / pan state being lost.
+     *
+     * However, we always read the latest list via the delegate, so any
+     * subsequent user initiated slide navigation (e.g. moving to the next
+     * slide) will use the new list.
      */
-    onGetFiles?: unknown; // TODO
+    getFiles?: () => EnteFile[];
+    /**
+     * Return `true` if the provided file has been marked as a favorite by the
+     * user.
+     *
+     * The toggle favorite button will not be shown for the file if this returns
+     * `undefined`. Otherwise the return value determines the toggle state of
+     * the toggle favorite button for the file.
+     */
+    isFavorite?: (
+        annotatedFile: FileViewerAnnotatedFile,
+    ) => boolean | undefined;
     /**
      * Called when the user activates the toggle favorite action on a file.
-     *
-     * If this callback is not provided, then the toggle favorite button is not
-     * shown. If this callback is provided, then the favorite button is shown if
-     * the {@link isFavorite} property of {@link FileViewerFileAnnotation} for
-     * the file is provided. In that case, the value of the {@link isFavorite}
-     * property will determine the current toggle state of the favorite button.
      */
-    onToggleFavorite?: (annotatedFile: FileViewerAnnotatedFile) => void;
-    // TODO(PS)
-    /**
-     * `true` if this file has been marked as a favorite by the user.
-     *
-     * The toggle favorite button will not be shown if this is not defined.
-     * Otherwise it determines the toggle state of the toggle favorite button.
-     */
-    isFavorite?: boolean | undefined;
+    toggleFavorite?: (annotatedFile: FileViewerAnnotatedFile) => void;
 }
 
-type FileViewerPhotoSwipeOptions = {
+type FileViewerPhotoSwipeOptions = Pick<
+    FileViewerProps,
+    "initialIndex" | "disableDownload"
+> & {
     /**
      * `true` if various actions that modify the file should be shown.
      *
@@ -101,6 +110,13 @@ type FileViewerPhotoSwipeOptions = {
      * {@link showFavorite} file annotation are true.
      */
     showModifyActions: boolean;
+    /**
+     * Dynamic callbacks.
+     *
+     * The extra level of indirection allows these to be updated without
+     * recreating us.
+     */
+    delegate: FileViewerPhotoSwipeDelegate;
     /**
      * Called when the file viewer is closed.
      */
@@ -124,14 +140,7 @@ type FileViewerPhotoSwipeOptions = {
      * for the file.
      */
     onEditImage?: (annotatedFile: FileViewerAnnotatedFile) => void;
-    /**
-     * Dynamic callbacks.
-     *
-     * The extra level of indirection allows these to be updated without
-     * recreating us.
-     */
-    delegate: FileViewerPhotoSwipeDelegate;
-} & Pick<FileViewerProps, "files" | "initialIndex" | "disableDownload">;
+};
 
 /**
  * A file and its annotation, in a nice cosy box.
@@ -172,10 +181,6 @@ export class FileViewerPhotoSwipe {
      * The options with which we were initialized.
      */
     private opts: Pick<FileViewerPhotoSwipeOptions, "disableDownload">;
-    /**
-     * An object via which we should route various dynamic callbacks.
-     */
-    private delegate: FileViewerPhotoSwipeDelegate;
     /**
      * An interval that invokes a periodic check of whether we should the hide
      * controls if the user does not perform any pointer events for a while.
@@ -207,19 +212,16 @@ export class FileViewerPhotoSwipe {
     private activeFileAnnotation: FileViewerFileAnnotation | undefined;
 
     constructor({
-        files,
         initialIndex,
         disableDownload,
         showModifyActions,
+        delegate,
         onClose,
         onAnnotate,
         onViewInfo,
         onEditImage,
-        delegate,
     }: FileViewerPhotoSwipeOptions) {
-        this.files = files;
         this.opts = { disableDownload };
-        this.delegate = delegate;
         this.lastActivityDate = new Date();
 
         const pswp = new PhotoSwipe({
@@ -279,15 +281,38 @@ export class FileViewerPhotoSwipe {
 
         this.pswp = pswp;
 
+        // Various helper routines to obtain the file at `currIndex`.
+
+        const currentFile = () => delegate.getFiles()[pswp.currIndex]!;
+
+        const currentAnnotatedFile = () => {
+            const file = currentFile();
+            let annotation = this.activeFileAnnotation;
+            if (annotation?.fileID != file.id) {
+                annotation = onAnnotate(file);
+                this.activeFileAnnotation = annotation;
+            }
+            return {
+                file,
+                // The above condition implies that annotation can never be
+                // undefined, but it doesn't seem to be enough to convince
+                // TypeScript. Writing the condition in a more unnatural way
+                // `(!(annotation && annotation?.fileID == file.id))` works, but
+                // instead we use a non-null assertion here.
+                annotation: annotation!,
+            };
+        };
+
+        const currentFileAnnotation = () => currentAnnotatedFile().annotation;
+
         // Provide data about slides to PhotoSwipe via callbacks
         // https://photoswipe.com/data-sources/#dynamically-generated-data
 
-        pswp.addFilter("numItems", () => {
-            return this.files.length;
-        });
+        pswp.addFilter("numItems", () => delegate.getFiles().length);
 
         pswp.addFilter("itemData", (_, index) => {
-            const file = this.files[index]!;
+            const files = delegate.getFiles();
+            const file = files[index]!;
 
             let itemData = itemDataForFile(file, () =>
                 pswp.refreshSlideContent(index),
@@ -378,8 +403,8 @@ export class FileViewerPhotoSwipe {
             //
             // See: [Note: File viewer error handling]
             // TODO
-            console.log(this.currentFile(), e);
-            forgetFailedItemDataForFile(this.currentFile());
+            console.log(currentFile(), e);
+            forgetFailedItemDataForFile(currentFile());
 
             // Pause the video element, if any, when we move away from the
             // slide.
@@ -510,7 +535,7 @@ export class FileViewerPhotoSwipe {
                 order: 9,
                 isButton: true,
                 html: createPSRegisterElementIconHTML("info"),
-                onClick: () => onViewInfo(this.currentAnnotatedFile()),
+                onClick: () => onViewInfo(currentAnnotatedFile()),
             });
 
             // TODO(PS):
@@ -589,38 +614,6 @@ export class FileViewerPhotoSwipe {
         this.pswp.refreshSlideContent(this.pswp.currIndex);
     }
 
-    updateFiles(files: EnteFile[]) {
-        // TODO(PS)
-    }
-
-    // Various helper routines to obtain the file at `currIndex`.
-
-    private currentFile() {
-        return this.files[this.pswp.currIndex]!;
-    }
-
-    private currentAnnotatedFile() {
-        const file = this.currentFile();
-        let annotation = this.activeFileAnnotation;
-        if (annotation?.fileID != file.id) {
-            annotation = this.delegate.onAnnotate(file);
-            this.activeFileAnnotation = annotation;
-        }
-        return {
-            file,
-            // The above condition implies that annotation can never be
-            // undefined, but it doesn't seem to be enough to convince
-            // TypeScript. Writing the condition in a more unnatural way
-            // `(!(annotation && annotation?.fileID == file.id))` works, but
-            // instead we use a non-null assertion here.
-            annotation: annotation!,
-        };
-    }
-
-    private currentFileAnnotation() {
-        return this.currentAnnotatedFile().annotation;
-    }
-
     private clearAutoHideIntervalIfNeeded() {
         if (this.autoHideCheckIntervalId) {
             clearInterval(this.autoHideCheckIntervalId);

From ec11bc70924e0113d8b2cc9ff7cffba04e94b997 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 12:25:35 +0530
Subject: [PATCH 622/796] Complete

---
 .../gallery/components/viewer/data-source.ts        | 13 +++++--------
 .../gallery/components/viewer/photoswipe.ts         |  7 +++----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index dc0901cca5..7b931d488b 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -224,8 +224,11 @@ export const itemDataForFile = (file: EnteFile, needsRefresh: () => void) => {
  * This is called when the user moves away from a slide so that we attempt a
  * full retry when they come back the next time.
  */
-export const forgetFailedItemDataForFile = (file: EnteFile) =>
-    forgetFailedItemDataForFileID(file.id);
+export const forgetFailedItemDataForFileID = (fileID: number) => {
+    if (_state.itemDataByFileID.get(fileID)?.fetchFailed) {
+        _state.itemDataByFileID.delete(fileID);
+    }
+};
 
 /**
  * Forget item data for the all files whose fetch had failed.
@@ -236,12 +239,6 @@ export const forgetFailedItemDataForFile = (file: EnteFile) =>
 export const forgetFailedItems = () =>
     [..._state.itemDataByFileID.keys()].forEach(forgetFailedItemDataForFileID);
 
-const forgetFailedItemDataForFileID = (fileID: number) => {
-    if (_state.itemDataByFileID.get(fileID)?.fetchFailed) {
-        _state.itemDataByFileID.delete(fileID);
-    }
-};
-
 const enqueueUpdates = async (file: EnteFile) => {
     const fileID = file.id;
     const fileType = file.metadata.fileType;
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index f8bf5e1a09..6cfe8f4918 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -9,7 +9,7 @@ import { t } from "i18next";
 import {
     forgetExif,
     forgetExifForItemData,
-    forgetFailedItemDataForFile,
+    forgetFailedItemDataForFileID,
     forgetFailedItems,
     itemDataForFile,
     updateFileInfoExifIfNeeded,
@@ -402,9 +402,8 @@ export class FileViewerPhotoSwipe {
             //   more than 2 slides and then back, or if they reopen the viewer.
             //
             // See: [Note: File viewer error handling]
-            // TODO
-            console.log(currentFile(), e);
-            forgetFailedItemDataForFile(currentFile());
+            const fileID = e.content?.data?.fileID;
+            if (fileID) forgetFailedItemDataForFileID(fileID);
 
             // Pause the video element, if any, when we move away from the
             // slide.

From b851a30c1805922953b026b67785174178b9ae75 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 12:42:05 +0530
Subject: [PATCH 623/796] Change both in sync

---
 .../gallery/components/viewer/FileViewer.tsx  | 56 +++++++++----------
 .../gallery/components/viewer/photoswipe.ts   |  4 +-
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 57c4831fd4..8c4164da84 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -293,36 +293,36 @@ const FileViewer: React.FC<FileViewerProps> = ({
 
     const getFiles = useCallback(() => files, [files]);
 
-    const isFavorite = useMemo(() => {
-        return showModifyActions && favoriteFileIDs
-            ? (annotatedFile: FileViewerAnnotatedFile): boolean =>
-                  favoriteFileIDs.has(annotatedFile.file.id)
-            : undefined;
+    const [isFavorite, toggleFavorite] = useMemo(() => {
+        if (!showModifyActions || !favoriteFileIDs)
+            return [undefined, undefined];
+
+        const isFavorite = ({ file }: FileViewerAnnotatedFile) =>
+            favoriteFileIDs.has(file.id);
+
+        const toggleFavorite = ({
+            file,
+            annotation,
+        }: FileViewerAnnotatedFile) => {
+            console.log({ file, annotation });
+            // TODO
+            //   const isFavorite = annotation.isFavorite;
+            //   if (isFavorite === undefined) {
+            //       assertionFailed();
+            //       return;
+            //   }
+
+            //   onMarkUnsyncedFavoriteUpdate(file.id, !isFavorite);
+            //   void (isFavorite ? removeFromFavorites : addToFavorites)(
+            //       file,
+            //   ).catch((e: unknown) => {
+            //       log.error("Failed to remove favorite", e);
+            //       onMarkUnsyncedFavoriteUpdate(file.id, undefined);
+            //   });
+        };
+        return [isFavorite, toggleFavorite];
     }, [showModifyActions, favoriteFileIDs]);
 
-    const toggleFavorite = useMemo(() => {
-        return favoriteFileIDs
-            ? ({ file, annotation }: FileViewerAnnotatedFile) => {
-                  console.log({ file, annotation });
-                  // TODO
-                  //   const isFavorite = annotation.isFavorite;
-                  //   if (isFavorite === undefined) {
-                  //       assertionFailed();
-                  //       return;
-                  //   }
-
-                  //   onMarkUnsyncedFavoriteUpdate(file.id, !isFavorite);
-                  //   void (isFavorite ? removeFromFavorites : addToFavorites)(
-                  //       file,
-                  //   ).catch((e: unknown) => {
-                  //       log.error("Failed to remove favorite", e);
-                  //       onMarkUnsyncedFavoriteUpdate(file.id, undefined);
-                  //   });
-              }
-            : undefined;
-        // }, [favoriteFileIDs, onMarkUnsyncedFavoriteUpdate]);
-    }, [favoriteFileIDs]);
-
     // Initial value of delegate.
     if (!delegateRef.current) {
         delegateRef.current = { getFiles, isFavorite, toggleFavorite };
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 6cfe8f4918..bd418dbb9e 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -85,9 +85,7 @@ export interface FileViewerPhotoSwipeDelegate {
      * `undefined`. Otherwise the return value determines the toggle state of
      * the toggle favorite button for the file.
      */
-    isFavorite?: (
-        annotatedFile: FileViewerAnnotatedFile,
-    ) => boolean | undefined;
+    isFavorite?: (annotatedFile: FileViewerAnnotatedFile) => boolean;
     /**
      * Called when the user activates the toggle favorite action on a file.
      */

From 9d601a6b4ec4450fe96df7583cd2fd5803986e30 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 28 Feb 2025 13:06:38 +0530
Subject: [PATCH 624/796] [mob] Clean up migration for livePhoto

---
 mobile/lib/db/file_updation_db.dart           |   1 -
 .../services/local_file_update_service.dart   | 188 +-----------------
 2 files changed, 4 insertions(+), 185 deletions(-)

diff --git a/mobile/lib/db/file_updation_db.dart b/mobile/lib/db/file_updation_db.dart
index 3d781b7867..e4f79380a8 100644
--- a/mobile/lib/db/file_updation_db.dart
+++ b/mobile/lib/db/file_updation_db.dart
@@ -14,7 +14,6 @@ class FileUpdationDB {
   static const tableName = 're_upload_tracker';
   static const columnLocalID = 'local_id';
   static const columnReason = 'reason';
-  static const livePhotoCheck = 'livePhotoCheck';
   static const androidMissingGPS = 'androidMissingGPS';
 
   static const modificationTimeUpdated = 'modificationTimeUpdated';
diff --git a/mobile/lib/services/local_file_update_service.dart b/mobile/lib/services/local_file_update_service.dart
index ce5a9080af..0f9c48dcc0 100644
--- a/mobile/lib/services/local_file_update_service.dart
+++ b/mobile/lib/services/local_file_update_service.dart
@@ -9,11 +9,8 @@ import 'package:photos/core/errors.dart';
 import 'package:photos/db/file_updation_db.dart';
 import 'package:photos/db/files_db.dart';
 import "package:photos/extensions/list.dart";
-import "package:photos/extensions/stop_watch.dart";
-import "package:photos/models/file/extensions/file_props.dart";
 import 'package:photos/models/file/file.dart';
 import 'package:photos/models/file/file_type.dart';
-import "package:photos/services/files_service.dart";
 import 'package:photos/utils/file_uploader_util.dart';
 import 'package:photos/utils/file_util.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -24,13 +21,11 @@ class LocalFileUpdateService {
   late FileUpdationDB _fileUpdationDB;
   late SharedPreferences _prefs;
   late Logger _logger;
-  final String _iosLivePhotoSizeMigrationDone = 'fm_ios_live_photo_check';
-  final String _doneLivePhotoImport = 'fm_import_ios_live_photo_check';
   final String _androidMissingGPSImportDone =
       'fm_android_missing_gps_import_done';
   final String _androidMissingGPSCheckDone =
       'fm_android_missing_gps_check_done';
-  static int twoHundredKb = 200 * 1024;
+
   final List<String> _oldMigrationKeys = [
     'fm_badCreationTime',
     'fm_badCreationTimeCompleted',
@@ -40,6 +35,8 @@ class LocalFileUpdateService {
     'fm_badLocationMigrationDone',
     'fm_ios_live_photo_size',
     'fm_import_ios_live_photo_size',
+    'fm_ios_live_photo_check',
+    'fm_import_ios_live_photo_check',
   ];
 
   Completer<void>? _existingMigration;
@@ -65,9 +62,6 @@ class LocalFileUpdateService {
     try {
       await _markFilesWhichAreActuallyUpdated();
       _cleanUpOlderMigration().ignore();
-      if (!Platform.isAndroid) {
-        await _handleLivePhotosSizedCheck();
-      }
       if (Platform.isAndroid) {
         await _androidMissingGPSCheck();
       }
@@ -95,6 +89,7 @@ class LocalFileUpdateService {
         'missingLocationV2',
         'badLocationCord',
         'livePhotoSize',
+        'livePhotoCheck',
       ]);
       for (var element in _oldMigrationKeys) {
         await _prefs.remove(element);
@@ -217,181 +212,6 @@ class LocalFileUpdateService {
     );
   }
 
-  Future<void> checkLivePhoto(EnteFile file) async {
-    if (file.localID == null ||
-        file.localID!.isEmpty ||
-        !file.isUploaded ||
-        file.fileType != FileType.livePhoto ||
-        !file.isOwner) {
-      return;
-    }
-    if (_prefs.containsKey(_iosLivePhotoSizeMigrationDone)) {
-      return;
-    }
-    final hasEntry = await _fileUpdationDB.isExisting(
-      file.localID!,
-      FileUpdationDB.livePhotoCheck,
-    );
-    if (hasEntry) {
-      _logger.info('eager checkLivePhoto ${file.tag}');
-      await _checkLivePhotoWithLowOrUnknownSize([file.localID!]);
-    }
-  }
-
-  Future<void> _handleLivePhotosSizedCheck() async {
-    try {
-      if (_prefs.containsKey(_iosLivePhotoSizeMigrationDone)) {
-        return;
-      }
-      await _importLivePhotoReUploadCandidates();
-
-      // singleRunLimit indicates number of files to check during single
-      // invocation of this method. The limit act as a crude way to limit the
-      // resource consumed by the method
-      const int singleRunLimit = 500;
-      final localIDsToProcess =
-          await _fileUpdationDB.getLocalIDsForPotentialReUpload(
-        singleRunLimit,
-        FileUpdationDB.livePhotoCheck,
-      );
-      if (localIDsToProcess.isNotEmpty) {
-        final chunksOf50 = localIDsToProcess.chunks(50);
-        for (final chunk in chunksOf50) {
-          final sTime = DateTime.now().microsecondsSinceEpoch;
-          final List<Future> futures = [];
-          final chunkOf10 = chunk.chunks(10);
-          for (final smallChunk in chunkOf10) {
-            futures.add(_checkLivePhotoWithLowOrUnknownSize(smallChunk));
-          }
-          await Future.wait(futures);
-          final eTime = DateTime.now().microsecondsSinceEpoch;
-          final d = Duration(microseconds: eTime - sTime);
-          _logger.info(
-            'Performed hashCheck for ${chunk.length} livePhoto files '
-            'completed in ${d.inSeconds.toString()} secs',
-          );
-        }
-      } else {
-        await _prefs.setBool(_iosLivePhotoSizeMigrationDone, true);
-      }
-    } catch (e, s) {
-      _logger.severe('error while checking livePhotoSize check', e, s);
-    }
-  }
-
-  Future<void> _checkLivePhotoWithLowOrUnknownSize(
-    List<String> localIDsToProcess,
-  ) async {
-    final int userID = Configuration.instance.getUserID()!;
-    final List<EnteFile> result =
-        await FilesDB.instance.getLocalFiles(localIDsToProcess);
-    final List<EnteFile> localFilesForUser = [];
-    final Set<String> localIDsWithFile = {};
-    final Set<int> missingSizeIDs = {};
-    final Set<String> processedIDs = {};
-    for (EnteFile file in result) {
-      if (file.ownerID == null || file.ownerID == userID) {
-        localFilesForUser.add(file);
-        localIDsWithFile.add(file.localID!);
-        if (file.isUploaded && file.fileSize == null) {
-          missingSizeIDs.add(file.uploadedFileID!);
-        }
-        if (file.isUploaded && file.updationTime == null) {
-          // file already queued for re-upload
-          processedIDs.add(file.localID!);
-        }
-      }
-    }
-    if (missingSizeIDs.isNotEmpty) {
-      await FilesService.instance.backFillSizes(missingSizeIDs.toList());
-      _logger.info('sizes back fill for ${missingSizeIDs.length} files');
-      // return early, let the check run in the next batch
-      return;
-    }
-
-    // if a file for localID doesn't exist, then mark it as processed
-    // otherwise the app will be stuck in retrying same set of ids
-
-    for (String localID in localIDsToProcess) {
-      if (!localIDsWithFile.contains(localID)) {
-        processedIDs.add(localID);
-      }
-    }
-    _logger.info(" check ${localIDsToProcess.length} files for livePhotoSize, "
-        "missing file cnt ${processedIDs.length}");
-
-    for (EnteFile file in localFilesForUser) {
-      if (file.fileSize == null) {
-        _logger.info('fileSize still null, skip this file');
-        continue;
-      } else if (file.fileType != FileType.livePhoto) {
-        _logger.severe('fileType is not livePhoto, skip this file');
-        processedIDs.add(file.localID!);
-        continue;
-      }
-      if (processedIDs.contains(file.localID)) {
-        continue;
-      }
-      try {
-        late MediaUploadData uploadData;
-        late int mediaUploadSize;
-        (uploadData, mediaUploadSize) = await getUploadDataWithSizeSize(file);
-        if ((file.fileSize! - mediaUploadSize).abs() > twoHundredKb) {
-          _logger.info(
-            'Re-upload livePhoto localHash ${uploadData.hashData?.fileHash ?? "null"} & localSize: $mediaUploadSize'
-            ' and remoteHash ${file.hash ?? "null"} & removeSize: ${file.fileSize!}',
-          );
-          await FilesDB.instance.markFilesForReUpload(
-            userID,
-            file.localID!,
-            file.title,
-            file.location,
-            file.creationTime!,
-            file.modificationTime!,
-            file.fileType,
-          );
-        }
-        processedIDs.add(file.localID!);
-      } on InvalidFileError catch (e) {
-        if (e.reason == InvalidReason.livePhotoToImageTypeChanged ||
-            e.reason == InvalidReason.imageToLivePhotoTypeChanged) {
-          // let existing file update check handle this case
-          _fileUpdationDB.insertMultiple(
-            [file.localID!],
-            FileUpdationDB.modificationTimeUpdated,
-          ).ignore();
-        } else {
-          _logger.severe("livePhoto check failed: invalid file ${file.tag}", e);
-        }
-        processedIDs.add(file.localID!);
-      } catch (e) {
-        _logger.severe("livePhoto check failed", e);
-      } finally {}
-    }
-    _logger.info('completed check for ${localIDsToProcess.length} files');
-    await _fileUpdationDB.deleteByLocalIDs(
-      processedIDs.toList(),
-      FileUpdationDB.livePhotoCheck,
-    );
-  }
-
-  Future<void> _importLivePhotoReUploadCandidates() async {
-    if (_prefs.containsKey(_doneLivePhotoImport)) {
-      return;
-    }
-    _logger.info('_importLivePhotoReUploadCandidates');
-    final EnteWatch watch = EnteWatch("_importLivePhotoReUploadCandidates");
-    final int ownerID = Configuration.instance.getUserID()!;
-    final List<String> localIDs =
-        await FilesDB.instance.getLivePhotosForUser(ownerID);
-    await _fileUpdationDB.insertMultiple(
-      localIDs,
-      FileUpdationDB.livePhotoCheck,
-    );
-    watch.log("imported ${localIDs.length} files");
-    await _prefs.setBool(_doneLivePhotoImport, true);
-  }
-
   //#region Android Missing GPS specific methods ###
 
   Future<void> _androidMissingGPSCheck() async {

From 28d412a12b84f3753f27562fb83e70bb8a609122 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 13:09:21 +0530
Subject: [PATCH 625/796] disabled

---
 .../gallery/components/viewer/FileViewer.tsx  | 26 +++----
 .../gallery/components/viewer/photoswipe.ts   | 70 +++++++++++--------
 2 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 8c4164da84..1fbec36920 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -293,17 +293,19 @@ const FileViewer: React.FC<FileViewerProps> = ({
 
     const getFiles = useCallback(() => files, [files]);
 
-    const [isFavorite, toggleFavorite] = useMemo(() => {
-        if (!showModifyActions || !favoriteFileIDs)
-            return [undefined, undefined];
-
-        const isFavorite = ({ file }: FileViewerAnnotatedFile) =>
+    const isFavorite = useCallback(
+        ({ file }: FileViewerAnnotatedFile) => {
+            if (!showModifyActions || !favoriteFileIDs) return undefined;
             favoriteFileIDs.has(file.id);
+        },
+        [showModifyActions, favoriteFileIDs],
+    );
+
+    const toggleFavorite = useCallback(
+        ({ file, annotation }: FileViewerAnnotatedFile) => {
+            if (!showModifyActions || !favoriteFileIDs)
+                throw new Error("Unexpected invocation");
 
-        const toggleFavorite = ({
-            file,
-            annotation,
-        }: FileViewerAnnotatedFile) => {
             console.log({ file, annotation });
             // TODO
             //   const isFavorite = annotation.isFavorite;
@@ -319,9 +321,9 @@ const FileViewer: React.FC<FileViewerProps> = ({
             //       log.error("Failed to remove favorite", e);
             //       onMarkUnsyncedFavoriteUpdate(file.id, undefined);
             //   });
-        };
-        return [isFavorite, toggleFavorite];
-    }, [showModifyActions, favoriteFileIDs]);
+        },
+        [showModifyActions, favoriteFileIDs],
+    );
 
     // Initial value of delegate.
     if (!delegateRef.current) {
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index bd418dbb9e..ac4a6a682c 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -76,20 +76,23 @@ export interface FileViewerPhotoSwipeDelegate {
      * subsequent user initiated slide navigation (e.g. moving to the next
      * slide) will use the new list.
      */
-    getFiles?: () => EnteFile[];
+    getFiles: () => EnteFile[];
     /**
      * Return `true` if the provided file has been marked as a favorite by the
      * user.
      *
-     * The toggle favorite button will not be shown for the file if this returns
-     * `undefined`. Otherwise the return value determines the toggle state of
-     * the toggle favorite button for the file.
+     * The toggle favorite button will not be shown for the file if
+     * this callback returns `undefined`. Otherwise the return value determines
+     * the toggle state of the toggle favorite button for the file.
      */
-    isFavorite?: (annotatedFile: FileViewerAnnotatedFile) => boolean;
+    isFavorite: (annotatedFile: FileViewerAnnotatedFile) => boolean | undefined;
     /**
      * Called when the user activates the toggle favorite action on a file.
+     *
+     * The toggle favorite button will be disabled for the file until the
+     * promise returned by this function returns settles.
      */
-    toggleFavorite?: (annotatedFile: FileViewerAnnotatedFile) => void;
+    toggleFavorite: (annotatedFile: FileViewerAnnotatedFile) => Promise<void>;
 }
 
 type FileViewerPhotoSwipeOptions = Pick<
@@ -208,6 +211,10 @@ export class FileViewerPhotoSwipe {
      * scope.
      */
     private activeFileAnnotation: FileViewerFileAnnotation | undefined;
+    /**
+     * IDs of files for which a there is a favorite update in progress.
+     */
+    private pendingFavoriteUpdates = new Set<number>();
 
     constructor({
         initialIndex,
@@ -486,6 +493,25 @@ export class FileViewerPhotoSwipe {
             });
 
             if (showModifyActions) {
+                const toggleFavorite = async () => {
+                    const af = currentAnnotatedFile();
+                    this.pendingFavoriteUpdates.add(af.file.id);
+                    await delegate.toggleFavorite(af);
+                    this.pendingFavoriteUpdates.delete(af.file.id);
+                };
+
+                const forIsFavorite = (
+                    buttonElement: HTMLElement,
+                    value: boolean,
+                ) => {
+                    const af = currentAnnotatedFile();
+                    const isFavorite = delegate.isFavorite(af);
+                    showIf(buttonElement, isFavorite === value);
+                    buttonElement.disabled = this.pendingFavoriteUpdates.has(
+                        af.file.id,
+                    );
+                };
+
                 // Only one of these two ("favorite" or "unfavorite") will end
                 // up being shown, so they can safely share the same order.
                 pswp.ui.registerElement({
@@ -494,17 +520,11 @@ export class FileViewerPhotoSwipe {
                     order: 8,
                     isButton: true,
                     html: createPSRegisterElementIconHTML("favorite"),
-                    // TODO
-                    // onClick: withCurrentAnnotatedFile(
-                    //     delegate.onToggleFavorite,
-                    // ),
-                    // onInit: (buttonElement) =>
-                    //     pswp.on("change", () =>
-                    //         showIf(
-                    //             buttonElement,
-                    //             currentFileAnnotation().isFavorite === false,
-                    //         ),
-                    //     ),
+                    onClick: toggleFavorite,
+                    onInit: (buttonElement) =>
+                        pswp.on("change", () =>
+                            forIsFavorite(buttonElement, false),
+                        ),
                 });
                 pswp.ui.registerElement({
                     name: "unfavorite",
@@ -512,17 +532,11 @@ export class FileViewerPhotoSwipe {
                     order: 8,
                     isButton: true,
                     html: createPSRegisterElementIconHTML("unfavorite"),
-                    // TODO
-                    // onClick: withCurrentAnnotatedFile(
-                    //     delegate.onToggleFavorite,
-                    // ),
-                    // onInit: (buttonElement) =>
-                    //     pswp.on("change", () =>
-                    //         showIf(
-                    //             buttonElement,
-                    //             currentFileAnnotation().isFavorite === true,
-                    //         ),
-                    //     ),
+                    onClick: toggleFavorite,
+                    onInit: (buttonElement) =>
+                        pswp.on("change", () =>
+                            forIsFavorite(buttonElement, true),
+                        ),
                 });
             }
 

From d98fbd6dc574e4ef91b3ef36debd8f4691838ce8 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 28 Feb 2025 13:12:37 +0530
Subject: [PATCH 626/796] [mob] Clean up

---
 mobile/lib/ui/viewer/file/zoomable_live_image_new.dart | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mobile/lib/ui/viewer/file/zoomable_live_image_new.dart b/mobile/lib/ui/viewer/file/zoomable_live_image_new.dart
index 74be3d954e..b077ed38c9 100644
--- a/mobile/lib/ui/viewer/file/zoomable_live_image_new.dart
+++ b/mobile/lib/ui/viewer/file/zoomable_live_image_new.dart
@@ -13,7 +13,6 @@ import "package:photos/models/file/extensions/file_props.dart";
 import 'package:photos/models/file/file.dart';
 import "package:photos/models/metadata/file_magic.dart";
 import "package:photos/services/file_magic_service.dart";
-import "package:photos/services/local_file_update_service.dart";
 import 'package:photos/ui/viewer/file/zoomable_image.dart';
 import 'package:photos/utils/file_util.dart';
 import 'package:photos/utils/toast_util.dart';
@@ -57,9 +56,6 @@ class _ZoomableLiveImageNewState extends State<ZoomableLiveImageNew>
     _logger.info(
       'initState for ${_enteFile.generatedID} with tag ${_enteFile.tag} and name ${_enteFile.displayName}',
     );
-    if (_enteFile.isLivePhoto && _enteFile.isUploaded) {
-      LocalFileUpdateService.instance.checkLivePhoto(_enteFile).ignore();
-    }
     _guestViewEventSubscription =
         Bus.instance.on<GuestViewEvent>().listen((event) {
       setState(() {

From cea88b91d243a132b6e9b00f2f525a993bb4812f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 13:24:21 +0530
Subject: [PATCH 627/796] dis 2

---
 .../gallery/components/viewer/FileViewer.tsx  |  5 +++--
 .../gallery/components/viewer/photoswipe.ts   | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 1fbec36920..44d51eab81 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -296,16 +296,17 @@ const FileViewer: React.FC<FileViewerProps> = ({
     const isFavorite = useCallback(
         ({ file }: FileViewerAnnotatedFile) => {
             if (!showModifyActions || !favoriteFileIDs) return undefined;
-            favoriteFileIDs.has(file.id);
+            return favoriteFileIDs.has(file.id);
         },
         [showModifyActions, favoriteFileIDs],
     );
 
     const toggleFavorite = useCallback(
-        ({ file, annotation }: FileViewerAnnotatedFile) => {
+        async ({ file, annotation }: FileViewerAnnotatedFile) => {
             if (!showModifyActions || !favoriteFileIDs)
                 throw new Error("Unexpected invocation");
 
+            await new Promise((r) => setTimeout(r, 7000));
             console.log({ file, annotation });
             // TODO
             //   const isFavorite = annotation.isFavorite;
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index ac4a6a682c..d6dbd2997f 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -493,15 +493,20 @@ export class FileViewerPhotoSwipe {
             });
 
             if (showModifyActions) {
-                const toggleFavorite = async () => {
+                const toggleFavorite = async (
+                    buttonElement: HTMLButtonElement,
+                    value: boolean,
+                ) => {
                     const af = currentAnnotatedFile();
                     this.pendingFavoriteUpdates.add(af.file.id);
+                    buttonElement.disabled = true;
                     await delegate.toggleFavorite(af);
                     this.pendingFavoriteUpdates.delete(af.file.id);
+                    showFavoriteIf(buttonElement, value);
                 };
 
-                const forIsFavorite = (
-                    buttonElement: HTMLElement,
+                const showFavoriteIf = (
+                    buttonElement: HTMLButtonElement,
                     value: boolean,
                 ) => {
                     const af = currentAnnotatedFile();
@@ -520,10 +525,10 @@ export class FileViewerPhotoSwipe {
                     order: 8,
                     isButton: true,
                     html: createPSRegisterElementIconHTML("favorite"),
-                    onClick: toggleFavorite,
+                    onClick: (e) => toggleFavorite(e.target, false),
                     onInit: (buttonElement) =>
                         pswp.on("change", () =>
-                            forIsFavorite(buttonElement, false),
+                            showFavoriteIf(buttonElement, false),
                         ),
                 });
                 pswp.ui.registerElement({
@@ -532,10 +537,10 @@ export class FileViewerPhotoSwipe {
                     order: 8,
                     isButton: true,
                     html: createPSRegisterElementIconHTML("unfavorite"),
-                    onClick: toggleFavorite,
+                    onClick: (e) => toggleFavorite(e.target),
                     onInit: (buttonElement) =>
                         pswp.on("change", () =>
-                            forIsFavorite(buttonElement, true),
+                            showFavoriteIf(buttonElement, true),
                         ),
                 });
             }

From ffc1db7369d4cbd71618cbefe2d595bbbff04bc6 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 13:33:50 +0530
Subject: [PATCH 628/796] err 1

---
 .../gallery/components/viewer/FileViewer.tsx         | 12 ++++++++++--
 web/packages/gallery/components/viewer/photoswipe.ts |  6 +++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 44d51eab81..5aefa1cb72 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -15,6 +15,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 
 import { isDesktop } from "@/base/app";
 import { type ModalVisibilityProps } from "@/base/components/utils/modal";
+import { useBaseContext } from "@/base/context";
 import { lowercaseExtension } from "@/base/file-name";
 import type { LocalUser } from "@/base/local-user";
 import log from "@/base/log";
@@ -159,6 +160,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
     onSelectPerson,
     onSaveEditedImageCopy,
 }) => {
+    const { onGenericError } = useBaseContext();
+
     // There are 3 things involved in this dance:
     //
     // 1. Us, "FileViewer". We're a React component.
@@ -306,7 +309,12 @@ const FileViewer: React.FC<FileViewerProps> = ({
             if (!showModifyActions || !favoriteFileIDs)
                 throw new Error("Unexpected invocation");
 
-            await new Promise((r) => setTimeout(r, 7000));
+            try {
+                await new Promise((r) => setTimeout(r, 3000));
+                throw new Error("test");
+            } catch (e) {
+                onGenericError(e);
+            }
             console.log({ file, annotation });
             // TODO
             //   const isFavorite = annotation.isFavorite;
@@ -323,7 +331,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
             //       onMarkUnsyncedFavoriteUpdate(file.id, undefined);
             //   });
         },
-        [showModifyActions, favoriteFileIDs],
+        [showModifyActions, onGenericError, favoriteFileIDs],
     );
 
     // Initial value of delegate.
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index d6dbd2997f..d7f63e69d3 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -90,7 +90,11 @@ export interface FileViewerPhotoSwipeDelegate {
      * Called when the user activates the toggle favorite action on a file.
      *
      * The toggle favorite button will be disabled for the file until the
-     * promise returned by this function returns settles.
+     * promise returned by this function returns fulfills.
+     *
+     * > Note: The caller is expected to handle any errors that occur, and
+     * > should not reject for foreseeable failures, otherwise the button will
+     * > remain in the disabled state (until the file viewer is closed).
      */
     toggleFavorite: (annotatedFile: FileViewerAnnotatedFile) => Promise<void>;
 }

From eb7f0c0bed901982f80d443d50806608e849bf56 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 13:48:53 +0530
Subject: [PATCH 629/796] Fix extra invalidations

---
 web/apps/photos/src/components/PhotoFrame.tsx |  10 +-
 web/apps/photos/src/pages/gallery.tsx         | 165 +++++++++---------
 2 files changed, 91 insertions(+), 84 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index d15a2c42b4..a18242a46c 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -101,7 +101,6 @@ export type PhotoFrameProps = Pick<
      */
     modePlus?: GalleryBarMode | "search";
     files: EnteFile[];
-    syncWithRemote: () => Promise<void>;
     setSelected: (
         selected: SelectedState | ((selected: SelectedState) => SelectedState),
     ) => void;
@@ -145,6 +144,7 @@ export type PhotoFrameProps = Pick<
     isInHiddenSection?: boolean;
     setFilesDownloadProgressAttributesCreator?: SetFilesDownloadProgressAttributesCreator;
     selectable?: boolean;
+    onSyncWithRemote: () => Promise<void>;
 };
 
 /**
@@ -154,7 +154,6 @@ const PhotoFrame = ({
     mode,
     modePlus,
     files,
-    syncWithRemote,
     setSelected,
     selected,
     favoriteFileIDs,
@@ -170,6 +169,7 @@ const PhotoFrame = ({
     isInHiddenSection,
     setFilesDownloadProgressAttributesCreator,
     selectable,
+    onSyncWithRemote,
     onSelectCollection,
     onSelectPerson,
 }: PhotoFrameProps) => {
@@ -262,8 +262,8 @@ const PhotoFrame = ({
     }, [selected]);
 
     const handleTriggerSyncWithRemote = useCallback(
-        () => void syncWithRemote(),
-        [syncWithRemote],
+        () => void onSyncWithRemote(),
+        [onSyncWithRemote],
     );
 
     const handleSaveEditedImageCopy = useCallback(
@@ -303,7 +303,7 @@ const PhotoFrame = ({
             throw new Error("Not implemented");
         } else {
             setOpen(false);
-            needUpdate && syncWithRemote();
+            needUpdate && onSyncWithRemote();
             setIsPhotoSwipeOpen?.(false);
         }
     };
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 5b88e5e9e3..cdacf81631 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -515,88 +515,96 @@ const Page: React.FC = () => {
         };
     }, [selectAll, clearSelection]);
 
-    const showSessionExpiredDialog = () =>
-        showMiniDialog(sessionExpiredDialogAttributes(logout));
+    const showSessionExpiredDialog = useCallback(
+        () => showMiniDialog(sessionExpiredDialogAttributes(logout)),
+        [showMiniDialog, logout],
+    );
 
-    const syncWithRemote = async (force = false, silent = false) => {
-        if (!navigator.onLine) return;
-        if (syncInProgress.current && !force) {
-            resync.current = { force, silent };
-            return;
-        }
-        const isForced = syncInProgress.current && force;
-        syncInProgress.current = true;
-        try {
-            const token = getToken();
-            if (!token) {
+    const handleSyncWithRemote = useCallback(
+        async (force = false, silent = false) => {
+            if (!navigator.onLine) return;
+            if (syncInProgress.current && !force) {
+                resync.current = { force, silent };
                 return;
             }
-            const tokenValid = await isTokenValid(token);
-            if (!tokenValid) {
-                throw new Error(CustomError.SESSION_EXPIRED);
+            const isForced = syncInProgress.current && force;
+            syncInProgress.current = true;
+            try {
+                const token = getToken();
+                if (!token) {
+                    return;
+                }
+                const tokenValid = await isTokenValid(token);
+                if (!tokenValid) {
+                    throw new Error(CustomError.SESSION_EXPIRED);
+                }
+                !silent && showLoadingBar();
+                await preCollectionsAndFilesSync();
+                const allCollections = await getAllLatestCollections();
+                const [hiddenCollections, collections] = splitByPredicate(
+                    allCollections,
+                    isHiddenCollection,
+                );
+                dispatch({
+                    type: "setAllCollections",
+                    collections,
+                    hiddenCollections,
+                });
+                const didUpdateNormalFiles = await syncFiles(
+                    "normal",
+                    collections,
+                    (files) => dispatch({ type: "setFiles", files }),
+                    (files) => dispatch({ type: "fetchFiles", files }),
+                );
+                const didUpdateHiddenFiles = await syncFiles(
+                    "hidden",
+                    hiddenCollections,
+                    (hiddenFiles) =>
+                        dispatch({ type: "setHiddenFiles", hiddenFiles }),
+                    (hiddenFiles) =>
+                        dispatch({ type: "fetchHiddenFiles", hiddenFiles }),
+                );
+                if (didUpdateNormalFiles || didUpdateHiddenFiles)
+                    exportService.onLocalFilesUpdated();
+                await syncTrash(allCollections, (trashedFiles: EnteFile[]) =>
+                    dispatch({ type: "setTrashedFiles", trashedFiles }),
+                );
+                // syncWithRemote is called with the force flag set to true before
+                // doing an upload. So it is possible, say when resuming a pending
+                // upload, that we get two syncWithRemotes happening in parallel.
+                //
+                // Do the non-file-related sync only for one of these parallel ones.
+                if (!isForced) {
+                    await sync();
+                }
+            } catch (e) {
+                switch (e.message) {
+                    case CustomError.SESSION_EXPIRED:
+                        showSessionExpiredDialog();
+                        break;
+                    case CustomError.KEY_MISSING:
+                        clearKeys();
+                        router.push(PAGES.CREDENTIALS);
+                        break;
+                    default:
+                        log.error("syncWithRemote failed", e);
+                }
+            } finally {
+                dispatch({ type: "clearUnsyncedState" });
+                !silent && hideLoadingBar();
             }
-            !silent && showLoadingBar();
-            await preCollectionsAndFilesSync();
-            const allCollections = await getAllLatestCollections();
-            const [hiddenCollections, collections] = splitByPredicate(
-                allCollections,
-                isHiddenCollection,
-            );
-            dispatch({
-                type: "setAllCollections",
-                collections,
-                hiddenCollections,
-            });
-            const didUpdateNormalFiles = await syncFiles(
-                "normal",
-                collections,
-                (files) => dispatch({ type: "setFiles", files }),
-                (files) => dispatch({ type: "fetchFiles", files }),
-            );
-            const didUpdateHiddenFiles = await syncFiles(
-                "hidden",
-                hiddenCollections,
-                (hiddenFiles) =>
-                    dispatch({ type: "setHiddenFiles", hiddenFiles }),
-                (hiddenFiles) =>
-                    dispatch({ type: "fetchHiddenFiles", hiddenFiles }),
-            );
-            if (didUpdateNormalFiles || didUpdateHiddenFiles)
-                exportService.onLocalFilesUpdated();
-            await syncTrash(allCollections, (trashedFiles: EnteFile[]) =>
-                dispatch({ type: "setTrashedFiles", trashedFiles }),
-            );
-            // syncWithRemote is called with the force flag set to true before
-            // doing an upload. So it is possible, say when resuming a pending
-            // upload, that we get two syncWithRemotes happening in parallel.
-            //
-            // Do the non-file-related sync only for one of these parallel ones.
-            if (!isForced) {
-                await sync();
+            syncInProgress.current = false;
+            if (resync.current) {
+                const { force, silent } = resync.current;
+                setTimeout(() => handleSyncWithRemote(force, silent), 0);
+                resync.current = undefined;
             }
-        } catch (e) {
-            switch (e.message) {
-                case CustomError.SESSION_EXPIRED:
-                    showSessionExpiredDialog();
-                    break;
-                case CustomError.KEY_MISSING:
-                    clearKeys();
-                    router.push(PAGES.CREDENTIALS);
-                    break;
-                default:
-                    log.error("syncWithRemote failed", e);
-            }
-        } finally {
-            dispatch({ type: "clearUnsyncedState" });
-            !silent && hideLoadingBar();
-        }
-        syncInProgress.current = false;
-        if (resync.current) {
-            const { force, silent } = resync.current;
-            setTimeout(() => syncWithRemote(force, silent), 0);
-            resync.current = undefined;
-        }
-    };
+        },
+        [showLoadingBar, hideLoadingBar, router, showSessionExpiredDialog],
+    );
+
+    // Alias for existing code.
+    const syncWithRemote = handleSyncWithRemote;
 
     const setupSelectAllKeyBoardShortcutHandler = () => {
         const handleKeyUp = (e: KeyboardEvent) => {
@@ -1047,8 +1055,6 @@ const Page: React.FC = () => {
                         mode={barMode}
                         modePlus={isInSearchMode ? "search" : barMode}
                         files={filteredFiles}
-                        // TODO: Warning: Doesn't have stable identity.
-                        syncWithRemote={syncWithRemote}
                         setSelected={setSelected}
                         selected={selected}
                         favoriteFileIDs={state.favoriteFileIDs}
@@ -1070,6 +1076,7 @@ const Page: React.FC = () => {
                             handleMarkUnsyncedFavoriteUpdate
                         }
                         onMarkTempDeleted={handleMarkTempDeleted}
+                        onSyncWithRemote={handleSyncWithRemote}
                         onSelectCollection={handleSelectCollection}
                         onSelectPerson={handleSelectPerson}
                     />

From 1605f71a544f0c73b609041835b71722bae326f9 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 14:11:32 +0530
Subject: [PATCH 630/796] Fill in

---
 .../gallery/components/viewer/FileViewer.tsx  | 32 +++++++------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 5aefa1cb72..55800ab218 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -14,6 +14,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 }
 
 import { isDesktop } from "@/base/app";
+import { assertionFailed } from "@/base/assert";
 import { type ModalVisibilityProps } from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
 import { lowercaseExtension } from "@/base/file-name";
@@ -305,33 +306,22 @@ const FileViewer: React.FC<FileViewerProps> = ({
     );
 
     const toggleFavorite = useCallback(
-        async ({ file, annotation }: FileViewerAnnotatedFile) => {
-            if (!showModifyActions || !favoriteFileIDs)
-                throw new Error("Unexpected invocation");
+        async (annotatedFile: FileViewerAnnotatedFile) => {
+            const { file, annotation } = annotatedFile;
+
+            const isFav = isFavorite(annotatedFile);
+            if (isFav === undefined || !annotation.showFavorite) {
+                assertionFailed();
+                return;
+            }
 
             try {
-                await new Promise((r) => setTimeout(r, 3000));
-                throw new Error("test");
+                await (isFav ? removeFromFavorites : addToFavorites)(file);
             } catch (e) {
                 onGenericError(e);
             }
-            console.log({ file, annotation });
-            // TODO
-            //   const isFavorite = annotation.isFavorite;
-            //   if (isFavorite === undefined) {
-            //       assertionFailed();
-            //       return;
-            //   }
-
-            //   onMarkUnsyncedFavoriteUpdate(file.id, !isFavorite);
-            //   void (isFavorite ? removeFromFavorites : addToFavorites)(
-            //       file,
-            //   ).catch((e: unknown) => {
-            //       log.error("Failed to remove favorite", e);
-            //       onMarkUnsyncedFavoriteUpdate(file.id, undefined);
-            //   });
         },
-        [showModifyActions, onGenericError, favoriteFileIDs],
+        [onGenericError, isFavorite],
     );
 
     // Initial value of delegate.

From 8e8610bedabcefc40dca97ffd1445f3c69abd74d Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Fri, 28 Feb 2025 14:11:33 +0530
Subject: [PATCH 631/796] [mob][photos] More robust caching and models

---
 mobile/lib/models/memories_cache.dart         |  29 ++--
 mobile/lib/models/people_memory.dart          |  37 ++---
 mobile/lib/models/smart_memory.dart           |  44 +++---
 mobile/lib/models/time_memory.dart            |  35 +----
 mobile/lib/models/trip_memory.dart            |  35 ++---
 .../lib/services/memories_cache_service.dart  |  48 ++++---
 mobile/lib/services/search_service.dart       |   5 +-
 .../lib/services/smart_memories_service.dart  | 127 +++++++++++++++---
 .../lib/ui/home/memories/memories_widget.dart |   3 +-
 9 files changed, 225 insertions(+), 138 deletions(-)

diff --git a/mobile/lib/models/memories_cache.dart b/mobile/lib/models/memories_cache.dart
index 32b14416e4..04939cbff6 100644
--- a/mobile/lib/models/memories_cache.dart
+++ b/mobile/lib/models/memories_cache.dart
@@ -47,27 +47,32 @@ class ToShowMemory {
   final MemoryType type;
   final int firstTimeToShow;
   final int lastTimeToShow;
+  final int calculationTime;
 
   final String? personID;
   final PeopleMemoryType? peopleMemoryType;
   final Location? location;
 
-  bool get shouldShowNow {
-    final now = DateTime.now().microsecondsSinceEpoch;
-    return now >= firstTimeToShow && now <= lastTimeToShow;
-  }
-
   bool get isOld {
     final now = DateTime.now().microsecondsSinceEpoch;
     return now > lastTimeToShow;
   }
 
+  bool shouldShowNow() {
+    final now = DateTime.now().microsecondsSinceEpoch;
+    final relevantForNow = now >= firstTimeToShow && now < lastTimeToShow;
+    final calculatedForNow = (now >= calculationTime) &&
+        (now < calculationTime + kMemoriesUpdateFrequency.inMicroseconds);
+    return relevantForNow && calculatedForNow;
+  }
+
   ToShowMemory(
     this.title,
     this.fileUploadedIDs,
     this.type,
     this.firstTimeToShow,
-    this.lastTimeToShow, {
+    this.lastTimeToShow,
+    this.calculationTime, {
     this.personID,
     this.peopleMemoryType,
     this.location,
@@ -80,8 +85,7 @@ class ToShowMemory {
           "PersonID and peopleMemoryType must be provided for people memory type, and location must be provided for trips memory type",
         );
 
-  factory ToShowMemory.fromSmartMemory(SmartMemory memory) {
-    assert(memory.firstDateToShow != null && memory.lastDateToShow != null);
+  factory ToShowMemory.fromSmartMemory(SmartMemory memory, DateTime calcTime) {
     String? personID;
     PeopleMemoryType? peopleMemoryType;
     Location? location;
@@ -92,11 +96,12 @@ class ToShowMemory {
       location = memory.location;
     }
     return ToShowMemory(
-      memory.name,
+      memory.title,
       memory.memories.map((m) => m.file.uploadedFileID!).toList(),
       memory.type,
-      memory.firstDateToShow!,
-      memory.lastDateToShow!,
+      memory.firstDateToShow,
+      memory.lastDateToShow,
+      calcTime.microsecondsSinceEpoch,
       personID: personID,
       peopleMemoryType: peopleMemoryType,
       location: location,
@@ -110,6 +115,7 @@ class ToShowMemory {
       memoryTypeFromString(json['type']),
       json['firstTimeToShow'],
       json['lastTimeToShow'],
+      json['calculationTime'],
       personID: json['personID'],
       peopleMemoryType: peopleMemoryTypeFromString(json['peopleMemoryType']),
       location: json['location'] != null
@@ -128,6 +134,7 @@ class ToShowMemory {
       'type': type.toString().split('.').last,
       'firstTimeToShow': firstTimeToShow,
       'lastTimeToShow': lastTimeToShow,
+      'calculationTime': calculationTime,
       'personID': personID,
       'peopleMemoryType': peopleMemoryType.toString().split('.').last,
       'location': location != null
diff --git a/mobile/lib/models/people_memory.dart b/mobile/lib/models/people_memory.dart
index 3a59cc155d..6935372d62 100644
--- a/mobile/lib/models/people_memory.dart
+++ b/mobile/lib/models/people_memory.dart
@@ -61,35 +61,40 @@ class PeopleMemory extends SmartMemory {
 
   PeopleMemory(
     List<Memory> memories,
+    String title,
+    int firstDateToShow,
+    int lastDateToShow, 
     this.peopleMemoryType,
     this.personID, {
-    super.name,
     super.firstCreationTime,
     super.lastCreationTime,
-    super.firstDateToShow,
-    super.lastDateToShow,
-  }) : super(memories, MemoryType.people);
+  }) : super(
+          memories,
+          MemoryType.people,
+          title,
+          firstDateToShow,
+          lastDateToShow,
+        );
 
-  @override
   PeopleMemory copyWith({
     List<Memory>? memories,
-    PeopleMemoryType? peopleMemoryType,
-    String? personID,
-    String? name,
-    int? firstCreationTime,
-    int? lastCreationTime,
+    String? title,
     int? firstDateToShow,
     int? lastDateToShow,
+    PeopleMemoryType? peopleMemoryType,
+    String? personID,
+    int? firstCreationTime,
+    int? lastCreationTime,
   }) {
     return PeopleMemory(
-      memories ?? super.memories,
+      memories ?? this.memories,
+      title ?? this.title,
+      firstDateToShow ?? this.firstDateToShow,
+      lastDateToShow ?? this.lastDateToShow,
       peopleMemoryType ?? this.peopleMemoryType,
       personID ?? this.personID,
-      name: name ?? super.name,
-      firstCreationTime: firstCreationTime ?? super.firstCreationTime,
-      lastCreationTime: lastCreationTime ?? super.lastCreationTime,
-      firstDateToShow: firstDateToShow ?? super.firstDateToShow,
-      lastDateToShow: lastDateToShow ?? super.lastDateToShow,
+      firstCreationTime: firstCreationTime ?? this.firstCreationTime,
+      lastCreationTime: lastCreationTime ?? this.lastCreationTime,
     );
   }
 }
diff --git a/mobile/lib/models/smart_memory.dart b/mobile/lib/models/smart_memory.dart
index a9e99d4608..980a25f216 100644
--- a/mobile/lib/models/smart_memory.dart
+++ b/mobile/lib/models/smart_memory.dart
@@ -1,5 +1,8 @@
 import "package:photos/models/memory.dart";
 
+const kMemoriesUpdateFrequency = Duration(days: 7);
+const kMemoriesMargin = Duration(days: 2);
+
 enum MemoryType {
   people,
   trips,
@@ -25,44 +28,34 @@ MemoryType memoryTypeFromString(String type) {
 class SmartMemory {
   final List<Memory> memories;
   final MemoryType type;
-  String name;
+  String title;
+  int firstDateToShow;
+  int lastDateToShow;
+
   int? firstCreationTime;
   int? lastCreationTime;
-
-  int? firstDateToShow;
-  int? lastDateToShow;
-  // TODO: lau: make the above two non-nullable!!!
   // TODO: lau: actually use this in calculated filters
 
   SmartMemory(
     this.memories,
-    this.type, {
-    name,
+    this.type,
+    title,
+    this.firstDateToShow,
+    this.lastDateToShow, {
     this.firstCreationTime,
     this.lastCreationTime,
-    this.firstDateToShow,
-    this.lastDateToShow,
-  }) : name = name != null ? name + "(I)" : null;
+  }) : title = title + "(I)";
   // TODO: lau: remove (I) from name when opening up the feature flag
 
+  bool get notForShow => firstDateToShow == 0 && lastDateToShow == 0;
+
   bool isOld() {
-    if (firstDateToShow == null || lastDateToShow == null) {
-      return false;
-    }
-    final now = DateTime.now().microsecondsSinceEpoch;
-    return lastDateToShow! < now;
-  }
-  
-  bool hasShowTime() {
-    return firstDateToShow != null && lastDateToShow != null;
+    return lastDateToShow < DateTime.now().microsecondsSinceEpoch;
   }
 
   bool shouldShowNow() {
-    if (!hasShowTime()) {
-      return false;
-    }
     final int now = DateTime.now().microsecondsSinceEpoch;
-    return now >= firstDateToShow! && now <= lastDateToShow!;
+    return now >= firstDateToShow && now <= lastDateToShow;
   }
 
   int averageCreationTime() {
@@ -74,6 +67,11 @@ class SmartMemory {
         .map((memory) => memory.file.creationTime!)
         .toList();
     if (creationTimes.length < 2) {
+      if (creationTimes.isEmpty) {
+        firstCreationTime = 0;
+        lastCreationTime = 0;
+        return 0;
+      }
       return creationTimes.isEmpty ? 0 : creationTimes.first;
     }
     creationTimes.sort();
diff --git a/mobile/lib/models/time_memory.dart b/mobile/lib/models/time_memory.dart
index 761c84a55e..1b8b02868b 100644
--- a/mobile/lib/models/time_memory.dart
+++ b/mobile/lib/models/time_memory.dart
@@ -3,38 +3,17 @@ import "package:photos/models/smart_memory.dart";
 
 class TimeMemory extends SmartMemory {
   TimeMemory(
-    List<Memory> memories, {
-    String? name,
+    List<Memory> memories,
+    String title,
+    int firstDateToShow,
+    int lastDateToShow, {
     int? firstCreationTime,
     int? lastCreationTime,
-    int? firstDateToShow,
-    int? lastDateToShow,
   }) : super(
           memories,
           MemoryType.time,
-          name: name,
-          firstCreationTime: firstCreationTime,
-          lastCreationTime: lastCreationTime,
-          firstDateToShow: firstDateToShow,
-          lastDateToShow: lastDateToShow,
+          title,
+          firstDateToShow,
+          lastDateToShow,
         );
-
-  @override
-  TimeMemory copyWith({
-    List<Memory>? memories,
-    String? name,
-    int? firstCreationTime,
-    int? lastCreationTime,
-    int? firstDateToShow,
-    int? lastDateToShow,
-  }) {
-    return TimeMemory(
-      memories ?? this.memories,
-      name: name ?? this.name,
-      firstCreationTime: firstCreationTime ?? super.firstCreationTime,
-      lastCreationTime: lastCreationTime ?? super.lastCreationTime,
-      firstDateToShow: firstDateToShow ?? super.firstDateToShow,
-      lastDateToShow: lastDateToShow ?? super.lastDateToShow,
-    );
-  }
 }
diff --git a/mobile/lib/models/trip_memory.dart b/mobile/lib/models/trip_memory.dart
index 244e77e86d..1cc353f317 100644
--- a/mobile/lib/models/trip_memory.dart
+++ b/mobile/lib/models/trip_memory.dart
@@ -7,32 +7,37 @@ class TripMemory extends SmartMemory {
 
   TripMemory(
     List<Memory> memories,
+    String title,
+    int firstDateToShow,
+    int lastDateToShow,
     this.location, {
-    super.name,
     super.firstCreationTime,
     super.lastCreationTime,
-    super.firstDateToShow,
-    super.lastDateToShow,
-  }) : super(memories, MemoryType.trips);
+  }) : super(
+          memories,
+          MemoryType.trips,
+          title,
+          firstDateToShow,
+          lastDateToShow,
+        );
 
-  @override
   TripMemory copyWith({
     List<Memory>? memories,
-    Location? location,
-    String? name,
-    int? firstCreationTime,
-    int? lastCreationTime,
+    String? title,
     int? firstDateToShow,
     int? lastDateToShow,
+    Location? location,
+    int? firstCreationTime,
+    int? lastCreationTime,
   }) {
     return TripMemory(
-      memories ?? super.memories,
+      memories ?? this.memories,
+      title ?? this.title,
+      firstDateToShow ?? this.firstDateToShow,
+      lastDateToShow ?? this.lastDateToShow,
       location ?? this.location,
-      name: name ?? super.name,
-      firstCreationTime: firstCreationTime ?? super.firstCreationTime,
-      lastCreationTime: lastCreationTime ?? super.lastCreationTime,
-      firstDateToShow: firstDateToShow ?? super.firstDateToShow,
-      lastDateToShow: lastDateToShow ?? super.lastDateToShow,
+      firstCreationTime: firstCreationTime ?? this.firstCreationTime,
+      lastCreationTime: lastCreationTime ?? this.lastCreationTime,
     );
   }
 }
diff --git a/mobile/lib/services/memories_cache_service.dart b/mobile/lib/services/memories_cache_service.dart
index 8080dd61b1..40c9d8ea72 100644
--- a/mobile/lib/services/memories_cache_service.dart
+++ b/mobile/lib/services/memories_cache_service.dart
@@ -25,7 +25,6 @@ class MemoriesCacheService {
   /// Delay is for cache update to be done not during app init, during which a
   /// lot of other things are happening.
   static const _kCacheUpdateDelay = Duration(seconds: 10);
-  static const _kUpdateFrequency = Duration(days: 7);
 
   final SharedPreferences _prefs;
   late final Logger _logger = Logger("MemoriesCacheService");
@@ -48,7 +47,9 @@ class MemoriesCacheService {
     unawaited(_memoriesDB.getSeenTimes().then((value) => _seenTimes = value));
     unawaited(
       _memoriesDB.clearMemoriesSeenBeforeTime(
-        DateTime.now().subtract(_kUpdateFrequency).microsecondsSinceEpoch,
+        DateTime.now()
+            .subtract(kMemoriesUpdateFrequency)
+            .microsecondsSinceEpoch,
       ),
     );
 
@@ -86,14 +87,16 @@ class MemoriesCacheService {
 
   Future<void> _checkIfTimeToUpdateCache() async {
     if (lastMemoriesCacheUpdateTime <
-        DateTime.now().subtract(_kUpdateFrequency).microsecondsSinceEpoch) {
+        DateTime.now()
+            .subtract(kMemoriesUpdateFrequency)
+            .microsecondsSinceEpoch) {
       _shouldUpdate = true;
     }
   }
 
   Future<String> _getCachePath() async {
     return (await getApplicationSupportDirectory()).path +
-        "/cache//test1/memories_cache";
+        "/cache//test2/memories_cache";
     // TODO: lau: remove the test1 directory after testing
   }
 
@@ -133,20 +136,21 @@ class MemoriesCacheService {
       w?.start();
       // calculate memories for this period and for the next period
       final now = DateTime.now();
-      final next = now.add(_kUpdateFrequency);
-      final List<SmartMemory> memories = [];
-      memories.addAll(await SmartMemoriesService.instance.calcMemories(now));
-      memories.addAll(await SmartMemoriesService.instance.calcMemories(next));
+      final next = now.add(kMemoriesUpdateFrequency);
+      final nowMemories = await SmartMemoriesService.instance.calcMemories(now);
+      final nextMemories =
+          await SmartMemoriesService.instance.calcMemories(next);
       w?.log("calculated new memories");
       final oldCache = await _readCacheFromDisk();
       w?.log("gotten old cache");
-      final MemoriesCache memoryCache = _toCache(memories, oldCache);
+      final MemoriesCache memoryCache =
+          _toCache(nowMemories, now, nextMemories, next, oldCache);
       w?.log("gotten cache from memories");
       final file = File(await _getCachePath());
       if (!file.existsSync()) {
         file.createSync(recursive: true);
       }
-      _cachedMemories = memories;
+      _cachedMemories = nowMemories;
       await file.writeAsBytes(
         MemoriesCache.encodeToJsonString(memoryCache).codeUnits,
       );
@@ -162,18 +166,20 @@ class MemoriesCacheService {
   }
 
   MemoriesCache _toCache(
-    List<SmartMemory> memories,
+    List<SmartMemory> nowMemories,
+    DateTime now,
+    List<SmartMemory> nextMemories,
+    DateTime next,
     MemoriesCache? oldCache,
   ) {
     final List<ToShowMemory> toShowMemories = [];
     final List<PeopleShownLog> peopleShownLogs = [];
     final List<TripsShownLog> tripsShownLogs = [];
-    for (final memory in memories) {
-      if (memory.hasShowTime()) {
-        toShowMemories.add(ToShowMemory.fromSmartMemory(memory));
-      } else {
-        _logger.severe('Memory has no first or last date to show');
-      }
+    for (final nowMemory in nowMemories) {
+      toShowMemories.add(ToShowMemory.fromSmartMemory(nowMemory, now));
+    }
+    for (final nextMemory in nextMemories) {
+      toShowMemories.add(ToShowMemory.fromSmartMemory(nextMemory, next));
     }
     if (oldCache != null) {
       peopleShownLogs.addAll(oldCache.peopleShownLogs);
@@ -224,7 +230,7 @@ class MemoriesCacheService {
       }
 
       for (final ToShowMemory memory in cache.toShowMemories) {
-        if (memory.shouldShowNow) {
+        if (memory.shouldShowNow()) {
           memories.add(
             SmartMemory(
               memory.fileUploadedIDs
@@ -234,9 +240,9 @@ class MemoriesCacheService {
                   )
                   .toList(),
               memory.type,
-              name: memory.title,
-              firstDateToShow: memory.firstTimeToShow,
-              lastDateToShow: memory.lastTimeToShow,
+              memory.title,
+              memory.firstTimeToShow,
+              memory.lastTimeToShow,
             ),
           );
         }
diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index fc77669555..6d2077612e 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1196,15 +1196,14 @@ class SearchService {
     final memories = await memoriesCacheService.getMemories(limit);
     final searchResults = <GenericSearchResult>[];
     for (final memory in memories) {
-      final name = memory.name ?? "memory";
       final files = Memory.filesFromMemories(memory.memories);
       searchResults.add(
         GenericSearchResult(
           ResultType.event,
-          name,
+          memory.title,
           files,
           hierarchicalSearchFilter: TopLevelGenericFilter(
-            filterName: name,
+            filterName: memory.title,
             occurrence: kMostRelevantFilter,
             filterResultType: ResultType.event,
             matchedUploadedIDs: filesToUploadedFileIDs(files),
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 1597d7f5b5..e2dc617782 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -208,9 +208,11 @@ class SmartMemoriesService {
         );
         final spotlightMemory = PeopleMemory(
           selectSpotlightMemories,
+          title,
+          currentTime.microsecondsSinceEpoch,
+          currentTime.add(kMemoriesUpdateFrequency).microsecondsSinceEpoch,
           PeopleMemoryType.spotlight,
           personID,
-          name: title,
         );
         personToMemories
             .putIfAbsent(personID, () => {})
@@ -236,9 +238,11 @@ class SmartMemoriesService {
           );
           final youAndThemMemory = PeopleMemory(
             selectYouAndThemMemories,
+            title,
+            currentTime.microsecondsSinceEpoch,
+            currentTime.add(kMemoriesUpdateFrequency).microsecondsSinceEpoch,
             PeopleMemoryType.youAndThem,
             personID,
-            name: title,
           );
           personToMemories
               .putIfAbsent(personID, () => {})
@@ -281,9 +285,11 @@ class SmartMemoriesService {
           );
           final activityMemory = PeopleMemory(
             selectActivityMemories,
+            title,
+            currentTime.microsecondsSinceEpoch,
+            currentTime.add(kMemoriesUpdateFrequency).microsecondsSinceEpoch,
             PeopleMemoryType.doingSomethingTogether,
             personID,
-            name: title,
           );
           personToMemories.putIfAbsent(personID, () => {}).putIfAbsent(
                 PeopleMemoryType.doingSomethingTogether,
@@ -326,9 +332,11 @@ class SmartMemoriesService {
           lastTimeYouSawThemFiles
               .map((f) => Memory.fromFile(f, _seenTimes))
               .toList(),
+          title,
+          currentTime.microsecondsSinceEpoch,
+          currentTime.add(kMemoriesUpdateFrequency).microsecondsSinceEpoch,
           PeopleMemoryType.lastTimeYouSawThem,
           personID,
-          name: title,
         );
         personToMemories.putIfAbsent(personID, () => {}).putIfAbsent(
               PeopleMemoryType.lastTimeYouSawThem,
@@ -528,7 +536,10 @@ class SmartMemoriesService {
                 Memory.fromFiles(
                   currentBlockFiles,
                   _seenTimes,
-                ), // TODO: lau: properly check last seen times
+                ),
+                'Trip1',
+                0,
+                0,
                 location,
                 firstCreationTime: blockStart,
                 lastCreationTime: lastTime,
@@ -553,6 +564,9 @@ class SmartMemoriesService {
         tripLocations.add(
           TripMemory(
             Memory.fromFiles(currentBlockFiles, _seenTimes),
+            'Trip2',
+            0,
+            0,
             location,
             firstCreationTime: blockStart,
             lastCreationTime: lastTime,
@@ -584,6 +598,9 @@ class SmartMemoriesService {
             )) {
           mergedTrips[idx] = TripMemory(
             otherTrip.memories + trip.memories,
+            'Trip3',
+            0,
+            0,
             otherTrip.location,
             firstCreationTime:
                 min(otherTrip.firstCreationTime!, trip.firstCreationTime!),
@@ -599,6 +616,9 @@ class SmartMemoriesService {
       mergedTrips.add(
         TripMemory(
           trip.memories,
+          'Trip4',
+          0,
+          0,
           trip.location,
           firstCreationTime: trip.firstCreationTime,
           lastCreationTime: trip.lastCreationTime,
@@ -629,8 +649,10 @@ class SmartMemoriesService {
       memoryResults.add(
         TripMemory(
           Memory.fromFiles(baseLocation.files, _seenTimes),
+          name,
+          0,
+          0,
           baseLocation.location,
-          name: name,
         ),
       );
     }
@@ -676,10 +698,28 @@ class SmartMemoriesService {
           name = "Last year's trip";
         }
         final photoSelection = await _bestSelection(trip.memories);
+        final firstCreationDate = DateTime.fromMicrosecondsSinceEpoch(
+          trip.firstCreationTime!,
+        );
+        final firstDateToShow = DateTime(
+          currentTime.year,
+          firstCreationDate.month,
+          firstCreationDate.day,
+        ).subtract(kMemoriesMargin).microsecondsSinceEpoch;
+        final lastCreationDate = DateTime.fromMicrosecondsSinceEpoch(
+          trip.lastCreationTime!,
+        );
+        final lastDateToShow = DateTime(
+          currentTime.year,
+          lastCreationDate.month,
+          lastCreationDate.day,
+        ).add(kMemoriesMargin).microsecondsSinceEpoch;
         memoryResults.add(
           trip.copyWith(
             memories: photoSelection,
-            name: name,
+            title: name,
+            firstDateToShow: firstDateToShow,
+            lastDateToShow: lastDateToShow,
           ),
         );
       }
@@ -717,10 +757,28 @@ class SmartMemoriesService {
               name = "Last year's trip";
             }
             final photoSelection = await _bestSelection(trip.memories);
+            final firstCreationDate = DateTime.fromMicrosecondsSinceEpoch(
+              trip.firstCreationTime!,
+            );
+            final firstDateToShow = DateTime(
+              currentTime.year,
+              firstCreationDate.month,
+              firstCreationDate.day,
+            ).subtract(kMemoriesMargin).microsecondsSinceEpoch;
+            final lastCreationDate = DateTime.fromMicrosecondsSinceEpoch(
+              trip.lastCreationTime!,
+            );
+            final lastDateToShow = DateTime(
+              currentTime.year,
+              lastCreationDate.month,
+              lastCreationDate.day,
+            ).add(kMemoriesMargin).microsecondsSinceEpoch;
             memoryResults.add(
               trip.copyWith(
                 memories: photoSelection,
-                name: name,
+                title: name,
+                firstDateToShow: firstDateToShow,
+                lastDateToShow: lastDateToShow,
               ),
             );
             break checkUpcomingMonths;
@@ -741,6 +799,7 @@ class SmartMemoriesService {
     final currentDayMonth = currentTime.month * 100 + currentTime.day;
     final currentWeek = _getWeekNumber(currentTime);
     final currentMonth = currentTime.month;
+    final currentYear = currentTime.year;
     final cutOffTime = currentTime.subtract(const Duration(days: 365));
     final averageDailyPhotos = allFiles.length / 365;
     final significantDayThreshold = averageDailyPhotos * 0.25;
@@ -766,7 +825,7 @@ class SmartMemoriesService {
     // Process each nearby day-month to find significant days
     for (final dayMonth in dayMonthYearGroups.keys) {
       final dayDiff = dayMonth - currentDayMonth;
-      if (dayDiff < 0 || dayDiff > 2) continue;
+      if (dayDiff < 0 || dayDiff > kMemoriesUpdateFrequency.inDays) continue;
       // TODO: lau: this doesn't cover month changes properly
 
       final yearGroups = dayMonthYearGroups[dayMonth]!;
@@ -776,7 +835,6 @@ class SmartMemoriesService {
           .toList();
 
       if (significantDays.length >= 3) {
-        // THE ISSUE IS HERE, MOST LIKELY IN THE SELECTION!
         // Combine all years for this day-month
         final date =
             DateTime(currentTime.year, dayMonth ~/ 100, dayMonth % 100);
@@ -786,24 +844,35 @@ class SmartMemoriesService {
         memoryResult.add(
           TimeMemory(
             photoSelection,
-            name: "${DateFormat('MMMM d').format(date)} through the years",
+            "${DateFormat('MMMM d').format(date)} through the years",
+            date.subtract(kMemoriesMargin).microsecondsSinceEpoch,
+            date.add(const Duration(days: 1)).microsecondsSinceEpoch,
           ),
         );
       } else {
         // Individual entries for significant years
         for (final year in significantDays) {
           final date = DateTime(year, dayMonth ~/ 100, dayMonth % 100);
+          final showDate =
+              DateTime(currentYear, dayMonth ~/ 100, dayMonth % 100);
           final files = yearGroups[year]!;
           final photoSelection = await _bestSelection(files);
           String name = DateFormat.yMMMd(_locale?.languageCode).format(date);
-          if (date.day == currentTime.day && date.month == currentTime.month) {
-            name = "This day, ${currentTime.year - date.year} years back";
-          }
-
           memoryResult.add(
             TimeMemory(
               photoSelection,
-              name: name,
+              name,
+              showDate.subtract(kMemoriesMargin).microsecondsSinceEpoch,
+              showDate.microsecondsSinceEpoch,
+            ),
+          );
+          name = "This day, ${currentTime.year - date.year} years back";
+          memoryResult.add(
+            TimeMemory(
+              photoSelection,
+              name,
+              showDate.microsecondsSinceEpoch,
+              showDate.add(const Duration(days: 1)).microsecondsSinceEpoch,
             ),
           );
         }
@@ -843,7 +912,9 @@ class SmartMemoriesService {
           memoryResult.add(
             TimeMemory(
               photoSelection,
-              name: name,
+              name,
+              currentTime.subtract(kMemoriesMargin).microsecondsSinceEpoch,
+              currentTime.add(kMemoriesUpdateFrequency).microsecondsSinceEpoch,
             ),
           );
         } else {
@@ -860,7 +931,11 @@ class SmartMemoriesService {
             memoryResult.add(
               TimeMemory(
                 photoSelection,
-                name: name,
+                name,
+                currentTime.subtract(kMemoriesMargin).microsecondsSinceEpoch,
+                currentTime
+                    .add(kMemoriesUpdateFrequency)
+                    .microsecondsSinceEpoch,
               ),
             );
           }
@@ -908,11 +983,18 @@ class SmartMemoriesService {
         );
         final monthName = DateFormat.MMMM(_locale?.languageCode)
             .format(DateTime(year, currentMonth));
+        final daysLeftInMonth = DateTime(currentYear, currentMonth + 1, 0).day -
+            currentTime.day +
+            1;
         final name = monthName + ", ${currentTime.year - year} years back";
         memoryResult.add(
           TimeMemory(
             photoSelection,
-            name: name,
+            name,
+            currentTime.microsecondsSinceEpoch,
+            currentTime
+                .add(Duration(days: daysLeftInMonth))
+                .microsecondsSinceEpoch,
           ),
         );
       }
@@ -926,17 +1008,22 @@ class SmartMemoriesService {
         await _bestSelection(allPhotos, prefferedSize: monthSelectionSize);
     final monthName = DateFormat.MMMM(_locale?.languageCode)
         .format(DateTime(currentTime.year, currentMonth));
+    final daysLeftInMonth =
+        DateTime(currentYear, currentMonth + 1, 0).day - currentTime.day + 1;
     final name = monthName + " through the years";
     memoryResult.add(
       TimeMemory(
         photoSelection,
-        name: name,
+        name,
+        currentTime.microsecondsSinceEpoch,
+        currentTime.add(Duration(days: daysLeftInMonth)).microsecondsSinceEpoch,
       ),
     );
 
     return memoryResult;
   }
 
+  /// TODO: lau: replace this by just taking next 7 days
   int _getWeekNumber(DateTime date) {
     // Get day of year (1-366)
     final int dayOfYear = int.parse(DateFormat('D').format(date));
diff --git a/mobile/lib/ui/home/memories/memories_widget.dart b/mobile/lib/ui/home/memories/memories_widget.dart
index 19557fdebb..002a899245 100644
--- a/mobile/lib/ui/home/memories/memories_widget.dart
+++ b/mobile/lib/ui/home/memories/memories_widget.dart
@@ -128,7 +128,8 @@ class _MemoriesWidgetState extends State<MemoriesWidget> {
   }
 
   Widget _buildSmartMemories(List<SmartMemory> memories) {
-    final collatedMemories = memories.map((e) => (e.memories, e.name)).toList();
+    final collatedMemories =
+        memories.map((e) => (e.memories, e.title)).toList();
 
     return SizedBox(
       height: _maxHeight + MemoryCoverWidget.outerStrokeWidth * 2,

From c1a2f226ef83b22853587962f5e838c92a358b37 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 14:13:34 +0530
Subject: [PATCH 632/796] Move

---
 .../new/photos/services/{collection/index.ts => collection.ts}    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename web/packages/new/photos/services/{collection/index.ts => collection.ts} (100%)

diff --git a/web/packages/new/photos/services/collection/index.ts b/web/packages/new/photos/services/collection.ts
similarity index 100%
rename from web/packages/new/photos/services/collection/index.ts
rename to web/packages/new/photos/services/collection.ts

From 2cdd919c37400b166c8f006c11a63cfba0a0fef9 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 28 Feb 2025 14:14:32 +0530
Subject: [PATCH 633/796] [mob] Clean up deprecated invalidFileIDs

---
 .../lib/services/local/local_sync_util.dart   |  4 ----
 mobile/lib/services/local_sync_service.dart   | 24 ++++---------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/mobile/lib/services/local/local_sync_util.dart b/mobile/lib/services/local/local_sync_util.dart
index 65b5bf2a80..c37b37e954 100644
--- a/mobile/lib/services/local/local_sync_util.dart
+++ b/mobile/lib/services/local/local_sync_util.dart
@@ -123,12 +123,10 @@ Future<LocalDiffResult> getDiffWithLocal(
   // current set of assets available on device
   Set<String> existingIDs, // localIDs of files already imported in app
   Map<String, Set<String>> pathToLocalIDs,
-  Set<String> invalidIDs,
 ) async {
   final Map<String, dynamic> args = <String, dynamic>{};
   args['assets'] = assets;
   args['existingIDs'] = existingIDs;
-  args['invalidIDs'] = invalidIDs;
   args['pathToLocalIDs'] = pathToLocalIDs;
   final LocalDiffResult diffResult = await Computer.shared().compute(
     _getLocalAssetsDiff,
@@ -147,7 +145,6 @@ Future<LocalDiffResult> getDiffWithLocal(
 LocalDiffResult _getLocalAssetsDiff(Map<String, dynamic> args) {
   final List<LocalPathAsset> onDeviceLocalPathAsset = args['assets'];
   final Set<String> existingIDs = args['existingIDs'];
-  final Set<String> invalidIDs = args['invalidIDs'];
   final Map<String, Set<String>> pathToLocalIDs = args['pathToLocalIDs'];
   final Map<String, Set<String>> newPathToLocalIDs = <String, Set<String>>{};
   final Map<String, Set<String>> removedPathToLocalIDs =
@@ -179,7 +176,6 @@ LocalDiffResult _getLocalAssetsDiff(Map<String, dynamic> args) {
     // End
 
     localPathAsset.localIDs.removeAll(existingIDs);
-    localPathAsset.localIDs.removeAll(invalidIDs);
     if (localPathAsset.localIDs.isNotEmpty) {
       unsyncedAssets.add(localPathAsset);
     }
diff --git a/mobile/lib/services/local_sync_service.dart b/mobile/lib/services/local_sync_service.dart
index d8237dd92a..e875ae2751 100644
--- a/mobile/lib/services/local_sync_service.dart
+++ b/mobile/lib/services/local_sync_service.dart
@@ -39,10 +39,6 @@ class LocalSyncService {
   static const kHasGrantedPermissionsKey = "has_granted_permissions";
   static const kPermissionStateKey = "permission_state";
 
-  // Adding `_2` as a suffic to pull files that were earlier ignored due to permission errors
-  // See https://github.com/CaiJingLong/flutter_photo_manager/issues/589
-  static const kInvalidFileIDsKey = "invalid_file_ids_2";
-
   LocalSyncService._privateConstructor();
 
   static final LocalSyncService instance =
@@ -79,7 +75,7 @@ class LocalSyncService {
     }
     _existingSync = Completer<void>();
     final int ownerID = Configuration.instance.getUserID()!;
-    
+
     // We use a lock to prevent synchronisation to occur while it is downloading
     // as this introduces wrong entry in FilesDB due to race condition
     // This is a fix for https://github.com/ente-io/ente/issues/4296
@@ -98,7 +94,8 @@ class LocalSyncService {
         );
       } else {
         // Load from 0 - 01.01.2010
-        Bus.instance.fire(SyncStatusUpdate(SyncStatus.startedFirstGalleryImport));
+        Bus.instance
+            .fire(SyncStatusUpdate(SyncStatus.startedFirstGalleryImport));
         var startTime = 0;
         var toYear = 2010;
         var toTime = DateTime(toYear).microsecondsSinceEpoch;
@@ -170,12 +167,11 @@ class LocalSyncService {
     final existingLocalFileIDs = await _db.getExistingLocalFileIDs(ownerID);
     final Map<String, Set<String>> pathToLocalIDs =
         await _db.getDevicePathIDToLocalIDMap();
-    final invalidIDs = _getInvalidFileIDs().toSet();
+
     final localDiffResult = await getDiffWithLocal(
       localAssets,
       existingLocalFileIDs,
       pathToLocalIDs,
-      invalidIDs,
     );
     bool hasAnyMappingChanged = false;
     if (localDiffResult.newPathToLocalIDs?.isNotEmpty ?? false) {
@@ -237,18 +233,6 @@ class LocalSyncService {
     await IgnoredFilesService.instance.cacheAndInsert([ignored]);
   }
 
-  @Deprecated(
-    "remove usage after few releases as we will switch to ignored files. Keeping it now to clear the invalid file ids from shared prefs",
-  )
-  List<String> _getInvalidFileIDs() {
-    if (_prefs.containsKey(kInvalidFileIDsKey)) {
-      _prefs.remove(kInvalidFileIDsKey);
-      return <String>[];
-    } else {
-      return <String>[];
-    }
-  }
-
   Lock getLock() {
     return _lock;
   }

From 103901bbd3c6743089e0aabfca820c15c2cbeba9 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Fri, 28 Feb 2025 14:15:40 +0530
Subject: [PATCH 634/796] [mob][photos] Fix ordering

---
 mobile/lib/services/smart_memories_service.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index e2dc617782..e5eb142b7d 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -1334,7 +1334,7 @@ class SmartMemoriesService {
 
     // Order the final selection chronologically
     filteredMemories
-        .sort((a, b) => b.file.creationTime!.compareTo(a.file.creationTime!));
+        .sort((a, b) => a.file.creationTime!.compareTo(b.file.creationTime!));
     return filteredMemories;
   }
 }

From 09e65e8d003be7354de4b5a8288dfb1d81bc13d4 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Fri, 28 Feb 2025 14:24:04 +0530
Subject: [PATCH 635/796] [mob][photos] Remove singleton pattern

---
 mobile/lib/service_locator.dart                 | 7 +++++++
 mobile/lib/services/memories_cache_service.dart | 5 ++---
 mobile/lib/services/smart_memories_service.dart | 5 +----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/mobile/lib/service_locator.dart b/mobile/lib/service_locator.dart
index 037e7c9a7e..599d7c04eb 100644
--- a/mobile/lib/service_locator.dart
+++ b/mobile/lib/service_locator.dart
@@ -11,6 +11,7 @@ import "package:photos/services/machine_learning/face_ml/face_recognition_servic
 import "package:photos/services/machine_learning/machine_learning_controller.dart";
 import "package:photos/services/magic_cache_service.dart";
 import "package:photos/services/memories_cache_service.dart";
+import "package:photos/services/smart_memories_service.dart";
 import "package:photos/services/storage_bonus_service.dart";
 import "package:photos/services/trash_sync_service.dart";
 import "package:photos/services/update_service.dart";
@@ -127,6 +128,12 @@ MemoriesCacheService get memoriesCacheService {
   return _memoriesCacheService!;
 }
 
+SmartMemoriesService? _smartMemoriesService;
+SmartMemoriesService get smartMemoriesService {
+  _smartMemoriesService ??= SmartMemoriesService();
+  return _smartMemoriesService!;
+}
+
 BillingService? _billingService;
 BillingService get billingService {
   _billingService ??= BillingService(
diff --git a/mobile/lib/services/memories_cache_service.dart b/mobile/lib/services/memories_cache_service.dart
index 40c9d8ea72..6745f314d3 100644
--- a/mobile/lib/services/memories_cache_service.dart
+++ b/mobile/lib/services/memories_cache_service.dart
@@ -15,7 +15,6 @@ import "package:photos/models/smart_memory.dart";
 import "package:photos/service_locator.dart";
 import "package:photos/services/location_service.dart";
 import "package:photos/services/search_service.dart";
-import "package:photos/services/smart_memories_service.dart";
 import "package:shared_preferences/shared_preferences.dart";
 
 class MemoriesCacheService {
@@ -137,9 +136,9 @@ class MemoriesCacheService {
       // calculate memories for this period and for the next period
       final now = DateTime.now();
       final next = now.add(kMemoriesUpdateFrequency);
-      final nowMemories = await SmartMemoriesService.instance.calcMemories(now);
+      final nowMemories = await smartMemoriesService.calcMemories(now);
       final nextMemories =
-          await SmartMemoriesService.instance.calcMemories(next);
+          await smartMemoriesService.calcMemories(next);
       w?.log("calculated new memories");
       final oldCache = await _readCacheFromDisk();
       w?.log("gotten old cache");
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index e5eb142b7d..f5e4375a0d 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -48,10 +48,7 @@ class SmartMemoriesService {
   static const _clipSimilarImageThreshold = 0.75;
   static const _clipActivityQueryThreshold = 0.25;
 
-  // Singleton pattern
-  SmartMemoriesService._privateConstructor();
-  static final instance = SmartMemoriesService._privateConstructor();
-  factory SmartMemoriesService() => instance;
+  SmartMemoriesService();
 
   Future<void> init() async {
     if (_isInit) return;

From 11a42e7ee3dfba588f8fb077ae605038697d9e3d Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Fri, 28 Feb 2025 14:26:42 +0530
Subject: [PATCH 636/796] fix: remove ticks from seekbar & change video source
 correctly

---
 .../lib/events/seekbar_triggered_event.dart   |  7 ++
 .../seek_bar.dart                             | 15 ++++
 .../ui/viewer/file/video_widget_native.dart   | 68 ++++++++++++-------
 3 files changed, 64 insertions(+), 26 deletions(-)
 create mode 100644 mobile/lib/events/seekbar_triggered_event.dart

diff --git a/mobile/lib/events/seekbar_triggered_event.dart b/mobile/lib/events/seekbar_triggered_event.dart
new file mode 100644
index 0000000000..33d5aa3014
--- /dev/null
+++ b/mobile/lib/events/seekbar_triggered_event.dart
@@ -0,0 +1,7 @@
+import "package:photos/events/event.dart";
+
+class SeekbarTriggeredEvent extends Event {
+  final int position;
+
+  SeekbarTriggeredEvent({required this.position});
+}
diff --git a/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart b/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart
index 574bd4f132..c3a9e80f8c 100644
--- a/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart
+++ b/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart
@@ -2,6 +2,8 @@ import "dart:async";
 
 import "package:flutter/material.dart";
 import "package:native_video_player/native_video_player.dart";
+import "package:photos/core/event_bus.dart";
+import "package:photos/events/seekbar_triggered_event.dart";
 import "package:photos/theme/colors.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/utils/debouncer.dart";
@@ -23,6 +25,7 @@ class _SeekBarState extends State<SeekBar> with SingleTickerProviderStateMixin {
     executionInterval: const Duration(milliseconds: 325),
   );
   StreamSubscription<void>? _eventsSubscription;
+  StreamSubscription<SeekbarTriggeredEvent>? _seekbarSubscription;
 
   @override
   void initState() {
@@ -33,6 +36,16 @@ class _SeekBarState extends State<SeekBar> with SingleTickerProviderStateMixin {
       value: 0,
     );
 
+    Future.microtask(() {
+      _seekbarSubscription =
+          Bus.instance.on<SeekbarTriggeredEvent>().listen((event) {
+        if (!mounted || _animationController.value == event.position) return;
+
+        _animationController.value = event.position.toDouble();
+        setState(() {});
+      });
+    });
+
     _eventsSubscription = widget.controller.events.listen(
       _listen,
     );
@@ -42,6 +55,7 @@ class _SeekBarState extends State<SeekBar> with SingleTickerProviderStateMixin {
 
   @override
   void dispose() {
+    _seekbarSubscription?.cancel();
     _eventsSubscription?.cancel();
     _animationController.dispose();
     _debouncer.cancelDebounceTimer();
@@ -57,6 +71,7 @@ class _SeekBarState extends State<SeekBar> with SingleTickerProviderStateMixin {
         return SliderTheme(
           data: SliderTheme.of(context).copyWith(
             trackHeight: 1.0,
+            tickMarkShape: SliderTickMarkShape.noTickMark,
             thumbShape: const RoundSliderThumbShape(enabledThumbRadius: 8.0),
             overlayShape: const RoundSliderOverlayShape(overlayRadius: 14.0),
             activeTrackColor: colorScheme.primary300,
diff --git a/mobile/lib/ui/viewer/file/video_widget_native.dart b/mobile/lib/ui/viewer/file/video_widget_native.dart
index a74cba0132..3d4578e549 100644
--- a/mobile/lib/ui/viewer/file/video_widget_native.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_native.dart
@@ -10,6 +10,7 @@ import "package:photos/core/constants.dart";
 import "package:photos/core/event_bus.dart";
 import "package:photos/events/guest_view_event.dart";
 import "package:photos/events/pause_video_event.dart";
+import "package:photos/events/seekbar_triggered_event.dart";
 import "package:photos/events/stream_switched_event.dart";
 import "package:photos/events/use_media_kit_for_video.dart";
 import "package:photos/generated/l10n.dart";
@@ -108,38 +109,51 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
         Bus.instance.on<StreamSwitchedEvent>().listen((event) {
       if (event.type != PlayerType.nativeVideoPlayer) return;
       if (event.selectedPreview) {
-        loadPreview();
+        loadPreview(update: true);
       } else {
-        loadOriginal();
+        loadOriginal(update: true);
       }
     });
   }
 
-  void loadPreview() {
-    _setFilePathForNativePlayer(widget.playlistData!.preview.path);
+  Future<void> setVideoSource() async {
+    final videoSource = VideoSource(
+      path: _filePath!,
+      type: VideoSourceType.file,
+    );
+    await _controller?.loadVideo(videoSource);
+    await _controller?.play();
+
+    Bus.instance.fire(SeekbarTriggeredEvent(position: 0));
   }
 
-  void loadOriginal() {
+  void loadPreview({bool update = false}) async {
+    _setFilePathForNativePlayer(widget.playlistData!.preview.path, update);
+
+    await setVideoSource();
+  }
+
+  void loadOriginal({bool update = false}) async {
     if (widget.file.isRemoteFile) {
-      _loadNetworkVideo();
+      _loadNetworkVideo(update);
       _setFileSizeIfNull();
     } else if (widget.file.isSharedMediaToAppSandbox) {
       final localFile = File(getSharedMediaFilePath(widget.file));
       if (localFile.existsSync()) {
-        _setFilePathForNativePlayer(localFile.path);
+        _setFilePathForNativePlayer(localFile.path, update);
       } else if (widget.file.uploadedFileID != null) {
-        _loadNetworkVideo();
+        _loadNetworkVideo(update);
       }
     } else {
-      widget.file.getAsset.then((asset) async {
+      await widget.file.getAsset.then((asset) async {
         if (asset == null || !(await asset.exists)) {
           if (widget.file.uploadedFileID != null) {
-            _loadNetworkVideo();
+            _loadNetworkVideo(update);
           }
         } else {
           // ignore: unawaited_futures
           getFile(widget.file, isOrigin: true).then((file) {
-            _setFilePathForNativePlayer(file!.path);
+            _setFilePathForNativePlayer(file!.path, update);
             if (Platform.isIOS) {
               _shouldClearCache = true;
             }
@@ -147,6 +161,9 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
         }
       });
     }
+    if (update) {
+      await setVideoSource();
+    }
   }
 
   @override
@@ -372,11 +389,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
 
       _isSeeking.addListener(_seekListener);
 
-      final videoSource = VideoSource(
-        path: _filePath!,
-        type: VideoSourceType.file,
-      );
-      await controller.loadVideo(videoSource);
+      await setVideoSource();
     } catch (e) {
       _logger.severe(
         "Error initializing native video player controller for file gen id: ${widget.file.generatedID}",
@@ -478,7 +491,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
     }
   }
 
-  void _loadNetworkVideo() {
+  void _loadNetworkVideo(bool update) {
     getFileFromServer(
       widget.file,
       progressCallback: (count, total) {
@@ -494,7 +507,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
       },
     ).then((file) {
       if (file != null) {
-        _setFilePathForNativePlayer(file.path);
+        _setFilePathForNativePlayer(file.path, update);
       }
     }).onError((error, stackTrace) {
       showErrorDialog(
@@ -578,14 +591,17 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
     );
   }
 
-  void _setFilePathForNativePlayer(String url) {
-    if (mounted) {
-      setState(() {
-        _filePath = url;
-      });
-      _setAspectRatioFromVideoProps().then((_) {
-        setState(() {});
-      });
+  void _setFilePathForNativePlayer(String url, bool update) {
+    if (!mounted) return;
+    setState(() {
+      _filePath = url;
+    });
+    _setAspectRatioFromVideoProps().then((_) {
+      setState(() {});
+    });
+
+    if (update) {
+      setVideoSource();
     }
   }
 

From 0f732c0b61e8bde7ee1cc4d0701c60d850083a70 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 14:37:30 +0530
Subject: [PATCH 637/796] Impl

---
 web/apps/photos/src/components/PhotoFrame.tsx | 18 ++++++-
 .../gallery/components/viewer/FileViewer.tsx  | 50 +++++++------------
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index a18242a46c..56a5b5a4eb 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -21,8 +21,12 @@ import { t } from "i18next";
 import { useRouter } from "next/router";
 import { GalleryContext } from "pages/gallery";
 import PhotoSwipe from "photoswipe";
-import { useCallback, useContext, useEffect, useState } from "react";
+import { useCallback, useContext, useEffect, useMemo, useState } from "react";
 import AutoSizer from "react-virtualized-auto-sizer";
+import {
+    addToFavorites,
+    removeFromFavorites,
+} from "services/collectionService";
 import uploadManager from "services/upload/uploadManager";
 import {
     SelectedState,
@@ -266,6 +270,17 @@ const PhotoFrame = ({
         [onSyncWithRemote],
     );
 
+    const handleToggleFavorite = useMemo(() => {
+        return favoriteFileIDs
+            ? (file: EnteFile) => {
+                  const isFavorite = favoriteFileIDs!.has(file.id);
+                  return (isFavorite ? removeFromFavorites : addToFavorites)(
+                      file,
+                  );
+              }
+            : undefined;
+    }, [favoriteFileIDs]);
+
     const handleSaveEditedImageCopy = useCallback(
         (editedFile: File, collection: Collection, enteFile: EnteFile) => {
             uploadManager.prepareForNewUpload();
@@ -557,6 +572,7 @@ const PhotoFrame = ({
                     isInHiddenSection={isInHiddenSection}
                     isInTrashSection={activeCollectionID === TRASH_SECTION}
                     onTriggerSyncWithRemote={handleTriggerSyncWithRemote}
+                    onToggleFavorite={handleToggleFavorite}
                     onSaveEditedImageCopy={handleSaveEditedImageCopy}
                     {...{
                         favoriteFileIDs,
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 55800ab218..1a8244c39a 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -14,7 +14,6 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 }
 
 import { isDesktop } from "@/base/app";
-import { assertionFailed } from "@/base/assert";
 import { type ModalVisibilityProps } from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
 import { lowercaseExtension } from "@/base/file-name";
@@ -43,19 +42,6 @@ import {
     type FileViewerPhotoSwipeDelegate,
 } from "./photoswipe";
 
-// TODO
-// import {
-//     addToFavorites,
-//     removeFromFavorites,
-// } from "apps/photos/services/collectionService";
-// import { wait } from "@/utils/promise";
-// const addToFavorites = async (file: EnteFile) => {
-//     console.log(file);
-//     await wait(3000);
-//     throw new Error("test");
-// };
-// const removeFromFavorites = addToFavorites;
-
 export type FileViewerProps = ModalVisibilityProps & {
     /**
      * The currently logged in user, if any.
@@ -123,6 +109,16 @@ export type FileViewerProps = ModalVisibilityProps & {
      * not defined, then this prop is not used.
      */
     onTriggerSyncWithRemote?: () => void;
+    /**
+     * Called when the favorite status of given {@link file} should be toggled
+     * from its current value.
+     *
+     * If this is not provided then the favorite toggle button will not be shown
+     * in the file actions.
+     *
+     * See also {@link favoriteFileIDs}.
+     */
+    onToggleFavorite?: (file: EnteFile) => Promise<void>;
     /**
      * Called when the user edits an image in the image editor and asks us to
      * save their edits as a copy.
@@ -157,6 +153,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
     fileCollectionIDs,
     allCollectionsNameByID,
     onTriggerSyncWithRemote,
+    onToggleFavorite,
     onSelectCollection,
     onSelectPerson,
     onSaveEditedImageCopy,
@@ -299,29 +296,18 @@ const FileViewer: React.FC<FileViewerProps> = ({
 
     const isFavorite = useCallback(
         ({ file }: FileViewerAnnotatedFile) => {
-            if (!showModifyActions || !favoriteFileIDs) return undefined;
+            if (!showModifyActions || !favoriteFileIDs || !onToggleFavorite) {
+                return undefined;
+            }
             return favoriteFileIDs.has(file.id);
         },
-        [showModifyActions, favoriteFileIDs],
+        [showModifyActions, favoriteFileIDs, onToggleFavorite],
     );
 
     const toggleFavorite = useCallback(
-        async (annotatedFile: FileViewerAnnotatedFile) => {
-            const { file, annotation } = annotatedFile;
-
-            const isFav = isFavorite(annotatedFile);
-            if (isFav === undefined || !annotation.showFavorite) {
-                assertionFailed();
-                return;
-            }
-
-            try {
-                await (isFav ? removeFromFavorites : addToFavorites)(file);
-            } catch (e) {
-                onGenericError(e);
-            }
-        },
-        [onGenericError, isFavorite],
+        ({ file }: FileViewerAnnotatedFile) =>
+            onToggleFavorite!(file).catch(onGenericError),
+        [onToggleFavorite, onGenericError],
     );
 
     // Initial value of delegate.

From 49c0e32fff4950b2b20c1cf0149215d9e304f874 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Fri, 28 Feb 2025 14:46:12 +0530
Subject: [PATCH 638/796] [mob][photos] Fix null issue

---
 mobile/lib/models/memories_cache.dart           | 6 ++++--
 mobile/lib/services/memories_cache_service.dart | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mobile/lib/models/memories_cache.dart b/mobile/lib/models/memories_cache.dart
index 04939cbff6..2284bb5a57 100644
--- a/mobile/lib/models/memories_cache.dart
+++ b/mobile/lib/models/memories_cache.dart
@@ -117,7 +117,9 @@ class ToShowMemory {
       json['lastTimeToShow'],
       json['calculationTime'],
       personID: json['personID'],
-      peopleMemoryType: peopleMemoryTypeFromString(json['peopleMemoryType']),
+      peopleMemoryType: json['peopleMemoryType'] != null
+          ? peopleMemoryTypeFromString(json['peopleMemoryType'])
+          : null,
       location: json['location'] != null
           ? Location(
               latitude: json['location']['latitude'],
@@ -136,7 +138,7 @@ class ToShowMemory {
       'lastTimeToShow': lastTimeToShow,
       'calculationTime': calculationTime,
       'personID': personID,
-      'peopleMemoryType': peopleMemoryType.toString().split('.').last,
+      'peopleMemoryType': peopleMemoryType?.toString().split('.').last,
       'location': location != null
           ? {
               'latitude': location!.latitude!,
diff --git a/mobile/lib/services/memories_cache_service.dart b/mobile/lib/services/memories_cache_service.dart
index 6745f314d3..fa3fadb9fa 100644
--- a/mobile/lib/services/memories_cache_service.dart
+++ b/mobile/lib/services/memories_cache_service.dart
@@ -95,7 +95,7 @@ class MemoriesCacheService {
 
   Future<String> _getCachePath() async {
     return (await getApplicationSupportDirectory()).path +
-        "/cache//test2/memories_cache";
+        "/cache//test3/memories_cache";
     // TODO: lau: remove the test1 directory after testing
   }
 

From 374979894a0a4f83e995fe2539e5e62c2590fc29 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Fri, 28 Feb 2025 15:08:49 +0530
Subject: [PATCH 639/796] [mob][photos] Cache path

---
 mobile/lib/services/memories_cache_service.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/services/memories_cache_service.dart b/mobile/lib/services/memories_cache_service.dart
index fa3fadb9fa..c6d2bcf8fc 100644
--- a/mobile/lib/services/memories_cache_service.dart
+++ b/mobile/lib/services/memories_cache_service.dart
@@ -95,7 +95,7 @@ class MemoriesCacheService {
 
   Future<String> _getCachePath() async {
     return (await getApplicationSupportDirectory()).path +
-        "/cache//test3/memories_cache";
+        "/cache/test3/memories_cache";
     // TODO: lau: remove the test1 directory after testing
   }
 

From df21d20dd0424f627edd367b36412d71fa3eb591 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 15:21:00 +0530
Subject: [PATCH 640/796] Workable

---
 web/apps/photos/src/components/PhotoFrame.tsx |  7 ++++---
 .../gallery/components/viewer/photoswipe.ts   | 21 ++++++++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 56a5b5a4eb..959395833e 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -272,14 +272,15 @@ const PhotoFrame = ({
 
     const handleToggleFavorite = useMemo(() => {
         return favoriteFileIDs
-            ? (file: EnteFile) => {
+            ? async (file: EnteFile) => {
                   const isFavorite = favoriteFileIDs!.has(file.id);
-                  return (isFavorite ? removeFromFavorites : addToFavorites)(
+                  await (isFavorite ? removeFromFavorites : addToFavorites)(
                       file,
                   );
+                  onMarkUnsyncedFavoriteUpdate(file.id, !isFavorite);
               }
             : undefined;
-    }, [favoriteFileIDs]);
+    }, [favoriteFileIDs, onMarkUnsyncedFavoriteUpdate]);
 
     const handleSaveEditedImageCopy = useCallback(
         (editedFile: File, collection: Collection, enteFile: EnteFile) => {
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index d7f63e69d3..a4087157ce 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -499,14 +499,29 @@ export class FileViewerPhotoSwipe {
             if (showModifyActions) {
                 const toggleFavorite = async (
                     buttonElement: HTMLButtonElement,
-                    value: boolean,
                 ) => {
                     const af = currentAnnotatedFile();
                     this.pendingFavoriteUpdates.add(af.file.id);
                     buttonElement.disabled = true;
                     await delegate.toggleFavorite(af);
+                    // TODO: This can be improved in two ways:
+                    //
+                    // 1. We currently have a setTimeout to ensure that the
+                    //    updated `favoriteFileIDs` have made their way to our
+                    //    delegate before we query for the status again.
+                    //    Obviously, this is hacky. Note that a timeout of 0
+                    //    (i.e., just deferring till the next tick) isn't enough
+                    //    here, for reasons I need to investigate more (hence
+                    //    this TODO).
+                    //
+                    // 2. We reload the entire slide instead of just updating
+                    //    the button state. This is because there are two
+                    //    buttons, instead of a single button toggling between
+                    //    two states (e.g. like the zoom button). A single
+                    //    button can be achieved by moving the fill as a layer.
+                    await new Promise((r) => setTimeout(r, 100));
                     this.pendingFavoriteUpdates.delete(af.file.id);
-                    showFavoriteIf(buttonElement, value);
+                    this.refreshCurrentSlideContent();
                 };
 
                 const showFavoriteIf = (
@@ -529,7 +544,7 @@ export class FileViewerPhotoSwipe {
                     order: 8,
                     isButton: true,
                     html: createPSRegisterElementIconHTML("favorite"),
-                    onClick: (e) => toggleFavorite(e.target, false),
+                    onClick: (e) => toggleFavorite(e.target),
                     onInit: (buttonElement) =>
                         pswp.on("change", () =>
                             showFavoriteIf(buttonElement, false),

From de9cad09c4eeedda00f88548d3d8c3ef3f2b69cf Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 15:28:43 +0530
Subject: [PATCH 641/796] sigh

---
 web/apps/photos/src/components/PhotoFrame.tsx |  1 +
 .../photos/src/services/collectionService.ts  | 25 ++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 959395833e..c779b8412d 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -276,6 +276,7 @@ const PhotoFrame = ({
                   const isFavorite = favoriteFileIDs!.has(file.id);
                   await (isFavorite ? removeFromFavorites : addToFavorites)(
                       file,
+                      true,
                   );
                   onMarkUnsyncedFavoriteUpdate(file.id, !isFavorite);
               }
diff --git a/web/apps/photos/src/services/collectionService.ts b/web/apps/photos/src/services/collectionService.ts
index 2e9250b67a..211021c33b 100644
--- a/web/apps/photos/src/services/collectionService.ts
+++ b/web/apps/photos/src/services/collectionService.ts
@@ -139,11 +139,17 @@ export const createFavoritesCollection = () => {
     return createCollection(FAVORITE_COLLECTION_NAME, CollectionType.favorites);
 };
 
-export const addToFavorites = async (file: EnteFile) => {
-    await addMultipleToFavorites([file]);
+export const addToFavorites = async (
+    file: EnteFile,
+    disableOldWorkaround?: boolean,
+) => {
+    await addMultipleToFavorites([file], disableOldWorkaround);
 };
 
-export const addMultipleToFavorites = async (files: EnteFile[]) => {
+export const addMultipleToFavorites = async (
+    files: EnteFile[],
+    disableOldWorkaround?: boolean,
+) => {
     try {
         let favCollection = await getFavCollection();
         if (!favCollection) {
@@ -152,10 +158,19 @@ export const addMultipleToFavorites = async (files: EnteFile[]) => {
         await addToCollection(favCollection, files);
     } catch (e) {
         log.error("failed to add to favorite", e);
+        // Old code swallowed the error here. This isn't good, but to
+        // avoid changing existing behaviour only new code will set the
+        // disableOldWorkaround flag to instead rethrow it.
+        //
+        // TODO: Migrate old code, remove this flag, always throw.
+        if (disableOldWorkaround) throw e;
     }
 };
 
-export const removeFromFavorites = async (file: EnteFile) => {
+export const removeFromFavorites = async (
+    file: EnteFile,
+    disableOldWorkaround?: boolean,
+) => {
     try {
         const favCollection = await getFavCollection();
         if (!favCollection) {
@@ -164,6 +179,8 @@ export const removeFromFavorites = async (file: EnteFile) => {
         await removeFromCollection(favCollection.id, [file]);
     } catch (e) {
         log.error("remove from favorite failed", e);
+        // TODO: See disableOldWorkaround in addMultipleToFavorites.
+        if (disableOldWorkaround) throw e;
     }
 };
 

From 67dc1b77d433a5cbaf3cc4adeab5e6f675a816b7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 15:32:33 +0530
Subject: [PATCH 642/796] Fix

---
 web/packages/gallery/components/viewer/photoswipe.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index a4087157ce..a421309941 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -530,7 +530,10 @@ export class FileViewerPhotoSwipe {
                 ) => {
                     const af = currentAnnotatedFile();
                     const isFavorite = delegate.isFavorite(af);
-                    showIf(buttonElement, isFavorite === value);
+                    showIf(
+                        buttonElement,
+                        af.annotation.showFavorite && isFavorite === value,
+                    );
                     buttonElement.disabled = this.pendingFavoriteUpdates.has(
                         af.file.id,
                     );

From dce95ad4f1183438a9b5be45e77a18610edc542d Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 15:49:00 +0530
Subject: [PATCH 643/796] more

---
 .../gallery/components/viewer/FileViewer.tsx        | 11 +++++++++++
 .../gallery/components/viewer/photoswipe.ts         | 13 ++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 1a8244c39a..30afccb4a3 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -266,6 +266,16 @@ const FileViewer: React.FC<FileViewerProps> = ({
             : undefined;
     }, [onSelectPerson, handleClose]);
 
+    const handleMore = useCallback(
+        (
+            annotatedFile: FileViewerAnnotatedFile,
+            buttonElement: HTMLElement,
+        ) => {
+            console.log({ annotatedFile, buttonElement });
+        },
+        [],
+    );
+
     const handleEditImage = useMemo(() => {
         return onSaveEditedImageCopy
             ? (annotatedFile: FileViewerAnnotatedFile) => {
@@ -336,6 +346,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 onClose: handleClose,
                 onAnnotate: handleAnnotate,
                 onViewInfo: handleViewInfo,
+                onMore: handleMore,
                 onEditImage: handleEditImage,
             });
 
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index a421309941..8d60b8dbda 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -135,6 +135,16 @@ type FileViewerPhotoSwipeOptions = Pick<
      * Called when the user activates the info action on a file.
      */
     onViewInfo: (annotatedFile: FileViewerAnnotatedFile) => void;
+    /**
+     * Called when the user activates the more action on a file.
+     *
+     * In addition to the file, callback is also passed a reference to the HTML
+     * DOM more button element.
+     */
+    onMore: (
+        annotatedFile: FileViewerAnnotatedFile,
+        buttonElement: HTMLElement,
+    ) => void;
     /**
      * Called when the user activates the edit action on an image.
      *
@@ -228,6 +238,7 @@ export class FileViewerPhotoSwipe {
         onClose,
         onAnnotate,
         onViewInfo,
+        onMore,
         onEditImage,
     }: FileViewerPhotoSwipeOptions) {
         this.opts = { disableDownload };
@@ -605,7 +616,7 @@ export class FileViewerPhotoSwipe {
                 order: 17,
                 isButton: true,
                 html: createPSRegisterElementIconHTML("more"),
-                // onClick: withCurrentAnnotatedFile(delegate.onViewInfo),
+                onClick: (e) => onMore(currentAnnotatedFile(), e.target),
             });
         });
 

From 5adac095a61fe61607f7afc1e9d9a3920e71d590 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 15:59:35 +0530
Subject: [PATCH 644/796] Anchor

---
 .../gallery/components/viewer/FileViewer.tsx  | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 30afccb4a3..dc70c52075 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -32,7 +32,7 @@ import {
     ImageEditorOverlay,
     type ImageEditorOverlayProps,
 } from "@/new/photos/components/ImageEditorOverlay";
-import { Button, styled } from "@mui/material";
+import { Button, Menu, styled } from "@mui/material";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { fileInfoExifForFile } from "./data-source";
 import {
@@ -200,6 +200,9 @@ const FileViewer: React.FC<FileViewerProps> = ({
     >(undefined);
 
     const [openFileInfo, setOpenFileInfo] = useState(false);
+    const [moreMenuAnchorEl, setMoreMenuAnchorEl] = useState<
+        HTMLElement | undefined
+    >(undefined);
     const [openImageEditor, setOpenImageEditor] = useState(false);
 
     // If `true`, then we need to trigger a sync with remote when we close.
@@ -245,7 +248,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
         [],
     );
 
-    const handleInfoClose = useCallback(() => setOpenFileInfo(false), []);
+    const handleFileInfoClose = useCallback(() => setOpenFileInfo(false), []);
 
     const handleScheduleUpdate = useCallback(() => setNeedsSync(true), []);
 
@@ -271,11 +274,17 @@ const FileViewer: React.FC<FileViewerProps> = ({
             annotatedFile: FileViewerAnnotatedFile,
             buttonElement: HTMLElement,
         ) => {
-            console.log({ annotatedFile, buttonElement });
+            setActiveAnnotatedFile(annotatedFile);
+            setMoreMenuAnchorEl(buttonElement);
         },
         [],
     );
 
+    const handleMoreMenuClose = useCallback(
+        () => setMoreMenuAnchorEl(undefined),
+        [],
+    );
+
     const handleEditImage = useMemo(() => {
         return onSaveEditedImageCopy
             ? (annotatedFile: FileViewerAnnotatedFile) => {
@@ -368,6 +377,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
         handleClose,
         handleAnnotate,
         handleViewInfo,
+        handleMore,
         handleEditImage,
     ]);
 
@@ -382,7 +392,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
             <Button>Test</Button>
             <FileInfo
                 open={openFileInfo}
-                onClose={handleInfoClose}
+                onClose={handleFileInfoClose}
                 file={activeAnnotatedFile?.file}
                 exif={activeFileExif}
                 allowEdits={!!activeAnnotatedFile?.annotation.isOwnFile}
@@ -394,6 +404,13 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 onSelectPerson={handleSelectPerson}
                 {...{ fileCollectionIDs, allCollectionsNameByID }}
             />
+            <Menu
+                open={!!moreMenuAnchorEl}
+                onClose={handleMoreMenuClose}
+                anchorEl={moreMenuAnchorEl}
+            >
+                Test
+            </Menu>
             <ImageEditorOverlay
                 open={openImageEditor}
                 onClose={handleImageEditorClose}

From d3cec93c035414d49b7ecdcb66996f47020627cb Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 16:02:55 +0530
Subject: [PATCH 645/796] type

---
 web/packages/gallery/components/viewer/FileViewer.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index dc70c52075..30821b1908 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -200,9 +200,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
     >(undefined);
 
     const [openFileInfo, setOpenFileInfo] = useState(false);
-    const [moreMenuAnchorEl, setMoreMenuAnchorEl] = useState<
-        HTMLElement | undefined
-    >(undefined);
+    const [moreMenuAnchorEl, setMoreMenuAnchorEl] =
+        useState<HTMLElement | null>(null);
     const [openImageEditor, setOpenImageEditor] = useState(false);
 
     // If `true`, then we need to trigger a sync with remote when we close.
@@ -281,7 +280,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
     );
 
     const handleMoreMenuClose = useCallback(
-        () => setMoreMenuAnchorEl(undefined),
+        () => setMoreMenuAnchorEl(null),
         [],
     );
 

From 4323ae9422b937412875880f977686032e3ac725 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 28 Feb 2025 16:10:53 +0530
Subject: [PATCH 646/796] [mob] Move

---
 mobile/lib/models/api/metadata.dart | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 mobile/lib/models/api/metadata.dart

diff --git a/mobile/lib/models/api/metadata.dart b/mobile/lib/models/api/metadata.dart
new file mode 100644
index 0000000000..e69de29bb2

From 805042231356a214091f6cc9673216f17108b029 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 16:32:11 +0530
Subject: [PATCH 647/796] Fix

---
 web/apps/photos/src/pages/shared-albums.tsx | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/web/apps/photos/src/pages/shared-albums.tsx b/web/apps/photos/src/pages/shared-albums.tsx
index 1e52800a82..97a8374827 100644
--- a/web/apps/photos/src/pages/shared-albums.tsx
+++ b/web/apps/photos/src/pages/shared-albums.tsx
@@ -60,7 +60,7 @@ import { ITEM_TYPE, TimeStampListItem } from "components/PhotoList";
 import { Upload } from "components/Upload";
 import { t } from "i18next";
 import { useRouter } from "next/router";
-import { useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { type FileWithPath } from "react-dropzone";
 import {
     getLocalPublicCollection,
@@ -289,7 +289,7 @@ export default function PublicCollectionGallery() {
         );
     }, [onAddPhotos]);
 
-    const syncWithRemote = async () => {
+    const handleSyncWithRemote = useCallback(async () => {
         const collectionUID = getPublicCollectionUID(
             credentials.current.accessToken,
         );
@@ -369,7 +369,10 @@ export default function PublicCollectionGallery() {
             hideLoadingBar();
             setLoading(false);
         }
-    };
+    }, [showLoadingBar, hideLoadingBar]);
+
+    // TODO: See gallery
+    const syncWithRemote = handleSyncWithRemote;
 
     const verifyLinkPassword: SingleInputFormProps["callback"] = async (
         password,
@@ -510,7 +513,7 @@ export default function PublicCollectionGallery() {
 
                 <PhotoFrame
                     files={publicFiles}
-                    syncWithRemote={syncWithRemote}
+                    onSyncWithRemote={handleSyncWithRemote}
                     setSelected={setSelected}
                     selected={selected}
                     activeCollectionID={ALL_SECTION}

From cae5b2ad4d72b2afb63d688a5f77d3ee8bbd00d5 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 16:21:09 +0530
Subject: [PATCH 648/796] Update deps to pick up new MUI

MenuListProps are (will eventually be) deprecated, but the alternative is only
in the latest release.
---
 web/packages/base/components/utils/theme.ts |   2 +-
 web/packages/base/package.json              |  16 +-
 web/packages/new/package.json               |   6 +-
 web/yarn.lock                               | 222 +++++++++++---------
 4 files changed, 129 insertions(+), 117 deletions(-)

diff --git a/web/packages/base/components/utils/theme.ts b/web/packages/base/components/utils/theme.ts
index 04c38e9859..960637e135 100644
--- a/web/packages/base/components/utils/theme.ts
+++ b/web/packages/base/components/utils/theme.ts
@@ -41,7 +41,7 @@ const getTheme = (appName: AppName): Theme => {
  *
  * 2. These can be groups of color values that have roughly the same hue, but
  *    different levels of saturation. Such hue groups are arranged together into
- *    a "Colors" exported by "@/mui/material":
+ *    a "Colors" exported by "@mui/material":
  *
  *        export interface Color {
  *            50: string;
diff --git a/web/packages/base/package.json b/web/packages/base/package.json
index a700cab88b..566fccca9d 100644
--- a/web/packages/base/package.json
+++ b/web/packages/base/package.json
@@ -7,8 +7,8 @@
         "@emotion/react": "^11.14.0",
         "@emotion/styled": "^11.14.0",
         "@fontsource-variable/inter": "^5.1.1",
-        "@mui/icons-material": "^6.4.3",
-        "@mui/material": "^6.4.3",
+        "@mui/icons-material": "^6.4.6",
+        "@mui/material": "^6.4.6",
         "comlink": "^4.4.2",
         "formik": "^2.4.6",
         "get-user-locale": "^2.3.2",
@@ -16,18 +16,18 @@
         "i18next-resources-to-backend": "^1.2.1",
         "idb": "^8.0.2",
         "libsodium-wrappers-sumo": "^0.7.15",
-        "nanoid": "^5.0.9",
-        "next": "^15.1.6",
+        "nanoid": "^5.1.2",
+        "next": "^15.2.0",
         "react": "^19.0.0",
         "react-dom": "^19.0.0",
-        "react-i18next": "^15.4.0",
+        "react-i18next": "^15.4.1",
         "yup": "^1.6.1",
-        "zod": "^3.24.1"
+        "zod": "^3.24.2"
     },
     "devDependencies": {
         "@/build-config": "*",
         "@types/libsodium-wrappers-sumo": "^0.7.8",
-        "@types/react": "^19.0.8",
-        "@types/react-dom": "^19.0.3"
+        "@types/react": "^19.0.10",
+        "@types/react-dom": "^19.0.4"
     }
 }
diff --git a/web/packages/new/package.json b/web/packages/new/package.json
index 860c93a9a9..e3d807db95 100644
--- a/web/packages/new/package.json
+++ b/web/packages/new/package.json
@@ -7,9 +7,9 @@
         "@/gallery": "*",
         "@/utils": "*",
         "@ente/shared": "*",
-        "@mui/material": "^6.4.3",
-        "@mui/system": "^6.4.3",
-        "@mui/x-date-pickers": "^7.25.0",
+        "@mui/material": "^6.4.6",
+        "@mui/system": "^6.4.6",
+        "@mui/x-date-pickers": "^7.27.1",
         "dayjs": "^1.11.13",
         "react": "^19.0.0",
         "react-dom": "^19.0.0"
diff --git a/web/yarn.lock b/web/yarn.lock
index faab8e0c40..70cb2f7127 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -684,28 +684,28 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
-"@mui/core-downloads-tracker@^6.4.3":
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-6.4.3.tgz#aa9506e4d43e02d61fb82e23de9741fd24b22b61"
-  integrity sha512-hlyOzo2ObarllAOeT1ZSAusADE5NZNencUeIvXrdQ1Na+FL1lcznhbxfV5He1KqGiuR8Az3xtCUcYKwMVGFdzg==
+"@mui/core-downloads-tracker@^6.4.6":
+  version "6.4.6"
+  resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-6.4.6.tgz#42820be160159df81976f467ce496f5310e08eb1"
+  integrity sha512-rho5Q4IscbrVmK9rCrLTJmjLjfH6m/NcqKr/mchvck0EIXlyYUB9+Z0oVmkt/+Mben43LMRYBH8q/Uzxj/c4Vw==
 
-"@mui/icons-material@^6.4.3":
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-6.4.3.tgz#11f275781f442f864ca5522a6196a0a17cc063ea"
-  integrity sha512-3IY9LpjkwIJVgL/SkZQKKCUcumdHdQEsJaIavvsQze2QEztBt0HJ17naToN0DBBdhKdtwX5xXrfD6ZFUeWWk8g==
+"@mui/icons-material@^6.4.6":
+  version "6.4.6"
+  resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-6.4.6.tgz#a26eaeae2f7f1359b48dac3fe8a8eec61640c325"
+  integrity sha512-rGJBvIQQbQAlyKYljHQ8wAQS/K2/uYwvemcpygnAmCizmCI4zSF9HQPuiG8Ql4YLZ6V/uKjA3WHIYmF/8sV+pQ==
   dependencies:
     "@babel/runtime" "^7.26.0"
 
-"@mui/material@^6.4.3":
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/@mui/material/-/material-6.4.3.tgz#18cb003b6526bf4b3ad6f2bb46ab53154a51b19f"
-  integrity sha512-ubtQjplbWneIEU8Y+4b2VA0CDBlyH5I3AmVFGmsLyDe/bf0ubxav5t11c8Afem6rkSFWPlZA2DilxmGka1xiKQ==
+"@mui/material@^6.4.6":
+  version "6.4.6"
+  resolved "https://registry.yarnpkg.com/@mui/material/-/material-6.4.6.tgz#6114a02977735d70170243efc487aed0ca974197"
+  integrity sha512-6UyAju+DBOdMogfYmLiT3Nu7RgliorimNBny1pN/acOjc+THNFVE7hlxLyn3RDONoZJNDi/8vO4AQQr6dLAXqA==
   dependencies:
     "@babel/runtime" "^7.26.0"
-    "@mui/core-downloads-tracker" "^6.4.3"
-    "@mui/system" "^6.4.3"
+    "@mui/core-downloads-tracker" "^6.4.6"
+    "@mui/system" "^6.4.6"
     "@mui/types" "^7.2.21"
-    "@mui/utils" "^6.4.3"
+    "@mui/utils" "^6.4.6"
     "@popperjs/core" "^2.11.8"
     "@types/react-transition-group" "^4.4.12"
     clsx "^2.1.1"
@@ -714,19 +714,19 @@
     react-is "^19.0.0"
     react-transition-group "^4.4.5"
 
-"@mui/private-theming@^6.4.3":
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-6.4.3.tgz#40d7d95316e9e52d465f0c96da23f9fb8f6a989f"
-  integrity sha512-7x9HaNwDCeoERc4BoEWLieuzKzXu5ZrhRnEM6AUcRXUScQLvF1NFkTlP59+IJfTbEMgcGg1wWHApyoqcksrBpQ==
+"@mui/private-theming@^6.4.6":
+  version "6.4.6"
+  resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-6.4.6.tgz#77c0b150be94c061b34b34ce00eb60cdfb92837f"
+  integrity sha512-T5FxdPzCELuOrhpA2g4Pi6241HAxRwZudzAuL9vBvniuB5YU82HCmrARw32AuCiyTfWzbrYGGpZ4zyeqqp9RvQ==
   dependencies:
     "@babel/runtime" "^7.26.0"
-    "@mui/utils" "^6.4.3"
+    "@mui/utils" "^6.4.6"
     prop-types "^15.8.1"
 
-"@mui/styled-engine@^6.4.3":
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-6.4.3.tgz#fbd7a6b925dfaeaa84ffbf8ed9be78a0ff0b3d6e"
-  integrity sha512-OC402VfK+ra2+f12Gef8maY7Y9n7B6CZcoQ9u7mIkh/7PKwW/xH81xwX+yW+Ak1zBT3HYcVjh2X82k5cKMFGoQ==
+"@mui/styled-engine@^6.4.6":
+  version "6.4.6"
+  resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-6.4.6.tgz#cd0783adbb066a349e1995f0e1a7b8c3c2d59738"
+  integrity sha512-vSWYc9ZLX46be5gP+FCzWVn5rvDr4cXC5JBZwSIkYk9xbC7GeV+0kCvB8Q6XLFQJy+a62bbqtmdwS4Ghi9NBlQ==
   dependencies:
     "@babel/runtime" "^7.26.0"
     "@emotion/cache" "^11.13.5"
@@ -735,16 +735,16 @@
     csstype "^3.1.3"
     prop-types "^15.8.1"
 
-"@mui/system@^6.4.3":
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/@mui/system/-/system-6.4.3.tgz#f1e093850c8cc23c6605297c8a4134bea6fe290b"
-  integrity sha512-Q0iDwnH3+xoxQ0pqVbt8hFdzhq1g2XzzR4Y5pVcICTNtoCLJmpJS3vI4y/OIM1FHFmpfmiEC2IRIq7YcZ8nsmg==
+"@mui/system@^6.4.6":
+  version "6.4.6"
+  resolved "https://registry.yarnpkg.com/@mui/system/-/system-6.4.6.tgz#f7078e403bd11377c539a05829cd71c441c8b6e6"
+  integrity sha512-FQjWwPec7pMTtB/jw5f9eyLynKFZ6/Ej9vhm5kGdtmts1z5b7Vyn3Rz6kasfYm1j2TfrfGnSXRvvtwVWxjpz6g==
   dependencies:
     "@babel/runtime" "^7.26.0"
-    "@mui/private-theming" "^6.4.3"
-    "@mui/styled-engine" "^6.4.3"
+    "@mui/private-theming" "^6.4.6"
+    "@mui/styled-engine" "^6.4.6"
     "@mui/types" "^7.2.21"
-    "@mui/utils" "^6.4.3"
+    "@mui/utils" "^6.4.6"
     clsx "^2.1.1"
     csstype "^3.1.3"
     prop-types "^15.8.1"
@@ -771,10 +771,10 @@
     prop-types "^15.8.1"
     react-is "^19.0.0"
 
-"@mui/utils@^6.4.3":
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-6.4.3.tgz#e08bc3a5ae1552a48dd13ddc7c65e3eebdb4cd58"
-  integrity sha512-jxHRHh3BqVXE9ABxDm+Tc3wlBooYz/4XPa0+4AI+iF38rV1/+btJmSUgG4shDtSWVs/I97aDn5jBCt6SF2Uq2A==
+"@mui/utils@^6.4.6":
+  version "6.4.6"
+  resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-6.4.6.tgz#307828bee501d30ed5cd1e339ca28c9efcc4e3f9"
+  integrity sha512-43nZeE1pJF2anGafNydUcYFPtHwAqiBiauRtaMvurdrZI3YrUjHkAu43RBsxef7OFtJMXGiHFvq43kb7lig0sA==
   dependencies:
     "@babel/runtime" "^7.26.0"
     "@mui/types" "^7.2.21"
@@ -783,71 +783,71 @@
     prop-types "^15.8.1"
     react-is "^19.0.0"
 
-"@mui/x-date-pickers@^7.25.0":
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/@mui/x-date-pickers/-/x-date-pickers-7.25.0.tgz#3cbd6733e84061bf1643571248de217f24075027"
-  integrity sha512-t62OSFAKwj7KYQ8KcwTuKj6OgDuLQPSe4QUJcKDzD9rEhRIJVRUw2x27gBSdcls4l0PTrba19TghvDxCZprriw==
+"@mui/x-date-pickers@^7.27.1":
+  version "7.27.1"
+  resolved "https://registry.yarnpkg.com/@mui/x-date-pickers/-/x-date-pickers-7.27.1.tgz#5c9769744598b1e10c1919ce0589b8d235131a17"
+  integrity sha512-2YPhTM9TM39dmIkEQdSB6P6NASePB9LuhXXKQqq0PX4FXGymYEPz/acQXkk617zwfxJJaDhJZ6g8SAv5pklTJQ==
   dependencies:
     "@babel/runtime" "^7.25.7"
     "@mui/utils" "^5.16.6 || ^6.0.0"
-    "@mui/x-internals" "7.25.0"
+    "@mui/x-internals" "7.26.0"
     "@types/react-transition-group" "^4.4.11"
     clsx "^2.1.1"
     prop-types "^15.8.1"
     react-transition-group "^4.4.5"
 
-"@mui/x-internals@7.25.0":
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/@mui/x-internals/-/x-internals-7.25.0.tgz#981a5365391190ab3aa0e9c7a346315b3d1f621c"
-  integrity sha512-tBUN54YznAkmtCIRAOl35Kgl0MjFDIjUbzIrbWRgVSIR3QJ8bXnVSkiRBi+P91SZEl9+ZW0rDj+osq7xFJV0kg==
+"@mui/x-internals@7.26.0":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@mui/x-internals/-/x-internals-7.26.0.tgz#e8c3060582c102127ab55b0a93e881930dac107b"
+  integrity sha512-VxTCYQcZ02d3190pdvys2TDg9pgbvewAVakEopiOgReKAUhLdRlgGJHcOA/eAuGLyK1YIo26A6Ow6ZKlSRLwMg==
   dependencies:
     "@babel/runtime" "^7.25.7"
     "@mui/utils" "^5.16.6 || ^6.0.0"
 
-"@next/env@15.1.6":
-  version "15.1.6"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-15.1.6.tgz#2fa863d8c568a56b1c8328a86e621b8bdd4f2a20"
-  integrity sha512-d9AFQVPEYNr+aqokIiPLNK/MTyt3DWa/dpKveiAaVccUadFbhFEvY6FXYX2LJO2Hv7PHnLBu2oWwB4uBuHjr/w==
+"@next/env@15.2.0":
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-15.2.0.tgz#4c3508ca2c0bb2bc324066818bb8d0415f767641"
+  integrity sha512-eMgJu1RBXxxqqnuRJQh5RozhskoNUDHBFybvi+Z+yK9qzKeG7dadhv/Vp1YooSZmCnegf7JxWuapV77necLZNA==
 
-"@next/swc-darwin-arm64@15.1.6":
-  version "15.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.1.6.tgz#92f99badab6cb41f4c5c11a3feffa574bd6a9276"
-  integrity sha512-u7lg4Mpl9qWpKgy6NzEkz/w0/keEHtOybmIl0ykgItBxEM5mYotS5PmqTpo+Rhg8FiOiWgwr8USxmKQkqLBCrw==
+"@next/swc-darwin-arm64@15.2.0":
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.2.0.tgz#51ebba2162330ee3e8b3412bf31defd94a7b85e7"
+  integrity sha512-rlp22GZwNJjFCyL7h5wz9vtpBVuCt3ZYjFWpEPBGzG712/uL1bbSkS675rVAUCRZ4hjoTJ26Q7IKhr5DfJrHDA==
 
-"@next/swc-darwin-x64@15.1.6":
-  version "15.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-15.1.6.tgz#f56f4f8d5f6cb5d3915912ac95590d387f897da5"
-  integrity sha512-x1jGpbHbZoZ69nRuogGL2MYPLqohlhnT9OCU6E6QFewwup+z+M6r8oU47BTeJcWsF2sdBahp5cKiAcDbwwK/lg==
+"@next/swc-darwin-x64@15.2.0":
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-15.2.0.tgz#90fd6c6cee494d4348342434cfb9ca9506eae895"
+  integrity sha512-DiU85EqSHogCz80+sgsx90/ecygfCSGl5P3b4XDRVZpgujBm5lp4ts7YaHru7eVTyZMjHInzKr+w0/7+qDrvMA==
 
-"@next/swc-linux-arm64-gnu@15.1.6":
-  version "15.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.1.6.tgz#0aaffae519c93d1006419d7b98c34ebfd80ecacd"
-  integrity sha512-jar9sFw0XewXsBzPf9runGzoivajeWJUc/JkfbLTC4it9EhU8v7tCRLH7l5Y1ReTMN6zKJO0kKAGqDk8YSO2bg==
+"@next/swc-linux-arm64-gnu@15.2.0":
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.2.0.tgz#f10a26cdbacf2e3de2a02a926c72857b3cb613e1"
+  integrity sha512-VnpoMaGukiNWVxeqKHwi8MN47yKGyki5q+7ql/7p/3ifuU2341i/gDwGK1rivk0pVYbdv5D8z63uu9yMw0QhpQ==
 
-"@next/swc-linux-arm64-musl@15.1.6":
-  version "15.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.1.6.tgz#e7398d3d31ca60033f708a718cd6c31edcee2e9a"
-  integrity sha512-+n3u//bfsrIaZch4cgOJ3tXCTbSxz0s6brJtU3SzLOvkJlPQMJ+eHVRi6qM2kKKKLuMY+tcau8XD9CJ1OjeSQQ==
+"@next/swc-linux-arm64-musl@15.2.0":
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.2.0.tgz#1821c9a1dd17c441d8182f5cefd586f7902fcdb5"
+  integrity sha512-ka97/ssYE5nPH4Qs+8bd8RlYeNeUVBhcnsNUmFM6VWEob4jfN9FTr0NBhXVi1XEJpj3cMfgSRW+LdE3SUZbPrw==
 
-"@next/swc-linux-x64-gnu@15.1.6":
-  version "15.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.1.6.tgz#d76c72508f4d79d6016cab0c52640b93e590cffb"
-  integrity sha512-SpuDEXixM3PycniL4iVCLyUyvcl6Lt0mtv3am08sucskpG0tYkW1KlRhTgj4LI5ehyxriVVcfdoxuuP8csi3kQ==
+"@next/swc-linux-x64-gnu@15.2.0":
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.2.0.tgz#522f55c7672346bab43bce0bcb35c4cb668ad20f"
+  integrity sha512-zY1JduE4B3q0k2ZCE+DAF/1efjTXUsKP+VXRtrt/rJCTgDlUyyryx7aOgYXNc1d8gobys/Lof9P9ze8IyRDn7Q==
 
-"@next/swc-linux-x64-musl@15.1.6":
-  version "15.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.1.6.tgz#0b8ba80a53e65bf8970ed11ea923001e2512c7cb"
-  integrity sha512-L4druWmdFSZIIRhF+G60API5sFB7suTbDRhYWSjiw0RbE+15igQvE2g2+S973pMGvwN3guw7cJUjA/TmbPWTHQ==
+"@next/swc-linux-x64-musl@15.2.0":
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.2.0.tgz#e23be1d046c9a630a0315588f9d692d9705ac355"
+  integrity sha512-QqvLZpurBD46RhaVaVBepkVQzh8xtlUN00RlG4Iq1sBheNugamUNPuZEH1r9X1YGQo1KqAe1iiShF0acva3jHQ==
 
-"@next/swc-win32-arm64-msvc@15.1.6":
-  version "15.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.1.6.tgz#81b5dbbfdada2c05deef688e799af4a24097b65f"
-  integrity sha512-s8w6EeqNmi6gdvM19tqKKWbCyOBvXFbndkGHl+c9YrzsLARRdCHsD9S1fMj8gsXm9v8vhC8s3N8rjuC/XrtkEg==
+"@next/swc-win32-arm64-msvc@15.2.0":
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.2.0.tgz#9e2cb008b82c676dad7d632a43549f969cb2194f"
+  integrity sha512-ODZ0r9WMyylTHAN6pLtvUtQlGXBL9voljv6ujSlcsjOxhtXPI1Ag6AhZK0SE8hEpR1374WZZ5w33ChpJd5fsjw==
 
-"@next/swc-win32-x64-msvc@15.1.6":
-  version "15.1.6"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.1.6.tgz#131993c45ffd124fb4b15258e2f3f9669c143e3c"
-  integrity sha512-6xomMuu54FAFxttYr5PJbEfu96godcxBTRk1OhAvJq0/EnmFU/Ybiax30Snis4vdWZ9LGpf7Roy5fSs7v/5ROQ==
+"@next/swc-win32-x64-msvc@15.2.0":
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.2.0.tgz#d280f450a5b6dbb7437c3265f81ea62febf4bf3c"
+  integrity sha512-8+4Z3Z7xa13NdUuUAcpVNA6o76lNPniBd9Xbo02bwXQXnZgFvEopwY2at5+z7yHl47X9qbZpvwatZ2BRo3EdZw==
 
 "@noble/hashes@^1.2.0":
   version "1.7.0"
@@ -1114,6 +1114,11 @@
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.0.3.tgz#0804dfd279a165d5a0ad8b53a5b9e65f338050a4"
   integrity sha512-0Knk+HJiMP/qOZgMyNFamlIjw9OFCsyC2ZbigmEEyXXixgre6IQpm/4V+r3qH4GC1JPvRJKInw+on2rV6YZLeA==
 
+"@types/react-dom@^19.0.4":
+  version "19.0.4"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.0.4.tgz#bedba97f9346bd4c0fe5d39e689713804ec9ac89"
+  integrity sha512-4fSQ8vWFkg+TGhePfUzVmat3eC14TXYSsiiDSLI0dVLsrm9gZFABjPy/Qu6TKgl1tq1Bu1yDsuQgY3A3DOjCcg==
+
 "@types/react-transition-group@^4.4.0", "@types/react-transition-group@^4.4.11", "@types/react-transition-group@^4.4.12":
   version "4.4.12"
   resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.12.tgz#b5d76568485b02a307238270bfe96cb51ee2a044"
@@ -1140,6 +1145,13 @@
   dependencies:
     csstype "^3.0.2"
 
+"@types/react@^19.0.10":
+  version "19.0.10"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-19.0.10.tgz#d0c66dafd862474190fe95ce11a68de69ed2b0eb"
+  integrity sha512-JuRQ9KXLEjaUNjTWpzuR231Z2WpIwczOkBEIvbHNCzQefFIT0L8IqE6NV6ULLyC1SI/i234JnDoMkfg+RjQj2g==
+  dependencies:
+    csstype "^3.0.2"
+
 "@types/react@^19.0.8":
   version "19.0.8"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-19.0.8.tgz#7098e6159f2a61e4f4cef2c1223c044a9bec590e"
@@ -2972,22 +2984,22 @@ nanoid@^3.3.6, nanoid@^3.3.7:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
   integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
 
-nanoid@^5.0.9:
-  version "5.0.9"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-5.0.9.tgz#977dcbaac055430ce7b1e19cf0130cea91a20e50"
-  integrity sha512-Aooyr6MXU6HpvvWXKoVoXwKMs/KyVakWwg7xQfv5/S/RIgJMy0Ifa45H9qqYy7pTCszrHzP21Uk4PZq2HpEM8Q==
+nanoid@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-5.1.2.tgz#b87c6cb6941d127a23b24dffc4659bba48b219d7"
+  integrity sha512-b+CiXQCNMUGe0Ri64S9SXFcP9hogjAJ2Rd6GdVxhPLRm7mhGaM7VgOvCAJ1ZshfHbqVDI3uqTI5C8/GaKuLI7g==
 
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-next@^15.1.6:
-  version "15.1.6"
-  resolved "https://registry.yarnpkg.com/next/-/next-15.1.6.tgz#ce22fd0a8f36da1fc4aba86e3ec7e98eb248c555"
-  integrity sha512-Hch4wzbaX0vKQtalpXvUiw5sYivBy4cm5rzUKrBnUB/y436LGrvOUqYvlSeNVCWFO/770gDlltR9gqZH62ct4Q==
+next@^15.2.0:
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/next/-/next-15.2.0.tgz#00f4619ae4322102b08c1a8bf315f7b757525508"
+  integrity sha512-VaiM7sZYX8KIAHBrRGSFytKknkrexNfGb8GlG6e93JqueCspuGte8i4ybn8z4ww1x3f2uzY4YpTaBEW4/hvsoQ==
   dependencies:
-    "@next/env" "15.1.6"
+    "@next/env" "15.2.0"
     "@swc/counter" "0.1.3"
     "@swc/helpers" "0.5.15"
     busboy "1.6.0"
@@ -2995,14 +3007,14 @@ next@^15.1.6:
     postcss "8.4.31"
     styled-jsx "5.1.6"
   optionalDependencies:
-    "@next/swc-darwin-arm64" "15.1.6"
-    "@next/swc-darwin-x64" "15.1.6"
-    "@next/swc-linux-arm64-gnu" "15.1.6"
-    "@next/swc-linux-arm64-musl" "15.1.6"
-    "@next/swc-linux-x64-gnu" "15.1.6"
-    "@next/swc-linux-x64-musl" "15.1.6"
-    "@next/swc-win32-arm64-msvc" "15.1.6"
-    "@next/swc-win32-x64-msvc" "15.1.6"
+    "@next/swc-darwin-arm64" "15.2.0"
+    "@next/swc-darwin-x64" "15.2.0"
+    "@next/swc-linux-arm64-gnu" "15.2.0"
+    "@next/swc-linux-arm64-musl" "15.2.0"
+    "@next/swc-linux-x64-gnu" "15.2.0"
+    "@next/swc-linux-x64-musl" "15.2.0"
+    "@next/swc-win32-arm64-msvc" "15.2.0"
+    "@next/swc-win32-x64-msvc" "15.2.0"
     sharp "^0.33.5"
 
 node-releases@^2.0.19:
@@ -3289,10 +3301,10 @@ react-fast-compare@^2.0.1:
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
   integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
 
-react-i18next@^15.4.0:
-  version "15.4.0"
-  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-15.4.0.tgz#87c755fb6d7a567eec134e4759b022a0baacb19e"
-  integrity sha512-Py6UkX3zV08RTvL6ZANRoBh9sL/ne6rQq79XlkHEdd82cZr2H9usbWpUNVadJntIZP2pu3M2rL1CN+5rQYfYFw==
+react-i18next@^15.4.1:
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-15.4.1.tgz#33f3e89c2f6c68e2bfcbf9aa59986ad42fe78758"
+  integrity sha512-ahGab+IaSgZmNPYXdV1n+OYky95TGpFwnKRflX/16dY04DsYYKHtVLjeny7sBSCREEcoMbAgSkFiGLF5g5Oofw==
   dependencies:
     "@babel/runtime" "^7.25.0"
     html-parse-stringify "^3.0.1"
@@ -4199,10 +4211,10 @@ yup@^1.6.1:
     toposort "^2.0.2"
     type-fest "^2.19.0"
 
-zod@^3.24.1:
-  version "3.24.1"
-  resolved "https://registry.yarnpkg.com/zod/-/zod-3.24.1.tgz#27445c912738c8ad1e9de1bea0359fa44d9d35ee"
-  integrity sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==
+zod@^3.24.2:
+  version "3.24.2"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.24.2.tgz#8efa74126287c675e92f46871cfc8d15c34372b3"
+  integrity sha512-lY7CDW43ECgW9u1TcT3IoXHflywfVqDYze4waEz812jR/bZ8FHDsl7pFQoSZTz5N+2NqRXs8GBwnAwo3ZNxqhQ==
 
 zxcvbn@^4.4.2:
   version "4.4.2"

From 14bfaf97f3d6b2544e5293715f32b95d19adba74 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 16:32:30 +0530
Subject: [PATCH 649/796] Update deprecated

---
 web/apps/auth/src/pages/auth.tsx              | 15 ++++++++-----
 .../Collections/CollectionHeader.tsx          |  8 ++++---
 web/packages/base/components/OverflowMenu.tsx | 12 +++++-----
 .../new/photos/components/DropdownInput.tsx   | 22 +++++++++----------
 4 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/web/apps/auth/src/pages/auth.tsx b/web/apps/auth/src/pages/auth.tsx
index 8e03adf9f0..9f702136a2 100644
--- a/web/apps/auth/src/pages/auth.tsx
+++ b/web/apps/auth/src/pages/auth.tsx
@@ -217,12 +217,15 @@ const CodeDisplay: React.FC<CodeDisplayProps> = ({ code }) => {
                     <Snackbar
                         open={openCopied}
                         message={t("copied")}
-                        ContentProps={{
-                            sx: (theme) => ({
-                                backgroundColor: theme.vars.palette.fill.faint,
-                                color: theme.vars.palette.primary.main,
-                                backdropFilter: "blur(10px)",
-                            }),
+                        slotProps={{
+                            content: {
+                                sx: (theme) => ({
+                                    backgroundColor:
+                                        theme.vars.palette.fill.faint,
+                                    color: theme.vars.palette.primary.main,
+                                    backdropFilter: "blur(10px)",
+                                }),
+                            },
                         }}
                     />
                 </ButtonBase>
diff --git a/web/apps/photos/src/components/Collections/CollectionHeader.tsx b/web/apps/photos/src/components/Collections/CollectionHeader.tsx
index 4935dea01f..0e59cabb25 100644
--- a/web/apps/photos/src/components/Collections/CollectionHeader.tsx
+++ b/web/apps/photos/src/components/Collections/CollectionHeader.tsx
@@ -717,9 +717,11 @@ const CollectionSortOrderMenu: React.FC<CollectionSortOrderMenuProps> = ({
             anchorEl={overFlowMenuIconRef.current}
             open={open}
             onClose={onClose}
-            MenuListProps={{
-                disablePadding: true,
-                "aria-labelledby": "collection-files-sort",
+            slotProps={{
+                list: {
+                    disablePadding: true,
+                    "aria-labelledby": "collection-files-sort",
+                },
             }}
             anchorOrigin={{
                 vertical: "bottom",
diff --git a/web/packages/base/components/OverflowMenu.tsx b/web/packages/base/components/OverflowMenu.tsx
index b3a474c92b..8f61ba9cbf 100644
--- a/web/packages/base/components/OverflowMenu.tsx
+++ b/web/packages/base/components/OverflowMenu.tsx
@@ -74,12 +74,14 @@ export const OverflowMenu: React.FC<
                 {...(anchorEl ? { anchorEl } : {})}
                 open={!!anchorEl}
                 onClose={() => setAnchorEl(undefined)}
-                MenuListProps={{
-                    // Disable padding at the top and bottom of the menu list.
-                    disablePadding: true,
-                    "aria-labelledby": ariaID,
+                slotProps={{
+                    paper: { sx: menuPaperSxProps },
+                    list: {
+                        // Disable padding at the top and bottom of the menu list.
+                        disablePadding: true,
+                        "aria-labelledby": ariaID,
+                    },
                 }}
-                slotProps={{ paper: { sx: menuPaperSxProps } }}
                 anchorOrigin={{ vertical: "bottom", horizontal: "right" }}
                 transformOrigin={{ vertical: "top", horizontal: "right" }}
             >
diff --git a/web/packages/new/photos/components/DropdownInput.tsx b/web/packages/new/photos/components/DropdownInput.tsx
index af095dfcfb..5522028ace 100644
--- a/web/packages/new/photos/components/DropdownInput.tsx
+++ b/web/packages/new/photos/components/DropdownInput.tsx
@@ -73,17 +73,17 @@ export const DropdownInput = <T extends string>({
                     // maxWidth to 0 forces element widths to equal minWidth.
                     sx: { maxWidth: 0 },
                 },
-            },
-            MenuListProps: {
-                sx: {
-                    backgroundColor: "background.paper2",
-                    ".MuiMenuItem-root": {
-                        color: "text.faint",
-                        whiteSpace: "normal",
-                    },
-                    // Make the selected item pop out by using color.
-                    "&&& > .Mui-selected": {
-                        color: "text.base",
+                list: {
+                    sx: {
+                        backgroundColor: "background.paper2",
+                        ".MuiMenuItem-root": {
+                            color: "text.faint",
+                            whiteSpace: "normal",
+                        },
+                        // Make the selected item pop out by using color.
+                        "&&& > .Mui-selected": {
+                            color: "text.base",
+                        },
                     },
                 },
             },

From a73e7af704980fe4a5b3e6735e511a408f740c24 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 16:42:50 +0530
Subject: [PATCH 650/796] Don't initialize face DB in non-desktop builds

---
 web/packages/gallery/components/FileInfo.tsx | 3 ++-
 web/packages/new/photos/services/ml/index.ts | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index ec49c17b17..40d8d3e44d 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -200,6 +200,7 @@ export const FileInfo: React.FC<FileInfoProps> = ({
 
     useEffect(() => {
         if (!file) return;
+        if (!isMLEnabled()) return;
 
         let didCancel = false;
 
@@ -317,7 +318,7 @@ export const FileInfo: React.FC<FileInfoProps> = ({
                         )
                     }
                 />
-                {isMLEnabled() && annotatedFaces.length > 0 && (
+                {annotatedFaces.length > 0 && (
                     <InfoItem icon={<FaceRetouchingNaturalIcon />}>
                         <FilePeopleList
                             file={file}
diff --git a/web/packages/new/photos/services/ml/index.ts b/web/packages/new/photos/services/ml/index.ts
index 89a08dc041..0b79922ceb 100644
--- a/web/packages/new/photos/services/ml/index.ts
+++ b/web/packages/new/photos/services/ml/index.ts
@@ -654,6 +654,8 @@ export interface AnnotatedFaceID {
 export const getAnnotatedFacesForFile = async (
     file: EnteFile,
 ): Promise<AnnotatedFaceID[]> => {
+    if (!isMLEnabled()) return [];
+
     const index = await savedFaceIndex(file.id);
     if (!index) return [];
 

From 9d61eaa04d67a5dd25e8c46f3a33baf9a6443f99 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 16:50:07 +0530
Subject: [PATCH 651/796] :\

---
 web/packages/base/next.config.base.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/packages/base/next.config.base.js b/web/packages/base/next.config.base.js
index 2c8155bf7a..594a8b9a3c 100644
--- a/web/packages/base/next.config.base.js
+++ b/web/packages/base/next.config.base.js
@@ -104,6 +104,10 @@ if (process.env.NEXT_PUBLIC_ENTE_FAMILY_URL) {
 const nextConfig = {
     // Generate a static export when we run `next build`.
     output: "export",
+    // Instead of the nice and useful HMR indicator that used to exist prior to
+    // 15.2, the Next.js folks have made this a persistent "branding" indicator
+    // that gets in the way and needs to be disabled.
+    devIndicators: false,
     compiler: {
         emotion: true,
     },

From 02a7024cdceceb7a3afe8e8150409839bd899dea Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 16:57:24 +0530
Subject: [PATCH 652/796] id

---
 web/packages/gallery/components/viewer/FileViewer.tsx | 5 +++++
 web/packages/gallery/components/viewer/photoswipe.ts  | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 30821b1908..d5952add20 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -407,6 +407,11 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 open={!!moreMenuAnchorEl}
                 onClose={handleMoreMenuClose}
                 anchorEl={moreMenuAnchorEl}
+                slotProps={{
+                    list: {
+                        "aria-labelledby": moreMenuAnchorEl?.id,
+                    },
+                }}
             >
                 Test
             </Menu>
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 8d60b8dbda..75a1b15c7f 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -617,6 +617,9 @@ export class FileViewerPhotoSwipe {
                 isButton: true,
                 html: createPSRegisterElementIconHTML("more"),
                 onClick: (e) => onMore(currentAnnotatedFile(), e.target),
+                onInit: (buttonElement) => {
+                    buttonElement.id = "ente-pswp-show-more";
+                },
             });
         });
 

From 61779a6ca7ec101195cb12fb246e454f72d53d1d Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 18:47:42 +0530
Subject: [PATCH 653/796] More aria

taken from the basic example in https://mui.com/material-ui/react-menu/
---
 .../gallery/components/viewer/FileViewer.tsx  | 18 ++++++----
 .../gallery/components/viewer/photoswipe.ts   | 35 +++++++++++++++++--
 2 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index d5952add20..ab1b385905 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -37,6 +37,9 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { fileInfoExifForFile } from "./data-source";
 import {
     FileViewerPhotoSwipe,
+    moreButtonID,
+    moreMenuID,
+    resetMoreMenuButtonOnMenuClose,
     type FileViewerAnnotatedFile,
     type FileViewerFileAnnotation,
     type FileViewerPhotoSwipeDelegate,
@@ -279,10 +282,12 @@ const FileViewer: React.FC<FileViewerProps> = ({
         [],
     );
 
-    const handleMoreMenuClose = useCallback(
-        () => setMoreMenuAnchorEl(null),
-        [],
-    );
+    const handleMoreMenuClose = useCallback(() => {
+        setMoreMenuAnchorEl((el) => {
+            resetMoreMenuButtonOnMenuClose(el);
+            return null;
+        });
+    }, []);
 
     const handleEditImage = useMemo(() => {
         return onSaveEditedImageCopy
@@ -407,10 +412,9 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 open={!!moreMenuAnchorEl}
                 onClose={handleMoreMenuClose}
                 anchorEl={moreMenuAnchorEl}
+                id={moreMenuID}
                 slotProps={{
-                    list: {
-                        "aria-labelledby": moreMenuAnchorEl?.id,
-                    },
+                    list: { "aria-labelledby": moreButtonID },
                 }}
             >
                 Test
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 75a1b15c7f..4fe76277d8 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -165,6 +165,21 @@ export interface FileViewerAnnotatedFile {
     annotation: FileViewerFileAnnotation;
 }
 
+/**
+ * The ID that is used by the "more" action button (if one is being displayed).
+ *
+ * @see also {@link moreMenuID}.
+ */
+export const moreButtonID = "ente-pswp-more-button";
+
+/**
+ * The ID this is expected to be used by the more menu that is shown in response
+ * to the more action button being activated.
+ *
+ * @see also {@link moreButtonID}.
+ */
+export const moreMenuID = "ente-pswp-more-menu";
+
 /**
  * A wrapper over {@link PhotoSwipe} to tailor its interface for use by our file
  * viewer.
@@ -616,9 +631,16 @@ export class FileViewerPhotoSwipe {
                 order: 17,
                 isButton: true,
                 html: createPSRegisterElementIconHTML("more"),
-                onClick: (e) => onMore(currentAnnotatedFile(), e.target),
                 onInit: (buttonElement) => {
-                    buttonElement.id = "ente-pswp-show-more";
+                    buttonElement.setAttribute("id", moreButtonID);
+                    buttonElement.setAttribute("aria-haspopup", "true");
+                },
+                onClick: (e) => {
+                    const buttonElement = e.target;
+                    // See also: `resetMoreMenuButtonOnMenuClose`.
+                    buttonElement.setAttribute("aria-controls", moreMenuID);
+                    buttonElement.setAttribute("aria-expanded", true);
+                    onMore(currentAnnotatedFile(), buttonElement);
                 },
             });
         });
@@ -740,3 +762,12 @@ const createElementFromHTMLString = (htmlString: string) => {
     template.innerHTML = htmlString.trim();
     return template.content.firstChild;
 };
+
+/**
+ * Update the ARIA attributes for the button that controls the more menu when
+ * the menu is closed.
+ */
+export const resetMoreMenuButtonOnMenuClose = (buttonElement: HTMLElement) => {
+    buttonElement.removeAttribute("aria-controls");
+    buttonElement.removeAttribute("aria-expanded");
+};

From d7587d12ed5240ddca990a695e012f363dc0fffd Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 19:04:30 +0530
Subject: [PATCH 654/796] vis

---
 .../gallery/components/viewer/FileViewer.tsx  |  7 ++-
 .../gallery/components/viewer/icons.tsx       |  5 --
 .../gallery/components/viewer/photoswipe.ts   | 56 +++++++------------
 3 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index ab1b385905..ad7247a3ea 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -17,6 +17,7 @@ import { isDesktop } from "@/base/app";
 import { type ModalVisibilityProps } from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
 import { lowercaseExtension } from "@/base/file-name";
+import { pt } from "@/base/i18n";
 import type { LocalUser } from "@/base/local-user";
 import log from "@/base/log";
 import {
@@ -32,7 +33,7 @@ import {
     ImageEditorOverlay,
     type ImageEditorOverlayProps,
 } from "@/new/photos/components/ImageEditorOverlay";
-import { Button, Menu, styled } from "@mui/material";
+import { Button, Menu, MenuItem, styled } from "@mui/material";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { fileInfoExifForFile } from "./data-source";
 import {
@@ -417,7 +418,9 @@ const FileViewer: React.FC<FileViewerProps> = ({
                     list: { "aria-labelledby": moreButtonID },
                 }}
             >
-                Test
+                {activeAnnotatedFile?.annotation.isEditableImage && (
+                    <MenuItem>{/*TODO */ pt("Edit image")}</MenuItem>
+                )}
             </Menu>
             <ImageEditorOverlay
                 open={openImageEditor}
diff --git a/web/packages/gallery/components/viewer/icons.tsx b/web/packages/gallery/components/viewer/icons.tsx
index 3f98051fff..241d83638c 100644
--- a/web/packages/gallery/components/viewer/icons.tsx
+++ b/web/packages/gallery/components/viewer/icons.tsx
@@ -21,17 +21,12 @@ const paths = {
     info: '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8" transform="translate(3.5, 3.5)"',
     // "@mui/icons-material/ErrorOutline"
     error: '<path d="M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2M12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8" transform="translate(7, 5.7) scale(0.85)"',
-    // "@mui/icons-material/Edit"
-    edit: '<path d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34a.996.996 0 0 0-1.41 0l-1.83 1.83 3.75 3.75z" transform="translate(3, 3) scale(0.97)"',
     // "@mui/icons-material/FavoriteBorderRounded"
     favorite:
         '<path d="M19.66 3.99c-2.64-1.8-5.9-.96-7.66 1.1-1.76-2.06-5.02-2.91-7.66-1.1-1.4.96-2.28 2.58-2.34 4.29-.14 3.88 3.3 6.99 8.55 11.76l.1.09c.76.69 1.93.69 2.69-.01l.11-.1c5.25-4.76 8.68-7.87 8.55-11.75-.06-1.7-.94-3.32-2.34-4.28M12.1 18.55l-.1.1-.1-.1C7.14 14.24 4 11.39 4 8.5 4 6.5 5.5 5 7.5 5c1.54 0 3.04.99 3.57 2.36h1.87C13.46 5.99 14.96 5 16.5 5c2 0 3.5 1.5 3.5 3.5 0 2.89-3.14 5.74-7.9 10.05" transform="translate(3, 3)"',
     // "@mui/icons-material/FavoriteRounded"
     unfavorite:
         '<path d="M13.35 20.13c-.76.69-1.93.69-2.69-.01l-.11-.1C5.3 15.27 1.87 12.16 2 8.28c.06-1.7.93-3.33 2.34-4.29 2.64-1.8 5.9-.96 7.66 1.1 1.76-2.06 5.02-2.91 7.66-1.1 1.41.96 2.28 2.59 2.34 4.29.14 3.88-3.3 6.99-8.55 11.76z" transform="translate(3, 3)"',
-    // TODO(PS): Remove me
-    // "@mui/icons-material/MoreVert"
-    moreV: '<path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2m0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2"',
     // "@mui/icons-material/MoreHoriz"
     more: '<path d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2" transform="translate(3, 4)"',
 };
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 4fe76277d8..8c564a55ff 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -602,47 +602,33 @@ export class FileViewerPhotoSwipe {
                 onClick: () => onViewInfo(currentAnnotatedFile()),
             });
 
-            // TODO(PS):
-            if (showModifyActions && onEditImage && false) {
+            if (showModifyActions && onEditImage) {
                 pswp.ui.registerElement({
-                    name: "edit",
+                    name: "more",
                     // TODO(PS):
-                    // title: t("edit_image"),
-                    title: pt("Edit image"),
+                    title: pt("More"),
                     order: 16,
                     isButton: true,
-                    html: createPSRegisterElementIconHTML("edit"),
-                    // TODO
-                    // onClick: withCurrentAnnotatedFile(delegate.onEditImage),
-                    // onInit: (buttonElement) =>
-                    //     pswp.on("change", () =>
-                    //         showIf(
-                    //             buttonElement,
-                    //             !!currentFileAnnotation().isEditableImage,
-                    //         ),
-                    //     ),
+                    html: createPSRegisterElementIconHTML("more"),
+                    onInit: (buttonElement) => {
+                        buttonElement.setAttribute("id", moreButtonID);
+                        buttonElement.setAttribute("aria-haspopup", "true");
+                        pswp.on("change", () =>
+                            showIf(
+                                buttonElement,
+                                !!currentFileAnnotation().isEditableImage,
+                            ),
+                        );
+                    },
+                    onClick: (e) => {
+                        const buttonElement = e.target;
+                        // See also: `resetMoreMenuButtonOnMenuClose`.
+                        buttonElement.setAttribute("aria-controls", moreMenuID);
+                        buttonElement.setAttribute("aria-expanded", true);
+                        onMore(currentAnnotatedFile(), buttonElement);
+                    },
                 });
             }
-
-            pswp.ui.registerElement({
-                name: "more",
-                // TODO(PS):
-                title: pt("More"),
-                order: 17,
-                isButton: true,
-                html: createPSRegisterElementIconHTML("more"),
-                onInit: (buttonElement) => {
-                    buttonElement.setAttribute("id", moreButtonID);
-                    buttonElement.setAttribute("aria-haspopup", "true");
-                },
-                onClick: (e) => {
-                    const buttonElement = e.target;
-                    // See also: `resetMoreMenuButtonOnMenuClose`.
-                    buttonElement.setAttribute("aria-controls", moreMenuID);
-                    buttonElement.setAttribute("aria-expanded", true);
-                    onMore(currentAnnotatedFile(), buttonElement);
-                },
-            });
         });
 
         // Modify the default UI elements.

From acaf1939e71ad61113d8e30ecdabe6520cc00864 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 19:23:13 +0530
Subject: [PATCH 655/796] edit

---
 .../gallery/components/viewer/FileViewer.tsx  | 123 +++++++++---------
 .../gallery/components/viewer/photoswipe.ts   |  36 ++---
 2 files changed, 76 insertions(+), 83 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index ad7247a3ea..ff360ceba8 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -211,33 +211,6 @@ const FileViewer: React.FC<FileViewerProps> = ({
     // If `true`, then we need to trigger a sync with remote when we close.
     const [, setNeedsSync] = useState(false);
 
-    const handleClose = useCallback(() => {
-        setNeedsSync((needSync) => {
-            if (needSync) onTriggerSyncWithRemote?.();
-            return false;
-        });
-        setOpenFileInfo(false);
-        setOpenImageEditor(false);
-        onClose();
-    }, [onTriggerSyncWithRemote, onClose]);
-
-    const handleAnnotate = useCallback(
-        (file: EnteFile): FileViewerFileAnnotation => {
-            log.debug(() => ["viewer", { action: "annotate", file }]);
-            const fileID = file.id;
-            const isOwnFile = file.ownerID == user?.id;
-            const canModify =
-                isOwnFile && !isInTrashSection && !isInHiddenSection;
-            const showFavorite = canModify;
-            const isEditableImage =
-                onSaveEditedImageCopy && canModify
-                    ? fileIsEditableImage(file)
-                    : undefined;
-            return { fileID, isOwnFile, showFavorite, isEditableImage };
-        },
-        [user, isInTrashSection, isInHiddenSection, onSaveEditedImageCopy],
-    );
-
     const handleViewInfo = useCallback(
         (annotatedFile: FileViewerAnnotatedFile) => {
             setActiveAnnotatedFile(annotatedFile);
@@ -253,25 +226,6 @@ const FileViewer: React.FC<FileViewerProps> = ({
 
     const handleFileInfoClose = useCallback(() => setOpenFileInfo(false), []);
 
-    const handleScheduleUpdate = useCallback(() => setNeedsSync(true), []);
-
-    const handleSelectCollection = useCallback(
-        (collectionID: number) => {
-            onSelectCollection(collectionID);
-            handleClose();
-        },
-        [onSelectCollection, handleClose],
-    );
-
-    const handleSelectPerson = useMemo(() => {
-        return onSelectPerson
-            ? (personID: string) => {
-                  onSelectPerson(personID);
-                  handleClose();
-              }
-            : undefined;
-    }, [onSelectPerson, handleClose]);
-
     const handleMore = useCallback(
         (
             annotatedFile: FileViewerAnnotatedFile,
@@ -292,40 +246,91 @@ const FileViewer: React.FC<FileViewerProps> = ({
 
     const handleEditImage = useMemo(() => {
         return onSaveEditedImageCopy
-            ? (annotatedFile: FileViewerAnnotatedFile) => {
-                  setActiveAnnotatedFile(annotatedFile);
+            ? () => {
+                  handleMoreMenuClose();
                   setOpenImageEditor(true);
               }
             : undefined;
-    }, [onSaveEditedImageCopy]);
+    }, [onSaveEditedImageCopy, handleMoreMenuClose]);
 
     const handleImageEditorClose = useCallback(
         () => setOpenImageEditor(false),
         [],
     );
 
+    const handleClose = useCallback(() => {
+        setNeedsSync((needSync) => {
+            if (needSync) onTriggerSyncWithRemote?.();
+            return false;
+        });
+        handleFileInfoClose();
+        handleImageEditorClose();
+        handleMoreMenuClose();
+        onClose();
+    }, [
+        onTriggerSyncWithRemote,
+        handleFileInfoClose,
+        handleImageEditorClose,
+        handleMoreMenuClose,
+        onClose,
+    ]);
+
     const handleSaveEditedCopy = useCallback(
         (editedFile: File, collection: Collection, enteFile: EnteFile) => {
             onSaveEditedImageCopy(editedFile, collection, enteFile);
-            handleImageEditorClose();
             handleClose();
         },
-        [onSaveEditedImageCopy, handleImageEditorClose, handleClose],
+        [onSaveEditedImageCopy, handleClose],
     );
 
+    const handleAnnotate = useCallback(
+        (file: EnteFile): FileViewerFileAnnotation => {
+            log.debug(() => ["viewer", { action: "annotate", file }]);
+            const fileID = file.id;
+            const isOwnFile = file.ownerID == user?.id;
+            const canModify =
+                isOwnFile && !isInTrashSection && !isInHiddenSection;
+            const showFavorite = canModify;
+            const isEditableImage =
+                handleEditImage && canModify
+                    ? fileIsEditableImage(file)
+                    : undefined;
+            return { fileID, isOwnFile, showFavorite, isEditableImage };
+        },
+        [user, isInTrashSection, isInHiddenSection, handleEditImage],
+    );
+
+    const handleScheduleUpdate = useCallback(() => setNeedsSync(true), []);
+
+    const handleSelectCollection = useCallback(
+        (collectionID: number) => {
+            onSelectCollection(collectionID);
+            handleClose();
+        },
+        [onSelectCollection, handleClose],
+    );
+
+    const handleSelectPerson = useMemo(() => {
+        return onSelectPerson
+            ? (personID: string) => {
+                  onSelectPerson(personID);
+                  handleClose();
+              }
+            : undefined;
+    }, [onSelectPerson, handleClose]);
+
     const haveUser = !!user;
-    const showModifyActions = haveUser;
 
     const getFiles = useCallback(() => files, [files]);
 
     const isFavorite = useCallback(
         ({ file }: FileViewerAnnotatedFile) => {
-            if (!showModifyActions || !favoriteFileIDs || !onToggleFavorite) {
+            if (!haveUser || !favoriteFileIDs || !onToggleFavorite) {
                 return undefined;
             }
             return favoriteFileIDs.has(file.id);
         },
-        [showModifyActions, favoriteFileIDs, onToggleFavorite],
+        [haveUser, favoriteFileIDs, onToggleFavorite],
     );
 
     const toggleFavorite = useCallback(
@@ -355,13 +360,12 @@ const FileViewer: React.FC<FileViewerProps> = ({
             const pswp = new FileViewerPhotoSwipe({
                 initialIndex,
                 disableDownload,
-                showModifyActions,
+                haveUser,
                 delegate: delegateRef.current!,
                 onClose: handleClose,
                 onAnnotate: handleAnnotate,
                 onViewInfo: handleViewInfo,
                 onMore: handleMore,
-                onEditImage: handleEditImage,
             });
 
             psRef.current = pswp;
@@ -378,12 +382,11 @@ const FileViewer: React.FC<FileViewerProps> = ({
         user,
         initialIndex,
         disableDownload,
-        showModifyActions,
+        haveUser,
         handleClose,
         handleAnnotate,
         handleViewInfo,
         handleMore,
-        handleEditImage,
     ]);
 
     const handleRefreshPhotoswipe = useCallback(() => {
@@ -419,7 +422,9 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 }}
             >
                 {activeAnnotatedFile?.annotation.isEditableImage && (
-                    <MenuItem>{/*TODO */ pt("Edit image")}</MenuItem>
+                    <MenuItem onClick={handleEditImage}>
+                        {/*TODO */ pt("Edit image")}
+                    </MenuItem>
                 )}
             </Menu>
             <ImageEditorOverlay
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 8c564a55ff..d84458c268 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -54,10 +54,8 @@ export interface FileViewerFileAnnotation {
      */
     showFavorite: boolean;
     /**
-     * `true` if this is an image which can be edited.
-     *
-     * The edit button is shown when this is true. See also the
-     * {@link onEditImage} option for {@link FileViewerPhotoSwipe} constructor.
+     * `true` if this is an image which can be edited, and editing is possible,
+     * and the edit action should therefore be shown for this file.
      */
     isEditableImage: boolean;
 }
@@ -104,17 +102,18 @@ type FileViewerPhotoSwipeOptions = Pick<
     "initialIndex" | "disableDownload"
 > & {
     /**
-     * `true` if various actions that modify the file should be shown.
+     * `true` if we're running in the context of a logged in user, and so
+     * various actions that modify the file should be shown.
      *
-     * This is the static variant of various per file annotations. If this is
-     * not `true`, then various actions like favorite, delete etc are never
-     * shown. If this is `true`, then their visibility depends on the
-     * corresponding annotation.
+     * This is the static variant of various per file annotations that control
+     * various modifications. If this is not `true`, then various actions like
+     * favorite, delete etc are never shown. If this is `true`, then their
+     * visibility depends on the corresponding annotation.
      *
      * For example, the favorite action is shown only if both this and the
      * {@link showFavorite} file annotation are true.
      */
-    showModifyActions: boolean;
+    haveUser: boolean;
     /**
      * Dynamic callbacks.
      *
@@ -145,16 +144,6 @@ type FileViewerPhotoSwipeOptions = Pick<
         annotatedFile: FileViewerAnnotatedFile,
         buttonElement: HTMLElement,
     ) => void;
-    /**
-     * Called when the user activates the edit action on an image.
-     *
-     * If this callback is not provided, then the edit action is never shown. If
-     * this callback is provided (and {@link showModifyActions} is `true`), then
-     * the visibility of the edit action is determined by the
-     * {@link isEditableImage} property of the {@link FileViewerFileAnnotation}
-     * for the file.
-     */
-    onEditImage?: (annotatedFile: FileViewerAnnotatedFile) => void;
 };
 
 /**
@@ -248,13 +237,12 @@ export class FileViewerPhotoSwipe {
     constructor({
         initialIndex,
         disableDownload,
-        showModifyActions,
+        haveUser,
         delegate,
         onClose,
         onAnnotate,
         onViewInfo,
         onMore,
-        onEditImage,
     }: FileViewerPhotoSwipeOptions) {
         this.opts = { disableDownload };
         this.lastActivityDate = new Date();
@@ -522,7 +510,7 @@ export class FileViewerPhotoSwipe {
                 },
             });
 
-            if (showModifyActions) {
+            if (haveUser) {
                 const toggleFavorite = async (
                     buttonElement: HTMLButtonElement,
                 ) => {
@@ -602,7 +590,7 @@ export class FileViewerPhotoSwipe {
                 onClick: () => onViewInfo(currentAnnotatedFile()),
             });
 
-            if (showModifyActions && onEditImage) {
+            if (haveUser) {
                 pswp.ui.registerElement({
                     name: "more",
                     // TODO(PS):

From 80859d91b08632289ea2750b48ec7c97be0a5d7e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 19:40:15 +0530
Subject: [PATCH 656/796] schedule update

---
 .../gallery/components/viewer/FileViewer.tsx  | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index ff360ceba8..590af3e324 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -211,6 +211,20 @@ const FileViewer: React.FC<FileViewerProps> = ({
     // If `true`, then we need to trigger a sync with remote when we close.
     const [, setNeedsSync] = useState(false);
 
+    const handleClose = useCallback(() => {
+        setNeedsSync((needSync) => {
+            console.log("needs sync", needSync);
+            if (needSync) onTriggerSyncWithRemote?.();
+            return false;
+        });
+        setOpenFileInfo(false);
+        setOpenImageEditor(false);
+        // No need to `resetMoreMenuButtonOnMenuClose` since we're closing
+        // anyway and it'll be removed from the DOM.
+        setMoreMenuAnchorEl(null);
+        onClose();
+    }, [onTriggerSyncWithRemote, onClose]);
+
     const handleViewInfo = useCallback(
         (annotatedFile: FileViewerAnnotatedFile) => {
             setActiveAnnotatedFile(annotatedFile);
@@ -258,23 +272,6 @@ const FileViewer: React.FC<FileViewerProps> = ({
         [],
     );
 
-    const handleClose = useCallback(() => {
-        setNeedsSync((needSync) => {
-            if (needSync) onTriggerSyncWithRemote?.();
-            return false;
-        });
-        handleFileInfoClose();
-        handleImageEditorClose();
-        handleMoreMenuClose();
-        onClose();
-    }, [
-        onTriggerSyncWithRemote,
-        handleFileInfoClose,
-        handleImageEditorClose,
-        handleMoreMenuClose,
-        onClose,
-    ]);
-
     const handleSaveEditedCopy = useCallback(
         (editedFile: File, collection: Collection, enteFile: EnteFile) => {
             onSaveEditedImageCopy(editedFile, collection, enteFile);
@@ -335,8 +332,10 @@ const FileViewer: React.FC<FileViewerProps> = ({
 
     const toggleFavorite = useCallback(
         ({ file }: FileViewerAnnotatedFile) =>
-            onToggleFavorite!(file).catch(onGenericError),
-        [onToggleFavorite, onGenericError],
+            onToggleFavorite!(file)
+                .then(handleScheduleUpdate)
+                .catch(onGenericError),
+        [onToggleFavorite, handleScheduleUpdate, onGenericError],
     );
 
     // Initial value of delegate.

From 2859e02dacdda5313eb1ff200c8b0e0d2409e255 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 19:40:39 +0530
Subject: [PATCH 657/796] Revert "Temporary workbench"

This reverts commit 8e08a0d71d2b32fe56fdd2e6acd80ad7a09f0a8f.
---
 web/apps/photos/src/pages/_app.tsx                   | 4 ++--
 web/apps/photos/src/styles/global.css                | 3 +--
 web/packages/gallery/components/viewer/photoswipe.ts | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index aad64be0cf..000cf2d037 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -48,9 +48,9 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { resumeExportsIfNeeded } from "services/export";
 import { photosLogout } from "services/logout";
 
-// import "photoswipe/dist/photoswipe.css";
+import "photoswipe/dist/photoswipe.css";
 // TODO(PS): Note, auto hide only works with the new CSS.
-import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
+// import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
 
 import "styles/global.css";
 
diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 1b45cfe9ed..fe0efe365a 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -12,7 +12,7 @@ body {
     flex-direction: column;
     height: 100%;
 }
-@media DISABLED {
+
 .pswp__button--custom {
     width: 48px;
     height: 48px;
@@ -114,7 +114,6 @@ body {
 .pswp__caption--empty {
     display: none;
 }
-}
 
 .pswp-ente {
     /* The default z-index for PhotoSwipe is 10k, way beyond everything else.
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index d84458c268..168fe3aacb 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -31,7 +31,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 let PhotoSwipe;
 if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     // TODO(PS): Comment me before merging into main.
-    PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
+    // PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
 
 /**

From b20de9ed83208b564b2756aed0247a2da9a058c6 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 19:42:58 +0530
Subject: [PATCH 658/796] Convert deprecated prop

---
 .../base/components/mui/SidebarDrawer.tsx     | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/web/packages/base/components/mui/SidebarDrawer.tsx b/web/packages/base/components/mui/SidebarDrawer.tsx
index 6c96b47859..97f321e427 100644
--- a/web/packages/base/components/mui/SidebarDrawer.tsx
+++ b/web/packages/base/components/mui/SidebarDrawer.tsx
@@ -23,16 +23,23 @@ import React from "react";
  * It also does some trickery with a sticky opaque bar to ensure that the
  * content scrolls below our inline title bar on desktop.
  */
-export const SidebarDrawer: React.FC<DrawerProps> = ({ children, ...rest }) => (
+export const SidebarDrawer: React.FC<DrawerProps> = ({
+    slotProps,
+    children,
+    ...rest
+}) => (
     <Drawer
         {...rest}
-        PaperProps={{
-            sx: {
-                maxWidth: "375px",
-                width: "100%",
-                scrollbarWidth: "thin",
-                // Need to increase specificity to override inherited padding.
-                "&&": { padding: 0 },
+        slotProps={{
+            ...(slotProps ?? {}),
+            paper: {
+                sx: {
+                    maxWidth: "375px",
+                    width: "100%",
+                    scrollbarWidth: "thin",
+                    // Need to increase specificity to override inherited padding.
+                    "&&": { padding: 0 },
+                },
             },
         }}
     >

From 7355d99299457ec651f033762f5e8aa369966b3f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Fri, 28 Feb 2025 19:54:38 +0530
Subject: [PATCH 659/796] Simplify

---
 web/apps/auth/src/pages/auth.tsx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/web/apps/auth/src/pages/auth.tsx b/web/apps/auth/src/pages/auth.tsx
index 9f702136a2..eb4ddee58a 100644
--- a/web/apps/auth/src/pages/auth.tsx
+++ b/web/apps/auth/src/pages/auth.tsx
@@ -219,12 +219,11 @@ const CodeDisplay: React.FC<CodeDisplayProps> = ({ code }) => {
                         message={t("copied")}
                         slotProps={{
                             content: {
-                                sx: (theme) => ({
-                                    backgroundColor:
-                                        theme.vars.palette.fill.faint,
-                                    color: theme.vars.palette.primary.main,
+                                sx: {
+                                    backgroundColor: "fill.faint",
+                                    color: "primary.main",
                                     backdropFilter: "blur(10px)",
-                                }),
+                                },
                             },
                         }}
                     />

From fcbba19129f801de4ef2454f68837f87cce526ff Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Fri, 28 Feb 2025 21:43:35 +0530
Subject: [PATCH 660/796] fix: remove rotate property, add scroll widget in
 failure or any dialog, seekbar smooth, player ux buttons same position,
 failure title for preview

---
 mobile/lib/services/preview_video_store.dart  |  4 ----
 mobile/lib/ui/components/dialog_widget.dart   | 24 ++++++++++---------
 .../ui/settings/backup/backup_item_card.dart  |  4 +++-
 .../seek_bar.dart                             |  2 +-
 .../file/video_widget_media_kit_common.dart   |  4 ++--
 .../ui/viewer/file/video_widget_native.dart   |  1 +
 6 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 787d3e5891..47463ef6e3 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -227,7 +227,6 @@ class PreviewVideoStore {
       if (bitrate != null && bitrate <= 4000 * 1000 && codecIsH264) {
         session = await FFmpegKit.execute(
           '-i "${file.path}" '
-          '-metadata:s:v:0 rotate=0 '
           '-c:v copy -c:a copy '
           '-f hls -hls_time 2 -hls_flags single_file '
           '-hls_list_size 0 -hls_key_info_file ${keyinfo.path} '
@@ -240,7 +239,6 @@ class PreviewVideoStore {
           !codecIsH264) {
         session = await FFmpegKit.execute(
           '-i "${file.path}" '
-          '-metadata:s:v:0 rotate=0 '
           '-vf "format=yuv420p10le,zscale=transfer=linear,tonemap=tonemap=hable:desat=0:peak=10,zscale=transfer=bt709:matrix=bt709:primaries=bt709,format=yuv420p" '
           '-color_primaries bt709 -color_trc bt709 -colorspace bt709 '
           '-c:v libx264 -crf 23 -preset medium '
@@ -253,7 +251,6 @@ class PreviewVideoStore {
       else if (colorSpace != null && isColorGood) {
         session = await FFmpegKit.execute(
           '-i "${file.path}" '
-          '-metadata:s:v:0 rotate=0 '
           '-vf "scale=-2:720,fps=30" '
           '-c:v libx264 -b:v 2000k -crf 23 -preset medium '
           '-c:a aac -b:a 128k -f hls -hls_time 2 -hls_flags single_file '
@@ -264,7 +261,6 @@ class PreviewVideoStore {
       else {
         session = await FFmpegKit.execute(
           '-i "${file.path}" '
-          '-metadata:s:v:0 rotate=0 '
           '-vf "scale=-2:720,fps=30,format=yuv420p10le,zscale=transfer=linear,tonemap=tonemap=hable:desat=0:peak=10,zscale=transfer=bt709:matrix=bt709:primaries=bt709,format=yuv420p" '
           '-color_primaries bt709 -color_trc bt709 -colorspace bt709 '
           '-x264-params "colorprim=bt709:transfer=bt709:colormatrix=bt709" '
diff --git a/mobile/lib/ui/components/dialog_widget.dart b/mobile/lib/ui/components/dialog_widget.dart
index 0dbf491177..1bab11669d 100644
--- a/mobile/lib/ui/components/dialog_widget.dart
+++ b/mobile/lib/ui/components/dialog_widget.dart
@@ -78,17 +78,19 @@ class DialogWidget extends StatelessWidget {
       ),
       child: Padding(
         padding: const EdgeInsets.all(16),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            ContentContainer(
-              title: title,
-              body: body,
-              icon: icon,
-            ),
-            const SizedBox(height: 36),
-            Actions(buttons),
-          ],
+        child: SingleChildScrollView(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              ContentContainer(
+                title: title,
+                body: body,
+                icon: icon,
+              ),
+              const SizedBox(height: 36),
+              Actions(buttons),
+            ],
+          ),
         ),
       ),
     );
diff --git a/mobile/lib/ui/settings/backup/backup_item_card.dart b/mobile/lib/ui/settings/backup/backup_item_card.dart
index da00498ca3..84d9272853 100644
--- a/mobile/lib/ui/settings/backup/backup_item_card.dart
+++ b/mobile/lib/ui/settings/backup/backup_item_card.dart
@@ -144,6 +144,7 @@ class _BackupItemCardState extends State<BackupItemCard> {
                   ),
                   onPressed: () {
                     String errorMessage = "";
+                    bool isPreview = false;
                     if (widget.item.error is Exception) {
                       final Exception ex = widget.item.error as Exception;
                       errorMessage = "Error: " +
@@ -154,10 +155,11 @@ class _BackupItemCardState extends State<BackupItemCard> {
                       errorMessage = widget.item.error.toString();
                     } else if (widget.preview?.error != null) {
                       errorMessage = widget.preview!.error!.toString();
+                      isPreview = true;
                     }
                     showErrorDialog(
                       context,
-                      'Upload failed',
+                      isPreview ? "Preview upload ailed" : 'Upload failed',
                       errorMessage,
                     );
                   },
diff --git a/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart b/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart
index c3a9e80f8c..226a33224d 100644
--- a/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart
+++ b/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart
@@ -92,7 +92,7 @@ class _SeekBarState extends State<SeekBar> with SingleTickerProviderStateMixin {
               });
               _seekTo(value);
             },
-            divisions: widget.duration ?? 4500,
+            divisions: 4500,
             onChangeEnd: (value) {
               setState(() {
                 _animationController.value = value;
diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
index c3791d757e..a3e5b5929e 100644
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
@@ -34,7 +34,7 @@ class VideoWidget extends StatefulWidget {
 
 class _VideoWidgetState extends State<VideoWidget> {
   final showControlsNotifier = ValueNotifier<bool>(true);
-  static const verticalMargin = 72.0;
+  static const double verticalMargin = 64;
   final _hideControlsDebouncer = Debouncer(
     const Duration(milliseconds: 2000),
   );
@@ -74,7 +74,7 @@ class _VideoWidgetState extends State<VideoWidget> {
       if (widget.controller.player.state.playing) {
         _hideControlsDebouncer.run(() async {
           showControlsNotifier.value = false;
-          widget.playbackCallback?.call(false);
+          widget.playbackCallback?.call(true);
         });
       }
     }
diff --git a/mobile/lib/ui/viewer/file/video_widget_native.dart b/mobile/lib/ui/viewer/file/video_widget_native.dart
index 3d4578e549..f91b10d53e 100644
--- a/mobile/lib/ui/viewer/file/video_widget_native.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_native.dart
@@ -487,6 +487,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
   void _onPlaybackEnded() async {
     await _controller?.stop();
     if (localSettings.shouldLoopVideo()) {
+      Bus.instance.fire(SeekbarTriggeredEvent(position: 0));
       await _controller?.play();
     }
   }

From 2a5ba8480cd80b3591f3f51e256fd6ec12c593ef Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Fri, 28 Feb 2025 21:44:14 +0530
Subject: [PATCH 661/796] chore: bump build number

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index da267d3f33..928d95dec1 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.99+1008
+version: 0.9.99+1009
 publish_to: none
 
 environment:

From 5b88b2b5633f96a70c999e9db050f282a0f6f4b6 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Sat, 1 Mar 2025 10:43:37 +0530
Subject: [PATCH 662/796] [mob] Move model

---
 .../models/api/collection/create_request.dart |  2 +-
 mobile/lib/models/api/metadata.dart           | 54 ++++++++++++++++++
 mobile/lib/services/collections_service.dart  |  3 +-
 mobile/lib/services/file_magic_service.dart   | 56 +------------------
 mobile/lib/services/hidden_service.dart       |  2 +-
 mobile/lib/utils/file_uploader.dart           |  5 +-
 mobile/lib/utils/file_uploader_util.dart      |  2 +-
 mobile/lib/utils/lat_lon_util.dart            | 14 -----
 8 files changed, 63 insertions(+), 75 deletions(-)
 delete mode 100644 mobile/lib/utils/lat_lon_util.dart

diff --git a/mobile/lib/models/api/collection/create_request.dart b/mobile/lib/models/api/collection/create_request.dart
index 0fc5866383..2cc3954bae 100644
--- a/mobile/lib/models/api/collection/create_request.dart
+++ b/mobile/lib/models/api/collection/create_request.dart
@@ -1,5 +1,5 @@
+import "package:photos/models/api/metadata.dart";
 import 'package:photos/models/collection/collection.dart';
-import 'package:photos/services/file_magic_service.dart';
 
 class CreateRequest {
   String encryptedKey;
diff --git a/mobile/lib/models/api/metadata.dart b/mobile/lib/models/api/metadata.dart
index e69de29bb2..dbb3a479b0 100644
--- a/mobile/lib/models/api/metadata.dart
+++ b/mobile/lib/models/api/metadata.dart
@@ -0,0 +1,54 @@
+class UpdateMagicMetadataRequest {
+  final int id;
+  final MetadataRequest? magicMetadata;
+
+  UpdateMagicMetadataRequest({required this.id, required this.magicMetadata});
+
+  factory UpdateMagicMetadataRequest.fromJson(dynamic json) {
+    return UpdateMagicMetadataRequest(
+      id: json['id'],
+      magicMetadata: json['magicMetadata'] != null
+          ? MetadataRequest.fromJson(json['magicMetadata'])
+          : null,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['id'] = id;
+    if (magicMetadata != null) {
+      map['magicMetadata'] = magicMetadata!.toJson();
+    }
+    return map;
+  }
+}
+
+class MetadataRequest {
+  int? version;
+  int? count;
+  String? data;
+  String? header;
+
+  MetadataRequest({
+    required this.version,
+    required this.count,
+    required this.data,
+    required this.header,
+  });
+
+  MetadataRequest.fromJson(dynamic json) {
+    version = json['version'];
+    count = json['count'];
+    data = json['data'];
+    header = json['header'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final map = <String, dynamic>{};
+    map['version'] = version;
+    map['count'] = count;
+    map['data'] = data;
+    map['header'] = header;
+    return map;
+  }
+}
diff --git a/mobile/lib/services/collections_service.dart b/mobile/lib/services/collections_service.dart
index aacec742bd..b2e3c8e73e 100644
--- a/mobile/lib/services/collections_service.dart
+++ b/mobile/lib/services/collections_service.dart
@@ -29,6 +29,7 @@ import 'package:photos/models/api/collection/collection_file_item.dart';
 import 'package:photos/models/api/collection/create_request.dart';
 import "package:photos/models/api/collection/public_url.dart";
 import "package:photos/models/api/collection/user.dart";
+import "package:photos/models/api/metadata.dart";
 import 'package:photos/models/collection/collection.dart';
 import 'package:photos/models/collection/collection_items.dart';
 import 'package:photos/models/file/file.dart';
@@ -37,7 +38,6 @@ import "package:photos/models/metadata/collection_magic.dart";
 import "package:photos/service_locator.dart";
 import 'package:photos/services/app_lifecycle_service.dart';
 import "package:photos/services/favorites_service.dart";
-import 'package:photos/services/file_magic_service.dart';
 import 'package:photos/services/local_sync_service.dart';
 import 'package:photos/services/remote_sync_service.dart';
 import "package:photos/utils/dialog_util.dart";
@@ -666,6 +666,7 @@ class CollectionsService {
       ),
     );
     sync().ignore();
+    // not required once remote & local world are separate
     LocalSyncService.instance.syncAll().ignore();
   }
 
diff --git a/mobile/lib/services/file_magic_service.dart b/mobile/lib/services/file_magic_service.dart
index 5d0c2721c4..b012cb49f4 100644
--- a/mobile/lib/services/file_magic_service.dart
+++ b/mobile/lib/services/file_magic_service.dart
@@ -12,6 +12,7 @@ import 'package:photos/events/files_updated_event.dart';
 import 'package:photos/events/force_reload_home_gallery_event.dart';
 import 'package:photos/events/local_photos_updated_event.dart';
 import 'package:photos/extensions/list.dart';
+import "package:photos/models/api/metadata.dart";
 import 'package:photos/models/file/file.dart';
 import "package:photos/models/metadata/common_keys.dart";
 import "package:photos/models/metadata/file_magic.dart";
@@ -195,58 +196,3 @@ class FileMagicService {
     }
   }
 }
-
-class UpdateMagicMetadataRequest {
-  final int id;
-  final MetadataRequest? magicMetadata;
-
-  UpdateMagicMetadataRequest({required this.id, required this.magicMetadata});
-
-  factory UpdateMagicMetadataRequest.fromJson(dynamic json) {
-    return UpdateMagicMetadataRequest(
-      id: json['id'],
-      magicMetadata: json['magicMetadata'] != null
-          ? MetadataRequest.fromJson(json['magicMetadata'])
-          : null,
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    final map = <String, dynamic>{};
-    map['id'] = id;
-    if (magicMetadata != null) {
-      map['magicMetadata'] = magicMetadata!.toJson();
-    }
-    return map;
-  }
-}
-
-class MetadataRequest {
-  int? version;
-  int? count;
-  String? data;
-  String? header;
-
-  MetadataRequest({
-    required this.version,
-    required this.count,
-    required this.data,
-    required this.header,
-  });
-
-  MetadataRequest.fromJson(dynamic json) {
-    version = json['version'];
-    count = json['count'];
-    data = json['data'];
-    header = json['header'];
-  }
-
-  Map<String, dynamic> toJson() {
-    final map = <String, dynamic>{};
-    map['version'] = version;
-    map['count'] = count;
-    map['data'] = data;
-    map['header'] = header;
-    return map;
-  }
-}
diff --git a/mobile/lib/services/hidden_service.dart b/mobile/lib/services/hidden_service.dart
index 90d65559c7..b97695a62d 100644
--- a/mobile/lib/services/hidden_service.dart
+++ b/mobile/lib/services/hidden_service.dart
@@ -12,12 +12,12 @@ import 'package:photos/events/files_updated_event.dart';
 import 'package:photos/events/local_photos_updated_event.dart';
 import "package:photos/generated/l10n.dart";
 import 'package:photos/models/api/collection/create_request.dart';
+import "package:photos/models/api/metadata.dart";
 import 'package:photos/models/collection/collection.dart';
 import 'package:photos/models/file/file.dart';
 import "package:photos/models/metadata/collection_magic.dart";
 import "package:photos/models/metadata/common_keys.dart";
 import 'package:photos/services/collections_service.dart';
-import 'package:photos/services/file_magic_service.dart';
 import 'package:photos/utils/dialog_util.dart';
 
 extension HiddenService on CollectionsService {
diff --git a/mobile/lib/utils/file_uploader.dart b/mobile/lib/utils/file_uploader.dart
index 98c9d49fc2..9929628e09 100644
--- a/mobile/lib/utils/file_uploader.dart
+++ b/mobile/lib/utils/file_uploader.dart
@@ -24,6 +24,7 @@ import 'package:photos/events/files_updated_event.dart';
 import 'package:photos/events/local_photos_updated_event.dart';
 import 'package:photos/events/subscription_purchased_event.dart';
 import 'package:photos/main.dart';
+import "package:photos/models/api/metadata.dart";
 import "package:photos/models/backup/backup_item.dart";
 import "package:photos/models/backup/backup_item_status.dart";
 import 'package:photos/models/file/file.dart';
@@ -34,7 +35,6 @@ import 'package:photos/module/upload/model/upload_url.dart';
 import "package:photos/module/upload/service/multipart.dart";
 import "package:photos/service_locator.dart";
 import 'package:photos/services/collections_service.dart';
-import "package:photos/services/file_magic_service.dart";
 import 'package:photos/services/local_sync_service.dart';
 import "package:photos/services/preview_video_store.dart";
 import 'package:photos/services/sync_service.dart';
@@ -751,7 +751,8 @@ class FileUploader {
       if (SyncService.instance.shouldStopSync()) {
         throw SyncStopRequestedError();
       }
-      final stillLocked = await _uploadLocks.isLocked(lockKey, _processType.toString());
+      final stillLocked =
+          await _uploadLocks.isLocked(lockKey, _processType.toString());
       if (!stillLocked) {
         _logger.warning('file ${file.tag} report paused is missing');
         throw LockFreedError();
diff --git a/mobile/lib/utils/file_uploader_util.dart b/mobile/lib/utils/file_uploader_util.dart
index 7bbdbd0bb2..07c3084b20 100644
--- a/mobile/lib/utils/file_uploader_util.dart
+++ b/mobile/lib/utils/file_uploader_util.dart
@@ -17,13 +17,13 @@ import 'package:photo_manager/photo_manager.dart';
 import 'package:photos/core/configuration.dart';
 import 'package:photos/core/constants.dart';
 import 'package:photos/core/errors.dart';
+import "package:photos/models/api/metadata.dart";
 import "package:photos/models/ffmpeg/ffprobe_props.dart";
 import "package:photos/models/file/extensions/file_props.dart";
 import 'package:photos/models/file/file.dart';
 import 'package:photos/models/file/file_type.dart';
 import "package:photos/models/location/location.dart";
 import "package:photos/models/metadata/file_magic.dart";
-import "package:photos/services/file_magic_service.dart";
 import "package:photos/utils/exif_util.dart";
 import 'package:photos/utils/file_util.dart';
 import "package:uuid/uuid.dart";
diff --git a/mobile/lib/utils/lat_lon_util.dart b/mobile/lib/utils/lat_lon_util.dart
deleted file mode 100644
index a270e39024..0000000000
--- a/mobile/lib/utils/lat_lon_util.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-String convertLatLng(double decimal, bool isLat) {
-  final degree = "${decimal.toString().split(".")[0]}°";
-  final minutesBeforeConversion =
-      double.parse("0.${decimal.toString().split(".")[1]}");
-  final minutes = "${(minutesBeforeConversion * 60).toString().split('.')[0]}'";
-  final secondsBeforeConversion = double.parse(
-    "0.${(minutesBeforeConversion * 60).toString().split('.')[1]}",
-  );
-  final seconds =
-      '${double.parse((secondsBeforeConversion * 60).toString()).toStringAsFixed(0)}" ';
-  final dmsOutput =
-      "$degree$minutes$seconds${isLat ? decimal > 0 ? 'N' : 'S' : decimal > 0 ? 'E' : 'W'}";
-  return dmsOutput;
-}

From 8516d8364cde2ca5ceb0ac3492170aadf4afb463 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Sat, 1 Mar 2025 10:48:03 +0530
Subject: [PATCH 663/796] [mob] Remove unused file

---
 .../lib/ui/settings/storage_error_widget.dart |  32 ----
 .../file_details/objects_item_widget.dart     |  66 -------
 .../viewer/people/new_person_item_widget.dart |  74 --------
 mobile/lib/utils/face/face_util.dart          | 175 ------------------
 mobile/lib/utils/multipart_upload_util.dart   | 157 ----------------
 5 files changed, 504 deletions(-)
 delete mode 100644 mobile/lib/ui/settings/storage_error_widget.dart
 delete mode 100644 mobile/lib/ui/viewer/file_details/objects_item_widget.dart
 delete mode 100644 mobile/lib/ui/viewer/people/new_person_item_widget.dart
 delete mode 100644 mobile/lib/utils/face/face_util.dart
 delete mode 100644 mobile/lib/utils/multipart_upload_util.dart

diff --git a/mobile/lib/ui/settings/storage_error_widget.dart b/mobile/lib/ui/settings/storage_error_widget.dart
deleted file mode 100644
index 8ccf6de0f5..0000000000
--- a/mobile/lib/ui/settings/storage_error_widget.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-import 'package:flutter/material.dart';
-import "package:photos/generated/l10n.dart";
-import 'package:photos/theme/colors.dart';
-import 'package:photos/theme/ente_theme.dart';
-
-class StorageErrorWidget extends StatelessWidget {
-  const StorageErrorWidget({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.all(12),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          const Icon(
-            Icons.error_outline_outlined,
-            color: strokeBaseDark,
-          ),
-          const SizedBox(height: 8),
-          Text(
-            S.of(context).yourStorageDetailsCouldNotBeFetched,
-            style: getEnteTextTheme(context).small.copyWith(
-                  color: textMutedDark,
-                ),
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/mobile/lib/ui/viewer/file_details/objects_item_widget.dart b/mobile/lib/ui/viewer/file_details/objects_item_widget.dart
deleted file mode 100644
index c02576c116..0000000000
--- a/mobile/lib/ui/viewer/file_details/objects_item_widget.dart
+++ /dev/null
@@ -1,66 +0,0 @@
-import "package:flutter/foundation.dart";
-import "package:flutter/material.dart";
-import "package:logging/logging.dart";
-import "package:photos/generated/l10n.dart";
-import 'package:photos/models/file/file.dart';
-import "package:photos/ui/components/buttons/chip_button_widget.dart";
-import "package:photos/ui/components/info_item_widget.dart";
-
-class ObjectsItemWidget extends StatelessWidget {
-  final EnteFile file;
-  const ObjectsItemWidget(this.file, {super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return InfoItemWidget(
-      key: const ValueKey("Objects"),
-      leadingIcon: Icons.image_search_outlined,
-      subtitleSection: _objectTags(context, file),
-      hasChipButtons: true,
-    );
-  }
-
-  Future<List<ChipButtonWidget>> _objectTags(
-    BuildContext context,
-    EnteFile file,
-  ) async {
-    try {
-      final chipButtons = <ChipButtonWidget>[];
-      var objectTags = <String, double>{};
-
-      // final thumbnail = await getThumbnail(file);
-      // if (thumbnail != null) {
-      //   objectTags = await ObjectDetectionService.instance.predict(thumbnail);
-      // }
-      if (objectTags.isEmpty) {
-        return [
-          ChipButtonWidget(
-            S.of(context).noResults,
-            noChips: true,
-          ),
-        ];
-      }
-      // sort by values
-      objectTags = Map.fromEntries(
-        objectTags.entries.toList()
-          ..sort((e1, e2) => e2.value.compareTo(e1.value)),
-      );
-
-      for (MapEntry<String, double> entry in objectTags.entries) {
-        chipButtons.add(
-          ChipButtonWidget(
-            entry.key +
-                (kDebugMode
-                    ? "-" + (entry.value * 100).round().toString()
-                    : ""),
-          ),
-        );
-      }
-
-      return chipButtons;
-    } catch (e, s) {
-      Logger("ObjctsItemWidget").info(e, s);
-      return [];
-    }
-  }
-}
diff --git a/mobile/lib/ui/viewer/people/new_person_item_widget.dart b/mobile/lib/ui/viewer/people/new_person_item_widget.dart
deleted file mode 100644
index 88fa0fa3de..0000000000
--- a/mobile/lib/ui/viewer/people/new_person_item_widget.dart
+++ /dev/null
@@ -1,74 +0,0 @@
-import 'package:dotted_border/dotted_border.dart';
-import 'package:flutter/material.dart';
-import "package:photos/generated/l10n.dart";
-import 'package:photos/theme/ente_theme.dart';
-
-///https://www.figma.com/file/SYtMyLBs5SAOkTbfMMzhqt/ente-Visual-Design?node-id=10854%3A57947&t=H5AvR79OYDnB9ekw-4
-class NewPersonItemWidget extends StatelessWidget {
-  const NewPersonItemWidget({
-    super.key,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final textTheme = getEnteTextTheme(context);
-    final colorScheme = getEnteColorScheme(context);
-    const sideOfThumbnail = 60.0;
-    return LayoutBuilder(
-      builder: (context, constraints) {
-        return Stack(
-          alignment: Alignment.center,
-          children: [
-            Row(
-              children: [
-                ClipRRect(
-                  borderRadius: const BorderRadius.horizontal(
-                    left: Radius.circular(4),
-                  ),
-                  child: SizedBox(
-                    height: sideOfThumbnail,
-                    width: sideOfThumbnail,
-                    child: Icon(
-                      Icons.add_outlined,
-                      color: colorScheme.strokeMuted,
-                    ),
-                  ),
-                ),
-                Padding(
-                  padding: const EdgeInsets.only(left: 12),
-                  child: Text(
-                    S.of(context).addNewPerson,
-                    style:
-                        textTheme.body.copyWith(color: colorScheme.textMuted),
-                  ),
-                ),
-              ],
-            ),
-            IgnorePointer(
-              child: DottedBorder(
-                dashPattern: const [4],
-                color: colorScheme.strokeFainter,
-                strokeWidth: 1,
-                padding: const EdgeInsets.all(0),
-                borderType: BorderType.RRect,
-                radius: const Radius.circular(4),
-                child: SizedBox(
-                  //Have to decrease the height and width by 1 pt as the stroke
-                  //dotted border gives is of strokeAlign.center, so 0.5 inside and
-                  // outside. Here for the row, stroke should be inside so we
-                  //decrease the size of this sizedBox by 1 (so it shrinks 0.5 from
-                  //every side) so that the strokeAlign.center of this sizedBox
-                  //looks like a strokeAlign.inside in the row.
-                  height: sideOfThumbnail - 1,
-                  //This width will work for this only if the row widget takes up the
-                  //full size it's parent (stack).
-                  width: constraints.maxWidth - 1,
-                ),
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
-}
diff --git a/mobile/lib/utils/face/face_util.dart b/mobile/lib/utils/face/face_util.dart
deleted file mode 100644
index cb5b186b04..0000000000
--- a/mobile/lib/utils/face/face_util.dart
+++ /dev/null
@@ -1,175 +0,0 @@
-import "dart:math";
-import "dart:typed_data";
-
-import "package:computer/computer.dart";
-import "package:flutter_image_compress/flutter_image_compress.dart";
-import "package:image/image.dart" as img;
-import "package:logging/logging.dart";
-import "package:photos/models/ml/face/box.dart";
-
-/// Bounding box of a face.
-///
-/// [xMin] and [yMin] are the coordinates of the top left corner of the box, and
-/// [width] and [height] are the width and height of the box.
-///
-/// One unit is equal to one pixel in the original image.
-class FaceBoxImage {
-  final int xMin;
-  final int yMin;
-  final int width;
-  final int height;
-
-  FaceBoxImage({
-    required this.xMin,
-    required this.yMin,
-    required this.width,
-    required this.height,
-  });
-}
-
-final _logger = Logger("FaceUtil");
-final _computer = Computer.shared();
-const _faceImageBufferFactor = 0.2;
-
-///Convert img.Image to ui.Image and use RawImage to display.
-Future<List<img.Image>> generateImgFaceThumbnails(
-  String imagePath,
-  List<FaceBox> faceBoxes,
-) async {
-  final faceThumbnails = <img.Image>[];
-
-  final image = await decodeToImgImage(imagePath);
-
-  for (FaceBox faceBox in faceBoxes) {
-    final croppedImage = cropFaceBoxFromImage(image, faceBox);
-    faceThumbnails.add(croppedImage);
-  }
-
-  return faceThumbnails;
-}
-
-Future<List<Uint8List>> generateJpgFaceThumbnails(
-  String imagePath,
-  List<FaceBox> faceBoxes,
-) async {
-  final image = await decodeToImgImage(imagePath);
-  final croppedImages = <img.Image>[];
-  for (FaceBox faceBox in faceBoxes) {
-    final croppedImage = cropFaceBoxFromImage(image, faceBox);
-    croppedImages.add(croppedImage);
-  }
-
-  return await _computer
-      .compute(_encodeImagesToJpg, param: {"images": croppedImages});
-}
-
-Future<img.Image> decodeToImgImage(String imagePath) async {
-  img.Image? image =
-      await _computer.compute(_decodeImageFile, param: {"filePath": imagePath});
-
-  if (image == null) {
-    _logger.info(
-      "Failed to decode image. Compressing to jpg and decoding",
-    );
-    final compressedJPGImage =
-        await FlutterImageCompress.compressWithFile(imagePath);
-    image = await _computer.compute(
-      _decodeJpg,
-      param: {"image": compressedJPGImage},
-    );
-
-    if (image == null) {
-      throw Exception("Failed to decode image");
-    } else {
-      return image;
-    }
-  } else {
-    return image;
-  }
-}
-
-/// Returns an Image from 'package:image/image.dart'
-img.Image cropFaceBoxFromImage(img.Image image, FaceBox faceBox) {
-  final squareFaceBox = _getSquareFaceBoxImage(image, faceBox);
-  final squareFaceBoxWithBuffer =
-      _addBufferAroundFaceBox(squareFaceBox, _faceImageBufferFactor);
-  return img.copyCrop(
-    image,
-    x: squareFaceBoxWithBuffer.xMin,
-    y: squareFaceBoxWithBuffer.yMin,
-    width: squareFaceBoxWithBuffer.width,
-    height: squareFaceBoxWithBuffer.height,
-    antialias: false,
-  );
-}
-
-/// Returns a square face box image from the original image with
-/// side length equal to the maximum of the width and height of the face box in
-/// the OG image.
-FaceBoxImage _getSquareFaceBoxImage(img.Image image, FaceBox faceBox) {
-  final width = (image.width * faceBox.width).round();
-  final height = (image.height * faceBox.height).round();
-  final side = max(width, height);
-  final xImage = (image.width * faceBox.x).round();
-  final yImage = (image.height * faceBox.y).round();
-
-  if (height >= width) {
-    final xImageAdj = (xImage - (height - width) / 2).round();
-    return FaceBoxImage(
-      xMin: xImageAdj,
-      yMin: yImage,
-      width: side,
-      height: side,
-    );
-  } else {
-    final yImageAdj = (yImage - (width - height) / 2).round();
-    return FaceBoxImage(
-      xMin: xImage,
-      yMin: yImageAdj,
-      width: side,
-      height: side,
-    );
-  }
-}
-
-///To add some buffer around the face box so that the face isn't cropped
-///too close to the face.
-FaceBoxImage _addBufferAroundFaceBox(
-  FaceBoxImage faceBoxImage,
-  double bufferFactor,
-) {
-  final heightBuffer = faceBoxImage.height * bufferFactor;
-  final widthBuffer = faceBoxImage.width * bufferFactor;
-  final xMinWithBuffer = faceBoxImage.xMin - widthBuffer;
-  final yMinWithBuffer = faceBoxImage.yMin - heightBuffer;
-  final widthWithBuffer = faceBoxImage.width + 2 * widthBuffer;
-  final heightWithBuffer = faceBoxImage.height + 2 * heightBuffer;
-  //Do not add buffer if the top left edge of the image is out of bounds
-  //after adding the buffer.
-  if (xMinWithBuffer < 0 || yMinWithBuffer < 0) {
-    return faceBoxImage;
-  }
-  //Another similar case that can be handled is when the bottom right edge
-  //of the image is out of bounds after adding the buffer. But the
-  //the visual difference is not as significant as when the top left edge
-  //is out of bounds, so we are not handling that case.
-  return FaceBoxImage(
-    xMin: xMinWithBuffer.round(),
-    yMin: yMinWithBuffer.round(),
-    width: widthWithBuffer.round(),
-    height: heightWithBuffer.round(),
-  );
-}
-
-List<Uint8List> _encodeImagesToJpg(Map args) {
-  final images = args["images"] as List<img.Image>;
-  return images.map((img.Image image) => img.encodeJpg(image)).toList();
-}
-
-Future<img.Image?> _decodeImageFile(Map args) async {
-  return await img.decodeImageFile(args["filePath"]);
-}
-
-img.Image? _decodeJpg(Map args) {
-  return img.decodeJpg(args["image"])!;
-}
diff --git a/mobile/lib/utils/multipart_upload_util.dart b/mobile/lib/utils/multipart_upload_util.dart
deleted file mode 100644
index 6b9ccafb97..0000000000
--- a/mobile/lib/utils/multipart_upload_util.dart
+++ /dev/null
@@ -1,157 +0,0 @@
-// ignore_for_file: implementation_imports
-
-import "dart:io";
-
-import "package:dio/dio.dart";
-import "package:logging/logging.dart";
-import "package:photos/core/constants.dart";
-import "package:photos/core/network/network.dart";
-import 'package:photos/module/upload/model/xml.dart';
-import "package:photos/service_locator.dart";
-
-final _enteDio = NetworkClient.instance.enteDio;
-final _dio = NetworkClient.instance.getDio();
-
-class PartETag extends XmlParsableObject {
-  final int partNumber;
-  final String eTag;
-
-  PartETag(this.partNumber, this.eTag);
-
-  @override
-  String get elementName => "Part";
-
-  @override
-  Map<String, dynamic> toMap() {
-    return {
-      "PartNumber": partNumber,
-      "ETag": eTag,
-    };
-  }
-}
-
-class MultipartUploadURLs {
-  final String objectKey;
-  final List<String> partsURLs;
-  final String completeURL;
-
-  MultipartUploadURLs({
-    required this.objectKey,
-    required this.partsURLs,
-    required this.completeURL,
-  });
-
-  factory MultipartUploadURLs.fromMap(Map<String, dynamic> map) {
-    return MultipartUploadURLs(
-      objectKey: map["urls"]["objectKey"],
-      partsURLs: (map["urls"]["partURLs"] as List).cast<String>(),
-      completeURL: map["urls"]["completeURL"],
-    );
-  }
-}
-
-Future<int> calculatePartCount(int fileSize) async {
-  final partCount = (fileSize / multipartPartSize).ceil();
-  return partCount;
-}
-
-Future<MultipartUploadURLs> getMultipartUploadURLs(int count) async {
-  try {
-    assert(
-      flagService.internalUser,
-      "Multipart upload should not be enabled for external users.",
-    );
-    final response = await _enteDio.get(
-      "/files/multipart-upload-urls",
-      queryParameters: {
-        "count": count,
-      },
-    );
-
-    return MultipartUploadURLs.fromMap(response.data);
-  } on Exception catch (e) {
-    Logger("MultipartUploadURL").severe(e);
-    rethrow;
-  }
-}
-
-Future<String> putMultipartFile(
-  MultipartUploadURLs urls,
-  File encryptedFile,
-) async {
-  // upload individual parts and get their etags
-  final etags = await uploadParts(urls.partsURLs, encryptedFile);
-
-  // complete the multipart upload
-  await completeMultipartUpload(etags, urls.completeURL);
-
-  return urls.objectKey;
-}
-
-Future<Map<int, String>> uploadParts(
-  List<String> partsURLs,
-  File encryptedFile,
-) async {
-  final partsLength = partsURLs.length;
-  final etags = <int, String>{};
-
-  for (int i = 0; i < partsLength; i++) {
-    final partURL = partsURLs[i];
-    final isLastPart = i == partsLength - 1;
-    final fileSize = isLastPart
-        ? encryptedFile.lengthSync() % multipartPartSize
-        : multipartPartSize;
-
-    final response = await _dio.put(
-      partURL,
-      data: encryptedFile.openRead(
-        i * multipartPartSize,
-        isLastPart ? null : multipartPartSize,
-      ),
-      options: Options(
-        headers: {
-          Headers.contentLengthHeader: fileSize,
-        },
-      ),
-    );
-
-    final eTag = response.headers.value("etag");
-
-    if (eTag?.isEmpty ?? true) {
-      throw Exception('ETAG_MISSING');
-    }
-
-    etags[i] = eTag!;
-  }
-
-  return etags;
-}
-
-Future<void> completeMultipartUpload(
-  Map<int, String> partEtags,
-  String completeURL,
-) async {
-  final body = convertJs2Xml({
-    'CompleteMultipartUpload': partEtags.entries
-        .map(
-          (e) => PartETag(
-            e.key + 1,
-            e.value,
-          ),
-        )
-        .toList(),
-  }).replaceAll('"', '').replaceAll('&quot;', '');
-
-  try {
-    await _dio.post(
-      completeURL,
-      data: body,
-      options: Options(
-        contentType: "text/xml",
-      ),
-    );
-  } catch (e) {
-    Logger("MultipartUpload").severe(e);
-    rethrow;
-  }
-}

From c7bc560d53f0f503c5eb55bcf430ce45efded669 Mon Sep 17 00:00:00 2001
From: vishnukvmd <vishnu@ente.io>
Date: Sat, 1 Mar 2025 12:30:27 +0530
Subject: [PATCH 664/796] [mob] Fix grammar

---
 auth/lib/l10n/arb/app_en.arb | 2 +-
 mobile/lib/l10n/intl_en.arb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/auth/lib/l10n/arb/app_en.arb b/auth/lib/l10n/arb/app_en.arb
index a51ec12366..9f450d8de3 100644
--- a/auth/lib/l10n/arb/app_en.arb
+++ b/auth/lib/l10n/arb/app_en.arb
@@ -499,7 +499,7 @@
   "appLockOfflineModeWarning": "You have chosen to proceed without backups. If you forget your applock, you will be locked out from accessing your data.",
   "duplicateCodes": "Duplicate codes",
   "noDuplicates": "✨ No duplicates",
-  "youveNoDuplicateCodesThatCanBeCleared": "You've no duplicate codes that can be cleared",
+  "youveNoDuplicateCodesThatCanBeCleared": "You don't have any duplicate codes that can be cleared",
   "deduplicateCodes": "Deduplicate codes",
   "deselectAll": "Deselect all",
   "selectAll": "Select all",
diff --git a/mobile/lib/l10n/intl_en.arb b/mobile/lib/l10n/intl_en.arb
index 9c29390b16..d4ad2fb32e 100644
--- a/mobile/lib/l10n/intl_en.arb
+++ b/mobile/lib/l10n/intl_en.arb
@@ -525,7 +525,7 @@
   "viewLargeFiles": "Large files",
   "viewLargeFilesDesc": "View files that are consuming the most amount of storage.",
   "noDuplicates": "✨ No duplicates",
-  "youveNoDuplicateFilesThatCanBeCleared": "You've no duplicate files that can be cleared",
+  "youveNoDuplicateFilesThatCanBeCleared": "You don't have any duplicate files that can be cleared",
   "success": "Success",
   "rateUs": "Rate us",
   "remindToEmptyDeviceTrash": "Also empty \"Recently Deleted\" from \"Settings\" -> \"Storage\" to claim the freed space",

From 74051ad6bb267df712df5118217ac0cb3e0de345 Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Sat, 1 Mar 2025 18:40:03 +0530
Subject: [PATCH 665/796] Some more details about Replication

---
 .../self-hosting/guides/configuring-s3.md     | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/docs/docs/self-hosting/guides/configuring-s3.md b/docs/docs/self-hosting/guides/configuring-s3.md
index 8da933d686..dcc209e8b1 100644
--- a/docs/docs/self-hosting/guides/configuring-s3.md
+++ b/docs/docs/self-hosting/guides/configuring-s3.md
@@ -54,20 +54,30 @@ The same principle applies if you're deploying to your custom domain.
 
 ## Replication 
 
-If you're wondering why there are 3 buckets on MinIO UI - that's because our 
-production instance uses these to perform [replication](https://ente.io/reliability/).
-
-In a self hosted Ente Instance replication is turned off by default.
-When replication is turned off, only the first bucket (`b2-eu-cen`) is used, 
-and you can ignore the other two. Use the `s3.hot_storage.primary` option 
-if you'd like to set one of the other predefined buckets as the primary bucket.
-
 > [!IMPORTANT]
 > As of now, Replication works only if all the 3 storage type 
 > needs are fulfilled (1 Hot, 1 Cold and 1 Glacier Storage).
 >
 > [Reference](https://github.com/ente-io/ente/discussions/3167#discussioncomment-10585970)
 
+If you're wondering why there are 3 buckets on MinIO UI - that's because our 
+production instance uses these to perform [replication](https://ente.io/reliability/).
+
+If you're also wondering about why the bucket names are specifically what they are, 
+it's because that is exactly what we are using on our production instance. 
+We use `b2-eu-cen` as hot, `wasabi-eu-central-2-v3` as cold (also the secondary hot) 
+and `scw-eu-fr-v3` as glacier storage. As of now, all of this is hardcoded. 
+Hence, the same hardcoded configuration is applied when you self host Ente.
+
+In a Self hosted Ente Instance replication is turned off by default.
+When replication is turned off, only the first bucket (`b2-eu-cen`) is used, 
+and the other two are ignored. Only the names here are specifically fixed, but 
+in the configuration body you can put any other keys. It does not have any relation 
+with `b2`, `wasabi` or even `scaleway`.
+
+Use the `s3.hot_storage.primary` option if you'd like to set one of the other 
+predefined buckets as the primary bucket.
+
 ## SSL Configuration 
 
 > [!NOTE]

From 36f90014a23918d22fe3a4a90204067e87af1c61 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Sat, 1 Mar 2025 18:50:06 +0530
Subject: [PATCH 666/796] [mob][photos] People surface logic

---
 mobile/lib/models/memories_cache.dart         |  11 ++
 mobile/lib/models/ml/face/person.dart         |   2 +
 mobile/lib/models/people_memory.dart          |   8 +-
 .../lib/services/memories_cache_service.dart  |  61 ++++---
 .../lib/services/smart_memories_service.dart  | 150 +++++++++++++++---
 5 files changed, 189 insertions(+), 43 deletions(-)

diff --git a/mobile/lib/models/memories_cache.dart b/mobile/lib/models/memories_cache.dart
index 2284bb5a57..268fcc1659 100644
--- a/mobile/lib/models/memories_cache.dart
+++ b/mobile/lib/models/memories_cache.dart
@@ -5,6 +5,17 @@ import "package:photos/models/people_memory.dart";
 import "package:photos/models/smart_memory.dart";
 import "package:photos/models/trip_memory.dart";
 
+const kPersonShowTimeout = Duration(days: 7 * 10);
+const kPersonAndTypeShowTimeout = Duration(days: 7 * 26);
+const kTripShowTimeout = Duration(days: 7 * 25);
+
+final maxShowTimeout = 
+    [
+      kPersonShowTimeout,
+      kPersonAndTypeShowTimeout,
+      kTripShowTimeout,
+    ].reduce((value, element) => value > element ? value : element) * 3;
+
 class MemoriesCache {
   final List<ToShowMemory> toShowMemories;
   final List<PeopleShownLog> peopleShownLogs;
diff --git a/mobile/lib/models/ml/face/person.dart b/mobile/lib/models/ml/face/person.dart
index b758285461..f373c89303 100644
--- a/mobile/lib/models/ml/face/person.dart
+++ b/mobile/lib/models/ml/face/person.dart
@@ -52,6 +52,8 @@ class PersonData {
   String? avatarFaceID;
   List<ClusterInfo> assigned = List<ClusterInfo>.empty();
   List<String> rejectedFaceIDs = List<String>.empty();
+
+  /// string formatted in `yyyy-MM-dd`
   final String? birthDate;
 
   /// email should be always looked via userID as user might have changed
diff --git a/mobile/lib/models/people_memory.dart b/mobile/lib/models/people_memory.dart
index 6935372d62..c6810be3c9 100644
--- a/mobile/lib/models/people_memory.dart
+++ b/mobile/lib/models/people_memory.dart
@@ -8,6 +8,12 @@ enum PeopleMemoryType {
   lastTimeYouSawThem,
 }
 
+const peopleRotationTypes = [
+  PeopleMemoryType.youAndThem,
+  PeopleMemoryType.doingSomethingTogether,
+  PeopleMemoryType.spotlight,
+];
+
 PeopleMemoryType peopleMemoryTypeFromString(String type) {
   switch (type) {
     case "youAndThem":
@@ -63,7 +69,7 @@ class PeopleMemory extends SmartMemory {
     List<Memory> memories,
     String title,
     int firstDateToShow,
-    int lastDateToShow, 
+    int lastDateToShow,
     this.peopleMemoryType,
     this.personID, {
     super.firstCreationTime,
diff --git a/mobile/lib/services/memories_cache_service.dart b/mobile/lib/services/memories_cache_service.dart
index c6d2bcf8fc..ebdadd85d9 100644
--- a/mobile/lib/services/memories_cache_service.dart
+++ b/mobile/lib/services/memories_cache_service.dart
@@ -133,25 +133,35 @@ class MemoriesCacheService {
       final EnteWatch? w =
           kDebugMode ? EnteWatch("MemoriesCacheService") : null;
       w?.start();
+      final oldCache = await _readCacheFromDisk();
+      w?.log("gotten old cache");
+      final MemoriesCache newCache = _processOldCache(oldCache);
+      w?.log("processed old cache");
       // calculate memories for this period and for the next period
       final now = DateTime.now();
       final next = now.add(kMemoriesUpdateFrequency);
-      final nowMemories = await smartMemoriesService.calcMemories(now);
+      final nowMemories =
+          await smartMemoriesService.calcMemories(now, newCache);
       final nextMemories =
-          await smartMemoriesService.calcMemories(next);
+          await smartMemoriesService.calcMemories(next, newCache);
       w?.log("calculated new memories");
-      final oldCache = await _readCacheFromDisk();
-      w?.log("gotten old cache");
-      final MemoriesCache memoryCache =
-          _toCache(nowMemories, now, nextMemories, next, oldCache);
-      w?.log("gotten cache from memories");
+      for (final nowMemory in nowMemories) {
+        newCache.toShowMemories
+            .add(ToShowMemory.fromSmartMemory(nowMemory, now));
+      }
+      for (final nextMemory in nextMemories) {
+        newCache.toShowMemories
+            .add(ToShowMemory.fromSmartMemory(nextMemory, next));
+      }
+      w?.log("added memories to cache");
       final file = File(await _getCachePath());
       if (!file.existsSync()) {
         file.createSync(recursive: true);
       }
-      _cachedMemories = nowMemories;
+      _cachedMemories =
+          nowMemories.where((memory) => memory.shouldShowNow()).toList();
       await file.writeAsBytes(
-        MemoriesCache.encodeToJsonString(memoryCache).codeUnits,
+        MemoriesCache.encodeToJsonString(newCache).codeUnits,
       );
       w?.log("cacheWritten");
       await _resetLastMemoriesCacheUpdateTime();
@@ -164,25 +174,28 @@ class MemoriesCacheService {
     }
   }
 
-  MemoriesCache _toCache(
-    List<SmartMemory> nowMemories,
-    DateTime now,
-    List<SmartMemory> nextMemories,
-    DateTime next,
-    MemoriesCache? oldCache,
-  ) {
+  MemoriesCache _processOldCache(MemoriesCache? oldCache) {
     final List<ToShowMemory> toShowMemories = [];
     final List<PeopleShownLog> peopleShownLogs = [];
     final List<TripsShownLog> tripsShownLogs = [];
-    for (final nowMemory in nowMemories) {
-      toShowMemories.add(ToShowMemory.fromSmartMemory(nowMemory, now));
-    }
-    for (final nextMemory in nextMemories) {
-      toShowMemories.add(ToShowMemory.fromSmartMemory(nextMemory, next));
-    }
     if (oldCache != null) {
-      peopleShownLogs.addAll(oldCache.peopleShownLogs);
-      tripsShownLogs.addAll(oldCache.tripsShownLogs);
+      final now = DateTime.now();
+      for (final peopleLog in oldCache.peopleShownLogs) {
+        if (now.difference(
+              DateTime.fromMicrosecondsSinceEpoch(peopleLog.lastTimeShown),
+            ) <
+            maxShowTimeout) {
+          peopleShownLogs.add(peopleLog);
+        }
+      }
+      for (final tripsLog in oldCache.tripsShownLogs) {
+        if (now.difference(
+              DateTime.fromMicrosecondsSinceEpoch(tripsLog.lastTimeShown),
+            ) <
+            maxShowTimeout) {
+          tripsShownLogs.add(tripsLog);
+        }
+      }
       for (final oldMemory in oldCache.toShowMemories) {
         if (oldMemory.isOld) {
           if (oldMemory.type == MemoryType.people) {
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index f5e4375a0d..ffa42f0eb2 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -16,6 +16,7 @@ import "package:photos/models/file/file.dart";
 import "package:photos/models/local_entity_data.dart";
 import "package:photos/models/location/location.dart";
 import "package:photos/models/location_tag/location_tag.dart";
+import "package:photos/models/memories_cache.dart";
 import "package:photos/models/memory.dart";
 import "package:photos/models/ml/face/face.dart";
 import "package:photos/models/ml/face/person.dart";
@@ -67,7 +68,10 @@ class SmartMemoriesService {
   }
 
   // One general method to get all memories, which calls on internal methods for each separate memory type
-  Future<List<SmartMemory>> calcMemories(DateTime now) async {
+  Future<List<SmartMemory>> calcMemories(
+    DateTime now,
+    MemoriesCache oldCache,
+  ) async {
     try {
       await init();
       final List<SmartMemory> memories = [];
@@ -77,7 +81,8 @@ class SmartMemoriesService {
       _seenTimes = await _memoriesDB.getSeenTimes();
       _logger.finest("All files length: ${allFiles.length}");
 
-      final peopleMemories = await _getPeopleResults(allFiles, now);
+      final peopleMemories =
+          await _getPeopleResults(allFiles, now, oldCache.peopleShownLogs);
       _deductUsedMemories(allFiles, peopleMemories);
       memories.addAll(peopleMemories);
       _logger.finest("All files length: ${allFiles.length}");
@@ -120,6 +125,7 @@ class SmartMemoriesService {
   Future<List<PeopleMemory>> _getPeopleResults(
     Iterable<EnteFile> allFiles,
     DateTime currentTime,
+    List<PeopleShownLog> shownPeople,
   ) async {
     final List<PeopleMemory> memoryResults = [];
     if (allFiles.isEmpty) return [];
@@ -129,6 +135,9 @@ class SmartMemoriesService {
         allFileIdsToFile[file.uploadedFileID!] = file;
       }
     }
+    final nowInMicroseconds = currentTime.microsecondsSinceEpoch;
+    final windowEnd =
+        currentTime.add(kMemoriesUpdateFrequency).microsecondsSinceEpoch;
 
     // Get ordered list of important people (all named, from most to least files)
     final persons = await PersonService.instance.getPersons();
@@ -206,8 +215,8 @@ class SmartMemoriesService {
         final spotlightMemory = PeopleMemory(
           selectSpotlightMemories,
           title,
-          currentTime.microsecondsSinceEpoch,
-          currentTime.add(kMemoriesUpdateFrequency).microsecondsSinceEpoch,
+          nowInMicroseconds,
+          windowEnd,
           PeopleMemoryType.spotlight,
           personID,
         );
@@ -236,8 +245,8 @@ class SmartMemoriesService {
           final youAndThemMemory = PeopleMemory(
             selectYouAndThemMemories,
             title,
-            currentTime.microsecondsSinceEpoch,
-            currentTime.add(kMemoriesUpdateFrequency).microsecondsSinceEpoch,
+            nowInMicroseconds,
+            windowEnd,
             PeopleMemoryType.youAndThem,
             personID,
           );
@@ -283,8 +292,8 @@ class SmartMemoriesService {
           final activityMemory = PeopleMemory(
             selectActivityMemories,
             title,
-            currentTime.microsecondsSinceEpoch,
-            currentTime.add(kMemoriesUpdateFrequency).microsecondsSinceEpoch,
+            nowInMicroseconds,
+            windowEnd,
             PeopleMemoryType.doingSomethingTogether,
             personID,
           );
@@ -330,10 +339,11 @@ class SmartMemoriesService {
               .map((f) => Memory.fromFile(f, _seenTimes))
               .toList(),
           title,
-          currentTime.microsecondsSinceEpoch,
-          currentTime.add(kMemoriesUpdateFrequency).microsecondsSinceEpoch,
+          nowInMicroseconds,
+          windowEnd,
           PeopleMemoryType.lastTimeYouSawThem,
           personID,
+          lastCreationTime: lastCreationTime,
         );
         personToMemories.putIfAbsent(personID, () => {}).putIfAbsent(
               PeopleMemoryType.lastTimeYouSawThem,
@@ -342,18 +352,122 @@ class SmartMemoriesService {
       }
     }
 
-    // Surface everything just for debug checking
-    for (final personID in personToMemories.keys) {
-      for (final memoryType in PeopleMemoryType.values) {
-        if (personToMemories[personID]!.containsKey(memoryType)) {
-          memoryResults.add(personToMemories[personID]![memoryType]!);
+    // // Surface everything just for debug checking
+    // for (final personID in personToMemories.keys) {
+    //   for (final memoryType in PeopleMemoryType.values) {
+    //     if (personToMemories[personID]!.containsKey(memoryType)) {
+    //       memoryResults.add(personToMemories[personID]![memoryType]!);
+    //     }
+    //   }
+    // }
+
+    // Loop through the people and check if we should surface anything based on relevancy (bday, last met)
+    personRelevancyLoop:
+    for (final personID in orderedImportantPersonsID) {
+      final personMemories = personToMemories[personID];
+      if (personID == meID || personMemories == null) continue;
+      final person = personIdToPerson[personID]!;
+      // Check if we should surface memory based on birthday
+      final birthdate = DateTime.tryParse(person.data.birthDate ?? "");
+      if (birthdate != null) {
+        final thisBirthday =
+            DateTime(currentTime.year, birthdate.month, birthdate.day);
+        final daysTillBirthday = thisBirthday.difference(currentTime).inDays;
+        if (daysTillBirthday < 7 && daysTillBirthday >= 0) {
+          final personName = person.data.name;
+          final int newAge = currentTime.year - birthdate.year;
+          final spotlightMem = personMemories[PeopleMemoryType.spotlight];
+          if (spotlightMem != null) {
+            final String firstTitle = "$personName turning $newAge!";
+            final String secondTitle = "$personName is $newAge!";
+            final thisBirthday = birthdate.copyWith(year: currentTime.year);
+            memoryResults.add(
+              spotlightMem.copyWith(
+                title: firstTitle,
+                firstDateToShow: thisBirthday
+                    .subtract(const Duration(days: 6))
+                    .microsecondsSinceEpoch,
+                lastDateToShow: thisBirthday.microsecondsSinceEpoch,
+              ),
+            );
+            memoryResults.add(
+              spotlightMem.copyWith(
+                title: secondTitle,
+                firstDateToShow: thisBirthday.microsecondsSinceEpoch,
+                lastDateToShow: thisBirthday
+                    .add(const Duration(days: 1))
+                    .microsecondsSinceEpoch,
+              ),
+            );
+          }
+          final youAndThemMem = personMemories[PeopleMemoryType.youAndThem];
+          if (youAndThemMem != null) {
+            memoryResults.add(
+              youAndThemMem.copyWith(
+                firstDateToShow: thisBirthday
+                    .subtract(const Duration(days: 6))
+                    .microsecondsSinceEpoch,
+                lastDateToShow: thisBirthday
+                    .add(const Duration(days: 1))
+                    .microsecondsSinceEpoch,
+              ),
+            );
+          }
+          continue personRelevancyLoop;
+        }
+      }
+
+      // Check if we should surface memory based on last met
+      final lastMetMemory = personMemories[PeopleMemoryType.lastTimeYouSawThem];
+      if (lastMetMemory != null) {
+        final lastMetTime = DateTime.fromMicrosecondsSinceEpoch(
+          lastMetMemory.lastCreationTime!,
+        ).copyWith(year: currentTime.year);
+        final daysSinceLastMet = lastMetTime.difference(currentTime).inDays;
+        if (daysSinceLastMet < 7 && daysSinceLastMet >= 0) {
+          memoryResults.add(lastMetMemory);
         }
       }
     }
 
-    // Loop through the people and check if we should surface anything based on relevancy (bday, last met)
-
-    // Loop through the people (and memory types) and add the remaining memories (for this month only?)
+    // Loop through the people (and memory types) and add based on rotation
+    if (memoryResults.length >= 3) return memoryResults;
+    peopleRotationLoop:
+    for (final personID in orderedImportantPersonsID) {
+      for (final memory in memoryResults) {
+        if (memory.personID == personID) {
+          continue peopleRotationLoop;
+        }
+      }
+      for (final shownLog in shownPeople) {
+        if (shownLog.personID != personID) continue;
+        final shownDate =
+            DateTime.fromMicrosecondsSinceEpoch(shownLog.lastTimeShown);
+        final bool seenPersonRecently =
+            currentTime.difference(shownDate) < kPersonShowTimeout;
+        if (seenPersonRecently) continue peopleRotationLoop;
+      }
+      if (personToMemories[personID] == null) continue peopleRotationLoop;
+      int added = 0;
+      potentialMemoryLoop:
+      for (final potentialMemory in personToMemories[personID]!.values) {
+        for (final shownLog in shownPeople) {
+          if (shownLog.personID != personID) continue;
+          if (shownLog.peopleMemoryType != potentialMemory.peopleMemoryType) {
+            continue;
+          }
+          final shownTypeDate =
+              DateTime.fromMicrosecondsSinceEpoch(shownLog.lastTimeShown);
+          final bool seenPersonTypeRecently =
+              currentTime.difference(shownTypeDate) < kPersonAndTypeShowTimeout;
+          if (seenPersonTypeRecently) continue potentialMemoryLoop;
+        }
+        memoryResults.add(potentialMemory);
+        added++;
+        if (added >= 2) break peopleRotationLoop;
+      }
+      if (added > 0) break peopleRotationLoop;
+    }
 
     return memoryResults;
   }

From 751e19abaeeefc9bb443d339f30eed311c49285a Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Sat, 1 Mar 2025 19:02:11 +0530
Subject: [PATCH 667/796] [mob][photos] Adjust trip time show

---
 .../lib/services/smart_memories_service.dart  | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index ffa42f0eb2..4a00afbdbd 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -480,6 +480,9 @@ class SmartMemoriesService {
     final Iterable<LocalEntity<LocationTag>> locationTagEntities =
         (await locationService.getLocationTags());
     if (allFiles.isEmpty) return [];
+    final nowInMicroseconds = currentTime.microsecondsSinceEpoch;
+    final windowEnd =
+        currentTime.add(kMemoriesUpdateFrequency).microsecondsSinceEpoch;
     final currentMonth = currentTime.month;
     final cutOffTime = currentTime.subtract(const Duration(days: 365));
 
@@ -868,28 +871,12 @@ class SmartMemoriesService {
               name = "Last year's trip";
             }
             final photoSelection = await _bestSelection(trip.memories);
-            final firstCreationDate = DateTime.fromMicrosecondsSinceEpoch(
-              trip.firstCreationTime!,
-            );
-            final firstDateToShow = DateTime(
-              currentTime.year,
-              firstCreationDate.month,
-              firstCreationDate.day,
-            ).subtract(kMemoriesMargin).microsecondsSinceEpoch;
-            final lastCreationDate = DateTime.fromMicrosecondsSinceEpoch(
-              trip.lastCreationTime!,
-            );
-            final lastDateToShow = DateTime(
-              currentTime.year,
-              lastCreationDate.month,
-              lastCreationDate.day,
-            ).add(kMemoriesMargin).microsecondsSinceEpoch;
             memoryResults.add(
               trip.copyWith(
                 memories: photoSelection,
                 title: name,
-                firstDateToShow: firstDateToShow,
-                lastDateToShow: lastDateToShow,
+                firstDateToShow: nowInMicroseconds,
+                lastDateToShow: windowEnd,
               ),
             );
             break checkUpcomingMonths;

From 0bfb48bde43f3f204d7e229e7750a905e4702fb0 Mon Sep 17 00:00:00 2001
From: Aman Raj Singh Mourya <amanrajmourya7@gmail.com>
Date: Sun, 2 Mar 2025 23:54:41 +0530
Subject: [PATCH 668/796] [mob][photos] Implemented ffmpeg to create video
 memory

---
 mobile/lib/services/video_memory_service.dart | 288 ++++++++++++++++++
 1 file changed, 288 insertions(+)
 create mode 100644 mobile/lib/services/video_memory_service.dart

diff --git a/mobile/lib/services/video_memory_service.dart b/mobile/lib/services/video_memory_service.dart
new file mode 100644
index 0000000000..762fdcaf8a
--- /dev/null
+++ b/mobile/lib/services/video_memory_service.dart
@@ -0,0 +1,288 @@
+import "dart:async";
+import "dart:io";
+import "dart:typed_data";
+
+import "package:ffmpeg_kit_flutter_full_gpl/ffmpeg_kit.dart";
+import "package:ffmpeg_kit_flutter_full_gpl/return_code.dart";
+import "package:flutter/cupertino.dart";
+import "package:image/image.dart" as img;
+import "package:logging/logging.dart";
+import "package:path_provider/path_provider.dart";
+import "package:photos/models/file/file.dart";
+import "package:photos/models/file/file_type.dart";
+import "package:photos/utils/dialog_util.dart";
+import "package:photos/utils/file_util.dart";
+import "package:photos/utils/toast_util.dart";
+
+final _logger = Logger("VideoMemoryService");
+
+Future<void> createSlideshow(
+  BuildContext context,
+  List<EnteFile> files,
+) async {
+  final dialog = createProgressDialog(
+    context,
+    "Creating video...",
+  );
+
+  try {
+    await dialog.show();
+
+    final imageData = await _prepareImageFiles(files);
+
+    if (imageData.paths.isEmpty) {
+      await dialog.hide();
+    }
+
+    final command = _buildFFmpegCommand(
+      context,
+      imageData.paths,
+      imageData.heights,
+      imageData.widths,
+    );
+
+    await _executeFFmpegProcess(
+      context: context,
+      command: command,
+      onComplete: () {
+        dialog.hide();
+      },
+    );
+  } catch (e) {
+    _logger.severe("Error creating slideshow: $e");
+    await dialog.hide();
+  }
+}
+
+Future<ImageProcessingResult> _prepareImageFiles(
+  List<EnteFile> files,
+) async {
+  final List<String> paths = [];
+  final List<double> heights = [];
+  final List<double> widths = [];
+
+  final Directory tempDir = await getTemporaryDirectory();
+  final String tempPath = tempDir.path;
+
+  for (EnteFile file in files) {
+    if (file.fileType == FileType.livePhoto ||
+        file.fileType == FileType.video) {
+      continue;
+    }
+
+    final File? originalImage = await getFile(file);
+    if (originalImage == null) continue;
+
+    final List<int> bytes = await originalImage.readAsBytes();
+    final img.Image? decodedImage = img.decodeImage(Uint8List.fromList(bytes));
+
+    if (decodedImage != null) {
+      String processedPath;
+
+      if (_isJpegFile(originalImage.path)) {
+        processedPath = originalImage.path;
+      } else {
+        processedPath =
+            '$tempPath/${DateTime.now().millisecondsSinceEpoch}.jpg';
+        File(processedPath)
+            .writeAsBytesSync(img.encodeJpg(decodedImage, quality: 95));
+      }
+
+      paths.add(processedPath);
+      widths.add(decodedImage.width.toDouble());
+      heights.add(decodedImage.height.toDouble());
+    }
+  }
+
+  return ImageProcessingResult(
+    paths: paths,
+    heights: heights,
+    widths: widths,
+  );
+}
+
+bool _isJpegFile(String path) {
+  return path.toLowerCase().endsWith("jpg") ||
+      path.toLowerCase().endsWith("jpeg");
+}
+
+Future<void> _executeFFmpegProcess({
+  required BuildContext context,
+  required String command,
+  required Function onComplete,
+}) async {
+  try {
+    final completer = Completer<void>();
+    final startTime = DateTime.now().millisecondsSinceEpoch;
+
+    await FFmpegKit.executeAsync(
+      command,
+      (session) async {
+        final returnCode = await session.getReturnCode();
+        final executionTime = _calculateExecutionTime(startTime);
+
+        if (ReturnCode.isSuccess(returnCode)) {
+          _logger.info(
+            "FFmpeg command executed successfully in $executionTime seconds",
+          );
+          _completeOperation(completer, onComplete);
+          showToast(
+            context,
+            "Video successfully create at ${_generateOutputPath()}",
+          );
+        } else {
+          _logger.warning(
+            "FFmpeg process failed with return code $returnCode in $executionTime seconds",
+          );
+          showToast(context, "Video creation failed. Please try again.");
+          _completeOperation(completer, onComplete);
+          await FFmpegKit.cancel();
+        }
+      },
+      (log) {
+        final String logMessage = log.getMessage();
+
+        if (logMessage.contains("Invalid data found") ||
+            logMessage.contains("Error")) {
+          _logger.warning("Error detected in FFmpeg log: $logMessage");
+          FFmpegKit.cancel();
+
+          if (!completer.isCompleted) {
+            _completeOperation(completer, onComplete);
+          }
+        }
+      },
+    );
+
+    return completer.future;
+  } catch (e) {
+    await FFmpegKit.cancel();
+    _logger.severe("Error during FFmpeg execution: $e");
+    onComplete();
+    rethrow;
+  }
+}
+
+void _completeOperation(
+  Completer<void> completer,
+  Function onComplete,
+) {
+  onComplete();
+  if (!completer.isCompleted) {
+    completer.complete();
+  }
+}
+
+double _calculateExecutionTime(int startTimeMs) {
+  final endTime = DateTime.now().millisecondsSinceEpoch;
+  return (endTime - startTimeMs) / 1000;
+}
+
+String _buildFFmpegCommand(
+  BuildContext context,
+  List<String> imagePaths,
+  List<double> imageHeights,
+  List<double> imageWidths,
+) {
+  final String outputPath = _generateOutputPath();
+
+  final screenDimensions = MediaQuery.sizeOf(context);
+  final int screenWidth = screenDimensions.width.toInt();
+  final int screenHeight = screenDimensions.height.toInt();
+
+  final StringBuffer command = StringBuffer();
+
+  command.write('-y ');
+
+  for (int i = 0; i < imagePaths.length; i++) {
+    command.write('-loop 1 -t 2  -i "${imagePaths[i]}" ');
+  }
+
+  command.write('-filter_complex "');
+
+  for (int i = 0; i < imagePaths.length; i++) {
+    final double aspectRatioOfImage = imageWidths[i] / imageHeights[i];
+    final double aspectRatioOfScreen = screenWidth / screenHeight;
+    int scaledWidth, scaledHeight;
+
+    if (aspectRatioOfImage > aspectRatioOfScreen) {
+      scaledWidth = screenWidth;
+      scaledHeight = (screenWidth / aspectRatioOfImage).toInt();
+    } else {
+      scaledHeight = screenHeight;
+      scaledWidth = (screenHeight * aspectRatioOfImage).toInt();
+    }
+
+    command.write(
+      '[$i:v]scale=$scaledWidth:$scaledHeight:force_original_aspect_ratio=decrease,'
+      'pad=$screenWidth:$screenHeight:(ow-iw)/2:(oh-ih)/2,'
+      'zoompan=z=\'zoom+0.001\':x=\'iw/2-(iw/zoom/2)\':y=\'ih/2-(ih/zoom/2)\':d=150:s=${screenWidth}x${screenHeight}:fps=60[v$i];',
+    );
+  }
+
+  for (int i = 0; i < imagePaths.length - 1; i++) {
+    final String transition = _getTransitionType(i % 5);
+
+    if (i == 0) {
+      command.write(
+        '[v0][v1]xfade=transition=$transition:duration=0.5:offset=2[f0];',
+      );
+    } else {
+      command.write(
+        '[f${i - 1}][v${i + 1}]xfade=transition=$transition:duration=0.5:offset=${2 * (i + 1)}[f$i];',
+      );
+    }
+  }
+
+  command.write('" -map "[f${imagePaths.length - 2}]" '
+      '-c:v libx264 -crf 18 -preset slow -movflags +faststart -pix_fmt yuv420p -r 60 '
+      '-t ${imagePaths.length * 2} "$outputPath"');
+
+  return command.toString();
+}
+
+String _getTransitionType(int index) {
+  switch (index) {
+    case 0:
+      return 'fade';
+    case 1:
+      return 'smoothleft';
+    case 2:
+      return 'smoothright';
+    case 3:
+      return 'slideright';
+    default:
+      return 'fadeblack';
+  }
+}
+
+String _generateOutputPath() {
+  Directory? directory;
+  if (Platform.isAndroid) {
+    try {
+      directory = Directory('/storage/emulated/0/Download');
+      if (!directory.existsSync()) {
+        directory.createSync(recursive: true);
+      }
+    } catch (e) {
+      _logger.warning("Failed to create download directory: $e");
+      directory = Directory('/storage/emulated/0/Download');
+    }
+  } else {
+    directory = Directory('/storage/emulated/0/Download');
+  }
+
+  return '${directory.path}/ente_video_memory_${DateTime.now().millisecondsSinceEpoch}.mp4';
+}
+
+class ImageProcessingResult {
+  final List<String> paths;
+  final List<double> heights;
+  final List<double> widths;
+
+  ImageProcessingResult({
+    required this.paths,
+    required this.heights,
+    required this.widths,
+  });
+}

From d49a90c6165a8b75ffc46223a49cf82420446e55 Mon Sep 17 00:00:00 2001
From: Aman Raj Singh Mourya <amanrajmourya7@gmail.com>
Date: Sun, 2 Mar 2025 23:55:23 +0530
Subject: [PATCH 669/796] [mob][photos] Show video memory option on file
 selection action

---
 .../file_selection_actions_widget.dart        | 158 +-----------------
 1 file changed, 2 insertions(+), 156 deletions(-)

diff --git a/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart b/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
index d0804dd079..4b8409ac09 100644
--- a/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
+++ b/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
@@ -1,17 +1,12 @@
 import "dart:async";
-import "dart:io";
 
 import 'package:fast_base58/fast_base58.dart';
-import "package:ffmpeg_kit_flutter_full_gpl/ffmpeg_kit.dart";
-import "package:ffmpeg_kit_flutter_full_gpl/log.dart";
-import "package:ffmpeg_kit_flutter_full_gpl/return_code.dart";
 import "package:flutter/cupertino.dart";
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import "package:local_auth/local_auth.dart";
 import "package:logging/logging.dart";
 import "package:modal_bottom_sheet/modal_bottom_sheet.dart";
-// import "package:photo_manager/photo_manager.dart";
 import 'package:photos/core/configuration.dart';
 import "package:photos/core/event_bus.dart";
 import "package:photos/events/guest_view_event.dart";
@@ -31,6 +26,7 @@ import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/hidden_service.dart';
 import 'package:photos/services/machine_learning/face_ml/feedback/cluster_feedback.dart';
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
+import "package:photos/services/video_memory_service.dart";
 import "package:photos/theme/colors.dart";
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/actions/collection/collection_file_actions.dart';
@@ -47,7 +43,6 @@ import "package:photos/ui/viewer/location/update_location_data_widget.dart";
 import 'package:photos/utils/delete_file_util.dart';
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/file_download_util.dart";
-import "package:photos/utils/file_util.dart";
 import 'package:photos/utils/magic_util.dart';
 import 'package:photos/utils/navigation_util.dart';
 import "package:photos/utils/share_util.dart";
@@ -669,155 +664,10 @@ class _FileSelectionActionsWidgetState
 
   Future<void> _onCreateVideoMemoryClicked() async {
     final List<EnteFile> selectedFiles = widget.selectedFiles.files.toList();
-    final List<String> paths = [];
-    final List<int> imageHeight = [];
-    final List<int> imageWidth = [];
-    _logger.info("selected files length ${selectedFiles.length}");
-    for (EnteFile file in selectedFiles) {
-      if (file.fileType == FileType.livePhoto ||
-          file.fileType == FileType.video) {
-        continue;
-      }
-
-      final File? fileToSave = await getFile(file);
-      if (fileToSave != null) {
-        paths.add(File(fileToSave.path).path);
-        _logger.info("----- Path ${File(fileToSave.path).path}");
-        _logger.info("----- Height ${file.height}");
-        _logger.info("----- Width ${file.width}");
-        imageHeight.add(file.height);
-        imageWidth.add(file.width);
-        _logger.info("----- Has Dimenssion ${file.hasDimensions}");
-      }
-    }
-    for (var path in paths) {
-      _logger.info("----- Path: $path");
-    }
-
-    await _buildVideoMemoryFFmpegCommand(
-      paths.whereType<String>().toList(),
-      imageHeight,
-      imageWidth,
-    );
+    await createSlideshow(context, selectedFiles);
     widget.selectedFiles.clearAll();
   }
 
-  String getTransitionType(int index) {
-    switch (index) {
-      case 0:
-        return 'fade';
-      case 1:
-        return 'smoothleft';
-      case 2:
-        return 'smoothright';
-      case 3:
-        return 'slideright';
-      default:
-        return 'fade';
-    }
-  }
-
-  Future<void> _buildVideoMemoryFFmpegCommand(
-    List<String> imagePaths,
-    List<int> imageHeight,
-    List<int> imageWidth,
-  ) async {
-    final dialog = createProgressDialog(context, "Video memory");
-    await dialog.show();
-    try {
-      final double desiredDuration = imagePaths.length * 2.0;
-      final int totalFrames = (desiredDuration * 60).toInt();
-
-      final Directory directory = Directory('/storage/emulated/0/Download');
-      final String tempDir = Configuration.instance.getTempDirectory();
-      final String outputPath =
-          "${directory.path}/video_memory${DateTime.now().millisecondsSinceEpoch}.mp4";
-
-      _logger.info("-------- Output path $outputPath");
-
-      StringBuffer command = StringBuffer();
-      command.write('-y ');
-
-      for (String imagePath in imagePaths) {
-        command.write('-loop 1 -t 2 -framerate 60 -i "$imagePath" ');
-      }
-
-      command.write('-filter_complex "');
-
-      command.write(
-          '[0]scale=1280:720:force_original_aspect_ratio=decrease:eval=frame,'
-          'zoompan=z=\'zoom+0.001\':x=iw/2-(iw/zoom/2):y=ih/2-(ih/zoom/2):d=180:fps=60,setsar=1[v0];');
-
-      String lastLabel = 'v0';
-
-      for (int i = 1; i < imagePaths.length; i++) {
-        final int height, width;
-        imageHeight[i] == 0 ? height = 720 : height = imageHeight[i];
-        imageWidth[i] == 0 ? width = 1280 : width = imageWidth[i];
-        command.write(
-            '[$i]scale=1280:720:force_original_aspect_ratio=decrease:eval=frame,'
-            'zoompan=z=\'zoom+0.001\':x=iw/2-(iw/zoom/2):y=ih/2-(ih/zoom/2):d=180:fps=60,setsar=1[v${i}];');
-
-        String transition = getTransitionType(i - 1);
-        String newLabel = 'tx${i}';
-        command.write(
-          '[$lastLabel][v$i]xfade=transition=$transition:duration=1:offset=${i * 2}[$newLabel];',
-        );
-        lastLabel = newLabel;
-      }
-
-      command.write('" ');
-
-      command.write('-map "[$lastLabel]" ');
-
-      command.write('-frames:v $totalFrames ');
-
-      command.write('-c:v libx264 '
-          '-pix_fmt yuv420p '
-          '-crf 23 '
-          '-preset medium '
-          '-movflags +faststart '
-          '-r 60 ');
-
-      command.write('"$outputPath"');
-
-      await FFmpegKit.executeAsync(
-        command.toString(),
-        (session) async {
-          final returnCode = await session.getReturnCode();
-
-          if (ReturnCode.isSuccess(returnCode)) {
-            _logger.info("Video created successfully at: $outputPath");
-          } else {
-            _logger.info("FFmpeg process failed with return code $returnCode");
-          }
-        },
-        (statistics) {
-          final progress = statistics.getTime() / (imagePaths.length * 2000);
-          _progressController.add(progress.clamp(0.0, 1.0));
-        },
-      );
-
-      _logger.info("------- Executing FFmpeg command: ${command.toString()}");
-
-      final DateTime now = DateTime.now();
-      final String formattedTime =
-          "${now.hour.toString().padLeft(2, '0')}:${now.minute.toString().padLeft(2, '0')}:${now.second.toString().padLeft(2, '0')}";
-      _logger.info("Current time: $formattedTime");
-
-      // final File savedVideoMemory = File(outputPath);
-      // await PhotoManager.editor.saveVideo(
-      //   savedVideoMemory,
-      //   title: "ente_video_memory $formattedTime",
-      // );
-      await dialog.hide();
-    } catch (e) {
-      await dialog.hide();
-      _logger.info("------- Error in FFmpeg  $e");
-      rethrow;
-    }
-  }
-
   Future<Uint8List> _createPlaceholder(
     List<EnteFile> ownedSelectedFiles,
   ) async {
@@ -1039,7 +889,3 @@ class _FileSelectionActionsWidgetState
     }
   }
 }
-
-extension on Log {
-  getTime() {}
-}

From f37f1c3703525a238a4eacad195840f68dcdb94b Mon Sep 17 00:00:00 2001
From: Crowdin Bot <support+bot@crowdin.com>
Date: Mon, 3 Mar 2025 01:05:17 +0000
Subject: [PATCH 670/796] New Crowdin translations by GitHub Action

---
 mobile/lib/l10n/intl_de.arb |  1 -
 mobile/lib/l10n/intl_es.arb |  1 -
 mobile/lib/l10n/intl_fr.arb |  1 -
 mobile/lib/l10n/intl_he.arb |  1 -
 mobile/lib/l10n/intl_id.arb |  1 -
 mobile/lib/l10n/intl_it.arb | 52 +++++++++++++++++++++++++++++++++++--
 mobile/lib/l10n/intl_ja.arb |  1 -
 mobile/lib/l10n/intl_lt.arb |  1 -
 mobile/lib/l10n/intl_nl.arb |  1 -
 mobile/lib/l10n/intl_pl.arb |  1 -
 mobile/lib/l10n/intl_pt.arb |  2 +-
 mobile/lib/l10n/intl_ro.arb |  1 -
 mobile/lib/l10n/intl_ru.arb |  1 -
 mobile/lib/l10n/intl_tr.arb |  1 -
 mobile/lib/l10n/intl_uk.arb |  1 -
 mobile/lib/l10n/intl_vi.arb |  1 -
 mobile/lib/l10n/intl_zh.arb |  1 -
 17 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/mobile/lib/l10n/intl_de.arb b/mobile/lib/l10n/intl_de.arb
index dd6e8b4b29..3c4ace7622 100644
--- a/mobile/lib/l10n/intl_de.arb
+++ b/mobile/lib/l10n/intl_de.arb
@@ -525,7 +525,6 @@
   "viewLargeFiles": "Große Dateien",
   "viewLargeFilesDesc": "Dateien anzeigen, die den meisten Speicherplatz belegen.",
   "noDuplicates": "✨ Keine Duplikate",
-  "youveNoDuplicateFilesThatCanBeCleared": "Du hast keine Duplikate, die gelöscht werden können",
   "success": "Abgeschlossen",
   "rateUs": "Bewerte uns",
   "remindToEmptyDeviceTrash": "Lösche auch Dateien aus \"Kürzlich gelöscht\" unter \"Einstellungen\" -> \"Speicher\" um freien Speicher zu erhalten",
diff --git a/mobile/lib/l10n/intl_es.arb b/mobile/lib/l10n/intl_es.arb
index 027d86301c..766f32f639 100644
--- a/mobile/lib/l10n/intl_es.arb
+++ b/mobile/lib/l10n/intl_es.arb
@@ -525,7 +525,6 @@
   "viewLargeFiles": "Archivos grandes",
   "viewLargeFilesDesc": "Ver los archivos que consumen la mayor cantidad de almacenamiento.",
   "noDuplicates": "✨ Sin duplicados",
-  "youveNoDuplicateFilesThatCanBeCleared": "No tienes archivos duplicados que puedan ser borrados",
   "success": "Éxito",
   "rateUs": "Califícanos",
   "remindToEmptyDeviceTrash": "También vacía \"Eliminado Recientemente\" de \"Configuración\" -> \"Almacenamiento\" para reclamar el espacio libre",
diff --git a/mobile/lib/l10n/intl_fr.arb b/mobile/lib/l10n/intl_fr.arb
index ca1b7fe027..214aa6e930 100644
--- a/mobile/lib/l10n/intl_fr.arb
+++ b/mobile/lib/l10n/intl_fr.arb
@@ -525,7 +525,6 @@
   "viewLargeFiles": "Fichiers volumineux",
   "viewLargeFilesDesc": "Affichez les fichiers qui consomment le plus de stockage.",
   "noDuplicates": "✨ Aucun doublon",
-  "youveNoDuplicateFilesThatCanBeCleared": "Vous n'avez aucun fichier dédupliqué pouvant être nettoyé",
   "success": "Succès",
   "rateUs": "Évaluez-nous",
   "remindToEmptyDeviceTrash": "Également vide \"récemment supprimé\" de \"Paramètres\" -> \"Stockage\" pour réclamer l'espace libéré",
diff --git a/mobile/lib/l10n/intl_he.arb b/mobile/lib/l10n/intl_he.arb
index f0aad995f8..e1e5713b55 100644
--- a/mobile/lib/l10n/intl_he.arb
+++ b/mobile/lib/l10n/intl_he.arb
@@ -462,7 +462,6 @@
   "noDeviceThatCanBeDeleted": "אין לך קבצים במכשיר הזה שניתן למחוק אותם",
   "removeDuplicates": "הסר כפילויות",
   "noDuplicates": "✨ אין כפילויות",
-  "youveNoDuplicateFilesThatCanBeCleared": "אין לך קבצים כפולים שניתן לנקות אותם",
   "success": "הצלחה",
   "rateUs": "דרג אותנו",
   "remindToEmptyDeviceTrash": "גם נקה \"נמחק לאחרונה\" מ-\"הגדרות\" -> \"אחסון\" על מנת לקבל המקום אחסון שהתפנה",
diff --git a/mobile/lib/l10n/intl_id.arb b/mobile/lib/l10n/intl_id.arb
index 21ff8eed39..fbee9bae17 100644
--- a/mobile/lib/l10n/intl_id.arb
+++ b/mobile/lib/l10n/intl_id.arb
@@ -494,7 +494,6 @@
   "viewLargeFiles": "File berukuran besar",
   "viewLargeFilesDesc": "Tampilkan file yang paling besar mengonsumsi ruang penyimpanan.",
   "noDuplicates": "✨ Tak ada file duplikat",
-  "youveNoDuplicateFilesThatCanBeCleared": "Kamu tidak memiliki file duplikat yang dapat dihapus",
   "success": "Berhasil",
   "rateUs": "Beri kami nilai",
   "remindToEmptyDeviceTrash": "Kosongkan juga “Baru Dihapus” dari “Pengaturan” -> “Penyimpanan” untuk memperoleh ruang yang baru saja dibersihkan",
diff --git a/mobile/lib/l10n/intl_it.arb b/mobile/lib/l10n/intl_it.arb
index 98e7d7dd49..fc131c597d 100644
--- a/mobile/lib/l10n/intl_it.arb
+++ b/mobile/lib/l10n/intl_it.arb
@@ -2,6 +2,8 @@
   "@@locale ": "en",
   "enterYourEmailAddress": "Inserisci il tuo indirizzo email",
   "accountWelcomeBack": "Bentornato!",
+  "emailAlreadyRegistered": "Email già registrata.",
+  "emailNotRegistered": "Email non registrata.",
   "email": "Email",
   "cancel": "Annulla",
   "verify": "Verifica",
@@ -523,7 +525,6 @@
   "viewLargeFiles": "File di grandi dimensioni",
   "viewLargeFilesDesc": "Visualizza i file che stanno occupando la maggior parte dello spazio di archiviazione.",
   "noDuplicates": "✨ Nessun doppione",
-  "youveNoDuplicateFilesThatCanBeCleared": "Non hai file duplicati che possono essere cancellati",
   "success": "Operazione riuscita",
   "rateUs": "Lascia una recensione",
   "remindToEmptyDeviceTrash": "Vuota anche \"Cancellati di recente\" da \"Impostazioni\" -> \"Storage\" per avere più spazio libero",
@@ -693,6 +694,7 @@
   "preserveMore": "Salva più foto",
   "grantFullAccessPrompt": "Consenti l'accesso a tutte le foto nelle Impostazioni",
   "allowPermTitle": "Consenti l'accesso alle foto",
+  "allowPermBody": "Permetti l'accesso alle tue foto da Impostazioni in modo che Ente possa visualizzare e fare il backup della tua libreria.",
   "openSettings": "Apri Impostazioni",
   "selectMorePhotos": "Seleziona più foto",
   "existingUser": "Accedi",
@@ -1246,6 +1248,7 @@
   "waitingForVerification": "In attesa di verifica...",
   "passkey": "Passkey",
   "passkeyAuthTitle": "Verifica della passkey",
+  "loginWithTOTP": "Login con TOTP",
   "passKeyPendingVerification": "La verifica è ancora in corso",
   "loginSessionExpired": "Sessione scaduta",
   "loginSessionExpiredDetails": "La sessione è scaduta. Si prega di accedere nuovamente.",
@@ -1488,7 +1491,11 @@
   "newLocation": "Nuova posizione",
   "faceNotClusteredYet": "Faccia non ancora raggruppata, per favore torna più tardi",
   "openFile": "Apri file",
+  "backupFile": "File di backup",
+  "openAlbumInBrowser": "Apri album nel browser",
+  "openAlbumInBrowserTitle": "Utilizza l'app web per aggiungere foto a questo album",
   "allow": "Consenti",
+  "allowAppToOpenSharedAlbumLinks": "Consenti all'app di aprire link all'album condiviso",
   "emergencyContacts": "Contatti di emergenza",
   "acceptTrustInvite": "Accetta l'invito",
   "declineTrustInvite": "Rifiuta l'invito",
@@ -1551,5 +1558,46 @@
   "authToManageLegacy": "Autenticati per gestire i tuoi contatti fidati",
   "useDifferentPlayerInfo": "Hai problemi a riprodurre questo video? Premi a lungo qui per provare un altro lettore.",
   "hideSharedItemsFromHomeGallery": "Nascondi gli elementi condivisi dalla galleria principale",
-  "gallery": "Galleria"
+  "gallery": "Galleria",
+  "accountOwnerPersonAppbarTitle": "{title} (Io)",
+  "@accountOwnerPersonAppbarTitle": {
+    "description": "Title of appbar for account owner person",
+    "placeholders": {
+      "title": {
+        "type": "String"
+      }
+    }
+  },
+  "reassignMe": "Riassegna \"Io\"",
+  "me": "Io",
+  "linkEmailToContactBannerCaption": "per una condivisione più veloce",
+  "@linkEmailToContactBannerCaption": {
+    "description": "Caption for the 'Link email' title. It should be a continuation of the 'Link email' title. Just like how 'Link email' + 'for faster sharing' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "selectPersonToLink": "Seleziona persona da collegare",
+  "linkPersonToEmail": "Collega persona a {email}",
+  "@linkPersonToEmail": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "reassigningLoading": "Riassegnando...",
+  "reassignedToName": "Riassegnato a {name}",
+  "@reassignedToName": {
+    "placeholders": {
+      "name": {
+        "type": "String"
+      }
+    }
+  },
+  "dontSave": "Non salvare",
+  "thisIsMeExclamation": "Questo sono io!",
+  "linkPerson": "Collega persona",
+  "linkPersonCaption": "per una migliore esperienza di condivisione",
+  "@linkPersonCaption": {
+    "description": "Caption for the 'Link person' title. It should be a continuation of the 'Link person' title. Just like how 'Link person' + 'for better sharing experience' forms a proper sentence in English, the combination of these two strings should also be a proper sentence in other languages."
+  },
+  "processingVideos": "Elaborando video"
 }
\ No newline at end of file
diff --git a/mobile/lib/l10n/intl_ja.arb b/mobile/lib/l10n/intl_ja.arb
index 0ea404b5d2..49664db37f 100644
--- a/mobile/lib/l10n/intl_ja.arb
+++ b/mobile/lib/l10n/intl_ja.arb
@@ -525,7 +525,6 @@
   "viewLargeFiles": "大きなファイル",
   "viewLargeFilesDesc": "最も多くのストレージを消費しているファイルを表示します。",
   "noDuplicates": "✨ 重複なし",
-  "youveNoDuplicateFilesThatCanBeCleared": "削除できる重複ファイルはありません",
   "success": "成功",
   "rateUs": "評価して下さい",
   "remindToEmptyDeviceTrash": "また、空き領域を取得するには、「設定」→「ストレージ」から「最近削除した項目」を空にします",
diff --git a/mobile/lib/l10n/intl_lt.arb b/mobile/lib/l10n/intl_lt.arb
index 016d909896..4872089337 100644
--- a/mobile/lib/l10n/intl_lt.arb
+++ b/mobile/lib/l10n/intl_lt.arb
@@ -524,7 +524,6 @@
   "removeDuplicatesDesc": "Peržiūrėkite ir pašalinkite failus, kurie yra tiksliai dublikatai.",
   "viewLargeFiles": "Dideli failai",
   "noDuplicates": "✨ Dublikatų nėra",
-  "youveNoDuplicateFilesThatCanBeCleared": "Neturite dubliuotų failų, kuriuos būtų galima išvalyti.",
   "success": "Sėkmė",
   "rateUs": "Vertinti mus",
   "remindToEmptyDeviceTrash": "Taip pat ištuštinkite Neseniai ištrinti iš Nustatymai -> Saugykla, kad atlaisvintumėte vietos.",
diff --git a/mobile/lib/l10n/intl_nl.arb b/mobile/lib/l10n/intl_nl.arb
index dac3062154..607f64f44c 100644
--- a/mobile/lib/l10n/intl_nl.arb
+++ b/mobile/lib/l10n/intl_nl.arb
@@ -525,7 +525,6 @@
   "viewLargeFiles": "Grote bestanden",
   "viewLargeFilesDesc": "Bekijk bestanden die de meeste opslagruimte verbruiken.",
   "noDuplicates": "✨ Geen duplicaten",
-  "youveNoDuplicateFilesThatCanBeCleared": "Je hebt geen dubbele bestanden die kunnen worden gewist",
   "success": "Succes",
   "rateUs": "Beoordeel ons",
   "remindToEmptyDeviceTrash": "Leeg ook \"Onlangs verwijderd\" uit \"Instellingen\" -> \"Opslag\" om de vrij gekomen ruimte te benutten",
diff --git a/mobile/lib/l10n/intl_pl.arb b/mobile/lib/l10n/intl_pl.arb
index 5f2470754b..7f9d8186b4 100644
--- a/mobile/lib/l10n/intl_pl.arb
+++ b/mobile/lib/l10n/intl_pl.arb
@@ -525,7 +525,6 @@
   "viewLargeFiles": "Duże pliki",
   "viewLargeFilesDesc": "Wyświetl pliki zużywające największą ilość pamięci.",
   "noDuplicates": "✨ Brak duplikatów",
-  "youveNoDuplicateFilesThatCanBeCleared": "Nie masz duplikatów plików, które mogą być wyczyszczone",
   "success": "Sukces",
   "rateUs": "Oceń nas",
   "remindToEmptyDeviceTrash": "Również opróżnij \"Ostatnio usunięte\" z \"Ustawienia\" -> \"Pamięć\", aby odebrać wolną przestrzeń",
diff --git a/mobile/lib/l10n/intl_pt.arb b/mobile/lib/l10n/intl_pt.arb
index 5a119375c1..ee7b60af34 100644
--- a/mobile/lib/l10n/intl_pt.arb
+++ b/mobile/lib/l10n/intl_pt.arb
@@ -525,7 +525,7 @@
   "viewLargeFiles": "Arquivos grandes",
   "viewLargeFilesDesc": "Ver arquivos que consumem a maior parte do armazenamento.",
   "noDuplicates": "✨ Sem duplicatas",
-  "youveNoDuplicateFilesThatCanBeCleared": "Você não tem arquivos duplicados que possam ser limpos",
+  "youveNoDuplicateFilesThatCanBeCleared": "Você não possui nenhum arquivo duplicado que possa ser excluído",
   "success": "Sucesso",
   "rateUs": "Avaliar",
   "remindToEmptyDeviceTrash": "Também vazio \"Excluído recentemente\" de \"Opções\" -> \"Armazenamento\" para reivindicar espaço liberado",
diff --git a/mobile/lib/l10n/intl_ro.arb b/mobile/lib/l10n/intl_ro.arb
index 0b2780edf6..6a41e41e52 100644
--- a/mobile/lib/l10n/intl_ro.arb
+++ b/mobile/lib/l10n/intl_ro.arb
@@ -525,7 +525,6 @@
   "viewLargeFiles": "Fișiere mari",
   "viewLargeFilesDesc": "Vizualizați fișierele care consumă cel mai mult spațiu.",
   "noDuplicates": "✨ Fără dubluri",
-  "youveNoDuplicateFilesThatCanBeCleared": "Nu aveți dubluri care pot fi șterse",
   "success": "Succes",
   "rateUs": "Evaluați-ne",
   "remindToEmptyDeviceTrash": "De asemenea, goliți dosarul „Șterse recent” din „Setări” -> „Spațiu” pentru a recupera spațiul eliberat",
diff --git a/mobile/lib/l10n/intl_ru.arb b/mobile/lib/l10n/intl_ru.arb
index bd1b59594c..5695eb350c 100644
--- a/mobile/lib/l10n/intl_ru.arb
+++ b/mobile/lib/l10n/intl_ru.arb
@@ -504,7 +504,6 @@
   "removeDuplicatesDesc": "Просмотрите и удалите точные дубликаты.",
   "viewLargeFiles": "Большие файлы",
   "noDuplicates": "✨ Дубликатов нет",
-  "youveNoDuplicateFilesThatCanBeCleared": "У вас нет дубликатов файлов, которые можно очистить",
   "success": "Успешно",
   "rateUs": "Оцените нас",
   "remindToEmptyDeviceTrash": "Также очистите \"Недавно удалённые\" из \"Настройки\" -> \"Хранилище\", чтобы получить больше свободного места",
diff --git a/mobile/lib/l10n/intl_tr.arb b/mobile/lib/l10n/intl_tr.arb
index 3b041effc5..80bbeef0a8 100644
--- a/mobile/lib/l10n/intl_tr.arb
+++ b/mobile/lib/l10n/intl_tr.arb
@@ -525,7 +525,6 @@
   "viewLargeFiles": "Büyük dosyalar",
   "viewLargeFilesDesc": "En fazla depolama alanı tüketen dosyaları görüntüleyin.",
   "noDuplicates": "Yinelenenleri kaldır",
-  "youveNoDuplicateFilesThatCanBeCleared": "Temizlenebilecek yinelenen dosyalarınız yok",
   "success": "Başarılı",
   "rateUs": "Bizi değerlendirin",
   "remindToEmptyDeviceTrash": "Ayrıca boşalan alanı talep etmek için \"Ayarlar\" -> \"Depolama\" bölümünden \"Son Silinenler \"i boşaltın",
diff --git a/mobile/lib/l10n/intl_uk.arb b/mobile/lib/l10n/intl_uk.arb
index 44eeb627a7..1f0e2c0d10 100644
--- a/mobile/lib/l10n/intl_uk.arb
+++ b/mobile/lib/l10n/intl_uk.arb
@@ -520,7 +520,6 @@
   "viewLargeFiles": "Великі файли",
   "viewLargeFilesDesc": "Перегляньте файли, які займають найбільше місця у сховищі.",
   "noDuplicates": "✨ Немає дублікатів",
-  "youveNoDuplicateFilesThatCanBeCleared": "У вас немає дублікатів файлів, які можна очистити",
   "success": "Успішно",
   "rateUs": "Оцініть нас",
   "remindToEmptyDeviceTrash": "Також очистьте «Нещодавно видалено» в «Налаштування» -> «Сховище», щоб отримати вільне місце",
diff --git a/mobile/lib/l10n/intl_vi.arb b/mobile/lib/l10n/intl_vi.arb
index ac3e32d9d5..8ad79e7b48 100644
--- a/mobile/lib/l10n/intl_vi.arb
+++ b/mobile/lib/l10n/intl_vi.arb
@@ -525,7 +525,6 @@
   "viewLargeFiles": "Tệp lớn",
   "viewLargeFilesDesc": "Xem các tệp đang tiêu tốn nhiều dung lượng lưu trữ nhất.",
   "noDuplicates": "✨ Không có trùng lặp",
-  "youveNoDuplicateFilesThatCanBeCleared": "Bạn không có tệp trùng lặp nào có thể được xóa",
   "success": "Thành công",
   "rateUs": "Đánh giá chúng tôi",
   "remindToEmptyDeviceTrash": "Cũng hãy xóa \"Đã xóa gần đây\" từ \"Cài đặt\" -> \"Lưu trữ\" để chiếm không gian đã giải phóng",
diff --git a/mobile/lib/l10n/intl_zh.arb b/mobile/lib/l10n/intl_zh.arb
index 99d7453f7e..fd08378794 100644
--- a/mobile/lib/l10n/intl_zh.arb
+++ b/mobile/lib/l10n/intl_zh.arb
@@ -525,7 +525,6 @@
   "viewLargeFiles": "大文件",
   "viewLargeFilesDesc": "查看占用存储空间最多的文件。",
   "noDuplicates": "✨ 没有重复内容",
-  "youveNoDuplicateFilesThatCanBeCleared": "您没有可以被清除的重复文件",
   "success": "成功",
   "rateUs": "给我们评分",
   "remindToEmptyDeviceTrash": "同时从“设置”->“存储”中清空“最近删除”以领取释放的空间",

From 1d01b913e1a462a1c6911a62dd4253cb5f98e2db Mon Sep 17 00:00:00 2001
From: Crowdin Bot <support+bot@crowdin.com>
Date: Mon, 3 Mar 2025 01:17:41 +0000
Subject: [PATCH 671/796] New Crowdin translations by GitHub Action

---
 auth/lib/l10n/arb/app_ar.arb |  1 -
 auth/lib/l10n/arb/app_bg.arb |  5 +++--
 auth/lib/l10n/arb/app_ca.arb |  1 -
 auth/lib/l10n/arb/app_cs.arb |  1 -
 auth/lib/l10n/arb/app_de.arb |  1 -
 auth/lib/l10n/arb/app_es.arb |  1 -
 auth/lib/l10n/arb/app_fr.arb |  1 -
 auth/lib/l10n/arb/app_hi.arb | 33 +++++++++++++++++++++++++++++++++
 auth/lib/l10n/arb/app_hu.arb |  1 -
 auth/lib/l10n/arb/app_id.arb |  1 -
 auth/lib/l10n/arb/app_it.arb |  1 -
 auth/lib/l10n/arb/app_ja.arb |  1 -
 auth/lib/l10n/arb/app_ko.arb |  1 -
 auth/lib/l10n/arb/app_lt.arb |  1 -
 auth/lib/l10n/arb/app_nl.arb |  1 -
 auth/lib/l10n/arb/app_pl.arb |  2 +-
 auth/lib/l10n/arb/app_pt.arb |  2 +-
 auth/lib/l10n/arb/app_sv.arb |  1 -
 auth/lib/l10n/arb/app_tr.arb |  1 -
 auth/lib/l10n/arb/app_uk.arb |  1 -
 auth/lib/l10n/arb/app_vi.arb |  1 -
 auth/lib/l10n/arb/app_zh.arb |  1 -
 22 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/auth/lib/l10n/arb/app_ar.arb b/auth/lib/l10n/arb/app_ar.arb
index d2a3985d20..9b8e3e7462 100644
--- a/auth/lib/l10n/arb/app_ar.arb
+++ b/auth/lib/l10n/arb/app_ar.arb
@@ -482,7 +482,6 @@
   "importFailureDescNew": "تعذر إعراب الملف المنتقى.",
   "duplicateCodes": "رموز مكررة",
   "noDuplicates": "✨ لا تكرارات",
-  "youveNoDuplicateCodesThatCanBeCleared": "ليس لديك رموز مكررة يمكن مسحها",
   "deselectAll": "ألغِ تحديد الكل",
   "selectAll": "حدد الكل",
   "deleteDuplicates": "احذف التكرار"
diff --git a/auth/lib/l10n/arb/app_bg.arb b/auth/lib/l10n/arb/app_bg.arb
index 156adf4bdc..d76ffbcc0d 100644
--- a/auth/lib/l10n/arb/app_bg.arb
+++ b/auth/lib/l10n/arb/app_bg.arb
@@ -499,10 +499,11 @@
   "appLockOfflineModeWarning": "Избрахте да продължите без резервни копия. Ако забравите паролата на приложението си, ще бъдете заключени от достъп до вашите данни.",
   "duplicateCodes": "Повтарящи се кодове",
   "noDuplicates": "✨ Няма дубликати",
-  "youveNoDuplicateCodesThatCanBeCleared": "Нямате повтарящи се кодове, които могат да бъдат изчистени",
   "deduplicateCodes": "Премахване на повтарящи се кодове",
   "deselectAll": "Демаркиране на всички",
   "selectAll": "Избиране на всички",
   "deleteDuplicates": "Изтриване на дубликатите",
-  "plainHTML": "Обикновен HTML"
+  "plainHTML": "Обикновен HTML",
+  "tellUsWhatYouThink": "Кажете ни какво мислите",
+  "freeStorageOfferDescription": "Използвайте промокод „AUTH“, за да получите 10% отстъпка през първата година"
 }
\ No newline at end of file
diff --git a/auth/lib/l10n/arb/app_ca.arb b/auth/lib/l10n/arb/app_ca.arb
index b091cc5e8a..012427ea50 100644
--- a/auth/lib/l10n/arb/app_ca.arb
+++ b/auth/lib/l10n/arb/app_ca.arb
@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "Has triat procedir sense còpies de seguretat. Si oblides el bloqueig de l'aplicació, no podràs accedir a les teves dades.",
   "duplicateCodes": "Codis duplicats",
   "noDuplicates": "✨ Sense duplicats",
-  "youveNoDuplicateCodesThatCanBeCleared": "No teniu codis duplicats que es puguin esborrar",
   "deduplicateCodes": "Desduplica codis",
   "deselectAll": "Desselecciona-ho tot",
   "selectAll": "Seleccionar-ho tot",
diff --git a/auth/lib/l10n/arb/app_cs.arb b/auth/lib/l10n/arb/app_cs.arb
index 04e8e411fb..5dfb19cc33 100644
--- a/auth/lib/l10n/arb/app_cs.arb
+++ b/auth/lib/l10n/arb/app_cs.arb
@@ -495,7 +495,6 @@
   "appLockOfflineModeWarning": "Zvolili jste si pokračování bez zálohování. Pokud zapomenete heslo do aplikace, přístup k datům bude uzamčen.",
   "duplicateCodes": "Duplikovat kódy",
   "noDuplicates": "✨ Žádné duplikáty",
-  "youveNoDuplicateCodesThatCanBeCleared": "Nemáte žádné duplicitní kódy k odstranění",
   "deduplicateCodes": "Deduplikovat kódy",
   "deselectAll": "Zrušit výběr všech položek",
   "selectAll": "Vybrat vše",
diff --git a/auth/lib/l10n/arb/app_de.arb b/auth/lib/l10n/arb/app_de.arb
index 94cef6b7b7..62c84330d4 100644
--- a/auth/lib/l10n/arb/app_de.arb
+++ b/auth/lib/l10n/arb/app_de.arb
@@ -495,7 +495,6 @@
   "authToViewPasskey": "Bitte authentifizieren, um deinen Passkey zu sehen",
   "duplicateCodes": "Doppelte Codes",
   "noDuplicates": "✨ Keine Duplikate",
-  "youveNoDuplicateCodesThatCanBeCleared": "Sie haben keine doppelten Codes, die gelöscht werden können",
   "deselectAll": "Alle abwählen",
   "selectAll": "Alles auswählen",
   "deleteDuplicates": "Duplikate löschen",
diff --git a/auth/lib/l10n/arb/app_es.arb b/auth/lib/l10n/arb/app_es.arb
index bf851a3ca0..c224d6677c 100644
--- a/auth/lib/l10n/arb/app_es.arb
+++ b/auth/lib/l10n/arb/app_es.arb
@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "Has elegido proceder sin copia de seguridad. Si olvidas el código de desbloqueo de la aplicación, se bloqueará el acceso a sus datos.",
   "duplicateCodes": "Duplicar códigos",
   "noDuplicates": "✨ No hay duplicados",
-  "youveNoDuplicateCodesThatCanBeCleared": "No tienes códigos duplicados que se puedan borrar",
   "deduplicateCodes": "Desduplicar códigos",
   "deselectAll": "Deseleccionar todo",
   "selectAll": "Seleccionar todo",
diff --git a/auth/lib/l10n/arb/app_fr.arb b/auth/lib/l10n/arb/app_fr.arb
index 49a4dd04a3..14dd5571d6 100644
--- a/auth/lib/l10n/arb/app_fr.arb
+++ b/auth/lib/l10n/arb/app_fr.arb
@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "Vous avez choisi de fonctionner sans sauvegardes. Si vous oubliez votre outil Applock, vous serez bloqué dans l'accès à vos données.",
   "duplicateCodes": "Codes dupliqués",
   "noDuplicates": "✨ Pas de doublons",
-  "youveNoDuplicateCodesThatCanBeCleared": "Vous n'avez aucun code en doublon pouvant être supprimé",
   "deduplicateCodes": "Codes dédupliqués",
   "deselectAll": "Tout désélectionner",
   "selectAll": "Tout sélectionner",
diff --git a/auth/lib/l10n/arb/app_hi.arb b/auth/lib/l10n/arb/app_hi.arb
index 6f311b95d5..728ef319cd 100644
--- a/auth/lib/l10n/arb/app_hi.arb
+++ b/auth/lib/l10n/arb/app_hi.arb
@@ -6,12 +6,15 @@
   "@counterAppBarTitle": {
     "description": "Text shown in the AppBar of the Counter Page"
   },
+  "onBoardingBody": "अपने 2FA कोड का सुरक्षित रूप से बैकअप लें",
   "onBoardingGetStarted": "प्रारंभ करें",
   "setupFirstAccount": "अपना पहला अकाउंट सेटअप करें",
   "importScanQrCode": "एक QR कोड स्कैन करें",
   "qrCode": "QR कोड",
   "importEnterSetupKey": "",
   "importAccountPageTitle": "अकाउंट विवरण डालें",
+  "secretCanNotBeEmpty": "सीक्रेट खाली नहीं हो सकता है",
+  "bothIssuerAndAccountCanNotBeEmpty": "दोनों इश्यूअर और अकाउंट ख़ाली नहीं हो सकते है",
   "incorrectDetails": "ग़लत विवरण",
   "pleaseVerifyDetails": "कृपया विवरण सत्यापित करें और पुनः प्रयास करें",
   "codeIssuerHint": "ज़ारीकर्ता",
@@ -32,18 +35,24 @@
   },
   "codeAccountHint": "अकाउंट (you@domain.com)",
   "codeTagHint": "टैग",
+  "accountKeyType": "की का प्रकार",
   "sessionExpired": "सत्र की अवधि समाप्त",
   "@sessionExpired": {
     "description": "Title of the dialog when the users current session is invalid/expired"
   },
   "pleaseLoginAgain": "कृपया फिर से लॉगिन करें",
   "loggingOut": "लॉग आउट हो रहा है...",
+  "timeBasedKeyType": "समय आधारित (TOTP)",
+  "counterBasedKeyType": "काउंटर आधारित (HOTP)",
   "saveAction": "सेव करें",
+  "nextTotpTitle": "अगला",
+  "deleteCodeTitle": "कोड डिलीट करें?",
   "deleteCodeMessage": "क्या आप वाकई इस कोड को हटाना चाहते हैं? इस क्रिया को वापस नहीं किया जा सकता",
   "trashCode": "?",
   "trashCodeMessage": "क्या आप वाकई {account} के लिए कोड नष्ट करना चाहते हैं?",
   "trash": "नष्ट करें",
   "viewLogsAction": "लॉग देखें",
+  "sendLogsDescription": "यह आपकी समस्या को सुलझाने में हमारी सहायता के लिए लॉग भेजेगा। हालाँकि हम यह सुनिश्चित करने के लिए सावधानी बरतते हैं कि संवेदनशील जानकारी लॉग न हो, हम आपको इन लॉग को साझा करने से पहले देखने के लिए प्रोत्साहित करते हैं।",
   "preparingLogsTitle": "लॉग तैयार किये जा रहे हैं...",
   "emailLogsTitle": "लॉग ईमेल करें",
   "emailLogsMessage": "कृपया {email} पर लॉग ईमेल करें",
@@ -57,6 +66,7 @@
   "copyEmailAction": "ईमेल कॉपी करें",
   "exportLogsAction": "लॉग एक्सपोर्ट करें",
   "reportABug": "बग रिपोर्ट करें",
+  "crashAndErrorReporting": "क्रैश एवं त्रुटि रिपोर्टिंग",
   "reportBug": "बग रिपोर्ट करें",
   "emailUsMessage": "कृपया हमें {email} पर ईमेल करें",
   "@emailUsMessage": {
@@ -69,14 +79,37 @@
   "contactSupport": "सपोर्ट टीम से संपर्क करें",
   "rateUsOnStore": "हमें {storeName} पर रेट करें",
   "blog": "ब्लॉग",
+  "merchandise": "मर्चेंडाइज़",
   "verifyPassword": "पासवर्ड सत्यापित करें",
   "pleaseWait": "कृपया प्रतीक्षा करें...",
+  "generatingEncryptionKeysTitle": "एन्क्रिप्शन कुंजियाँ उत्पन्न हो रही हैं...",
+  "recreatePassword": "पासवर्ड दोबारा बनाएं",
+  "recreatePasswordMessage": "वर्तमान डिवाइस आपके पासवर्ड को सत्यापित करने के लिए पर्याप्त शक्तिशाली नहीं है, इसलिए हमें इसे सभी डिवाइसों के साथ काम करने वाले तरीके से एक बार पुन: उत्पन्न करने की आवश्यकता है। \n\nकृपया अपनी पुनर्प्राप्ति कुंजी का उपयोग करके लॉगिन करें और अपना पासवर्ड पुनः बनाएं (यदि आप चाहें तो उसी का दोबारा उपयोग कर सकते हैं)।",
+  "useRecoveryKey": "रिकवरी कुंजी का उपयोग करें",
   "incorrectPasswordTitle": "ग़लत पासवर्ड",
   "welcomeBack": "आपका पुनः स्वागत है!",
+  "emailAlreadyRegistered": "ईमेल पहले से ही पंजीकृत है।",
+  "emailNotRegistered": "ईमेल पंजीकृत नहीं है।",
+  "madeWithLoveAtPrefix": " ❤️ से बनाया गया ",
+  "supportDevs": "हमें समर्थन देने के लिए <bold-green>ente</bold-green> की सदस्यता लें",
+  "supportDiscount": "पहले साल 10% छूट पाने के लिए कूपन कोड \"AUTH\" का उपयोग करें",
   "changeEmail": "ईमेल बदलें",
   "changePassword": "पासवर्ड बदलें",
   "data": "डेटा",
+  "importCodes": "कोड आयात करें",
+  "importTypePlainText": "साधारण टेक्स्ट",
+  "importTypeEnteEncrypted": "Ente द्वारा एनक्रिप्टेड टेक्स्ट",
+  "passwordForDecryptingExport": "डीक्रिप्ट करने के लिए पासवर्ड",
   "passwordEmptyError": "पासवर्ड रिक्त नहीं हो सकता है",
+  "importFromApp": "{appName} से कोड इंपोर्ट करें",
+  "importGoogleAuthGuide": "ट्रांसफर अकाउंट्स\" विकल्प का उपयोग करके अपने खातों को Google प्रमाणक से एक क्यूआर कोड में निर्यात करें। फिर किसी अन्य डिवाइस का उपयोग करके QR कोड को स्कैन करें।\n\nटिप: क्यूआर कोड की तस्वीर लेने के लिए आप अपने लैपटॉप के वेबकैम का उपयोग कर सकते हैं।",
+  "importSelectJsonFile": "JSON फाइल चुनें",
+  "importSelectAppExport": "{appName} की निर्यात फ़ाइल का चयन करें",
+  "importEnteEncGuide": "Ente से निर्यात की गई एन्क्रिप्टेड JSON फ़ाइल का चयन करें",
+  "importRaivoGuide": "Raivo की सेटिंग्स में \"एक्सपोर्ट ओटीपी टू जिप आर्काइव\" विकल्प का उपयोग करें।\n\nज़िप फ़ाइल निकालें और JSON फ़ाइल आयात करें।",
+  "importBitwardenGuide": "बिटवर्डन टूल्स के भीतर \"एक्सपोर्ट वॉल्ट\" विकल्प का उपयोग करें और अनएन्क्रिप्टेड JSON फ़ाइल आयात करें।",
+  "importAegisGuide": "Aegis की सेटिंग्स में \"एक्सपोर्ट द वॉल्ट\" विकल्प का उपयोग करें।\n\nयदि आपकी वॉल्ट एन्क्रिप्टेड है, तो आपको वॉल्ट को डिक्रिप्ट करने के लिए वॉल्ट पासवर्ड दर्ज करना होगा।",
+  "import2FasGuide": "2FAS में \"सेटिंग्स->बैकअप-एक्सपोर्ट\" विकल्प का उपयोग करें।\n\nयदि आपका बैकअप एन्क्रिप्टेड है, तो आपको बैकअप को डिक्रिप्ट करने के लिए पासवर्ड दर्ज करना होगा",
   "importLabel": "इंपोर्ट",
   "selectFile": "फ़ाइल का चयन करें",
   "emailVerificationToggle": "ईमेल सत्यापन",
diff --git a/auth/lib/l10n/arb/app_hu.arb b/auth/lib/l10n/arb/app_hu.arb
index f2b917e09b..b68a3d8d7a 100644
--- a/auth/lib/l10n/arb/app_hu.arb
+++ b/auth/lib/l10n/arb/app_hu.arb
@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "Úgy döntött, hogy biztonsági mentés nélkül folytatja. Ha elfelejti az alkalmazászárat, akkor nem férhet hozzá adataihoz.",
   "duplicateCodes": "Ismétlődő kódok",
   "noDuplicates": "✨Nincs ismétlődés",
-  "youveNoDuplicateCodesThatCanBeCleared": "Nincsenek ismétlődő kódjai, amelyeket törölni lehetne",
   "deduplicateCodes": "Ismétlődő kódok",
   "deselectAll": "Összes kijelölés megszüntetése",
   "selectAll": "Összes kijelölése",
diff --git a/auth/lib/l10n/arb/app_id.arb b/auth/lib/l10n/arb/app_id.arb
index 628c1d650f..c791a866a9 100644
--- a/auth/lib/l10n/arb/app_id.arb
+++ b/auth/lib/l10n/arb/app_id.arb
@@ -497,7 +497,6 @@
   "appLockOfflineModeWarning": "Anda telah memilih untuk mengunci aplikasi tanpa cadangan apa pun. Jika Anda lupa kode Pengunci Apl Anda, Anda tidak akan dapat mengakses data-data Anda.",
   "duplicateCodes": "Kode duplikat",
   "noDuplicates": "✨ Tak ada duplikat",
-  "youveNoDuplicateCodesThatCanBeCleared": "Kamu tidak memiliki kode duplikat yang dapat dihapus",
   "deduplicateCodes": "Hapus kode duplikat",
   "deselectAll": "Batalkan semua pilihan",
   "selectAll": "Pilih semua",
diff --git a/auth/lib/l10n/arb/app_it.arb b/auth/lib/l10n/arb/app_it.arb
index 17281db08a..c68a87301b 100644
--- a/auth/lib/l10n/arb/app_it.arb
+++ b/auth/lib/l10n/arb/app_it.arb
@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "Hai scelto di procedere senza backup. Se dimentichi il tuo codice di blocco dell'app, non potrai più accedere ai tuoi dati.",
   "duplicateCodes": "Codici duplicati",
   "noDuplicates": "✨ Nessun doppione",
-  "youveNoDuplicateCodesThatCanBeCleared": "Non ci sono codici duplicati che possono essere cancellati",
   "deduplicateCodes": "Codici deduplicati",
   "deselectAll": "Deselezionare tutti",
   "selectAll": "Seleziona tutti",
diff --git a/auth/lib/l10n/arb/app_ja.arb b/auth/lib/l10n/arb/app_ja.arb
index 086d8afe32..49cd9a1e84 100644
--- a/auth/lib/l10n/arb/app_ja.arb
+++ b/auth/lib/l10n/arb/app_ja.arb
@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "バックアップなしで進むことを選択しました。アプリロックを忘れると、データにアクセスできなくなります。",
   "duplicateCodes": "重複コード",
   "noDuplicates": "✨ 重複なし",
-  "youveNoDuplicateCodesThatCanBeCleared": "削除できる重複コードはありません",
   "deduplicateCodes": "重複コード",
   "deselectAll": "すべての選択を解除",
   "selectAll": "すべて選択",
diff --git a/auth/lib/l10n/arb/app_ko.arb b/auth/lib/l10n/arb/app_ko.arb
index 0af9fa10f0..a250219cee 100644
--- a/auth/lib/l10n/arb/app_ko.arb
+++ b/auth/lib/l10n/arb/app_ko.arb
@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "백업 없이 진행하는 것을 선택하셨습니다. App 잠금 방법을 잊어버리신 경우, 데이터에 접근하실 수 없게 됩니다.",
   "duplicateCodes": "중복된 코드",
   "noDuplicates": "✨ 중복 없음",
-  "youveNoDuplicateCodesThatCanBeCleared": "지울 수 있는 중복 코드가 없습니다",
   "deduplicateCodes": "중복된 코드 제거",
   "deselectAll": "모두 선택 해제",
   "selectAll": "모두 선택",
diff --git a/auth/lib/l10n/arb/app_lt.arb b/auth/lib/l10n/arb/app_lt.arb
index f1903dd9b0..71b96d3027 100644
--- a/auth/lib/l10n/arb/app_lt.arb
+++ b/auth/lib/l10n/arb/app_lt.arb
@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "Pasirinkote tęsti be atsarginių kopijų. Jei pamiršite programos užraktą, jums bus užrakinta prieiga prie duomenų.",
   "duplicateCodes": "Dubliuoti kodus",
   "noDuplicates": "✨ Dublikatų nėra",
-  "youveNoDuplicateCodesThatCanBeCleared": "Neturite dubliuotų kodų, kuriuos būtų galima išvalyti.",
   "deduplicateCodes": "Atdubliuoti kodus",
   "deselectAll": "Naikinti visų pasirinkimą",
   "selectAll": "Pasirinkti viską",
diff --git a/auth/lib/l10n/arb/app_nl.arb b/auth/lib/l10n/arb/app_nl.arb
index 020646852f..c3d8fa7dd8 100644
--- a/auth/lib/l10n/arb/app_nl.arb
+++ b/auth/lib/l10n/arb/app_nl.arb
@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "Je hebt ervoor gekozen om verder te gaan zonder backups. Als je jouw applock vergeet, wordt je uitgesloten van toegang tot je gegevens.",
   "duplicateCodes": "Dubbele codes",
   "noDuplicates": "✨ Geen dubbele",
-  "youveNoDuplicateCodesThatCanBeCleared": "Je hebt geen dubbele codes die kunnen worden gewist",
   "deduplicateCodes": "Dubbele codes",
   "deselectAll": "Alles deselecteren",
   "selectAll": "Alles selecteren",
diff --git a/auth/lib/l10n/arb/app_pl.arb b/auth/lib/l10n/arb/app_pl.arb
index 95eddd5fd5..e2c6b26f6a 100644
--- a/auth/lib/l10n/arb/app_pl.arb
+++ b/auth/lib/l10n/arb/app_pl.arb
@@ -499,7 +499,7 @@
   "appLockOfflineModeWarning": "Wybrano kontynuowanie bez kopii zapasowych. Jeśli zapomnisz blokady aplikacji, utracisz dostęp do swoich danych.",
   "duplicateCodes": "Zduplikowane kody",
   "noDuplicates": "✨ Brak duplikatów",
-  "youveNoDuplicateCodesThatCanBeCleared": "Nie masz duplikatów kodów, które mogą być wyczyszczone",
+  "youveNoDuplicateCodesThatCanBeCleared": "Nie masz żadnych duplikatów kodów do usunięcia",
   "deduplicateCodes": "Deduplikuj kody",
   "deselectAll": "Odznacz wszystko",
   "selectAll": "Zaznacz wszystko",
diff --git a/auth/lib/l10n/arb/app_pt.arb b/auth/lib/l10n/arb/app_pt.arb
index 5b65e71b1e..cc7d6f4975 100644
--- a/auth/lib/l10n/arb/app_pt.arb
+++ b/auth/lib/l10n/arb/app_pt.arb
@@ -499,7 +499,7 @@
   "appLockOfflineModeWarning": "Você prosseguiu sem cópias de segurança. Caso, se esqueça de seu aplicativo de bloqueio, você não poderá mais acessar seus dados.",
   "duplicateCodes": "Duplicar códigos",
   "noDuplicates": "✨ Sem duplicados",
-  "youveNoDuplicateCodesThatCanBeCleared": "Você não possui códigos duplicados para limpar",
+  "youveNoDuplicateCodesThatCanBeCleared": "Você não possui códigos duplicados que possam ser excluídos",
   "deduplicateCodes": "Desduplicar códigos",
   "deselectAll": "Deselecionar tudo",
   "selectAll": "Selecionar tudo",
diff --git a/auth/lib/l10n/arb/app_sv.arb b/auth/lib/l10n/arb/app_sv.arb
index a096aa931e..facf5c1c1e 100644
--- a/auth/lib/l10n/arb/app_sv.arb
+++ b/auth/lib/l10n/arb/app_sv.arb
@@ -451,7 +451,6 @@
   "appLockOfflineModeWarning": "Du har valt att fortsätta utan säkerhetskopior. Om du glömmer ditt applås, kommer du att bli utelåst från att komma åt dina data.",
   "duplicateCodes": "Dubblettkoder",
   "noDuplicates": "✨ Inga dubbletter",
-  "youveNoDuplicateCodesThatCanBeCleared": "Du har inga dubblettkoder som kan rensas bort",
   "deduplicateCodes": "Deduplicera koder",
   "deselectAll": "Avmarkera alla",
   "selectAll": "Markera alla",
diff --git a/auth/lib/l10n/arb/app_tr.arb b/auth/lib/l10n/arb/app_tr.arb
index 965689a53d..aee7870c06 100644
--- a/auth/lib/l10n/arb/app_tr.arb
+++ b/auth/lib/l10n/arb/app_tr.arb
@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "Yedekleme olmadan devam etmeyi seçtiniz. Eğer uygulama parolanızı unutursanız, verilerinize erişiminiz engellenir.",
   "duplicateCodes": "Yinelenen kodlar",
   "noDuplicates": "✨ Yinelenen yok",
-  "youveNoDuplicateCodesThatCanBeCleared": "Temizlenebilecek yinelenen kodunuz yok",
   "deduplicateCodes": "Kodları tekilleştir",
   "deselectAll": "Tümünün seçimini kaldır",
   "selectAll": "Tümünü seç",
diff --git a/auth/lib/l10n/arb/app_uk.arb b/auth/lib/l10n/arb/app_uk.arb
index a758171d89..09c485b7c2 100644
--- a/auth/lib/l10n/arb/app_uk.arb
+++ b/auth/lib/l10n/arb/app_uk.arb
@@ -497,7 +497,6 @@
   "appLockOfflineModeWarning": "Ви обрали продовжити без резервних копій. Якщо ви забудете свій пароль, доступ до ваших даних буде заблоковано.",
   "duplicateCodes": "Дублікати кодів",
   "noDuplicates": "✨ Немає дублікатів",
-  "youveNoDuplicateCodesThatCanBeCleared": "У вас немає дублікатів кодів, які можна очистити",
   "deduplicateCodes": "Дедуплікувати коди",
   "deselectAll": "Зняти виділення",
   "selectAll": "Вибрати все",
diff --git a/auth/lib/l10n/arb/app_vi.arb b/auth/lib/l10n/arb/app_vi.arb
index e186b4bbfd..1c7dbecb1e 100644
--- a/auth/lib/l10n/arb/app_vi.arb
+++ b/auth/lib/l10n/arb/app_vi.arb
@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "Bạn đã chọn tiếp tục mà không có bản sao lưu. Nếu bạn quên khóa ứng dụng, bạn sẽ bị khóa khỏi việc truy cập dữ liệu của mình.",
   "duplicateCodes": "Mã trùng lặp",
   "noDuplicates": "✨ Không có trùng lặp",
-  "youveNoDuplicateCodesThatCanBeCleared": "Bạn không có mã trùng lặp nào có thể được xóa",
   "deduplicateCodes": "Loại bỏ mã trùng lặp",
   "deselectAll": "Bỏ chọn tất cả",
   "selectAll": "Chọn tất cả",
diff --git a/auth/lib/l10n/arb/app_zh.arb b/auth/lib/l10n/arb/app_zh.arb
index a15b3f3896..b9c7ebc4ab 100644
--- a/auth/lib/l10n/arb/app_zh.arb
+++ b/auth/lib/l10n/arb/app_zh.arb
@@ -499,7 +499,6 @@
   "appLockOfflineModeWarning": "您已选择继续而不备份。如果您忘记了应用锁，您将无法访问数据。",
   "duplicateCodes": "重复代码",
   "noDuplicates": "✨ 没有重复",
-  "youveNoDuplicateCodesThatCanBeCleared": "您没有可清除的重复代码",
   "deduplicateCodes": "删除重复代码",
   "deselectAll": "取消全选",
   "selectAll": "全选",

From 2d1e6312af7df5e21a31557c015f23e001c3d23d Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 3 Mar 2025 10:39:06 +0530
Subject: [PATCH 672/796] [infra] Import Grafana conf

---
 infra/services/grafana/README.md          | 37 +++++++++++++++++++++++
 infra/services/grafana/grafana.nginx.conf | 24 +++++++++++++++
 infra/services/grafana/grafana.service    | 14 +++++++++
 3 files changed, 75 insertions(+)
 create mode 100644 infra/services/grafana/README.md
 create mode 100644 infra/services/grafana/grafana.nginx.conf
 create mode 100644 infra/services/grafana/grafana.service

diff --git a/infra/services/grafana/README.md b/infra/services/grafana/README.md
new file mode 100644
index 0000000000..5c9ef8ef96
--- /dev/null
+++ b/infra/services/grafana/README.md
@@ -0,0 +1,37 @@
+# Grafana
+
+Grafana data is stored in a persistent Docker volume named `grafana-storage`. To
+create a backup of this, use
+
+```sh
+docker run --rm \
+  --mount source=grafana-storage,target=/g \
+  -v $(pwd):/backup \
+  busybox \
+  tar -cvzf /backup/grafana-storage.backup.tar.gz /g
+```
+
+## Installation
+
+Restore the volume:
+
+```sh
+docker run --rm \
+  --mount source=grafana-storage,target=/g \
+  -v $(pwd):/backup \
+  busybox \
+  tar -xvzf /backup/grafana-storage.backup.tar.gz -C /
+```
+
+Add the Grafana nginx config
+
+```sh
+sudo mv grafana.nginx.conf /root/nginx/conf.d
+```
+
+and reload the nginx service before starting Grafana for the first time.
+
+```sh
+sudo systemctl reload nginx
+sudo systemctl start grafana
+```
diff --git a/infra/services/grafana/grafana.nginx.conf b/infra/services/grafana/grafana.nginx.conf
new file mode 100644
index 0000000000..046f42153c
--- /dev/null
+++ b/infra/services/grafana/grafana.nginx.conf
@@ -0,0 +1,24 @@
+# Needed for web sockets
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    '' close;
+}
+
+server {
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+    ssl_certificate         /etc/ssl/certs/cert.pem;
+    ssl_certificate_key     /etc/ssl/private/key.pem;
+
+    server_name grafana.ente.io;
+
+    location / {
+        proxy_pass http://host.docker.internal:3001;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+    }
+}
diff --git a/infra/services/grafana/grafana.service b/infra/services/grafana/grafana.service
new file mode 100644
index 0000000000..22003a5bc5
--- /dev/null
+++ b/infra/services/grafana/grafana.service
@@ -0,0 +1,14 @@
+[Unit]
+Documentation=https://grafana.com/docs/grafana/latest/setup-grafana/configure-docker/
+Requires=docker.service
+After=docker.service
+
+[Service]
+ExecStartPre=docker pull grafana/grafana-oss
+ExecStartPre=-docker stop grafana
+ExecStartPre=-docker rm grafana
+ExecStart=docker run --name grafana \
+    -p 3001:3001 \
+    -v grafana-storage:/var/lib/grafana \
+    -e "GF_SERVER_HTTP_PORT=3001" \
+    grafana/grafana-oss

From bcf49763e68e6ea6f09d0a6c0b789e54ce519880 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 3 Mar 2025 13:32:59 +0530
Subject: [PATCH 673/796] [mob] Avoid multiple calls to fetch flags

---
 .../plugins/ente_feature_flag/lib/src/service.dart   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/mobile/plugins/ente_feature_flag/lib/src/service.dart b/mobile/plugins/ente_feature_flag/lib/src/service.dart
index c9e1a94628..e0e0276940 100644
--- a/mobile/plugins/ente_feature_flag/lib/src/service.dart
+++ b/mobile/plugins/ente_feature_flag/lib/src/service.dart
@@ -1,5 +1,6 @@
 // ignore_for_file: always_use_package_imports
 
+import "dart:async";
 import "dart:convert";
 import "dart:developer";
 import "dart:io";
@@ -39,10 +40,18 @@ class FlagService {
     }
   }
 
+  Completer<void>? _fetchCompleter;
   Future<void> _fetch() async {
+    if (_fetchCompleter != null) {
+      await _fetchCompleter!.future;
+      return;
+    }
+    _fetchCompleter = Completer<void>();
     try {
       if (!_prefs.containsKey("token")) {
         log("token not found, skip", name: "FlagService");
+        _fetchCompleter!.complete();
+        _fetchCompleter = null;
         return;
       }
       log("fetching feature flags", name: "FlagService");
@@ -52,6 +61,9 @@ class FlagService {
       _flags = remoteFlags;
     } catch (e) {
       debugPrint("Failed to sync feature flags $e");
+    } finally {
+      _fetchCompleter!.complete();
+      _fetchCompleter = null;
     }
   }
 

From 025fc46022eab5ba6367cae8313c26b0f8aaf2cf Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 3 Mar 2025 13:40:47 +0530
Subject: [PATCH 674/796] [mob][photos] constant for day itself duration

---
 mobile/lib/models/smart_memory.dart             | 1 +
 mobile/lib/services/smart_memories_service.dart | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mobile/lib/models/smart_memory.dart b/mobile/lib/models/smart_memory.dart
index 980a25f216..999525f98e 100644
--- a/mobile/lib/models/smart_memory.dart
+++ b/mobile/lib/models/smart_memory.dart
@@ -2,6 +2,7 @@ import "package:photos/models/memory.dart";
 
 const kMemoriesUpdateFrequency = Duration(days: 7);
 const kMemoriesMargin = Duration(days: 2);
+const kDayItself = Duration(days: 1);
 
 enum MemoryType {
   people,
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 4a00afbdbd..88179d4fcb 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -395,7 +395,7 @@ class SmartMemoriesService {
                 title: secondTitle,
                 firstDateToShow: thisBirthday.microsecondsSinceEpoch,
                 lastDateToShow: thisBirthday
-                    .add(const Duration(days: 1))
+                    .add(kDayItself)
                     .microsecondsSinceEpoch,
               ),
             );
@@ -408,7 +408,7 @@ class SmartMemoriesService {
                     .subtract(const Duration(days: 6))
                     .microsecondsSinceEpoch,
                 lastDateToShow: thisBirthday
-                    .add(const Duration(days: 1))
+                    .add(kDayItself)
                     .microsecondsSinceEpoch,
               ),
             );
@@ -944,7 +944,7 @@ class SmartMemoriesService {
             photoSelection,
             "${DateFormat('MMMM d').format(date)} through the years",
             date.subtract(kMemoriesMargin).microsecondsSinceEpoch,
-            date.add(const Duration(days: 1)).microsecondsSinceEpoch,
+            date.add(kDayItself).microsecondsSinceEpoch,
           ),
         );
       } else {
@@ -970,7 +970,7 @@ class SmartMemoriesService {
               photoSelection,
               name,
               showDate.microsecondsSinceEpoch,
-              showDate.add(const Duration(days: 1)).microsecondsSinceEpoch,
+              showDate.add(kDayItself).microsecondsSinceEpoch,
             ),
           );
         }

From e34b70a8f9777fd0f63192457f9e548d88f2434e Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 3 Mar 2025 13:38:07 +0530
Subject: [PATCH 675/796] [mob] Stop special treatment for @ente.io  as
 internal users

---
 mobile/plugins/ente_feature_flag/lib/src/service.dart | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mobile/plugins/ente_feature_flag/lib/src/service.dart b/mobile/plugins/ente_feature_flag/lib/src/service.dart
index e0e0276940..0bbcdda9ed 100644
--- a/mobile/plugins/ente_feature_flag/lib/src/service.dart
+++ b/mobile/plugins/ente_feature_flag/lib/src/service.dart
@@ -14,10 +14,8 @@ import "model.dart";
 class FlagService {
   final SharedPreferences _prefs;
   final Dio _enteDio;
-  late final bool _usingEnteEmail;
 
   FlagService(this._prefs, this._enteDio) {
-    _usingEnteEmail = _prefs.getString("email")?.endsWith("@ente.io") ?? false;
     Future.delayed(const Duration(seconds: 5), () {
       _fetch();
     });
@@ -69,7 +67,7 @@ class FlagService {
 
   bool get disableCFWorker => flags.disableCFWorker;
 
-  bool get internalUser => flags.internalUser || _usingEnteEmail || kDebugMode;
+  bool get internalUser => flags.internalUser || kDebugMode;
 
   bool get betaUser => flags.betaUser;
 

From 4b5618e1f2a55401a66e507fdc5061eeb25c0be2 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 3 Mar 2025 14:25:54 +0530
Subject: [PATCH 676/796] [web] Match mobile's internal user spec

---
 web/apps/photos/src/components/Sidebar.tsx   |  5 ++---
 web/packages/new/photos/services/settings.ts | 22 ++++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsx
index fba039ffb2..647a8719d6 100644
--- a/web/apps/photos/src/components/Sidebar.tsx
+++ b/web/apps/photos/src/components/Sidebar.tsx
@@ -25,7 +25,6 @@ import {
     type ModalVisibilityProps,
 } from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
-import { isDevBuild } from "@/base/env";
 import {
     getLocaleInUse,
     setLocaleInUse,
@@ -58,7 +57,7 @@ import {
 import type { CollectionSummaries } from "@/new/photos/services/collection/ui";
 import { isMLSupported } from "@/new/photos/services/ml";
 import {
-    isInternalUser,
+    isDevBuildAndUser,
     syncSettings,
     updateCFProxyDisabledPreference,
     updateMapEnabled,
@@ -1148,7 +1147,7 @@ const Help: React.FC<NestedSidebarDrawerVisibilityProps> = ({
                         }
                         onClick={confirmViewLogs}
                     />
-                    {isInternalUser() && isDevBuild && (
+                    {isDevBuildAndUser() && (
                         <RowButton
                             variant="secondary"
                             label={
diff --git a/web/packages/new/photos/services/settings.ts b/web/packages/new/photos/services/settings.ts
index 9a91ad2d49..06aa63c3d2 100644
--- a/web/packages/new/photos/services/settings.ts
+++ b/web/packages/new/photos/services/settings.ts
@@ -8,6 +8,7 @@
 //
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 
+import { isDevBuild } from "@/base/env";
 import { localUser } from "@/base/local-user";
 import log from "@/base/log";
 import { updateShouldDisableCFUploadProxy } from "@/gallery/services/upload";
@@ -152,7 +153,7 @@ type FeatureFlags = z.infer<typeof FeatureFlags>;
 const syncSettingsSnapshotWithLocalStorage = () => {
     const flags = savedRemoteFeatureFlags();
     const settings = createDefaultSettings();
-    settings.isInternalUser = flags?.internalUser || isInternalUserViaEmail();
+    settings.isInternalUser = flags?.internalUser || false;
     settings.mapEnabled = flags?.mapEnabled || false;
     settings.cfUploadProxyDisabled = savedCFProxyDisabled();
     if (flags?.castUrl) settings.castURL = flags.castUrl;
@@ -185,20 +186,19 @@ const setSettingsSnapshot = (snapshot: Settings) => {
     _state.settingsListeners.forEach((l) => l());
 };
 
-const isInternalUserViaEmail = () => {
+/**
+ * Return `true` if this is a development build, and the current user is marked
+ * as an "development" user.
+ *
+ * Emails that end in "@ente.io" are considered as dev users.
+ */
+export const isDevBuildAndUser = () => isDevBuild && isDevUserViaEmail();
+
+const isDevUserViaEmail = () => {
     const user = localUser();
     return !!user?.email.endsWith("@ente.io");
 };
 
-/**
- * Return `true` if the current user is marked as an "internal" user.
- *
- * 1. Emails that end in `@ente.io` are considered as internal users.
- * 2. If the "internalUser" remote feature flag is set, the user is internal.
- * 3. Otherwise false.
- */
-export const isInternalUser = () => settingsSnapshot().isInternalUser;
-
 /**
  * Persist the user's map enabled preference both locally and on remote.
  */

From f8e271431564a613bdf0b1069ae0e33eab238918 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 3 Mar 2025 14:30:52 +0530
Subject: [PATCH 677/796] [mob] Use flagservice for map consent

---
 .../services/user_remote_flag_service.dart    |  5 +-
 mobile/lib/ui/map/enable_map.dart             | 11 +--
 .../ui/settings/advanced_settings_screen.dart | 16 +----
 .../file_details/location_tags_widget.dart    |  4 +-
 .../ente_feature_flag/lib/src/model.dart      | 25 +++++++
 .../ente_feature_flag/lib/src/service.dart    | 67 +++++++++++++------
 6 files changed, 81 insertions(+), 47 deletions(-)

diff --git a/mobile/lib/services/user_remote_flag_service.dart b/mobile/lib/services/user_remote_flag_service.dart
index 42bc45a60d..40d1b63b3f 100644
--- a/mobile/lib/services/user_remote_flag_service.dart
+++ b/mobile/lib/services/user_remote_flag_service.dart
@@ -17,7 +17,6 @@ class UserRemoteFlagService {
   final SharedPreferences _prefs;
 
   static const String recoveryVerificationFlag = "recoveryKeyVerified";
-  static const String mapEnabled = "mapEnabled";
   static const String mlEnabled = "faceSearchEnabled";
   static const String videoStreamingEnabled = "videoStreamingEnabled";
   static const String needRecoveryKeyVerification =
@@ -44,9 +43,7 @@ class UserRemoteFlagService {
 
   bool getCachedBoolValue(String key) {
     bool defaultValue = false;
-    if (key == mapEnabled) {
-      defaultValue = flagService.mapEnabled;
-    } else if (key == mlEnabled) {
+    if (key == mlEnabled) {
       defaultValue = flagService.hasGrantedMLConsent;
     }
     return _prefs.getBool(key) ?? defaultValue;
diff --git a/mobile/lib/ui/map/enable_map.dart b/mobile/lib/ui/map/enable_map.dart
index 335b362ae1..553e13dae4 100644
--- a/mobile/lib/ui/map/enable_map.dart
+++ b/mobile/lib/ui/map/enable_map.dart
@@ -2,15 +2,13 @@ import "package:flutter/cupertino.dart";
 import "package:photos/generated/l10n.dart";
 import 'package:photos/models/button_result.dart';
 import "package:photos/service_locator.dart";
-import "package:photos/services/user_remote_flag_service.dart";
 import "package:photos/ui/components/buttons/button_widget.dart";
 import "package:photos/ui/components/dialog_widget.dart";
 import "package:photos/ui/components/models/button_type.dart";
 import "package:photos/utils/toast_util.dart";
 
 Future<bool> requestForMapEnable(BuildContext context) async {
-  const String flagName = UserRemoteFlagService.mapEnabled;
-  if (userRemoteFlagService.getCachedBoolValue(flagName)) {
+  if (flagService.mapEnabled) {
     return true;
   }
 
@@ -26,10 +24,7 @@ Future<bool> requestForMapEnable(BuildContext context) async {
         labelText: S.of(context).enableMaps,
         isInAlert: true,
         onTap: () async {
-          await userRemoteFlagService.setBoolValue(
-            flagName,
-            true,
-          );
+          await flagService.setMapEnabled(true);
         },
       ),
       ButtonWidget(
@@ -52,5 +47,5 @@ Future<bool> requestForMapEnable(BuildContext context) async {
 
 //For debugging.
 void disableMap() {
-  userRemoteFlagService.setBoolValue(UserRemoteFlagService.mapEnabled, false);
+  flagService.setMapEnabled(false);
 }
diff --git a/mobile/lib/ui/settings/advanced_settings_screen.dart b/mobile/lib/ui/settings/advanced_settings_screen.dart
index 0da7aab7ca..461131a503 100644
--- a/mobile/lib/ui/settings/advanced_settings_screen.dart
+++ b/mobile/lib/ui/settings/advanced_settings_screen.dart
@@ -3,7 +3,6 @@ import "package:photos/core/error-reporting/super_logging.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/service_locator.dart";
 import "package:photos/services/preview_video_store.dart";
-import "package:photos/services/user_remote_flag_service.dart";
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/buttons/icon_button_widget.dart';
 import 'package:photos/ui/components/captioned_text_widget.dart';
@@ -101,19 +100,10 @@ class AdvancedSettingsScreen extends StatelessWidget {
                         singleBorderRadius: 8,
                         alignCaptionedTextToLeft: true,
                         trailingWidget: ToggleSwitchWidget(
-                          value: () => userRemoteFlagService.getCachedBoolValue(
-                            UserRemoteFlagService.mapEnabled,
-                          ),
+                          value: () => flagService.mapEnabled,
                           onChanged: () async {
-                            final isEnabled =
-                                userRemoteFlagService.getCachedBoolValue(
-                              UserRemoteFlagService.mapEnabled,
-                            );
-
-                            await userRemoteFlagService.setBoolValue(
-                              UserRemoteFlagService.mapEnabled,
-                              !isEnabled,
-                            );
+                            final isEnabled = flagService.mapEnabled;
+                            await flagService.setMapEnabled(!isEnabled);
                           },
                         ),
                       ),
diff --git a/mobile/lib/ui/viewer/file_details/location_tags_widget.dart b/mobile/lib/ui/viewer/file_details/location_tags_widget.dart
index fd85ef491b..b526643f1a 100644
--- a/mobile/lib/ui/viewer/file_details/location_tags_widget.dart
+++ b/mobile/lib/ui/viewer/file_details/location_tags_widget.dart
@@ -11,7 +11,6 @@ import "package:photos/generated/l10n.dart";
 import "package:photos/models/file/file.dart";
 import "package:photos/service_locator.dart";
 import "package:photos/services/search_service.dart";
-import "package:photos/services/user_remote_flag_service.dart";
 import "package:photos/states/location_screen_state.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/components/buttons/chip_button_widget.dart";
@@ -183,8 +182,7 @@ class _InfoMapState extends State<InfoMap> {
   @override
   void initState() {
     super.initState();
-    _hasEnabledMap = userRemoteFlagService
-        .getCachedBoolValue(UserRemoteFlagService.mapEnabled);
+    _hasEnabledMap = flagService.mapEnabled;
     _fileLat = widget.file.location!.latitude!;
     _fileLng = widget.file.location!.longitude!;
 
diff --git a/mobile/plugins/ente_feature_flag/lib/src/model.dart b/mobile/plugins/ente_feature_flag/lib/src/model.dart
index 412ef11a39..5635df17a2 100644
--- a/mobile/plugins/ente_feature_flag/lib/src/model.dart
+++ b/mobile/plugins/ente_feature_flag/lib/src/model.dart
@@ -26,6 +26,31 @@ class RemoteFlags {
     required this.castUrl,
   });
 
+  // CopyWith
+  RemoteFlags copyWith({
+    bool? enableStripe,
+    bool? disableCFWorker,
+    bool? mapEnabled,
+    bool? faceSearchEnabled,
+    bool? recoveryKeyVerified,
+    bool? internalUser,
+    bool? betaUser,
+    bool? enableMobMultiPart,
+    String? castUrl,
+  }) {
+    return RemoteFlags(
+      enableStripe: enableStripe ?? this.enableStripe,
+      disableCFWorker: disableCFWorker ?? this.disableCFWorker,
+      mapEnabled: mapEnabled ?? this.mapEnabled,
+      faceSearchEnabled: faceSearchEnabled ?? this.faceSearchEnabled,
+      recoveryKeyVerified: recoveryKeyVerified ?? this.recoveryKeyVerified,
+      internalUser: internalUser ?? this.internalUser,
+      betaUser: betaUser ?? this.betaUser,
+      enableMobMultiPart: enableMobMultiPart ?? this.enableMobMultiPart,
+      castUrl: castUrl ?? this.castUrl,
+    );
+  }
+
   static RemoteFlags defaultValue = RemoteFlags(
     enableStripe: Platform.isAndroid,
     disableCFWorker: false,
diff --git a/mobile/plugins/ente_feature_flag/lib/src/service.dart b/mobile/plugins/ente_feature_flag/lib/src/service.dart
index 0bbcdda9ed..0b011f01eb 100644
--- a/mobile/plugins/ente_feature_flag/lib/src/service.dart
+++ b/mobile/plugins/ente_feature_flag/lib/src/service.dart
@@ -38,6 +38,28 @@ class FlagService {
     }
   }
 
+  bool get disableCFWorker => flags.disableCFWorker;
+
+  bool get internalUser => flags.internalUser || kDebugMode;
+
+  bool get betaUser => flags.betaUser;
+
+  bool get internalOrBetaUser => internalUser || betaUser;
+
+  bool get enableStripe => Platform.isIOS ? false : flags.enableStripe;
+
+  bool get mapEnabled => flags.mapEnabled;
+
+  bool get isBetaUser => internalUser || flags.betaUser;
+
+  bool get recoveryKeyVerified => flags.recoveryKeyVerified;
+
+  bool get hasGrantedMLConsent => flags.faceSearchEnabled;
+
+  bool get enableMobMultiPart => flags.enableMobMultiPart || internalUser;
+
+  String get castUrl => flags.castUrl;
+
   Completer<void>? _fetchCompleter;
   Future<void> _fetch() async {
     if (_fetchCompleter != null) {
@@ -65,25 +87,32 @@ class FlagService {
     }
   }
 
-  bool get disableCFWorker => flags.disableCFWorker;
+  Future<void> _updateKeyValue(String key, String value) async {
+    try {
+      final response = await _enteDio.post(
+        "/remote-store/update",
+        data: {
+          "key": key,
+          "value": value,
+        },
+      );
+      if (response.statusCode != HttpStatus.ok) {
+        throw Exception("Unexpected state");
+      }
+    } catch (e) {
+      debugPrint("Failed to set flag for $key $e");
+      rethrow;
+    }
+  }
 
-  bool get internalUser => flags.internalUser || kDebugMode;
+  Future<void> setMapEnabled(bool isEnabled) async {
+    await _updateKeyValue("mapEnabled", isEnabled.toString());
+    _updateFlags(flags.copyWith(mapEnabled: isEnabled));
+  }
 
-  bool get betaUser => flags.betaUser;
-
-  bool get internalOrBetaUser => internalUser || betaUser;
-
-  bool get enableStripe => Platform.isIOS ? false : flags.enableStripe;
-
-  bool get mapEnabled => flags.mapEnabled;
-
-  bool get isBetaUser => internalUser || flags.betaUser;
-
-  bool get recoveryKeyVerified => flags.recoveryKeyVerified;
-
-  bool get hasGrantedMLConsent => flags.faceSearchEnabled;
-
-  bool get enableMobMultiPart => flags.enableMobMultiPart || internalUser;
-
-  String get castUrl => flags.castUrl;
+  void _updateFlags(RemoteFlags flags) {
+    _flags = flags;
+    _prefs.setString("remote_flags", flags.toJson());
+    _fetch().ignore();
+  }
 }

From f556950c072df569089d311141dadaf9448660de Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 3 Mar 2025 14:32:38 +0530
Subject: [PATCH 678/796] Remove unused constant

---
 mobile/lib/services/user_remote_flag_service.dart | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mobile/lib/services/user_remote_flag_service.dart b/mobile/lib/services/user_remote_flag_service.dart
index 40d1b63b3f..71e9936526 100644
--- a/mobile/lib/services/user_remote_flag_service.dart
+++ b/mobile/lib/services/user_remote_flag_service.dart
@@ -18,7 +18,6 @@ class UserRemoteFlagService {
 
   static const String recoveryVerificationFlag = "recoveryKeyVerified";
   static const String mlEnabled = "faceSearchEnabled";
-  static const String videoStreamingEnabled = "videoStreamingEnabled";
   static const String needRecoveryKeyVerification =
       "needRecoveryKeyVerification";
 

From 137a5cd77242af3c66a18115a8c690a0f84169bb Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 3 Mar 2025 14:58:54 +0530
Subject: [PATCH 679/796] Switch to flagService for mlConsent

---
 .../lib/services/machine_learning/ml_service.dart |  7 ++-----
 .../semantic_search/semantic_search_service.dart  | 10 +++-------
 mobile/lib/services/magic_cache_service.dart      |  4 +---
 mobile/lib/services/search_service.dart           |  4 +---
 mobile/lib/services/user_remote_flag_service.dart | 15 ---------------
 mobile/lib/ui/home/status_bar_widget.dart         |  7 ++-----
 .../settings/debug/ml_debug_section_widget.dart   | 12 +++---------
 mobile/lib/ui/settings/ml/enable_ml_consent.dart  |  6 +-----
 .../ml/machine_learning_settings_page.dart        | 15 ++++-----------
 .../lib/ui/viewer/file/file_details_widget.dart   |  4 +---
 mobile/lib/ui/viewer/search_tab/search_tab.dart   |  5 +----
 .../ente_feature_flag/lib/src/service.dart        | 15 ++++++++++-----
 12 files changed, 29 insertions(+), 75 deletions(-)

diff --git a/mobile/lib/services/machine_learning/ml_service.dart b/mobile/lib/services/machine_learning/ml_service.dart
index d6dcdb3bfc..be38b613b2 100644
--- a/mobile/lib/services/machine_learning/ml_service.dart
+++ b/mobile/lib/services/machine_learning/ml_service.dart
@@ -21,7 +21,6 @@ import "package:photos/services/machine_learning/face_ml/person/person_service.d
 import "package:photos/services/machine_learning/ml_indexing_isolate.dart";
 import 'package:photos/services/machine_learning/ml_result.dart';
 import "package:photos/services/machine_learning/semantic_search/semantic_search_service.dart";
-import "package:photos/services/user_remote_flag_service.dart";
 import "package:photos/utils/ml_util.dart";
 import "package:photos/utils/network_util.dart";
 import "package:photos/utils/ram_check_util.dart";
@@ -58,8 +57,7 @@ class MLService {
   /// Only call this function once at app startup, after that you can directly call [runAllML]
   Future<void> init() async {
     if (_isInitialized) return;
-    if (!userRemoteFlagService
-        .getCachedBoolValue(UserRemoteFlagService.mlEnabled)) {
+    if (!flagService.hasGrantedMLConsent) {
       return;
     }
     _logger.info("init called");
@@ -74,8 +72,7 @@ class MLService {
 
     // Listen on MachineLearningController
     Bus.instance.on<MachineLearningControlEvent>().listen((event) {
-      if (!userRemoteFlagService
-          .getCachedBoolValue(UserRemoteFlagService.mlEnabled)) {
+      if (!flagService.hasGrantedMLConsent) {
         return;
       }
 
diff --git a/mobile/lib/services/machine_learning/semantic_search/semantic_search_service.dart b/mobile/lib/services/machine_learning/semantic_search/semantic_search_service.dart
index df56796cd1..4e881e718d 100644
--- a/mobile/lib/services/machine_learning/semantic_search/semantic_search_service.dart
+++ b/mobile/lib/services/machine_learning/semantic_search/semantic_search_service.dart
@@ -21,7 +21,6 @@ import "package:photos/services/collections_service.dart";
 import "package:photos/services/machine_learning/ml_computer.dart";
 import "package:photos/services/machine_learning/ml_result.dart";
 import "package:photos/services/machine_learning/semantic_search/clip/clip_image_encoder.dart";
-import "package:photos/services/user_remote_flag_service.dart";
 import "package:shared_preferences/shared_preferences.dart";
 
 class SemanticSearchService {
@@ -48,8 +47,7 @@ class SemanticSearchService {
       _logger.info("Initialized already");
       return;
     }
-    final hasGivenConsent = userRemoteFlagService
-        .getCachedBoolValue(UserRemoteFlagService.mlEnabled);
+    final hasGivenConsent = flagService.hasGrantedMLConsent;
     if (!hasGivenConsent) return;
 
     _logger.info("init called");
@@ -67,9 +65,7 @@ class SemanticSearchService {
   }
 
   bool isMagicSearchEnabledAndReady() {
-    return userRemoteFlagService
-            .getCachedBoolValue(UserRemoteFlagService.mlEnabled) &&
-        _textModelIsLoaded;
+    return flagService.hasGrantedMLConsent && _textModelIsLoaded;
   }
 
   // searchScreenQuery should only be used for the user initiate query on the search screen.
@@ -78,7 +74,7 @@ class SemanticSearchService {
     if (!isMagicSearchEnabledAndReady()) {
       if (flagService.internalUser) {
         _logger.info(
-          "ML global consent: ${userRemoteFlagService.getCachedBoolValue(UserRemoteFlagService.mlEnabled)}, loaded: $_textModelIsLoaded ",
+          "ML global consent: ${flagService.hasGrantedMLConsent}, loaded: $_textModelIsLoaded ",
         );
       }
       return (query, <EnteFile>[]);
diff --git a/mobile/lib/services/magic_cache_service.dart b/mobile/lib/services/magic_cache_service.dart
index fc9d02a0a9..70379590c5 100644
--- a/mobile/lib/services/magic_cache_service.dart
+++ b/mobile/lib/services/magic_cache_service.dart
@@ -23,7 +23,6 @@ import "package:photos/service_locator.dart";
 import "package:photos/services/machine_learning/semantic_search/semantic_search_service.dart";
 import "package:photos/services/remote_assets_service.dart";
 import "package:photos/services/search_service.dart";
-import "package:photos/services/user_remote_flag_service.dart";
 import "package:photos/ui/viewer/search/result/magic_result_screen.dart";
 import "package:photos/utils/file_util.dart";
 import "package:photos/utils/navigation_util.dart";
@@ -203,8 +202,7 @@ class MagicCacheService {
     return _prefs.getInt(_lastMagicCacheUpdateTime) ?? 0;
   }
 
-  bool get enableDiscover =>
-      userRemoteFlagService.getCachedBoolValue(UserRemoteFlagService.mlEnabled);
+  bool get enableDiscover => flagService.hasGrantedMLConsent;
 
   void queueUpdate(String reason) {
     _pendingUpdateReason.add(reason);
diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 62576eae03..8274db3b0a 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -45,7 +45,6 @@ import "package:photos/services/machine_learning/face_ml/face_filtering/face_fil
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
 import "package:photos/services/machine_learning/ml_computer.dart";
 import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';
-import "package:photos/services/user_remote_flag_service.dart";
 import "package:photos/services/user_service.dart";
 import "package:photos/states/location_screen_state.dart";
 import "package:photos/ui/viewer/location/add_location_sheet.dart";
@@ -249,8 +248,7 @@ class SearchService {
   Future<List<GenericSearchResult>> getMagicSectionResults(
     BuildContext context,
   ) async {
-    if (userRemoteFlagService
-        .getCachedBoolValue(UserRemoteFlagService.mlEnabled)) {
+    if (flagService.hasGrantedMLConsent) {
       return magicCacheService.getMagicGenericSearchResult(context);
     } else {
       return <GenericSearchResult>[];
diff --git a/mobile/lib/services/user_remote_flag_service.dart b/mobile/lib/services/user_remote_flag_service.dart
index 71e9936526..0c8961fbd1 100644
--- a/mobile/lib/services/user_remote_flag_service.dart
+++ b/mobile/lib/services/user_remote_flag_service.dart
@@ -7,7 +7,6 @@ import "package:flutter/foundation.dart";
 import 'package:logging/logging.dart';
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/events/notification_event.dart';
-import "package:photos/service_locator.dart";
 import 'package:photos/services/user_service.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -17,7 +16,6 @@ class UserRemoteFlagService {
   final SharedPreferences _prefs;
 
   static const String recoveryVerificationFlag = "recoveryKeyVerified";
-  static const String mlEnabled = "faceSearchEnabled";
   static const String needRecoveryKeyVerification =
       "needRecoveryKeyVerification";
 
@@ -40,19 +38,6 @@ class UserRemoteFlagService {
     }
   }
 
-  bool getCachedBoolValue(String key) {
-    bool defaultValue = false;
-    if (key == mlEnabled) {
-      defaultValue = flagService.hasGrantedMLConsent;
-    }
-    return _prefs.getBool(key) ?? defaultValue;
-  }
-
-  Future<bool> setBoolValue(String key, bool value) async {
-    await _updateKeyValue(key, value.toString());
-    return _prefs.setBool(key, value);
-  }
-
   // markRecoveryVerificationAsDone is used to track if user has verified their
   // recovery key in the past or not. This helps in avoid showing the same
   // prompt to the user on re-install or signing into a different device
diff --git a/mobile/lib/ui/home/status_bar_widget.dart b/mobile/lib/ui/home/status_bar_widget.dart
index e967d7b0b5..a36f2f75a5 100644
--- a/mobile/lib/ui/home/status_bar_widget.dart
+++ b/mobile/lib/ui/home/status_bar_widget.dart
@@ -13,7 +13,6 @@ import "package:photos/models/preview/preview_item_status.dart";
 import "package:photos/service_locator.dart";
 import "package:photos/services/preview_video_store.dart";
 import 'package:photos/services/sync_service.dart';
-import "package:photos/services/user_remote_flag_service.dart";
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/theme/text_style.dart';
 import 'package:photos/ui/account/verify_recovery_page.dart';
@@ -43,8 +42,7 @@ class _StatusBarWidgetState extends State<StatusBarWidget> {
 
   bool _showStatus = false;
   bool _showErrorBanner = false;
-  bool _showMlBanner = !userRemoteFlagService
-          .getCachedBoolValue(UserRemoteFlagService.mlEnabled) &&
+  bool _showMlBanner = !flagService.hasGrantedMLConsent &&
       !localSettings.hasSeenMLEnablingBanner;
   Error? _syncError;
 
@@ -81,8 +79,7 @@ class _StatusBarWidgetState extends State<StatusBarWidget> {
     _notificationSubscription =
         Bus.instance.on<NotificationEvent>().listen((event) {
       if (mounted) {
-        _showMlBanner = !userRemoteFlagService
-                .getCachedBoolValue(UserRemoteFlagService.mlEnabled) &&
+        _showMlBanner = !flagService.hasGrantedMLConsent &&
             !localSettings.hasSeenMLEnablingBanner;
         setState(() {});
       }
diff --git a/mobile/lib/ui/settings/debug/ml_debug_section_widget.dart b/mobile/lib/ui/settings/debug/ml_debug_section_widget.dart
index d89ee548a1..e0cdf1cdad 100644
--- a/mobile/lib/ui/settings/debug/ml_debug_section_widget.dart
+++ b/mobile/lib/ui/settings/debug/ml_debug_section_widget.dart
@@ -11,7 +11,6 @@ import "package:photos/services/machine_learning/face_ml/person/person_service.d
 import "package:photos/services/machine_learning/ml_indexing_isolate.dart";
 import 'package:photos/services/machine_learning/ml_service.dart';
 import "package:photos/services/machine_learning/semantic_search/semantic_search_service.dart";
-import "package:photos/services/user_remote_flag_service.dart";
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/captioned_text_widget.dart';
 import 'package:photos/ui/components/expandable_menu_item_widget.dart';
@@ -81,17 +80,12 @@ class _MLDebugSectionWidgetState extends State<MLDebugSectionWidget> {
             },
           ),
           trailingWidget: ToggleSwitchWidget(
-            value: () => userRemoteFlagService
-                .getCachedBoolValue(UserRemoteFlagService.mlEnabled),
+            value: () => flagService.hasGrantedMLConsent,
             onChanged: () async {
               try {
-                final oldMlConsent = userRemoteFlagService
-                    .getCachedBoolValue(UserRemoteFlagService.mlEnabled);
+                final oldMlConsent = flagService.hasGrantedMLConsent;
                 final mlConsent = !oldMlConsent;
-                await userRemoteFlagService.setBoolValue(
-                  UserRemoteFlagService.mlEnabled,
-                  mlConsent,
-                );
+                await flagService.setMLConsent(mlConsent);
                 logger.info('ML consent turned ${mlConsent ? 'on' : 'off'}');
                 if (!mlConsent) {
                   MLService.instance.pauseIndexingAndClustering();
diff --git a/mobile/lib/ui/settings/ml/enable_ml_consent.dart b/mobile/lib/ui/settings/ml/enable_ml_consent.dart
index 972858c3d7..c828e9d36b 100644
--- a/mobile/lib/ui/settings/ml/enable_ml_consent.dart
+++ b/mobile/lib/ui/settings/ml/enable_ml_consent.dart
@@ -3,7 +3,6 @@ import "package:photos/core/event_bus.dart";
 import "package:photos/events/notification_event.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/service_locator.dart";
-import "package:photos/services/user_remote_flag_service.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/common/web_page.dart";
 import "package:photos/ui/components/buttons/button_widget.dart";
@@ -153,10 +152,7 @@ class _EnableMachineLearningConsentState
 
   Future<void> enableMlConsent(BuildContext context) async {
     try {
-      await userRemoteFlagService.setBoolValue(
-        UserRemoteFlagService.mlEnabled,
-        true,
-      );
+      await flagService.setMLConsent(true);
       Bus.instance.fire(NotificationEvent());
       Navigator.of(context).pop(true);
     } catch (e) {
diff --git a/mobile/lib/ui/settings/ml/machine_learning_settings_page.dart b/mobile/lib/ui/settings/ml/machine_learning_settings_page.dart
index 0ebe3656ba..ad4f87821a 100644
--- a/mobile/lib/ui/settings/ml/machine_learning_settings_page.dart
+++ b/mobile/lib/ui/settings/ml/machine_learning_settings_page.dart
@@ -12,7 +12,6 @@ import "package:photos/services/machine_learning/semantic_search/clip/clip_image
 import "package:photos/services/machine_learning/semantic_search/clip/clip_text_encoder.dart";
 import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';
 import "package:photos/services/remote_assets_service.dart";
-import "package:photos/services/user_remote_flag_service.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/common/loading_widget.dart";
 import "package:photos/ui/common/web_page.dart";
@@ -77,8 +76,7 @@ class _MachineLearningSettingsPageState
 
   @override
   Widget build(BuildContext context) {
-    final hasEnabled = userRemoteFlagService
-        .getCachedBoolValue(UserRemoteFlagService.mlEnabled);
+    final hasEnabled = flagService.hasGrantedMLConsent;
     return Scaffold(
       body: CustomScrollView(
         primary: false,
@@ -211,8 +209,7 @@ class _MachineLearningSettingsPageState
   }
 
   Future<void> toggleMlConsent() async {
-    final oldMlConsent = userRemoteFlagService
-        .getCachedBoolValue(UserRemoteFlagService.mlEnabled);
+    final oldMlConsent = flagService.hasGrantedMLConsent;
     // Go to consent page first if not enabled
     if (!oldMlConsent) {
       final result = await Navigator.push(
@@ -228,10 +225,7 @@ class _MachineLearningSettingsPageState
       }
     }
     final mlConsent = !oldMlConsent;
-    await userRemoteFlagService.setBoolValue(
-      UserRemoteFlagService.mlEnabled,
-      mlConsent,
-    );
+    await flagService.setMLConsent(mlConsent);
     if (!mlConsent) {
       MLService.instance.pauseIndexingAndClustering();
       unawaited(
@@ -248,8 +242,7 @@ class _MachineLearningSettingsPageState
   }
 
   Widget _getMlSettings(BuildContext context) {
-    final hasEnabled = userRemoteFlagService
-        .getCachedBoolValue(UserRemoteFlagService.mlEnabled);
+    final hasEnabled = flagService.hasGrantedMLConsent;
     if (!hasEnabled) {
       return const SizedBox.shrink();
     }
diff --git a/mobile/lib/ui/viewer/file/file_details_widget.dart b/mobile/lib/ui/viewer/file/file_details_widget.dart
index 1138908860..12f722b357 100644
--- a/mobile/lib/ui/viewer/file/file_details_widget.dart
+++ b/mobile/lib/ui/viewer/file/file_details_widget.dart
@@ -19,7 +19,6 @@ import "package:photos/models/metadata/file_magic.dart";
 import "package:photos/service_locator.dart";
 import "package:photos/services/file_magic_service.dart";
 import "package:photos/services/filedata/filedata_service.dart";
-import "package:photos/services/user_remote_flag_service.dart";
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/buttons/icon_button_widget.dart';
 import "package:photos/ui/components/divider_widget.dart";
@@ -298,8 +297,7 @@ class _FileDetailsWidgetState extends State<FileDetailsWidget> {
       ]);
     }
 
-    if (userRemoteFlagService
-        .getCachedBoolValue(UserRemoteFlagService.mlEnabled)) {
+    if (flagService.hasGrantedMLConsent) {
       fileDetailsTiles.addAll([
         FacesItemWidget(file),
         const FileDetailsDivider(),
diff --git a/mobile/lib/ui/viewer/search_tab/search_tab.dart b/mobile/lib/ui/viewer/search_tab/search_tab.dart
index 27e3f46830..ec616f7ec4 100644
--- a/mobile/lib/ui/viewer/search_tab/search_tab.dart
+++ b/mobile/lib/ui/viewer/search_tab/search_tab.dart
@@ -10,7 +10,6 @@ import "package:photos/models/search/index_of_indexed_stack.dart";
 import "package:photos/models/search/search_result.dart";
 import "package:photos/models/search/search_types.dart";
 import "package:photos/service_locator.dart";
-import "package:photos/services/user_remote_flag_service.dart";
 import "package:photos/states/all_sections_examples_state.dart";
 import "package:photos/ui/common/loading_widget.dart";
 import "package:photos/ui/viewer/search/result/no_result_widget.dart";
@@ -119,9 +118,7 @@ class _AllSearchSectionsState extends State<AllSearchSections> {
                   itemBuilder: (context, index) {
                     switch (searchTypes[index]) {
                       case SectionType.face:
-                        if (!userRemoteFlagService.getCachedBoolValue(
-                          UserRemoteFlagService.mlEnabled,
-                        )) {
+                        if (!flagService.hasGrantedMLConsent) {
                           return const SizedBox.shrink();
                         }
                         return PeopleSection(
diff --git a/mobile/plugins/ente_feature_flag/lib/src/service.dart b/mobile/plugins/ente_feature_flag/lib/src/service.dart
index 0b011f01eb..b6e99eb0b5 100644
--- a/mobile/plugins/ente_feature_flag/lib/src/service.dart
+++ b/mobile/plugins/ente_feature_flag/lib/src/service.dart
@@ -60,6 +60,16 @@ class FlagService {
 
   String get castUrl => flags.castUrl;
 
+  Future<void> setMapEnabled(bool isEnabled) async {
+    await _updateKeyValue("mapEnabled", isEnabled.toString());
+    _updateFlags(flags.copyWith(mapEnabled: isEnabled));
+  }
+
+  Future<void> setMLConsent(bool isEnabled) async {
+    await _updateKeyValue("faceSearchEnabled", isEnabled.toString());
+    _updateFlags(flags.copyWith(faceSearchEnabled: isEnabled));
+  }
+
   Completer<void>? _fetchCompleter;
   Future<void> _fetch() async {
     if (_fetchCompleter != null) {
@@ -105,11 +115,6 @@ class FlagService {
     }
   }
 
-  Future<void> setMapEnabled(bool isEnabled) async {
-    await _updateKeyValue("mapEnabled", isEnabled.toString());
-    _updateFlags(flags.copyWith(mapEnabled: isEnabled));
-  }
-
   void _updateFlags(RemoteFlags flags) {
     _flags = flags;
     _prefs.setString("remote_flags", flags.toJson());

From 976634f8c725b7816b1584f07c9799d3e9da0fde Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 3 Mar 2025 16:08:26 +0530
Subject: [PATCH 680/796] [mob] Show verification banner after 3 days

---
 mobile/lib/service_locator.dart               |  10 --
 .../services/user_remote_flag_service.dart    | 122 ------------------
 .../lib/ui/account/verify_recovery_page.dart  |   2 +-
 mobile/lib/ui/home/status_bar_widget.dart     |  16 ++-
 mobile/lib/utils/local_settings.dart          |  15 +++
 .../ente_feature_flag/lib/src/service.dart    |   5 +
 6 files changed, 33 insertions(+), 137 deletions(-)
 delete mode 100644 mobile/lib/services/user_remote_flag_service.dart

diff --git a/mobile/lib/service_locator.dart b/mobile/lib/service_locator.dart
index d33bef747e..f056258598 100644
--- a/mobile/lib/service_locator.dart
+++ b/mobile/lib/service_locator.dart
@@ -13,7 +13,6 @@ import "package:photos/services/magic_cache_service.dart";
 import "package:photos/services/storage_bonus_service.dart";
 import "package:photos/services/trash_sync_service.dart";
 import "package:photos/services/update_service.dart";
-import "package:photos/services/user_remote_flag_service.dart";
 import "package:photos/utils/local_settings.dart";
 import "package:shared_preferences/shared_preferences.dart";
 
@@ -101,15 +100,6 @@ LocationService get locationService {
   return _locationService!;
 }
 
-UserRemoteFlagService? _userRemoteFlagService;
-UserRemoteFlagService get userRemoteFlagService {
-  _userRemoteFlagService ??= UserRemoteFlagService(
-    ServiceLocator.instance.enteDio,
-    ServiceLocator.instance.prefs,
-  );
-  return _userRemoteFlagService!;
-}
-
 MagicCacheService? _magicCacheService;
 MagicCacheService get magicCacheService {
   _magicCacheService ??= MagicCacheService(
diff --git a/mobile/lib/services/user_remote_flag_service.dart b/mobile/lib/services/user_remote_flag_service.dart
deleted file mode 100644
index 0c8961fbd1..0000000000
--- a/mobile/lib/services/user_remote_flag_service.dart
+++ /dev/null
@@ -1,122 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-
-import 'package:collection/collection.dart';
-import "package:dio/dio.dart";
-import "package:flutter/foundation.dart";
-import 'package:logging/logging.dart';
-import 'package:photos/core/event_bus.dart';
-import 'package:photos/events/notification_event.dart';
-import 'package:photos/services/user_service.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-class UserRemoteFlagService {
-  final Dio _enteDio;
-  late final _logger = Logger((UserRemoteFlagService).toString());
-  final SharedPreferences _prefs;
-
-  static const String recoveryVerificationFlag = "recoveryKeyVerified";
-  static const String needRecoveryKeyVerification =
-      "needRecoveryKeyVerification";
-
-  UserRemoteFlagService(this._enteDio, this._prefs) {
-    debugPrint("UserRemoteFlagService constructor");
-  }
-
-  bool shouldShowRecoveryVerification() {
-    if (!_prefs.containsKey(needRecoveryKeyVerification)) {
-      // fetch the status from remote
-      _refreshRecoveryVerificationFlag().ignore();
-      return false;
-    } else {
-      final bool shouldShow = _prefs.getBool(needRecoveryKeyVerification)!;
-      if (shouldShow) {
-        // refresh the status to check if user marked it as done on another device
-        _refreshRecoveryVerificationFlag().ignore();
-      }
-      return shouldShow;
-    }
-  }
-
-  // markRecoveryVerificationAsDone is used to track if user has verified their
-  // recovery key in the past or not. This helps in avoid showing the same
-  // prompt to the user on re-install or signing into a different device
-  Future<void> markRecoveryVerificationAsDone() async {
-    await _updateKeyValue(recoveryVerificationFlag, true.toString());
-    await _prefs.setBool(needRecoveryKeyVerification, false);
-  }
-
-  Future<void> _refreshRecoveryVerificationFlag() async {
-    _logger.finest('refresh recovery key verification flag');
-    final remoteStatusValue =
-        await _getValue(recoveryVerificationFlag, "false");
-    final bool isNeedVerificationFlagSet =
-        _prefs.containsKey(needRecoveryKeyVerification);
-    if (remoteStatusValue.toLowerCase() == "true") {
-      await _prefs.setBool(needRecoveryKeyVerification, false);
-      // If the user verified on different device, then we should refresh
-      // the UI to dismiss the Notification.
-      if (isNeedVerificationFlagSet) {
-        Bus.instance.fire(NotificationEvent());
-      }
-    } else if (!isNeedVerificationFlagSet) {
-      // Verification is not done yet as remoteStatus is false and local flag to
-      // show notification isn't set. Set the flag to true if any active
-      // session is older than 1 day.
-      final activeSessions = await UserService.instance.getActiveSessions();
-      final int microSecondsInADay = const Duration(days: 1).inMicroseconds;
-      final bool anyActiveSessionOlderThanADay =
-          activeSessions.sessions.firstWhereOrNull(
-                (e) =>
-                    (e.creationTime + microSecondsInADay) <
-                    DateTime.now().microsecondsSinceEpoch,
-              ) !=
-              null;
-      if (anyActiveSessionOlderThanADay) {
-        await _prefs.setBool(needRecoveryKeyVerification, true);
-        Bus.instance.fire(NotificationEvent());
-      } else {
-        // continue defaulting to no verification prompt
-        _logger.finest('No active session older than 1 day');
-      }
-    }
-  }
-
-  Future<String> _getValue(String key, String? defaultValue) async {
-    try {
-      final Map<String, dynamic> queryParams = {"key": key};
-      if (defaultValue != null) {
-        queryParams["defaultValue"] = defaultValue;
-      }
-      final response =
-          await _enteDio.get("/remote-store", queryParameters: queryParams);
-      if (response.statusCode != HttpStatus.ok) {
-        throw Exception("Unexpected status code ${response.statusCode}");
-      }
-      return response.data["value"];
-    } catch (e) {
-      _logger.info("Error while fetching bool status for $key", e);
-      rethrow;
-    }
-  }
-
-  // _setBooleanFlag sets the corresponding flag on remote
-  // to mark recovery as completed
-  Future<void> _updateKeyValue(String key, String value) async {
-    try {
-      final response = await _enteDio.post(
-        "/remote-store/update",
-        data: {
-          "key": key,
-          "value": value,
-        },
-      );
-      if (response.statusCode != HttpStatus.ok) {
-        throw Exception("Unexpected state");
-      }
-    } catch (e) {
-      _logger.warning("Failed to set flag for $key", e);
-      rethrow;
-    }
-  }
-}
diff --git a/mobile/lib/ui/account/verify_recovery_page.dart b/mobile/lib/ui/account/verify_recovery_page.dart
index 573f351828..94a289089b 100644
--- a/mobile/lib/ui/account/verify_recovery_page.dart
+++ b/mobile/lib/ui/account/verify_recovery_page.dart
@@ -40,7 +40,7 @@ class _VerifyRecoveryPageState extends State<VerifyRecoveryPage> {
       final String recoveryKeyWords = bip39.entropyToMnemonic(recoveryKey);
       if (inputKey == recoveryKey || inputKey == recoveryKeyWords) {
         try {
-          await userRemoteFlagService.markRecoveryVerificationAsDone();
+          await flagService.setRecoveryKeyVerified(true);
         } catch (e) {
           await dialog.hide();
           if (e is DioException && e.type == DioExceptionType.connectionError) {
diff --git a/mobile/lib/ui/home/status_bar_widget.dart b/mobile/lib/ui/home/status_bar_widget.dart
index a36f2f75a5..56f46cbb53 100644
--- a/mobile/lib/ui/home/status_bar_widget.dart
+++ b/mobile/lib/ui/home/status_bar_widget.dart
@@ -112,7 +112,6 @@ class _StatusBarWidgetState extends State<StatusBarWidget> {
     _subscription.cancel();
     _notificationSubscription.cancel();
     _previewSubscription.cancel();
-
     super.dispose();
   }
 
@@ -176,9 +175,7 @@ class _StatusBarWidgetState extends State<StatusBarWidget> {
                 ),
               )
             : const SizedBox.shrink(),
-        userRemoteFlagService.shouldShowRecoveryVerification() &&
-                !_showErrorBanner &&
-                !_showMlBanner
+        _showVerificationBanner()
             ? Padding(
                 padding:
                     const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12),
@@ -200,6 +197,17 @@ class _StatusBarWidgetState extends State<StatusBarWidget> {
       ],
     );
   }
+
+  // _showVerificationBanner after 3 days of installation
+  bool _showVerificationBanner() {
+    if (_showErrorBanner ||
+        _showErrorBanner ||
+        flagService.recoveryKeyVerified) {
+      return false;
+    }
+    final DateTime installTime = localSettings.getInstallDateTime();
+    return DateTime.now().difference(installTime).inDays >= 3;
+  }
 }
 
 class SyncStatusWidget extends StatefulWidget {
diff --git a/mobile/lib/utils/local_settings.dart b/mobile/lib/utils/local_settings.dart
index 204db7d3ca..8ca37cd29b 100644
--- a/mobile/lib/utils/local_settings.dart
+++ b/mobile/lib/utils/local_settings.dart
@@ -22,6 +22,7 @@ class LocalSettings {
       "has_configured_links_in_app_permission";
   static const _hideSharedItemsFromHomeGalleryTag =
       "hide_shared_items_from_home_gallery";
+  static const _installTimeKey = "install_time";
 
   final SharedPreferences _prefs;
 
@@ -55,6 +56,20 @@ class LocalSettings {
     }
   }
 
+  // getEstimatedInstallTimeInMs returns the time when the app was installed
+  // The time is stored in shared preferences and will be reset on logout
+  DateTime getInstallDateTime() {
+    if (_prefs.containsKey('install_time')) {
+      return DateTime.fromMillisecondsSinceEpoch(
+        _prefs.getInt('install_time')!,
+      );
+    } else {
+      final installTime = DateTime.now();
+      _prefs.setInt('install_time', installTime.millisecondsSinceEpoch);
+      return installTime;
+    }
+  }
+
   Future<void> setRateUsShownCount(int value) async {
     await _prefs.setInt(kRateUsShownCount, value);
   }
diff --git a/mobile/plugins/ente_feature_flag/lib/src/service.dart b/mobile/plugins/ente_feature_flag/lib/src/service.dart
index b6e99eb0b5..c89dea719b 100644
--- a/mobile/plugins/ente_feature_flag/lib/src/service.dart
+++ b/mobile/plugins/ente_feature_flag/lib/src/service.dart
@@ -70,6 +70,11 @@ class FlagService {
     _updateFlags(flags.copyWith(faceSearchEnabled: isEnabled));
   }
 
+  Future<void> setRecoveryKeyVerified(bool isVerified) async {
+    await _updateKeyValue("recoveryKeyVerified", isVerified.toString());
+    _updateFlags(flags.copyWith(recoveryKeyVerified: isVerified));
+  }
+
   Completer<void>? _fetchCompleter;
   Future<void> _fetch() async {
     if (_fetchCompleter != null) {

From 8898ac7060943f437daa56b6dad73cc73bd0b406 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 3 Mar 2025 16:10:34 +0530
Subject: [PATCH 681/796] clean up

---
 mobile/lib/utils/local_settings.dart                | 7 +++----
 mobile/plugins/ente_feature_flag/lib/src/model.dart | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/mobile/lib/utils/local_settings.dart b/mobile/lib/utils/local_settings.dart
index 8ca37cd29b..9fcd9e9adc 100644
--- a/mobile/lib/utils/local_settings.dart
+++ b/mobile/lib/utils/local_settings.dart
@@ -22,7 +22,6 @@ class LocalSettings {
       "has_configured_links_in_app_permission";
   static const _hideSharedItemsFromHomeGalleryTag =
       "hide_shared_items_from_home_gallery";
-  static const _installTimeKey = "install_time";
 
   final SharedPreferences _prefs;
 
@@ -59,13 +58,13 @@ class LocalSettings {
   // getEstimatedInstallTimeInMs returns the time when the app was installed
   // The time is stored in shared preferences and will be reset on logout
   DateTime getInstallDateTime() {
-    if (_prefs.containsKey('install_time')) {
+    if (_prefs.containsKey('ls.install_time')) {
       return DateTime.fromMillisecondsSinceEpoch(
-        _prefs.getInt('install_time')!,
+        _prefs.getInt('ls.install_time')!,
       );
     } else {
       final installTime = DateTime.now();
-      _prefs.setInt('install_time', installTime.millisecondsSinceEpoch);
+      _prefs.setInt('ls.install_time', installTime.millisecondsSinceEpoch);
       return installTime;
     }
   }
diff --git a/mobile/plugins/ente_feature_flag/lib/src/model.dart b/mobile/plugins/ente_feature_flag/lib/src/model.dart
index 5635df17a2..925b722a7e 100644
--- a/mobile/plugins/ente_feature_flag/lib/src/model.dart
+++ b/mobile/plugins/ente_feature_flag/lib/src/model.dart
@@ -26,7 +26,6 @@ class RemoteFlags {
     required this.castUrl,
   });
 
-  // CopyWith
   RemoteFlags copyWith({
     bool? enableStripe,
     bool? disableCFWorker,
@@ -56,7 +55,7 @@ class RemoteFlags {
     disableCFWorker: false,
     mapEnabled: false,
     faceSearchEnabled: false,
-    recoveryKeyVerified: false,
+    recoveryKeyVerified: true,
     internalUser: kDebugMode,
     betaUser: kDebugMode,
     enableMobMultiPart: false,

From ee41052eda6bf8bbf76010358cf207da89356fdd Mon Sep 17 00:00:00 2001
From: Caboose <162767460+Caboose86@users.noreply.github.com>
Date: Mon, 3 Mar 2025 21:13:04 +1030
Subject: [PATCH 682/796] [auth] BingX & CoinSpot Icons (#5186)

Added BingX & CoinSpot .svg files as well as updated the .JSON file to
include them
---
 .../custom-icons/_data/custom-icons.json      |   6 +
 auth/assets/custom-icons/icons/bingx.svg      |   1 +
 auth/assets/custom-icons/icons/coinspot.svg   | 130 ++++++++++++++++++
 3 files changed, 137 insertions(+)
 create mode 100644 auth/assets/custom-icons/icons/bingx.svg
 create mode 100644 auth/assets/custom-icons/icons/coinspot.svg

diff --git a/auth/assets/custom-icons/_data/custom-icons.json b/auth/assets/custom-icons/_data/custom-icons.json
index 5eea155f5f..73a0ac3142 100644
--- a/auth/assets/custom-icons/_data/custom-icons.json
+++ b/auth/assets/custom-icons/_data/custom-icons.json
@@ -1245,6 +1245,12 @@
     },
     {
       "title": "Zoom"
+    },
+    {
+      "title": "BingX"
+    },
+    {
+      "title": "CoinSpot"
     }
   ]
 }
diff --git a/auth/assets/custom-icons/icons/bingx.svg b/auth/assets/custom-icons/icons/bingx.svg
new file mode 100644
index 0000000000..9bcb83f42d
--- /dev/null
+++ b/auth/assets/custom-icons/icons/bingx.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 150 150"><defs><style>.e{fill:#2a54ff;}.f{fill:url(#d);}.g{fill:none;}</style><linearGradient id="d" x1="17.68" y1="116.45" x2="132.14" y2="32.11" gradientTransform="matrix(1, 0, 0, 1, 0, 0)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#2a54ff"/><stop offset=".52" stop-color="#2143cb"/><stop offset="1" stop-color="#2a54ff"/></linearGradient></defs><g id="b"><path id="c" class="g" d="M0,0H150V150H0V0Z"/></g><path class="f" d="M140.2,22.33c-25.18-.09-49.79,10.83-66.63,29.47-6.06,6.27-10.1,13.95-14.96,21.06-11.64,15.93-29.81,25.14-49.5,25.13h0v28.65h0c25.17,.1,49.78-10.86,66.63-29.5,6.03-6.27,10.13-13.94,14.96-21.06,11.64-15.91,29.81-25.12,49.5-25.11V22.33h0Z"/><path class="e" d="M140.2,97.99c-19.68,0-37.86-9.2-49.5-25.11-4.81-7.12-8.92-14.78-14.94-21.06C58.95,33.18,34.3,22.24,9.13,22.35h0v28.65h0c21.8-.11,42.05,11.62,53.01,30.46,3.22,5.62,7.06,10.9,11.45,15.74,16.83,18.63,41.46,29.59,66.63,29.5l-.02-28.7h0Z"/></svg>
\ No newline at end of file
diff --git a/auth/assets/custom-icons/icons/coinspot.svg b/auth/assets/custom-icons/icons/coinspot.svg
new file mode 100644
index 0000000000..0d94e75a88
--- /dev/null
+++ b/auth/assets/custom-icons/icons/coinspot.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#C5C8CA;}
+	.st1{fill:#9DA4A8;}
+	.st2{fill:#B7BBBD;}
+	.st3{fill:#CBCFD1;}
+	.st4{fill:#BBBFC2;}
+	.st5{fill:#CACDCE;}
+	.st6{fill:#BFC3C5;}
+	.st7{fill:#BCC0C2;}
+	.st8{fill:#BDC1C4;}
+	.st9{fill:#C7CACC;}
+	.st10{fill:url(#SVGID_1_);}
+	.st11{fill:#FFFFFF;}
+	.st12{fill:#B8BCBF;}
+	.st13{fill:#C4C7C9;}
+	.st14{fill:#C1C5C7;}
+	.st15{fill:url(#SVGID_00000003093454306001190100000011813141018663887528_);}
+	.st16{fill:url(#SVGID_00000017503418065689336600000007511615486600436881_);}
+	.st17{fill:url(#SVGID_00000057845154053127761930000017803385842445649033_);}
+	.st18{fill:url(#SVGID_00000156571711195124538550000006687723982713171592_);}
+	.st19{fill:#DF3030;}
+	.st20{fill:url(#SVGID_00000001636660173574603980000008731795684331757470_);}
+	.st21{fill:#17181C;}
+	.st22{fill:url(#SVGID_00000180343933242210086490000003762167186865041053_);}
+	.st23{fill:url(#SVGID_00000015338415700440354440000005681408021599925436_);}
+</style>
+<g>
+	<path class="st0" d="M14.4,29.5c0.1,0,0.1,0,0.2,0c0.1,0,0.2,0,0.2,0H14.4z"/>
+	<path class="st1" d="M15.3,29.5h0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0L15.3,29.5
+		C15.2,29.5,15.3,29.5,15.3,29.5z"/>
+	<path class="st2" d="M15.3,29.5L15.3,29.5l-0.2,0C15.2,29.5,15.2,29.5,15.3,29.5z"/>
+	<path class="st3" d="M15.5,29.5L15.5,29.5L15.5,29.5L15.5,29.5L15.5,29.5z"/>
+	<path class="st0" d="M14.1,29.5c0.1,0,0.1,0,0.2,0H14.1z"/>
+	<path class="st4" d="M13.9,29.5C13.9,29.5,14,29.5,13.9,29.5c0.1,0,0.1,0,0.2,0H13.9z"/>
+	<path class="st5" d="M13.6,29.5C13.6,29.5,13.6,29.5,13.6,29.5c0.1,0,0.1,0,0.1,0H13.6z"/>
+	<path class="st6" d="M13.7,29.5C13.8,29.5,13.8,29.5,13.7,29.5c0.1,0,0.1,0,0.1,0H13.7z"/>
+	<path class="st7" d="M13.3,29.4C13.3,29.4,13.3,29.4,13.3,29.4C13.4,29.4,13.4,29.4,13.3,29.4L13.3,29.4z"/>
+	<path class="st8" d="M13.4,29.5C13.4,29.4,13.5,29.4,13.4,29.5C13.5,29.4,13.5,29.4,13.4,29.5L13.4,29.5z"/>
+	<path class="st8" d="M13.1,29.4C13.1,29.4,13.1,29.4,13.1,29.4C13.1,29.4,13.1,29.4,13.1,29.4L13.1,29.4z"/>
+	<path class="st9" d="M13.2,29.4C13.2,29.4,13.2,29.4,13.2,29.4C13.2,29.4,13.2,29.4,13.2,29.4C13.2,29.4,13.2,29.4,13.2,29.4
+		C13.3,29.4,13.3,29.4,13.2,29.4L13.2,29.4z"/>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="21.8812" y1="-88.078" x2="8.2545" y2="-104.6955" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#020037"/>
+		<stop  offset="1" style="stop-color:#050F62"/>
+	</linearGradient>
+	<path class="st10" d="M15,0.4C11.1,0.4,7.5,2,4.7,4.7C2,7.4,0.5,11.1,0.5,15c0,1.7,0.3,3.4,0.9,5.1c0.3,0,0.5,0,0.8,0
+		c2.9,0,5.8,0.9,8.2,2.6c2.4,1.7,4.2,4.1,5.1,6.9c3.8-0.1,7.4-1.7,10-4.4c2.6-2.7,4.1-6.4,4.1-10.1c0-3.9-1.5-7.6-4.3-10.3
+		C22.6,2,18.9,0.4,15,0.4"/>
+	<path class="st11" d="M20.7,22.5C20.7,22.5,20.7,22.5,20.7,22.5L20.7,22.5c0,0.4,0.1,0.8,0.3,1c0.2,0.2,0.6,0.3,1,0.3c0,0,0,0,0,0
+		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c-0.4,0-0.7,0.1-1,0.3c-0.2,0.2-0.3,0.6-0.3,1c0,0,0,0,0,0c0,0,0,0,0,0
+		c0,0,0,0,0,0c0,0,0,0,0,0h0l0,0c0-0.4-0.1-0.7-0.3-1c-0.2-0.2-0.6-0.3-1-0.3c0,0,0,0,0,0l0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0
+		c0,0,0,0,0,0c0.4,0,0.7-0.1,1-0.3S20.7,22.9,20.7,22.5C20.7,22.5,20.7,22.5,20.7,22.5C20.7,22.5,20.7,22.5,20.7,22.5z"/>
+	<path class="st11" d="M6.9,15.5C6.9,15.5,6.9,15.5,6.9,15.5L6.9,15.5c0,0.4,0.1,0.8,0.3,1c0.2,0.2,0.6,0.3,1,0.3c0,0,0,0,0,0
+		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c-0.4,0-0.7,0.1-1,0.3c-0.2,0.2-0.3,0.6-0.3,1c0,0,0,0,0,0c0,0,0,0,0,0
+		c0,0,0,0,0,0c0,0,0,0,0,0h0l0,0c0-0.4-0.1-0.7-0.3-1c-0.2-0.2-0.6-0.3-1-0.3c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+		c0,0,0,0,0,0c0.4,0,0.7-0.1,1-0.3C6.8,16.2,6.9,15.9,6.9,15.5C6.9,15.5,6.9,15.5,6.9,15.5C6.9,15.5,6.9,15.5,6.9,15.5z"/>
+	<path class="st11" d="M10.6,4.1L10.6,4.1C10.7,4.1,10.7,4.1,10.6,4.1c0,0.3,0.1,0.5,0.3,0.7c0.2,0.2,0.4,0.3,0.7,0.2h0v0l0,0l0,0
+		l0,0l0,0c-0.3,0-0.5,0.1-0.7,0.2c-0.2,0.2-0.3,0.4-0.2,0.7l0,0l0,0l0,0l0,0h0v0c0-0.3-0.1-0.5-0.2-0.7C10.2,5.1,10,5,9.7,5.1h0v0v0
+		h0C10,5,10.2,5,10.4,4.8C10.6,4.6,10.7,4.3,10.6,4.1C10.6,4.1,10.6,4.1,10.6,4.1C10.6,4.1,10.6,4.1,10.6,4.1z"/>
+	<path class="st12" d="M12.8,29.4C12.8,29.4,12.8,29.4,12.8,29.4C12.8,29.4,12.8,29.4,12.8,29.4C12.8,29.4,12.8,29.4,12.8,29.4
+		C12.8,29.4,12.8,29.4,12.8,29.4L12.8,29.4z"/>
+	<path class="st13" d="M13,29.4C13,29.4,13,29.4,13,29.4C13,29.4,13,29.4,13,29.4L13,29.4z"/>
+	<path class="st14" d="M12.9,29.4C12.9,29.4,12.9,29.4,12.9,29.4C12.9,29.4,12.9,29.4,12.9,29.4L12.9,29.4z"/>
+	
+		<linearGradient id="SVGID_00000173122186048074043340000017421439166240502921_" gradientUnits="userSpaceOnUse" x1="19.2457" y1="-89.3156" x2="22.9553" y2="-91.7188" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#E5E5E5"/>
+		<stop  offset="1" style="stop-color:#B7B8C1"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000173122186048074043340000017421439166240502921_);" d="M21.8,1.2c-1.4,0.7-3,1.9-4.4,4.2
+		c-2.5,3.9-3.2,7.4-3.2,7.4L16,14l0.3,0.2l1.9,1.2c0,0,2.9-2,5.4-5.9c1.5-2.3,2-4.3,2-5.8c-0.8-0.1-1.5-0.4-2.2-0.8
+		C22.8,2.5,22.2,1.9,21.8,1.2z"/>
+	
+		<linearGradient id="SVGID_00000127763695479642710240000017533313096818365313_" gradientUnits="userSpaceOnUse" x1="21.2378" y1="-99.9826" x2="19.0472" y2="-97.8815" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#EC4F4F"/>
+		<stop  offset="1" style="stop-color:#A91919"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000127763695479642710240000017533313096818365313_);" d="M20.8,16.8c0.9-1.4,0.3-3.2,0-3.8
+		c-0.7,0.8-1.5,1.5-2.3,2.1c0.1,0.4,0.3,0.8,0.3,1.2c0,0.1,0,0.2-0.1,0.3c-0.4,0.6-0.8,1.3-1.1,2c-0.1,0.1-0.1,0.2-0.1,0.3
+		c-0.1,0.2-0.1,0.3,0,0.5c0,0.3,0.2,0.5,0.3,0.8c0,0,0.1,0.1,0.1,0.1c0.1,0,0.1,0.1,0.2,0.1s0.1,0,0.2-0.1c0.1-0.1,0.3-0.2,0.4-0.4
+		C19.5,19,19.8,18.5,20.8,16.8z"/>
+	
+		<linearGradient id="SVGID_00000060717637781723915790000002744012061535479481_" gradientUnits="userSpaceOnUse" x1="11.3158" y1="-99.2586" x2="14.8122" y2="-101.5237" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#F2A518"/>
+		<stop  offset="1" style="stop-color:#F4E23E"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000060717637781723915790000002744012061535479481_);" d="M15.1,15.7l-1.7-1.1c-2,3.1-3.3,7-2.4,7.5
+		c0.9,0.6,3.9-2.2,5.9-5.3L15.1,15.7z"/>
+	
+		<linearGradient id="SVGID_00000070084874335106853820000008402293642909580433_" gradientUnits="userSpaceOnUse" x1="-4386.2534" y1="747.6443" x2="-4497.9517" y2="769.0099" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#EC4F4F"/>
+		<stop  offset="1" style="stop-color:#A91919"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000070084874335106853820000008402293642909580433_);" d="M15.2,9.5c-0.7-0.1-2.5,0.1-3.4,1.5
+		c-1.1,1.6-1.5,2.1-2,3.2c-0.1,0.2-0.1,0.3-0.2,0.5c0,0.1,0,0.1,0,0.2C9.6,15,9.7,15,9.7,15c0,0,0.1,0,0.2,0.1c0.3,0.1,0.6,0,0.8,0
+		c0.2,0,0.3-0.1,0.4-0.2c0.1-0.1,0.2-0.2,0.3-0.3c0.5-0.6,0.9-1.2,1.3-1.8c0.1-0.1,0.2-0.2,0.3-0.2c0.4-0.1,0.8-0.1,1.2-0.2l0,0
+		C14.5,11.4,14.8,10.4,15.2,9.5z"/>
+	<path class="st19" d="M25,0.6c-0.2-0.1-1.5-0.2-3.2,0.7c0.4,0.7,1,1.2,1.6,1.7c0.7,0.4,1.4,0.7,2.2,0.8C25.7,1.9,25.1,0.7,25,0.6z"
+		/>
+	<path class="st19" d="M18.4,15.5L14,12.7c-0.1,0-0.1,0-0.2,0l-0.9,1.4c0,0.1,0,0.1,0,0.2l4.4,2.8c0.1,0,0.1,0,0.2,0l0.9-1.4
+		C18.4,15.6,18.4,15.6,18.4,15.5z"/>
+	
+		<linearGradient id="SVGID_00000044894753735506851200000013592864944465274029_" gradientUnits="userSpaceOnUse" x1="14.9436" y1="-95.9217" x2="16.3716" y2="-96.8468" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#B71E1E"/>
+		<stop  offset="0.44" style="stop-color:#DF3030"/>
+		<stop  offset="1" style="stop-color:#C51D1D"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000044894753735506851200000013592864944465274029_);" d="M17.8,11.6c-0.4-0.2-2.1,1.6-3.2,3.3
+		c-0.8,1.2-1.4,3-1.1,3.2c0.4,0.2,1.7-1,2.5-2.3C17.1,14.2,18.1,11.9,17.8,11.6z"/>
+	<path class="st21" d="M21.2,8.6c1.3,0,2.3-1,2.3-2.3s-1-2.3-2.3-2.3c-1.3,0-2.3,1-2.3,2.3S20,8.6,21.2,8.6z"/>
+	
+		<linearGradient id="SVGID_00000090987122570624474440000002432161440392897685_" gradientUnits="userSpaceOnUse" x1="20.068" y1="-87.0655" x2="22.3556" y2="-88.5473" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#CED1EC"/>
+		<stop  offset="1" style="stop-color:#FFFFFF"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000090987122570624474440000002432161440392897685_);" d="M21.2,7.7c0.8,0,1.4-0.6,1.4-1.4
+		S22,5,21.2,5c-0.8,0-1.4,0.6-1.4,1.4S20.5,7.7,21.2,7.7z"/>
+	
+		<linearGradient id="SVGID_00000044151119195171880090000016489263670362291109_" gradientUnits="userSpaceOnUse" x1="14.4192" y1="-110.4727" x2="2.0973" y2="-101.7197" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#B7B7BD"/>
+		<stop  offset="0.68" style="stop-color:#EFEFEF"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000044151119195171880090000016489263670362291109_);" d="M2.1,20c-0.3,0-0.5,0-0.8,0
+		c1,2.8,2.9,5.2,5.3,6.9s5.3,2.6,8.3,2.6c0.1,0,0.3,0,0.4,0c-0.9-2.8-2.7-5.2-5.1-6.9C7.9,20.9,5.1,20,2.1,20z"/>
+</g>
+</svg>

From 28c19b891633b0e8e907c697aa6ebbaca37aa91e Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 3 Mar 2025 16:18:39 +0530
Subject: [PATCH 683/796] [mob][photos] filler memories

---
 mobile/lib/models/filler_memory.dart          | 19 +++++
 .../lib/services/smart_memories_service.dart  | 75 ++++++++++++++++---
 .../lib/ui/home/memories/memories_widget.dart | 11 ++-
 3 files changed, 92 insertions(+), 13 deletions(-)
 create mode 100644 mobile/lib/models/filler_memory.dart

diff --git a/mobile/lib/models/filler_memory.dart b/mobile/lib/models/filler_memory.dart
new file mode 100644
index 0000000000..8cfcbea49d
--- /dev/null
+++ b/mobile/lib/models/filler_memory.dart
@@ -0,0 +1,19 @@
+import "package:photos/models/memory.dart";
+import "package:photos/models/smart_memory.dart";
+
+class FillerMemory extends SmartMemory {
+  FillerMemory(
+    List<Memory> memories,
+    String title,
+    int firstDateToShow,
+    int lastDateToShow, {
+    int? firstCreationTime,
+    int? lastCreationTime,
+  }) : super(
+          memories,
+          MemoryType.filler,
+          title,
+          firstDateToShow,
+          lastDateToShow,
+        );
+}
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 88179d4fcb..ff1e0a94f3 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -13,6 +13,7 @@ import "package:photos/l10n/l10n.dart";
 import "package:photos/models/base_location.dart";
 import "package:photos/models/file/extensions/file_props.dart";
 import "package:photos/models/file/file.dart";
+import "package:photos/models/filler_memory.dart";
 import "package:photos/models/local_entity_data.dart";
 import "package:photos/models/location/location.dart";
 import "package:photos/models/location_tag/location_tag.dart";
@@ -49,6 +50,8 @@ class SmartMemoriesService {
   static const _clipSimilarImageThreshold = 0.75;
   static const _clipActivityQueryThreshold = 0.25;
 
+  static const yearsBefore = 30;
+
   SmartMemoriesService();
 
   Future<void> init() async {
@@ -99,11 +102,9 @@ class SmartMemoriesService {
       memories.addAll(timeMemories);
       _logger.finest("All files length: ${allFiles.length}");
 
-      // // Filler memories TODO: lau: add filler results
-      // final fillerMemories = await _getFillerResults(limit);
-      // _deductUsedMemories(allFiles, fillerMemories);
-      // memories.addAll(fillerMemories);
-      // _logger.finest("All files length: ${allFiles.length}");
+      // Filler memories
+      final fillerMemories = await _getFillerResults(allFiles, now);
+      memories.addAll(fillerMemories);
       return memories;
     } catch (e, s) {
       _logger.severe("Error calculating smart memories", e, s);
@@ -394,9 +395,8 @@ class SmartMemoriesService {
               spotlightMem.copyWith(
                 title: secondTitle,
                 firstDateToShow: thisBirthday.microsecondsSinceEpoch,
-                lastDateToShow: thisBirthday
-                    .add(kDayItself)
-                    .microsecondsSinceEpoch,
+                lastDateToShow:
+                    thisBirthday.add(kDayItself).microsecondsSinceEpoch,
               ),
             );
           }
@@ -407,9 +407,8 @@ class SmartMemoriesService {
                 firstDateToShow: thisBirthday
                     .subtract(const Duration(days: 6))
                     .microsecondsSinceEpoch,
-                lastDateToShow: thisBirthday
-                    .add(kDayItself)
-                    .microsecondsSinceEpoch,
+                lastDateToShow:
+                    thisBirthday.add(kDayItself).microsecondsSinceEpoch,
               ),
             );
           }
@@ -1121,6 +1120,60 @@ class SmartMemoriesService {
     return memoryResult;
   }
 
+  Future<List<FillerMemory>> _getFillerResults(
+    Iterable<EnteFile> allFiles,
+    DateTime currentTime,
+  ) async {
+    final List<FillerMemory> memoryResults = [];
+    if (allFiles.isEmpty) return [];
+    final nowInMicroseconds = currentTime.microsecondsSinceEpoch;
+    final windowEnd =
+        currentTime.add(kMemoriesUpdateFrequency).microsecondsSinceEpoch;
+    final currentYear = currentTime.year;
+    final cutOffTime = currentTime.subtract(const Duration(days: 365));
+    final timeTillYearEnd = DateTime(currentYear + 1).difference(currentTime);
+    final bool almostYearEnd = timeTillYearEnd < kMemoriesUpdateFrequency;
+
+    final Map<int, List<Memory>> yearsAgoToMemories = {};
+    for (final file in allFiles) {
+      if (file.creationTime == null ||
+          file.creationTime! > cutOffTime.microsecondsSinceEpoch) {
+        continue;
+      }
+      final fileDate = DateTime.fromMicrosecondsSinceEpoch(file.creationTime!);
+      final fileTimeInYear = fileDate.copyWith(year: currentYear);
+      final diff = fileTimeInYear.difference(currentTime);
+      if (!diff.isNegative && diff < kMemoriesUpdateFrequency) {
+        final yearsAgo = currentYear - fileDate.year;
+        yearsAgoToMemories
+            .putIfAbsent(yearsAgo, () => [])
+            .add(Memory.fromFile(file, _seenTimes));
+      } else if (almostYearEnd) {
+        final altDiff = fileDate.copyWith(year: currentYear + 1).difference(
+              currentTime,
+            );
+        if (!altDiff.isNegative && altDiff < kMemoriesUpdateFrequency) {
+          final yearsAgo = currentYear - fileDate.year + 1;
+          yearsAgoToMemories
+              .putIfAbsent(yearsAgo, () => [])
+              .add(Memory.fromFile(file, _seenTimes));
+        }
+      }
+    }
+    for (var yearAgo = 1; yearAgo <= yearsBefore; yearAgo++) {
+      final memories = yearsAgoToMemories[yearAgo];
+      if (memories == null) continue;
+      final fillerMemory = FillerMemory(
+        memories,
+        "TEST",
+        nowInMicroseconds,
+        windowEnd,
+      );
+      memoryResults.add(fillerMemory);
+    }
+    return memoryResults;
+  }
+
   /// TODO: lau: replace this by just taking next 7 days
   int _getWeekNumber(DateTime date) {
     // Get day of year (1-366)
diff --git a/mobile/lib/ui/home/memories/memories_widget.dart b/mobile/lib/ui/home/memories/memories_widget.dart
index 002a899245..de4f9fbbc8 100644
--- a/mobile/lib/ui/home/memories/memories_widget.dart
+++ b/mobile/lib/ui/home/memories/memories_widget.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import "package:flutter_animate/flutter_animate.dart";
 import "package:photos/core/event_bus.dart";
 import "package:photos/events/memories_setting_changed.dart";
+import "package:photos/models/filler_memory.dart";
 import 'package:photos/models/memory.dart';
 import "package:photos/models/smart_memory.dart";
 import "package:photos/service_locator.dart";
@@ -128,8 +129,14 @@ class _MemoriesWidgetState extends State<MemoriesWidget> {
   }
 
   Widget _buildSmartMemories(List<SmartMemory> memories) {
-    final collatedMemories =
-        memories.map((e) => (e.memories, e.title)).toList();
+    final List<(List<Memory>, String?)> collatedMemories = [];
+    for (final memory in memories) {
+      if (memory is FillerMemory) {
+        collatedMemories.add((memory.memories, null));
+      } else {
+        collatedMemories.add((memory.memories, memory.title));
+      }
+    }
 
     return SizedBox(
       height: _maxHeight + MemoryCoverWidget.outerStrokeWidth * 2,

From 3bf715fd462f3dc5d3fb2ed25a078ce113250651 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 3 Mar 2025 17:00:50 +0530
Subject: [PATCH 684/796] [mob] Move

---
 mobile/lib/services/files_service.dart        | 35 ++++++++++++++++++
 mobile/lib/services/sync_service.dart         | 37 -------------------
 .../settings/backup/free_space_options.dart   |  4 +-
 .../gallery/gallery_app_bar_widget.dart       |  4 +-
 4 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/mobile/lib/services/files_service.dart b/mobile/lib/services/files_service.dart
index a72db91a9e..36cfe7d50d 100644
--- a/mobile/lib/services/files_service.dart
+++ b/mobile/lib/services/files_service.dart
@@ -5,9 +5,11 @@ import 'package:logging/logging.dart';
 import 'package:path/path.dart';
 import 'package:photos/core/configuration.dart';
 import 'package:photos/core/network/network.dart';
+import "package:photos/db/device_files_db.dart";
 import 'package:photos/db/files_db.dart';
 import 'package:photos/extensions/list.dart';
 import "package:photos/generated/l10n.dart";
+import "package:photos/models/backup_status.dart";
 import 'package:photos/models/file/file.dart';
 import "package:photos/models/file_load_result.dart";
 import "package:photos/models/metadata/file_magic.dart";
@@ -71,6 +73,39 @@ class FilesService {
     }
   }
 
+  Future<BackupStatus> getBackupStatus({String? pathID}) async {
+    BackedUpFileIDs ids;
+    final bool hasMigratedSize = await FilesService.instance.hasMigratedSizes();
+    if (pathID == null) {
+      ids = await FilesDB.instance.getBackedUpIDs();
+    } else {
+      ids = await FilesDB.instance.getBackedUpForDeviceCollection(
+        pathID,
+        Configuration.instance.getUserID()!,
+      );
+    }
+    late int size;
+    if (hasMigratedSize) {
+      size = ids.localSize;
+    } else {
+      size = await _getFileSize(ids.uploadedIDs);
+    }
+    return BackupStatus(ids.localIDs, size);
+  }
+
+  Future<int> _getFileSize(List<int> fileIDs) async {
+    try {
+      final response = await _enteDio.post(
+        "/files/size",
+        data: {"fileIDs": fileIDs},
+      );
+      return response.data["size"];
+    } catch (e) {
+      _logger.severe(e);
+      rethrow;
+    }
+  }
+
   Future<Map<int, int>> getFilesSizeFromInfo(List<int> uploadedFileID) async {
     try {
       final response = await _enteDio.post(
diff --git a/mobile/lib/services/sync_service.dart b/mobile/lib/services/sync_service.dart
index f015c9a82c..66291e02d1 100644
--- a/mobile/lib/services/sync_service.dart
+++ b/mobile/lib/services/sync_service.dart
@@ -10,16 +10,12 @@ import 'package:photos/core/constants.dart';
 import 'package:photos/core/errors.dart';
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/core/network/network.dart';
-import 'package:photos/db/device_files_db.dart';
-import 'package:photos/db/files_db.dart';
 import 'package:photos/events/permission_granted_event.dart';
 import 'package:photos/events/subscription_purchased_event.dart';
 import 'package:photos/events/sync_status_update_event.dart';
 import 'package:photos/events/trigger_logout_event.dart';
-import 'package:photos/models/backup_status.dart';
 import 'package:photos/models/file/file_type.dart';
 import "package:photos/services/filedata/filedata_service.dart";
-import "package:photos/services/files_service.dart";
 import 'package:photos/services/local_sync_service.dart';
 import 'package:photos/services/notification_service.dart';
 import 'package:photos/services/remote_sync_service.dart';
@@ -202,39 +198,6 @@ class SyncService {
     );
   }
 
-  Future<BackupStatus> getBackupStatus({String? pathID}) async {
-    BackedUpFileIDs ids;
-    final bool hasMigratedSize = await FilesService.instance.hasMigratedSizes();
-    if (pathID == null) {
-      ids = await FilesDB.instance.getBackedUpIDs();
-    } else {
-      ids = await FilesDB.instance.getBackedUpForDeviceCollection(
-        pathID,
-        Configuration.instance.getUserID()!,
-      );
-    }
-    late int size;
-    if (hasMigratedSize) {
-      size = ids.localSize;
-    } else {
-      size = await _getFileSize(ids.uploadedIDs);
-    }
-    return BackupStatus(ids.localIDs, size);
-  }
-
-  Future<int> _getFileSize(List<int> fileIDs) async {
-    try {
-      final response = await _enteDio.post(
-        "/files/size",
-        data: {"fileIDs": fileIDs},
-      );
-      return response.data["size"];
-    } catch (e) {
-      _logger.severe(e);
-      rethrow;
-    }
-  }
-
   Future<void> _doSync() async {
     await _localSyncService.sync();
     if (_localSyncService.hasCompletedFirstImport()) {
diff --git a/mobile/lib/ui/settings/backup/free_space_options.dart b/mobile/lib/ui/settings/backup/free_space_options.dart
index 09879f4ebf..c285bf507e 100644
--- a/mobile/lib/ui/settings/backup/free_space_options.dart
+++ b/mobile/lib/ui/settings/backup/free_space_options.dart
@@ -7,7 +7,7 @@ import "package:photos/models/backup_status.dart";
 import "package:photos/models/duplicate_files.dart";
 import "package:photos/service_locator.dart";
 import "package:photos/services/deduplication_service.dart";
-import "package:photos/services/sync_service.dart";
+import "package:photos/services/files_service.dart";
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
 import 'package:photos/ui/components/buttons/icon_button_widget.dart';
@@ -93,7 +93,7 @@ class _FreeUpSpaceOptionsScreenState extends State<FreeUpSpaceOptionsScreen> {
                                   onTap: () async {
                                     BackupStatus status;
                                     try {
-                                      status = await SyncService.instance
+                                      status = await FilesService.instance
                                           .getBackupStatus();
                                     } catch (e) {
                                       await showGenericErrorDialog(
diff --git a/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart b/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
index 34c3c04b77..941af3965b 100644
--- a/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
+++ b/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
@@ -26,7 +26,7 @@ import "package:photos/models/metadata/common_keys.dart";
 import 'package:photos/models/selected_files.dart';
 import 'package:photos/service_locator.dart';
 import 'package:photos/services/collections_service.dart';
-import 'package:photos/services/sync_service.dart';
+import "package:photos/services/files_service.dart";
 import "package:photos/states/location_screen_state.dart";
 import "package:photos/theme/colors.dart";
 import 'package:photos/ui/actions/collection/collection_sharing_actions.dart';
@@ -296,7 +296,7 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
     await dialog.show();
     BackupStatus status;
     try {
-      status = await SyncService.instance
+      status = await FilesService.instance
           .getBackupStatus(pathID: widget.deviceCollection!.id);
     } catch (e) {
       await dialog.hide();

From f2550bb2530e1e4adb3c25148271203c15b657e5 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 3 Mar 2025 17:04:45 +0530
Subject: [PATCH 685/796] move constant

---
 mobile/lib/core/constants.dart           | 2 ++
 mobile/lib/utils/file_uploader_util.dart | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/core/constants.dart b/mobile/lib/core/constants.dart
index f55c3344ed..58f1fb6963 100644
--- a/mobile/lib/core/constants.dart
+++ b/mobile/lib/core/constants.dart
@@ -113,3 +113,5 @@ final tempDirCleanUpInterval = kDebugMode
 
 const kFilterChipHeight = 32.0;
 const kMaxAppbarFilters = 14;
+
+const kLivePhotoHashSeparator = ':';
diff --git a/mobile/lib/utils/file_uploader_util.dart b/mobile/lib/utils/file_uploader_util.dart
index 07c3084b20..5ca93defe0 100644
--- a/mobile/lib/utils/file_uploader_util.dart
+++ b/mobile/lib/utils/file_uploader_util.dart
@@ -31,7 +31,6 @@ import 'package:video_thumbnail/video_thumbnail.dart';
 
 final _logger = Logger("FileUtil");
 const kMaximumThumbnailCompressionAttempts = 2;
-const kLivePhotoHashSeparator = ':';
 
 class MediaUploadData {
   final File? sourceFile;

From be6ca79c2da579b51a499faeb24ccc1f861bb7b9 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 3 Mar 2025 17:21:31 +0530
Subject: [PATCH 686/796] move

---
 mobile/lib/emergency/emergency_service.dart                | 2 +-
 mobile/lib/emergency/select_contact_page.dart              | 2 +-
 mobile/lib/main.dart                                       | 2 +-
 mobile/lib/service_locator.dart                            | 2 +-
 mobile/lib/services/{ => account}/billing_service.dart     | 2 +-
 mobile/lib/services/{ => account}/passkey_service.dart     | 0
 mobile/lib/services/{ => account}/user_service.dart        | 0
 mobile/lib/services/search_service.dart                    | 2 +-
 mobile/lib/services/sync_service.dart                      | 2 --
 mobile/lib/states/user_details_state.dart                  | 2 +-
 mobile/lib/ui/account/change_email_dialog.dart             | 2 +-
 mobile/lib/ui/account/delete_account_page.dart             | 2 +-
 mobile/lib/ui/account/email_entry_page.dart                | 2 +-
 mobile/lib/ui/account/login_page.dart                      | 2 +-
 mobile/lib/ui/account/login_pwd_verification_page.dart     | 2 +-
 mobile/lib/ui/account/ott_verification_page.dart           | 2 +-
 mobile/lib/ui/account/passkey_page.dart                    | 2 +-
 mobile/lib/ui/account/password_entry_page.dart             | 2 +-
 mobile/lib/ui/account/password_reentry_page.dart           | 2 +-
 mobile/lib/ui/account/sessions_page.dart                   | 2 +-
 mobile/lib/ui/account/two_factor_authentication_page.dart  | 2 +-
 mobile/lib/ui/account/two_factor_recovery_page.dart        | 2 +-
 mobile/lib/ui/account/two_factor_setup_page.dart           | 2 +-
 mobile/lib/ui/account/verify_recovery_page.dart            | 2 +-
 .../ui/actions/collection/collection_sharing_actions.dart  | 2 +-
 mobile/lib/ui/growth/referral_screen.dart                  | 2 +-
 mobile/lib/ui/payment/child_subscription_widget.dart       | 2 +-
 mobile/lib/ui/payment/payment_web_page.dart                | 4 ++--
 mobile/lib/ui/payment/store_subscription_page.dart         | 2 +-
 mobile/lib/ui/payment/stripe_subscription_page.dart        | 7 ++++---
 mobile/lib/ui/settings/account_section_widget.dart         | 2 +-
 mobile/lib/ui/settings/general_section_widget.dart         | 2 +-
 mobile/lib/ui/settings/security_section_widget.dart        | 4 ++--
 mobile/lib/ui/sharing/add_participant_page.dart            | 2 +-
 mobile/lib/ui/sharing/verify_identity_dialog.dart          | 2 +-
 mobile/lib/ui/tabs/home_widget.dart                        | 2 +-
 mobile/lib/ui/tools/lock_screen.dart                       | 2 +-
 mobile/lib/ui/viewer/people/link_email_screen.dart         | 2 +-
 mobile/lib/ui/viewer/people/save_or_edit_person.dart       | 2 +-
 mobile/lib/utils/file_uploader.dart                        | 2 +-
 40 files changed, 42 insertions(+), 43 deletions(-)
 rename mobile/lib/services/{ => account}/billing_service.dart (98%)
 rename mobile/lib/services/{ => account}/passkey_service.dart (100%)
 rename mobile/lib/services/{ => account}/user_service.dart (100%)

diff --git a/mobile/lib/emergency/emergency_service.dart b/mobile/lib/emergency/emergency_service.dart
index 537adaf513..1afb01adc5 100644
--- a/mobile/lib/emergency/emergency_service.dart
+++ b/mobile/lib/emergency/emergency_service.dart
@@ -13,7 +13,7 @@ import "package:photos/generated/l10n.dart";
 import "package:photos/models/api/user/key_attributes.dart";
 import "package:photos/models/api/user/set_keys_request.dart";
 import "package:photos/models/api/user/srp.dart";
-import "package:photos/services/user_service.dart";
+import "package:photos/services/account/user_service.dart";
 import "package:photos/ui/common/user_dialogs.dart";
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/email_util.dart";
diff --git a/mobile/lib/emergency/select_contact_page.dart b/mobile/lib/emergency/select_contact_page.dart
index a61828f3b1..5253d01f52 100644
--- a/mobile/lib/emergency/select_contact_page.dart
+++ b/mobile/lib/emergency/select_contact_page.dart
@@ -6,8 +6,8 @@ import "package:photos/emergency/emergency_service.dart";
 import "package:photos/emergency/model.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/models/api/collection/user.dart";
+import "package:photos/services/account/user_service.dart";
 import 'package:photos/services/collections_service.dart';
-import "package:photos/services/user_service.dart";
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/actions/collection/collection_sharing_actions.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index b2e00dfbdf..ad85fab533 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -28,6 +28,7 @@ import 'package:photos/ente_theme_data.dart';
 import "package:photos/extensions/stop_watch.dart";
 import "package:photos/l10n/l10n.dart";
 import "package:photos/service_locator.dart";
+import "package:photos/services/account/user_service.dart";
 import 'package:photos/services/app_lifecycle_service.dart';
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/favorites_service.dart';
@@ -45,7 +46,6 @@ import 'package:photos/services/push_service.dart';
 import 'package:photos/services/remote_sync_service.dart';
 import 'package:photos/services/search_service.dart';
 import "package:photos/services/sync_service.dart";
-import "package:photos/services/user_service.dart";
 import 'package:photos/ui/tools/app_lock.dart';
 import 'package:photos/ui/tools/lock_screen.dart';
 import "package:photos/utils/email_util.dart";
diff --git a/mobile/lib/service_locator.dart b/mobile/lib/service_locator.dart
index f056258598..075c642602 100644
--- a/mobile/lib/service_locator.dart
+++ b/mobile/lib/service_locator.dart
@@ -4,7 +4,7 @@ import "package:ente_cast_normal/ente_cast_normal.dart";
 import "package:ente_feature_flag/ente_feature_flag.dart";
 import "package:package_info_plus/package_info_plus.dart";
 import "package:photos/gateways/entity_gw.dart";
-import "package:photos/services/billing_service.dart";
+import "package:photos/services/account/billing_service.dart";
 import "package:photos/services/entity_service.dart";
 import "package:photos/services/location_service.dart";
 import "package:photos/services/machine_learning/face_ml/face_recognition_service.dart";
diff --git a/mobile/lib/services/billing_service.dart b/mobile/lib/services/account/billing_service.dart
similarity index 98%
rename from mobile/lib/services/billing_service.dart
rename to mobile/lib/services/account/billing_service.dart
index 7da0976c8f..3b2c825544 100644
--- a/mobile/lib/services/billing_service.dart
+++ b/mobile/lib/services/account/billing_service.dart
@@ -11,7 +11,7 @@ import "package:photos/generated/l10n.dart";
 import 'package:photos/models/api/billing/billing_plan.dart';
 import 'package:photos/models/api/billing/subscription.dart';
 import 'package:photos/models/user_details.dart';
-import 'package:photos/services/user_service.dart';
+import 'package:photos/services/account/user_service.dart';
 import 'package:photos/ui/common/web_page.dart';
 import 'package:photos/utils/dialog_util.dart';
 
diff --git a/mobile/lib/services/passkey_service.dart b/mobile/lib/services/account/passkey_service.dart
similarity index 100%
rename from mobile/lib/services/passkey_service.dart
rename to mobile/lib/services/account/passkey_service.dart
diff --git a/mobile/lib/services/user_service.dart b/mobile/lib/services/account/user_service.dart
similarity index 100%
rename from mobile/lib/services/user_service.dart
rename to mobile/lib/services/account/user_service.dart
diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 8274db3b0a..94cce83bd2 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -38,6 +38,7 @@ import "package:photos/models/search/search_constants.dart";
 import "package:photos/models/search/search_types.dart";
 import "package:photos/models/trip_memory.dart";
 import "package:photos/service_locator.dart";
+import "package:photos/services/account/user_service.dart";
 import 'package:photos/services/collections_service.dart';
 import "package:photos/services/filter/db_filters.dart";
 import "package:photos/services/location_service.dart";
@@ -45,7 +46,6 @@ import "package:photos/services/machine_learning/face_ml/face_filtering/face_fil
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
 import "package:photos/services/machine_learning/ml_computer.dart";
 import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';
-import "package:photos/services/user_service.dart";
 import "package:photos/states/location_screen_state.dart";
 import "package:photos/ui/viewer/location/add_location_sheet.dart";
 import "package:photos/ui/viewer/location/location_screen.dart";
diff --git a/mobile/lib/services/sync_service.dart b/mobile/lib/services/sync_service.dart
index 66291e02d1..551f78405c 100644
--- a/mobile/lib/services/sync_service.dart
+++ b/mobile/lib/services/sync_service.dart
@@ -9,7 +9,6 @@ import 'package:photos/core/configuration.dart';
 import 'package:photos/core/constants.dart';
 import 'package:photos/core/errors.dart';
 import 'package:photos/core/event_bus.dart';
-import 'package:photos/core/network/network.dart';
 import 'package:photos/events/permission_granted_event.dart';
 import 'package:photos/events/subscription_purchased_event.dart';
 import 'package:photos/events/sync_status_update_event.dart';
@@ -26,7 +25,6 @@ class SyncService {
   final _logger = Logger("SyncService");
   final _localSyncService = LocalSyncService.instance;
   final _remoteSyncService = RemoteSyncService.instance;
-  final _enteDio = NetworkClient.instance.enteDio;
   final _uploader = FileUploader.instance;
   bool _syncStopRequested = false;
   Completer<bool>? _existingSync;
diff --git a/mobile/lib/states/user_details_state.dart b/mobile/lib/states/user_details_state.dart
index 842d8bfad6..5c366b3fef 100644
--- a/mobile/lib/states/user_details_state.dart
+++ b/mobile/lib/states/user_details_state.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/events/opened_settings_event.dart';
 import 'package:photos/models/user_details.dart';
-import 'package:photos/services/user_service.dart';
+import 'package:photos/services/account/user_service.dart';
 
 class UserDetailsStateWidget extends StatefulWidget {
   final Widget child;
diff --git a/mobile/lib/ui/account/change_email_dialog.dart b/mobile/lib/ui/account/change_email_dialog.dart
index 4b888760d1..3f0c83d9c1 100644
--- a/mobile/lib/ui/account/change_email_dialog.dart
+++ b/mobile/lib/ui/account/change_email_dialog.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import "package:photos/l10n/l10n.dart";
-import 'package:photos/services/user_service.dart';
+import 'package:photos/services/account/user_service.dart';
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/email_util.dart';
 
diff --git a/mobile/lib/ui/account/delete_account_page.dart b/mobile/lib/ui/account/delete_account_page.dart
index 7a433829b6..7fed66a104 100644
--- a/mobile/lib/ui/account/delete_account_page.dart
+++ b/mobile/lib/ui/account/delete_account_page.dart
@@ -8,7 +8,7 @@ import "package:logging/logging.dart";
 import 'package:photos/core/configuration.dart';
 import "package:photos/generated/l10n.dart";
 import 'package:photos/models/api/user/delete_account.dart';
-import 'package:photos/services/user_service.dart';
+import 'package:photos/services/account/user_service.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
 import 'package:photos/ui/components/models/button_type.dart';
diff --git a/mobile/lib/ui/account/email_entry_page.dart b/mobile/lib/ui/account/email_entry_page.dart
index 262bd0fc6c..26cf44c53f 100644
--- a/mobile/lib/ui/account/email_entry_page.dart
+++ b/mobile/lib/ui/account/email_entry_page.dart
@@ -5,7 +5,7 @@ import 'package:password_strength/password_strength.dart';
 import 'package:photos/core/configuration.dart';
 import 'package:photos/ente_theme_data.dart';
 import "package:photos/generated/l10n.dart";
-import 'package:photos/services/user_service.dart';
+import 'package:photos/services/account/user_service.dart';
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/common/dynamic_fab.dart';
 import 'package:photos/ui/common/web_page.dart';
diff --git a/mobile/lib/ui/account/login_page.dart b/mobile/lib/ui/account/login_page.dart
index 6b960aa9e3..dd3e5cc92c 100644
--- a/mobile/lib/ui/account/login_page.dart
+++ b/mobile/lib/ui/account/login_page.dart
@@ -7,7 +7,7 @@ import "package:photos/core/errors.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/l10n/l10n.dart";
 import "package:photos/models/api/user/srp.dart";
-import 'package:photos/services/user_service.dart';
+import 'package:photos/services/account/user_service.dart';
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/account/login_pwd_verification_page.dart";
 import 'package:photos/ui/common/dynamic_fab.dart';
diff --git a/mobile/lib/ui/account/login_pwd_verification_page.dart b/mobile/lib/ui/account/login_pwd_verification_page.dart
index c919b19018..1969a033f3 100644
--- a/mobile/lib/ui/account/login_pwd_verification_page.dart
+++ b/mobile/lib/ui/account/login_pwd_verification_page.dart
@@ -6,7 +6,7 @@ import "package:logging/logging.dart";
 import 'package:photos/core/configuration.dart';
 import "package:photos/generated/l10n.dart";
 import "package:photos/models/api/user/srp.dart";
-import "package:photos/services/user_service.dart";
+import "package:photos/services/account/user_service.dart";
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/common/dynamic_fab.dart';
 import "package:photos/ui/components/buttons/button_widget.dart";
diff --git a/mobile/lib/ui/account/ott_verification_page.dart b/mobile/lib/ui/account/ott_verification_page.dart
index f411bd09d3..cca13d1da0 100644
--- a/mobile/lib/ui/account/ott_verification_page.dart
+++ b/mobile/lib/ui/account/ott_verification_page.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:photos/ente_theme_data.dart';
 import "package:photos/generated/l10n.dart";
-import 'package:photos/services/user_service.dart';
+import 'package:photos/services/account/user_service.dart';
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/common/dynamic_fab.dart';
 import 'package:step_progress_indicator/step_progress_indicator.dart';
diff --git a/mobile/lib/ui/account/passkey_page.dart b/mobile/lib/ui/account/passkey_page.dart
index 11ca53adea..39b3fd341c 100644
--- a/mobile/lib/ui/account/passkey_page.dart
+++ b/mobile/lib/ui/account/passkey_page.dart
@@ -8,7 +8,7 @@ import "package:photos/core/errors.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/l10n/l10n.dart";
 import "package:photos/models/account/two_factor.dart";
-import 'package:photos/services/user_service.dart';
+import 'package:photos/services/account/user_service.dart';
 import "package:photos/ui/account/two_factor_authentication_page.dart";
 import "package:photos/ui/components/buttons/button_widget.dart";
 import "package:photos/ui/components/models/button_type.dart";
diff --git a/mobile/lib/ui/account/password_entry_page.dart b/mobile/lib/ui/account/password_entry_page.dart
index 60de6c6899..37a358ae0b 100644
--- a/mobile/lib/ui/account/password_entry_page.dart
+++ b/mobile/lib/ui/account/password_entry_page.dart
@@ -11,7 +11,7 @@ import 'package:photos/events/subscription_purchased_event.dart';
 import "package:photos/generated/l10n.dart";
 import "package:photos/l10n/l10n.dart";
 import "package:photos/models/api/user/key_gen_result.dart";
-import 'package:photos/services/user_service.dart';
+import 'package:photos/services/account/user_service.dart';
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/account/recovery_key_page.dart';
 import 'package:photos/ui/common/dynamic_fab.dart';
diff --git a/mobile/lib/ui/account/password_reentry_page.dart b/mobile/lib/ui/account/password_reentry_page.dart
index 8597ba1d45..f54b82c832 100644
--- a/mobile/lib/ui/account/password_reentry_page.dart
+++ b/mobile/lib/ui/account/password_reentry_page.dart
@@ -9,7 +9,7 @@ import 'package:photos/core/errors.dart';
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/events/subscription_purchased_event.dart';
 import "package:photos/generated/l10n.dart";
-import "package:photos/services/user_service.dart";
+import "package:photos/services/account/user_service.dart";
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/account/recovery_page.dart';
 import 'package:photos/ui/common/dynamic_fab.dart';
diff --git a/mobile/lib/ui/account/sessions_page.dart b/mobile/lib/ui/account/sessions_page.dart
index 5de4bf1002..da69faee96 100644
--- a/mobile/lib/ui/account/sessions_page.dart
+++ b/mobile/lib/ui/account/sessions_page.dart
@@ -4,7 +4,7 @@ import 'package:photos/core/configuration.dart';
 import 'package:photos/ente_theme_data.dart';
 import "package:photos/generated/l10n.dart";
 import 'package:photos/models/api/user/sessions.dart';
-import 'package:photos/services/user_service.dart';
+import 'package:photos/services/account/user_service.dart';
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/common/loading_widget.dart';
 import "package:photos/utils/date_time_util.dart";
diff --git a/mobile/lib/ui/account/two_factor_authentication_page.dart b/mobile/lib/ui/account/two_factor_authentication_page.dart
index 84ab13a37a..bb9b0d9361 100644
--- a/mobile/lib/ui/account/two_factor_authentication_page.dart
+++ b/mobile/lib/ui/account/two_factor_authentication_page.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import "package:photos/generated/l10n.dart";
 import "package:photos/models/account/two_factor.dart";
-import 'package:photos/services/user_service.dart';
+import 'package:photos/services/account/user_service.dart';
 import 'package:photos/ui/lifecycle_event_handler.dart';
 import "package:pinput/pinput.dart";
 
diff --git a/mobile/lib/ui/account/two_factor_recovery_page.dart b/mobile/lib/ui/account/two_factor_recovery_page.dart
index 6274024b9c..8beea1da75 100644
--- a/mobile/lib/ui/account/two_factor_recovery_page.dart
+++ b/mobile/lib/ui/account/two_factor_recovery_page.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import "package:photos/generated/l10n.dart";
 import "package:photos/models/account/two_factor.dart";
-import 'package:photos/services/user_service.dart';
+import 'package:photos/services/account/user_service.dart';
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/utils/dialog_util.dart';
 
diff --git a/mobile/lib/ui/account/two_factor_setup_page.dart b/mobile/lib/ui/account/two_factor_setup_page.dart
index c9db107deb..3cd4082dbc 100644
--- a/mobile/lib/ui/account/two_factor_setup_page.dart
+++ b/mobile/lib/ui/account/two_factor_setup_page.dart
@@ -6,7 +6,7 @@ import 'package:flutter/services.dart';
 import 'package:photos/core/configuration.dart';
 import 'package:photos/ente_theme_data.dart';
 import "package:photos/generated/l10n.dart";
-import 'package:photos/services/user_service.dart';
+import 'package:photos/services/account/user_service.dart';
 import 'package:photos/ui/account/recovery_key_page.dart';
 import 'package:photos/ui/lifecycle_event_handler.dart';
 import 'package:photos/utils/navigation_util.dart';
diff --git a/mobile/lib/ui/account/verify_recovery_page.dart b/mobile/lib/ui/account/verify_recovery_page.dart
index 94a289089b..47bf0b150c 100644
--- a/mobile/lib/ui/account/verify_recovery_page.dart
+++ b/mobile/lib/ui/account/verify_recovery_page.dart
@@ -8,8 +8,8 @@ import 'package:photos/ente_theme_data.dart';
 import 'package:photos/events/notification_event.dart';
 import "package:photos/generated/l10n.dart";
 import "package:photos/service_locator.dart";
+import 'package:photos/services/account/user_service.dart';
 import 'package:photos/services/local_authentication_service.dart';
-import 'package:photos/services/user_service.dart';
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/account/recovery_key_page.dart';
 import 'package:photos/ui/common/gradient_button.dart';
diff --git a/mobile/lib/ui/actions/collection/collection_sharing_actions.dart b/mobile/lib/ui/actions/collection/collection_sharing_actions.dart
index 1cf642dff0..b7cc2350c3 100644
--- a/mobile/lib/ui/actions/collection/collection_sharing_actions.dart
+++ b/mobile/lib/ui/actions/collection/collection_sharing_actions.dart
@@ -14,9 +14,9 @@ import 'package:photos/models/file/file.dart';
 import 'package:photos/models/files_split.dart';
 import "package:photos/models/metadata/collection_magic.dart";
 import "package:photos/models/metadata/common_keys.dart";
+import 'package:photos/services/account/user_service.dart';
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/hidden_service.dart';
-import 'package:photos/services/user_service.dart';
 import 'package:photos/theme/colors.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/common/progress_dialog.dart';
diff --git a/mobile/lib/ui/growth/referral_screen.dart b/mobile/lib/ui/growth/referral_screen.dart
index 6a913415bd..426bb3e015 100644
--- a/mobile/lib/ui/growth/referral_screen.dart
+++ b/mobile/lib/ui/growth/referral_screen.dart
@@ -3,7 +3,7 @@ import "package:photos/generated/l10n.dart";
 import "package:photos/models/api/storage_bonus/storage_bonus.dart";
 import "package:photos/models/user_details.dart";
 import "package:photos/service_locator.dart";
-import "package:photos/services/user_service.dart";
+import "package:photos/services/account/user_service.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/common/loading_widget.dart";
 import "package:photos/ui/common/web_page.dart";
diff --git a/mobile/lib/ui/payment/child_subscription_widget.dart b/mobile/lib/ui/payment/child_subscription_widget.dart
index 2fb6353ec1..a4c95be321 100644
--- a/mobile/lib/ui/payment/child_subscription_widget.dart
+++ b/mobile/lib/ui/payment/child_subscription_widget.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
 import "package:photos/generated/l10n.dart";
 import 'package:photos/models/user_details.dart';
-import 'package:photos/services/user_service.dart';
+import 'package:photos/services/account/user_service.dart';
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/components/buttons/button_widget.dart';
 import 'package:photos/utils/dialog_util.dart';
diff --git a/mobile/lib/ui/payment/payment_web_page.dart b/mobile/lib/ui/payment/payment_web_page.dart
index aa1b50a499..a19536a59d 100644
--- a/mobile/lib/ui/payment/payment_web_page.dart
+++ b/mobile/lib/ui/payment/payment_web_page.dart
@@ -10,8 +10,8 @@ import 'package:photos/ente_theme_data.dart';
 import "package:photos/generated/l10n.dart";
 import 'package:photos/models/api/billing/subscription.dart';
 import "package:photos/service_locator.dart";
-import 'package:photos/services/billing_service.dart';
-import 'package:photos/services/user_service.dart';
+import 'package:photos/services/account/billing_service.dart';
+import 'package:photos/services/account/user_service.dart';
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/utils/dialog_util.dart';
 import "package:photos/utils/email_util.dart";
diff --git a/mobile/lib/ui/payment/store_subscription_page.dart b/mobile/lib/ui/payment/store_subscription_page.dart
index 709ee632ef..ab0854ef89 100644
--- a/mobile/lib/ui/payment/store_subscription_page.dart
+++ b/mobile/lib/ui/payment/store_subscription_page.dart
@@ -13,7 +13,7 @@ import 'package:photos/models/api/billing/billing_plan.dart';
 import 'package:photos/models/api/billing/subscription.dart';
 import 'package:photos/models/user_details.dart';
 import "package:photos/service_locator.dart";
-import 'package:photos/services/user_service.dart';
+import 'package:photos/services/account/user_service.dart';
 import "package:photos/theme/colors.dart";
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/common/loading_widget.dart';
diff --git a/mobile/lib/ui/payment/stripe_subscription_page.dart b/mobile/lib/ui/payment/stripe_subscription_page.dart
index c6229fab07..ba04d24908 100644
--- a/mobile/lib/ui/payment/stripe_subscription_page.dart
+++ b/mobile/lib/ui/payment/stripe_subscription_page.dart
@@ -10,7 +10,7 @@ import 'package:photos/models/api/billing/billing_plan.dart';
 import 'package:photos/models/api/billing/subscription.dart';
 import 'package:photos/models/user_details.dart';
 import "package:photos/service_locator.dart";
-import 'package:photos/services/user_service.dart';
+import 'package:photos/services/account/user_service.dart';
 import "package:photos/theme/colors.dart";
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/common/loading_widget.dart';
@@ -164,8 +164,9 @@ class _StripeSubscriptionPageState extends State<StripeSubscriptionPage> {
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 TitleBarTitleWidget(
-                  title:
-                      widget.isOnboarding ? S.of(context).selectYourPlan : S.of(context).subscription,
+                  title: widget.isOnboarding
+                      ? S.of(context).selectYourPlan
+                      : S.of(context).subscription,
                 ),
                 _isFreePlanUser() || !_hasLoadedData
                     ? const SizedBox.shrink()
diff --git a/mobile/lib/ui/settings/account_section_widget.dart b/mobile/lib/ui/settings/account_section_widget.dart
index 5783598f5b..a137349639 100644
--- a/mobile/lib/ui/settings/account_section_widget.dart
+++ b/mobile/lib/ui/settings/account_section_widget.dart
@@ -5,8 +5,8 @@ import "package:flutter/foundation.dart";
 import 'package:flutter/material.dart';
 import "package:photos/emergency/emergency_page.dart";
 import "package:photos/generated/l10n.dart";
+import 'package:photos/services/account/user_service.dart';
 import 'package:photos/services/local_authentication_service.dart';
-import 'package:photos/services/user_service.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/account/change_email_dialog.dart';
 import 'package:photos/ui/account/delete_account_page.dart';
diff --git a/mobile/lib/ui/settings/general_section_widget.dart b/mobile/lib/ui/settings/general_section_widget.dart
index d42d280244..b5f7e35ad3 100644
--- a/mobile/lib/ui/settings/general_section_widget.dart
+++ b/mobile/lib/ui/settings/general_section_widget.dart
@@ -5,7 +5,7 @@ import "package:photos/app.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/l10n/l10n.dart";
 import "package:photos/service_locator.dart";
-import 'package:photos/services/user_service.dart';
+import 'package:photos/services/account/user_service.dart';
 import 'package:photos/theme/ente_theme.dart';
 import "package:photos/ui/components/captioned_text_widget.dart";
 import "package:photos/ui/components/expandable_menu_item_widget.dart";
diff --git a/mobile/lib/ui/settings/security_section_widget.dart b/mobile/lib/ui/settings/security_section_widget.dart
index c136018acb..7e3e88dd9c 100644
--- a/mobile/lib/ui/settings/security_section_widget.dart
+++ b/mobile/lib/ui/settings/security_section_widget.dart
@@ -12,9 +12,9 @@ import 'package:photos/events/two_factor_status_change_event.dart';
 import "package:photos/generated/l10n.dart";
 import "package:photos/l10n/l10n.dart";
 import "package:photos/models/user_details.dart";
+import "package:photos/services/account/passkey_service.dart";
+import 'package:photos/services/account/user_service.dart';
 import 'package:photos/services/local_authentication_service.dart';
-import "package:photos/services/passkey_service.dart";
-import 'package:photos/services/user_service.dart';
 import 'package:photos/theme/ente_theme.dart';
 import "package:photos/ui/account/request_pwd_verification_page.dart";
 import 'package:photos/ui/account/sessions_page.dart';
diff --git a/mobile/lib/ui/sharing/add_participant_page.dart b/mobile/lib/ui/sharing/add_participant_page.dart
index 6c7b064014..dd3d210a67 100644
--- a/mobile/lib/ui/sharing/add_participant_page.dart
+++ b/mobile/lib/ui/sharing/add_participant_page.dart
@@ -4,8 +4,8 @@ import "package:photos/extensions/user_extension.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/models/api/collection/user.dart";
 import 'package:photos/models/collection/collection.dart';
+import "package:photos/services/account/user_service.dart";
 import 'package:photos/services/collections_service.dart';
-import "package:photos/services/user_service.dart";
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/actions/collection/collection_sharing_actions.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
diff --git a/mobile/lib/ui/sharing/verify_identity_dialog.dart b/mobile/lib/ui/sharing/verify_identity_dialog.dart
index 424525f2fc..88374b58e3 100644
--- a/mobile/lib/ui/sharing/verify_identity_dialog.dart
+++ b/mobile/lib/ui/sharing/verify_identity_dialog.dart
@@ -8,7 +8,7 @@ import "package:flutter/services.dart";
 import "package:logging/logging.dart";
 import "package:photos/core/configuration.dart";
 import "package:photos/generated/l10n.dart";
-import "package:photos/services/user_service.dart";
+import "package:photos/services/account/user_service.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/common/loading_widget.dart";
 import 'package:photos/ui/components/buttons/button_widget.dart';
diff --git a/mobile/lib/ui/tabs/home_widget.dart b/mobile/lib/ui/tabs/home_widget.dart
index cfb44c5d64..d972927856 100644
--- a/mobile/lib/ui/tabs/home_widget.dart
+++ b/mobile/lib/ui/tabs/home_widget.dart
@@ -34,13 +34,13 @@ import 'package:photos/models/collection/collection_items.dart';
 import "package:photos/models/file/file.dart";
 import 'package:photos/models/selected_files.dart';
 import "package:photos/service_locator.dart";
+import 'package:photos/services/account/user_service.dart';
 import 'package:photos/services/app_lifecycle_service.dart';
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/local_sync_service.dart';
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
 import "package:photos/services/notification_service.dart";
 import "package:photos/services/remote_sync_service.dart";
-import 'package:photos/services/user_service.dart';
 import 'package:photos/states/user_details_state.dart';
 import 'package:photos/theme/colors.dart';
 import "package:photos/theme/effects.dart";
diff --git a/mobile/lib/ui/tools/lock_screen.dart b/mobile/lib/ui/tools/lock_screen.dart
index 6a77e0c97d..e81cc2b8bc 100644
--- a/mobile/lib/ui/tools/lock_screen.dart
+++ b/mobile/lib/ui/tools/lock_screen.dart
@@ -10,7 +10,7 @@ import "package:photos/core/configuration.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/l10n/l10n.dart";
 import "package:photos/service_locator.dart";
-import "package:photos/services/user_service.dart";
+import "package:photos/services/account/user_service.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/components/buttons/icon_button_widget.dart";
 import 'package:photos/ui/tools/app_lock.dart';
diff --git a/mobile/lib/ui/viewer/people/link_email_screen.dart b/mobile/lib/ui/viewer/people/link_email_screen.dart
index bf610d0542..2a647754d1 100644
--- a/mobile/lib/ui/viewer/people/link_email_screen.dart
+++ b/mobile/lib/ui/viewer/people/link_email_screen.dart
@@ -10,8 +10,8 @@ import "package:photos/generated/l10n.dart";
 import "package:photos/l10n/l10n.dart";
 import "package:photos/models/api/collection/user.dart";
 import "package:photos/models/ml/face/person.dart";
+import "package:photos/services/account/user_service.dart";
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
-import "package:photos/services/user_service.dart";
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
 import 'package:photos/ui/components/captioned_text_widget.dart';
diff --git a/mobile/lib/ui/viewer/people/save_or_edit_person.dart b/mobile/lib/ui/viewer/people/save_or_edit_person.dart
index 9216801a20..2127eab235 100644
--- a/mobile/lib/ui/viewer/people/save_or_edit_person.dart
+++ b/mobile/lib/ui/viewer/people/save_or_edit_person.dart
@@ -18,11 +18,11 @@ import "package:photos/l10n/l10n.dart";
 import "package:photos/models/api/collection/user.dart";
 import "package:photos/models/file/file.dart";
 import "package:photos/models/ml/face/person.dart";
+import "package:photos/services/account/user_service.dart";
 import "package:photos/services/machine_learning/face_ml/feedback/cluster_feedback.dart";
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
 import "package:photos/services/machine_learning/ml_result.dart";
 import "package:photos/services/search_service.dart";
-import "package:photos/services/user_service.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/common/date_input.dart";
 import "package:photos/ui/common/loading_widget.dart";
diff --git a/mobile/lib/utils/file_uploader.dart b/mobile/lib/utils/file_uploader.dart
index 9929628e09..e4c1c4abb7 100644
--- a/mobile/lib/utils/file_uploader.dart
+++ b/mobile/lib/utils/file_uploader.dart
@@ -34,11 +34,11 @@ import "package:photos/models/user_details.dart";
 import 'package:photos/module/upload/model/upload_url.dart';
 import "package:photos/module/upload/service/multipart.dart";
 import "package:photos/service_locator.dart";
+import "package:photos/services/account/user_service.dart";
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/local_sync_service.dart';
 import "package:photos/services/preview_video_store.dart";
 import 'package:photos/services/sync_service.dart';
-import "package:photos/services/user_service.dart";
 import 'package:photos/utils/data_util.dart';
 import "package:photos/utils/exif_util.dart";
 import "package:photos/utils/file_key.dart";

From 73efdbbf4ddf5074db1bb2ccd18b6e9b97862324 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Mon, 3 Mar 2025 17:29:03 +0530
Subject: [PATCH 687/796] move

---
 mobile/lib/app.dart                                         | 2 +-
 mobile/lib/core/configuration.dart                          | 2 +-
 mobile/lib/main.dart                                        | 6 +++---
 mobile/lib/service_locator.dart                             | 2 +-
 mobile/lib/services/collections_service.dart                | 4 ++--
 mobile/lib/services/favorites_service.dart                  | 2 +-
 mobile/lib/services/file_magic_service.dart                 | 2 +-
 mobile/lib/services/notification_service.dart               | 2 +-
 mobile/lib/services/push_service.dart                       | 2 +-
 mobile/lib/services/{ => sync}/local_sync_service.dart      | 0
 mobile/lib/services/{ => sync}/remote_sync_service.dart     | 3 +--
 mobile/lib/services/{ => sync}/sync_service.dart            | 4 ++--
 mobile/lib/services/{ => sync}/trash_sync_service.dart      | 0
 .../lib/ui/actions/collection/collection_file_actions.dart  | 2 +-
 mobile/lib/ui/collections/album/vertical_list.dart          | 2 +-
 mobile/lib/ui/components/home_header_widget.dart            | 2 +-
 mobile/lib/ui/home/grant_permissions_widget.dart            | 2 +-
 mobile/lib/ui/home/loading_photos_widget.dart               | 2 +-
 mobile/lib/ui/home/start_backup_hook_widget.dart            | 2 +-
 mobile/lib/ui/home/status_bar_widget.dart                   | 2 +-
 .../ui/settings/backup/backup_folder_selection_page.dart    | 2 +-
 mobile/lib/ui/settings/debug/debug_section_widget.dart      | 4 ++--
 mobile/lib/ui/tabs/home_widget.dart                         | 4 ++--
 mobile/lib/ui/tools/collage/collage_save_button.dart        | 2 +-
 mobile/lib/ui/tools/editor/image_editor_page.dart           | 2 +-
 mobile/lib/ui/tools/editor/video_editor_page.dart           | 2 +-
 mobile/lib/ui/viewer/actions/delete_empty_albums.dart       | 2 +-
 mobile/lib/ui/viewer/file_details/upload_icon_widget.dart   | 4 ++--
 mobile/lib/ui/viewer/gallery/device_folder_page.dart        | 2 +-
 .../ui/viewer/gallery/shared_public_collection_page.dart    | 2 +-
 mobile/lib/utils/delete_file_util.dart                      | 4 ++--
 mobile/lib/utils/file_download_util.dart                    | 2 +-
 mobile/lib/utils/file_uploader.dart                         | 4 ++--
 33 files changed, 40 insertions(+), 41 deletions(-)
 rename mobile/lib/services/{ => sync}/local_sync_service.dart (100%)
 rename mobile/lib/services/{ => sync}/remote_sync_service.dart (99%)
 rename mobile/lib/services/{ => sync}/sync_service.dart (98%)
 rename mobile/lib/services/{ => sync}/trash_sync_service.dart (100%)

diff --git a/mobile/lib/app.dart b/mobile/lib/app.dart
index 96111aa10b..4596e06710 100644
--- a/mobile/lib/app.dart
+++ b/mobile/lib/app.dart
@@ -16,7 +16,7 @@ import "package:photos/l10n/l10n.dart";
 import "package:photos/service_locator.dart";
 import 'package:photos/services/app_lifecycle_service.dart';
 import "package:photos/services/home_widget_service.dart";
-import 'package:photos/services/sync_service.dart';
+import 'package:photos/services/sync/sync_service.dart';
 import 'package:photos/ui/tabs/home_widget.dart';
 import "package:photos/ui/viewer/actions/file_viewer.dart";
 import "package:photos/utils/intent_util.dart";
diff --git a/mobile/lib/core/configuration.dart b/mobile/lib/core/configuration.dart
index c6fb81a9d7..5d1a73fecc 100644
--- a/mobile/lib/core/configuration.dart
+++ b/mobile/lib/core/configuration.dart
@@ -30,7 +30,7 @@ import 'package:photos/services/ignored_files_service.dart';
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
 import 'package:photos/services/memories_service.dart';
 import 'package:photos/services/search_service.dart';
-import 'package:photos/services/sync_service.dart';
+import 'package:photos/services/sync/sync_service.dart';
 import 'package:photos/utils/file_uploader.dart';
 import "package:photos/utils/lock_screen_settings.dart";
 import 'package:photos/utils/validator_util.dart';
diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index ad85fab533..ae48431448 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -35,7 +35,6 @@ import 'package:photos/services/favorites_service.dart';
 import "package:photos/services/filedata/filedata_service.dart";
 import 'package:photos/services/home_widget_service.dart';
 import 'package:photos/services/local_file_update_service.dart';
-import 'package:photos/services/local_sync_service.dart';
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
 import 'package:photos/services/machine_learning/ml_service.dart';
 import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';
@@ -43,9 +42,10 @@ import 'package:photos/services/memories_service.dart';
 import "package:photos/services/notification_service.dart";
 import "package:photos/services/preview_video_store.dart";
 import 'package:photos/services/push_service.dart';
-import 'package:photos/services/remote_sync_service.dart';
 import 'package:photos/services/search_service.dart';
-import "package:photos/services/sync_service.dart";
+import 'package:photos/services/sync/local_sync_service.dart';
+import 'package:photos/services/sync/remote_sync_service.dart';
+import "package:photos/services/sync/sync_service.dart";
 import 'package:photos/ui/tools/app_lock.dart';
 import 'package:photos/ui/tools/lock_screen.dart';
 import "package:photos/utils/email_util.dart";
diff --git a/mobile/lib/service_locator.dart b/mobile/lib/service_locator.dart
index 075c642602..8244d6fae3 100644
--- a/mobile/lib/service_locator.dart
+++ b/mobile/lib/service_locator.dart
@@ -11,7 +11,7 @@ import "package:photos/services/machine_learning/face_ml/face_recognition_servic
 import "package:photos/services/machine_learning/machine_learning_controller.dart";
 import "package:photos/services/magic_cache_service.dart";
 import "package:photos/services/storage_bonus_service.dart";
-import "package:photos/services/trash_sync_service.dart";
+import "package:photos/services/sync/trash_sync_service.dart";
 import "package:photos/services/update_service.dart";
 import "package:photos/utils/local_settings.dart";
 import "package:shared_preferences/shared_preferences.dart";
diff --git a/mobile/lib/services/collections_service.dart b/mobile/lib/services/collections_service.dart
index b2e3c8e73e..7ee743f5ee 100644
--- a/mobile/lib/services/collections_service.dart
+++ b/mobile/lib/services/collections_service.dart
@@ -38,8 +38,8 @@ import "package:photos/models/metadata/collection_magic.dart";
 import "package:photos/service_locator.dart";
 import 'package:photos/services/app_lifecycle_service.dart';
 import "package:photos/services/favorites_service.dart";
-import 'package:photos/services/local_sync_service.dart';
-import 'package:photos/services/remote_sync_service.dart';
+import 'package:photos/services/sync/local_sync_service.dart';
+import 'package:photos/services/sync/remote_sync_service.dart';
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/file_key.dart";
 import "package:photos/utils/local_settings.dart";
diff --git a/mobile/lib/services/favorites_service.dart b/mobile/lib/services/favorites_service.dart
index af8dbda084..68cdc59944 100644
--- a/mobile/lib/services/favorites_service.dart
+++ b/mobile/lib/services/favorites_service.dart
@@ -13,7 +13,7 @@ import 'package:photos/models/api/collection/create_request.dart';
 import 'package:photos/models/collection/collection.dart';
 import 'package:photos/models/file/file.dart';
 import 'package:photos/services/collections_service.dart';
-import 'package:photos/services/remote_sync_service.dart';
+import 'package:photos/services/sync/remote_sync_service.dart';
 import 'package:photos/ui/actions/collection/collection_sharing_actions.dart';
 
 class FavoritesService {
diff --git a/mobile/lib/services/file_magic_service.dart b/mobile/lib/services/file_magic_service.dart
index b012cb49f4..5c970f5867 100644
--- a/mobile/lib/services/file_magic_service.dart
+++ b/mobile/lib/services/file_magic_service.dart
@@ -16,7 +16,7 @@ import "package:photos/models/api/metadata.dart";
 import 'package:photos/models/file/file.dart';
 import "package:photos/models/metadata/common_keys.dart";
 import "package:photos/models/metadata/file_magic.dart";
-import 'package:photos/services/remote_sync_service.dart';
+import 'package:photos/services/sync/remote_sync_service.dart';
 import "package:photos/utils/file_key.dart";
 
 class FileMagicService {
diff --git a/mobile/lib/services/notification_service.dart b/mobile/lib/services/notification_service.dart
index b99c3bcb0f..86cabfe014 100644
--- a/mobile/lib/services/notification_service.dart
+++ b/mobile/lib/services/notification_service.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import "package:logging/logging.dart";
-import "package:photos/services/remote_sync_service.dart";
+import "package:photos/services/sync/remote_sync_service.dart";
 import "package:shared_preferences/shared_preferences.dart";
 
 class NotificationService {
diff --git a/mobile/lib/services/push_service.dart b/mobile/lib/services/push_service.dart
index 4ddd92c742..9e085fcaca 100644
--- a/mobile/lib/services/push_service.dart
+++ b/mobile/lib/services/push_service.dart
@@ -6,7 +6,7 @@ import 'package:photos/core/constants.dart';
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/core/network/network.dart';
 import 'package:photos/events/signed_in_event.dart';
-import 'package:photos/services/sync_service.dart';
+import 'package:photos/services/sync/sync_service.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class PushService {
diff --git a/mobile/lib/services/local_sync_service.dart b/mobile/lib/services/sync/local_sync_service.dart
similarity index 100%
rename from mobile/lib/services/local_sync_service.dart
rename to mobile/lib/services/sync/local_sync_service.dart
diff --git a/mobile/lib/services/remote_sync_service.dart b/mobile/lib/services/sync/remote_sync_service.dart
similarity index 99%
rename from mobile/lib/services/remote_sync_service.dart
rename to mobile/lib/services/sync/remote_sync_service.dart
index e3bb5b463d..77f56441ba 100644
--- a/mobile/lib/services/remote_sync_service.dart
+++ b/mobile/lib/services/sync/remote_sync_service.dart
@@ -28,7 +28,7 @@ import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/ignored_files_service.dart';
 import 'package:photos/services/local_file_update_service.dart';
 import "package:photos/services/notification_service.dart";
-import 'package:photos/services/sync_service.dart';
+import 'package:photos/services/sync/sync_service.dart';
 import 'package:photos/utils/diff_fetcher.dart';
 import 'package:photos/utils/file_uploader.dart';
 import 'package:photos/utils/file_util.dart';
@@ -308,7 +308,6 @@ class RemoteSyncService {
   Future<void> joinAndSyncCollection(
     BuildContext context,
     int collectionID,
-  
   ) async {
     await _collectionsService.joinPublicCollection(context, collectionID);
     await _collectionsService.sync();
diff --git a/mobile/lib/services/sync_service.dart b/mobile/lib/services/sync/sync_service.dart
similarity index 98%
rename from mobile/lib/services/sync_service.dart
rename to mobile/lib/services/sync/sync_service.dart
index 551f78405c..f9c0a2b83c 100644
--- a/mobile/lib/services/sync_service.dart
+++ b/mobile/lib/services/sync/sync_service.dart
@@ -15,9 +15,9 @@ import 'package:photos/events/sync_status_update_event.dart';
 import 'package:photos/events/trigger_logout_event.dart';
 import 'package:photos/models/file/file_type.dart';
 import "package:photos/services/filedata/filedata_service.dart";
-import 'package:photos/services/local_sync_service.dart';
 import 'package:photos/services/notification_service.dart';
-import 'package:photos/services/remote_sync_service.dart';
+import 'package:photos/services/sync/local_sync_service.dart';
+import 'package:photos/services/sync/remote_sync_service.dart';
 import 'package:photos/utils/file_uploader.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
diff --git a/mobile/lib/services/trash_sync_service.dart b/mobile/lib/services/sync/trash_sync_service.dart
similarity index 100%
rename from mobile/lib/services/trash_sync_service.dart
rename to mobile/lib/services/sync/trash_sync_service.dart
diff --git a/mobile/lib/ui/actions/collection/collection_file_actions.dart b/mobile/lib/ui/actions/collection/collection_file_actions.dart
index 81bdcefb3b..7ef1dfaf74 100644
--- a/mobile/lib/ui/actions/collection/collection_file_actions.dart
+++ b/mobile/lib/ui/actions/collection/collection_file_actions.dart
@@ -14,7 +14,7 @@ import "package:photos/services/collections_service.dart";
 import 'package:photos/services/favorites_service.dart';
 import "package:photos/services/hidden_service.dart";
 import "package:photos/services/ignored_files_service.dart";
-import "package:photos/services/remote_sync_service.dart";
+import "package:photos/services/sync/remote_sync_service.dart";
 import 'package:photos/ui/actions/collection/collection_sharing_actions.dart';
 import 'package:photos/ui/common/progress_dialog.dart';
 import 'package:photos/ui/components/action_sheet_widget.dart';
diff --git a/mobile/lib/ui/collections/album/vertical_list.dart b/mobile/lib/ui/collections/album/vertical_list.dart
index d6d4a4c07c..79b75b6303 100644
--- a/mobile/lib/ui/collections/album/vertical_list.dart
+++ b/mobile/lib/ui/collections/album/vertical_list.dart
@@ -11,7 +11,7 @@ import 'package:photos/models/collection/collection_items.dart';
 import 'package:photos/models/selected_files.dart';
 import 'package:photos/services/collections_service.dart';
 import "package:photos/services/hidden_service.dart";
-import 'package:photos/services/remote_sync_service.dart';
+import 'package:photos/services/sync/remote_sync_service.dart';
 import "package:photos/ui/actions/collection/collection_file_actions.dart";
 import "package:photos/ui/actions/collection/collection_sharing_actions.dart";
 import "package:photos/ui/collections/album/column_item.dart";
diff --git a/mobile/lib/ui/components/home_header_widget.dart b/mobile/lib/ui/components/home_header_widget.dart
index b4f98c4899..7b65586554 100644
--- a/mobile/lib/ui/components/home_header_widget.dart
+++ b/mobile/lib/ui/components/home_header_widget.dart
@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 import "package:logging/logging.dart";
 import "package:photo_manager/photo_manager.dart";
 import "package:photos/generated/l10n.dart";
-import "package:photos/services/local_sync_service.dart";
+import "package:photos/services/sync/local_sync_service.dart";
 import 'package:photos/ui/components/buttons/icon_button_widget.dart';
 import "package:photos/ui/settings/backup/backup_folder_selection_page.dart";
 import "package:photos/utils/dialog_util.dart";
diff --git a/mobile/lib/ui/home/grant_permissions_widget.dart b/mobile/lib/ui/home/grant_permissions_widget.dart
index 5a4238b1e5..9935b3c332 100644
--- a/mobile/lib/ui/home/grant_permissions_widget.dart
+++ b/mobile/lib/ui/home/grant_permissions_widget.dart
@@ -6,7 +6,7 @@ import "package:logging/logging.dart";
 import 'package:photo_manager/photo_manager.dart';
 import "package:photos/generated/l10n.dart";
 import "package:photos/l10n/l10n.dart";
-import 'package:photos/services/sync_service.dart';
+import 'package:photos/services/sync/sync_service.dart';
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/photo_manager_util.dart";
diff --git a/mobile/lib/ui/home/loading_photos_widget.dart b/mobile/lib/ui/home/loading_photos_widget.dart
index 7ae293131f..2215cf41e2 100644
--- a/mobile/lib/ui/home/loading_photos_widget.dart
+++ b/mobile/lib/ui/home/loading_photos_widget.dart
@@ -7,7 +7,7 @@ import 'package:photos/ente_theme_data.dart';
 import 'package:photos/events/local_import_progress.dart';
 import 'package:photos/events/sync_status_update_event.dart';
 import "package:photos/generated/l10n.dart";
-import 'package:photos/services/local_sync_service.dart';
+import 'package:photos/services/sync/local_sync_service.dart';
 import 'package:photos/ui/common/bottom_shadow.dart';
 import "package:photos/ui/components/buttons/button_widget.dart";
 import "package:photos/ui/components/dialog_widget.dart";
diff --git a/mobile/lib/ui/home/start_backup_hook_widget.dart b/mobile/lib/ui/home/start_backup_hook_widget.dart
index 64dfa1fa21..5ef2db1e5e 100644
--- a/mobile/lib/ui/home/start_backup_hook_widget.dart
+++ b/mobile/lib/ui/home/start_backup_hook_widget.dart
@@ -3,7 +3,7 @@ import "dart:async";
 import 'package:flutter/material.dart';
 import 'package:photo_manager/photo_manager.dart';
 import 'package:photos/generated/l10n.dart';
-import 'package:photos/services/local_sync_service.dart';
+import 'package:photos/services/sync/local_sync_service.dart';
 import 'package:photos/ui/common/gradient_button.dart';
 import 'package:photos/ui/settings/backup/backup_folder_selection_page.dart';
 import 'package:photos/utils/navigation_util.dart';
diff --git a/mobile/lib/ui/home/status_bar_widget.dart b/mobile/lib/ui/home/status_bar_widget.dart
index 56f46cbb53..15ba5b7141 100644
--- a/mobile/lib/ui/home/status_bar_widget.dart
+++ b/mobile/lib/ui/home/status_bar_widget.dart
@@ -12,7 +12,7 @@ import "package:photos/generated/l10n.dart";
 import "package:photos/models/preview/preview_item_status.dart";
 import "package:photos/service_locator.dart";
 import "package:photos/services/preview_video_store.dart";
-import 'package:photos/services/sync_service.dart';
+import 'package:photos/services/sync/sync_service.dart';
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/theme/text_style.dart';
 import 'package:photos/ui/account/verify_recovery_page.dart';
diff --git a/mobile/lib/ui/settings/backup/backup_folder_selection_page.dart b/mobile/lib/ui/settings/backup/backup_folder_selection_page.dart
index d657c60950..3eea0c2e7a 100644
--- a/mobile/lib/ui/settings/backup/backup_folder_selection_page.dart
+++ b/mobile/lib/ui/settings/backup/backup_folder_selection_page.dart
@@ -12,7 +12,7 @@ import 'package:photos/ente_theme_data.dart';
 import 'package:photos/generated/l10n.dart';
 import 'package:photos/models/device_collection.dart';
 import 'package:photos/models/file/file.dart';
-import 'package:photos/services/remote_sync_service.dart';
+import 'package:photos/services/sync/remote_sync_service.dart';
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
diff --git a/mobile/lib/ui/settings/debug/debug_section_widget.dart b/mobile/lib/ui/settings/debug/debug_section_widget.dart
index d8bd13b002..0cebd2c931 100644
--- a/mobile/lib/ui/settings/debug/debug_section_widget.dart
+++ b/mobile/lib/ui/settings/debug/debug_section_widget.dart
@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
 import 'package:photos/core/configuration.dart';
 import "package:photos/service_locator.dart";
 import 'package:photos/services/ignored_files_service.dart';
-import 'package:photos/services/local_sync_service.dart';
-import 'package:photos/services/sync_service.dart';
+import 'package:photos/services/sync/local_sync_service.dart';
+import 'package:photos/services/sync/sync_service.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/captioned_text_widget.dart';
 import 'package:photos/ui/components/expandable_menu_item_widget.dart';
diff --git a/mobile/lib/ui/tabs/home_widget.dart b/mobile/lib/ui/tabs/home_widget.dart
index d972927856..70cc154a1e 100644
--- a/mobile/lib/ui/tabs/home_widget.dart
+++ b/mobile/lib/ui/tabs/home_widget.dart
@@ -37,10 +37,10 @@ import "package:photos/service_locator.dart";
 import 'package:photos/services/account/user_service.dart';
 import 'package:photos/services/app_lifecycle_service.dart';
 import 'package:photos/services/collections_service.dart';
-import 'package:photos/services/local_sync_service.dart';
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
 import "package:photos/services/notification_service.dart";
-import "package:photos/services/remote_sync_service.dart";
+import 'package:photos/services/sync/local_sync_service.dart';
+import "package:photos/services/sync/remote_sync_service.dart";
 import 'package:photos/states/user_details_state.dart';
 import 'package:photos/theme/colors.dart';
 import "package:photos/theme/effects.dart";
diff --git a/mobile/lib/ui/tools/collage/collage_save_button.dart b/mobile/lib/ui/tools/collage/collage_save_button.dart
index cd2645403b..df7e98f6e0 100644
--- a/mobile/lib/ui/tools/collage/collage_save_button.dart
+++ b/mobile/lib/ui/tools/collage/collage_save_button.dart
@@ -4,7 +4,7 @@ import "package:logging/logging.dart";
 import "package:photo_manager/photo_manager.dart";
 import "package:photos/generated/l10n.dart";
 import 'package:photos/models/file/file.dart';
-import "package:photos/services/sync_service.dart";
+import "package:photos/services/sync/sync_service.dart";
 import "package:photos/ui/components/buttons/button_widget.dart";
 import "package:photos/ui/components/models/button_type.dart";
 import "package:photos/ui/viewer/file/detail_page.dart";
diff --git a/mobile/lib/ui/tools/editor/image_editor_page.dart b/mobile/lib/ui/tools/editor/image_editor_page.dart
index 522831664b..c92ba5ae5d 100644
--- a/mobile/lib/ui/tools/editor/image_editor_page.dart
+++ b/mobile/lib/ui/tools/editor/image_editor_page.dart
@@ -17,7 +17,7 @@ import 'package:photos/events/local_photos_updated_event.dart';
 import "package:photos/generated/l10n.dart";
 import 'package:photos/models/file/file.dart' as ente;
 import 'package:photos/models/location/location.dart';
-import 'package:photos/services/sync_service.dart';
+import 'package:photos/services/sync/sync_service.dart';
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/ui/components/action_sheet_widget.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
diff --git a/mobile/lib/ui/tools/editor/video_editor_page.dart b/mobile/lib/ui/tools/editor/video_editor_page.dart
index 238c771115..7d6ef7762d 100644
--- a/mobile/lib/ui/tools/editor/video_editor_page.dart
+++ b/mobile/lib/ui/tools/editor/video_editor_page.dart
@@ -12,7 +12,7 @@ import "package:photos/events/local_photos_updated_event.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/models/file/file.dart";
 import "package:photos/models/location/location.dart";
-import "package:photos/services/sync_service.dart";
+import "package:photos/services/sync/sync_service.dart";
 import "package:photos/ui/tools/editor/export_video_service.dart";
 import 'package:photos/ui/tools/editor/video_crop_page.dart';
 import "package:photos/ui/tools/editor/video_editor/video_editor_bottom_action.dart";
diff --git a/mobile/lib/ui/viewer/actions/delete_empty_albums.dart b/mobile/lib/ui/viewer/actions/delete_empty_albums.dart
index 3f3186465f..18b817f067 100644
--- a/mobile/lib/ui/viewer/actions/delete_empty_albums.dart
+++ b/mobile/lib/ui/viewer/actions/delete_empty_albums.dart
@@ -6,7 +6,7 @@ import "package:photos/generated/l10n.dart";
 import 'package:photos/models/collection/collection.dart';
 import 'package:photos/models/file/file.dart';
 import 'package:photos/services/collections_service.dart';
-import "package:photos/services/remote_sync_service.dart";
+import "package:photos/services/sync/remote_sync_service.dart";
 import 'package:photos/ui/components/action_sheet_widget.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
 import 'package:photos/ui/components/models/button_type.dart';
diff --git a/mobile/lib/ui/viewer/file_details/upload_icon_widget.dart b/mobile/lib/ui/viewer/file_details/upload_icon_widget.dart
index 5c346d3dc1..c388135d0e 100644
--- a/mobile/lib/ui/viewer/file_details/upload_icon_widget.dart
+++ b/mobile/lib/ui/viewer/file_details/upload_icon_widget.dart
@@ -13,8 +13,8 @@ import "package:photos/models/ignored_file.dart";
 import "package:photos/services/collections_service.dart";
 import "package:photos/services/hidden_service.dart";
 import "package:photos/services/ignored_files_service.dart";
-import "package:photos/services/remote_sync_service.dart";
-import "package:photos/services/sync_service.dart";
+import "package:photos/services/sync/remote_sync_service.dart";
+import "package:photos/services/sync/sync_service.dart";
 import "package:photos/ui/common/loading_widget.dart";
 import "package:photos/utils/toast_util.dart";
 
diff --git a/mobile/lib/ui/viewer/gallery/device_folder_page.dart b/mobile/lib/ui/viewer/gallery/device_folder_page.dart
index 0fbe5785db..0eae4e1de1 100644
--- a/mobile/lib/ui/viewer/gallery/device_folder_page.dart
+++ b/mobile/lib/ui/viewer/gallery/device_folder_page.dart
@@ -13,7 +13,7 @@ import 'package:photos/models/file/file.dart';
 import 'package:photos/models/gallery_type.dart';
 import 'package:photos/models/selected_files.dart';
 import 'package:photos/services/ignored_files_service.dart';
-import 'package:photos/services/remote_sync_service.dart';
+import 'package:photos/services/sync/remote_sync_service.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/captioned_text_widget.dart';
 import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart';
diff --git a/mobile/lib/ui/viewer/gallery/shared_public_collection_page.dart b/mobile/lib/ui/viewer/gallery/shared_public_collection_page.dart
index f4905eb4c7..6d464c47f1 100644
--- a/mobile/lib/ui/viewer/gallery/shared_public_collection_page.dart
+++ b/mobile/lib/ui/viewer/gallery/shared_public_collection_page.dart
@@ -13,7 +13,7 @@ import "package:photos/models/file_load_result.dart";
 import "package:photos/models/gallery_type.dart";
 import "package:photos/models/selected_files.dart";
 import "package:photos/services/collections_service.dart";
-import "package:photos/services/remote_sync_service.dart";
+import "package:photos/services/sync/remote_sync_service.dart";
 import "package:photos/ui/components/buttons/button_widget.dart";
 import "package:photos/ui/components/end_to_end_banner.dart";
 import "package:photos/ui/components/models/button_type.dart";
diff --git a/mobile/lib/utils/delete_file_util.dart b/mobile/lib/utils/delete_file_util.dart
index 3a1dc7c25d..34566f1469 100644
--- a/mobile/lib/utils/delete_file_util.dart
+++ b/mobile/lib/utils/delete_file_util.dart
@@ -18,8 +18,8 @@ import 'package:photos/models/file/file.dart';
 import "package:photos/models/files_split.dart";
 import 'package:photos/models/selected_files.dart';
 import "package:photos/service_locator.dart";
-import 'package:photos/services/remote_sync_service.dart';
-import 'package:photos/services/sync_service.dart';
+import 'package:photos/services/sync/remote_sync_service.dart';
+import 'package:photos/services/sync/sync_service.dart';
 import 'package:photos/ui/common/linear_progress_dialog.dart';
 import 'package:photos/ui/components/action_sheet_widget.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
diff --git a/mobile/lib/utils/file_download_util.dart b/mobile/lib/utils/file_download_util.dart
index 8958136c69..f5982abd19 100644
--- a/mobile/lib/utils/file_download_util.dart
+++ b/mobile/lib/utils/file_download_util.dart
@@ -18,7 +18,7 @@ import "package:photos/models/file/file_type.dart";
 import "package:photos/models/ignored_file.dart";
 import "package:photos/services/collections_service.dart";
 import "package:photos/services/ignored_files_service.dart";
-import "package:photos/services/local_sync_service.dart";
+import "package:photos/services/sync/local_sync_service.dart";
 import "package:photos/utils/data_util.dart";
 import "package:photos/utils/fake_progress.dart";
 import "package:photos/utils/file_key.dart";
diff --git a/mobile/lib/utils/file_uploader.dart b/mobile/lib/utils/file_uploader.dart
index e4c1c4abb7..2855b83c78 100644
--- a/mobile/lib/utils/file_uploader.dart
+++ b/mobile/lib/utils/file_uploader.dart
@@ -36,9 +36,9 @@ import "package:photos/module/upload/service/multipart.dart";
 import "package:photos/service_locator.dart";
 import "package:photos/services/account/user_service.dart";
 import 'package:photos/services/collections_service.dart';
-import 'package:photos/services/local_sync_service.dart';
 import "package:photos/services/preview_video_store.dart";
-import 'package:photos/services/sync_service.dart';
+import 'package:photos/services/sync/local_sync_service.dart';
+import 'package:photos/services/sync/sync_service.dart';
 import 'package:photos/utils/data_util.dart';
 import "package:photos/utils/exif_util.dart";
 import "package:photos/utils/file_key.dart";

From d3d5aa5a8b2f9c288e238bf1c43f02d45ee00d9b Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 3 Mar 2025 17:54:24 +0530
Subject: [PATCH 688/796] [mob][photos] Fix

---
 mobile/lib/models/memories_cache.dart | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mobile/lib/models/memories_cache.dart b/mobile/lib/models/memories_cache.dart
index 268fcc1659..8abb6695d3 100644
--- a/mobile/lib/models/memories_cache.dart
+++ b/mobile/lib/models/memories_cache.dart
@@ -9,12 +9,12 @@ const kPersonShowTimeout = Duration(days: 7 * 10);
 const kPersonAndTypeShowTimeout = Duration(days: 7 * 26);
 const kTripShowTimeout = Duration(days: 7 * 25);
 
-final maxShowTimeout = 
-    [
+final maxShowTimeout = [
       kPersonShowTimeout,
       kPersonAndTypeShowTimeout,
       kTripShowTimeout,
-    ].reduce((value, element) => value > element ? value : element) * 3;
+    ].reduce((value, element) => value > element ? value : element) *
+    3;
 
 class MemoriesCache {
   final List<ToShowMemory> toShowMemories;
@@ -108,7 +108,10 @@ class ToShowMemory {
     }
     return ToShowMemory(
       memory.title,
-      memory.memories.map((m) => m.file.uploadedFileID!).toList(),
+      memory.memories
+          .where((m) => m.file.uploadedFileID != null)
+          .map((m) => m.file.uploadedFileID!)
+          .toList(),
       memory.type,
       memory.firstDateToShow,
       memory.lastDateToShow,

From 7b5ed1deaa08fc0557b539a517fddd59d349691a Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 3 Mar 2025 18:03:00 +0530
Subject: [PATCH 689/796] [mob][photos] Fix correct sort

---
 mobile/lib/services/smart_memories_service.dart | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index ff1e0a94f3..d8a5b33c87 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -76,6 +76,7 @@ class SmartMemoriesService {
     MemoriesCache oldCache,
   ) async {
     try {
+      _logger.finest('calcMemories called with time: $now');
       await init();
       final List<SmartMemory> memories = [];
       final allFiles = Set<EnteFile>.from(
@@ -1163,6 +1164,9 @@ class SmartMemoriesService {
     for (var yearAgo = 1; yearAgo <= yearsBefore; yearAgo++) {
       final memories = yearsAgoToMemories[yearAgo];
       if (memories == null) continue;
+      memories.sort(
+        (a, b) => a.file.creationTime!.compareTo(b.file.creationTime!),
+      );
       final fillerMemory = FillerMemory(
         memories,
         "TEST",

From 809fe6ab2c3a29ccd75e88bb35f7819a33095c17 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 3 Mar 2025 18:12:09 +0530
Subject: [PATCH 690/796] [mob][photos] show internal in UI only

---
 mobile/lib/models/smart_memory.dart                  | 5 ++---
 mobile/lib/ui/home/memories/memory_cover_widget.dart | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mobile/lib/models/smart_memory.dart b/mobile/lib/models/smart_memory.dart
index 999525f98e..06d9c1cd15 100644
--- a/mobile/lib/models/smart_memory.dart
+++ b/mobile/lib/models/smart_memory.dart
@@ -40,13 +40,12 @@ class SmartMemory {
   SmartMemory(
     this.memories,
     this.type,
-    title,
+    this.title,
     this.firstDateToShow,
     this.lastDateToShow, {
     this.firstCreationTime,
     this.lastCreationTime,
-  }) : title = title + "(I)";
-  // TODO: lau: remove (I) from name when opening up the feature flag
+  });
 
   bool get notForShow => firstDateToShow == 0 && lastDateToShow == 0;
 
diff --git a/mobile/lib/ui/home/memories/memory_cover_widget.dart b/mobile/lib/ui/home/memories/memory_cover_widget.dart
index e825a003cd..270bdb0f4a 100644
--- a/mobile/lib/ui/home/memories/memory_cover_widget.dart
+++ b/mobile/lib/ui/home/memories/memory_cover_widget.dart
@@ -47,7 +47,8 @@ class _MemoryCoverWidgetState extends State<MemoryCoverWidget> {
 
     final widthOfScreen = MediaQuery.sizeOf(context).width;
     final index = _getNextMemoryIndex();
-    final title = widget.title ?? _getTitle(widget.memories[index]);
+    // TODO: lau: remove (I) from name when opening up the feature flag
+    final title = widget.title != null ? widget.title! + "(I)" : _getTitle(widget.memories[index]);
     final memory = widget.memories[index];
     final isSeen = memory.isSeen();
     final brightness =

From e459da3908b277a859320ecbf95817918883b4f8 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Mon, 3 Mar 2025 18:25:03 +0530
Subject: [PATCH 691/796] [mob][photos] Fix

---
 mobile/lib/services/smart_memories_service.dart | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index d8a5b33c87..964c82127e 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -1131,7 +1131,8 @@ class SmartMemoriesService {
     final windowEnd =
         currentTime.add(kMemoriesUpdateFrequency).microsecondsSinceEpoch;
     final currentYear = currentTime.year;
-    final cutOffTime = currentTime.subtract(const Duration(days: 365));
+    final cutOffTime = currentTime
+        .subtract(const Duration(days: 364) - kMemoriesUpdateFrequency);
     final timeTillYearEnd = DateTime(currentYear + 1).difference(currentTime);
     final bool almostYearEnd = timeTillYearEnd < kMemoriesUpdateFrequency;
 

From 0940b8b3be95755572ffa56beca22f7c7aff8987 Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Mon, 3 Mar 2025 19:53:47 +0530
Subject: [PATCH 692/796] [server] Instructions to tweak compose

---
 server/compose.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/compose.yaml b/server/compose.yaml
index 250feb40a0..b9d6ee5cc2 100644
--- a/server/compose.yaml
+++ b/server/compose.yaml
@@ -1,3 +1,5 @@
+# Please note that the below dockerfile is NOT directly meant 
+# to be copy pasted and deployed to production.
 services:
   museum:
     build:
@@ -31,6 +33,7 @@ services:
 
   postgres:
     image: postgres:15
+    # Change the postgres port here
     ports:
       - 5432:5432
     environment:
@@ -64,8 +67,9 @@ services:
       - 3200:3200 # API
       - 3201:3201 # Console
     environment:
-      MINIO_ROOT_USER: test
-      MINIO_ROOT_PASSWORD: testtest
+      MINIO_ROOT_USER: changeme
+      MINIO_ROOT_PASSWORD: changeme1234
+    # Tweak this command to match the above port changes.
     command: server /data --address ":3200" --console-address ":3201"
     volumes:
       - minio-data:/data

From 1eddf1f75a33fd5f0e08995370d3993613f94bd8 Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Mon, 3 Mar 2025 19:55:20 +0530
Subject: [PATCH 693/796] fix

---
 server/compose.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/compose.yaml b/server/compose.yaml
index b9d6ee5cc2..727d1f8d77 100644
--- a/server/compose.yaml
+++ b/server/compose.yaml
@@ -1,5 +1,5 @@
-# Please note that the below dockerfile is NOT directly meant 
-# to be copy pasted and deployed to production.
+# Please note that the below docker compose is NOT directly  
+# meant to be copy pasted and deployed to production.
 services:
   museum:
     build:

From 1eec079a85774578cd30b2fa7c1eda56630b962c Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Tue, 4 Mar 2025 10:39:33 +0530
Subject: [PATCH 694/796] update dummy pass in minio provision script

---
 server/scripts/compose/minio-provision.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/scripts/compose/minio-provision.sh b/server/scripts/compose/minio-provision.sh
index 34e3b98b88..3ca0078c5c 100755
--- a/server/scripts/compose/minio-provision.sh
+++ b/server/scripts/compose/minio-provision.sh
@@ -3,7 +3,7 @@
 # Script used to prepare the minio instance that runs as part of the development
 # Docker compose cluster.
 
-while ! mc config host add h0 http://minio:3200 test testtest
+while ! mc config host add h0 http://minio:3200 changem changeme1234
 do
    echo "waiting for minio..."
    sleep 0.5

From 2dc71143b7a7d8fa128a2b8dcac11aff409ed9e6 Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Tue, 4 Mar 2025 10:45:44 +0530
Subject: [PATCH 695/796] update

---
 server/RUNNING.md                         |  6 +++---
 server/scripts/compose/credentials.yaml   | 12 ++++++------
 server/scripts/compose/minio-provision.sh |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/server/RUNNING.md b/server/RUNNING.md
index 0f2dc4fe3d..8b64af6bef 100644
--- a/server/RUNNING.md
+++ b/server/RUNNING.md
@@ -43,10 +43,10 @@ Or interact with the other services in the cluster, e.g. connect to the DB
 
 Or interact with the MinIO S3 API
 
-    AWS_ACCESS_KEY_ID=test AWS_SECRET_ACCESS_KEY=testtest \
-        aws s3 --endpoint-url http://localhost:3200 ls s3://test
+    AWS_ACCESS_KEY_ID=test AWS_SECRET_ACCESS_KEY=changeme1234 \
+        aws s3 --endpoint-url http://localhost:3200 ls s3://changeme
 
-Or open the MinIO dashboard at <http://localhost:3201> (user: test/password: testtest).
+Or open the MinIO dashboard at <http://localhost:3201> (user: changeme/password: changeme1234).
 
 > [!NOTE]
 >
diff --git a/server/scripts/compose/credentials.yaml b/server/scripts/compose/credentials.yaml
index d20532ec94..644743b657 100644
--- a/server/scripts/compose/credentials.yaml
+++ b/server/scripts/compose/credentials.yaml
@@ -8,21 +8,21 @@ db:
 s3:
     are_local_buckets: true
     b2-eu-cen:
-        key: test
-        secret: testtest
+        key: changeme
+        secret: changeme1234
         endpoint: localhost:3200
         region: eu-central-2
         bucket: b2-eu-cen
     wasabi-eu-central-2-v3:
-        key: test
-        secret: testtest
+        key: changeme
+        secret: changeme1234
         endpoint: localhost:3200
         region: eu-central-2
         bucket: wasabi-eu-central-2-v3
         compliance: false
     scw-eu-fr-v3:
-        key: test
-        secret: testtest
+        key: changeme
+        secret: changeme1234
         endpoint: localhost:3200
         region: eu-central-2
         bucket: scw-eu-fr-v3
diff --git a/server/scripts/compose/minio-provision.sh b/server/scripts/compose/minio-provision.sh
index 3ca0078c5c..ae60318804 100755
--- a/server/scripts/compose/minio-provision.sh
+++ b/server/scripts/compose/minio-provision.sh
@@ -3,7 +3,7 @@
 # Script used to prepare the minio instance that runs as part of the development
 # Docker compose cluster.
 
-while ! mc config host add h0 http://minio:3200 changem changeme1234
+while ! mc config host add h0 http://minio:3200 changeme changeme1234
 do
    echo "waiting for minio..."
    sleep 0.5

From 038692ad06abe295d11d5e360c99d5aa77a89892 Mon Sep 17 00:00:00 2001
From: mngshm <mangeshrex@tutanota.com>
Date: Tue, 4 Mar 2025 11:07:58 +0530
Subject: [PATCH 696/796] fix KEY_ID & s3 bucket url

---
 server/RUNNING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/RUNNING.md b/server/RUNNING.md
index 8b64af6bef..00c1298677 100644
--- a/server/RUNNING.md
+++ b/server/RUNNING.md
@@ -43,8 +43,8 @@ Or interact with the other services in the cluster, e.g. connect to the DB
 
 Or interact with the MinIO S3 API
 
-    AWS_ACCESS_KEY_ID=test AWS_SECRET_ACCESS_KEY=changeme1234 \
-        aws s3 --endpoint-url http://localhost:3200 ls s3://changeme
+    AWS_ACCESS_KEY_ID=changeme AWS_SECRET_ACCESS_KEY=changeme1234 \
+        aws s3 --endpoint-url http://localhost:3200 ls s3://b2-eu-cen
 
 Or open the MinIO dashboard at <http://localhost:3201> (user: changeme/password: changeme1234).
 

From 3f721abc4dd8851bf55a8f183d6c79d9b89b2967 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 4 Mar 2025 11:30:13 +0530
Subject: [PATCH 697/796] [mob] Simplify batch insert for files

---
 mobile/lib/db/files_db.dart             | 120 +++++++++---------------
 mobile/lib/utils/primitive_wrapper.dart |   6 --
 2 files changed, 43 insertions(+), 83 deletions(-)
 delete mode 100644 mobile/lib/utils/primitive_wrapper.dart

diff --git a/mobile/lib/db/files_db.dart b/mobile/lib/db/files_db.dart
index c734044c4c..8f1fe5a1e2 100644
--- a/mobile/lib/db/files_db.dart
+++ b/mobile/lib/db/files_db.dart
@@ -15,7 +15,6 @@ import 'package:photos/models/location/location.dart';
 import "package:photos/models/metadata/common_keys.dart";
 import "package:photos/services/filter/db_filters.dart";
 import 'package:photos/utils/file_uploader_util.dart';
-import "package:photos/utils/primitive_wrapper.dart";
 import "package:photos/utils/sqlite_util.dart";
 import 'package:sqlite_async/sqlite_async.dart';
 
@@ -468,73 +467,62 @@ class FilesDB {
     final startTime = DateTime.now();
     final db = await sqliteAsyncDB;
 
-    ///Strong batch counter in an object so that it gets passed by reference
-    ///Primitives are passed by value
-    final genIdNotNullbatchCounter = PrimitiveWrapper(0);
-    final genIdNullbatchCounter = PrimitiveWrapper(0);
-    final genIdNullParameterSets = <List<Object?>>[];
-    final genIdNotNullParameterSets = <List<Object?>>[];
+    final withIdParams = <List<Object?>>[];
+    const withIdColumnNames = _columnNames;
+    final withoutIdParams = <List<Object?>>[];
+    final withoutIdColumns =
+        _columnNames.where((column) => column != columnGeneratedID).toList();
 
-    final genIdNullcolumnNames =
-        _columnNames.where((element) => element != columnGeneratedID);
+    // Sort files into appropriate parameter sets
+    for (final file in files) {
+      if (file.generatedID == null) {
+        withoutIdParams.add(_getParameterSetForFile(file));
 
-    for (EnteFile file in files) {
-      final fileGenIdIsNull = file.generatedID == null;
-
-      if (!fileGenIdIsNull) {
-        await _batchAndInsertFile(
-          file,
-          conflictAlgorithm,
-          db,
-          genIdNotNullParameterSets,
-          genIdNotNullbatchCounter,
-          isGenIdNull: fileGenIdIsNull,
-        );
+        if (withoutIdParams.length == 400) {
+          await _insertBatch(
+            conflictAlgorithm,
+            withoutIdColumns,
+            db,
+            withoutIdParams,
+          );
+          withoutIdParams.clear();
+        }
       } else {
-        await _batchAndInsertFile(
-          file,
-          conflictAlgorithm,
-          db,
-          genIdNullParameterSets,
-          genIdNullbatchCounter,
-          isGenIdNull: fileGenIdIsNull,
-        );
+        withIdParams.add(_getParameterSetForFile(file));
+        if (withIdParams.length == 400) {
+          await _insertBatch(
+            conflictAlgorithm,
+            withIdColumnNames,
+            db,
+            withIdParams,
+          );
+          withIdParams.clear();
+        }
       }
     }
 
-    if (genIdNotNullbatchCounter.value > 0) {
+    // Insert any remaining files
+    if (withIdParams.isNotEmpty) {
       await _insertBatch(
         conflictAlgorithm,
-        _columnNames,
+        withIdColumnNames,
         db,
-        genIdNotNullParameterSets,
+        withIdParams,
       );
-      genIdNotNullbatchCounter.value = 0;
-      genIdNotNullParameterSets.clear();
-    }
-    if (genIdNullbatchCounter.value > 0) {
-      await _insertBatch(
-        conflictAlgorithm,
-        genIdNullcolumnNames,
-        db,
-        genIdNullParameterSets,
-      );
-      genIdNullbatchCounter.value = 0;
-      genIdNullParameterSets.clear();
     }
 
-    final endTime = DateTime.now();
-    final duration = Duration(
-      microseconds:
-          endTime.microsecondsSinceEpoch - startTime.microsecondsSinceEpoch,
-    );
+    if (withoutIdParams.isNotEmpty) {
+      await _insertBatch(
+        conflictAlgorithm,
+        withoutIdColumns,
+        db,
+        withoutIdParams,
+      );
+    }
+
+    final duration = DateTime.now().difference(startTime);
     _logger.info(
-      "Batch insert of " +
-          files.length.toString() +
-          " took " +
-          duration.inMilliseconds.toString() +
-          "ms.",
-    );
+        "Batch insert of ${files.length} took ${duration.inMilliseconds}ms.");
   }
 
   Future<void> insert(EnteFile file) async {
@@ -1943,28 +1931,6 @@ class FilesDB {
     return values;
   }
 
-  Future<void> _batchAndInsertFile(
-    EnteFile file,
-    SqliteAsyncConflictAlgorithm conflictAlgorithm,
-    SqliteDatabase db,
-    List<List<Object?>> parameterSets,
-    PrimitiveWrapper batchCounter, {
-    required bool isGenIdNull,
-  }) async {
-    parameterSets.add(_getParameterSetForFile(file));
-    batchCounter.value++;
-
-    final columnNames = isGenIdNull
-        ? _columnNames.where((column) => column != columnGeneratedID)
-        : _columnNames;
-    if (batchCounter.value == 400) {
-      _logger.info("Inserting batch with genIdNull: $isGenIdNull");
-      await _insertBatch(conflictAlgorithm, columnNames, db, parameterSets);
-      batchCounter.value = 0;
-      parameterSets.clear();
-    }
-  }
-
   Future<void> _insertBatch(
     SqliteAsyncConflictAlgorithm conflictAlgorithm,
     Iterable<String> columnNames,
diff --git a/mobile/lib/utils/primitive_wrapper.dart b/mobile/lib/utils/primitive_wrapper.dart
deleted file mode 100644
index 20ea9bbb6e..0000000000
--- a/mobile/lib/utils/primitive_wrapper.dart
+++ /dev/null
@@ -1,6 +0,0 @@
-///This is useful when you want to pass a primitive by reference.
-
-class PrimitiveWrapper {
-  var value;
-  PrimitiveWrapper(this.value);
-}

From e145da5a8b9dbaf52ebabefa86498a324b978481 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 4 Mar 2025 11:35:33 +0530
Subject: [PATCH 698/796] [mob] move

---
 .../{utils/sqlite_util.dart => db/enum/conflict_algo.dart}  | 0
 mobile/lib/db/files_db.dart                                 | 6 +++---
 mobile/lib/services/sync/local_sync_service.dart            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename mobile/lib/{utils/sqlite_util.dart => db/enum/conflict_algo.dart} (100%)

diff --git a/mobile/lib/utils/sqlite_util.dart b/mobile/lib/db/enum/conflict_algo.dart
similarity index 100%
rename from mobile/lib/utils/sqlite_util.dart
rename to mobile/lib/db/enum/conflict_algo.dart
diff --git a/mobile/lib/db/files_db.dart b/mobile/lib/db/files_db.dart
index 8f1fe5a1e2..0568ce6018 100644
--- a/mobile/lib/db/files_db.dart
+++ b/mobile/lib/db/files_db.dart
@@ -6,6 +6,7 @@ import 'package:flutter/foundation.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
+import "package:photos/db/enum/conflict_algo.dart";
 import "package:photos/extensions/stop_watch.dart";
 import 'package:photos/models/backup_status.dart';
 import 'package:photos/models/file/file.dart';
@@ -15,7 +16,6 @@ import 'package:photos/models/location/location.dart';
 import "package:photos/models/metadata/common_keys.dart";
 import "package:photos/services/filter/db_filters.dart";
 import 'package:photos/utils/file_uploader_util.dart';
-import "package:photos/utils/sqlite_util.dart";
 import 'package:sqlite_async/sqlite_async.dart';
 
 class FilesDB {
@@ -519,10 +519,10 @@ class FilesDB {
         withoutIdParams,
       );
     }
-
     final duration = DateTime.now().difference(startTime);
     _logger.info(
-        "Batch insert of ${files.length} took ${duration.inMilliseconds}ms.");
+      "Batch insert of ${files.length} took ${duration.inMilliseconds}ms.",
+    );
   }
 
   Future<void> insert(EnteFile file) async {
diff --git a/mobile/lib/services/sync/local_sync_service.dart b/mobile/lib/services/sync/local_sync_service.dart
index e875ae2751..c635b9440d 100644
--- a/mobile/lib/services/sync/local_sync_service.dart
+++ b/mobile/lib/services/sync/local_sync_service.dart
@@ -8,6 +8,7 @@ import 'package:photos/core/configuration.dart';
 import "package:photos/core/errors.dart";
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/db/device_files_db.dart';
+import "package:photos/db/enum/conflict_algo.dart";
 import 'package:photos/db/file_updation_db.dart';
 import 'package:photos/db/files_db.dart';
 import 'package:photos/events/backup_folders_updated_event.dart';
@@ -21,7 +22,6 @@ import "package:photos/services/ignored_files_service.dart";
 import 'package:photos/services/local/local_sync_util.dart';
 import "package:photos/utils/debouncer.dart";
 import "package:photos/utils/photo_manager_util.dart";
-import "package:photos/utils/sqlite_util.dart";
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:synchronized/synchronized.dart';
 import 'package:tuple/tuple.dart';

From 71b7589de3d6c6f17409f0c3a834a2593d20fc1a Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Tue, 4 Mar 2025 11:40:11 +0530
Subject: [PATCH 699/796] [mob][photos] method to compare embeddings in
 MLComputer

---
 mobile/lib/models/ml/vector.dart              | 23 +++++++++++++++----
 mobile/lib/services/isolate_functions.dart    | 22 +++++++++++++++++-
 .../machine_learning/ml_computer.dart         | 15 ++++++++++++
 3 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/mobile/lib/models/ml/vector.dart b/mobile/lib/models/ml/vector.dart
index 1b0fd21491..925a02f6b3 100644
--- a/mobile/lib/models/ml/vector.dart
+++ b/mobile/lib/models/ml/vector.dart
@@ -1,5 +1,4 @@
 import "dart:convert";
-
 import "package:ml_linalg/vector.dart";
 
 class EmbeddingVector {
@@ -13,11 +12,25 @@ class EmbeddingVector {
     required List<double> embedding,
   }) : vector = Vector.fromList(embedding);
 
-  static Vector decodeEmbedding(String embedding) {
-    return Vector.fromList(List<double>.from(jsonDecode(embedding) as List));
+  static EmbeddingVector fromJsonString(String jsonString) {
+    return _fromJson(jsonDecode(jsonString) as Map<String, dynamic>);
   }
 
-  static String encodeEmbedding(Vector embedding) {
-    return jsonEncode(embedding.toList());
+  String toJsonString() {
+    return jsonEncode(_toJson());
+  }
+
+  Map<String, dynamic> _toJson() {
+    return {
+      "fileID": fileID,
+      "embedding": vector.toList(),
+    };
+  }
+
+  static EmbeddingVector _fromJson(Map<String, dynamic> json) {
+    return EmbeddingVector(
+      fileID: json["fileID"] as int,
+      embedding: List<double>.from(json["embedding"] as List),
+    );
   }
 }
diff --git a/mobile/lib/services/isolate_functions.dart b/mobile/lib/services/isolate_functions.dart
index 08624ef206..0ed231a63a 100644
--- a/mobile/lib/services/isolate_functions.dart
+++ b/mobile/lib/services/isolate_functions.dart
@@ -1,7 +1,9 @@
 import "dart:io" show File;
 import 'dart:typed_data' show Uint8List;
 
+import "package:ml_linalg/linalg.dart";
 import "package:photos/models/ml/face/box.dart";
+import "package:photos/models/ml/vector.dart";
 import "package:photos/services/machine_learning/face_ml/face_clustering/face_clustering_service.dart";
 import "package:photos/services/machine_learning/ml_model.dart";
 import "package:photos/services/machine_learning/ml_result.dart";
@@ -32,8 +34,11 @@ enum IsolateOperation {
   /// [MLComputer]
   runClipText,
 
+  /// [MLComputer]
+  compareEmbeddings,
+
   /// [FaceClusteringService]
-  linearIncrementalClustering
+  linearIncrementalClustering,
 }
 
 /// WARNING: Only return primitives unless you know the method is only going
@@ -115,6 +120,21 @@ Future<dynamic> isolateFunction(
       final textEmbedding = await ClipTextEncoder.predict(args);
       return List<double>.from(textEmbedding, growable: false);
 
+    /// MLComputer
+    case IsolateOperation.compareEmbeddings:
+      final List<EmbeddingVector> embeddings =
+          (args['embeddings'] as List<String>)
+              .map((jsonString) => EmbeddingVector.fromJsonString(jsonString))
+              .toList();
+      final otherEmbedding =
+          Vector.fromList(args['otherEmbedding'] as List<double>);
+      final Map<int, double> result = {};
+      for (final embedding in embeddings) {
+        final double similarity = embedding.vector.dot(otherEmbedding);
+        result[embedding.fileID] = similarity;
+      }
+      return Map.from(result);
+
     /// Cases for MLComputer end here
 
     /// Cases for FaceClusteringService start here
diff --git a/mobile/lib/services/machine_learning/ml_computer.dart b/mobile/lib/services/machine_learning/ml_computer.dart
index bce51b674a..3301f6b7c6 100644
--- a/mobile/lib/services/machine_learning/ml_computer.dart
+++ b/mobile/lib/services/machine_learning/ml_computer.dart
@@ -2,7 +2,9 @@ import 'dart:async';
 import 'dart:typed_data' show Uint8List;
 
 import "package:logging/logging.dart";
+import "package:ml_linalg/linalg.dart";
 import "package:photos/models/ml/face/box.dart";
+import "package:photos/models/ml/vector.dart";
 import "package:photos/services/isolate_functions.dart";
 import "package:photos/services/isolate_service.dart";
 import "package:photos/services/machine_learning/semantic_search/clip/clip_text_encoder.dart";
@@ -64,6 +66,19 @@ class MLComputer extends SuperIsolate {
     }
   }
 
+  Future<Map<int, double>> compareEmbeddings(List<EmbeddingVector> embeddings, Vector otherEmbedding) async {
+    try {
+      final fileIdToSimilarity = await runInIsolate(IsolateOperation.compareEmbeddings, {
+        "embeddings": embeddings.map((e) => e.toJsonString()).toList(),
+        "otherEmbedding": otherEmbedding.toList(),
+      }) as Map<int, double>;
+      return fileIdToSimilarity;
+    } catch (e, s) {
+      _logger.severe("Could not compare embeddings MLComputer isolate", e, s);
+      rethrow;
+    }
+  }
+
   Future<void> _ensureLoadedClipTextModel() async {
     return _initModelLock.synchronized(() async {
       if (ClipTextEncoder.instance.isInitialized) return;

From 4439d97f314401e3ac14177404e3310b44e6cb90 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 4 Mar 2025 12:20:17 +0530
Subject: [PATCH 700/796] chore: add doc for appendPreview

---
 mobile/lib/services/filedata/filedata_service.dart | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mobile/lib/services/filedata/filedata_service.dart b/mobile/lib/services/filedata/filedata_service.dart
index 22fa04e557..d876aba256 100644
--- a/mobile/lib/services/filedata/filedata_service.dart
+++ b/mobile/lib/services/filedata/filedata_service.dart
@@ -29,6 +29,9 @@ class FileDataService {
     _prefs = prefs;
   }
 
+  /// Used to not sync preview ids everytime a chunking and preview
+  /// upload is successful, instead update the local copy of those
+  /// preview ids
   void appendPreview(int id) {
     if (previewIds?.containsKey(id) ?? false) return;
     previewIds ??= {};

From 5a2be86524046eca148e5903a3c6e68382b7d227 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 4 Mar 2025 12:57:30 +0530
Subject: [PATCH 701/796] fix: make uploadedFileID as the primary key

---
 mobile/lib/db/upload_locks_db.dart           | 4 +---
 mobile/lib/services/preview_video_store.dart | 8 +++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mobile/lib/db/upload_locks_db.dart b/mobile/lib/db/upload_locks_db.dart
index 32ff836402..f2aca98a56 100644
--- a/mobile/lib/db/upload_locks_db.dart
+++ b/mobile/lib/db/upload_locks_db.dart
@@ -47,7 +47,6 @@ class UploadLocksDB {
 
   static const _streamUploadErrorTable = (
     table: "stream_upload_error",
-    columnID: "id",
     columnUploadedFileID: "uploaded_file_id",
     columnErrorMessage: "error_message",
     columnLastAttemptedAt: "last_attempted_at",
@@ -129,8 +128,7 @@ class UploadLocksDB {
                 ''',
       '''
                 CREATE TABLE IF NOT EXISTS ${_streamUploadErrorTable.table} (
-                  ${_streamUploadErrorTable.columnID} INTEGER PRIMARY KEY,
-                  ${_streamUploadErrorTable.columnUploadedFileID} INTEGER NOT NULL,
+                  ${_streamUploadErrorTable.columnUploadedFileID} INTEGER PRIMARY KEY,
                   ${_streamUploadErrorTable.columnErrorMessage} TEXT NOT NULL,
                   ${_streamUploadErrorTable.columnLastAttemptedAt} INTEGER NOT NULL,
                   ${_streamUploadErrorTable.columnCreatedAt} INTEGER DEFAULT CURRENT_TIMESTAMP NOT NULL
diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 47463ef6e3..98637776bf 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -677,6 +677,7 @@ class PreviewVideoStore {
 
     final cutoff = videoStreamingCutoff;
     if (cutoff == null) return;
+    initSuccess = true;
 
     Map<int, String> failureFiles = {};
     try {
@@ -752,13 +753,14 @@ class PreviewVideoStore {
     // take first file and put it for stream generation
     final file = allFiles.removeAt(0);
     fileQueue.addAll(allFiles);
-    initSuccess = true;
-    await chunkAndUploadVideo(null, file);
+    chunkAndUploadVideo(null, file).ignore();
   }
 
   void queueFiles() {
     if (!initSuccess) {
-      _putFilesForPreviewCreation();
+      _putFilesForPreviewCreation().catchError((_) {
+        initSuccess = false;
+      });
     }
   }
 }

From 33cd46583e105304c16fdd3cc385f0271dc3b5e3 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 4 Mar 2025 13:02:16 +0530
Subject: [PATCH 702/796] fix: only update init if called from correct function

---
 mobile/lib/services/preview_video_store.dart | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 98637776bf..4312ad5168 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -46,7 +46,7 @@ class PreviewVideoStore {
   LinkedHashMap<int, PreviewItem> get previews => _items;
   late Set<int> _failureFiles;
 
-  bool initSuccess = false;
+  bool _initSuccess = false;
 
   PreviewVideoStore._privateConstructor();
 
@@ -672,12 +672,12 @@ class PreviewVideoStore {
   }
 
   // generate stream for all files after cutoff date
-  Future<void> _putFilesForPreviewCreation() async {
+  Future<void> _putFilesForPreviewCreation([bool updateInit = false]) async {
     if (!isVideoStreamingEnabled || !await canUseHighBandwidth()) return;
 
     final cutoff = videoStreamingCutoff;
     if (cutoff == null) return;
-    initSuccess = true;
+    if (updateInit) _initSuccess = true;
 
     Map<int, String> failureFiles = {};
     try {
@@ -757,9 +757,9 @@ class PreviewVideoStore {
   }
 
   void queueFiles() {
-    if (!initSuccess) {
-      _putFilesForPreviewCreation().catchError((_) {
-        initSuccess = false;
+    if (!_initSuccess) {
+      _putFilesForPreviewCreation(true).catchError((_) {
+        _initSuccess = false;
       });
     }
   }

From b922bacb78999739884b8805475b2a665cc72fb9 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Tue, 4 Mar 2025 13:45:26 +0530
Subject: [PATCH 703/796] [mob][photos] Move dot product inside MLComputer

---
 mobile/lib/db/ml/base.dart                    |  3 --
 mobile/lib/db/ml/db.dart                      | 16 ------
 .../semantic_search_service.dart              | 19 +++++--
 .../lib/services/smart_memories_service.dart  | 49 ++++++++-----------
 4 files changed, 36 insertions(+), 51 deletions(-)

diff --git a/mobile/lib/db/ml/base.dart b/mobile/lib/db/ml/base.dart
index c2685b1214..a99f70f813 100644
--- a/mobile/lib/db/ml/base.dart
+++ b/mobile/lib/db/ml/base.dart
@@ -108,9 +108,6 @@ abstract class IMLDataDB<T> {
 
   Future<List<EmbeddingVector>> getAllClipVectors();
   Future<Map<int, int>> clipIndexedFileWithVersion();
-  Future<Map<int, EmbeddingVector>> getClipVectorsForFileIDs(
-    Iterable<int> fileIDs,
-  );
   Future<int> getClipIndexedFileCount({int minimumMlVersion});
   Future<void> putClip(List<ClipEmbedding> embeddings);
   Future<void> deleteClipEmbeddings(List<T> fileIDs);
diff --git a/mobile/lib/db/ml/db.dart b/mobile/lib/db/ml/db.dart
index 3ea5d88c53..124d5052d8 100644
--- a/mobile/lib/db/ml/db.dart
+++ b/mobile/lib/db/ml/db.dart
@@ -1196,22 +1196,6 @@ class MLDataDB extends IMLDataDB<int> {
     return _convertToVectors(results);
   }
 
-  @override
-  Future<Map<int, EmbeddingVector>> getClipVectorsForFileIDs(
-    Iterable<int> fileIDs,
-  ) async {
-    final db = await MLDataDB.instance.asyncDB;
-    final results = await db.getAll(
-      'SELECT * FROM $clipTable WHERE $fileIDColumn IN (${fileIDs.join(", ")})',
-    );
-    final Map<int, EmbeddingVector> embeddings = {};
-    for (final result in results) {
-      final embedding = _getVectorFromRow(result);
-      embeddings[embedding.fileID] = embedding;
-    }
-    return embeddings;
-  }
-
   // Get indexed FileIDs
   @override
   Future<Map<int, int>> clipIndexedFileWithVersion() async {
diff --git a/mobile/lib/services/machine_learning/semantic_search/semantic_search_service.dart b/mobile/lib/services/machine_learning/semantic_search/semantic_search_service.dart
index df56796cd1..cf475d399c 100644
--- a/mobile/lib/services/machine_learning/semantic_search/semantic_search_service.dart
+++ b/mobile/lib/services/machine_learning/semantic_search/semantic_search_service.dart
@@ -57,7 +57,7 @@ class SemanticSearchService {
 
     // call getClipEmbeddings after 5 seconds
     Future.delayed(const Duration(seconds: 5), () async {
-      await getClipVectors();
+      await _getClipVectors();
     });
     Bus.instance.on<EmbeddingUpdatedEvent>().listen((event) {
       _cachedImageEmbeddingVectors = null;
@@ -112,7 +112,20 @@ class SemanticSearchService {
     _logger.info("Indexes cleared");
   }
 
-  Future<List<EmbeddingVector>> getClipVectors() async {
+  Future<List<EmbeddingVector>> getClipVectorsForFileIDs(
+    Iterable<int> fileIDs,
+  ) async {
+    final embeddings = await _getClipVectors();
+    final result = <EmbeddingVector>[];
+    for (final embedding in embeddings) {
+      if (fileIDs.contains(embedding.fileID)) {
+        result.add(embedding);
+      }
+    }
+    return result;
+  }
+
+  Future<List<EmbeddingVector>> _getClipVectors() async {
     if (_cachedImageEmbeddingVectors != null) {
       return _cachedImageEmbeddingVectors!;
     }
@@ -245,7 +258,7 @@ class SemanticSearchService {
     double? minimumSimilarity,
   }) async {
     final startTime = DateTime.now();
-    final imageEmbeddings = await getClipVectors();
+    final imageEmbeddings = await _getClipVectors();
     final List<QueryResult> queryResults = await _computer.compute(
       computeBulkSimilarities,
       param: {
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 964c82127e..3651ea98eb 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -21,6 +21,7 @@ import "package:photos/models/memories_cache.dart";
 import "package:photos/models/memory.dart";
 import "package:photos/models/ml/face/face.dart";
 import "package:photos/models/ml/face/person.dart";
+import "package:photos/models/ml/vector.dart";
 import "package:photos/models/people_memory.dart";
 import "package:photos/models/smart_memory.dart";
 import "package:photos/models/time_memory.dart";
@@ -30,6 +31,7 @@ import "package:photos/services/location_service.dart";
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
 import "package:photos/services/machine_learning/ml_computer.dart";
 import "package:photos/services/machine_learning/ml_result.dart";
+import "package:photos/services/machine_learning/semantic_search/semantic_search_service.dart";
 import "package:photos/services/search_service.dart";
 
 class SmartMemoriesService {
@@ -260,8 +262,8 @@ class SmartMemoriesService {
 
       // Inside people loop, check for doingSomethingTogether
       if (isMeAssigned && meID != personID) {
-        final fileIdToClip =
-            await MLDataDB.instance.getClipVectorsForFileIDs(personFileIDs);
+        final vectors = await SemanticSearchService.instance
+            .getClipVectorsForFileIDs(personFileIDs);
         final activityFiles = <EnteFile>[];
         PeopleActivity lastActivity = PeopleActivity.values.first;
         activityLoop:
@@ -273,10 +275,11 @@ class SmartMemoriesService {
             _logger.severe("No vector for activity $activity");
             continue activityLoop;
           }
+          final similarities = await MLComputer.instance
+              .compareEmbeddings(vectors, activityVector);
           for (final fileID in personFileIDs) {
-            final clipVector = fileIdToClip[fileID];
-            if (clipVector == null) continue;
-            final similarity = activityVector.dot(clipVector.vector);
+            final similarity = similarities[fileID];
+            if (similarity == null) continue;
             if (similarity > _clipActivityQueryThreshold) {
               final file = allFileIdsToFile[fileID];
               if (file != null) {
@@ -1255,23 +1258,14 @@ class SmartMemoriesService {
       bucketLoop:
       for (final bucket in timeBuckets) {
         // Get X% most nostalgic photos
-        final nostalgiaScores = <int, double>{};
         final bucketFileIDs = bucket
             .map((memory) => memory.file.uploadedFileID!)
             .toSet()
             .toList();
-        final bucketFileIdToClip =
-            await MLDataDB.instance.getClipVectorsForFileIDs(bucketFileIDs);
-        for (final mem in bucket) {
-          final fileID = mem.file.uploadedFileID!;
-          final clip = bucketFileIdToClip[fileID];
-          if (clip == null) {
-            nostalgiaScores[fileID] = 0;
-            continue;
-          }
-          final score = clip.vector.dot(_clipPositiveTextVector!);
-          nostalgiaScores[fileID] = score;
-        }
+        final bucketVectors = await SemanticSearchService.instance
+            .getClipVectorsForFileIDs(bucketFileIDs);
+        final nostalgiaScores = await MLComputer.instance
+            .compareEmbeddings(bucketVectors, _clipPositiveTextVector!);
         final sortedNostalgia = bucket
           ..sort(
             (a, b) => nostalgiaScores[b.file.uploadedFileID!]!
@@ -1347,8 +1341,7 @@ class SmartMemoriesService {
         fileIdToFace.values.expand((x) => x.map((face) => face.faceID)).toSet();
     final faceIDsToPersonID =
         await MLDataDB.instance.getFaceIdToPersonIdForFaces(faceIDs);
-    final fileIdToClip =
-        await MLDataDB.instance.getClipVectorsForFileIDs(fileIDs);
+
     final allYears = safeMemories.map((e) {
       final creationTime =
           DateTime.fromMicrosecondsSinceEpoch(e.file.creationTime!);
@@ -1356,16 +1349,14 @@ class SmartMemoriesService {
     }).toSet();
 
     // Get clip scores for each file
-    final fileToScore = <int, double>{};
-    for (final mem in safeMemories) {
-      final clip = fileIdToClip[mem.file.uploadedFileID!];
-      if (clip == null) {
-        fileToScore[mem.file.uploadedFileID!] = 0;
-        continue;
+    final vectors =
+        await SemanticSearchService.instance.getClipVectorsForFileIDs(fileIDs);
+    final fileToScore = await MLComputer.instance
+        .compareEmbeddings(vectors, _clipPositiveTextVector!);
+    final fileIdToClip = <int, EmbeddingVector>{};
+      for (final vector in vectors) {
+        fileIdToClip[vector.fileID] = vector;
       }
-      final score = clip.vector.dot(_clipPositiveTextVector!);
-      fileToScore[mem.file.uploadedFileID!] = score;
-    }
 
     // Get face scores for each file
     final fileToFaceCount = <int, int>{};

From fd5501882b2a817360b186cdf509d3c6b569ab4f Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 4 Mar 2025 13:54:26 +0530
Subject: [PATCH 704/796] [mob] Move toast

---
 mobile/lib/emergency/emergency_page.dart                      | 2 +-
 mobile/lib/emergency/recover_others_account.dart              | 2 +-
 mobile/lib/services/account/user_service.dart                 | 2 +-
 mobile/lib/services/local_authentication_service.dart         | 2 +-
 mobile/lib/services/preview_video_store.dart                  | 2 +-
 mobile/lib/ui/account/delete_account_page.dart                | 2 +-
 mobile/lib/ui/account/email_entry_page.dart                   | 2 +-
 mobile/lib/ui/account/passkey_page.dart                       | 2 +-
 mobile/lib/ui/account/password_entry_page.dart                | 2 +-
 mobile/lib/ui/account/recovery_key_page.dart                  | 2 +-
 mobile/lib/ui/account/recovery_page.dart                      | 3 +--
 mobile/lib/ui/account/sessions_page.dart                      | 2 +-
 mobile/lib/ui/account/two_factor_setup_page.dart              | 2 +-
 mobile/lib/ui/actions/collection/collection_file_actions.dart | 2 +-
 .../lib/ui/actions/collection/collection_sharing_actions.dart | 2 +-
 mobile/lib/ui/actions/file/file_actions.dart                  | 2 +-
 mobile/lib/ui/collections/album/vertical_list.dart            | 2 +-
 mobile/lib/ui/map/enable_map.dart                             | 2 +-
 mobile/lib/ui/map/map_screen.dart                             | 2 +-
 .../lib/{utils/toast_util.dart => ui/notification/toast.dart} | 0
 mobile/lib/ui/payment/store_subscription_page.dart            | 2 +-
 mobile/lib/ui/payment/stripe_subscription_page.dart           | 2 +-
 mobile/lib/ui/settings/about_section_widget.dart              | 2 +-
 mobile/lib/ui/settings/backup/free_space_options.dart         | 2 +-
 mobile/lib/ui/settings/debug/debug_section_widget.dart        | 2 +-
 mobile/lib/ui/settings/debug/ml_debug_section_widget.dart     | 2 +-
 mobile/lib/ui/settings/developer_settings_page.dart           | 2 +-
 mobile/lib/ui/settings/ml/ml_user_dev_screen.dart             | 2 +-
 mobile/lib/ui/settings/security_section_widget.dart           | 4 ++--
 mobile/lib/ui/sharing/add_participant_page.dart               | 2 +-
 mobile/lib/ui/sharing/manage_links_widget.dart                | 2 +-
 mobile/lib/ui/sharing/share_collection_page.dart              | 2 +-
 mobile/lib/ui/tabs/shared/empty_state.dart                    | 2 +-
 mobile/lib/ui/tools/collage/collage_save_button.dart          | 2 +-
 mobile/lib/ui/tools/editor/image_editor_page.dart             | 2 +-
 mobile/lib/ui/tools/editor/video_editor_page.dart             | 2 +-
 .../lib/ui/viewer/actions/file_selection_actions_widget.dart  | 2 +-
 mobile/lib/ui/viewer/file/detail_page.dart                    | 2 +-
 mobile/lib/ui/viewer/file/file_app_bar.dart                   | 2 +-
 mobile/lib/ui/viewer/file/video_widget_media_kit.dart         | 2 +-
 mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart     | 2 +-
 mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart | 2 +-
 mobile/lib/ui/viewer/file/video_widget_native.dart            | 2 +-
 mobile/lib/ui/viewer/file/zoomable_live_image_new.dart        | 2 +-
 mobile/lib/ui/viewer/file_details/exif_item_widgets.dart      | 2 +-
 mobile/lib/ui/viewer/file_details/face_widget.dart            | 2 +-
 mobile/lib/ui/viewer/file_details/favorite_widget.dart        | 2 +-
 mobile/lib/ui/viewer/file_details/upload_icon_widget.dart     | 2 +-
 mobile/lib/ui/viewer/file_details/video_exif_item.dart        | 2 +-
 mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart      | 2 +-
 .../lib/ui/viewer/gallery/shared_public_collection_page.dart  | 2 +-
 .../lib/ui/viewer/location/update_location_data_widget.dart   | 2 +-
 mobile/lib/ui/viewer/people/cluster_page.dart                 | 2 +-
 .../lib/ui/viewer/people/person_selection_action_widgets.dart | 2 +-
 mobile/lib/ui/viewer/people/save_or_edit_person.dart          | 2 +-
 mobile/lib/utils/delete_file_util.dart                        | 2 +-
 mobile/lib/utils/email_util.dart                              | 2 +-
 mobile/lib/utils/magic_util.dart                              | 2 +-
 58 files changed, 58 insertions(+), 59 deletions(-)
 rename mobile/lib/{utils/toast_util.dart => ui/notification/toast.dart} (100%)

diff --git a/mobile/lib/emergency/emergency_page.dart b/mobile/lib/emergency/emergency_page.dart
index 04c60b7923..a4b218badb 100644
--- a/mobile/lib/emergency/emergency_page.dart
+++ b/mobile/lib/emergency/emergency_page.dart
@@ -23,9 +23,9 @@ import "package:photos/ui/components/models/button_type.dart";
 import "package:photos/ui/components/notification_widget.dart";
 import 'package:photos/ui/components/title_bar_title_widget.dart';
 import 'package:photos/ui/components/title_bar_widget.dart';
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/ui/sharing/user_avator_widget.dart";
 import "package:photos/utils/navigation_util.dart";
-import "package:photos/utils/toast_util.dart";
 
 class EmergencyPage extends StatefulWidget {
   const EmergencyPage({
diff --git a/mobile/lib/emergency/recover_others_account.dart b/mobile/lib/emergency/recover_others_account.dart
index 58d4714da7..4c31c971e4 100644
--- a/mobile/lib/emergency/recover_others_account.dart
+++ b/mobile/lib/emergency/recover_others_account.dart
@@ -11,8 +11,8 @@ import "package:photos/generated/l10n.dart";
 import "package:photos/models/api/user/key_attributes.dart";
 import "package:photos/models/api/user/set_keys_request.dart";
 import 'package:photos/ui/common/dynamic_fab.dart';
+import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/utils/dialog_util.dart';
-import 'package:photos/utils/toast_util.dart';
 
 class RecoverOthersAccount extends StatefulWidget {
   final String recoveryKey;
diff --git a/mobile/lib/services/account/user_service.dart b/mobile/lib/services/account/user_service.dart
index 03c1123a38..82341c5e6f 100644
--- a/mobile/lib/services/account/user_service.dart
+++ b/mobile/lib/services/account/user_service.dart
@@ -40,10 +40,10 @@ import 'package:photos/ui/account/two_factor_authentication_page.dart';
 import 'package:photos/ui/account/two_factor_recovery_page.dart';
 import 'package:photos/ui/account/two_factor_setup_page.dart';
 import "package:photos/ui/common/progress_dialog.dart";
+import 'package:photos/ui/notification/toast.dart';
 import "package:photos/ui/tabs/home_widget.dart";
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/navigation_util.dart';
-import 'package:photos/utils/toast_util.dart';
 import "package:pointycastle/export.dart";
 import "package:pointycastle/srp/srp6_client.dart";
 import "package:pointycastle/srp/srp6_standard_groups.dart";
diff --git a/mobile/lib/services/local_authentication_service.dart b/mobile/lib/services/local_authentication_service.dart
index fecca7ac70..3fb2aaf275 100644
--- a/mobile/lib/services/local_authentication_service.dart
+++ b/mobile/lib/services/local_authentication_service.dart
@@ -3,12 +3,12 @@ import "dart:async";
 import 'package:flutter/material.dart';
 import 'package:local_auth/local_auth.dart';
 import 'package:photos/core/configuration.dart';
+import 'package:photos/ui/notification/toast.dart';
 import "package:photos/ui/settings/lock_screen/lock_screen_password.dart";
 import "package:photos/ui/settings/lock_screen/lock_screen_pin.dart";
 import 'package:photos/ui/tools/app_lock.dart';
 import 'package:photos/utils/auth_util.dart';
 import 'package:photos/utils/dialog_util.dart';
-import 'package:photos/utils/toast_util.dart';
 
 class LocalAuthenticationService {
   LocalAuthenticationService._privateConstructor();
diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 556eb5193e..b461b25118 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -30,11 +30,11 @@ import "package:photos/models/preview/playlist_data.dart";
 import "package:photos/models/preview/preview_item.dart";
 import "package:photos/models/preview/preview_item_status.dart";
 import "package:photos/services/filedata/filedata_service.dart";
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/utils/exif_util.dart";
 import "package:photos/utils/file_key.dart";
 import "package:photos/utils/file_util.dart";
 import "package:photos/utils/gzip.dart";
-import "package:photos/utils/toast_util.dart";
 import "package:shared_preferences/shared_preferences.dart";
 
 class PreviewVideoStore {
diff --git a/mobile/lib/ui/account/delete_account_page.dart b/mobile/lib/ui/account/delete_account_page.dart
index 7fed66a104..961549a859 100644
--- a/mobile/lib/ui/account/delete_account_page.dart
+++ b/mobile/lib/ui/account/delete_account_page.dart
@@ -12,8 +12,8 @@ import 'package:photos/services/account/user_service.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
 import 'package:photos/ui/components/models/button_type.dart';
+import "package:photos/ui/notification/toast.dart";
 import 'package:photos/utils/dialog_util.dart';
-import "package:photos/utils/toast_util.dart";
 
 class DeleteAccountPage extends StatefulWidget {
   const DeleteAccountPage({
diff --git a/mobile/lib/ui/account/email_entry_page.dart b/mobile/lib/ui/account/email_entry_page.dart
index 26cf44c53f..73e04e0f61 100644
--- a/mobile/lib/ui/account/email_entry_page.dart
+++ b/mobile/lib/ui/account/email_entry_page.dart
@@ -9,8 +9,8 @@ import 'package:photos/services/account/user_service.dart';
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/common/dynamic_fab.dart';
 import 'package:photos/ui/common/web_page.dart';
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/utils/dialog_util.dart";
-import "package:photos/utils/toast_util.dart";
 import 'package:step_progress_indicator/step_progress_indicator.dart';
 import "package:styled_text/styled_text.dart";
 
diff --git a/mobile/lib/ui/account/passkey_page.dart b/mobile/lib/ui/account/passkey_page.dart
index 39b3fd341c..8db4c3a130 100644
--- a/mobile/lib/ui/account/passkey_page.dart
+++ b/mobile/lib/ui/account/passkey_page.dart
@@ -12,9 +12,9 @@ import 'package:photos/services/account/user_service.dart';
 import "package:photos/ui/account/two_factor_authentication_page.dart";
 import "package:photos/ui/components/buttons/button_widget.dart";
 import "package:photos/ui/components/models/button_type.dart";
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/navigation_util.dart";
-import "package:photos/utils/toast_util.dart";
 import "package:uni_links/uni_links.dart";
 import 'package:url_launcher/url_launcher_string.dart';
 
diff --git a/mobile/lib/ui/account/password_entry_page.dart b/mobile/lib/ui/account/password_entry_page.dart
index 37a358ae0b..a8d7e5d82f 100644
--- a/mobile/lib/ui/account/password_entry_page.dart
+++ b/mobile/lib/ui/account/password_entry_page.dart
@@ -17,10 +17,10 @@ import 'package:photos/ui/account/recovery_key_page.dart';
 import 'package:photos/ui/common/dynamic_fab.dart';
 import 'package:photos/ui/common/web_page.dart';
 import "package:photos/ui/components/models/button_type.dart";
+import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/ui/payment/subscription.dart';
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/navigation_util.dart';
-import 'package:photos/utils/toast_util.dart';
 import "package:styled_text/styled_text.dart";
 
 enum PasswordEntryMode {
diff --git a/mobile/lib/ui/account/recovery_key_page.dart b/mobile/lib/ui/account/recovery_key_page.dart
index 69b3ff672c..1d4d9a57d7 100644
--- a/mobile/lib/ui/account/recovery_key_page.dart
+++ b/mobile/lib/ui/account/recovery_key_page.dart
@@ -10,7 +10,7 @@ import 'package:photos/core/constants.dart';
 import 'package:photos/ente_theme_data.dart';
 import "package:photos/generated/l10n.dart";
 import 'package:photos/ui/common/gradient_button.dart';
-import 'package:photos/utils/toast_util.dart';
+import 'package:photos/ui/notification/toast.dart';
 import "package:share_plus/share_plus.dart";
 import 'package:step_progress_indicator/step_progress_indicator.dart';
 
diff --git a/mobile/lib/ui/account/recovery_page.dart b/mobile/lib/ui/account/recovery_page.dart
index 90c4279039..1d3dd142be 100644
--- a/mobile/lib/ui/account/recovery_page.dart
+++ b/mobile/lib/ui/account/recovery_page.dart
@@ -1,12 +1,11 @@
-
 import 'package:flutter/material.dart';
 import 'package:photos/core/configuration.dart';
 import "package:photos/generated/l10n.dart";
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/account/password_entry_page.dart';
 import 'package:photos/ui/common/dynamic_fab.dart';
+import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/utils/dialog_util.dart';
-import 'package:photos/utils/toast_util.dart';
 
 class RecoveryPage extends StatefulWidget {
   const RecoveryPage({super.key});
diff --git a/mobile/lib/ui/account/sessions_page.dart b/mobile/lib/ui/account/sessions_page.dart
index da69faee96..64eaf80d72 100644
--- a/mobile/lib/ui/account/sessions_page.dart
+++ b/mobile/lib/ui/account/sessions_page.dart
@@ -7,9 +7,9 @@ import 'package:photos/models/api/user/sessions.dart';
 import 'package:photos/services/account/user_service.dart';
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/common/loading_widget.dart';
+import 'package:photos/ui/notification/toast.dart';
 import "package:photos/utils/date_time_util.dart";
 import 'package:photos/utils/dialog_util.dart';
-import 'package:photos/utils/toast_util.dart';
 
 class SessionsPage extends StatefulWidget {
   const SessionsPage({super.key});
diff --git a/mobile/lib/ui/account/two_factor_setup_page.dart b/mobile/lib/ui/account/two_factor_setup_page.dart
index 3cd4082dbc..5817b4afed 100644
--- a/mobile/lib/ui/account/two_factor_setup_page.dart
+++ b/mobile/lib/ui/account/two_factor_setup_page.dart
@@ -9,8 +9,8 @@ import "package:photos/generated/l10n.dart";
 import 'package:photos/services/account/user_service.dart';
 import 'package:photos/ui/account/recovery_key_page.dart';
 import 'package:photos/ui/lifecycle_event_handler.dart';
+import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/utils/navigation_util.dart';
-import 'package:photos/utils/toast_util.dart';
 import "package:pinput/pinput.dart";
 
 class TwoFactorSetupPage extends StatefulWidget {
diff --git a/mobile/lib/ui/actions/collection/collection_file_actions.dart b/mobile/lib/ui/actions/collection/collection_file_actions.dart
index 7ef1dfaf74..cf28e6687c 100644
--- a/mobile/lib/ui/actions/collection/collection_file_actions.dart
+++ b/mobile/lib/ui/actions/collection/collection_file_actions.dart
@@ -20,10 +20,10 @@ import 'package:photos/ui/common/progress_dialog.dart';
 import 'package:photos/ui/components/action_sheet_widget.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
 import 'package:photos/ui/components/models/button_type.dart';
+import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/utils/dialog_util.dart';
 import "package:photos/utils/file_uploader.dart";
 import "package:photos/utils/share_util.dart";
-import 'package:photos/utils/toast_util.dart';
 import "package:receive_sharing_intent/receive_sharing_intent.dart";
 
 extension CollectionFileActions on CollectionActions {
diff --git a/mobile/lib/ui/actions/collection/collection_sharing_actions.dart b/mobile/lib/ui/actions/collection/collection_sharing_actions.dart
index b7cc2350c3..7c8074bd7b 100644
--- a/mobile/lib/ui/actions/collection/collection_sharing_actions.dart
+++ b/mobile/lib/ui/actions/collection/collection_sharing_actions.dart
@@ -25,12 +25,12 @@ import 'package:photos/ui/components/action_sheet_widget.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
 import 'package:photos/ui/components/dialog_widget.dart';
 import 'package:photos/ui/components/models/button_type.dart';
+import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/ui/payment/subscription.dart';
 import 'package:photos/utils/date_time_util.dart';
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/email_util.dart';
 import 'package:photos/utils/share_util.dart';
-import 'package:photos/utils/toast_util.dart';
 import "package:styled_text/styled_text.dart";
 
 class CollectionActions {
diff --git a/mobile/lib/ui/actions/file/file_actions.dart b/mobile/lib/ui/actions/file/file_actions.dart
index 03f8a2d3ac..60dfeaf739 100644
--- a/mobile/lib/ui/actions/file/file_actions.dart
+++ b/mobile/lib/ui/actions/file/file_actions.dart
@@ -10,11 +10,11 @@ import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/components/action_sheet_widget.dart";
 import 'package:photos/ui/components/buttons/button_widget.dart';
 import "package:photos/ui/components/models/button_type.dart";
+import "package:photos/ui/notification/toast.dart";
 import 'package:photos/ui/viewer/file/file_details_widget.dart';
 import "package:photos/utils/delete_file_util.dart";
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/panorama_util.dart";
-import "package:photos/utils/toast_util.dart";
 
 Future<void> showSingleFileDeleteSheet(
   BuildContext context,
diff --git a/mobile/lib/ui/collections/album/vertical_list.dart b/mobile/lib/ui/collections/album/vertical_list.dart
index 79b75b6303..78bcdc8b2f 100644
--- a/mobile/lib/ui/collections/album/vertical_list.dart
+++ b/mobile/lib/ui/collections/album/vertical_list.dart
@@ -17,12 +17,12 @@ import "package:photos/ui/actions/collection/collection_sharing_actions.dart";
 import "package:photos/ui/collections/album/column_item.dart";
 import "package:photos/ui/collections/album/new_list_item.dart";
 import 'package:photos/ui/collections/collection_action_sheet.dart';
+import 'package:photos/ui/notification/toast.dart';
 import "package:photos/ui/sharing/share_collection_page.dart";
 import 'package:photos/ui/viewer/gallery/collection_page.dart';
 import "package:photos/ui/viewer/gallery/empty_state.dart";
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/navigation_util.dart';
-import 'package:photos/utils/toast_util.dart';
 import 'package:receive_sharing_intent/receive_sharing_intent.dart';
 
 class AlbumVerticalListWidget extends StatelessWidget {
diff --git a/mobile/lib/ui/map/enable_map.dart b/mobile/lib/ui/map/enable_map.dart
index 553e13dae4..c49353884a 100644
--- a/mobile/lib/ui/map/enable_map.dart
+++ b/mobile/lib/ui/map/enable_map.dart
@@ -5,7 +5,7 @@ import "package:photos/service_locator.dart";
 import "package:photos/ui/components/buttons/button_widget.dart";
 import "package:photos/ui/components/dialog_widget.dart";
 import "package:photos/ui/components/models/button_type.dart";
-import "package:photos/utils/toast_util.dart";
+import "package:photos/ui/notification/toast.dart";
 
 Future<bool> requestForMapEnable(BuildContext context) async {
   if (flagService.mapEnabled) {
diff --git a/mobile/lib/ui/map/map_screen.dart b/mobile/lib/ui/map/map_screen.dart
index 78120bd839..b12ce3e80c 100644
--- a/mobile/lib/ui/map/map_screen.dart
+++ b/mobile/lib/ui/map/map_screen.dart
@@ -17,7 +17,7 @@ import "package:photos/ui/map/image_marker.dart";
 import "package:photos/ui/map/map_isolate.dart";
 import "package:photos/ui/map/map_pull_up_gallery.dart";
 import "package:photos/ui/map/map_view.dart";
-import "package:photos/utils/toast_util.dart";
+import "package:photos/ui/notification/toast.dart";
 
 class MapScreen extends StatefulWidget {
   // Add a function parameter where the function returns a Future<List<File>>
diff --git a/mobile/lib/utils/toast_util.dart b/mobile/lib/ui/notification/toast.dart
similarity index 100%
rename from mobile/lib/utils/toast_util.dart
rename to mobile/lib/ui/notification/toast.dart
diff --git a/mobile/lib/ui/payment/store_subscription_page.dart b/mobile/lib/ui/payment/store_subscription_page.dart
index ab0854ef89..f0b833c367 100644
--- a/mobile/lib/ui/payment/store_subscription_page.dart
+++ b/mobile/lib/ui/payment/store_subscription_page.dart
@@ -22,6 +22,7 @@ import "package:photos/ui/components/captioned_text_widget.dart";
 import "package:photos/ui/components/divider_widget.dart";
 import "package:photos/ui/components/menu_item_widget/menu_item_widget.dart";
 import "package:photos/ui/components/title_bar_title_widget.dart";
+import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/ui/payment/child_subscription_widget.dart';
 import 'package:photos/ui/payment/subscription_common_widgets.dart';
 import 'package:photos/ui/payment/subscription_plan_widget.dart';
@@ -29,7 +30,6 @@ import "package:photos/ui/payment/view_add_on_widget.dart";
 import "package:photos/ui/tabs/home_widget.dart";
 import "package:photos/utils/data_util.dart";
 import 'package:photos/utils/dialog_util.dart';
-import 'package:photos/utils/toast_util.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
 class StoreSubscriptionPage extends StatefulWidget {
diff --git a/mobile/lib/ui/payment/stripe_subscription_page.dart b/mobile/lib/ui/payment/stripe_subscription_page.dart
index ba04d24908..707a427071 100644
--- a/mobile/lib/ui/payment/stripe_subscription_page.dart
+++ b/mobile/lib/ui/payment/stripe_subscription_page.dart
@@ -21,6 +21,7 @@ import "package:photos/ui/components/captioned_text_widget.dart";
 import "package:photos/ui/components/divider_widget.dart";
 import "package:photos/ui/components/menu_item_widget/menu_item_widget.dart";
 import "package:photos/ui/components/title_bar_title_widget.dart";
+import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/ui/payment/child_subscription_widget.dart';
 import 'package:photos/ui/payment/payment_web_page.dart';
 import 'package:photos/ui/payment/subscription_common_widgets.dart';
@@ -29,7 +30,6 @@ import "package:photos/ui/payment/view_add_on_widget.dart";
 import "package:photos/ui/tabs/home_widget.dart";
 import "package:photos/utils/data_util.dart";
 import 'package:photos/utils/dialog_util.dart';
-import 'package:photos/utils/toast_util.dart';
 import 'package:step_progress_indicator/step_progress_indicator.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
diff --git a/mobile/lib/ui/settings/about_section_widget.dart b/mobile/lib/ui/settings/about_section_widget.dart
index 375fdac64a..7ca9397274 100644
--- a/mobile/lib/ui/settings/about_section_widget.dart
+++ b/mobile/lib/ui/settings/about_section_widget.dart
@@ -6,10 +6,10 @@ import "package:photos/ui/common/web_page.dart";
 import 'package:photos/ui/components/captioned_text_widget.dart';
 import 'package:photos/ui/components/expandable_menu_item_widget.dart';
 import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart';
+import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/ui/settings/app_update_dialog.dart';
 import 'package:photos/ui/settings/common_settings.dart';
 import 'package:photos/utils/dialog_util.dart';
-import 'package:photos/utils/toast_util.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class AboutSectionWidget extends StatelessWidget {
diff --git a/mobile/lib/ui/settings/backup/free_space_options.dart b/mobile/lib/ui/settings/backup/free_space_options.dart
index c285bf507e..c98d4e9b63 100644
--- a/mobile/lib/ui/settings/backup/free_space_options.dart
+++ b/mobile/lib/ui/settings/backup/free_space_options.dart
@@ -18,6 +18,7 @@ import "package:photos/ui/components/menu_section_description_widget.dart";
 import "package:photos/ui/components/models/button_type.dart";
 import 'package:photos/ui/components/title_bar_title_widget.dart';
 import 'package:photos/ui/components/title_bar_widget.dart';
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/ui/tools/debug/app_storage_viewer.dart";
 import "package:photos/ui/tools/deduplicate_page.dart";
 import "package:photos/ui/tools/free_space_page.dart";
@@ -25,7 +26,6 @@ import "package:photos/ui/viewer/gallery/large_files_page.dart";
 import "package:photos/utils/data_util.dart";
 import "package:photos/utils/dialog_util.dart";
 import 'package:photos/utils/navigation_util.dart';
-import "package:photos/utils/toast_util.dart";
 
 class FreeUpSpaceOptionsScreen extends StatefulWidget {
   const FreeUpSpaceOptionsScreen({super.key});
diff --git a/mobile/lib/ui/settings/debug/debug_section_widget.dart b/mobile/lib/ui/settings/debug/debug_section_widget.dart
index 0cebd2c931..007a5b8242 100644
--- a/mobile/lib/ui/settings/debug/debug_section_widget.dart
+++ b/mobile/lib/ui/settings/debug/debug_section_widget.dart
@@ -9,8 +9,8 @@ import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/captioned_text_widget.dart';
 import 'package:photos/ui/components/expandable_menu_item_widget.dart';
 import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart';
+import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/ui/settings/common_settings.dart';
-import 'package:photos/utils/toast_util.dart';
 
 class DebugSectionWidget extends StatelessWidget {
   const DebugSectionWidget({super.key});
diff --git a/mobile/lib/ui/settings/debug/ml_debug_section_widget.dart b/mobile/lib/ui/settings/debug/ml_debug_section_widget.dart
index e0cdf1cdad..5ba090282b 100644
--- a/mobile/lib/ui/settings/debug/ml_debug_section_widget.dart
+++ b/mobile/lib/ui/settings/debug/ml_debug_section_widget.dart
@@ -16,10 +16,10 @@ import 'package:photos/ui/components/captioned_text_widget.dart';
 import 'package:photos/ui/components/expandable_menu_item_widget.dart';
 import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart';
 import "package:photos/ui/components/toggle_switch_widget.dart";
+import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/ui/settings/common_settings.dart';
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/ml_util.dart";
-import 'package:photos/utils/toast_util.dart';
 
 class MLDebugSectionWidget extends StatefulWidget {
   const MLDebugSectionWidget({super.key});
diff --git a/mobile/lib/ui/settings/developer_settings_page.dart b/mobile/lib/ui/settings/developer_settings_page.dart
index c9f6357f29..27267bf516 100644
--- a/mobile/lib/ui/settings/developer_settings_page.dart
+++ b/mobile/lib/ui/settings/developer_settings_page.dart
@@ -4,8 +4,8 @@ import "package:photos/core/configuration.dart";
 import "package:photos/core/network/network.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/ui/common/gradient_button.dart";
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/utils/dialog_util.dart";
-import "package:photos/utils/toast_util.dart";
 
 class DeveloperSettingsPage extends StatefulWidget {
   const DeveloperSettingsPage({super.key});
diff --git a/mobile/lib/ui/settings/ml/ml_user_dev_screen.dart b/mobile/lib/ui/settings/ml/ml_user_dev_screen.dart
index e68ec6d295..32fdaaaedc 100644
--- a/mobile/lib/ui/settings/ml/ml_user_dev_screen.dart
+++ b/mobile/lib/ui/settings/ml/ml_user_dev_screen.dart
@@ -16,8 +16,8 @@ import "package:photos/ui/components/models/button_type.dart";
 import "package:photos/ui/components/title_bar_title_widget.dart";
 import "package:photos/ui/components/title_bar_widget.dart";
 import "package:photos/ui/components/toggle_switch_widget.dart";
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/utils/dialog_util.dart";
-import "package:photos/utils/toast_util.dart";
 
 final Logger _logger = Logger("MLUserDeveloperOptions");
 
diff --git a/mobile/lib/ui/settings/security_section_widget.dart b/mobile/lib/ui/settings/security_section_widget.dart
index 7e3e88dd9c..c2c305a7ad 100644
--- a/mobile/lib/ui/settings/security_section_widget.dart
+++ b/mobile/lib/ui/settings/security_section_widget.dart
@@ -22,12 +22,12 @@ import 'package:photos/ui/components/captioned_text_widget.dart';
 import 'package:photos/ui/components/expandable_menu_item_widget.dart';
 import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart';
 import 'package:photos/ui/components/toggle_switch_widget.dart';
+import "package:photos/ui/notification/toast.dart";
 import 'package:photos/ui/settings/common_settings.dart';
 import "package:photos/ui/settings/lock_screen/lock_screen_options.dart";
 import "package:photos/utils/auth_util.dart";
 import "package:photos/utils/dialog_util.dart";
-import "package:photos/utils/navigation_util.dart";
-import "package:photos/utils/toast_util.dart";
+import 'package:photos/utils/navigation_util.dart';
 
 class SecuritySectionWidget extends StatefulWidget {
   const SecuritySectionWidget({super.key});
diff --git a/mobile/lib/ui/sharing/add_participant_page.dart b/mobile/lib/ui/sharing/add_participant_page.dart
index dd3d210a67..6c2ffbef0d 100644
--- a/mobile/lib/ui/sharing/add_participant_page.dart
+++ b/mobile/lib/ui/sharing/add_participant_page.dart
@@ -15,9 +15,9 @@ import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart';
 import 'package:photos/ui/components/menu_section_description_widget.dart';
 import 'package:photos/ui/components/menu_section_title.dart';
 import 'package:photos/ui/components/models/button_type.dart';
+import "package:photos/ui/notification/toast.dart";
 import 'package:photos/ui/sharing/user_avator_widget.dart';
 import "package:photos/ui/sharing/verify_identity_dialog.dart";
-import "package:photos/utils/toast_util.dart";
 
 class AddParticipantPage extends StatefulWidget {
   final Collection collection;
diff --git a/mobile/lib/ui/sharing/manage_links_widget.dart b/mobile/lib/ui/sharing/manage_links_widget.dart
index a0d336c81c..86146b9c64 100644
--- a/mobile/lib/ui/sharing/manage_links_widget.dart
+++ b/mobile/lib/ui/sharing/manage_links_widget.dart
@@ -17,13 +17,13 @@ import 'package:photos/ui/components/divider_widget.dart';
 import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart';
 import 'package:photos/ui/components/menu_section_description_widget.dart';
 import "package:photos/ui/components/toggle_switch_widget.dart";
+import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/ui/sharing/pickers/device_limit_picker_page.dart';
 import 'package:photos/ui/sharing/pickers/link_expiry_picker_page.dart';
 import 'package:photos/utils/date_time_util.dart';
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/navigation_util.dart';
 import "package:photos/utils/share_util.dart";
-import 'package:photos/utils/toast_util.dart';
 
 class ManageSharedLinkWidget extends StatefulWidget {
   final Collection? collection;
diff --git a/mobile/lib/ui/sharing/share_collection_page.dart b/mobile/lib/ui/sharing/share_collection_page.dart
index 430935071a..64090528c8 100644
--- a/mobile/lib/ui/sharing/share_collection_page.dart
+++ b/mobile/lib/ui/sharing/share_collection_page.dart
@@ -14,6 +14,7 @@ import 'package:photos/ui/components/divider_widget.dart';
 import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart';
 import 'package:photos/ui/components/menu_section_description_widget.dart';
 import 'package:photos/ui/components/menu_section_title.dart';
+import 'package:photos/ui/notification/toast.dart';
 import "package:photos/ui/sharing/add_participant_page.dart";
 import 'package:photos/ui/sharing/album_participants_page.dart';
 import "package:photos/ui/sharing/album_share_info_widget.dart";
@@ -22,7 +23,6 @@ import 'package:photos/ui/sharing/manage_links_widget.dart';
 import 'package:photos/ui/sharing/user_avator_widget.dart';
 import 'package:photos/utils/navigation_util.dart';
 import 'package:photos/utils/share_util.dart';
-import 'package:photos/utils/toast_util.dart';
 
 class ShareCollectionPage extends StatefulWidget {
   final Collection collection;
diff --git a/mobile/lib/ui/tabs/shared/empty_state.dart b/mobile/lib/ui/tabs/shared/empty_state.dart
index b69d64b96d..53b1584a64 100644
--- a/mobile/lib/ui/tabs/shared/empty_state.dart
+++ b/mobile/lib/ui/tabs/shared/empty_state.dart
@@ -7,9 +7,9 @@ import 'package:photos/ui/collections/collection_action_sheet.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
 import "package:photos/ui/components/empty_state_item_widget.dart";
 import "package:photos/ui/components/models/button_type.dart";
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/utils/collection_util.dart";
 import "package:photos/utils/share_util.dart";
-import "package:photos/utils/toast_util.dart";
 
 class SharedEmptyStateWidget extends StatelessWidget {
   const SharedEmptyStateWidget({super.key});
diff --git a/mobile/lib/ui/tools/collage/collage_save_button.dart b/mobile/lib/ui/tools/collage/collage_save_button.dart
index df7e98f6e0..c7f77a47e0 100644
--- a/mobile/lib/ui/tools/collage/collage_save_button.dart
+++ b/mobile/lib/ui/tools/collage/collage_save_button.dart
@@ -7,9 +7,9 @@ import 'package:photos/models/file/file.dart';
 import "package:photos/services/sync/sync_service.dart";
 import "package:photos/ui/components/buttons/button_widget.dart";
 import "package:photos/ui/components/models/button_type.dart";
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/ui/viewer/file/detail_page.dart";
 import "package:photos/utils/navigation_util.dart";
-import "package:photos/utils/toast_util.dart";
 import "package:widgets_to_image/widgets_to_image.dart";
 
 class SaveCollageButton extends StatelessWidget {
diff --git a/mobile/lib/ui/tools/editor/image_editor_page.dart b/mobile/lib/ui/tools/editor/image_editor_page.dart
index c92ba5ae5d..686044d21c 100644
--- a/mobile/lib/ui/tools/editor/image_editor_page.dart
+++ b/mobile/lib/ui/tools/editor/image_editor_page.dart
@@ -22,11 +22,11 @@ import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/ui/components/action_sheet_widget.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
 import 'package:photos/ui/components/models/button_type.dart';
+import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/ui/tools/editor/filtered_image.dart';
 import 'package:photos/ui/viewer/file/detail_page.dart';
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/navigation_util.dart';
-import 'package:photos/utils/toast_util.dart';
 import 'package:syncfusion_flutter_core/theme.dart';
 import 'package:syncfusion_flutter_sliders/sliders.dart';
 
diff --git a/mobile/lib/ui/tools/editor/video_editor_page.dart b/mobile/lib/ui/tools/editor/video_editor_page.dart
index 7d6ef7762d..5abf738ad9 100644
--- a/mobile/lib/ui/tools/editor/video_editor_page.dart
+++ b/mobile/lib/ui/tools/editor/video_editor_page.dart
@@ -13,6 +13,7 @@ import "package:photos/generated/l10n.dart";
 import "package:photos/models/file/file.dart";
 import "package:photos/models/location/location.dart";
 import "package:photos/services/sync/sync_service.dart";
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/ui/tools/editor/export_video_service.dart";
 import 'package:photos/ui/tools/editor/video_crop_page.dart';
 import "package:photos/ui/tools/editor/video_editor/video_editor_bottom_action.dart";
@@ -24,7 +25,6 @@ import "package:photos/ui/tools/editor/video_trim_page.dart";
 import "package:photos/ui/viewer/file/detail_page.dart";
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/navigation_util.dart";
-import "package:photos/utils/toast_util.dart";
 import "package:video_editor/video_editor.dart";
 
 class VideoEditorPage extends StatefulWidget {
diff --git a/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart b/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
index 97708bfbac..608c6a22eb 100644
--- a/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
+++ b/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
@@ -35,6 +35,7 @@ import 'package:photos/ui/components/action_sheet_widget.dart';
 import "package:photos/ui/components/bottom_action_bar/selection_action_button_widget.dart";
 import 'package:photos/ui/components/buttons/button_widget.dart';
 import 'package:photos/ui/components/models/button_type.dart';
+import 'package:photos/ui/notification/toast.dart';
 import "package:photos/ui/sharing/show_images_prevew.dart";
 import "package:photos/ui/tools/collage/collage_creator_page.dart";
 import "package:photos/ui/viewer/file/detail_page.dart";
@@ -45,7 +46,6 @@ import "package:photos/utils/file_download_util.dart";
 import 'package:photos/utils/magic_util.dart';
 import 'package:photos/utils/navigation_util.dart';
 import "package:photos/utils/share_util.dart";
-import 'package:photos/utils/toast_util.dart';
 import "package:screenshot/screenshot.dart";
 
 class FileSelectionActionsWidget extends StatefulWidget {
diff --git a/mobile/lib/ui/viewer/file/detail_page.dart b/mobile/lib/ui/viewer/file/detail_page.dart
index 98ff163b14..0dab65b96d 100644
--- a/mobile/lib/ui/viewer/file/detail_page.dart
+++ b/mobile/lib/ui/viewer/file/detail_page.dart
@@ -17,6 +17,7 @@ import "package:photos/models/file/file_type.dart";
 import "package:photos/service_locator.dart";
 import "package:photos/services/local_authentication_service.dart";
 import "package:photos/ui/common/fast_scroll_physics.dart";
+import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/ui/tools/editor/image_editor_page.dart';
 import "package:photos/ui/tools/editor/video_editor_page.dart";
 import "package:photos/ui/viewer/file/file_app_bar.dart";
@@ -28,7 +29,6 @@ import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/file_util.dart';
 import 'package:photos/utils/navigation_util.dart';
 import "package:photos/utils/thumbnail_util.dart";
-import 'package:photos/utils/toast_util.dart';
 
 enum DetailPageMode {
   minimalistic,
diff --git a/mobile/lib/ui/viewer/file/file_app_bar.dart b/mobile/lib/ui/viewer/file/file_app_bar.dart
index 46adbad5d4..bf7e7cb996 100644
--- a/mobile/lib/ui/viewer/file/file_app_bar.dart
+++ b/mobile/lib/ui/viewer/file/file_app_bar.dart
@@ -23,13 +23,13 @@ import "package:photos/services/local_authentication_service.dart";
 import "package:photos/services/preview_video_store.dart";
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/collections/collection_action_sheet.dart';
+import 'package:photos/ui/notification/toast.dart';
 import "package:photos/ui/viewer/file_details/favorite_widget.dart";
 import "package:photos/ui/viewer/file_details/upload_icon_widget.dart";
 import 'package:photos/utils/dialog_util.dart';
 import "package:photos/utils/file_download_util.dart";
 import 'package:photos/utils/file_util.dart';
 import "package:photos/utils/magic_util.dart";
-import 'package:photos/utils/toast_util.dart';
 
 class FileAppBar extends StatefulWidget {
   final EnteFile file;
diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit.dart
index 4ce67981b6..ae1f86dd6b 100644
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit.dart
@@ -17,10 +17,10 @@ import "package:photos/services/files_service.dart";
 import "package:photos/theme/colors.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/actions/file/file_actions.dart";
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/ui/viewer/file/thumbnail_widget.dart";
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/file_util.dart";
-import "package:photos/utils/toast_util.dart";
 
 class VideoWidgetMediaKit extends StatefulWidget {
   final EnteFile file;
diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
index 13d45bd57a..20cd457892 100644
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_new.dart
@@ -16,11 +16,11 @@ import "package:photos/services/files_service.dart";
 import "package:photos/theme/colors.dart";
 import "package:photos/ui/actions/file/file_actions.dart";
 import "package:photos/ui/common/loading_widget.dart";
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/ui/viewer/file/video_widget_media_kit_common.dart"
     as common;
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/file_util.dart";
-import "package:photos/utils/toast_util.dart";
 
 class VideoWidgetMediaKitNew extends StatefulWidget {
   final EnteFile file;
diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart
index 39ff6e491f..9d6bce668c 100644
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart
@@ -16,11 +16,11 @@ import "package:photos/services/preview_video_store.dart";
 import "package:photos/theme/colors.dart";
 import "package:photos/ui/actions/file/file_actions.dart";
 import "package:photos/ui/common/loading_widget.dart";
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/ui/viewer/file/video_widget_media_kit_common.dart"
     as common;
 import "package:photos/utils/data_util.dart";
 import "package:photos/utils/file_util.dart";
-import "package:photos/utils/toast_util.dart";
 
 class VideoWidgetMediaKitPreview extends StatefulWidget {
   final EnteFile file;
diff --git a/mobile/lib/ui/viewer/file/video_widget_native.dart b/mobile/lib/ui/viewer/file/video_widget_native.dart
index c3d1bb8c83..53cc67483e 100644
--- a/mobile/lib/ui/viewer/file/video_widget_native.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_native.dart
@@ -20,6 +20,7 @@ import "package:photos/theme/colors.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/actions/file/file_actions.dart";
 import "package:photos/ui/common/loading_widget.dart";
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/ui/viewer/file/native_video_player_controls/play_pause_button.dart";
 import "package:photos/ui/viewer/file/native_video_player_controls/seek_bar.dart";
 import "package:photos/ui/viewer/file/preview_status_widget.dart";
@@ -29,7 +30,6 @@ import "package:photos/utils/debouncer.dart";
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/exif_util.dart";
 import "package:photos/utils/file_util.dart";
-import "package:photos/utils/toast_util.dart";
 import "package:visibility_detector/visibility_detector.dart";
 
 class VideoWidgetNative extends StatefulWidget {
diff --git a/mobile/lib/ui/viewer/file/zoomable_live_image_new.dart b/mobile/lib/ui/viewer/file/zoomable_live_image_new.dart
index b077ed38c9..65c6c72127 100644
--- a/mobile/lib/ui/viewer/file/zoomable_live_image_new.dart
+++ b/mobile/lib/ui/viewer/file/zoomable_live_image_new.dart
@@ -13,9 +13,9 @@ import "package:photos/models/file/extensions/file_props.dart";
 import 'package:photos/models/file/file.dart';
 import "package:photos/models/metadata/file_magic.dart";
 import "package:photos/services/file_magic_service.dart";
+import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/ui/viewer/file/zoomable_image.dart';
 import 'package:photos/utils/file_util.dart';
-import 'package:photos/utils/toast_util.dart';
 
 class ZoomableLiveImageNew extends StatefulWidget {
   final EnteFile enteFile;
diff --git a/mobile/lib/ui/viewer/file_details/exif_item_widgets.dart b/mobile/lib/ui/viewer/file_details/exif_item_widgets.dart
index 25b1e5e11e..dead77781b 100644
--- a/mobile/lib/ui/viewer/file_details/exif_item_widgets.dart
+++ b/mobile/lib/ui/viewer/file_details/exif_item_widgets.dart
@@ -5,8 +5,8 @@ import 'package:photos/models/file/file.dart';
 import "package:photos/theme/colors.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/components/info_item_widget.dart";
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/ui/viewer/file/exif_info_dialog.dart";
-import "package:photos/utils/toast_util.dart";
 
 class BasicExifItemWidget extends StatelessWidget {
   final Map<String, dynamic> exifData;
diff --git a/mobile/lib/ui/viewer/file_details/face_widget.dart b/mobile/lib/ui/viewer/file_details/face_widget.dart
index 69d22bcfd5..b841b872c0 100644
--- a/mobile/lib/ui/viewer/file_details/face_widget.dart
+++ b/mobile/lib/ui/viewer/file_details/face_widget.dart
@@ -18,11 +18,11 @@ import "package:photos/services/machine_learning/face_ml/feedback/cluster_feedba
 import "package:photos/services/machine_learning/ml_service.dart";
 import "package:photos/services/search_service.dart";
 import "package:photos/theme/ente_theme.dart";
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/ui/viewer/file/no_thumbnail_widget.dart";
 import "package:photos/ui/viewer/people/cluster_page.dart";
 import "package:photos/ui/viewer/people/people_page.dart";
 import "package:photos/utils/face/face_box_crop.dart";
-import "package:photos/utils/toast_util.dart";
 
 class FaceWidget extends StatefulWidget {
   final EnteFile file;
diff --git a/mobile/lib/ui/viewer/file_details/favorite_widget.dart b/mobile/lib/ui/viewer/file_details/favorite_widget.dart
index 3371b14421..11c588b933 100644
--- a/mobile/lib/ui/viewer/file_details/favorite_widget.dart
+++ b/mobile/lib/ui/viewer/file_details/favorite_widget.dart
@@ -8,7 +8,7 @@ import "package:photos/generated/l10n.dart";
 import 'package:photos/models/file/file.dart';
 import "package:photos/services/favorites_service.dart";
 import "package:photos/ui/common/loading_widget.dart";
-import "package:photos/utils/toast_util.dart";
+import "package:photos/ui/notification/toast.dart";
 
 class FavoriteWidget extends StatefulWidget {
   final EnteFile file;
diff --git a/mobile/lib/ui/viewer/file_details/upload_icon_widget.dart b/mobile/lib/ui/viewer/file_details/upload_icon_widget.dart
index c388135d0e..65ade712bd 100644
--- a/mobile/lib/ui/viewer/file_details/upload_icon_widget.dart
+++ b/mobile/lib/ui/viewer/file_details/upload_icon_widget.dart
@@ -16,7 +16,7 @@ import "package:photos/services/ignored_files_service.dart";
 import "package:photos/services/sync/remote_sync_service.dart";
 import "package:photos/services/sync/sync_service.dart";
 import "package:photos/ui/common/loading_widget.dart";
-import "package:photos/utils/toast_util.dart";
+import "package:photos/ui/notification/toast.dart";
 
 class UploadIconWidget extends StatefulWidget {
   final EnteFile file;
diff --git a/mobile/lib/ui/viewer/file_details/video_exif_item.dart b/mobile/lib/ui/viewer/file_details/video_exif_item.dart
index a3d51d6c9a..d4d9cc205f 100644
--- a/mobile/lib/ui/viewer/file_details/video_exif_item.dart
+++ b/mobile/lib/ui/viewer/file_details/video_exif_item.dart
@@ -6,8 +6,8 @@ import 'package:photos/models/file/file.dart';
 import "package:photos/theme/colors.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/components/info_item_widget.dart";
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/ui/viewer/file/video_exif_dialog.dart";
-import "package:photos/utils/toast_util.dart";
 
 class VideoExifRowItem extends StatefulWidget {
   final EnteFile file;
diff --git a/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart b/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
index 941af3965b..0bc6c5e568 100644
--- a/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
+++ b/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
@@ -39,6 +39,7 @@ import 'package:photos/ui/components/buttons/button_widget.dart';
 import 'package:photos/ui/components/models/button_type.dart';
 import "package:photos/ui/map/enable_map.dart";
 import "package:photos/ui/map/map_screen.dart";
+import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/ui/sharing/album_participants_page.dart';
 import "package:photos/ui/sharing/manage_links_widget.dart";
 import 'package:photos/ui/sharing/share_collection_page.dart';
@@ -54,7 +55,6 @@ import 'package:photos/utils/dialog_util.dart';
 import "package:photos/utils/file_download_util.dart";
 import 'package:photos/utils/magic_util.dart';
 import 'package:photos/utils/navigation_util.dart';
-import 'package:photos/utils/toast_util.dart';
 import "package:uuid/uuid.dart";
 
 class GalleryAppBarWidget extends StatefulWidget {
diff --git a/mobile/lib/ui/viewer/gallery/shared_public_collection_page.dart b/mobile/lib/ui/viewer/gallery/shared_public_collection_page.dart
index 6d464c47f1..a6e341d58c 100644
--- a/mobile/lib/ui/viewer/gallery/shared_public_collection_page.dart
+++ b/mobile/lib/ui/viewer/gallery/shared_public_collection_page.dart
@@ -17,6 +17,7 @@ import "package:photos/services/sync/remote_sync_service.dart";
 import "package:photos/ui/components/buttons/button_widget.dart";
 import "package:photos/ui/components/end_to_end_banner.dart";
 import "package:photos/ui/components/models/button_type.dart";
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/ui/viewer/actions/file_selection_overlay_bar.dart";
 import "package:photos/ui/viewer/gallery/collection_page.dart";
 import "package:photos/ui/viewer/gallery/gallery.dart";
@@ -25,7 +26,6 @@ import "package:photos/ui/viewer/gallery/state/gallery_files_inherited_widget.da
 import "package:photos/ui/viewer/gallery/state/selection_state.dart";
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/navigation_util.dart";
-import "package:photos/utils/toast_util.dart";
 
 class SharedPublicCollectionPage extends StatefulWidget {
   final CollectionWithThumbnail c;
diff --git a/mobile/lib/ui/viewer/location/update_location_data_widget.dart b/mobile/lib/ui/viewer/location/update_location_data_widget.dart
index 2584c8748d..16414270d1 100644
--- a/mobile/lib/ui/viewer/location/update_location_data_widget.dart
+++ b/mobile/lib/ui/viewer/location/update_location_data_widget.dart
@@ -13,7 +13,7 @@ import "package:photos/theme/effects.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/map/map_button.dart";
 import "package:photos/ui/map/tile/layers.dart";
-import "package:photos/utils/toast_util.dart";
+import "package:photos/ui/notification/toast.dart";
 
 class UpdateLocationDataWidget extends StatefulWidget {
   final List<EnteFile> files;
diff --git a/mobile/lib/ui/viewer/people/cluster_page.dart b/mobile/lib/ui/viewer/people/cluster_page.dart
index 8df8c4b6e6..2b89097be9 100644
--- a/mobile/lib/ui/viewer/people/cluster_page.dart
+++ b/mobile/lib/ui/viewer/people/cluster_page.dart
@@ -13,6 +13,7 @@ import 'package:photos/models/gallery_type.dart';
 import "package:photos/models/ml/face/person.dart";
 import 'package:photos/models/selected_files.dart';
 import "package:photos/services/machine_learning/face_ml/feedback/cluster_feedback.dart";
+import "package:photos/ui/notification/toast.dart";
 import 'package:photos/ui/viewer/actions/file_selection_overlay_bar.dart';
 import 'package:photos/ui/viewer/gallery/gallery.dart';
 import "package:photos/ui/viewer/gallery/state/gallery_files_inherited_widget.dart";
@@ -24,7 +25,6 @@ import "package:photos/ui/viewer/people/people_page.dart";
 import "package:photos/ui/viewer/search/result/person_face_widget.dart";
 import "package:photos/ui/viewer/search/result/search_result_page.dart";
 import "package:photos/utils/navigation_util.dart";
-import "package:photos/utils/toast_util.dart";
 
 class ClusterPage extends StatefulWidget {
   final List<EnteFile> searchResult;
diff --git a/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart b/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart
index aafc6b7c8a..b3a03451c4 100644
--- a/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart
+++ b/mobile/lib/ui/viewer/people/person_selection_action_widgets.dart
@@ -16,11 +16,11 @@ import "package:photos/ui/common/loading_widget.dart";
 import "package:photos/ui/components/buttons/button_widget.dart";
 import "package:photos/ui/components/dialog_widget.dart";
 import "package:photos/ui/components/models/button_type.dart";
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/ui/viewer/file/no_thumbnail_widget.dart";
 import "package:photos/ui/viewer/search/result/person_face_widget.dart";
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/person_contact_linking_util.dart";
-import "package:photos/utils/toast_util.dart";
 
 class PersonEntityWithThumbnailFile {
   final PersonEntity person;
diff --git a/mobile/lib/ui/viewer/people/save_or_edit_person.dart b/mobile/lib/ui/viewer/people/save_or_edit_person.dart
index 2127eab235..5e543f7ef4 100644
--- a/mobile/lib/ui/viewer/people/save_or_edit_person.dart
+++ b/mobile/lib/ui/viewer/people/save_or_edit_person.dart
@@ -29,6 +29,7 @@ import "package:photos/ui/common/loading_widget.dart";
 import "package:photos/ui/components/action_sheet_widget.dart";
 import "package:photos/ui/components/buttons/button_widget.dart";
 import "package:photos/ui/components/models/button_type.dart";
+import "package:photos/ui/notification/toast.dart";
 import "package:photos/ui/sharing/album_share_info_widget.dart";
 import "package:photos/ui/sharing/user_avator_widget.dart";
 import "package:photos/ui/viewer/file/no_thumbnail_widget.dart";
@@ -40,7 +41,6 @@ import "package:photos/ui/viewer/search/result/person_face_widget.dart";
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/navigation_util.dart";
 import "package:photos/utils/person_contact_linking_util.dart";
-import "package:photos/utils/toast_util.dart";
 
 class SaveOrEditPerson extends StatefulWidget {
   final String? clusterID;
diff --git a/mobile/lib/utils/delete_file_util.dart b/mobile/lib/utils/delete_file_util.dart
index 34566f1469..9f139519c2 100644
--- a/mobile/lib/utils/delete_file_util.dart
+++ b/mobile/lib/utils/delete_file_util.dart
@@ -24,10 +24,10 @@ import 'package:photos/ui/common/linear_progress_dialog.dart';
 import 'package:photos/ui/components/action_sheet_widget.dart';
 import 'package:photos/ui/components/buttons/button_widget.dart';
 import 'package:photos/ui/components/models/button_type.dart';
+import 'package:photos/ui/notification/toast.dart';
 import "package:photos/utils/device_info.dart";
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/file_util.dart';
-import 'package:photos/utils/toast_util.dart';
 
 final _logger = Logger("DeleteFileUtil");
 
diff --git a/mobile/lib/utils/email_util.dart b/mobile/lib/utils/email_util.dart
index 9831e3b480..c92659e380 100644
--- a/mobile/lib/utils/email_util.dart
+++ b/mobile/lib/utils/email_util.dart
@@ -19,9 +19,9 @@ import "package:photos/ui/common/progress_dialog.dart";
 import 'package:photos/ui/components/buttons/button_widget.dart';
 import 'package:photos/ui/components/dialog_widget.dart';
 import 'package:photos/ui/components/models/button_type.dart';
+import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/ui/tools/debug/log_file_viewer.dart';
 import 'package:photos/utils/dialog_util.dart';
-import 'package:photos/utils/toast_util.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
 
diff --git a/mobile/lib/utils/magic_util.dart b/mobile/lib/utils/magic_util.dart
index 62411de438..923eb07b61 100644
--- a/mobile/lib/utils/magic_util.dart
+++ b/mobile/lib/utils/magic_util.dart
@@ -17,8 +17,8 @@ import "package:photos/models/metadata/file_magic.dart";
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/file_magic_service.dart';
 import 'package:photos/ui/common/progress_dialog.dart';
+import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/utils/dialog_util.dart';
-import 'package:photos/utils/toast_util.dart';
 
 final _logger = Logger('MagicUtil');
 

From 23dc3788880d032d7c065762599490cb92f29934 Mon Sep 17 00:00:00 2001
From: Aman Raj Singh Mourya <amanrajmourya7@gmail.com>
Date: Tue, 4 Mar 2025 14:09:39 +0530
Subject: [PATCH 705/796] [mob][photos] fix: feature flag

---
 .../lib/ui/viewer/actions/file_selection_actions_widget.dart | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart b/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
index 4b8409ac09..9420805da2 100644
--- a/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
+++ b/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
@@ -320,11 +320,12 @@ class _FileSelectionActionsWidgetState
         ),
       );
     }
-    if (widget.type != GalleryType.sharedPublicCollection) {
+    if (flagService.internalUser &&
+        widget.type != GalleryType.sharedPublicCollection) {
       items.add(
         SelectionActionButton(
           icon: Icons.movie_creation_sharp,
-          labelText: "Video memory",
+          labelText: "Video Memory",
           onTap: _onCreateVideoMemoryClicked,
         ),
       );

From 985d530aef8b8827aa3da6ceb8cda09dbc4e6bfd Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 4 Mar 2025 14:20:29 +0530
Subject: [PATCH 706/796] fix: don't make failureFiles a late variable

---
 mobile/lib/services/preview_video_store.dart | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 4312ad5168..15e55be8bc 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -44,7 +44,7 @@ const _maxRetryCount = 3;
 class PreviewVideoStore {
   final LinkedHashMap<int, PreviewItem> _items = LinkedHashMap();
   LinkedHashMap<int, PreviewItem> get previews => _items;
-  late Set<int> _failureFiles;
+  Set<int>? _failureFiles;
 
   bool _initSuccess = false;
 
@@ -375,12 +375,12 @@ class PreviewVideoStore {
 
   Future<void> _removeFromLocks(EnteFile enteFile) async {
     final bool isFailurePresent =
-        _failureFiles.contains(enteFile.uploadedFileID!);
+        _failureFiles?.contains(enteFile.uploadedFileID!) ?? false;
 
     if (isFailurePresent) {
       await UploadLocksDB.instance
           .deleteStreamUploadErrorEntry(enteFile.uploadedFileID!);
-      _failureFiles.remove(enteFile.uploadedFileID!);
+      _failureFiles?.remove(enteFile.uploadedFileID!);
     }
   }
 
@@ -407,7 +407,7 @@ class PreviewVideoStore {
       );
 
       final bool isFailurePresent =
-          _failureFiles.contains(enteFile.uploadedFileID!);
+          _failureFiles?.contains(enteFile.uploadedFileID!) ?? false;
 
       if (isFailurePresent) {
         UploadLocksDB.instance.updateStreamStatus(
@@ -419,7 +419,7 @@ class PreviewVideoStore {
           enteFile.uploadedFileID!,
           error.toString(),
         );
-        _failureFiles.add(enteFile.uploadedFileID!);
+        _failureFiles?.add(enteFile.uploadedFileID!);
       }
     }
   }
@@ -685,7 +685,7 @@ class PreviewVideoStore {
       _failureFiles = {...failureFiles.keys};
 
       // handle case when failures are already previewed
-      for (final failure in _failureFiles) {
+      for (final failure in _failureFiles!) {
         if (previews.containsKey(failure)) {
           UploadLocksDB.instance.deleteStreamUploadErrorEntry(failure).ignore();
         }
@@ -716,7 +716,8 @@ class PreviewVideoStore {
       final enteFile = allFiles[i];
       // elimination case for <=10 MB with H.264
       final (_, result, _) = await _checkFileForPreviewCreation(enteFile);
-      final isFailure = _failureFiles.contains(enteFile.uploadedFileID!);
+      final isFailure =
+          _failureFiles?.contains(enteFile.uploadedFileID!) ?? false;
 
       if (isFailure) {
         _items[enteFile.uploadedFileID!] = PreviewItem(

From 1f18c65ff67e9754c27de38e66c83d4321dbce85 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 4 Mar 2025 14:38:30 +0530
Subject: [PATCH 707/796] fix: add other information like objectId and
 objectSize to previewIds

---
 .../services/filedata/filedata_service.dart   |  7 +++++--
 mobile/lib/services/preview_video_store.dart  | 19 +++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/mobile/lib/services/filedata/filedata_service.dart b/mobile/lib/services/filedata/filedata_service.dart
index d876aba256..dd01fa36e4 100644
--- a/mobile/lib/services/filedata/filedata_service.dart
+++ b/mobile/lib/services/filedata/filedata_service.dart
@@ -32,10 +32,13 @@ class FileDataService {
   /// Used to not sync preview ids everytime a chunking and preview
   /// upload is successful, instead update the local copy of those
   /// preview ids
-  void appendPreview(int id) {
+  void appendPreview(int id, String objectId, int objectSize) {
     if (previewIds?.containsKey(id) ?? false) return;
     previewIds ??= {};
-    previewIds?[id] = PreviewInfo(objectId: "dummy", objectSize: 0);
+    previewIds?[id] = PreviewInfo(
+      objectId: objectId,
+      objectSize: objectSize,
+    );
   }
 
   Future<void> putFileData(EnteFile file, FileDataEntity data) async {
diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 15e55be8bc..24b42954f6 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -273,6 +273,9 @@ class PreviewVideoStore {
 
       final returnCode = await session.getReturnCode();
 
+      String? objectId;
+      int? objectSize;
+
       if (ReturnCode.isSuccess(returnCode)) {
         try {
           _items[enteFile.uploadedFileID!] = PreviewItem(
@@ -289,8 +292,8 @@ class PreviewVideoStore {
           final previewFile = File("$prefix/output.ts");
           final result = await _uploadPreviewVideo(enteFile, previewFile);
 
-          final String objectID = result.$1;
-          final objectSize = result.$2;
+          objectId = result.$1;
+          objectSize = result.$2;
 
           // Fetch resolution of generated stream by decrypting a single frame
           final FFmpegSession session2 = await FFmpegKit.execute(
@@ -314,7 +317,7 @@ class PreviewVideoStore {
           await _reportVideoPreview(
             enteFile,
             playlistFile,
-            objectID: objectID,
+            objectId: objectId,
             objectSize: objectSize,
             width: width,
             height: height,
@@ -339,7 +342,11 @@ class PreviewVideoStore {
 
       if (error == null) {
         // update previewIds
-        FileDataService.instance.appendPreview(enteFile.uploadedFileID!);
+        FileDataService.instance.appendPreview(
+          enteFile.uploadedFileID!,
+          objectId!,
+          objectSize!,
+        );
 
         _items[enteFile.uploadedFileID!] = PreviewItem(
           status: PreviewItemStatus.uploaded,
@@ -427,7 +434,7 @@ class PreviewVideoStore {
   Future<void> _reportVideoPreview(
     EnteFile file,
     File playlist, {
-    required String objectID,
+    required String objectId,
     required int objectSize,
     required int? width,
     required int? height,
@@ -450,7 +457,7 @@ class PreviewVideoStore {
         "/files/video-data",
         data: {
           "fileID": file.uploadedFileID!,
-          "objectID": objectID,
+          "objectID": objectId,
           "objectSize": objectSize,
           "playlist": result.encData,
           "playlistHeader": result.header,

From 0c722171be6c9023dfc7c89b82be2b7d569a4caa Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 4 Mar 2025 14:39:37 +0530
Subject: [PATCH 708/796] move

---
 mobile/lib/{utils => services/sync}/diff_fetcher.dart | 0
 mobile/lib/services/sync/remote_sync_service.dart     | 2 +-
 mobile/lib/ui/tabs/home_widget.dart                   | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename mobile/lib/{utils => services/sync}/diff_fetcher.dart (100%)

diff --git a/mobile/lib/utils/diff_fetcher.dart b/mobile/lib/services/sync/diff_fetcher.dart
similarity index 100%
rename from mobile/lib/utils/diff_fetcher.dart
rename to mobile/lib/services/sync/diff_fetcher.dart
diff --git a/mobile/lib/services/sync/remote_sync_service.dart b/mobile/lib/services/sync/remote_sync_service.dart
index 77f56441ba..c04882d25b 100644
--- a/mobile/lib/services/sync/remote_sync_service.dart
+++ b/mobile/lib/services/sync/remote_sync_service.dart
@@ -28,8 +28,8 @@ import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/ignored_files_service.dart';
 import 'package:photos/services/local_file_update_service.dart';
 import "package:photos/services/notification_service.dart";
+import 'package:photos/services/sync/diff_fetcher.dart';
 import 'package:photos/services/sync/sync_service.dart';
-import 'package:photos/utils/diff_fetcher.dart';
 import 'package:photos/utils/file_uploader.dart';
 import 'package:photos/utils/file_util.dart';
 import 'package:shared_preferences/shared_preferences.dart';
diff --git a/mobile/lib/ui/tabs/home_widget.dart b/mobile/lib/ui/tabs/home_widget.dart
index 70cc154a1e..565db9daad 100644
--- a/mobile/lib/ui/tabs/home_widget.dart
+++ b/mobile/lib/ui/tabs/home_widget.dart
@@ -39,6 +39,7 @@ import 'package:photos/services/app_lifecycle_service.dart';
 import 'package:photos/services/collections_service.dart';
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
 import "package:photos/services/notification_service.dart";
+import "package:photos/services/sync/diff_fetcher.dart";
 import 'package:photos/services/sync/local_sync_service.dart';
 import "package:photos/services/sync/remote_sync_service.dart";
 import 'package:photos/states/user_details_state.dart';
@@ -68,7 +69,6 @@ import "package:photos/ui/viewer/search/search_widget.dart";
 import 'package:photos/ui/viewer/search_tab/search_tab.dart';
 import "package:photos/utils/collection_util.dart";
 import 'package:photos/utils/dialog_util.dart';
-import "package:photos/utils/diff_fetcher.dart";
 import "package:photos/utils/navigation_util.dart";
 import 'package:receive_sharing_intent/receive_sharing_intent.dart';
 import 'package:uni_links/uni_links.dart';

From 2147e13af4ef31343e9923ada2118df305e0fed7 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Tue, 4 Mar 2025 14:45:34 +0530
Subject: [PATCH 709/796] [mob][photos] Fix

---
 mobile/lib/services/isolate_functions.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/services/isolate_functions.dart b/mobile/lib/services/isolate_functions.dart
index 0ed231a63a..c123facf79 100644
--- a/mobile/lib/services/isolate_functions.dart
+++ b/mobile/lib/services/isolate_functions.dart
@@ -133,7 +133,7 @@ Future<dynamic> isolateFunction(
         final double similarity = embedding.vector.dot(otherEmbedding);
         result[embedding.fileID] = similarity;
       }
-      return Map.from(result);
+      return Map<int, double>.from(result);
 
     /// Cases for MLComputer end here
 

From 610c1ffc9fdc882ccb4e928d0793b7be81e8fb1c Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 4 Mar 2025 15:03:42 +0530
Subject: [PATCH 710/796] fix: add conflict resolution algorithm as replace

---
 mobile/lib/db/upload_locks_db.dart           | 3 ++-
 mobile/lib/services/preview_video_store.dart | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mobile/lib/db/upload_locks_db.dart b/mobile/lib/db/upload_locks_db.dart
index f2aca98a56..ab786d5c78 100644
--- a/mobile/lib/db/upload_locks_db.dart
+++ b/mobile/lib/db/upload_locks_db.dart
@@ -307,7 +307,7 @@ class UploadLocksDB {
     );
   }
 
-  Future<void> createStreamEntry(
+  Future<void> appendStreamEntry(
     int uploadedFileID,
     String errorMessage,
   ) async {
@@ -321,6 +321,7 @@ class UploadLocksDB {
         _streamUploadErrorTable.columnLastAttemptedAt:
             DateTime.now().millisecondsSinceEpoch,
       },
+      conflictAlgorithm: ConflictAlgorithm.replace,
     );
   }
 
diff --git a/mobile/lib/services/preview_video_store.dart b/mobile/lib/services/preview_video_store.dart
index 24b42954f6..b9b1a8e0b3 100644
--- a/mobile/lib/services/preview_video_store.dart
+++ b/mobile/lib/services/preview_video_store.dart
@@ -417,12 +417,12 @@ class PreviewVideoStore {
           _failureFiles?.contains(enteFile.uploadedFileID!) ?? false;
 
       if (isFailurePresent) {
-        UploadLocksDB.instance.updateStreamStatus(
+        UploadLocksDB.instance.appendStreamEntry(
           enteFile.uploadedFileID!,
           error.toString(),
         );
       } else {
-        UploadLocksDB.instance.createStreamEntry(
+        UploadLocksDB.instance.appendStreamEntry(
           enteFile.uploadedFileID!,
           error.toString(),
         );

From d9691ac0898ffe11c53f8716fdd3c996e7b81c48 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Tue, 4 Mar 2025 15:03:48 +0530
Subject: [PATCH 711/796] [mob][photos] Resolve merge conflixt properly

---
 mobile/lib/core/configuration.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/core/configuration.dart b/mobile/lib/core/configuration.dart
index 70b1d30015..ffa88ce132 100644
--- a/mobile/lib/core/configuration.dart
+++ b/mobile/lib/core/configuration.dart
@@ -13,17 +13,17 @@ import 'package:photos/core/error-reporting/super_logging.dart';
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/db/collections_db.dart';
 import 'package:photos/db/files_db.dart';
-import 'package:photos/db/s_db.dart';
+import "package:photos/db/memories_db.dart";
 import "package:photos/db/ml/db.dart";
 import 'package:photos/db/trash_db.dart';
 import 'package:photos/db/upload_locks_db.dart';
 import "package:photos/events/endpoint_updated_event.dart";
 import 'package:photos/events/signed_in_event.dart';
 import 'package:photos/events/user_logged_out_event.dart';
-import "package:photos/service_locator.dart";
 import 'package:photos/models/api/user/key_attributes.dart';
 import 'package:photos/models/api/user/key_gen_result.dart';
 import 'package:photos/models/api/user/private_key_attributes.dart';
+import "package:photos/service_locator.dart";
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/favorites_service.dart';
 import "package:photos/services/home_widget_service.dart";

From dcf6d3a9e116e79af1dfe537318388d219b5421a Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Tue, 4 Mar 2025 15:04:31 +0530
Subject: [PATCH 712/796] [mob][photos] Fix title bug

---
 mobile/lib/services/smart_memories_service.dart      |  2 +-
 mobile/lib/ui/home/memories/memories_widget.dart     | 11 ++---------
 mobile/lib/ui/home/memories/memory_cover_widget.dart |  6 +++++-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index 3651ea98eb..b6921104d6 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -1173,7 +1173,7 @@ class SmartMemoriesService {
       );
       final fillerMemory = FillerMemory(
         memories,
-        "TEST",
+        "filler",
         nowInMicroseconds,
         windowEnd,
       );
diff --git a/mobile/lib/ui/home/memories/memories_widget.dart b/mobile/lib/ui/home/memories/memories_widget.dart
index de4f9fbbc8..002a899245 100644
--- a/mobile/lib/ui/home/memories/memories_widget.dart
+++ b/mobile/lib/ui/home/memories/memories_widget.dart
@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 import "package:flutter_animate/flutter_animate.dart";
 import "package:photos/core/event_bus.dart";
 import "package:photos/events/memories_setting_changed.dart";
-import "package:photos/models/filler_memory.dart";
 import 'package:photos/models/memory.dart';
 import "package:photos/models/smart_memory.dart";
 import "package:photos/service_locator.dart";
@@ -129,14 +128,8 @@ class _MemoriesWidgetState extends State<MemoriesWidget> {
   }
 
   Widget _buildSmartMemories(List<SmartMemory> memories) {
-    final List<(List<Memory>, String?)> collatedMemories = [];
-    for (final memory in memories) {
-      if (memory is FillerMemory) {
-        collatedMemories.add((memory.memories, null));
-      } else {
-        collatedMemories.add((memory.memories, memory.title));
-      }
-    }
+    final collatedMemories =
+        memories.map((e) => (e.memories, e.title)).toList();
 
     return SizedBox(
       height: _maxHeight + MemoryCoverWidget.outerStrokeWidth * 2,
diff --git a/mobile/lib/ui/home/memories/memory_cover_widget.dart b/mobile/lib/ui/home/memories/memory_cover_widget.dart
index 270bdb0f4a..e4696ecc67 100644
--- a/mobile/lib/ui/home/memories/memory_cover_widget.dart
+++ b/mobile/lib/ui/home/memories/memory_cover_widget.dart
@@ -48,7 +48,11 @@ class _MemoryCoverWidgetState extends State<MemoryCoverWidget> {
     final widthOfScreen = MediaQuery.sizeOf(context).width;
     final index = _getNextMemoryIndex();
     // TODO: lau: remove (I) from name when opening up the feature flag
-    final title = widget.title != null ? widget.title! + "(I)" : _getTitle(widget.memories[index]);
+    final title = widget.title != null
+        ? widget.title! == "filler"
+            ? _getTitle(widget.memories[index]) + "(I)"
+            : widget.title! + "(I)"
+        : _getTitle(widget.memories[index]);
     final memory = widget.memories[index];
     final isSeen = memory.isSeen();
     final brightness =

From 8792167986e204388f18ea40675ba46b92d3684d Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Tue, 4 Mar 2025 15:12:46 +0530
Subject: [PATCH 713/796] [mob][photos] Move clearCache

---
 mobile/lib/core/configuration.dart      | 2 --
 mobile/lib/services/search_service.dart | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/core/configuration.dart b/mobile/lib/core/configuration.dart
index ffa88ce132..e18f4e3a40 100644
--- a/mobile/lib/core/configuration.dart
+++ b/mobile/lib/core/configuration.dart
@@ -23,7 +23,6 @@ import 'package:photos/events/user_logged_out_event.dart';
 import 'package:photos/models/api/user/key_attributes.dart';
 import 'package:photos/models/api/user/key_gen_result.dart';
 import 'package:photos/models/api/user/private_key_attributes.dart';
-import "package:photos/service_locator.dart";
 import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/favorites_service.dart';
 import "package:photos/services/home_widget_service.dart";
@@ -217,7 +216,6 @@ class Configuration {
       CollectionsService.instance.clearCache();
       FavoritesService.instance.clearCache();
       MemoriesService.instance.clearCache();
-      unawaited(memoriesCacheService.clearMemoriesCache());
       SearchService.instance.clearCache();
       PersonService.instance.clearCache();
       unawaited(HomeWidgetService.instance.clearHomeWidget());
diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 6cc493d8aa..f9fb5d6aa4 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -1,3 +1,4 @@
+import "dart:async";
 import "dart:math";
 
 import "package:flutter/cupertino.dart";
@@ -151,6 +152,7 @@ class SearchService {
     _cachedFilesForSearch = null;
     _cachedFilesForHierarchicalSearch = null;
     _cachedHiddenFilesFuture = null;
+    unawaited(memoriesCacheService.clearMemoriesCache());
   }
 
   // getFilteredCollectionsWithThumbnail removes deleted or archived or

From 7d9e2eccd6e7b8c959bca960b74e93f0a665e78f Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 4 Mar 2025 15:13:26 +0530
Subject: [PATCH 714/796] fix: add info to update to latest verison whenever
 update is available

---
 mobile/pubspec.yaml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 928d95dec1..1966010ee5 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -25,7 +25,7 @@ dependencies:
   animated_list_plus: ^0.5.2
   archive: ^3.6.1
   background_fetch: ^1.2.1
-  battery_info:
+  battery_info: # update source if there is any update
     git:
       url: https://github.com/ente-io/battery_info
   bip39: ^1.0.6
@@ -68,7 +68,7 @@ dependencies:
   fade_indexed_stack: ^0.2.2
   fast_base58: ^0.2.1
   ffmpeg_kit_flutter_full_gpl: ^6.0.3
-  figma_squircle:
+  figma_squircle: # update source if there is any update
     git:
       url: https://github.com/aloisdeniel/figma_squircle.git
       ref: 7cc383b30e96c07acd4e484c1d6731d054f7f6ec
@@ -95,8 +95,6 @@ dependencies:
   flutter_password_strength: ^0.1.6
   flutter_secure_storage: ^9.2.4
   flutter_sodium:
-    git:
-      url: https://github.com/ente-io/flutter_sodium
   flutter_staggered_grid_view: ^0.6.2
   flutter_svg: ^2.0.10+1
   fluttertoast: ^8.0.6
@@ -146,7 +144,7 @@ dependencies:
     git: "https://github.com/ente-io/motion_photo.git"
   motionphoto:
     git: "https://github.com/ente-io/motionphoto.git"
-  move_to_background:
+  move_to_background: # update source if there is any update
     git: "https://github.com/ente-io/move_to_background.git"
   nanoid: ^1.0.0
   native_dio_adapter: ^1.4.0
@@ -157,7 +155,7 @@ dependencies:
     git:
       url: https://github.com/ente-io/onnxruntime.git
       ref: ios_only
-  open_mail_app:
+  open_mail_app: # update source if there is any update
     git:
       url: https://github.com/ente-io/open-mail-app-flutter.git
   package_info_plus: ^8.2.1
@@ -176,14 +174,14 @@ dependencies:
   pinput: ^5.0.0
   pointycastle: ^3.7.3
   pool: ^1.5.1
-  privacy_screen:
+  privacy_screen: # update source if there is any update
     git:
       url: https://github.com/ente-io/privacy_screen.git
       ref: pb/FIX-obsolete-android-plugin
   protobuf: ^3.1.0
   provider: ^6.0.0
   quiver: ^3.0.1
-  receive_sharing_intent:
+  receive_sharing_intent: # update source if there is any update
     git:
       url: https://github.com/KasemJaffer/receive_sharing_intent.git
   screenshot: ^3.0.0
@@ -205,7 +203,7 @@ dependencies:
   system_info_plus: ^0.0.6
   tuple: ^2.0.0
   ua_client_hints: ^1.4.0
-  uni_links:
+  uni_links: # update to app_links
     git:
       url: https://github.com/ente-io/uni_links.git
       path: uni_links
@@ -222,7 +220,7 @@ dependencies:
   video_thumbnail:
   visibility_detector: ^0.3.3
   wakelock_plus: ^1.1.1
-  wallpaper_manager_flutter:
+  wallpaper_manager_flutter: # update source if there is any update
     git:
       url: https://github.com/ente-io/wallpaper_manager_fork.git
   wechat_assets_picker: ^8.6.3
@@ -235,7 +233,7 @@ dependency_overrides:
   # Remove this after removing dependency from flutter_sodium.
   # Newer flutter packages depends on ffi > 2.0.0 while flutter_sodium depends on ffi < 2.0.0
   ffi: 2.1.0
-  flutter_sodium:
+  flutter_sodium: # update source if there is any update
     git:
       url: https://github.com/ente-io/flutter_sodium
   intl: 0.18.1

From f41c12cde82d01e6a8e4cc985f7961f52cef87e6 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 4 Mar 2025 15:15:41 +0530
Subject: [PATCH 715/796] fix: keep r8 enabled

---
 mobile/android/gradle.properties | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mobile/android/gradle.properties b/mobile/android/gradle.properties
index 69e42b7481..fce68493b1 100644
--- a/mobile/android/gradle.properties
+++ b/mobile/android/gradle.properties
@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx4608m
 android.useAndroidX=true
-android.enableJetifier=true
-android.enableR8.fullMode=false
\ No newline at end of file
+android.enableJetifier=true
\ No newline at end of file

From ba6b34be2a3fff54077df0d96556e52f52f9195d Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Tue, 4 Mar 2025 15:17:19 +0530
Subject: [PATCH 716/796] [mob][photos] Move models

---
 mobile/lib/db/memories_db.dart                     |  2 +-
 .../lib/models/{ => memories}/filler_memory.dart   |  4 ++--
 .../lib/models/{ => memories}/memories_cache.dart  |  6 +++---
 mobile/lib/models/{ => memories}/memory.dart       |  0
 .../lib/models/{ => memories}/people_memory.dart   |  4 ++--
 mobile/lib/models/{ => memories}/smart_memory.dart |  2 +-
 mobile/lib/models/{ => memories}/time_memory.dart  |  4 ++--
 mobile/lib/models/{ => memories}/trip_memory.dart  |  4 ++--
 mobile/lib/services/memories_cache_service.dart    |  6 +++---
 mobile/lib/services/memories_service.dart          |  2 +-
 mobile/lib/services/search_service.dart            |  2 +-
 mobile/lib/services/smart_memories_service.dart    | 14 +++++++-------
 .../lib/ui/home/memories/full_screen_memory.dart   |  2 +-
 mobile/lib/ui/home/memories/memories_widget.dart   |  4 ++--
 .../lib/ui/home/memories/memory_cover_widget.dart  |  2 +-
 15 files changed, 29 insertions(+), 29 deletions(-)
 rename mobile/lib/models/{ => memories}/filler_memory.dart (76%)
 rename mobile/lib/models/{ => memories}/memories_cache.dart (97%)
 rename mobile/lib/models/{ => memories}/memory.dart (100%)
 rename mobile/lib/models/{ => memories}/people_memory.dart (96%)
 rename mobile/lib/models/{ => memories}/smart_memory.dart (97%)
 rename mobile/lib/models/{ => memories}/time_memory.dart (75%)
 rename mobile/lib/models/{ => memories}/trip_memory.dart (90%)

diff --git a/mobile/lib/db/memories_db.dart b/mobile/lib/db/memories_db.dart
index eb84627b41..acee44fec9 100644
--- a/mobile/lib/db/memories_db.dart
+++ b/mobile/lib/db/memories_db.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:photos/models/memory.dart';
+import 'package:photos/models/memories/memory.dart';
 import 'package:sqflite/sqflite.dart';
 
 class MemoriesDB {
diff --git a/mobile/lib/models/filler_memory.dart b/mobile/lib/models/memories/filler_memory.dart
similarity index 76%
rename from mobile/lib/models/filler_memory.dart
rename to mobile/lib/models/memories/filler_memory.dart
index 8cfcbea49d..3e4e02b2c2 100644
--- a/mobile/lib/models/filler_memory.dart
+++ b/mobile/lib/models/memories/filler_memory.dart
@@ -1,5 +1,5 @@
-import "package:photos/models/memory.dart";
-import "package:photos/models/smart_memory.dart";
+import "package:photos/models/memories/memory.dart";
+import "package:photos/models/memories/smart_memory.dart";
 
 class FillerMemory extends SmartMemory {
   FillerMemory(
diff --git a/mobile/lib/models/memories_cache.dart b/mobile/lib/models/memories/memories_cache.dart
similarity index 97%
rename from mobile/lib/models/memories_cache.dart
rename to mobile/lib/models/memories/memories_cache.dart
index 8abb6695d3..5298c7f81a 100644
--- a/mobile/lib/models/memories_cache.dart
+++ b/mobile/lib/models/memories/memories_cache.dart
@@ -1,9 +1,9 @@
 import "dart:convert";
 
 import "package:photos/models/location/location.dart";
-import "package:photos/models/people_memory.dart";
-import "package:photos/models/smart_memory.dart";
-import "package:photos/models/trip_memory.dart";
+import "package:photos/models/memories/people_memory.dart";
+import "package:photos/models/memories/smart_memory.dart";
+import "package:photos/models/memories/trip_memory.dart";
 
 const kPersonShowTimeout = Duration(days: 7 * 10);
 const kPersonAndTypeShowTimeout = Duration(days: 7 * 26);
diff --git a/mobile/lib/models/memory.dart b/mobile/lib/models/memories/memory.dart
similarity index 100%
rename from mobile/lib/models/memory.dart
rename to mobile/lib/models/memories/memory.dart
diff --git a/mobile/lib/models/people_memory.dart b/mobile/lib/models/memories/people_memory.dart
similarity index 96%
rename from mobile/lib/models/people_memory.dart
rename to mobile/lib/models/memories/people_memory.dart
index c6810be3c9..0ce3ac6453 100644
--- a/mobile/lib/models/people_memory.dart
+++ b/mobile/lib/models/memories/people_memory.dart
@@ -1,5 +1,5 @@
-import "package:photos/models/memory.dart";
-import "package:photos/models/smart_memory.dart";
+import "package:photos/models/memories/memory.dart";
+import "package:photos/models/memories/smart_memory.dart";
 
 enum PeopleMemoryType {
   youAndThem,
diff --git a/mobile/lib/models/smart_memory.dart b/mobile/lib/models/memories/smart_memory.dart
similarity index 97%
rename from mobile/lib/models/smart_memory.dart
rename to mobile/lib/models/memories/smart_memory.dart
index 06d9c1cd15..d3527b2895 100644
--- a/mobile/lib/models/smart_memory.dart
+++ b/mobile/lib/models/memories/smart_memory.dart
@@ -1,4 +1,4 @@
-import "package:photos/models/memory.dart";
+import "package:photos/models/memories/memory.dart";
 
 const kMemoriesUpdateFrequency = Duration(days: 7);
 const kMemoriesMargin = Duration(days: 2);
diff --git a/mobile/lib/models/time_memory.dart b/mobile/lib/models/memories/time_memory.dart
similarity index 75%
rename from mobile/lib/models/time_memory.dart
rename to mobile/lib/models/memories/time_memory.dart
index 1b8b02868b..7dafef90ec 100644
--- a/mobile/lib/models/time_memory.dart
+++ b/mobile/lib/models/memories/time_memory.dart
@@ -1,5 +1,5 @@
-import "package:photos/models/memory.dart";
-import "package:photos/models/smart_memory.dart";
+import "package:photos/models/memories/memory.dart";
+import "package:photos/models/memories/smart_memory.dart";
 
 class TimeMemory extends SmartMemory {
   TimeMemory(
diff --git a/mobile/lib/models/trip_memory.dart b/mobile/lib/models/memories/trip_memory.dart
similarity index 90%
rename from mobile/lib/models/trip_memory.dart
rename to mobile/lib/models/memories/trip_memory.dart
index 1cc353f317..8763d20c1e 100644
--- a/mobile/lib/models/trip_memory.dart
+++ b/mobile/lib/models/memories/trip_memory.dart
@@ -1,6 +1,6 @@
 import "package:photos/models/location/location.dart";
-import "package:photos/models/memory.dart";
-import "package:photos/models/smart_memory.dart";
+import "package:photos/models/memories/memory.dart";
+import "package:photos/models/memories/smart_memory.dart";
 
 class TripMemory extends SmartMemory {
   final Location location;
diff --git a/mobile/lib/services/memories_cache_service.dart b/mobile/lib/services/memories_cache_service.dart
index ebdadd85d9..fdbb362d3f 100644
--- a/mobile/lib/services/memories_cache_service.dart
+++ b/mobile/lib/services/memories_cache_service.dart
@@ -9,9 +9,9 @@ import "package:photos/db/memories_db.dart";
 import "package:photos/events/files_updated_event.dart";
 import "package:photos/extensions/stop_watch.dart";
 import "package:photos/models/file/file.dart";
-import "package:photos/models/memories_cache.dart";
-import "package:photos/models/memory.dart";
-import "package:photos/models/smart_memory.dart";
+import "package:photos/models/memories/memories_cache.dart";
+import "package:photos/models/memories/memory.dart";
+import "package:photos/models/memories/smart_memory.dart";
 import "package:photos/service_locator.dart";
 import "package:photos/services/location_service.dart";
 import "package:photos/services/search_service.dart";
diff --git a/mobile/lib/services/memories_service.dart b/mobile/lib/services/memories_service.dart
index 6461131289..50e63b24b0 100644
--- a/mobile/lib/services/memories_service.dart
+++ b/mobile/lib/services/memories_service.dart
@@ -7,7 +7,7 @@ import 'package:photos/db/memories_db.dart';
 import "package:photos/events/files_updated_event.dart";
 import "package:photos/events/memories_setting_changed.dart";
 import 'package:photos/models/filters/important_items_filter.dart';
-import 'package:photos/models/memory.dart';
+import 'package:photos/models/memories/memory.dart';
 import "package:photos/models/metadata/common_keys.dart";
 import 'package:photos/services/collections_service.dart';
 import "package:shared_preferences/shared_preferences.dart";
diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index f9fb5d6aa4..c25dda586b 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -23,7 +23,7 @@ import 'package:photos/models/file/file_type.dart';
 import "package:photos/models/local_entity_data.dart";
 import "package:photos/models/location/location.dart";
 import "package:photos/models/location_tag/location_tag.dart";
-import "package:photos/models/memory.dart";
+import "package:photos/models/memories/memory.dart";
 import "package:photos/models/ml/face/person.dart";
 import 'package:photos/models/search/album_search_result.dart';
 import 'package:photos/models/search/generic_search_result.dart';
diff --git a/mobile/lib/services/smart_memories_service.dart b/mobile/lib/services/smart_memories_service.dart
index b6921104d6..2afe4190aa 100644
--- a/mobile/lib/services/smart_memories_service.dart
+++ b/mobile/lib/services/smart_memories_service.dart
@@ -13,19 +13,19 @@ import "package:photos/l10n/l10n.dart";
 import "package:photos/models/base_location.dart";
 import "package:photos/models/file/extensions/file_props.dart";
 import "package:photos/models/file/file.dart";
-import "package:photos/models/filler_memory.dart";
 import "package:photos/models/local_entity_data.dart";
 import "package:photos/models/location/location.dart";
 import "package:photos/models/location_tag/location_tag.dart";
-import "package:photos/models/memories_cache.dart";
-import "package:photos/models/memory.dart";
+import "package:photos/models/memories/filler_memory.dart";
+import "package:photos/models/memories/memories_cache.dart";
+import "package:photos/models/memories/memory.dart";
+import "package:photos/models/memories/people_memory.dart";
+import "package:photos/models/memories/smart_memory.dart";
+import "package:photos/models/memories/time_memory.dart";
+import "package:photos/models/memories/trip_memory.dart";
 import "package:photos/models/ml/face/face.dart";
 import "package:photos/models/ml/face/person.dart";
 import "package:photos/models/ml/vector.dart";
-import "package:photos/models/people_memory.dart";
-import "package:photos/models/smart_memory.dart";
-import "package:photos/models/time_memory.dart";
-import "package:photos/models/trip_memory.dart";
 import "package:photos/service_locator.dart";
 import "package:photos/services/location_service.dart";
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
diff --git a/mobile/lib/ui/home/memories/full_screen_memory.dart b/mobile/lib/ui/home/memories/full_screen_memory.dart
index 10b02b4862..bb92278911 100644
--- a/mobile/lib/ui/home/memories/full_screen_memory.dart
+++ b/mobile/lib/ui/home/memories/full_screen_memory.dart
@@ -5,7 +5,7 @@ import "package:flutter/cupertino.dart";
 import "package:flutter/material.dart";
 import "package:intl/intl.dart";
 import "package:photos/core/configuration.dart";
-import "package:photos/models/memory.dart";
+import "package:photos/models/memories/memory.dart";
 import "package:photos/services/memories_service.dart";
 import "package:photos/theme/text_style.dart";
 import "package:photos/ui/actions/file/file_actions.dart";
diff --git a/mobile/lib/ui/home/memories/memories_widget.dart b/mobile/lib/ui/home/memories/memories_widget.dart
index 002a899245..ade6fcaaf5 100644
--- a/mobile/lib/ui/home/memories/memories_widget.dart
+++ b/mobile/lib/ui/home/memories/memories_widget.dart
@@ -4,8 +4,8 @@ import 'package:flutter/material.dart';
 import "package:flutter_animate/flutter_animate.dart";
 import "package:photos/core/event_bus.dart";
 import "package:photos/events/memories_setting_changed.dart";
-import 'package:photos/models/memory.dart';
-import "package:photos/models/smart_memory.dart";
+import 'package:photos/models/memories/memory.dart';
+import "package:photos/models/memories/smart_memory.dart";
 import "package:photos/service_locator.dart";
 import 'package:photos/services/memories_service.dart';
 import "package:photos/ui/common/loading_widget.dart";
diff --git a/mobile/lib/ui/home/memories/memory_cover_widget.dart b/mobile/lib/ui/home/memories/memory_cover_widget.dart
index e4696ecc67..7d59112bb9 100644
--- a/mobile/lib/ui/home/memories/memory_cover_widget.dart
+++ b/mobile/lib/ui/home/memories/memory_cover_widget.dart
@@ -1,7 +1,7 @@
 import "package:flutter/material.dart";
 import "package:flutter/scheduler.dart";
 import "package:photos/generated/l10n.dart";
-import "package:photos/models/memory.dart";
+import "package:photos/models/memories/memory.dart";
 import "package:photos/theme/colors.dart";
 import "package:photos/theme/effects.dart";
 import "package:photos/theme/ente_theme.dart";

From de2bd40401eebeea4e0f204d0b987cf7f1fd9d45 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 4 Mar 2025 15:35:38 +0530
Subject: [PATCH 717/796] chore: bump package and add docs to them

---
 mobile/pubspec.lock |  6 +++---
 mobile/pubspec.yaml | 24 ++++++------------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index 5cfc923a6f..a1ef8a618b 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -1800,10 +1800,10 @@ packages:
     dependency: "direct main"
     description:
       name: native_video_player
-      sha256: "5a56da17e6c359de8e8063281dc14c1f8a3f17d40220cdbb1fa69217a2dda8b2"
+      sha256: "571d2ddb9ce297a653ca69ced40e30135c6a59c5a9be9a38e3b370dd6e4bdb0e"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0-dev.3"
+    version: "3.0.0-dev.4"
   nested:
     dependency: transitive
     description:
@@ -2844,7 +2844,7 @@ packages:
       path: "."
       ref: HEAD
       resolved-ref: "1eeb18e2b1ce36bd8ca70178c0d4b485e9982257"
-      url: "https://github.com/prateekmedia/video_editor.git"
+      url: "https://github.com/ente-io/video_editor_fork.git"
     source: git
     version: "3.0.0"
   video_player:
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 1966010ee5..0dda3f23c4 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -123,23 +123,11 @@ dependencies:
     git:
       url: "https://github.com/ente-io/media_extension.git"
   media_kit:
-    git:
-      url: https://github.com/media-kit/media-kit
-      path: media_kit
   media_kit_libs_ios_video:
-    git:
-      url: https://github.com/media-kit/media-kit
-      path: libs/ios/media_kit_libs_ios_video
   media_kit_libs_video:
-    git:
-      url: https://github.com/media-kit/media-kit
-      path: libs/universal/media_kit_libs_video
   media_kit_video:
-    git:
-      url: https://github.com/media-kit/media-kit
-      path: media_kit_video
   ml_linalg: ^13.11.31
-  modal_bottom_sheet: ^3.0.0-pre
+  modal_bottom_sheet: ^3.0.0
   motion_photos:
     git: "https://github.com/ente-io/motion_photo.git"
   motionphoto:
@@ -148,7 +136,7 @@ dependencies:
     git: "https://github.com/ente-io/move_to_background.git"
   nanoid: ^1.0.0
   native_dio_adapter: ^1.4.0
-  native_video_player: ^3.0.0-dev.3
+  native_video_player: ^3.0.0-dev.4
   onnx_dart:
     path: plugins/onnx_dart
   onnxruntime:
@@ -211,7 +199,7 @@ dependencies:
   uuid: ^4.5.0
   video_editor:
     git:
-      url: https://github.com/prateekmedia/video_editor.git
+      url: https://github.com/ente-io/video_editor_fork.git
   video_player:
     git:
       url: https://github.com/ente-io/packages.git
@@ -238,7 +226,7 @@ dependency_overrides:
       url: https://github.com/ente-io/flutter_sodium
   intl: 0.18.1
   js: ^0.6.7
-  media_kit:
+  media_kit: # update media_kit* if there is any update
     git:
       url: https://github.com/media-kit/media-kit
       path: media_kit
@@ -254,12 +242,12 @@ dependency_overrides:
     git:
       url: https://github.com/media-kit/media-kit
       path: media_kit_video
-  video_player:
+  video_player: # remove this dep as soon as we move to one player for all
     git:
       url: https://github.com/ente-io/packages.git
       ref: android_video_roation_fix
       path: packages/video_player/video_player/
-  video_thumbnail:
+  video_thumbnail: # update source if there is any update
     git:
       url: https://github.com/ente-io/video_thumbnail_fork.git
   watcher: ^1.1.0

From 017692d80f92d16d60b15599fb4b6432c924b5af Mon Sep 17 00:00:00 2001
From: Aman Raj Singh Mourya <amanrajmourya7@gmail.com>
Date: Tue, 4 Mar 2025 15:35:43 +0530
Subject: [PATCH 718/796] [mob][photos] fix: change title to `(i) Video Memory`
 to identify its a internal feature

---
 mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart b/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
index 9420805da2..eb155a1898 100644
--- a/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
+++ b/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart
@@ -325,7 +325,7 @@ class _FileSelectionActionsWidgetState
       items.add(
         SelectionActionButton(
           icon: Icons.movie_creation_sharp,
-          labelText: "Video Memory",
+          labelText: "(i) Video Memory",
           onTap: _onCreateVideoMemoryClicked,
         ),
       );

From ebab9fd1a0d5eb8ae91a2c8a297335a20548ade1 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 4 Mar 2025 15:36:36 +0530
Subject: [PATCH 719/796] fix: remove stop code as there is no memory leak now

---
 mobile/lib/ui/viewer/file/video_widget_native.dart | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mobile/lib/ui/viewer/file/video_widget_native.dart b/mobile/lib/ui/viewer/file/video_widget_native.dart
index f91b10d53e..2ca7a4ac92 100644
--- a/mobile/lib/ui/viewer/file/video_widget_native.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_native.dart
@@ -178,9 +178,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
   @override
   void dispose() {
     _subscription?.cancel();
-    _controller?.stop();
     _controller?.dispose();
-    _controller = null;
 
     //https://github.com/fluttercandies/flutter_photo_manager/blob/8afba2745ebaac6af8af75de9cbded9157bc2690/README.md#clear-caches
     if (_shouldClearCache) {

From 5ef1a0d3f74ade689f8d37e43f9e6d930af5239f Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Tue, 4 Mar 2025 16:11:12 +0530
Subject: [PATCH 720/796] chore: bump version

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 0dda3f23c4..9956bb03d2 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.99+1009
+version: 0.9.99+1010
 publish_to: none
 
 environment:

From 6083992bfda90da1a5632590a14560860094acf5 Mon Sep 17 00:00:00 2001
From: Aman Raj Singh Mourya <amanrajmourya7@gmail.com>
Date: Tue, 4 Mar 2025 19:31:45 +0530
Subject: [PATCH 721/796] [mob][photos] fix: Allow uploads when link shared
 from collect photos

---
 .../ui/viewer/gallery/collect_photos_bottom_buttons.dart    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/ui/viewer/gallery/collect_photos_bottom_buttons.dart b/mobile/lib/ui/viewer/gallery/collect_photos_bottom_buttons.dart
index 0d6b633040..df90b8a10c 100644
--- a/mobile/lib/ui/viewer/gallery/collect_photos_bottom_buttons.dart
+++ b/mobile/lib/ui/viewer/gallery/collect_photos_bottom_buttons.dart
@@ -68,7 +68,11 @@ class _EmptyAlbumStateNewState extends State<CollectPhotosBottomButtons> {
     if (hasUrl) {
       await _shareAlbumUrl();
     } else {
-      final bool result = await collectionActions.enableUrl(context, widget.c);
+      final bool result = await collectionActions.enableUrl(
+        context,
+        widget.c,
+        enableCollect: true,
+      );
       if (result) {
         await _shareAlbumUrl();
       } else {

From 8ac9751891103d538577701a326b90d5b73915b5 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 3 Mar 2025 13:18:28 +0530
Subject: [PATCH 722/796] Temporary workbench

This reverts commit 2859e02dacdda5313eb1ff200c8b0e0d2409e255.
---
 web/apps/photos/src/pages/_app.tsx                   | 4 ++--
 web/apps/photos/src/styles/global.css                | 3 ++-
 web/packages/gallery/components/viewer/photoswipe.ts | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index 000cf2d037..aad64be0cf 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -48,9 +48,9 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { resumeExportsIfNeeded } from "services/export";
 import { photosLogout } from "services/logout";
 
-import "photoswipe/dist/photoswipe.css";
+// import "photoswipe/dist/photoswipe.css";
 // TODO(PS): Note, auto hide only works with the new CSS.
-// import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
+import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
 
 import "styles/global.css";
 
diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index fe0efe365a..1b45cfe9ed 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -12,7 +12,7 @@ body {
     flex-direction: column;
     height: 100%;
 }
-
+@media DISABLED {
 .pswp__button--custom {
     width: 48px;
     height: 48px;
@@ -114,6 +114,7 @@ body {
 .pswp__caption--empty {
     display: none;
 }
+}
 
 .pswp-ente {
     /* The default z-index for PhotoSwipe is 10k, way beyond everything else.
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 168fe3aacb..d84458c268 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -31,7 +31,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 let PhotoSwipe;
 if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     // TODO(PS): Comment me before merging into main.
-    // PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
+    PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
 
 /**

From a9def0ccc12f83e5bb91a29ba722c7a95a3a3504 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 3 Mar 2025 13:42:57 +0530
Subject: [PATCH 723/796] cap 1

---
 web/apps/photos/src/styles/global.css             | 15 +++++++++++++++
 .../gallery/components/viewer/photoswipe.ts       | 12 ++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 1b45cfe9ed..718b8a6f8a 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -170,3 +170,18 @@ body {
     /* default is a horizontal flip, transform: scale(-1, 1); */
     transform: scale(-0.8, 0.8);
 }
+
+.pswp-ente .pswp__caption {
+    color: white;
+    position: absolute;
+    bottom: 8px;
+    right: 8px;
+    padding: 6px 16px;
+    border-radius: 2px;
+    background-color: rgba(0 0 0 / 0.2);
+    backdrop-filter: blur(10px);
+    word-break: break-word;
+    text-align: right;
+    max-width: 375px;
+    max-height: 200px;
+}
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index d84458c268..0332a97b47 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -617,6 +617,18 @@ export class FileViewerPhotoSwipe {
                     },
                 });
             }
+
+            pswp.ui.registerElement({
+                name: "caption",
+                order: 50,
+                appendTo: "root",
+                html: "<p/>",
+                onInit: (captionElement, pswp) =>
+                    pswp.on("change", () => {
+                        const { file } = pswp.currSlide.content.data;
+                        captionElement.innerText = `${file}`;
+                    }),
+            });
         });
 
         // Modify the default UI elements.

From 72aab3f53c6f629870b19fae95a1da7fa2edcdfa Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 3 Mar 2025 13:59:23 +0530
Subject: [PATCH 724/796] cap 2

---
 web/packages/gallery/components/FileInfo.tsx          |  3 ++-
 web/packages/gallery/components/viewer/FileViewer.tsx | 11 ++++++++++-
 web/packages/gallery/components/viewer/photoswipe.ts  |  8 ++++++--
 web/packages/media/file-metadata.ts                   |  7 +++++++
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 40d8d3e44d..4d90134a35 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -35,6 +35,7 @@ import {
 import { formattedByteSize } from "@/gallery/utils/units";
 import { type EnteFile } from "@/media/file";
 import {
+    fileCaption,
     fileCreationPhotoDate,
     fileLocation,
     filePublicMagicMetadata,
@@ -536,7 +537,7 @@ const Caption: React.FC<CaptionProps> = ({
 }) => {
     const [isSaving, setIsSaving] = useState(false);
 
-    const caption = file.pubMagicMetadata?.data.caption ?? "";
+    const caption = fileCaption(file) ?? "";
 
     const formik = useFormik<{ caption: string }>({
         initialValues: { caption },
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 590af3e324..3cfb0679b8 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -26,6 +26,7 @@ import {
     type FileInfoProps,
 } from "@/gallery/components/FileInfo";
 import type { Collection } from "@/media/collection";
+import { fileCaption } from "@/media/file-metadata";
 import { FileType } from "@/media/file-type";
 import type { EnteFile } from "@/media/file.js";
 import { isHEICExtension, needsJPEGConversion } from "@/media/formats";
@@ -292,7 +293,15 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 handleEditImage && canModify
                     ? fileIsEditableImage(file)
                     : undefined;
-            return { fileID, isOwnFile, showFavorite, isEditableImage };
+            const caption = fileCaption(file);
+
+            return {
+                fileID,
+                isOwnFile,
+                showFavorite,
+                isEditableImage,
+                caption,
+            };
         },
         [user, isInTrashSection, isInHiddenSection, handleEditImage],
     );
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 0332a97b47..c13570ba49 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -58,6 +58,10 @@ export interface FileViewerFileAnnotation {
      * and the edit action should therefore be shown for this file.
      */
     isEditableImage: boolean;
+    /**
+     * The caption ("description") of the file (if any).
+     */
+    caption: string | undefined;
 }
 
 export interface FileViewerPhotoSwipeDelegate {
@@ -625,8 +629,8 @@ export class FileViewerPhotoSwipe {
                 html: "<p/>",
                 onInit: (captionElement, pswp) =>
                     pswp.on("change", () => {
-                        const { file } = pswp.currSlide.content.data;
-                        captionElement.innerText = `${file}`;
+                        captionElement.innerText =
+                            currentFileAnnotation().caption ?? "";
                     }),
             });
         });
diff --git a/web/packages/media/file-metadata.ts b/web/packages/media/file-metadata.ts
index a9ceba491c..44936d9af5 100644
--- a/web/packages/media/file-metadata.ts
+++ b/web/packages/media/file-metadata.ts
@@ -855,3 +855,10 @@ export const fileLocation = (file: EnteFile): Location | undefined => {
 
     return { latitude, longitude };
 };
+
+/**
+ * Return the caption, aka "description", (if any) attached to the given
+ * {@link EnteFile}.
+ */
+export const fileCaption = (file: EnteFile): string | undefined =>
+    filePublicMagicMetadata(file)?.caption;

From 2490b5ca4fd44430f042f63c45b1c815bc586ac4 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 3 Mar 2025 14:16:50 +0530
Subject: [PATCH 725/796] caption fin

---
 web/apps/photos/src/styles/global.css                | 11 +++++++++--
 web/packages/gallery/components/viewer/photoswipe.ts |  9 ++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 718b8a6f8a..007c8d5d20 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -174,8 +174,9 @@ body {
 .pswp-ente .pswp__caption {
     color: white;
     position: absolute;
-    bottom: 8px;
-    right: 8px;
+    bottom: 0;
+    right: 0;
+    margin: 10px;
     padding: 6px 16px;
     border-radius: 2px;
     background-color: rgba(0 0 0 / 0.2);
@@ -184,4 +185,10 @@ body {
     text-align: right;
     max-width: 375px;
     max-height: 200px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 4;
+    line-clamp: 4;
 }
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index c13570ba49..6e15989a5c 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -626,11 +626,14 @@ export class FileViewerPhotoSwipe {
                 name: "caption",
                 order: 50,
                 appendTo: "root",
-                html: "<p/>",
+                tagName: "p",
                 onInit: (captionElement, pswp) =>
                     pswp.on("change", () => {
-                        captionElement.innerText =
-                            currentFileAnnotation().caption ?? "";
+                        const caption = currentFileAnnotation().caption ?? "";
+                        captionElement.innerText = caption;
+                        captionElement.style.visibility = caption
+                            ? "visible"
+                            : "hidden";
                     }),
             });
         });

From 79ac17a7420ef020553d52a73926a6205f4150b4 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 3 Mar 2025 15:11:11 +0530
Subject: [PATCH 726/796] Vids

---
 web/packages/gallery/components/viewer/photoswipe.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 6e15989a5c..d79cf23b5b 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -629,11 +629,21 @@ export class FileViewerPhotoSwipe {
                 tagName: "p",
                 onInit: (captionElement, pswp) =>
                     pswp.on("change", () => {
-                        const caption = currentFileAnnotation().caption ?? "";
+                        const { file, annotation } = currentAnnotatedFile();
+                        const caption = annotation.caption ?? "";
                         captionElement.innerText = caption;
                         captionElement.style.visibility = caption
                             ? "visible"
                             : "hidden";
+                        // Add extra offset for video captions so that they do
+                        // not overlap with the video controls. The constant is
+                        // something that worked and looked okay-ish across
+                        // Chrome, Safari and Firefox video players when I
+                        // tested, but might need tweaking in the future.
+                        captionElement.style.bottom =
+                            file.metadata.fileType === FileType.video
+                                ? "48px"
+                                : "0";
                     }),
             });
         });

From 0e32e60dbdfbaa9928888868de02aac9e8a92b07 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 3 Mar 2025 15:24:09 +0530
Subject: [PATCH 727/796] Tweak

---
 web/apps/photos/src/styles/global.css                |  4 ++--
 web/packages/gallery/components/viewer/photoswipe.ts | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 007c8d5d20..eee2c742fd 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -174,9 +174,9 @@ body {
 .pswp-ente .pswp__caption {
     color: white;
     position: absolute;
-    bottom: 0;
+    bottom: 0px;
     right: 0;
-    margin: 10px;
+    margin: 20px 24px;
     padding: 6px 16px;
     border-radius: 2px;
     background-color: rgba(0 0 0 / 0.2);
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index d79cf23b5b..7e2415a684 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -624,7 +624,9 @@ export class FileViewerPhotoSwipe {
 
             pswp.ui.registerElement({
                 name: "caption",
-                order: 50,
+                // Arbitrary order towards the end (it doesn't matter anyways
+                // since we're absolutely positioned).
+                order: 30,
                 appendTo: "root",
                 tagName: "p",
                 onInit: (captionElement, pswp) =>
@@ -637,12 +639,10 @@ export class FileViewerPhotoSwipe {
                             : "hidden";
                         // Add extra offset for video captions so that they do
                         // not overlap with the video controls. The constant is
-                        // something that worked and looked okay-ish across
-                        // Chrome, Safari and Firefox video players when I
-                        // tested, but might need tweaking in the future.
+                        // an ad-hoc value that looked okay-ish across browsers.
                         captionElement.style.bottom =
                             file.metadata.fileType === FileType.video
-                                ? "48px"
+                                ? "36px"
                                 : "0";
                     }),
             });

From ca24541ea55f4c3482bcde80e122b356e99532db Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 3 Mar 2025 15:30:35 +0530
Subject: [PATCH 728/796] Limit text field rows

---
 web/packages/gallery/components/FileInfo.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 4d90134a35..5cbcd32f74 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -576,6 +576,7 @@ const Caption: React.FC<CaptionProps> = ({
                 name="caption"
                 type="text"
                 multiline
+                maxRows={7}
                 aria-label={t("description")}
                 hiddenLabel
                 fullWidth

From 6676668c8621a35a201f66d3a222f6767fa776aa Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 3 Mar 2025 15:36:27 +0530
Subject: [PATCH 729/796] alt

---
 .../gallery/components/viewer/FileViewer.tsx     |  4 +---
 .../gallery/components/viewer/data-source.ts     | 16 +++++++++++++++-
 .../gallery/components/viewer/photoswipe.ts      | 15 ++++++---------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 3cfb0679b8..25e6d254fe 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -26,7 +26,6 @@ import {
     type FileInfoProps,
 } from "@/gallery/components/FileInfo";
 import type { Collection } from "@/media/collection";
-import { fileCaption } from "@/media/file-metadata";
 import { FileType } from "@/media/file-type";
 import type { EnteFile } from "@/media/file.js";
 import { isHEICExtension, needsJPEGConversion } from "@/media/formats";
@@ -284,6 +283,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
     const handleAnnotate = useCallback(
         (file: EnteFile): FileViewerFileAnnotation => {
             log.debug(() => ["viewer", { action: "annotate", file }]);
+
             const fileID = file.id;
             const isOwnFile = file.ownerID == user?.id;
             const canModify =
@@ -293,14 +293,12 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 handleEditImage && canModify
                     ? fileIsEditableImage(file)
                     : undefined;
-            const caption = fileCaption(file);
 
             return {
                 fileID,
                 isOwnFile,
                 showFavorite,
                 isEditableImage,
-                caption,
             };
         },
         [user, isInTrashSection, isInHiddenSection, handleEditImage],
diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 7b931d488b..5c6d4ef7f5 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -6,6 +6,7 @@ import {
 } from "@/gallery/services/download";
 import { extractRawExif, parseExif } from "@/gallery/services/exif";
 import type { EnteFile } from "@/media/file";
+import { fileCaption } from "@/media/file-metadata";
 import { FileType } from "@/media/file-type";
 import { ensureString } from "@/utils/ensure";
 
@@ -97,6 +98,15 @@ export type ItemData = PhotoSwipeSlideData & {
      * It is set while the thumbnail is loaded.
      */
     isContentZoomable?: boolean;
+    /**
+     * The alt text associated with the file.
+     *
+     * This will be set to the file's caption. PhotoSwipe will use it as the alt
+     * text when constructing img elements (if any) for this item. We will also
+     * use this for displaying the visible "caption" element atop the file (both
+     * images and video).
+     */
+    alt?: string;
     /**
      * This will be `true` if the fetch for the file's data has failed.
      *
@@ -244,7 +254,11 @@ const enqueueUpdates = async (file: EnteFile) => {
     const fileType = file.metadata.fileType;
 
     const update = (itemData: Partial<ItemData>) => {
-        _state.itemDataByFileID.set(file.id, { ...itemData, fileType, fileID });
+        // Use the file's caption as its alt text (in addition to using it as
+        // the visible caption).
+        const alt = fileCaption(file);
+
+        _state.itemDataByFileID.set(file.id, { ...itemData, fileType, fileID, alt });
         _state.needsRefreshByFileID.get(file.id)?.();
     };
 
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 7e2415a684..73c60bf916 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -345,8 +345,8 @@ export class FileViewerPhotoSwipe {
                 pswp.refreshSlideContent(index),
             );
 
-            const { fileType, videoURL, ...rest } = itemData;
-            if (fileType === FileType.video && videoURL) {
+            const { videoURL, ...rest } = itemData;
+            if (itemData.fileType === FileType.video && videoURL) {
                 const disableDownload = !!this.opts.disableDownload;
                 itemData = {
                     ...rest,
@@ -631,19 +631,16 @@ export class FileViewerPhotoSwipe {
                 tagName: "p",
                 onInit: (captionElement, pswp) =>
                     pswp.on("change", () => {
-                        const { file, annotation } = currentAnnotatedFile();
-                        const caption = annotation.caption ?? "";
-                        captionElement.innerText = caption;
-                        captionElement.style.visibility = caption
+                        const { fileType, alt } = pswp.currSlide.content.data;
+                        captionElement.innerText = alt ?? "";
+                        captionElement.style.visibility = alt
                             ? "visible"
                             : "hidden";
                         // Add extra offset for video captions so that they do
                         // not overlap with the video controls. The constant is
                         // an ad-hoc value that looked okay-ish across browsers.
                         captionElement.style.bottom =
-                            file.metadata.fileType === FileType.video
-                                ? "36px"
-                                : "0";
+                            fileType === FileType.video ? "36px" : "0";
                     }),
             });
         });

From 9c5adfe7cbbd4361d094ddb735a1723514d50b36 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Mon, 3 Mar 2025 16:38:39 +0530
Subject: [PATCH 730/796] Reset cache

---
 web/apps/photos/src/pages/gallery.tsx         |  8 +-
 .../gallery/components/viewer/FileViewer.tsx  |  1 -
 .../gallery/components/viewer/data-source.ts  | 91 ++++++++++++++++---
 .../gallery/components/viewer/photoswipe.ts   | 14 ++-
 .../components/FileViewerComponents-temp.ts   |  7 ++
 .../components/FileViewerComponents.tsx       |  1 +
 web/packages/new/photos/services/sync.ts      | 11 ++-
 7 files changed, 107 insertions(+), 26 deletions(-)
 create mode 100644 web/packages/new/photos/components/FileViewerComponents-temp.ts

diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index cdacf81631..79de4d7458 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -18,6 +18,7 @@ import {
     CollectionSelector,
     type CollectionSelectorAttributes,
 } from "@/new/photos/components/CollectionSelector";
+import { resetFileViewerDataSourceOnClose } from "@/new/photos/components/FileViewerComponents-temp";
 import { PlanSelector } from "@/new/photos/components/PlanSelector";
 import {
     SearchBar,
@@ -564,11 +565,14 @@ const Page: React.FC = () => {
                     (hiddenFiles) =>
                         dispatch({ type: "fetchHiddenFiles", hiddenFiles }),
                 );
-                if (didUpdateNormalFiles || didUpdateHiddenFiles)
-                    exportService.onLocalFilesUpdated();
                 await syncTrash(allCollections, (trashedFiles: EnteFile[]) =>
                     dispatch({ type: "setTrashedFiles", trashedFiles }),
                 );
+                if (didUpdateNormalFiles || didUpdateHiddenFiles) {
+                    exportService.onLocalFilesUpdated();
+                    // TODO(PS): Use direct one
+                    resetFileViewerDataSourceOnClose();
+                }
                 // syncWithRemote is called with the force flag set to true before
                 // doing an upload. So it is possible, say when resuming a pending
                 // upload, that we get two syncWithRemotes happening in parallel.
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 25e6d254fe..400bef2b36 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -213,7 +213,6 @@ const FileViewer: React.FC<FileViewerProps> = ({
 
     const handleClose = useCallback(() => {
         setNeedsSync((needSync) => {
-            console.log("needs sync", needSync);
             if (needSync) onTriggerSyncWithRemote?.();
             return false;
         });
diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 5c6d4ef7f5..ad82bfbbfa 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -38,6 +38,15 @@ interface PhotoSwipeSlideData {
      * The height (in pixels) of the {@link src} image.
      */
     height?: number | undefined;
+    /**
+     * The alt text associated with the file.
+     *
+     * This will be set to the file's caption. PhotoSwipe will use it as the alt
+     * text when constructing img elements (if any) for this item. We will also
+     * use this for displaying the visible "caption" element atop the file (both
+     * images and video).
+     */
+    alt?: string;
 }
 
 /**
@@ -98,15 +107,6 @@ export type ItemData = PhotoSwipeSlideData & {
      * It is set while the thumbnail is loaded.
      */
     isContentZoomable?: boolean;
-    /**
-     * The alt text associated with the file.
-     *
-     * This will be set to the file's caption. PhotoSwipe will use it as the alt
-     * text when constructing img elements (if any) for this item. We will also
-     * use this for displaying the visible "caption" element atop the file (both
-     * images and video).
-     */
-    alt?: string;
     /**
      * This will be `true` if the fetch for the file's data has failed.
      *
@@ -127,6 +127,19 @@ export type ItemData = PhotoSwipeSlideData & {
  * This will be cleared on logout.
  */
 class FileViewerDataSourceState {
+    /**
+     * Non-zero if a file viewer is currently open.
+     *
+     * This is a counter, but the file viewer data source has other many
+     * assumptions about only a single instance of PhotoSwipe being active at a
+     * time, so this could've been a boolean as well.
+     */
+    viewerCount = 0;
+    /**
+     * True if our state needs to be cleared the next time the file viewer is
+     * closed.
+     */
+    needsReset = false;
     /**
      * The best data we have for a particular file (ID).
      */
@@ -154,12 +167,59 @@ class FileViewerDataSourceState {
  */
 let _state = new FileViewerDataSourceState();
 
+const resetState = () => {
+    _state = new FileViewerDataSourceState();
+};
+
 /**
  * Clear any internal state maintained by the file viewer data source.
  */
 // TODO(PS): Call me during logout sequence once this is integrated.
-export const logoutFileViewerDataSource = () => {
-    _state = new FileViewerDataSourceState();
+export const logoutFileViewerDataSource = resetState;
+
+/**
+ * Clear any internal state if possible. This is invoked when files have been
+ * updated on remote, and those changes synced locally.
+ *
+ * Because we also retain callbacks, clearing existing item data when the file
+ * viewer is open can lead to problematic edge cases. Thus, this function
+ * behaves in two different ways:
+ *
+ * - If the file viewer is already open, then we enqueue a reset for when it is
+ *   closed the next time.
+ *
+ * - Otherwise we immediately reset our state.
+ *
+ * See: [Note: Changes to underlying files when file viewer is open]
+ */
+export const resetFileViewerDataSourceOnClose = () => {
+    if (_state.viewerCount) {
+        _state.needsReset = true;
+    } else {
+        resetState();
+    }
+};
+
+/**
+ * Called by the file viewer whenever it is opened.
+ */
+export const fileViewerWillOpen = () => {
+    _state.viewerCount++;
+};
+
+/**
+ * Called by the file viewer whenever it has been closed.
+ */
+export const fileViewerDidClose = () => {
+    _state.viewerCount--;
+    if (_state.needsReset && _state.viewerCount == 0) {
+        // Reset everything.
+        resetState();
+    } else {
+        // Selectively clear.
+        forgetFailedItems();
+        forgetExif();
+    }
 };
 
 /**
@@ -246,7 +306,7 @@ export const forgetFailedItemDataForFileID = (fileID: number) => {
  * This is called when the user closes the file viewer so that we attempt a full
  * retry when they reopen the viewer the next time.
  */
-export const forgetFailedItems = () =>
+const forgetFailedItems = () =>
     [..._state.itemDataByFileID.keys()].forEach(forgetFailedItemDataForFileID);
 
 const enqueueUpdates = async (file: EnteFile) => {
@@ -258,7 +318,12 @@ const enqueueUpdates = async (file: EnteFile) => {
         // the visible caption).
         const alt = fileCaption(file);
 
-        _state.itemDataByFileID.set(file.id, { ...itemData, fileType, fileID, alt });
+        _state.itemDataByFileID.set(file.id, {
+            ...itemData,
+            fileType,
+            fileID,
+            alt,
+        });
         _state.needsRefreshByFileID.get(file.id)?.();
     };
 
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 73c60bf916..384ad01d0a 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -7,10 +7,10 @@ import type { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import { t } from "i18next";
 import {
-    forgetExif,
+    fileViewerDidClose,
+    fileViewerWillOpen,
     forgetExifForItemData,
     forgetFailedItemDataForFileID,
-    forgetFailedItems,
     itemDataForFile,
     updateFileInfoExifIfNeeded,
 } from "./data-source";
@@ -58,10 +58,6 @@ export interface FileViewerFileAnnotation {
      * and the edit action should therefore be shown for this file.
      */
     isEditableImage: boolean;
-    /**
-     * The caption ("description") of the file (if any).
-     */
-    caption: string | undefined;
 }
 
 export interface FileViewerPhotoSwipeDelegate {
@@ -464,8 +460,7 @@ export class FileViewerPhotoSwipe {
         // completed.
         pswp.on("destroy", () => {
             this.clearAutoHideIntervalIfNeeded();
-            forgetFailedItems();
-            forgetExif();
+            fileViewerDidClose();
             // Let our parent know that we have been closed.
             onClose();
         });
@@ -654,6 +649,9 @@ export class FileViewerPhotoSwipe {
             return element;
         });
 
+        // Let our data source know.
+        fileViewerWillOpen();
+
         // Initializing PhotoSwipe adds it to the DOM as a dialog-like div with
         // the class "pswp".
         pswp.init();
diff --git a/web/packages/new/photos/components/FileViewerComponents-temp.ts b/web/packages/new/photos/components/FileViewerComponents-temp.ts
new file mode 100644
index 0000000000..834bc63d6c
--- /dev/null
+++ b/web/packages/new/photos/components/FileViewerComponents-temp.ts
@@ -0,0 +1,7 @@
+// TODO(PS): Temporary trampoline
+export const resetFileViewerDataSourceOnClose = async () => {
+    if (!process.env.NEXT_PUBLIC_ENTE_WIP_PS5) return;
+    (
+        await import("@/gallery/components/viewer/data-source")
+    ).resetFileViewerDataSourceOnClose();
+};
diff --git a/web/packages/new/photos/components/FileViewerComponents.tsx b/web/packages/new/photos/components/FileViewerComponents.tsx
index 120b3a4c2c..c65c74e52f 100644
--- a/web/packages/new/photos/components/FileViewerComponents.tsx
+++ b/web/packages/new/photos/components/FileViewerComponents.tsx
@@ -16,6 +16,7 @@ import dynamic from "next/dynamic";
 const FV5 = dynamic(() => import("@/gallery/components/viewer/FileViewer"), {
     ssr: false,
 });
+
 const FVD = () => <></>;
 
 export const FileViewer: React.FC = (props) => {
diff --git a/web/packages/new/photos/services/sync.ts b/web/packages/new/photos/services/sync.ts
index 906eaad9b5..6bd072e71e 100644
--- a/web/packages/new/photos/services/sync.ts
+++ b/web/packages/new/photos/services/sync.ts
@@ -9,6 +9,7 @@ import { isMLSupported, mlStatusSync, mlSync } from "@/new/photos/services/ml";
 import { searchDataSync } from "@/new/photos/services/search";
 import { syncSettings } from "@/new/photos/services/settings";
 import { splitByPredicate } from "@/utils/array";
+import { resetFileViewerDataSourceOnClose } from "../components/FileViewerComponents-temp";
 
 /**
  * Part 1 of {@link sync}. See TODO below for why this is split.
@@ -62,17 +63,23 @@ export const syncFilesAndCollections = async () => {
         allCollections,
         isHiddenCollection,
     );
-    await syncFiles(
+    const didUpdateNormalFiles = await syncFiles(
         "normal",
         normalCollections,
         () => {},
         () => {},
     );
-    await syncFiles(
+    const didUpdateHiddenFiles = await syncFiles(
         "hidden",
         hiddenCollections,
         () => {},
         () => {},
     );
     await syncTrash(allCollections, () => {});
+    if (didUpdateNormalFiles || didUpdateHiddenFiles) {
+        // TODO:
+        // exportService.onLocalFilesUpdated();
+        // TODO(PS): Use direct one
+        await resetFileViewerDataSourceOnClose();
+    }
 };

From bad8a9c9b807e5ef676505053cd6a9ee4c64de3e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 07:48:23 +0530
Subject: [PATCH 731/796] Rename and pass file

---
 .../src/components/PhotoViewer/index.tsx      |  4 +-
 web/packages/gallery/components/FileInfo.tsx  | 57 ++++++++++++-------
 .../gallery/components/viewer/FileViewer.tsx  | 13 +++--
 .../gallery/components/viewer/data-source.ts  |  3 +-
 4 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx
index 2868a0f5d4..b2376b707c 100644
--- a/web/apps/photos/src/components/PhotoViewer/index.tsx
+++ b/web/apps/photos/src/components/PhotoViewer/index.tsx
@@ -1003,8 +1003,8 @@ export const PhotoViewer: React.FC<PhotoViewerProps> = ({
                 }
                 fileCollectionIDs={fileCollectionIDs}
                 allCollectionsNameByID={allCollectionsNameByID}
-                scheduleUpdate={scheduleUpdate}
-                refreshPhotoswipe={refreshPhotoswipe}
+                onNeedsRemoteSync={scheduleUpdate}
+                onUpdateCaption={refreshPhotoswipe}
                 onSelectCollection={handleSelectCollection}
                 onSelectPerson={handleSelectPerson}
             />
diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx
index 5cbcd32f74..c021aeb07d 100644
--- a/web/packages/gallery/components/FileInfo.tsx
+++ b/web/packages/gallery/components/FileInfo.tsx
@@ -154,8 +154,27 @@ export type FileInfoProps = ModalVisibilityProps & {
      * Used when {@link showCollections} is set.
      */
     allCollectionsNameByID?: Map<number, string>;
-    scheduleUpdate: () => void;
-    refreshPhotoswipe: () => void;
+    /**
+     * Called when the action on the file info drawer has changed some the
+     * metadata for some file, and we need to sync with remote to get our
+     * locally persisted file objects up to date.
+     *
+     * The sync is not performed immediately by the file info drawer to give
+     * faster feedback to the user, and to allow changes to multiple files to be
+     * batched together into a single sync when the file viewer is closed.
+     */
+    onNeedsRemoteSync: () => void;
+    /**
+     * Called when an action on the file info drawer change the caption of the
+     * given {@link EnteFile}.
+     *
+     * This hook allows the file viewer to update the caption it is displaying
+     * for the given file.
+     *
+     * @param updatedFile The updated file object, containing the updated
+     * caption.
+     */
+    onUpdateCaption: (updatedFile: EnteFile) => void;
     /**
      * Called when the user selects a collection from among the collections that
      * the file belongs to.
@@ -177,8 +196,8 @@ export const FileInfo: React.FC<FileInfoProps> = ({
     showCollections,
     fileCollectionIDs,
     allCollectionsNameByID,
-    scheduleUpdate,
-    refreshPhotoswipe,
+    onNeedsRemoteSync,
+    onUpdateCaption,
     onSelectCollection,
     onSelectPerson,
 }) => {
@@ -240,13 +259,13 @@ export const FileInfo: React.FC<FileInfoProps> = ({
                     {...{
                         file,
                         allowEdits,
-                        scheduleUpdate,
-                        refreshPhotoswipe,
+                        onNeedsRemoteSync,
+                        onUpdateCaption,
                     }}
                 />
-                <CreationTime {...{ file, allowEdits, scheduleUpdate }} />
+                <CreationTime {...{ file, allowEdits, onNeedsRemoteSync }} />
                 <FileName
-                    {...{ file, annotatedExif, allowEdits, scheduleUpdate }}
+                    {...{ file, annotatedExif, allowEdits, onNeedsRemoteSync }}
                 />
 
                 {annotatedExif?.takenOnDevice && (
@@ -521,7 +540,7 @@ const EditButton: React.FC<EditButtonProps> = ({ onClick, loading }) => (
 
 type CaptionProps = Pick<
     FileInfoProps,
-    "allowEdits" | "scheduleUpdate" | "refreshPhotoswipe"
+    "allowEdits" | "onNeedsRemoteSync" | "onUpdateCaption"
 > & {
     /* TODO(PS): This is DisplayFile, but that's meant to be removed */
     file: EnteFile & {
@@ -532,8 +551,8 @@ type CaptionProps = Pick<
 const Caption: React.FC<CaptionProps> = ({
     file,
     allowEdits,
-    scheduleUpdate,
-    refreshPhotoswipe,
+    onNeedsRemoteSync,
+    onUpdateCaption,
 }) => {
     const [isSaving, setIsSaving] = useState(false);
 
@@ -553,12 +572,12 @@ const Caption: React.FC<CaptionProps> = ({
                 updateExistingFilePubMetadata(file, updatedFile);
                 // @ts-ignore
                 file.title = file.pubMagicMetadata.data.caption;
+                onUpdateCaption(file);
             } catch (e) {
                 log.error("Failed to update caption", e);
                 setFieldError("caption", t("generic_error"));
             }
-            refreshPhotoswipe();
-            scheduleUpdate();
+            onNeedsRemoteSync();
             setIsSaving(false);
         },
     });
@@ -616,7 +635,7 @@ const CaptionForm = styled("form")(({ theme }) => ({
 
 type CreationTimeProps = Pick<
     FileInfoProps,
-    "allowEdits" | "scheduleUpdate"
+    "allowEdits" | "onNeedsRemoteSync"
 > & {
     file: EnteFile;
 };
@@ -624,7 +643,7 @@ type CreationTimeProps = Pick<
 const CreationTime: React.FC<CreationTimeProps> = ({
     file,
     allowEdits,
-    scheduleUpdate,
+    onNeedsRemoteSync,
 }) => {
     const { onGenericError } = useBaseContext();
 
@@ -665,7 +684,7 @@ const CreationTime: React.FC<CreationTimeProps> = ({
         } catch (e) {
             onGenericError(e);
         }
-        scheduleUpdate();
+        onNeedsRemoteSync();
         setIsSaving(false);
     };
 
@@ -695,7 +714,7 @@ const CreationTime: React.FC<CreationTimeProps> = ({
     );
 };
 
-type FileNameProps = Pick<FileInfoProps, "allowEdits" | "scheduleUpdate"> & {
+type FileNameProps = Pick<FileInfoProps, "allowEdits" | "onNeedsRemoteSync"> & {
     file: EnteFile;
     annotatedExif: AnnotatedExif | undefined;
 };
@@ -704,7 +723,7 @@ const FileName: React.FC<FileNameProps> = ({
     file,
     annotatedExif,
     allowEdits,
-    scheduleUpdate,
+    onNeedsRemoteSync,
 }) => {
     const { show: showRename, props: renameVisibilityProps } =
         useModalVisibility();
@@ -714,7 +733,7 @@ const FileName: React.FC<FileNameProps> = ({
     const handleRename = async (newFileName: string) => {
         const updatedFile = await changeFileName(file, newFileName);
         updateExistingFilePubMetadata(file, updatedFile);
-        scheduleUpdate();
+        onNeedsRemoteSync();
     };
 
     const icon =
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 400bef2b36..0d9c3050a6 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -303,7 +303,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
         [user, isInTrashSection, isInHiddenSection, handleEditImage],
     );
 
-    const handleScheduleUpdate = useCallback(() => setNeedsSync(true), []);
+    const handleNeedsRemoteSync = useCallback(() => setNeedsSync(true), []);
 
     const handleSelectCollection = useCallback(
         (collectionID: number) => {
@@ -339,9 +339,9 @@ const FileViewer: React.FC<FileViewerProps> = ({
     const toggleFavorite = useCallback(
         ({ file }: FileViewerAnnotatedFile) =>
             onToggleFavorite!(file)
-                .then(handleScheduleUpdate)
+                .then(handleNeedsRemoteSync)
                 .catch(onGenericError),
-        [onToggleFavorite, handleScheduleUpdate, onGenericError],
+        [onToggleFavorite, handleNeedsRemoteSync, onGenericError],
     );
 
     // Initial value of delegate.
@@ -394,7 +394,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
         handleMore,
     ]);
 
-    const handleRefreshPhotoswipe = useCallback(() => {
+    const handleUpdateCaption = useCallback((updatedFile: EnteFile) => {
+        console.log("TODO", updatedFile);
         psRef.current!.refreshCurrentSlideContent();
     }, []);
 
@@ -411,8 +412,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 allowEdits={!!activeAnnotatedFile?.annotation.isOwnFile}
                 allowMap={haveUser}
                 showCollections={haveUser}
-                scheduleUpdate={handleScheduleUpdate}
-                refreshPhotoswipe={handleRefreshPhotoswipe}
+                onNeedsRemoteSync={handleNeedsRemoteSync}
+                onUpdateCaption={handleUpdateCaption}
                 onSelectCollection={handleSelectCollection}
                 onSelectPerson={handleSelectPerson}
                 {...{ fileCollectionIDs, allCollectionsNameByID }}
diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index ad82bfbbfa..93c3d3a6c0 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -223,7 +223,8 @@ export const fileViewerDidClose = () => {
 };
 
 /**
- * Return the best available ItemData for rendering the given {@link file}.
+ * Return the best available {@link ItemData} for rendering the given
+ * {@link file}.
  *
  * If an entry does not exist for a particular file, then it is lazily added on
  * demand, and updated as we keep getting better data (thumbnail, original) for

From fd87d196ac5628a9c27e9e5b26304b3b01f99107 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 08:09:52 +0530
Subject: [PATCH 732/796] Handle

---
 .../gallery/components/viewer/FileViewer.tsx        |  4 ++--
 .../gallery/components/viewer/data-source.ts        | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 0d9c3050a6..8bba5bb6c6 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -35,7 +35,7 @@ import {
 } from "@/new/photos/components/ImageEditorOverlay";
 import { Button, Menu, MenuItem, styled } from "@mui/material";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { fileInfoExifForFile } from "./data-source";
+import { fileInfoExifForFile, updateItemDataAlt } from "./data-source";
 import {
     FileViewerPhotoSwipe,
     moreButtonID,
@@ -395,7 +395,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
     ]);
 
     const handleUpdateCaption = useCallback((updatedFile: EnteFile) => {
-        console.log("TODO", updatedFile);
+        updateItemDataAlt(updatedFile);
         psRef.current!.refreshCurrentSlideContent();
     }, []);
 
diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 93c3d3a6c0..1aa115535d 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -301,6 +301,19 @@ export const forgetFailedItemDataForFileID = (fileID: number) => {
     }
 };
 
+/**
+ * Update the alt attribute of the {@link ItemData}, if any, associated with the
+ * given {@link EnteFile}.
+ *
+ * @param updatedFile The file whose caption was updated.
+ */
+export const updateItemDataAlt = (updatedFile: EnteFile) => {
+    const itemData = _state.itemDataByFileID.get(updatedFile.id);
+    if (itemData) {
+        itemData.alt = fileCaption(updatedFile);
+    }
+};
+
 /**
  * Forget item data for the all files whose fetch had failed.
  *

From e376bf00e092afb3833f034be868b1b9afc9f12f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 08:37:05 +0530
Subject: [PATCH 733/796] Use same opacity throughout

---
 web/apps/photos/src/styles/global.css | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index eee2c742fd..56b73406f9 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -153,6 +153,14 @@ body {
     opacity: 0.85;
 }
 
+
+/* The ".pswp--ui-visible .pswp__hide-on-close" selector in PhotoSwipe's CSS
+   sets the opacity of the arrows to 1, which doesn't match the rest of the
+   controls (0.85). */
+.pswp-ente.pswp--ui-visible .pswp__hide-on-close.pswp__button--arrow {
+	opacity: 0.85;
+}
+
 .pswp-ente .pswp__error--active {
     display: initial;
 }
@@ -172,15 +180,17 @@ body {
 }
 
 .pswp-ente .pswp__caption {
-    color: white;
     position: absolute;
     bottom: 0px;
     right: 0;
     margin: 20px 24px;
     padding: 6px 16px;
     border-radius: 2px;
+    /* Same opacity as the other controls. */
+    color: rgba(255 255 255 / 0.85);
     background-color: rgba(0 0 0 / 0.2);
     backdrop-filter: blur(10px);
+    /* 4 lines max, ellipsis on overflow. */
     word-break: break-word;
     text-align: right;
     max-width: 375px;

From 35b3dbe650a3e926e1a454c45ea9586ec27b3cfe Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 09:42:11 +0530
Subject: [PATCH 734/796] Menu 1

---
 .../gallery/components/viewer/FileViewer.tsx  | 69 +++++++++++++++++--
 1 file changed, 65 insertions(+), 4 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 8bba5bb6c6..0e29f6f31e 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -33,7 +33,16 @@ import {
     ImageEditorOverlay,
     type ImageEditorOverlayProps,
 } from "@/new/photos/components/ImageEditorOverlay";
-import { Button, Menu, MenuItem, styled } from "@mui/material";
+import EditIcon from "@mui/icons-material/Edit";
+import {
+    Button,
+    ListItemText,
+    Menu,
+    MenuItem,
+    Stack,
+    styled,
+    Typography,
+} from "@mui/material";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { fileInfoExifForFile, updateItemDataAlt } from "./data-source";
 import {
@@ -418,7 +427,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 onSelectPerson={handleSelectPerson}
                 {...{ fileCollectionIDs, allCollectionsNameByID }}
             />
-            <Menu
+            <MoreMenu
                 open={!!moreMenuAnchorEl}
                 onClose={handleMoreMenuClose}
                 anchorEl={moreMenuAnchorEl}
@@ -429,10 +438,44 @@ const FileViewer: React.FC<FileViewerProps> = ({
             >
                 {activeAnnotatedFile?.annotation.isEditableImage && (
                     <MenuItem onClick={handleEditImage}>
-                        {/*TODO */ pt("Edit image")}
+                        <EditIcon fontSize="20px" />
+
+                        <ListItemText>
+                            {/*TODO */ pt("Edit image")}
+                        </ListItemText>
+                        <Typography
+                            variant="small"
+                            sx={{ color: "text.muted" }}
+                        >
+                            E
+                        </Typography>
                     </MenuItem>
                 )}
-            </Menu>
+                <MenuItem sx={(theme) => ({})}>
+                    <Stack
+                        direction="row"
+                        sx={{
+                            gap: 1.5,
+                            alignItems: "center",
+                            // Fill our container.
+                            width: "100%",
+                            // MUI has responsive padding, use a static value instead.
+                            py: 1,
+                        }}
+                    >
+                        <EditIcon fontSize="20px" />
+                        <Typography sx={{ flex: 1, fontWeight: "medium" }}>
+                            {/*TODO */ pt("Edit image")}
+                        </Typography>
+                        <Typography
+                            variant="small"
+                            sx={{ color: "text.muted" }}
+                        >
+                            E
+                        </Typography>
+                    </Stack>
+                </MenuItem>
+            </MoreMenu>
             <ImageEditorOverlay
                 open={openImageEditor}
                 onClose={handleImageEditorClose}
@@ -454,6 +497,24 @@ const Container = styled("div")`
     }
 `;
 
+const MoreMenu = styled(Menu)`
+    & .MuiPaper-root {
+        background-color: #252525 /* theme.dark.background.paper2 */;
+        min-width: 220px;
+    }
+    & .MuiMenuItem-root {
+        /* Same as other controls on the PhotoSwipe UI */
+        color: rgba(255 255 255 / 0.85);
+        &:hover {
+            /* Highlight on hover */
+            color: rgba(255 255 255 / 1);
+        }
+        .MuiSvgIcon-root {
+            font-size: 20px;
+        }
+    }
+`;
+
 const fileIsEditableImage = (file: EnteFile) => {
     // Only images are editable.
     if (file.metadata.fileType !== FileType.image) return false;

From a9540307bf1ae5677f711208f70e964f98d27c78 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 10:20:43 +0530
Subject: [PATCH 735/796] Menu 2

---
 .../gallery/components/viewer/FileViewer.tsx  | 86 +++++++------------
 1 file changed, 30 insertions(+), 56 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 0e29f6f31e..33d1d9c866 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -34,15 +34,7 @@ import {
     type ImageEditorOverlayProps,
 } from "@/new/photos/components/ImageEditorOverlay";
 import EditIcon from "@mui/icons-material/Edit";
-import {
-    Button,
-    ListItemText,
-    Menu,
-    MenuItem,
-    Stack,
-    styled,
-    Typography,
-} from "@mui/material";
+import { Button, Menu, MenuItem, styled, Typography } from "@mui/material";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { fileInfoExifForFile, updateItemDataAlt } from "./data-source";
 import {
@@ -437,44 +429,13 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 }}
             >
                 {activeAnnotatedFile?.annotation.isEditableImage && (
-                    <MenuItem onClick={handleEditImage}>
-                        <EditIcon fontSize="20px" />
-
-                        <ListItemText>
+                    <MoreMenuItem onClick={handleEditImage}>
+                        <Typography sx={{ fontWeight: "medium" }}>
                             {/*TODO */ pt("Edit image")}
-                        </ListItemText>
-                        <Typography
-                            variant="small"
-                            sx={{ color: "text.muted" }}
-                        >
-                            E
                         </Typography>
-                    </MenuItem>
+                        <EditIcon />
+                    </MoreMenuItem>
                 )}
-                <MenuItem sx={(theme) => ({})}>
-                    <Stack
-                        direction="row"
-                        sx={{
-                            gap: 1.5,
-                            alignItems: "center",
-                            // Fill our container.
-                            width: "100%",
-                            // MUI has responsive padding, use a static value instead.
-                            py: 1,
-                        }}
-                    >
-                        <EditIcon fontSize="20px" />
-                        <Typography sx={{ flex: 1, fontWeight: "medium" }}>
-                            {/*TODO */ pt("Edit image")}
-                        </Typography>
-                        <Typography
-                            variant="small"
-                            sx={{ color: "text.muted" }}
-                        >
-                            E
-                        </Typography>
-                    </Stack>
-                </MenuItem>
             </MoreMenu>
             <ImageEditorOverlay
                 open={openImageEditor}
@@ -499,19 +460,32 @@ const Container = styled("div")`
 
 const MoreMenu = styled(Menu)`
     & .MuiPaper-root {
-        background-color: #252525 /* theme.dark.background.paper2 */;
-        min-width: 220px;
+        background-color: #1b1b1b /* theme.dark.background.paper */;
     }
-    & .MuiMenuItem-root {
-        /* Same as other controls on the PhotoSwipe UI */
-        color: rgba(255 255 255 / 0.85);
-        &:hover {
-            /* Highlight on hover */
-            color: rgba(255 255 255 / 1);
-        }
-        .MuiSvgIcon-root {
-            font-size: 20px;
-        }
+    & .MuiList-root {
+        padding-block: 2px;
+    }
+`;
+
+const MoreMenuItem = styled(MenuItem)`
+    min-width: 190px;
+
+    gap: 1;
+    justify-content: space-between;
+    align-items: center;
+
+    /* Same as other controls on the PhotoSwipe UI */
+    color: rgba(255 255 255 / 0.85);
+    &:hover {
+        /* Highlight on hover */
+        color: rgba(255 255 255 / 1);
+        /* Disable the MUI default background color change on hover since it is
+           mode specific (we want this menu in a fixed dark mode). */
+        background-color: transparent;
+    }
+
+    .MuiSvgIcon-root {
+        font-size: 20px;
     }
 `;
 

From 043d3324ca31e0db2955dce2fd62f2610ea84f05 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 10:52:54 +0530
Subject: [PATCH 736/796] del 1

---
 .../gallery/components/viewer/FileViewer.tsx  | 75 +++++++++++++++++--
 .../gallery/components/viewer/photoswipe.ts   | 10 ++-
 2 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 33d1d9c866..9b1c5dc135 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -14,7 +14,10 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 }
 
 import { isDesktop } from "@/base/app";
-import { type ModalVisibilityProps } from "@/base/components/utils/modal";
+import {
+    useModalVisibility,
+    type ModalVisibilityProps,
+} from "@/base/components/utils/modal";
 import { useBaseContext } from "@/base/context";
 import { lowercaseExtension } from "@/base/file-name";
 import { pt } from "@/base/i18n";
@@ -29,12 +32,15 @@ import type { Collection } from "@/media/collection";
 import { FileType } from "@/media/file-type";
 import type { EnteFile } from "@/media/file.js";
 import { isHEICExtension, needsJPEGConversion } from "@/media/formats";
+import { ConfirmDeleteFileDialog } from "@/new/photos/components/FileViewerComponents";
 import {
     ImageEditorOverlay,
     type ImageEditorOverlayProps,
 } from "@/new/photos/components/ImageEditorOverlay";
+import DeleteIcon from "@mui/icons-material/Delete";
 import EditIcon from "@mui/icons-material/Edit";
 import { Button, Menu, MenuItem, styled, Typography } from "@mui/material";
+import { t } from "i18next";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { fileInfoExifForFile, updateItemDataAlt } from "./data-source";
 import {
@@ -124,6 +130,13 @@ export type FileViewerProps = ModalVisibilityProps & {
      * See also {@link favoriteFileIDs}.
      */
     onToggleFavorite?: (file: EnteFile) => Promise<void>;
+    /**
+     * Called when the given {@link file} should be deleted.
+     *
+     * If this is not provided then the delete button will not be shown
+     * in the file actions.
+     */
+    onDeleteFile?: (file: EnteFile) => Promise<void>;
     /**
      * Called when the user edits an image in the image editor and asks us to
      * save their edits as a copy.
@@ -159,6 +172,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
     allCollectionsNameByID,
     onTriggerSyncWithRemote,
     onToggleFavorite,
+    onDeleteFile,
     onSelectCollection,
     onSelectPerson,
     onSaveEditedImageCopy,
@@ -208,6 +222,10 @@ const FileViewer: React.FC<FileViewerProps> = ({
     const [moreMenuAnchorEl, setMoreMenuAnchorEl] =
         useState<HTMLElement | null>(null);
     const [openImageEditor, setOpenImageEditor] = useState(false);
+    const {
+        show: showConfirmDeleteFile,
+        props: confirmDeleteFileVisibilityProps,
+    } = useModalVisibility();
 
     // If `true`, then we need to trigger a sync with remote when we close.
     const [, setNeedsSync] = useState(false);
@@ -258,6 +276,25 @@ const FileViewer: React.FC<FileViewerProps> = ({
         });
     }, []);
 
+    const [handleConfirmDeleteFile, handleDeleteFile] = useMemo(() => {
+        const onConfirm = onDeleteFile
+            ? () => {
+                  handleMoreMenuClose();
+                  showConfirmDeleteFile();
+              }
+            : undefined;
+        return [onConfirm, onDeleteFile];
+    }, [onDeleteFile, showConfirmDeleteFile, handleMoreMenuClose]);
+
+    // const handleDeleteFile = async () => {
+    //     const file = fileToDelete!;
+    //     await moveToTrash([file]);
+    //     onMarkTempDeleted?.([file]);
+    //     updateItems(items.filter((item) => item.id !== file.id));
+    //     setFileToDelete(undefined);
+    //     needUpdate.current = true;
+    // };
+
     const handleEditImage = useMemo(() => {
         return onSaveEditedImageCopy
             ? () => {
@@ -289,19 +326,26 @@ const FileViewer: React.FC<FileViewerProps> = ({
             const canModify =
                 isOwnFile && !isInTrashSection && !isInHiddenSection;
             const showFavorite = canModify;
-            const isEditableImage =
-                handleEditImage && canModify
-                    ? fileIsEditableImage(file)
-                    : undefined;
+            const showDelete =
+                !!handleConfirmDeleteFile && isOwnFile && !isInTrashSection;
+            const showEditImage =
+                !!handleEditImage && canModify && fileIsEditableImage(file);
 
             return {
                 fileID,
                 isOwnFile,
                 showFavorite,
-                isEditableImage,
+                showDelete,
+                showEditImage,
             };
         },
-        [user, isInTrashSection, isInHiddenSection, handleEditImage],
+        [
+            user,
+            isInTrashSection,
+            isInHiddenSection,
+            handleEditImage,
+            handleConfirmDeleteFile,
+        ],
     );
 
     const handleNeedsRemoteSync = useCallback(() => setNeedsSync(true), []);
@@ -428,7 +472,15 @@ const FileViewer: React.FC<FileViewerProps> = ({
                     list: { "aria-labelledby": moreButtonID },
                 }}
             >
-                {activeAnnotatedFile?.annotation.isEditableImage && (
+                {activeAnnotatedFile?.annotation.showDelete && (
+                    <MoreMenuItem onClick={showConfirmDeleteFile}>
+                        <Typography sx={{ fontWeight: "medium" }}>
+                            {/*TODO */ t("delete")}
+                        </Typography>
+                        <DeleteIcon />
+                    </MoreMenuItem>
+                )}
+                {activeAnnotatedFile?.annotation.showEditImage && (
                     <MoreMenuItem onClick={handleEditImage}>
                         <Typography sx={{ fontWeight: "medium" }}>
                             {/*TODO */ pt("Edit image")}
@@ -437,6 +489,13 @@ const FileViewer: React.FC<FileViewerProps> = ({
                     </MoreMenuItem>
                 )}
             </MoreMenu>
+            {/* TODO(PS): Fix imports */}
+            {handleDeleteFile && (
+                <ConfirmDeleteFileDialog
+                    {...confirmDeleteFileVisibilityProps}
+                    onConfirm={handleDeleteFile}
+                />
+            )}
             <ImageEditorOverlay
                 open={openImageEditor}
                 onClose={handleImageEditorClose}
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 384ad01d0a..8f12f9a403 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -54,10 +54,14 @@ export interface FileViewerFileAnnotation {
      */
     showFavorite: boolean;
     /**
-     * `true` if this is an image which can be edited, and editing is possible,
-     * and the edit action should therefore be shown for this file.
+     * `true` if the delete action should be shown for this file.
      */
-    isEditableImage: boolean;
+    showDelete: boolean;
+    /**
+     * `true` if this is an image which can be edited, _and_ editing is
+     * possible, and the edit action should therefore be shown for this file.
+     */
+    showEditImage: boolean;
 }
 
 export interface FileViewerPhotoSwipeDelegate {

From b363e3663f2b30614d5f689b31063c6c6b96f3cf Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 11:25:21 +0530
Subject: [PATCH 737/796] del 2

---
 web/apps/photos/src/components/PhotoFrame.tsx | 14 ++++-
 .../gallery/components/viewer/FileViewer.tsx  | 54 +++++++++----------
 .../gallery/components/viewer/photoswipe.ts   |  6 ++-
 3 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index c779b8412d..c6589fedc3 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -14,7 +14,7 @@ import { EnteFile } from "@/media/file";
 import { FileType } from "@/media/file-type";
 import { FileViewer } from "@/new/photos/components/FileViewerComponents";
 import type { GalleryBarMode } from "@/new/photos/components/gallery/reducer";
-import { TRASH_SECTION } from "@/new/photos/services/collection";
+import { moveToTrash, TRASH_SECTION } from "@/new/photos/services/collection";
 import { styled } from "@mui/material";
 import { PhotoViewer } from "components/PhotoViewer";
 import { t } from "i18next";
@@ -271,7 +271,7 @@ const PhotoFrame = ({
     );
 
     const handleToggleFavorite = useMemo(() => {
-        return favoriteFileIDs
+        return favoriteFileIDs && onMarkUnsyncedFavoriteUpdate
             ? async (file: EnteFile) => {
                   const isFavorite = favoriteFileIDs!.has(file.id);
                   await (isFavorite ? removeFromFavorites : addToFavorites)(
@@ -283,6 +283,15 @@ const PhotoFrame = ({
             : undefined;
     }, [favoriteFileIDs, onMarkUnsyncedFavoriteUpdate]);
 
+    const handleDelete = useMemo(() => {
+        return onMarkTempDeleted
+            ? async (file: EnteFile) => {
+                  await moveToTrash([file]);
+                  onMarkTempDeleted?.([file]);
+              }
+            : undefined;
+    }, [favoriteFileIDs, onMarkTempDeleted]);
+
     const handleSaveEditedImageCopy = useCallback(
         (editedFile: File, collection: Collection, enteFile: EnteFile) => {
             uploadManager.prepareForNewUpload();
@@ -575,6 +584,7 @@ const PhotoFrame = ({
                     isInTrashSection={activeCollectionID === TRASH_SECTION}
                     onTriggerSyncWithRemote={handleTriggerSyncWithRemote}
                     onToggleFavorite={handleToggleFavorite}
+                    onDelete={handleDelete}
                     onSaveEditedImageCopy={handleSaveEditedImageCopy}
                     {...{
                         favoriteFileIDs,
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 9b1c5dc135..cc431e902b 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -136,7 +136,7 @@ export type FileViewerProps = ModalVisibilityProps & {
      * If this is not provided then the delete button will not be shown
      * in the file actions.
      */
-    onDeleteFile?: (file: EnteFile) => Promise<void>;
+    onDelete?: (file: EnteFile) => Promise<void>;
     /**
      * Called when the user edits an image in the image editor and asks us to
      * save their edits as a copy.
@@ -172,7 +172,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
     allCollectionsNameByID,
     onTriggerSyncWithRemote,
     onToggleFavorite,
-    onDeleteFile,
+    onDelete,
     onSelectCollection,
     onSelectPerson,
     onSaveEditedImageCopy,
@@ -222,10 +222,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
     const [moreMenuAnchorEl, setMoreMenuAnchorEl] =
         useState<HTMLElement | null>(null);
     const [openImageEditor, setOpenImageEditor] = useState(false);
-    const {
-        show: showConfirmDeleteFile,
-        props: confirmDeleteFileVisibilityProps,
-    } = useModalVisibility();
+    const { show: showConfirmDelete, props: confirmDeleteVisibilityProps } =
+        useModalVisibility();
 
     // If `true`, then we need to trigger a sync with remote when we close.
     const [, setNeedsSync] = useState(false);
@@ -276,24 +274,24 @@ const FileViewer: React.FC<FileViewerProps> = ({
         });
     }, []);
 
-    const [handleConfirmDeleteFile, handleDeleteFile] = useMemo(() => {
-        const onConfirm = onDeleteFile
+    const handleConfirmDelete = useMemo(() => {
+        return onDelete
             ? () => {
                   handleMoreMenuClose();
-                  showConfirmDeleteFile();
+                  showConfirmDelete();
               }
             : undefined;
-        return [onConfirm, onDeleteFile];
-    }, [onDeleteFile, showConfirmDeleteFile, handleMoreMenuClose]);
+    }, [onDelete, showConfirmDelete, handleMoreMenuClose]);
 
-    // const handleDeleteFile = async () => {
-    //     const file = fileToDelete!;
-    //     await moveToTrash([file]);
-    //     onMarkTempDeleted?.([file]);
-    //     updateItems(items.filter((item) => item.id !== file.id));
-    //     setFileToDelete(undefined);
-    //     needUpdate.current = true;
-    // };
+    // Not memoized since it depends on the frequently changing
+    // `activeAnnotatedFile`.
+    const handleDelete = async () => {
+        const file = activeAnnotatedFile!.file;
+        await onDelete(file);
+        // TODO(PS): Update the viewer
+        //     updateItems(items.filter((item) => item.id !== file.id));
+        handleNeedsRemoteSync();
+    };
 
     const handleEditImage = useMemo(() => {
         return onSaveEditedImageCopy
@@ -327,14 +325,16 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 isOwnFile && !isInTrashSection && !isInHiddenSection;
             const showFavorite = canModify;
             const showDelete =
-                !!handleConfirmDeleteFile && isOwnFile && !isInTrashSection;
+                !!handleConfirmDelete && isOwnFile && !isInTrashSection;
             const showEditImage =
                 !!handleEditImage && canModify && fileIsEditableImage(file);
+            const showMore = showDelete || showEditImage;
 
             return {
                 fileID,
                 isOwnFile,
                 showFavorite,
+                showMore,
                 showDelete,
                 showEditImage,
             };
@@ -344,7 +344,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
             isInTrashSection,
             isInHiddenSection,
             handleEditImage,
-            handleConfirmDeleteFile,
+            handleConfirmDelete,
         ],
     );
 
@@ -473,7 +473,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 }}
             >
                 {activeAnnotatedFile?.annotation.showDelete && (
-                    <MoreMenuItem onClick={showConfirmDeleteFile}>
+                    <MoreMenuItem onClick={showConfirmDelete}>
                         <Typography sx={{ fontWeight: "medium" }}>
                             {/*TODO */ t("delete")}
                         </Typography>
@@ -490,12 +490,10 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 )}
             </MoreMenu>
             {/* TODO(PS): Fix imports */}
-            {handleDeleteFile && (
-                <ConfirmDeleteFileDialog
-                    {...confirmDeleteFileVisibilityProps}
-                    onConfirm={handleDeleteFile}
-                />
-            )}
+            <ConfirmDeleteFileDialog
+                {...confirmDeleteVisibilityProps}
+                onConfirm={handleDelete}
+            />
             <ImageEditorOverlay
                 open={openImageEditor}
                 onClose={handleImageEditorClose}
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 8f12f9a403..70aba66c5f 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -53,6 +53,10 @@ export interface FileViewerFileAnnotation {
      * `true` if the toggle favorite action should be shown for this file.
      */
     showFavorite: boolean;
+    /**
+     * `true` if the more menu action should be shown for this file.
+     */
+    showMore: boolean;
     /**
      * `true` if the delete action should be shown for this file.
      */
@@ -607,7 +611,7 @@ export class FileViewerPhotoSwipe {
                         pswp.on("change", () =>
                             showIf(
                                 buttonElement,
-                                !!currentFileAnnotation().isEditableImage,
+                                !!currentFileAnnotation().showMore,
                             ),
                         );
                     },

From 4fe12c46aaf75c790ee1980b211f3293093ad6b8 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 11:26:28 +0530
Subject: [PATCH 738/796] hov

---
 web/packages/gallery/components/viewer/FileViewer.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index cc431e902b..0b2d6887ed 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -534,11 +534,8 @@ const MoreMenuItem = styled(MenuItem)`
     /* Same as other controls on the PhotoSwipe UI */
     color: rgba(255 255 255 / 0.85);
     &:hover {
-        /* Highlight on hover */
         color: rgba(255 255 255 / 1);
-        /* Disable the MUI default background color change on hover since it is
-           mode specific (we want this menu in a fixed dark mode). */
-        background-color: transparent;
+        background-color: #252525 /* theme.dark.background.paper2 */;
     }
 
     .MuiSvgIcon-root {

From 7c1dae7c779ea7af166a4c8d5dec5468e3cb09e6 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 11:43:32 +0530
Subject: [PATCH 739/796] Update color

---
 web/apps/photos/src/styles/global.css                | 12 +++++++++++-
 web/packages/gallery/components/viewer/photoswipe.ts |  1 -
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 56b73406f9..e5c7a38819 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -153,12 +153,22 @@ body {
     opacity: 0.85;
 }
 
+.pswp-ente .pswp__error .pswp__icn {
+    /* Use a warning color for the error icon */
+    fill: var(--mui-palette-fixed-golden);
+}
+
+.pswp-ente .pswp__error .pswp__icn-shadow {
+    /* Reduce the stroke from default (2px) to make it look better with the
+       golden icon outline */
+    stroke-width: 1px;
+}
 
 /* The ".pswp--ui-visible .pswp__hide-on-close" selector in PhotoSwipe's CSS
    sets the opacity of the arrows to 1, which doesn't match the rest of the
    controls (0.85). */
 .pswp-ente.pswp--ui-visible .pswp__hide-on-close.pswp__button--arrow {
-	opacity: 0.85;
+    opacity: 0.85;
 }
 
 .pswp-ente .pswp__error--active {
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 70aba66c5f..87e72949c8 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -503,7 +503,6 @@ export class FileViewerPhotoSwipe {
             pswp.ui.registerElement({
                 name: "error",
                 order: 6,
-                // TODO(PS): Change color?
                 html: createPSRegisterElementIconHTML("error"),
                 onInit: (errorElement, pswp) => {
                     pswp.on("change", () => {

From 349ef3263c2e4c5a6fb724542841698fdb04e47a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 11:57:45 +0530
Subject: [PATCH 740/796] Workaround

---
 .../gallery/components/viewer/FileViewer.tsx        | 13 +++++++++++--
 .../gallery/components/viewer/photoswipe.ts         |  7 +++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 0b2d6887ed..9d32737208 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -288,8 +288,17 @@ const FileViewer: React.FC<FileViewerProps> = ({
     const handleDelete = async () => {
         const file = activeAnnotatedFile!.file;
         await onDelete(file);
-        // TODO(PS): Update the viewer
-        //     updateItems(items.filter((item) => item.id !== file.id));
+        // TODO: We currently have a setTimeout to ensure that the updated
+        // `files` prop has made its way to us delegate before we query for the
+        // status again.
+        //
+        // See: [Note: File viewer action setTimeout TODO]
+        await new Promise((r) => setTimeout(r, 100));
+        // Refreshing the current slide after the current file has gone will
+        // show the subsequent slide (since that will move down to the current
+        // index). TODO: What if it's the last file?
+        psRef.current!.refreshCurrentSlideContent();
+
         handleNeedsRemoteSync();
     };
 
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 87e72949c8..a67469df61 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -524,6 +524,8 @@ export class FileViewerPhotoSwipe {
                     this.pendingFavoriteUpdates.add(af.file.id);
                     buttonElement.disabled = true;
                     await delegate.toggleFavorite(af);
+                    // [Note: File viewer action setTimeout TODO]
+                    //
                     // TODO: This can be improved in two ways:
                     //
                     // 1. We currently have a setTimeout to ensure that the
@@ -537,8 +539,9 @@ export class FileViewerPhotoSwipe {
                     // 2. We reload the entire slide instead of just updating
                     //    the button state. This is because there are two
                     //    buttons, instead of a single button toggling between
-                    //    two states (e.g. like the zoom button). A single
-                    //    button can be achieved by moving the fill as a layer.
+                    //    two states (e.g. like the zoom button). This aspect is
+                    //    easier to improve: A single button can be achieved by
+                    //    moving the fill as a layer.
                     await new Promise((r) => setTimeout(r, 100));
                     this.pendingFavoriteUpdates.delete(af.file.id);
                     this.refreshCurrentSlideContent();

From ca276ba1fe92a262dad6b7dbc97a7e29869d6a70 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 13:48:46 +0530
Subject: [PATCH 741/796] Fix rerenders on remote sync

---
 web/apps/photos/src/components/PhotoFrame.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index c6589fedc3..b814fa9d01 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -290,7 +290,7 @@ const PhotoFrame = ({
                   onMarkTempDeleted?.([file]);
               }
             : undefined;
-    }, [favoriteFileIDs, onMarkTempDeleted]);
+    }, [onMarkTempDeleted]);
 
     const handleSaveEditedImageCopy = useCallback(
         (editedFile: File, collection: Collection, enteFile: EnteFile) => {

From 8e9eb79f2bb8598f6dc359db82d97dcf71255f6f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 14:17:30 +0530
Subject: [PATCH 742/796] Slightly better

---
 .../gallery/components/viewer/FileViewer.tsx  | 39 +++++++++++++++----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 9d32737208..b85980f2f1 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -225,9 +225,21 @@ const FileViewer: React.FC<FileViewerProps> = ({
     const { show: showConfirmDelete, props: confirmDeleteVisibilityProps } =
         useModalVisibility();
 
+    // Callbacks to be invoked (only once) the next time we get an update to the
+    // `files` prop.
+    const [, setOnNextFilesUpdate] = useState<(() => void)[]>([]);
+
     // If `true`, then we need to trigger a sync with remote when we close.
     const [, setNeedsSync] = useState(false);
 
+    /**
+     * Add a callback to be fired (only once) the next time we get an update to
+     * the `files` prop.
+     */
+    const awaitNextFilesUpdate = useCallback((cb: () => void) => {
+        setOnNextFilesUpdate((cbs) => cbs.concat(cb));
+    }, []);
+
     const handleClose = useCallback(() => {
         setNeedsSync((needSync) => {
             if (needSync) onTriggerSyncWithRemote?.();
@@ -288,18 +300,23 @@ const FileViewer: React.FC<FileViewerProps> = ({
     const handleDelete = async () => {
         const file = activeAnnotatedFile!.file;
         await onDelete(file);
+        // Be careful here. This works currently, deterministically, but it
+        // relies on the assumption that `onDelete` will asynchronously result
+        // in updates to the `files` prop.
+        awaitNextFilesUpdate(() => {
+            // Refreshing the current slide after the current file has gone will
+            // show the subsequent slide (since that will move down to the current
+            // index). TODO: What if it's the last file?
+            psRef.current!.refreshCurrentSlideContent();
+
+            handleNeedsRemoteSync();
+        });
         // TODO: We currently have a setTimeout to ensure that the updated
         // `files` prop has made its way to us delegate before we query for the
         // status again.
         //
         // See: [Note: File viewer action setTimeout TODO]
-        await new Promise((r) => setTimeout(r, 100));
-        // Refreshing the current slide after the current file has gone will
-        // show the subsequent slide (since that will move down to the current
-        // index). TODO: What if it's the last file?
-        psRef.current!.refreshCurrentSlideContent();
-
-        handleNeedsRemoteSync();
+        // await new Promise((r) => setTimeout(r, 100));
     };
 
     const handleEditImage = useMemo(() => {
@@ -411,6 +428,14 @@ const FileViewer: React.FC<FileViewerProps> = ({
         delegate.toggleFavorite = toggleFavorite;
     }, [getFiles, isFavorite, toggleFavorite]);
 
+    // Notify the listeners, if any, for updates to files.
+    useEffect(() => {
+        setOnNextFilesUpdate((cbs) => {
+            cbs.forEach((cb) => cb());
+            return [];
+        });
+    }, [files]);
+
     useEffect(() => {
         if (open) {
             // We're open. Create psRef. This will show the file viewer dialog.

From 60d3cad540c26b62582dffd35ea2cd5ee8c67227 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 15:03:18 +0530
Subject: [PATCH 743/796] Also for favs

---
 web/apps/photos/src/components/PhotoFrame.tsx |  2 +
 .../gallery/components/viewer/FileViewer.tsx  | 60 ++++++++++++++-----
 .../gallery/components/viewer/photoswipe.ts   | 26 +++-----
 3 files changed, 53 insertions(+), 35 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index b814fa9d01..2a90699152 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -278,6 +278,7 @@ const PhotoFrame = ({
                       file,
                       true,
                   );
+                  // See: [Note: File viewer update and dispatch]
                   onMarkUnsyncedFavoriteUpdate(file.id, !isFavorite);
               }
             : undefined;
@@ -287,6 +288,7 @@ const PhotoFrame = ({
         return onMarkTempDeleted
             ? async (file: EnteFile) => {
                   await moveToTrash([file]);
+                  // See: [Note: File viewer update and dispatch]
                   onMarkTempDeleted?.([file]);
               }
             : undefined;
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index b85980f2f1..481c899e6f 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -128,6 +128,8 @@ export type FileViewerProps = ModalVisibilityProps & {
      * in the file actions.
      *
      * See also {@link favoriteFileIDs}.
+     *
+     * See also: [Note: File viewer update and dispatch]
      */
     onToggleFavorite?: (file: EnteFile) => Promise<void>;
     /**
@@ -135,6 +137,8 @@ export type FileViewerProps = ModalVisibilityProps & {
      *
      * If this is not provided then the delete button will not be shown
      * in the file actions.
+     *
+     * See also: [Note: File viewer update and dispatch]
      */
     onDelete?: (file: EnteFile) => Promise<void>;
     /**
@@ -226,8 +230,13 @@ const FileViewer: React.FC<FileViewerProps> = ({
         useModalVisibility();
 
     // Callbacks to be invoked (only once) the next time we get an update to the
-    // `files` prop.
-    const [, setOnNextFilesUpdate] = useState<(() => void)[]>([]);
+    // `files` or `favoriteFileIDs` props.
+    //
+    // Both of those trace their way back to the same reducer, so they get
+    // updated in tandem. When we delete files, only the `files` prop gets
+    // updated, while when we toggle favoriets, only the `favoriteFileIDs` prop
+    // gets updated.
+    const [, setOnNextFilesOrFavoritesUpdate] = useState<(() => void)[]>([]);
 
     // If `true`, then we need to trigger a sync with remote when we close.
     const [, setNeedsSync] = useState(false);
@@ -236,8 +245,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
      * Add a callback to be fired (only once) the next time we get an update to
      * the `files` prop.
      */
-    const awaitNextFilesUpdate = useCallback((cb: () => void) => {
-        setOnNextFilesUpdate((cbs) => cbs.concat(cb));
+    const awaitNextFilesOrFavoritesUpdate = useCallback((cb: () => void) => {
+        setOnNextFilesOrFavoritesUpdate((cbs) => cbs.concat(cb));
     }, []);
 
     const handleClose = useCallback(() => {
@@ -300,10 +309,14 @@ const FileViewer: React.FC<FileViewerProps> = ({
     const handleDelete = async () => {
         const file = activeAnnotatedFile!.file;
         await onDelete(file);
-        // Be careful here. This works currently, deterministically, but it
-        // relies on the assumption that `onDelete` will asynchronously result
-        // in updates to the `files` prop.
-        awaitNextFilesUpdate(() => {
+        // [Note: File viewer update and dispatch]
+        //
+        // This relies on the assumption that `onDelete` will asynchronously
+        // result in updates to the `files` prop. Currently that indeed is what
+        // happens as the last call in the `onDelete` implementation is a call
+        // to a dispatcher, but we need to be careful about preserving this
+        // assumption when changing `onDelete` implementation in the future.
+        awaitNextFilesOrFavoritesUpdate(() => {
             // Refreshing the current slide after the current file has gone will
             // show the subsequent slide (since that will move down to the current
             // index). TODO: What if it's the last file?
@@ -408,11 +421,26 @@ const FileViewer: React.FC<FileViewerProps> = ({
     );
 
     const toggleFavorite = useCallback(
-        ({ file }: FileViewerAnnotatedFile) =>
-            onToggleFavorite!(file)
-                .then(handleNeedsRemoteSync)
-                .catch(onGenericError),
-        [onToggleFavorite, handleNeedsRemoteSync, onGenericError],
+        ({ file }: FileViewerAnnotatedFile) => {
+            return new Promise((resolve) => {
+                // See: [Note: File viewer update and dispatch]
+                onToggleFavorite!(file)
+                    .then(
+                        () => awaitNextFilesOrFavoritesUpdate(resolve),
+                        (e: unknown) => {
+                            onGenericError(e);
+                            resolve();
+                        },
+                    )
+                    .finally(handleNeedsRemoteSync);
+            });
+        },
+        [
+            onToggleFavorite,
+            onGenericError,
+            awaitNextFilesOrFavoritesUpdate,
+            handleNeedsRemoteSync,
+        ],
     );
 
     // Initial value of delegate.
@@ -428,13 +456,13 @@ const FileViewer: React.FC<FileViewerProps> = ({
         delegate.toggleFavorite = toggleFavorite;
     }, [getFiles, isFavorite, toggleFavorite]);
 
-    // Notify the listeners, if any, for updates to files.
+    // Notify the listeners, if any, for updates to files or favorites.
     useEffect(() => {
-        setOnNextFilesUpdate((cbs) => {
+        setOnNextFilesOrFavoritesUpdate((cbs) => {
             cbs.forEach((cb) => cb());
             return [];
         });
-    }, [files]);
+    }, [files, favoriteFileIDs]);
 
     useEffect(() => {
         if (open) {
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index a67469df61..2661d2100f 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -524,26 +524,14 @@ export class FileViewerPhotoSwipe {
                     this.pendingFavoriteUpdates.add(af.file.id);
                     buttonElement.disabled = true;
                     await delegate.toggleFavorite(af);
-                    // [Note: File viewer action setTimeout TODO]
-                    //
-                    // TODO: This can be improved in two ways:
-                    //
-                    // 1. We currently have a setTimeout to ensure that the
-                    //    updated `favoriteFileIDs` have made their way to our
-                    //    delegate before we query for the status again.
-                    //    Obviously, this is hacky. Note that a timeout of 0
-                    //    (i.e., just deferring till the next tick) isn't enough
-                    //    here, for reasons I need to investigate more (hence
-                    //    this TODO).
-                    //
-                    // 2. We reload the entire slide instead of just updating
-                    //    the button state. This is because there are two
-                    //    buttons, instead of a single button toggling between
-                    //    two states (e.g. like the zoom button). This aspect is
-                    //    easier to improve: A single button can be achieved by
-                    //    moving the fill as a layer.
-                    await new Promise((r) => setTimeout(r, 100));
                     this.pendingFavoriteUpdates.delete(af.file.id);
+                    // TODO: We reload the entire slide instead of just updating
+                    // the button state. This is because there are two buttons,
+                    // instead of a single button toggling between two states
+                    // e.g. like the zoom button.
+                    //
+                    // To fix this, a single button can be achieved by moving
+                    // the fill of the heart as a layer.
                     this.refreshCurrentSlideContent();
                 };
 

From 12f5c1db87aaefcbbb7b173647c4f92121929ceb Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 15:19:20 +0530
Subject: [PATCH 744/796] Handle singleton album deletes

---
 .../gallery/components/viewer/FileViewer.tsx  | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 481c899e6f..378bf437f9 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -232,11 +232,15 @@ const FileViewer: React.FC<FileViewerProps> = ({
     // Callbacks to be invoked (only once) the next time we get an update to the
     // `files` or `favoriteFileIDs` props.
     //
+    // The callback is passed the latest values of the `files` prop.
+    //
     // Both of those trace their way back to the same reducer, so they get
     // updated in tandem. When we delete files, only the `files` prop gets
     // updated, while when we toggle favoriets, only the `favoriteFileIDs` prop
     // gets updated.
-    const [, setOnNextFilesOrFavoritesUpdate] = useState<(() => void)[]>([]);
+    const [, setOnNextFilesOrFavoritesUpdate] = useState<
+        ((files: EnteFile[]) => void)[]
+    >([]);
 
     // If `true`, then we need to trigger a sync with remote when we close.
     const [, setNeedsSync] = useState(false);
@@ -245,9 +249,11 @@ const FileViewer: React.FC<FileViewerProps> = ({
      * Add a callback to be fired (only once) the next time we get an update to
      * the `files` prop.
      */
-    const awaitNextFilesOrFavoritesUpdate = useCallback((cb: () => void) => {
-        setOnNextFilesOrFavoritesUpdate((cbs) => cbs.concat(cb));
-    }, []);
+    const awaitNextFilesOrFavoritesUpdate = useCallback(
+        (cb: (files: EnteFile[]) => void) =>
+            setOnNextFilesOrFavoritesUpdate((cbs) => cbs.concat(cb)),
+        [],
+    );
 
     const handleClose = useCallback(() => {
         setNeedsSync((needSync) => {
@@ -316,20 +322,18 @@ const FileViewer: React.FC<FileViewerProps> = ({
         // happens as the last call in the `onDelete` implementation is a call
         // to a dispatcher, but we need to be careful about preserving this
         // assumption when changing `onDelete` implementation in the future.
-        awaitNextFilesOrFavoritesUpdate(() => {
-            // Refreshing the current slide after the current file has gone will
-            // show the subsequent slide (since that will move down to the current
-            // index). TODO: What if it's the last file?
-            psRef.current!.refreshCurrentSlideContent();
-
+        awaitNextFilesOrFavoritesUpdate((files: EnteFile[]) => {
             handleNeedsRemoteSync();
+            if (files.length) {
+                // Refreshing the current slide after the current file has gone
+                // will show the subsequent slide (since that would've now moved
+                // down to the current index).
+                psRef.current!.refreshCurrentSlideContent();
+            } else {
+                // If there are no more files left, close the viewer.
+                handleClose();
+            }
         });
-        // TODO: We currently have a setTimeout to ensure that the updated
-        // `files` prop has made its way to us delegate before we query for the
-        // status again.
-        //
-        // See: [Note: File viewer action setTimeout TODO]
-        // await new Promise((r) => setTimeout(r, 100));
     };
 
     const handleEditImage = useMemo(() => {
@@ -459,7 +463,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
     // Notify the listeners, if any, for updates to files or favorites.
     useEffect(() => {
         setOnNextFilesOrFavoritesUpdate((cbs) => {
-            cbs.forEach((cb) => cb());
+            cbs.forEach((cb) => cb(files));
             return [];
         });
     }, [files, favoriteFileIDs]);

From 907276616988e1a927357916e85f45f017006514 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 16:03:05 +0530
Subject: [PATCH 745/796] Fix

---
 web/packages/gallery/components/viewer/FileViewer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 378bf437f9..b39992fa62 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -539,7 +539,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 }}
             >
                 {activeAnnotatedFile?.annotation.showDelete && (
-                    <MoreMenuItem onClick={showConfirmDelete}>
+                    <MoreMenuItem onClick={handleConfirmDelete}>
                         <Typography sx={{ fontWeight: "medium" }}>
                             {/*TODO */ t("delete")}
                         </Typography>

From 62222b0228eecdaefd685284fd9d54c8f0d8ebc2 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 18:57:50 +0530
Subject: [PATCH 746/796] Fix height

https://github.com/mui/material-ui/blob/356b885778a2af26505d5dbba76a9abcceb69800/packages/mui-material/src/MenuItem/MenuItem.js#L147
---
 web/packages/gallery/components/viewer/FileViewer.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index b39992fa62..5bd0845144 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -593,6 +593,12 @@ const MoreMenu = styled(Menu)`
 const MoreMenuItem = styled(MenuItem)`
     min-width: 190px;
 
+    /* MUI MenuItem default implementation has a minHeight of "48px" below the
+       "sm" breakpoint, and auto after it. We always want the same height, so
+       use an explicit padding to have minHeight "auto" also come out to 48px
+       (20px (icon or Typography height + 14 + 14) */
+    padding-block: 14px;
+
     gap: 1;
     justify-content: space-between;
     align-items: center;

From 2541febb534bd89b547a5f65fd4f34c2f872b538 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 19:21:12 +0530
Subject: [PATCH 747/796] Download

---
 web/packages/gallery/components/viewer/photoswipe.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 2661d2100f..5424c6c3ab 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -61,6 +61,14 @@ export interface FileViewerFileAnnotation {
      * `true` if the delete action should be shown for this file.
      */
     showDelete: boolean;
+    /**
+     * Set if the download action should be shown for this file.
+     *
+     * - When "bar", the action button is shown among the bar icons.
+     *
+     * - When "menu", the action is shown as a more menu entry.
+     */
+    showDownload: "bar" | "menu" | undefined;
     /**
      * `true` if this is an image which can be edited, _and_ editing is
      * possible, and the edit action should therefore be shown for this file.

From 3d44700010f2e8f9f78ef7f6363fc57ceac84936 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 19:31:10 +0530
Subject: [PATCH 748/796] Position

---
 .../gallery/components/viewer/FileViewer.tsx  | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 5bd0845144..9de2c15a45 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -86,6 +86,10 @@ export type FileViewerProps = ModalVisibilityProps & {
      * provided within the file viewer itself.
      */
     initialIndex: number;
+    /**
+     * If true then the viewer does not show controls for downloading the file.
+     */
+    disableDownload?: boolean;
     /**
      * `true` when we are viewing files in the Trash.
      */
@@ -94,10 +98,6 @@ export type FileViewerProps = ModalVisibilityProps & {
      * `true` when we are viewing files in the hidden section.
      */
     isInHiddenSection?: boolean;
-    /**
-     * If true then the viewer does not show controls for downloading the file.
-     */
-    disableDownload?: boolean;
     /**
      * File IDs of all the files that the user has marked as a favorite.
      *
@@ -168,9 +168,9 @@ const FileViewer: React.FC<FileViewerProps> = ({
     user,
     files,
     initialIndex,
+    disableDownload,
     isInTrashSection,
     isInHiddenSection,
-    disableDownload,
     favoriteFileIDs,
     fileCollectionIDs,
     allCollectionsNameByID,
@@ -371,7 +371,21 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 !!handleConfirmDelete && isOwnFile && !isInTrashSection;
             const showEditImage =
                 !!handleEditImage && canModify && fileIsEditableImage(file);
-            const showMore = showDelete || showEditImage;
+
+            const showDownload = (() => {
+                if (disableDownload) return undefined;
+                if (user) {
+                    // Logged in users see the download option in the more menu.
+                    return "menu";
+                } else {
+                    // In shared albums, the download option is shown in the bar
+                    // buttons, in lieu of the favorite option.
+                    return "bar";
+                }
+            })();
+
+            const showMore =
+                showDelete || showEditImage || showDownload == "bar";
 
             return {
                 fileID,
@@ -379,11 +393,13 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 showFavorite,
                 showMore,
                 showDelete,
+                showDownload,
                 showEditImage,
             };
         },
         [
             user,
+            disableDownload,
             isInTrashSection,
             isInHiddenSection,
             handleEditImage,

From 76efe1290cc632d36c73a35c249b78db85493ae8 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 19:36:17 +0530
Subject: [PATCH 749/796] menu

---
 .../gallery/components/viewer/FileViewer.tsx  | 19 +++++++++++++++++++
 .../gallery/components/viewer/photoswipe.ts   |  4 ++++
 2 files changed, 23 insertions(+)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 9de2c15a45..1e4f1c02df 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -39,6 +39,7 @@ import {
 } from "@/new/photos/components/ImageEditorOverlay";
 import DeleteIcon from "@mui/icons-material/Delete";
 import EditIcon from "@mui/icons-material/Edit";
+import FileDownloadOutlinedIcon from "@mui/icons-material/FileDownloadOutlined";
 import { Button, Menu, MenuItem, styled, Typography } from "@mui/material";
 import { t } from "i18next";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -283,6 +284,14 @@ const FileViewer: React.FC<FileViewerProps> = ({
 
     const handleFileInfoClose = useCallback(() => setOpenFileInfo(false), []);
 
+    const handleDownload = useCallback(
+        (annotatedFile: FileViewerAnnotatedFile) => {
+            setActiveAnnotatedFile(annotatedFile);
+            console.log("TODO download", annotatedFile);
+        },
+        [],
+    );
+
     const handleMore = useCallback(
         (
             annotatedFile: FileViewerAnnotatedFile,
@@ -497,6 +506,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 onClose: handleClose,
                 onAnnotate: handleAnnotate,
                 onViewInfo: handleViewInfo,
+                onDownload: handleDownload,
                 onMore: handleMore,
             });
 
@@ -518,6 +528,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
         handleClose,
         handleAnnotate,
         handleViewInfo,
+        handleDownload,
         handleMore,
     ]);
 
@@ -570,6 +581,14 @@ const FileViewer: React.FC<FileViewerProps> = ({
                         <EditIcon />
                     </MoreMenuItem>
                 )}
+                {activeAnnotatedFile?.annotation.showDownload == "menu" && (
+                    <MoreMenuItem onClick={handleDownload}>
+                        <Typography sx={{ fontWeight: "medium" }}>
+                            {/*TODO */ t("download")}
+                        </Typography>
+                        <FileDownloadOutlinedIcon />
+                    </MoreMenuItem>
+                )}
             </MoreMenu>
             {/* TODO(PS): Fix imports */}
             <ConfirmDeleteFileDialog
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 5424c6c3ab..890d6fc164 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -150,6 +150,10 @@ type FileViewerPhotoSwipeOptions = Pick<
      * Called when the user activates the info action on a file.
      */
     onViewInfo: (annotatedFile: FileViewerAnnotatedFile) => void;
+    /**
+     * Called when the user activates the download action on a file.
+     */
+    onDownload: (annotatedFile: FileViewerAnnotatedFile) => void;
     /**
      * Called when the user activates the more action on a file.
      *

From 7fc96285f145df4bcd321212710dd5841f30b351 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 19:45:16 +0530
Subject: [PATCH 750/796] route

---
 .../gallery/components/viewer/FileViewer.tsx  | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 1e4f1c02df..3d85319753 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -284,12 +284,21 @@ const FileViewer: React.FC<FileViewerProps> = ({
 
     const handleFileInfoClose = useCallback(() => setOpenFileInfo(false), []);
 
-    const handleDownload = useCallback(
+    // The download action - either invoked directly (if the download option is
+    // shown in the more menu), or via `handleDownloadBarAction` (if the
+    // download option is shown in the PhotoSwipe bar).
+    const handleDownload = useCallback(() => {
+        console.log("TODO download");
+    }, []);
+
+    // Callback invoked when the download action is triggered by activating the
+    // download button in the PhotoSwipe bar.
+    const handleDownloadBarAction = useCallback(
         (annotatedFile: FileViewerAnnotatedFile) => {
             setActiveAnnotatedFile(annotatedFile);
-            console.log("TODO download", annotatedFile);
+            handleDownload();
         },
-        [],
+        [handleDownload],
     );
 
     const handleMore = useCallback(
@@ -506,7 +515,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 onClose: handleClose,
                 onAnnotate: handleAnnotate,
                 onViewInfo: handleViewInfo,
-                onDownload: handleDownload,
+                onDownload: handleDownloadBarAction,
                 onMore: handleMore,
             });
 
@@ -528,7 +537,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
         handleClose,
         handleAnnotate,
         handleViewInfo,
-        handleDownload,
+        handleDownloadBarAction,
         handleMore,
     ]);
 

From fd13c737aad06d3cafc254f17b246f28b207fd7e Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 19:55:16 +0530
Subject: [PATCH 751/796] Download in bar

---
 .../gallery/components/viewer/FileViewer.tsx  |  2 +-
 .../gallery/components/viewer/icons.tsx       |  3 ++
 .../gallery/components/viewer/photoswipe.ts   | 28 +++++++++++++++++--
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 3d85319753..36fc4067d7 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -403,7 +403,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
             })();
 
             const showMore =
-                showDelete || showEditImage || showDownload == "bar";
+                showDelete || showEditImage || showDownload == "menu";
 
             return {
                 fileID,
diff --git a/web/packages/gallery/components/viewer/icons.tsx b/web/packages/gallery/components/viewer/icons.tsx
index 241d83638c..5c7c8dc5b1 100644
--- a/web/packages/gallery/components/viewer/icons.tsx
+++ b/web/packages/gallery/components/viewer/icons.tsx
@@ -29,6 +29,9 @@ const paths = {
         '<path d="M13.35 20.13c-.76.69-1.93.69-2.69-.01l-.11-.1C5.3 15.27 1.87 12.16 2 8.28c.06-1.7.93-3.33 2.34-4.29 2.64-1.8 5.9-.96 7.66 1.1 1.76-2.06 5.02-2.91 7.66-1.1 1.41.96 2.28 2.59 2.34 4.29.14 3.88-3.3 6.99-8.55 11.76z" transform="translate(3, 3)"',
     // "@mui/icons-material/MoreHoriz"
     more: '<path d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2" transform="translate(3, 4)"',
+    // "@mui/icons-material/FileDownloadOutlined"
+    download:
+        '<path d="M18 15v3H6v-3H4v3c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2v-3zm-1-4-1.41-1.41L13 12.17V4h-2v8.17L8.41 9.59 7 11l5 5z"',
 };
 
 /**
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 890d6fc164..2aded83324 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -67,6 +67,8 @@ export interface FileViewerFileAnnotation {
      * - When "bar", the action button is shown among the bar icons.
      *
      * - When "menu", the action is shown as a more menu entry.
+     *
+     * Note: "bar" should only be set if {@link haveUser} is also true.
      */
     showDownload: "bar" | "menu" | undefined;
     /**
@@ -262,6 +264,7 @@ export class FileViewerPhotoSwipe {
         onClose,
         onAnnotate,
         onViewInfo,
+        onDownload,
         onMore,
     }: FileViewerPhotoSwipeOptions) {
         this.opts = { disableDownload };
@@ -566,7 +569,7 @@ export class FileViewerPhotoSwipe {
                 // up being shown, so they can safely share the same order.
                 pswp.ui.registerElement({
                     name: "favorite",
-                    title: t("favorite_key"),
+                    title: t("favorite"),
                     order: 8,
                     isButton: true,
                     html: createPSRegisterElementIconHTML("favorite"),
@@ -578,7 +581,7 @@ export class FileViewerPhotoSwipe {
                 });
                 pswp.ui.registerElement({
                     name: "unfavorite",
-                    title: t("unfavorite_key"),
+                    title: t("unfavorite"),
                     order: 8,
                     isButton: true,
                     html: createPSRegisterElementIconHTML("unfavorite"),
@@ -588,6 +591,27 @@ export class FileViewerPhotoSwipe {
                             showFavoriteIf(buttonElement, true),
                         ),
                 });
+            } else {
+                // When we don't have a user (i.e. in the context of public
+                // albums), the download button is shown (if enabled for that
+                // album) instead of the favorite button as the first action.
+                //
+                // It can thus also use the same order as fav/unfav.
+                pswp.ui.registerElement({
+                    name: "download",
+                    title: t("download"),
+                    order: 8,
+                    isButton: true,
+                    html: createPSRegisterElementIconHTML("download"),
+                    onClick: () => onDownload(currentAnnotatedFile()),
+                    onInit: (buttonElement) =>
+                        pswp.on("change", () =>
+                            showIf(
+                                buttonElement,
+                                currentFileAnnotation().showDownload == "bar",
+                            ),
+                        ),
+                });
             }
 
             pswp.ui.registerElement({

From 6f8f997f937a5f3baea101dbb9f07f0a36ed05d2 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 20:14:55 +0530
Subject: [PATCH 752/796] icons

---
 web/apps/photos/src/styles/global.css           |  4 ++++
 .../gallery/components/viewer/icons.tsx         | 17 +++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index e5c7a38819..428c59fd6e 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -180,6 +180,10 @@ body {
     transform: scale(0.85);
 }
 
+.pswp-ente .pswp__button--close .pswp__icn {
+    transform: scale(0.9);
+}
+
 .pswp-ente .pswp__button--arrow--prev .pswp__icn {
     transform: scale(0.8);
 }
diff --git a/web/packages/gallery/components/viewer/icons.tsx b/web/packages/gallery/components/viewer/icons.tsx
index 5c7c8dc5b1..b1e7b37eb9 100644
--- a/web/packages/gallery/components/viewer/icons.tsx
+++ b/web/packages/gallery/components/viewer/icons.tsx
@@ -15,23 +15,24 @@
  *     console.log(renderToString(<InfoOutlinedIcon />));
  */
 
+// The transforms are not part of the originals, they have been applied
+// separately to get these icons to align with the ones built into PhotoSwipe.
 const paths = {
-    // "@mui/icons-material/InfoOutlined"
-    // TODO(PS): This transform is temporary, audit later.
-    info: '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8" transform="translate(3.5, 3.5)"',
     // "@mui/icons-material/ErrorOutline"
     error: '<path d="M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2M12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8" transform="translate(7, 5.7) scale(0.85)"',
     // "@mui/icons-material/FavoriteBorderRounded"
     favorite:
-        '<path d="M19.66 3.99c-2.64-1.8-5.9-.96-7.66 1.1-1.76-2.06-5.02-2.91-7.66-1.1-1.4.96-2.28 2.58-2.34 4.29-.14 3.88 3.3 6.99 8.55 11.76l.1.09c.76.69 1.93.69 2.69-.01l.11-.1c5.25-4.76 8.68-7.87 8.55-11.75-.06-1.7-.94-3.32-2.34-4.28M12.1 18.55l-.1.1-.1-.1C7.14 14.24 4 11.39 4 8.5 4 6.5 5.5 5 7.5 5c1.54 0 3.04.99 3.57 2.36h1.87C13.46 5.99 14.96 5 16.5 5c2 0 3.5 1.5 3.5 3.5 0 2.89-3.14 5.74-7.9 10.05" transform="translate(3, 3)"',
+        '<path d="M19.66 3.99c-2.64-1.8-5.9-.96-7.66 1.1-1.76-2.06-5.02-2.91-7.66-1.1-1.4.96-2.28 2.58-2.34 4.29-.14 3.88 3.3 6.99 8.55 11.76l.1.09c.76.69 1.93.69 2.69-.01l.11-.1c5.25-4.76 8.68-7.87 8.55-11.75-.06-1.7-.94-3.32-2.34-4.28M12.1 18.55l-.1.1-.1-.1C7.14 14.24 4 11.39 4 8.5 4 6.5 5.5 5 7.5 5c1.54 0 3.04.99 3.57 2.36h1.87C13.46 5.99 14.96 5 16.5 5c2 0 3.5 1.5 3.5 3.5 0 2.89-3.14 5.74-7.9 10.05" transform="translate(0, 4.7) scale(0.95)"',
     // "@mui/icons-material/FavoriteRounded"
     unfavorite:
-        '<path d="M13.35 20.13c-.76.69-1.93.69-2.69-.01l-.11-.1C5.3 15.27 1.87 12.16 2 8.28c.06-1.7.93-3.33 2.34-4.29 2.64-1.8 5.9-.96 7.66 1.1 1.76-2.06 5.02-2.91 7.66-1.1 1.41.96 2.28 2.59 2.34 4.29.14 3.88-3.3 6.99-8.55 11.76z" transform="translate(3, 3)"',
-    // "@mui/icons-material/MoreHoriz"
-    more: '<path d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2" transform="translate(3, 4)"',
+        '<path d="M13.35 20.13c-.76.69-1.93.69-2.69-.01l-.11-.1C5.3 15.27 1.87 12.16 2 8.28c.06-1.7.93-3.33 2.34-4.29 2.64-1.8 5.9-.96 7.66 1.1 1.76-2.06 5.02-2.91 7.66-1.1 1.41.96 2.28 2.59 2.34 4.29.14 3.88-3.3 6.99-8.55 11.76z" transform="translate(0, 4.7) scale(0.95)"',
     // "@mui/icons-material/FileDownloadOutlined"
     download:
-        '<path d="M18 15v3H6v-3H4v3c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2v-3zm-1-4-1.41-1.41L13 12.17V4h-2v8.17L8.41 9.59 7 11l5 5z"',
+        '<path d="M18 15v3H6v-3H4v3c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2v-3zm-1-4-1.41-1.41L13 12.17V4h-2v8.17L8.41 9.59 7 11l5 5z" transform="translate(0, 4)"',
+    // "@mui/icons-material/InfoOutlined"
+    info: '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8" transform="translate(7.5, 4.5) scale(0.95)"',
+    // "@mui/icons-material/MoreHoriz"
+    more: '<path d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2" transform="translate(8, 4.5)"',
 };
 
 /**

From 642320b1d99302d0c253f8c8e7fa6b413e8346b6 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Tue, 4 Mar 2025 20:56:58 +0530
Subject: [PATCH 753/796] icons 2

---
 web/apps/photos/src/styles/global.css            | 6 +++++-
 web/packages/gallery/components/viewer/icons.tsx | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 428c59fd6e..41e0e2e19d 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -181,7 +181,11 @@ body {
 }
 
 .pswp-ente .pswp__button--close .pswp__icn {
-    transform: scale(0.9);
+    transform: translate(-6px, 0) scale(0.925);
+}
+
+.pswp-ente .pswp__button--close {
+    margin-right: 2px;
 }
 
 .pswp-ente .pswp__button--arrow--prev .pswp__icn {
diff --git a/web/packages/gallery/components/viewer/icons.tsx b/web/packages/gallery/components/viewer/icons.tsx
index b1e7b37eb9..bd5bc062f4 100644
--- a/web/packages/gallery/components/viewer/icons.tsx
+++ b/web/packages/gallery/components/viewer/icons.tsx
@@ -22,17 +22,17 @@ const paths = {
     error: '<path d="M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2M12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8" transform="translate(7, 5.7) scale(0.85)"',
     // "@mui/icons-material/FavoriteBorderRounded"
     favorite:
-        '<path d="M19.66 3.99c-2.64-1.8-5.9-.96-7.66 1.1-1.76-2.06-5.02-2.91-7.66-1.1-1.4.96-2.28 2.58-2.34 4.29-.14 3.88 3.3 6.99 8.55 11.76l.1.09c.76.69 1.93.69 2.69-.01l.11-.1c5.25-4.76 8.68-7.87 8.55-11.75-.06-1.7-.94-3.32-2.34-4.28M12.1 18.55l-.1.1-.1-.1C7.14 14.24 4 11.39 4 8.5 4 6.5 5.5 5 7.5 5c1.54 0 3.04.99 3.57 2.36h1.87C13.46 5.99 14.96 5 16.5 5c2 0 3.5 1.5 3.5 3.5 0 2.89-3.14 5.74-7.9 10.05" transform="translate(0, 4.7) scale(0.95)"',
+        '<path d="M19.66 3.99c-2.64-1.8-5.9-.96-7.66 1.1-1.76-2.06-5.02-2.91-7.66-1.1-1.4.96-2.28 2.58-2.34 4.29-.14 3.88 3.3 6.99 8.55 11.76l.1.09c.76.69 1.93.69 2.69-.01l.11-.1c5.25-4.76 8.68-7.87 8.55-11.75-.06-1.7-.94-3.32-2.34-4.28M12.1 18.55l-.1.1-.1-.1C7.14 14.24 4 11.39 4 8.5 4 6.5 5.5 5 7.5 5c1.54 0 3.04.99 3.57 2.36h1.87C13.46 5.99 14.96 5 16.5 5c2 0 3.5 1.5 3.5 3.5 0 2.89-3.14 5.74-7.9 10.05" transform="translate(0, 5.5) scale(0.95)"',
     // "@mui/icons-material/FavoriteRounded"
     unfavorite:
-        '<path d="M13.35 20.13c-.76.69-1.93.69-2.69-.01l-.11-.1C5.3 15.27 1.87 12.16 2 8.28c.06-1.7.93-3.33 2.34-4.29 2.64-1.8 5.9-.96 7.66 1.1 1.76-2.06 5.02-2.91 7.66-1.1 1.41.96 2.28 2.59 2.34 4.29.14 3.88-3.3 6.99-8.55 11.76z" transform="translate(0, 4.7) scale(0.95)"',
+        '<path d="M13.35 20.13c-.76.69-1.93.69-2.69-.01l-.11-.1C5.3 15.27 1.87 12.16 2 8.28c.06-1.7.93-3.33 2.34-4.29 2.64-1.8 5.9-.96 7.66 1.1 1.76-2.06 5.02-2.91 7.66-1.1 1.41.96 2.28 2.59 2.34 4.29.14 3.88-3.3 6.99-8.55 11.76z" transform="translate(0, 5.5) scale(0.95)"',
     // "@mui/icons-material/FileDownloadOutlined"
     download:
         '<path d="M18 15v3H6v-3H4v3c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2v-3zm-1-4-1.41-1.41L13 12.17V4h-2v8.17L8.41 9.59 7 11l5 5z" transform="translate(0, 4)"',
     // "@mui/icons-material/InfoOutlined"
-    info: '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8" transform="translate(7.5, 4.5) scale(0.95)"',
+    info: '<path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8" transform="translate(1, 4.5) scale(0.95)"',
     // "@mui/icons-material/MoreHoriz"
-    more: '<path d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2" transform="translate(8, 4.5)"',
+    more: '<path d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2m-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2" transform="translate(0, 4.5)"',
 };
 
 /**

From 848ec03827461cc8f532a37647b0f69595dbed90 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 07:11:25 +0530
Subject: [PATCH 754/796] Route

---
 .../gallery/components/viewer/FileViewer.tsx  | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 36fc4067d7..89f7433254 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -284,23 +284,34 @@ const FileViewer: React.FC<FileViewerProps> = ({
 
     const handleFileInfoClose = useCallback(() => setOpenFileInfo(false), []);
 
-    // The download action - either invoked directly (if the download option is
-    // shown in the more menu), or via `handleDownloadBarAction` (if the
+    // The download action itself - either invoked via the download option is
+    // shown in the more menu, or via `handleDownloadBarAction` (if the
     // download option is shown in the PhotoSwipe bar).
-    const handleDownload = useCallback(() => {
-        console.log("TODO download");
-    }, []);
+    const handleDownload = useCallback(
+        (annotatedFile: FileViewerAnnotatedFile) => {
+            console.log("TODO download", annotatedFile);
+        },
+        [],
+    );
 
     // Callback invoked when the download action is triggered by activating the
     // download button in the PhotoSwipe bar.
     const handleDownloadBarAction = useCallback(
         (annotatedFile: FileViewerAnnotatedFile) => {
             setActiveAnnotatedFile(annotatedFile);
-            handleDownload();
+            handleDownload(annotatedFile);
         },
         [handleDownload],
     );
 
+    // Callback invoked when the download action is triggered by activating the
+    // download menu item in the more menu.
+    //
+    // Not memoized since it uses the frequently changing `activeAnnotatedFile`.
+    const handleDownloadMenuAction = () => {
+        handleDownload(activeAnnotatedFile!);
+    };
+
     const handleMore = useCallback(
         (
             annotatedFile: FileViewerAnnotatedFile,
@@ -396,7 +407,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
                     // Logged in users see the download option in the more menu.
                     return "menu";
                 } else {
-                    // In shared albums, the download option is shown in the bar
+                    // In public albums, the download option is shown in the bar
                     // buttons, in lieu of the favorite option.
                     return "bar";
                 }
@@ -574,6 +585,14 @@ const FileViewer: React.FC<FileViewerProps> = ({
                     list: { "aria-labelledby": moreButtonID },
                 }}
             >
+                {activeAnnotatedFile?.annotation.showDownload == "menu" && (
+                    <MoreMenuItem onClick={handleDownloadMenuAction}>
+                        <Typography sx={{ fontWeight: "medium" }}>
+                            {/*TODO */ t("download")}
+                        </Typography>
+                        <FileDownloadOutlinedIcon />
+                    </MoreMenuItem>
+                )}
                 {activeAnnotatedFile?.annotation.showDelete && (
                     <MoreMenuItem onClick={handleConfirmDelete}>
                         <Typography sx={{ fontWeight: "medium" }}>
@@ -590,14 +609,6 @@ const FileViewer: React.FC<FileViewerProps> = ({
                         <EditIcon />
                     </MoreMenuItem>
                 )}
-                {activeAnnotatedFile?.annotation.showDownload == "menu" && (
-                    <MoreMenuItem onClick={handleDownload}>
-                        <Typography sx={{ fontWeight: "medium" }}>
-                            {/*TODO */ t("download")}
-                        </Typography>
-                        <FileDownloadOutlinedIcon />
-                    </MoreMenuItem>
-                )}
             </MoreMenu>
             {/* TODO(PS): Fix imports */}
             <ConfirmDeleteFileDialog

From c0b3b4b38e11525f18b1e54bfb15c503c32b3598 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 07:24:10 +0530
Subject: [PATCH 755/796] link

---
 web/apps/photos/src/components/PhotoFrame.tsx |  9 ++++++
 .../gallery/components/viewer/FileViewer.tsx  | 31 ++++++++++---------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 2a90699152..2df66688ee 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -32,6 +32,7 @@ import {
     SelectedState,
     SetFilesDownloadProgressAttributesCreator,
 } from "types/gallery";
+import { downloadSingleFile } from "utils/file";
 import { handleSelectCreator } from "utils/photoFrame";
 import { PhotoList } from "./PhotoList";
 import PreviewCard from "./pages/gallery/PreviewCard";
@@ -284,6 +285,13 @@ const PhotoFrame = ({
             : undefined;
     }, [favoriteFileIDs, onMarkUnsyncedFavoriteUpdate]);
 
+    // TODO(PS): Missing dep!
+    const handleDownload = useCallback((file: EnteFile) => {
+        const setSingleFileDownloadProgress =
+            setFilesDownloadProgressAttributesCreator!(file.metadata.title);
+        void downloadSingleFile(file, setSingleFileDownloadProgress);
+    }, []);
+
     const handleDelete = useMemo(() => {
         return onMarkTempDeleted
             ? async (file: EnteFile) => {
@@ -586,6 +594,7 @@ const PhotoFrame = ({
                     isInTrashSection={activeCollectionID === TRASH_SECTION}
                     onTriggerSyncWithRemote={handleTriggerSyncWithRemote}
                     onToggleFavorite={handleToggleFavorite}
+                    onDownload={handleDownload}
                     onDelete={handleDelete}
                     onSaveEditedImageCopy={handleSaveEditedImageCopy}
                     {...{
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 89f7433254..9921958bea 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -133,11 +133,18 @@ export type FileViewerProps = ModalVisibilityProps & {
      * See also: [Note: File viewer update and dispatch]
      */
     onToggleFavorite?: (file: EnteFile) => Promise<void>;
+    /**
+     * Called when the given {@link file} should be downloaded.
+     *
+     * If this is not provided then the download action will not be shown.
+     *
+     * See also: [Note: File viewer update and dispatch]
+     */
+    onDownload?: (file: EnteFile) => void;
     /**
      * Called when the given {@link file} should be deleted.
      *
-     * If this is not provided then the delete button will not be shown
-     * in the file actions.
+     * If this is not provided then the delete action will not be shown.
      *
      * See also: [Note: File viewer update and dispatch]
      */
@@ -177,6 +184,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
     allCollectionsNameByID,
     onTriggerSyncWithRemote,
     onToggleFavorite,
+    onDownload,
     onDelete,
     onSelectCollection,
     onSelectPerson,
@@ -284,24 +292,14 @@ const FileViewer: React.FC<FileViewerProps> = ({
 
     const handleFileInfoClose = useCallback(() => setOpenFileInfo(false), []);
 
-    // The download action itself - either invoked via the download option is
-    // shown in the more menu, or via `handleDownloadBarAction` (if the
-    // download option is shown in the PhotoSwipe bar).
-    const handleDownload = useCallback(
-        (annotatedFile: FileViewerAnnotatedFile) => {
-            console.log("TODO download", annotatedFile);
-        },
-        [],
-    );
-
     // Callback invoked when the download action is triggered by activating the
     // download button in the PhotoSwipe bar.
     const handleDownloadBarAction = useCallback(
         (annotatedFile: FileViewerAnnotatedFile) => {
             setActiveAnnotatedFile(annotatedFile);
-            handleDownload(annotatedFile);
+            onDownload!(annotatedFile.file);
         },
-        [handleDownload],
+        [onDownload],
     );
 
     // Callback invoked when the download action is triggered by activating the
@@ -309,7 +307,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
     //
     // Not memoized since it uses the frequently changing `activeAnnotatedFile`.
     const handleDownloadMenuAction = () => {
-        handleDownload(activeAnnotatedFile!);
+        handleMoreMenuClose();
+        onDownload!(activeAnnotatedFile!.file);
     };
 
     const handleMore = useCallback(
@@ -403,6 +402,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
 
             const showDownload = (() => {
                 if (disableDownload) return undefined;
+                if (!onDownload) return undefined;
                 if (user) {
                     // Logged in users see the download option in the more menu.
                     return "menu";
@@ -431,6 +431,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
             disableDownload,
             isInTrashSection,
             isInHiddenSection,
+            onDownload,
             handleEditImage,
             handleConfirmDelete,
         ],

From f3a079e73425bfbe5189613c257021d129b7c4c2 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 07:32:40 +0530
Subject: [PATCH 756/796] Prevent rerenders

---
 web/apps/photos/src/components/PhotoFrame.tsx | 3 +--
 web/apps/photos/src/pages/gallery.tsx         | 6 +++---
 web/apps/photos/src/pages/shared-albums.tsx   | 6 +++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index 2df66688ee..a60768019a 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -285,12 +285,11 @@ const PhotoFrame = ({
             : undefined;
     }, [favoriteFileIDs, onMarkUnsyncedFavoriteUpdate]);
 
-    // TODO(PS): Missing dep!
     const handleDownload = useCallback((file: EnteFile) => {
         const setSingleFileDownloadProgress =
             setFilesDownloadProgressAttributesCreator!(file.metadata.title);
         void downloadSingleFile(file, setSingleFileDownloadProgress);
-    }, []);
+    }, [setFilesDownloadProgressAttributesCreator]);
 
     const handleDelete = useMemo(() => {
         return onMarkTempDeleted
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 79de4d7458..3fed596013 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -630,8 +630,8 @@ const Page: React.FC = () => {
     };
 
     const setFilesDownloadProgressAttributesCreator: SetFilesDownloadProgressAttributesCreator =
-        (folderName, collectionID, isHidden) => {
-            const id = filesDownloadProgressAttributesList?.length ?? 0;
+        useCallback((folderName, collectionID, isHidden) => {
+            const id = Math.random();
             const updater: SetFilesDownloadProgressAttributes = (value) => {
                 setFilesDownloadProgressAttributesList((prev) => {
                     const attributes = prev?.find((attr) => attr.id === id);
@@ -660,7 +660,7 @@ const Page: React.FC = () => {
                 downloadDirPath: null,
             });
             return updater;
-        };
+        }, []);
 
     const collectionOpsHelper =
         (ops: COLLECTION_OPS_TYPE) => async (collection: Collection) => {
diff --git a/web/apps/photos/src/pages/shared-albums.tsx b/web/apps/photos/src/pages/shared-albums.tsx
index 97a8374827..25812ee9a3 100644
--- a/web/apps/photos/src/pages/shared-albums.tsx
+++ b/web/apps/photos/src/pages/shared-albums.tsx
@@ -124,8 +124,8 @@ export default function PublicCollectionGallery() {
     ] = useState<FilesDownloadProgressAttributes[]>([]);
 
     const setFilesDownloadProgressAttributesCreator: SetFilesDownloadProgressAttributesCreator =
-        (folderName, collectionID, isHidden) => {
-            const id = filesDownloadProgressAttributesList?.length ?? 0;
+        useCallback((folderName, collectionID, isHidden) => {
+            const id = Math.random();
             const updater: SetFilesDownloadProgressAttributes = (value) => {
                 setFilesDownloadProgressAttributesList((prev) => {
                     const attributes = prev?.find((attr) => attr.id === id);
@@ -154,7 +154,7 @@ export default function PublicCollectionGallery() {
                 downloadDirPath: null,
             });
             return updater;
-        };
+        }, []);
 
     const onAddPhotos = useMemo(() => {
         return publicCollection?.publicURLs?.[0]?.enableCollect

From 8f8cdbb13f19adde189eb58567b4318d5f166650 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 07:43:38 +0530
Subject: [PATCH 757/796] mh

---
 web/packages/gallery/components/viewer/FileViewer.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 9921958bea..5f174e89cd 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -651,9 +651,10 @@ const MoreMenuItem = styled(MenuItem)`
 
     /* MUI MenuItem default implementation has a minHeight of "48px" below the
        "sm" breakpoint, and auto after it. We always want the same height, so
-       use an explicit padding to have minHeight "auto" also come out to 48px
-       (20px (icon or Typography height + 14 + 14) */
-    padding-block: 14px;
+       set minHeight auto and use an explicit padding always to come out to 44px
+       (20px (icon or Typography height + 12 + 12) */
+    padding-block: 12px;
+    min-height: auto;
 
     gap: 1;
     justify-content: space-between;

From 1bc8c44b54ecca9a9c901d8861539b3aa022d8b9 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 07:53:51 +0530
Subject: [PATCH 758/796] copy 1

---
 .../gallery/components/viewer/FileViewer.tsx  | 38 ++++++++++++++++---
 .../gallery/components/viewer/photoswipe.ts   | 20 ++++++----
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 5f174e89cd..91ba9de7a3 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -37,6 +37,7 @@ import {
     ImageEditorOverlay,
     type ImageEditorOverlayProps,
 } from "@/new/photos/components/ImageEditorOverlay";
+import ContentCopyIcon from "@mui/icons-material/ContentCopy";
 import DeleteIcon from "@mui/icons-material/Delete";
 import EditIcon from "@mui/icons-material/Edit";
 import FileDownloadOutlinedIcon from "@mui/icons-material/FileDownloadOutlined";
@@ -338,8 +339,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
             : undefined;
     }, [onDelete, showConfirmDelete, handleMoreMenuClose]);
 
-    // Not memoized since it depends on the frequently changing
-    // `activeAnnotatedFile`.
+    // Not memoized since it uses the frequently changing `activeAnnotatedFile`.
     const handleDelete = async () => {
         const file = activeAnnotatedFile!.file;
         await onDelete(file);
@@ -364,6 +364,11 @@ const FileViewer: React.FC<FileViewerProps> = ({
         });
     };
 
+    // Not memoized since it uses the frequently changing `activeAnnotatedFile`.
+    const handleCopyImage = () => {
+        console.log("TODO copy", activeAnnotatedFile!);
+    };
+
     const handleEditImage = useMemo(() => {
         return onSaveEditedImageCopy
             ? () => {
@@ -388,10 +393,9 @@ const FileViewer: React.FC<FileViewerProps> = ({
 
     const handleAnnotate = useCallback(
         (file: EnteFile): FileViewerFileAnnotation => {
-            log.debug(() => ["viewer", { action: "annotate", file }]);
-
             const fileID = file.id;
             const isOwnFile = file.ownerID == user?.id;
+
             const canModify =
                 isOwnFile && !isInTrashSection && !isInHiddenSection;
             const showFavorite = canModify;
@@ -413,16 +417,30 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 }
             })();
 
+            const showCopyImage = (() => {
+                switch (file.metadata.fileType) {
+                    case FileType.image:
+                    case FileType.livePhoto:
+                        return true;
+                    default:
+                        return false;
+                }
+            })();
+
             const showMore =
-                showDelete || showEditImage || showDownload == "menu";
+                showDownload == "menu" ||
+                showDelete ||
+                showCopyImage ||
+                showEditImage;
 
             return {
                 fileID,
                 isOwnFile,
                 showFavorite,
+                showDownload,
                 showMore,
                 showDelete,
-                showDownload,
+                showCopyImage,
                 showEditImage,
             };
         },
@@ -602,6 +620,14 @@ const FileViewer: React.FC<FileViewerProps> = ({
                         <DeleteIcon />
                     </MoreMenuItem>
                 )}
+                {activeAnnotatedFile?.annotation.showCopyImage && (
+                    <MoreMenuItem onClick={handleCopyImage}>
+                        <Typography sx={{ fontWeight: "medium" }}>
+                            {/*TODO */ pt("Copy image")}
+                        </Typography>
+                        <ContentCopyIcon />
+                    </MoreMenuItem>
+                )}
                 {activeAnnotatedFile?.annotation.showEditImage && (
                     <MoreMenuItem onClick={handleEditImage}>
                         <Typography sx={{ fontWeight: "medium" }}>
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 2aded83324..c8d170bfe3 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -53,14 +53,6 @@ export interface FileViewerFileAnnotation {
      * `true` if the toggle favorite action should be shown for this file.
      */
     showFavorite: boolean;
-    /**
-     * `true` if the more menu action should be shown for this file.
-     */
-    showMore: boolean;
-    /**
-     * `true` if the delete action should be shown for this file.
-     */
-    showDelete: boolean;
     /**
      * Set if the download action should be shown for this file.
      *
@@ -71,6 +63,18 @@ export interface FileViewerFileAnnotation {
      * Note: "bar" should only be set if {@link haveUser} is also true.
      */
     showDownload: "bar" | "menu" | undefined;
+    /**
+     * `true` if the more menu action should be shown for this file.
+     */
+    showMore: boolean;
+    /**
+     * `true` if the delete action should be shown for this file.
+     */
+    showDelete: boolean;
+    /**
+     * `true` if the copy image action should be shown for this file.
+     */
+    showCopyImage: boolean;
     /**
      * `true` if this is an image which can be edited, _and_ editing is
      * possible, and the edit action should therefore be shown for this file.

From bb6c2f16566780eb08dd51746c0c1d7ea25e2b3d Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 08:08:10 +0530
Subject: [PATCH 759/796] Tweak

---
 .../gallery/components/viewer/FileViewer.tsx  | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 91ba9de7a3..2e8e227192 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -43,7 +43,13 @@ import EditIcon from "@mui/icons-material/Edit";
 import FileDownloadOutlinedIcon from "@mui/icons-material/FileDownloadOutlined";
 import { Button, Menu, MenuItem, styled, Typography } from "@mui/material";
 import { t } from "i18next";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import React, {
+    useCallback,
+    useEffect,
+    useMemo,
+    useRef,
+    useState,
+} from "react";
 import { fileInfoExifForFile, updateItemDataAlt } from "./data-source";
 import {
     FileViewerPhotoSwipe,
@@ -606,33 +612,34 @@ const FileViewer: React.FC<FileViewerProps> = ({
             >
                 {activeAnnotatedFile?.annotation.showDownload == "menu" && (
                     <MoreMenuItem onClick={handleDownloadMenuAction}>
-                        <Typography sx={{ fontWeight: "medium" }}>
+                        <MoreMenuItemTitle>
                             {/*TODO */ t("download")}
-                        </Typography>
+                        </MoreMenuItemTitle>
                         <FileDownloadOutlinedIcon />
                     </MoreMenuItem>
                 )}
                 {activeAnnotatedFile?.annotation.showDelete && (
                     <MoreMenuItem onClick={handleConfirmDelete}>
-                        <Typography sx={{ fontWeight: "medium" }}>
+                        <MoreMenuItemTitle>
                             {/*TODO */ t("delete")}
-                        </Typography>
+                        </MoreMenuItemTitle>
                         <DeleteIcon />
                     </MoreMenuItem>
                 )}
                 {activeAnnotatedFile?.annotation.showCopyImage && (
                     <MoreMenuItem onClick={handleCopyImage}>
-                        <Typography sx={{ fontWeight: "medium" }}>
+                        <MoreMenuItemTitle>
                             {/*TODO */ pt("Copy image")}
-                        </Typography>
-                        <ContentCopyIcon />
+                        </MoreMenuItemTitle>
+                        {/* Tweak icon size to visually fit better with neighbours */}
+                        <ContentCopyIcon sx={{ "&&": { fontSize: "18px" } }} />
                     </MoreMenuItem>
                 )}
                 {activeAnnotatedFile?.annotation.showEditImage && (
                     <MoreMenuItem onClick={handleEditImage}>
-                        <Typography sx={{ fontWeight: "medium" }}>
+                        <MoreMenuItemTitle>
                             {/*TODO */ pt("Edit image")}
-                        </Typography>
+                        </MoreMenuItemTitle>
                         <EditIcon />
                     </MoreMenuItem>
                 )}
@@ -698,6 +705,10 @@ const MoreMenuItem = styled(MenuItem)`
     }
 `;
 
+const MoreMenuItemTitle: React.FC<React.PropsWithChildren> = ({ children }) => (
+    <Typography sx={{ fontWeight: "medium" }}>{children}</Typography>
+);
+
 const fileIsEditableImage = (file: EnteFile) => {
     // Only images are editable.
     if (file.metadata.fileType !== FileType.image) return false;

From 11413ee77b00eebd90b0e716ab322134ad1d3405 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 09:47:30 +0530
Subject: [PATCH 760/796] Move closer to source

---
 .../gallery/components/viewer/FileViewer.tsx  | 58 +++++++++++++++++-
 .../gallery/components/viewer/photoswipe.ts   | 60 ++-----------------
 2 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 2e8e227192..cc3435c8ba 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -56,11 +56,65 @@ import {
     moreButtonID,
     moreMenuID,
     resetMoreMenuButtonOnMenuClose,
-    type FileViewerAnnotatedFile,
-    type FileViewerFileAnnotation,
     type FileViewerPhotoSwipeDelegate,
 } from "./photoswipe";
 
+/**
+ * Derived data for a file that is needed to display the file viewer controls
+ * etc associated with the file.
+ *
+ * This is recomputed on-demand each time the slide changes.
+ */
+export interface FileViewerFileAnnotation {
+    /**
+     * The id of the file whose annotation this is.
+     */
+    fileID: number;
+    /**
+     * `true` if this file is owned by the logged in user (if any).
+     */
+    isOwnFile: boolean;
+    /**
+     * `true` if the toggle favorite action should be shown for this file.
+     */
+    showFavorite: boolean;
+    /**
+     * Set if the download action should be shown for this file.
+     *
+     * - When "bar", the action button is shown among the bar icons.
+     *
+     * - When "menu", the action is shown as a more menu entry.
+     *
+     * Note: "bar" should only be set if {@link haveUser} is also true.
+     */
+    showDownload: "bar" | "menu" | undefined;
+    /**
+     * `true` if the more menu action should be shown for this file.
+     */
+    showMore: boolean;
+    /**
+     * `true` if the delete action should be shown for this file.
+     */
+    showDelete: boolean;
+    /**
+     * `true` if the copy image action should be shown for this file.
+     */
+    showCopyImage: boolean;
+    /**
+     * `true` if this is an image which can be edited, _and_ editing is
+     * possible, and the edit action should therefore be shown for this file.
+     */
+    showEditImage: boolean;
+}
+
+/**
+ * A file and its annotation, in a nice cosy box.
+ */
+export interface FileViewerAnnotatedFile {
+    file: EnteFile;
+    annotation: FileViewerFileAnnotation;
+}
+
 export type FileViewerProps = ModalVisibilityProps & {
     /**
      * The currently logged in user, if any.
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index c8d170bfe3..082ac919d5 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -14,6 +14,10 @@ import {
     itemDataForFile,
     updateFileInfoExifIfNeeded,
 } from "./data-source";
+import {
+    type FileViewerAnnotatedFile,
+    type FileViewerFileAnnotation,
+} from "./FileViewer";
 import { createPSRegisterElementIconHTML } from "./icons";
 
 // TODO(PS): WIP gallery using upstream photoswipe
@@ -34,54 +38,6 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
 
-/**
- * Derived data for a file that is needed to display the file viewer controls
- * etc associated with the file.
- *
- * This is recomputed on-demand each time the slide changes.
- */
-export interface FileViewerFileAnnotation {
-    /**
-     * The id of the file whose annotation this is.
-     */
-    fileID: number;
-    /**
-     * `true` if this file is owned by the logged in user (if any).
-     */
-    isOwnFile: boolean;
-    /**
-     * `true` if the toggle favorite action should be shown for this file.
-     */
-    showFavorite: boolean;
-    /**
-     * Set if the download action should be shown for this file.
-     *
-     * - When "bar", the action button is shown among the bar icons.
-     *
-     * - When "menu", the action is shown as a more menu entry.
-     *
-     * Note: "bar" should only be set if {@link haveUser} is also true.
-     */
-    showDownload: "bar" | "menu" | undefined;
-    /**
-     * `true` if the more menu action should be shown for this file.
-     */
-    showMore: boolean;
-    /**
-     * `true` if the delete action should be shown for this file.
-     */
-    showDelete: boolean;
-    /**
-     * `true` if the copy image action should be shown for this file.
-     */
-    showCopyImage: boolean;
-    /**
-     * `true` if this is an image which can be edited, _and_ editing is
-     * possible, and the edit action should therefore be shown for this file.
-     */
-    showEditImage: boolean;
-}
-
 export interface FileViewerPhotoSwipeDelegate {
     /**
      * Called to obtain the latest list of files.
@@ -172,14 +128,6 @@ type FileViewerPhotoSwipeOptions = Pick<
     ) => void;
 };
 
-/**
- * A file and its annotation, in a nice cosy box.
- */
-export interface FileViewerAnnotatedFile {
-    file: EnteFile;
-    annotation: FileViewerFileAnnotation;
-}
-
 /**
  * The ID that is used by the "more" action button (if one is being displayed).
  *

From 879f28599c9ceec106eb3d6bb6479729fa998813 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 10:01:28 +0530
Subject: [PATCH 761/796] Copy 2

---
 .../gallery/components/viewer/FileViewer.tsx  | 41 +++++++++++--------
 .../gallery/components/viewer/data-source.ts  |  7 ++++
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index cc3435c8ba..ddf29541a6 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -50,7 +50,11 @@ import React, {
     useRef,
     useState,
 } from "react";
-import { fileInfoExifForFile, updateItemDataAlt } from "./data-source";
+import {
+    fileInfoExifForFile,
+    originalImageBlobForFileID,
+    updateItemDataAlt,
+} from "./data-source";
 import {
     FileViewerPhotoSwipe,
     moreButtonID,
@@ -96,15 +100,17 @@ export interface FileViewerFileAnnotation {
      * `true` if the delete action should be shown for this file.
      */
     showDelete: boolean;
-    /**
-     * `true` if the copy image action should be shown for this file.
-     */
-    showCopyImage: boolean;
     /**
      * `true` if this is an image which can be edited, _and_ editing is
      * possible, and the edit action should therefore be shown for this file.
      */
     showEditImage: boolean;
+    /**
+     * If there is a image associated with the file, then this will be that
+     * image's raw (original) data as a {@link Blob}, and the copy image action
+     * will be show for this file.
+     */
+    originalImageBlob?: Blob;
 }
 
 /**
@@ -427,6 +433,16 @@ const FileViewer: React.FC<FileViewerProps> = ({
     // Not memoized since it uses the frequently changing `activeAnnotatedFile`.
     const handleCopyImage = () => {
         console.log("TODO copy", activeAnnotatedFile!);
+        const blob = activeAnnotatedFile!.annotation.originalImageBlob;
+        const newBlob = new Blob([blob], { type: "image/png" });
+        console.log("image/png");
+        void window.navigator.clipboard
+            .write([
+                new ClipboardItem({
+                    "image/png": newBlob,
+                }),
+            ])
+            .catch(onGenericError);
     };
 
     const handleEditImage = useMemo(() => {
@@ -477,15 +493,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 }
             })();
 
-            const showCopyImage = (() => {
-                switch (file.metadata.fileType) {
-                    case FileType.image:
-                    case FileType.livePhoto:
-                        return true;
-                    default:
-                        return false;
-                }
-            })();
+            const originalImageBlob = originalImageBlobForFileID(fileID);
+            const showCopyImage = !!originalImageBlob;
 
             const showMore =
                 showDownload == "menu" ||
@@ -500,8 +509,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 showDownload,
                 showMore,
                 showDelete,
-                showCopyImage,
                 showEditImage,
+                originalImageBlob,
             };
         },
         [
@@ -680,7 +689,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
                         <DeleteIcon />
                     </MoreMenuItem>
                 )}
-                {activeAnnotatedFile?.annotation.showCopyImage && (
+                {activeAnnotatedFile?.annotation.originalImageBlob && (
                     <MoreMenuItem onClick={handleCopyImage}>
                         <MoreMenuItemTitle>
                             {/*TODO */ pt("Copy image")}
diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 1aa115535d..633615faa8 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -301,6 +301,13 @@ export const forgetFailedItemDataForFileID = (fileID: number) => {
     }
 };
 
+/**
+ * Return the cached {@link originalImageBlob}, if any, from the
+ * {@link ItemData} for the file with the given {@link fileID}.
+ */
+export const originalImageBlobForFileID = (fileID: number) =>
+    _state.itemDataByFileID.get(fileID)?.originalImageBlob;
+
 /**
  * Update the alt attribute of the {@link ItemData}, if any, associated with the
  * given {@link EnteFile}.

From 21f87b7cbad7a1f056e99c8454333e4ea4d2763f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 10:45:34 +0530
Subject: [PATCH 762/796] Different tack

---
 .../gallery/components/viewer/FileViewer.tsx  | 69 ++++++++++++-------
 .../gallery/components/viewer/data-source.ts  |  7 --
 .../gallery/components/viewer/photoswipe.ts   | 18 ++++-
 3 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index ddf29541a6..848c2fccbb 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -50,11 +50,7 @@ import React, {
     useRef,
     useState,
 } from "react";
-import {
-    fileInfoExifForFile,
-    originalImageBlobForFileID,
-    updateItemDataAlt,
-} from "./data-source";
+import { fileInfoExifForFile, updateItemDataAlt } from "./data-source";
 import {
     FileViewerPhotoSwipe,
     moreButtonID,
@@ -100,17 +96,15 @@ export interface FileViewerFileAnnotation {
      * `true` if the delete action should be shown for this file.
      */
     showDelete: boolean;
+    /**
+     * `true` if the copy image action should be shown for this file.
+     */
+    showCopyImage: boolean;
     /**
      * `true` if this is an image which can be edited, _and_ editing is
      * possible, and the edit action should therefore be shown for this file.
      */
     showEditImage: boolean;
-    /**
-     * If there is a image associated with the file, then this will be that
-     * image's raw (original) data as a {@link Blob}, and the copy image action
-     * will be show for this file.
-     */
-    originalImageBlob?: Blob;
 }
 
 /**
@@ -298,6 +292,13 @@ const FileViewer: React.FC<FileViewerProps> = ({
         FileInfoExif | undefined
     >(undefined);
 
+    // With semantics similar to `activeAnnotatedFile`, this is the imageURL
+    // associated with the `activeAnnotatedFile`, if any. However, unlike
+    // `activeAnnotatedFile`, this is only set when the more menu is activated.
+    const [activeImageURL, setActiveImageURL] = useState<string | undefined>(
+        undefined,
+    );
+
     const [openFileInfo, setOpenFileInfo] = useState(false);
     const [moreMenuAnchorEl, setMoreMenuAnchorEl] =
         useState<HTMLElement | null>(null);
@@ -381,9 +382,11 @@ const FileViewer: React.FC<FileViewerProps> = ({
     const handleMore = useCallback(
         (
             annotatedFile: FileViewerAnnotatedFile,
+            imageURL: string | undefined,
             buttonElement: HTMLElement,
         ) => {
             setActiveAnnotatedFile(annotatedFile);
+            setActiveImageURL(imageURL);
             setMoreMenuAnchorEl(buttonElement);
         },
         [],
@@ -433,8 +436,14 @@ const FileViewer: React.FC<FileViewerProps> = ({
     // Not memoized since it uses the frequently changing `activeAnnotatedFile`.
     const handleCopyImage = () => {
         console.log("TODO copy", activeAnnotatedFile!);
-        const blob = activeAnnotatedFile!.annotation.originalImageBlob;
-        const newBlob = new Blob([blob], { type: "image/png" });
+        // const blob = activeAnnotatedFile!.annotation.originalImageBlob;
+        const newBlob = new Promise((resolve) => {
+            void fetch(activeImageURL)
+                .then((res) => res.blob())
+                .then((blob) =>
+                    resolve(new Blob([blob], { type: "image/png" })),
+                );
+        });
         console.log("image/png");
         void window.navigator.clipboard
             .write([
@@ -493,8 +502,15 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 }
             })();
 
-            const originalImageBlob = originalImageBlobForFileID(fileID);
-            const showCopyImage = !!originalImageBlob;
+            const showCopyImage = (() => {
+                switch (file.metadata.fileType) {
+                    case FileType.image:
+                    case FileType.livePhoto:
+                        return true;
+                    default:
+                        return false;
+                }
+            })();
 
             const showMore =
                 showDownload == "menu" ||
@@ -509,8 +525,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 showDownload,
                 showMore,
                 showDelete,
+                showCopyImage,
                 showEditImage,
-                originalImageBlob,
             };
         },
         [
@@ -689,15 +705,18 @@ const FileViewer: React.FC<FileViewerProps> = ({
                         <DeleteIcon />
                     </MoreMenuItem>
                 )}
-                {activeAnnotatedFile?.annotation.originalImageBlob && (
-                    <MoreMenuItem onClick={handleCopyImage}>
-                        <MoreMenuItemTitle>
-                            {/*TODO */ pt("Copy image")}
-                        </MoreMenuItemTitle>
-                        {/* Tweak icon size to visually fit better with neighbours */}
-                        <ContentCopyIcon sx={{ "&&": { fontSize: "18px" } }} />
-                    </MoreMenuItem>
-                )}
+                {activeAnnotatedFile?.annotation.showCopyImage &&
+                    activeImageURL && (
+                        <MoreMenuItem onClick={handleCopyImage}>
+                            <MoreMenuItemTitle>
+                                {/*TODO */ pt("Copy image")}
+                            </MoreMenuItemTitle>
+                            {/* Tweak icon size to visually fit better with neighbours */}
+                            <ContentCopyIcon
+                                sx={{ "&&": { fontSize: "18px" } }}
+                            />
+                        </MoreMenuItem>
+                    )}
                 {activeAnnotatedFile?.annotation.showEditImage && (
                     <MoreMenuItem onClick={handleEditImage}>
                         <MoreMenuItemTitle>
diff --git a/web/packages/gallery/components/viewer/data-source.ts b/web/packages/gallery/components/viewer/data-source.ts
index 633615faa8..1aa115535d 100644
--- a/web/packages/gallery/components/viewer/data-source.ts
+++ b/web/packages/gallery/components/viewer/data-source.ts
@@ -301,13 +301,6 @@ export const forgetFailedItemDataForFileID = (fileID: number) => {
     }
 };
 
-/**
- * Return the cached {@link originalImageBlob}, if any, from the
- * {@link ItemData} for the file with the given {@link fileID}.
- */
-export const originalImageBlobForFileID = (fileID: number) =>
-    _state.itemDataByFileID.get(fileID)?.originalImageBlob;
-
 /**
  * Update the alt attribute of the {@link ItemData}, if any, associated with the
  * given {@link EnteFile}.
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 082ac919d5..9068b4dada 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -119,11 +119,19 @@ type FileViewerPhotoSwipeOptions = Pick<
     /**
      * Called when the user activates the more action on a file.
      *
-     * In addition to the file, callback is also passed a reference to the HTML
-     * DOM more button element.
+     * @param annotatedFile The current (annotated) file.
+     *
+     * @param imageURL If the current file has an associated non-thumbnail image
+     * that is being shown in the viewer, then this is set to the (object) URL
+     * of the image being shown. Specifically, this is the same as the
+     * {@link imageURL} attribute of the {@link ItemData} associated with the
+     * current file.
+     *
+     * @param buttonElement The more button DOM element.
      */
     onMore: (
         annotatedFile: FileViewerAnnotatedFile,
+        imageURL: string | undefined,
         buttonElement: HTMLElement,
     ) => void;
 };
@@ -598,7 +606,11 @@ export class FileViewerPhotoSwipe {
                         // See also: `resetMoreMenuButtonOnMenuClose`.
                         buttonElement.setAttribute("aria-controls", moreMenuID);
                         buttonElement.setAttribute("aria-expanded", true);
-                        onMore(currentAnnotatedFile(), buttonElement);
+                        onMore(
+                            currentAnnotatedFile(),
+                            pswp.currSlide.content.data.imageURL,
+                            buttonElement,
+                        );
                     },
                 });
             }

From 81e3593b74363e36c1e43f264e684336f198c108 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 11:02:14 +0530
Subject: [PATCH 763/796] PNG

---
 .../gallery/components/viewer/FileViewer.tsx  | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 848c2fccbb..f21883b1e0 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -435,20 +435,13 @@ const FileViewer: React.FC<FileViewerProps> = ({
 
     // Not memoized since it uses the frequently changing `activeAnnotatedFile`.
     const handleCopyImage = () => {
-        console.log("TODO copy", activeAnnotatedFile!);
-        // const blob = activeAnnotatedFile!.annotation.originalImageBlob;
-        const newBlob = new Promise((resolve) => {
-            void fetch(activeImageURL)
-                .then((res) => res.blob())
-                .then((blob) =>
-                    resolve(new Blob([blob], { type: "image/png" })),
-                );
-        });
-        console.log("image/png");
+        // Safari does not copy if we do not call `navigator.clipboard.write`
+        // synchronously within the click event handler, but it does supports
+        // passing a promise in lieu of the blob.
         void window.navigator.clipboard
             .write([
                 new ClipboardItem({
-                    "image/png": newBlob,
+                    "image/png": createImagePNGBlob(activeImageURL!),
                 }),
             ])
             .catch(onGenericError);
@@ -808,3 +801,21 @@ const fileIsEditableImage = (file: EnteFile) => {
     }
     return isRenderable;
 };
+
+/**
+ * Return a promise that resolves with a "image/png" blob derived from the given
+ * {@link imageURL} that can be written to the navigator's clipboard.
+ */
+const createImagePNGBlob = async (imageURL: string) =>
+    new Promise((resolve, reject) => {
+        const image = new Image();
+        image.onload = () => {
+            const canvas = document.createElement("canvas");
+            canvas.width = image.width;
+            canvas.height = image.height;
+            canvas.getContext("2d").drawImage(image, 0, 0);
+            canvas.toBlob(resolve, "image/png");
+        };
+        image.onerror = reject;
+        image.src = imageURL;
+    });

From 7d8683640b62ef72ea78c3fe0b33dc9d66efbd21 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 11:19:12 +0530
Subject: [PATCH 764/796] vid 1

---
 .../gallery/components/viewer/FileViewer.tsx  |  1 +
 .../gallery/components/viewer/photoswipe.ts   | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index f21883b1e0..a16954be66 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -435,6 +435,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
 
     // Not memoized since it uses the frequently changing `activeAnnotatedFile`.
     const handleCopyImage = () => {
+        handleMoreMenuClose();
         // Safari does not copy if we do not call `navigator.clipboard.write`
         // synchronously within the click event handler, but it does supports
         // passing a promise in lieu of the blob.
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 9068b4dada..5d9989c8fa 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -432,9 +432,32 @@ export class FileViewerPhotoSwipe {
             updateFileInfoExifIfNeeded(e.content.data),
         );
 
+        let el;
+        let listener;
         pswp.on("change", (e) => {
             const itemData = this.pswp.currSlide.content.data;
             updateFileInfoExifIfNeeded(itemData);
+
+            if (el && listener) {
+                el.removeEventListener("pause", listener);
+                el.removeEventListener("play", listener);
+                el.removeEventListener("ended", listener);
+                el = undefined;
+                listener = undefined;
+            }
+            if (itemData.fileType == FileType.video) {
+                setTimeout(() => {
+                    listener = (e) => {
+                        console.log(e);
+                    };
+                    // TODO:
+                    el = document.getElementsByTagName("video")[0];
+                    console.log(el);
+                    el.addEventListener("pause", listener);
+                    el.addEventListener("play", listener);
+                    el.addEventListener("ended", listener);
+                }, 3000);
+            }
         });
 
         pswp.on("contentDestroy", (e) => forgetExifForItemData(e.content.data));

From 1897285380287b67c375dd0d84cd4ba4d6d3c937 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 11:46:30 +0530
Subject: [PATCH 765/796] Don't show delete in shared

This functionality has not yet been implemented
---
 web/apps/photos/src/components/PhotoFrame.tsx      |  5 ++++-
 web/apps/photos/src/pages/gallery.tsx              |  6 ++++++
 .../gallery/components/viewer/FileViewer.tsx       | 14 +++++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index a60768019a..c1e5460f4d 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -146,6 +146,7 @@ export type PhotoFrameProps = Pick<
     enableDownload?: boolean;
     showAppDownloadBanner?: boolean;
     setIsPhotoSwipeOpen?: (value: boolean) => void;
+    isInIncomingSharedCollection?: boolean;
     isInHiddenSection?: boolean;
     setFilesDownloadProgressAttributesCreator?: SetFilesDownloadProgressAttributesCreator;
     selectable?: boolean;
@@ -171,6 +172,7 @@ const PhotoFrame = ({
     allCollectionsNameByID,
     showAppDownloadBanner,
     setIsPhotoSwipeOpen,
+    isInIncomingSharedCollection,
     isInHiddenSection,
     setFilesDownloadProgressAttributesCreator,
     selectable,
@@ -589,8 +591,9 @@ const PhotoFrame = ({
                     files={files}
                     initialIndex={currentIndex}
                     disableDownload={!enableDownload}
-                    isInHiddenSection={isInHiddenSection}
+                    isInIncomingSharedCollection={isInIncomingSharedCollection}
                     isInTrashSection={activeCollectionID === TRASH_SECTION}
+                    isInHiddenSection={isInHiddenSection}
                     onTriggerSyncWithRemote={handleTriggerSyncWithRemote}
                     onToggleFavorite={handleToggleFavorite}
                     onDownload={handleDownload}
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index 3fed596013..b57b6e312c 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -1071,6 +1071,12 @@ const Page: React.FC = () => {
                         showAppDownloadBanner={
                             files.length < 30 && !isInSearchMode
                         }
+                        isInIncomingSharedCollection={
+                            collectionSummaries.get(activeCollectionID)
+                            ?.type == "incomingShareCollaborator" ||
+                            collectionSummaries.get(activeCollectionID)
+                            ?.type == "incomingShareViewer"
+                        }
                         isInHiddenSection={barMode == "hidden-albums"}
                         setFilesDownloadProgressAttributesCreator={
                             setFilesDownloadProgressAttributesCreator
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index a16954be66..4aae85fe0c 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -152,6 +152,10 @@ export type FileViewerProps = ModalVisibilityProps & {
      * If true then the viewer does not show controls for downloading the file.
      */
     disableDownload?: boolean;
+    /**
+     * `true` when we are viewing files in an album that the user does not own.
+     */
+    isInIncomingSharedCollection?: boolean;
     /**
      * `true` when we are viewing files in the Trash.
      */
@@ -238,6 +242,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
     files,
     initialIndex,
     disableDownload,
+    isInIncomingSharedCollection,
     isInTrashSection,
     isInHiddenSection,
     favoriteFileIDs,
@@ -477,9 +482,15 @@ const FileViewer: React.FC<FileViewerProps> = ({
 
             const canModify =
                 isOwnFile && !isInTrashSection && !isInHiddenSection;
+
             const showFavorite = canModify;
+
             const showDelete =
-                !!handleConfirmDelete && isOwnFile && !isInTrashSection;
+                !!handleConfirmDelete &&
+                isOwnFile &&
+                !isInTrashSection &&
+                !isInIncomingSharedCollection;
+
             const showEditImage =
                 !!handleEditImage && canModify && fileIsEditableImage(file);
 
@@ -526,6 +537,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
         [
             user,
             disableDownload,
+            isInIncomingSharedCollection,
             isInTrashSection,
             isInHiddenSection,
             onDownload,

From 3ac937a244cb717e66f9afee206c355ef6b83bbf Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Wed, 5 Mar 2025 12:00:02 +0530
Subject: [PATCH 766/796] move

---
 mobile/lib/data/years.dart                           |  2 +-
 mobile/lib/emergency/other_contact_page.dart         |  2 +-
 mobile/lib/models/file/file.dart                     |  2 +-
 mobile/lib/models/ml/face/box.dart                   |  2 +-
 mobile/lib/models/ml/face/face.dart                  |  2 +-
 mobile/lib/services/filedata/model/file_data.dart    |  2 +-
 mobile/lib/services/files_service.dart               |  2 +-
 mobile/lib/services/search_service.dart              |  2 +-
 mobile/lib/services/sync/local_sync_service.dart     |  2 +-
 mobile/lib/states/all_sections_examples_state.dart   |  2 +-
 mobile/lib/states/location_state.dart                |  2 +-
 mobile/lib/ui/account/sessions_page.dart             |  2 +-
 .../collection/collection_sharing_actions.dart       |  2 +-
 .../collections/device/device_folders_grid_view.dart |  2 +-
 .../device/device_folders_vertical_grid_view.dart    |  2 +-
 mobile/lib/ui/components/buttons/button_widget.dart  |  2 +-
 .../menu_item_widget/menu_item_widget.dart           |  2 +-
 mobile/lib/ui/components/text_input_widget.dart      |  2 +-
 mobile/lib/ui/components/toggle_switch_widget.dart   |  2 +-
 mobile/lib/ui/growth/referral_screen.dart            |  2 +-
 mobile/lib/ui/growth/storage_details_screen.dart     |  2 +-
 mobile/lib/ui/home/home_gallery_widget.dart          |  2 +-
 mobile/lib/ui/map/map_view.dart                      |  2 +-
 mobile/lib/ui/payment/add_on_page.dart               |  2 +-
 mobile/lib/ui/payment/store_subscription_page.dart   |  2 +-
 mobile/lib/ui/payment/stripe_subscription_page.dart  |  2 +-
 .../lib/ui/payment/subscription_common_widgets.dart  |  6 ++++--
 mobile/lib/ui/payment/subscription_plan_widget.dart  | 12 +++++++++---
 .../lib/ui/settings/backup/free_space_options.dart   |  2 +-
 mobile/lib/ui/settings/storage_card_widget.dart      |  2 +-
 mobile/lib/ui/sharing/manage_links_widget.dart       |  2 +-
 mobile/lib/ui/sharing/user_avator_widget.dart        |  2 +-
 mobile/lib/ui/tabs/shared_collections_tab.dart       |  2 +-
 mobile/lib/ui/tabs/user_collections_tab.dart         |  2 +-
 mobile/lib/ui/tools/debug/app_storage_viewer.dart    |  2 +-
 mobile/lib/ui/tools/debug/path_storage_viewer.dart   |  4 ++--
 mobile/lib/ui/tools/deduplicate_page.dart            |  2 +-
 mobile/lib/ui/tools/free_space_page.dart             |  2 +-
 mobile/lib/ui/viewer/file/file_icons_widget.dart     |  2 +-
 .../file/native_video_player_controls/seek_bar.dart  |  2 +-
 .../viewer/file/video_widget_media_kit_common.dart   |  4 ++--
 .../viewer/file/video_widget_media_kit_preview.dart  |  2 +-
 mobile/lib/ui/viewer/file/video_widget_native.dart   |  4 ++--
 .../file_details/backed_up_time_item_widget.dart     |  2 +-
 .../file_details/creation_time_item_widget.dart      |  2 +-
 .../file_details/file_properties_item_widget.dart    |  4 ++--
 .../file_details/preview_properties_item_widget.dart |  2 +-
 .../lib/ui/viewer/gallery/component/group/type.dart  |  2 +-
 .../component/multiple_groups_gallery_view.dart      |  2 +-
 mobile/lib/ui/viewer/gallery/gallery.dart            |  4 ++--
 .../ui/viewer/gallery/gallery_app_bar_widget.dart    |  2 +-
 mobile/lib/ui/viewer/search/search_widget.dart       |  4 ++--
 mobile/lib/utils/file_download_util.dart             |  4 ++--
 mobile/lib/utils/file_uploader.dart                  |  2 +-
 mobile/lib/utils/share_util.dart                     |  2 +-
 mobile/lib/utils/standalone/README.md                |  3 +++
 .../utils/{data_util.dart => standalone/data.dart}   |  0
 .../date_time.dart}                                  |  0
 mobile/lib/utils/{ => standalone}/debouncer.dart     |  3 +--
 .../utils/{ => standalone}/directory_content.dart    |  2 +-
 mobile/lib/utils/{ => standalone}/fake_progress.dart |  0
 mobile/lib/utils/{ => standalone}/parse.dart         |  0
 mobile/test/utils/date_time_util_test.dart           |  2 +-
 63 files changed, 79 insertions(+), 69 deletions(-)
 create mode 100644 mobile/lib/utils/standalone/README.md
 rename mobile/lib/utils/{data_util.dart => standalone/data.dart} (100%)
 rename mobile/lib/utils/{date_time_util.dart => standalone/date_time.dart} (100%)
 rename mobile/lib/utils/{ => standalone}/debouncer.dart (95%)
 rename mobile/lib/utils/{ => standalone}/directory_content.dart (98%)
 rename mobile/lib/utils/{ => standalone}/fake_progress.dart (100%)
 rename mobile/lib/utils/{ => standalone}/parse.dart (100%)

diff --git a/mobile/lib/data/years.dart b/mobile/lib/data/years.dart
index 2b2e04d911..5f496d2a68 100644
--- a/mobile/lib/data/years.dart
+++ b/mobile/lib/data/years.dart
@@ -1,4 +1,4 @@
-import 'package:photos/utils/date_time_util.dart';
+import 'package:photos/utils/standalone/date_time.dart';
 
 class YearsData {
   final List<YearData> yearsData = [];
diff --git a/mobile/lib/emergency/other_contact_page.dart b/mobile/lib/emergency/other_contact_page.dart
index 07605b59da..89235aa330 100644
--- a/mobile/lib/emergency/other_contact_page.dart
+++ b/mobile/lib/emergency/other_contact_page.dart
@@ -17,9 +17,9 @@ import "package:photos/ui/components/menu_item_widget/menu_item_widget.dart";
 import "package:photos/ui/components/menu_section_title.dart";
 import "package:photos/ui/components/models/button_type.dart";
 import "package:photos/ui/components/title_bar_title_widget.dart";
-import "package:photos/utils/date_time_util.dart";
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/navigation_util.dart";
+import "package:photos/utils/standalone/date_time.dart";
 
 // OtherContactPage is used to start recovery process for other user's account
 // Based on the state of the contact & recovery session, it will show
diff --git a/mobile/lib/models/file/file.dart b/mobile/lib/models/file/file.dart
index 705d740e82..eea913a1bc 100644
--- a/mobile/lib/models/file/file.dart
+++ b/mobile/lib/models/file/file.dart
@@ -10,10 +10,10 @@ import 'package:photos/models/file/file_type.dart';
 import 'package:photos/models/location/location.dart';
 import "package:photos/models/metadata/file_magic.dart";
 import "package:photos/service_locator.dart";
-import 'package:photos/utils/date_time_util.dart';
 import 'package:photos/utils/exif_util.dart';
 import 'package:photos/utils/file_uploader_util.dart';
 import "package:photos/utils/panorama_util.dart";
+import 'package:photos/utils/standalone/date_time.dart';
 
 //Todo: files with no location data have lat and long set to 0.0. This should ideally be null.
 class EnteFile {
diff --git a/mobile/lib/models/ml/face/box.dart b/mobile/lib/models/ml/face/box.dart
index d5d8672fb9..8d4adfd112 100644
--- a/mobile/lib/models/ml/face/box.dart
+++ b/mobile/lib/models/ml/face/box.dart
@@ -1,4 +1,4 @@
-import "package:photos/utils/parse.dart";
+import "package:photos/utils/standalone/parse.dart";
 
 /// Bounding box of a face.
 ///
diff --git a/mobile/lib/models/ml/face/face.dart b/mobile/lib/models/ml/face/face.dart
index 1001d4988e..5e4c554e3b 100644
--- a/mobile/lib/models/ml/face/face.dart
+++ b/mobile/lib/models/ml/face/face.dart
@@ -4,7 +4,7 @@ import "package:photos/models/ml/face/dimension.dart";
 import "package:photos/models/ml/face/landmark.dart";
 import 'package:photos/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart';
 import "package:photos/services/machine_learning/ml_result.dart";
-import "package:photos/utils/parse.dart";
+import "package:photos/utils/standalone/parse.dart";
 
 // FileInfo contains the image width and height of the image the face was detected in.
 class FileInfo {
diff --git a/mobile/lib/services/filedata/model/file_data.dart b/mobile/lib/services/filedata/model/file_data.dart
index 4aedf96128..7de75dbb06 100644
--- a/mobile/lib/services/filedata/model/file_data.dart
+++ b/mobile/lib/services/filedata/model/file_data.dart
@@ -1,5 +1,5 @@
 import "package:photos/models/ml/face/face.dart";
-import "package:photos/utils/parse.dart";
+import "package:photos/utils/standalone/parse.dart";
 
 const _faceKey = 'face';
 const _clipKey = 'clip';
diff --git a/mobile/lib/services/files_service.dart b/mobile/lib/services/files_service.dart
index 36cfe7d50d..d6f0994f30 100644
--- a/mobile/lib/services/files_service.dart
+++ b/mobile/lib/services/files_service.dart
@@ -18,7 +18,7 @@ import "package:photos/services/ignored_files_service.dart";
 import "package:photos/ui/components/action_sheet_widget.dart";
 import "package:photos/ui/components/buttons/button_widget.dart";
 import "package:photos/ui/components/models/button_type.dart";
-import 'package:photos/utils/date_time_util.dart';
+import 'package:photos/utils/standalone/date_time.dart';
 
 class FilesService {
   late Dio _enteDio;
diff --git a/mobile/lib/services/search_service.dart b/mobile/lib/services/search_service.dart
index 94cce83bd2..73c74c8aef 100644
--- a/mobile/lib/services/search_service.dart
+++ b/mobile/lib/services/search_service.dart
@@ -52,9 +52,9 @@ import "package:photos/ui/viewer/location/location_screen.dart";
 import "package:photos/ui/viewer/people/cluster_page.dart";
 import "package:photos/ui/viewer/people/people_page.dart";
 import "package:photos/ui/viewer/search/result/magic_result_screen.dart";
-import 'package:photos/utils/date_time_util.dart';
 import "package:photos/utils/file_util.dart";
 import "package:photos/utils/navigation_util.dart";
+import 'package:photos/utils/standalone/date_time.dart';
 import 'package:tuple/tuple.dart';
 
 class SearchService {
diff --git a/mobile/lib/services/sync/local_sync_service.dart b/mobile/lib/services/sync/local_sync_service.dart
index e875ae2751..f8d4326722 100644
--- a/mobile/lib/services/sync/local_sync_service.dart
+++ b/mobile/lib/services/sync/local_sync_service.dart
@@ -19,9 +19,9 @@ import "package:photos/models/ignored_file.dart";
 import 'package:photos/services/app_lifecycle_service.dart';
 import "package:photos/services/ignored_files_service.dart";
 import 'package:photos/services/local/local_sync_util.dart';
-import "package:photos/utils/debouncer.dart";
 import "package:photos/utils/photo_manager_util.dart";
 import "package:photos/utils/sqlite_util.dart";
+import "package:photos/utils/standalone/debouncer.dart";
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:synchronized/synchronized.dart';
 import 'package:tuple/tuple.dart';
diff --git a/mobile/lib/states/all_sections_examples_state.dart b/mobile/lib/states/all_sections_examples_state.dart
index abb0077ef3..19e640d318 100644
--- a/mobile/lib/states/all_sections_examples_state.dart
+++ b/mobile/lib/states/all_sections_examples_state.dart
@@ -10,7 +10,7 @@ import "package:photos/events/people_changed_event.dart";
 import "package:photos/events/tab_changed_event.dart";
 import "package:photos/models/search/search_result.dart";
 import "package:photos/models/search/search_types.dart";
-import "package:photos/utils/debouncer.dart";
+import "package:photos/utils/standalone/debouncer.dart";
 
 class AllSectionsExamplesProvider extends StatefulWidget {
   final Widget child;
diff --git a/mobile/lib/states/location_state.dart b/mobile/lib/states/location_state.dart
index 8ab32e55e8..2227f324e3 100644
--- a/mobile/lib/states/location_state.dart
+++ b/mobile/lib/states/location_state.dart
@@ -9,7 +9,7 @@ import "package:photos/models/local_entity_data.dart";
 import "package:photos/models/location/location.dart";
 import "package:photos/models/location_tag/location_tag.dart";
 import "package:photos/models/typedefs.dart";
-import "package:photos/utils/debouncer.dart";
+import "package:photos/utils/standalone/debouncer.dart";
 
 class LocationTagStateProvider extends StatefulWidget {
   final LocalEntity<LocationTag>? locationTagEntity;
diff --git a/mobile/lib/ui/account/sessions_page.dart b/mobile/lib/ui/account/sessions_page.dart
index 64eaf80d72..ed3c48407b 100644
--- a/mobile/lib/ui/account/sessions_page.dart
+++ b/mobile/lib/ui/account/sessions_page.dart
@@ -8,8 +8,8 @@ import 'package:photos/services/account/user_service.dart';
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/ui/notification/toast.dart';
-import "package:photos/utils/date_time_util.dart";
 import 'package:photos/utils/dialog_util.dart';
+import "package:photos/utils/standalone/date_time.dart";
 
 class SessionsPage extends StatefulWidget {
   const SessionsPage({super.key});
diff --git a/mobile/lib/ui/actions/collection/collection_sharing_actions.dart b/mobile/lib/ui/actions/collection/collection_sharing_actions.dart
index 7c8074bd7b..87b552269d 100644
--- a/mobile/lib/ui/actions/collection/collection_sharing_actions.dart
+++ b/mobile/lib/ui/actions/collection/collection_sharing_actions.dart
@@ -27,10 +27,10 @@ import 'package:photos/ui/components/dialog_widget.dart';
 import 'package:photos/ui/components/models/button_type.dart';
 import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/ui/payment/subscription.dart';
-import 'package:photos/utils/date_time_util.dart';
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/email_util.dart';
 import 'package:photos/utils/share_util.dart';
+import 'package:photos/utils/standalone/date_time.dart';
 import "package:styled_text/styled_text.dart";
 
 class CollectionActions {
diff --git a/mobile/lib/ui/collections/device/device_folders_grid_view.dart b/mobile/lib/ui/collections/device/device_folders_grid_view.dart
index 6f4ac30f0f..d6c04e0bed 100644
--- a/mobile/lib/ui/collections/device/device_folders_grid_view.dart
+++ b/mobile/lib/ui/collections/device/device_folders_grid_view.dart
@@ -12,7 +12,7 @@ import 'package:photos/models/device_collection.dart';
 import "package:photos/ui/collections/device/device_folder_item.dart";
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/ui/viewer/gallery/empty_state.dart';
-import "package:photos/utils/debouncer.dart";
+import "package:photos/utils/standalone/debouncer.dart";
 
 class DeviceFoldersGridView extends StatefulWidget {
   const DeviceFoldersGridView({
diff --git a/mobile/lib/ui/collections/device/device_folders_vertical_grid_view.dart b/mobile/lib/ui/collections/device/device_folders_vertical_grid_view.dart
index c0acc66af6..d42bad8dd5 100644
--- a/mobile/lib/ui/collections/device/device_folders_vertical_grid_view.dart
+++ b/mobile/lib/ui/collections/device/device_folders_vertical_grid_view.dart
@@ -13,7 +13,7 @@ import 'package:photos/models/device_collection.dart';
 import "package:photos/ui/collections/device/device_folder_item.dart";
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/ui/viewer/gallery/empty_state.dart';
-import "package:photos/utils/debouncer.dart";
+import "package:photos/utils/standalone/debouncer.dart";
 
 class DeviceFolderVerticalGridView extends StatelessWidget {
   final Widget? appTitle;
diff --git a/mobile/lib/ui/components/buttons/button_widget.dart b/mobile/lib/ui/components/buttons/button_widget.dart
index 7590735b10..84012da5b8 100644
--- a/mobile/lib/ui/components/buttons/button_widget.dart
+++ b/mobile/lib/ui/components/buttons/button_widget.dart
@@ -9,8 +9,8 @@ import 'package:photos/theme/text_style.dart';
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/ui/components/models/button_type.dart';
 import 'package:photos/ui/components/models/custom_button_style.dart';
-import 'package:photos/utils/debouncer.dart';
 import "package:photos/utils/dialog_util.dart";
+import 'package:photos/utils/standalone/debouncer.dart';
 
 enum ButtonSize {
   small,
diff --git a/mobile/lib/ui/components/menu_item_widget/menu_item_widget.dart b/mobile/lib/ui/components/menu_item_widget/menu_item_widget.dart
index f737de5f9c..dfd2479057 100644
--- a/mobile/lib/ui/components/menu_item_widget/menu_item_widget.dart
+++ b/mobile/lib/ui/components/menu_item_widget/menu_item_widget.dart
@@ -4,7 +4,7 @@ import 'package:photos/models/execution_states.dart';
 import 'package:photos/models/typedefs.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/menu_item_widget/menu_item_child_widgets.dart';
-import 'package:photos/utils/debouncer.dart';
+import 'package:photos/utils/standalone/debouncer.dart';
 
 class MenuItemWidget extends StatefulWidget {
   final Widget captionedTextWidget;
diff --git a/mobile/lib/ui/components/text_input_widget.dart b/mobile/lib/ui/components/text_input_widget.dart
index 965de67c48..4a59bbe7ee 100644
--- a/mobile/lib/ui/components/text_input_widget.dart
+++ b/mobile/lib/ui/components/text_input_widget.dart
@@ -5,8 +5,8 @@ import 'package:photos/models/execution_states.dart';
 import 'package:photos/models/typedefs.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/common/loading_widget.dart';
-import 'package:photos/utils/debouncer.dart';
 import 'package:photos/utils/separators_util.dart';
+import 'package:photos/utils/standalone/debouncer.dart';
 
 ///To show wrong password state, throw an exception with the message
 ///"Incorrect password" in onSubmit.
diff --git a/mobile/lib/ui/components/toggle_switch_widget.dart b/mobile/lib/ui/components/toggle_switch_widget.dart
index f04cbfc99b..ec631f6fa8 100644
--- a/mobile/lib/ui/components/toggle_switch_widget.dart
+++ b/mobile/lib/ui/components/toggle_switch_widget.dart
@@ -6,7 +6,7 @@ import 'package:photos/ente_theme_data.dart';
 import 'package:photos/models/execution_states.dart';
 import 'package:photos/models/typedefs.dart';
 import 'package:photos/ui/common/loading_widget.dart';
-import 'package:photos/utils/debouncer.dart';
+import 'package:photos/utils/standalone/debouncer.dart';
 
 class ToggleSwitchWidget extends StatefulWidget {
   final BoolCallBack value;
diff --git a/mobile/lib/ui/growth/referral_screen.dart b/mobile/lib/ui/growth/referral_screen.dart
index 426bb3e015..0d82c54edb 100644
--- a/mobile/lib/ui/growth/referral_screen.dart
+++ b/mobile/lib/ui/growth/referral_screen.dart
@@ -16,9 +16,9 @@ import "package:photos/ui/components/title_bar_widget.dart";
 import "package:photos/ui/growth/apply_code_screen.dart";
 import "package:photos/ui/growth/referral_code_widget.dart";
 import "package:photos/ui/growth/storage_details_screen.dart";
-import "package:photos/utils/data_util.dart";
 import "package:photos/utils/navigation_util.dart";
 import "package:photos/utils/share_util.dart";
+import "package:photos/utils/standalone/data.dart";
 import "package:tuple/tuple.dart";
 
 class ReferralScreen extends StatefulWidget {
diff --git a/mobile/lib/ui/growth/storage_details_screen.dart b/mobile/lib/ui/growth/storage_details_screen.dart
index 286772593c..c1c9bcf1a0 100644
--- a/mobile/lib/ui/growth/storage_details_screen.dart
+++ b/mobile/lib/ui/growth/storage_details_screen.dart
@@ -10,7 +10,7 @@ import "package:photos/ui/common/loading_widget.dart";
 import 'package:photos/ui/components/buttons/icon_button_widget.dart';
 import "package:photos/ui/components/title_bar_title_widget.dart";
 import "package:photos/ui/components/title_bar_widget.dart";
-import "package:photos/utils/data_util.dart";
+import "package:photos/utils/standalone/data.dart";
 
 class StorageDetailsScreen extends StatefulWidget {
   final ReferralView referralView;
diff --git a/mobile/lib/ui/home/home_gallery_widget.dart b/mobile/lib/ui/home/home_gallery_widget.dart
index 0095b13fbb..35bc5eb326 100644
--- a/mobile/lib/ui/home/home_gallery_widget.dart
+++ b/mobile/lib/ui/home/home_gallery_widget.dart
@@ -19,7 +19,7 @@ import 'package:photos/ui/viewer/actions/file_selection_overlay_bar.dart';
 import 'package:photos/ui/viewer/gallery/gallery.dart';
 import "package:photos/ui/viewer/gallery/state/gallery_files_inherited_widget.dart";
 import "package:photos/ui/viewer/gallery/state/selection_state.dart";
-import "package:photos/utils/debouncer.dart";
+import "package:photos/utils/standalone/debouncer.dart";
 
 class HomeGalleryWidget extends StatefulWidget {
   final Widget? header;
diff --git a/mobile/lib/ui/map/map_view.dart b/mobile/lib/ui/map/map_view.dart
index 3629da7e96..e25319b133 100644
--- a/mobile/lib/ui/map/map_view.dart
+++ b/mobile/lib/ui/map/map_view.dart
@@ -9,7 +9,7 @@ import "package:photos/ui/map/map_gallery_tile.dart";
 import "package:photos/ui/map/map_gallery_tile_badge.dart";
 import "package:photos/ui/map/map_marker.dart";
 import "package:photos/ui/map/tile/layers.dart";
-import "package:photos/utils/debouncer.dart";
+import "package:photos/utils/standalone/debouncer.dart";
 
 class MapView extends StatefulWidget {
   final List<ImageMarker> imageMarkers;
diff --git a/mobile/lib/ui/payment/add_on_page.dart b/mobile/lib/ui/payment/add_on_page.dart
index fa7b3aba76..5701ea8cd0 100644
--- a/mobile/lib/ui/payment/add_on_page.dart
+++ b/mobile/lib/ui/payment/add_on_page.dart
@@ -6,7 +6,7 @@ import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/components/buttons/icon_button_widget.dart';
 import "package:photos/ui/components/title_bar_title_widget.dart";
 import "package:photos/ui/components/title_bar_widget.dart";
-import "package:photos/utils/data_util.dart";
+import "package:photos/utils/standalone/data.dart";
 
 class AddOnPage extends StatelessWidget {
   final BonusData bonusData;
diff --git a/mobile/lib/ui/payment/store_subscription_page.dart b/mobile/lib/ui/payment/store_subscription_page.dart
index f0b833c367..b83b65b5d2 100644
--- a/mobile/lib/ui/payment/store_subscription_page.dart
+++ b/mobile/lib/ui/payment/store_subscription_page.dart
@@ -28,8 +28,8 @@ import 'package:photos/ui/payment/subscription_common_widgets.dart';
 import 'package:photos/ui/payment/subscription_plan_widget.dart';
 import "package:photos/ui/payment/view_add_on_widget.dart";
 import "package:photos/ui/tabs/home_widget.dart";
-import "package:photos/utils/data_util.dart";
 import 'package:photos/utils/dialog_util.dart';
+import "package:photos/utils/standalone/data.dart";
 import 'package:url_launcher/url_launcher_string.dart';
 
 class StoreSubscriptionPage extends StatefulWidget {
diff --git a/mobile/lib/ui/payment/stripe_subscription_page.dart b/mobile/lib/ui/payment/stripe_subscription_page.dart
index 707a427071..e88c2db0bb 100644
--- a/mobile/lib/ui/payment/stripe_subscription_page.dart
+++ b/mobile/lib/ui/payment/stripe_subscription_page.dart
@@ -28,8 +28,8 @@ import 'package:photos/ui/payment/subscription_common_widgets.dart';
 import 'package:photos/ui/payment/subscription_plan_widget.dart';
 import "package:photos/ui/payment/view_add_on_widget.dart";
 import "package:photos/ui/tabs/home_widget.dart";
-import "package:photos/utils/data_util.dart";
 import 'package:photos/utils/dialog_util.dart';
+import "package:photos/utils/standalone/data.dart";
 import 'package:step_progress_indicator/step_progress_indicator.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
diff --git a/mobile/lib/ui/payment/subscription_common_widgets.dart b/mobile/lib/ui/payment/subscription_common_widgets.dart
index 84fe693b7f..faa4ebd1ac 100644
--- a/mobile/lib/ui/payment/subscription_common_widgets.dart
+++ b/mobile/lib/ui/payment/subscription_common_widgets.dart
@@ -8,7 +8,7 @@ import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/components/captioned_text_widget.dart";
 import "package:photos/ui/components/menu_item_widget/menu_item_widget.dart";
 import 'package:photos/ui/payment/billing_questions_widget.dart';
-import 'package:photos/utils/data_util.dart';
+import 'package:photos/utils/standalone/data.dart';
 
 class SubscriptionHeaderWidget extends StatefulWidget {
   final bool? isOnboarding;
@@ -281,7 +281,9 @@ class _SubscriptionToggleState extends State<SubscriptionToggle> {
                       switchOutCurve: Curves.easeInOutExpo,
                       child: Text(
                         key: ValueKey(_isYearly),
-                        _isYearly ? S.of(context).yearly : S.of(context).monthly,
+                        _isYearly
+                            ? S.of(context).yearly
+                            : S.of(context).monthly,
                         style: textTheme.body,
                       ),
                     ),
diff --git a/mobile/lib/ui/payment/subscription_plan_widget.dart b/mobile/lib/ui/payment/subscription_plan_widget.dart
index d23d06dab5..3a269ec2b5 100644
--- a/mobile/lib/ui/payment/subscription_plan_widget.dart
+++ b/mobile/lib/ui/payment/subscription_plan_widget.dart
@@ -6,7 +6,7 @@ import "package:photos/generated/l10n.dart";
 import "package:photos/service_locator.dart";
 import "package:photos/theme/colors.dart";
 import "package:photos/theme/ente_theme.dart";
-import 'package:photos/utils/data_util.dart';
+import 'package:photos/utils/standalone/data.dart';
 
 class SubscriptionPlanWidget extends StatefulWidget {
   const SubscriptionPlanWidget({
@@ -176,7 +176,10 @@ class _Price extends StatelessWidget {
         children: [
           if (isPlayStore)
             Text(
-              currencySymbol + pricePerMonthString + ' / ' + S.of(context).month,
+              currencySymbol +
+                  pricePerMonthString +
+                  ' / ' +
+                  S.of(context).month,
               style: textTheme.largeBold.copyWith(color: textBaseLight),
             ),
           if (isPlayStore)
@@ -186,7 +189,10 @@ class _Price extends StatelessWidget {
             ),
           if (!isPlayStore)
             Text(
-              currencySymbol + pricePerMonthString + ' / ' + S.of(context).month,
+              currencySymbol +
+                  pricePerMonthString +
+                  ' / ' +
+                  S.of(context).month,
               style: textTheme.largeBold.copyWith(color: textBaseLight),
             ),
           if (!isPlayStore)
diff --git a/mobile/lib/ui/settings/backup/free_space_options.dart b/mobile/lib/ui/settings/backup/free_space_options.dart
index c98d4e9b63..6d42e2040c 100644
--- a/mobile/lib/ui/settings/backup/free_space_options.dart
+++ b/mobile/lib/ui/settings/backup/free_space_options.dart
@@ -23,9 +23,9 @@ import "package:photos/ui/tools/debug/app_storage_viewer.dart";
 import "package:photos/ui/tools/deduplicate_page.dart";
 import "package:photos/ui/tools/free_space_page.dart";
 import "package:photos/ui/viewer/gallery/large_files_page.dart";
-import "package:photos/utils/data_util.dart";
 import "package:photos/utils/dialog_util.dart";
 import 'package:photos/utils/navigation_util.dart';
+import "package:photos/utils/standalone/data.dart";
 
 class FreeUpSpaceOptionsScreen extends StatefulWidget {
   const FreeUpSpaceOptionsScreen({super.key});
diff --git a/mobile/lib/ui/settings/storage_card_widget.dart b/mobile/lib/ui/settings/storage_card_widget.dart
index ffc09fa550..8388e87038 100644
--- a/mobile/lib/ui/settings/storage_card_widget.dart
+++ b/mobile/lib/ui/settings/storage_card_widget.dart
@@ -11,7 +11,7 @@ import 'package:photos/theme/ente_theme.dart';
 import "package:photos/ui/common/loading_widget.dart";
 import 'package:photos/ui/payment/subscription.dart';
 import 'package:photos/ui/settings/storage_progress_widget.dart';
-import 'package:photos/utils/data_util.dart';
+import 'package:photos/utils/standalone/data.dart';
 
 class StorageCardWidget extends StatefulWidget {
   const StorageCardWidget({super.key});
diff --git a/mobile/lib/ui/sharing/manage_links_widget.dart b/mobile/lib/ui/sharing/manage_links_widget.dart
index 86146b9c64..dfea026297 100644
--- a/mobile/lib/ui/sharing/manage_links_widget.dart
+++ b/mobile/lib/ui/sharing/manage_links_widget.dart
@@ -20,10 +20,10 @@ import "package:photos/ui/components/toggle_switch_widget.dart";
 import 'package:photos/ui/notification/toast.dart';
 import 'package:photos/ui/sharing/pickers/device_limit_picker_page.dart';
 import 'package:photos/ui/sharing/pickers/link_expiry_picker_page.dart';
-import 'package:photos/utils/date_time_util.dart';
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/navigation_util.dart';
 import "package:photos/utils/share_util.dart";
+import 'package:photos/utils/standalone/date_time.dart';
 
 class ManageSharedLinkWidget extends StatefulWidget {
   final Collection? collection;
diff --git a/mobile/lib/ui/sharing/user_avator_widget.dart b/mobile/lib/ui/sharing/user_avator_widget.dart
index c24158763e..7acd869f87 100644
--- a/mobile/lib/ui/sharing/user_avator_widget.dart
+++ b/mobile/lib/ui/sharing/user_avator_widget.dart
@@ -13,7 +13,7 @@ import "package:photos/services/machine_learning/face_ml/person/person_service.d
 import "package:photos/theme/colors.dart";
 import 'package:photos/theme/ente_theme.dart';
 import "package:photos/ui/viewer/search/result/person_face_widget.dart";
-import "package:photos/utils/debouncer.dart";
+import "package:photos/utils/standalone/debouncer.dart";
 import 'package:tuple/tuple.dart';
 
 enum AvatarType { small, mini, tiny, extra }
diff --git a/mobile/lib/ui/tabs/shared_collections_tab.dart b/mobile/lib/ui/tabs/shared_collections_tab.dart
index a6e7f3c679..1f0fc3d727 100644
--- a/mobile/lib/ui/tabs/shared_collections_tab.dart
+++ b/mobile/lib/ui/tabs/shared_collections_tab.dart
@@ -20,8 +20,8 @@ import "package:photos/ui/tabs/shared/empty_state.dart";
 import "package:photos/ui/tabs/shared/quick_link_album_item.dart";
 import "package:photos/ui/viewer/gallery/collect_photos_card_widget.dart";
 import "package:photos/ui/viewer/gallery/collection_page.dart";
-import "package:photos/utils/debouncer.dart";
 import "package:photos/utils/navigation_util.dart";
+import "package:photos/utils/standalone/debouncer.dart";
 
 class SharedCollectionsTab extends StatefulWidget {
   const SharedCollectionsTab({super.key});
diff --git a/mobile/lib/ui/tabs/user_collections_tab.dart b/mobile/lib/ui/tabs/user_collections_tab.dart
index 6f4621484d..afc6178c24 100644
--- a/mobile/lib/ui/tabs/user_collections_tab.dart
+++ b/mobile/lib/ui/tabs/user_collections_tab.dart
@@ -27,9 +27,9 @@ import 'package:photos/ui/components/buttons/icon_button_widget.dart';
 import "package:photos/ui/tabs/section_title.dart";
 import "package:photos/ui/viewer/actions/delete_empty_albums.dart";
 import "package:photos/ui/viewer/gallery/empty_state.dart";
-import "package:photos/utils/debouncer.dart";
 import 'package:photos/utils/local_settings.dart';
 import "package:photos/utils/navigation_util.dart";
+import "package:photos/utils/standalone/debouncer.dart";
 
 class UserCollectionsTab extends StatefulWidget {
   const UserCollectionsTab({super.key});
diff --git a/mobile/lib/ui/tools/debug/app_storage_viewer.dart b/mobile/lib/ui/tools/debug/app_storage_viewer.dart
index f5e58f1a8a..bb7abf3e51 100644
--- a/mobile/lib/ui/tools/debug/app_storage_viewer.dart
+++ b/mobile/lib/ui/tools/debug/app_storage_viewer.dart
@@ -16,7 +16,7 @@ import 'package:photos/ui/components/menu_section_title.dart';
 import 'package:photos/ui/components/title_bar_title_widget.dart';
 import 'package:photos/ui/components/title_bar_widget.dart';
 import 'package:photos/ui/tools/debug/path_storage_viewer.dart';
-import 'package:photos/utils/directory_content.dart';
+import 'package:photos/utils/standalone/directory_content.dart';
 
 class AppStorageViewer extends StatefulWidget {
   const AppStorageViewer({super.key});
diff --git a/mobile/lib/ui/tools/debug/path_storage_viewer.dart b/mobile/lib/ui/tools/debug/path_storage_viewer.dart
index 63b4e0bde2..1859234175 100644
--- a/mobile/lib/ui/tools/debug/path_storage_viewer.dart
+++ b/mobile/lib/ui/tools/debug/path_storage_viewer.dart
@@ -7,8 +7,8 @@ import 'package:logging/logging.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/captioned_text_widget.dart';
 import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart';
-import 'package:photos/utils/data_util.dart';
-import 'package:photos/utils/directory_content.dart';
+import 'package:photos/utils/standalone/data.dart';
+import 'package:photos/utils/standalone/directory_content.dart';
 
 class PathStorageItem {
   final String path;
diff --git a/mobile/lib/ui/tools/deduplicate_page.dart b/mobile/lib/ui/tools/deduplicate_page.dart
index 8b8efd8dd8..579b458e0d 100644
--- a/mobile/lib/ui/tools/deduplicate_page.dart
+++ b/mobile/lib/ui/tools/deduplicate_page.dart
@@ -14,10 +14,10 @@ import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/viewer/file/detail_page.dart';
 import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
 import 'package:photos/ui/viewer/gallery/empty_state.dart';
-import 'package:photos/utils/data_util.dart';
 import 'package:photos/utils/delete_file_util.dart';
 import "package:photos/utils/dialog_util.dart";
 import 'package:photos/utils/navigation_util.dart';
+import 'package:photos/utils/standalone/data.dart';
 
 class DeduplicatePage extends StatefulWidget {
   final List<DuplicateFiles> duplicates;
diff --git a/mobile/lib/ui/tools/free_space_page.dart b/mobile/lib/ui/tools/free_space_page.dart
index 3b60096d1f..b2cfab26b4 100644
--- a/mobile/lib/ui/tools/free_space_page.dart
+++ b/mobile/lib/ui/tools/free_space_page.dart
@@ -4,8 +4,8 @@ import 'package:logging/logging.dart';
 import "package:photos/generated/l10n.dart";
 import 'package:photos/models/backup_status.dart';
 import 'package:photos/ui/common/gradient_button.dart';
-import 'package:photos/utils/data_util.dart';
 import 'package:photos/utils/delete_file_util.dart';
+import 'package:photos/utils/standalone/data.dart';
 
 class FreeSpacePage extends StatefulWidget {
   final BackupStatus status;
diff --git a/mobile/lib/ui/viewer/file/file_icons_widget.dart b/mobile/lib/ui/viewer/file/file_icons_widget.dart
index 9cc2554035..b7e675ff95 100644
--- a/mobile/lib/ui/viewer/file/file_icons_widget.dart
+++ b/mobile/lib/ui/viewer/file/file_icons_widget.dart
@@ -10,7 +10,7 @@ import 'package:photos/models/file/trash_file.dart';
 import 'package:photos/theme/colors.dart';
 import "package:photos/theme/ente_theme.dart";
 import 'package:photos/ui/sharing/user_avator_widget.dart';
-import "package:photos/utils/data_util.dart";
+import "package:photos/utils/standalone/data.dart";
 
 class ThumbnailPlaceHolder extends StatelessWidget {
   const ThumbnailPlaceHolder({super.key});
diff --git a/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart b/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart
index dafd812db4..3250a912d5 100644
--- a/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart
+++ b/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart
@@ -5,7 +5,7 @@ import "package:native_video_player/native_video_player.dart";
 import "package:photos/service_locator.dart";
 import "package:photos/theme/colors.dart";
 import "package:photos/theme/ente_theme.dart";
-import "package:photos/utils/debouncer.dart";
+import "package:photos/utils/standalone/debouncer.dart";
 
 class SeekBar extends StatefulWidget {
   final NativeVideoPlayerController controller;
diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
index e2b0229591..df9f819637 100644
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
@@ -6,8 +6,8 @@ import "package:photos/models/file/file.dart";
 import "package:photos/theme/colors.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/viewer/file/preview_status_widget.dart";
-import "package:photos/utils/date_time_util.dart";
-import "package:photos/utils/debouncer.dart";
+import "package:photos/utils/standalone/date_time.dart";
+import "package:photos/utils/standalone/debouncer.dart";
 
 class VideoWidget extends StatefulWidget {
   final EnteFile file;
diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart
index 9d6bce668c..35bf1ad58e 100644
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_preview.dart
@@ -19,8 +19,8 @@ import "package:photos/ui/common/loading_widget.dart";
 import "package:photos/ui/notification/toast.dart";
 import "package:photos/ui/viewer/file/video_widget_media_kit_common.dart"
     as common;
-import "package:photos/utils/data_util.dart";
 import "package:photos/utils/file_util.dart";
+import "package:photos/utils/standalone/data.dart";
 
 class VideoWidgetMediaKitPreview extends StatefulWidget {
   final EnteFile file;
diff --git a/mobile/lib/ui/viewer/file/video_widget_native.dart b/mobile/lib/ui/viewer/file/video_widget_native.dart
index 53cc67483e..8d9858f6b7 100644
--- a/mobile/lib/ui/viewer/file/video_widget_native.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_native.dart
@@ -25,11 +25,11 @@ import "package:photos/ui/viewer/file/native_video_player_controls/play_pause_bu
 import "package:photos/ui/viewer/file/native_video_player_controls/seek_bar.dart";
 import "package:photos/ui/viewer/file/preview_status_widget.dart";
 import "package:photos/ui/viewer/file/thumbnail_widget.dart";
-import "package:photos/utils/date_time_util.dart";
-import "package:photos/utils/debouncer.dart";
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/exif_util.dart";
 import "package:photos/utils/file_util.dart";
+import "package:photos/utils/standalone/date_time.dart";
+import "package:photos/utils/standalone/debouncer.dart";
 import "package:visibility_detector/visibility_detector.dart";
 
 class VideoWidgetNative extends StatefulWidget {
diff --git a/mobile/lib/ui/viewer/file_details/backed_up_time_item_widget.dart b/mobile/lib/ui/viewer/file_details/backed_up_time_item_widget.dart
index 28f9cff870..813b32ced9 100644
--- a/mobile/lib/ui/viewer/file_details/backed_up_time_item_widget.dart
+++ b/mobile/lib/ui/viewer/file_details/backed_up_time_item_widget.dart
@@ -3,7 +3,7 @@ import "package:intl/intl.dart";
 import 'package:photos/models/file/file.dart';
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/components/info_item_widget.dart";
-import "package:photos/utils/date_time_util.dart";
+import "package:photos/utils/standalone/date_time.dart";
 
 class BackedUpTimeItemWidget extends StatelessWidget {
   final EnteFile file;
diff --git a/mobile/lib/ui/viewer/file_details/creation_time_item_widget.dart b/mobile/lib/ui/viewer/file_details/creation_time_item_widget.dart
index 13c8800fa8..e86bbafc18 100644
--- a/mobile/lib/ui/viewer/file_details/creation_time_item_widget.dart
+++ b/mobile/lib/ui/viewer/file_details/creation_time_item_widget.dart
@@ -6,8 +6,8 @@ import "package:photos/l10n/l10n.dart";
 import 'package:photos/models/file/file.dart';
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/components/info_item_widget.dart";
-import "package:photos/utils/date_time_util.dart";
 import "package:photos/utils/magic_util.dart";
+import "package:photos/utils/standalone/date_time.dart";
 
 class CreationTimeItem extends StatefulWidget {
   final EnteFile file;
diff --git a/mobile/lib/ui/viewer/file_details/file_properties_item_widget.dart b/mobile/lib/ui/viewer/file_details/file_properties_item_widget.dart
index 0640f92eeb..2cedc1da2b 100644
--- a/mobile/lib/ui/viewer/file_details/file_properties_item_widget.dart
+++ b/mobile/lib/ui/viewer/file_details/file_properties_item_widget.dart
@@ -4,10 +4,10 @@ import 'package:photos/models/file/file.dart';
 import 'package:photos/models/file/file_type.dart';
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/components/info_item_widget.dart";
-import "package:photos/utils/data_util.dart";
-import "package:photos/utils/date_time_util.dart";
 import "package:photos/utils/file_util.dart";
 import "package:photos/utils/magic_util.dart";
+import "package:photos/utils/standalone/data.dart";
+import "package:photos/utils/standalone/date_time.dart";
 
 class FilePropertiesItemWidget extends StatefulWidget {
   final EnteFile file;
diff --git a/mobile/lib/ui/viewer/file_details/preview_properties_item_widget.dart b/mobile/lib/ui/viewer/file_details/preview_properties_item_widget.dart
index aec1b9fa3d..6e5d15d7d5 100644
--- a/mobile/lib/ui/viewer/file_details/preview_properties_item_widget.dart
+++ b/mobile/lib/ui/viewer/file_details/preview_properties_item_widget.dart
@@ -6,7 +6,7 @@ import "package:photos/models/file/file_type.dart";
 import "package:photos/services/preview_video_store.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/components/info_item_widget.dart";
-import "package:photos/utils/data_util.dart";
+import "package:photos/utils/standalone/data.dart";
 
 class PreviewPropertiesItemWidget extends StatefulWidget {
   final EnteFile file;
diff --git a/mobile/lib/ui/viewer/gallery/component/group/type.dart b/mobile/lib/ui/viewer/gallery/component/group/type.dart
index 19b1224de9..079ddb1e2e 100644
--- a/mobile/lib/ui/viewer/gallery/component/group/type.dart
+++ b/mobile/lib/ui/viewer/gallery/component/group/type.dart
@@ -3,7 +3,7 @@ import "package:intl/intl.dart";
 import "package:photos/core/constants.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/models/file/file.dart";
-import "package:photos/utils/date_time_util.dart";
+import "package:photos/utils/standalone/date_time.dart";
 
 enum GroupType {
   day,
diff --git a/mobile/lib/ui/viewer/gallery/component/multiple_groups_gallery_view.dart b/mobile/lib/ui/viewer/gallery/component/multiple_groups_gallery_view.dart
index d4ecf73520..de38d22fda 100644
--- a/mobile/lib/ui/viewer/gallery/component/multiple_groups_gallery_view.dart
+++ b/mobile/lib/ui/viewer/gallery/component/multiple_groups_gallery_view.dart
@@ -13,7 +13,7 @@ import 'package:photos/ui/viewer/gallery/component/group/lazy_group_gallery.dart
 import "package:photos/ui/viewer/gallery/component/group/type.dart";
 import "package:photos/ui/viewer/gallery/gallery.dart";
 import "package:photos/ui/viewer/gallery/state/gallery_context_state.dart";
-import "package:photos/utils/data_util.dart";
+import "package:photos/utils/standalone/data.dart";
 import "package:scrollable_positioned_list/scrollable_positioned_list.dart";
 
 /*
diff --git a/mobile/lib/ui/viewer/gallery/gallery.dart b/mobile/lib/ui/viewer/gallery/gallery.dart
index 970992a91e..f48209669e 100644
--- a/mobile/lib/ui/viewer/gallery/gallery.dart
+++ b/mobile/lib/ui/viewer/gallery/gallery.dart
@@ -18,9 +18,9 @@ import 'package:photos/ui/viewer/gallery/empty_state.dart';
 import "package:photos/ui/viewer/gallery/state/gallery_context_state.dart";
 import "package:photos/ui/viewer/gallery/state/gallery_files_inherited_widget.dart";
 import "package:photos/ui/viewer/gallery/state/inherited_search_filter_data.dart";
-import "package:photos/utils/date_time_util.dart";
-import "package:photos/utils/debouncer.dart";
 import "package:photos/utils/hierarchical_search_util.dart";
+import "package:photos/utils/standalone/date_time.dart";
+import "package:photos/utils/standalone/debouncer.dart";
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 
 typedef GalleryLoader = Future<FileLoadResult> Function(
diff --git a/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart b/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
index 0bc6c5e568..d29def8033 100644
--- a/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
+++ b/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
@@ -50,11 +50,11 @@ import "package:photos/ui/viewer/gallery/state/inherited_search_filter_data.dart
 import "package:photos/ui/viewer/hierarchicial_search/applied_filters_for_appbar.dart";
 import "package:photos/ui/viewer/hierarchicial_search/recommended_filters_for_appbar.dart";
 import "package:photos/ui/viewer/location/edit_location_sheet.dart";
-import 'package:photos/utils/data_util.dart';
 import 'package:photos/utils/dialog_util.dart';
 import "package:photos/utils/file_download_util.dart";
 import 'package:photos/utils/magic_util.dart';
 import 'package:photos/utils/navigation_util.dart';
+import 'package:photos/utils/standalone/data.dart';
 import "package:uuid/uuid.dart";
 
 class GalleryAppBarWidget extends StatefulWidget {
diff --git a/mobile/lib/ui/viewer/search/search_widget.dart b/mobile/lib/ui/viewer/search/search_widget.dart
index a71254a0c7..1461d37f99 100644
--- a/mobile/lib/ui/viewer/search/search_widget.dart
+++ b/mobile/lib/ui/viewer/search/search_widget.dart
@@ -13,8 +13,8 @@ import "package:photos/models/search/search_result.dart";
 import "package:photos/services/search_service.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/viewer/search/search_suffix_icon_widget.dart";
-import "package:photos/utils/date_time_util.dart";
-import "package:photos/utils/debouncer.dart";
+import "package:photos/utils/standalone/date_time.dart";
+import "package:photos/utils/standalone/debouncer.dart";
 
 class SearchWidget extends StatefulWidget {
   const SearchWidget({super.key});
diff --git a/mobile/lib/utils/file_download_util.dart b/mobile/lib/utils/file_download_util.dart
index f5982abd19..420ad34713 100644
--- a/mobile/lib/utils/file_download_util.dart
+++ b/mobile/lib/utils/file_download_util.dart
@@ -19,10 +19,10 @@ import "package:photos/models/ignored_file.dart";
 import "package:photos/services/collections_service.dart";
 import "package:photos/services/ignored_files_service.dart";
 import "package:photos/services/sync/local_sync_service.dart";
-import "package:photos/utils/data_util.dart";
-import "package:photos/utils/fake_progress.dart";
 import "package:photos/utils/file_key.dart";
 import "package:photos/utils/file_util.dart";
+import "package:photos/utils/standalone/data.dart";
+import "package:photos/utils/standalone/fake_progress.dart";
 
 final _logger = Logger("file_download_util");
 
diff --git a/mobile/lib/utils/file_uploader.dart b/mobile/lib/utils/file_uploader.dart
index 2855b83c78..5d78af6a06 100644
--- a/mobile/lib/utils/file_uploader.dart
+++ b/mobile/lib/utils/file_uploader.dart
@@ -39,12 +39,12 @@ import 'package:photos/services/collections_service.dart';
 import "package:photos/services/preview_video_store.dart";
 import 'package:photos/services/sync/local_sync_service.dart';
 import 'package:photos/services/sync/sync_service.dart';
-import 'package:photos/utils/data_util.dart';
 import "package:photos/utils/exif_util.dart";
 import "package:photos/utils/file_key.dart";
 import 'package:photos/utils/file_uploader_util.dart';
 import "package:photos/utils/file_util.dart";
 import "package:photos/utils/network_util.dart";
+import 'package:photos/utils/standalone/data.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:tuple/tuple.dart';
 import "package:uuid/uuid.dart";
diff --git a/mobile/lib/utils/share_util.dart b/mobile/lib/utils/share_util.dart
index 694bc6cff6..2efd8bd1e6 100644
--- a/mobile/lib/utils/share_util.dart
+++ b/mobile/lib/utils/share_util.dart
@@ -14,10 +14,10 @@ import "package:photos/models/collection/collection.dart";
 import 'package:photos/models/file/file.dart';
 import 'package:photos/models/file/file_type.dart';
 import "package:photos/ui/sharing/show_images_prevew.dart";
-import 'package:photos/utils/date_time_util.dart';
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/exif_util.dart';
 import 'package:photos/utils/file_util.dart';
+import 'package:photos/utils/standalone/date_time.dart';
 import 'package:receive_sharing_intent/receive_sharing_intent.dart';
 import "package:screenshot/screenshot.dart";
 import 'package:share_plus/share_plus.dart';
diff --git a/mobile/lib/utils/standalone/README.md b/mobile/lib/utils/standalone/README.md
new file mode 100644
index 0000000000..f0e2884aef
--- /dev/null
+++ b/mobile/lib/utils/standalone/README.md
@@ -0,0 +1,3 @@
+## Standalone Utils
+This folder contains standalone utilities that can be used in any project. These utilities are not dependent on any other part of the project and can be used independently.
+The utils inside this folder are not dependent on any other part of the project and can be used independently.
\ No newline at end of file
diff --git a/mobile/lib/utils/data_util.dart b/mobile/lib/utils/standalone/data.dart
similarity index 100%
rename from mobile/lib/utils/data_util.dart
rename to mobile/lib/utils/standalone/data.dart
diff --git a/mobile/lib/utils/date_time_util.dart b/mobile/lib/utils/standalone/date_time.dart
similarity index 100%
rename from mobile/lib/utils/date_time_util.dart
rename to mobile/lib/utils/standalone/date_time.dart
diff --git a/mobile/lib/utils/debouncer.dart b/mobile/lib/utils/standalone/debouncer.dart
similarity index 95%
rename from mobile/lib/utils/debouncer.dart
rename to mobile/lib/utils/standalone/debouncer.dart
index 07097440f0..fc0e6d6359 100644
--- a/mobile/lib/utils/debouncer.dart
+++ b/mobile/lib/utils/standalone/debouncer.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import "package:photos/models/typedefs.dart";
 
 ///Do not forget to cancel the debounce's timer using [cancelDebounceTimer]
 ///when the debouncer is no longer needed
@@ -21,7 +20,7 @@ class Debouncer {
 
   final Stopwatch _stopwatch = Stopwatch();
 
-  void run(FutureVoidCallback fn) {
+  void run(Future<void> Function() fn) {
     if (leading && !isActive()) {
       _stopwatch.stop();
       _stopwatch.reset();
diff --git a/mobile/lib/utils/directory_content.dart b/mobile/lib/utils/standalone/directory_content.dart
similarity index 98%
rename from mobile/lib/utils/directory_content.dart
rename to mobile/lib/utils/standalone/directory_content.dart
index 654e3af245..a868e51c0c 100644
--- a/mobile/lib/utils/directory_content.dart
+++ b/mobile/lib/utils/standalone/directory_content.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import "package:path/path.dart";
-import "package:photos/utils/data_util.dart";
+import "package:photos/utils/standalone/data.dart";
 
 class DirectoryStat {
   final String path;
diff --git a/mobile/lib/utils/fake_progress.dart b/mobile/lib/utils/standalone/fake_progress.dart
similarity index 100%
rename from mobile/lib/utils/fake_progress.dart
rename to mobile/lib/utils/standalone/fake_progress.dart
diff --git a/mobile/lib/utils/parse.dart b/mobile/lib/utils/standalone/parse.dart
similarity index 100%
rename from mobile/lib/utils/parse.dart
rename to mobile/lib/utils/standalone/parse.dart
diff --git a/mobile/test/utils/date_time_util_test.dart b/mobile/test/utils/date_time_util_test.dart
index 5025299a1c..ac89231ee8 100644
--- a/mobile/test/utils/date_time_util_test.dart
+++ b/mobile/test/utils/date_time_util_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:photos/core/constants.dart';
-import 'package:photos/utils/date_time_util.dart';
+import "package:photos/utils/standalone/date_time.dart";
 import 'package:test/test.dart';
 
 void main() {

From 731c19d6a9d1380fb4a92d7937122e02a4b79934 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 12:13:39 +0530
Subject: [PATCH 767/796] Notes of what needs to be done

---
 .../pages/gallery/SelectedFileOptions.tsx     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/web/apps/photos/src/components/pages/gallery/SelectedFileOptions.tsx b/web/apps/photos/src/components/pages/gallery/SelectedFileOptions.tsx
index fcf1d5c452..e9bc01a1fc 100644
--- a/web/apps/photos/src/components/pages/gallery/SelectedFileOptions.tsx
+++ b/web/apps/photos/src/components/pages/gallery/SelectedFileOptions.tsx
@@ -48,6 +48,27 @@ interface Props {
     activeCollectionID: number;
     isFavoriteCollection: boolean;
     isUncategorizedCollection: boolean;
+    /**
+     * TODO: Need to implement delete-equivalent from shared albums.
+     *
+     * Notes:
+     *
+     * - Delete action should not be enabled  3 selected (0 Yours). There should
+     *   be separate remove action.
+     *
+     * - On remove, if the file and collection both belong to current user, we
+     *   just use move api to existing or uncat collection.
+     *
+     * - Otherwise, we call /collections/v3/remove-files (when collection and
+     *   file belong to different users).
+     *
+     * - Album owner can remove files of all other users from their collection.
+     *   Particiapant (viewer/collaborator) can only remove files that belong to
+     *   them.
+     *
+     * Also note that that user cannot delete files that are not owned by the
+     * user, even if they are in an album owned by the user.
+     */
     isIncomingSharedCollection: boolean;
     isInSearchMode: boolean;
     selectedCollection: Collection;

From 72ba881e2639c551e716b7ca0eca52d0cd6e8abc Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Wed, 5 Mar 2025 12:36:25 +0530
Subject: [PATCH 768/796] [mob] Remove assert

---
 mobile/lib/module/upload/service/multipart.dart | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mobile/lib/module/upload/service/multipart.dart b/mobile/lib/module/upload/service/multipart.dart
index e03c4315d8..f4ecf3b3c4 100644
--- a/mobile/lib/module/upload/service/multipart.dart
+++ b/mobile/lib/module/upload/service/multipart.dart
@@ -65,17 +65,12 @@ class MultiPartUploader {
 
   Future<MultipartUploadURLs> getMultipartUploadURLs(int count) async {
     try {
-      assert(
-        _featureFlagService.internalUser,
-        "Multipart upload should not be enabled for external users.",
-      );
       final response = await _enteDio.get(
         "/files/multipart-upload-urls",
         queryParameters: {
           "count": count,
         },
       );
-
       return MultipartUploadURLs.fromMap(response.data);
     } on Exception catch (e) {
       _logger.severe('failed to get multipart url', e);

From 32ceac423ba258060e96aa1ead912956b9d19417 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Wed, 5 Mar 2025 13:19:04 +0530
Subject: [PATCH 769/796] fix: share in android

---
 mobile/android/app/proguard-rules.pro | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mobile/android/app/proguard-rules.pro b/mobile/android/app/proguard-rules.pro
index 066c0d1874..797953c7f9 100644
--- a/mobile/android/app/proguard-rules.pro
+++ b/mobile/android/app/proguard-rules.pro
@@ -4,3 +4,4 @@
 -keepattributes LineNumberTable,SourceFile
 
 -keep class org.chromium.net.** { *; }
+-keep class org.xmlpull.v1.** { *; }
\ No newline at end of file

From fb8f7901b161964ac2db2d14c10fdf67a0898830 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 13:05:23 +0530
Subject: [PATCH 770/796] Impl + shift top bar

---
 web/apps/photos/src/styles/global.css         |  7 ++
 .../gallery/components/viewer/photoswipe.ts   | 64 +++++++++++--------
 2 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 41e0e2e19d..174067991a 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -122,6 +122,13 @@ body {
     z-index: calc(var(--mui-zIndex-drawer) - 1);
 }
 
+/* Shift the top bar by a fraction of the desktop title bar, if any. The top bar
+   contents already have a decent top padding, so we don't need to shift by the
+   entire amount. See also: [Note: Customize the desktop title bar] */
+.pswp-ente .pswp__top-bar {
+    top: calc(env(titlebar-area-height, 0px) * 0.4);
+}
+
 /*
   Make the controllable video elements we render as custom PhotoSwipe content
   take up the entire container.
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 5d9989c8fa..5cefb0789e 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -432,36 +432,48 @@ export class FileViewerPhotoSwipe {
             updateFileInfoExifIfNeeded(e.content.data),
         );
 
-        let el;
-        let listener;
         pswp.on("change", (e) => {
             const itemData = this.pswp.currSlide.content.data;
             updateFileInfoExifIfNeeded(itemData);
-
-            if (el && listener) {
-                el.removeEventListener("pause", listener);
-                el.removeEventListener("play", listener);
-                el.removeEventListener("ended", listener);
-                el = undefined;
-                listener = undefined;
-            }
-            if (itemData.fileType == FileType.video) {
-                setTimeout(() => {
-                    listener = (e) => {
-                        console.log(e);
-                    };
-                    // TODO:
-                    el = document.getElementsByTagName("video")[0];
-                    console.log(el);
-                    el.addEventListener("pause", listener);
-                    el.addEventListener("play", listener);
-                    el.addEventListener("ended", listener);
-                }, 3000);
-            }
         });
 
         pswp.on("contentDestroy", (e) => forgetExifForItemData(e.content.data));
 
+        // State needed to hide the caption when a video is playing.
+        let videoElement: HTMLVideoElement | undefined;
+        let onVideoPlayback: EventHandler | undefined;
+        let captionElementRef: HTMLElement | undefined;
+
+        pswp.on("change", (e) => {
+            const itemData = this.pswp.currSlide.content.data;
+
+            // Clear existing listeners, if any.
+            if (videoElement && onVideoPlayback) {
+                videoElement.removeEventListener("play", onVideoPlayback);
+                videoElement.removeEventListener("pause", onVideoPlayback);
+                videoElement.removeEventListener("ended", onVideoPlayback);
+                videoElement = undefined;
+                onVideoPlayback = undefined;
+            }
+
+            // Reset.
+            showIf(captionElementRef, true);
+
+            // Attach new listeners, if needed.
+            if (itemData.fileType == FileType.video) {
+                const contentElement = pswp.currSlide.content.element;
+                videoElement = contentElement.getElementsByTagName("video")[0];
+                if (videoElement) {
+                    onVideoPlayback = (e) => {
+                        showIf(captionElementRef, !!videoElement?.paused);
+                    };
+                    videoElement.addEventListener("play", onVideoPlayback);
+                    videoElement.addEventListener("pause", onVideoPlayback);
+                    videoElement.addEventListener("ended", onVideoPlayback);
+                }
+            }
+        });
+
         // The PhotoSwipe dialog has being closed and the animations have
         // completed.
         pswp.on("destroy", () => {
@@ -645,7 +657,8 @@ export class FileViewerPhotoSwipe {
                 order: 30,
                 appendTo: "root",
                 tagName: "p",
-                onInit: (captionElement, pswp) =>
+                onInit: (captionElement, pswp) => {
+                    captionElementRef = captionElement;
                     pswp.on("change", () => {
                         const { fileType, alt } = pswp.currSlide.content.data;
                         captionElement.innerText = alt ?? "";
@@ -657,7 +670,8 @@ export class FileViewerPhotoSwipe {
                         // an ad-hoc value that looked okay-ish across browsers.
                         captionElement.style.bottom =
                             fileType === FileType.video ? "36px" : "0";
-                    }),
+                    });
+                },
             });
         });
 

From f36666bd0a974e70f38febceb9a9119974b84f3b Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Wed, 5 Mar 2025 13:36:22 +0530
Subject: [PATCH 771/796] fix: show video description in previews for android

---
 .../ui/viewer/file/video_widget_native.dart    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/mobile/lib/ui/viewer/file/video_widget_native.dart b/mobile/lib/ui/viewer/file/video_widget_native.dart
index d534b8f677..65fb1ecb0f 100644
--- a/mobile/lib/ui/viewer/file/video_widget_native.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_native.dart
@@ -328,13 +328,13 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
                             child: Column(
                               crossAxisAlignment: CrossAxisAlignment.center,
                               children: [
-                                if (!widget.selectedPreview)
-                                  _VideoDescriptionAndSwitchToMediaKitButton(
-                                    file: widget.file,
-                                    showControls: _showControls,
-                                    elTooltipController: _elTooltipController,
-                                    controller: _controller,
-                                  ),
+                                _VideoDescriptionAndSwitchToMediaKitButton(
+                                  file: widget.file,
+                                  showControls: _showControls,
+                                  elTooltipController: _elTooltipController,
+                                  controller: _controller,
+                                  selectedPreview: widget.selectedPreview,
+                                ),
                                 ValueListenableBuilder(
                                   valueListenable: _showControls,
                                   builder: (context, value, _) {
@@ -736,12 +736,14 @@ class _VideoDescriptionAndSwitchToMediaKitButton extends StatelessWidget {
   final ValueNotifier<bool> showControls;
   final ElTooltipController elTooltipController;
   final NativeVideoPlayerController? controller;
+  final bool selectedPreview;
 
   const _VideoDescriptionAndSwitchToMediaKitButton({
     required this.file,
     required this.showControls,
     required this.elTooltipController,
     required this.controller,
+    required this.selectedPreview,
   });
 
   @override
@@ -777,7 +779,7 @@ class _VideoDescriptionAndSwitchToMediaKitButton extends StatelessWidget {
                 ),
               )
             : const SizedBox.shrink(),
-        Platform.isAndroid
+        Platform.isAndroid && !selectedPreview
             ? ValueListenableBuilder(
                 valueListenable: showControls,
                 builder: (context, value, _) {

From 6c748f6c872b30654311346cd8b5ec9e4f3e8f58 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Wed, 5 Mar 2025 13:36:37 +0530
Subject: [PATCH 772/796] chore: bump locks

---
 mobile/ios/Podfile.lock | 110 ++++++++++++++++++++--------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
index aeb88a7cec..f7c69935af 100644
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -437,81 +437,81 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/wakelock_plus/ios"
 
 SPEC CHECKSUMS:
-  background_fetch: 39f11371c0dce04b001c4bfd5e782bcccb0a85e2
-  battery_info: b6c551049266af31556b93c9d9b9452cfec0219f
-  connectivity_plus: 2a701ffec2c0ae28a48cf7540e279787e77c447d
-  cupertino_http: 947a233f40cfea55167a49f2facc18434ea117ba
-  dart_ui_isolate: d5bcda83ca4b04f129d70eb90110b7a567aece14
-  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
+  background_fetch: 94b36ee293e82972852dba8ede1fbcd3bd3d9d57
+  battery_info: 83f3aae7be2fccefab1d2bf06b8aa96f11c8bcdd
+  connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
+  cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
+  dart_ui_isolate: 46f6714abe6891313267153ef6f9748d8ecfcab1
+  device_info_plus: 335f3ce08d2e174b9fdc3db3db0f4e3b1f66bd89
   ffmpeg-kit-ios-full-gpl: 80adc341962e55ef709e36baa8ed9a70cf4ea62b
-  ffmpeg_kit_flutter_full_gpl: 8d15c14c0c3aba616fac04fe44b3d27d02e3c330
-  file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
+  ffmpeg_kit_flutter_full_gpl: ce18b888487c05c46ed252cd2e7956812f2e3bd1
+  file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
   Firebase: d80354ed7f6df5f9aca55e9eb47cc4b634735eaf
-  firebase_core: 6e223dfa350b2edceb729cea505eaaef59330682
-  firebase_messaging: 07fde77ae28c08616a1d4d870450efc2b38cf40d
+  firebase_core: 6cbed78b4f298ed103a9fd034e6dbc846320480f
+  firebase_messaging: 5e0adf2eb18b0ee59aa0c109314c091a0497ecac
   FirebaseCore: 99fe0c4b44a39f37d99e6404e02009d2db5d718d
   FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629
   FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917
   FirebaseMessaging: 487b634ccdf6f7b7ff180fdcb2a9935490f764e8
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_email_sender: e03bdda7637bcd3539bfe718fddd980e9508efaa
-  flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e
-  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
-  flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
-  flutter_native_splash: f71420956eb811e6d310720fee915f1d42852e7a
-  flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
-  flutter_sodium: a00383520fc689c688b66fd3092984174712493e
-  fluttertoast: 21eecd6935e7064cc1fcb733a4c5a428f3f24f0f
+  flutter_email_sender: aa1e9772696691d02cd91fea829856c11efb8e58
+  flutter_image_compress_common: 1697a328fd72bfb335507c6bca1a65fa5ad87df1
+  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
+  flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100
+  flutter_native_splash: 6cad9122ea0fad137d23137dd14b937f3e90b145
+  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
+  flutter_sodium: 7e4621538491834eba53bd524547854bcbbd6987
+  fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
-  home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57
-  image_editor_common: d6f6644ae4a6de80481e89fe6d0a8c49e30b4b43
-  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
-  in_app_purchase_storekit: a1ce04056e23eecc666b086040239da7619cd783
-  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
+  home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
+  image_editor_common: 3de87e7c4804f4ae24c8f8a998362b98c105cac1
+  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
+  in_app_purchase_storekit: d1a48cb0f8b29dbf5f85f782f5dd79b21b90a5e6
+  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
   libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
-  local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
-  local_auth_ios: 5046a18c018dd973247a0564496c8898dbb5adf9
+  local_auth_darwin: 553ce4f9b16d3fdfeafce9cf042e7c9f77c1c391
+  local_auth_ios: f7a1841beef3151d140a967c2e46f30637cdf451
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
-  maps_launcher: 2e5b6a2d664ec6c27f82ffa81b74228d770ab203
-  media_extension: 6618f07abd762cdbfaadf1b0c56a287e820f0c84
-  media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
-  media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
-  motion_sensors: 03f55b7c637a7e365a0b5f9697a449f9059d5d91
-  motionphoto: 8b65ce50c7d7ff3c767534fc3768b2eed9ac24e4
-  move_to_background: cd3091014529ec7829e342ad2d75c0a11f4378a5
+  maps_launcher: edf829809ba9e894d70e569bab11c16352dedb45
+  media_extension: 671e2567880d96c95c65c9a82ccceed8f2e309fd
+  media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
+  media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
+  motion_sensors: 741e702c17467b9569a92165dda8d4d88c6167f1
+  motionphoto: 23e2aeb5c6380112f69468d71f970fa7438e5ed1
+  move_to_background: 7e3467dd2a1d1013e98c9c1cb93fd53cd7ef9d84
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  native_video_player: 5d36066807b680e181473e6890dde643ac85380d
-  objective_c: 77e887b5ba1827970907e10e832eec1683f3431d
-  onnxruntime: e7c2ae44385191eaad5ae64c935a72debaddc997
+  native_video_player: e363dd14f6a498ad8a8f7e6486a0db046ad19f13
+  objective_c: 89e720c30d716b036faf9c9684022048eee1eee2
+  onnxruntime: f9b296392c96c42882be020a59dbeac6310d81b2
   onnxruntime-c: a909204639a1f035f575127ac406f781ac797c9c
   onnxruntime-objc: b6fab0f1787aa6f7190c2013f03037df4718bd8b
-  open_mail_app: 70273c53f768beefdafbe310c3d9086e4da3cb02
+  open_mail_app: 7314a609e88eed22d53671279e189af7a0ab0f11
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
-  photo_manager: ff695c7a1dd5bc379974953a2b5c0a293f7c4c8a
-  privacy_screen: 1a131c052ceb3c3659934b003b0d397c2381a24e
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
+  photo_manager: d2fbcc0f2d82458700ee6256a15018210a81d413
+  privacy_screen: 3159a541f5d3a31bea916cfd4e58f9dc722b3fd4
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  receive_sharing_intent: 79c848f5b045674ad60b9fea3bafea59962ad2c1
+  receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00
   SDWebImage: f84b0feeb08d2d11e6a9b843cb06d75ebf5b8868
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
   Sentry: 0f9bc9adfc0b960e7f3bb5ec67e9a3d8193f3bdb
-  sentry_flutter: 64a43fb39ab4c7f67d8a4cad52b49e22439e58b7
-  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
+  sentry_flutter: f4a0466dc8855998ffd59378ec33507c7dc32d7b
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
   sqlite3: fc1400008a9b3525f5914ed715a5d1af0b8f4983
-  sqlite3_flutter_libs: 069c435986dd4b63461aecd68f4b30be4a9e9daa
-  system_info_plus: 5393c8da281d899950d751713575fbf91c7709aa
-  ua_client_hints: aeabd123262c087f0ce151ef96fa3ab77bfc8b38
-  uni_links: 103d3319e3383ed8bce559b96b1e219fbf02ba96
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
-  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
-  video_thumbnail: 94ba6705afbaa120b77287080424930f23ea0c40
-  volume_controller: 2e3de73d6e7e81a0067310d17fb70f2f86d71ac7
-  wakelock_plus: 373cfe59b235a6dd5837d0fb88791d2f13a90d56
+  sqlite3_flutter_libs: 3c323550ef3b928bc0aa9513c841e45a7d242832
+  system_info_plus: 555ce7047fbbf29154726db942ae785c29211740
+  ua_client_hints: 92fe0d139619b73ec9fcb46cc7e079a26178f586
+  uni_links: f191d616c4db8750f74c72c988e79a83dd297fac
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
+  video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
+  video_thumbnail: 584ccfa55d8fd2f3d5507218b0a18d84c839c620
+  volume_controller: 3657a1f65bedb98fa41ff7dc5793537919f31b12
+  wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49
 
 PODFILE CHECKSUM: 20e086e6008977d43a3d40260f3f9bffcac748dd
 

From b4a853acc59a88e620f1b24cc595fea269e9d2c5 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 13:51:36 +0530
Subject: [PATCH 773/796] fs 1

Refs
 * https://developer.mozilla.org/en-US/docs/Web/API/Fullscreen_API
 * https://mdn.github.io/dom-examples/fullscreen-api/index.html
---
 .../gallery/components/viewer/FileViewer.tsx       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 4aae85fe0c..0dea5dea44 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -731,6 +731,12 @@ const FileViewer: React.FC<FileViewerProps> = ({
                         <EditIcon />
                     </MoreMenuItem>
                 )}
+                <MoreMenuItem onClick={handleToggleFullscreen}>
+                    <MoreMenuItemTitle>
+                        {/*TODO */ pt("Full screen")}
+                    </MoreMenuItemTitle>
+                    <EditIcon />
+                </MoreMenuItem>
             </MoreMenu>
             {/* TODO(PS): Fix imports */}
             <ConfirmDeleteFileDialog
@@ -832,3 +838,11 @@ const createImagePNGBlob = async (imageURL: string) =>
         image.onerror = reject;
         image.src = imageURL;
     });
+
+/**
+ * Toggle full screen mode.
+ */
+const toggleFullscreen = () =>
+    document.fullscreenElement
+        ? document.exitFullscreen()
+        : document.body.requestFullscreen();

From e12a9aa80047c1361b7c966073adb72d3d85bd8f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 14:01:46 +0530
Subject: [PATCH 774/796] fs 2

---
 .../gallery/components/viewer/FileViewer.tsx  | 52 ++++++++++--------
 .../gallery/components/viewer/photoswipe.ts   | 54 ++++++++-----------
 2 files changed, 52 insertions(+), 54 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 0dea5dea44..cf0ccea275 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -41,6 +41,8 @@ import ContentCopyIcon from "@mui/icons-material/ContentCopy";
 import DeleteIcon from "@mui/icons-material/Delete";
 import EditIcon from "@mui/icons-material/Edit";
 import FileDownloadOutlinedIcon from "@mui/icons-material/FileDownloadOutlined";
+import FullscreenExitOutlinedIcon from "@mui/icons-material/FullscreenExitOutlined";
+import FullscreenOutlinedIcon from "@mui/icons-material/FullscreenOutlined";
 import { Button, Menu, MenuItem, styled, Typography } from "@mui/material";
 import { t } from "i18next";
 import React, {
@@ -88,10 +90,6 @@ export interface FileViewerFileAnnotation {
      * Note: "bar" should only be set if {@link haveUser} is also true.
      */
     showDownload: "bar" | "menu" | undefined;
-    /**
-     * `true` if the more menu action should be shown for this file.
-     */
-    showMore: boolean;
     /**
      * `true` if the delete action should be shown for this file.
      */
@@ -308,6 +306,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
     const [moreMenuAnchorEl, setMoreMenuAnchorEl] =
         useState<HTMLElement | null>(null);
     const [openImageEditor, setOpenImageEditor] = useState(false);
+    const [isFullscreen, setIsFullscreen] = useState(false);
     const { show: showConfirmDelete, props: confirmDeleteVisibilityProps } =
         useModalVisibility();
 
@@ -517,18 +516,11 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 }
             })();
 
-            const showMore =
-                showDownload == "menu" ||
-                showDelete ||
-                showCopyImage ||
-                showEditImage;
-
             return {
                 fileID,
                 isOwnFile,
                 showFavorite,
                 showDownload,
-                showMore,
                 showDelete,
                 showCopyImage,
                 showEditImage,
@@ -602,6 +594,18 @@ const FileViewer: React.FC<FileViewerProps> = ({
         ],
     );
 
+    const updateFullscreenStatus = useCallback(() => {
+        setIsFullscreen(!!document.fullscreenElement);
+    }, []);
+
+    const toggleFullscreen = useCallback(() => {
+        void (
+            document.fullscreenElement
+                ? document.exitFullscreen()
+                : document.body.requestFullscreen()
+        ).then(updateFullscreenStatus);
+    }, [updateFullscreenStatus]);
+
     // Initial value of delegate.
     if (!delegateRef.current) {
         delegateRef.current = { getFiles, isFavorite, toggleFavorite };
@@ -667,6 +671,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
         psRef.current!.refreshCurrentSlideContent();
     }, []);
 
+    useEffect(updateFullscreenStatus, [updateFullscreenStatus]);
+
     log.debug(() => ["viewer", { action: "render", psRef: psRef.current }]);
 
     return (
@@ -731,11 +737,19 @@ const FileViewer: React.FC<FileViewerProps> = ({
                         <EditIcon />
                     </MoreMenuItem>
                 )}
-                <MoreMenuItem onClick={handleToggleFullscreen}>
+                <MoreMenuItem onClick={toggleFullscreen}>
                     <MoreMenuItemTitle>
-                        {/*TODO */ pt("Full screen")}
+                        {
+                            /*TODO */ isFullscreen
+                                ? pt("Exit full screen")
+                                : pt("Go full screen")
+                        }
                     </MoreMenuItemTitle>
-                    <EditIcon />
+                    {isFullscreen ? (
+                        <FullscreenExitOutlinedIcon />
+                    ) : (
+                        <FullscreenOutlinedIcon />
+                    )}
                 </MoreMenuItem>
             </MoreMenu>
             {/* TODO(PS): Fix imports */}
@@ -774,7 +788,7 @@ const MoreMenu = styled(Menu)`
 `;
 
 const MoreMenuItem = styled(MenuItem)`
-    min-width: 190px;
+    min-width: 210px;
 
     /* MUI MenuItem default implementation has a minHeight of "48px" below the
        "sm" breakpoint, and auto after it. We always want the same height, so
@@ -838,11 +852,3 @@ const createImagePNGBlob = async (imageURL: string) =>
         image.onerror = reject;
         image.src = imageURL;
     });
-
-/**
- * Toggle full screen mode.
- */
-const toggleFullscreen = () =>
-    document.fullscreenElement
-        ? document.exitFullscreen()
-        : document.body.requestFullscreen();
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 5cefb0789e..0e8d12e534 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -618,37 +618,29 @@ export class FileViewerPhotoSwipe {
                 onClick: () => onViewInfo(currentAnnotatedFile()),
             });
 
-            if (haveUser) {
-                pswp.ui.registerElement({
-                    name: "more",
-                    // TODO(PS):
-                    title: pt("More"),
-                    order: 16,
-                    isButton: true,
-                    html: createPSRegisterElementIconHTML("more"),
-                    onInit: (buttonElement) => {
-                        buttonElement.setAttribute("id", moreButtonID);
-                        buttonElement.setAttribute("aria-haspopup", "true");
-                        pswp.on("change", () =>
-                            showIf(
-                                buttonElement,
-                                !!currentFileAnnotation().showMore,
-                            ),
-                        );
-                    },
-                    onClick: (e) => {
-                        const buttonElement = e.target;
-                        // See also: `resetMoreMenuButtonOnMenuClose`.
-                        buttonElement.setAttribute("aria-controls", moreMenuID);
-                        buttonElement.setAttribute("aria-expanded", true);
-                        onMore(
-                            currentAnnotatedFile(),
-                            pswp.currSlide.content.data.imageURL,
-                            buttonElement,
-                        );
-                    },
-                });
-            }
+            pswp.ui.registerElement({
+                name: "more",
+                // TODO(PS):
+                title: pt("More"),
+                order: 16,
+                isButton: true,
+                html: createPSRegisterElementIconHTML("more"),
+                onInit: (buttonElement) => {
+                    buttonElement.setAttribute("id", moreButtonID);
+                    buttonElement.setAttribute("aria-haspopup", "true");
+                },
+                onClick: (e) => {
+                    const buttonElement = e.target;
+                    // See also: `resetMoreMenuButtonOnMenuClose`.
+                    buttonElement.setAttribute("aria-controls", moreMenuID);
+                    buttonElement.setAttribute("aria-expanded", true);
+                    onMore(
+                        currentAnnotatedFile(),
+                        pswp.currSlide.content.data.imageURL,
+                        buttonElement,
+                    );
+                },
+            });
 
             pswp.ui.registerElement({
                 name: "caption",

From 5ea4f8b897553dc583fded5fd1f7774505f83517 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 14:47:29 +0530
Subject: [PATCH 775/796] shortcut 1

---
 .../base/components/utils/mui-theme.d.ts      |  8 ++++
 web/packages/base/components/utils/theme.ts   | 13 +++++
 .../gallery/components/viewer/FileViewer.tsx  | 47 +++++++++++++++----
 3 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/web/packages/base/components/utils/mui-theme.d.ts b/web/packages/base/components/utils/mui-theme.d.ts
index e2d11c1756..6f15714aba 100644
--- a/web/packages/base/components/utils/mui-theme.d.ts
+++ b/web/packages/base/components/utils/mui-theme.d.ts
@@ -140,6 +140,14 @@ declare module "@mui/material/styles" {
              * The color of a switch when it is enabled.
              */
             switchOn: string;
+            /**
+             * A subset of the dark mode colors, fixed so that they don't change
+             * even when the app is in light mode.
+             */
+            dark: {
+                background: TypeBackground;
+                text: TypeText;
+            };
         };
         /**
          * MUI as of v6 does not allow customizing shadows easily. This is due
diff --git a/web/packages/base/components/utils/theme.ts b/web/packages/base/components/utils/theme.ts
index 960637e135..f1c51f7fe9 100644
--- a/web/packages/base/components/utils/theme.ts
+++ b/web/packages/base/components/utils/theme.ts
@@ -151,6 +151,19 @@ const _colors = {
             light: "#ff6565",
         },
         switchOn: "#2eca45",
+        dark: {
+            // Duplicated from "dark" below.
+            background: {
+                default: "#000",
+                paper: "#1b1b1b",
+                paper2: "#252525",
+            },
+            text: {
+                base: "#fff",
+                muted: "rgba(255 255 255 / 0.70)",
+                faint: "rgba(255 255 255 / 0.50)",
+            },
+        },
     },
     light: {
         // Keep these solid.
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index cf0ccea275..1b020cdb68 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -43,7 +43,14 @@ import EditIcon from "@mui/icons-material/Edit";
 import FileDownloadOutlinedIcon from "@mui/icons-material/FileDownloadOutlined";
 import FullscreenExitOutlinedIcon from "@mui/icons-material/FullscreenExitOutlined";
 import FullscreenOutlinedIcon from "@mui/icons-material/FullscreenOutlined";
-import { Button, Menu, MenuItem, styled, Typography } from "@mui/material";
+import {
+    Button,
+    Divider,
+    Menu,
+    MenuItem,
+    styled,
+    Typography,
+} from "@mui/material";
 import { t } from "i18next";
 import React, {
     useCallback,
@@ -307,9 +314,13 @@ const FileViewer: React.FC<FileViewerProps> = ({
         useState<HTMLElement | null>(null);
     const [openImageEditor, setOpenImageEditor] = useState(false);
     const [isFullscreen, setIsFullscreen] = useState(false);
+
     const { show: showConfirmDelete, props: confirmDeleteVisibilityProps } =
         useModalVisibility();
 
+    const { show: showShortcuts, props: shortcutsVisibilityProps } =
+        useModalVisibility();
+
     // Callbacks to be invoked (only once) the next time we get an update to the
     // `files` or `favoriteFileIDs` props.
     //
@@ -598,7 +609,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
         setIsFullscreen(!!document.fullscreenElement);
     }, []);
 
-    const toggleFullscreen = useCallback(() => {
+    const handleToggleFullscreen = useCallback(() => {
         void (
             document.fullscreenElement
                 ? document.exitFullscreen()
@@ -721,7 +732,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
                     activeImageURL && (
                         <MoreMenuItem onClick={handleCopyImage}>
                             <MoreMenuItemTitle>
-                                {/*TODO */ pt("Copy image")}
+                                {/*TODO */ pt("Copy as PNG")}
                             </MoreMenuItemTitle>
                             {/* Tweak icon size to visually fit better with neighbours */}
                             <ContentCopyIcon
@@ -737,7 +748,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
                         <EditIcon />
                     </MoreMenuItem>
                 )}
-                <MoreMenuItem onClick={toggleFullscreen}>
+                <MoreMenuItem onClick={handleToggleFullscreen}>
                     <MoreMenuItemTitle>
                         {
                             /*TODO */ isFullscreen
@@ -751,6 +762,14 @@ const FileViewer: React.FC<FileViewerProps> = ({
                         <FullscreenOutlinedIcon />
                     )}
                 </MoreMenuItem>
+                <Divider sx={{}} />
+                <MoreMenuItem onClick={showShortcuts}>
+                    <Typography
+                        sx={{ opacity: 0.7 /* theme.dark.background.paper2 */ }}
+                    >
+                        {pt("Shortcuts")}
+                    </Typography>
+                </MoreMenuItem>
             </MoreMenu>
             {/* TODO(PS): Fix imports */}
             <ConfirmDeleteFileDialog
@@ -778,16 +797,19 @@ const Container = styled("div")`
     }
 `;
 
-const MoreMenu = styled(Menu)`
+const MoreMenu = styled(Menu)(
+    ({ theme }) => `
     & .MuiPaper-root {
-        background-color: #1b1b1b /* theme.dark.background.paper */;
+        background-color: ${theme.vars.palette.fixed.dark.background.paper};
     }
     & .MuiList-root {
         padding-block: 2px;
     }
-`;
+`,
+);
 
-const MoreMenuItem = styled(MenuItem)`
+const MoreMenuItem = styled(MenuItem)(
+    ({ theme }) => `
     min-width: 210px;
 
     /* MUI MenuItem default implementation has a minHeight of "48px" below the
@@ -805,18 +827,23 @@ const MoreMenuItem = styled(MenuItem)`
     color: rgba(255 255 255 / 0.85);
     &:hover {
         color: rgba(255 255 255 / 1);
-        background-color: #252525 /* theme.dark.background.paper2 */;
+        background-color: ${theme.vars.palette.fixed.dark.background.paper2}
     }
 
     .MuiSvgIcon-root {
         font-size: 20px;
     }
-`;
+`,
+);
 
 const MoreMenuItemTitle: React.FC<React.PropsWithChildren> = ({ children }) => (
     <Typography sx={{ fontWeight: "medium" }}>{children}</Typography>
 );
 
+const MoreMenuItemMinorTitle: React.FC<React.PropsWithChildren> = ({
+    children,
+}) => <Typography sx={{ fontWeight: "medium" }}>{children}</Typography>;
+
 const fileIsEditableImage = (file: EnteFile) => {
     // Only images are editable.
     if (file.metadata.fileType !== FileType.image) return false;

From 270158dadc4722d359c06fdbcba04b7d4bd9d3e7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 15:04:08 +0530
Subject: [PATCH 776/796] sc 2

---
 .../base/components/utils/mui-theme.d.ts      |  5 ++--
 web/packages/base/components/utils/theme.ts   | 23 +++++++---------
 .../gallery/components/viewer/FileViewer.tsx  | 26 +++++++++----------
 3 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/web/packages/base/components/utils/mui-theme.d.ts b/web/packages/base/components/utils/mui-theme.d.ts
index 6f15714aba..6a82f67043 100644
--- a/web/packages/base/components/utils/mui-theme.d.ts
+++ b/web/packages/base/components/utils/mui-theme.d.ts
@@ -145,8 +145,9 @@ declare module "@mui/material/styles" {
              * even when the app is in light mode.
              */
             dark: {
-                background: TypeBackground;
-                text: TypeText;
+                background: Omit<TypeBackground, "elevatedPaper">;
+                text: Omit<TypeText, "primary" | "secondary" | "disabled">;
+                divider: string;
             };
         };
         /**
diff --git a/web/packages/base/components/utils/theme.ts b/web/packages/base/components/utils/theme.ts
index f1c51f7fe9..5c6859dd7d 100644
--- a/web/packages/base/components/utils/theme.ts
+++ b/web/packages/base/components/utils/theme.ts
@@ -117,6 +117,16 @@ const getTheme = (appName: AppName): Theme => {
  */
 const getColors = (appName: AppName) => ({
     ..._colors,
+    ...{
+        fixed: {
+            ..._colors.fixed,
+            dark: {
+                background: _colors.dark.background,
+                text: _colors.dark.text,
+                divider: _colors.dark.stroke.faint
+            },
+        },
+    },
     ...{
         accent: appName == "auth" ? _colors.accentAuth : _colors.accentPhotos,
     },
@@ -151,19 +161,6 @@ const _colors = {
             light: "#ff6565",
         },
         switchOn: "#2eca45",
-        dark: {
-            // Duplicated from "dark" below.
-            background: {
-                default: "#000",
-                paper: "#1b1b1b",
-                paper2: "#252525",
-            },
-            text: {
-                base: "#fff",
-                muted: "rgba(255 255 255 / 0.70)",
-                faint: "rgba(255 255 255 / 0.50)",
-            },
-        },
     },
     light: {
         // Keep these solid.
diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 1b020cdb68..2ab43464de 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -43,14 +43,7 @@ import EditIcon from "@mui/icons-material/Edit";
 import FileDownloadOutlinedIcon from "@mui/icons-material/FileDownloadOutlined";
 import FullscreenExitOutlinedIcon from "@mui/icons-material/FullscreenExitOutlined";
 import FullscreenOutlinedIcon from "@mui/icons-material/FullscreenOutlined";
-import {
-    Button,
-    Divider,
-    Menu,
-    MenuItem,
-    styled,
-    Typography,
-} from "@mui/material";
+import { Button, Menu, MenuItem, styled, Typography } from "@mui/material";
 import { t } from "i18next";
 import React, {
     useCallback,
@@ -748,7 +741,15 @@ const FileViewer: React.FC<FileViewerProps> = ({
                         <EditIcon />
                     </MoreMenuItem>
                 )}
-                <MoreMenuItem onClick={handleToggleFullscreen}>
+                <MoreMenuItem
+                    onClick={handleToggleFullscreen}
+                    divider
+                    sx={{
+                        borderColor: "fixed.dark.divider",
+                        /* 12px + 2px */
+                        pb: "14px",
+                    }}
+                >
                     <MoreMenuItemTitle>
                         {
                             /*TODO */ isFullscreen
@@ -762,11 +763,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
                         <FullscreenOutlinedIcon />
                     )}
                 </MoreMenuItem>
-                <Divider sx={{}} />
-                <MoreMenuItem onClick={showShortcuts}>
-                    <Typography
-                        sx={{ opacity: 0.7 /* theme.dark.background.paper2 */ }}
-                    >
+                <MoreMenuItem onClick={showShortcuts} sx={{ mt: "2px" }}>
+                    <Typography sx={{ color: "fixed.dark.text.faint" }}>
                         {pt("Shortcuts")}
                     </Typography>
                 </MoreMenuItem>

From ed76b413924bd28b5c02ad029649bca4fe557514 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 15:17:26 +0530
Subject: [PATCH 777/796] sc3

---
 .../gallery/components/viewer/FileViewer.tsx  | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 2ab43464de..bac5339db8 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -43,7 +43,14 @@ import EditIcon from "@mui/icons-material/Edit";
 import FileDownloadOutlinedIcon from "@mui/icons-material/FileDownloadOutlined";
 import FullscreenExitOutlinedIcon from "@mui/icons-material/FullscreenExitOutlined";
 import FullscreenOutlinedIcon from "@mui/icons-material/FullscreenOutlined";
-import { Button, Menu, MenuItem, styled, Typography } from "@mui/material";
+import {
+    Button,
+    Dialog,
+    Menu,
+    MenuItem,
+    styled,
+    Typography,
+} from "@mui/material";
 import { t } from "i18next";
 import React, {
     useCallback,
@@ -603,12 +610,18 @@ const FileViewer: React.FC<FileViewerProps> = ({
     }, []);
 
     const handleToggleFullscreen = useCallback(() => {
+        handleMoreMenuClose();
         void (
             document.fullscreenElement
                 ? document.exitFullscreen()
                 : document.body.requestFullscreen()
         ).then(updateFullscreenStatus);
-    }, [updateFullscreenStatus]);
+    }, [handleMoreMenuClose, updateFullscreenStatus]);
+
+    const handleShortcuts = useCallback(() => {
+        handleMoreMenuClose();
+        showShortcuts();
+    }, [handleMoreMenuClose, showShortcuts]);
 
     // Initial value of delegate.
     if (!delegateRef.current) {
@@ -763,7 +776,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
                         <FullscreenOutlinedIcon />
                     )}
                 </MoreMenuItem>
-                <MoreMenuItem onClick={showShortcuts} sx={{ mt: "2px" }}>
+                <MoreMenuItem onClick={handleShortcuts} sx={{ mt: "2px" }}>
                     <Typography sx={{ color: "fixed.dark.text.faint" }}>
                         {pt("Shortcuts")}
                     </Typography>
@@ -780,6 +793,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 file={activeAnnotatedFile?.file}
                 onSaveEditedCopy={handleSaveEditedCopy}
             />
+            <Shortcuts {...shortcutsVisibilityProps} />
         </Container>
     );
 };
@@ -838,9 +852,9 @@ const MoreMenuItemTitle: React.FC<React.PropsWithChildren> = ({ children }) => (
     <Typography sx={{ fontWeight: "medium" }}>{children}</Typography>
 );
 
-const MoreMenuItemMinorTitle: React.FC<React.PropsWithChildren> = ({
-    children,
-}) => <Typography sx={{ fontWeight: "medium" }}>{children}</Typography>;
+const Shortcuts: React.FC<ModalVisibilityProps> = (props) => (
+    <Dialog {...props}></Dialog>
+);
 
 const fileIsEditableImage = (file: EnteFile) => {
     // Only images are editable.

From 4a8b1307388193c0ee6038a0f8449e2ace4be2f7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 15:52:10 +0530
Subject: [PATCH 778/796] sc4

---
 .../gallery/components/viewer/FileViewer.tsx  | 50 +++++++++++++++++--
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index bac5339db8..6b80acd551 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -14,6 +14,9 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 }
 
 import { isDesktop } from "@/base/app";
+import { SpacedRow } from "@/base/components/containers";
+import { DialogCloseIconButton } from "@/base/components/mui/DialogCloseIconButton";
+import { useIsSmallWidth } from "@/base/components/utils/hooks";
 import {
     useModalVisibility,
     type ModalVisibilityProps,
@@ -46,8 +49,11 @@ import FullscreenOutlinedIcon from "@mui/icons-material/FullscreenOutlined";
 import {
     Button,
     Dialog,
+    DialogContent,
+    DialogTitle,
     Menu,
     MenuItem,
+    Box,
     styled,
     Typography,
 } from "@mui/material";
@@ -766,8 +772,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
                     <MoreMenuItemTitle>
                         {
                             /*TODO */ isFullscreen
-                                ? pt("Exit full screen")
-                                : pt("Go full screen")
+                                ? pt("Exit fullscreen")
+                                : pt("Go fullscreen")
                         }
                     </MoreMenuItemTitle>
                     {isFullscreen ? (
@@ -852,8 +858,44 @@ const MoreMenuItemTitle: React.FC<React.PropsWithChildren> = ({ children }) => (
     <Typography sx={{ fontWeight: "medium" }}>{children}</Typography>
 );
 
-const Shortcuts: React.FC<ModalVisibilityProps> = (props) => (
-    <Dialog {...props}></Dialog>
+const Shortcuts: React.FC<ModalVisibilityProps> = ({ open, onClose }) => (
+    <Dialog {...{ open, onClose }} fullWidth fullScreen={useIsSmallWidth()}>
+        <SpacedRow sx={{ pt: 2, px: 2.5 }}>
+            <DialogTitle>{pt("Shortcuts")}</DialogTitle>
+            <DialogCloseIconButton {...{ onClose }} />
+        </SpacedRow>
+        <ShortcutsContent sx={{ "&&": { pt: 2, pb: 5, px: 5 } }}>
+            <Shortcut action="Previous, Next" shortcut="←, →" />
+            <Shortcut action="Close" shortcut="Esc" />
+            <Shortcut action="Zoom" shortcut="Mouse scroll" />
+            <Shortcut action="Toggle favorite" shortcut="L" />
+            <Shortcut action="View info" shortcut="I" />
+            <Shortcut action="Download" shortcut="D" />
+            <Shortcut action="Delete" shortcut="Delete, Backspace" />
+            <Shortcut action="Copy as PNG" shortcut="^C, ⌘C" />
+            <Shortcut action="Toggle fullscreen" shortcut="F" />
+        </ShortcutsContent>
+    </Dialog>
+);
+
+const ShortcutsContent = styled(DialogContent)`
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+`;
+
+interface ShortcutProps {
+    action: string;
+    shortcut: string;
+}
+
+const Shortcut: React.FC<ShortcutProps> = ({ action, shortcut }) => (
+    <Box sx={{ display: "flex", gap: 2 }}>
+        <Typography sx={{ color: "text.muted", minWidth: "min(20ch, 40svw)" }}>
+            {action}
+        </Typography>
+        <Typography sx={{ fontWeight: "medium" }}>{shortcut}</Typography>
+    </Box>
 );
 
 const fileIsEditableImage = (file: EnteFile) => {

From d5c9eea40f12ea70476cc4b9b2225f30b045d63e Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Wed, 5 Mar 2025 17:05:32 +0530
Subject: [PATCH 779/796] [mob][photos] Try checking for and handling already
 deleted local IDs during free up space only if freeing up space without it
 fails

This is to make free up space faster in most cases
---
 mobile/lib/ui/tools/free_space_page.dart |  8 +++
 mobile/lib/utils/delete_file_util.dart   | 67 +++++++++++++++++++++++-
 2 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/ui/tools/free_space_page.dart b/mobile/lib/ui/tools/free_space_page.dart
index a8d6a42742..cae35185e6 100644
--- a/mobile/lib/ui/tools/free_space_page.dart
+++ b/mobile/lib/ui/tools/free_space_page.dart
@@ -167,6 +167,14 @@ class _FreeSpacePageState extends State<FreeSpacePage> {
 
   Future<void> _freeStorage(BackupStatus status) async {
     bool result = await deleteLocalFiles(context, status.localIDs);
+
+    if (result == false) {
+      result = await deleteLocalFilesAfterRemovingAlreadyDeletedIDs(
+        context,
+        status.localIDs,
+      );
+    }
+
     if (result == false && Platform.isAndroid) {
       result = await retryFreeUpSpaceAfterRemovingNonExistingAssets(context);
     }
diff --git a/mobile/lib/utils/delete_file_util.dart b/mobile/lib/utils/delete_file_util.dart
index 0147441f7b..6e5c65a4da 100644
--- a/mobile/lib/utils/delete_file_util.dart
+++ b/mobile/lib/utils/delete_file_util.dart
@@ -19,6 +19,7 @@ import 'package:photos/models/file/file.dart';
 import "package:photos/models/files_split.dart";
 import 'package:photos/models/selected_files.dart';
 import "package:photos/service_locator.dart";
+import "package:photos/services/files_service.dart";
 import "package:photos/services/sync/local_sync_service.dart";
 import 'package:photos/services/sync/remote_sync_service.dart';
 import 'package:photos/services/sync/sync_service.dart';
@@ -326,6 +327,69 @@ Future<bool> emptyTrash(BuildContext context) async {
 Future<bool> deleteLocalFiles(
   BuildContext context,
   List<String> localIDs,
+) async {
+  final List<String> deletedIDs = [];
+  final List<String> localAssetIDs = [];
+  final List<String> localSharedMediaIDs = [];
+  try {
+    for (String id in localIDs) {
+      if (id.startsWith(oldSharedMediaIdentifier) ||
+          id.startsWith(sharedMediaIdentifier)) {
+        localSharedMediaIDs.add(id);
+      } else {
+        localAssetIDs.add(id);
+      }
+    }
+    deletedIDs.addAll(await _tryDeleteSharedMediaFiles(localSharedMediaIDs));
+
+    final bool shouldDeleteInBatches =
+        await isAndroidSDKVersionLowerThan(android11SDKINT);
+    if (shouldDeleteInBatches) {
+      _logger.info("Deleting in batches");
+      deletedIDs
+          .addAll(await deleteLocalFilesInBatches(context, localAssetIDs));
+    } else {
+      _logger.info("Deleting in one shot");
+      deletedIDs
+          .addAll(await _deleteLocalFilesInOneShot(context, localAssetIDs));
+    }
+    // In IOS, the library returns no error and fail to delete any file is
+    // there's any shared file. As a stop-gap solution, we initiate deletion in
+    // batches. Similar in Android, for large number of files, we have observed
+    // that the library fails to delete any file. So, we initiate deletion in
+    // batches.
+    if (deletedIDs.isEmpty && Platform.isIOS) {
+      deletedIDs.addAll(
+        await _iosDeleteLocalFilesInBatchesFallback(context, localAssetIDs),
+      );
+    }
+
+    if (deletedIDs.isNotEmpty) {
+      final deletedFiles = await FilesDB.instance.getLocalFiles(deletedIDs);
+      await FilesDB.instance.deleteLocalFiles(deletedIDs);
+      _logger.info(deletedFiles.length.toString() + " files deleted locally");
+      Bus.instance.fire(
+        LocalPhotosUpdatedEvent(deletedFiles, source: "deleteLocal"),
+      );
+      return true;
+    } else {
+      //On android 10, even if files were deleted, deletedIDs is empty.
+      //This is a workaround so that users are not shown an error message on
+      //android 10
+      if (!await isAndroidSDKVersionLowerThan(android11SDKINT)) {
+        return false;
+      }
+      return true;
+    }
+  } catch (e, s) {
+    _logger.severe("Could not delete local files", e, s);
+    return false;
+  }
+}
+
+Future<bool> deleteLocalFilesAfterRemovingAlreadyDeletedIDs(
+  BuildContext context,
+  List<String> localIDs,
 ) async {
   final files =
       await FilesDB.instance.getLocalFiles(localIDs, dedupeByLocalID: true);
@@ -388,7 +452,6 @@ Future<bool> deleteLocalFiles(
       //This is a workaround so that users are not shown an error message on
       //android 10
       if (!await isAndroidSDKVersionLowerThan(android11SDKINT)) {
-        showToast(context, S.of(context).couldNotFreeUpSpace);
         return false;
       }
       return true;
@@ -423,7 +486,7 @@ Future<bool> retryFreeUpSpaceAfterRemovingNonExistingAssets(
     final List<String> deletedIDs = [];
     final List<String> localAssetIDs = [];
     final List<String> localSharedMediaIDs = [];
-    status = await SyncService.instance.getBackupStatus();
+    status = await FilesService.instance.getBackupStatus();
 
     for (String localID in status.localIDs) {
       if (localID.startsWith(oldSharedMediaIdentifier) ||

From 8902b99ae77fd0bd8c76185359c2d2993be49f71 Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Wed, 5 Mar 2025 17:31:36 +0530
Subject: [PATCH 780/796] fix: add buffering indicator for media kit player

---
 .../ui/viewer/file/video_widget_media_kit_common.dart | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart b/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
index 15c5f5d439..ba4b730206 100644
--- a/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
+++ b/mobile/lib/ui/viewer/file/video_widget_media_kit_common.dart
@@ -5,6 +5,7 @@ import "package:media_kit_video/media_kit_video.dart";
 import "package:photos/models/file/file.dart";
 import "package:photos/theme/colors.dart";
 import "package:photos/theme/ente_theme.dart";
+import "package:photos/ui/common/loading_widget.dart";
 import "package:photos/ui/viewer/file/preview_status_widget.dart";
 import "package:photos/utils/standalone/date_time.dart";
 import "package:photos/utils/standalone/debouncer.dart";
@@ -191,6 +192,8 @@ class PlayPauseButtonMediaKit extends StatefulWidget {
 class _PlayPauseButtonState extends State<PlayPauseButtonMediaKit> {
   bool _isPlaying = true;
   late final StreamSubscription<bool>? isPlayingStreamSubscription;
+  late StreamSubscription<bool>? _bufferStateSubscription;
+  late var buffering = widget.controller?.player.state.buffering ?? true;
 
   @override
   void initState() {
@@ -202,16 +205,24 @@ class _PlayPauseButtonState extends State<PlayPauseButtonMediaKit> {
         _isPlaying = isPlaying;
       });
     });
+
+    _bufferStateSubscription =
+        widget.controller?.player.stream.buffering.listen(
+      (event) => setState(() => buffering = event),
+    );
   }
 
   @override
   void dispose() {
     isPlayingStreamSubscription?.cancel();
+    _bufferStateSubscription?.cancel();
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
+    if (buffering) return const EnteLoadingWidget();
+
     return GestureDetector(
       behavior: HitTestBehavior.opaque,
       onTap: () {

From bb781e257e0ff4411aa7854c31273ec3f692a1d0 Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Wed, 5 Mar 2025 17:41:17 +0530
Subject: [PATCH 781/796] [mob][photos] More logging

---
 mobile/lib/utils/delete_file_util.dart | 27 +++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/mobile/lib/utils/delete_file_util.dart b/mobile/lib/utils/delete_file_util.dart
index 6e5c65a4da..7757e29dc7 100644
--- a/mobile/lib/utils/delete_file_util.dart
+++ b/mobile/lib/utils/delete_file_util.dart
@@ -328,6 +328,7 @@ Future<bool> deleteLocalFiles(
   BuildContext context,
   List<String> localIDs,
 ) async {
+  _logger.info("Trying to delete local files ");
   final List<String> deletedIDs = [];
   final List<String> localAssetIDs = [];
   final List<String> localSharedMediaIDs = [];
@@ -391,16 +392,20 @@ Future<bool> deleteLocalFilesAfterRemovingAlreadyDeletedIDs(
   BuildContext context,
   List<String> localIDs,
 ) async {
-  final files =
-      await FilesDB.instance.getLocalFiles(localIDs, dedupeByLocalID: true);
+  _logger.info(
+    "Trying to delete local files after removing already deleted IDs",
+  );
+
   final List<String> deletedIDs = [];
   final List<String> localAssetIDs = [];
   final List<String> localSharedMediaIDs = [];
   final List<String> alreadyDeletedIDs = []; // to ignore already deleted files
 
+  final dialog = createProgressDialog(context, "Loading...");
+  await dialog.show();
   try {
-    final dialog = createProgressDialog(context, "Loading...");
-    await dialog.show();
+    final files =
+        await FilesDB.instance.getLocalFiles(localIDs, dedupeByLocalID: true);
     for (final file in files) {
       if (!(await _localFileExist(file))) {
         _logger.warning("Already deleted " + file.toString());
@@ -458,6 +463,7 @@ Future<bool> deleteLocalFilesAfterRemovingAlreadyDeletedIDs(
     }
   } catch (e, s) {
     _logger.severe("Could not delete local files", e, s);
+    await dialog.hide();
     return false;
   }
 }
@@ -466,12 +472,14 @@ Future<bool> deleteLocalFilesAfterRemovingAlreadyDeletedIDs(
 Future<bool> retryFreeUpSpaceAfterRemovingNonExistingAssets(
   BuildContext context,
 ) async {
-  _logger.info("Retrying free up space after removing non-existing assets");
-  try {
-    final dialog =
-        createProgressDialog(context, "Please wait, this will take a while...");
-    await dialog.show();
+  _logger.info(
+    "Retrying free up space after removing non-existing assets",
+  );
 
+  final dialog =
+      createProgressDialog(context, "Please wait, this will take a while...");
+  await dialog.show();
+  try {
     final stopwatch = Stopwatch()..start();
     final res = await PhotoManager.editor.android.removeAllNoExistsAsset();
     if (res == false) {
@@ -530,6 +538,7 @@ Future<bool> retryFreeUpSpaceAfterRemovingNonExistingAssets(
       return true;
     }
   } catch (e) {
+    await dialog.hide();
     return false;
   }
 }

From abe313fff2c5535e3bb15ed52abf4e5d6a7fb46a Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Wed, 5 Mar 2025 18:00:12 +0530
Subject: [PATCH 782/796] [mob][photos] Use better name

---
 mobile/lib/ui/tools/free_space_page.dart | 13 +++++++------
 mobile/lib/utils/delete_file_util.dart   |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/mobile/lib/ui/tools/free_space_page.dart b/mobile/lib/ui/tools/free_space_page.dart
index 3f957ad5f8..664bf49c3e 100644
--- a/mobile/lib/ui/tools/free_space_page.dart
+++ b/mobile/lib/ui/tools/free_space_page.dart
@@ -166,20 +166,21 @@ class _FreeSpacePageState extends State<FreeSpacePage> {
   }
 
   Future<void> _freeStorage(BackupStatus status) async {
-    bool result = await deleteLocalFiles(context, status.localIDs);
+    bool isSuccess = await deleteLocalFiles(context, status.localIDs);
 
-    if (result == false) {
-      result = await deleteLocalFilesAfterRemovingAlreadyDeletedIDs(
+    if (isSuccess == false) {
+      isSuccess = await deleteLocalFilesAfterRemovingAlreadyDeletedIDs(
         context,
         status.localIDs,
       );
     }
 
-    if (result == false && Platform.isAndroid) {
-      result = await retryFreeUpSpaceAfterRemovingNonExistingAssets(context);
+    if (isSuccess == false && Platform.isAndroid) {
+      isSuccess =
+          await retryFreeUpSpaceAfterRemovingAssetsNonExistingInDisk(context);
     }
 
-    if (result) {
+    if (isSuccess) {
       Navigator.of(context).pop(true);
     } else {
       showToast(context, S.of(context).couldNotFreeUpSpace);
diff --git a/mobile/lib/utils/delete_file_util.dart b/mobile/lib/utils/delete_file_util.dart
index 60f09c1276..0bee866ed3 100644
--- a/mobile/lib/utils/delete_file_util.dart
+++ b/mobile/lib/utils/delete_file_util.dart
@@ -469,11 +469,11 @@ Future<bool> deleteLocalFilesAfterRemovingAlreadyDeletedIDs(
 }
 
 /// Only to be used on Android
-Future<bool> retryFreeUpSpaceAfterRemovingNonExistingAssets(
+Future<bool> retryFreeUpSpaceAfterRemovingAssetsNonExistingInDisk(
   BuildContext context,
 ) async {
   _logger.info(
-    "Retrying free up space after removing non-existing assets",
+    "Retrying free up space after removing assets non-existing in disk",
   );
 
   final dialog =

From 8e1d931c1f5b6cb3ddb3adba1075ced30d633734 Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Wed, 5 Mar 2025 18:06:24 +0530
Subject: [PATCH 783/796] [mob][photos] Extract string

---
 mobile/lib/generated/intl/messages_en.dart |  2 ++
 mobile/lib/generated/l10n.dart             | 10 ++++++++++
 mobile/lib/l10n/intl_en.arb                |  3 ++-
 mobile/lib/utils/delete_file_util.dart     |  3 ++-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/generated/intl/messages_en.dart b/mobile/lib/generated/intl/messages_en.dart
index 61b8cd4d19..d9982f9c27 100644
--- a/mobile/lib/generated/intl/messages_en.dart
+++ b/mobile/lib/generated/intl/messages_en.dart
@@ -1400,6 +1400,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseWaitForSometimeBeforeRetrying":
             MessageLookupByLibrary.simpleMessage(
                 "Please wait for sometime before retrying"),
+        "pleaseWaitThisWillTakeAWhile": MessageLookupByLibrary.simpleMessage(
+            "Please wait, this will take a while."),
         "preparingLogs":
             MessageLookupByLibrary.simpleMessage("Preparing logs..."),
         "preserveMore": MessageLookupByLibrary.simpleMessage("Preserve more"),
diff --git a/mobile/lib/generated/l10n.dart b/mobile/lib/generated/l10n.dart
index c3f99471c6..947d3c6060 100644
--- a/mobile/lib/generated/l10n.dart
+++ b/mobile/lib/generated/l10n.dart
@@ -11230,6 +11230,16 @@ class S {
       args: [],
     );
   }
+
+  /// `Please wait, this will take a while.`
+  String get pleaseWaitThisWillTakeAWhile {
+    return Intl.message(
+      'Please wait, this will take a while.',
+      name: 'pleaseWaitThisWillTakeAWhile',
+      desc: '',
+      args: [],
+    );
+  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<S> {
diff --git a/mobile/lib/l10n/intl_en.arb b/mobile/lib/l10n/intl_en.arb
index d4ad2fb32e..58e80714fe 100644
--- a/mobile/lib/l10n/intl_en.arb
+++ b/mobile/lib/l10n/intl_en.arb
@@ -1674,5 +1674,6 @@
   "failed": "Failed",
   "playStream": "Play stream",
   "playOriginal": "Play original",
-  "joinAlbumConfirmationDialogBody" : "Joining an album will make your email visible to its participants."
+  "joinAlbumConfirmationDialogBody" : "Joining an album will make your email visible to its participants.",
+  "pleaseWaitThisWillTakeAWhile": "Please wait, this will take a while."
 }
\ No newline at end of file
diff --git a/mobile/lib/utils/delete_file_util.dart b/mobile/lib/utils/delete_file_util.dart
index 0bee866ed3..1285675003 100644
--- a/mobile/lib/utils/delete_file_util.dart
+++ b/mobile/lib/utils/delete_file_util.dart
@@ -13,6 +13,7 @@ import 'package:photos/events/files_updated_event.dart';
 import "package:photos/events/force_reload_trash_page_event.dart";
 import 'package:photos/events/local_photos_updated_event.dart';
 import "package:photos/generated/l10n.dart";
+import "package:photos/l10n/l10n.dart";
 import 'package:photos/models/api/collection/trash_item_request.dart';
 import "package:photos/models/backup_status.dart";
 import 'package:photos/models/file/file.dart';
@@ -477,7 +478,7 @@ Future<bool> retryFreeUpSpaceAfterRemovingAssetsNonExistingInDisk(
   );
 
   final dialog =
-      createProgressDialog(context, "Please wait, this will take a while...");
+      createProgressDialog(context, context.l10n.pleaseWaitThisWillTakeAWhile);
   await dialog.show();
   try {
     final stopwatch = Stopwatch()..start();

From cc569eb1924bee26232168b5f0b4a710cee75bcd Mon Sep 17 00:00:00 2001
From: Prateek Sunal <prtksunal@gmail.com>
Date: Wed, 5 Mar 2025 18:45:33 +0530
Subject: [PATCH 784/796] chore: bump build number

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 9956bb03d2..98bb6a2c03 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.99+1010
+version: 0.9.99+1011
 publish_to: none
 
 environment:

From aff27e662a1a21625e97c2a6fbc09b9f3fa283b3 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 19:02:38 +0530
Subject: [PATCH 785/796] More

---
 web/packages/gallery/components/viewer/FileViewer.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 6b80acd551..59d943cad9 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -865,9 +865,11 @@ const Shortcuts: React.FC<ModalVisibilityProps> = ({ open, onClose }) => (
             <DialogCloseIconButton {...{ onClose }} />
         </SpacedRow>
         <ShortcutsContent sx={{ "&&": { pt: 2, pb: 5, px: 5 } }}>
-            <Shortcut action="Previous, Next" shortcut="←, →" />
             <Shortcut action="Close" shortcut="Esc" />
+            <Shortcut action="Previous, Next" shortcut="←, →" />
             <Shortcut action="Zoom" shortcut="Mouse scroll" />
+            <Shortcut action="Zoom preset" shortcut="Tap inside image" />
+            <Shortcut action="Toggle controls" shortcut="Tap outside image" />
             <Shortcut action="Toggle favorite" shortcut="L" />
             <Shortcut action="View info" shortcut="I" />
             <Shortcut action="Download" shortcut="D" />

From 89d6ddf2c64ff3725664814f7d33c4369e9dfdd4 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 19:05:58 +0530
Subject: [PATCH 786/796] backdrop

---
 web/packages/gallery/components/viewer/FileViewer.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 59d943cad9..5bfcd5e300 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -47,13 +47,13 @@ import FileDownloadOutlinedIcon from "@mui/icons-material/FileDownloadOutlined";
 import FullscreenExitOutlinedIcon from "@mui/icons-material/FullscreenExitOutlined";
 import FullscreenOutlinedIcon from "@mui/icons-material/FullscreenOutlined";
 import {
+    Box,
     Button,
     Dialog,
     DialogContent,
     DialogTitle,
     Menu,
     MenuItem,
-    Box,
     styled,
     Typography,
 } from "@mui/material";
@@ -859,7 +859,12 @@ const MoreMenuItemTitle: React.FC<React.PropsWithChildren> = ({ children }) => (
 );
 
 const Shortcuts: React.FC<ModalVisibilityProps> = ({ open, onClose }) => (
-    <Dialog {...{ open, onClose }} fullWidth fullScreen={useIsSmallWidth()}>
+    <Dialog
+        {...{ open, onClose }}
+        fullWidth
+        fullScreen={useIsSmallWidth()}
+        slotProps={{ backdrop: { sx: { backdropFilter: "blur(30px)" } } }}
+    >
         <SpacedRow sx={{ pt: 2, px: 2.5 }}>
             <DialogTitle>{pt("Shortcuts")}</DialogTitle>
             <DialogCloseIconButton {...{ onClose }} />

From a18db13899800f88d1e23dfd3c0dadbaeebf381c Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 19:25:42 +0530
Subject: [PATCH 787/796] simpl

---
 .../gallery/components/viewer/FileViewer.tsx  |  2 +-
 .../gallery/components/viewer/photoswipe.ts   | 70 +++++++++++++------
 2 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index 5bfcd5e300..a233a18a62 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -873,7 +873,7 @@ const Shortcuts: React.FC<ModalVisibilityProps> = ({ open, onClose }) => (
             <Shortcut action="Close" shortcut="Esc" />
             <Shortcut action="Previous, Next" shortcut="←, →" />
             <Shortcut action="Zoom" shortcut="Mouse scroll" />
-            <Shortcut action="Zoom preset" shortcut="Tap inside image" />
+            <Shortcut action="Zoom preset" shortcut="Z, Tap inside image" />
             <Shortcut action="Toggle controls" shortcut="Tap outside image" />
             <Shortcut action="Toggle favorite" shortcut="L" />
             <Shortcut action="View info" shortcut="I" />
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 0e8d12e534..0c230d945c 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -483,6 +483,32 @@ export class FileViewerPhotoSwipe {
             onClose();
         });
 
+        const handleViewInfo = () => onViewInfo(currentAnnotatedFile());
+
+        let favoriteButtonElement: HTMLButtonElement | undefined;
+        let unfavoriteButtonElement: HTMLButtonElement | undefined;
+
+        const toggleFavorite = async () => {
+            const af = currentAnnotatedFile();
+            this.pendingFavoriteUpdates.add(af.file.id);
+            favoriteButtonElement.disabled = true;
+            unfavoriteButtonElement.disabled = true;
+            await delegate.toggleFavorite(af);
+            this.pendingFavoriteUpdates.delete(af.file.id);
+            // TODO: We reload the entire slide instead of just updating
+            // the button state. This is because there are two buttons,
+            // instead of a single button toggling between two states
+            // e.g. like the zoom button.
+            //
+            // To fix this, a single button can be achieved by moving
+            // the fill of the heart as a layer.
+            this.refreshCurrentSlideContent();
+        };
+
+        const handleToggleFavorite = () => void toggleFavorite();
+
+        const handleDownload = () => onDownload(currentAnnotatedFile());
+
         const showIf = (element: HTMLElement, condition: boolean) =>
             condition
                 ? element.classList.remove("pswp__hidden")
@@ -527,24 +553,6 @@ export class FileViewerPhotoSwipe {
             });
 
             if (haveUser) {
-                const toggleFavorite = async (
-                    buttonElement: HTMLButtonElement,
-                ) => {
-                    const af = currentAnnotatedFile();
-                    this.pendingFavoriteUpdates.add(af.file.id);
-                    buttonElement.disabled = true;
-                    await delegate.toggleFavorite(af);
-                    this.pendingFavoriteUpdates.delete(af.file.id);
-                    // TODO: We reload the entire slide instead of just updating
-                    // the button state. This is because there are two buttons,
-                    // instead of a single button toggling between two states
-                    // e.g. like the zoom button.
-                    //
-                    // To fix this, a single button can be achieved by moving
-                    // the fill of the heart as a layer.
-                    this.refreshCurrentSlideContent();
-                };
-
                 const showFavoriteIf = (
                     buttonElement: HTMLButtonElement,
                     value: boolean,
@@ -568,7 +576,7 @@ export class FileViewerPhotoSwipe {
                     order: 8,
                     isButton: true,
                     html: createPSRegisterElementIconHTML("favorite"),
-                    onClick: (e) => toggleFavorite(e.target),
+                    onClick: handleToggleFavorite,
                     onInit: (buttonElement) =>
                         pswp.on("change", () =>
                             showFavoriteIf(buttonElement, false),
@@ -580,7 +588,7 @@ export class FileViewerPhotoSwipe {
                     order: 8,
                     isButton: true,
                     html: createPSRegisterElementIconHTML("unfavorite"),
-                    onClick: (e) => toggleFavorite(e.target),
+                    onClick: handleToggleFavorite,
                     onInit: (buttonElement) =>
                         pswp.on("change", () =>
                             showFavoriteIf(buttonElement, true),
@@ -598,7 +606,7 @@ export class FileViewerPhotoSwipe {
                     order: 8,
                     isButton: true,
                     html: createPSRegisterElementIconHTML("download"),
-                    onClick: () => onDownload(currentAnnotatedFile()),
+                    onClick: handleDownload,
                     onInit: (buttonElement) =>
                         pswp.on("change", () =>
                             showIf(
@@ -615,7 +623,7 @@ export class FileViewerPhotoSwipe {
                 order: 9,
                 isButton: true,
                 html: createPSRegisterElementIconHTML("info"),
-                onClick: () => onViewInfo(currentAnnotatedFile()),
+                onClick: handleViewInfo,
             });
 
             pswp.ui.registerElement({
@@ -676,7 +684,23 @@ export class FileViewerPhotoSwipe {
             return element;
         });
 
-        // Let our data source know.
+        pswp.on("keydown", (e, z) => {
+            const key = e.originalEvent.key ?? "";
+            const cb = (() => {
+                switch (key.toLowerCase()) {
+                    case "l":
+                        return handleToggleFavorite;
+                    case "d":
+                        return handleDownload;
+                    case "i":
+                        return handleViewInfo;
+                }
+                return undefined;
+            })();
+            cb?.();
+        });
+
+        // Let our data source know that we're about to open.
         fileViewerWillOpen();
 
         // Initializing PhotoSwipe adds it to the DOM as a dialog-like div with

From 22cd3763b718c49dff4592504087b3d98a407f6a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 19:56:46 +0530
Subject: [PATCH 788/796] delegate

---
 .../gallery/components/viewer/FileViewer.tsx  | 62 ++++++++++++++-----
 .../gallery/components/viewer/photoswipe.ts   | 32 +++++++++-
 2 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/web/packages/gallery/components/viewer/FileViewer.tsx b/web/packages/gallery/components/viewer/FileViewer.tsx
index a233a18a62..263ba87942 100644
--- a/web/packages/gallery/components/viewer/FileViewer.tsx
+++ b/web/packages/gallery/components/viewer/FileViewer.tsx
@@ -396,7 +396,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
     //
     // Not memoized since it uses the frequently changing `activeAnnotatedFile`.
     const handleDownloadMenuAction = () => {
-        handleMoreMenuClose();
+        handleMoreMenuCloseIfNeeded();
         onDownload!(activeAnnotatedFile!.file);
     };
 
@@ -413,9 +413,9 @@ const FileViewer: React.FC<FileViewerProps> = ({
         [],
     );
 
-    const handleMoreMenuClose = useCallback(() => {
+    const handleMoreMenuCloseIfNeeded = useCallback(() => {
         setMoreMenuAnchorEl((el) => {
-            resetMoreMenuButtonOnMenuClose(el);
+            if (el) resetMoreMenuButtonOnMenuClose(el);
             return null;
         });
     }, []);
@@ -423,11 +423,11 @@ const FileViewer: React.FC<FileViewerProps> = ({
     const handleConfirmDelete = useMemo(() => {
         return onDelete
             ? () => {
-                  handleMoreMenuClose();
+                  handleMoreMenuCloseIfNeeded();
                   showConfirmDelete();
               }
             : undefined;
-    }, [onDelete, showConfirmDelete, handleMoreMenuClose]);
+    }, [onDelete, showConfirmDelete, handleMoreMenuCloseIfNeeded]);
 
     // Not memoized since it uses the frequently changing `activeAnnotatedFile`.
     const handleDelete = async () => {
@@ -455,8 +455,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
     };
 
     // Not memoized since it uses the frequently changing `activeAnnotatedFile`.
-    const handleCopyImage = () => {
-        handleMoreMenuClose();
+    const handleCopyImage = useCallback(() => {
+        handleMoreMenuCloseIfNeeded();
         // Safari does not copy if we do not call `navigator.clipboard.write`
         // synchronously within the click event handler, but it does supports
         // passing a promise in lieu of the blob.
@@ -467,16 +467,16 @@ const FileViewer: React.FC<FileViewerProps> = ({
                 }),
             ])
             .catch(onGenericError);
-    };
+    }, [onGenericError, handleMoreMenuCloseIfNeeded, activeImageURL]);
 
     const handleEditImage = useMemo(() => {
         return onSaveEditedImageCopy
             ? () => {
-                  handleMoreMenuClose();
+                  handleMoreMenuCloseIfNeeded();
                   setOpenImageEditor(true);
               }
             : undefined;
-    }, [onSaveEditedImageCopy, handleMoreMenuClose]);
+    }, [onSaveEditedImageCopy, handleMoreMenuCloseIfNeeded]);
 
     const handleImageEditorClose = useCallback(
         () => setOpenImageEditor(false),
@@ -616,22 +616,49 @@ const FileViewer: React.FC<FileViewerProps> = ({
     }, []);
 
     const handleToggleFullscreen = useCallback(() => {
-        handleMoreMenuClose();
+        handleMoreMenuCloseIfNeeded();
         void (
             document.fullscreenElement
                 ? document.exitFullscreen()
                 : document.body.requestFullscreen()
         ).then(updateFullscreenStatus);
-    }, [handleMoreMenuClose, updateFullscreenStatus]);
+    }, [handleMoreMenuCloseIfNeeded, updateFullscreenStatus]);
 
     const handleShortcuts = useCallback(() => {
-        handleMoreMenuClose();
+        handleMoreMenuCloseIfNeeded();
         showShortcuts();
-    }, [handleMoreMenuClose, showShortcuts]);
+    }, [handleMoreMenuCloseIfNeeded, showShortcuts]);
+
+    const performKeyAction = useCallback(
+        (action): FileViewerPhotoSwipeDelegate["performKeyAction"] => {
+            switch (action) {
+                case "delete":
+                    handleConfirmDelete?.();
+                    break;
+                case "copy":
+                    if (activeImageURL) handleCopyImage();
+                    break;
+                case "toggle-fullscreen":
+                    handleToggleFullscreen();
+                    break;
+            }
+        },
+        [
+            handleConfirmDelete,
+            activeImageURL,
+            handleCopyImage,
+            handleToggleFullscreen,
+        ],
+    );
 
     // Initial value of delegate.
     if (!delegateRef.current) {
-        delegateRef.current = { getFiles, isFavorite, toggleFavorite };
+        delegateRef.current = {
+            getFiles,
+            isFavorite,
+            toggleFavorite,
+            performKeyAction,
+        };
     }
 
     // Updates to delegate callbacks.
@@ -640,7 +667,8 @@ const FileViewer: React.FC<FileViewerProps> = ({
         delegate.getFiles = getFiles;
         delegate.isFavorite = isFavorite;
         delegate.toggleFavorite = toggleFavorite;
-    }, [getFiles, isFavorite, toggleFavorite]);
+        delegate.performKeyAction = performKeyAction;
+    }, [getFiles, isFavorite, toggleFavorite, performKeyAction]);
 
     // Notify the listeners, if any, for updates to files or favorites.
     useEffect(() => {
@@ -717,7 +745,7 @@ const FileViewer: React.FC<FileViewerProps> = ({
             />
             <MoreMenu
                 open={!!moreMenuAnchorEl}
-                onClose={handleMoreMenuClose}
+                onClose={handleMoreMenuCloseIfNeeded}
                 anchorEl={moreMenuAnchorEl}
                 id={moreMenuID}
                 slotProps={{
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 0c230d945c..5f4bb1bbe0 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -73,6 +73,15 @@ export interface FileViewerPhotoSwipeDelegate {
      * > remain in the disabled state (until the file viewer is closed).
      */
     toggleFavorite: (annotatedFile: FileViewerAnnotatedFile) => Promise<void>;
+    /**
+     * Called when the user triggers a potential action using a keyboard
+     * shortcut.
+     *
+     * The caller does not check if the action is valid in the current context,
+     * so the delegate must validate and only then perform the action if it is
+     * appropriate.
+     */
+    performKeyAction: (action: "delete" | "copy" | "toggle-fullscreen") => void;
 }
 
 type FileViewerPhotoSwipeOptions = Pick<
@@ -507,8 +516,16 @@ export class FileViewerPhotoSwipe {
 
         const handleToggleFavorite = () => void toggleFavorite();
 
+        const handleToggleFavoriteIfEnabled = () => {
+            if (haveUser) handleToggleFavorite();
+        };
+
         const handleDownload = () => onDownload(currentAnnotatedFile());
 
+        const handleDownloadIfEnabled = () => {
+            if (!!currentFileAnnotation().showDownload) handleDownload();
+        };
+
         const showIf = (element: HTMLElement, condition: boolean) =>
             condition
                 ? element.classList.remove("pswp__hidden")
@@ -684,16 +701,27 @@ export class FileViewerPhotoSwipe {
             return element;
         });
 
+        // Some actions routed via the delegate
+
+        const handleDelete = () => delegate.performKeyAction("delete");
+
+        const handleCopy = () => delegate.performKeyAction("copy");
+
+        const handleToggleFullscreen = () =>
+            delegate.performKeyAction("toggle-fullscreen");
+
         pswp.on("keydown", (e, z) => {
             const key = e.originalEvent.key ?? "";
             const cb = (() => {
                 switch (key.toLowerCase()) {
                     case "l":
-                        return handleToggleFavorite;
+                        return handleToggleFavoriteIfEnabled;
                     case "d":
-                        return handleDownload;
+                        return handleDownloadIfEnabled;
                     case "i":
                         return handleViewInfo;
+                    case "f":
+                        return handleToggleFullscreen;
                 }
                 return undefined;
             })();

From 1eed87e117f9917e20b489622316fd7a82e6edfb Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 20:00:29 +0530
Subject: [PATCH 789/796] Revert "Temporary workbench"

This reverts commit 8ac9751891103d538577701a326b90d5b73915b5.
---
 web/apps/photos/src/pages/_app.tsx                   | 4 ++--
 web/apps/photos/src/styles/global.css                | 3 +--
 web/packages/gallery/components/viewer/photoswipe.ts | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index aad64be0cf..000cf2d037 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -48,9 +48,9 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { resumeExportsIfNeeded } from "services/export";
 import { photosLogout } from "services/logout";
 
-// import "photoswipe/dist/photoswipe.css";
+import "photoswipe/dist/photoswipe.css";
 // TODO(PS): Note, auto hide only works with the new CSS.
-import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
+// import "../../../../packages/gallery/components/viewer/ps5/dist/photoswipe.css";
 
 import "styles/global.css";
 
diff --git a/web/apps/photos/src/styles/global.css b/web/apps/photos/src/styles/global.css
index 174067991a..9d61f12f42 100644
--- a/web/apps/photos/src/styles/global.css
+++ b/web/apps/photos/src/styles/global.css
@@ -12,7 +12,7 @@ body {
     flex-direction: column;
     height: 100%;
 }
-@media DISABLED {
+
 .pswp__button--custom {
     width: 48px;
     height: 48px;
@@ -114,7 +114,6 @@ body {
 .pswp__caption--empty {
     display: none;
 }
-}
 
 .pswp-ente {
     /* The default z-index for PhotoSwipe is 10k, way beyond everything else.
diff --git a/web/packages/gallery/components/viewer/photoswipe.ts b/web/packages/gallery/components/viewer/photoswipe.ts
index 5f4bb1bbe0..db7239bf5e 100644
--- a/web/packages/gallery/components/viewer/photoswipe.ts
+++ b/web/packages/gallery/components/viewer/photoswipe.ts
@@ -35,7 +35,7 @@ if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
 let PhotoSwipe;
 if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
     // TODO(PS): Comment me before merging into main.
-    PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
+    // PhotoSwipe = require("./ps5/dist/photoswipe.esm.js").default;
 }
 
 export interface FileViewerPhotoSwipeDelegate {

From d98394272e7e7ad2655a29c1d8fea691b2827a78 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Wed, 5 Mar 2025 20:03:10 +0530
Subject: [PATCH 790/796] Fix formatting lints

---
 web/apps/photos/src/components/PhotoFrame.tsx | 13 ++++++++-----
 web/apps/photos/src/pages/gallery.tsx         |  8 ++++----
 web/packages/base/components/utils/theme.ts   |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index c1e5460f4d..582af17667 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -287,11 +287,14 @@ const PhotoFrame = ({
             : undefined;
     }, [favoriteFileIDs, onMarkUnsyncedFavoriteUpdate]);
 
-    const handleDownload = useCallback((file: EnteFile) => {
-        const setSingleFileDownloadProgress =
-            setFilesDownloadProgressAttributesCreator!(file.metadata.title);
-        void downloadSingleFile(file, setSingleFileDownloadProgress);
-    }, [setFilesDownloadProgressAttributesCreator]);
+    const handleDownload = useCallback(
+        (file: EnteFile) => {
+            const setSingleFileDownloadProgress =
+                setFilesDownloadProgressAttributesCreator!(file.metadata.title);
+            void downloadSingleFile(file, setSingleFileDownloadProgress);
+        },
+        [setFilesDownloadProgressAttributesCreator],
+    );
 
     const handleDelete = useMemo(() => {
         return onMarkTempDeleted
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index b57b6e312c..d4926fd54d 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -1072,10 +1072,10 @@ const Page: React.FC = () => {
                             files.length < 30 && !isInSearchMode
                         }
                         isInIncomingSharedCollection={
-                            collectionSummaries.get(activeCollectionID)
-                            ?.type == "incomingShareCollaborator" ||
-                            collectionSummaries.get(activeCollectionID)
-                            ?.type == "incomingShareViewer"
+                            collectionSummaries.get(activeCollectionID)?.type ==
+                                "incomingShareCollaborator" ||
+                            collectionSummaries.get(activeCollectionID)?.type ==
+                                "incomingShareViewer"
                         }
                         isInHiddenSection={barMode == "hidden-albums"}
                         setFilesDownloadProgressAttributesCreator={
diff --git a/web/packages/base/components/utils/theme.ts b/web/packages/base/components/utils/theme.ts
index 5c6859dd7d..99cb3d86e8 100644
--- a/web/packages/base/components/utils/theme.ts
+++ b/web/packages/base/components/utils/theme.ts
@@ -123,7 +123,7 @@ const getColors = (appName: AppName) => ({
             dark: {
                 background: _colors.dark.background,
                 text: _colors.dark.text,
-                divider: _colors.dark.stroke.faint
+                divider: _colors.dark.stroke.faint,
             },
         },
     },

From 5ec52541bfa06fb6f1e226d689de94e1b2a1ceef Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Thu, 6 Mar 2025 01:13:49 +0530
Subject: [PATCH 791/796] [mob][photos] Pass back any exceptions/errors back to
 main isolate when thrown from a different isolate when using
 _getLocalIDsAndFilesFromAssets + catch and log in the main isolate so that
 its reported on sentry

---
 .../lib/services/local/local_sync_util.dart   | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/mobile/lib/services/local/local_sync_util.dart b/mobile/lib/services/local/local_sync_util.dart
index c37b37e954..12f273803a 100644
--- a/mobile/lib/services/local/local_sync_util.dart
+++ b/mobile/lib/services/local/local_sync_util.dart
@@ -34,17 +34,26 @@ Future<Tuple2<List<LocalPathAsset>, List<EnteFile>>> getLocalPathAssetsAndFiles(
     if (assetsInPath.isEmpty) {
       result = const Tuple2({}, []);
     } else {
-      result = await Computer.shared().compute(
-        _getLocalIDsAndFilesFromAssets,
-        param: <String, dynamic>{
-          "pathEntity": pathEntity,
-          "fromTime": fromTime,
-          "alreadySeenLocalIDs": alreadySeenLocalIDs,
-          "assetList": assetsInPath,
-        },
-        taskName:
-            "getLocalPathAssetsAndFiles-${pathEntity.name}-count-${assetsInPath.length}",
-      );
+      try {
+        result = await Computer.shared().compute(
+          _getLocalIDsAndFilesFromAssets,
+          param: <String, dynamic>{
+            "pathEntity": pathEntity,
+            "fromTime": fromTime,
+            "alreadySeenLocalIDs": alreadySeenLocalIDs,
+            "assetList": assetsInPath,
+          },
+          taskName:
+              "getLocalPathAssetsAndFiles-${pathEntity.name}-count-${assetsInPath.length}",
+        );
+      } catch (e) {
+        _logger.severe("_getLocalIDsAndFilesFromAssets failed", e);
+        _logger.info(
+          "Failed for pathEntity: ${pathEntity.name}",
+        );
+        result = const Tuple2({}, []);
+      }
+
       alreadySeenLocalIDs.addAll(result.item1);
       uniqueFiles.addAll(result.item2);
     }
@@ -299,12 +308,8 @@ Future<Tuple2<Set<String>, List<EnteFile>>> _getLocalIDsAndFilesFromAssets(
         (fromTime / ~1000);
     if (!alreadySeenLocalIDs.contains(entity.id) &&
         assetCreatedOrUpdatedAfterGivenTime) {
-      try {
-        final file = await EnteFile.fromAsset(pathEntity.name, entity);
-        files.add(file);
-      } catch (e) {
-        _logger.severe(e);
-      }
+      final file = await EnteFile.fromAsset(pathEntity.name, entity);
+      files.add(file);
     }
   }
   return Tuple2(localIDs, files);

From db7f669198d94afe1198d96bef72ca875dba5d3c Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Thu, 6 Mar 2025 12:04:25 +0530
Subject: [PATCH 792/796] [mob][photos] Bump up build number

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 98bb6a2c03..954ab86366 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.99+1011
+version: 0.9.99+1012
 publish_to: none
 
 environment:

From a4f64a73cbcda490c2c2ef1325b7a1d379782a28 Mon Sep 17 00:00:00 2001
From: vishnukvmd <vishnu@ente.io>
Date: Thu, 6 Mar 2025 12:39:24 +0530
Subject: [PATCH 793/796] [docs] Update

---
 docs/docs/photos/faq/security-and-privacy.md | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/docs/docs/photos/faq/security-and-privacy.md b/docs/docs/photos/faq/security-and-privacy.md
index 240ded8d70..6f40ab043f 100644
--- a/docs/docs/photos/faq/security-and-privacy.md
+++ b/docs/docs/photos/faq/security-and-privacy.md
@@ -58,14 +58,17 @@ in the unlikely event of a server breach, your data remains protected.
 
 ## Account Security
 
-### What happens if I forget my password?
+### What happens if I forget my password? {#account-recovery}
 
-You can reset your password using your recovery key that was provided to you
-during account creation. Please store this key securely, as it's your lifeline
-if you forget your password.
+If you are logged into Ente on any of your existing devices, you can use that
+device to reset your password and use your new password to log in.
 
-If you lose both your password and recovery key, we cannot recover your account
-or data due to our end-to-end encrypted architecture.
+If you are logged out of Ente on all your devices, you can reset your password
+using your recovery key that was provided to you during account creation.
+
+If you are logged out of Ente on all your devices and you have lost both your
+password and recovery key, we cannot recover your account or data due to our
+end-to-end encrypted architecture.
 
 If you wish to delete your account in such scenarios, please reach out to
 support@ente.io and we will help you out.

From 4bd08f02f8e86bd730a3dd8b70ecc3b9c7c0c916 Mon Sep 17 00:00:00 2001
From: Vishnu Mohandas <vishnu@ente.io>
Date: Thu, 6 Mar 2025 15:08:06 +0530
Subject: [PATCH 794/796] [docs] Update passkeys.md

---
 docs/docs/photos/features/passkeys.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/docs/photos/features/passkeys.md b/docs/docs/photos/features/passkeys.md
index 5f7329bed7..fcbfc5b180 100644
--- a/docs/docs/photos/features/passkeys.md
+++ b/docs/docs/photos/features/passkeys.md
@@ -59,3 +59,6 @@ then select the "Recover two-factor" option in the error message that gets
 shown. This will take you to a place where you can enter your Ente recovery key
 and login into your account. Now you can go to the _Passkey_ page to delete the
 lost passkey and/or add a new one.
+
+If you have lost access to both your passkey and recovery key, please reach out
+to [support@ente.io](mailto:support@ente.io) for help.

From ff8224529324c90e56806600560024fe33cf9585 Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Thu, 6 Mar 2025 15:08:59 +0530
Subject: [PATCH 795/796] [mob][photos] Rethrow

---
 mobile/lib/services/local/local_sync_util.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/services/local/local_sync_util.dart b/mobile/lib/services/local/local_sync_util.dart
index 12f273803a..2be4707a22 100644
--- a/mobile/lib/services/local/local_sync_util.dart
+++ b/mobile/lib/services/local/local_sync_util.dart
@@ -51,7 +51,7 @@ Future<Tuple2<List<LocalPathAsset>, List<EnteFile>>> getLocalPathAssetsAndFiles(
         _logger.info(
           "Failed for pathEntity: ${pathEntity.name}",
         );
-        result = const Tuple2({}, []);
+        rethrow;
       }
 
       alreadySeenLocalIDs.addAll(result.item1);

From 72421762431ab8761c403ce2432af2059bf4b5e7 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 6 Mar 2025 15:46:52 +0530
Subject: [PATCH 796/796] [mob] Bump version code

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 954ab86366..4b384f8c58 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.9.99+1012
+version: 0.9.99+1013
 publish_to: none
 
 environment: