fix(mobile): keep drag select going while the grid auto scrolls

mobile/android/app/CMakeLists.txt

@@ -7,7 +7,6 @@ project(native_buffer LANGUAGES C)
 
 add_library(native_buffer SHARED
     src/main/cpp/native_buffer.c
-    src/main/cpp/native_image.c
 )
 
 target_link_libraries(native_buffer jnigraphics)

mobile/android/app/src/main/cpp/native_image.c

@@ -1,109 +0,0 @@
-#include <jni.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <android/bitmap.h>
-
-// Cache-friendly block size for the tiled rotation (in pixels). 32x32 uint32 = 4KB, fits L1.
-#define TILE 32
-
-// EXIF orientation values (androidx.exifinterface.media.ExifInterface.ORIENTATION_*).
-enum {
-  ORIENTATION_FLIP_HORIZONTAL = 2,
-  ORIENTATION_ROTATE_180 = 3,
-  ORIENTATION_FLIP_VERTICAL = 4,
-  ORIENTATION_TRANSPOSE = 5,
-  ORIENTATION_ROTATE_90 = 6,
-  ORIENTATION_TRANSVERSE = 7,
-  ORIENTATION_ROTATE_270 = 8,
-};
-
-// The orientations that swap width and height. Must stay in sync with affine_for's dim usage.
-static int swaps_dims(int o) {
-  return o == ORIENTATION_ROTATE_90 || o == ORIENTATION_ROTATE_270 ||
-         o == ORIENTATION_TRANSPOSE || o == ORIENTATION_TRANSVERSE;
-}
-
-// A source pixel (sx, sy) maps to destination index base + sx*stepX + sy*stepY, where dw is the
-// destination width. This affine form covers all 8 EXIF orientations and matches the pixel layout
-// of Bitmap.createBitmap(src, matrixForExifOrientation(o)). int64_t so it stays correct on
-// armeabi-v7a (32-bit long) regardless of how large MAX_RAW_DECODE_PIXELS grows.
-static void affine_for(int o, int sw, int sh, int dw, int64_t *base, int64_t *stepX, int64_t *stepY) {
-  switch (o) {
-    case ORIENTATION_ROTATE_90:       *base = sh - 1;                             *stepX = dw;  *stepY = -1;  break;
-    case ORIENTATION_ROTATE_270:      *base = (int64_t) (sw - 1) * dw;            *stepX = -dw; *stepY = 1;   break;
-    case ORIENTATION_ROTATE_180:      *base = (int64_t) (sh - 1) * dw + (sw - 1); *stepX = -1;  *stepY = -dw; break;
-    case ORIENTATION_FLIP_HORIZONTAL: *base = sw - 1;                             *stepX = -1;  *stepY = dw;  break;
-    case ORIENTATION_FLIP_VERTICAL:   *base = (int64_t) (sh - 1) * dw;            *stepX = 1;   *stepY = -dw; break;
-    case ORIENTATION_TRANSPOSE:       *base = 0;                                  *stepX = dw;  *stepY = 1;   break;
-    case ORIENTATION_TRANSVERSE:      *base = (int64_t) (sw - 1) * dw + (sh - 1); *stepX = -dw; *stepY = -1;  break;
-    default:                          *base = 0;                                  *stepX = 1;   *stepY = dw;  break;
-  }
-}
-
-// Copy each source pixel (whole uint32, so channel order/premult is irrelevant) to its rotated
-// destination, walking TILE x TILE blocks so the scattered writes of a 90/270 transpose stay
-// cache-resident. dst is densely packed (rowBytes == dw*4, no padding), which the affine math relies on.
-static void rotate_tiled(const uint8_t *src, int srcStride, uint32_t *dst,
-                         int sw, int sh, int64_t base, int64_t stepX, int64_t stepY) {
-  for (int ty = 0; ty < sh; ty += TILE) {
-    int yEnd = ty + TILE < sh ? ty + TILE : sh;
-    for (int tx = 0; tx < sw; tx += TILE) {
-      int xEnd = tx + TILE < sw ? tx + TILE : sw;
-      for (int sy = ty; sy < yEnd; sy++) {
-        const uint32_t *srcRow = (const uint32_t *) (src + (size_t) sy * srcStride);
-        int64_t idx = base + (int64_t) sy * stepY + (int64_t) tx * stepX;
-        for (int sx = tx; sx < xEnd; sx++) {
-          dst[idx] = srcRow[sx];
-          idx += stepX;
-        }
-      }
-    }
-  }
-}
-
-// Rotates an RGBA_8888 bitmap to the given EXIF orientation into a freshly malloc'd buffer (free it
-// via NativeBuffer.free). Fills outInfo with {width, height, rowBytes} and returns the buffer
-// address, or 0 if the bitmap can't be handled (e.g. a non-8888 format) so the caller can fall back.
-JNIEXPORT jlong JNICALL
-Java_app_alextran_immich_NativeImage_rotate(
-    JNIEnv *env, jclass clazz, jobject bitmap, jint orientation, jintArray outInfo) {
-  AndroidBitmapInfo info;
-  if (AndroidBitmap_getInfo(env, bitmap, &info) != ANDROID_BITMAP_RESULT_SUCCESS) {
-    return 0;
-  }
-  if (info.format != ANDROID_BITMAP_FORMAT_RGBA_8888) {
-    return 0;
-  }
-
-  int sw = (int) info.width;
-  int sh = (int) info.height;
-  int dw = swaps_dims(orientation) ? sh : sw;
-  int dh = swaps_dims(orientation) ? sw : sh;
-
-  uint32_t *dst = (uint32_t *) malloc((size_t) dw * dh * 4);
-  if (dst == NULL) {
-    return 0;
-  }
-
-  void *srcPixels = NULL;
-  if (AndroidBitmap_lockPixels(env, bitmap, &srcPixels) != ANDROID_BITMAP_RESULT_SUCCESS) {
-    free(dst);
-    return 0;
-  }
-
-  int64_t base, stepX, stepY;
-  affine_for(orientation, sw, sh, dw, &base, &stepX, &stepY);
-  rotate_tiled((const uint8_t *) srcPixels, (int) info.stride, dst, sw, sh, base, stepX, stepY);
-
-  AndroidBitmap_unlockPixels(env, bitmap);
-
-  jint dims[3] = {dw, dh, dw * 4};
-  (*env)->SetIntArrayRegion(env, outInfo, 0, 3, dims);
-  // Keep ownership in C until the buffer is safely handed back: if outInfo was somehow too small,
-  // SetIntArrayRegion left a pending exception and Kotlin will never receive (or free) dst.
-  if ((*env)->ExceptionCheck(env)) {
-    free(dst);
-    return 0;
-  }
-  return (jlong) dst;
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/NativeImage.kt

@@ -1,19 +0,0 @@
-package app.alextran.immich
-
-import android.graphics.Bitmap
-
-object NativeImage {
-  init {
-    // rotate() is compiled into the native_buffer shared lib (which already links jnigraphics).
-    System.loadLibrary("native_buffer")
-  }
-
-  /**
-   * Rotates an RGBA_8888 [bitmap] to the given EXIF [orientation], writing the result into a freshly
-   * malloc'd native buffer. Returns the buffer address (free it with [NativeBuffer.free]) and fills
-   * [outInfo] with {width, height, rowBytes}. Returns 0 when the bitmap can't be handled (e.g. a
-   * non-8888 config) so the caller can fall back.
-   */
-  @JvmStatic
-  external fun rotate(bitmap: Bitmap, orientation: Int, outInfo: IntArray): Long
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/images/LocalImagesImpl.kt

@@ -12,9 +12,7 @@ import android.provider.MediaStore.Images
 import android.provider.MediaStore.Video
 import android.util.Size
 import androidx.annotation.RequiresApi
-import androidx.exifinterface.media.ExifInterface
 import app.alextran.immich.NativeBuffer
-import app.alextran.immich.NativeImage
 import kotlin.math.*
 import java.io.IOException
 import java.util.concurrent.Executors
@@ -183,88 +181,35 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
     val id = assetId.toLong()
 
     signal.throwIfCanceled()
+    val bitmap = if (isVideo) {
+      decodeVideoThumbnail(id, size, signal)
+    } else {
+      decodeImage(id, size, signal)
+    }
+
     try {
-      val res = if (isVideo) {
-        decodeVideoThumbnail(id, size, signal).toNativeBuffer()
-      } else {
-        val (bitmap, orientation) = decodeImage(id, size, signal)
-        signal.throwIfCanceled()
-        if (orientation == ExifInterface.ORIENTATION_NORMAL || orientation == ExifInterface.ORIENTATION_UNDEFINED) {
-          bitmap.toNativeBuffer()
-        } else {
-          rotateToNativeBuffer(bitmap, orientation, signal)
-        }
-      }
-      // Don't re-check cancellation here: res owns a malloc'd buffer, and bailing to CANCELLED would
-      // orphan it. Deliver it; Dart frees the buffer itself if the request was cancelled meanwhile.
+      signal.throwIfCanceled()
+      val res = bitmap.toNativeBuffer()
+      signal.throwIfCanceled()
       callback(Result.success(res))
     } catch (e: Exception) {
       callback(if (e is OperationCanceledException) CANCELLED else Result.failure(e))
     }
   }
 
-  // Returns the decoded bitmap plus the EXIF orientation that still needs applying. Only Q+ raw
-  // decodes come back unrotated (ImageDecoder / loadThumbnail skip EXIF for raw like DNG); every
-  // other path already orients itself, so it reports ORIENTATION_NORMAL.
-  private fun decodeImage(id: Long, size: Size, signal: CancellationSignal): Pair<Bitmap, Int> {
+  private fun decodeImage(id: Long, size: Size, signal: CancellationSignal): Bitmap {
     signal.throwIfCanceled()
     val uri = ContentUris.withAppendedId(Images.Media.EXTERNAL_CONTENT_URI, id)
-    val handleRaw = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && isRawMime(uri)
-    val orientation = if (handleRaw) rawOrientation(uri) else ExifInterface.ORIENTATION_NORMAL
-
     if (size.width <= 0 || size.height <= 0 || size.width > 768 || size.height > 768) {
-      // A "load original" request is unsized -> a full-res decode (a sized > 768 just samples to target).
-      return decodeSource(uri, size, signal) to orientation
+      return decodeSource(uri, size, signal)
     }
 
-    val bitmap = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
       resolver.loadThumbnail(uri, size, signal)
     } else {
       signal.setOnCancelListener { Images.Thumbnails.cancelThumbnailRequest(resolver, id) }
       Images.Thumbnails.getThumbnail(resolver, id, Images.Thumbnails.MINI_KIND, OPTIONS)
     }
-    return bitmap to orientation
-  }
-
-  private fun isRawMime(uri: Uri): Boolean {
-    val mime = resolver.getType(uri) ?: return false
-    return mime.startsWith("image/x-") || mime == "image/dng"
-  }
-
-  private fun rawOrientation(uri: Uri): Int {
-    return resolver.openInputStream(uri)?.use {
-      ExifInterface(it).getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL)
-    } ?: ExifInterface.ORIENTATION_NORMAL
-  }
-
-  // ImageDecoder / loadThumbnail skip EXIF orientation for raw (e.g. DNG) on Q+, so the decoded
-  // bitmap comes back unrotated. Rotate it into the output buffer in native code (one pass, no
-  // intermediate rotated bitmap).
-  private fun rotateToNativeBuffer(bitmap: Bitmap, orientation: Int, signal: CancellationSignal): Map<String, Long> {
-    signal.throwIfCanceled()
-    // Force ARGB_8888: the native rotate needs a lockable 8888 buffer, and toNativeBuffer() below
-    // allocates width*height*4 (an F16/HDR decode would otherwise under-allocate). No-op for the
-    // common already-8888 case.
-    val src = if (bitmap.config != Bitmap.Config.ARGB_8888) {
-      val converted = bitmap.copy(Bitmap.Config.ARGB_8888, false)
-      bitmap.recycle()
-      converted ?: throw IOException("could not convert bitmap to ARGB_8888")
-    } else {
-      bitmap
-    }
-    try {
-      val info = IntArray(3)
-      val pointer = NativeImage.rotate(src, orientation, info)
-      if (pointer == 0L) throw IOException("native rotate failed for orientation $orientation")
-      return mapOf(
-        "pointer" to pointer,
-        "width" to info[0].toLong(),
-        "height" to info[1].toLong(),
-        "rowBytes" to info[2].toLong()
-      )
-    } finally {
-      if (!src.isRecycled) src.recycle()
-    }
   }
 
   private fun decodeVideoThumbnail(id: Long, target: Size, signal: CancellationSignal): Bitmap {

mobile/lib/constants/enums.dart

@@ -9,6 +9,8 @@ enum SortOrder {
 
 enum TextSearchType { context, filename, description, ocr }
 
+enum AssetVisibilityEnum { timeline, hidden, archive, locked }
+
 enum ActionSource { timeline, viewer }
 
 enum ShareAssetType { original, preview }

mobile/lib/domain/models/asset/remote_asset.model.dart

@@ -52,12 +52,6 @@ class RemoteAsset extends BaseAsset {
 
   bool get isTrashed => deletedAt != null;
 
-  bool get isStacked => stackId != null;
-
-  bool get isArchived => visibility == .archive;
-
-  bool get isLocked => visibility == .locked;
-
   @override
   String toString() {
     return '''Asset {

mobile/lib/domain/services/asset.service.dart

@@ -4,7 +4,6 @@ import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
-import 'package:immich_mobile/utils/option.dart';
 
 class AssetService {
   final RemoteAssetRepository _remoteRepository;
@@ -70,43 +69,12 @@ class AssetService {
     return _localRepository.getSourceAlbums(localAssetId, backupSelection: backupSelection);
   }
 
-  Future<void> restoreTrash(List<String> remoteIds) async {
+  Future<void> updateFavorite(List<String> remoteIds, bool isFavorite) async {
     if (remoteIds.isEmpty) {
       return;
     }
 
-    await _apiRepository.restoreTrash(remoteIds);
-    await _remoteRepository.restoreTrash(remoteIds);
-  }
-
-  Future<void> stack(String userId, List<String> remoteIds) async {
-    if (remoteIds.isEmpty) {
-      return;
-    }
-
-    final stack = await _apiRepository.stack(remoteIds);
-    await _remoteRepository.stack(userId, stack);
-  }
-
-  Future<void> unstack(List<String> stackIds) async {
-    if (stackIds.isEmpty) {
-      return;
-    }
-
-    await _remoteRepository.unStack(stackIds);
-    await _apiRepository.unStack(stackIds);
-  }
-
-  Future<void> update(
-    List<String> remoteIds, {
-    Option<bool> isFavorite = const .none(),
-    Option<AssetVisibility> visibility = const .none(),
-  }) async {
-    if (remoteIds.isEmpty) {
-      return;
-    }
-
-    await _apiRepository.update(remoteIds, isFavorite: isFavorite, visibility: visibility);
-    await _remoteRepository.update(remoteIds, isFavorite: isFavorite, visibility: visibility);
+    await _apiRepository.updateFavorite(remoteIds, isFavorite);
+    await _remoteRepository.updateFavorite(remoteIds, isFavorite);
   }
 }

mobile/lib/domain/services/timeline.service.dart

@@ -182,6 +182,18 @@ class TimelineService {
     return _buffer.slice(start, start + count);
   }
 
+  /// Reads a range without disturbing the buffer; queries the source if it isn't resident.
+  Future<List<BaseAsset>> getAssetsRange(int index, int count) async {
+    if (index < 0 || count <= 0 || index >= _totalAssets) {
+      return const [];
+    }
+    final clamped = math.min(count, _totalAssets - index);
+    if (hasRange(index, clamped)) {
+      return getAssets(index, clamped);
+    }
+    return _assetSource(index, clamped);
+  }
+
   // Preload assets around the given index for asset viewer
   Future<void> preloadAssets(int index) => _mutex.run(() => _loadAssets(index, math.min(5, _totalAssets - index)));
 

mobile/lib/infrastructure/repositories/remote_asset.repository.dart

@@ -10,7 +10,6 @@ import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:immich_mobile/utils/option.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
 class RemoteAssetRepository extends DriftDatabaseRepository {
@@ -287,20 +286,4 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
       ..orderBy([(row) => OrderingTerm.asc(row.sequence)]);
     return query.map((row) => row.toDto()!).get();
   }
-
-  Future<void> update(
-    List<String> remoteIds, {
-    Option<bool> isFavorite = const .none(),
-    Option<AssetVisibility> visibility = const .none(),
-  }) {
-    final companion = RemoteAssetEntityCompanion(
-      visibility: visibility.toDriftValue(),
-      isFavorite: isFavorite.toDriftValue(),
-    );
-    return _db.batch((batch) {
-      for (final remoteId in remoteIds) {
-        batch.update(_db.remoteAssetEntity, companion, where: (e) => e.id.equals(remoteId));
-      }
-    });
-  }
 }

mobile/lib/pages/library/partner/partner.page.dart

@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/partner.action.dart';
 import 'package:immich_mobile/presentation/widgets/people/partner_user_avatar.widget.dart';
@@ -28,14 +27,13 @@ class PartnerPage extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final sharedByAsync = ref.watch(partnersStateProvider);
-    final scope = ActionScope.from(context, ref);
 
     return Scaffold(
       appBar: AppBar(
         title: Text(context.t.partners),
         elevation: 0,
         centerTitle: false,
-        actions: [ActionIconButtonWidget(action: PartnerAddAction(scope: scope))],
+        actions: const [ActionIconButtonWidget(action: PartnerAddAction())],
       ),
       body: sharedByAsync.when(
         data: (partners) => PartnerSharedByList(partners: partners.toList(growable: false)),
@@ -46,12 +44,11 @@ class PartnerPage extends ConsumerWidget {
   }
 }
 
-class _EmptyPartners extends ConsumerWidget {
+class _EmptyPartners extends StatelessWidget {
   const _EmptyPartners();
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final scope = ActionScope.from(context, ref);
+  Widget build(BuildContext context) {
     return Padding(
       padding: const .symmetric(horizontal: 16.0),
       child: Column(
@@ -61,9 +58,9 @@ class _EmptyPartners extends ConsumerWidget {
             padding: const .symmetric(vertical: 8),
             child: Text(context.t.partner_page_empty_message, style: const TextStyle(fontSize: 14)),
           ),
-          Align(
+          const Align(
             alignment: .center,
-            child: ActionButtonWidget(action: PartnerAddAction(scope: scope)),
+            child: ActionButtonWidget(action: PartnerAddAction()),
           ),
         ],
       ),
@@ -72,17 +69,16 @@ class _EmptyPartners extends ConsumerWidget {
 }
 
 @visibleForTesting
-class PartnerSharedByList extends ConsumerWidget {
+class PartnerSharedByList extends StatelessWidget {
   const PartnerSharedByList({super.key, required this.partners});
 
   final List<Partner> partners;
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  Widget build(BuildContext context) {
     if (partners.isEmpty) {
       return const _EmptyPartners();
     }
-    final scope = ActionScope.from(context, ref);
 
     return ListView.builder(
       itemCount: partners.length,
@@ -93,7 +89,7 @@ class PartnerSharedByList extends ConsumerWidget {
           title: Text(partner.name),
           subtitle: Text(partner.email),
           trailing: ActionIconButtonWidget(
-            action: PartnerRemoveAction(sharedWithId: partner.id, partnerName: partner.name, scope: scope),
+            action: PartnerRemoveAction(sharedWithId: partner.id, partnerName: partner.name),
           ),
         );
       },

mobile/lib/presentation/actions/action.dart

@@ -1,9 +1,7 @@
-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/user.model.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
 
 class ActionScope {
   final BuildContext context;
@@ -11,24 +9,24 @@ class ActionScope {
   final UserDto authUser;
 
   const ActionScope({required this.context, required this.ref, required this.authUser});
-
-  factory ActionScope.from(BuildContext context, WidgetRef ref) {
-    final authUser = ref.watch(currentUserProvider);
-    if (authUser == null) {
-      throw StateError('Auth user is not available in ActionScope');
-    }
-
-    return ActionScope(context: context, ref: ref, authUser: authUser);
-  }
 }
 
 abstract class BaseAction {
-  final ActionScope scope;
-  final IconData icon;
-  final String label;
-  final bool isVisible;
+  const BaseAction();
 
-  const BaseAction({required this.scope, required this.icon, required this.label, this.isVisible = true});
+  IconData get icon;
 
-  Future<void> onAction();
+  String label(ActionScope scope);
+
+  bool isVisible(ActionScope scope) => true;
+
+  Future<void> onAction(ActionScope scope);
+}
+
+abstract class AssetAction<T extends BaseAsset> extends BaseAction {
+  final Iterable<BaseAsset> assets;
+
+  const AssetAction({required this.assets});
+
+  Iterable<T> filter(ActionScope scope) => assets.whereType<T>();
 }

mobile/lib/presentation/actions/action.widget.dart

@@ -1,18 +1,16 @@
-import 'dart:async';
-
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/utils/error_handler.dart';
 import 'package:immich_ui/immich_ui.dart';
 
 class _ActionWidgetScope {
-  final IconData icon;
   final String label;
-  final FutureOr<void> Function() onAction;
+  final VoidCallback onAction;
 
-  const _ActionWidgetScope({required this.icon, required this.label, required this.onAction});
+  const _ActionWidgetScope({required this.label, required this.onAction});
 }
 
 class _ActionWidget extends ConsumerWidget {
@@ -21,21 +19,27 @@ class _ActionWidget extends ConsumerWidget {
 
   const _ActionWidget({required this.action, required this.builder});
 
-  Future<void> _onAction() async {
+  Future<void> _onAction(ActionScope scope) async {
     try {
-      await action.onAction();
+      await action.onAction(scope);
     } catch (error, stackTrace) {
-      handleError(error, stack: stackTrace, description: 'Action failed: ${action.runtimeType}');
+      handleError(scope.context, error, stack: stackTrace, description: 'Action failed: ${action.runtimeType}');
     }
   }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    if (!action.isVisible) {
+    final authUser = ref.watch(currentUserProvider);
+    if (authUser == null) {
       return const SizedBox.shrink();
     }
 
-    return builder(.new(icon: action.icon, label: action.label, onAction: _onAction));
+    final scope = ActionScope(context: context, ref: ref, authUser: authUser);
+    if (!action.isVisible(scope)) {
+      return const SizedBox.shrink();
+    }
+
+    return builder(.new(label: action.label(scope), onAction: () => _onAction(scope)));
   }
 }
 
@@ -48,7 +52,7 @@ class ActionIconButtonWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) => _ActionWidget(
     action: action,
-    builder: (ctx) => ImmichIconButton(icon: ctx.icon, onPressed: ctx.onAction, variant: variant),
+    builder: (ctx) => ImmichIconButton(icon: action.icon, onPressed: ctx.onAction, variant: variant),
   );
 }
 
@@ -61,7 +65,8 @@ class ActionButtonWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) => _ActionWidget(
     action: action,
-    builder: (ctx) => ImmichTextButton(labelText: ctx.label, icon: ctx.icon, onPressed: ctx.onAction, variant: variant),
+    builder: (ctx) =>
+        ImmichTextButton(labelText: ctx.label, icon: action.icon, onPressed: ctx.onAction, variant: variant),
   );
 }
 
@@ -73,7 +78,7 @@ class ActionColumnButtonWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) => _ActionWidget(
     action: action,
-    builder: (ctx) => ImmichColumnButton(icon: ctx.icon, label: ctx.label, onPressed: ctx.onAction),
+    builder: (ctx) => ImmichColumnButton(icon: action.icon, label: ctx.label, onPressed: ctx.onAction),
   );
 }
 
@@ -85,6 +90,6 @@ class ActionMenuItemWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) => _ActionWidget(
     action: action,
-    builder: (ctx) => ImmichMenuItem(icon: ctx.icon, label: ctx.label, onPressed: ctx.onAction),
+    builder: (ctx) => ImmichMenuItem(icon: action.icon, label: ctx.label, onPressed: ctx.onAction),
   );
 }

mobile/lib/presentation/actions/archive.action.dart

@@ -1,47 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';
-import 'package:immich_mobile/utils/asset_filter.dart';
-
-class ArchiveAction extends BaseAction {
-  final List<String> assetIds;
-  final bool archive;
-
-  const ArchiveAction._({
-    required this.assetIds,
-    required this.archive,
-    required super.scope,
-    required super.icon,
-    required super.label,
-    super.isVisible,
-  });
-
-  factory ArchiveAction({required Iterable<BaseAsset> assets, required ActionScope scope}) {
-    final ownedAssets = AssetFilter(assets).owned(scope.authUser.id);
-    final archive = ownedAssets.archived(isArchived: false).isNotEmpty;
-    final assetIds = ownedAssets.archived(isArchived: !archive).map((asset) => asset.id).toList(growable: false);
-
-    return ArchiveAction._(
-      assetIds: assetIds,
-      archive: archive,
-      scope: scope,
-      icon: archive ? Icons.archive_outlined : Icons.unarchive_outlined,
-      label: archive ? scope.context.t.archive : scope.context.t.unarchive,
-      isVisible: assetIds.isNotEmpty,
-    );
-  }
-
-  @override
-  Future<void> onAction() async {
-    final ActionScope(:ref, :context) = scope;
-
-    await ref.read(assetServiceProvider).update(assetIds, visibility: .some(archive ? .archive : .timeline));
-    final message = archive
-        ? context.t.archive_action_prompt(count: assetIds.length)
-        : context.t.unarchive_action_prompt(count: assetIds.length);
-    ref.read(toastRepositoryProvider).success(message);
-  }
-}

mobile/lib/presentation/actions/asset_actions.dart

@@ -1,31 +0,0 @@
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/presentation/actions/archive.action.dart';
-import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';
-import 'package:immich_mobile/presentation/actions/favorite.action.dart';
-import 'package:immich_mobile/presentation/actions/lock.action.dart';
-import 'package:immich_mobile/presentation/actions/stack.action.dart';
-
-class AssetActions {
-  final AssetDebugAction debug;
-  final FavoriteAction favorite;
-  final ArchiveAction archive;
-  final StackAction stack;
-  final LockAction lock;
-
-  const AssetActions({
-    required this.debug,
-    required this.favorite,
-    required this.archive,
-    required this.stack,
-    required this.lock,
-  });
-
-  static AssetActions from(ActionScope scope, List<BaseAsset> assets) => .new(
-    debug: AssetDebugAction(assets: assets, scope: scope),
-    favorite: FavoriteAction(assets: assets, scope: scope),
-    archive: ArchiveAction(assets: assets, scope: scope),
-    stack: StackAction(assets: assets, scope: scope),
-    lock: LockAction(assets: assets, scope: scope),
-  );
-}

mobile/lib/presentation/actions/asset_debug.action.dart

@@ -8,18 +8,20 @@ import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 
-class AssetDebugAction extends BaseAction {
-  final List<BaseAsset> asset;
-
-  AssetDebugAction._({this.asset = const [], required super.scope, super.isVisible})
-    : super(icon: Icons.help_outline_rounded, label: scope.context.t.troubleshoot);
-
-  factory AssetDebugAction({required Iterable<BaseAsset> assets, required ActionScope scope}) => AssetDebugAction._(
-    asset: assets.toList(growable: false),
-    scope: scope,
-    isVisible: scope.ref.watch(settingsProvider.notifier).get(.advancedTroubleshooting) && assets.length == 1,
-  );
+class AssetDebugAction extends AssetAction<BaseAsset> {
+  const AssetDebugAction({required super.assets});
 
   @override
-  Future<void> onAction() async => unawaited(scope.context.pushRoute(AssetTroubleshootRoute(asset: asset.first)));
+  IconData get icon => Icons.help_outline_rounded;
+
+  @override
+  String label(ActionScope scope) => scope.context.t.troubleshoot;
+
+  @override
+  bool isVisible(ActionScope scope) =>
+      assets.length == 1 && scope.ref.watch(settingsProvider.notifier).get(.advancedTroubleshooting);
+
+  @override
+  Future<void> onAction(ActionScope scope) async =>
+      unawaited(scope.context.pushRoute(AssetTroubleshootRoute(asset: assets.first)));
 }

mobile/lib/presentation/actions/cast.action.dart

@@ -1,25 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/providers/cast.provider.dart';
-import 'package:immich_mobile/widgets/asset_viewer/cast_dialog.dart';
-
-class CastAction extends BaseAction {
-  const CastAction._({required super.scope, required super.icon, required super.label});
-
-  factory CastAction({required ActionScope scope}) {
-    final casting = scope.ref.watch(castProvider.select((state) => state.isCasting));
-    return CastAction._(
-      scope: scope,
-      icon: casting ? Icons.cast_connected_rounded : Icons.cast_rounded,
-      label: scope.context.t.cast,
-    );
-  }
-
-  @override
-  Future<void> onAction() async {
-    unawaited(showDialog(context: scope.context, builder: (_) => const CastDialog()));
-  }
-}

mobile/lib/presentation/actions/favorite.action.dart

@@ -3,45 +3,38 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';
-import 'package:immich_mobile/utils/asset_filter.dart';
+import 'package:immich_ui/immich_ui.dart';
 
-class FavoriteAction extends BaseAction {
-  final List<String> assetIds;
-  final bool favorite;
+class FavoriteAction extends AssetAction<RemoteAsset> {
+  final bool shouldFavorite;
 
-  const FavoriteAction._({
-    required this.assetIds,
-    required this.favorite,
-    required super.scope,
-    required super.icon,
-    required super.label,
-    super.isVisible,
-  });
-
-  factory FavoriteAction({required Iterable<BaseAsset> assets, required ActionScope scope}) {
-    final ownedAssets = AssetFilter(assets).owned(scope.authUser.id);
-    final favorite = ownedAssets.favorite(isFavorite: false).isNotEmpty;
-    final assetIds = ownedAssets.favorite(isFavorite: !favorite).map((asset) => asset.id).toList(growable: false);
-
-    return FavoriteAction._(
-      assetIds: assetIds,
-      favorite: favorite,
-      scope: scope,
-      icon: favorite ? Icons.favorite_border_rounded : Icons.favorite_rounded,
-      label: favorite ? scope.context.t.favorite : scope.context.t.unfavorite,
-      isVisible: assetIds.isNotEmpty,
-    );
-  }
+  FavoriteAction({required super.assets}) : shouldFavorite = assets.any((asset) => !asset.isFavorite);
 
   @override
-  Future<void> onAction() async {
-    final ActionScope(:ref, :context) = scope;
+  IconData get icon => shouldFavorite ? Icons.favorite_border_rounded : Icons.favorite_rounded;
 
-    await ref.read(assetServiceProvider).update(assetIds, isFavorite: .some(favorite));
-    final message = favorite
-        ? context.t.favorite_action_prompt(count: assetIds.length)
-        : context.t.unfavorite_action_prompt(count: assetIds.length);
-    ref.read(toastRepositoryProvider).success(message);
+  @override
+  String label(ActionScope scope) => shouldFavorite ? scope.context.t.favorite : scope.context.t.unfavorite;
+
+  @override
+  Iterable<RemoteAsset> filter(ActionScope scope) => assets
+      .where(
+        (asset) => asset is RemoteAsset && asset.ownerId == scope.authUser.id && asset.isFavorite == !shouldFavorite,
+      )
+      .cast<RemoteAsset>();
+
+  @override
+  bool isVisible(ActionScope scope) => filter(scope).isNotEmpty;
+
+  @override
+  Future<void> onAction(ActionScope scope) async {
+    final ActionScope(:ref) = scope;
+    final assets = filter(scope).map((asset) => asset.id).toList(growable: false);
+
+    await ref.read(assetServiceProvider).updateFavorite(assets, shouldFavorite);
+    final message = shouldFavorite
+        ? StaticTranslations.instance.favorite_action_prompt(count: assets.length)
+        : StaticTranslations.instance.unfavorite_action_prompt(count: assets.length);
+    snackbar.success(message);
   }
 }

mobile/lib/presentation/actions/lock.action.dart

@@ -1,47 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';
-import 'package:immich_mobile/utils/asset_filter.dart';
-
-class LockAction extends BaseAction {
-  final List<String> assetIds;
-  final bool lock;
-
-  const LockAction._({
-    required this.assetIds,
-    required this.lock,
-    required super.scope,
-    required super.icon,
-    required super.label,
-    super.isVisible,
-  });
-
-  factory LockAction({required Iterable<BaseAsset> assets, required ActionScope scope}) {
-    final ownedAssets = AssetFilter(assets).owned(scope.authUser.id);
-    final lock = ownedAssets.locked(isLocked: false).isNotEmpty;
-    final assetIds = ownedAssets.locked(isLocked: !lock).map((asset) => asset.id).toList(growable: false);
-
-    return LockAction._(
-      assetIds: assetIds,
-      lock: lock,
-      scope: scope,
-      icon: lock ? Icons.lock_rounded : Icons.lock_open_rounded,
-      label: lock ? scope.context.t.move_to_locked_folder : scope.context.t.remove_from_locked_folder,
-      isVisible: assetIds.isNotEmpty,
-    );
-  }
-
-  @override
-  Future<void> onAction() async {
-    final ActionScope(:ref, :context) = scope;
-
-    await ref.read(assetServiceProvider).update(assetIds, visibility: .some(lock ? .locked : .timeline));
-    final message = lock
-        ? scope.context.t.move_to_lock_folder_action_prompt(count: assetIds.length)
-        : scope.context.t.remove_from_lock_folder_action_prompt(count: assetIds.length);
-    ref.read(toastRepositoryProvider).success(message);
-  }
-}

mobile/lib/presentation/actions/partner.action.dart

@@ -9,10 +9,16 @@ import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
 
 class PartnerAddAction extends BaseAction {
-  PartnerAddAction({required super.scope}) : super(icon: Icons.person_add_rounded, label: scope.context.t.add_partner);
+  const PartnerAddAction();
 
   @override
-  Future<void> onAction() async {
+  IconData get icon => Icons.person_add_rounded;
+
+  @override
+  String label(ActionScope scope) => scope.context.t.add_partner;
+
+  @override
+  Future<void> onAction(ActionScope scope) async {
     final ActionScope(:context, :ref, :authUser) = scope;
     final selected = await showDialog<User>(context: context, builder: (_) => const PartnerSelectionDialog());
     if (selected == null) {
@@ -24,14 +30,19 @@ class PartnerAddAction extends BaseAction {
 }
 
 class PartnerRemoveAction extends BaseAction {
-  PartnerRemoveAction({required super.scope, required this.sharedWithId, required this.partnerName})
-    : super(icon: Icons.person_remove_rounded, label: scope.context.t.remove);
+  const PartnerRemoveAction({required this.sharedWithId, required this.partnerName});
 
   final String sharedWithId;
   final String partnerName;
 
   @override
-  Future<void> onAction() async {
+  IconData get icon => Icons.person_remove_rounded;
+
+  @override
+  String label(ActionScope scope) => scope.context.t.remove;
+
+  @override
+  Future<void> onAction(ActionScope scope) async {
     final ActionScope(:context, :ref, :authUser) = scope;
 
     final confirmed = await showDialog<bool>(

mobile/lib/presentation/actions/restore.action.dart

@@ -1,29 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';
-import 'package:immich_mobile/utils/asset_filter.dart';
-
-class RestoreAction extends BaseAction {
-  final List<String> assetIds;
-
-  RestoreAction._({required super.scope, required this.assetIds, super.isVisible})
-    : super(icon: Icons.history_rounded, label: scope.context.t.restore);
-
-  factory RestoreAction({required Iterable<BaseAsset> assets, required ActionScope scope}) {
-    final assetIds = AssetFilter(
-      assets,
-    ).owned(scope.authUser.id).trashed().map((asset) => asset.id).toList(growable: false);
-
-    return RestoreAction._(assetIds: assetIds, scope: scope, isVisible: assetIds.isNotEmpty);
-  }
-
-  @override
-  Future<void> onAction() async {
-    final ActionScope(:ref, :context) = scope;
-    await ref.read(assetServiceProvider).restoreTrash(assetIds);
-    ref.read(toastRepositoryProvider).success(context.t.assets_restored_count(count: assetIds.length));
-  }
-}

mobile/lib/presentation/actions/slideshow.action.dart

@@ -1,18 +0,0 @@
-import 'dart:async';
-
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-
-class SlideshowAction extends BaseAction {
-  SlideshowAction({required super.scope}) : super(icon: Icons.slideshow, label: scope.context.t.slideshow);
-
-  @override
-  Future<void> onAction() async {
-    final ActionScope(:context, :ref) = scope;
-    unawaited(context.pushRoute(DriftSlideshowRoute(timeline: ref.read(timelineServiceProvider))));
-  }
-}

mobile/lib/presentation/actions/stack.action.dart

@@ -1,56 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';
-import 'package:immich_mobile/utils/asset_filter.dart';
-
-class StackAction extends BaseAction {
-  final List<String> assetIds;
-  final List<String> stackIds;
-  final bool stack;
-
-  const StackAction._({
-    required this.assetIds,
-    required this.stackIds,
-    required this.stack,
-    required super.scope,
-    required super.icon,
-    required super.label,
-    super.isVisible,
-  });
-
-  factory StackAction({required Iterable<BaseAsset> assets, required ActionScope scope}) {
-    final ownedAssets = AssetFilter(assets).owned(scope.authUser.id);
-    // Stack when any owned asset is not yet stacked; otherwise unstack them all.
-    final stack = ownedAssets.stacked(isStacked: false).isNotEmpty;
-    final assetIds = ownedAssets.map((asset) => asset.id).toList(growable: false);
-    final stackIds = ownedAssets.map((asset) => asset.stackId).nonNulls.toList(growable: false);
-
-    return StackAction._(
-      assetIds: assetIds,
-      stackIds: stackIds,
-      stack: stack,
-      scope: scope,
-      icon: stack ? Icons.filter_none_rounded : Icons.layers_clear_outlined,
-      label: stack ? scope.context.t.stack : scope.context.t.unstack,
-      isVisible: stack ? assetIds.length > 1 : stackIds.isNotEmpty,
-    );
-  }
-
-  @override
-  Future<void> onAction() async {
-    final ActionScope(:ref, :context) = scope;
-    if (stack) {
-      await ref.read(assetServiceProvider).stack(scope.authUser.id, assetIds);
-    } else {
-      await ref.read(assetServiceProvider).unstack(stackIds);
-    }
-
-    final message = stack
-        ? context.t.stacked_assets_count(count: assetIds.length)
-        : context.t.unstacked_assets_count(count: assetIds.length);
-    ref.read(toastRepositoryProvider).success(message);
-  }
-}

mobile/lib/presentation/actions/timeline.action.dart

@@ -1,15 +1,24 @@
+import 'package:flutter/material.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 
 class TimelineAction extends BaseAction {
   final BaseAction action;
 
-  TimelineAction({required this.action})
-    : super(scope: action.scope, icon: action.icon, label: action.label, isVisible: action.isVisible);
+  const TimelineAction({required this.action});
 
   @override
-  Future<void> onAction() async {
-    await action.onAction();
+  IconData get icon => action.icon;
+
+  @override
+  String label(ActionScope scope) => action.label(scope);
+
+  @override
+  bool isVisible(ActionScope scope) => action.isVisible(scope);
+
+  @override
+  Future<void> onAction(ActionScope scope) async {
+    await action.onAction(scope);
     scope.ref.read(multiSelectProvider.notifier).reset();
   }
 }

mobile/lib/presentation/widgets/action_buttons/add_action_button.widget.dart

@@ -1,25 +1,26 @@
 import 'package:easy_localization/easy_localization.dart';
 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/album/album.model.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/archive.action.dart';
-import 'package:immich_mobile/presentation/actions/lock.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
-import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/unarchive_action_button.widget.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
+import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
-import 'package:immich_ui/immich_ui.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 
-enum AddToMenuItem { album }
+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/constants/enums.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
+
+enum AddToMenuItem { album, archive, unarchive, lockedFolder }
 
 class AddActionButton extends ConsumerStatefulWidget {
   const AddActionButton({super.key, this.originalTheme});
@@ -36,6 +37,15 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
       case AddToMenuItem.album:
         _openAlbumSelector();
         break;
+      case AddToMenuItem.archive:
+        performArchiveAction(context, ref, source: ActionSource.viewer);
+        break;
+      case AddToMenuItem.unarchive:
+        performUnArchiveAction(context, ref, source: ActionSource.viewer);
+        break;
+      case AddToMenuItem.lockedFolder:
+        performMoveToLockFolderAction(context, ref, source: ActionSource.viewer);
+        break;
     }
   }
 
@@ -47,7 +57,11 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
 
     final user = ref.read(currentUserProvider);
     final isOwner = asset is RemoteAsset && asset.ownerId == user?.id;
-    final scope = ActionScope.from(context, ref);
+    final isInLockedView = ref.watch(inLockedViewProvider);
+    final isArchived = asset is RemoteAsset && asset.visibility == AssetVisibility.archive;
+    final hasRemote = asset is RemoteAsset;
+    final showArchive = isOwner && !isInLockedView && hasRemote && !isArchived;
+    final showUnarchive = isOwner && !isInLockedView && hasRemote && isArchived;
 
     return [
       Padding(
@@ -67,11 +81,25 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
           padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
           child: Text("move_to".tr(), style: context.textTheme.labelMedium),
         ),
-        ActionMenuItemWidget(
-          action: ArchiveAction(assets: [asset], scope: scope),
-        ),
-        ActionMenuItemWidget(
-          action: LockAction(assets: [asset], scope: scope),
+        if (showArchive)
+          BaseActionButton(
+            iconData: Icons.archive_outlined,
+            label: "archive".tr(),
+            menuItem: true,
+            onPressed: () => _handleMenuSelection(AddToMenuItem.archive),
+          ),
+        if (showUnarchive)
+          BaseActionButton(
+            iconData: Icons.unarchive_outlined,
+            label: "unarchive".tr(),
+            menuItem: true,
+            onPressed: () => _handleMenuSelection(AddToMenuItem.unarchive),
+          ),
+        BaseActionButton(
+          iconData: Icons.lock_outline,
+          label: "locked_folder".tr(),
+          menuItem: true,
+          onPressed: () => _handleMenuSelection(AddToMenuItem.lockedFolder),
         ),
       ],
     ];
@@ -156,7 +184,7 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
 
     final themeData = widget.originalTheme ?? context.themeData;
 
-    return ImmichMenu(
+    return MenuAnchor(
       consumeOutsideTap: true,
       style: MenuStyle(
         backgroundColor: WidgetStatePropertyAll(themeData.scaffoldBackgroundColor),
@@ -167,7 +195,7 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
         ),
         padding: const WidgetStatePropertyAll(EdgeInsets.symmetric(vertical: 6)),
       ),
-      children: widget.originalTheme != null
+      menuChildren: widget.originalTheme != null
           ? [
               Theme(
                 data: widget.originalTheme!,

mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart

@@ -0,0 +1,59 @@
+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';
+
+// used to allow performing archive action from different sources  (without duplicating code)
+Future<void> performArchiveAction(BuildContext context, WidgetRef ref, {required ActionSource source}) async {
+  if (!context.mounted) {
+    return;
+  }
+
+  if (source == ActionSource.viewer) {
+    EventStream.shared.emit(const ViewerReloadAssetEvent());
+  }
+
+  final result = await ref.read(actionProvider.notifier).archive(source);
+  ref.read(multiSelectProvider.notifier).reset();
+
+  final successMessage = 'archive_action_prompt'.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,
+    );
+  }
+}
+
+class ArchiveActionButton extends ConsumerWidget {
+  final ActionSource source;
+  final bool iconOnly;
+  final bool menuItem;
+
+  const ArchiveActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+
+  Future<void> _onTap(BuildContext context, WidgetRef ref) async {
+    await performArchiveAction(context, ref, source: source);
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.archive_outlined,
+      label: "to_archive".t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}

mobile/lib/presentation/widgets/action_buttons/cast_action_button.widget.dart

@@ -0,0 +1,30 @@
+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/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/cast.provider.dart';
+import 'package:immich_mobile/widgets/asset_viewer/cast_dialog.dart';
+
+class CastActionButton extends ConsumerWidget {
+  const CastActionButton({super.key, this.iconOnly = false, this.menuItem = false});
+
+  final bool iconOnly;
+  final bool menuItem;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isCasting = ref.watch(castProvider.select((c) => c.isCasting));
+
+    return BaseActionButton(
+      iconData: isCasting ? Icons.cast_connected_rounded : Icons.cast_rounded,
+      iconColor: isCasting ? context.primaryColor : null, // null = default color
+      label: "cast".t(context: context),
+      onPressed: () {
+        showDialog(context: context, builder: (context) => const CastDialog());
+      },
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+    );
+  }
+}

mobile/lib/presentation/widgets/action_buttons/favorite_action_button.widget.dart

@@ -0,0 +1,61 @@
+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/asset/base_asset.model.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/asset_viewer/asset_viewer.provider.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 FavoriteActionButton extends ConsumerWidget {
+  final ActionSource source;
+  final bool iconOnly;
+  final bool menuItem;
+
+  const FavoriteActionButton({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).favorite(source);
+
+    if (source == ActionSource.viewer) {
+      if (result.success) {
+        final currentAsset = ref.read(assetViewerProvider).currentAsset;
+        if (currentAsset is RemoteAsset && !currentAsset.isFavorite) {
+          ref.read(assetViewerProvider.notifier).setAsset(currentAsset.copyWith(isFavorite: true));
+        }
+      }
+      return;
+    }
+
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'favorite_action_prompt'.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.favorite_border_rounded,
+      label: "favorite".t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}

mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart

@@ -0,0 +1,63 @@
+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';
+
+// Reusable helper: move to locked folder from any source (e.g called from menu)
+Future<void> performMoveToLockFolderAction(BuildContext context, WidgetRef ref, {required ActionSource source}) async {
+  if (!context.mounted) {
+    return;
+  }
+
+  if (source == ActionSource.viewer) {
+    EventStream.shared.emit(const ViewerReloadAssetEvent());
+  }
+
+  final result = await ref.read(actionProvider.notifier).moveToLockFolder(source);
+  ref.read(multiSelectProvider.notifier).reset();
+
+  final successMessage = 'move_to_lock_folder_action_prompt'.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,
+    );
+  }
+}
+
+class MoveToLockFolderActionButton extends ConsumerWidget {
+  final ActionSource source;
+  final bool iconOnly;
+  final bool menuItem;
+
+  const MoveToLockFolderActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+
+  Future<void> _onTap(BuildContext context, WidgetRef ref) async {
+    await performMoveToLockFolderAction(context, ref, source: source);
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      maxWidth: 115.0,
+      iconData: Icons.lock_outline_rounded,
+      label: "move_to_locked_folder".t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}

mobile/lib/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart

@@ -0,0 +1,57 @@
+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/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 RemoveFromLockFolderActionButton extends ConsumerWidget {
+  final ActionSource source;
+  final bool iconOnly;
+  final bool menuItem;
+
+  const RemoveFromLockFolderActionButton({
+    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).removeFromLockFolder(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'remove_from_lock_folder_action_prompt'.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(
+      maxWidth: 100.0,
+      iconData: Icons.lock_open_rounded,
+      label: "remove_from_locked_folder".t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}

mobile/lib/presentation/widgets/action_buttons/restore_action_button.widget.dart

@@ -0,0 +1,55 @@
+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,
+    );
+  }
+}

mobile/lib/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart

@@ -0,0 +1,43 @@
+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/extensions/translate_extensions.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 RestoreTrashActionButton extends ConsumerWidget {
+  final ActionSource source;
+
+  const RestoreTrashActionButton({super.key, required this.source});
+
+  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();
+
+    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 TextButton.icon(
+      icon: const Icon(Icons.history_rounded),
+      label: Text('restore'.t(), style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}

mobile/lib/presentation/widgets/action_buttons/slideshow_action_button.widget.dart

@@ -0,0 +1,34 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.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/timeline.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+
+class SlideshowActionButton extends ConsumerWidget {
+  final bool iconOnly;
+  final bool menuItem;
+
+  const SlideshowActionButton({super.key, this.iconOnly = false, this.menuItem = false});
+
+  void _onTap(BuildContext context, WidgetRef ref) {
+    if (!context.mounted) {
+      return;
+    }
+
+    context.pushRoute(DriftSlideshowRoute(timeline: ref.read(timelineServiceProvider)));
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.slideshow,
+      label: "slideshow".t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context, ref),
+      maxWidth: 100,
+    );
+  }
+}

mobile/lib/presentation/widgets/action_buttons/stack_action_button.widget.dart

@@ -0,0 +1,50 @@
+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/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/providers/user.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+
+class StackActionButton extends ConsumerWidget {
+  final ActionSource source;
+
+  const StackActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final user = ref.watch(currentUserProvider);
+    if (user == null) {
+      throw Exception('User must be logged in to access stack action');
+    }
+
+    final result = await ref.read(actionProvider.notifier).stack(user.id, source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'stack_action_prompt'.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.filter_none_rounded,
+      label: "stack".t(context: context),
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}

mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart

@@ -0,0 +1,61 @@
+// dart
+// File: `lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart`
+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/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';
+import 'package:immich_mobile/domain/models/events.model.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
+
+// used to allow performing unarchive action from different sources (without duplicating code)
+Future<void> performUnArchiveAction(BuildContext context, WidgetRef ref, {required ActionSource source}) async {
+  if (!context.mounted) {
+    return;
+  }
+
+  if (source == ActionSource.viewer) {
+    EventStream.shared.emit(const ViewerReloadAssetEvent());
+  }
+
+  final result = await ref.read(actionProvider.notifier).unArchive(source);
+  ref.read(multiSelectProvider.notifier).reset();
+
+  final successMessage = 'unarchive_action_prompt'.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,
+    );
+  }
+}
+
+class UnArchiveActionButton extends ConsumerWidget {
+  final ActionSource source;
+  final bool iconOnly;
+  final bool menuItem;
+
+  const UnArchiveActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+
+  Future<void> _onTap(BuildContext context, WidgetRef ref) async {
+    await performUnArchiveAction(context, ref, source: source);
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.unarchive_outlined,
+      label: "unarchive".t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}

mobile/lib/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart

@@ -0,0 +1,61 @@
+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/asset/base_asset.model.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/asset_viewer/asset_viewer.provider.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 UnFavoriteActionButton extends ConsumerWidget {
+  final ActionSource source;
+  final bool iconOnly;
+  final bool menuItem;
+
+  const UnFavoriteActionButton({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).unFavorite(source);
+
+    if (source == ActionSource.viewer) {
+      if (result.success) {
+        final currentAsset = ref.read(assetViewerProvider).currentAsset;
+        if (currentAsset is RemoteAsset && currentAsset.isFavorite) {
+          ref.read(assetViewerProvider.notifier).setAsset(currentAsset.copyWith(isFavorite: false));
+        }
+      }
+      return;
+    }
+
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'unfavorite_action_prompt'.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.favorite_rounded,
+      label: "unfavorite".t(context: context),
+      onPressed: () => _onTap(context, ref),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+    );
+  }
+}

mobile/lib/presentation/widgets/action_buttons/unstack_action_button.widget.dart

@@ -0,0 +1,48 @@
+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/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 UnStackActionButton extends ConsumerWidget {
+  final ActionSource source;
+  final bool iconOnly;
+  final bool menuItem;
+
+  const UnStackActionButton({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).unStack(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'unstack_action_prompt'.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.layers_clear_outlined,
+      label: "unstack".t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}

mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart

@@ -4,14 +4,12 @@ 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/actions/action.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/restore.action.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/presentation/widgets/asset_viewer/ocr_toggle_button.widget.dart';
@@ -44,12 +42,11 @@ class ViewerBottomBar extends ConsumerWidget {
 
     final originalTheme = context.themeData;
 
-    final assets = [asset];
-    final scope = ActionScope.from(context, ref);
-    final restore = RestoreAction(assets: assets, scope: scope);
     final actions = <Widget>[
-      if (restore.isVisible) ActionColumnButtonWidget(action: restore),
-      const ShareActionButton(source: ActionSource.viewer),
+      if (isInTrash && isOwner && asset.hasRemote)
+        const RestoreActionButton(source: ActionSource.viewer)
+      else
+        const ShareActionButton(source: ActionSource.viewer),
 
       if (!isInLockedView) ...[
         if (!isInTrash) ...[

mobile/lib/presentation/widgets/asset_viewer/viewer_kebab_menu.widget.dart

@@ -50,7 +50,7 @@ class ViewerKebabMenu extends ConsumerWidget {
       timelineOrigin: timelineOrigin,
     );
 
-    final menuChildren = ActionButtonBuilder.buildViewerKebabMenu(actionContext, context, ref);
+    final menuChildren = ActionButtonBuilder.buildViewerKebabMenu(actionContext, context);
 
     return ImmichMenu(
       consumeOutsideTap: true,

mobile/lib/presentation/widgets/asset_viewer/viewer_top_app_bar.widget.dart

@@ -4,7 +4,6 @@ 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/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart';
@@ -45,7 +44,6 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
 
     final originalTheme = context.themeData;
     final assetForAction = [asset];
-    final scope = ActionScope.from(context, ref);
 
     final actions = <Widget>[
       if (asset.isMotionPhoto) const MotionPhotoActionButton(iconOnly: true),
@@ -63,9 +61,7 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
           },
         ),
 
-      ActionIconButtonWidget(
-        action: FavoriteAction(assets: assetForAction, scope: scope),
-      ),
+      ActionIconButtonWidget(action: FavoriteAction(assets: assetForAction)),
 
       ViewerKebabMenu(originalTheme: originalTheme),
     ];

mobile/lib/presentation/widgets/bottom_sheet/archive_bottom_sheet.widget.dart

@@ -3,18 +3,21 @@ 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/album/album.model.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/asset_actions.dart';
+import 'package:immich_mobile/presentation/actions/favorite.action.dart';
 import 'package:immich_mobile/presentation/actions/timeline.action.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/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_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/share_link_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/unarchive_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
@@ -73,8 +76,8 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {
       return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);
     }
 
-    final scope = ActionScope.from(context, ref);
-    final actions = AssetActions.from(scope, multiselect.selectedAssets.toList(growable: false));
+    final assets = multiselect.selectedAssets.toList(growable: false);
+    final actions = [FavoriteAction(assets: assets)];
 
     return BaseBottomSheet(
       controller: sheetController,
@@ -85,18 +88,17 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {
         const ShareActionButton(source: ActionSource.timeline),
         if (multiselect.hasRemote) ...[
           const ShareLinkActionButton(source: ActionSource.timeline),
-          ...[
-            actions.favorite,
-            actions.archive,
-            actions.stack,
-            actions.lock,
-          ].map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
+          const UnArchiveActionButton(source: ActionSource.timeline),
+          ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
           if (multiselect.onlyRemote) const DownloadActionButton(source: ActionSource.timeline),
           isTrashEnable
               ? const TrashActionButton(source: ActionSource.timeline)
               : const DeletePermanentActionButton(source: ActionSource.timeline),
           const EditDateTimeActionButton(source: ActionSource.timeline),
           const EditLocationActionButton(source: ActionSource.timeline),
+          const MoveToLockFolderActionButton(source: ActionSource.timeline),
+          if (multiselect.selectedAssets.length > 1) const StackActionButton(source: ActionSource.timeline),
+          if (multiselect.hasStacked) const UnStackActionButton(source: ActionSource.timeline),
         ],
         if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),
       ],

mobile/lib/presentation/widgets/bottom_sheet/favorite_bottom_sheet.widget.dart

@@ -4,18 +4,21 @@ 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/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/asset_actions.dart';
+import 'package:immich_mobile/presentation/actions/favorite.action.dart';
 import 'package:immich_mobile/presentation/actions/timeline.action.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/archive_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/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_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/share_link_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
@@ -64,8 +67,8 @@ class FavoriteBottomSheet extends ConsumerWidget {
       ref.read(multiSelectProvider.notifier).reset();
     }
 
-    final scope = ActionScope.from(context, ref);
-    final actions = AssetActions.from(scope, multiselect.selectedAssets.toList(growable: false));
+    final assets = multiselect.selectedAssets.toList(growable: false);
+    final actions = [FavoriteAction(assets: assets)];
 
     return BaseBottomSheet(
       initialChildSize: 0.4,
@@ -75,18 +78,17 @@ class FavoriteBottomSheet extends ConsumerWidget {
         const ShareActionButton(source: ActionSource.timeline),
         if (multiselect.hasRemote) ...[
           const ShareLinkActionButton(source: ActionSource.timeline),
-          ...[
-            actions.favorite,
-            actions.archive,
-            actions.stack,
-            actions.lock,
-          ].map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
+          ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
+          const ArchiveActionButton(source: ActionSource.timeline),
           if (multiselect.onlyRemote) const DownloadActionButton(source: ActionSource.timeline),
           isTrashEnable
               ? const TrashActionButton(source: ActionSource.timeline)
               : const DeletePermanentActionButton(source: ActionSource.timeline),
           const EditDateTimeActionButton(source: ActionSource.timeline),
           const EditLocationActionButton(source: ActionSource.timeline),
+          const MoveToLockFolderActionButton(source: ActionSource.timeline),
+          if (multiselect.selectedAssets.length > 1) const StackActionButton(source: ActionSource.timeline),
+          if (multiselect.hasStacked) const UnStackActionButton(source: ActionSource.timeline),
         ],
         if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),
       ],

mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart

@@ -3,10 +3,10 @@ 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/album/album.model.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/asset_actions.dart';
+import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';
 import 'package:immich_mobile/presentation/actions/timeline.action.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/bulk_tag_assets_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';
@@ -14,9 +14,13 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permane
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_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/share_link_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
@@ -79,8 +83,8 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
       return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);
     }
 
-    final scope = ActionScope.from(context, ref);
-    final actions = AssetActions.from(scope, multiselect.selectedAssets.toList(growable: false));
+    final assets = multiselect.selectedAssets.toList(growable: false);
+    final actions = [AssetDebugAction(assets: assets)];
 
     return BaseBottomSheet(
       controller: sheetController,
@@ -89,13 +93,7 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
       maxChildSize: 0.85,
       shouldCloseOnMinExtent: false,
       actions: [
-        ...[
-          actions.debug,
-          actions.favorite,
-          actions.archive,
-          actions.stack,
-          actions.lock,
-        ].map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
+        ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
         const ShareActionButton(source: ActionSource.timeline),
         if (multiselect.hasRemote) ...[
           const ShareLinkActionButton(source: ActionSource.timeline),
@@ -103,9 +101,14 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
           isTrashEnable
               ? const TrashActionButton(source: ActionSource.timeline)
               : const DeletePermanentActionButton(source: ActionSource.timeline),
+          const FavoriteActionButton(source: ActionSource.timeline),
+          const ArchiveActionButton(source: ActionSource.timeline),
           if (tagsEnabled) const BulkTagAssetsActionButton(source: ActionSource.timeline),
           const EditDateTimeActionButton(source: ActionSource.timeline),
           const EditLocationActionButton(source: ActionSource.timeline),
+          const MoveToLockFolderActionButton(source: ActionSource.timeline),
+          if (multiselect.selectedAssets.length > 1) const StackActionButton(source: ActionSource.timeline),
+          if (multiselect.hasStacked) const UnStackActionButton(source: ActionSource.timeline),
           if (multiselect.onlyLocal || multiselect.hasMerged) const DeleteActionButton(source: ActionSource.timeline),
         ],
         if (multiselect.onlyLocal || multiselect.hasMerged)

mobile/lib/presentation/widgets/bottom_sheet/locked_folder_bottom_sheet.widget.dart

@@ -1,36 +1,26 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/lock.action.dart';
-import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_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/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 
 class LockedFolderBottomSheet extends ConsumerWidget {
   const LockedFolderBottomSheet({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final multiselect = ref.watch(multiSelectProvider);
-    final scope = ActionScope.from(context, ref);
-    return BaseBottomSheet(
+    return const BaseBottomSheet(
       initialChildSize: 0.25,
       maxChildSize: 0.4,
       shouldCloseOnMinExtent: false,
       actions: [
-        const ShareActionButton(source: ActionSource.timeline),
-        const DownloadActionButton(source: ActionSource.timeline),
-        const DeletePermanentActionButton(source: ActionSource.timeline),
-        ActionColumnButtonWidget(
-          action: TimelineAction(
-            action: LockAction(assets: multiselect.selectedAssets.toList(growable: false), scope: scope),
-          ),
-        ),
+        ShareActionButton(source: ActionSource.timeline),
+        DownloadActionButton(source: ActionSource.timeline),
+        DeletePermanentActionButton(source: ActionSource.timeline),
+        RemoveFromLockFolderActionButton(source: ActionSource.timeline),
       ],
     );
   }

mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart

@@ -3,20 +3,23 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/asset_actions.dart';
+import 'package:immich_mobile/presentation/actions/favorite.action.dart';
 import 'package:immich_mobile/presentation/actions/timeline.action.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/archive_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/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_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/set_album_cover.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
@@ -82,8 +85,8 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
       return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);
     }
 
-    final scope = ActionScope.from(context, ref);
-    final actions = AssetActions.from(scope, multiselect.selectedAssets.toList(growable: false));
+    final assets = multiselect.selectedAssets.toList(growable: false);
+    final actions = [FavoriteAction(assets: assets)];
 
     return BaseBottomSheet(
       controller: sheetController,
@@ -97,12 +100,8 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
           const ShareLinkActionButton(source: ActionSource.timeline),
 
           if (ownsAlbum) ...[
-            ...[
-              actions.favorite,
-              actions.archive,
-              actions.stack,
-              actions.lock,
-            ].map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
+            const ArchiveActionButton(source: ActionSource.timeline),
+            ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
           ],
           const DownloadActionButton(source: ActionSource.timeline),
           if (ownsAlbum) ...[
@@ -111,6 +110,9 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
                 : const DeletePermanentActionButton(source: ActionSource.timeline),
             const EditDateTimeActionButton(source: ActionSource.timeline),
             const EditLocationActionButton(source: ActionSource.timeline),
+            const MoveToLockFolderActionButton(source: ActionSource.timeline),
+            if (multiselect.selectedAssets.length > 1) const StackActionButton(source: ActionSource.timeline),
+            if (multiselect.hasStacked) const UnStackActionButton(source: ActionSource.timeline),
           ],
         ],
         if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),

mobile/lib/presentation/widgets/bottom_sheet/trash_bottom_sheet.widget.dart

@@ -2,37 +2,26 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/restore.action.dart';
-import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart';
-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart';
 
 class TrashBottomBar extends ConsumerWidget {
   const TrashBottomBar({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final assets = ref.watch(multiSelectProvider.select((s) => s.selectedAssets)).toList(growable: false);
-    final scope = ActionScope.from(context, ref);
-
     return Align(
       alignment: Alignment.bottomCenter,
       child: Container(
         color: context.themeData.canvasColor,
         padding: const EdgeInsets.symmetric(vertical: 8),
-        child: SafeArea(
+        child: const SafeArea(
           top: false,
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceEvenly,
             children: [
-              const DeleteTrashActionButton(source: ActionSource.timeline),
-              ActionColumnButtonWidget(
-                action: TimelineAction(
-                  action: RestoreAction(assets: assets, scope: scope),
-                ),
-              ),
+              DeleteTrashActionButton(source: ActionSource.timeline),
+              RestoreTrashActionButton(source: ActionSource.timeline),
             ],
           ),
         ),

mobile/lib/presentation/widgets/timeline/drag_selection_controller.dart

@@ -0,0 +1,175 @@
+import 'dart:collection';
+
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+
+// Tracks the [anchor..current] range selected by a drag. The in-buffer part of
+// each tick is selected synchronously so it follows the finger without racing;
+// the rare beyond-buffer part is read async (applied only if still in range) and
+// [end] reads whatever is still missing so the final range always lands.
+class DragSelectionController {
+  DragSelectionController({required this.getAssetSafe, required this.getAssetsRange, required this.onChange});
+
+  final BaseAsset? Function(int index) getAssetSafe;
+  final Future<List<BaseAsset>> Function(int index, int count) getAssetsRange;
+  final void Function(Set<BaseAsset> select, Set<BaseAsset> deselect) onChange;
+
+  final HashMap<int, BaseAsset> _selected = HashMap();
+  // Indices the buffer didn't hold yet (the edge outran the async buffer-load on a
+  // fast scroll); read in by _extendPending and guaranteed by end().
+  final Set<int> _pending = {};
+  int? _anchor;
+  int? _lo;
+  int? _hi;
+  bool _disposed = false;
+
+  // Call before starting a new drag so a previous drag's in-flight read can't
+  // leak into the new selection.
+  void dispose() => _disposed = true;
+
+  void _emit(Set<BaseAsset> select, Set<BaseAsset> deselect) {
+    if (_disposed) {
+      return;
+    }
+    onChange(select, deselect);
+  }
+
+  void start(int anchor) {
+    _selected.clear();
+    _pending.clear();
+    _anchor = anchor;
+    _lo = anchor;
+    _hi = anchor;
+    _select(anchor);
+    _extendPending();
+  }
+
+  void enter(int current) {
+    final anchor = _anchor;
+    if (anchor == null || _lo == null || _hi == null) {
+      return;
+    }
+    final ns = current < anchor ? current : anchor;
+    final ne = current < anchor ? anchor : current;
+    final ps = _lo!;
+    final pe = _hi!;
+    if (ns == ps && ne == pe) {
+      return;
+    }
+
+    final toSelect = <BaseAsset>{};
+    final toDeselect = <BaseAsset>{};
+
+    _forEach(ps, ns - 1, (k) => _removeIndex(k, toDeselect));
+    _forEach(ne + 1, pe, (k) => _removeIndex(k, toDeselect));
+    _forEach(ns, ps - 1, (k) => _addIndex(k, toSelect));
+    _forEach(pe + 1, ne, (k) => _addIndex(k, toSelect));
+
+    _lo = ns;
+    _hi = ne;
+
+    if (toSelect.isNotEmpty || toDeselect.isNotEmpty) {
+      _emit(toSelect, toDeselect);
+    }
+    _extendPending();
+  }
+
+  Future<void> end() async {
+    final lo = _lo;
+    final hi = _hi;
+    if (lo == null || hi == null) {
+      return;
+    }
+    final missing = <int>[];
+    for (var k = lo; k <= hi; k++) {
+      if (!_selected.containsKey(k)) {
+        missing.add(k);
+      }
+    }
+    if (missing.isEmpty) {
+      return;
+    }
+    final from = missing.first;
+    final assets = await getAssetsRange(from, missing.last - from + 1);
+    final missingSet = missing.toSet();
+    final toSelect = <BaseAsset>{};
+    for (var i = 0; i < assets.length; i++) {
+      final idx = from + i;
+      if (missingSet.contains(idx) && !_selected.containsKey(idx)) {
+        _selected[idx] = assets[i];
+        _pending.remove(idx);
+        toSelect.add(assets[i]);
+      }
+    }
+    if (toSelect.isNotEmpty) {
+      _emit(toSelect, const {});
+    }
+  }
+
+  void _select(int index) {
+    final asset = getAssetSafe(index);
+    if (asset != null) {
+      _selected[index] = asset;
+      _pending.remove(index);
+      _emit({asset}, const {});
+    } else {
+      _pending.add(index);
+    }
+  }
+
+  void _addIndex(int index, Set<BaseAsset> toSelect) {
+    if (_selected.containsKey(index)) {
+      return;
+    }
+    final asset = getAssetSafe(index);
+    if (asset != null) {
+      _selected[index] = asset;
+      _pending.remove(index);
+      toSelect.add(asset);
+    } else {
+      _pending.add(index);
+    }
+  }
+
+  void _removeIndex(int index, Set<BaseAsset> toDeselect) {
+    _pending.remove(index);
+    final asset = _selected.remove(index);
+    if (asset != null) {
+      toDeselect.add(asset);
+    }
+  }
+
+  Future<void> _extendPending() async {
+    if (_pending.isEmpty) {
+      return;
+    }
+    var from = _pending.first;
+    var to = _pending.first;
+    for (final k in _pending) {
+      if (k < from) {
+        from = k;
+      }
+      if (k > to) {
+        to = k;
+      }
+    }
+    final assets = await getAssetsRange(from, to - from + 1);
+    final toSelect = <BaseAsset>{};
+    for (var i = 0; i < assets.length; i++) {
+      final idx = from + i;
+      if (_pending.contains(idx) && _lo != null && idx >= _lo! && idx <= _hi!) {
+        _selected[idx] = assets[i];
+        toSelect.add(assets[i]);
+      }
+    }
+    _pending.removeWhere((idx) => _selected.containsKey(idx));
+    if (toSelect.isNotEmpty) {
+      _emit(toSelect, const {});
+    }
+  }
+
+  void _forEach(int lo, int hi, void Function(int) fn) {
+    for (var k = lo; k <= hi; k++) {
+      fn(k);
+    }
+  }
+}

mobile/lib/presentation/widgets/timeline/timeline.widget.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:collection';
 import 'dart:math' as math;
 
 import 'package:collection/collection.dart';
@@ -8,7 +7,6 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.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/events.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
@@ -20,6 +18,7 @@ import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/scrubber.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
+import 'package:immich_mobile/presentation/widgets/timeline/drag_selection_controller.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline_drag_region.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
@@ -29,6 +28,27 @@ import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
 import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
 import 'package:immich_mobile/widgets/common/selection_sliver_app_bar.dart';
 
+// First asset index of the row shown at [offset]. Pure for testing.
+@visibleForTesting
+int? assetIndexAtOffset(
+  List<Segment> segments,
+  double offset, {
+  required int columnCount,
+  required double maxScrollExtent,
+}) {
+  final clamped = offset.clamp(0.0, maxScrollExtent);
+  final segment = segments.findByOffset(clamped) ?? segments.lastOrNull;
+  if (segment == null) {
+    return null;
+  }
+  final rowIndex = segment.getMinChildIndexForScrollOffset(clamped);
+  if (rowIndex > segment.firstIndex) {
+    final rowIndexInSegment = rowIndex - (segment.firstIndex + 1);
+    return segment.firstAssetIndex + rowIndexInSegment * columnCount;
+  }
+  return segment.firstAssetIndex;
+}
+
 class Timeline extends StatelessWidget {
   const Timeline({
     super.key,
@@ -140,9 +160,10 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
   StreamSubscription? _eventSubscription;
 
   // Drag selection state
+  static const _autoScrollStep = 175.0;
+  static const _autoScrollDuration = Duration(milliseconds: 125);
   bool _dragging = false;
-  TimelineAssetIndex? _dragAnchorIndex;
-  final Set<BaseAsset> _draggedAssets = HashSet();
+  DragSelectionController? _dragController;
   ScrollPhysics? _scrollPhysics;
 
   int _perRow = 4;
@@ -226,26 +247,18 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
     EventStream.shared.emit(MultiSelectToggleEvent(isEnabled));
   }
 
-  int? _getCurrentAssetIndex(List<Segment> segments) {
-    final currentOffset = _scrollController.offset.clamp(0.0, _scrollController.position.maxScrollExtent);
-    final segment = segments.findByOffset(currentOffset) ?? segments.lastOrNull;
-    int? targetAssetIndex;
-    if (segment != null) {
-      final rowIndex = segment.getMinChildIndexForScrollOffset(currentOffset);
-      if (rowIndex > segment.firstIndex) {
-        final rowIndexInSegment = rowIndex - (segment.firstIndex + 1);
-        final assetsPerRow = ref.read(timelineArgsProvider).columnCount;
-        final assetIndexInSegment = rowIndexInSegment * assetsPerRow;
-        targetAssetIndex = segment.firstAssetIndex + assetIndexInSegment;
-      } else {
-        targetAssetIndex = segment.firstAssetIndex;
-      }
-    }
-    return targetAssetIndex;
-  }
+  int? _getCurrentAssetIndex(List<Segment> segments) => _assetIndexAtOffset(segments, _scrollController.offset);
+
+  int? _assetIndexAtOffset(List<Segment> segments, double offset) => assetIndexAtOffset(
+    segments,
+    offset,
+    columnCount: ref.read(timelineArgsProvider).columnCount,
+    maxScrollExtent: _scrollController.position.maxScrollExtent,
+  );
 
   @override
   void dispose() {
+    _dragController?.dispose();
     _scrollController.dispose();
     _eventSubscription?.cancel();
     super.dispose();
@@ -295,9 +308,21 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
 
   // Drag selection methods
   void _setDragStartIndex(TimelineAssetIndex index) {
+    // Stop the old drag's controller so its in-flight read can't leak into this one.
+    _dragController?.dispose();
+    final timelineService = ref.read(timelineServiceProvider);
+    _dragController = DragSelectionController(
+      getAssetSafe: timelineService.getAssetSafe,
+      getAssetsRange: timelineService.getAssetsRange,
+      onChange: (select, deselect) {
+        if (!mounted) {
+          return;
+        }
+        ref.read(multiSelectProvider.notifier).selectRange(select, deselect);
+      },
+    )..start(index.assetIndex);
     setState(() {
       _scrollPhysics = const ClampingScrollPhysics();
-      _dragAnchorIndex = index;
       _dragging = true;
     });
   }
@@ -313,8 +338,12 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
     });
     setState(() {
       _dragging = false;
-      _draggedAssets.clear();
     });
+    // Apply the full final range even if a read is still in flight on lift.
+    final finishing = _dragController?.end();
+    if (finishing != null) {
+      unawaited(finishing);
+    }
     final timelineState = ref.read(timelineStateProvider.notifier);
     Future.delayed(const Duration(milliseconds: 300), () {
       timelineState.setScrolling(false);
@@ -322,42 +351,33 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
   }
 
   void _dragScroll(ScrollDirection direction) {
-    _scrollController.animateTo(
-      _scrollController.offset + (direction == ScrollDirection.forward ? 175 : -175),
-      duration: const Duration(milliseconds: 125),
-      curve: Curves.easeOut,
-    );
+    final position = _scrollController.position;
+    final step = direction == ScrollDirection.forward ? _autoScrollStep : -_autoScrollStep;
+    final target = (_scrollController.offset + step).clamp(0.0, position.maxScrollExtent);
+    _scrollController.animateTo(target, duration: _autoScrollDuration, curve: Curves.easeOut);
+
+    // A held finger emits no move events, so extend the selection to the asset
+    // at the leading edge of the scroll instead.
+    final controller = _dragController;
+    if (controller == null) {
+      return;
+    }
+    final segments = ref.read(timelineSegmentProvider).valueOrNull;
+    if (segments == null) {
+      return;
+    }
+    final edgeOffset = direction == ScrollDirection.forward ? target + position.viewportDimension : target;
+    final edgeIndex = _assetIndexAtOffset(segments, edgeOffset);
+    if (edgeIndex != null) {
+      controller.enter(edgeIndex);
+    }
   }
 
   void _handleDragAssetEnter(TimelineAssetIndex index) {
-    if (_dragAnchorIndex == null || !_dragging) {
+    if (!_dragging) {
       return;
     }
-
-    final timelineService = ref.read(timelineServiceProvider);
-    final dragAnchorIndex = _dragAnchorIndex!;
-
-    // Calculate the range of assets to select
-    final startIndex = math.min(dragAnchorIndex.assetIndex, index.assetIndex);
-    final endIndex = math.max(dragAnchorIndex.assetIndex, index.assetIndex);
-    final count = endIndex - startIndex + 1;
-
-    // Load the assets in the range
-    if (timelineService.hasRange(startIndex, count)) {
-      final selectedAssets = timelineService.getAssets(startIndex, count);
-
-      // Clear previous drag selection and add new range
-      final multiSelectNotifier = ref.read(multiSelectProvider.notifier);
-      for (final asset in _draggedAssets) {
-        multiSelectNotifier.deselectAsset(asset);
-      }
-      _draggedAssets.clear();
-
-      for (final asset in selectedAssets) {
-        multiSelectNotifier.selectAsset(asset);
-        _draggedAssets.add(asset);
-      }
-    }
+    _dragController?.enter(index.assetIndex);
   }
 
   @override

mobile/lib/providers/infrastructure/action.provider.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:auto_route/auto_route.dart';
 import 'package:background_downloader/background_downloader.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -7,17 +8,20 @@ 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/models/asset_edit.model.dart';
+import 'package:immich_mobile/domain/services/asset.service.dart';
 import 'package:immich_mobile/domain/services/remote_album.service.dart';
 import 'package:immich_mobile/models/download/livephotos_medatada.model.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/backup/asset_upload_progress.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/asset.provider.dart' show assetExifProvider;
 import 'package:immich_mobile/providers/infrastructure/tag.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/action.service.dart';
 import 'package:immich_mobile/services/download.service.dart';
 import 'package:immich_mobile/services/foreground_upload.service.dart';
@@ -45,6 +49,7 @@ class ActionNotifier extends Notifier<void> {
   late ActionService _service;
   late ForegroundUploadService _foregroundUploadService;
   late DownloadService _downloadService;
+  late AssetService _assetService;
 
   ActionNotifier() : super();
 
@@ -52,6 +57,7 @@ class ActionNotifier extends Notifier<void> {
   void build() {
     _foregroundUploadService = ref.watch(foregroundUploadServiceProvider);
     _service = ref.watch(actionServiceProvider);
+    _assetService = ref.watch(assetServiceProvider);
     _downloadService = ref.watch(downloadServiceProvider);
     _downloadService.onImageDownloadStatus = _downloadImageCallback;
     _downloadService.onVideoDownloadStatus = _downloadVideoCallback;
@@ -104,6 +110,21 @@ class ActionNotifier extends Notifier<void> {
     return _getAssets(source).whereType<RemoteAsset>().ownedAssets(ownerId).toIds().toList(growable: false);
   }
 
+  List<RemoteAsset> _getOwnedRemoteAssetsForSource(ActionSource source) {
+    final ownerId = ref.read(currentUserProvider)?.id;
+    return _getIdsForSource<RemoteAsset>(source).ownedAssets(ownerId).toList();
+  }
+
+  Iterable<T> _getIdsForSource<T extends BaseAsset>(ActionSource source) {
+    final Set<BaseAsset> assets = _getAssets(source);
+    return switch (T) {
+          const (RemoteAsset) => assets.whereType<RemoteAsset>(),
+          const (LocalAsset) => assets.whereType<LocalAsset>(),
+          _ => const [],
+        }
+        as Iterable<T>;
+  }
+
   Set<BaseAsset> _getAssets(ActionSource source) {
     return switch (source) {
       ActionSource.timeline => ref.read(multiSelectProvider).selectedAssets,
@@ -114,6 +135,16 @@ class ActionNotifier extends Notifier<void> {
     };
   }
 
+  Future<ActionResult> troubleshoot(ActionSource source, BuildContext context) async {
+    final assets = _getAssets(source);
+    if (assets.length > 1) {
+      return ActionResult(count: assets.length, success: false, error: 'Cannot troubleshoot multiple assets');
+    }
+    unawaited(context.pushRoute(AssetTroubleshootRoute(asset: assets.first)));
+
+    return ActionResult(count: assets.length, success: true);
+  }
+
   Future<ActionResult> shareLink(ActionSource source, BuildContext context) async {
     final ids = _getRemoteIdsForSource(source);
     try {
@@ -125,6 +156,73 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
+  Future<ActionResult> favorite(ActionSource source) async {
+    final ids = _getOwnedRemoteIdsForSource(source);
+    try {
+      await _service.favorite(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to favorite assets', error, stack);
+      return ActionResult(count: ids.length, success: false, error: error.toString());
+    }
+  }
+
+  Future<ActionResult> unFavorite(ActionSource source) async {
+    final ids = _getOwnedRemoteIdsForSource(source);
+    try {
+      await _service.unFavorite(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to unfavorite assets', error, stack);
+      return ActionResult(count: ids.length, success: false, error: error.toString());
+    }
+  }
+
+  Future<ActionResult> archive(ActionSource source) async {
+    final ids = _getOwnedRemoteIdsForSource(source);
+    try {
+      await _service.archive(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to archive assets', error, stack);
+      return ActionResult(count: ids.length, success: false, error: error.toString());
+    }
+  }
+
+  Future<ActionResult> unArchive(ActionSource source) async {
+    final ids = _getOwnedRemoteIdsForSource(source);
+    try {
+      await _service.unArchive(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to unarchive assets', error, stack);
+      return ActionResult(count: ids.length, success: false, error: error.toString());
+    }
+  }
+
+  Future<ActionResult> moveToLockFolder(ActionSource source) async {
+    final ids = _getOwnedRemoteIdsForSource(source);
+    final localIds = _getLocalIdsForSource(source, ignoreLocalOnly: true);
+    try {
+      await _service.moveToLockFolder(ids, localIds);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to move assets to lock folder', error, stack);
+      return ActionResult(count: ids.length, success: false, error: error.toString());
+    }
+  }
+
+  Future<ActionResult> removeFromLockFolder(ActionSource source) async {
+    final ids = _getOwnedRemoteIdsForSource(source);
+    try {
+      await _service.removeFromLockFolder(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to remove assets from lock folder', error, stack);
+      return ActionResult(count: ids.length, success: false, error: error.toString());
+    }
+  }
+
   Future<ActionResult> trash(ActionSource source) async {
     final ids = _getOwnedRemoteIdsForSource(source);
 
@@ -137,6 +235,17 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
+  Future<ActionResult> restoreTrash(ActionSource source) async {
+    final ids = _getOwnedRemoteIdsForSource(source);
+    try {
+      await _service.restoreTrash(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to restore trash assets', error, stack);
+      return ActionResult(count: ids.length, success: false, error: error.toString());
+    }
+  }
+
   Future<ActionResult> emptyTrash(String userId) async {
     try {
       final count = await _service.emptyTrash(userId);
@@ -377,6 +486,35 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
+  Future<ActionResult> stack(String userId, ActionSource source) async {
+    final ids = _getOwnedRemoteIdsForSource(source);
+    try {
+      await _service.stack(userId, ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to stack assets', error, stack);
+      return ActionResult(count: ids.length, success: false, error: error.toString());
+    }
+  }
+
+  Future<ActionResult> unStack(ActionSource source) async {
+    final assets = _getOwnedRemoteAssetsForSource(source);
+    try {
+      await _service.unStack(assets.map((e) => e.stackId).nonNulls.toList());
+      if (source == ActionSource.viewer) {
+        final updatedParent = await _assetService.getRemoteAsset(assets.first.id);
+        if (updatedParent != null) {
+          ref.read(assetViewerProvider.notifier).setAsset(updatedParent);
+        }
+      }
+
+      return ActionResult(count: assets.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to unstack assets', error, stack);
+      return ActionResult(count: assets.length, success: false);
+    }
+  }
+
   Future<ActionResult> shareAssets(
     ActionSource source,
     BuildContext context, {

mobile/lib/providers/infrastructure/toast.provider.dart

@@ -1,4 +0,0 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/repositories/toast.repository.dart';
-
-final toastRepositoryProvider = Provider<ToastRepository>((ref) => const .new());

mobile/lib/providers/timeline/multiselect.provider.dart

@@ -22,6 +22,8 @@ class MultiSelectState {
   bool get hasRemote =>
       selectedAssets.any((asset) => asset.storage == AssetState.remote || asset.storage == AssetState.merged);
 
+  bool get hasStacked => selectedAssets.any((asset) => asset is RemoteAsset && asset.stackId != null);
+
   bool get hasMerged => selectedAssets.any((asset) => asset.storage == AssetState.merged);
 
   bool get onlyLocal => selectedAssets.any((asset) => asset.storage == AssetState.local);
@@ -95,6 +97,15 @@ class MultiSelectNotifier extends Notifier<MultiSelectState> {
     }
   }
 
+  // Drops the previous drag range and adds the new one in a single update. The
+  // full-set copy per drag tick is the accepted cost of immutable state.
+  void selectRange(Set<BaseAsset> toSelect, Set<BaseAsset> toDeselect) {
+    final selectedAssets = state.selectedAssets.toSet()
+      ..removeAll(toDeselect)
+      ..addAll(toSelect);
+    state = state.copyWith(selectedAssets: selectedAssets);
+  }
+
   void reset() {
     state = const MultiSelectState(selectedAssets: {}, lockedSelectionAssets: {}, forceEnable: false);
   }

mobile/lib/repositories/asset_api.repository.dart

@@ -1,14 +1,12 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:http/http.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset_edit.model.dart' hide AssetEditAction;
 import 'package:immich_mobile/domain/models/stack.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/repositories/api.repository.dart';
-import 'package:immich_mobile/utils/option.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
-import 'package:openapi/api.dart' as api show AssetVisibility;
-import 'package:openapi/api.dart' hide AssetVisibility;
+import 'package:openapi/api.dart';
 
 final assetApiRepositoryProvider = Provider(
   (ref) => AssetApiRepository(
@@ -43,10 +41,14 @@ class AssetApiRepository extends ApiRepository {
     return response?.count ?? 0;
   }
 
-  Future<void> updateVisibility(List<String> ids, AssetVisibility visibility) async {
+  Future<void> updateVisibility(List<String> ids, AssetVisibilityEnum visibility) async {
     return _api.updateAssets(AssetBulkUpdateDto(ids: ids, visibility: Optional.present(_mapVisibility(visibility))));
   }
 
+  Future<void> updateFavorite(List<String> ids, bool isFavorite) async {
+    return _api.updateAssets(AssetBulkUpdateDto(ids: ids, isFavorite: Optional.present(isFavorite)));
+  }
+
   Future<void> updateLocation(List<String> ids, LatLng location) async {
     return _api.updateAssets(
       AssetBulkUpdateDto(
@@ -75,11 +77,11 @@ class AssetApiRepository extends ApiRepository {
     return _api.downloadAssetWithHttpInfo(id, edited: edited);
   }
 
-  api.AssetVisibility _mapVisibility(AssetVisibility visibility) => switch (visibility) {
-    AssetVisibility.timeline => api.AssetVisibility.timeline,
-    AssetVisibility.hidden => api.AssetVisibility.hidden,
-    AssetVisibility.locked => api.AssetVisibility.locked,
-    AssetVisibility.archive => api.AssetVisibility.archive,
+  _mapVisibility(AssetVisibilityEnum visibility) => switch (visibility) {
+    AssetVisibilityEnum.timeline => AssetVisibility.timeline,
+    AssetVisibilityEnum.hidden => AssetVisibility.hidden,
+    AssetVisibilityEnum.locked => AssetVisibility.locked,
+    AssetVisibilityEnum.archive => AssetVisibility.archive,
   };
 
   Future<String?> getAssetMIMEType(String assetId) async {
@@ -104,20 +106,6 @@ class AssetApiRepository extends ApiRepository {
   Future<void> removeEdits(String assetId) async {
     return _api.removeAssetEdits(assetId);
   }
-
-  Future<void> update(
-    List<String> remoteIds, {
-    Option<bool> isFavorite = const .none(),
-    Option<AssetVisibility> visibility = const .none(),
-  }) {
-    return _api.updateAssets(
-      AssetBulkUpdateDto(
-        ids: remoteIds,
-        isFavorite: isFavorite.toOptional(),
-        visibility: visibility.map(_mapVisibility).toOptional(),
-      ),
-    );
-  }
 }
 
 extension on StackResponseDto {

mobile/lib/repositories/toast.repository.dart

@@ -1,26 +0,0 @@
-import 'dart:async';
-
-import 'package:immich_ui/immich_ui.dart';
-
-class ToastOption {
-  final Duration? timeout;
-  final FutureOr<void> Function()? onUndo;
-
-  const ToastOption({this.timeout, this.onUndo});
-}
-
-class ToastRepository {
-  const ToastRepository();
-
-  FutureOr<void> success(String message, {ToastOption? toast}) {
-    snackbar.success(message, duration: toast?.timeout);
-  }
-
-  FutureOr<void> info(String message, {ToastOption? toast}) {
-    snackbar.info(message, duration: toast?.timeout);
-  }
-
-  FutureOr<void> error(String message, {ToastOption? toast}) {
-    snackbar.error(message, duration: toast?.timeout);
-  }
-}

mobile/lib/services/action.service.dart

@@ -68,8 +68,28 @@ class ActionService {
     unawaited(context.pushRoute(SharedLinkEditRoute(assetsList: remoteIds)));
   }
 
+  Future<void> favorite(List<String> remoteIds) async {
+    await _assetApiRepository.updateFavorite(remoteIds, true);
+    await _remoteAssetRepository.updateFavorite(remoteIds, true);
+  }
+
+  Future<void> unFavorite(List<String> remoteIds) async {
+    await _assetApiRepository.updateFavorite(remoteIds, false);
+    await _remoteAssetRepository.updateFavorite(remoteIds, false);
+  }
+
+  Future<void> archive(List<String> remoteIds) async {
+    await _assetApiRepository.updateVisibility(remoteIds, AssetVisibilityEnum.archive);
+    await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.archive);
+  }
+
+  Future<void> unArchive(List<String> remoteIds) async {
+    await _assetApiRepository.updateVisibility(remoteIds, AssetVisibilityEnum.timeline);
+    await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.timeline);
+  }
+
   Future<void> moveToLockFolder(List<String> remoteIds, List<String> localIds) async {
-    await _assetApiRepository.updateVisibility(remoteIds, .locked);
+    await _assetApiRepository.updateVisibility(remoteIds, AssetVisibilityEnum.locked);
     await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.locked);
 
     // Ask user if they want to delete local copies
@@ -79,7 +99,7 @@ class ActionService {
   }
 
   Future<void> removeFromLockFolder(List<String> remoteIds) async {
-    await _assetApiRepository.updateVisibility(remoteIds, .timeline);
+    await _assetApiRepository.updateVisibility(remoteIds, AssetVisibilityEnum.timeline);
     await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.timeline);
   }
 
@@ -88,6 +108,11 @@ class ActionService {
     await _remoteAssetRepository.trash(remoteIds);
   }
 
+  Future<void> restoreTrash(List<String> ids) async {
+    await _assetApiRepository.restoreTrash(ids);
+    await _remoteAssetRepository.restoreTrash(ids);
+  }
+
   Future<int> emptyTrash(String userId) async {
     final count = await _assetApiRepository.emptyTrash();
     await _remoteAssetRepository.emptyTrash(userId);

mobile/lib/utils/action_button.utils.dart

@@ -1,36 +1,36 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 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/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/archive.action.dart';
 import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';
-import 'package:immich_mobile/presentation/actions/cast.action.dart';
-import 'package:immich_mobile/presentation/actions/lock.action.dart';
-import 'package:immich_mobile/presentation/actions/restore.action.dart';
-import 'package:immich_mobile/presentation/actions/slideshow.action.dart';
-import 'package:immich_mobile/presentation/actions/stack.action.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/cast_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/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/like_activity_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
 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';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/similar_photos_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/slideshow_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/unarchive_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/routing/router.dart';
 
@@ -186,32 +186,32 @@ enum ActionButtonType {
   }
 
   Widget buildButton(
-    ActionButtonContext context,
-    BuildContext buildContext,
-
-    WidgetRef ref, [
+    ActionButtonContext context, [
+    BuildContext? buildContext,
     bool iconOnly = false,
     bool menuItem = false,
   ]) {
-    final scope = ActionScope.from(buildContext, ref);
     return switch (this) {
-      ActionButtonType.advancedInfo => ActionMenuItemWidget(
-        action: AssetDebugAction(assets: [context.asset], scope: scope),
-      ),
+      ActionButtonType.advancedInfo => ActionMenuItemWidget(action: AssetDebugAction(assets: [context.asset])),
       ActionButtonType.share => ShareActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
       ActionButtonType.shareLink => ShareLinkActionButton(
         source: context.source,
         iconOnly: iconOnly,
         menuItem: menuItem,
       ),
-      ActionButtonType.slideshow => ActionMenuItemWidget(action: SlideshowAction(scope: scope)),
-      ActionButtonType.archive || ActionButtonType.unarchive => ActionMenuItemWidget(
-        action: ArchiveAction(assets: [context.asset], scope: scope),
+      ActionButtonType.slideshow => SlideshowActionButton(iconOnly: iconOnly, menuItem: menuItem),
+      ActionButtonType.archive => ArchiveActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
+      ActionButtonType.unarchive => UnArchiveActionButton(
+        source: context.source,
+        iconOnly: iconOnly,
+        menuItem: menuItem,
       ),
       ActionButtonType.download => DownloadActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
       ActionButtonType.trash => TrashActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
-      ActionButtonType.restoreTrash => ActionMenuItemWidget(
-        action: RestoreAction(assets: [context.asset], scope: scope),
+      ActionButtonType.restoreTrash => RestoreActionButton(
+        source: context.source,
+        iconOnly: iconOnly,
+        menuItem: menuItem,
       ),
       ActionButtonType.deletePermanent => DeletePermanentActionButton(
         source: context.source,
@@ -219,11 +219,15 @@ enum ActionButtonType {
         menuItem: menuItem,
       ),
       ActionButtonType.delete => DeleteActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
-      ActionButtonType.moveToLockFolder => ActionMenuItemWidget(
-        action: LockAction(assets: [context.asset], scope: scope),
+      ActionButtonType.moveToLockFolder => MoveToLockFolderActionButton(
+        source: context.source,
+        iconOnly: iconOnly,
+        menuItem: menuItem,
       ),
-      ActionButtonType.removeFromLockFolder => ActionMenuItemWidget(
-        action: LockAction(assets: [context.asset], scope: scope),
+      ActionButtonType.removeFromLockFolder => RemoveFromLockFolderActionButton(
+        source: context.source,
+        iconOnly: iconOnly,
+        menuItem: menuItem,
       ),
       ActionButtonType.deleteLocal => DeleteLocalActionButton(
         source: context.source,
@@ -244,9 +248,7 @@ enum ActionButtonType {
         menuItem: menuItem,
       ),
       ActionButtonType.likeActivity => LikeActivityActionButton(iconOnly: iconOnly, menuItem: menuItem),
-      ActionButtonType.unstack => ActionMenuItemWidget(
-        action: StackAction(assets: [context.asset], scope: scope),
-      ),
+      ActionButtonType.unstack => UnStackActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
       ActionButtonType.openInBrowser => OpenInBrowserActionButton(
         remoteId: context.asset.remoteId!,
         origin: context.timelineOrigin,
@@ -274,12 +276,14 @@ enum ActionButtonType {
         iconData: Icons.image_search,
         iconOnly: iconOnly,
         menuItem: menuItem,
-        onPressed: () async {
-          await buildContext.router.navigate(const TabShellRoute(children: [MainTimelineRoute()]));
-          EventStream.shared.emit(ScrollToDateEvent(context.asset.createdAt));
-        },
+        onPressed: buildContext == null
+            ? null
+            : () async {
+                await buildContext.router.navigate(const TabShellRoute(children: [MainTimelineRoute()]));
+                EventStream.shared.emit(ScrollToDateEvent(context.asset.createdAt));
+              },
       ),
-      ActionButtonType.cast => ActionMenuItemWidget(action: CastAction(scope: scope)),
+      ActionButtonType.cast => CastActionButton(iconOnly: iconOnly, menuItem: menuItem),
     };
   }
 
@@ -322,14 +326,11 @@ class ActionButtonBuilder {
     ActionButtonType.deletePermanent,
   };
 
-  static List<Widget> build(ActionButtonContext context, BuildContext buildContext, WidgetRef ref) {
-    return _actionTypes
-        .where((type) => type.shouldShow(context))
-        .map((type) => type.buildButton(context, buildContext, ref))
-        .toList();
+  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();
@@ -345,7 +346,7 @@ class ActionButtonBuilder {
       if (lastGroup != null && type.kebabMenuGroup != lastGroup) {
         result.add(const Divider(height: 1));
       }
-      result.add(type.buildButton(context, buildContext, ref, false, true));
+      result.add(type.buildButton(context, buildContext, false, true));
       lastGroup = type.kebabMenuGroup;
     }
 

mobile/lib/utils/asset_filter.dart

@@ -1,24 +0,0 @@
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-
-extension type const AssetFilter<T extends BaseAsset>(Iterable<T> assets) implements Iterable<T> {
-  AssetFilter<T> where(bool Function(T asset) test) => AssetFilter(assets.where(test));
-  AssetFilter<T> whereNot(bool Function(T asset) test) => AssetFilter(assets.where((asset) => !test(asset)));
-
-  AssetFilter<T> type(AssetType type) => where((asset) => asset.type == type);
-  AssetFilter<T> favorite({bool isFavorite = true}) => where((asset) => asset.isFavorite == isFavorite);
-
-  AssetFilter<RemoteAsset> remote() => AssetFilter(assets.whereType<RemoteAsset>());
-  AssetFilter<RemoteAsset> owned(String ownerId) => remote().where((asset) => asset.ownerId == ownerId);
-  AssetFilter<RemoteAsset> visibility(AssetVisibility visibility) =>
-      remote().where((asset) => asset.visibility == visibility);
-  AssetFilter<RemoteAsset> notVisibility(AssetVisibility visibility) =>
-      remote().where((asset) => asset.visibility != visibility);
-  AssetFilter<RemoteAsset> archived({bool isArchived = true}) =>
-      remote().where((asset) => asset.isArchived == isArchived);
-  AssetFilter<RemoteAsset> locked({bool isLocked = true}) => remote().where((asset) => asset.isLocked == isLocked);
-  AssetFilter<RemoteAsset> stacked({bool isStacked = true}) => remote().where((asset) => asset.isStacked == isStacked);
-  AssetFilter<RemoteAsset> trashed({bool isTrashed = true}) => remote().where((asset) => asset.isTrashed == isTrashed);
-
-  AssetFilter<LocalAsset> local() => AssetFilter(assets.whereType<LocalAsset>());
-  AssetFilter<LocalAsset> backedUp() => local().where((asset) => asset.remoteAssetId != null);
-}

mobile/lib/utils/error_handler.dart

@@ -8,7 +8,7 @@ import 'package:openapi/api.dart';
 // ignore: depend_on_referenced_packages
 import 'package:stack_trace/stack_trace.dart';
 
-void handleError(Object error, {StackTrace? stack, String? description}) {
+void handleError(BuildContext context, Object error, {StackTrace? stack, String? description}) {
   String? stackTrace;
   if (stack != null) {
     final trace = Trace.from(stack);
@@ -23,13 +23,17 @@ void handleError(Object error, {StackTrace? stack, String? description}) {
     () => 'Error${description != null ? ' ($description)' : ''}: $error${stackTrace != null ? '\n$stackTrace' : ''}',
   );
 
+  if (!context.mounted) {
+    return;
+  }
+
   final String message;
   if (serverErrorMessage(error) case String serverMessage) {
     message = serverMessage;
   } else if (isConnectionError(error)) {
-    message = StaticTranslations.instance.login_form_server_error;
+    message = context.t.login_form_server_error;
   } else {
-    message = StaticTranslations.instance.scaffold_body_error_occurred;
+    message = context.t.scaffold_body_error_occurred;
   }
 
   snackbar.error(message);

mobile/lib/utils/option.dart

@@ -1,4 +1,3 @@
-import 'package:drift/drift.dart';
 import 'package:openapi/api.dart' show Optional;
 
 sealed class Option<T> {
@@ -22,11 +21,6 @@ sealed class Option<T> {
     None() => null,
   };
 
-  Option<U> map<U>(U Function(T value) f) => switch (this) {
-    Some(:final value) => Some(f(value)),
-    None() => None<U>(),
-  };
-
   U fold<U>(U Function(T value) onSome, U Function() onNone) => switch (this) {
     Some(:final value) => onSome(value),
     None() => onNone(),
@@ -71,10 +65,3 @@ extension OptionToOptional<T> on Option<T> {
     Some(:final value) => Optional.present(value),
   };
 }
-
-extension OptionToDriftValue<T> on Option<T> {
-  Value<T> toDriftValue() => switch (this) {
-    Some(:final value) => Value(value),
-    None() => const Value.absent(),
-  };
-}

mobile/packages/ui/lib/src/snackbar.dart

@@ -6,23 +6,18 @@ final scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
 class SnackbarManager {
   const SnackbarManager();
 
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? show(
-    String message,
-    SnackbarType type, {
-    Duration? duration,
-  }) {
+  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? show(String message, SnackbarType type) {
     final messenger = scaffoldMessengerKey.currentState;
     final context = scaffoldMessengerKey.currentContext;
     if (messenger == null || context == null) {
       return null;
     }
 
-    duration ??= const .new(seconds: 4);
     messenger.hideCurrentSnackBar();
-    return messenger.showSnackBar(_build(context, message, type, duration));
+    return messenger.showSnackBar(_build(context, message, type));
   }
 
-  SnackBar _build(BuildContext context, String message, SnackbarType type, Duration duration) {
+  SnackBar _build(BuildContext context, String message, SnackbarType type) {
     final theme = Theme.of(context);
     final colors = theme.extension<ImmichColors>() ?? ImmichColors.harmonized(theme.colorScheme);
     final (IconData icon, Color background, Color foreground) = switch (type) {
@@ -34,7 +29,7 @@ class SnackbarManager {
     return SnackBar(
       behavior: .floating,
       backgroundColor: background,
-      duration: duration,
+      duration: const .new(seconds: 4),
       shape: const RoundedRectangleBorder(borderRadius: .all(.circular(ImmichRadius.sm))),
       content: Row(
         children: [
@@ -53,14 +48,11 @@ class SnackbarManager {
     );
   }
 
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? info(String message, {Duration? duration}) =>
-      show(message, .info, duration: duration);
+  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? info(String message) => show(message, .info);
 
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? success(String message, {Duration? duration}) =>
-      show(message, .success, duration: duration);
+  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? success(String message) => show(message, .success);
 
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? error(String message, {Duration? duration}) =>
-      show(message, .error, duration: duration);
+  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? error(String message) => show(message, .error);
 }
 
 const snackbar = SnackbarManager();

mobile/test/domain/service.mock.dart

@@ -5,7 +5,6 @@ import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/domain/utils/background_sync.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/services/gcast.service.dart';
 import 'package:mocktail/mocktail.dart';
 
 class MockStoreService extends Mock implements StoreService {}
@@ -21,5 +20,3 @@ class MockPartnerService extends Mock implements PartnerService {}
 class MockAssetService extends Mock implements AssetService {}
 
 class MockUserService extends Mock implements UserService {}
-
-class MockGCastService extends Mock implements GCastService {}

mobile/test/flutter_test_config.dart

@@ -1,13 +0,0 @@
-import 'dart:async';
-
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/foundation.dart';
-import 'package:logging/logging.dart';
-
-Future<void> testExecutable(FutureOr<void> Function() testMain) async {
-  Logger.root.level = Level.OFF;
-  EasyLocalization.logger.enableBuildModes = [];
-  // ignore: banned-usage
-  debugPrint = (String? message, {int? wrapWidth}) {};
-  return testMain();
-}

mobile/test/infrastructure/repository.mock.dart

@@ -3,9 +3,9 @@ import 'package:immich_mobile/infrastructure/repositories/local_album.repository
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/partner.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_api.repository.dart';
@@ -15,7 +15,6 @@ import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.re
 import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user_api.repository.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
-import 'package:immich_mobile/repositories/toast.repository.dart';
 import 'package:immich_mobile/repositories/upload.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
@@ -51,8 +50,6 @@ class MockUserRepository extends Mock implements UserRepository {}
 
 class MockPartnerRepository extends Mock implements PartnerRepository {}
 
-class MockToastRepository extends Mock implements ToastRepository {}
-
 // API Repos
 class MockUserApiRepository extends Mock implements UserApiRepository {}
 

mobile/test/modules/map/map_theme_override_test.dart

@@ -1,4 +1,5 @@
 @Skip('Flaky test, needs investigation')
+@Tags(['widget'])
 library;
 
 import 'package:drift/drift.dart';

mobile/test/unit/factories/remote_asset_factory.dart

@@ -5,15 +5,7 @@ import '../../utils.dart';
 class RemoteAssetFactory {
   const RemoteAssetFactory();
 
-  static RemoteAsset create({
-    String? id,
-    String? name,
-    String? ownerId,
-    bool isFavorite = false,
-    AssetVisibility visibility = AssetVisibility.timeline,
-    String? stackId,
-    DateTime? deletedAt,
-  }) {
+  static RemoteAsset create({String? id, String? name, String? ownerId, bool isFavorite = false}) {
     id = TestUtils.uuid(id);
 
     return RemoteAsset(
@@ -25,10 +17,7 @@ class RemoteAssetFactory {
       createdAt: TestUtils.yesterday(),
       updatedAt: TestUtils.now(),
       isFavorite: isFavorite,
-      visibility: visibility,
-      stackId: stackId,
       isEdited: false,
-      deletedAt: deletedAt,
     );
   }
 }

mobile/test/unit/mocks.dart

@@ -1,11 +1,7 @@
 import 'dart:typed_data';
 
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/album/local_album.model.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/platform/native_sync_api.g.dart';
-import 'package:immich_mobile/utils/option.dart';
 import 'package:mocktail/mocktail.dart' as mock;
 import 'package:mocktail/mocktail.dart';
 
@@ -16,12 +12,11 @@ import 'factories/local_asset_factory.dart';
 import 'factories/user_factory.dart';
 
 class RepositoryMocks {
-  final localAlbum = LocalAlbumRepositoryStub(MockLocalAlbumRepository());
-  final localAsset = LocalAssetRepositoryStub(MockDriftLocalAssetRepository());
+  final localAlbum = MockLocalAlbumRepository();
+  final localAsset = MockDriftLocalAssetRepository();
   final trashedAsset = MockTrashedLocalAssetRepository();
-  final toast = MockToastRepository();
 
-  final nativeApi = NativeSyncApiStub(MockNativeSyncApi());
+  final nativeApi = MockNativeSyncApi();
 
   RepositoryMocks() {
     resetAll();
@@ -29,35 +24,17 @@ class RepositoryMocks {
 
   void resetAll() {
     _registerFallbacks();
-    localAlbum.reset();
-    localAsset.reset();
+    reset(localAlbum);
+    reset(localAsset);
     reset(trashedAsset);
-    nativeApi.reset();
-    reset(toast);
-    _stubLocalAlbumRepository();
-    _stubLocalAssetRepository();
-    _stubNativeSyncApi();
-  }
-
-  void _stubLocalAlbumRepository() {
-    when(localAlbum.getBackupAlbums).thenAnswer((_) async => []);
-    when(localAlbum.getAssetsToHash).thenAnswer((_) async => []);
-  }
-
-  void _stubLocalAssetRepository() {
-    when(localAsset.reconcileHashesFromCloudId).thenAnswer((_) async => {});
-    when(localAsset.updateHashes).thenAnswer((_) async => {});
-  }
-
-  void _stubNativeSyncApi() {
-    when(nativeApi.hashAssets).thenAnswer((_) async => []);
+    reset(nativeApi);
   }
 }
 
 class ServiceMocks {
-  final partner = PartnerServiceStub(MockPartnerService());
-  final user = UserServiceStub(MockUserService());
-  final asset = AssetServiceStub(MockAssetService());
+  final PartnerStub partner = PartnerStub(MockPartnerService());
+  final UserStub user = UserStub(MockUserService());
+  final asset = AssetStub(MockAssetService());
 
   ServiceMocks() {
     resetAll();
@@ -91,10 +68,7 @@ class ServiceMocks {
   }
 
   void _stubAssetService() {
-    when(asset.update).thenAnswer((_) async {});
-    when(asset.stack).thenAnswer((_) async {});
-    when(asset.unstack).thenAnswer((_) async {});
-    when(asset.restoreTrash).thenAnswer((_) async {});
+    when(asset.updateFavorite).thenAnswer((_) async {});
   }
 }
 
@@ -102,33 +76,13 @@ void _registerFallbacks() {
   registerFallbackValue(LocalAlbumFactory.create());
   registerFallbackValue(LocalAssetFactory.create());
   registerFallbackValue(Uint8List(0));
-  registerFallbackValue(AssetVisibility.timeline);
-  registerFallbackValue(const Option<bool>.none());
-  registerFallbackValue(const Option<AssetVisibility>.none());
 }
 
-extension type const Stub<T extends Mock>(T mockedClass) {
-  void reset() => mock.reset(mockedClass);
+extension type const Stub<T extends Mock>(T mockedService) {
+  void reset() => mock.reset(mockedService);
 }
 
-extension type const LocalAlbumRepositoryStub(MockLocalAlbumRepository repo) implements Stub<MockLocalAlbumRepository> {
-  Future<List<LocalAlbum>> Function() get getBackupAlbums =>
-      () => repo.getBackupAlbums();
-
-  Future<List<LocalAsset>> Function() get getAssetsToHash =>
-      () => repo.getAssetsToHash(any());
-}
-
-extension type const LocalAssetRepositoryStub(MockDriftLocalAssetRepository repo)
-    implements Stub<MockDriftLocalAssetRepository> {
-  Future<void> Function() get reconcileHashesFromCloudId =>
-      () => repo.reconcileHashesFromCloudId();
-
-  Future<void> Function() get updateHashes =>
-      () => repo.updateHashes(any());
-}
-
-extension type const PartnerServiceStub(MockPartnerService service) implements Stub<MockPartnerService> {
+extension type const PartnerStub(MockPartnerService service) implements Stub<MockPartnerService> {
   Stream<Iterable<User>> Function() get getCandidates =>
       () => service.getCandidates(any());
 
@@ -156,7 +110,7 @@ extension type const PartnerServiceStub(MockPartnerService service) implements S
       );
 }
 
-extension type const UserServiceStub(MockUserService service) implements Stub<MockUserService> {
+extension type const UserStub(MockUserService service) implements Stub<MockUserService> {
   UserDto Function() get getMyUser =>
       () => service.getMyUser();
 
@@ -173,25 +127,7 @@ extension type const UserServiceStub(MockUserService service) implements Stub<Mo
       () => service.createProfileImage(any(), any());
 }
 
-extension type const AssetServiceStub(MockAssetService service) implements Stub<MockAssetService> {
-  Future<void> Function() get update =>
-      () => service.update(
-        any(),
-        isFavorite: any(named: 'isFavorite'),
-        visibility: any(named: 'visibility'),
-      );
-
-  Future<void> Function() get stack =>
-      () => service.stack(any(), any());
-
-  Future<void> Function() get unstack =>
-      () => service.unstack(any());
-
-  Future<void> Function() get restoreTrash =>
-      () => service.restoreTrash(any());
-}
-
-extension type const NativeSyncApiStub(MockNativeSyncApi api) implements Stub<MockNativeSyncApi> {
-  Future<List<HashResult>> Function() get hashAssets =>
-      () => api.hashAssets(any(), allowNetworkAccess: any(named: 'allowNetworkAccess'));
+extension type const AssetStub(MockAssetService service) implements Stub<MockAssetService> {
+  Future<void> Function() get updateFavorite =>
+      () => service.updateFavorite(any(), any());
 }

mobile/test/unit/presentation/actions/archive_action_test.dart

@@ -1,109 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/presentation/actions/archive.action.dart';
-import 'package:immich_mobile/utils/option.dart';
-import 'package:mocktail/mocktail.dart';
-
-import '../../../domain/service.mock.dart';
-import '../../factories/remote_asset_factory.dart';
-import '../presentation_context.dart';
-
-void main() {
-  late PresentationContext context;
-  late MockAssetService assetService;
-
-  setUp(() async {
-    context = await PresentationContext.create();
-    assetService = context.service.asset.service;
-  });
-
-  tearDown(() {
-    context.dispose();
-  });
-
-  RemoteAsset owned({AssetVisibility visibility = AssetVisibility.timeline}) =>
-      RemoteAssetFactory.create(ownerId: context.currentUser.id, visibility: visibility);
-
-  group('ArchiveAction', () {
-    testWidgets('archives the eligible owned assets', (tester) async {
-      final asset = owned();
-      final action = await tester.pumpTestAction(context, (scope) => ArchiveAction(assets: [asset], scope: scope));
-
-      expect(action.icon, Icons.archive_outlined);
-      expect(action.label, StaticTranslations.instance.archive);
-
-      verify(() => assetService.update([asset.id], visibility: const Some(AssetVisibility.archive))).called(1);
-    });
-
-    testWidgets('unarchive the eligible owned assets', (tester) async {
-      final asset = owned(visibility: .archive);
-      final action = await tester.pumpTestAction(context, (scope) => ArchiveAction(assets: [asset], scope: scope));
-
-      expect(action.icon, Icons.unarchive_outlined);
-      expect(action.label, StaticTranslations.instance.unarchive);
-
-      verify(() => assetService.update([asset.id], visibility: const Some(AssetVisibility.timeline))).called(1);
-    });
-
-    testWidgets('dispatches on owned state, ignoring assets owned by others', (tester) async {
-      final mine = owned(visibility: .archive);
-      final theirs = RemoteAssetFactory.create();
-      final action = await tester.pumpTestAction(
-        context,
-        (scope) => ArchiveAction(assets: [mine, theirs], scope: scope),
-      );
-      expect(action.label, StaticTranslations.instance.unarchive);
-
-      verify(() => assetService.update([mine.id], visibility: const Some(AssetVisibility.timeline))).called(1);
-    });
-
-    testWidgets('batches every eligible owned asset into a single call', (tester) async {
-      final first = owned();
-      final second = owned();
-
-      await tester.pumpTestAction(context, (scope) => ArchiveAction(assets: [first, second], scope: scope));
-
-      verify(
-        () => assetService.update([first.id, second.id], visibility: const Some(AssetVisibility.archive)),
-      ).called(1);
-    });
-
-    testWidgets('archives only the owned assets not already archived', (tester) async {
-      final stale = owned();
-      final alreadyArchived = owned(visibility: .archive);
-
-      await tester.pumpTestAction(context, (scope) => ArchiveAction(assets: [stale, alreadyArchived], scope: scope));
-
-      verify(() => assetService.update([stale.id], visibility: const Some(AssetVisibility.archive))).called(1);
-    });
-
-    testWidgets('reports the archived count through the toast repository', (tester) async {
-      final toast = context.repository.toast;
-
-      await tester.pumpTestAction(context, (scope) => ArchiveAction(assets: [owned(), owned()], scope: scope));
-
-      final message = verify(() => toast.success(captureAny())).captured.single as String;
-      expect(message, StaticTranslations.instance.archive_action_prompt(count: 2));
-    });
-
-    testWidgets('reports the unarchive count through the toast repository', (tester) async {
-      final toast = context.repository.toast;
-
-      await tester.pumpTestAction(
-        context,
-        (scope) => ArchiveAction(
-          assets: [
-            owned(visibility: .archive),
-            owned(visibility: .archive),
-          ],
-          scope: scope,
-        ),
-      );
-
-      final message = verify(() => toast.success(captureAny())).captured.single as String;
-      expect(message, StaticTranslations.instance.unarchive_action_prompt(count: 2));
-    });
-  });
-}

mobile/test/unit/presentation/actions/asset_debug_action_test.dart

@@ -1,11 +1,12 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';
+import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';
 import 'package:immich_ui/immich_ui.dart';
 
 import '../../factories/remote_asset_factory.dart';
-import '../presentation_context.dart';
+import '../../presentation_context.dart';
 
 void main() {
   late PresentationContext context;
@@ -21,18 +22,20 @@ void main() {
 
   group('AssetDebugAction', () {
     testWidgets('visible for a single asset when advanced troubleshooting is on', (tester) async {
-      await tester.pumpActionButton(
-        context,
-        (scope) => AssetDebugAction(assets: [RemoteAssetFactory.create()], scope: scope),
+      await tester.pumpTestWidget(
+        ActionIconButtonWidget(action: AssetDebugAction(assets: [RemoteAssetFactory.create()])),
+        overrides: context.overrides,
       );
 
       expect(find.byType(ImmichIconButton), findsOneWidget);
     });
 
     testWidgets('hidden for multiple assets', (tester) async {
-      await tester.pumpActionButton(
-        context,
-        (scope) => AssetDebugAction(assets: [RemoteAssetFactory.create(), RemoteAssetFactory.create()], scope: scope),
+      await tester.pumpTestWidget(
+        ActionIconButtonWidget(
+          action: AssetDebugAction(assets: [RemoteAssetFactory.create(), RemoteAssetFactory.create()]),
+        ),
+        overrides: context.overrides,
       );
 
       expect(find.byType(ImmichIconButton), findsNothing);
@@ -40,9 +43,9 @@ void main() {
 
     testWidgets('hidden when advanced troubleshooting is off', (tester) async {
       await StoreService.I.put(StoreKey.advancedTroubleshooting, false);
-      await tester.pumpActionButton(
-        context,
-        (scope) => AssetDebugAction(assets: [RemoteAssetFactory.create()], scope: scope),
+      await tester.pumpTestWidget(
+        ActionIconButtonWidget(action: AssetDebugAction(assets: [RemoteAssetFactory.create()])),
+        overrides: context.overrides,
       );
 
       expect(find.byType(ImmichIconButton), findsNothing);

mobile/test/unit/presentation/actions/favorite_action_test.dart

@@ -1,101 +1,82 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
-import 'package:immich_mobile/utils/option.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../../../domain/service.mock.dart';
 import '../../factories/remote_asset_factory.dart';
-import '../presentation_context.dart';
+import '../../presentation_context.dart';
 
 void main() {
   late PresentationContext context;
-  late MockAssetService assetService;
 
   setUp(() async {
     context = await PresentationContext.create();
-    assetService = context.service.asset.service;
   });
 
   tearDown(() {
     context.dispose();
   });
 
+  List<Override> overrides() => [
+    ...context.overrides,
+    assetServiceProvider.overrideWithValue(context.mocks.asset.service),
+  ];
+
   RemoteAsset owned({bool isFavorite = false}) =>
       RemoteAssetFactory.create(ownerId: context.currentUser.id, isFavorite: isFavorite);
 
   group('FavoriteAction', () {
     testWidgets('favorites the eligible owned assets', (tester) async {
       final asset = owned();
-      final action = await tester.pumpTestAction(context, (scope) => FavoriteAction(assets: [asset], scope: scope));
 
-      expect(action.icon, Icons.favorite_border_rounded);
-      expect(action.label, StaticTranslations.instance.favorite);
+      await tester.pumpTestAction(FavoriteAction(assets: [asset]), overrides: overrides());
 
-      verify(() => assetService.update([asset.id], isFavorite: const Some(true))).called(1);
+      verify(() => context.mocks.asset.service.updateFavorite([asset.id], true)).called(1);
     });
 
     testWidgets('unfavorite the eligible owned assets', (tester) async {
       final asset = owned(isFavorite: true);
-      final action = await tester.pumpTestAction(context, (scope) => FavoriteAction(assets: [asset], scope: scope));
 
-      expect(action.icon, Icons.favorite_rounded);
-      expect(action.label, StaticTranslations.instance.unfavorite);
+      await tester.pumpTestAction(FavoriteAction(assets: [asset]), overrides: overrides());
 
-      verify(() => assetService.update([asset.id], isFavorite: const Some(false))).called(1);
+      verify(() => context.mocks.asset.service.updateFavorite([asset.id], false)).called(1);
     });
 
-    testWidgets('dispatches on owned state, ignoring assets owned by others', (tester) async {
-      final mine = owned(isFavorite: true);
+    testWidgets('ignores assets owned by someone else', (tester) async {
+      final mine = owned();
       final theirs = RemoteAssetFactory.create();
-      final action = await tester.pumpTestAction(
-        context,
-        (scope) => FavoriteAction(assets: [mine, theirs], scope: scope),
-      );
-      expect(action.label, StaticTranslations.instance.unfavorite);
 
-      verify(() => assetService.update([mine.id], isFavorite: const Some(false))).called(1);
+      await tester.pumpTestAction(FavoriteAction(assets: [mine, theirs]), overrides: overrides());
+
+      verify(() => context.mocks.asset.service.updateFavorite([mine.id], true)).called(1);
     });
 
     testWidgets('batches every eligible owned asset into a single call', (tester) async {
       final first = owned();
       final second = owned();
 
-      await tester.pumpTestAction(context, (scope) => FavoriteAction(assets: [first, second], scope: scope));
+      await tester.pumpTestAction(FavoriteAction(assets: [first, second]), overrides: overrides());
 
-      verify(() => assetService.update([first.id, second.id], isFavorite: const Some(true))).called(1);
+      verify(() => context.mocks.asset.service.updateFavorite([first.id, second.id], true)).called(1);
     });
 
-    testWidgets('favorites only the owned assets not already favorite', (tester) async {
+    testWidgets('skips owned assets already in the target state', (tester) async {
       final stale = owned();
       final alreadyFavorite = owned(isFavorite: true);
 
-      await tester.pumpTestAction(context, (scope) => FavoriteAction(assets: [stale, alreadyFavorite], scope: scope));
+      await tester.pumpTestAction(FavoriteAction(assets: [stale, alreadyFavorite]), overrides: overrides());
 
-      verify(() => assetService.update([stale.id], isFavorite: const Some(true))).called(1);
+      verify(() => context.mocks.asset.service.updateFavorite([stale.id], true)).called(1);
     });
 
-    testWidgets('reports the favorite count through the toast repository', (tester) async {
-      final toast = context.repository.toast;
+    testWidgets('shows a confirmation snackbar on success', (tester) async {
+      await tester.pumpTestAction(FavoriteAction(assets: [owned()]), overrides: overrides());
+      await tester.pumpUntilFound(find.byType(SnackBar));
 
-      await tester.pumpTestAction(context, (scope) => FavoriteAction(assets: [owned(), owned()], scope: scope));
-
-      final message = verify(() => toast.success(captureAny())).captured.single as String;
-      expect(message, StaticTranslations.instance.favorite_action_prompt(count: 2));
-    });
-
-    testWidgets('reports the unfavorite count through the toast repository', (tester) async {
-      final toast = context.repository.toast;
-
-      await tester.pumpTestAction(
-        context,
-        (scope) => FavoriteAction(assets: [owned(isFavorite: true), owned(isFavorite: true)], scope: scope),
-      );
-
-      final message = verify(() => toast.success(captureAny())).captured.single as String;
-      expect(message, StaticTranslations.instance.unfavorite_action_prompt(count: 2));
+      expect(find.byType(SnackBar), findsOneWidget);
     });
   });
 }

mobile/test/unit/presentation/actions/lock_action_test.dart

@@ -1,104 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/presentation/actions/lock.action.dart';
-import 'package:immich_mobile/utils/option.dart';
-import 'package:mocktail/mocktail.dart';
-
-import '../../../domain/service.mock.dart';
-import '../../factories/remote_asset_factory.dart';
-import '../presentation_context.dart';
-
-void main() {
-  late PresentationContext context;
-  late MockAssetService assetService;
-
-  setUp(() async {
-    context = await PresentationContext.create();
-    assetService = context.service.asset.service;
-  });
-
-  tearDown(() {
-    context.dispose();
-  });
-
-  RemoteAsset owned({AssetVisibility visibility = .timeline}) =>
-      RemoteAssetFactory.create(ownerId: context.currentUser.id, visibility: visibility);
-
-  group('LockAction', () {
-    testWidgets('locks the eligible owned assets', (tester) async {
-      final asset = owned();
-      final action = await tester.pumpTestAction(context, (scope) => LockAction(assets: [asset], scope: scope));
-
-      expect(action.icon, Icons.lock_rounded);
-      expect(action.label, StaticTranslations.instance.move_to_locked_folder);
-
-      verify(() => assetService.update([asset.id], visibility: const Some(.locked))).called(1);
-    });
-
-    testWidgets('unlocks the eligible owned assets', (tester) async {
-      final asset = owned(visibility: .locked);
-      final action = await tester.pumpTestAction(context, (scope) => LockAction(assets: [asset], scope: scope));
-
-      expect(action.icon, Icons.lock_open_rounded);
-      expect(action.label, StaticTranslations.instance.remove_from_locked_folder);
-
-      verify(() => assetService.update([asset.id], visibility: const Some(.timeline))).called(1);
-    });
-
-    testWidgets('dispatches on owned state, ignoring assets owned by others', (tester) async {
-      final mine = owned(visibility: .locked);
-      final theirs = RemoteAssetFactory.create();
-      final action = await tester.pumpTestAction(context, (scope) => LockAction(assets: [mine, theirs], scope: scope));
-      expect(action.label, StaticTranslations.instance.remove_from_locked_folder);
-
-      verify(() => assetService.update([mine.id], visibility: const Some(.timeline))).called(1);
-    });
-
-    testWidgets('batches every eligible owned asset into a single call', (tester) async {
-      final first = owned();
-      final second = owned();
-
-      await tester.pumpTestAction(context, (scope) => LockAction(assets: [first, second], scope: scope));
-
-      verify(() => assetService.update([first.id, second.id], visibility: const Some(.locked))).called(1);
-    });
-
-    testWidgets('locks only the owned assets not already locked', (tester) async {
-      final stale = owned();
-      final alreadyLocked = owned(visibility: .locked);
-
-      await tester.pumpTestAction(context, (scope) => LockAction(assets: [stale, alreadyLocked], scope: scope));
-
-      verify(() => assetService.update([stale.id], visibility: const Some(.locked))).called(1);
-    });
-
-    testWidgets('reports the locked count through the toast repository', (tester) async {
-      final toast = context.repository.toast;
-
-      await tester.pumpTestAction(context, (scope) => LockAction(assets: [owned(), owned()], scope: scope));
-
-      final message = verify(() => toast.success(captureAny())).captured.single as String;
-      expect(message, StaticTranslations.instance.move_to_lock_folder_action_prompt(count: 2));
-    });
-
-    testWidgets('reports the unlocked count through the toast repository', (tester) async {
-      final toast = context.repository.toast;
-
-      await tester.pumpTestAction(
-        context,
-        (scope) => LockAction(
-          assets: [
-            owned(visibility: .locked),
-            owned(visibility: .locked),
-          ],
-          scope: scope,
-        ),
-      );
-
-      final message = verify(() => toast.success(captureAny())).captured.single as String;
-      expect(message, StaticTranslations.instance.remove_from_lock_folder_action_prompt(count: 2));
-    });
-  });
-}

mobile/test/unit/presentation/actions/partner_action_test.dart

@@ -4,19 +4,17 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/presentation/actions/partner.action.dart';
+import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../../../domain/service.mock.dart';
 import '../../factories/user_factory.dart';
-import '../presentation_context.dart';
+import '../../presentation_context.dart';
 
 void main() {
   late PresentationContext context;
-  late MockPartnerService partnerService;
 
   setUp(() async {
     context = await PresentationContext.create();
-    partnerService = context.service.partner.service;
   });
 
   tearDown(() {
@@ -24,6 +22,8 @@ void main() {
   });
 
   List<Override> overrides({List<User> candidates = const []}) => [
+    ...context.overrides,
+    partnerServiceProvider.overrideWithValue(context.mocks.partner.service),
     candidatesStateProvider.overrideWith((ref) => Stream<Iterable<User>>.value(candidates)),
   ];
 
@@ -31,28 +31,22 @@ void main() {
     testWidgets('creates a partner for the selected candidate', (tester) async {
       final candidate = UserFactory.create();
 
-      await tester.pumpTestAction(
-        context,
-        (scope) => PartnerAddAction(scope: scope),
-        overrides: overrides(candidates: [candidate]),
-      );
+      await tester.pumpTestAction(const PartnerAddAction(), overrides: overrides(candidates: [candidate]));
       await tester.pumpUntilFound(find.text(candidate.name));
       await tester.tap(find.text(candidate.name));
       await tester.pumpAndSettle();
 
-      verify(() => partnerService.create(sharedById: context.currentUser.id, sharedWithId: candidate.id)).called(1);
+      verify(
+        () => context.mocks.partner.service.create(sharedById: context.currentUser.id, sharedWithId: candidate.id),
+      ).called(1);
     });
 
     testWidgets('creates nothing when the selection dialog is dismissed', (tester) async {
-      await tester.pumpTestAction(
-        context,
-        (scope) => PartnerAddAction(scope: scope),
-        overrides: overrides(candidates: [UserFactory.create()]),
-      );
+      await tester.pumpTestAction(const PartnerAddAction(), overrides: overrides(candidates: [UserFactory.create()]));
       await tester.sendKeyEvent(LogicalKeyboardKey.escape); // dismiss without selecting
       await tester.pumpAndSettle();
 
-      verifyNever(context.service.partner.create);
+      verifyNever(context.mocks.partner.create);
     });
   });
 
@@ -60,27 +54,27 @@ void main() {
     testWidgets('deletes the partner after confirmation', (tester) async {
       final partner = UserFactory.create();
       await tester.pumpTestAction(
-        context,
-        (scope) => PartnerRemoveAction(sharedWithId: partner.id, partnerName: partner.name, scope: scope),
+        PartnerRemoveAction(sharedWithId: partner.id, partnerName: partner.name),
         overrides: overrides(),
       );
       await tester.tap(find.byType(TextButton).last); // confirm
       await tester.pumpAndSettle();
 
-      verify(() => partnerService.delete(sharedById: context.currentUser.id, sharedWithId: partner.id)).called(1);
+      verify(
+        () => context.mocks.partner.service.delete(sharedById: context.currentUser.id, sharedWithId: partner.id),
+      ).called(1);
     });
 
     testWidgets('deletes nothing when the confirmation is cancelled', (tester) async {
       final partner = UserFactory.create();
       await tester.pumpTestAction(
-        context,
-        (scope) => PartnerRemoveAction(sharedWithId: partner.id, partnerName: partner.name, scope: scope),
+        PartnerRemoveAction(sharedWithId: partner.id, partnerName: partner.name),
         overrides: overrides(),
       );
       await tester.tap(find.byType(TextButton).first); // cancel
       await tester.pumpAndSettle();
 
-      verifyNever(context.service.partner.delete);
+      verifyNever(context.mocks.partner.delete);
     });
   });
 }

mobile/test/unit/presentation/actions/restore_action_test.dart

@@ -1,72 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/presentation/actions/restore.action.dart';
-import 'package:mocktail/mocktail.dart';
-
-import '../../../domain/service.mock.dart';
-import '../../factories/remote_asset_factory.dart';
-import '../presentation_context.dart';
-
-void main() {
-  late PresentationContext context;
-  late MockAssetService assetService;
-
-  setUp(() async {
-    context = await PresentationContext.create();
-    assetService = context.service.asset.service;
-  });
-
-  tearDown(() {
-    context.dispose();
-  });
-
-  RemoteAsset owned({bool trashed = true}) =>
-      RemoteAssetFactory.create(ownerId: context.currentUser.id, deletedAt: trashed ? DateTime(2020) : null);
-
-  group('RestoreAction', () {
-    testWidgets('restores the eligible owned trashed assets', (tester) async {
-      final asset = owned();
-
-      await tester.pumpTestAction(context, (scope) => RestoreAction(assets: [asset], scope: scope));
-
-      verify(() => assetService.restoreTrash([asset.id])).called(1);
-    });
-
-    testWidgets('ignores assets owned by someone else', (tester) async {
-      final mine = owned();
-      final theirs = RemoteAssetFactory.create(deletedAt: DateTime(2020));
-
-      await tester.pumpTestAction(context, (scope) => RestoreAction(assets: [mine, theirs], scope: scope));
-
-      verify(() => assetService.restoreTrash([mine.id])).called(1);
-    });
-
-    testWidgets('restores only the owned assets that are trashed', (tester) async {
-      final trashed = owned();
-      final live = owned(trashed: false);
-
-      await tester.pumpTestAction(context, (scope) => RestoreAction(assets: [trashed, live], scope: scope));
-
-      verify(() => assetService.restoreTrash([trashed.id])).called(1);
-    });
-
-    testWidgets('batches every eligible owned asset into a single call', (tester) async {
-      final first = owned();
-      final second = owned();
-
-      await tester.pumpTestAction(context, (scope) => RestoreAction(assets: [first, second], scope: scope));
-
-      verify(() => assetService.restoreTrash([first.id, second.id])).called(1);
-    });
-
-    testWidgets('reports success through the toast repository with the restored count', (tester) async {
-      final toast = context.repository.toast;
-
-      await tester.pumpTestAction(context, (scope) => RestoreAction(assets: [owned(), owned()], scope: scope));
-
-      final message = verify(() => toast.success(captureAny())).captured.single as String;
-      expect(message, StaticTranslations.instance.assets_restored_count(count: 2));
-    });
-  });
-}

mobile/test/unit/presentation/actions/stack_action_test.dart

@@ -1,111 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/presentation/actions/stack.action.dart';
-import 'package:mocktail/mocktail.dart';
-
-import '../../../domain/service.mock.dart';
-import '../../factories/remote_asset_factory.dart';
-import '../presentation_context.dart';
-
-void main() {
-  late PresentationContext context;
-  late MockAssetService assetService;
-
-  setUp(() async {
-    context = await PresentationContext.create();
-    assetService = context.service.asset.service;
-  });
-
-  tearDown(() {
-    context.dispose();
-  });
-
-  RemoteAsset owned({String? stackId}) => RemoteAssetFactory.create(ownerId: context.currentUser.id, stackId: stackId);
-
-  group('StackAction', () {
-    testWidgets('stacks the eligible owned assets', (tester) async {
-      final first = owned();
-      final second = owned();
-      final action = await tester.pumpTestAction(
-        context,
-        (scope) => StackAction(assets: [first, second], scope: scope),
-      );
-
-      expect(action.icon, Icons.filter_none_rounded);
-      expect(action.label, StaticTranslations.instance.stack);
-
-      verify(() => assetService.stack(context.currentUser.id, [first.id, second.id])).called(1);
-    });
-
-    testWidgets('unstacks the eligible owned assets', (tester) async {
-      final asset = owned(stackId: 'stack');
-      final action = await tester.pumpTestAction(context, (scope) => StackAction(assets: [asset], scope: scope));
-
-      expect(action.icon, Icons.layers_clear_outlined);
-      expect(action.label, StaticTranslations.instance.unstack);
-
-      verify(() => assetService.unstack(['stack'])).called(1);
-    });
-
-    testWidgets('prioritizes stack when the owned selection is mixed', (tester) async {
-      final first = owned();
-      final second = owned(stackId: 'stack');
-      final action = await tester.pumpTestAction(
-        context,
-        (scope) => StackAction(assets: [first, second], scope: scope),
-      );
-
-      expect(action.label, StaticTranslations.instance.stack);
-
-      verify(() => assetService.stack(context.currentUser.id, [first.id, second.id])).called(1);
-    });
-
-    testWidgets('dispatches on owned state, ignoring assets owned by others', (tester) async {
-      final mine = owned();
-      final other = owned();
-      final theirs = RemoteAssetFactory.create();
-
-      await tester.pumpTestAction(context, (scope) => StackAction(assets: [mine, other, theirs], scope: scope));
-
-      verify(() => assetService.stack(context.currentUser.id, [mine.id, other.id])).called(1);
-    });
-
-    testWidgets('unstacks every selected stack in a single call', (tester) async {
-      final first = owned(stackId: 'stack-1');
-      final second = owned(stackId: 'stack-2');
-
-      await tester.pumpTestAction(context, (scope) => StackAction(assets: [first, second], scope: scope));
-
-      verify(() => assetService.unstack(['stack-1', 'stack-2'])).called(1);
-    });
-
-    testWidgets('reports the stacked count through the toast repository', (tester) async {
-      final toast = context.repository.toast;
-
-      await tester.pumpTestAction(context, (scope) => StackAction(assets: [owned(), owned()], scope: scope));
-
-      final message = verify(() => toast.success(captureAny())).captured.single as String;
-      expect(message, StaticTranslations.instance.stacked_assets_count(count: 2));
-    });
-
-    testWidgets('reports the unstacked count through the toast repository', (tester) async {
-      final toast = context.repository.toast;
-
-      await tester.pumpTestAction(
-        context,
-        (scope) => StackAction(
-          assets: [
-            owned(stackId: 'stack-1'),
-            owned(stackId: 'stack-2'),
-          ],
-          scope: scope,
-        ),
-      );
-
-      final message = verify(() => toast.success(captureAny())).captured.single as String;
-      expect(message, StaticTranslations.instance.unstacked_assets_count(count: 2));
-    });
-  });
-}

mobile/test/unit/presentation/actions/timeline_action_test.dart

@@ -7,19 +7,28 @@ import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 
 import '../../factories/remote_asset_factory.dart';
-import '../presentation_context.dart';
+import '../../presentation_context.dart';
 
 class _FakeAction extends BaseAction {
-  _FakeAction({required super.scope, bool visible = true, this.error})
-    : super(icon: Icons.bolt, label: 'fake', isVisible: visible);
+  _FakeAction({this.visible = true, this.error});
 
+  final bool visible;
   final Object? error;
 
   bool ran = false;
   bool? selectionDuringOnAction;
 
   @override
-  Future<void> onAction() async {
+  IconData get icon => Icons.bolt;
+
+  @override
+  String label(ActionScope scope) => 'fake';
+
+  @override
+  bool isVisible(ActionScope scope) => visible;
+
+  @override
+  Future<void> onAction(ActionScope scope) async {
     ran = true;
     selectionDuringOnAction = scope.ref.read(multiSelectProvider).isEnabled;
     if (error != null) {
@@ -39,7 +48,8 @@ void main() {
     context.dispose();
   });
 
-  List<Override> overrides() => [
+  List<Override> seededOverrides() => [
+    ...context.overrides,
     multiSelectProvider.overrideWith(
       () => MultiSelectNotifier(
         MultiSelectState(selectedAssets: {RemoteAssetFactory.create()}, lockedSelectionAssets: const {}),
@@ -51,7 +61,6 @@ void main() {
     late ActionScope scope;
     late ProviderContainer container;
     await tester.pumpTestWidget(
-      context,
       Consumer(
         builder: (innerContext, ref, _) {
           scope = ActionScope(context: innerContext, ref: ref, authUser: context.currentUser);
@@ -59,16 +68,16 @@ void main() {
           return const SizedBox.shrink();
         },
       ),
-      overrides: overrides(),
+      overrides: seededOverrides(),
     );
     return (scope, container);
   }
 
   group('TimelineAction', () {
     testWidgets('runs the wrapped action and then clears the selection', (tester) async {
+      final inner = _FakeAction();
       final (scope, container) = await pumpScope(tester);
-      final inner = _FakeAction(scope: scope);
-      await TimelineAction(action: inner).onAction();
+      await TimelineAction(action: inner).onAction(scope);
 
       expect(inner.ran, isTrue);
       expect(inner.selectionDuringOnAction, isTrue, reason: 'reset must run after the inner action, not before');
@@ -77,19 +86,19 @@ void main() {
 
     testWidgets('rethrows and keeps the selection when the wrapped action throws', (tester) async {
       final error = Exception('boom');
+      final inner = _FakeAction(error: error);
       final (scope, container) = await pumpScope(tester);
-      final inner = _FakeAction(scope: scope, error: error);
 
-      await expectLater(TimelineAction(action: inner).onAction(), throwsA(same(error)));
+      await expectLater(TimelineAction(action: inner).onAction(scope), throwsA(same(error)));
 
       expect(inner.ran, isTrue);
       expect(container.read(multiSelectProvider).isEnabled, isTrue);
     });
 
     testWidgets('delegates visibility to the wrapped action', (tester) async {
-      await tester.pumpActionButton(
-        context,
-        (scope) => TimelineAction(action: _FakeAction(scope: scope, visible: false)),
+      await tester.pumpTestWidget(
+        ActionIconButtonWidget(action: TimelineAction(action: _FakeAction(visible: false))),
+        overrides: context.overrides,
       );
 
       expect(find.byType(ActionIconButtonWidget), findsOneWidget);

mobile/test/unit/presentation/partner_page_test.dart

@@ -7,7 +7,7 @@ import 'package:immich_mobile/presentation/actions/partner.action.dart';
 
 import '../factories/partner_user_factory.dart';
 import '../factories/user_factory.dart';
-import 'presentation_context.dart';
+import '../presentation_context.dart';
 
 void main() {
   late PresentationContext context;
@@ -17,16 +17,19 @@ void main() {
 
   group('PartnerSharedByList', () {
     testWidgets('shows the empty-state add button when there are no partners', (tester) async {
-      await tester.pumpTestWidget(context, const PartnerSharedByList(partners: []));
+      final action = const PartnerAddAction();
+
+      await tester.pumpTestWidget(const PartnerSharedByList(partners: []), overrides: context.overrides);
 
       expect(find.byType(ListView), findsNothing);
-      expect(find.widgetWithIcon(TextButton, Icons.person_add_rounded), findsOneWidget);
+      expect(find.widgetWithIcon(TextButton, action.icon), findsOneWidget);
     });
 
     testWidgets('renders a tile per partner with name and email', (tester) async {
       final partner1 = PartnerFactory.create();
       final partner2 = PartnerFactory.create();
-      await tester.pumpTestWidget(context, PartnerSharedByList(partners: [partner1, partner2]));
+      await tester.pumpTestWidget(PartnerSharedByList(partners: [partner1, partner2]), overrides: context.overrides);
+
       expect(find.byType(ListTile), findsNWidgets(2));
       expect(find.text(partner1.name), findsOneWidget);
       expect(find.text(partner1.email), findsOneWidget);
@@ -37,8 +40,9 @@ void main() {
     testWidgets('renders a remove action for each partner', (tester) async {
       final partner1 = PartnerFactory.create(inTimeline: true);
       final partner2 = PartnerFactory.create();
-      await tester.pumpTestWidget(context, PartnerSharedByList(partners: [partner1, partner2]));
-      expect(find.byIcon(Icons.person_remove_rounded), findsNWidgets(2));
+      final action = const PartnerRemoveAction(sharedWithId: '', partnerName: '');
+      await tester.pumpTestWidget(PartnerSharedByList(partners: [partner1, partner2]), overrides: context.overrides);
+      expect(find.byIcon(action.icon), findsNWidgets(2));
     });
   });
 
@@ -58,12 +62,13 @@ void main() {
     }
 
     List<Override> withCandidates(List<User> candidates) => [
+      ...context.overrides,
       candidatesStateProvider.overrideWith((ref) => Stream<Iterable<User>>.value(candidates)),
     ];
 
     testWidgets('renders an option per candidate fetched from the provider', (tester) async {
       final user = UserFactory.create();
-      await tester.pumpTestWidget(context, dialogWidget(), overrides: withCandidates([user]));
+      await tester.pumpTestWidget(dialogWidget(), overrides: withCandidates([user]));
 
       await tester.tap(find.byKey(dialogButtonKey));
       await tester.pumpAndSettle();
@@ -73,7 +78,7 @@ void main() {
     });
 
     testWidgets('shows no options when the provider returns no candidates', (tester) async {
-      await tester.pumpTestWidget(context, dialogWidget(), overrides: withCandidates(const []));
+      await tester.pumpTestWidget(dialogWidget(), overrides: withCandidates(const []));
 
       await tester.tap(find.byKey(dialogButtonKey));
       await tester.pumpAndSettle();
@@ -84,11 +89,7 @@ void main() {
     testWidgets('pops the selected candidate when an option is tapped', (tester) async {
       final user = UserFactory.create();
       User? selected;
-      await tester.pumpTestWidget(
-        context,
-        dialogWidget(onClosed: (user) => selected = user),
-        overrides: withCandidates([user]),
-      );
+      await tester.pumpTestWidget(dialogWidget(onClosed: (user) => selected = user), overrides: withCandidates([user]));
 
       await tester.tap(find.byKey(dialogButtonKey));
       await tester.pumpAndSettle();

mobile/test/unit/presentation/widgets/timeline/asset_index_at_offset_test.dart

@@ -0,0 +1,60 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/domain/models/timeline.model.dart';
+import 'package:immich_mobile/presentation/widgets/timeline/fixed/segment.model.dart';
+import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
+import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
+
+void main() {
+  // Two day-segments, 4 columns, 8 assets each (2 rows). header 50, tile 100, no spacing.
+  //   A: header@[0,50)  rows@50,150   assets 0..7    offset [0,250]
+  //   B: header@[250,300) rows@300,400 assets 8..15  offset [250,500]
+  const columnCount = 4;
+  const maxScrollExtent = 500.0;
+  final segments = <Segment>[
+    const FixedSegment(
+      firstIndex: 0,
+      lastIndex: 2,
+      startOffset: 0,
+      endOffset: 250,
+      firstAssetIndex: 0,
+      bucket: Bucket(assetCount: 8),
+      tileHeight: 100,
+      columnCount: columnCount,
+      headerExtent: 50,
+      spacing: 0,
+      header: HeaderType.day,
+    ),
+    const FixedSegment(
+      firstIndex: 3,
+      lastIndex: 5,
+      startOffset: 250,
+      endOffset: 500,
+      firstAssetIndex: 8,
+      bucket: Bucket(assetCount: 8),
+      tileHeight: 100,
+      columnCount: columnCount,
+      headerExtent: 50,
+      spacing: 0,
+      header: HeaderType.day,
+    ),
+  ];
+
+  int? at(double offset) =>
+      assetIndexAtOffset(segments, offset, columnCount: columnCount, maxScrollExtent: maxScrollExtent);
+
+  test('maps an offset to the first asset of the row shown there', () {
+    expect(at(0), 0); // top of segment A
+    expect(at(150), 4); // second row of A
+    expect(at(350), 8); // first row of B
+    expect(at(450), 12); // second row of B
+  });
+
+  test('clamps offsets outside the scroll range', () {
+    expect(at(-100), 0); // below the top -> first asset
+    expect(at(9999), at(maxScrollExtent)); // past the end -> same as the max offset
+  });
+
+  test('returns null for empty segments', () {
+    expect(assetIndexAtOffset(const [], 100, columnCount: columnCount, maxScrollExtent: maxScrollExtent), isNull);
+  });
+}

mobile/test/unit/presentation/widgets/timeline/drag_selection_controller_test.dart

@@ -0,0 +1,157 @@
+import 'dart:async';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/presentation/widgets/timeline/drag_selection_controller.dart';
+
+import '../../../factories/remote_asset_factory.dart';
+
+void main() {
+  const total = 50;
+  late List<BaseAsset> all;
+  late Set<int> inBuffer; // indices getAssetSafe resolves synchronously
+  late List<Completer<List<BaseAsset>>> reads; // pending async reads, completed manually
+  late List<({int from, int count})> readArgs;
+  late Set<BaseAsset> selected;
+  late DragSelectionController sut;
+
+  Set<BaseAsset> range(int lo, int hi) => {for (var i = lo; i <= hi; i++) all[i]};
+
+  void completeRead(int i) {
+    final a = readArgs[i];
+    reads[i].complete([for (var k = a.from; k < a.from + a.count && k < total; k++) all[k]]);
+  }
+
+  Future<void> settle() => Future(() {});
+
+  setUp(() {
+    all = List.generate(total, (i) => RemoteAssetFactory.create(id: 'a${i.toString().padLeft(3, '0')}'));
+    inBuffer = {for (var i = 0; i < total; i++) i}; // default: everything buffered (sync)
+    reads = [];
+    readArgs = [];
+    selected = {};
+    sut = DragSelectionController(
+      getAssetSafe: (i) => inBuffer.contains(i) ? all[i] : null,
+      getAssetsRange: (from, count) {
+        final c = Completer<List<BaseAsset>>();
+        reads.add(c);
+        readArgs.add((from: from, count: count));
+        return c.future;
+      },
+      onChange: (select, deselect) {
+        selected
+          ..addAll(select)
+          ..removeAll(deselect);
+      },
+    );
+  });
+
+  group('live selection (all in buffer, synchronous)', () {
+    test('dragging down selects the whole range as it grows', () {
+      sut.start(2);
+      sut.enter(6);
+      sut.enter(12);
+      expect(selected, range(2, 12));
+      expect(reads, isEmpty, reason: 'everything buffered -> no async read');
+    });
+
+    test('dragging back up toward the anchor deselects the shrunk tail', () {
+      sut.start(2);
+      sut.enter(12);
+      expect(selected, range(2, 12));
+      sut.enter(6); // reverse
+      expect(selected, range(2, 6));
+      sut.enter(3); // reverse more
+      expect(selected, range(2, 3));
+    });
+
+    test('dragging past the anchor flips the range', () {
+      sut.start(10);
+      sut.enter(14);
+      expect(selected, range(10, 14));
+      sut.enter(7); // crosses the anchor
+      expect(selected, range(7, 10));
+    });
+  });
+
+  group('beyond-buffer (async)', () {
+    setUp(() => inBuffer = {}); // nothing buffered -> every tile needs an async read
+
+    test('drag-end fills the full range even if every live read is still in flight', () async {
+      sut.start(0);
+      sut.enter(20);
+      // simulate the real-rate race: none of the in-drag reads have completed
+      expect(selected, isEmpty);
+
+      final ending = sut.end();
+      // end() issues its own read for the missing range; complete it
+      completeRead(reads.length - 1);
+      await ending;
+
+      expect(selected, range(0, 20), reason: 'final range must always apply on drag-end');
+    });
+
+    test('out-of-order live read completions never corrupt the selection', () async {
+      sut.start(0); // issues read for [0,1]
+      sut.enter(10); // issues read for [0,11]
+      sut.enter(20); // issues read for [0,21]
+      expect(reads.length, 3);
+
+      // complete newest first, then older ones (out of order)
+      completeRead(2);
+      await settle();
+      completeRead(1);
+      await settle();
+      completeRead(0);
+      await settle();
+
+      expect(selected, range(0, 20));
+
+      final ending = sut.end();
+      await ending; // nothing missing -> no extra read
+      expect(selected, range(0, 20));
+    });
+
+    test('a disposed controller never emits when its in-flight read resolves', () async {
+      sut.start(0); // read [0,1] (pending, in flight)
+      sut.enter(20); // read [0,21] (pending, in flight)
+      expect(selected, isEmpty);
+
+      // a new drag starts -> the old controller is disposed
+      final ending = sut.end(); // issues end()'s fill read
+      sut.dispose();
+
+      // every in-flight read for the old controller now resolves
+      for (var i = 0; i < reads.length; i++) {
+        if (!reads[i].isCompleted) {
+          completeRead(i);
+        }
+      }
+      await ending;
+      await settle();
+
+      expect(selected, isEmpty, reason: 'a disposed controller must not leak into the new selection');
+    });
+
+    test('a late read for tiles dragged back out of range is ignored', () async {
+      sut.start(0); // read [0,1]
+      sut.enter(20); // read [0,21]
+      sut.enter(5); // shrink back; read [0,6]
+      // complete the stale wide read AFTER the shrink
+      completeRead(1); // [0,21]
+      await settle();
+      // indices 6..20 left the range -> must not be selected
+      expect(selected.intersection(range(6, 20)), isEmpty);
+
+      final ending = sut.end();
+      // complete any read end() issued for the (now smaller) missing range
+      for (var i = 0; i < reads.length; i++) {
+        if (!reads[i].isCompleted) {
+          completeRead(i);
+        }
+      }
+      await ending;
+      expect(selected, range(0, 5));
+    });
+  });
+}

mobile/test/unit/presentation_context.dart

@@ -13,24 +13,16 @@ import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/services/gcast.service.dart';
 import 'package:immich_ui/immich_ui.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../../domain/service.mock.dart';
-import '../../test_utils.dart';
-import '../factories/user_factory.dart';
-import '../mocks.dart';
+import '../test_utils.dart';
+import 'factories/user_factory.dart';
+import 'mocks.dart';
 
 class PresentationContext {
-  PresentationContext._({required UserDto user})
-    : currentUser = user,
-      service = ServiceMocks(),
-      repository = RepositoryMocks() {
+  PresentationContext._({required UserDto user}) : currentUser = user, mocks = ServiceMocks() {
     setup();
   }
 
@@ -39,16 +31,9 @@ class PresentationContext {
   static Drift? _db;
 
   final UserDto currentUser;
-  final ServiceMocks service;
-  final RepositoryMocks repository;
+  final ServiceMocks mocks;
 
-  List<Override> get overrides => [
-    currentUserProvider.overrideWith((ref) => CurrentUserProvider(service.user.service)),
-    assetServiceProvider.overrideWithValue(service.asset.service),
-    partnerServiceProvider.overrideWithValue(service.partner.service),
-    toastRepositoryProvider.overrideWithValue(repository.toast),
-    gCastServiceProvider.overrideWithValue(MockGCastService()),
-  ];
+  List<Override> get overrides => [currentUserProvider.overrideWith((ref) => CurrentUserProvider(mocks.user.service))];
 
   static Future<PresentationContext> create() async {
     TestUtils.init();
@@ -62,18 +47,18 @@ class PresentationContext {
   }
 
   void setup() {
-    when(service.user.tryGetMyUser).thenReturn(currentUser);
+    when(mocks.user.tryGetMyUser).thenReturn(currentUser);
   }
 
   void dispose() {
     addTearDown(() {
-      service.resetAll();
+      mocks.resetAll();
     });
   }
 }
 
 extension PumpPresentationWidget on WidgetTester {
-  Future<void> pumpTestWidget(PresentationContext context, Widget widget, {List<Override> overrides = const []}) async {
+  Future<void> pumpTestWidget(Widget widget, {List<Override> overrides = const []}) async {
     await pumpWidget(
       EasyLocalization(
         supportedLocales: locales.values.toList(),
@@ -84,7 +69,7 @@ extension PumpPresentationWidget on WidgetTester {
         useFallbackTranslations: true,
         assetLoader: const CodegenLoader(),
         child: ProviderScope(
-          overrides: [...context.overrides, ...overrides],
+          overrides: overrides,
           child: Builder(
             builder: (context) => MaterialApp(
               debugShowCheckedModeBanner: false,
@@ -101,34 +86,10 @@ extension PumpPresentationWidget on WidgetTester {
     await pumpAndSettle();
   }
 
-  Future<BaseAction> pumpTestAction(
-    PresentationContext context,
-    BaseAction Function(ActionScope scope) build, {
-    List<Override> overrides = const [],
-  }) async {
-    final action = await pumpActionButton(context, build, overrides: overrides);
+  Future<void> pumpTestAction(BaseAction action, {List<Override> overrides = const []}) async {
+    await pumpTestWidget(ActionIconButtonWidget(action: action), overrides: overrides);
     await tap(find.byType(ImmichIconButton));
     await pump();
-    return action;
-  }
-
-  Future<BaseAction> pumpActionButton(
-    PresentationContext context,
-    BaseAction Function(ActionScope scope) build, {
-    List<Override> overrides = const [],
-  }) async {
-    late BaseAction action;
-    await pumpTestWidget(
-      context,
-      Consumer(
-        builder: (innerContext, ref, _) {
-          action = build(ActionScope(context: innerContext, ref: ref, authUser: context.currentUser));
-          return ActionIconButtonWidget(action: action);
-        },
-      ),
-      overrides: overrides,
-    );
-    return action;
   }
 
   Future<void> pumpUntilFound(Finder finder, {int maxFrames = 10}) async {

mobile/test/unit/services/hash_service_test.dart

@@ -14,11 +14,14 @@ void main() {
 
   setUp(() {
     sut = HashService(
-      localAlbumRepository: mocks.localAlbum.repo,
-      localAssetRepository: mocks.localAsset.repo,
-      nativeSyncApi: mocks.nativeApi.api,
+      localAlbumRepository: mocks.localAlbum,
+      localAssetRepository: mocks.localAsset,
+      nativeSyncApi: mocks.nativeApi,
       trashedLocalAssetRepository: mocks.trashedAsset,
     );
+
+    when(() => mocks.localAsset.reconcileHashesFromCloudId()).thenAnswer((_) async => {});
+    when(() => mocks.localAsset.updateHashes(any())).thenAnswer((_) async => {});
   });
 
   tearDown(() {
@@ -29,20 +32,22 @@ void main() {
     group('hashAssets', () {
       test('skips albums with no assets to hash', () async {
         final album = LocalAlbumFactory.create(assetCount: 0);
-        when(mocks.localAlbum.getBackupAlbums).thenAnswer((_) async => [album]);
+        when(() => mocks.localAlbum.getBackupAlbums()).thenAnswer((_) async => [album]);
+        when(() => mocks.localAlbum.getAssetsToHash(album.id)).thenAnswer((_) async => []);
 
         await sut.hashAssets();
 
-        verifyNever(mocks.nativeApi.hashAssets);
+        verifyNever(() => mocks.nativeApi.hashAssets(any(), allowNetworkAccess: any(named: 'allowNetworkAccess')));
       });
 
       test('skips empty batches', () async {
         final album = LocalAlbumFactory.create();
-        when(mocks.localAlbum.getBackupAlbums).thenAnswer((_) async => [album]);
+        when(() => mocks.localAlbum.getBackupAlbums()).thenAnswer((_) async => [album]);
+        when(() => mocks.localAlbum.getAssetsToHash(album.id)).thenAnswer((_) async => []);
 
         await sut.hashAssets();
 
-        verifyNever(mocks.nativeApi.hashAssets);
+        verifyNever(() => mocks.nativeApi.hashAssets(any(), allowNetworkAccess: any(named: 'allowNetworkAccess')));
       });
 
       test('processes assets when available', () async {
@@ -50,17 +55,15 @@ void main() {
         final asset = LocalAssetFactory.create();
         final result = HashResult(assetId: asset.id, hash: 'test-hash');
 
-        when(mocks.localAlbum.getBackupAlbums).thenAnswer((_) async => [album]);
-        when(() => mocks.localAlbum.repo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
-        when(
-          () => mocks.nativeApi.api.hashAssets([asset.id], allowNetworkAccess: false),
-        ).thenAnswer((_) async => [result]);
+        when(() => mocks.localAlbum.getBackupAlbums()).thenAnswer((_) async => [album]);
+        when(() => mocks.localAlbum.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
+        when(() => mocks.nativeApi.hashAssets([asset.id], allowNetworkAccess: false)).thenAnswer((_) async => [result]);
 
         await sut.hashAssets();
 
-        verify(() => mocks.nativeApi.api.hashAssets([asset.id], allowNetworkAccess: false)).called(1);
+        verify(() => mocks.nativeApi.hashAssets([asset.id], allowNetworkAccess: false)).called(1);
         final captured =
-            verify(() => mocks.localAsset.repo.updateHashes(captureAny())).captured.first as Map<String, String>;
+            verify(() => mocks.localAsset.updateHashes(captureAny())).captured.first as Map<String, String>;
         expect(captured.length, 1);
         expect(captured[asset.id], result.hash);
       });
@@ -69,16 +72,16 @@ void main() {
         final album = LocalAlbumFactory.create();
         final asset = LocalAssetFactory.create();
 
-        when(mocks.localAlbum.getBackupAlbums).thenAnswer((_) async => [album]);
-        when(() => mocks.localAlbum.repo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
+        when(() => mocks.localAlbum.getBackupAlbums()).thenAnswer((_) async => [album]);
+        when(() => mocks.localAlbum.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
         when(
-          () => mocks.nativeApi.api.hashAssets([asset.id], allowNetworkAccess: false),
+          () => mocks.nativeApi.hashAssets([asset.id], allowNetworkAccess: false),
         ).thenAnswer((_) async => [HashResult(assetId: asset.id, error: 'Failed to hash')]);
 
         await sut.hashAssets();
 
         final captured =
-            verify(() => mocks.localAsset.repo.updateHashes(captureAny())).captured.first as Map<String, String>;
+            verify(() => mocks.localAsset.updateHashes(captureAny())).captured.first as Map<String, String>;
         expect(captured.length, 0);
       });
 
@@ -86,25 +89,25 @@ void main() {
         final album = LocalAlbumFactory.create();
         final asset = LocalAssetFactory.create();
 
-        when(mocks.localAlbum.getBackupAlbums).thenAnswer((_) async => [album]);
-        when(() => mocks.localAlbum.repo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
+        when(() => mocks.localAlbum.getBackupAlbums()).thenAnswer((_) async => [album]);
+        when(() => mocks.localAlbum.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
         when(
-          () => mocks.nativeApi.api.hashAssets([asset.id], allowNetworkAccess: false),
+          () => mocks.nativeApi.hashAssets([asset.id], allowNetworkAccess: false),
         ).thenAnswer((_) async => [HashResult(assetId: asset.id, hash: null)]);
 
         await sut.hashAssets();
 
         final captured =
-            verify(() => mocks.localAsset.repo.updateHashes(captureAny())).captured.first as Map<String, String>;
+            verify(() => mocks.localAsset.updateHashes(captureAny())).captured.first as Map<String, String>;
         expect(captured.length, 0);
       });
 
       test('batches by size limit', () async {
         const batchSize = 2;
         final sut = HashService(
-          localAlbumRepository: mocks.localAlbum.repo,
-          localAssetRepository: mocks.localAsset.repo,
-          nativeSyncApi: mocks.nativeApi.api,
+          localAlbumRepository: mocks.localAlbum,
+          localAssetRepository: mocks.localAsset,
+          nativeSyncApi: mocks.nativeApi,
           batchSize: batchSize,
           trashedLocalAssetRepository: mocks.trashedAsset,
         );
@@ -116,9 +119,12 @@ void main() {
 
         final capturedCalls = <List<String>>[];
 
-        when(mocks.localAlbum.getBackupAlbums).thenAnswer((_) async => [album]);
-        when(() => mocks.localAlbum.repo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset1, asset2, asset3]);
-        when(mocks.nativeApi.hashAssets).thenAnswer((invocation) async {
+        when(() => mocks.localAsset.updateHashes(any())).thenAnswer((_) async => {});
+        when(() => mocks.localAlbum.getBackupAlbums()).thenAnswer((_) async => [album]);
+        when(() => mocks.localAlbum.getAssetsToHash(album.id)).thenAnswer((_) async => [asset1, asset2, asset3]);
+        when(() => mocks.nativeApi.hashAssets(any(), allowNetworkAccess: any(named: 'allowNetworkAccess'))).thenAnswer((
+          invocation,
+        ) async {
           final assetIds = invocation.positionalArguments[0] as List<String>;
           capturedCalls.add(List<String>.from(assetIds));
           return assetIds.map((id) => HashResult(assetId: id, hash: '$id-hash')).toList();
@@ -130,7 +136,7 @@ void main() {
         expect(capturedCalls[0], [asset1.id, asset2.id], reason: 'First call should batch the first two assets');
         expect(capturedCalls[1], [asset3.id], reason: 'Second call should have the remaining asset');
 
-        verify(() => mocks.localAsset.repo.updateHashes(any())).called(2);
+        verify(() => mocks.localAsset.updateHashes(any())).called(2);
       });
 
       test('handles mixed success and failure in batch', () async {
@@ -138,9 +144,9 @@ void main() {
         final asset1 = LocalAssetFactory.create();
         final asset2 = LocalAssetFactory.create();
 
-        when(mocks.localAlbum.getBackupAlbums).thenAnswer((_) async => [album]);
-        when(() => mocks.localAlbum.repo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset1, asset2]);
-        when(() => mocks.nativeApi.api.hashAssets([asset1.id, asset2.id], allowNetworkAccess: false)).thenAnswer(
+        when(() => mocks.localAlbum.getBackupAlbums()).thenAnswer((_) async => [album]);
+        when(() => mocks.localAlbum.getAssetsToHash(album.id)).thenAnswer((_) async => [asset1, asset2]);
+        when(() => mocks.nativeApi.hashAssets([asset1.id, asset2.id], allowNetworkAccess: false)).thenAnswer(
           (_) async => [
             HashResult(assetId: asset1.id, hash: 'asset1-hash'),
             HashResult(assetId: asset2.id, error: 'Failed to hash asset2'),
@@ -150,7 +156,7 @@ void main() {
         await sut.hashAssets();
 
         final captured =
-            verify(() => mocks.localAsset.repo.updateHashes(captureAny())).captured.first as Map<String, String>;
+            verify(() => mocks.localAsset.updateHashes(captureAny())).captured.first as Map<String, String>;
         expect(captured.length, 1);
         expect(captured[asset1.id], 'asset1-hash');
       });
@@ -161,18 +167,20 @@ void main() {
         final asset1 = LocalAssetFactory.create();
         final asset2 = LocalAssetFactory.create();
 
-        when(mocks.localAlbum.getBackupAlbums).thenAnswer((_) async => [selectedAlbum, nonSelectedAlbum]);
-        when(() => mocks.localAlbum.repo.getAssetsToHash(selectedAlbum.id)).thenAnswer((_) async => [asset1]);
-        when(() => mocks.localAlbum.repo.getAssetsToHash(nonSelectedAlbum.id)).thenAnswer((_) async => [asset2]);
-        when(mocks.nativeApi.hashAssets).thenAnswer((invocation) async {
+        when(() => mocks.localAlbum.getBackupAlbums()).thenAnswer((_) async => [selectedAlbum, nonSelectedAlbum]);
+        when(() => mocks.localAlbum.getAssetsToHash(selectedAlbum.id)).thenAnswer((_) async => [asset1]);
+        when(() => mocks.localAlbum.getAssetsToHash(nonSelectedAlbum.id)).thenAnswer((_) async => [asset2]);
+        when(() => mocks.nativeApi.hashAssets(any(), allowNetworkAccess: any(named: 'allowNetworkAccess'))).thenAnswer((
+          invocation,
+        ) async {
           final assetIds = invocation.positionalArguments[0] as List<String>;
           return assetIds.map((id) => HashResult(assetId: id, hash: '$id-hash')).toList();
         });
 
         await sut.hashAssets();
 
-        verify(() => mocks.nativeApi.api.hashAssets([asset1.id], allowNetworkAccess: true)).called(1);
-        verify(() => mocks.nativeApi.api.hashAssets([asset2.id], allowNetworkAccess: false)).called(1);
+        verify(() => mocks.nativeApi.hashAssets([asset1.id], allowNetworkAccess: true)).called(1);
+        verify(() => mocks.nativeApi.hashAssets([asset2.id], allowNetworkAccess: false)).called(1);
       });
     });
   });

mobile/test/unit/services/timeline_service_test.dart

@@ -0,0 +1,100 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/constants/constants.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/timeline.model.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
+
+import '../factories/remote_asset_factory.dart';
+
+void main() {
+  // total must exceed the sliding buffer so it cannot hold the whole library at once
+  const total = 2000;
+  late List<BaseAsset> all;
+  late TimelineService sut;
+
+  TimelineService buildService() {
+    all = List.generate(total, (i) => RemoteAssetFactory.create(id: 'a${i.toString().padLeft(5, '0')}'));
+    return TimelineService((
+      assetSource: (index, count) async {
+        final end = (index + count) > total ? total : index + count;
+        return all.sublist(index, end);
+      },
+      bucketSource: () => Stream.value([const Bucket(assetCount: total)]),
+      origin: TimelineOrigin.main,
+    ));
+  }
+
+  Future<void> settle() => Future.delayed(const Duration(milliseconds: 10));
+
+  setUp(() async {
+    sut = buildService();
+    await settle(); // let the bucket subscription load the first batch and set totalAssets
+  });
+
+  tearDown(() async {
+    await sut.dispose();
+  });
+
+  test('buffer holds the first batch but not the whole library', () {
+    expect(sut.totalAssets, total);
+    expect(sut.hasRange(0, kTimelineAssetLoadBatchSize), isTrue);
+    expect(sut.hasRange(0, total), isFalse);
+  });
+
+  // #27118 / #20855 mechanism: drag-selecting from a low anchor while the grid
+  // auto-scrolls down slides the buffer forward to follow the finger. once the
+  // buffer offset passes the anchor, hasRange(anchor, ...) is false and
+  // _handleDragAssetEnter silently stops extending the selection.
+  test('anchor drops out of the buffer after the grid scrolls down', () async {
+    const anchor = 5;
+    expect(sut.hasRange(anchor, 100), isTrue);
+
+    // the grid loads a far-down range as it auto-scrolls during the drag
+    await sut.loadAssets(1500, 1);
+
+    const current = 1500;
+    const count = current - anchor + 1;
+    expect(sut.hasRange(anchor, 1), isFalse, reason: 'anchor is now below the buffer offset');
+    expect(sut.hasRange(anchor, count), isFalse, reason: 'the full drag range is no longer resident');
+    expect(() => sut.getAssets(anchor, count), throwsRangeError);
+  });
+
+  // the fix: getAssetsRange returns the whole drag range regardless of the
+  // buffer position, so the selection keeps extending while scrolling.
+  group('getAssetsRange', () {
+    test('returns a buffered range', () async {
+      final assets = await sut.getAssetsRange(0, 50);
+      expect(assets.length, 50);
+      expect(assets.first, all[0]);
+      expect(assets.last, all[49]);
+    });
+
+    test('returns a range wider than the buffer', () async {
+      final assets = await sut.getAssetsRange(0, total);
+      expect(assets.length, total);
+      expect(assets.first, all[0]);
+      expect(assets.last, all[total - 1]);
+    });
+
+    test('returns the anchor range after the buffer scrolled past the anchor', () async {
+      const anchor = 5;
+      await sut.loadAssets(1500, 1); // buffer slides forward, dropping the anchor
+      expect(sut.hasRange(anchor, 1), isFalse);
+
+      const current = 1500;
+      const count = current - anchor + 1;
+      final assets = await sut.getAssetsRange(anchor, count);
+      expect(assets.length, count);
+      expect(assets.first, all[anchor]);
+      expect(assets.last, all[current]);
+    });
+
+    test('clamps a range that runs past the end and ignores invalid input', () async {
+      final tail = await sut.getAssetsRange(total - 10, 100);
+      expect(tail.length, 10);
+      expect(await sut.getAssetsRange(-1, 10), isEmpty);
+      expect(await sut.getAssetsRange(0, 0), isEmpty);
+      expect(await sut.getAssetsRange(total, 10), isEmpty);
+    });
+  });
+}

mobile/test/unit/utils/asset_filter_test.dart

@@ -1,200 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/utils/asset_filter.dart';
-
-import '../factories/local_asset_factory.dart';
-import '../factories/remote_asset_factory.dart';
-
-void main() {
-  group('AssetFilter', () {
-    group('type promotion', () {
-      test('a bare filter retains every BaseAsset', () {
-        final remoteAsset = RemoteAssetFactory.create();
-        final localAsset = LocalAssetFactory.create();
-
-        final AssetFilter<BaseAsset> filter = AssetFilter(<BaseAsset>[remoteAsset, localAsset]);
-
-        expect(filter.toList(), [remoteAsset, localAsset]);
-      });
-
-      test('remote keeps only remote assets', () {
-        final remoteAsset = RemoteAssetFactory.create();
-        final localAsset = LocalAssetFactory.create();
-
-        final AssetFilter<RemoteAsset> remoteOnly = AssetFilter(<BaseAsset>[remoteAsset, localAsset]).remote();
-
-        expect(remoteOnly.toList(), [remoteAsset]);
-      });
-
-      test('local keeps only local assets', () {
-        final remoteAsset = RemoteAssetFactory.create();
-        final localAsset = LocalAssetFactory.create();
-
-        final AssetFilter<LocalAsset> localOnly = AssetFilter(<BaseAsset>[remoteAsset, localAsset]).local();
-
-        expect(localOnly.toList(), [localAsset]);
-      });
-
-      test('owned promotes to RemoteAsset and drops local assets', () {
-        final remoteAsset = RemoteAssetFactory.create();
-        final localAsset = LocalAssetFactory.create();
-
-        final AssetFilter<RemoteAsset> remoteOnly = AssetFilter(<BaseAsset>[
-          remoteAsset,
-          localAsset,
-        ]).owned(remoteAsset.ownerId);
-
-        expect(remoteOnly.toList(), [remoteAsset]);
-      });
-
-      test('backedUp promotes to LocalAsset and drops remote assets', () {
-        final syncedPhoto = LocalAssetFactory.create().copyWith(remoteId: 'remote');
-        final offlinePhoto = LocalAssetFactory.create();
-        final remotePhoto = RemoteAssetFactory.create();
-
-        final AssetFilter<LocalAsset> syncedPhotos = AssetFilter(<BaseAsset>[
-          syncedPhoto,
-          offlinePhoto,
-          remotePhoto,
-        ]).backedUp();
-
-        expect(syncedPhotos.toList(), [syncedPhoto]);
-      });
-    });
-
-    group('named filters', () {
-      test('owned keeps only assets of the given owner', () {
-        final asset1 = RemoteAssetFactory.create();
-        final asset2 = RemoteAssetFactory.create();
-
-        final alexPhotos = AssetFilter([asset1, asset2]).owned(asset1.ownerId);
-
-        expect(alexPhotos.toList(), [asset1]);
-      });
-
-      test('favorites keeps only favorite assets', () {
-        final asset1 = RemoteAssetFactory.create(isFavorite: true);
-        final asset2 = RemoteAssetFactory.create(ownerId: asset1.ownerId);
-
-        final favorites = AssetFilter([asset1, asset2]).favorite();
-
-        expect(favorites.toList(), [asset1]);
-      });
-
-      test('type keeps only assets of the given type', () {
-        final image = RemoteAssetFactory.create();
-        final video = RemoteAssetFactory.create(ownerId: image.ownerId).copyWith(type: .video);
-
-        final videos = AssetFilter([image, video]).type(.video);
-
-        expect(videos.toList(), [video]);
-      });
-
-      test('visibility keeps only assets with the given visibility', () {
-        final locked = RemoteAssetFactory.create(visibility: AssetVisibility.locked);
-        final onTimeline = RemoteAssetFactory.create(ownerId: locked.ownerId);
-
-        final lockedPhotos = AssetFilter([locked, onTimeline]).visibility(.locked);
-
-        expect(lockedPhotos.toList(), [locked]);
-      });
-
-      test('archived keeps only archived assets', () {
-        final archived = RemoteAssetFactory.create(visibility: AssetVisibility.archive);
-        final onTimeline = RemoteAssetFactory.create(ownerId: archived.ownerId);
-
-        final archivedPhotos = AssetFilter([archived, onTimeline]).archived();
-
-        expect(archivedPhotos.toList(), [archived]);
-      });
-
-      test('stacked keeps only assets belonging to a stack', () {
-        final stacked = RemoteAssetFactory.create(stackId: 'stack');
-        final loose = RemoteAssetFactory.create(ownerId: stacked.ownerId);
-
-        final stackedPhotos = AssetFilter([stacked, loose]).stacked();
-
-        expect(stackedPhotos.toList(), [stacked]);
-      });
-    });
-
-    group('inversion', () {
-      test('notArchived keeps every non-archived visibility', () {
-        final archived = RemoteAssetFactory.create(visibility: AssetVisibility.archive);
-        final onTimeline = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.timeline);
-        final hidden = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.hidden);
-        final locked = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.locked);
-
-        final visiblePhotos = AssetFilter([archived, onTimeline, hidden, locked]).archived(isArchived: false);
-
-        expect(visiblePhotos.toSet(), {onTimeline, hidden, locked});
-      });
-
-      test('notVisibility keeps every asset not at the target visibility', () {
-        final archived = RemoteAssetFactory.create(visibility: AssetVisibility.archive);
-        final onTimeline = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.timeline);
-        final locked = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.locked);
-
-        final toArchive = AssetFilter([archived, onTimeline, locked]).notVisibility(.archive);
-
-        expect(toArchive.toSet(), {onTimeline, locked});
-      });
-
-      test('notStacked keeps only assets without a stack', () {
-        final stacked = RemoteAssetFactory.create(stackId: 'stack');
-        final loose = RemoteAssetFactory.create(ownerId: stacked.ownerId);
-
-        final loosePhotos = AssetFilter([stacked, loose]).stacked(isStacked: false);
-
-        expect(loosePhotos.toList(), [loose]);
-      });
-
-      test('whereNot inverts an arbitrary predicate', () {
-        final favorite = RemoteAssetFactory.create(isFavorite: true);
-        final regular = RemoteAssetFactory.create(ownerId: favorite.ownerId);
-
-        final nonFavorites = AssetFilter([favorite, regular]).whereNot((asset) => asset.isFavorite);
-
-        expect(nonFavorites.toList(), [regular]);
-      });
-
-      test('notFavorites keeps only non-favorite assets', () {
-        final favorite = RemoteAssetFactory.create(isFavorite: true);
-        final regular = RemoteAssetFactory.create(ownerId: favorite.ownerId);
-
-        final nonFavorites = AssetFilter([favorite, regular]).favorite(isFavorite: false);
-
-        expect(nonFavorites.toList(), [regular]);
-      });
-    });
-
-    group('chaining', () {
-      test('combines predicates across owner, visibility and stack', () {
-        final asset = RemoteAssetFactory.create();
-        final wrongOwner = RemoteAssetFactory.create();
-        final archived = RemoteAssetFactory.create(ownerId: asset.ownerId, visibility: AssetVisibility.archive);
-        final stacked = RemoteAssetFactory.create(ownerId: asset.ownerId, stackId: 'stack-1');
-        final localPhoto = LocalAssetFactory.create();
-
-        final result = AssetFilter(<BaseAsset>[
-          asset,
-          wrongOwner,
-          archived,
-          stacked,
-          localPhoto,
-        ]).owned(asset.ownerId).archived(isArchived: false).stacked(isStacked: false);
-
-        expect(result.toList(), [asset]);
-      });
-
-      test('a base filter after a promotion retains the promoted type', () {
-        final favorite = RemoteAssetFactory.create(isFavorite: true);
-        final regular = RemoteAssetFactory.create(ownerId: favorite.ownerId);
-
-        final AssetFilter<RemoteAsset> result = AssetFilter([favorite, regular]).owned(favorite.ownerId).favorite();
-
-        expect(result.toList(), [favorite]);
-      });
-    });
-  });
-}

mobile/test/utils_legacy/action_button_utils_test.dart

@@ -1,14 +1,11 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:hooks_riverpod/hooks_riverpod.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';
 
-import '../unit/presentation/presentation_context.dart';
-
 LocalAsset createLocalAsset({
   String? remoteId,
   String name = 'test.jpg',
@@ -80,23 +77,6 @@ RemoteAlbum createRemoteAlbum({
   );
 }
 
-ActionButtonContext _buttonContext({
-  required BaseAsset asset,
-  RemoteAlbum? currentAlbum,
-  bool isArchived = false,
-  bool isStacked = false,
-}) => ActionButtonContext(
-  asset: asset,
-  isOwner: true,
-  isArchived: isArchived,
-  isTrashEnabled: true,
-  isInLockedView: false,
-  currentAlbum: currentAlbum,
-  advancedTroubleshooting: false,
-  isStacked: isStacked,
-  source: ActionSource.timeline,
-);
-
 void main() {
   group('ActionButtonContext', () {
     test('should create context with all required parameters', () {
@@ -1074,101 +1054,188 @@ void main() {
   });
 
   group('ActionButtonType.buildButton', () {
-    late PresentationContext presentation;
     late BaseAsset asset;
+    late ActionButtonContext context;
 
-    setUp(() async {
-      presentation = await PresentationContext.create();
+    setUp(() {
       asset = createLocalAsset(remoteId: 'remote-id');
-    });
-
-    tearDown(() {
-      presentation.dispose();
-    });
-
-    testWidgets('builds a widget for every button type', (tester) async {
-      final built = <Widget>[];
-      await tester.pumpTestWidget(
-        presentation,
-        Consumer(
-          builder: (buildContext, ref, _) {
-            for (final buttonType in ActionButtonType.values) {
-              final buttonContext = switch (buttonType) {
-                ActionButtonType.similarPhotos => _buttonContext(asset: createRemoteAsset()),
-                ActionButtonType.removeFromAlbum ||
-                ActionButtonType.setAlbumCover => _buttonContext(asset: asset, currentAlbum: createRemoteAlbum()),
-                ActionButtonType.unstack => _buttonContext(
-                  asset: asset,
-                  currentAlbum: createRemoteAlbum(),
-                  isStacked: true,
-                ),
-                _ => _buttonContext(asset: asset),
-              };
-              built.add(buttonType.buildButton(buttonContext, buildContext, ref));
-            }
-            return const SizedBox.shrink();
-          },
-        ),
+      context = ActionButtonContext(
+        asset: asset,
+        isOwner: true,
+        isArchived: false,
+        isTrashEnabled: true,
+        isInLockedView: false,
+        currentAlbum: null,
+        advancedTroubleshooting: false,
+        isStacked: false,
+        source: ActionSource.timeline,
       );
+    });
 
-      expect(built, hasLength(ActionButtonType.values.length));
-      expect(built, everyElement(isA<Widget>()));
+    test('should build correct widget for each button type', () {
+      for (final buttonType in ActionButtonType.values) {
+        var buttonContext = context;
+
+        if (buttonType == ActionButtonType.removeFromAlbum) {
+          final album = createRemoteAlbum();
+          final contextWithAlbum = ActionButtonContext(
+            asset: asset,
+            isOwner: true,
+            isArchived: false,
+            isTrashEnabled: true,
+            isInLockedView: false,
+            currentAlbum: album,
+            advancedTroubleshooting: false,
+            isStacked: false,
+            source: ActionSource.timeline,
+          );
+          final widget = buttonType.buildButton(contextWithAlbum);
+          expect(widget, isA<Widget>());
+        } else if (buttonType == ActionButtonType.similarPhotos) {
+          final contextWithAlbum = ActionButtonContext(
+            asset: createRemoteAsset(),
+            isOwner: true,
+            isArchived: false,
+            isTrashEnabled: true,
+            isInLockedView: false,
+            currentAlbum: null,
+            advancedTroubleshooting: false,
+            isStacked: false,
+            source: ActionSource.timeline,
+          );
+          final widget = buttonType.buildButton(contextWithAlbum);
+          expect(widget, isA<Widget>());
+        } else if (buttonType == ActionButtonType.setAlbumCover) {
+          final album = createRemoteAlbum();
+          final contextWithAlbum = ActionButtonContext(
+            asset: asset,
+            isOwner: true,
+            isArchived: false,
+            isTrashEnabled: true,
+            isInLockedView: false,
+            currentAlbum: album,
+            advancedTroubleshooting: false,
+            isStacked: false,
+            source: ActionSource.timeline,
+          );
+          final widget = buttonType.buildButton(contextWithAlbum);
+          expect(widget, isA<Widget>());
+        } else if (buttonType == ActionButtonType.unstack) {
+          final album = createRemoteAlbum();
+          final contextWithAlbum = ActionButtonContext(
+            asset: asset,
+            isOwner: true,
+            isArchived: false,
+            isTrashEnabled: true,
+            isInLockedView: false,
+            currentAlbum: album,
+            advancedTroubleshooting: false,
+            isStacked: true,
+            source: ActionSource.timeline,
+          );
+          final widget = buttonType.buildButton(contextWithAlbum);
+          expect(widget, isA<Widget>());
+        } else {
+          final widget = buttonType.buildButton(buttonContext);
+          expect(widget, isA<Widget>());
+        }
+      }
     });
   });
 
   group('ActionButtonBuilder', () {
-    late PresentationContext presentation;
-
-    setUp(() async {
-      presentation = await PresentationContext.create();
-    });
-
-    tearDown(() {
-      presentation.dispose();
-    });
-
-    Future<List<Widget>> buildButtons(WidgetTester tester, ActionButtonContext context) async {
-      late List<Widget> widgets;
-      await tester.pumpTestWidget(
-        presentation,
-        Consumer(
-          builder: (buildContext, ref, _) {
-            widgets = ActionButtonBuilder.build(context, buildContext, ref);
-            return const SizedBox.shrink();
-          },
-        ),
-      );
-      return widgets;
-    }
-
-    testWidgets('returns buttons that should show', (tester) async {
-      final widgets = await buildButtons(tester, _buttonContext(asset: createRemoteAsset()));
-      expect(widgets, isNotEmpty);
-    });
-
-    testWidgets('includes album-specific buttons when album is present', (tester) async {
-      final widgets = await buildButtons(
-        tester,
-        _buttonContext(
-          asset: createRemoteAsset(),
-          currentAlbum: createRemoteAlbum(isActivityEnabled: true, isShared: true),
-        ),
-      );
-      expect(widgets, isNotEmpty);
-    });
-
-    testWidgets('includes local buttons for local assets', (tester) async {
-      final widgets = await buildButtons(tester, _buttonContext(asset: createLocalAsset()));
-      expect(widgets, isNotEmpty);
-    });
-
-    testWidgets('respects archived state', (tester) async {
+    test('should return buttons that should show', () {
       final remoteAsset = createRemoteAsset();
-      final archived = await buildButtons(tester, _buttonContext(asset: remoteAsset, isArchived: true));
-      final nonArchived = await buildButtons(tester, _buttonContext(asset: remoteAsset, isArchived: false));
+      final context = ActionButtonContext(
+        asset: remoteAsset,
+        isOwner: true,
+        isArchived: false,
+        isTrashEnabled: true,
+        isInLockedView: false,
+        currentAlbum: null,
+        advancedTroubleshooting: false,
+        isStacked: false,
+        source: ActionSource.timeline,
+      );
 
-      expect(archived, isNotEmpty);
-      expect(nonArchived, isNotEmpty);
+      final widgets = ActionButtonBuilder.build(context);
+
+      expect(widgets, isNotEmpty);
+      expect(widgets.length, greaterThan(0));
+    });
+
+    test('should include album-specific buttons when album is present', () {
+      final remoteAsset = createRemoteAsset();
+      final album = createRemoteAlbum(isActivityEnabled: true, isShared: true);
+      final context = ActionButtonContext(
+        asset: remoteAsset,
+        isOwner: true,
+        isArchived: false,
+        isTrashEnabled: true,
+        isInLockedView: false,
+        currentAlbum: album,
+        advancedTroubleshooting: false,
+        isStacked: false,
+        source: ActionSource.timeline,
+      );
+
+      final widgets = ActionButtonBuilder.build(context);
+
+      expect(widgets, isNotEmpty);
+    });
+
+    test('should only include local buttons for local assets', () {
+      final localAsset = createLocalAsset();
+      final context = ActionButtonContext(
+        asset: localAsset,
+        isOwner: true,
+        isArchived: false,
+        isTrashEnabled: true,
+        isInLockedView: false,
+        currentAlbum: null,
+        advancedTroubleshooting: false,
+        isStacked: false,
+        source: ActionSource.timeline,
+      );
+
+      final widgets = ActionButtonBuilder.build(context);
+
+      expect(widgets, isNotEmpty);
+    });
+
+    test('should respect archived state', () {
+      final remoteAsset = createRemoteAsset();
+
+      final archivedContext = ActionButtonContext(
+        asset: remoteAsset,
+        isOwner: true,
+        isArchived: true,
+        isTrashEnabled: true,
+        isInLockedView: false,
+        currentAlbum: null,
+        advancedTroubleshooting: false,
+        isStacked: false,
+        source: ActionSource.timeline,
+      );
+
+      final archivedWidgets = ActionButtonBuilder.build(archivedContext);
+
+      final nonArchivedContext = ActionButtonContext(
+        asset: remoteAsset,
+        isOwner: true,
+        isArchived: false,
+        isTrashEnabled: true,
+        isInLockedView: false,
+        currentAlbum: null,
+        advancedTroubleshooting: false,
+        isStacked: false,
+        source: ActionSource.timeline,
+      );
+
+      final nonArchivedWidgets = ActionButtonBuilder.build(nonArchivedContext);
+
+      expect(archivedWidgets, isNotEmpty);
+      expect(nonArchivedWidgets, isNotEmpty);
     });
   });
 }

mobile/test/widget_tester_extensions.dart

@@ -1,51 +1,27 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/locales.dart';
-import 'package:immich_mobile/generated/codegen_loader.g.dart';
 
 extension PumpConsumerWidget on WidgetTester {
-  /// Wraps the provided [widget] with a localized Material app such that it
-  /// becomes:
-  ///
-  /// EasyLocalization
-  ///   |-ProviderScope
-  ///     |-MaterialApp (localization delegates wired up)
-  ///       |-Material
-  ///         |-[widget]
+  /// Wraps the provided [widget] with Material app such that it becomes:
   ///
+  /// ProviderScope
+  ///   |-MaterialApp
+  ///     |-Material
+  ///       |-[widget]
   Future<void> pumpConsumerWidget(
     Widget widget, {
     Duration? duration,
     EnginePhase phase = EnginePhase.sendSemanticsUpdate,
     List<Override> overrides = const [],
   }) async {
-    await pumpWidget(
-      EasyLocalization(
-        supportedLocales: locales.values.toList(),
-        path: translationsPath,
-        startLocale: locales.values.first,
-        fallbackLocale: locales.values.first,
-        saveLocale: false,
-        useFallbackTranslations: true,
-        assetLoader: const CodegenLoader(),
-        child: ProviderScope(
-          overrides: overrides,
-          child: Builder(
-            builder: (context) => MaterialApp(
-              debugShowCheckedModeBanner: false,
-              localizationsDelegates: context.localizationDelegates,
-              supportedLocales: context.supportedLocales,
-              locale: context.locale,
-              home: Material(child: widget),
-            ),
-          ),
-        ),
+    return pumpWidget(
+      ProviderScope(
+        overrides: overrides,
+        child: MaterialApp(debugShowCheckedModeBanner: false, home: Material(child: widget)),
       ),
       duration: duration,
       phase: phase,
     );
-    await pumpAndSettle();
   }
 }

server/src/repositories/metadata.repository.ts

@@ -53,10 +53,10 @@ export interface ImmichTags extends Omit<Tags, TagsWithWrongTypes> {
     RegionList: {
       Area: {
         // (X,Y) // center of the rectangle
-        X: number | string;
-        Y: number | string;
-        W: number | string;
-        H: number | string;
+        X: number;
+        Y: number;
+        W: number;
+        H: number;
         Unit: string;
       };
       Rotation?: number;

server/src/services/metadata.service.spec.ts

@@ -39,10 +39,7 @@ const forSidecarJob = (
   };
 };
 
-const makeFaceTags = (
-  face: Partial<{ Name: string }> = {},
-  orientation?: ImmichTags['Orientation'],
-): Partial<ImmichTags> => ({
+const makeFaceTags = (face: Partial<{ Name: string }> = {}, orientation?: ImmichTags['Orientation']) => ({
   Orientation: orientation,
   RegionInfo: {
     AppliedToDimensions: { W: 1000, H: 100, Unit: 'pixel' },
@@ -1374,35 +1371,6 @@ describe(MetadataService.name, () => {
       expect(mocks.person.updateAll).not.toHaveBeenCalled();
     });
 
-    it('should handle string coordinates in face region bounding box calculation by limiting to 16 decimal places', async () => {
-      const asset = AssetFactory.create();
-      const person = PersonFactory.create();
-
-      mocks.assetJob.getForMetadataExtraction.mockResolvedValue(getForMetadataExtraction(asset));
-      mocks.systemMetadata.get.mockResolvedValue({ metadata: { faces: { import: true } } });
-      const faceTags = makeFaceTags({ Name: person.name });
-
-      // Simulating EXIF returning a string with >16 decimal places
-      faceTags.RegionInfo!.RegionList[0].Area.X = '0.48564814814814824';
-      faceTags.RegionInfo!.RegionList[0].Area.W = '0.2';
-
-      mockReadTags(faceTags);
-      mocks.person.getDistinctNames.mockResolvedValue([]);
-      mocks.person.createAll.mockResolvedValue([person.id]);
-      mocks.person.update.mockResolvedValue(person);
-
-      await sut.handleMetadataExtraction({ id: asset.id });
-
-      expect(mocks.person.refreshFaces).toHaveBeenCalledWith(
-        [
-          expect.objectContaining({
-            boundingBoxX1: Math.floor((0.485_648_148_148_148_2 - 0.2 / 2) * 1000),
-          }),
-        ],
-        [],
-      );
-    });
-
     it('should apply metadata face tags creating new people', async () => {
       const asset = AssetFactory.create();
       const person = PersonFactory.create();

server/src/services/metadata.service.ts

@@ -854,13 +854,6 @@ export class MetadataService extends BaseService {
     // update area coordinates and dimensions in RegionList assuming "normalized" unit as per MWG guidelines
     const adjustedRegionList = regionInfo.RegionList.map((region) => {
       let { X, Y, W, H } = region.Area;
-
-      // EXIF floats with >16 decimals are serialized as strings. Ensure they are numbers.
-      X = Number(X);
-      Y = Number(Y);
-      W = Number(W);
-      H = Number(H);
-
       switch (orientation) {
         case ExifOrientation.MirrorHorizontal: {
           X = 1 - X;
@@ -933,21 +926,16 @@ export class MetadataService extends BaseService {
       const loweredName = region.Name.toLowerCase();
       const personId = existingNameMap.get(loweredName) || this.cryptoRepository.randomUUID();
 
-      const X = Number(region.Area.X);
-      const Y = Number(region.Area.Y);
-      const W = Number(region.Area.W);
-      const H = Number(region.Area.H);
-
       const face = {
         id: this.cryptoRepository.randomUUID(),
         personId,
         assetId: asset.id,
         imageWidth,
         imageHeight,
-        boundingBoxX1: Math.floor((X - W / 2) * imageWidth),
-        boundingBoxY1: Math.floor((Y - H / 2) * imageHeight),
-        boundingBoxX2: Math.floor((X + W / 2) * imageWidth),
-        boundingBoxY2: Math.floor((Y + H / 2) * imageHeight),
+        boundingBoxX1: Math.floor((region.Area.X - region.Area.W / 2) * imageWidth),
+        boundingBoxY1: Math.floor((region.Area.Y - region.Area.H / 2) * imageHeight),
+        boundingBoxX2: Math.floor((region.Area.X + region.Area.W / 2) * imageWidth),
+        boundingBoxY2: Math.floor((region.Area.Y + region.Area.H / 2) * imageHeight),
         sourceType: SourceType.Exif,
       };