From 57ec62e45eb60f7ed9ff889c397093565fa1be05 Mon Sep 17 00:00:00 2001
From: AmanRajSinghMourya <amanrajmourya7@gmail.com>
Date: Fri, 11 Jul 2025 17:00:23 +0530
Subject: [PATCH 01/29] Implement advance date search service

---
 .../lib/services/date_parse_service.dart      | 372 ++++++++++++++++++
 .../photos/lib/services/search_service.dart   | 121 +++---
 2 files changed, 429 insertions(+), 64 deletions(-)
 create mode 100644 mobile/apps/photos/lib/services/date_parse_service.dart

diff --git a/mobile/apps/photos/lib/services/date_parse_service.dart b/mobile/apps/photos/lib/services/date_parse_service.dart
new file mode 100644
index 0000000000..01cd898f19
--- /dev/null
+++ b/mobile/apps/photos/lib/services/date_parse_service.dart
@@ -0,0 +1,372 @@
+import "package:photos/data/months.dart";
+import 'package:tuple/tuple.dart';
+
+class DateParseService {
+  static final DateParseService instance =
+      DateParseService._privateConstructor();
+  DateParseService._privateConstructor();
+
+  static const Map<String, int> _monthMap = {
+    "january": 1, "february": 2, "march": 3, "april": 4,
+    "may": 5, "june": 6, "july": 7, "august": 8,
+    "september": 9, "october": 10, "november": 11, "december": 12,
+    "jan": 1, "feb": 2, "mar": 3, "apr": 4, "jun": 6,
+    "jul": 7, "aug": 8, "sep": 9, "sept": 9, "oct": 10, "nov": 11, "dec": 12,
+    "janu": 1, "febr": 2, "marc": 3, "apri": 4, "juli": 7,
+    "augu": 8, "sepe": 9, "octo": 10, "nove": 11, "dece": 12,
+  };
+
+  static const Map<int, String> monthNumberToName = {
+    1: "January",
+    2: "February",
+    3: "March",
+    4: "April",
+    5: "May",
+    6: "June",
+    7: "July",
+    8: "August",
+    9: "September",
+    10: "October",
+    11: "November",
+    12: "December",
+  };
+
+  String normalizeDateString(String input) {
+    return input
+        .toLowerCase()
+        .replaceAllMapped(
+          RegExp(r'\b(\d{1,2})(st|nd|rd|th)\b'),
+          (match) => match.group(1)!,
+        )
+        .replaceAll(RegExp(r'\bof\b'), '')
+        .replaceAll(RegExp(r'[,\.]+'), '')
+        .replaceAll(RegExp(r'\s+'), ' ')
+        .trim();
+  }
+
+  Tuple3<int?, int?, int?> parseStructuredFormats(String input) {
+    final normalized = input.replaceAll(RegExp(r'\s'), '');
+
+    // ISO format: YYYY-MM-DD or YYYY/MM/DD
+    final isoMatch =
+        RegExp(r'^(\d{4})[\/-](\d{1,2})[\/-](\d{1,2})$').firstMatch(normalized);
+    if (isoMatch != null) {
+      return Tuple3(
+        int.tryParse(isoMatch.group(3)!), // day
+        int.tryParse(isoMatch.group(2)!), // month
+        int.tryParse(isoMatch.group(1)!), // year
+      );
+    }
+
+    // Standard formats: MM/DD/YYYY, DD/MM/YYYY, MM-DD-YYYY, DD-MM-YYYY
+    final standardMatch =
+        RegExp(r'^(\d{1,2})[\/-](\d{1,2})[\/-](\d{4})$').firstMatch(normalized);
+    if (standardMatch != null) {
+      final first = int.tryParse(standardMatch.group(1)!);
+      final second = int.tryParse(standardMatch.group(2)!);
+      final year = int.tryParse(standardMatch.group(3)!);
+
+      if (first == null || second == null || year == null) {
+        return const Tuple3(null, null, null);
+      }
+      if (first < 1 || first > 31 || second < 1 || second > 31) {
+        return const Tuple3(null, null, null);
+      }
+
+      // Heuristic: if first number > 12, assume DD/MM format
+      if (first > 12) { 
+        if (second > 12) return const Tuple3(null, null, null);
+        return Tuple3(first, second, year);
+      } else { 
+        if (first > 12) return const Tuple3(null, null, null);
+        return Tuple3(second, first, year);
+      }
+    }
+
+    // Standard formats with 2-digit years: MM/DD/YY, DD/MM/YY, MM-DD-YY, DD-MM-YY
+    final standardMatchTwoDigitYear =
+        RegExp(r'^(\d{1,2})[\/-](\d{1,2})[\/-](\d{2})$').firstMatch(normalized);
+    if (standardMatchTwoDigitYear != null) {
+      final first = int.tryParse(standardMatchTwoDigitYear.group(1)!);
+      final second = int.tryParse(standardMatchTwoDigitYear.group(2)!);
+      final yearTwoDigit = int.tryParse(standardMatchTwoDigitYear.group(3)!);
+
+      if (first == null || second == null || yearTwoDigit == null) {
+        return const Tuple3(null, null, null);
+      }
+      if (first < 1 || first > 31 || second < 1 || second > 31) {
+        return const Tuple3(null, null, null);
+      }
+
+      final year =
+          yearTwoDigit < 50 ? 2000 + yearTwoDigit : 1900 + yearTwoDigit;
+
+      if (first > 12) {
+        if (second > 12) return const Tuple3(null, null, null);
+        return Tuple3(first, second, year);
+      } else {
+        if (first > 12) return const Tuple3(null, null, null);
+        return Tuple3(second, first, year);
+      }
+    }
+
+    // Dot format: DD.MM.YYYY
+    final dotMatch =
+        RegExp(r'^(\d{1,2})\.(\d{1,2})\.(\d{4})$').firstMatch(normalized);
+    if (dotMatch != null) {
+      final day = int.tryParse(dotMatch.group(1)!);
+      final month = int.tryParse(dotMatch.group(2)!);
+      final year = int.tryParse(dotMatch.group(3)!);
+
+      if (day == null || month == null || year == null) {
+        return const Tuple3(null, null, null);
+      }
+      if (day < 1 || day > 31 || month < 1 || month > 12) {
+        return const Tuple3(null, null, null);
+      }
+
+      return Tuple3(day, month, year);
+    }
+
+    // Dot format with 2-digit year: DD.MM.YY
+    final dotMatchTwoDigitYear =
+        RegExp(r'^(\d{1,2})\.(\d{1,2})\.(\d{2})$').firstMatch(normalized);
+    if (dotMatchTwoDigitYear != null) {
+      final day = int.tryParse(dotMatchTwoDigitYear.group(1)!);
+      final month = int.tryParse(dotMatchTwoDigitYear.group(2)!);
+      final yearTwoDigit = int.tryParse(dotMatchTwoDigitYear.group(3)!);
+
+      if (day == null || month == null || yearTwoDigit == null) {
+        return const Tuple3(null, null, null);
+      }
+      if (day < 1 || day > 31 || month < 1 || month > 12) {
+        return const Tuple3(null, null, null);
+      }
+
+      final year =
+          yearTwoDigit < 50 ? 2000 + yearTwoDigit : 1900 + yearTwoDigit;
+
+      return Tuple3(day, month, year);
+    }
+
+    // Compact format: YYYYMMDD
+    if (normalized.length == 8 && RegExp(r'^\d{8}$').hasMatch(normalized)) {
+      final year = int.tryParse(normalized.substring(0, 4));
+      final month = int.tryParse(normalized.substring(4, 6));
+      final day = int.tryParse(normalized.substring(6, 8));
+      if (year != null &&
+          year > 1900 &&
+          month != null &&
+          month <= 12 &&
+          day != null &&
+          day <= 31) {
+        return Tuple3(day, month, year);
+      }
+    }
+
+    // Short format: MM/DD or DD/MM
+    final shortMatch =
+        RegExp(r'^(\d{1,2})[\/-](\d{1,2})$').firstMatch(normalized);
+    if (shortMatch != null) {
+      final first = int.tryParse(shortMatch.group(1)!);
+      final second = int.tryParse(shortMatch.group(2)!);
+
+      if (first == null || second == null) {
+        return const Tuple3(null, null, null);
+      }
+      if (first < 1 || first > 31 || second < 1 || second > 31) {
+        return const Tuple3(null, null, null);
+      }
+
+      if (first > 12) { 
+        if (second > 12) return const Tuple3(null, null, null);
+        return Tuple3(first, second, null);
+      } else { 
+        if (first > 12) return const Tuple3(null, null, null);
+        return Tuple3(second, first, null);
+      }
+    }
+
+    return const Tuple3(null, null, null);
+  }
+
+  Tuple3<int?, MonthData?, int?> _parseDateParts(String input) {
+    if (input.trim().isEmpty) return const Tuple3(null, null, null);
+
+    final lowerInput = input.toLowerCase();
+    final today = DateTime.now();
+
+    if (lowerInput.contains('today')) {
+      return Tuple3(
+        today.day,
+        MonthData(monthNumberToName[today.month]!, today.month),
+        today.year,
+      );
+    } else if (lowerInput.contains('tomorrow')) {
+      final tomorrow = today.add(const Duration(days: 1));
+      return Tuple3(
+        tomorrow.day,
+        MonthData(monthNumberToName[tomorrow.month]!, tomorrow.month),
+        tomorrow.year,
+      );
+    } else if (lowerInput.contains('yesterday')) {
+      final yesterday = today.subtract(const Duration(days: 1));
+      return Tuple3(
+        yesterday.day,
+        MonthData(monthNumberToName[yesterday.month]!, yesterday.month),
+        yesterday.year,
+      );
+    }
+
+    // Check for year-only queries like "2025"
+    final yearOnlyMatch = RegExp(r'^\s*(\d{4})\s*$').firstMatch(input.trim());
+    if (yearOnlyMatch != null) {
+      final year = int.tryParse(yearOnlyMatch.group(1)!);
+      if (year != null && year >= 1900 && year <= 2100) {
+        return Tuple3(null, null, year);
+      }
+    }
+
+    // First try structured formats (slash, dash, dot patterns)
+    final structuredResult = parseStructuredFormats(input);
+    if (structuredResult.item1 != null ||
+        structuredResult.item2 != null ||
+        structuredResult.item3 != null) {
+      final int? day = structuredResult.item1;
+      final int? monthNum = structuredResult.item2;
+      final int? year = structuredResult.item3;
+      MonthData? monthData;
+      if (monthNum != null && monthNumberToName.containsKey(monthNum)) {
+        monthData = MonthData(monthNumberToName[monthNum]!, monthNum);
+      }
+      return Tuple3(day, monthData, year);
+    }
+
+    final normalized = normalizeDateString(input);
+    final tokens = normalized.split(RegExp(r'\s+'));
+
+    int? day, monthNum, year;
+    MonthData? monthData;
+
+    // Handle patterns like "25 02" (day month) or "Feb 2025" (month year)
+    if (tokens.length == 2) {
+      final first = tokens[0];
+      final second = tokens[1];
+
+      // Check if first token is a month name and second is a year
+      if (_monthMap.containsKey(first)) {
+        final yearValue = int.tryParse(second);
+        if (yearValue != null && yearValue >= 1900 && yearValue <= 2100) {
+          monthNum = _monthMap[first];
+          year = yearValue;
+        }
+      }
+      // Check if both are numbers - could be day+month or month+day
+      else {
+        final firstNum = int.tryParse(first);
+        final secondNum = int.tryParse(second);
+
+        if (firstNum != null && secondNum != null) {
+          if (secondNum >= 1900 && secondNum <= 2100) {
+            if (firstNum >= 1 && firstNum <= 12) {
+              monthNum = firstNum;
+              year = secondNum;
+            }
+          } else if (firstNum >= 1 &&
+              firstNum <= 31 &&
+              secondNum >= 1 &&
+              secondNum <= 12) {
+            day = firstNum;
+            monthNum = secondNum;
+          } else if (firstNum >= 1 &&
+              firstNum <= 12 &&
+              secondNum >= 1 &&
+              secondNum <= 31) {
+            monthNum = firstNum;
+            day = secondNum;
+          }
+        }
+      }
+    }
+
+    if (day == null && monthNum == null && year == null) {
+      for (var token in tokens) {
+        if (_monthMap.containsKey(token)) {
+          monthNum = _monthMap[token];
+        } else if (RegExp(r'^\d+$').hasMatch(token)) {
+          final value = int.parse(token);
+          if (value >= 1900 && value <= 2100) {
+            year = value;
+          } else if (value >= 1 && value <= 31) {
+            if (day == null) {
+              day = value;
+            } else if (monthNum == null && value <= 12) {
+              monthNum = value;
+            }
+          } else if (value >= 32 && value <= 99) {
+            year = value < 50 ? 2000 + value : 1900 + value;
+          }
+        }
+      }
+    }
+
+    if (monthNum != null && monthNumberToName.containsKey(monthNum)) {
+      monthData = MonthData(monthNumberToName[monthNum]!, monthNum);
+    }
+
+    if (monthNum != null && (monthNum < 1 || monthNum > 12)) {
+      monthNum = null;
+      monthData = null;
+    }
+    if (day != null && (day < 1 || day > 31)) {
+      day = null;
+    }
+
+    return Tuple3(day, monthData, year);
+  }
+
+  Tuple3<int?, MonthData?, int?> parseDate(String input) {
+    return _parseDateParts(input);
+  }
+
+  List<Tuple3<int?, MonthData?, int?>> parseDateVariations(String input) {
+    final List<Tuple3<int?, MonthData?, int?>> variations = [];
+    final primaryResult = _parseDateParts(input);
+
+    variations.add(primaryResult);
+
+    if (primaryResult.item1 != null &&
+        primaryResult.item2 != null &&
+        primaryResult.item3 != null) {
+      final genericVersion = Tuple3(
+        primaryResult.item1,
+        primaryResult.item2,
+        null,
+      );
+      if (!variations.contains(genericVersion)) {
+        variations.add(genericVersion);
+      }
+    }
+
+    return variations;
+  }
+ 
+  bool isYearQuery(String input) {
+    final yearOnlyMatch = RegExp(r'^\s*(\d{4})\s*$').firstMatch(input.trim());
+    if (yearOnlyMatch != null) {
+      final year = int.tryParse(yearOnlyMatch.group(1)!);
+      return year != null && year >= 1900 && year <= 2100;
+    }
+    return false;
+  }
+ 
+  bool isMonthYearQuery(String input) {
+    final result = _parseDateParts(input);
+    return result.item1 == null && result.item2 != null && result.item3 != null;
+  }
+ 
+  bool isGenericDateQuery(String input) {
+    final result = _parseDateParts(input);
+    return result.item1 != null && result.item2 != null && result.item3 == null;
+  }
+}
diff --git a/mobile/apps/photos/lib/services/search_service.dart b/mobile/apps/photos/lib/services/search_service.dart
index f0429ed947..8c77d10d8e 100644
--- a/mobile/apps/photos/lib/services/search_service.dart
+++ b/mobile/apps/photos/lib/services/search_service.dart
@@ -44,6 +44,7 @@ import "package:photos/models/search/search_types.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/date_parse_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";
@@ -60,7 +61,6 @@ import "package:photos/utils/cache_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 {
   Future<List<EnteFile>>? _cachedFilesFuture;
@@ -1172,20 +1172,56 @@ class SearchService {
     String query,
   ) async {
     final List<GenericSearchResult> searchResults = [];
-    final potentialDates = _getPossibleEventDate(context, query);
 
-    for (var potentialDate in potentialDates) {
-      final int day = potentialDate.item1;
-      final int month = potentialDate.item2.monthNumber;
-      final int? year = potentialDate.item3; // nullable
-      final matchedFiles =
-          await FilesDB.instance.getFilesCreatedWithinDurations(
-        _getDurationsForCalendarDateInEveryYear(day, month, year: year),
-        ignoreCollections(),
-        order: 'DESC',
-      );
-      if (matchedFiles.isNotEmpty) {
-        final name = '$day ${potentialDate.item2.name} ${year ?? ''}';
+    final dateVariations = DateParseService.instance.parseDateVariations(query);
+
+    // Handle month-year queries
+    if (DateParseService.instance.isMonthYearQuery(query)) {
+      final monthYearResult = DateParseService.instance.parseDate(query);
+      if (monthYearResult.item2 != null && monthYearResult.item3 != null) {
+        final month = monthYearResult.item2!.monthNumber;
+        final year = monthYearResult.item3!;
+        final monthYearFiles =
+            await FilesDB.instance.getFilesCreatedWithinDurations(
+          [_getDurationForMonthInYear(month, year)],
+          ignoreCollections(),
+          order: 'DESC',
+        );
+        if (monthYearFiles.isNotEmpty) {
+          final name = '${monthYearResult.item2!.name} $year';
+          searchResults.add(
+            GenericSearchResult(
+              ResultType.month,
+              name,
+              monthYearFiles,
+              hierarchicalSearchFilter: TopLevelGenericFilter(
+                filterName: name,
+                occurrence: kMostRelevantFilter,
+                filterResultType: ResultType.month,
+                matchedUploadedIDs: filesToUploadedFileIDs(monthYearFiles),
+                filterIcon: Icons.calendar_month_outlined,
+              ),
+            ),
+          );
+        }
+      }
+    }
+
+    for (final dateVar in dateVariations) {
+      if (dateVar.item1 != null && dateVar.item2 != null) {
+        final int day = dateVar.item1!;
+        final int month = dateVar.item2!.monthNumber;
+        final int? year = dateVar.item3; // nullable for generic dates
+
+        final matchedFiles =
+            await FilesDB.instance.getFilesCreatedWithinDurations(
+          _getDurationsForCalendarDateInEveryYear(day, month, year: year),
+          ignoreCollections(),
+          order: 'DESC',
+        );
+
+        final name =
+            '$day ${dateVar.item2!.name}${year != null ? ' $year' : ''}';
         searchResults.add(
           GenericSearchResult(
             ResultType.event,
@@ -1641,55 +1677,12 @@ class SearchService {
     return durationsOfMonthInEveryYear;
   }
 
-  List<Tuple3<int, MonthData, int?>> _getPossibleEventDate(
-    BuildContext context,
-    String query,
-  ) {
-    final List<Tuple3<int, MonthData, int?>> possibleEvents = [];
-    if (query.trim().isEmpty) {
-      return possibleEvents;
-    }
-    final result = query
-        .trim()
-        .split(RegExp('[ ,-/]+'))
-        .map((e) => e.trim())
-        .where((e) => e.isNotEmpty)
-        .toList();
-    final resultCount = result.length;
-    if (resultCount < 1 || resultCount > 4) {
-      return possibleEvents;
-    }
-
-    final int? day = int.tryParse(result[0]);
-    if (day == null || day < 1 || day > 31) {
-      return possibleEvents;
-    }
-    final List<MonthData> potentialMonth = resultCount > 1
-        ? _getMatchingMonths(context, result[1])
-        : getMonthData(context);
-    final int? parsedYear = resultCount >= 3 ? int.tryParse(result[2]) : null;
-    final List<int> matchingYears = [];
-    if (parsedYear != null) {
-      bool foundMatch = false;
-      for (int i = searchStartYear; i <= currentYear; i++) {
-        if (i.toString().startsWith(parsedYear.toString())) {
-          matchingYears.add(i);
-          foundMatch = foundMatch || (i == parsedYear);
-        }
-      }
-      if (!foundMatch && parsedYear > 1000 && parsedYear <= currentYear) {
-        matchingYears.add(parsedYear);
-      }
-    }
-    for (var element in potentialMonth) {
-      if (matchingYears.isEmpty) {
-        possibleEvents.add(Tuple3(day, element, null));
-      } else {
-        for (int yr in matchingYears) {
-          possibleEvents.add(Tuple3(day, element, yr));
-        }
-      }
-    }
-    return possibleEvents;
+  List<int> _getDurationForMonthInYear(int month, int year) {
+    return [
+      DateTime(year, month, 1).microsecondsSinceEpoch,
+      month == 12
+          ? DateTime(year + 1, 1, 1).microsecondsSinceEpoch
+          : DateTime(year, month + 1, 1).microsecondsSinceEpoch,
+    ];
   }
 }

From be6f596b7938919a123065a7d90a74988b5653fc Mon Sep 17 00:00:00 2001
From: AmanRajSinghMourya <amanrajmourya7@gmail.com>
Date: Mon, 14 Jul 2025 15:02:58 +0530
Subject: [PATCH 02/29] Minor improvements around date search parsing

---
 .../lib/services/date_parse_service.dart      | 78 ++++++++++---------
 .../photos/lib/services/search_service.dart   | 53 ++++++-------
 2 files changed, 70 insertions(+), 61 deletions(-)

diff --git a/mobile/apps/photos/lib/services/date_parse_service.dart b/mobile/apps/photos/lib/services/date_parse_service.dart
index 01cd898f19..f70bafe2ea 100644
--- a/mobile/apps/photos/lib/services/date_parse_service.dart
+++ b/mobile/apps/photos/lib/services/date_parse_service.dart
@@ -7,13 +7,40 @@ class DateParseService {
   DateParseService._privateConstructor();
 
   static const Map<String, int> _monthMap = {
-    "january": 1, "february": 2, "march": 3, "april": 4,
-    "may": 5, "june": 6, "july": 7, "august": 8,
-    "september": 9, "october": 10, "november": 11, "december": 12,
-    "jan": 1, "feb": 2, "mar": 3, "apr": 4, "jun": 6,
-    "jul": 7, "aug": 8, "sep": 9, "sept": 9, "oct": 10, "nov": 11, "dec": 12,
-    "janu": 1, "febr": 2, "marc": 3, "apri": 4, "juli": 7,
-    "augu": 8, "sepe": 9, "octo": 10, "nove": 11, "dece": 12,
+    "january": 1,
+    "february": 2,
+    "march": 3,
+    "april": 4,
+    "may": 5,
+    "june": 6,
+    "july": 7,
+    "august": 8,
+    "september": 9,
+    "october": 10,
+    "november": 11,
+    "december": 12,
+    "jan": 1,
+    "feb": 2,
+    "mar": 3,
+    "apr": 4,
+    "jun": 6,
+    "jul": 7,
+    "aug": 8,
+    "sep": 9,
+    "sept": 9,
+    "oct": 10,
+    "nov": 11,
+    "dec": 12,
+    "janu": 1,
+    "febr": 2,
+    "marc": 3,
+    "apri": 4,
+    "juli": 7,
+    "augu": 8,
+    "sepe": 9,
+    "octo": 10,
+    "nove": 11,
+    "dece": 12,
   };
 
   static const Map<int, String> monthNumberToName = {
@@ -74,11 +101,11 @@ class DateParseService {
       }
 
       // Heuristic: if first number > 12, assume DD/MM format
-      if (first > 12) { 
+      if (first > 12) {
         if (second > 12) return const Tuple3(null, null, null);
         return Tuple3(first, second, year);
-      } else { 
-        if (first > 12) return const Tuple3(null, null, null);
+      } else {
+        if (second > 12) return const Tuple3(null, null, null);
         return Tuple3(second, first, year);
       }
     }
@@ -105,7 +132,7 @@ class DateParseService {
         if (second > 12) return const Tuple3(null, null, null);
         return Tuple3(first, second, year);
       } else {
-        if (first > 12) return const Tuple3(null, null, null);
+        if (second > 12) return const Tuple3(null, null, null);
         return Tuple3(second, first, year);
       }
     }
@@ -178,11 +205,11 @@ class DateParseService {
         return const Tuple3(null, null, null);
       }
 
-      if (first > 12) { 
+      if (first > 12) {
         if (second > 12) return const Tuple3(null, null, null);
         return Tuple3(first, second, null);
-      } else { 
-        if (first > 12) return const Tuple3(null, null, null);
+      } else {
+        if (second > 12) return const Tuple3(null, null, null);
         return Tuple3(second, first, null);
       }
     }
@@ -334,23 +361,9 @@ class DateParseService {
     final primaryResult = _parseDateParts(input);
 
     variations.add(primaryResult);
-
-    if (primaryResult.item1 != null &&
-        primaryResult.item2 != null &&
-        primaryResult.item3 != null) {
-      final genericVersion = Tuple3(
-        primaryResult.item1,
-        primaryResult.item2,
-        null,
-      );
-      if (!variations.contains(genericVersion)) {
-        variations.add(genericVersion);
-      }
-    }
-
     return variations;
   }
- 
+
   bool isYearQuery(String input) {
     final yearOnlyMatch = RegExp(r'^\s*(\d{4})\s*$').firstMatch(input.trim());
     if (yearOnlyMatch != null) {
@@ -359,12 +372,7 @@ class DateParseService {
     }
     return false;
   }
- 
-  bool isMonthYearQuery(String input) {
-    final result = _parseDateParts(input);
-    return result.item1 == null && result.item2 != null && result.item3 != null;
-  }
- 
+
   bool isGenericDateQuery(String input) {
     final result = _parseDateParts(input);
     return result.item1 != null && result.item2 != null && result.item3 == null;
diff --git a/mobile/apps/photos/lib/services/search_service.dart b/mobile/apps/photos/lib/services/search_service.dart
index 8c77d10d8e..f09007c6ee 100644
--- a/mobile/apps/photos/lib/services/search_service.dart
+++ b/mobile/apps/photos/lib/services/search_service.dart
@@ -1175,12 +1175,13 @@ class SearchService {
 
     final dateVariations = DateParseService.instance.parseDateVariations(query);
 
-    // Handle month-year queries
-    if (DateParseService.instance.isMonthYearQuery(query)) {
-      final monthYearResult = DateParseService.instance.parseDate(query);
-      if (monthYearResult.item2 != null && monthYearResult.item3 != null) {
-        final month = monthYearResult.item2!.monthNumber;
-        final year = monthYearResult.item3!;
+    for (final dateVar in dateVariations) {
+      // Handle month-year queries
+      if (dateVar.item1 == null &&
+          dateVar.item2 != null &&
+          dateVar.item3 != null) {
+        final month = dateVar.item2!.monthNumber;
+        final year = dateVar.item3!;
         final monthYearFiles =
             await FilesDB.instance.getFilesCreatedWithinDurations(
           [_getDurationForMonthInYear(month, year)],
@@ -1188,7 +1189,7 @@ class SearchService {
           order: 'DESC',
         );
         if (monthYearFiles.isNotEmpty) {
-          final name = '${monthYearResult.item2!.name} $year';
+          final name = '${dateVar.item2!.name} $year';
           searchResults.add(
             GenericSearchResult(
               ResultType.month,
@@ -1205,10 +1206,8 @@ class SearchService {
           );
         }
       }
-    }
-
-    for (final dateVar in dateVariations) {
-      if (dateVar.item1 != null && dateVar.item2 != null) {
+      // Handle day-month queries (with or without year)
+      else if (dateVar.item1 != null && dateVar.item2 != null) {
         final int day = dateVar.item1!;
         final int month = dateVar.item2!.monthNumber;
         final int? year = dateVar.item3; // nullable for generic dates
@@ -1220,22 +1219,24 @@ class SearchService {
           order: 'DESC',
         );
 
-        final name =
-            '$day ${dateVar.item2!.name}${year != null ? ' $year' : ''}';
-        searchResults.add(
-          GenericSearchResult(
-            ResultType.event,
-            name,
-            matchedFiles,
-            hierarchicalSearchFilter: TopLevelGenericFilter(
-              filterName: name,
-              occurrence: kMostRelevantFilter,
-              filterResultType: ResultType.event,
-              matchedUploadedIDs: filesToUploadedFileIDs(matchedFiles),
-              filterIcon: Icons.event_outlined,
+        if (matchedFiles.isNotEmpty) {
+          final name =
+              '$day ${dateVar.item2!.name}${year != null ? ' $year' : ''}';
+          searchResults.add(
+            GenericSearchResult(
+              ResultType.event,
+              name,
+              matchedFiles,
+              hierarchicalSearchFilter: TopLevelGenericFilter(
+                filterName: name,
+                occurrence: kMostRelevantFilter,
+                filterResultType: ResultType.event,
+                matchedUploadedIDs: filesToUploadedFileIDs(matchedFiles),
+                filterIcon: Icons.event_outlined,
+              ),
             ),
-          ),
-        );
+          );
+        }
       }
     }
     return searchResults;

From 209291e09a5fce3d424737447b6fa3f529ba1f61 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 23 Jul 2025 10:32:58 +0200
Subject: [PATCH 03/29] Rename isolate components for clarity

---
 .../face_clustering_service.dart              |   7 +-
 .../face_thumbnail_generator.dart             |   4 +-
 .../machine_learning/ml_computer.dart         |   4 +-
 .../machine_learning/ml_indexing_isolate.dart |   4 +-
 .../isolate/isolate_operations.dart}          |   0
 .../isolate/super_isolate.dart}               |   2 +-
 mobile/apps/photos/pubspec.lock               | 114 +++++++++---------
 7 files changed, 68 insertions(+), 67 deletions(-)
 rename mobile/apps/photos/lib/{services/isolate_functions.dart => utils/isolate/isolate_operations.dart} (100%)
 rename mobile/apps/photos/lib/{services/isolate_service.dart => utils/isolate/super_isolate.dart} (99%)

diff --git a/mobile/apps/photos/lib/services/machine_learning/face_ml/face_clustering/face_clustering_service.dart b/mobile/apps/photos/lib/services/machine_learning/face_ml/face_clustering/face_clustering_service.dart
index 2e79215cf1..b11ff67fb5 100644
--- a/mobile/apps/photos/lib/services/machine_learning/face_ml/face_clustering/face_clustering_service.dart
+++ b/mobile/apps/photos/lib/services/machine_learning/face_ml/face_clustering/face_clustering_service.dart
@@ -8,11 +8,11 @@ import "package:ml_linalg/dtype.dart";
 import "package:ml_linalg/vector.dart";
 import "package:photos/generated/protos/ente/common/vector.pb.dart";
 import "package:photos/models/base/id.dart";
-import "package:photos/services/isolate_functions.dart";
-import "package:photos/services/isolate_service.dart";
 import "package:photos/services/machine_learning/face_ml/face_clustering/face_db_info_for_clustering.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/isolate/isolate_operations.dart";
+import "package:photos/utils/isolate/super_isolate.dart";
 
 class FaceInfo {
   final String faceID;
@@ -507,7 +507,8 @@ ClusteringResult _runCompleteClustering(Map args) {
           EVector.fromBuffer(entry.value).values,
           dtype: DType.float32,
         ),
-        fileCreationTime: fileIDToCreationTime?[getFileIdFromFaceId<int>(entry.key)],
+        fileCreationTime:
+            fileIDToCreationTime?[getFileIdFromFaceId<int>(entry.key)],
       ),
     );
   }
diff --git a/mobile/apps/photos/lib/services/machine_learning/face_thumbnail_generator.dart b/mobile/apps/photos/lib/services/machine_learning/face_thumbnail_generator.dart
index 4980f2e904..a51541863c 100644
--- a/mobile/apps/photos/lib/services/machine_learning/face_thumbnail_generator.dart
+++ b/mobile/apps/photos/lib/services/machine_learning/face_thumbnail_generator.dart
@@ -4,9 +4,9 @@ import 'dart:typed_data' show Uint8List;
 import "package:computer/computer.dart";
 import "package:logging/logging.dart";
 import "package:photos/models/ml/face/box.dart";
-import "package:photos/services/isolate_functions.dart";
-import "package:photos/services/isolate_service.dart";
 import "package:photos/utils/image_ml_util.dart";
+import "package:photos/utils/isolate/isolate_operations.dart";
+import "package:photos/utils/isolate/super_isolate.dart";
 
 final Computer _computer = Computer.shared();
 
diff --git a/mobile/apps/photos/lib/services/machine_learning/ml_computer.dart b/mobile/apps/photos/lib/services/machine_learning/ml_computer.dart
index edbc16b7ff..939d486f64 100644
--- a/mobile/apps/photos/lib/services/machine_learning/ml_computer.dart
+++ b/mobile/apps/photos/lib/services/machine_learning/ml_computer.dart
@@ -2,12 +2,12 @@ import 'dart:async';
 
 import "package:logging/logging.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/ml_constants.dart";
 import "package:photos/services/machine_learning/semantic_search/clip/clip_text_encoder.dart";
 import "package:photos/services/machine_learning/semantic_search/query_result.dart";
 import "package:photos/services/remote_assets_service.dart";
+import "package:photos/utils/isolate/isolate_operations.dart";
+import "package:photos/utils/isolate/super_isolate.dart";
 import "package:synchronized/synchronized.dart";
 
 class MLComputer extends SuperIsolate {
diff --git a/mobile/apps/photos/lib/services/machine_learning/ml_indexing_isolate.dart b/mobile/apps/photos/lib/services/machine_learning/ml_indexing_isolate.dart
index e66848bb27..b386674b31 100644
--- a/mobile/apps/photos/lib/services/machine_learning/ml_indexing_isolate.dart
+++ b/mobile/apps/photos/lib/services/machine_learning/ml_indexing_isolate.dart
@@ -2,14 +2,14 @@ import "dart:async";
 
 import "package:flutter/foundation.dart" show debugPrint;
 import "package:logging/logging.dart";
-import "package:photos/services/isolate_functions.dart";
-import "package:photos/services/isolate_service.dart";
 import 'package:photos/services/machine_learning/face_ml/face_detection/face_detection_service.dart';
 import 'package:photos/services/machine_learning/face_ml/face_embedding/face_embedding_service.dart';
 import "package:photos/services/machine_learning/ml_models_overview.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/remote_assets_service.dart";
+import "package:photos/utils/isolate/isolate_operations.dart";
+import "package:photos/utils/isolate/super_isolate.dart";
 import "package:photos/utils/ml_util.dart";
 import "package:photos/utils/network_util.dart";
 import "package:synchronized/synchronized.dart";
diff --git a/mobile/apps/photos/lib/services/isolate_functions.dart b/mobile/apps/photos/lib/utils/isolate/isolate_operations.dart
similarity index 100%
rename from mobile/apps/photos/lib/services/isolate_functions.dart
rename to mobile/apps/photos/lib/utils/isolate/isolate_operations.dart
diff --git a/mobile/apps/photos/lib/services/isolate_service.dart b/mobile/apps/photos/lib/utils/isolate/super_isolate.dart
similarity index 99%
rename from mobile/apps/photos/lib/services/isolate_service.dart
rename to mobile/apps/photos/lib/utils/isolate/super_isolate.dart
index 4a91c64473..f37c2d4b3b 100644
--- a/mobile/apps/photos/lib/services/isolate_service.dart
+++ b/mobile/apps/photos/lib/utils/isolate/super_isolate.dart
@@ -7,7 +7,7 @@ import "package:flutter/services.dart";
 import "package:logging/logging.dart";
 import "package:photos/core/error-reporting/isolate_logging.dart";
 import "package:photos/models/base/id.dart";
-import "package:photos/services/isolate_functions.dart";
+import "package:photos/utils/isolate/isolate_operations.dart";
 import "package:synchronized/synchronized.dart";
 
 abstract class SuperIsolate {
diff --git a/mobile/apps/photos/pubspec.lock b/mobile/apps/photos/pubspec.lock
index 58284d5f09..a5d14c3829 100644
--- a/mobile/apps/photos/pubspec.lock
+++ b/mobile/apps/photos/pubspec.lock
@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
+      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
       url: "https://pub.dev"
     source: hosted
-    version: "72.0.0"
+    version: "76.0.0"
   _flutterfire_internals:
     dependency: transitive
     description:
@@ -21,7 +21,7 @@ packages:
     dependency: transitive
     description: dart
     source: sdk
-    version: "0.3.2"
+    version: "0.3.3"
   adaptive_theme:
     dependency: "direct main"
     description:
@@ -34,10 +34,10 @@ packages:
     dependency: transitive
     description:
       name: analyzer
-      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
+      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
       url: "https://pub.dev"
     source: hosted
-    version: "6.7.0"
+    version: "6.11.0"
   android_intent_plus:
     dependency: "direct main"
     description:
@@ -130,10 +130,10 @@ packages:
     dependency: "direct main"
     description:
       name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
       url: "https://pub.dev"
     source: hosted
-    version: "2.11.0"
+    version: "2.12.0"
   battery_info:
     dependency: "direct main"
     description:
@@ -155,10 +155,10 @@ packages:
     dependency: transitive
     description:
       name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   brotli:
     dependency: transitive
     description:
@@ -268,10 +268,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -301,10 +301,10 @@ packages:
     dependency: transitive
     description:
       name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   code_builder:
     dependency: transitive
     description:
@@ -317,10 +317,10 @@ packages:
     dependency: "direct main"
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.1"
   computer:
     dependency: "direct main"
     description:
@@ -619,10 +619,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.2"
   fast_base58:
     dependency: "direct main"
     description:
@@ -668,10 +668,10 @@ packages:
     dependency: transitive
     description:
       name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "7.0.1"
   file_saver:
     dependency: "direct main"
     description:
@@ -1416,18 +1416,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.8"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.9"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -1536,10 +1536,10 @@ packages:
     dependency: transitive
     description:
       name: macros
-      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
+      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.2-main.4"
+    version: "0.1.3-main.0"
   maps_launcher:
     dependency: "direct main"
     description:
@@ -1552,10 +1552,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16+1"
+    version: "0.12.17"
   material_color_utilities:
     dependency: transitive
     description:
@@ -1645,10 +1645,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
       url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   mgrs_dart:
     dependency: transitive
     description:
@@ -1859,10 +1859,10 @@ packages:
     dependency: "direct main"
     description:
       name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   path_drawing:
     dependency: transitive
     description:
@@ -2019,10 +2019,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.5"
+    version: "3.1.6"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -2068,10 +2068,10 @@ packages:
     dependency: transitive
     description:
       name: process
-      sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32"
+      sha256: "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.2"
+    version: "5.0.3"
   proj4dart:
     dependency: transitive
     description:
@@ -2309,7 +2309,7 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   source_gen:
     dependency: transitive
     description:
@@ -2346,10 +2346,10 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.10.1"
   sprintf:
     dependency: transitive
     description:
@@ -2434,10 +2434,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.1"
   step_progress_indicator:
     dependency: "direct main"
     description:
@@ -2450,10 +2450,10 @@ packages:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   stream_transform:
     dependency: transitive
     description:
@@ -2466,10 +2466,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.4.1"
   styled_text:
     dependency: "direct main"
     description:
@@ -2522,34 +2522,34 @@ packages:
     dependency: transitive
     description:
       name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   test:
     dependency: "direct dev"
     description:
       name: test
-      sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e"
+      sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.25.7"
+    version: "1.25.15"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.4"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696"
+      sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.4"
+    version: "0.6.8"
   thermal:
     dependency: "direct main"
     description:
@@ -2813,10 +2813,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.5"
+    version: "14.3.1"
   volume_controller:
     dependency: transitive
     description:
@@ -2877,10 +2877,10 @@ packages:
     dependency: transitive
     description:
       name: webdriver
-      sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e"
+      sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.4"
   webkit_inspection_protocol:
     dependency: transitive
     description:
@@ -2978,5 +2978,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.5.0 <4.0.0"
+  dart: ">=3.7.0-0 <4.0.0"
   flutter: ">=3.24.0"

From 4260c3c7690d141addfdca0543e6a35e00c6e294 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 23 Jul 2025 10:33:31 +0200
Subject: [PATCH 04/29] Remove redundant code

---
 .../services/machine_learning/face_thumbnail_generator.dart    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mobile/apps/photos/lib/services/machine_learning/face_thumbnail_generator.dart b/mobile/apps/photos/lib/services/machine_learning/face_thumbnail_generator.dart
index a51541863c..60de96d1df 100644
--- a/mobile/apps/photos/lib/services/machine_learning/face_thumbnail_generator.dart
+++ b/mobile/apps/photos/lib/services/machine_learning/face_thumbnail_generator.dart
@@ -1,15 +1,12 @@
 import 'dart:async';
 import 'dart:typed_data' show Uint8List;
 
-import "package:computer/computer.dart";
 import "package:logging/logging.dart";
 import "package:photos/models/ml/face/box.dart";
 import "package:photos/utils/image_ml_util.dart";
 import "package:photos/utils/isolate/isolate_operations.dart";
 import "package:photos/utils/isolate/super_isolate.dart";
 
-final Computer _computer = Computer.shared();
-
 class FaceThumbnailGenerator extends SuperIsolate {
   @override
   Logger get logger => _logger;

From 1cc3499019449bf02f6342214b19f423e01466d4 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 23 Jul 2025 10:34:19 +0200
Subject: [PATCH 05/29] face thumbnail fix pragma entry point

---
 .../lib/services/machine_learning/face_thumbnail_generator.dart  | 1 +
 mobile/apps/photos/lib/utils/isolate/super_isolate.dart          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/mobile/apps/photos/lib/services/machine_learning/face_thumbnail_generator.dart b/mobile/apps/photos/lib/services/machine_learning/face_thumbnail_generator.dart
index 60de96d1df..b61763c782 100644
--- a/mobile/apps/photos/lib/services/machine_learning/face_thumbnail_generator.dart
+++ b/mobile/apps/photos/lib/services/machine_learning/face_thumbnail_generator.dart
@@ -7,6 +7,7 @@ import "package:photos/utils/image_ml_util.dart";
 import "package:photos/utils/isolate/isolate_operations.dart";
 import "package:photos/utils/isolate/super_isolate.dart";
 
+@pragma('vm:entry-point')
 class FaceThumbnailGenerator extends SuperIsolate {
   @override
   Logger get logger => _logger;
diff --git a/mobile/apps/photos/lib/utils/isolate/super_isolate.dart b/mobile/apps/photos/lib/utils/isolate/super_isolate.dart
index f37c2d4b3b..a2e509fabc 100644
--- a/mobile/apps/photos/lib/utils/isolate/super_isolate.dart
+++ b/mobile/apps/photos/lib/utils/isolate/super_isolate.dart
@@ -10,6 +10,7 @@ import "package:photos/models/base/id.dart";
 import "package:photos/utils/isolate/isolate_operations.dart";
 import "package:synchronized/synchronized.dart";
 
+@pragma('vm:entry-point')
 abstract class SuperIsolate {
   Logger get logger;
 

From b16c9af36bf322a433285ab4b314e0074c47872e Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 23 Jul 2025 10:47:01 +0200
Subject: [PATCH 06/29] Logging in super isolate when starting operation

---
 mobile/apps/photos/lib/utils/isolate/super_isolate.dart | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mobile/apps/photos/lib/utils/isolate/super_isolate.dart b/mobile/apps/photos/lib/utils/isolate/super_isolate.dart
index a2e509fabc..3a83eaef1b 100644
--- a/mobile/apps/photos/lib/utils/isolate/super_isolate.dart
+++ b/mobile/apps/photos/lib/utils/isolate/super_isolate.dart
@@ -81,6 +81,8 @@ abstract class SuperIsolate {
     if (rootToken != null) {
       BackgroundIsolateBinaryMessenger.ensureInitialized(rootToken);
     }
+    final logger = Logger('SuperIsolate');
+    logger.info('IsolateMain started');
 
     receivePort.listen((message) async {
       final taskID = message[0] as String;
@@ -88,6 +90,7 @@ abstract class SuperIsolate {
       final function = IsolateOperation.values[functionIndex];
       final args = message[2] as Map<String, dynamic>;
       final sendPort = message[3] as SendPort;
+      logger.info("Starting isolate operation $function in isolate");
 
       late final Object data;
       try {

From 1718e5d1d6d657eb1ac54d8d644f1145bfe61ccc Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 23 Jul 2025 11:33:30 +0200
Subject: [PATCH 07/29] More careful logging

---
 mobile/apps/photos/lib/db/ml/db.dart          | 12 ++++++
 .../face_thumbnail_generator.dart             | 40 ++++++++++++-------
 .../ui/viewer/people/person_face_widget.dart  | 12 ++++--
 .../lib/utils/face/face_thumbnail_cache.dart  |  6 ++-
 .../apps/photos/lib/utils/image_ml_util.dart  |  2 +-
 5 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/mobile/apps/photos/lib/db/ml/db.dart b/mobile/apps/photos/lib/db/ml/db.dart
index 851e349d00..5ab5d28c8b 100644
--- a/mobile/apps/photos/lib/db/ml/db.dart
+++ b/mobile/apps/photos/lib/db/ml/db.dart
@@ -360,6 +360,10 @@ class MLDataDB with SqlDbBase implements IMLDataDB<int> {
         }
         return mapRowToFace(faceMaps.first);
       }
+    } else if (clusterID == null) {
+      _logger.severe(
+        "Didn't find any faces for personID $personID in `getCoverFaceForPerson`.",
+      );
     }
     if (clusterID != null) {
       const String queryFaceID = '''
@@ -380,11 +384,19 @@ class MLDataDB with SqlDbBase implements IMLDataDB<int> {
             return face;
           }
         }
+      } else {
+        _logger.severe(
+          "Didn't find any faces for clusterID $clusterID in `getCoverFaceForPerson`. faces: $faces",
+        );
       }
     }
     if (personID == null && clusterID == null) {
+      _logger.severe("personID and clusterID cannot be null both");
       throw Exception("personID and clusterID cannot be null");
     }
+    _logger.severe(
+      "Something went wrong finding a face from `getCoverFaceForPerson` (personID: $personID, clusterID: $clusterID)",
+    );
     return null;
   }
 
diff --git a/mobile/apps/photos/lib/services/machine_learning/face_thumbnail_generator.dart b/mobile/apps/photos/lib/services/machine_learning/face_thumbnail_generator.dart
index b61763c782..6e09744cff 100644
--- a/mobile/apps/photos/lib/services/machine_learning/face_thumbnail_generator.dart
+++ b/mobile/apps/photos/lib/services/machine_learning/face_thumbnail_generator.dart
@@ -35,20 +35,30 @@ class FaceThumbnailGenerator extends SuperIsolate {
     String imagePath,
     List<FaceBox> faceBoxes,
   ) async {
-    final List<Map<String, dynamic>> faceBoxesJson =
-        faceBoxes.map((box) => box.toJson()).toList();
-    final List<Uint8List> faces = await runInIsolate(
-      IsolateOperation.generateFaceThumbnails,
-      {
-        'imagePath': imagePath,
-        'faceBoxesList': faceBoxesJson,
-      },
-    ).then((value) => value.cast<Uint8List>());
-    final compressedFaces =
-        await compressFaceThumbnails({'listPngBytes': faces});
-    _logger.fine(
-      "Compressed face thumbnails from sizes ${faces.map((e) => e.length / 1024).toList()} to ${compressedFaces.map((e) => e.length / 1024).toList()} kilobytes",
-    );
-    return compressedFaces;
+    try {
+      _logger.info(
+        "Generating face thumbnails for ${faceBoxes.length} face boxes in $imagePath",
+      );
+      final List<Map<String, dynamic>> faceBoxesJson =
+          faceBoxes.map((box) => box.toJson()).toList();
+      final List<Uint8List> faces = await runInIsolate(
+        IsolateOperation.generateFaceThumbnails,
+        {
+          'imagePath': imagePath,
+          'faceBoxesList': faceBoxesJson,
+        },
+      ).then((value) => value.cast<Uint8List>());
+      _logger.info("Generated face thumbnails");
+      final compressedFaces =
+          await compressFaceThumbnails({'listPngBytes': faces});
+      _logger.fine(
+        "Compressed face thumbnails from sizes ${faces.map((e) => e.length / 1024).toList()} to ${compressedFaces.map((e) => e.length / 1024).toList()} kilobytes",
+      );
+      return compressedFaces;
+    } catch (e, s) {
+      _logger.severe("Failed to generate face thumbnails", e, s);
+
+      rethrow;
+    }
   }
 }
diff --git a/mobile/apps/photos/lib/ui/viewer/people/person_face_widget.dart b/mobile/apps/photos/lib/ui/viewer/people/person_face_widget.dart
index 8bd069f57e..0327c5853d 100644
--- a/mobile/apps/photos/lib/ui/viewer/people/person_face_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/people/person_face_widget.dart
@@ -163,7 +163,7 @@ class _PersonFaceWidgetState extends State<PersonFaceWidget> {
           }
         }
         if (fileForFaceCrop == null) {
-          _logger.warning(
+          _logger.severe(
             "No suitable file found for face crop for person: ${widget.personId} or cluster: ${widget.clusterID}",
           );
           return null;
@@ -176,7 +176,7 @@ class _PersonFaceWidgetState extends State<PersonFaceWidget> {
         clusterID: widget.clusterID,
       );
       if (face == null) {
-        debugPrint(
+        _logger.severe(
           "No cover face for person: ${widget.personId} or cluster ${widget.clusterID} and fileID ${fileForFaceCrop.uploadedFileID!}",
         );
         return null;
@@ -188,7 +188,13 @@ class _PersonFaceWidgetState extends State<PersonFaceWidget> {
         personOrClusterID: personOrClusterId,
         useTempCache: false,
       );
-      return cropMap?[face.faceID];
+      final result = cropMap?[face.faceID];
+      if (result == null) {
+        _logger.severe(
+          "Null cover face crop for person: ${widget.personId} or cluster ${widget.clusterID} and fileID ${fileForFaceCrop.uploadedFileID!}",
+        );
+      }
+      return result;
     } catch (e, s) {
       _logger.severe(
         "Error getting cover face for person: ${widget.personId} or cluster ${widget.clusterID}",
diff --git a/mobile/apps/photos/lib/utils/face/face_thumbnail_cache.dart b/mobile/apps/photos/lib/utils/face/face_thumbnail_cache.dart
index 117793173f..448eb7789a 100644
--- a/mobile/apps/photos/lib/utils/face/face_thumbnail_cache.dart
+++ b/mobile/apps/photos/lib/utils/face/face_thumbnail_cache.dart
@@ -129,7 +129,7 @@ Future<Map<String, Uint8List>?> getCachedFaceCrops(
               );
               faceIdToCrop[face.faceID] = data;
             } else {
-              _logger.warning(
+              _logger.severe(
                 "Cached face crop for faceID ${face.faceID} is empty, deleting file ${faceCropCacheFile.path}",
               );
               await faceCropCacheFile.delete();
@@ -231,7 +231,7 @@ Future<Map<String, Uint8List>?> getCachedFaceCrops(
         s,
       );
     } else {
-      _logger.info(
+      _logger.severe(
         "Stopped getting face crops for faceIDs: ${faces.map((face) => face.faceID).toList()} due to $e",
       );
     }
@@ -334,12 +334,14 @@ Future<Map<String, Uint8List>?> _getFaceCrops(
   if (useFullFile && file.fileType != FileType.video) {
     final File? ioFile = await getFile(file);
     if (ioFile == null) {
+      _logger.severe("Failed to get file for face crop generation");
       return null;
     }
     imagePath = ioFile.path;
   } else {
     final thumbnail = await getThumbnailForUploadedFile(file);
     if (thumbnail == null) {
+      _logger.severe("Failed to get thumbnail for face crop generation");
       return null;
     }
     imagePath = thumbnail.path;
diff --git a/mobile/apps/photos/lib/utils/image_ml_util.dart b/mobile/apps/photos/lib/utils/image_ml_util.dart
index 0ab1428fea..ab8b4a4e0f 100644
--- a/mobile/apps/photos/lib/utils/image_ml_util.dart
+++ b/mobile/apps/photos/lib/utils/image_ml_util.dart
@@ -575,7 +575,7 @@ Future<List<Uint8List>> compressFaceThumbnails(Map args) async {
     }
     return await Future.wait(compressedBytesList);
   } catch (e, s) {
-    _logger.warning(
+    _logger.severe(
       'Failed to compress face thumbnail, using original. Size: ${listPngBytes.map((e) => e.length).toList()} bytes',
       e,
       s,

From 3bba125f1ccfc6adea534a32f67ca335bc701902 Mon Sep 17 00:00:00 2001
From: max977 <max77@writeme.com>
Date: Wed, 23 Jul 2025 11:51:25 +0200
Subject: [PATCH 08/29] custom-icon-startmail

Adding Custom Icon for Startmail
---
 .../assets/custom-icons/_data/custom-icons.json   |  4 ++++
 .../auth/assets/custom-icons/icons/startmail.svg  | 15 +++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100755 mobile/apps/auth/assets/custom-icons/icons/startmail.svg

diff --git a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
index 129e14ca96..ba42bb47f1 100644
--- a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
+++ b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
@@ -1295,6 +1295,10 @@
         "PAYDAY 3"
       ]
     },
+    {
+      "title": "Startmail",
+      "slug": "startmail"
+    },
     {
       "title": "STRATO",
       "hex": "FF8800"
diff --git a/mobile/apps/auth/assets/custom-icons/icons/startmail.svg b/mobile/apps/auth/assets/custom-icons/icons/startmail.svg
new file mode 100755
index 0000000000..3df4bc496b
--- /dev/null
+++ b/mobile/apps/auth/assets/custom-icons/icons/startmail.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="500px" height="500px" viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#6573FF;}
+	.st1{fill:#202945;}
+</style>
+<g>
+	<path class="st0" d="M500,47.2C500,20.9,478.6,0,452.9,0H47.7C21.4-0.5,0,20.9,0,47.2v43.9c0,0,186.4,180.6,250.5,180.6
+		C319.6,271.7,500,92.2,500,92.2S500,56.5,500,47.2z"/>
+	<path class="st1" d="M0,452.8C0,479.1,21.4,500,47.2,500h405.6c26.3,0,47.2-21.4,47.2-47.2V142.7c0,0-159.2,184.4-249.7,184.4
+		C160.8,327.1,0,178.4,0,178.4C0,236.6,0,395.2,0,452.8z"/>
+</g>
+</svg>

From a06a5be98382b7034b1fd5f37267e18a5ed6ddf7 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Wed, 23 Jul 2025 15:45:20 +0530
Subject: [PATCH 09/29] [mob] Skip dup fileID from src collection during copy

---
 .../lib/services/collections_service.dart     | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/mobile/apps/photos/lib/services/collections_service.dart b/mobile/apps/photos/lib/services/collections_service.dart
index ee3d662a63..a8c1986f1b 100644
--- a/mobile/apps/photos/lib/services/collections_service.dart
+++ b/mobile/apps/photos/lib/services/collections_service.dart
@@ -1427,12 +1427,20 @@ class CollectionsService {
       }
       // group files by collectionID
       final Map<int, List<EnteFile>> filesByCollection = {};
+      final Map<int, Set<int>> fileSeenByCollection = {};
       for (final file in filesToCopy) {
-        if (filesByCollection.containsKey(file.collectionID!)) {
-          filesByCollection[file.collectionID!]!.add(file.copyWith());
-        } else {
-          filesByCollection[file.collectionID!] = [file.copyWith()];
+        fileSeenByCollection.putIfAbsent(file.collectionID!, () => <int>{});
+        if (fileSeenByCollection[file.collectionID]!
+            .contains(file.uploadedFileID)) {
+          _logger.warning(
+            "skip copy, duplicate ID: ${file.uploadedFileID} in collection "
+            "${file.collectionID}",
+          );
+          continue;
         }
+        filesByCollection
+            .putIfAbsent(file.collectionID!, () => [])
+            .add(file.copyWith());
       }
       for (final entry in filesByCollection.entries) {
         final srcCollectionID = entry.key;
@@ -1579,9 +1587,6 @@ class CollectionsService {
       params["files"] = [];
       for (final batchFile in batch) {
         final fileKey = getFileKey(batchFile);
-        _logger.info(
-          "srcCollection : $srcCollectionID  file: ${batchFile.uploadedFileID}  key: ${CryptoUtil.bin2base64(fileKey)} ",
-        );
         final encryptedKeyData =
             CryptoUtil.encryptSync(fileKey, getCollectionKey(dstCollectionID));
         batchFile.encryptedKey =

From c2d1c668887ec5baca472d00f520c2cce24387ba Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 23 Jul 2025 12:45:09 +0200
Subject: [PATCH 10/29] keep alive face thumbnail when scrolling fast

---
 .../ui/viewer/people/person_face_widget.dart    | 12 +++++++++++-
 .../search/result/people_section_all_page.dart  | 17 +++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/mobile/apps/photos/lib/ui/viewer/people/person_face_widget.dart b/mobile/apps/photos/lib/ui/viewer/people/person_face_widget.dart
index 0327c5853d..3e1b138c26 100644
--- a/mobile/apps/photos/lib/ui/viewer/people/person_face_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/people/person_face_widget.dart
@@ -21,6 +21,7 @@ class PersonFaceWidget extends StatefulWidget {
   final String? clusterID;
   final bool useFullFile;
   final VoidCallback? onErrorCallback;
+  final bool keepAlive;
 
   // PersonFaceWidget constructor checks that both personId and clusterID are not null
   // and that the file is not null
@@ -29,6 +30,7 @@ class PersonFaceWidget extends StatefulWidget {
     this.clusterID,
     this.useFullFile = true,
     this.onErrorCallback,
+    this.keepAlive = false,
     super.key,
   }) : assert(
           personId != null || clusterID != null,
@@ -39,12 +41,16 @@ class PersonFaceWidget extends StatefulWidget {
   State<PersonFaceWidget> createState() => _PersonFaceWidgetState();
 }
 
-class _PersonFaceWidgetState extends State<PersonFaceWidget> {
+class _PersonFaceWidgetState extends State<PersonFaceWidget>
+    with AutomaticKeepAliveClientMixin {
   Future<Uint8List?>? faceCropFuture;
   EnteFile? fileForFaceCrop;
 
   bool get isPerson => widget.personId != null;
 
+  @override
+  bool get wantKeepAlive => widget.keepAlive;
+
   @override
   void initState() {
     super.initState();
@@ -64,6 +70,10 @@ class _PersonFaceWidgetState extends State<PersonFaceWidget> {
 
   @override
   Widget build(BuildContext context) {
+    super.build(
+      context,
+    ); // Calling super.build for AutomaticKeepAliveClientMixin
+
     return FutureBuilder<Uint8List?>(
       future: faceCropFuture,
       builder: (context, snapshot) {
diff --git a/mobile/apps/photos/lib/ui/viewer/search/result/people_section_all_page.dart b/mobile/apps/photos/lib/ui/viewer/search/result/people_section_all_page.dart
index d78eb4b9ba..d711bd9ebd 100644
--- a/mobile/apps/photos/lib/ui/viewer/search/result/people_section_all_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/search/result/people_section_all_page.dart
@@ -95,12 +95,14 @@ class SelectablePersonSearchExample extends StatelessWidget {
   final GenericSearchResult searchResult;
   final double size;
   final SelectedPeople selectedPeople;
+  final bool isDefaultFace;
 
   const SelectablePersonSearchExample({
     super.key,
     required this.searchResult,
     required this.selectedPeople,
     this.size = 102,
+    this.isDefaultFace = false,
   });
 
   void _handleTap(BuildContext context) {
@@ -192,7 +194,10 @@ class SelectablePersonSearchExample extends StatelessWidget {
                                 searchResult.previewThumbnail()!,
                                 shouldShowSyncStatus: false,
                               )
-                            : FaceSearchResult(searchResult);
+                            : FaceSearchResult(
+                                searchResult,
+                                isDefaultFace: isDefaultFace,
+                              );
                       } else {
                         child = const NoThumbnailWidget(
                           addBorder: false,
@@ -301,8 +306,13 @@ class SelectablePersonSearchExample extends StatelessWidget {
 
 class FaceSearchResult extends StatelessWidget {
   final SearchResult searchResult;
+  final bool isDefaultFace;
 
-  const FaceSearchResult(this.searchResult, {super.key});
+  const FaceSearchResult(
+    this.searchResult, {
+    super.key,
+    this.isDefaultFace = false,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -313,6 +323,7 @@ class FaceSearchResult extends StatelessWidget {
       key: params.containsKey(kPersonWidgetKey)
           ? ValueKey(params[kPersonWidgetKey])
           : ValueKey(params[kPersonParamID] ?? params[kClusterParamId]),
+      keepAlive: isDefaultFace,
     );
   }
 }
@@ -486,6 +497,7 @@ class _PeopleSectionAllWidgetState extends State<PeopleSectionAllWidget> {
                               searchResult: normalFaces[index],
                               size: itemSize,
                               selectedPeople: widget.selectedPeople!,
+                              isDefaultFace: true,
                             )
                           : PersonSearchExample(
                               searchResult: normalFaces[index],
@@ -525,6 +537,7 @@ class _PeopleSectionAllWidgetState extends State<PeopleSectionAllWidget> {
                                 searchResult: extraFaces[index],
                                 size: itemSize,
                                 selectedPeople: widget.selectedPeople!,
+                                isDefaultFace: false,
                               )
                             : PersonSearchExample(
                                 searchResult: extraFaces[index],

From 843e956a8aa8f6dd94ba1179aad649f3082eae73 Mon Sep 17 00:00:00 2001
From: Neeraj <neeraj.gupta983@gmail.com>
Date: Wed, 23 Jul 2025 16:45:04 +0530
Subject: [PATCH 11/29] [web] Update download link for auth apps

---
 web/apps/auth/src/pages/auth.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/apps/auth/src/pages/auth.tsx b/web/apps/auth/src/pages/auth.tsx
index 8f9e18733b..5c9809c9c6 100644
--- a/web/apps/auth/src/pages/auth.tsx
+++ b/web/apps/auth/src/pages/auth.tsx
@@ -405,7 +405,7 @@ const Footer: React.FC = () => {
         <Stack sx={{ my: "4rem", gap: 2, alignItems: "center" }}>
             <Typography>{t("auth_download_mobile_app")}</Typography>
             <a
-                href="https://github.com/ente-io/ente/tree/main/auth#-download"
+                href="https://ente.io/auth/#download-auth"
                 download
             >
                 <Button color="accent">{t("download")}</Button>

From 4a743be322daae0ff8d68911c3815121395ed53c Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Wed, 23 Jul 2025 16:41:55 +0530
Subject: [PATCH 12/29] [mob]Handle duplicate fileID during addOrCopy

---
 .../lib/services/collections_service.dart     | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/mobile/apps/photos/lib/services/collections_service.dart b/mobile/apps/photos/lib/services/collections_service.dart
index a8c1986f1b..86ed68924b 100644
--- a/mobile/apps/photos/lib/services/collections_service.dart
+++ b/mobile/apps/photos/lib/services/collections_service.dart
@@ -1648,17 +1648,27 @@ class CollectionsService {
     );
     final List<EnteFile> filesToCopy = [];
     final List<EnteFile> filesToAdd = [];
+    final Set<int> seenForAdd = {};
+    final Set<int> seenForCopy = {};
+
     for (final EnteFile file in othersFile) {
-      if (hashToUserFile.containsKey(file.hash ?? '')) {
-        final userFile = hashToUserFile[file.hash]!;
-        if (userFile.fileType == file.fileType) {
-          filesToAdd.add(userFile);
-        } else {
-          filesToCopy.add(file);
-        }
-      } else {
-        filesToCopy.add(file);
+      final userFile = hashToUserFile[file.hash ?? ''];
+      final bool shouldAdd =
+          userFile != null && userFile.fileType == file.fileType;
+      final targetList = shouldAdd ? filesToAdd : filesToCopy;
+      final seenSet = shouldAdd ? seenForAdd : seenForCopy;
+      final fileToProcess = shouldAdd ? userFile : file;
+      final uploadID = fileToProcess.uploadedFileID;
+
+      if (seenSet.contains(uploadID)) {
+        final action = shouldAdd ? "adding" : "copying";
+        _logger.warning(
+          "skip $action file $uploadID as it is already ${action}ed",
+        );
+        continue;
       }
+      targetList.add(fileToProcess);
+      seenSet.add(uploadID!);
     }
     return (filesToAdd, filesToCopy);
   }

From 968f04c04af4942b734cdcfd36bf960ee26c954a Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Wed, 23 Jul 2025 13:45:37 +0200
Subject: [PATCH 13/29] Lower severity logging

---
 mobile/apps/photos/lib/db/ml/db.dart                      | 8 --------
 .../apps/photos/lib/utils/face/face_thumbnail_cache.dart  | 8 ++++----
 mobile/apps/photos/lib/utils/image_ml_util.dart           | 2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/mobile/apps/photos/lib/db/ml/db.dart b/mobile/apps/photos/lib/db/ml/db.dart
index 5ab5d28c8b..bc0913f8fe 100644
--- a/mobile/apps/photos/lib/db/ml/db.dart
+++ b/mobile/apps/photos/lib/db/ml/db.dart
@@ -360,10 +360,6 @@ class MLDataDB with SqlDbBase implements IMLDataDB<int> {
         }
         return mapRowToFace(faceMaps.first);
       }
-    } else if (clusterID == null) {
-      _logger.severe(
-        "Didn't find any faces for personID $personID in `getCoverFaceForPerson`.",
-      );
     }
     if (clusterID != null) {
       const String queryFaceID = '''
@@ -384,10 +380,6 @@ class MLDataDB with SqlDbBase implements IMLDataDB<int> {
             return face;
           }
         }
-      } else {
-        _logger.severe(
-          "Didn't find any faces for clusterID $clusterID in `getCoverFaceForPerson`. faces: $faces",
-        );
       }
     }
     if (personID == null && clusterID == null) {
diff --git a/mobile/apps/photos/lib/utils/face/face_thumbnail_cache.dart b/mobile/apps/photos/lib/utils/face/face_thumbnail_cache.dart
index 448eb7789a..6f390fcf77 100644
--- a/mobile/apps/photos/lib/utils/face/face_thumbnail_cache.dart
+++ b/mobile/apps/photos/lib/utils/face/face_thumbnail_cache.dart
@@ -129,14 +129,14 @@ Future<Map<String, Uint8List>?> getCachedFaceCrops(
               );
               faceIdToCrop[face.faceID] = data;
             } else {
-              _logger.severe(
+              _logger.warning(
                 "Cached face crop for faceID ${face.faceID} is empty, deleting file ${faceCropCacheFile.path}",
               );
               await faceCropCacheFile.delete();
               facesWithoutCrops[face.faceID] = face.detection.box;
             }
           } catch (e, s) {
-            _logger.severe(
+            _logger.warning(
               "Error reading cached face crop for faceID ${face.faceID} from file ${faceCropCacheFile.path}",
               e,
               s,
@@ -212,7 +212,7 @@ Future<Map<String, Uint8List>?> getCachedFaceCrops(
           milliseconds: 100 * pow(2, fetchAttempt + 1).toInt(),
         );
         await Future.delayed(backoff);
-        _logger.warning(
+        _logger.fine(
           "Error getting face crops for faceIDs: ${faces.map((face) => face.faceID).toList()}, retrying (attempt ${fetchAttempt + 1}) in ${backoff.inMilliseconds} ms",
           e,
           s,
@@ -225,7 +225,7 @@ Future<Map<String, Uint8List>?> getCachedFaceCrops(
           useTempCache: useTempCache,
         );
       }
-      _logger.severe(
+      _logger.warning(
         "Error getting face crops for faceIDs: ${faces.map((face) => face.faceID).toList()}",
         e,
         s,
diff --git a/mobile/apps/photos/lib/utils/image_ml_util.dart b/mobile/apps/photos/lib/utils/image_ml_util.dart
index ab8b4a4e0f..0ab1428fea 100644
--- a/mobile/apps/photos/lib/utils/image_ml_util.dart
+++ b/mobile/apps/photos/lib/utils/image_ml_util.dart
@@ -575,7 +575,7 @@ Future<List<Uint8List>> compressFaceThumbnails(Map args) async {
     }
     return await Future.wait(compressedBytesList);
   } catch (e, s) {
-    _logger.severe(
+    _logger.warning(
       'Failed to compress face thumbnail, using original. Size: ${listPngBytes.map((e) => e.length).toList()} bytes',
       e,
       s,

From b58aeddeba45728c47fb9233f79c9a2275ea6146 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 24 Jul 2025 11:27:49 +0530
Subject: [PATCH 14/29] [mob][photos] Remove file entry for files that are
 already queued

---
 mobile/apps/photos/lib/db/files_db.dart       | 23 +++++++++++++++++++
 .../services/sync/remote_sync_service.dart    |  3 +++
 2 files changed, 26 insertions(+)

diff --git a/mobile/apps/photos/lib/db/files_db.dart b/mobile/apps/photos/lib/db/files_db.dart
index f8900f8912..3150dbc3b6 100644
--- a/mobile/apps/photos/lib/db/files_db.dart
+++ b/mobile/apps/photos/lib/db/files_db.dart
@@ -979,6 +979,29 @@ class FilesDB with SqlDbBase {
     return result;
   }
 
+  // remove references for local files which are either already uploaded
+  // or queued for upload but not yet uploaded
+  Future<int> removeQueuedLocalFiles(Set<String> localIDs) async {
+    final db = await instance.sqliteAsyncDB;
+    final inParam = localIDs.map((id) => "'$id'").join(',');
+    final r = await db.execute(
+      '''
+      DELETE FROM $filesTable
+      WHERE $columnLocalID IN ($inParam) and (collectionID IS NULL || collectionID = -1)
+      and ($columnUploadedFileID IS NULL OR $columnUploadedFileID = -1);
+    ''',
+    );
+    if (r.isNotEmpty) {
+      _logger.warning(
+        "Removed ${r.length} potential dups for already queued local files",
+      );
+    } else {
+      _logger.finest("No duplicate id found for queued/uploaded files");
+    }
+
+    return r.length;
+  }
+
   Future<Set<String>> getLocalFileIDsForCollection(int collectionID) async {
     final db = await instance.sqliteAsyncDB;
     final rows = await db.getAll(
diff --git a/mobile/apps/photos/lib/services/sync/remote_sync_service.dart b/mobile/apps/photos/lib/services/sync/remote_sync_service.dart
index d4523b27d0..d0e995a438 100644
--- a/mobile/apps/photos/lib/services/sync/remote_sync_service.dart
+++ b/mobile/apps/photos/lib/services/sync/remote_sync_service.dart
@@ -371,6 +371,9 @@ class RemoteSyncService {
         final Set<String> alreadyClaimedLocalIDs =
             await _db.getLocalIDsMarkedForOrAlreadyUploaded(ownerID);
         localIDsToSync.removeAll(alreadyClaimedLocalIDs);
+        if (alreadyClaimedLocalIDs.isNotEmpty) {
+          await _db.removeQueuedLocalFiles(alreadyClaimedLocalIDs);
+        }
       }
 
       if (localIDsToSync.isEmpty) {

From 98868dd76f302a590e4accc1a32f7ef99f38e1cb Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 24 Jul 2025 11:40:26 +0530
Subject: [PATCH 15/29] [web][auth] Lint fix

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

diff --git a/web/apps/auth/src/pages/auth.tsx b/web/apps/auth/src/pages/auth.tsx
index 5c9809c9c6..f74f0e7c8f 100644
--- a/web/apps/auth/src/pages/auth.tsx
+++ b/web/apps/auth/src/pages/auth.tsx
@@ -404,10 +404,7 @@ const Footer: React.FC = () => {
     return (
         <Stack sx={{ my: "4rem", gap: 2, alignItems: "center" }}>
             <Typography>{t("auth_download_mobile_app")}</Typography>
-            <a
-                href="https://ente.io/auth/#download-auth"
-                download
-            >
+            <a href="https://ente.io/auth/#download-auth" download>
                 <Button color="accent">{t("download")}</Button>
             </a>
         </Stack>

From daaf73664a250945cdd844d30c40e7cb72043f0f Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 24 Jul 2025 13:14:09 +0530
Subject: [PATCH 16/29] [server][db] Tweak autovacuum threshold for trash table

---
 .../102_trash_vaccume_and_analyze_threshold.down.sql        | 6 ++++++
 .../102_trash_vaccume_and_analyze_threshold.up.sql          | 6 ++++++
 2 files changed, 12 insertions(+)
 create mode 100644 server/migrations/102_trash_vaccume_and_analyze_threshold.down.sql
 create mode 100644 server/migrations/102_trash_vaccume_and_analyze_threshold.up.sql

diff --git a/server/migrations/102_trash_vaccume_and_analyze_threshold.down.sql b/server/migrations/102_trash_vaccume_and_analyze_threshold.down.sql
new file mode 100644
index 0000000000..3d2dc0b0bf
--- /dev/null
+++ b/server/migrations/102_trash_vaccume_and_analyze_threshold.down.sql
@@ -0,0 +1,6 @@
+ALTER TABLE trash RESET (
+    autovacuum_analyze_scale_factor,
+    autovacuum_vacuum_scale_factor,
+    autovacuum_analyze_threshold,
+    autovacuum_vacuum_threshold
+    );
\ No newline at end of file
diff --git a/server/migrations/102_trash_vaccume_and_analyze_threshold.up.sql b/server/migrations/102_trash_vaccume_and_analyze_threshold.up.sql
new file mode 100644
index 0000000000..5d61312da7
--- /dev/null
+++ b/server/migrations/102_trash_vaccume_and_analyze_threshold.up.sql
@@ -0,0 +1,6 @@
+ALTER TABLE trash SET (
+    autovacuum_analyze_scale_factor = 0.01,  -- Trigger ANALYZE after 1% of rows change
+    autovacuum_vacuum_scale_factor = 0.02,   -- Trigger VACUUM after 2% of rows change
+    autovacuum_analyze_threshold = 1000,
+    autovacuum_vacuum_threshold = 1000
+);

From 0b8f26d0bbd9585baefab22f3873940d13b6286a Mon Sep 17 00:00:00 2001
From: AmanRajSinghMourya <amanrajmourya7@gmail.com>
Date: Thu, 24 Jul 2025 14:12:46 +0530
Subject: [PATCH 17/29] Fix dare parsing file

---
 .../lib/services/date_parse_service.dart      | 579 +++++++++---------
 .../photos/lib/services/search_service.dart   | 118 ++--
 2 files changed, 342 insertions(+), 355 deletions(-)

diff --git a/mobile/apps/photos/lib/services/date_parse_service.dart b/mobile/apps/photos/lib/services/date_parse_service.dart
index f70bafe2ea..ef136d25ed 100644
--- a/mobile/apps/photos/lib/services/date_parse_service.dart
+++ b/mobile/apps/photos/lib/services/date_parse_service.dart
@@ -1,12 +1,54 @@
-import "package:photos/data/months.dart";
-import 'package:tuple/tuple.dart';
+import 'dart:collection';
+
+class PartialDate {
+  final int? day;
+  final int? month;
+  final int? year;
+
+  const PartialDate({this.day, this.month, this.year});
+
+  static const empty = PartialDate();
+
+  bool get isEmpty => day == null && month == null && year == null;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is PartialDate &&
+          runtimeType == other.runtimeType &&
+          day == other.day &&
+          month == other.month &&
+          year == other.year;
+
+  @override
+  int get hashCode => day.hashCode ^ month.hashCode ^ year.hashCode;
+
+  @override
+  String toString() {
+    return 'PartialDate(day: $day, month: $month, year: $year)';
+  }
+}
 
 class DateParseService {
-  static final DateParseService instance =
-      DateParseService._privateConstructor();
-  DateParseService._privateConstructor();
+  static final DateParseService instance = DateParseService._private();
+  DateParseService._private();
 
-  static const Map<String, int> _monthMap = {
+  static const int _MIN_YEAR = 1900;
+  static const int _MAX_YEAR = 2100;
+  static const int _TWO_DIGIT_YEAR_PIVOT = 50;
+
+  static final _ordinalRegex = RegExp(r'\b(\d{1,2})(st|nd|rd|th)\b');
+  static final _normalizeRegex = RegExp(r'\bof\b|[,\.]+|\s+');
+  static final _isoFormatRegex =
+      RegExp(r'^(\d{4})[\/-](\d{1,2})[\/-](\d{1,2})$');
+  static final _standardFormatRegex =
+      RegExp(r'^(\d{1,2})[\/-](\d{1,2})[\/-](\d{2,4})$');
+  static final _dotFormatRegex = RegExp(r'^(\d{1,2})\.(\d{1,2})\.(\d{2,4})$');
+  static final _compactFormatRegex = RegExp(r'^(\d{8})$');
+  static final _yearOnlyRegex = RegExp(r'^\s*(\d{4})\s*$');
+  static final _shortFormatRegex = RegExp(r'^(\d{1,2})[\/-](\d{1,2})$');
+
+  static final Map<String, int> _monthMap = UnmodifiableMapView({
     "january": 1,
     "february": 2,
     "march": 3,
@@ -41,7 +83,7 @@ class DateParseService {
     "octo": 10,
     "nove": 11,
     "dece": 12,
-  };
+  });
 
   static const Map<int, String> monthNumberToName = {
     1: "January",
@@ -58,323 +100,266 @@ class DateParseService {
     12: "December",
   };
 
-  String normalizeDateString(String input) {
+  PartialDate parse(String input) {
+    if (input.trim().isEmpty) return PartialDate.empty;
+
+    final lowerInput = input.toLowerCase();
+
+    var result = _parseRelativeDate(lowerInput);
+    if (!result.isEmpty) return result;
+
+    result = _parseStructuredFormats(lowerInput);
+    if (!result.isEmpty) return result;
+
+    final normalized = _normalizeDateString(lowerInput);
+    result = _parseTokenizedDate(normalized);
+
+    return result;
+  }
+
+  String getMonthName(int month) {
+    return monthNumberToName[month] ?? 'Unknown';
+  }
+
+  String _normalizeDateString(String input) {
     return input
-        .toLowerCase()
-        .replaceAllMapped(
-          RegExp(r'\b(\d{1,2})(st|nd|rd|th)\b'),
-          (match) => match.group(1)!,
-        )
-        .replaceAll(RegExp(r'\bof\b'), '')
-        .replaceAll(RegExp(r'[,\.]+'), '')
-        .replaceAll(RegExp(r'\s+'), ' ')
+        .replaceAllMapped(_ordinalRegex, (match) => match.group(1)!)
+        .replaceAll(_normalizeRegex, ' ')
         .trim();
   }
 
-  Tuple3<int?, int?, int?> parseStructuredFormats(String input) {
-    final normalized = input.replaceAll(RegExp(r'\s'), '');
-
-    // ISO format: YYYY-MM-DD or YYYY/MM/DD
-    final isoMatch =
-        RegExp(r'^(\d{4})[\/-](\d{1,2})[\/-](\d{1,2})$').firstMatch(normalized);
-    if (isoMatch != null) {
-      return Tuple3(
-        int.tryParse(isoMatch.group(3)!), // day
-        int.tryParse(isoMatch.group(2)!), // month
-        int.tryParse(isoMatch.group(1)!), // year
-      );
-    }
-
-    // Standard formats: MM/DD/YYYY, DD/MM/YYYY, MM-DD-YYYY, DD-MM-YYYY
-    final standardMatch =
-        RegExp(r'^(\d{1,2})[\/-](\d{1,2})[\/-](\d{4})$').firstMatch(normalized);
-    if (standardMatch != null) {
-      final first = int.tryParse(standardMatch.group(1)!);
-      final second = int.tryParse(standardMatch.group(2)!);
-      final year = int.tryParse(standardMatch.group(3)!);
-
-      if (first == null || second == null || year == null) {
-        return const Tuple3(null, null, null);
-      }
-      if (first < 1 || first > 31 || second < 1 || second > 31) {
-        return const Tuple3(null, null, null);
-      }
-
-      // Heuristic: if first number > 12, assume DD/MM format
-      if (first > 12) {
-        if (second > 12) return const Tuple3(null, null, null);
-        return Tuple3(first, second, year);
-      } else {
-        if (second > 12) return const Tuple3(null, null, null);
-        return Tuple3(second, first, year);
-      }
-    }
-
-    // Standard formats with 2-digit years: MM/DD/YY, DD/MM/YY, MM-DD-YY, DD-MM-YY
-    final standardMatchTwoDigitYear =
-        RegExp(r'^(\d{1,2})[\/-](\d{1,2})[\/-](\d{2})$').firstMatch(normalized);
-    if (standardMatchTwoDigitYear != null) {
-      final first = int.tryParse(standardMatchTwoDigitYear.group(1)!);
-      final second = int.tryParse(standardMatchTwoDigitYear.group(2)!);
-      final yearTwoDigit = int.tryParse(standardMatchTwoDigitYear.group(3)!);
-
-      if (first == null || second == null || yearTwoDigit == null) {
-        return const Tuple3(null, null, null);
-      }
-      if (first < 1 || first > 31 || second < 1 || second > 31) {
-        return const Tuple3(null, null, null);
-      }
-
-      final year =
-          yearTwoDigit < 50 ? 2000 + yearTwoDigit : 1900 + yearTwoDigit;
-
-      if (first > 12) {
-        if (second > 12) return const Tuple3(null, null, null);
-        return Tuple3(first, second, year);
-      } else {
-        if (second > 12) return const Tuple3(null, null, null);
-        return Tuple3(second, first, year);
-      }
-    }
-
-    // Dot format: DD.MM.YYYY
-    final dotMatch =
-        RegExp(r'^(\d{1,2})\.(\d{1,2})\.(\d{4})$').firstMatch(normalized);
-    if (dotMatch != null) {
-      final day = int.tryParse(dotMatch.group(1)!);
-      final month = int.tryParse(dotMatch.group(2)!);
-      final year = int.tryParse(dotMatch.group(3)!);
-
-      if (day == null || month == null || year == null) {
-        return const Tuple3(null, null, null);
-      }
-      if (day < 1 || day > 31 || month < 1 || month > 12) {
-        return const Tuple3(null, null, null);
-      }
-
-      return Tuple3(day, month, year);
-    }
-
-    // Dot format with 2-digit year: DD.MM.YY
-    final dotMatchTwoDigitYear =
-        RegExp(r'^(\d{1,2})\.(\d{1,2})\.(\d{2})$').firstMatch(normalized);
-    if (dotMatchTwoDigitYear != null) {
-      final day = int.tryParse(dotMatchTwoDigitYear.group(1)!);
-      final month = int.tryParse(dotMatchTwoDigitYear.group(2)!);
-      final yearTwoDigit = int.tryParse(dotMatchTwoDigitYear.group(3)!);
-
-      if (day == null || month == null || yearTwoDigit == null) {
-        return const Tuple3(null, null, null);
-      }
-      if (day < 1 || day > 31 || month < 1 || month > 12) {
-        return const Tuple3(null, null, null);
-      }
-
-      final year =
-          yearTwoDigit < 50 ? 2000 + yearTwoDigit : 1900 + yearTwoDigit;
-
-      return Tuple3(day, month, year);
-    }
-
-    // Compact format: YYYYMMDD
-    if (normalized.length == 8 && RegExp(r'^\d{8}$').hasMatch(normalized)) {
-      final year = int.tryParse(normalized.substring(0, 4));
-      final month = int.tryParse(normalized.substring(4, 6));
-      final day = int.tryParse(normalized.substring(6, 8));
-      if (year != null &&
-          year > 1900 &&
-          month != null &&
-          month <= 12 &&
-          day != null &&
-          day <= 31) {
-        return Tuple3(day, month, year);
-      }
-    }
-
-    // Short format: MM/DD or DD/MM
-    final shortMatch =
-        RegExp(r'^(\d{1,2})[\/-](\d{1,2})$').firstMatch(normalized);
-    if (shortMatch != null) {
-      final first = int.tryParse(shortMatch.group(1)!);
-      final second = int.tryParse(shortMatch.group(2)!);
-
-      if (first == null || second == null) {
-        return const Tuple3(null, null, null);
-      }
-      if (first < 1 || first > 31 || second < 1 || second > 31) {
-        return const Tuple3(null, null, null);
-      }
-
-      if (first > 12) {
-        if (second > 12) return const Tuple3(null, null, null);
-        return Tuple3(first, second, null);
-      } else {
-        if (second > 12) return const Tuple3(null, null, null);
-        return Tuple3(second, first, null);
-      }
-    }
-
-    return const Tuple3(null, null, null);
+  int _convertTwoDigitYear(int year) {
+    return year < _TWO_DIGIT_YEAR_PIVOT ? 2000 + year : 1900 + year;
   }
 
-  Tuple3<int?, MonthData?, int?> _parseDateParts(String input) {
-    if (input.trim().isEmpty) return const Tuple3(null, null, null);
+  PartialDate _parseRelativeDate(String lowerInput) {
+    final bool hasToday = lowerInput.contains('today');
+    final bool hasTomorrow = lowerInput.contains('tomorrow');
+    final bool hasYesterday = lowerInput.contains('yesterday');
 
-    final lowerInput = input.toLowerCase();
-    final today = DateTime.now();
+    final int count =
+        (hasToday ? 1 : 0) + (hasTomorrow ? 1 : 0) + (hasYesterday ? 1 : 0);
 
-    if (lowerInput.contains('today')) {
-      return Tuple3(
-        today.day,
-        MonthData(monthNumberToName[today.month]!, today.month),
-        today.year,
-      );
-    } else if (lowerInput.contains('tomorrow')) {
-      final tomorrow = today.add(const Duration(days: 1));
-      return Tuple3(
-        tomorrow.day,
-        MonthData(monthNumberToName[tomorrow.month]!, tomorrow.month),
-        tomorrow.year,
-      );
-    } else if (lowerInput.contains('yesterday')) {
-      final yesterday = today.subtract(const Duration(days: 1));
-      return Tuple3(
-        yesterday.day,
-        MonthData(monthNumberToName[yesterday.month]!, yesterday.month),
-        yesterday.year,
+    if (count > 1) {
+      return PartialDate.empty;
+    }
+
+    final now = DateTime.now();
+    if (hasToday) {
+      return PartialDate(day: now.day, month: now.month, year: now.year);
+    }
+    if (hasTomorrow) {
+      final tomorrow = now.add(const Duration(days: 1));
+      return PartialDate(
+        day: tomorrow.day,
+        month: tomorrow.month,
+        year: tomorrow.year,
       );
     }
+    if (hasYesterday) {
+      final yesterday = now.subtract(const Duration(days: 1));
+      return PartialDate(
+        day: yesterday.day,
+        month: yesterday.month,
+        year: yesterday.year,
+      );
+    }
+    return PartialDate.empty;
+  }
 
-    // Check for year-only queries like "2025"
-    final yearOnlyMatch = RegExp(r'^\s*(\d{4})\s*$').firstMatch(input.trim());
-    if (yearOnlyMatch != null) {
-      final year = int.tryParse(yearOnlyMatch.group(1)!);
-      if (year != null && year >= 1900 && year <= 2100) {
-        return Tuple3(null, null, year);
+  PartialDate _parseStructuredFormats(String input) {
+    final cleanInput = input.replaceAll(' ', '');
+
+    Match? match = _isoFormatRegex.firstMatch(cleanInput);
+    if (match != null) {
+      final yearVal = int.tryParse(match.group(1)!);
+      final monthVal = int.tryParse(match.group(2)!);
+      final dayVal = int.tryParse(match.group(3)!);
+      if (yearVal != null &&
+          yearVal >= _MIN_YEAR &&
+          yearVal <= _MAX_YEAR &&
+          monthVal != null &&
+          monthVal >= 1 &&
+          monthVal <= 12 &&
+          dayVal != null &&
+          dayVal >= 1 &&
+          dayVal <= 31) {
+        return PartialDate(day: dayVal, month: monthVal, year: yearVal);
       }
+      return PartialDate.empty;
     }
 
-    // First try structured formats (slash, dash, dot patterns)
-    final structuredResult = parseStructuredFormats(input);
-    if (structuredResult.item1 != null ||
-        structuredResult.item2 != null ||
-        structuredResult.item3 != null) {
-      final int? day = structuredResult.item1;
-      final int? monthNum = structuredResult.item2;
-      final int? year = structuredResult.item3;
-      MonthData? monthData;
-      if (monthNum != null && monthNumberToName.containsKey(monthNum)) {
-        monthData = MonthData(monthNumberToName[monthNum]!, monthNum);
-      }
-      return Tuple3(day, monthData, year);
-    }
+    match = _standardFormatRegex.firstMatch(cleanInput);
+    if (match != null) {
+      final p1 = int.parse(match.group(1)!);
+      final p2 = int.parse(match.group(2)!);
+      final yearRaw = int.parse(match.group(3)!);
+      final year = yearRaw > 99 ? yearRaw : _convertTwoDigitYear(yearRaw);
 
-    final normalized = normalizeDateString(input);
-    final tokens = normalized.split(RegExp(r'\s+'));
+      if (year < _MIN_YEAR || year > _MAX_YEAR) return PartialDate.empty;
 
-    int? day, monthNum, year;
-    MonthData? monthData;
-
-    // Handle patterns like "25 02" (day month) or "Feb 2025" (month year)
-    if (tokens.length == 2) {
-      final first = tokens[0];
-      final second = tokens[1];
-
-      // Check if first token is a month name and second is a year
-      if (_monthMap.containsKey(first)) {
-        final yearValue = int.tryParse(second);
-        if (yearValue != null && yearValue >= 1900 && yearValue <= 2100) {
-          monthNum = _monthMap[first];
-          year = yearValue;
+      if (p1 > 12) {
+        if (p1 >= 1 && p1 <= 31 && p2 >= 1 && p2 <= 12) {
+          return PartialDate(day: p1, month: p2, year: year);
+        }
+      } else if (p2 > 12) {
+        if (p1 >= 1 && p1 <= 12 && p2 >= 1 && p2 <= 31) {
+          return PartialDate(day: p2, month: p1, year: year);
+        }
+      } else {
+        if (p1 >= 1 && p1 <= 12 && p2 >= 1 && p2 <= 31) {
+          return PartialDate(day: p2, month: p1, year: year);
         }
       }
-      // Check if both are numbers - could be day+month or month+day
-      else {
-        final firstNum = int.tryParse(first);
-        final secondNum = int.tryParse(second);
+      return PartialDate.empty;
+    }
 
-        if (firstNum != null && secondNum != null) {
-          if (secondNum >= 1900 && secondNum <= 2100) {
-            if (firstNum >= 1 && firstNum <= 12) {
-              monthNum = firstNum;
-              year = secondNum;
-            }
-          } else if (firstNum >= 1 &&
-              firstNum <= 31 &&
-              secondNum >= 1 &&
-              secondNum <= 12) {
-            day = firstNum;
-            monthNum = secondNum;
-          } else if (firstNum >= 1 &&
-              firstNum <= 12 &&
-              secondNum >= 1 &&
-              secondNum <= 31) {
-            monthNum = firstNum;
-            day = secondNum;
-          }
+    match = _shortFormatRegex.firstMatch(cleanInput);
+    if (match != null) {
+      final p1 = int.parse(match.group(1)!);
+      final p2 = int.parse(match.group(2)!);
+
+      if (p1 > 12) {
+        if (p1 >= 1 && p1 <= 31 && p2 >= 1 && p2 <= 12) {
+          return PartialDate(day: p1, month: p2);
         }
+      } else if (p2 > 12) {
+        if (p1 >= 1 && p1 <= 12 && p2 >= 1 && p2 <= 31) {
+          return PartialDate(day: p2, month: p1);
+        }
+      } else {
+        if (p1 >= 1 && p1 <= 12 && p2 >= 1 && p2 <= 31) {
+          return PartialDate(day: p2, month: p1);
+        }
+      }
+      return PartialDate.empty;
+    }
+
+    match = _dotFormatRegex.firstMatch(cleanInput);
+    if (match != null) {
+      final yearRaw = int.parse(match.group(3)!);
+      final year = yearRaw > 99 ? yearRaw : _convertTwoDigitYear(yearRaw);
+      final dayVal = int.tryParse(match.group(1)!);
+      final monthVal = int.tryParse(match.group(2)!);
+
+      if (year >= _MIN_YEAR &&
+          year <= _MAX_YEAR &&
+          dayVal != null &&
+          dayVal >= 1 &&
+          dayVal <= 31 &&
+          monthVal != null &&
+          monthVal >= 1 &&
+          monthVal <= 12) {
+        return PartialDate(day: dayVal, month: monthVal, year: year);
+      }
+      return PartialDate.empty;
+    }
+
+    match = _compactFormatRegex.firstMatch(cleanInput);
+    if (match != null) {
+      final yearVal = int.tryParse(cleanInput.substring(0, 4));
+      final monthVal = int.tryParse(cleanInput.substring(4, 6));
+      final dayVal = int.tryParse(cleanInput.substring(6, 8));
+
+      if (yearVal != null &&
+          yearVal >= _MIN_YEAR &&
+          yearVal <= _MAX_YEAR &&
+          monthVal != null &&
+          monthVal >= 1 &&
+          monthVal <= 12 &&
+          dayVal != null &&
+          dayVal >= 1 &&
+          dayVal <= 31) {
+        return PartialDate(day: dayVal, month: monthVal, year: yearVal);
+      }
+      return PartialDate.empty;
+    }
+
+    return PartialDate.empty;
+  }
+
+  PartialDate _parseTokenizedDate(String normalized) {
+    final tokens = normalized.split(' ');
+    int? day, month, year;
+
+    if (tokens.length == 1) {
+      final token = tokens[0];
+      final match = _yearOnlyRegex.firstMatch(token);
+      if (match != null) {
+        final parsedYear = int.tryParse(match.group(1)!);
+        if (parsedYear != null &&
+            parsedYear >= _MIN_YEAR &&
+            parsedYear <= _MAX_YEAR) {
+          return PartialDate(year: parsedYear);
+        }
+      }
+      if (_monthMap.containsKey(token)) {
+        return PartialDate(month: _monthMap[token]!);
+      }
+      final singleValue = int.tryParse(token);
+      if (singleValue != null && singleValue >= 1 && singleValue <= 31) {
+        return PartialDate(day: singleValue);
+      }
+      return PartialDate.empty;
+    }
+
+    for (final token in tokens) {
+      if (_monthMap.containsKey(token) && month == null) {
+        month = _monthMap[token];
+        continue;
+      }
+
+      final value = int.tryParse(token);
+      if (value == null) {
+        continue;
+      }
+
+      if (value >= _MIN_YEAR && value <= _MAX_YEAR && year == null) {
+        year = value;
+      } else if (value >= 1 && value <= 31 && day == null) {
+        day = value;
+      } else if (value >= 0 && value <= 99 && year == null) {
+        final convertedYear = _convertTwoDigitYear(value);
+        if (convertedYear >= _MIN_YEAR && convertedYear <= _MAX_YEAR) {
+          year = convertedYear;
+        }
+      } else if (value >= 1 && value <= 12 && month == null) {
+        month = value;
       }
     }
 
-    if (day == null && monthNum == null && year == null) {
-      for (var token in tokens) {
-        if (_monthMap.containsKey(token)) {
-          monthNum = _monthMap[token];
-        } else if (RegExp(r'^\d+$').hasMatch(token)) {
-          final value = int.parse(token);
-          if (value >= 1900 && value <= 2100) {
-            year = value;
-          } else if (value >= 1 && value <= 31) {
-            if (day == null) {
-              day = value;
-            } else if (monthNum == null && value <= 12) {
-              monthNum = value;
-            }
-          } else if (value >= 32 && value <= 99) {
-            year = value < 50 ? 2000 + value : 1900 + value;
-          }
-        }
-      }
-    }
-
-    if (monthNum != null && monthNumberToName.containsKey(monthNum)) {
-      monthData = MonthData(monthNumberToName[monthNum]!, monthNum);
-    }
-
-    if (monthNum != null && (monthNum < 1 || monthNum > 12)) {
-      monthNum = null;
-      monthData = null;
-    }
     if (day != null && (day < 1 || day > 31)) {
       day = null;
     }
-
-    return Tuple3(day, monthData, year);
-  }
-
-  Tuple3<int?, MonthData?, int?> parseDate(String input) {
-    return _parseDateParts(input);
-  }
-
-  List<Tuple3<int?, MonthData?, int?>> parseDateVariations(String input) {
-    final List<Tuple3<int?, MonthData?, int?>> variations = [];
-    final primaryResult = _parseDateParts(input);
-
-    variations.add(primaryResult);
-    return variations;
-  }
-
-  bool isYearQuery(String input) {
-    final yearOnlyMatch = RegExp(r'^\s*(\d{4})\s*$').firstMatch(input.trim());
-    if (yearOnlyMatch != null) {
-      final year = int.tryParse(yearOnlyMatch.group(1)!);
-      return year != null && year >= 1900 && year <= 2100;
+    if (month != null && (month < 1 || month > 12)) {
+      month = null;
     }
-    return false;
-  }
 
-  bool isGenericDateQuery(String input) {
-    final result = _parseDateParts(input);
-    return result.item1 != null && result.item2 != null && result.item3 == null;
+    final bool inputHadMonthWord = tokens.any((t) => _monthMap.containsKey(t));
+    final bool inputHadYearWord = tokens.any((t) {
+      final v = int.tryParse(t);
+      return v != null && v >= 1000 && v <= 9999;
+    });
+
+    if (day != null && month == null && year == null && tokens.length > 1) {
+      if (normalized.contains('of') &&
+          !inputHadMonthWord &&
+          !inputHadYearWord) {
+        return PartialDate.empty;
+      }
+      if (!inputHadMonthWord && !inputHadYearWord && tokens.length > 1) {}
+    }
+
+    if (day == null && month == null && year == null) {
+      return PartialDate.empty;
+    }
+
+    if (day != null && month == null && year == null && tokens.length > 1) {
+      if (!inputHadMonthWord && !inputHadYearWord) {
+        return PartialDate.empty;
+      }
+    }
+
+    return PartialDate(day: day, month: month, year: year);
   }
 }
diff --git a/mobile/apps/photos/lib/services/search_service.dart b/mobile/apps/photos/lib/services/search_service.dart
index f09007c6ee..f1dd0d64f4 100644
--- a/mobile/apps/photos/lib/services/search_service.dart
+++ b/mobile/apps/photos/lib/services/search_service.dart
@@ -1173,70 +1173,72 @@ class SearchService {
   ) async {
     final List<GenericSearchResult> searchResults = [];
 
-    final dateVariations = DateParseService.instance.parseDateVariations(query);
+    final parsedDate = DateParseService.instance.parse(query);
 
-    for (final dateVar in dateVariations) {
-      // Handle month-year queries
-      if (dateVar.item1 == null &&
-          dateVar.item2 != null &&
-          dateVar.item3 != null) {
-        final month = dateVar.item2!.monthNumber;
-        final year = dateVar.item3!;
-        final monthYearFiles =
-            await FilesDB.instance.getFilesCreatedWithinDurations(
-          [_getDurationForMonthInYear(month, year)],
-          ignoreCollections(),
-          order: 'DESC',
-        );
-        if (monthYearFiles.isNotEmpty) {
-          final name = '${dateVar.item2!.name} $year';
-          searchResults.add(
-            GenericSearchResult(
-              ResultType.month,
-              name,
-              monthYearFiles,
-              hierarchicalSearchFilter: TopLevelGenericFilter(
-                filterName: name,
-                occurrence: kMostRelevantFilter,
-                filterResultType: ResultType.month,
-                matchedUploadedIDs: filesToUploadedFileIDs(monthYearFiles),
-                filterIcon: Icons.calendar_month_outlined,
-              ),
+    if (parsedDate.isEmpty) {
+      return searchResults;
+    }
+    // Handle month-year queries
+    if (parsedDate.day == null &&
+        parsedDate.month != null &&
+        parsedDate.year != null) {
+      final month = parsedDate.month!;
+      final year = parsedDate.year!;
+      final monthYearFiles =
+          await FilesDB.instance.getFilesCreatedWithinDurations(
+        [_getDurationForMonthInYear(month, year)],
+        ignoreCollections(),
+        order: 'DESC',
+      );
+      if (monthYearFiles.isNotEmpty) {
+        final monthName = DateParseService.instance.getMonthName(month);
+        final name = '$monthName $year';
+        searchResults.add(
+          GenericSearchResult(
+            ResultType.month,
+            name,
+            monthYearFiles,
+            hierarchicalSearchFilter: TopLevelGenericFilter(
+              filterName: name,
+              occurrence: kMostRelevantFilter,
+              filterResultType: ResultType.month,
+              matchedUploadedIDs: filesToUploadedFileIDs(monthYearFiles),
+              filterIcon: Icons.calendar_month_outlined,
             ),
-          );
-        }
+          ),
+        );
       }
-      // Handle day-month queries (with or without year)
-      else if (dateVar.item1 != null && dateVar.item2 != null) {
-        final int day = dateVar.item1!;
-        final int month = dateVar.item2!.monthNumber;
-        final int? year = dateVar.item3; // nullable for generic dates
+    }
+    // Handle day-month queries (with or without year)
+    else if (parsedDate.day != null && parsedDate.month != null) {
+      final int day = parsedDate.day!;
+      final int month = parsedDate.month!;
+      final int? year = parsedDate.year; // nullable for generic dates
 
-        final matchedFiles =
-            await FilesDB.instance.getFilesCreatedWithinDurations(
-          _getDurationsForCalendarDateInEveryYear(day, month, year: year),
-          ignoreCollections(),
-          order: 'DESC',
-        );
+      final matchedFiles =
+          await FilesDB.instance.getFilesCreatedWithinDurations(
+        _getDurationsForCalendarDateInEveryYear(day, month, year: year),
+        ignoreCollections(),
+        order: 'DESC',
+      );
 
-        if (matchedFiles.isNotEmpty) {
-          final name =
-              '$day ${dateVar.item2!.name}${year != null ? ' $year' : ''}';
-          searchResults.add(
-            GenericSearchResult(
-              ResultType.event,
-              name,
-              matchedFiles,
-              hierarchicalSearchFilter: TopLevelGenericFilter(
-                filterName: name,
-                occurrence: kMostRelevantFilter,
-                filterResultType: ResultType.event,
-                matchedUploadedIDs: filesToUploadedFileIDs(matchedFiles),
-                filterIcon: Icons.event_outlined,
-              ),
+      if (matchedFiles.isNotEmpty) {
+        final monthName = DateParseService.instance.getMonthName(month);
+        final name = '$day $monthName${year != null ? ' $year' : ''}';
+        searchResults.add(
+          GenericSearchResult(
+            ResultType.event,
+            name,
+            matchedFiles,
+            hierarchicalSearchFilter: TopLevelGenericFilter(
+              filterName: name,
+              occurrence: kMostRelevantFilter,
+              filterResultType: ResultType.event,
+              matchedUploadedIDs: filesToUploadedFileIDs(matchedFiles),
+              filterIcon: Icons.event_outlined,
             ),
-          );
-        }
+          ),
+        );
       }
     }
     return searchResults;

From 241dcd64bfc28269f037a598f67afcf16e731f69 Mon Sep 17 00:00:00 2001
From: AmanRajSinghMourya <amanrajmourya7@gmail.com>
Date: Thu, 24 Jul 2025 14:13:04 +0530
Subject: [PATCH 18/29] Add comprehensive tests for date parsing functionality

---
 .../test/utils/date_query_parsing_test.dart   | 346 ++++++++++++++++++
 1 file changed, 346 insertions(+)
 create mode 100644 mobile/apps/photos/test/utils/date_query_parsing_test.dart

diff --git a/mobile/apps/photos/test/utils/date_query_parsing_test.dart b/mobile/apps/photos/test/utils/date_query_parsing_test.dart
new file mode 100644
index 0000000000..402b890489
--- /dev/null
+++ b/mobile/apps/photos/test/utils/date_query_parsing_test.dart
@@ -0,0 +1,346 @@
+import 'package:photos/services/date_parse_service.dart';
+import 'package:test/test.dart';
+
+void main() {
+  // Get an instance of the service
+  final DateParseService dateParseService = DateParseService.instance;
+
+  // --- Natural Language Date Parsing ---
+  group('Natural Language Date Parsing', () {
+    // Relative dates: today, tomorrow, yesterday
+    test('should parse "today" correctly', () {
+      final DateTime now = DateTime.now();
+      final PartialDate expectedDate =
+          PartialDate(day: now.day, month: now.month, year: now.year);
+      final PartialDate parsedDate = dateParseService.parse('today');
+
+      expect(
+        parsedDate.day,
+        expectedDate.day,
+        reason: 'Day mismatch for today',
+      );
+      expect(
+        parsedDate.month,
+        expectedDate.month,
+        reason: 'Month mismatch for today',
+      );
+      expect(
+        parsedDate.year,
+        expectedDate.year,
+        reason: 'Year mismatch for today',
+      );
+    });
+
+    test('should parse "tomorrow" correctly', () {
+      final DateTime tomorrow = DateTime.now().add(const Duration(days: 1));
+      final PartialDate expectedDate = PartialDate(
+        day: tomorrow.day,
+        month: tomorrow.month,
+        year: tomorrow.year,
+      );
+      final PartialDate parsedDate = dateParseService.parse('tomorrow');
+
+      expect(
+        parsedDate.day,
+        expectedDate.day,
+        reason: 'Day mismatch for tomorrow',
+      );
+      expect(
+        parsedDate.month,
+        expectedDate.month,
+        reason: 'Month mismatch for tomorrow',
+      );
+      expect(
+        parsedDate.year,
+        expectedDate.year,
+        reason: 'Year mismatch for tomorrow',
+      );
+    });
+
+    test('should parse "yesterday" correctly', () {
+      final DateTime yesterday =
+          DateTime.now().subtract(const Duration(days: 1));
+      final PartialDate expectedDate = PartialDate(
+        day: yesterday.day,
+        month: yesterday.month,
+        year: yesterday.year,
+      );
+      final PartialDate parsedDate = dateParseService.parse('yesterday');
+
+      expect(
+        parsedDate.day,
+        expectedDate.day,
+        reason: 'Day mismatch for yesterday',
+      );
+      expect(
+        parsedDate.month,
+        expectedDate.month,
+        reason: 'Month mismatch for yesterday',
+      );
+      expect(
+        parsedDate.year,
+        expectedDate.year,
+        reason: 'Year mismatch for yesterday',
+      );
+    });
+
+    // Month names: Full (February), abbreviated (Feb), and partial (Febr)
+    test('should parse full month name "February 2025"', () {
+      final PartialDate parsedDate = dateParseService.parse('February 2025');
+      expect(parsedDate.day, isNull);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, 2025);
+    });
+
+    test('should parse abbreviated month name "Feb 2025"', () {
+      final PartialDate parsedDate = dateParseService.parse('Feb 2025');
+      expect(parsedDate.day, isNull);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, 2025);
+    });
+
+    test('should parse partial month name "Febr 2025"', () {
+      final PartialDate parsedDate = dateParseService.parse('Febr 2025');
+      expect(parsedDate.day, isNull);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, 2025);
+    });
+
+    // Ordinal numbers: 25th, 22nd, 3rd, 1st
+    test('should parse ordinal number "25th Jan 2024"', () {
+      final PartialDate parsedDate = dateParseService.parse('25th Jan 2024');
+      expect(parsedDate.day, 25);
+      expect(parsedDate.month, 1);
+      expect(parsedDate.year, 2024);
+    });
+
+    test('should parse ordinal number "22nd Feb"', () {
+      final PartialDate parsedDate = dateParseService.parse('22nd Feb');
+      expect(parsedDate.day, 22);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, isNull);
+    });
+
+    test('should parse ordinal number "3rd March"', () {
+      final PartialDate parsedDate = dateParseService.parse('3rd March');
+      expect(parsedDate.day, 3);
+      expect(parsedDate.month, 3);
+      expect(parsedDate.year, isNull);
+    });
+
+    // Flexible combinations
+    test('should parse "25th Feb" (generic date)', () {
+      final PartialDate parsedDate = dateParseService.parse('25th Feb');
+      expect(parsedDate.day, 25);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, isNull);
+    });
+
+    test('should parse "February 2025" (month-year query)', () {
+      final PartialDate parsedDate = dateParseService.parse('February 2025');
+      expect(parsedDate.day, isNull);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, 2025);
+    });
+
+    test('should parse "25th of February 2025"', () {
+      final PartialDate parsedDate =
+          dateParseService.parse('25th of February 2025');
+      expect(parsedDate.day, 25);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, 2025);
+    });
+  });
+
+  // --- Structured Date Format Support ---
+  group('Structured Date Format Support', () {
+    // ISO format: 2025-02-25, 2025/02/25
+    test('should parse ISO format "2025-02-25"', () {
+      final PartialDate parsedDate = dateParseService.parse('2025-02-25');
+      expect(parsedDate.day, 25);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, 2025);
+    });
+
+    test('should parse ISO format "2025/02/25"', () {
+      final PartialDate parsedDate = dateParseService.parse('2025/02/25');
+      expect(parsedDate.day, 25);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, 2025);
+    });
+
+    // Standard formats: 02/25/2025, 25/02/2025 (with MM/DD vs DD/MM detection)
+    test('should parse standard MM/DD/YYYY format "02/25/2025"', () {
+      // Your parser assumes MM/DD if ambiguous (e.g., both parts <= 12)
+      // but for 02/25/2025, 25 > 12, so it correctly interprets 02 as month and 25 as day.
+      final PartialDate parsedDate = dateParseService.parse('02/25/2025');
+      expect(parsedDate.day, 25);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, 2025);
+    });
+
+    test('should parse standard DD/MM/YYYY format "25/02/2025"', () {
+      // Your parser handles DD/MM explicitly when day part > 12
+      final PartialDate parsedDate = dateParseService.parse('25/02/2025');
+      expect(parsedDate.day, 25);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, 2025);
+    });
+
+    test('should parse ambiguous "01/02/2024" as MM/DD/YYYY (Jan 2)', () {
+      // Test your specific heuristic for ambiguous cases
+      final PartialDate parsedDate = dateParseService.parse('01/02/2024');
+      expect(parsedDate.day, 2);
+      expect(parsedDate.month, 1);
+      expect(parsedDate.year, 2024);
+    });
+
+    // Dot notation: 25.02.2025, 25.02.25
+    test('should parse dot notation "25.02.2025"', () {
+      final PartialDate parsedDate = dateParseService.parse('25.02.2025');
+      expect(parsedDate.day, 25);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, 2025);
+    });
+
+    test('should parse dot notation with two-digit year "25.02.25"', () {
+      // Assumes century detection (e.g., 25 -> 2025)
+      final PartialDate parsedDate = dateParseService.parse('25.02.25');
+      expect(parsedDate.day, 25);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, 2025);
+    });
+
+    // Compact format: 20250225
+    test('should parse compact format "20250225"', () {
+      final PartialDate parsedDate = dateParseService.parse('20250225');
+      expect(parsedDate.day, 25);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, 2025);
+    });
+
+    // Short formats: 02/25, 25/02 (your parser doesn't explicitly handle short yearless formats)
+    // Based on your _standardFormatRegex: RegExp(r'^(\d{1,2})[\/-](\d{1,2})[\/-](\d{2,4})$');
+    // and _parseTokenizedDate, "02/25" would be processed by _parseTokenizedDate.
+    // Let's test how your current parser handles these.
+    test(
+        'should parse short MM/DD format "02/25" (no year, handled by tokenized)',
+        () {
+      final PartialDate parsedDate = dateParseService.parse('02/25');
+      expect(parsedDate.day, 25); // value 25 is assigned to day first
+      expect(parsedDate.month, 2); // value 02 is assigned to month
+      expect(parsedDate.year, isNull);
+    });
+
+    test(
+        'should parse short DD/MM format "25/02" (no year, handled by tokenized)',
+        () {
+      // This will be parsed by _parseTokenizedDate
+      final PartialDate parsedDate = dateParseService.parse('25/02');
+      expect(parsedDate.day, 25);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, isNull);
+    });
+
+    // Two-digit years: 25/02/25 (with century detection)
+    test('should parse two-digit year "25/02/25"', () {
+      final PartialDate parsedDate = dateParseService.parse('25/02/25');
+      expect(parsedDate.day, 25);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, 2025); // Based on _convertTwoDigitYear pivot
+    });
+
+    test('should parse two-digit year "01/01/01" as 2001', () {
+      final PartialDate parsedDate = dateParseService.parse('01/01/01');
+      expect(parsedDate.day, 1);
+      expect(parsedDate.month, 1);
+      expect(parsedDate.year, 2001); // 01 < _TWO_DIGIT_YEAR_PIVOT
+    });
+
+    test('should parse two-digit year "01/01/99" as 1999', () {
+      final PartialDate parsedDate = dateParseService.parse('01/01/99');
+      expect(parsedDate.day, 1);
+      expect(parsedDate.month, 1);
+      expect(parsedDate.year, 1999); // 99 > _TWO_DIGIT_YEAR_PIVOT
+    });
+  });
+
+  // --- Smart Query Types ---
+  group('Smart Query Types', () {
+    test('should parse year-only query "2025"', () {
+      final PartialDate parsedDate = dateParseService.parse('2025');
+      expect(parsedDate.day, isNull);
+      expect(parsedDate.month, isNull);
+      expect(parsedDate.year, 2025);
+    });
+
+    test('should parse month-year query "February 2025"', () {
+      final PartialDate parsedDate = dateParseService.parse('February 2025');
+      expect(parsedDate.day, isNull);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, 2025);
+    });
+
+    test('should parse generic date query "25th Feb" (year is null)', () {
+      final PartialDate parsedDate = dateParseService.parse('25th Feb');
+      expect(parsedDate.day, 25);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, isNull);
+    });
+
+    test('should parse specific date query "25/02/2025"', () {
+      final PartialDate parsedDate = dateParseService.parse('25/02/2025');
+      expect(parsedDate.day, 25);
+      expect(parsedDate.month, 2);
+      expect(parsedDate.year, 2025);
+    });
+  });
+
+  // --- Invalid Date Queries ---
+  group('Invalid Date Queries', () {
+    test('should parse "February 30000" as month-only (invalid year ignored)',
+        () {
+      final PartialDate parsedDate = dateParseService.parse('February 30000');
+      expect(parsedDate.day, isNull);
+      expect(parsedDate.month, 2);
+      expect(
+        parsedDate.year,
+        isNull,
+        reason: 'Year 30000 is out of range and should be ignored',
+      );
+    });
+
+    // Specific case to test if invalid day/month values are set to null
+    test('should return null for invalid day/month in tokenized parsing', () {
+      final PartialDate parsedDate = dateParseService.parse('32 Jan 2024');
+      expect(parsedDate.day, isNull, reason: 'Day should be null for 32');
+      expect(parsedDate.month, 1);
+      expect(
+        parsedDate.year,
+        2024,
+      );
+
+      // "Jan 13 2024" - This is a valid date (Jan 13, 2024), should parse completely.
+      final PartialDate parsedDate2 = dateParseService.parse('Jan 13 2024');
+      expect(parsedDate2.day, 13);
+      expect(parsedDate2.month, 1);
+      expect(parsedDate2.year, 2024);
+
+      // "Feb 0 2024" - Day 0 should be null, but month and year are valid.
+      final PartialDate parsedDate3 = dateParseService.parse('Feb 0 2024');
+      expect(parsedDate3.day, isNull, reason: 'Day should be null for 0');
+      expect(parsedDate3.month, 2);
+      expect(parsedDate3.year, 2024);
+    });
+
+    test('should handle invalid day/month in tokenized parsing gracefully', () {
+      final PartialDate parsedDate = dateParseService.parse('32 Jan 2024');
+      expect(parsedDate.day, isNull, reason: 'Day should be null for 32');
+      expect(parsedDate.month, 1);
+      expect(
+        parsedDate.year,
+        2024,
+      );
+    });
+  });
+}

From f951880ed1b17a2935266617a01e07241ae4c3cb Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 24 Jul 2025 15:16:24 +0530
Subject: [PATCH 19/29] [server] Use IS FALSE to match partial index

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

diff --git a/server/pkg/repo/trash.go b/server/pkg/repo/trash.go
index 1c6ab6b45f..f1ab3c2289 100644
--- a/server/pkg/repo/trash.go
+++ b/server/pkg/repo/trash.go
@@ -338,7 +338,7 @@ func (t *TrashRepository) GetTimeStampForLatestNonDeletedEntry(userID int64) (*i
 // GetUserIDToFileIDsMapForDeletion returns map of userID to fileIds, where the file ids which should be deleted by now
 func (t *TrashRepository) GetUserIDToFileIDsMapForDeletion() (map[int64][]int64, error) {
 	rows, err := t.DB.Query(`SELECT user_id, file_id FROM trash 
-			WHERE delete_by <= $1  AND is_deleted = FALSE AND is_restored = FALSE limit $2`,
+			WHERE delete_by <= $1  AND is_deleted IS FALSE AND is_restored IS FALSE limit $2`,
 		time.Microseconds(), TrashDiffLimit)
 	if err != nil {
 		return nil, stacktrace.Propagate(err, "")

From 0906fddfc638673568cfcbc58ae7dfcd73415743 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 24 Jul 2025 16:24:54 +0530
Subject: [PATCH 20/29] [mob][photos] Fix query to remove dup enteries

---
 mobile/apps/photos/lib/db/files_db.dart | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/mobile/apps/photos/lib/db/files_db.dart b/mobile/apps/photos/lib/db/files_db.dart
index 3150dbc3b6..657148a61a 100644
--- a/mobile/apps/photos/lib/db/files_db.dart
+++ b/mobile/apps/photos/lib/db/files_db.dart
@@ -982,15 +982,23 @@ class FilesDB with SqlDbBase {
   // remove references for local files which are either already uploaded
   // or queued for upload but not yet uploaded
   Future<int> removeQueuedLocalFiles(Set<String> localIDs) async {
+    if (localIDs.isEmpty) {
+      _logger.finest("No local IDs provided for removal");
+      return 0;
+    }
+
     final db = await instance.sqliteAsyncDB;
-    final inParam = localIDs.map((id) => "'$id'").join(',');
+    final placeholders = List.filled(localIDs.length, '?').join(',');
     final r = await db.execute(
       '''
       DELETE FROM $filesTable
-      WHERE $columnLocalID IN ($inParam) and (collectionID IS NULL || collectionID = -1)
-      and ($columnUploadedFileID IS NULL OR $columnUploadedFileID = -1);
-    ''',
+      WHERE $columnLocalID IN ($placeholders) 
+      AND (collectionID IS NULL OR collectionID = -1)
+      AND ($columnUploadedFileID IS NULL OR $columnUploadedFileID = -1)
+      ''',
+      localIDs.toList(),
     );
+
     if (r.isNotEmpty) {
       _logger.warning(
         "Removed ${r.length} potential dups for already queued local files",
@@ -998,7 +1006,6 @@ class FilesDB with SqlDbBase {
     } else {
       _logger.finest("No duplicate id found for queued/uploaded files");
     }
-
     return r.length;
   }
 

From 79eff8aa5ad51846e8fd75008a46d23d26cbafaa Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 24 Jul 2025 17:22:31 +0530
Subject: [PATCH 21/29] Fix db query & swallow errow

---
 mobile/apps/photos/lib/db/files_db.dart       | 37 ++++++--
 .../services/sync/remote_sync_service.dart    | 12 ++-
 mobile/apps/photos/pubspec.lock               | 94 +++++++++----------
 3 files changed, 86 insertions(+), 57 deletions(-)

diff --git a/mobile/apps/photos/lib/db/files_db.dart b/mobile/apps/photos/lib/db/files_db.dart
index 657148a61a..1957f55179 100644
--- a/mobile/apps/photos/lib/db/files_db.dart
+++ b/mobile/apps/photos/lib/db/files_db.dart
@@ -988,25 +988,44 @@ class FilesDB with SqlDbBase {
     }
 
     final db = await instance.sqliteAsyncDB;
-    final placeholders = List.filled(localIDs.length, '?').join(',');
-    final r = await db.execute(
-      '''
+    const batchSize = 10000;
+    int totalRemoved = 0;
+
+    final localIDsList = localIDs.toList();
+
+    for (int i = 0; i < localIDsList.length; i += batchSize) {
+      final endIndex = (i + batchSize > localIDsList.length)
+          ? localIDsList.length
+          : i + batchSize;
+
+      final batch = localIDsList.sublist(i, endIndex);
+      final placeholders = List.filled(batch.length, '?').join(',');
+
+      final r = await db.execute(
+        '''
       DELETE FROM $filesTable
       WHERE $columnLocalID IN ($placeholders) 
-      AND (collectionID IS NULL OR collectionID = -1)
+      AND ($columnCollectionID IS NULL OR $columnCollectionID = -1)
       AND ($columnUploadedFileID IS NULL OR $columnUploadedFileID = -1)
       ''',
-      localIDs.toList(),
-    );
+        batch,
+      );
 
-    if (r.isNotEmpty) {
+      if (r.isNotEmpty) {
+        _logger
+            .fine("Batch ${(i ~/ batchSize) + 1}: Removed ${r.length} files");
+        totalRemoved += r.length;
+      }
+    }
+
+    if (totalRemoved > 0) {
       _logger.warning(
-        "Removed ${r.length} potential dups for already queued local files",
+        "Removed $totalRemoved potential dups for already queued local files",
       );
     } else {
       _logger.finest("No duplicate id found for queued/uploaded files");
     }
-    return r.length;
+    return totalRemoved;
   }
 
   Future<Set<String>> getLocalFileIDsForCollection(int collectionID) async {
diff --git a/mobile/apps/photos/lib/services/sync/remote_sync_service.dart b/mobile/apps/photos/lib/services/sync/remote_sync_service.dart
index d0e995a438..9e2f7f6aed 100644
--- a/mobile/apps/photos/lib/services/sync/remote_sync_service.dart
+++ b/mobile/apps/photos/lib/services/sync/remote_sync_service.dart
@@ -51,6 +51,10 @@ class RemoteSyncService {
   Completer<void>? _existingSync;
   bool _isExistingSyncSilent = false;
 
+  // _hasCleanupStaleEntry is used to track if we have already cleaned up
+  // statle db entries in this sync session.
+  bool _hasCleanupStaleEntry = false;
+
   static const kHasSyncedArchiveKey = "has_synced_archive";
   /* This setting is used to maintain a list of local IDs for videos that the user has manually
  marked for upload, even if the global video upload setting is currently disabled.
@@ -371,8 +375,13 @@ class RemoteSyncService {
         final Set<String> alreadyClaimedLocalIDs =
             await _db.getLocalIDsMarkedForOrAlreadyUploaded(ownerID);
         localIDsToSync.removeAll(alreadyClaimedLocalIDs);
-        if (alreadyClaimedLocalIDs.isNotEmpty) {
+        if (alreadyClaimedLocalIDs.isNotEmpty && !_hasCleanupStaleEntry) {
+          try {
           await _db.removeQueuedLocalFiles(alreadyClaimedLocalIDs);
+          } catch(e, s) {
+            _logger.severe("removeQueuedLocalFiles failed",e,s);
+            
+          }
         }
       }
 
@@ -442,6 +451,7 @@ class RemoteSyncService {
       // "force reload due to display new files"
       Bus.instance.fire(ForceReloadHomeGalleryEvent("newFilesDisplay"));
     }
+    _hasCleanupStaleEntry = true;
   }
 
   Future<void> updateDeviceFolderSyncStatus(
diff --git a/mobile/apps/photos/pubspec.lock b/mobile/apps/photos/pubspec.lock
index a5d14c3829..f8cf5809fe 100644
--- a/mobile/apps/photos/pubspec.lock
+++ b/mobile/apps/photos/pubspec.lock
@@ -130,10 +130,10 @@ packages:
     dependency: "direct main"
     description:
       name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.12.0"
+    version: "2.11.0"
   battery_info:
     dependency: "direct main"
     description:
@@ -155,10 +155,10 @@ packages:
     dependency: transitive
     description:
       name: boolean_selector
-      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   brotli:
     dependency: transitive
     description:
@@ -268,10 +268,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.3.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -301,10 +301,10 @@ packages:
     dependency: transitive
     description:
       name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.1"
   code_builder:
     dependency: transitive
     description:
@@ -317,10 +317,10 @@ packages:
     dependency: "direct main"
     description:
       name: collection
-      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
       url: "https://pub.dev"
     source: hosted
-    version: "1.19.1"
+    version: "1.19.0"
   computer:
     dependency: "direct main"
     description:
@@ -619,10 +619,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.1"
   fast_base58:
     dependency: "direct main"
     description:
@@ -668,10 +668,10 @@ packages:
     dependency: transitive
     description:
       name: file
-      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.1"
+    version: "7.0.0"
   file_saver:
     dependency: "direct main"
     description:
@@ -1416,18 +1416,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
+      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.8"
+    version: "10.0.7"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.9"
+    version: "3.0.8"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -1552,10 +1552,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.17"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
@@ -1645,10 +1645,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.15.0"
   mgrs_dart:
     dependency: transitive
     description:
@@ -1859,10 +1859,10 @@ packages:
     dependency: "direct main"
     description:
       name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.9.0"
   path_drawing:
     dependency: transitive
     description:
@@ -2019,10 +2019,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
+      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.6"
+    version: "3.1.5"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -2068,10 +2068,10 @@ packages:
     dependency: transitive
     description:
       name: process
-      sha256: "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d"
+      sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.3"
+    version: "5.0.2"
   proj4dart:
     dependency: transitive
     description:
@@ -2346,10 +2346,10 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.1"
+    version: "1.10.0"
   sprintf:
     dependency: transitive
     description:
@@ -2434,10 +2434,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.1"
+    version: "1.12.0"
   step_progress_indicator:
     dependency: "direct main"
     description:
@@ -2450,10 +2450,10 @@ packages:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.2"
   stream_transform:
     dependency: transitive
     description:
@@ -2466,10 +2466,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.3.0"
   styled_text:
     dependency: "direct main"
     description:
@@ -2522,34 +2522,34 @@ packages:
     dependency: transitive
     description:
       name: term_glyph
-      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.2.1"
   test:
     dependency: "direct dev"
     description:
       name: test
-      sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e"
+      sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f"
       url: "https://pub.dev"
     source: hosted
-    version: "1.25.15"
+    version: "1.25.8"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.4"
+    version: "0.7.3"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa"
+      sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.8"
+    version: "0.6.5"
   thermal:
     dependency: "direct main"
     description:
@@ -2813,10 +2813,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
+      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
       url: "https://pub.dev"
     source: hosted
-    version: "14.3.1"
+    version: "14.3.0"
   volume_controller:
     dependency: transitive
     description:
@@ -2978,5 +2978,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.7.0-0 <4.0.0"
+  dart: ">=3.5.0 <4.0.0"
   flutter: ">=3.24.0"

From 0d162b6075c30a27b33e1ca9fe12d839f62ea5eb Mon Sep 17 00:00:00 2001
From: Daniel T <github.email.hatless810@passfwd.com>
Date: Thu, 24 Jul 2025 15:02:48 -0500
Subject: [PATCH 22/29] chore: add accredible custom icon

---
 .../auth/assets/custom-icons/_data/custom-icons.json   | 10 ++++++++++
 .../apps/auth/assets/custom-icons/icons/accredible.svg |  8 ++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 mobile/apps/auth/assets/custom-icons/icons/accredible.svg

diff --git a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
index ba42bb47f1..c748203add 100644
--- a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
+++ b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
@@ -10,6 +10,16 @@
     {
       "title": "3Commas"
     },
+    {
+      "title": "Accredible",
+      "slug": "accredible",
+      "altNames": [
+        "Accredible Certificates",
+        "Accredible Badges",
+        "Digital Credentials",
+        "certificates.zaka.ai"
+      ]
+    },
     {
       "title": "Addy.io",
       "slug": "addy_io"
diff --git a/mobile/apps/auth/assets/custom-icons/icons/accredible.svg b/mobile/apps/auth/assets/custom-icons/icons/accredible.svg
new file mode 100644
index 0000000000..707dbf482d
--- /dev/null
+++ b/mobile/apps/auth/assets/custom-icons/icons/accredible.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg enable-background="new 0 0 240 240" version="1.1" viewBox="0 0 240 240" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<path d="m1 214c0-46.021 0-92.042 0.27671-138.19 0.74988-0.75875 1.4558-1.3222 1.6616-2.0308 3.4637-11.931 9.7863-22.061 19.083-30.291 10.734-9.5027 23.139-15.388 37.612-15.425 60.455-0.15068 120.91-0.063334 181.37-0.063242 0 45.688 0 91.375-0.29245 137.19-2.9994 6.1167-5.1585 12.433-8.5123 18.034-11.681 19.506-28.965 30.541-51.873 30.666-59.773 0.32539-119.55 0.10936-179.32 0.10925m151.5-107h36.106v-14.744h-126.3v14.744h90.195m15.11 63.164c1.9138 0.27864 3.8409 0.86449 5.7391 0.78206 7.6904-0.33391 15.992-9.1312 15.551-16.275-0.4837-7.8375-8.5467-15.644-16.184-15.67-8.5565-0.02861-14.433 4.8247-16.567 13.682-1.4658 6.0848 3.2382 13.739 11.461 17.481z" fill="#5B4DFC"/>
+
+
+
+
+</svg>

From d57daf91a038259ec6ff57919fdba7b62a7e7294 Mon Sep 17 00:00:00 2001
From: Daniel T <github.email.hatless810@passfwd.com>
Date: Thu, 24 Jul 2025 15:19:17 -0500
Subject: [PATCH 23/29] chore: add xvideos custom icon

---
 .../apps/auth/assets/custom-icons/_data/custom-icons.json | 8 ++++++++
 mobile/apps/auth/assets/custom-icons/icons/xvideos.svg    | 1 +
 2 files changed, 9 insertions(+)
 create mode 100644 mobile/apps/auth/assets/custom-icons/icons/xvideos.svg

diff --git a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
index ba42bb47f1..4fad895b57 100644
--- a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
+++ b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
@@ -1581,6 +1581,14 @@
       "title": "xAI",
       "slug": "xai"
     },
+    {
+      "title": "XVideos",
+      "slug": "xvideos",
+      "altNames": [
+        "X Videos",
+        "xvideos.com"
+      ]
+    },
     {
       "title": "Cronometer",
       "slug": "cronometer"
diff --git a/mobile/apps/auth/assets/custom-icons/icons/xvideos.svg b/mobile/apps/auth/assets/custom-icons/icons/xvideos.svg
new file mode 100644
index 0000000000..91ccdbba27
--- /dev/null
+++ b/mobile/apps/auth/assets/custom-icons/icons/xvideos.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 90 90" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="#000" d="M0 0h90v90H0z"/><path d="m32 11 13 19.217L58 11h17L53.5 42.783 78 79H61L45 55.348 29 79H12l24.5-36.217L15 11h17Z" fill="#F40000"/></g></svg>
\ No newline at end of file

From bc3302157cd7eefc52c4122da5f5604a70090246 Mon Sep 17 00:00:00 2001
From: Daniel T <github.email.hatless810@passfwd.com>
Date: Thu, 24 Jul 2025 15:27:05 -0500
Subject: [PATCH 24/29] chore: add custom icon for chaturbate

---
 .../apps/auth/assets/custom-icons/_data/custom-icons.json  | 7 +++++++
 mobile/apps/auth/assets/custom-icons/icons/chaturbate.svg  | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 mobile/apps/auth/assets/custom-icons/icons/chaturbate.svg

diff --git a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
index ba42bb47f1..44c963dac5 100644
--- a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
+++ b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
@@ -279,6 +279,13 @@
       "title": "CERN",
       "slug": "cern"
     },
+    {
+      "title": "Chaturbate",
+      "slug": "chaturbate",
+      "altNames": [
+        "Chaturbate.com"
+      ]
+    },
     {
       "title": "ChangeNOW"
     },
diff --git a/mobile/apps/auth/assets/custom-icons/icons/chaturbate.svg b/mobile/apps/auth/assets/custom-icons/icons/chaturbate.svg
new file mode 100644
index 0000000000..2c6992ebe7
--- /dev/null
+++ b/mobile/apps/auth/assets/custom-icons/icons/chaturbate.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 90 90" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="50%" y1="23.373%" x2="50%" y2="85.937%" id="a"><stop stop-color="#02729D" offset="0%"/><stop stop-color="#00333F" offset="100%"/></linearGradient><linearGradient x1="63.263%" y1="134.632%" x2="51.527%" y2="36.554%" id="b"><stop stop-color="#FFE5BE" offset="0%"/><stop stop-color="#FEBE1D" offset="58%"/><stop stop-color="#FCAE1E" offset="69%"/><stop stop-color="#F58420" offset="92%"/><stop stop-color="#F37321" offset="100%"/></linearGradient></defs><g fill="none"><path d="M46.126 61.143c-13.37 0-22.008-10.053-22.008-25.606.006-1.882.137-3.762.392-5.626C9.072 27.993 0 22.686 0 15.412c0-4.811 3.898-9.02 11.91-12.899L17.094 0l.207 5.767c.278 7.462 5.656 11.056 10.286 12.777C32.346 7.41 41.096.644 51.042.644c10.545 0 15.264 5.889 15.264 11.726 0 7.621-7.984 15.956-23.278 17.848-1.225 3.027-1.936 6.148-1.936 8.642 0 4.753 2.143 4.753 3.424 4.753 1.799 0 6.192-3.657 6.848-7.725l.507-3.168h3.209c6.214 0 10.234 3.797 10.234 9.679-.004 7.64-7.477 18.744-19.188 18.744Z" fill="url(#a)" transform="translate(6 15)"/><path d="M44.516 47.374c4.038 0 9.675-5.364 10.564-10.894 4.2 0 6.47 2.221 6.47 5.923 0 5.807-6.026 14.986-15.428 14.986-12.717 0-18.247-10.286-18.247-21.838a41.255 41.255 0 0 1 1.051-8.957c-14.435-1.162-25.17-5.53-25.17-11.17.008-2.936 2.94-6.208 9.798-9.524.33 9.29 7.185 15.101 16.308 17.252 3.372-10.23 10.894-18.747 21.18-18.747 7.632 0 11.503 3.65 11.503 7.961 0 5.922-7.243 13.162-22.063 14.32-1.88 3.872-3.154 8.35-3.154 12.167 0 4.815 1.991 8.52 7.188 8.52ZM42.03 23.98c7.402-.551 9.993-2.876 9.993-4.534 0-.94-.884-1.714-2.157-1.714-2.691 0-5.567 2.598-7.836 6.248Z" fill="url(#b)" transform="translate(6 15)"/><path d="M36.41 41.587a1.377 1.377 0 0 1 1.233 1.676 39.89 39.89 0 0 0-1.018 8.654c0 5.6 1.436 11.419 4.915 15.427-4.497-3.949-6.292-10.5-6.292-16.793a39.882 39.882 0 0 1 1.018-8.653c.023-.102.034-.207.033-.311Zm25.769 11.33c1.68.196 2.832.877 3.453 2.024a5.415 5.415 0 0 0-2.08-.648c-1.506 5.552-7.047 10.834-11.659 10.834-2.902 0-5.137-1.036-6.596-2.95 1.362 1.03 3.117 1.573 5.223 1.573 4.626 0 10.153-5.281 11.659-10.833Zm-5.134-32.135c4.33 0 7.577 1.288 9.12 3.442-1.773-1.325-4.441-2.066-7.747-2.066-10.323 0-17.026 9.198-19.872 17.793a1.377 1.377 0 0 1-1.625.91c-.359-.085-.703-.188-1.051-.281a1.362 1.362 0 0 0-.837-.37l-.618-.056c-4.293-1.395-7.799-3.586-10.312-6.41 2.898 2.657 6.77 4.637 11.449 5.748a1.377 1.377 0 0 0 1.625-.91c2.842-8.606 9.545-17.8 19.868-17.8Zm2.073 12.41a2.99 2.99 0 0 1 1.673 2.617c-.001.124-.01.247-.026.37a24.799 24.799 0 0 1-3.779 1.85c1.714-1.08 2.428-2.38 2.428-3.582 0-.436-.101-.865-.296-1.255ZM18.366 23.047c.1.65.235 1.293.404 1.928-4.053 2.35-6.248 4.723-6.248 6.81a3.83 3.83 0 0 0 .877 2.329c-1.458-1.162-2.258-2.414-2.258-3.702 0-2.25 2.547-4.834 7.225-7.365Z" fill-opacity=".4" fill="#FFF"/></g></svg>
\ No newline at end of file

From 3ca5303db633d9086c6f8587a3850a3756b4c9f7 Mon Sep 17 00:00:00 2001
From: Daniel T <github.email.hatless810@passfwd.com>
Date: Thu, 24 Jul 2025 15:31:04 -0500
Subject: [PATCH 25/29] chore: add custom icon for lifemiles

---
 .../custom-icons/_data/custom-icons.json      |   9 ++
 .../assets/custom-icons/icons/lifemiles.svg   | 101 ++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 mobile/apps/auth/assets/custom-icons/icons/lifemiles.svg

diff --git a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
index ba42bb47f1..a27ecc3cc7 100644
--- a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
+++ b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
@@ -742,6 +742,15 @@
     {
       "title": "Letterboxd"
     },
+    {
+      "title": "LifeMiles",
+      "slug": "lifemiles",
+      "altNames": [
+        "Life Miles",
+        "lifemiles.com",
+        "Avianca LifeMiles"
+      ]
+    },
     {
       "title": "lincolnfinancial",
       "altNames": [
diff --git a/mobile/apps/auth/assets/custom-icons/icons/lifemiles.svg b/mobile/apps/auth/assets/custom-icons/icons/lifemiles.svg
new file mode 100644
index 0000000000..b08d6f0107
--- /dev/null
+++ b/mobile/apps/auth/assets/custom-icons/icons/lifemiles.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 26.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 1000 425.96859"
+   xml:space="preserve"
+   sodipodi:docname="lifemiles-logo-white.svg"
+   width="1000"
+   height="425.9686"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
+   id="metadata39"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs37">
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+		
+		
+		
+	</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#111111"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1017"
+   id="namedview35"
+   showgrid="false"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0"
+   inkscape:zoom="0.21047873"
+   inkscape:cx="874.3819"
+   inkscape:cy="-478.96841"
+   inkscape:window-x="1912"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1"><inkscape:grid
+     type="xygrid"
+     id="grid80"
+     originx="112"
+     originy="919.50723" /></sodipodi:namedview>
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#FFFFFF;}
+</style>
+
+<path
+   inkscape:connector-curvature="0"
+   style="fill:#2c3d47;fill-opacity:1;stroke-width:17.97037315"
+   id="path10"
+   d="m 503.10835,200.17953 c -10.36162,0 -19.4727,2.34995 -27.33325,7.23061 -7.8605,4.88066 -14.64912,10.48438 -20.18731,16.81116 1.6079,6.86908 2.67979,14.64198 3.21574,23.49947 0.53591,8.85749 0.89324,17.35347 0.89324,25.30714 v 152.56585 h -95.57696 v -154.3735 c 0,-24.58407 -3.03703,-42.47983 -9.28969,-54.0488 -6.0741,-11.38821 -16.97163,-17.17269 -32.51405,-17.17269 -10.0043,0 -18.57946,2.16919 -25.90406,6.68831 -7.32459,4.51913 -13.21998,9.94208 -17.50752,16.26887 V 425.59376 H 183.50616 V 129.6811 h 91.82531 v 39.22605 c 9.11113,-16.0881 21.08054,-27.47631 36.08706,-34.3454 14.82782,-6.86907 30.01291,-10.30361 45.55533,-10.30361 19.11543,0 34.83648,3.97684 47.34185,11.74974 12.50539,7.7729 24.29616,20.60723 35.5511,38.32222 20.7232,-33.44156 53.05854,-50.07196 97.18473,-50.07196 19.11537,0 35.19376,4.1576 48.2351,12.29204 13.04134,8.3152 23.76025,19.16112 31.79944,32.89926 8.21784,13.73816 13.93458,29.46473 17.50754,47.36049 3.573,17.89575 5.35947,36.69535 5.35947,56.39874 v 152.56589 h -95.39833 v -154.5543 c 0,-24.58407 -3.03703,-42.47983 -9.28969,-54.0488 -5.89539,-11.38821 -16.79299,-16.99193 -32.15672,-16.99193"
+   class="st0" /><path
+   inkscape:connector-curvature="0"
+   style="fill:#2c3d47;fill-opacity:1;stroke-width:18.07651901"
+   id="path12"
+   d="m 94.576402,332.35756 c 0,12.5291 8.918858,22.3039 25.860738,22.3039 h 65.76015 l -2.21663,70.9323 H 120.43714 C 81.005734,425.59376 0,419.93116 0,349.78556 V 0 h 94.576402 z"
+   class="st0"
+   sodipodi:nodetypes="ccccccccc" /><path
+   class="st0"
+   d="m 733.71651,296.61048 c 29.55738,-29.55737 77.63263,-29.55737 107.19006,0 29.55734,29.5574 29.55734,77.63268 0,107.19008 -29.55743,29.5574 -77.63268,29.5574 -107.19006,0 -29.55738,-29.7355 -29.55738,-77.63268 0,-107.19008"
+   id="path24"
+   style="fill:#ff1d1e;fill-opacity:1;stroke-width:17.80565071"
+   inkscape:connector-curvature="0" /><path
+   class="st0"
+   d="m 733.71651,22.93762 c 29.55738,-29.55739 77.63263,-29.55739 107.19006,0 29.55734,29.55739 29.55734,77.63263 0,107.19003 -29.55743,29.55737 -77.63268,29.55737 -107.19006,0 -29.55738,-29.73544 -29.55738,-77.63264 0,-107.19003"
+   id="path26"
+   style="fill:#ff1d1e;fill-opacity:1;stroke-width:17.80565071"
+   inkscape:connector-curvature="0" /><path
+   class="st0"
+   d="m 870.64206,159.68502 c 29.55734,-29.55737 77.63259,-29.55737 107.18993,0 29.55731,29.55739 29.55731,77.63264 0,107.19001 -29.55734,29.5574 -77.63259,29.5574 -107.18993,0 -29.73549,-29.55737 -29.73549,-77.63262 0,-107.19001"
+   id="path28"
+   style="fill:#ff1d1e;fill-opacity:1;stroke-width:17.80565071"
+   inkscape:connector-curvature="0" /></svg>
\ No newline at end of file

From 25117f846a79bb04f59894e8091a3df8ef08567e Mon Sep 17 00:00:00 2001
From: Daniel T <github.email.hatless810@passfwd.com>
Date: Thu, 24 Jul 2025 15:34:51 -0500
Subject: [PATCH 26/29] chore: add custom icon for stripchat

---
 .../auth/assets/custom-icons/_data/custom-icons.json     | 9 +++++++++
 mobile/apps/auth/assets/custom-icons/icons/stripchat.svg | 1 +
 2 files changed, 10 insertions(+)
 create mode 100644 mobile/apps/auth/assets/custom-icons/icons/stripchat.svg

diff --git a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
index ba42bb47f1..e5bc1c018e 100644
--- a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
+++ b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
@@ -1299,6 +1299,15 @@
       "title": "Startmail",
       "slug": "startmail"
     },
+    {
+      "title": "Stripchat",
+      "slug": "stripchat",
+      "altNames": [
+        "Strip Chat",
+        "stripchat.com",
+        "StripChat Live"
+      ]
+    },
     {
       "title": "STRATO",
       "hex": "FF8800"
diff --git a/mobile/apps/auth/assets/custom-icons/icons/stripchat.svg b/mobile/apps/auth/assets/custom-icons/icons/stripchat.svg
new file mode 100644
index 0000000000..4a338ee588
--- /dev/null
+++ b/mobile/apps/auth/assets/custom-icons/icons/stripchat.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 90 90" xmlns="http://www.w3.org/2000/svg"><path d="M44.86 8.486c23.44 0 42.423 15.87 42.423 35.463 0 18.47-16.877 33.633-38.366 35.318-.749.072-1.57-.61-1.57-1.406V57c0-1.032.538-1.853 1.31-2.602l15.893-17.04c1.172-1.267.26-2.275-.513-2.275H24.893c-.749 0-1.901 1.008-.47 2.506l15.892 16.78c.773.773 1.032 1.546 1.032 2.602v20.602c0 .797-.869 1.641-1.545 1.57a32.528 32.528 0 0 1-3.399-.447c-10.08-1.709-2.673 2.414-28.968 7.22 6.048-11.343 10.455-13.969 5.626-18.514A32.292 32.292 0 0 1 2.49 43.915c0-19.593 18.984-35.462 42.375-35.462v.033h-.005Z" fill="#A02831"/></svg>
\ No newline at end of file

From 8f8eeb82a97972314eae13050644342159e8ba3c Mon Sep 17 00:00:00 2001
From: Daniel T <github.email.hatless810@passfwd.com>
Date: Thu, 24 Jul 2025 15:51:16 -0500
Subject: [PATCH 27/29] chore: add custom icon for auth digital

---
 .../apps/auth/assets/custom-icons/_data/custom-icons.json  | 7 +++++++
 .../apps/auth/assets/custom-icons/icons/auth_digital.svg   | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 mobile/apps/auth/assets/custom-icons/icons/auth_digital.svg

diff --git a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
index ba42bb47f1..11ee25eceb 100644
--- a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
+++ b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
@@ -71,6 +71,13 @@
       ],
       "hex": "fd4b2d"
     },
+    {
+      "title": "Autenticacion Digital",
+      "slug": "autenticacion-digital",
+      "altNames": [
+        "autenticaciondigital.and.gov.co"
+      ]
+    },
     {
       "title": "availity"
     },
diff --git a/mobile/apps/auth/assets/custom-icons/icons/auth_digital.svg b/mobile/apps/auth/assets/custom-icons/icons/auth_digital.svg
new file mode 100644
index 0000000000..173f12977c
--- /dev/null
+++ b/mobile/apps/auth/assets/custom-icons/icons/auth_digital.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 469 526"><path fill="#181F6F" d="M470 307.53c-15.63.43-31.27.29-46.9.44-3.98.04-5.13-1.31-5.11-5.19.13-24.65.12-49.3-.02-73.96-.02-3.71 1.15-5.12 4.88-4.83 3.3.26 6.67.26 9.98 0 3.92-.3 5.18 1.16 5.14 5.1-.17 17.5-.06 34.98-.05 52.47 0 7.41 0 7.42 7.16 7.44h24.45c.47 6.02.47 12.04.47 18.53"/><path fill="#4B41B3" d="M245.01 37.04a498 498 0 0 1-25.5-4.9c1.36-1.38 3.84-2.2 3.93-3.25.59-6.33.73-12.7.74-19.06 0-.84-1.65-2.39-2.54-2.4-4.46 0-5.82-2.86-6.64-6.43h4.59c1.02.67 1.53 1.8 2.24 1.95 13.59 2.86 27.2 5.61 40.95 8.72.15.35.26.29.26.29.75.06 1.5.12 2.67.61 1.63 1.39 2.72 2.68 4.1 3.24 4.12 1.68 8.5 2.78 12.53 4.64 6.84 3.16 10.65 8.29 9.75 16.35-.36 3.27.3 6.63.32 9.95.01 1.54.1 4.04-.67 4.41-1.27.61-3.2-.15-5.05-.35l.96-2.27c-4.28-1.48-8.24-3.16-12.36-4.2-5.36-1.37-10.84-2.24-16.27-3.32-.47-.04-.93-.07-1.87-.32-.68-.4-.9-.54-1.14-.66-.17-.04-.34-.08-.92-.5-3.49-1.75-6.18-4.89-10.08-2.5m43.48 2.08-1.01.14.21.78c.3-.18.6-.36.8-.92"/><path fill="#4F60C0" d="M1 77.47c.48-.45 1.15-.22 1.41-.45 10.67-9.24 21.3-18.53 32.5-27.76 2.07-1.06 3.57-2.17 5.06-3.29 0 0 .01.02.38.02 1.13 0 1.89 0 2.82.24 2.72 1.1 2.72 1.1 3.15-3.3a29 29 0 0 0 2.64-2.9s0-.07.4-.05c1.15.01 1.9.02 3 0 2.13-1.01 3.89-2 5.98-2.97.77 0 1.22 0 1.97.12.38 1.57.63 3.01.48 4.42-.14 1.22-.97 2.38-1.06 3.6-.64 7.94-1.15 15.9-1.7 23.86 0 0-.02 0-.2.14-.4.33-.6.55-.76.8-9.89 8-19.88 15.88-29.62 24.07-7.58 6.37-17.62 7.52-24.06-2.13-.44-.65-1.26-1.05-2.15-1.23C1 86.64 1 82.3 1 77.46z"/><path fill="#4D55BA" d="M155.46 527c-1.05-.67-1.58-1.86-2.23-1.93A238.9 238.9 0 0 1 87.81 508c-.45-.2-.96-.24-1.32-.79 2.07-.2 4.32-.52 5.88.37 3.88 2.23 7.36 2.68 10.6-.9l2.32 3.88 1.7-.18v-26.34c10.23 2.8 20.44 5.72 30.72 8.34 4.74 1.2 9.63 1.82 15.05 3.08 4.13.76 7.68 1.15 11.23 1.53 4.8.13 9.62.27 14.25.7-2.81.31-5.46.37-8.1.3-2.9-.06-4.4 1.22-4.07 4.18.94 8.28 1.95 16.55 2.92 24.83z"/><path fill="#4C4BB6" d="M214.53 1c1.29 3.57 2.64 6.44 7.1 6.44.9 0 2.54 1.55 2.54 2.39 0 6.36-.14 12.73-.73 19.06-.1 1.04-2.58 1.87-4.19 2.95-11.8-.53-23.35-1.84-34.9-1.72-10.16.1-20.3 1.8-30.72 2.43 1.21-3.35 3.02-5.23 6.77-3.45 3.07 1.46 4.9-.47 5.34-3.24.68-4.31.67-8.74 1.3-13.07.66-4.44.38-8.48-3.04-11.79z"/><path fill="#4D53B9" d="M163.62 1c3.8 3.31 4.08 7.35 3.42 11.8-.63 4.32-.62 8.75-1.3 13.06-.44 2.76-2.28 4.7-5.35 3.24-3.74-1.78-5.55.1-7.18 3.39-2.27.64-4.4 1-7.02 1.23-.74-.19-.95-.14-1.14.04-9.09 2.4-18.18 4.78-27.26 7.21-1.71.46-3.38 1.1-5.47 1.37-2.12-2.13-3.84-3.96-5.55-5.78l1.33.19c.33-3 .58-6.01 1.01-9 .45-3.02 1.08-6.02 1.6-9.04.19-1.05.77-2.46.31-3.08-.5-.7-2.11-1.14-3-.89-3.82 1.1-7.5 2.6-11.3 3.74-4.21 1.28-8.49 2.35-12.74 3.5 12.26-4.3 24.46-8.78 36.79-12.84 4.62-1.53 9.55-2.1 15.2-3.13 3.92-.6 6.98-1.19 10.03-1.77.45-.06.89-.12 1.77.1 3.38 2.6 10.64.55 13.23-3.34z"/><path fill="#4C4DB8" d="M169.47 527a416 416 0 0 1-3.39-24.83c-.33-2.96 1.17-4.24 4.07-4.17 2.64.06 5.28 0 8.39 0 6.54-.3 12.61-.59 19.47-.66 6.1.38 11.47.19 16.72.83 2.34.29 5.57 1.75 6.4 3.58.98 2.15 0 5.32-.56 7.96-.27 1.27-1.5 2.33-2.55 3.85l6.54 2.71c-1.49 4.6-3.1 8.28-8.82 7.9-1.18-.08-2.49 1.84-3.74 2.83z"/><path fill="#4B45B3" d="M212.44 527c.8-1 2.12-2.9 3.3-2.83 5.72.38 7.33-3.3 8.82-7.9l-6.54-2.7c1.05-1.53 2.28-2.6 2.54-3.86.56-2.64 1.55-5.81.57-7.96-.83-1.83-4.07-3.3-6.4-3.58-5.26-.64-10.62-.46-16.3-.78 19.35-.7 38.57-4.03 57.3-10.2.76-.25 1.65-.1 3.15.1 2.96.84 5.26 1.44 7.04 1.92 1.1 2.06 1.96 3.9 3.05 5.58.97 1.51 2.77 2.71 3.18 4.32.89 3.54 1.13 7.24 1.72 11.48-6.48-1.42-8.88 2.86-11.86 6.2l-34.97 7.65a39.7 39.7 0 0 0-7.21 2.15c-2.2.4-4.58.4-7.39.4z"/><path fill="#4C4BB6" d="M160.57 1c-2.16 3.89-9.41 5.93-12.47 3.3 2.35-1.05 4.81-1.8 7.08-2.92 1.53-.38 3.25-.38 5.39-.38"/><path fill="#181F6F" d="M81.13 274c-3.56 20.14-22.65 34.94-42.31 34-9.63-.46-19.31-.21-28.96-.02-3.67.08-4.9-1.12-4.89-4.84.12-24.64.1-49.27-.03-73.9-.02-3.73.87-5.38 5-5.28 10.65.26 21.31-.08 31.96.13 24.57.47 44.55 25.72 39.23 49.91m-41.95-30.05c-3.34 0-6.68.14-10-.04-3.32-.19-4.33 1.28-4.3 4.43.13 9.5.05 19 .03 28.5-.02 11.2-.03 11.2 10.94 11.2 1.5 0 3 .03 4.5 0 11.77-.19 21.76-9.97 21.59-21.74-.15-10.55-7.31-20.78-22.76-22.35"/><path fill="#182070" d="M167.76 224.64c16.55-3.8 29.98 1.46 41.75 12.4 2.73 2.54 2.6 4.37-.04 6.95-6.07 5.92-11.3 7.23-18.77 3.16-9.15-4.98-17.8-5.57-26.48.86-7.42 5.49-10.49 13-8.98 21.77 1.58 9.18 7.21 15.83 16.47 18.06 4.34 1.05 9.13.44 13.7.25 5.37-.22 6.67-3.37 5.86-5.97-5.01-4.09-8.57-6.92-12.03-9.88-.56-.48-.76-1.47-.96-2.27-1.76-7.06-.33-8.94 6.85-8.97 7.16-.02 14.32.11 21.48-.04 3.2-.06 4.45 1.04 4.4 4.32-.15 9.66.07 19.32-.2 28.97-.04 1.87-1.12 4.32-2.56 5.46-16.06 12.66-43.97 13.49-60.42-2.82-17.14-16.99-17.42-42.72-1.12-60.06 5.71-6.08 12.28-10.59 21.05-12.19"/><path fill="#181F6F" d="M397.25 276.75c4.47 10.36 8.75 20.38 13.32 31.06-5.88 0-11.07.54-16.08-.14-5.97-.81-8.71-5.79-10.43-10.92-1.36-4.1-3.76-5.07-7.78-4.9-7.65.3-15.32.19-22.98 0-2.97-.07-4.82.95-5.6 3.72-3.83 13.5-12.1 13.42-26.58 11.54 2.63-6.36 5.1-12.62 7.8-18.78 8.87-20.21 17.9-40.35 26.62-60.62 1.23-2.85 2.7-3.77 5.52-3.7 15.78.41 11.95-2.43 17.87 10.93 6.12 13.8 12.1 27.65 18.32 41.81m-28.02-14.37-3.73-7.96-7.68 18.3h15.2a373 373 0 0 0-3.79-10.34"/><path fill="#482BA7" d="M385.05 389.98c3.89-7.02 8.41-13.77 11.54-21.11 6.75-15.85 12.78-32 19.27-48.43h30.07c-4.75 14.43-8.81 28.3-13.87 41.79-9.56 25.53-23.7 48.47-41.05 69.46-.2.25-.3.6-.8.72-2.07-3.36-1.9-5.44 2.1-6.96 2.82-1.08 5.8-3.24 4.15-7.16l-4.88 2.3c.53-5.46.97-10.06 1.43-14.66.24-2.46.53-4.91.8-7.37.24-2.24 1.49-5.7.53-6.48-2.44-2.01-5.53-4.52-9.3-2.1z"/><path fill="#182070" d="M278.92 242.97h-1.48l-12.76-.9c-.2-5.12-.57-10.23-.45-15.33.02-.92 2.07-2.56 3.2-2.57 19.63-.15 39.26-.16 58.9.05 1.2.02 3.3 2.09 3.44 3.36 1.55 15.37 1.47 15.35-14.1 15.38-10.06.03-8.66-.94-8.71 8.85-.09 16.3-.02 32.62-.01 48.92 0 7.17 0 7.17-7.41 7.19-2.5 0-5.01-.2-7.48.05-3.97.39-5.14-1.27-5.1-5.13.15-17.47.06-34.95.05-52.42 0-7.46-.01-7.46-8.09-7.45"/><path fill="#0592DC" d="M342.09 118.06c8.3 10.51 16.96 20.77 24.82 31.6 10.66 14.71 21.72 40.98 25.78 59.29-9.54 0-19 .11-28.45-.15-1.15-.04-2.8-1.9-3.28-3.25-5.65-16.14-13.04-31.37-22.86-45.4-1.02-1.46-2.05-2.9-2.8-4.7 4.42-1.18 3.84-3.43 1.65-5.74-1.74-1.83-2.36-3.25.36-4.51 4.07-1.89 3.05-4.56 1-7.15-1.63-2.04-3.96-3.41-1.44-6.63 1.47-1.88 1.11-5.99 2.73-6.8 3.43-1.73 2.65-4.03 2.5-6.56z"/><path fill="#4F5FBF" d="M107 484.02v26.36l-1.7.18-2.31-3.88c-3.25 3.58-6.73 3.13-10.61.9-1.56-.9-3.82-.58-6.07-.68a214.8 214.8 0 0 1-48.32-25.7c-9.51-6.67-9.46-17.67-.49-25.1 3.64-3.01 11.61-2.9 16.84.1 12.66 7.27 25.35 14.47 38.5 22.15 1.7.85 2.92 1.24 4.14 1.64 0 0 .04 0 .17.33 3.35 1.45 6.58 2.57 9.8 3.69 0 0 .06-.01.05.01"/><path fill="#4729A6" d="M407.99 120.04c6.47 11.42 14.13 22.34 19.13 34.37 6.94 16.68 11.89 34.18 17.64 51.34.25.73.03 1.62.03 3.1-9.46 0-18.72.1-27.97-.14-.96-.03-2.27-1.98-2.74-3.28a730 730 0 0 1-10.58-31.94c1.34-.42 3.2-.47 3.24-.75.52-3.94 1.1-7.92 1.06-11.88-.1-9.58-.63-19.15-.73-28.73-.04-4.03.6-8.06.92-12.1z"/><path fill="#4933AB" d="m335.01 46.02 25.5 19.14a26.5 26.5 0 0 1 4.4 3.95c.17 3.96 2.34 4.74 5.06 4.87 0 0 .06-.01.2.2.3.42.52.62.76.8 0 0 .1 0 .23.22.3.43.51.61.74.78 0 0 .1 0 .14.39.97 1.14 1.9 1.89 2.85 2.65 0 0 .1-.01.13.4 2 2.12 3.96 3.84 5.93 5.57 0 0 .07 0 .09.38 1.33 1.8 2.65 3.21 3.96 4.63.27.2.54.38.68 1.09a6.1 6.1 0 0 1-2.22 1.77c-4.73 1.95-4.83 2.56-1.74 6.5 1.6 2.02 2.77 4.37 3.83 6.08l-2.58 7.19c-.44 1.2-1.05 2.37-1.37 3.6-.31 1.15-.81 2.54-.44 3.54 2.26 6.16 4.74 12.24 7.32 18.81l-3.41-.6s-.06.01-.09-.34a19.5 19.5 0 0 0-1.9-2.66s-.07 0-.07-.41c-.67-6.8-4.27-10.98-9.94-13.59 0 0-.06.01-.08-.36-.99-1.46-1.95-2.55-2.91-3.64 0 0-.06 0-.1-.39-1.64-3.44-2.11-7.59-6.92-7.58 0 0-.09 0-.22-.2a3.2 3.2 0 0 0-.76-.79s-.1 0-.24-.22c-.32-.43-.53-.6-.77-.76 0 0-.11 0-.24-.22a2.7 2.7 0 0 0-.8-.77s-.07 0-.09-.4c-2.38-6.79-7.8-10.23-13.04-13.84-.17-.12-.62.16-.93.25a279 279 0 0 1-13.43-11.78c1.14-4.73 2.72-9.08 2.94-13.5.33-6.9-.27-13.84-.47-20.76"/><path fill="#4832AA" d="M385.01 389.98c3.8-2.42 6.88.09 9.32 2.1.96.8-.28 4.25-.53 6.49-.26 2.45-.55 4.9-.8 7.36-.46 4.6-.9 9.2-1.43 14.67l4.88-2.3c1.65 3.91-1.33 6.07-4.15 7.15-4 1.52-4.16 3.6-2.4 7.11.08.33.07.41-.3.45a20.6 20.6 0 0 0-2.63 2.86s0 .1-.4.16c-1.12 1.34-1.85 2.63-2.58 3.93 0 0 0 .06-.2.19-.4.3-.6.51-.76.74 0 0 0 .14-.23.27-.44.34-.62.55-.78.8 0 0 0 .07-.2.2-.43.33-.63.55-.79.79 0 0 0 .09-.21.22-.43.31-.62.52-.79.75 0 0 0 .12-.22.24-.44.3-.63.5-.8.73-.2.3-.42.58-1.23.98-1.33.12-2.06.12-2.8.08-.04-.05.01.06-.05.39a235 235 0 0 1-.92 3.61s0 .08-.21.2c-.43.31-.62.52-.8.74 0 0 0 .12-.22.25-.42.32-.61.53-.77.75 0 0 0 .12-.23.26a3.2 3.2 0 0 0-.77.76s0 .1-.22.24c-.43.32-.62.53-.78.76 0 0 0 .09-.32.19-.76.7-1.2 1.29-1.65 1.88-5.14 4.55-10.27 9.1-15.77 13.36-.8-1.35-1.8-2.58-1.55-3.49 2.33-8.84-3.09-17.99 1.06-26.75.27-.57-.27-1.52-.64-3.3-2.37 1.4-4.26 2.45-6.11 3.58-3.02 1.84-6.02 3.73-9.02 5.6 3.7-3.5 7.28-7.12 11.12-10.44 12-10.37 21.89-22.57 31.8-35.3a10.8 10.8 0 0 0 2.06-3.2c.17-.3.34-.58 1.07-1.07 1.34-1.78 2.13-3.35 2.91-4.93 0 0 0-.06.04-.06"/><path fill="#04B4DD" d="M196.03 80.82c-15 1.39-30 2.85-45.01 4.13-9.11.78-18.76-3.26-20.9-16.1-.68-4.08 3.35-10.65 7.56-11.54a344 344 0 0 1 24.03-4.22c6.47-.9 13.02-1.2 20.13-1.5 5.93 1.5 11.27 2.73 15.16 3.64 0 5.95.12 10.86-.04 15.76-.1 3.28-.6 6.55-.93 9.83"/><path fill="#04AADD" d="M196.44 80.9c-.09-3.36.41-6.63.52-9.91.16-4.9.04-9.81.04-15.76a319 319 0 0 1-14.74-3.7c4.17.25 8.52.84 12.87 1.37 1.14.14 2.34.24 3.46.06 12.03-1.96 23.52 1.4 35.13 3.5 1.9.34 3.76.97 6.22 1.76 1.06.42 1.54.55 2.02.69.19.04.37.08 1 .4 1.4 1.2 2.22 2.75 3.3 2.96 5.24 1.03 7.57 3.24 7.69 8.4.1 4.48-.34 8.97-.1 13.44.18 3.54-1.25 4.91-4.59 4.88-2.42-.02-4.84.04-7.27.07-11.3-2.35-22.58-4.8-33.91-6.98-3.68-.71-7.48-.74-11.64-1.17z"/><path fill="#181F6F" d="M98.33 225.53c6-.73 11.88-1.15 17.76-1.14.63 0 1.77 2.53 1.8 3.9.18 8.48.12 16.96.12 25.45-.01 16.3-.15 32.6.02 48.9.04 4.13-1.28 5.72-5.43 5.36-3.47-.3-6.99-.18-10.48-.06-3 .11-4.06-1.12-4.05-4.13.1-25.95.1-51.9.25-78.28z"/><path fill="#18206E" d="M230.04 253c0-8.48.13-16.47-.05-24.45-.09-3.5 1.2-4.52 4.63-4.59 15.31-.31 15.31-.4 15.3 14.81 0 21.3-.1 42.58.09 63.87.03 4.15-1.25 5.73-5.39 5.37a59 59 0 0 0-9.47-.02c-3.87.3-5.21-1.11-5.17-5.09.18-16.46.07-32.93.06-49.9"/><path fill="#4A3AAD" d="M335.01 46c.2 6.94.8 13.89.47 20.79-.22 4.41-1.8 8.76-3.07 13.19-.3.04-.45.04-.58-.2a2.9 2.9 0 0 0-.75-.75s-.09 0-.18-.32c-.68-.8-1.26-1.28-1.93-1.99-.7-.4-1.32-.57-1.94-.74-.28-.18-.56-.36-1.02-1.11-2.44-2.01-4.7-3.45-6.96-4.89 0 0-.05.02-.17-.3a17 17 0 0 0-2.9-1.67c-.18-.04-.36-.08-.93-.36-.56-.38-.75-.52-.95-.64 0 0-.1.01-.25-.2a3.5 3.5 0 0 0-.82-.8s-.05.01-.11-.25c-.68-.42-1.3-.58-1.92-.74-6.02-3.23-11.86-6.83-18.09-9.59-11.03-4.88-22.3-9.25-33.68-14.12 5.21.79 10.7 1.66 16.06 3.02 4.12 1.05 8.08 2.73 12.35 4.21l-.95 2.27c1.85.2 3.78.96 5.05.35.76-.37.68-2.87.67-4.4-.03-3.33-.69-6.7-.32-9.96.9-8.06-2.92-13.19-9.76-16.35-4.03-1.86-8.4-2.96-12.53-4.64-1.38-.56-2.46-1.85-3.72-3.16 24.02 7.18 46.46 18.12 67.93 32.23a3.9 3.9 0 0 0 1 1.12"/><path fill="#05A1DC" d="M242.18 89.38c2.23-.35 4.66-.41 7.08-.39 3.33.03 4.77-1.34 4.58-4.88-.23-4.47.21-8.96.1-13.44-.12-5.16-2.45-7.37-7.68-8.4-1.08-.21-1.91-1.76-3.03-2.88 9.65 3.07 19.74 5.72 29.23 9.77 9.41 4 18.22 9.43 27.52 14.88.5 1.25.69 1.9 1.05 2.45 2.55 3.75 4.25 7.17-2.19 8.82-.62.16-1.29 2.5-.97 3.54 1.2 4 3.04 7.82 4.11 11.84.3 1.15-1.14 3.94-1.82 3.96-1.73.03-4.48-.61-5.06-1.82-2.29-4.76-5.35-6.06-10.03-3.71-13.59-7.9-27.54-15-42.89-19.74"/><path fill="#0599DC" d="M285.23 109.41c4.53-2.64 7.59-1.34 9.88 3.42.58 1.2 3.32 1.85 5.05 1.81.68-.01 2.13-2.8 1.82-3.95-1.07-4.03-2.9-7.84-4.1-11.84-.32-1.04.35-3.39.97-3.55 6.44-1.65 4.73-5.06 2.19-8.81-.37-.54-.56-1.2-.9-2.14 6.17 3.78 12.78 7.44 18.54 12.14 8.05 6.57 15.46 13.91 23.28 21.25.3 2.85 1.08 5.15-2.35 6.88-1.62.81-1.26 4.92-2.74 6.8-2.52 3.22-.18 4.6 1.44 6.63 2.06 2.59 3.08 5.26-1 7.15-2.71 1.26-2.09 2.68-.35 4.51 2.18 2.3 2.77 4.56-1.69 5.4a4.72 4.72 0 0 1-2.03-2.05c.07-1.08.06-1.66.06-2.25l-1.33.25c-6.64-6.86-12.88-14.2-20.03-20.48-8.44-7.43-17.67-13.96-26.71-21.17m52.86 10.9-.1-.61c-.05.2-.1.4.1.6"/><path fill="#05B3DD" d="M250.04 467.07c-9.23 2.3-18.4 4.86-27.71 6.77-4.79.99-9.81 1-14.74 1.09-5.4.09-10.6-3.48-12.04-9.1-1.24-4.85-1.3-9.85 2.39-14.4 3.85-4.77 9.09-5.91 14.38-6.27 12.86-.87 24.77-5.22 37.08-8.71a38 38 0 0 1-4.64 4.96c1.56 5.4 1.5 5.3 6.63 2.42.96-.54 2.63.17 3.97.3-.57.97-.9 2.46-1.73 2.82-4.45 1.96-6.01 5.3-5.68 9.95.13 1.79.23 3.83-.5 5.36-1.46 3.12-.22 4.26 2.59 4.81"/><path fill="#4E5ABE" d="M83.62 22.02c4.62-1.2 8.9-2.26 13.1-3.54 3.8-1.15 7.49-2.64 11.3-3.73.9-.26 2.5.19 3 .88.46.62-.12 2.03-.3 3.08-.53 3.02-1.16 6.02-1.6 9.05-.44 2.98-.69 6-1.02 8.99l-1.33-.2a100 100 0 0 1 5.19 5.84c-.4.42-.84.5-1.74.3-1.52-.86-3.13-2.26-3.59-1.95-3.33 2.23-6.42 4.8-9.6 7.27 0 0 0 .02-.37.02A34 34 0 0 0 93 49.94s0 .07-.3.1c-.74.29-1.2.53-1.67.77-10.78 5.98-21.57 11.96-32.68 18.07.23-7.83.74-15.79 1.38-23.74.1-1.22.93-2.37 1.06-3.6.15-1.4-.1-2.84-.62-4.7-.7-1.24-.96-2.05-1.22-2.86 0 0 0-.03.38-.03a31.5 31.5 0 0 0 3.62-1.97l.2-.1c.41-.26.62-.44.8-.64.17-.05.34-.1 1.18-.21 4.17-.9 8.56-.1 9.84-5.03 0 0 0-.03.37-.03 1.44-.65 2.52-1.3 3.6-1.95 0 0 0-.08.21-.17.42-.25.62-.42.78-.63 1.11-.39 2.22-.78 3.7-1.2z"/><path fill="#4A38AE" d="M335.99 444.97c3.02-1.87 6.02-3.75 9.04-5.6 1.85-1.12 3.74-2.18 6.11-3.57.38 1.78.91 2.73.65 3.3-4.15 8.76 1.27 17.9-1.07 26.75-.24.9.76 2.13 1.24 3.55-.12.4-.29.45-1.07.57-2.38 1.72-4.13 3.37-5.88 5.01 0 0 0 .04-.2.17-.42.34-.63.57-.8.82-.48.3-.95.62-1.98.81a121 121 0 0 0-10.02 7.18s0 .06-.2.19c-.42.32-.62.53-.79.77 0 0 0 .1-.2.2-.4.22-.58.38-.74.56-.18.06-.36.12-1.15.28a15.7 15.7 0 0 0-2.91 1.98s0 .09-.2.18c-.4.24-.58.4-.74.6-.18.06-.37.12-1 .38-.68.4-.87.63-1.03.89 0 0 0 .05-.2.16-.42.26-.63.45-.8.65-.18.05-.35.1-1.02.16-.5.02-1 0-1.04-.05s-.03.12-.02.3l.03.54c-4.42 2.4-8.84 4.8-13.6 6.82-.15-4.56 2.6-8.16 3.21-11.88 1.04-6.37 4.03-14.07-4.13-18.76-.24-.14-.31-.57-.46-.87 6.58-4.66 13.16-9.3 19.73-13.97 2.24-1.6 4.46-3.23 7.16-5.08.67-.37.85-.53 1-.71.2-.06.37-.13 1.02-.4.68-.4.88-.62 1.05-.87 0 0-.01-.06.2-.2.43-.34.62-.57.79-.82 0 0 0-.04.02-.04"/><path fill="#0596DC" d="M369.96 373.06c-4.96 7.42-9.58 15.1-15 22.18-4.96 6.5-10.8 12.33-16.66 18.24a71 71 0 0 1 2-9.92c.47-1.77 1.02-3.52 1.53-5.28l-1.47-.51-4.2 3.96c-2.02-7.32 6.44-4.48 7.69-8.44-2.03-1.66-6.93.53-5.22-4.72 2.64-8.1.85-10.43-7.69-10.62 8-13.1 16-26.21 24.44-39.71 2.67-1.63 3.8-1.32 4.58 1.5 1.07 3.87 2.88 7.54 4.63 11.94-3.83 2.33-2.56 7.36-2.58 12.01-.02 7.22.6 7.9 7.95 9.37"/><path fill="#4A3EB0" d="M304.67 467.07c.5.29.56.72.8.86 8.16 4.7 5.17 12.39 4.14 18.76-.61 3.72-3.36 7.32-3.57 11.9-.03.39-.03.43-.35.42-1.11.6-1.92 1.2-2.72 1.8-13.41 5.28-26.83 10.55-40.6 15.9 2.62-3.26 5.02-7.55 11.5-6.13-.59-4.23-.83-7.94-1.72-11.48-.4-1.6-2.21-2.8-3.18-4.31-1.09-1.69-1.94-3.52-3.05-5.59-1.78-.47-4.08-1.08-6.63-1.92a1841 1841 0 0 1 41.52-18.4c.77-.38.98-.6 1.15-.86 0 0 0-.06.2-.16.42-.26.62-.43.8-.64.45-.04.9-.1 1.7-.15z"/><path fill="#1AE9A1" d="M303.91 201.02c-8.54-14.12-18.78-26.88-30.9-38.95-2.4-6.16-5.4-10.73-11.37-11.08-.39-7.9-.85-15.7-1-23.53 0-.56 2.46-1.79 3.65-1.64 3.6.42 7.15 1.37 10.71 2.12 0 0 .04 0 .18.21.35.45.6.65.86.82l-.07.34c-.01 1.26-.27 2.86.13 3.05 4.24 1.99 8.59 3.75 12.9 5.58 0 0 .04 0 .18.21.34.45.57.65.84.8a3.5 3.5 0 0 0 1 1c0 .01-.02.05.14.22.38.41.63.6.9.77 0 0 .44.1.71.51 1.25 1.11 2.24 1.8 3.22 2.5 0 0 .06 0 .2.2.32.45.55.65.81.8 0 0 .05 0 .18.2.33.45.56.64.83.8 0 0 .05 0 .05.37.65 1.8 1.3 3.24 1.66 4.88-1.6 2.94-5.29 4.24-4.1 8.6 1.54 5.67 2.13 11.6 2.91 17.45.13.94-.88 2.02-1.3 3.06-.57 1.4-1.07 2.8-1.6 4.2h5.75zm-31.32-54.51-.9-.54-.22.77c.34.05.68.1 1.12-.23"/><path fill="#0FEE9E" d="m303.93 201.03-2.55-16.52h-5.74c.53-1.4 1.03-2.81 1.6-4.2.42-1.04 1.43-2.12 1.3-3.06-.79-5.85-1.37-11.78-2.91-17.44-1.2-4.37 2.49-5.67 4.29-8.4.67.54.88 1.06 1.16 1.82.68.42 1.3.6 2.2.95 2.77 2.05 5.26 3.92 7.75 5.78 0 0-.02.03-.02.43-.2 3.29 1 4.83 4.07 4.56 0 0-.06.03.08.2.4.4.65.62.9.85 0 0-.06 0-.05.36-.01 3.58 1.57 5.4 4.78 5.79 0 0 .16.36.2.9a15.7 15.7 0 0 0 2.04 2.92s-.03.02.11.22c.34.44.59.64.88.79v.37c.68 1.45 1.36 2.53 2.04 3.62 0 0-.05.03-.02.34.7 1.1 1.35 1.88 2 2.66 0 0-.04.03-.03.38a36 36 0 0 0 2.05 3.62s-.06.03-.04.37c.7 1.44 1.38 2.53 2.07 3.63 0 0-.06.02-.06.39 1.6 3.48 3.2 6.6 4.78 9.7 0 0 .16.43.18 1.02.6 3.69-.38 5.1-3.82 4.98-5.91-.22-11.87.26-17.76-.2-3.2-.24-6.28-1.82-9.42-2.8 0 0-.06 0-.04-.39a28 28 0 0 0-1.97-3.61z"/><path fill="#482EA7" d="M385.11 138.33c.9-.18 1.86-.02 3.37.25-2.59-6.57-5.07-12.65-7.32-18.8-.37-1 .13-2.4.43-3.55.33-1.23.93-2.4 1.37-3.6 1.02-2.8 2.02-5.6 2.58-7.19-1.06-1.7-2.23-4.06-3.82-6.09-3.09-3.93-3-4.54 1.74-6.49.75-.3 1.4-.84 2.3-1.53a431 431 0 0 1 18.23 23.64c.97 1.47 1.86 2.25 2.75 3.03.06.17.11.33.35.94.4.67.62.88.86 1.06 0 0 .05 0 .05.02-.33 4.05-.97 8.08-.93 12.11.1 9.58.64 19.16.73 28.73.04 3.96-.54 7.94-1.06 11.88-.04.29-1.9.33-3.18.38-.34-.3-.4-.49-.6-1.11-.29-.6-.44-.76-.61-.9-.07-.21-.14-.42-.39-1.08-.32-.64-.49-.8-.67-.95l-.4-1.12a1.5 1.5 0 0 0-.45-.64l-.5-2.1c-.3-.78-.46-.98-.65-1.16-.05-.2-.1-.4-.22-1.23-.7-1.7-1.34-2.77-1.97-3.83 0 0-.1 0-.12-.36-.58-1.1-1.14-1.87-1.7-2.63-.06-.16-.12-.33-.38-.93-.4-.67-.63-.88-.88-1.05a794 794 0 0 1-8.91-15.7"/><path fill="#32E1AB" d="M208.11 103.96c3.85.44 7.71.88 11.32 1.68-3.23.43-6.3.1-9.17.73-2.04.45-4.69 1.78-5.48 3.46-1.27 2.72-1.4 6.03-1.7 9.12-.83 8.44.3 10.24 8.05 13.72.4.18.62.76.92 1.15-11.34-.6-22.68-1.21-34.89-1.81-2.16-.22-3.92 0-4.67-.75-2.75-2.8-5.22-2.19-7.59.15-6.34-4.78-7.66-9.97-4.64-16.83.56-1.27 1.17-2.94.8-4.12-1-3.14-.26-4.32 3.1-4.32.93 0 1.86-1.44 2.8-2.22 0 0 .03.06.47.06z"/><path fill="#03A9DE" d="M250.31 467.02c-3.07-.5-4.31-1.64-2.85-4.76.72-1.53.62-3.58.5-5.36-.34-4.65 1.23-8 5.67-9.95.83-.36 1.17-1.85 1.74-2.83-1.35-.13-3.01-.83-3.97-.3-5.13 2.88-5.07 3-6.63-2.4 1.65-1.58 3.25-3.1 5-4.93.34-.35.52-.41 1.25-.57 1-.3 1.48-.5 1.95-.72a377 377 0 0 1 16.15-7.19c3.81.25 6.86.53 10.48.87-.32.83.03.38-.02-.02-.25-2.13-1.13-4.52 2.36-4.75 3.08-.2 4.13 1.79 4.17 4.37.08 4.43.3 8.91-.21 13.3-.48 4.12-1.84 8.14-2.81 12.2 0 0 0 .11-.23.2-.44.22-.62.39-.77.6-9.42 3.73-18.84 7.47-28.92 11.28-1.14.3-1.61.52-2.09.75z"/><path fill="#0491DC" d="M370.02 373.05c-7.41-1.46-8.03-2.15-8-9.37 0-4.65-1.26-9.67 2.57-12-1.75-4.4-3.55-8.07-4.63-11.95-.78-2.82-1.9-3.12-4.42-1.82 1.82-5.85 3.92-11.76 6.05-17.78h31.01a189.7 189.7 0 0 1-21.84 51.76c-.44.63-.57.83-.68 1.04 0 0 0 .11-.06.12"/><path fill="#3DDDAE" d="M166.52 103.96c-.5.75-1.43 2.19-2.37 2.19-3.35 0-4.08 1.18-3.09 4.32.37 1.18-.24 2.84-.8 4.11-3.02 6.86-1.7 12.06 4.65 16.83 2.37-2.33 4.84-2.94 7.58-.15.75.76 2.51.53 4.21.76-5.77 1.06-12.03 1.74-18.1 3.24-7.65 1.9-15.13 4.47-23.52 6.76-1.99.05-3.16-.01-4.31.14-7.36.96-8.53-.03-7.63-7.43.2-1.67 1.77-3.23 2.9-4.7.74-.97 1.82-1.68 2.75-2.51l-.74-.9-4.38 1.88c-1-1.44-1.8-2.68-2.67-3.88-.82-1.13-1.68-2.23-2.76-3.66 7.9-.14 8.35-.52 8.78-6.8 0 0 .42-.15 1.06-.16 4.05-1.36 7.46-2.7 10.87-4.05 0 0 .04.03.42.03 2.14-.6 3.9-1.2 5.66-1.8 7.02-1.4 14.03-2.79 21.49-4.22"/><path fill="#059CDC" d="M330.63 378.07c8.86.07 10.65 2.39 8 10.5-1.7 5.24 3.2 3.05 5.22 4.72-1.24 3.96-9.7 1.11-7.69 8.44l4.2-3.97 1.47.51c-.5 1.76-1.06 3.51-1.51 5.29-.84 3.22-1.62 6.46-2.33 10.04.1.35.1.51-.13.62-.43.28-.58.47-.7.7-10.45 8.67-20.9 17.35-31.66 25.75 2.98-5.42 6.34-10.52 7.5-16.67l.37-.08c2.09-.92 3.82-1.76 6.6-3.1l-6.2-3.24c4.4-3.87-.24-5.97-1.49-8.82l4.5-4.78-9.81-1c4.86-4.98 9.77-9.92 14.56-14.96 3.02-3.19 5.86-6.54 9.1-9.95"/><path fill="#26E6A7" d="M212.25 133.9c-.5-.47-.72-1.05-1.11-1.23-7.75-3.48-8.89-5.27-8.06-13.72.3-3.09.44-6.4 1.7-9.12.8-1.68 3.44-3 5.48-3.46 2.86-.63 5.94-.3 9.4-.39.47-.01.9.04 1.29.42 5.29 1.44 10.2 2.5 15.11 3.55 0 0-.05.04.11.35 2.08.75 3.98 1.2 5.89 1.64 0 0-.05.05.16.3 1.75.76 3.3 1.24 4.84 1.73 0 0-.06.02.1.33 1.74.75 3.32 1.2 4.9 1.64 0 0-.06.05-.04.37 0 .77 0 1.23-.4 1.72-3.01-.32-5.63-.78-8.27-.95-1.25-.08-3.48.14-3.63.68a7.38 7.38 0 0 0 .42 4.53c.32.75 1.85.98 1.6.86-1.1 2.48-1.9 4.63-2.99 6.62a9.4 9.4 0 0 1-2.66 3.05c-1.05.75-2.43 1.04-4.48 1.86 1.52 1.07 2.33 2.01 2.7 1.86 4.63-1.9 6.42 2.18 9 4.34.46.38-.2 2.08-.35 3.16a46 46 0 0 0-1.88-1.28c-.67-.44-.91-.6-1.18-.72-1.75-.64-3.5-1.27-5.74-2.36a99 99 0 0 0-9.24-2.66s-.45-.06-.84-.44c-4-1.1-7.6-1.83-11.2-2.55 0 0-.43-.05-.63-.13"/><path fill="#05A2DD" d="M312.99 424.01c-1.15 6.15-4.52 11.24-7.85 16.68-.05.3-.06.4-.28.51-.43.3-.6.51-.75.75 0 0 0 .14-.4.12-1.19.67-1.97 1.35-2.76 2.03a841 841 0 0 1-17.5 9.87c.6-4.05 1.96-8.07 2.44-12.2.52-4.37.3-8.85.22-13.29-.05-2.58-1.1-4.56-4.18-4.36-3.49.22-2.6 2.62-2.35 4.74.04.4-.3.85.02.02-3.62-.33-6.67-.62-10.1-.9 12.01-8.25 24.42-16.5 37.14-24.87 3.18.17 6.05.46 10.13.88l-4.5 4.78c1.26 2.84 5.9 4.95 1.5 8.82l6.2 3.23c-2.78 1.35-4.52 2.19-6.65 2.78a161 161 0 0 1-2.91-2.1l-.75 1.73zm-3.27-10.57-1.68.32.29.82c.56-.27 1.12-.53 1.39-1.14"/><path fill="#45DAB1" d="M126.66 114.19c-.07 6.25-.52 6.62-8.42 6.77 1.08 1.43 1.94 2.52 2.75 3.65.87 1.2 1.68 2.44 2.67 3.89l4.38-1.88.75.9c-.93.82-2.01 1.54-2.76 2.51-1.13 1.47-2.69 3.03-2.9 4.7-.9 7.4.28 8.38 7.64 7.42 1.14-.15 2.32-.09 3.92-.12-3.69 2.34-7.82 4.66-11.94 7-1.67.95-3.3 1.95-5.65 2.99a13.2 13.2 0 0 0-3.06 2.04c-.23.3-.45.6-1.09 1.05-.59.25-.73.4-.83.57-.17.09-.33.17-.96.46-.72.41-.95.65-1.14.92 0 0 .01-.06-.36-.03-1.44 1.02-2.52 2.01-3.6 3l-.36.03c-1.1.69-1.88 1.34-2.66 2 0 0-.03-.05-.2.1l-.82.9s-.01-.06-.18.1a5.2 5.2 0 0 0-.82.9s.02-.05-.33-.09a12.9 12.9 0 0 1-2.16-3.89c-.4-1.35-.16-2.9-.64-4.2-1.36-3.66-2.98-7.2-4.38-10.84-.19-.49.08-1.53.49-1.8 5.26-3.59 3.84-9.04 4.04-14.04 0 0 .42-.17.99-.23 1.34-.73 2.13-1.4 2.91-2.07 8.12-4.23 16.24-8.45 24.72-12.71"/><path fill="#22E6A3" d="M251.02 355.06a368 368 0 0 1-18.84 9.84c-2.87.9-5.06 1.92-7.24 2.93 0 0-.4.15-.97.12-5.3-3.14-5.81-7.9-5.95-13-.06-2.19-.7-4.58-1.79-6.47-1.53-2.68-1.42-4.85 1.61-5.27 4.42-.62 5.94-3.54 7.25-7.02 0 0 .4-.16.9-.25 1-.39 1.5-.7 2-1.01 0 0 0 .07.17-.08.4-.36.63-.6.8-.86h.42c5.37-.07 8.46-2.85 10.58-7.04 0 0 .04.04.2-.1.42-.36.63-.6.8-.87 0 0 .03.02.21-.14.43-.36.63-.6.8-.87 0 0 .02.03.2-.13.43-.37.64-.61.8-.89 0 0 .03.05.2-.11.42-.4.64-.64.82-.92 0 0-.01.06.3.06l1.72.03c0 .01.03.03.03.4a81 81 0 0 0 4.3 6.23c-.64.32-2.28 1.82-3.22 1.47-3.62-1.36-4.73.69-5.77 3.1l5.03 6.18c-5.34 1.92-6.99 5.08-4.25 8.13 2.4 2.68 5.88 4.4 8.89 6.54"/><path fill="#13EC9E" d="M250.1 168.99c.35.01.62.17.93 1.05 1.5 5.93 5.67 6.89 10.3 7.15 0 0 .38.1.32.62 1.78 2.06 3.6 3.6 5.43 5.13 0 0-.06.03.1.2.41.38.67.6.93.81a552 552 0 0 1 15.82 19.84c.36 1.11.75 1.64 1.14 2.17 0 0-.06.04-.23.35-1.35.77-2.53 1.6-3.72 1.62-8.16.1-16.33.07-24.5 0-1.03-.02-2.06-.58-3.25-.93l2.4-5.07-7.06-.38v-1.45l4.08-3.02-1.57-.27c-.43-2.7-.82-5.4-1.32-8.09-.73-3.94-.7-8.35-2.56-11.68-1.71-3.08-2.28-5.24.06-8.02z"/><path fill="#1BE9A2" d="M247.01 169.02c-1.96 2.78-1.39 4.94.33 8.02 1.86 3.33 1.82 7.74 2.55 11.68.5 2.69.9 5.4 1.33 8.09l1.56.27-4.08 3.02v1.45l7.06.38-2.4 5.07c1.2.35 2.23.91 3.26.92 8.17.08 16.33.11 24.5 0 1.19-.01 2.37-.84 3.74-1.64 1.03.13 1.86.6 2.7 1.09l-.7 1.62h-5.57c-7.96 0-15.93-.25-23.88.1-4.36.2-7.43-1.16-10.3-4.37-2.84-3.16-6.3-5.76-9.93-8.91-.69-.5-.93-.65-1.2-.76 0 0 0-.02-.15-.22-.37-.43-.61-.64-.88-.8 0 0 .05-.01-.07-.3-.38-1.63-.63-2.97-.9-4.38l-6 .7s-.04.01.06-.4c-.15-3.03.6-6.75-.84-8.05-2.68-2.42-3.4-5.01-2.68-7.86.98-3.86 1.78-7.52-.1-11.28-.06-.14.36-.51.37-.53h12.24s-.01.03.13.35a25.3 25.3 0 0 0 3.9 1.67s-.06.04.07.33c2.04 1.77 3.96 3.25 5.88 4.74"/><path fill="#16EBA0" d="M251.02 355.04c-3-2.13-6.5-3.84-8.9-6.53-2.73-3.04-1.09-6.2 4.25-8.12l-5.02-6.17c1.04-2.43 2.15-4.47 5.77-3.11.94.35 2.58-1.15 3.23-1.48-1.84-2.5-3.08-4.18-3.94-6.24a29 29 0 0 1 5.02-2.37l6.02-.04c6.42.01 12.38.17 18.32-.04 3.8-.14 5.64 1.2 5.28 5.1 0 0-.05-.04-.4 0-1.42 1.7-2.51 3.34-3.6 4.98 0 0-.03-.02-.22.14-.43.37-.64.62-.81.9 0 0 0-.07-.3.06-.75 1.04-1.2 1.94-1.67 2.85 0 0 0 .08-.22.21-.46.33-.64.56-.79.83l-.2.16c-.44.34-.64.58-.8.84l-.21.15c-.44.34-.63.58-.79.85 0 0 0 .03-.2.16-.45.34-.64.58-.8.84l-.21.15c-.44.34-.63.58-.79.85 0 0 0 .02-.2.16-.44.34-.64.57-.8.84 0 0 0 .02-.2.16-.45.33-.64.57-.8.84 0 0 0 .03-.2.16-.45.34-.64.57-.8.84 0 0 0 .03-.2.16a2.6 2.6 0 0 0-.8.85s-.02 0-.21.14c-.43.35-.63.6-.8.86l-.21.1c-.45.27-.67.46-.86.7-.76.66-1.52 1.33-2.93 2.03-6.76-1.07-8.75.64-8.98 7.17 0 0-.03 0-.03.02"/><path fill="#4DD7B4" d="M97.7 129.23c.14 4.97 1.56 10.43-3.7 14.01-.4.28-.68 1.32-.5 1.8 1.41 3.63 3.03 7.19 4.39 10.84.48 1.3.24 2.86.64 4.2.4 1.35 1.19 2.58 2.16 3.93-4.23 5.78-9.58 9.33-17.51 8.1-5.84-.9-9.02-4.47-11.06-9.24-2.37-5.55-1.58-11.19 2.95-15.25 7.16-6.41 14.83-12.27 22.63-18.39"/><path fill="#22E6A3" d="M243.13 144.37c-.02-1.41.64-3.1.19-3.48-2.58-2.17-4.37-6.25-9-4.34-.37.15-1.19-.8-2.7-1.87 2.04-.82 3.42-1.1 4.47-1.86a9.4 9.4 0 0 0 2.66-3.05c1.1-1.99 1.9-4.14 3-6.62.24.12-1.3-.1-1.6-.85a7.4 7.4 0 0 1-.43-4.54c.15-.53 2.38-.76 3.63-.68 2.64.17 5.26.64 8.56 1.04 2.16-.01 3.65-.09 5.14-.17 0 0-.05.05.1.35 1.41.76 2.68 1.23 3.95 1.7 0 0 .44.05.8.3.62.41.88.56 1.16.66 0 0 .45.08.84.31.62.43.88.59 1.16.7 0 0-.05.03.1.2.43.38.7.6.96.8 2.87 1.45 5.73 2.9 8.75 4.65-3.42-.43-6.96-1.38-10.57-1.8-1.19-.15-3.65 1.07-3.64 1.64.13 7.82.6 15.63.99 23.52 5.97.35 8.97 4.92 11.23 10.78-4.07-2.34-8.1-5.23-12.38-7.71-5.64-3.28-11.46-6.25-17.37-9.68"/><path fill="#26E5A6" d="M236.86 161.62c-3.85.32-7.87.32-12.07.32-.01.01-.43.39-.36.52 1.87 3.77 1.07 7.42.09 11.29-.73 2.84 0 5.44 2.68 7.86 1.44 1.3.7 5.02.84 8.03a341 341 0 0 1-21.87-7.8c-.7-.52-.92-.7-1.18-1.22-2.43-4.6-5-8.65-4.04-14.03.58-3.26.11-6.7.11-11.1l8.46 1.89.5-4.2c2.77.56 5.52 1.1 8.75 1.9.47.24.87.28.87.28l.36-.17a458 458 0 0 1 16.86 6.43"/><path fill="#2EE3A9" d="M224.72 336.13c-.93 3.54-2.45 6.46-6.87 7.08-3.03.42-3.15 2.6-1.61 5.26a14.25 14.25 0 0 1 1.78 6.49c.14 5.09.65 9.85 5.74 13.02-4.7 1.37-9.76 2.7-15.7 4.03-4.6 0-8.33 0-12.06-.45-.22-2.41-.65-4.39-.64-6.36.05-6.83-2.82-14.06 2.66-20.4l.04-.63.81-.29c.68-.3.93-.49 1.14-.71 8.78-.07 16.67-3.2 24.71-7.04"/><path fill="#3FDCAF" d="M145.01 160.17c6.71-2.05 13.42-4.1 20.3-5.88-.85 1.44-2.97 3.2-2.71 3.67 2 3.74-.45 5-2.98 6.49-.63.37-1.33 1.33-1.3 2 .22 4.9.4 9.83 1.14 14.67.13.84 2.9 1.77 4.46 1.8 2.73.05 5.47-.56 8.21-.89a507 507 0 0 1-19.93 6.87c-1.5.66-2.32 1.4-3.15 2.15 0 0-.05-.05-.3.03-.76.38-1.25.68-1.74.98 0 0 .02-.06-.34-.04-1.78 1.03-3.2 2.03-4.6 3.03 0 0-.06-.04-.44-.05-1.42-.88-3.38-1.76-3.35-2.6.16-6.29-2.35-13.1 3.17-18.51.56-.55.91-2 .58-2.59-.3-.56-1.65-.74-2.53-.73-.86 0-1.71.48-2.57.75l-.81-.95c3.4-3.06 8.59-4.76 8.89-10.2"/><path fill="#36E0AD" d="M172.35 182.01c-2.96.36-5.7.96-8.43.9-1.57-.02-4.33-.95-4.46-1.8-.75-4.83-.93-9.76-1.14-14.67-.03-.66.67-1.62 1.3-2 2.52-1.48 4.98-2.74 2.97-6.48-.25-.48 1.87-2.23 3.14-3.6.97-.26 1.7-.31 3.07-.43 1.17-.3 1.68-.53 2.2-.76 10-3.92 20.4-1.7 30.4-1.57-3.87.39-7.5.46-11.13.4-3.82-.08-6.7.58-5.74 5.54.19.97-.56 2.12-.86 3.19-.9 3.2-1.7 6.43-2.71 9.6-1.3 4.05.36 6.7 3.72 8.7.22.13.23.6-.1.92a784 784 0 0 0-11.6 1.88s-.41.15-.63.18"/><path fill="#45DAB1" d="M144.64 160.11c.07 5.5-5.12 7.2-8.52 10.27l.81.94c.85-.27 1.7-.74 2.56-.75.89-.01 2.23.18 2.54.73.33.6-.02 2.04-.58 2.59-5.53 5.41-3.01 12.23-3.18 18.51-.02.84 1.93 1.73 3.37 2.63a24 24 0 0 1-5.48 4.66c-1.84-.32-4.18-.9-4.22-.75-2.27 7.23-8.47 6.52-14.02 7.09 0 0-.44-.07-.57-.45 2.91-3.52 2.54-6.03-1.9-7.54 1.52-1.85 3.45-3.17 3.8-4.83.74-3.45.65-7.08.9-10.64l1.3.1-4.27-5.14s.08-.28.56-.22c2.06-1.42 3.64-2.9 5.22-4.39 0 0 .03.06.2-.1.4-.37.63-.61.82-.89 0 0-.01.06.34.07 2.99.67 5.06.54 4.63-3.07 0 0 .03.06.2-.1.39-.41.6-.66.83-.91 0 0 0 .06.17-.06.41-.28.65-.47.86-.68l.87-.3c.69-.3.92-.48 1.13-.7 3.75-2.04 7.5-4.09 11.63-6.07m-18.37 31.74c.15-1.34.36-2.69.35-4.03 0-.12-2.06-.47-2.13-.3-.85 2.13-1.52 4.34-2.23 6.54l1.35.78c.8-.79 1.59-1.58 2.66-3"/><path fill="#41DCAF" d="M197.58 344.1c.47.07.45.5.03.79-5.7.58-10.96.85-16.23 1.14-6.52.37-7.18 1.54-4.62 7.21a13.8 13.8 0 0 1 1.15 5.77c-.09 4.61-.55 9.22-.86 13.82-4.75-.61-9.5-1.23-14.82-2.08-.82-.41-1.06-.58-1.32-.72 0 0 .06 0-.01-.32-1.23-1.9-2.1-3.84-3.59-5-3.24-2.54-3.76-4.71-.04-7.14.2-.13.19-.6.36-1.21l-2.71-2.33 1.46-.52c-.37-2.23-1.06-4.47-1-6.69.06-2.1.9-4.19 1.4-6.28 1.41.82 2.81 1.64 3.88 2.49-1.24.74-2.13 1.46-3.03 2.18l1.35 1.15c.67-1.12 1.34-2.24 2.4-3.44 2.84-.37 5.28-.66 7.72-.95 9.34.69 18.67 1.38 28.48 2.13"/><path fill="#2EE3A9" d="M185.02 179.94c-.11-.31-.12-.78-.34-.91-3.36-2-5.02-4.65-3.72-8.7 1.01-3.16 1.8-6.4 2.7-9.6.3-1.07 1.06-2.22.87-3.19-.96-4.96 1.92-5.61 5.74-5.54 3.63.06 7.26 0 11.37-.03 2.87.28 5.26.56 8.02 1.03.21 1.46.06 2.74-.14 4.37l-8.46-1.89c0 4.4.47 7.85-.1 11.11-.96 5.37 1.6 9.42 3.61 14.03-1.5.39-2.6.4-3.7.4 0 0-.45-.05-1.03-.3-5.33-.43-10.07-.6-14.82-.78"/><path fill="#26E6A7" d="M321.02 355.06s-.08.42-.52.66c-4.2.67-4.08 3.65-4.48 6.3 0 0-.02-.02-.2.14-.42.39-.63.64-.8.93 0 0-.06.44-.3.81-.42.6-.57.86-.69 1.13l-.4-.03c-5.88-.8-4.58-3.83-2.47-7.02l-3.09-2.12c.34-4.2.9-7.79.87-11.37-.06-6.51 2.42-13.17-.83-19.84.45-1.71.74-3.1 1.03-4.5 9-.05 17.99-.08 26.98-.19 1.96-.02 3.42.2 2 2.61-6.05-.34-11.52-.59-17-.84.05 4.5.04 9.02.17 13.52.03.96.71 1.88.85 2.85.16 1.1.53 2.71-.03 3.28-3.6 3.7-.36 5.49 1.74 7.91-.36 1.13-.6 1.97-.83 2.8 0 0-.06.45-.3.82-.42.6-.57.84-.7 1.1 0 0-.02-.01-.2.14-.43.38-.63.63-.8.9z"/><path fill="#36E0AD" d="M307.96 324.98c3.4 6.34.92 13 .98 19.5.03 3.6-.53 7.19-.87 11.38l3.08 2.12c-2.1 3.19-3.4 6.22 2.5 7.04a64.4 64.4 0 0 1-8.6 8.96c-3.18.22-5.65.42-8.28.64.3-2.15 1.65-5.1.83-7.2-3.3-8.5 3.27-16.71.26-25.17-.48-1.37 1.5-3.53 2.1-5.4.52-1.6.7-3.3 1.02-4.97.32-.44.65-.89 1.24-1.76.46-.67.62-.94.74-1.22 0 0 .06-.4.4-.64a819 819 0 0 0 4.6-3.28"/><path fill="#4AD9B3" d="m161 343-4.21-2.46c-.5 2.09-1.35 4.17-1.4 6.28-.07 2.22.63 4.46.99 6.69l-1.46.52 2.71 2.32c-.17.61-.15 1.09-.36 1.22-3.72 2.43-3.2 4.6.04 7.14 1.49 1.16 2.36 3.1 3.57 5.02a64.6 64.6 0 0 1-11.92-3.57 23 23 0 0 0-5.04-2.1s.07-.04-.04-.33c-2.3-2.8-4.51-5.32-6.71-7.83 0 0-.14-.37-.08-.98l.84-10.98s.06.06.34-.07c.74-1.07 1.2-2 1.67-2.94 0 0 .04.05.22-.1.39-.4.6-.65.82-.9 0 0 0 .06.36.04 4.5-1 8.63-2 12.76-2.99a314 314 0 0 1 14.8 4.66c-2.24.61-4.68.9-7.51 1.27l-.4.09z"/><path fill="#36E0AD" d="M177.36 372.9c0-4.68.46-9.28.56-13.9.04-1.92-.37-4-1.16-5.76-2.55-5.68-1.9-6.85 4.62-7.21 5.27-.3 10.54-.57 16.22-.93-5.06 6.03-2.2 13.26-2.24 20.1-.02 1.97.41 3.94.17 6.36-5.84.8-11.22 1.16-16.6 1.52a23 23 0 0 1-1.57-.18"/><path fill="#45DAB1" d="M300.67 332.04c-.01 1.5-.19 3.2-.7 4.8-.6 1.88-2.59 4.04-2.1 5.4 3 8.47-3.56 16.68-.26 25.18.81 2.1-.54 5.05-.84 7.2 2.63-.22 5.1-.42 7.95-.6-2.9 3.36-6.76 3.71-11.58 1.84-1.15-.51-1.7-.68-2.25-.84 0 0-.44-.05-.83-.28-.61-.43-.87-.6-1.16-.72 0 0 .07 0 .04-.32-.83-1.73-1.9-3.03-2.37-4.53-.97-3.03-2.83-8.57-2.23-8.87 4.15-2.06 1.44-4.94 1.62-7.38 0 0 .01.07.18-.14.39-.75.6-1.3.82-1.85 0 0 .03.06.2-.08.4-.41.61-.67.83-.93 0 0 0 .08.17-.07.4-.41.62-.67.83-.93 0 0 0 .08.17-.07.4-.42.61-.68.84-.94 0 0-.01.07.26-.04.75-1.06 1.23-2 1.7-2.93 0 0 .02.05.2-.1.4-.4.62-.67.84-.93 0 0 0 .09.16-.07.39-.42.61-.68.84-.94 0 0 0 .11.16-.1.37-.77.59-1.32.8-1.87 0 0 .02.06.2-.1.38-.42.6-.69.82-.95 1.46-2.56 2.91-5.12 4.69-7.84"/><path fill="#1AE9A1" d="M323.98 348.99c-2.23-2.12-5.47-3.91-1.87-7.61.56-.57.19-2.18.03-3.28-.14-.97-.83-1.9-.85-2.85-.14-4.5-.13-9.01-.17-13.52 5.48.25 10.95.5 16.66 1.06-1.62 4.9-3.23 9.62-5.42 14.04-1.65 3.33-4.05 6.3-6.49 9.88a469 469 0 0 0-1.89 2.28"/><path fill="#4DD7B4" d="M116.91 177.7a47 47 0 0 1 4.53 4.97l-1.3-.1c-.24 3.56-.15 7.19-.89 10.64-.35 1.66-2.28 2.98-3.8 4.83 4.44 1.5 4.81 4.02 1.69 7.47-10.22-1.97-11.82-16.21-6.1-22.89 1.58-1.83 3.72-3.18 5.87-4.92"/><path fill="#3DDDAE" d="M207.87 103.6c-13.17.37-26.58.38-40.47.37 9.04-.58 18.54-1.3 28.05-1.62 4.05-.14 8.12.57 12.42 1.25"/><path fill="#59CFB0" d="M285.63 353.08c.15 2.27 2.86 5.16-1.28 7.21-.6.3 1.25 5.84 2.22 8.87.48 1.5 1.54 2.81 2.36 4.56-7.09-2.98-8.81-12.83-3.3-20.64"/><path fill="#41DCAF" d="M179.18 373.45c5.13-.72 10.51-1.08 16.36-1.45 4.19 0 7.91.01 12.1.03-6.27.66-13.02 1.41-19.78 1.92a40.7 40.7 0 0 1-8.68-.5"/><path fill="#1AE9A1" d="M306.02 205.46c3.1.58 6.2 2.16 9.39 2.4 5.89.46 11.84-.02 17.76.2 3.44.13 4.42-1.3 3.84-4.75a69 69 0 0 1 2.9 5.68c-10.63 0-20.48.1-30.32-.14-1.2-.03-2.36-1.95-3.57-3.39"/><path fill="#482EA7" d="M346.11 92.36c.18-.4.62-.67.8-.55 5.23 3.61 10.65 7.05 13.03 13.8a330 330 0 0 1-13.83-13.25"/><path fill="#4DD7B4" d="M118.15 206.38c5.32-.92 11.52-.2 13.79-7.44.04-.14 2.38.43 3.9.88-4.23 6.19-10.24 8.15-17.7 6.56z"/><path fill="#4D53B9" d="M97.42 47.98c2.79-2.44 5.88-5.01 9.21-7.24.46-.31 2.07 1.09 3.26 2a137 137 0 0 1-12.47 5.23z"/><path fill="#22E6A3" d="M288.87 137.62a153 153 0 0 1-12.76-5.27c-.4-.19-.14-1.79-.12-3.06a157 157 0 0 1 12.88 8.33"/><path fill="#482EA7" d="M373.19 121.3c5.54 2.3 9.15 6.46 9.82 13.24a291 291 0 0 1-9.82-13.24"/><path fill="#22E6A3" d="M251.4 354.99c-.12-6.5 1.87-8.2 8.35-7.03a81 81 0 0 1-8.35 7.03m29.96-29.09c.05-3.76-1.79-5.1-5.6-4.96-5.93.21-11.89.05-18.3-.16-.47-.21-.47-.63-.47-.63h27.68c-1.1 2.06-2.04 3.83-3.3 5.75zM311 159.61c-2.46-1.52-4.95-3.39-7.94-5.62a15 15 0 0 0-2.05-1c-.21-.52-.42-1.05-.82-1.79a43 43 0 0 1-2.12-4.86c4.3 4.08 8.6 8.5 12.93 13.27"/><path fill="#1BE9A2" d="M261.18 176.92c-4.48 0-8.66-.95-10.07-6.64 3.27 1.88 6.6 4.12 10.07 6.64"/><path fill="#3FDCAF" d="M184.57 179.95c5.2.16 9.94.33 15.05.68-4.94.23-10.25.18-15.55.38-3.41.13-6.82.63-10.66.9 3.29-.7 7-1.32 11.16-1.96"/><path fill="#32E1AB" d="M235.87 109.62c-4.72-.72-9.63-1.77-14.71-3.13 4.72.73 9.62 1.76 14.71 3.13"/><path fill="#4832AA" d="M332.36 483.92a102 102 0 0 1 9.37-7.1 102 102 0 0 1-9.37 7.1"/><path fill="#2EE3A9" d="M239.61 326.98c-1.76 4.16-4.85 6.94-10.22 7a126 126 0 0 1 10.22-7"/><path fill="#45DAB1" d="M308.12 324.66a38 38 0 0 1-4.67 3.42 57 57 0 0 1 5.33-7.98c.08 1.45-.22 2.84-.66 4.56"/><path fill="#482EA7" d="M363.18 109.33c4.69-.33 5.17 3.83 6.82 7.24a94 94 0 0 1-6.82-7.24"/><path fill="#4C4DB8" d="M163.74 496.67c-3.3-.06-6.85-.45-10.56-1.14 3.32.07 6.82.45 10.56 1.14"/><path fill="#4A3AAD" d="M245.23 37.34c3.68-2.69 6.37.45 9.6 2.12a65 65 0 0 1-9.6-2.12"/><path fill="#45DAB1" d="M138.55 109.98a145 145 0 0 1-10.25 4c3-1.34 6.43-2.65 10.25-4"/><path fill="#1AE9A1" d="M336.87 201.7a91 91 0 0 1-4.83-9.37 91 91 0 0 1 4.83 9.37"/><path fill="#59CFB0" d="M137.1 356.27a76 76 0 0 1 6.77 7.5 76 76 0 0 1-6.77-7.5"/><path fill="#4D55BA" d="M106.8 483.69a68 68 0 0 1-9.65-3.35c3.07.8 6.28 1.91 9.65 3.35"/><path fill="#59CFB0" d="M153.89 336.63a111 111 0 0 1-12.56 3.32c3.23-3.4 7.47-4.64 12.56-3.32"/><path fill="#26E5A6" d="M228.13 190.38c1.75-.54 3.63-.76 5.85-1.03.27 1.41.52 2.76.87 4.4a42.7 42.7 0 0 1-6.72-3.37"/><path fill="#59CFB0" d="M137.59 344.13c.09 3.27-.17 6.73-.52 10.6 0-3.2.09-6.8.52-10.6"/><path fill="#32E1AB" d="M213.08 134.37c3.4.39 7 1.1 10.78 2.13-3.4-.4-6.99-1.1-10.78-2.13"/><path fill="#26E5A6" d="M247.4 169.02a49.4 49.4 0 0 1-6.25-4.77 74 74 0 0 1 8.78 4.43c-.6.32-1.37.33-2.53.34"/><path fill="#36E0AD" d="M316.34 361.9c.08-2.52-.03-5.5 4.08-5.97a38 38 0 0 1-4.08 5.97"/><path fill="#4933AB" d="M319.18 70.3a50 50 0 0 1 6.73 4.33 50 50 0 0 1-6.73-4.34"/><path fill="#4832AA" d="M345.35 474.95a39.6 39.6 0 0 1 5.28-4.93 39.4 39.4 0 0 1-5.28 4.93"/><path fill="#482EA7" d="M380.83 84.69a52 52 0 0 1-5.81-5.23 52 52 0 0 1 5.81 5.23"/><path fill="#1BE9A2" d="M266.95 182.64a35.5 35.5 0 0 1-5.25-4.64 35.5 35.5 0 0 1 5.25 4.64"/><path fill="#22E6A3" d="M320.81 171.8c-3.22-.04-4.8-1.86-4.78-5.46 1.6 1.45 3.2 3.28 4.78 5.46"/><path fill="#32E1AB" d="M225.11 137.35c2.73.4 5.64 1.14 8.73 2.18a51 51 0 0 1-8.73-2.18"/><path fill="#22E6A3" d="M315.03 164.62c-3.02.6-4.21-.94-4-4.24a23.4 23.4 0 0 1 4 4.24"/><path fill="#482EA7" d="M369.84 73.68c-2.59.16-4.76-.6-4.81-4.26a33.3 33.3 0 0 1 4.81 4.26"/><path fill="#2EE3A9" d="M225.31 367.89a38 38 0 0 1 6.49-2.98 38 38 0 0 1-6.49 2.98"/><path fill="#4DD7B4" d="M122.63 172.96a27.5 27.5 0 0 1-4.74 4.32 27.6 27.6 0 0 1 4.74-4.32m5.98-3.98c.77 3.57-1.3 3.7-4.3 3a23 23 0 0 1 4.3-3"/><path fill="#482EA7" d="M384.93 89.68a28.8 28.8 0 0 1-3.9-4.28 28.8 28.8 0 0 1 3.9 4.28"/><path fill="#22E6A3" d="M277.36 330.9a24.5 24.5 0 0 1 3.32-4.83 24.5 24.5 0 0 1-3.32 4.83"/><path fill="#2EE3A9" d="M256.55 320.08c.44.07.44.48.44.7-1.7.21-3.42.22-5.96.24h-4.15c3.07-.34 6.15-.67 9.67-.94"/><path fill="#22E6A3" d="M246.66 321.07a89 89 0 0 1 3.94-.05c-1 .67-2.4 1.33-4.19 2-.37.02-.39 0-.4-.3l.01-.84c0-.34.14-.59.64-.81"/><path fill="#45DAB1" d="M142.4 195.02a23 23 0 0 1 4.27-2.96c-1.06.98-2.5 1.95-4.27 2.96"/><path fill="#32E1AB" d="M241.88 111.62a20.3 20.3 0 0 1-5.69-1.36c1.74.12 3.62.58 5.69 1.36"/><path fill="#36E0AD" d="M323.86 349.29c.63-.91 1.14-1.53 1.94-2.24a24 24 0 0 1-2.48 4.9c-.06-.7.18-1.53.54-2.66"/><path fill="#45DAB1" d="M144.65 108.12a31.4 31.4 0 0 1-5.3 1.83 31.4 31.4 0 0 1 5.3-1.83"/><path fill="#482BA7" d="M384.66 390.16a20 20 0 0 1-2.37 4.71 20 20 0 0 1 2.37-4.71"/><path fill="#32E1AB" d="M251.89 115.63c-1.42-.13-3-.58-4.72-1.36 1.42.13 2.99.59 4.72 1.36"/><path fill="#482BA7" d="m375 445.99 2.53-.01a19.6 19.6 0 0 1-3.23 3.85c0-.98.28-2.07.63-3.5z"/><path fill="#32E1AB" d="M256.88 117.63c-1.33.4-2.82.47-4.59.46-.28-.55-.28-1.01-.26-1.81 1.58.11 3.13.57 4.85 1.35"/><path fill="#482EA7" d="M370.1 117.31c.94.76 1.9 1.85 2.9 3.28-.95-.75-1.91-1.85-2.9-3.28"/><path fill="#059CDC" d="M301.25 443.98a9.9 9.9 0 0 1 2.38-1.91 9.8 9.8 0 0 1-2.38 1.91"/><path fill="#4DD7B4" d="M106.37 159.93c.77-.88 1.85-1.88 3.3-2.87-.75.92-1.87 1.84-3.3 2.87"/><path fill="#482BA7" d="M384.28 439.82a14.5 14.5 0 0 1 2.23-3.79 14.5 14.5 0 0 1-2.23 3.79"/><path fill="#4729A6" d="M406.69 117.69a9.9 9.9 0 0 1-2.66-2.36 9.8 9.8 0 0 1 2.66 2.36"/><path fill="#45DAB1" d="M149.38 191.02a7.6 7.6 0 0 1 2.44-2.08 7.6 7.6 0 0 1-2.44 2.08"/><path fill="#32E1AB" d="M246.89 113.65a16.7 16.7 0 0 1-4.67-1.44c1.37.18 2.94.65 4.67 1.44"/><path fill="#59CFB0" d="M144.08 364.38c1.4.17 2.95.66 4.7 1.46a16.3 16.3 0 0 1-4.7-1.46"/><path fill="#482BA7" d="M380.71 396.17a7.8 7.8 0 0 1-1.46 2.94c.23-1.01.7-1.9 1.46-2.94"/><path fill="#4D53B9" d="M93.34 49.93c.76-.62 1.86-1.26 3.31-1.9a14.4 14.4 0 0 1-3.31 1.9"/><path fill="#1AE9A1" d="M304 201.39c.64.74 1.3 1.82 1.95 3.26a14 14 0 0 1-1.95-3.26"/><path fill="#22E6A3" d="M330.02 187.63a14.4 14.4 0 0 1-2-3.3c.67.74 1.32 1.85 2 3.3m2.02 4a15.2 15.2 0 0 1-2-3.32c.65.75 1.3 1.87 2 3.32"/><path fill="#482EA7" d="M374.79 78.73a10.9 10.9 0 0 1-2.76-2.31c.87.45 1.77 1.23 2.76 2.3"/><path fill="#22E6A3" d="M326.03 180.63a14.4 14.4 0 0 1-2-3.28c.66.74 1.31 1.84 2 3.28"/><path fill="#4D55BA" d="M96.83 479.69q-1.6-.15-3.67-1.19 1.61.15 3.67 1.19"/><path fill="#22E6A3" d="M295.89 143.65a10.5 10.5 0 0 1-2.9-2.11c.89.38 1.84 1.1 2.9 2.11"/><path fill="#32E1AB" d="M260.93 119.69a11 11 0 0 1-3.77-1.42c1.12.16 2.36.63 3.77 1.42"/><path fill="#0592DC" d="M332 151.36c.4-.38.85-.46 1.3-.54 0 .58.01 1.17-.15 1.95-.48-.24-.8-.68-1.15-1.41"/><path fill="#482BA7" d="M387.26 435.78c.46-.85 1.22-1.79 2.3-2.77-.45.86-1.23 1.77-2.3 2.77"/><path fill="#4729A6" d="M397.11 159.33c.62.74 1.26 1.8 1.9 3.2-.62-.73-1.25-1.8-1.9-3.2"/><path fill="#26E5A6" d="M240.9 163.65a10.7 10.7 0 0 1-3.73-1.37c1.11.14 2.35.6 3.73 1.37"/><path fill="#4933AB" d="M316.11 68.3q1.2.24 2.78 1.35-1.2-.23-2.78-1.34"/><path fill="#59CFB0" d="M291.65 345.05q-.24 1.23-1.42 2.8.24-1.22 1.42-2.8m-152.01-4a7.15 7.15 0 0 1-1.4 2.8c.15-.83.62-1.76 1.4-2.8"/><path fill="#22E6A3" d="M274.35 334.85c.16-.79.62-1.7 1.39-2.7a7.1 7.1 0 0 1-1.39 2.7"/><path fill="#4832AA" d="M326.33 487.92a8.2 8.2 0 0 1 2.31-1.88 8.2 8.2 0 0 1-2.31 1.88"/><path fill="#4DD7B4" d="M101.62 126.95a8.5 8.5 0 0 1-2.37 1.99 8.5 8.5 0 0 1 2.37-1.99"/><path fill="#4A38AE" d="M303.28 500.79c.5-.58 1.3-1.18 2.4-1.78a8.7 8.7 0 0 1-2.4 1.78"/><path fill="#4DD7B4" d="M103.36 162.02a8.2 8.2 0 0 1 2.34-1.94 8.2 8.2 0 0 1-2.34 1.94m11-8a8.7 8.7 0 0 1 2.38-1.96 8.7 8.7 0 0 1-2.38 1.96"/><path fill="#22E6A3" d="M322.99 175.64a8.3 8.3 0 0 1-1.97-2.4 8.3 8.3 0 0 1 1.97 2.4"/><path fill="#3FDCAF" d="M201.07 181.36c.9-.35 2-.35 3.52-.36.66.14.88.31 1.22.68-1.42.11-2.98.07-4.74-.32"/><path fill="#22E6A3" d="M328 183.65a8.2 8.2 0 0 1-1.94-2.36 8.2 8.2 0 0 1 1.94 2.36"/><path fill="#482EA7" d="M383.1 135.29q.9.69 1.89 2.32-.9-.68-1.89-2.32"/><path fill="#4729A6" d="M395.32 156.3a8.8 8.8 0 0 1 1.66 2.29 8.8 8.8 0 0 1-1.66-2.29"/><path fill="#4933AB" d="M311.14 65.28c.48-.1 1.1.06 1.78.46-.5.1-1.07-.05-1.78-.46m15.98 10.94c.54-.07 1.16.1 1.83.53.06.25.01.3-.22.28l-.7-.01a3.9 3.9 0 0 1-.91-.8"/><path fill="#1BE9A2" d="M285.02 205.65a3.4 3.4 0 0 1-1.06-1.5c.38.25.7.72 1.06 1.5"/><path fill="#4933AB" d="M329.03 76.98c.6.45 1.19.93 1.86 1.68-.39-.03-.87-.34-1.63-.97-.27-.3-.3-.65-.3-.65z"/><path fill="#482BA7" d="M368.3 455.87c.18-.49.63-1.08 1.35-1.78q-.27.74-1.35 1.78"/><path fill="#59CFB0" d="M291.03 375.31c.4-.13.96.04 1.75.37-.38.08-.99 0-1.75-.37m-4.37-24.26c.08.43-.13.97-.56 1.74-.05-.4.1-1 .56-1.74"/><path fill="#2EE3A9" d="M227.68 334.97c-.18.27-.69.58-1.48.95.19-.27.68-.6 1.48-.95"/><path fill="#3FDCAF" d="M170.68 153.1c-.2.3-.72.54-1.52.82.21-.27.7-.58 1.52-.82"/><path fill="#05B3DD" d="M251.37 466.87c.18-.29.66-.51 1.4-.77-.2.26-.65.55-1.4.77"/><path fill="#59CFB0" d="M294.68 341.06c.07.42-.15.97-.57 1.74-.05-.4.12-1 .57-1.74"/><path fill="#2EE3A9" d="M245.7 321.95c.31.12.3.3.3.77-.47.28-.93.27-1.73.24.14-.33.63-.64 1.43-1.01"/><path fill="#4D53B9" d="M91.32 50.84c.18-.27.64-.51 1.36-.8-.19.25-.63.55-1.36.8"/><path fill="#05A1DC" d="M241.85 58.65c-.37.13-.85 0-1.54-.3.34-.08.89-.03 1.54.3"/><path fill="#45DAB1" d="M147.32 192.03c.18-.26.67-.56 1.45-.92a4 4 0 0 1-1.45.92"/><path fill="#05B3DD" d="M252.68 435.14c-.19.27-.66.48-1.39.7.2-.24.65-.5 1.39-.7"/><path fill="#22E6A3" d="M296.94 144.71c-.2.08-.43-.11-.76-.53.23-.17.5-.02.76.53m1.01.99c-.2.09-.43-.11-.77-.53.15-.03.43.13.77.53"/><path fill="#482BA7" d="M383.25 440.83c-.05-.17.14-.37.52-.68.13.2-.02.45-.52.68"/><path fill="#059CDC" d="M304.33 441.9c-.08-.19.1-.4.48-.7.17.22.03.47-.48.7"/><path fill="#482BA7" d="M382.25 441.88c-.06-.17.12-.38.49-.72.16.2.02.47-.49.72m-3.01 2.96c-.06-.17.13-.38.51-.68.15.21 0 .46-.51.68m2.02-1.97c-.06-.17.13-.39.52-.71.14.2-.02.46-.52.71m-1 .99c-.06-.17.13-.38.52-.7.14.21-.02.46-.52.7"/><path fill="#4832AA" d="M332.71 447.29c.05.19-.13.35-.49.57-.12-.2.02-.43.49-.57"/><path fill="#4C4BB6" d="M145.27 33.8c-.02-.22.19-.27.53-.14.1.07-.32.2-.53.15"/><path fill="#4729A6" d="M394.1 154.25c.17-.05.4.15.73.57-.2.11-.45-.06-.73-.57"/><path fill="#0596DC" d="M337.37 414.88c-.09-.18.06-.38.4-.64.19.2.07.44-.4.64"/><path fill="#4DD7B4" d="M112.29 155.71c-.07-.2.07-.34.38-.5.15.22.04.41-.38.5"/><path fill="#2EE3A9" d="M219.76 155.12c.25.07-.12.24-.12.24s-.4-.04-.51-.1c.05-.12.22-.16.63-.14"/><path fill="#4DD7B4" d="M110.28 156.99c-.06-.2.16-.44.6-.8.02.15-.16.44-.6.8"/><path fill="#32E1AB" d="M266.01 122.73c-.16.04-.42-.17-.85-.58.15-.02.45.15.85.58"/><path fill="#59CFB0" d="M288.99 374.28c.2-.13.46.03.86.39-.14.06-.46-.03-.86-.39"/><path fill="#22E6A3" d="M275.97 128.73c-.2.07-.43-.13-.78-.55.14-.03.42.14.78.55"/><path fill="#4A38AE" d="M301.73 468.1c.06.17-.15.4-.56.73-.12-.2.05-.46.56-.73"/><path fill="#4832AA" d="M325.29 488.72c-.05-.2.13-.36.49-.6.14.22 0 .45-.49.6"/><path fill="#32E1AB" d="M262.96 120.71c-.2.14-.45 0-.85-.34.14-.07.45.01.85.34"/><path fill="#4832AA" d="M330.29 485.69c-.05-.2.12-.35.47-.58.14.21 0 .44-.47.58m.96-.82c-.06-.18.14-.4.53-.72.15.22 0 .48-.53.72m-8.97 5.94c-.06-.21.15-.4.55-.66.16.25 0 .5-.55.66"/><path fill="#4729A6" d="M407.88 119.77c-.17.05-.4-.16-.73-.57.2-.12.46.05.73.57"/><path fill="#4832AA" d="m320.03 490.96.74.04c.18.35 0 .6-.53.76-.24 0-.26-.37-.25-.56s.04-.24.04-.24"/><path fill="#22E6A3" d="M289.95 138.71c-.2.08-.43-.12-.77-.54.14-.03.42.14.77.54"/><path fill="#4832AA" d="M344.24 475.9c-.06-.18.15-.4.56-.75.14.22-.03.49-.56.75"/><path fill="#22E6A3" d="M290.96 139.71c-.2.08-.44-.12-.78-.55.14-.02.43.14.78.55m1.02.98c-.2.08-.44-.11-.8-.54.14-.02.43.14.8.54"/><path fill="#4832AA" d="M335.73 445.09c.07.18-.13.4-.53.75-.15-.21 0-.48.53-.75"/><path fill="#4A38AE" d="M302.72 467.21c.06.22-.14.4-.54.65-.16-.25 0-.5.54-.65"/><path fill="#32E1AB" d="M264.97 121.72c-.2.14-.46-.02-.86-.37.15-.06.46.02.86.37"/><path fill="#05A2DD" d="M282.31 454.8c-.07-.23.11-.4.49-.63.17.25.03.5-.49.63"/><path fill="#22E6A3" d="M315.98 165.73c-.18.04-.43-.18-.83-.6.15-.03.45.15.83.6"/><path fill="#482BA7" d="M370.23 453.84c-.05-.16.14-.37.51-.69.14.2-.01.45-.51.69m1-1c-.06-.16.13-.37.5-.7.14.2 0 .46-.5.7m1-1.01c-.05-.16.13-.37.5-.69.15.2 0 .45-.5.69m1-1c-.05-.17.15-.37.53-.68.13.2-.03.45-.53.68"/><path fill="#4832AA" d="M323.27 489.9c-.06-.17.13-.4.53-.74.13.2-.04.46-.53.74"/><path fill="#22E6A3" d="M239.99 142.28c.18-.11.42.04.8.38-.13.05-.42-.05-.8-.38"/><path fill="#4832AA" d="M334.75 446.11c.06.17-.14.4-.54.73-.13-.2.03-.46.54-.73"/><path fill="#1BE9A2" d="M268.01 183.7c-.17.04-.43-.18-.85-.6.15-.01.45.17.85.6"/><path fill="#59CFB0" d="M295.72 339.97c.04.17-.17.44-.6.87-.02-.15.16-.46.6-.87"/><path fill="#22E6A3" d="M268.29 340.95c-.09-.2.11-.44.54-.78.03.15-.13.44-.54.78"/><path fill="#59CFB0" d="M140.72 340c.04.18-.17.43-.6.84-.02-.16.16-.46.6-.84"/><path fill="#22E6A3" d="M269.29 339.95c-.09-.2.1-.44.54-.77.03.15-.13.43-.54.77m1-1c-.09-.2.11-.44.54-.78.03.15-.14.43-.54.78m1-1c-.1-.21.1-.45.53-.78.03.15-.12.44-.53.78m52.66-161.22c-.22.1-.47-.1-.8-.55.16-.04.45.13.8.55m-51.66 160.22c-.09-.2.11-.44.54-.78.03.15-.13.43-.54.78"/><path fill="#4933AB" d="M334.91 45.75c-.18.06-.4-.15-.74-.57.22-.14.49.03.74.57"/><path fill="#482EA7" d="M362.13 108.25c.18-.07.4.13.7.51-.21.17-.47.02-.7-.51"/><path fill="#22E6A3" d="M273.28 335.95c-.1-.2.1-.44.51-.76.2.24.05.51-.51.76"/><path fill="#2EE3A9" d="M228.72 334.05c.07.2-.15.44-.6.8-.01-.15.17-.44.6-.8"/><path fill="#22E6A3" d="M276.27 331.98c-.08-.2.13-.45.57-.8.02.14-.15.43-.57.8"/><path fill="#45DAB1" d="M302.71 329c.13.19-.03.45-.37.87-.07-.14.03-.46.37-.87"/><path fill="#4DD7B4" d="M123.72 172.01c.06.2-.16.44-.6.82-.02-.15.16-.44.6-.82"/><path fill="#482EA7" d="M361.13 107.26c.17-.07.38.11.7.48-.2.16-.45.02-.7-.48"/><path fill="#2EE3A9" d="M240.71 326.04c.08.2-.13.45-.57.8-.03-.15.15-.44.57-.8"/><path fill="#482EA7" d="M360.11 106.27c.17-.06.39.12.71.5-.2.14-.45 0-.71-.5"/><path fill="#2EE3A9" d="M241.71 325.03c.09.21-.12.45-.55.8-.03-.16.14-.45.55-.8m1.02-1c.08.2-.12.45-.56.8-.03-.15.14-.44.56-.8m1-1.04c.08.2-.14.46-.58.84-.03-.16.14-.46.58-.84"/><path fill="#4933AB" d="M313.1 66.25c.17-.07.4.12.74.5-.21.17-.48.03-.74-.5m1.06.95c.15-.07.34.06.63.35.13.13-.28.13-.28.13s-.3-.28-.35-.48"/><path fill="#26E5A6" d="M235.02 194.28c.2-.08.44.13.8.56-.15.02-.44-.14-.8-.56m1.03 1.01c.2-.14.44.01.82.36-.15.06-.45-.03-.82-.36"/><path fill="#4E5ABE" d="M57.3 69.88c-.07-.18.13-.4.53-.73.13.2-.03.47-.54.73"/><path fill="#4933AB" d="M331.14 79.24c.16-.06.37.12.68.48-.2.16-.45.02-.68-.48"/><path fill="#482EA7" d="M370.87 74.74c-.18.06-.4-.13-.71-.53.21-.16.48 0 .71.53m.98 1.01c-.18.06-.38-.12-.7-.5.22-.16.47-.01.7.5"/><path fill="#4729A6" d="M400.42 167.43c.02-.11.31.1.33.19s-.35-.08-.33-.19"/><path fill="#4AD9B3" d="M160.99 370.27c.18-.1.42.06.82.4-.14.05-.44-.05-.82-.4"/><path fill="#36E0AD" d="M314.29 364.96c-.14-.2.02-.46.36-.84.07.14-.01.46-.36.84"/><path fill="#4DD7B4" d="M102.28 162.99c-.04-.17.18-.42.6-.82.02.14-.16.44-.6.82m-1 1.01c-.07-.2.15-.45.6-.82.02.14-.16.45-.6.82"/><path fill="#36E0AD" d="M315.27 362.99c-.07-.19.14-.44.57-.83.02.14-.15.44-.57.83"/><path fill="#4729A6" d="M399.28 164.29c.2-.04.37.15.61.54-.22.12-.46-.03-.61-.54"/><path fill="#4A3AAD" d="M328.73 77.03c.23.01.26.35.27.52s-.46.21-.46.21-.36-.3-.43-.52c-.07-.23.39-.22.62-.21"/><path fill="#36E0AD" d="M321.27 354.98c-.08-.2.13-.44.56-.8.02.13-.14.42-.56.8m1.01-1.03c-.13-.2.03-.44.36-.83.07.15-.02.45-.36.83"/><path fill="#4DD7B4" d="M132.75 166.15c.05.25-.18.43-.64.69 0-.17.2-.45.64-.69"/><path fill="#59CFB0" d="M287.73 350c.04.18-.17.44-.6.85-.03-.16.15-.47.6-.85m1-1.01c.05.18-.17.44-.6.85-.03-.16.15-.46.6-.85m1-1c.04.18-.18.44-.61.85-.02-.15.16-.46.61-.85"/><path fill="#4DD7B4" d="M130.74 167.15c.05.25-.18.43-.63.71 0-.17.18-.46.63-.71"/><path fill="#0596DC" d="M370.29 372.88c-.1-.16.04-.36.32-.66.27.2.2.44-.32.66"/><path fill="#4DD7B4" d="M129.72 168.01c.03.17-.19.42-.61.82-.01-.14.17-.44.61-.82"/><path fill="#22E6A3" d="M263.22 345.85c-.07-.27.15-.46.6-.71.02.19-.16.47-.6.71"/><path fill="#4A3AAD" d="M256.08 40.26c.17-.1.39.04.72.36.14.14-.31.16-.31.16s-.34-.3-.41-.52"/><path fill="#59CFB0" d="M292.74 343.99c.04.17-.18.44-.6.85-.03-.15.15-.46.6-.85"/><path fill="#22E6A3" d="M264.29 344.96c-.09-.2.11-.44.54-.79.03.15-.13.44-.54.79"/><path fill="#4729A6" d="M401.29 169.29c.19-.06.35.1.6.42-.2.17-.44.05-.6-.42"/><path fill="#59CFB0" d="M293.73 342.99c.04.17-.19.44-.62.86-.02-.15.17-.46.62-.86"/><path fill="#22E6A3" d="M265.29 343.96c-.1-.21.1-.45.53-.78.03.15-.13.43-.53.78"/><path fill="#36E0AD" d="M199.74 343.13c.05.26-.2.45-.67.72 0-.18.2-.47.67-.72"/><path fill="#4729A6" d="M402.34 171.3c.17-.05.33.1.55.41-.2.14-.4.02-.55-.41"/><path fill="#22E6A3" d="M266.29 342.95c-.09-.2.1-.44.53-.77.03.15-.13.43-.53.77m1-1c-.09-.2.1-.44.53-.77.03.15-.13.43-.53.77"/><path fill="#4D53B9" d="M74.6 26.04c-.91 4.9-5.3 4.1-9.2 4.93 2.68-1.63 5.76-3.26 9.2-4.93"/><path fill="#4E5ABE" d="M58 37.01c-1.75.98-3.5 1.96-5.63 2.62-.38-.76-.4-1.21-.4-1.66.46-.31.93-.62 1.88-1.06.71-.29.92-.47 1.11-.67.16-.06.32-.12 1-.1 1.02.35 1.53.61 2.04.87"/><path fill="#4C4BB6" d="M145.59 4.17c-2.64.65-5.7 1.23-9.2 1.8a117 117 0 0 1 9.2-1.8"/><path fill="#4E5ABE" d="M39.63 46.01a21 21 0 0 1-4.4 3.11 21 21 0 0 1 4.4-3.1"/><path fill="#4D53B9" d="M48.62 40.04a7.86 7.86 0 0 1-2.63 2.9c-1.07.13-1.5.15-1.94.15l-.03-.07a61 61 0 0 1 4.6-2.98m9.72-3.03c-.85-.26-1.36-.52-2.13-.9a7.6 7.6 0 0 1 2.42-2.1c.58.78.84 1.6 1.24 2.7-.31.29-.75.3-1.53.3m20.28-12.96c-.75.62-1.83 1.27-3.27 1.92.74-.63 1.84-1.26 3.27-1.92m-16 7.96c-.75.63-1.84 1.29-3.28 1.94.75-.64 1.85-1.27 3.28-1.94M43 46c-.75 0-1.51 0-2.65-.02a6.6 6.6 0 0 1 2.35-1.93c.35-.02.42.02.4.34a164 164 0 0 0-.1 1.6m8.7-7.9c.29.34.3.79.3 1.58-.74.33-1.48.33-2.6.32a8.6 8.6 0 0 1 2.3-1.9m12.03-6.86c.05.23-.16.4-.56.64-.15-.24.02-.5.56-.64m-9 5c.05.22-.16.4-.57.65-.13-.23.05-.48.58-.64M79.7 23.2c.07.23-.12.4-.5.64-.18-.25-.03-.5.5-.64M43 44c.16-.3.34-.58.77-.92.24-.06.27-.01.13.18-.33.42-.55.62-.79.8l-.1-.06"/><path fill="#4A3AAD" d="M288.54 39.31c-.25.37-.55.55-.85.73l-.21-.78c.33-.05.67-.1 1.06.05m-25.52-27.33c.02-.02-.09.04-.03.01.05-.02.01.01.03-.01"/><path fill="#4E5ABE" d="M43.09 44.38c.26-.5.48-.7.83-1.1.57-.19 1-.21 1.76-.25.2 4.3.2 4.3-2.5 3.2a5.6 5.6 0 0 1-.1-1.85"/><path fill="#482BA7" d="M375 446s-.05-.1-.02-.06.02.06.02.06"/><path fill="#0592DC" d="M337.96 120.31c-.08-.2-.03-.4.02-.6.03.2.07.4-.02.6"/><path fill="#4832AA" d="M319.97 491.01c-.02.02-.02-.15.01-.1s.01.08-.01.1"/><path fill="#22E6A3" d="M272.54 146.69c-.39.14-.73.1-1.07.05l.22-.78c.3.18.6.36.85.73"/><path fill="#1AE9A1" d="M301.08 153.23c.45-.03.97.19 1.71.58a3.5 3.5 0 0 1-1.71-.58"/><path fill="#059CDC" d="M313 424a878 878 0 0 1-3.33-.78l.74-1.72c.84.61 1.68 1.23 2.56 2.16.04.33.03.34.03.34m-3.13-10.39c-.41.44-.97.7-1.54.97l-.29-.82c.56-.11 1.12-.22 1.83-.15"/><path fill="#4DD7B4" d="M126.13 192.17a39 39 0 0 1-2.52 2.67l-1.35-.77c.71-2.2 1.38-4.41 2.23-6.55.07-.17 2.12.19 2.13.31.01 1.34-.2 2.68-.49 4.34"/><path fill="#4AD9B3" d="m161 343-2.01 3.35-1.35-1.14c.9-.72 1.79-1.44 3.02-2.18z"/></svg>
\ No newline at end of file

From 93b7cb8beacc431abfdb277706c864a2ae844f1f Mon Sep 17 00:00:00 2001
From: Eric Nielsen <4120606+ericbn@users.noreply.github.com>
Date: Thu, 24 Jul 2025 21:55:15 -0500
Subject: [PATCH 28/29] Add custom icons for Tableau and X

---
 .../custom-icons/_data/custom-icons.json      | 11 +++-
 .../assets/custom-icons/icons/tableau.svg     | 52 +++++++++++++++++++
 .../apps/auth/assets/custom-icons/icons/x.svg | 18 +++++++
 3 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 mobile/apps/auth/assets/custom-icons/icons/tableau.svg
 create mode 100644 mobile/apps/auth/assets/custom-icons/icons/x.svg

diff --git a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
index ba42bb47f1..39a9b24bb5 100644
--- a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
+++ b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
@@ -436,7 +436,7 @@
       "title": "emeritihealth",
       "altNames": [
         "Emeriti Health",
-        "Emeriti Retirement Health",
+        "Emeriti Retirement Health"
       ]
     },
     {
@@ -1317,6 +1317,9 @@
         "T-Mobile ID"
       ]
     },
+    {
+      "title": "Tableau"
+    },
     {
       "title": "TCPShield"
     },
@@ -1526,6 +1529,12 @@
     {
       "title": "WYZE"
     },
+    {
+      "title": "X",
+      "altNames": [
+        "Twitter"
+      ]
+    },
     {
       "title": "Xbox",
       "hex": "107C10"
diff --git a/mobile/apps/auth/assets/custom-icons/icons/tableau.svg b/mobile/apps/auth/assets/custom-icons/icons/tableau.svg
new file mode 100644
index 0000000000..361bb578ac
--- /dev/null
+++ b/mobile/apps/auth/assets/custom-icons/icons/tableau.svg
@@ -0,0 +1,52 @@
+<svg version="1.1" id="Layer_1" xmlns:x="ns_extend;" xmlns:i="ns_ai;" xmlns:graph="ns_graphs;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 100.2 98" style="enable-background:new 0 0 100.2 98;" xml:space="preserve">
+ <style type="text/css">
+  .st0{fill:#E8762C;}
+	.st1{fill:#C72035;}
+	.st2{fill:#59879B;}
+	.st3{fill:#5B6591;}
+	.st4{fill:#EB912C;}
+	.st5{fill:#1F447E;}
+	.st6{fill:#7099A6;}
+ </style>
+ <metadata>
+  <sfw xmlns="ns_sfw;">
+   <slices>
+   </slices>
+   <sliceSourceBounds bottomLeftOrigin="true" height="98" width="100.2" x="-301.9" y="-233.3">
+   </sliceSourceBounds>
+  </sfw>
+ </metadata>
+ <g>
+  <g>
+   <g id="icon_1_">
+    <polygon class="st0" points="65.7,51.8 52,51.8 52,66.8 46.6,66.8 46.6,51.8 32.8,51.8 32.8,46.6 46.6,46.6 46.6,31.6 52,31.6 
+				52,46.6 65.7,46.6 			">
+    </polygon>
+    <polygon class="st1" points="38.2,70.3 25.9,70.3 25.9,56.8 21.3,56.8 21.3,70.3 8.8,70.3 8.8,74.3 21.3,74.3 21.3,87.6 
+				25.9,87.6 25.9,74.3 38.2,74.3 			">
+    </polygon>
+    <polygon class="st2" points="90.7,23 78.3,23 78.3,9.6 73.7,9.6 73.7,23 61.4,23 61.4,27.2 73.7,27.2 73.7,40.5 78.3,40.5 
+				78.3,27.2 90.7,27.2 			">
+    </polygon>
+    <polygon class="st3" points="59.8,84.9 51.5,84.9 51.5,75.6 47.5,75.6 47.5,84.9 39,84.9 39,88.5 47.5,88.5 47.5,98 51.5,98 
+				51.5,88.5 59.8,88.5 			">
+    </polygon>
+    <polygon class="st4" points="38.1,22.9 25.6,22.9 25.6,9.6 21.1,9.6 21.1,22.9 8.6,22.9 8.6,26.9 21.1,26.9 21.1,40.5 25.6,40.5 
+				25.6,26.9 38.1,26.9 			">
+    </polygon>
+    <polygon class="st3" points="100.2,47.4 91.9,47.4 91.9,38.1 87.8,38.1 87.8,47.4 79.4,47.4 79.4,51 87.8,51 87.8,60.3 
+				91.9,60.3 91.9,51 100.2,51 			">
+    </polygon>
+    <polygon class="st5" points="89.9,70.3 77.6,70.3 77.6,56.8 73,56.8 73,70.3 60.6,70.3 60.6,74.3 73,74.3 73,87.6 77.6,87.6 
+				77.6,74.3 89.9,74.3 			">
+    </polygon>
+    <polygon class="st6" points="59.2,9.3 50.9,9.3 50.9,0 47.9,0 47.9,9.3 39.6,9.3 39.6,12.1 47.9,12.1 47.9,21.2 50.9,21.2 
+				50.9,12.1 59.2,12.1 			">
+    </polygon>
+    <polygon class="st6" points="19.6,47.8 11.3,47.8 11.3,38.7 8.3,38.7 8.3,47.8 0,47.8 0,50.6 8.3,50.6 8.3,59.7 11.3,59.7 
+				11.3,50.6 19.6,50.6 			">
+    </polygon>
+   </g>
+  </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/mobile/apps/auth/assets/custom-icons/icons/x.svg b/mobile/apps/auth/assets/custom-icons/icons/x.svg
new file mode 100644
index 0000000000..d6464cc0bf
--- /dev/null
+++ b/mobile/apps/auth/assets/custom-icons/icons/x.svg
@@ -0,0 +1,18 @@
+<svg version="1.1" id="Layer_1" xmlns:x="ns_extend;" xmlns:i="ns_ai;" xmlns:graph="ns_graphs;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 49.8 45" style="enable-background:new 0 0 49.8 45;" xml:space="preserve">
+ <style type="text/css">
+  .st0{fill:#FFFFFF;}
+ </style>
+ <metadata>
+  <sfw xmlns="ns_sfw;">
+   <slices>
+   </slices>
+   <sliceSourceBounds bottomLeftOrigin="true" height="45" width="49.8" x="-67.2" y="-209.8">
+   </sliceSourceBounds>
+  </sfw>
+ </metadata>
+ <g>
+  <path class="st0" d="M39.2,0h7.6L30.2,19.1L49.8,45H34.4l-12-15.7L8.6,45H1l17.8-20.4L0,0h15.8l10.9,14.4L39.2,0z M36.5,40.4h4.2
+		L13.5,4.3H8.9L36.5,40.4z">
+  </path>
+ </g>
+</svg>
\ No newline at end of file

From 4d6d3d651a1552b4765b1f1cd7e89f71cb9b1941 Mon Sep 17 00:00:00 2001
From: Aman Raj Singh Mourya
 <146618155+AmanRajSinghMourya@users.noreply.github.com>
Date: Fri, 25 Jul 2025 12:44:37 +0530
Subject: [PATCH 29/29] Minor Fix

---
 mobile/apps/auth/assets/custom-icons/_data/custom-icons.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
index e5bc1c018e..566176e3d2 100644
--- a/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
+++ b/mobile/apps/auth/assets/custom-icons/_data/custom-icons.json
@@ -436,7 +436,7 @@
       "title": "emeritihealth",
       "altNames": [
         "Emeriti Health",
-        "Emeriti Retirement Health",
+        "Emeriti Retirement Health"
       ]
     },
     {