fix: no lock on queue duplicates

fix: locking around concurrency-1 jobs
2026-05-15 20:12:13 -04:00 · 2026-05-14 10:20:50 +02:00 · 2026-05-13 15:18:33 +02:00
50 changed files with 488 additions and 755 deletions
@@ -116,6 +116,7 @@ jobs:
            ~/.gradle/wrapper
            ~/.android/sdk
            mobile/android/.gradle
+            mobile/.dart_tool
          key: build-mobile-gradle-${{ runner.os }}-main

      - name: Setup Android SDK
@@ -188,6 +189,7 @@ jobs:
            ~/.gradle/wrapper
            ~/.android/sdk
            mobile/android/.gradle
+            mobile/.dart_tool
          key: ${{ steps.cache-gradle-restore.outputs.cache-primary-key }}

  build-sign-ios:
@@ -13,11 +13,8 @@ The `immich-server` docker image comes preinstalled with an administrative CLI (
 | `enable-oauth-login`       | Enable OAuth login                                            |
 | `disable-oauth-login`      | Disable OAuth login                                           |
 | `list-users`               | List Immich users                                             |
-| `grant-admin`              | Grant admin privileges to a user (by email)                   |
-| `revoke-admin`             | Revoke admin privileges from a user (by email)                |
 | `version`                  | Print Immich version                                          |
 | `change-media-location`    | Change database file paths to align with a new media location |
-| `schema-check`             | Verify database migrations and check for schema drift         |

 ## How to run a command

@@ -105,22 +102,6 @@ immich-admin list-users
 ]
 ```

-Grant Admin
-
-```
-immich-admin grant-admin
-? Please enter the user email:  user@example.com
-Admin access has been granted to user@example.com
-```
-
-Revoke Admin
-
-```
-immich-admin revoke-admin
-? Please enter the user email:  user@example.com
-Admin access has been revoked from user@example.com
-```
-
 Print Immich Version

 ```
@@ -145,12 +126,3 @@ immich-admin change-media-location
 Database file paths updated successfully! 🎉
 ...
 ```
-
-Schema Check
-
-```
-immich-admin schema-check
-Migrations are up to date
-
-No schema drift detected
-```
@@ -52,7 +52,7 @@ Scroll to the bottom of the "**Details**" section and find the `IP Address` list

 ## Step 4 - Configure Firewall Settings

-Once your project completes the build process, your containers will start. In order to be able to access Immich from your browser, you need to configure the firewall settings for your Synology NAS to allow communication between the Immich containers.
+Once your project completes the build process, your containers will start. In order to be able to access Immich from your browser, you need to configure the firewall settings for your Synology NAS.

 Open "**Control Panel**" on your Synology NAS, and select "**Security**". Navigate to "**Firewall**"

@@ -74,7 +74,6 @@ Read the [Post Installation](/install/post-install.mdx) steps and [upgrade instr

 <details>
  <summary>Updating Immich using Container Manager</summary>
-
 Check the post installation and upgrade instructions at the links above before proceeding with this section.

 ## Step 1. Backup
@@ -111,7 +110,7 @@ Go to **Project**, select **Action** then **Build**. This will download, unpack,

 ## Step 5. Update firewall rule

-Without a fixed subnet, the default behavior is to automatically start the containers once installed. If `immich_server` runs for a few seconds and then stops, it may be because the firewall rule no longer matches the server IP address.
+The default behavior is to automatically start the containers once installed. If `immich_server` runs for a few seconds and then stops, it may be because the firewall rule no longer matches the server IP address.

 Go to the **Container** section. Click on `immich_server` and scroll down on **General** to find the IP address.
 ![Container IP](../../static/img/synology-container-ip.png)
@@ -124,67 +123,4 @@ In this example, the IP addresses mismatch and the firewall rule needs to be edi

 ![Edit IP](../../static/img/synology-fw-ipedit.png)

-To prevent future firewall issues, you may set a fixed subnet. [See Set Fixed Subnet](#set-fixed-subnet) for instructions.
-
-</details>
-
-<details id="set-fixed-subnet">
-  <summary>Set Fixed Subnet</summary>
-
-Docker by default assigns dynamic subnets to bridge networks which can change when rebuilding containers and can cause firewall rules to break. To avoid this, define a fixed subnet in your `docker-compose.yml`:
-
-## Step 1. Determine current subnet
-
-Go to the **Container** section. Click on `immich_server` and scroll down on **General** to find the IP address.
-![Container IP](../../static/img/synology-container-ip.png)
-
-## Step 2. Add network configuration
-
-Add the following network configuration at the end of your `docker-compose.yml` file:
-
-```yaml
-networks:
-  immich-network:
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 172.20.0.0/16
-          gateway: 172.20.0.1
-```
-
-If your docker container is running on a different subnet then update accordingly.
-
-## Step 3. Add network to each service
-
-Add the network to each service (immich-server, immich-machine-learning, redis, database):
-
-```yaml
-services:
-  immich-server:
-    # other config options
-    networks:
-      - immich-network
-
-  immich-machine-learning:
-    # other config options
-    networks:
-      - immich-network
-
-  redis:
-    # other config options
-    networks:
-      - immich-network
-
-  database:
-    # other config options
-    networks:
-      - immich-network
-```
-
-Save your changes. Synology will ask if you want to save changes only or rebuild containers. Select rebuild containers.
-
-## Step 4. Update Firewall Rules, if necessary
-
-If your firewall rules were not already set for this subnet, the firewall rules will need to be updated. See [Step 4 - Configure Firewall Settings](#step-4---configure-firewall-settings).
-
 </details>
@@ -2,7 +2,7 @@ import { LoginResponseDto, ManualJobName } from '@immich/sdk';
 import { errorDto } from 'src/responses';
 import { app, utils } from 'src/utils';
 import request from 'supertest';
-import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest';
+import { afterAll, beforeAll, describe, expect, it } from 'vitest';

 describe('/admin/database-backups', () => {
  let cookie: string | undefined;
@@ -13,9 +13,6 @@ describe('/admin/database-backups', () => {
    admin = await utils.adminSetup({
      onboarding: false,
    });
-  });
-
-  beforeEach(async () => {
    await utils.resetBackups(admin.accessToken);
  });

@@ -568,8 +568,6 @@ export const utils = {
      name: ManualJobName.BackupDatabase,
    });

-    await utils.waitForQueueFinish(accessToken, 'backupDatabase');
-
    return utils.poll(
      () => request(app).get('/admin/database-backups').set('Authorization', `Bearer ${accessToken}`),
      ({ status, body }) => status === 200 && body.backups.length === 1,
@@ -885,13 +885,15 @@
  "cutoff_date_description": "Keep photos from the last…",
  "cutoff_day": "{count, plural, one {day} other {days}}",
  "cutoff_year": "{count, plural, one {year} other {years}}",
+  "daily_title_text_date": "E, MMM dd",
+  "daily_title_text_date_year": "E, MMM dd, yyyy",
  "dark": "Dark",
  "dark_theme": "Switch to dark theme",
  "date": "Date",
  "date_after": "Date after",
  "date_and_time": "Date and Time",
  "date_before": "Date before",
-  "date_of_birth": "Date of birth",
+  "date_format": "E, LLL d, y • h:mm a",
  "date_of_birth_saved": "Date of birth saved successfully",
  "date_range": "Date range",
  "day": "Day",
@@ -1581,6 +1583,7 @@
  "mobile_app_download_onboarding_note": "Download the companion mobile app using the following options",
  "model": "Model",
  "month": "Month",
+  "monthly_title_text_date_format": "MMMM y",
  "more": "More",
  "motion": "Motion",
  "move": "Move",
@@ -23,8 +23,6 @@ import java.io.IOException
 import java.nio.ByteBuffer
 import java.util.concurrent.ConcurrentHashMap

-private const val MAX_PREALLOC_BYTES = 128 * 1024 * 1024
-
 private class RemoteRequest(val cancellationSignal: CancellationSignal)

 class RemoteImagesImpl(context: Context) : RemoteImageApi {
@@ -230,6 +228,7 @@ private class CronetImageFetcher : ImageFetcher {
    private val onComplete: () -> Unit,
  ) : UrlRequest.Callback() {
    private var buffer: NativeByteBuffer? = null
+    private var wrapped: ByteBuffer? = null
    private var error: Exception? = null

    override fun onRedirectReceived(request: UrlRequest, info: UrlResponseInfo, newUrl: String) {
@@ -243,16 +242,15 @@ private class CronetImageFetcher : ImageFetcher {
      }

      try {
-        // Content-Length is a size hint only. With Content-Encoding (gzip/br/...),
-        // Cronet auto-decompresses and writes decompressed bytes to our buffer, which
-        // may exceed the wire/compressed Content-Length. Always use the growable
-        // buffer path so we can't overflow.
        val contentLength = info.allHeaders["content-length"]?.firstOrNull()?.toIntOrNull() ?: 0
-        // Cap the up-front alloc: Content-Length is untrusted and can be huge or near
-        // Int.MAX_VALUE (overflowing `+1`). For larger responses the grow path takes over.
-        val initialSize = if (contentLength in 1..MAX_PREALLOC_BYTES) contentLength + 1 else INITIAL_BUFFER_SIZE
-        buffer = NativeByteBuffer(initialSize)
-        request.read(buffer!!.wrapRemaining())
+        if (contentLength > 0) {
+          buffer = NativeByteBuffer(contentLength + 1)
+          wrapped = NativeBuffer.wrap(buffer!!.pointer, contentLength + 1)
+          request.read(wrapped)
+        } else {
+          buffer = NativeByteBuffer(INITIAL_BUFFER_SIZE)
+          request.read(buffer!!.wrapRemaining())
+        }
      } catch (e: Exception) {
        error = e
        return request.cancel()
@@ -265,18 +263,14 @@ private class CronetImageFetcher : ImageFetcher {
      byteBuffer: ByteBuffer
    ) {
      try {
-        val b = buffer!!
-        b.advance(byteBuffer.position())
-        // Reuse the caller-supplied ByteBuffer as long as we don't need to grow.
-        // It already points at our native memory with position advanced past the
-        // written bytes — Cronet can keep writing into the remaining tail.
-        // Only when the buffer is full do we grow (which may realloc + move the
-        // native pointer) and need a fresh wrap.
-        val buf = if (b.offset == b.capacity) {
-          b.ensureHeadroom()
-          b.wrapRemaining()
+        val buf = if (wrapped == null) {
+          buffer!!.run {
+            advance(byteBuffer.position())
+            ensureHeadroom()
+            wrapRemaining()
+          }
        } else {
-          byteBuffer
+          wrapped
        }
        request.read(buf)
      } catch (e: Exception) {
@@ -286,6 +280,7 @@ private class CronetImageFetcher : ImageFetcher {
    }

    override fun onSucceeded(request: UrlRequest, info: UrlResponseInfo) {
+      wrapped?.let { buffer!!.advance(it.position()) }
      onSuccess(buffer!!)
      onComplete()
    }
@@ -11,7 +11,6 @@ class RemoteAsset extends BaseAsset {
  final String ownerId;
  final String? stackId;
  final DateTime? uploadedAt;
-  final DateTime? deletedAt;

  const RemoteAsset({
    required this.id,
@@ -32,7 +31,6 @@ class RemoteAsset extends BaseAsset {
    super.livePhotoVideoId,
    this.stackId,
    required super.isEdited,
-    this.deletedAt,
  }) : localAssetId = localId;

  @override
@@ -50,8 +48,6 @@ class RemoteAsset extends BaseAsset {
  @override
  bool get isEditable => isImage && !isMotionPhoto && !isAnimatedImage;

-  bool get isTrashed => deletedAt != null;
-
  @override
  String toString() {
    return '''Asset {
@@ -90,8 +86,7 @@ class RemoteAsset extends BaseAsset {
        thumbHash == other.thumbHash &&
        visibility == other.visibility &&
        stackId == other.stackId &&
-        uploadedAt == other.uploadedAt &&
-        deletedAt == other.deletedAt;
+        uploadedAt == other.uploadedAt;
  }

  @override
@@ -103,8 +98,7 @@ class RemoteAsset extends BaseAsset {
      thumbHash.hashCode ^
      visibility.hashCode ^
      stackId.hashCode ^
-      uploadedAt.hashCode ^
-      deletedAt.hashCode;
+      uploadedAt.hashCode;

  RemoteAsset copyWith({
    String? id,
@@ -125,7 +119,6 @@ class RemoteAsset extends BaseAsset {
    String? livePhotoVideoId,
    String? stackId,
    bool? isEdited,
-    DateTime? deletedAt,
  }) {
    return RemoteAsset(
      id: id ?? this.id,
@@ -146,7 +139,6 @@ class RemoteAsset extends BaseAsset {
      livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
      stackId: stackId ?? this.stackId,
      isEdited: isEdited ?? this.isEdited,
-      deletedAt: deletedAt ?? this.deletedAt,
    );
  }
 }
@@ -164,7 +156,6 @@ class RemoteAssetExif extends RemoteAsset {
    required super.createdAt,
    required super.updatedAt,
    super.uploadedAt,
-    super.deletedAt,
    super.width,
    super.height,
    super.durationMs,
@@ -202,7 +193,6 @@ class RemoteAssetExif extends RemoteAsset {
    DateTime? createdAt,
    DateTime? updatedAt,
    DateTime? uploadedAt,
-    DateTime? deletedAt,
    int? width,
    int? height,
    int? durationMs,
@@ -224,7 +214,6 @@ class RemoteAssetExif extends RemoteAsset {
      createdAt: createdAt ?? this.createdAt,
      updatedAt: updatedAt ?? this.updatedAt,
      uploadedAt: uploadedAt ?? this.uploadedAt,
-      deletedAt: deletedAt ?? this.deletedAt,
      width: width ?? this.width,
      height: height ?? this.height,
      durationMs: durationMs ?? this.durationMs,
@@ -3,7 +3,6 @@ import 'package:immich_mobile/domain/models/config/image_config.dart';
 import 'package:immich_mobile/domain/models/config/map_config.dart';
 import 'package:immich_mobile/domain/models/config/theme_config.dart';
 import 'package:immich_mobile/domain/models/config/timeline_config.dart';
-import 'package:immich_mobile/domain/models/config/viewer_config.dart';

 class AppConfig {
  final ThemeConfig theme;
@@ -11,7 +10,6 @@ class AppConfig {
  final MapConfig map;
  final TimelineConfig timeline;
  final ImageConfig image;
-  final ViewerConfig viewer;

  const AppConfig({
    this.theme = const .new(),
@@ -19,7 +17,6 @@ class AppConfig {
    this.map = const .new(),
    this.timeline = const .new(),
    this.image = const .new(),
-    this.viewer = const .new(),
  });

  AppConfig copyWith({
@@ -28,14 +25,12 @@ class AppConfig {
    MapConfig? map,
    TimelineConfig? timeline,
    ImageConfig? image,
-    ViewerConfig? viewer,
  }) => .new(
    theme: theme ?? this.theme,
    cleanup: cleanup ?? this.cleanup,
    map: map ?? this.map,
    timeline: timeline ?? this.timeline,
    image: image ?? this.image,
-    viewer: viewer ?? this.viewer,
  );

  @override
@@ -46,13 +41,11 @@ class AppConfig {
          other.cleanup == cleanup &&
          other.map == map &&
          other.timeline == timeline &&
-          other.image == image &&
-          other.viewer == viewer);
+          other.image == image);

  @override
-  int get hashCode => Object.hash(theme, cleanup, map, timeline, image, viewer);
+  int get hashCode => Object.hash(theme, cleanup, map, timeline, image);

  @override
-  String toString() =>
-      'AppConfig(theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer)';
+  String toString() => 'AppConfig(theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image)';
 }
@@ -1,37 +0,0 @@
-class ViewerConfig {
-  final bool loopVideo;
-  final bool loadOriginalVideo;
-  final bool autoPlayVideo;
-  final bool tapToNavigate;
-
-  const ViewerConfig({
-    this.loopVideo = true,
-    this.loadOriginalVideo = false,
-    this.autoPlayVideo = true,
-    this.tapToNavigate = false,
-  });
-
-  ViewerConfig copyWith({bool? loopVideo, bool? loadOriginalVideo, bool? autoPlayVideo, bool? tapToNavigate}) =>
-      ViewerConfig(
-        loopVideo: loopVideo ?? this.loopVideo,
-        loadOriginalVideo: loadOriginalVideo ?? this.loadOriginalVideo,
-        autoPlayVideo: autoPlayVideo ?? this.autoPlayVideo,
-        tapToNavigate: tapToNavigate ?? this.tapToNavigate,
-      );
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is ViewerConfig &&
-          other.loopVideo == loopVideo &&
-          other.loadOriginalVideo == loadOriginalVideo &&
-          other.autoPlayVideo == autoPlayVideo &&
-          other.tapToNavigate == tapToNavigate);
-
-  @override
-  int get hashCode => Object.hash(loopVideo, loadOriginalVideo, autoPlayVideo, tapToNavigate);
-
-  @override
-  String toString() =>
-      'ViewerConfig(loopVideo: $loopVideo, loadOriginalVideo: $loadOriginalVideo, autoPlayVideo: $autoPlayVideo, tapToNavigate: $tapToNavigate)';
-}
@@ -28,12 +28,6 @@ enum MetadataKey<T extends Object> {
  imagePreferRemote<bool>(.appConfig, 'image.preferRemote', false),
  imageLoadOriginal<bool>(.appConfig, 'image.loadOriginal', false),

-  // Viewer
-  viewerLoopVideo<bool>(.appConfig, 'viewer.loopVideo', true),
-  viewerLoadOriginalVideo<bool>(.appConfig, 'viewer.loadOriginalVideo', false),
-  viewerAutoPlayVideo<bool>(.appConfig, 'viewer.autoPlayVideo', true),
-  viewerTapToNavigate<bool>(.appConfig, 'viewer.tapToNavigate', false),
-
  // Timeline
  timelineTilesPerRow<int>(.appConfig, 'timeline.tilesPerRow', 4),
  timelineGroupAssetsBy<GroupAssetsBy>(
@@ -1,6 +1,8 @@
 import 'package:immich_mobile/domain/models/store.model.dart';

 enum Setting<T> {
+  loadOriginalVideo<bool>(StoreKey.loadOriginalVideo, false),
+  autoPlayVideo<bool>(StoreKey.autoPlayVideo, true),
  advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, false),
  enableBackup<bool>(StoreKey.enableBackup, false);

@@ -4,15 +4,25 @@ import 'package:immich_mobile/domain/models/user.model.dart';
 /// Defines the data type for each value
 enum StoreKey<T> {
  version<int>._(0),
+  assetETag<String>._(1),
  currentUser<UserDto>._(2),
+  deviceIdHash<int>._(3),
  deviceId<String>._(4),
+  backupFailedSince<DateTime>._(5),
+  backupRequireWifi<bool>._(6),
  backupRequireCharging<bool>._(7),
  backupTriggerDelay<int>._(8),
  serverUrl<String>._(10),
  accessToken<String>._(11),
  serverEndpoint<String>._(12),
+  autoBackup<bool>._(13),
+  backgroundBackup<bool>._(14),
+  sslClientCertData<String>._(15),
+  sslClientPasswd<String>._(16),
+  uploadErrorNotificationGracePeriod<int>._(106),
  selectedAlbumSortOrder<int>._(113),
  advancedTroubleshooting<bool>._(114),
+  selfSignedCert<bool>._(120),
  selectedAlbumSortReverse<bool>._(123),
  enableHapticFeedback<bool>._(126),
  customHeaders<String>._(127),
@@ -28,6 +38,13 @@ enum StoreKey<T> {
  // Read-only Mode settings
  readonlyModeEnabled<bool>._(138),
  albumGridView<bool>._(140),
+  loadOriginal<bool>._(101),
+
+  // Image viewer navigation settings
+  loopVideo<bool>._(117),
+  loadOriginalVideo<bool>._(136),
+  autoPlayVideo<bool>._(139),
+  tapToNavigate<bool>._(141),

  // Experimental stuff
  enableBackup<bool>._(1003),
@@ -36,10 +53,6 @@ enum StoreKey<T> {
  syncMigrationStatus<String>._(1013),

  // Legacy keys that have been migrated to the new metadata store
-  legacyLoopVideo<bool>._(117),
-  legacyLoadOriginalVideo<bool>._(136),
-  legacyAutoPlayVideo<bool>._(139),
-  legacyTapToNavigate<bool>._(141),
  legacyPreferRemoteImage<bool>._(116),
  legacyLoadOriginal<bool>._(101),
  legacyPrimaryColor<String>._(128),
@@ -74,6 +74,5 @@ extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
    localId: localId,
    stackId: stackId,
    isEdited: isEdited,
-    deletedAt: deletedAt,
  );
 }
@@ -133,12 +133,6 @@ extension<T extends Object> on MetadataDomain<T> {
            storageIndicator: repo._read(.timelineStorageIndicator),
          ),
          image: .new(preferRemote: repo._read(.imagePreferRemote), loadOriginal: repo._read(.imageLoadOriginal)),
-          viewer: .new(
-            loopVideo: repo._read(.viewerLoopVideo),
-            loadOriginalVideo: repo._read(.viewerLoadOriginalVideo),
-            autoPlayVideo: repo._read(.viewerAutoPlayVideo),
-            tapToNavigate: repo._read(.viewerTapToNavigate),
-          ),
        );
      case .systemConfig:
        repo._systemConfig = .new(logLevel: repo._read(.logLevel));
@@ -35,11 +35,10 @@ class BaseActionButton extends ConsumerWidget {
    final miniWidth = minWidth ?? (context.isMobile ? context.width / 4.5 : 75.0);
    final iconTheme = IconTheme.of(context);
    final iconSize = iconTheme.size ?? 24.0;
+    final iconColor = this.iconColor ?? iconTheme.color ?? context.themeData.iconTheme.color;
    final textColor = context.themeData.textTheme.labelLarge?.color;

    if (iconOnly) {
-      final iconColor = this.iconColor ?? iconTheme.color ?? context.themeData.iconTheme.color;
-
      return IconButton(
        onPressed: onPressed,
        icon: Icon(iconData, size: iconSize, color: iconColor),
@@ -47,18 +46,17 @@ class BaseActionButton extends ConsumerWidget {
    }

    if (menuItem) {
-      final iconColor = this.iconColor;
+      final theme = context.themeData;
+      final effectiveIconColor = iconColor ?? theme.iconTheme.color ?? theme.colorScheme.onSurfaceVariant;

      return MenuItemButton(
        style: MenuItemButton.styleFrom(alignment: Alignment.centerLeft, padding: const EdgeInsets.all(16)),
-        leadingIcon: Icon(iconData, color: iconColor),
+        leadingIcon: Icon(iconData, color: effectiveIconColor),
        onPressed: onPressed,
-        child: Text(label, style: TextStyle(fontSize: 16, color: iconColor)),
+        child: Text(label, style: theme.textTheme.labelLarge?.copyWith(fontSize: 16, color: iconColor)),
      );
    }

-    final iconColor = this.iconColor ?? iconTheme.color ?? context.themeData.iconTheme.color;
-
    return ConstrainedBox(
      constraints: BoxConstraints(maxWidth: maxWidth),
      child: MaterialButton(
@@ -18,15 +18,8 @@ class DeletePermanentActionButton extends ConsumerWidget {
  final ActionSource source;
  final bool iconOnly;
  final bool menuItem;
-  final bool useShortLabel;

-  const DeletePermanentActionButton({
-    super.key,
-    required this.source,
-    this.iconOnly = false,
-    this.menuItem = false,
-    this.useShortLabel = false,
-  });
+  const DeletePermanentActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});

  void _onTap(BuildContext context, WidgetRef ref) async {
    if (!context.mounted) {
@@ -71,7 +64,7 @@ class DeletePermanentActionButton extends ConsumerWidget {
    return BaseActionButton(
      maxWidth: 110.0,
      iconData: Icons.delete_forever,
-      label: useShortLabel ? "delete".t(context: context) : "delete_permanently".t(context: context),
+      label: "delete_permanently".t(context: context),
      iconOnly: iconOnly,
      menuItem: menuItem,
      onPressed: () => _onTap(context, ref),
@@ -1,55 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/events.model.dart';
-import 'package:immich_mobile/domain/utils/event_stream.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';
-
-class RestoreActionButton extends ConsumerWidget {
-  final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
-
-  const RestoreActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
-
-  void _onTap(BuildContext context, WidgetRef ref) async {
-    if (!context.mounted) {
-      return;
-    }
-
-    final result = await ref.read(actionProvider.notifier).restoreTrash(source);
-    ref.read(multiSelectProvider.notifier).reset();
-
-    if (source == ActionSource.viewer) {
-      EventStream.shared.emit(const ViewerReloadAssetEvent());
-    }
-
-    final successMessage = 'assets_restored_count'.t(context: context, args: {'count': result.count.toString()});
-
-    if (context.mounted) {
-      ImmichToast.show(
-        context: context,
-        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
-        gravity: ToastGravity.BOTTOM,
-        toastType: result.success ? ToastType.success : ToastType.error,
-      );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return BaseActionButton(
-      iconData: Icons.history_rounded,
-      label: 'restore'.t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
-      onPressed: () => _onTap(context, ref),
-      maxWidth: 100.0,
-    );
-  }
-}
@@ -17,10 +17,11 @@ import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_stack.widg
 import 'package:immich_mobile/presentation/widgets/asset_viewer/video_viewer.widget.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/common/immich_loading_indicator.dart';
 import 'package:immich_mobile/widgets/photo_view/photo_view.dart';

@@ -230,7 +231,7 @@ class _AssetPageState extends ConsumerState<AssetPage> {
      return;
    }

-    final tapToNavigate = ref.read(metadataProvider).appConfig.viewer.tapToNavigate;
+    final tapToNavigate = ref.read(appSettingsServiceProvider).getSetting<bool>(AppSettingsEnum.tapToNavigate);
    if (!tapToNavigate) {
      _viewer.toggleControls();
      return;
@@ -2,19 +2,15 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/add_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_image_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/restore_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
@@ -37,31 +33,23 @@ class ViewerBottomBar extends ConsumerWidget {
    final showingDetails = ref.watch(assetViewerProvider.select((s) => s.showingDetails));
    final isInLockedView = ref.watch(inLockedViewProvider);
    final serverInfo = ref.watch(serverInfoProvider);
-    final isInTrash = ref.read(timelineServiceProvider).origin == TimelineOrigin.trash;

    final originalTheme = context.themeData;

    final actions = <Widget>[
-      if (isInTrash && isOwner && asset.hasRemote)
-        const RestoreActionButton(source: ActionSource.viewer)
-      else
-        const ShareActionButton(source: ActionSource.viewer),
+      const ShareActionButton(source: ActionSource.viewer),

      if (!isInLockedView) ...[
-        if (!isInTrash) ...[
-          if (asset.isLocalOnly) const UploadActionButton(source: ActionSource.viewer),
-          // edit sync was added in 2.6.0
-          if (asset.isEditable && serverInfo.serverVersion >= const SemVer(major: 2, minor: 6, patch: 0))
-            const EditImageActionButton(),
-          if (asset.hasRemote) AddActionButton(originalTheme: originalTheme),
-        ],
+        if (asset.isLocalOnly) const UploadActionButton(source: ActionSource.viewer),
+        // edit sync was added in 2.6.0
+        if (asset.isEditable && serverInfo.serverVersion >= const SemVer(major: 2, minor: 6, patch: 0))
+          const EditImageActionButton(),
+        if (asset.hasRemote) AddActionButton(originalTheme: originalTheme),
+
        if (isOwner) ...[
-          if (asset.isLocalOnly)
-            const DeleteLocalActionButton(source: ActionSource.viewer)
-          else if (asset.isTrashed)
-            const DeletePermanentActionButton(source: ActionSource.viewer, useShortLabel: true)
-          else
-            const DeleteActionButton(source: ActionSource.viewer, showConfirmation: true),
+          asset.isLocalOnly
+              ? const DeleteLocalActionButton(source: ActionSource.viewer)
+              : const DeleteActionButton(source: ActionSource.viewer, showConfirmation: true),
        ],
      ],
    ];
@@ -3,17 +3,21 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/domain/services/setting.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/video_player_provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/services/api.service.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:logging/logging.dart';
 import 'package:native_video_player/native_video_player.dart';

@@ -128,7 +132,7 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
      final remoteId = (videoAsset as RemoteAsset).id;

      final serverEndpoint = Store.get(StoreKey.serverEndpoint);
-      final isOriginalVideo = ref.read(metadataProvider).appConfig.viewer.loadOriginalVideo;
+      final isOriginalVideo = ref.read(settingsProvider).get<bool>(Setting.loadOriginalVideo);
      final String postfixUrl = isOriginalVideo ? 'original' : 'video/playback';
      final String videoUrl = videoAsset.livePhotoVideoId != null
          ? '$serverEndpoint/assets/${videoAsset.livePhotoVideoId}/$postfixUrl'
@@ -161,7 +165,7 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
      return;
    }

-    final autoPlayVideo = ref.read(metadataProvider).appConfig.viewer.autoPlayVideo;
+    final autoPlayVideo = AppSetting.get(Setting.autoPlayVideo);
    if (autoPlayVideo || widget.asset.isMotionPhoto) {
      await _notifier.play();
    }
@@ -212,7 +216,7 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
    }

    await _notifier.load(source);
-    final loopVideo = ref.read(metadataProvider).appConfig.viewer.loopVideo;
+    final loopVideo = ref.read(appSettingsServiceProvider).getSetting<bool>(AppSettingsEnum.loopVideo);
    await _notifier.setLoop(!widget.asset.isMotionPhoto && loopVideo);
    await _notifier.setVolume(1);
  }
@@ -50,7 +50,7 @@ class ViewerKebabMenu extends ConsumerWidget {
      timelineOrigin: timelineOrigin,
    );

-    final menuChildren = ActionButtonBuilder.buildViewerKebabMenu(actionContext, context, ref);
+    final menuChildren = ActionButtonBuilder.buildViewerKebabMenu(actionContext, context);

    return MenuAnchor(
      consumeOutsideTap: true,
@@ -11,11 +11,12 @@ import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/auth.service.dart';
-import 'package:immich_mobile/services/background_upload.service.dart';
 import 'package:immich_mobile/services/foreground_upload.service.dart';
 import 'package:immich_mobile/services/secure_storage.service.dart';
+import 'package:immich_mobile/services/background_upload.service.dart';
 import 'package:immich_mobile/services/widget.service.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
+import 'package:immich_mobile/utils/hash.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';

@@ -143,6 +144,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
        // Due to the flow of the code, this will always happen on first login
        user = serverUser;
        await Store.put(StoreKey.deviceId, deviceId);
+        await Store.put(StoreKey.deviceIdHash, fastHash(deviceId));
      }
    } on ApiException catch (error, stackTrace) {
      if (error.code == 401) {
@@ -15,62 +15,37 @@ class AuthGuard extends AutoRouteGuard {
  final ApiService _apiService;
  final AuthService _authService;
  final _log = Logger("AuthGuard");
-  bool _validateInFlight = false;
  AuthGuard(this._apiService, this._authService);
  @override
-  void onNavigation(NavigationResolver resolver, StackRouter router) {
-    // Synchronously check for the access token. auto_route awaits async
-    // guards, so we keep this function fully sync and validate the token in
-    // the background — otherwise a slow validateAccessToken() request would
-    // block the route transition for as long as the OS-level HTTP timeout.
-    try {
-      Store.get(StoreKey.accessToken);
-    } on StoreKeyNotFoundException catch (_) {
-      _log.warning('No access token in the store.');
-      resolver.next(false);
-      unawaited(router.replaceAll([const LoginRoute()]));
-      return;
-    }
-
+  void onNavigation(NavigationResolver resolver, StackRouter router) async {
    resolver.next(true);
-    unawaited(_validateAccessTokenInBackground(router));
-  }

-  Future<void> _validateAccessTokenInBackground(StackRouter router) async {
-    if (_validateInFlight) {
-      return;
-    }
-    final token = Store.tryGet(StoreKey.accessToken);
-    if (token == null) {
-      return;
-    }
-    _validateInFlight = true;
    try {
+      // Look in the store for an access token
+      Store.get(StoreKey.accessToken);
+
+      // Validate the access token with the server
      final res = await _apiService.authenticationApi.validateAccessToken();
      if (res == null || res.authStatus != true) {
-        // Token may have changed during validation (user logged out + logged in
-        // again); only act if it still applies to the current session.
-        if (Store.tryGet(StoreKey.accessToken) != token) {
-          return;
-        }
+        // If the access token is invalid, take user back to login
        _log.fine('User token is invalid. Redirecting to login');
-        await router.replaceAll([const LoginRoute()]);
-        await _authService.clearLocalData();
+        unawaited(router.replaceAll([const LoginRoute()]).then((_) => _authService.clearLocalData()));
      }
+    } on StoreKeyNotFoundException catch (_) {
+      // If there is no access token, take us to the login page
+      _log.warning('No access token in the store.');
+      unawaited(router.replaceAll([const LoginRoute()]));
+      return;
    } on ApiException catch (e) {
-      if (e.code != HttpStatus.unauthorized) {
+      // On an unauthorized request, take us to the login page
+      if (e.code == HttpStatus.unauthorized) {
+        _log.warning("Unauthorized access token.");
+        unawaited(router.replaceAll([const LoginRoute()]).then((_) => _authService.clearLocalData()));
        return;
      }
-      if (Store.tryGet(StoreKey.accessToken) != token) {
-        return;
-      }
-      _log.warning("Unauthorized access token.");
-      await router.replaceAll([const LoginRoute()]);
-      await _authService.clearLocalData();
    } catch (e) {
+      // Otherwise, this is not fatal, but we still log the warning
      _log.warning('Error validating access token from server: $e');
-    } finally {
-      _validateInFlight = false;
    }
  }
 }
@@ -2,9 +2,19 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';

 enum AppSettingsEnum<T> {
+  uploadErrorNotificationGracePeriod<int>(
+    StoreKey.uploadErrorNotificationGracePeriod,
+    "uploadErrorNotificationGracePeriod",
+    2,
+  ),
  selectedAlbumSortOrder<int>(StoreKey.selectedAlbumSortOrder, "selectedAlbumSortOrder", 2),
  advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, null, false),
  manageLocalMediaAndroid<bool>(StoreKey.manageLocalMediaAndroid, null, false),
+  loopVideo<bool>(StoreKey.loopVideo, "loopVideo", true),
+  loadOriginalVideo<bool>(StoreKey.loadOriginalVideo, "loadOriginalVideo", false),
+  autoPlayVideo<bool>(StoreKey.autoPlayVideo, "autoPlayVideo", true),
+  tapToNavigate<bool>(StoreKey.tapToNavigate, "tapToNavigate", false),
+  allowSelfSignedSSLCert<bool>(StoreKey.selfSignedCert, null, false),
  selectedAlbumSortReverse<bool>(StoreKey.selectedAlbumSortReverse, null, true),
  enableHapticFeedback<bool>(StoreKey.enableHapticFeedback, null, true),
  syncAlbums<bool>(StoreKey.syncAlbums, null, false),
@@ -123,6 +123,7 @@ class AuthService {
      _authRepository.clearLocalData(),
      Store.delete(StoreKey.currentUser),
      Store.delete(StoreKey.accessToken),
+      Store.delete(StoreKey.assetETag),
      Store.delete(StoreKey.autoEndpointSwitching),
      Store.delete(StoreKey.preferredWifiName),
      Store.delete(StoreKey.localEndpoint),
@@ -394,13 +394,9 @@ class BackgroundUploadService {
    final serverEndpoint = Store.get(StoreKey.serverEndpoint);
    final url = Uri.parse('$serverEndpoint/assets').toString();
    final headers = ApiService.getRequestHeaders();
-    final deviceId = Store.get(StoreKey.deviceId);
    final (baseDirectory, directory, filename) = await Task.split(filePath: file.path);
    final fieldsMap = {
      'filename': originalFileName ?? filename,
-      // deviceAssetId/deviceId required by server v2.7.5 and below (drop in v4.0 per #27818).
-      'deviceAssetId': deviceAssetId ?? '',
-      'deviceId': deviceId,
      'fileCreatedAt': createdAt.toUtc().toIso8601String(),
      'fileModifiedAt': modifiedAt.toUtc().toIso8601String(),
      'isFavorite': isFavorite?.toString() ?? 'false',
@@ -5,8 +5,6 @@ import 'dart:io';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/asset_metadata.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/network_capability_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
@@ -321,12 +319,8 @@ class ForegroundUploadService {
      }

      final originalFileName = entity.isLivePhoto ? p.setExtension(fileName, p.extension(file.path)) : fileName;
-      final deviceId = Store.get(StoreKey.deviceId);

      final fields = {
-        // deviceAssetId/deviceId required by server v2.7.5 and below (drop in v4.0 per #27818).
-        'deviceAssetId': asset.localId!,
-        'deviceId': deviceId,
        'fileCreatedAt': asset.createdAt.toUtc().toIso8601String(),
        'fileModifiedAt': asset.updatedAt.toUtc().toIso8601String(),
        'isFavorite': asset.isFavorite.toString(),
@@ -432,9 +426,6 @@ class ForegroundUploadService {
      final filename = p.basename(file.path);

      final fields = {
-        // deviceAssetId/deviceId required by server v2.7.5 and below (drop in v4.0 per #27818).
-        'deviceAssetId': deviceAssetId,
-        'deviceId': Store.get(StoreKey.deviceId),
        'fileCreatedAt': fileCreatedAt.toUtc().toIso8601String(),
        'fileModifiedAt': fileModifiedAt.toUtc().toIso8601String(),
        'isFavorite': 'false',
@@ -21,7 +21,6 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_f
 import 'package:immich_mobile/presentation/widgets/action_buttons/open_in_browser_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/restore_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/set_album_cover.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/set_profile_picture_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
@@ -82,7 +81,6 @@ enum ActionButtonType {
  moveToLockFolder,
  removeFromLockFolder,
  removeFromAlbum,
-  restoreTrash,
  trash,
  deleteLocal,
  deletePermanent,
@@ -114,17 +112,12 @@ enum ActionButtonType {
        context.isOwner && //
            !context.isInLockedView && //
            context.asset.hasRemote && //
-            context.isTrashEnabled && //
-            context.timelineOrigin != TimelineOrigin.trash,
-      ActionButtonType.restoreTrash =>
-        context.isOwner && //
-            !context.isInLockedView && //
-            context.asset.hasRemote && //
-            context.timelineOrigin == TimelineOrigin.trash,
+            context.isTrashEnabled,
      ActionButtonType.deletePermanent =>
        context.isOwner && //
-            context.asset.hasRemote && //
-            (!context.isTrashEnabled || context.timelineOrigin == TimelineOrigin.trash || context.isInLockedView),
+                context.asset.hasRemote && //
+                !context.isTrashEnabled ||
+            context.isInLockedView,
      ActionButtonType.delete =>
        context.isOwner && //
            !context.isInLockedView && //
@@ -208,11 +201,6 @@ enum ActionButtonType {
      ),
      ActionButtonType.download => DownloadActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
      ActionButtonType.trash => TrashActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
-      ActionButtonType.restoreTrash => RestoreActionButton(
-        source: context.source,
-        iconOnly: iconOnly,
-        menuItem: menuItem,
-      ),
      ActionButtonType.deletePermanent => DeletePermanentActionButton(
        source: context.source,
        iconOnly: iconOnly,
@@ -304,7 +292,6 @@ enum ActionButtonType {
    ActionButtonType.moveToLockFolder => 10,
    ActionButtonType.deleteLocal => 10,
    ActionButtonType.delete => 10,
-    ActionButtonType.restoreTrash => 10,
    // 90: advancedInfo
    ActionButtonType.advancedInfo => 90,
    // 1: others
@@ -322,15 +309,13 @@ class ActionButtonBuilder {
    ActionButtonType.delete,
    ActionButtonType.archive,
    ActionButtonType.unarchive,
-    ActionButtonType.restoreTrash,
-    ActionButtonType.deletePermanent,
  };

  static List<Widget> build(ActionButtonContext context) {
    return _actionTypes.where((type) => type.shouldShow(context)).map((type) => type.buildButton(context)).toList();
  }

-  static List<Widget> buildViewerKebabMenu(ActionButtonContext context, BuildContext buildContext, WidgetRef ref) {
+  static List<Widget> buildViewerKebabMenu(ActionButtonContext context, BuildContext buildContext) {
    final visibleButtons = defaultViewerKebabMenuOrder
        .where((type) => !defaultViewerBottomBarButtons.contains(type) && type.shouldShow(context))
        .toList();
@@ -346,7 +331,7 @@ class ActionButtonBuilder {
      if (lastGroup != null && type.kebabMenuGroup != lastGroup) {
        result.add(const Divider(height: 1));
      }
-      result.add(type.buildButton(context, buildContext, false, true).build(buildContext, ref));
+      result.add(type.buildButton(context, buildContext, false, true));
      lastGroup = type.kebabMenuGroup;
    }

@@ -91,11 +91,6 @@ Future<void> _migrateTo26(Drift drift) async {
  // Image
  await migrator.migrateBool(StoreKey.legacyPreferRemoteImage, MetadataKey.imagePreferRemote);
  await migrator.migrateBool(StoreKey.legacyLoadOriginal, MetadataKey.imageLoadOriginal);
-  // Viewer
-  await migrator.migrateBool(StoreKey.legacyLoopVideo, MetadataKey.viewerLoopVideo);
-  await migrator.migrateBool(StoreKey.legacyLoadOriginalVideo, MetadataKey.viewerLoadOriginalVideo);
-  await migrator.migrateBool(StoreKey.legacyAutoPlayVideo, MetadataKey.viewerAutoPlayVideo);
-  await migrator.migrateBool(StoreKey.legacyTapToNavigate, MetadataKey.viewerTapToNavigate);
  await migrator.complete();
 }

@@ -1,20 +1,18 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
+import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';

 class ImageViewerTapToNavigateSetting extends HookConsumerWidget {
  const ImageViewerTapToNavigateSetting({super.key});

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final tapToNavigate = useState(ref.read(appConfigProvider).viewer.tapToNavigate);
-    useValueChanged<bool, void>(tapToNavigate.value, (_, __) {
-      ref.read(metadataProvider).write(.viewerTapToNavigate, tapToNavigate.value);
-    });
+    final tapToNavigate = useAppSettingsState(AppSettingsEnum.tapToNavigate);

    return Column(
      crossAxisAlignment: CrossAxisAlignment.start,
@@ -24,6 +22,7 @@ class ImageViewerTapToNavigateSetting extends HookConsumerWidget {
          valueNotifier: tapToNavigate,
          title: "setting_image_navigation_enable_title".tr(),
          subtitle: "setting_image_navigation_enable_subtitle".tr(),
+          onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
        ),
      ],
    );
@@ -1,30 +1,20 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
+import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';

 class VideoViewerSettings extends HookConsumerWidget {
  const VideoViewerSettings({super.key});

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final viewer = ref.read(appConfigProvider).viewer;
-    final useAutoPlayVideo = useState(viewer.autoPlayVideo);
-    final useLoopVideo = useState(viewer.loopVideo);
-    final useOriginalVideo = useState(viewer.loadOriginalVideo);
-
-    useValueChanged<bool, void>(useAutoPlayVideo.value, (_, __) {
-      ref.read(metadataProvider).write(.viewerAutoPlayVideo, useAutoPlayVideo.value);
-    });
-    useValueChanged<bool, void>(useLoopVideo.value, (_, __) {
-      ref.read(metadataProvider).write(.viewerLoopVideo, useLoopVideo.value);
-    });
-    useValueChanged<bool, void>(useOriginalVideo.value, (_, __) {
-      ref.read(metadataProvider).write(.viewerLoadOriginalVideo, useOriginalVideo.value);
-    });
+    final useLoopVideo = useAppSettingsState(AppSettingsEnum.loopVideo);
+    final useOriginalVideo = useAppSettingsState(AppSettingsEnum.loadOriginalVideo);
+    final useAutoPlayVideo = useAppSettingsState(AppSettingsEnum.autoPlayVideo);

    return Column(
      crossAxisAlignment: CrossAxisAlignment.start,
@@ -37,16 +27,19 @@ class VideoViewerSettings extends HookConsumerWidget {
          valueNotifier: useAutoPlayVideo,
          title: "setting_video_viewer_auto_play_title".t(context: context),
          subtitle: "setting_video_viewer_auto_play_subtitle".t(context: context),
+          onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
        ),
        SettingsSwitchListTile(
          valueNotifier: useLoopVideo,
          title: "setting_video_viewer_looping_title".t(context: context),
          subtitle: "loop_videos_description".t(context: context),
+          onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
        ),
        SettingsSwitchListTile(
          valueNotifier: useOriginalVideo,
          title: "setting_video_viewer_original_video_title".t(context: context),
          subtitle: "setting_video_viewer_original_video_subtitle".t(context: context),
+          onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
        ),
      ],
    );
@@ -3,7 +3,10 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/notification_permission.provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
+import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
 import 'package:immich_mobile/widgets/settings/settings_button_list_tile.dart';
+import 'package:immich_mobile/widgets/settings/settings_slider_list_tile.dart';
 import 'package:immich_mobile/widgets/settings/settings_sub_page_scaffold.dart';
 import 'package:permission_handler/permission_handler.dart';

@@ -13,6 +16,9 @@ class NotificationSetting extends HookConsumerWidget {
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    final permissionService = ref.watch(notificationPermissionProvider);
+
+    final sliderValue = useAppSettingsState(AppSettingsEnum.uploadErrorNotificationGracePeriod);
+
    final hasPermission = permissionService == PermissionStatus.granted;

    openAppNotificationSettings(BuildContext ctx) {
@@ -35,6 +41,8 @@ class NotificationSetting extends HookConsumerWidget {
      );
    }

+    final String formattedValue = _formatSliderValue(sliderValue.value.toDouble());
+
    final notificationSettings = [
      if (!hasPermission)
        SettingsButtonListTile(
@@ -49,8 +57,32 @@ class NotificationSetting extends HookConsumerWidget {
                }
              }),
        ),
+      SettingsSliderListTile(
+        enabled: hasPermission,
+        valueNotifier: sliderValue,
+        text: 'setting_notifications_notify_failures_grace_period'.tr(namedArgs: {'duration': formattedValue}),
+        maxValue: 5.0,
+        noDivisons: 5,
+        label: formattedValue,
+      ),
    ];

    return SettingsSubPageScaffold(settings: notificationSettings);
  }
 }
+
+String _formatSliderValue(double v) {
+  if (v == 0.0) {
+    return 'setting_notifications_notify_immediately'.tr();
+  } else if (v == 1.0) {
+    return 'setting_notifications_notify_minutes'.tr(namedArgs: {'count': '30'});
+  } else if (v == 2.0) {
+    return 'setting_notifications_notify_hours'.tr(namedArgs: {'count': '2'});
+  } else if (v == 3.0) {
+    return 'setting_notifications_notify_hours'.tr(namedArgs: {'count': '8'});
+  } else if (v == 4.0) {
+    return 'setting_notifications_notify_hours'.tr(namedArgs: {'count': '24'});
+  } else {
+    return 'setting_notifications_notify_never'.tr();
+  }
+}
@@ -9,8 +9,9 @@ import 'package:mocktail/mocktail.dart';
 import '../../infrastructure/repository.mock.dart';

 const _kAccessToken = '#ThisIsAToken';
-const _kEnableBackup = false;
+const _kBackgroundBackup = false;
 const _kVersion = 2;
+final _kBackupFailedSince = DateTime.utc(2023);

 void main() {
  late StoreService sut;
@@ -23,13 +24,15 @@ void main() {
    // For generics, we need to provide fallback to each concrete type to avoid runtime errors
    registerFallbackValue(StoreKey.accessToken);
    registerFallbackValue(StoreKey.backupTriggerDelay);
-    registerFallbackValue(StoreKey.enableBackup);
+    registerFallbackValue(StoreKey.backgroundBackup);
+    registerFallbackValue(StoreKey.backupFailedSince);

    when(() => mockDriftStoreRepo.getAll()).thenAnswer(
      (_) async => [
        const StoreDto(StoreKey.accessToken, _kAccessToken),
-        const StoreDto(StoreKey.enableBackup, _kEnableBackup),
+        const StoreDto(StoreKey.backgroundBackup, _kBackgroundBackup),
        const StoreDto(StoreKey.version, _kVersion),
+        StoreDto(StoreKey.backupFailedSince, _kBackupFailedSince),
      ],
    );
    when(() => mockDriftStoreRepo.watchAll()).thenAnswer((_) => controller.stream);
@@ -46,8 +49,9 @@ void main() {
    test('Populates the internal cache on init', () {
      verify(() => mockDriftStoreRepo.getAll()).called(1);
      expect(sut.tryGet(StoreKey.accessToken), _kAccessToken);
-      expect(sut.tryGet(StoreKey.enableBackup), _kEnableBackup);
+      expect(sut.tryGet(StoreKey.backgroundBackup), _kBackgroundBackup);
      expect(sut.tryGet(StoreKey.version), _kVersion);
+      expect(sut.tryGet(StoreKey.backupFailedSince), _kBackupFailedSince);
      // Other keys should be null
      expect(sut.tryGet(StoreKey.currentUser), isNull);
    });
@@ -147,8 +151,9 @@ void main() {
      await sut.clear();
      verify(() => mockDriftStoreRepo.deleteAll()).called(1);
      expect(sut.tryGet(StoreKey.accessToken), isNull);
-      expect(sut.tryGet(StoreKey.enableBackup), isNull);
+      expect(sut.tryGet(StoreKey.backgroundBackup), isNull);
      expect(sut.tryGet(StoreKey.version), isNull);
+      expect(sut.tryGet(StoreKey.backupFailedSince), isNull);
    });
  });
 }
@@ -12,8 +12,9 @@ import 'package:immich_mobile/infrastructure/repositories/store.repository.dart'
 import '../../fixtures/user.stub.dart';

 const _kTestAccessToken = "#TestToken";
+final _kTestBackupFailed = DateTime(2025, 2, 20, 11, 45);
 const _kTestVersion = 10;
-const _kTestBackupRequireCharging = false;
+const _kTestBackupRequireWifi = false;
 final _kTestUser = UserStub.admin;

 Future<void> _populateStore(Drift db) async {
@@ -21,8 +22,16 @@ Future<void> _populateStore(Drift db) async {
    batch.insert(
      db.storeEntity,
      StoreEntityCompanion(
-        id: Value(StoreKey.backupRequireCharging.id),
-        intValue: const Value(_kTestBackupRequireCharging ? 1 : 0),
+        id: Value(StoreKey.backupRequireWifi.id),
+        intValue: const Value(_kTestBackupRequireWifi ? 1 : 0),
+        stringValue: const Value(null),
+      ),
+    );
+    batch.insert(
+      db.storeEntity,
+      StoreEntityCompanion(
+        id: Value(StoreKey.backupFailedSince.id),
+        intValue: Value(_kTestBackupFailed.millisecondsSinceEpoch),
        stringValue: const Value(null),
      ),
    );
@@ -75,12 +84,20 @@ void main() {
      expect(accessToken, _kTestAccessToken);
    });

+    test('converts datetime', () async {
+      DateTime? backupFailedSince = await sut.tryGet(StoreKey.backupFailedSince);
+      expect(backupFailedSince, isNull);
+      await sut.upsert(StoreKey.backupFailedSince, _kTestBackupFailed);
+      backupFailedSince = await sut.tryGet(StoreKey.backupFailedSince);
+      expect(backupFailedSince, _kTestBackupFailed);
+    });
+
    test('converts bool', () async {
-      bool? backupRequireCharging = await sut.tryGet(StoreKey.backupRequireCharging);
-      expect(backupRequireCharging, isNull);
-      await sut.upsert(StoreKey.backupRequireCharging, _kTestBackupRequireCharging);
-      backupRequireCharging = await sut.tryGet(StoreKey.backupRequireCharging);
-      expect(backupRequireCharging, _kTestBackupRequireCharging);
+      bool? backupRequireWifi = await sut.tryGet(StoreKey.backupRequireWifi);
+      expect(backupRequireWifi, isNull);
+      await sut.upsert(StoreKey.backupRequireWifi, _kTestBackupRequireWifi);
+      backupRequireWifi = await sut.tryGet(StoreKey.backupRequireWifi);
+      expect(backupRequireWifi, _kTestBackupRequireWifi);
    });

    test('converts user', () async {
@@ -98,11 +115,11 @@ void main() {
    });

    test('delete()', () async {
-      bool? backupRequireCharging = await sut.tryGet(StoreKey.backupRequireCharging);
-      expect(backupRequireCharging, isFalse);
-      await sut.delete(StoreKey.backupRequireCharging);
-      backupRequireCharging = await sut.tryGet(StoreKey.backupRequireCharging);
-      expect(backupRequireCharging, isNull);
+      bool? backupRequireWifi = await sut.tryGet(StoreKey.backupRequireWifi);
+      expect(backupRequireWifi, isFalse);
+      await sut.delete(StoreKey.backupRequireWifi);
+      backupRequireWifi = await sut.tryGet(StoreKey.backupRequireWifi);
+      expect(backupRequireWifi, isNull);
    });

    test('deleteAll()', () async {
@@ -147,12 +164,14 @@ void main() {
          emitsInOrder([
            [
              const StoreDto<Object>(StoreKey.version, _kTestVersion),
-              const StoreDto<Object>(StoreKey.backupRequireCharging, _kTestBackupRequireCharging),
+              StoreDto<Object>(StoreKey.backupFailedSince, _kTestBackupFailed),
+              const StoreDto<Object>(StoreKey.backupRequireWifi, _kTestBackupRequireWifi),
              const StoreDto<Object>(StoreKey.accessToken, _kTestAccessToken),
            ],
            [
              const StoreDto<Object>(StoreKey.version, _kTestVersion + 10),
-              const StoreDto<Object>(StoreKey.backupRequireCharging, _kTestBackupRequireCharging),
+              StoreDto<Object>(StoreKey.backupFailedSince, _kTestBackupFailed),
+              const StoreDto<Object>(StoreKey.backupRequireWifi, _kTestBackupRequireWifi),
              const StoreDto<Object>(StoreKey.accessToken, _kTestAccessToken),
            ],
          ]),
@@ -79,6 +79,7 @@ void main() {
      expect(sut.appConfig.theme.mode, ThemeMode.system);

      await MetadataRepository.refresh();
+
      expect(sut.appConfig.theme.mode, ThemeMode.dark);
    });

@@ -89,6 +90,7 @@ void main() {
      expect(sut.appConfig.theme.mode, ThemeMode.dark);

      await MetadataRepository.refresh();
+
      expect(sut.appConfig.theme.mode, ThemeMode.system);
    });

@@ -133,4 +135,5 @@ void main() {
      await expectation;
    });
  });
+
 }
@@ -3,7 +3,6 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/utils/action_button.utils.dart';

 LocalAsset createLocalAsset({
@@ -38,7 +37,6 @@ RemoteAsset createRemoteAsset({
  DateTime? updatedAt,
  DateTime? uploadedAt,
  bool isFavorite = false,
-  DateTime? deletedAt,
 }) {
  return RemoteAsset(
    id: 'remote-id',
@@ -52,7 +50,6 @@ RemoteAsset createRemoteAsset({
    uploadedAt: uploadedAt ?? DateTime.now(),
    isFavorite: isFavorite,
    isEdited: false,
-    deletedAt: deletedAt,
  );
 }

@@ -461,62 +458,6 @@ void main() {

        expect(ActionButtonType.trash.shouldShow(context), isFalse);
      });
-
-      test('should not show when asset is already trashed', () {
-        final remoteAsset = createRemoteAsset(deletedAt: DateTime(2024));
-        final context = ActionButtonContext(
-          asset: remoteAsset,
-          isOwner: true,
-          isArchived: false,
-          isTrashEnabled: true,
-          isInLockedView: false,
-          currentAlbum: null,
-          advancedTroubleshooting: false,
-          isStacked: false,
-          source: ActionSource.viewer,
-          timelineOrigin: TimelineOrigin.trash,
-        );
-
-        expect(ActionButtonType.trash.shouldShow(context), isFalse);
-      });
-    });
-
-    group('restoreTrash button', () {
-      test('should show when owner, not locked, has remote, and is in trash timeline', () {
-        final remoteAsset = createRemoteAsset();
-        final context = ActionButtonContext(
-          asset: remoteAsset,
-          isOwner: true,
-          isArchived: false,
-          isTrashEnabled: true,
-          isInLockedView: false,
-          currentAlbum: null,
-          advancedTroubleshooting: false,
-          isStacked: false,
-          source: ActionSource.timeline,
-          timelineOrigin: TimelineOrigin.trash,
-        );
-
-        expect(ActionButtonType.restoreTrash.shouldShow(context), isTrue);
-      });
-
-      test('should not show when not in trash timeline', () {
-        final remoteAsset = createRemoteAsset();
-        final context = ActionButtonContext(
-          asset: remoteAsset,
-          isOwner: true,
-          isArchived: false,
-          isTrashEnabled: false,
-          isInLockedView: false,
-          currentAlbum: null,
-          advancedTroubleshooting: false,
-          isStacked: false,
-          source: ActionSource.timeline,
-          timelineOrigin: TimelineOrigin.main,
-        );
-
-        expect(ActionButtonType.restoreTrash.shouldShow(context), isFalse);
-      });
    });

    group('deletePermanent button', () {
@@ -553,24 +494,6 @@ void main() {

        expect(ActionButtonType.deletePermanent.shouldShow(context), isFalse);
      });
-
-      test('should show when asset is trashed even with trash enabled', () {
-        final remoteAsset = createRemoteAsset(deletedAt: DateTime(2024));
-        final context = ActionButtonContext(
-          asset: remoteAsset,
-          isOwner: true,
-          isArchived: false,
-          isTrashEnabled: true,
-          isInLockedView: false,
-          currentAlbum: null,
-          advancedTroubleshooting: false,
-          isStacked: false,
-          source: ActionSource.viewer,
-          timelineOrigin: TimelineOrigin.trash,
-        );
-
-        expect(ActionButtonType.deletePermanent.shouldShow(context), isTrue);
-      });
    });

    group('delete button', () {
@@ -11,6 +11,9 @@
            "required": true,
            "in": "query",
            "description": "Album ID",
+            "x-nestjs_zod-parent-metadata": {
+              "description": "Activity search"
+            },
            "schema": {
              "format": "uuid",
              "pattern": "^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12})$",
@@ -22,6 +25,9 @@
            "required": false,
            "in": "query",
            "description": "Asset ID (if activity is for an asset)",
+            "x-nestjs_zod-parent-metadata": {
+              "description": "Activity search"
+            },
            "schema": {
              "format": "uuid",
              "pattern": "^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12})$",
@@ -32,6 +38,9 @@
            "name": "level",
            "required": false,
            "in": "query",
+            "x-nestjs_zod-parent-metadata": {
+              "description": "Activity search"
+            },
            "schema": {
              "$ref": "#/components/schemas/ReactionLevel"
            }
@@ -40,6 +49,9 @@
            "name": "type",
            "required": false,
            "in": "query",
+            "x-nestjs_zod-parent-metadata": {
+              "description": "Activity search"
+            },
            "schema": {
              "$ref": "#/components/schemas/ReactionType"
            }
@@ -49,6 +61,9 @@
            "required": false,
            "in": "query",
            "description": "Filter by user ID",
+            "x-nestjs_zod-parent-metadata": {
+              "description": "Activity search"
+            },
            "schema": {
              "format": "uuid",
              "pattern": "^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12})$",
@@ -172,6 +187,9 @@
            "required": true,
            "in": "query",
            "description": "Album ID",
+            "x-nestjs_zod-parent-metadata": {
+              "description": "Activity"
+            },
            "schema": {
              "format": "uuid",
              "pattern": "^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12})$",
@@ -183,6 +201,9 @@
            "required": false,
            "in": "query",
            "description": "Asset ID (if activity is for an asset)",
+            "x-nestjs_zod-parent-metadata": {
+              "description": "Activity"
+            },
            "schema": {
              "format": "uuid",
              "pattern": "^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12})$",
@@ -36,16 +36,18 @@ const ActivityStatisticsResponseSchema = z
  })
  .meta({ id: 'ActivityStatisticsResponseDto' });

-const ActivitySchema = z.object({
-  albumId: z.uuidv4().describe('Album ID'),
-  assetId: z.uuidv4().optional().describe('Asset ID (if activity is for an asset)'),
-});
+const ActivitySchema = z
+  .object({
+    albumId: z.uuidv4().describe('Album ID'),
+    assetId: z.uuidv4().optional().describe('Asset ID (if activity is for an asset)'),
+  })
+  .describe('Activity');

 const ActivitySearchSchema = ActivitySchema.extend({
  type: ReactionTypeSchema.optional(),
  level: ReactionLevelSchema.optional(),
  userId: z.uuidv4().optional().describe('Filter by user ID'),
-});
+}).describe('Activity search');

 const ActivityCreateSchema = ActivitySchema.extend({
  type: ReactionTypeSchema,
@@ -915,6 +915,8 @@ export enum DatabaseLock {
  MaintenanceOperation = 621,
  MemoryCreation = 777,
  VersionCheck = 800,
+  FacialRecognition = 900,
+  DuplicateDetection = 1000,
 }

 export enum MaintenanceAction {
@@ -171,8 +171,8 @@ export class JobRepository {
        options: this.getJobOptions(item) || undefined,
      } as JobItem & { data: any; options: JobsOptions | undefined };

-      if (job.options?.jobId || job.options?.deduplication) {
-        // need to use add() instead of addBulk() for jobId/deduplication to take effect
+      if (job.options?.jobId) {
+        // need to use add() instead of addBulk() for jobId deduplication
        promises.push(this.getQueue(queueName).add(item.name, item.data, job.options));
      } else {
        itemsByQueue[queueName] = itemsByQueue[queueName] || [];
@@ -230,13 +230,10 @@ export class JobRepository {
        return { priority: 1 };
      }
      case JobName.FacialRecognitionQueueAll: {
-        return { deduplication: { id: JobName.FacialRecognitionQueueAll } };
+        return { jobId: JobName.FacialRecognitionQueueAll };
      }
      case JobName.VersionCheck: {
-        return { deduplication: { id: JobName.VersionCheck } };
-      }
-      case JobName.DatabaseBackup: {
-        return { deduplication: { id: JobName.DatabaseBackup } };
+        return { jobId: JobName.VersionCheck };
      }
      default: {
        return null;
@@ -132,7 +132,7 @@ export class MachineLearningRepository {
  private async check(url: string) {
    let healthy = false;
    try {
-      const response = await fetch(new URL('ping', url), {
+      const response = await fetch(new URL('/ping', url), {
        signal: AbortSignal.timeout(this.config.availabilityChecks.timeout),
      });
      if (response.ok) {
@@ -170,7 +170,7 @@ export class MachineLearningRepository {
      ...this.config.urls.filter((url) => !this.isHealthy(url)),
    ]) {
      try {
-        const response = await fetch(new URL('predict', url), { method: 'POST', body: formData });
+        const response = await fetch(new URL('/predict', url), { method: 'POST', body: formData });
        if (response.ok) {
          this.setHealthy(url, true);
          return response.json();
@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { BinaryField, DefaultReadTaskOptions, ExifTool, ReadTaskOptions, Tags } from 'exiftool-vendored';
+import { BinaryField, DefaultReadTaskOptions, ExifTool, Tags } from 'exiftool-vendored';
 import geotz from 'geo-tz';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { mimeTypes } from 'src/utils/mime-types';
@@ -89,7 +89,7 @@ export class MetadataRepository {
    geoTz: (lat, lon) => geotz.find(lat, lon)[0],
    geolocation: true,
    // Enable exiftool LFS to parse metadata for files larger than 2GB.
-    readArgs: ['-api', 'largefilesupport=1', '--ICC_Profile:DeviceManufacturer', '--ICC_Profile:DeviceModelName'],
+    readArgs: ['-api', 'largefilesupport=1'],
    writeArgs: ['-api', 'largefilesupport=1', '-overwrite_original'],
    taskTimeoutMillis: 2 * 60 * 1000,
  });
@@ -107,8 +107,8 @@ export class MetadataRepository {
  }

  readTags(path: string): Promise<ImmichTags> {
-    const options: ReadTaskOptions | undefined = mimeTypes.isVideo(path) ? { readArgs: ['-ee'] } : undefined;
-    return this.exiftool.read(path, options).catch((error) => {
+    const args = mimeTypes.isVideo(path) ? ['-ee'] : [];
+    return this.exiftool.read(path, { readArgs: args }).catch((error) => {
      this.logger.warn(`Error reading exif data (${path}): ${error}\n${error?.stack}`);
      return {};
    }) as Promise<ImmichTags>;
@@ -5,7 +5,7 @@ import { BulkIdErrorReason, BulkIdResponseDto, BulkIdsDto } from 'src/dtos/asset
 import { MapAsset, mapAsset } from 'src/dtos/asset-response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { DuplicateResolveDto, DuplicateResolveGroupDto, DuplicateResponseDto } from 'src/dtos/duplicate.dto';
-import { AssetStatus, AssetVisibility, JobName, JobStatus, Permission, QueueName } from 'src/enum';
+import { AssetStatus, AssetVisibility, DatabaseLock, JobName, JobStatus, Permission, QueueName } from 'src/enum';
 import { AssetDuplicateResult } from 'src/repositories/search.repository';
 import { BaseService } from 'src/services/base.service';
 import { JobItem, JobOf } from 'src/types';
@@ -326,60 +326,62 @@ export class DuplicateService extends BaseService {

  @OnJob({ name: JobName.AssetDetectDuplicates, queue: QueueName.DuplicateDetection })
  async handleSearchDuplicates({ id }: JobOf<JobName.AssetDetectDuplicates>): Promise<JobStatus> {
-    const { machineLearning } = await this.getConfig({ withCache: true });
-    if (!isDuplicateDetectionEnabled(machineLearning)) {
-      return JobStatus.Skipped;
-    }
+    return this.databaseRepository.withLock(DatabaseLock.DuplicateDetection, async () => {
+      const { machineLearning } = await this.getConfig({ withCache: true });
+      if (!isDuplicateDetectionEnabled(machineLearning)) {
+        return JobStatus.Skipped;
+      }

-    const asset = await this.assetJobRepository.getForSearchDuplicatesJob(id);
-    if (!asset) {
-      this.logger.error(`Asset ${id} not found`);
-      return JobStatus.Failed;
-    }
+      const asset = await this.assetJobRepository.getForSearchDuplicatesJob(id);
+      if (!asset) {
+        this.logger.error(`Asset ${id} not found`);
+        return JobStatus.Failed;
+      }

-    if (asset.stackId) {
-      this.logger.debug(`Asset ${id} is part of a stack, skipping`);
-      return JobStatus.Skipped;
-    }
+      if (asset.stackId) {
+        this.logger.debug(`Asset ${id} is part of a stack, skipping`);
+        return JobStatus.Skipped;
+      }

-    if (asset.visibility === AssetVisibility.Hidden) {
-      this.logger.debug(`Asset ${id} is not visible, skipping`);
-      return JobStatus.Skipped;
-    }
+      if (asset.visibility === AssetVisibility.Hidden) {
+        this.logger.debug(`Asset ${id} is not visible, skipping`);
+        return JobStatus.Skipped;
+      }

-    if (asset.visibility === AssetVisibility.Locked) {
-      this.logger.debug(`Asset ${id} is locked, skipping`);
-      return JobStatus.Skipped;
-    }
+      if (asset.visibility === AssetVisibility.Locked) {
+        this.logger.debug(`Asset ${id} is locked, skipping`);
+        return JobStatus.Skipped;
+      }

-    if (!asset.embedding) {
-      this.logger.debug(`Asset ${id} is missing embedding`);
-      return JobStatus.Failed;
-    }
+      if (!asset.embedding) {
+        this.logger.debug(`Asset ${id} is missing embedding`);
+        return JobStatus.Failed;
+      }

-    const duplicateAssets = await this.duplicateRepository.search({
-      assetId: asset.id,
-      embedding: asset.embedding,
-      maxDistance: machineLearning.duplicateDetection.maxDistance,
-      type: asset.type,
-      userIds: [asset.ownerId],
+      const duplicateAssets = await this.duplicateRepository.search({
+        assetId: asset.id,
+        embedding: asset.embedding,
+        maxDistance: machineLearning.duplicateDetection.maxDistance,
+        type: asset.type,
+        userIds: [asset.ownerId],
+      });
+
+      let assetIds = [asset.id];
+      if (duplicateAssets.length > 0) {
+        this.logger.debug(
+          `Found ${duplicateAssets.length} duplicate${duplicateAssets.length === 1 ? '' : 's'} for asset ${asset.id}`,
+        );
+        assetIds = await this.updateDuplicates(asset, duplicateAssets);
+      } else if (asset.duplicateId) {
+        this.logger.debug(`No duplicates found for asset ${asset.id}, removing duplicateId`);
+        await this.assetRepository.update({ id: asset.id, duplicateId: null });
+      }
+
+      const duplicatesDetectedAt = new Date();
+      await this.assetRepository.upsertJobStatus(...assetIds.map((assetId) => ({ assetId, duplicatesDetectedAt })));
+
+      return JobStatus.Success;
    });
-
-    let assetIds = [asset.id];
-    if (duplicateAssets.length > 0) {
-      this.logger.debug(
-        `Found ${duplicateAssets.length} duplicate${duplicateAssets.length === 1 ? '' : 's'} for asset ${asset.id}`,
-      );
-      assetIds = await this.updateDuplicates(asset, duplicateAssets);
-    } else if (asset.duplicateId) {
-      this.logger.debug(`No duplicates found for asset ${asset.id}, removing duplicateId`);
-      await this.assetRepository.update({ id: asset.id, duplicateId: null });
-    }
-
-    const duplicatesDetectedAt = new Date();
-    await this.assetRepository.upsertJobStatus(...assetIds.map((assetId) => ({ assetId, duplicatesDetectedAt })));
-
-    return JobStatus.Success;
  }

  private async updateDuplicates(
@@ -25,6 +25,7 @@ import {
 import {
  AssetVisibility,
  CacheControl,
+  DatabaseLock,
  JobName,
  JobStatus,
  Permission,
@@ -402,144 +403,148 @@ export class PersonService extends BaseService {

  @OnJob({ name: JobName.FacialRecognitionQueueAll, queue: QueueName.FacialRecognition })
  async handleQueueRecognizeFaces({ force, nightly }: JobOf<JobName.FacialRecognitionQueueAll>): Promise<JobStatus> {
-    const { machineLearning } = await this.getConfig({ withCache: false });
-    if (!isFacialRecognitionEnabled(machineLearning)) {
-      return JobStatus.Skipped;
-    }
-
-    await this.jobRepository.waitForQueueCompletion(QueueName.ThumbnailGeneration, QueueName.FaceDetection);
-
-    if (nightly) {
-      const [state, latestFaceDate] = await Promise.all([
-        this.systemMetadataRepository.get(SystemMetadataKey.FacialRecognitionState),
-        this.personRepository.getLatestFaceDate(),
-      ]);
-
-      if (state?.lastRun && latestFaceDate && state.lastRun > latestFaceDate) {
-        this.logger.debug('Skipping facial recognition nightly since no face has been added since the last run');
+    return this.databaseRepository.withLock(DatabaseLock.FacialRecognition, async () => {
+      const { machineLearning } = await this.getConfig({ withCache: false });
+      if (!isFacialRecognitionEnabled(machineLearning)) {
        return JobStatus.Skipped;
      }
-    }

-    const { waiting } = await this.jobRepository.getJobCounts(QueueName.FacialRecognition);
+      await this.jobRepository.waitForQueueCompletion(QueueName.ThumbnailGeneration, QueueName.FaceDetection);

-    if (force) {
-      await this.personRepository.unassignFaces({ sourceType: SourceType.MachineLearning });
-      await this.handlePersonCleanup();
-      await this.personRepository.vacuum({ reindexVectors: false });
-    } else if (waiting) {
-      this.logger.debug(
-        `Skipping facial recognition queueing because ${waiting} job${waiting > 1 ? 's are' : ' is'} already queued`,
-      );
-      return JobStatus.Skipped;
-    }
+      if (nightly) {
+        const [state, latestFaceDate] = await Promise.all([
+          this.systemMetadataRepository.get(SystemMetadataKey.FacialRecognitionState),
+          this.personRepository.getLatestFaceDate(),
+        ]);

-    await this.databaseRepository.prewarm(VectorIndex.Face);
-
-    const lastRun = new Date().toISOString();
-    const facePagination = this.personRepository.getAllFaces(
-      force ? undefined : { personId: null, sourceType: SourceType.MachineLearning },
-    );
-
-    let jobs: { name: JobName.FacialRecognition; data: { id: string; deferred: false } }[] = [];
-    for await (const face of facePagination) {
-      jobs.push({ name: JobName.FacialRecognition, data: { id: face.id, deferred: false } });
-
-      if (jobs.length === JOBS_ASSET_PAGINATION_SIZE) {
-        await this.jobRepository.queueAll(jobs);
-        jobs = [];
+        if (state?.lastRun && latestFaceDate && state.lastRun > latestFaceDate) {
+          this.logger.debug('Skipping facial recognition nightly since no face has been added since the last run');
+          return JobStatus.Skipped;
+        }
      }
-    }

-    await this.jobRepository.queueAll(jobs);
+      const { waiting } = await this.jobRepository.getJobCounts(QueueName.FacialRecognition);

-    await this.systemMetadataRepository.set(SystemMetadataKey.FacialRecognitionState, { lastRun });
+      if (force) {
+        await this.personRepository.unassignFaces({ sourceType: SourceType.MachineLearning });
+        await this.handlePersonCleanup();
+        await this.personRepository.vacuum({ reindexVectors: false });
+      } else if (waiting) {
+        this.logger.debug(
+          `Skipping facial recognition queueing because ${waiting} job${waiting > 1 ? 's are' : ' is'} already queued`,
+        );
+        return JobStatus.Skipped;
+      }

-    return JobStatus.Success;
+      await this.databaseRepository.prewarm(VectorIndex.Face);
+
+      const lastRun = new Date().toISOString();
+      const facePagination = this.personRepository.getAllFaces(
+        force ? undefined : { personId: null, sourceType: SourceType.MachineLearning },
+      );
+
+      let jobs: { name: JobName.FacialRecognition; data: { id: string; deferred: false } }[] = [];
+      for await (const face of facePagination) {
+        jobs.push({ name: JobName.FacialRecognition, data: { id: face.id, deferred: false } });
+
+        if (jobs.length === JOBS_ASSET_PAGINATION_SIZE) {
+          await this.jobRepository.queueAll(jobs);
+          jobs = [];
+        }
+      }
+
+      await this.jobRepository.queueAll(jobs);
+
+      await this.systemMetadataRepository.set(SystemMetadataKey.FacialRecognitionState, { lastRun });
+
+      return JobStatus.Success;
+    });
  }

  @OnJob({ name: JobName.FacialRecognition, queue: QueueName.FacialRecognition })
  async handleRecognizeFaces({ id, deferred }: JobOf<JobName.FacialRecognition>): Promise<JobStatus> {
-    const { machineLearning } = await this.getConfig({ withCache: true });
-    if (!isFacialRecognitionEnabled(machineLearning)) {
-      return JobStatus.Skipped;
-    }
+    return this.databaseRepository.withLock(DatabaseLock.FacialRecognition, async () => {
+      const { machineLearning } = await this.getConfig({ withCache: true });
+      if (!isFacialRecognitionEnabled(machineLearning)) {
+        return JobStatus.Skipped;
+      }

-    const face = await this.personRepository.getFaceForFacialRecognitionJob(id);
-    if (!face || !face.asset) {
-      this.logger.warn(`Face ${id} not found`);
-      return JobStatus.Failed;
-    }
+      const face = await this.personRepository.getFaceForFacialRecognitionJob(id);
+      if (!face || !face.asset) {
+        this.logger.warn(`Face ${id} not found`);
+        return JobStatus.Failed;
+      }

-    if (face.sourceType !== SourceType.MachineLearning) {
-      this.logger.warn(`Skipping face ${id} due to source ${face.sourceType}`);
-      return JobStatus.Skipped;
-    }
+      if (face.sourceType !== SourceType.MachineLearning) {
+        this.logger.warn(`Skipping face ${id} due to source ${face.sourceType}`);
+        return JobStatus.Skipped;
+      }

-    if (!face.faceSearch?.embedding) {
-      this.logger.warn(`Face ${id} does not have an embedding`);
-      return JobStatus.Failed;
-    }
+      if (!face.faceSearch?.embedding) {
+        this.logger.warn(`Face ${id} does not have an embedding`);
+        return JobStatus.Failed;
+      }

-    if (face.personId) {
-      this.logger.debug(`Face ${id} already has a person assigned`);
-      return JobStatus.Skipped;
-    }
+      if (face.personId) {
+        this.logger.debug(`Face ${id} already has a person assigned`);
+        return JobStatus.Skipped;
+      }

-    const matches = await this.searchRepository.searchFaces({
-      userIds: [face.asset.ownerId],
-      embedding: face.faceSearch.embedding,
-      maxDistance: machineLearning.facialRecognition.maxDistance,
-      numResults: machineLearning.facialRecognition.minFaces,
-      minBirthDate: new Date(face.asset.fileCreatedAt),
-    });
-
-    // `matches` also includes the face itself
-    if (machineLearning.facialRecognition.minFaces > 1 && matches.length <= 1) {
-      this.logger.debug(`Face ${id} only matched the face itself, skipping`);
-      return JobStatus.Skipped;
-    }
-
-    this.logger.debug(`Face ${id} has ${matches.length} matches`);
-
-    const isCore =
-      matches.length >= machineLearning.facialRecognition.minFaces &&
-      face.asset.visibility === AssetVisibility.Timeline;
-    if (!isCore && !deferred) {
-      this.logger.debug(`Deferring non-core face ${id} for later processing`);
-      await this.jobRepository.queue({ name: JobName.FacialRecognition, data: { id, deferred: true } });
-      return JobStatus.Skipped;
-    }
-
-    let personId = matches.find((match) => match.personId)?.personId;
-    if (!personId) {
-      const matchWithPerson = await this.searchRepository.searchFaces({
+      const matches = await this.searchRepository.searchFaces({
        userIds: [face.asset.ownerId],
        embedding: face.faceSearch.embedding,
        maxDistance: machineLearning.facialRecognition.maxDistance,
-        numResults: 1,
-        hasPerson: true,
+        numResults: machineLearning.facialRecognition.minFaces,
        minBirthDate: new Date(face.asset.fileCreatedAt),
      });

-      if (matchWithPerson.length > 0) {
-        personId = matchWithPerson[0].personId;
+      // `matches` also includes the face itself
+      if (machineLearning.facialRecognition.minFaces > 1 && matches.length <= 1) {
+        this.logger.debug(`Face ${id} only matched the face itself, skipping`);
+        return JobStatus.Skipped;
      }
-    }

-    if (isCore && !personId) {
-      this.logger.log(`Creating new person for face ${id}`);
-      const newPerson = await this.personRepository.create({ ownerId: face.asset.ownerId, faceAssetId: face.id });
-      await this.jobRepository.queue({ name: JobName.PersonGenerateThumbnail, data: { id: newPerson.id } });
-      personId = newPerson.id;
-    }
+      this.logger.debug(`Face ${id} has ${matches.length} matches`);

-    if (personId) {
-      this.logger.debug(`Assigning face ${id} to person ${personId}`);
-      await this.personRepository.reassignFaces({ faceIds: [id], newPersonId: personId });
-    }
+      const isCore =
+        matches.length >= machineLearning.facialRecognition.minFaces &&
+        face.asset.visibility === AssetVisibility.Timeline;
+      if (!isCore && !deferred) {
+        this.logger.debug(`Deferring non-core face ${id} for later processing`);
+        await this.jobRepository.queue({ name: JobName.FacialRecognition, data: { id, deferred: true } });
+        return JobStatus.Skipped;
+      }

-    return JobStatus.Success;
+      let personId = matches.find((match) => match.personId)?.personId;
+      if (!personId) {
+        const matchWithPerson = await this.searchRepository.searchFaces({
+          userIds: [face.asset.ownerId],
+          embedding: face.faceSearch.embedding,
+          maxDistance: machineLearning.facialRecognition.maxDistance,
+          numResults: 1,
+          hasPerson: true,
+          minBirthDate: new Date(face.asset.fileCreatedAt),
+        });
+
+        if (matchWithPerson.length > 0) {
+          personId = matchWithPerson[0].personId;
+        }
+      }
+
+      if (isCore && !personId) {
+        this.logger.log(`Creating new person for face ${id}`);
+        const newPerson = await this.personRepository.create({ ownerId: face.asset.ownerId, faceAssetId: face.id });
+        await this.jobRepository.queue({ name: JobName.PersonGenerateThumbnail, data: { id: newPerson.id } });
+        personId = newPerson.id;
+      }
+
+      if (personId) {
+        this.logger.debug(`Assigning face ${id} to person ${personId}`);
+        await this.personRepository.reassignFaces({ faceIds: [id], newPersonId: personId });
+      }
+
+      return JobStatus.Success;
+    });
  }

  @OnJob({ name: JobName.PersonFileMigration, queue: QueueName.Migration })
@@ -212,10 +212,16 @@
      };
    }

-    return {
-      fileCreatedAfter: dateAfter?.toUTC().toISO(),
-      fileCreatedBefore: dateBefore?.toUTC().toISO(),
-    };
+    try {
+      return {
+        fileCreatedAfter: dateAfter ? new Date(dateAfter).toISOString() : undefined,
+        fileCreatedBefore: dateBefore ? new Date(dateBefore).toISOString() : undefined,
+      };
+    } catch {
+      $mapSettings.dateAfter = '';
+      $mapSettings.dateBefore = '';
+      return {};
+    }
  }

  async function loadMapMarkers() {
@@ -231,7 +237,7 @@
      {
        isArchived: includeArchived || undefined,
        isFavorite: onlyFavorites || undefined,
-        fileCreatedAfter,
+        fileCreatedAfter: fileCreatedAfter || undefined,
        fileCreatedBefore,
        withPartners: withPartners || undefined,
        withSharedAlbums: withSharedAlbums || undefined,
@@ -1,6 +1,7 @@
 <script lang="ts">
+  import DateInput from '$lib/elements/DateInput.svelte';
  import type { MapSettings } from '$lib/stores/preferences.store';
-  import { Button, DatePicker, Field, FormModal, Select, Stack, Switch } from '@immich/ui';
+  import { Button, Field, FormModal, Select, Stack, Switch } from '@immich/ui';
  import { Duration } from 'luxon';
  import { t } from 'svelte-i18n';
  import { fly } from 'svelte/transition';
@@ -40,21 +41,29 @@

    {#if customDateRange}
      <div in:fly={{ y: 10, duration: 200 }} class="flex flex-col gap-4">
-        <Field label={$t('date_after')}>
-          <DatePicker bind:value={settings.dateAfter} maxDate={settings.dateBefore} />
-        </Field>
-        <Field label={$t('date_before')}>
-          <DatePicker bind:value={settings.dateBefore} />
-        </Field>
-        <div class="flex justify-center">
+        <div class="flex items-center justify-between gap-8">
+          <label class="shrink-0 text-sm immich-form-label" for="date-after">{$t('date_after')}</label>
+          <DateInput
+            class="immich-form-input w-40"
+            type="date"
+            id="date-after"
+            max={settings.dateBefore}
+            bind:value={settings.dateAfter}
+          />
+        </div>
+        <div class="flex items-center justify-between gap-8">
+          <label class="shrink-0 text-sm immich-form-label" for="date-before">{$t('date_before')}</label>
+          <DateInput class="immich-form-input w-40" type="date" id="date-before" bind:value={settings.dateBefore} />
+        </div>
+        <div class="flex justify-center text-xs">
          <Button
            color="primary"
            size="small"
            variant="ghost"
            onclick={() => {
              customDateRange = false;
-              settings.dateAfter = undefined;
-              settings.dateBefore = undefined;
+              settings.dateAfter = '';
+              settings.dateBefore = '';
            }}
          >
            {$t('remove_custom_date_range')}
@@ -62,7 +71,7 @@
        </div>
      </div>
    {:else}
-      <div in:fly={{ y: -10, duration: 200 }} class="flex flex-col gap-2">
+      <div in:fly={{ y: -10, duration: 200 }} class="flex flex-col gap-1">
        <Field label={$t('date_range')}>
          <Select
            bind:value={settings.relativeDate}
@@ -73,38 +82,40 @@
              },
              {
                label: $t('past_durations.hours', { values: { hours: 24 } }),
-                value: Duration.fromObject({ hours: 24 }).toISO(),
+                value: Duration.fromObject({ hours: 24 }).toISO() || '',
              },
              {
                label: $t('past_durations.days', { values: { days: 7 } }),
-                value: Duration.fromObject({ days: 7 }).toISO(),
+                value: Duration.fromObject({ days: 7 }).toISO() || '',
              },
              {
                label: $t('past_durations.days', { values: { days: 30 } }),
-                value: Duration.fromObject({ days: 30 }).toISO(),
+                value: Duration.fromObject({ days: 30 }).toISO() || '',
              },
              {
                label: $t('past_durations.years', { values: { years: 1 } }),
-                value: Duration.fromObject({ years: 1 }).toISO(),
+                value: Duration.fromObject({ years: 1 }).toISO() || '',
              },
              {
                label: $t('past_durations.years', { values: { years: 3 } }),
-                value: Duration.fromObject({ years: 3 }).toISO(),
+                value: Duration.fromObject({ years: 3 }).toISO() || '',
              },
            ]}
          />
        </Field>
-        <Button
-          color="primary"
-          size="small"
-          variant="ghost"
-          onclick={() => {
-            customDateRange = true;
-            settings.relativeDate = '';
-          }}
-        >
-          {$t('use_custom_date_range')}
-        </Button>
+        <div class="text-xs">
+          <Button
+            color="primary"
+            size="small"
+            variant="ghost"
+            onclick={() => {
+              customDateRange = true;
+              settings.relativeDate = '';
+            }}
+          >
+            {$t('use_custom_date_range')}
+          </Button>
+        </div>
      </div>
    {/if}
  </Stack>
@@ -1,9 +1,9 @@
 <script lang="ts">
+  import DateInput from '$lib/elements/DateInput.svelte';
  import { handleUpdatePersonBirthDate } from '$lib/services/person.service';
  import { type PersonResponseDto } from '@immich/sdk';
-  import { Button, DatePicker, Field, FormModal, HelperText } from '@immich/ui';
+  import { Button, FormModal, Text } from '@immich/ui';
  import { mdiCake } from '@mdi/js';
-  import { DateTime } from 'luxon';
  import { t } from 'svelte-i18n';

  type Props = {
@@ -12,25 +12,32 @@
  };

  let { person, onClose }: Props = $props();
-  let birthDate = $derived(person.birthDate ? DateTime.fromISO(person.birthDate) : undefined);
+  let birthDate = $derived(person.birthDate ?? '');

  const onSubmit = async () => {
-    const success = await handleUpdatePersonBirthDate(person, birthDate?.toISODate() ?? '');
+    const success = await handleUpdatePersonBirthDate(person, birthDate);
    if (success) {
      onClose();
    }
  };
+
+  const todayFormatted = new Date().toISOString().split('T')[0];
 </script>

 <FormModal title={$t('set_date_of_birth')} size="small" icon={mdiCake} {onClose} {onSubmit}>
-  <div class="my-2 flex flex-col gap-2">
-    <Field label={$t('date_of_birth')}>
-      <DatePicker bind:value={birthDate} maxDate={DateTime.now()} />
-      <HelperText>{$t('birthdate_set_description')}</HelperText>
-    </Field>
+  <Text size="small">{$t('birthdate_set_description')}</Text>
+  <div class="my-4 flex flex-col gap-2">
+    <DateInput
+      class="immich-form-input"
+      id="birthDate"
+      name="birthDate"
+      type="date"
+      bind:value={birthDate}
+      max={todayFormatted}
+    />
    {#if person.birthDate}
      <div class="flex justify-end">
-        <Button shape="round" color="secondary" size="small" onclick={() => (birthDate = undefined)}>
+        <Button shape="round" color="secondary" size="small" onclick={() => (birthDate = '')}>
          {$t('clear')}
        </Button>
      </div>
@@ -1,4 +1,3 @@
-import type { DateTime } from 'luxon';
 import { persisted } from 'svelte-persisted-store';
 import { browser } from '$app/environment';
 import { defaultLang } from '$lib/constants';
@@ -27,8 +26,8 @@ export interface MapSettings {
  withPartners: boolean;
  withSharedAlbums: boolean;
  relativeDate: string;
-  dateAfter?: DateTime<true>;
-  dateBefore?: DateTime<true>;
+  dateAfter: string;
+  dateBefore: string;
 }

 const defaultMapSettings = {
@@ -38,6 +37,8 @@ const defaultMapSettings = {
  withPartners: false,
  withSharedAlbums: false,
  relativeDate: '',
+  dateAfter: '',
+  dateBefore: '',
 };

 const persistedObject = <T>(key: string, defaults: T) =>
@@ -4,18 +4,15 @@
  import OnEvents from '$lib/components/OnEvents.svelte';
  import EmptyPlaceholder from '$lib/components/shared-components/EmptyPlaceholder.svelte';
  import SingleGridRow from '$lib/components/shared-components/SingleGridRow.svelte';
-  import { assetViewerManager } from '$lib/managers/asset-viewer-manager.svelte';
  import { Route } from '$lib/route';
  import { getAssetMediaUrl, getPeopleThumbnailUrl } from '$lib/utils';
-  import { getAssetInfo, AssetMediaSize, type SearchExploreResponseDto } from '@immich/sdk';
-  import { authManager } from '$lib/managers/auth-manager.svelte';
+  import { AssetMediaSize, type SearchExploreResponseDto } from '@immich/sdk';
  import { Icon } from '@immich/ui';
  import { mdiHeart } from '@mdi/js';
  import { t } from 'svelte-i18n';
  import type { PageData } from './$types';
  import { toTimelineAsset } from '$lib/utils/timeline-util';
  import { getAltText } from '$lib/utils/thumbnail-util';
-  import Portal from '$lib/elements/Portal.svelte';

  interface Props {
    data: PageData;
@@ -43,15 +40,6 @@
      }
    }
  };
-
-  const onViewAsset = async (id: string) => {
-    const asset = await getAssetInfo({ ...authManager.params, id });
-    assetViewerManager.setAsset(asset);
-  };
-
-  const assetCursor = $derived({
-    current: assetViewerManager.asset!,
-  });
 </script>

 <OnEvents {onPersonThumbnailReady} />
@@ -134,20 +122,15 @@
          draggable="false">{$t('view_all')}</a
        >
      </div>
-      <div class="flex h-24 max-w-fit flex-wrap gap-x-1 overflow-hidden md:h-42">
+      <div class="flex h-24 flex-wrap gap-x-1 overflow-hidden md:h-42">
        {#each recents as item (item.data.id)}
-          <button
-            type="button"
-            class="relative h-full flex-auto"
-            onclick={() => onViewAsset(item.data.id)}
-            draggable="false"
-          >
+          <a class="relative h-full flex-auto" href={Route.viewAsset({ id: item.data.id })} draggable="false">
            <img
              src={getAssetMediaUrl({ id: item.data.id, size: AssetMediaSize.Thumbnail })}
              alt={$getAltText(toTimelineAsset(item.data))}
              class="size-full min-w-max rounded-xl object-cover"
            />
-          </button>
+          </a>
        {/each}
      </div>
    </div>
@@ -157,15 +140,3 @@
    <EmptyPlaceholder text={$t('no_explore_results_message')} class="mx-auto mt-10" />
  {/if}
 </UserPageLayout>
-
-{#if assetViewerManager.isViewing}
-  {#await import('$lib/components/asset-viewer/AssetViewer.svelte') then { default: AssetViewer }}
-    <Portal target="body">
-      <AssetViewer
-        cursor={assetCursor}
-        showNavigation={false}
-        onClose={() => assetViewerManager.showAssetViewer(false)}
-      />
-    </Portal>
-  {/await}
-{/if}
Author	SHA1	Message	Date
bo0tzz	6fec82b772	fix: no lock on queue duplicates	2026-05-14 10:20:50 +02:00
bo0tzz	e2e9dd425f	fix: locking around concurrency-1 jobs	2026-05-13 15:18:33 +02:00