fix(mobile): treat wired ethernet as unmetered on ios

check the metered flags instead of the interface type, so ethernet counts like android already does.
2026-07-02 02:55:01 -07:00 · 2026-06-27 16:35:03 +06:00
79 changed files with 910 additions and 1625 deletions
@@ -1,7 +1,7 @@
 [
  {
-    "label": "v3.0.0-rc.4",
-    "url": "https://docs.v3.0.0-rc.4.archive.immich.app"
+    "label": "v3.0.0-rc.3",
+    "url": "https://docs.v3.0.0-rc.3.archive.immich.app"
  },
  {
    "label": "v2.7.5",
@@ -1,6 +1,6 @@
 {
  "name": "immich-e2e",
-  "version": "3.0.0-rc.4",
+  "version": "3.0.0-rc.3",
  "description": "",
  "main": "index.js",
  "type": "module",
@@ -1,6 +1,6 @@
 [project]
 name = "immich-ml"
-version = "3.0.0rc4"
+version = "3.0.0rc3"
 description = ""
 authors = [{ name = "Hau Tran", email = "alex.tran1502@gmail.com" }]
 requires-python = ">=3.11,<4.0"
@@ -974,7 +974,7 @@ wheels = [

 [[package]]
 name = "immich-ml"
-version = "3.0.0rc4"
+version = "3.0.0rc3"
 source = { editable = "." }
 dependencies = [
    { name = "aiocache" },
@@ -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)
@@ -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;
-}
@@ -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
-}
@@ -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 {
@@ -22,8 +22,8 @@ platform :android do
      task: 'bundle', 
      build_type: 'Release',
      properties: {
-        "android.injected.version.code" => 3052,
-        "android.injected.version.name" => "3.0.0-rc.4",
+        "android.injected.version.code" => 3051,
+        "android.injected.version.name" => "3.0.0-rc.3",
      }
    )
    upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab', track: 'beta')
@@ -35,8 +35,8 @@ platform :android do
      task: 'bundle', 
      build_type: 'Release',
      properties: {
-        "android.injected.version.code" => 3052,
-        "android.injected.version.name" => "3.0.0-rc.4",
+        "android.injected.version.code" => 3051,
+        "android.injected.version.name" => "3.0.0-rc.3",
      }
    )
    upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')
@@ -43,15 +43,16 @@ class ConnectivityApiImpl: ConnectivityApi {
      capabilities.append(.vpn)
    }
    
-    // Determine if connection is unmetered:
-    // - Must be on WiFi (not cellular)
-    // - Must not be expensive (rules out personal hotspot)
-    // - Must not be constrained (Low Data Mode)
-    // Note: VPN over cellular should still be considered metered
+    // Determine if connection is unmetered from the OS metered flags rather than
+    // the interface type, so wired ethernet (iPhone USB adapters, Apple Silicon
+    // Macs) is treated as unmetered like Wi-Fi:
+    // - Not on cellular
+    // - Not expensive (also rules out cellular and personal hotspot)
+    // - Not constrained (Low Data Mode)
+    // Note: VPN over cellular stays metered because the path is still expensive.
    let isOnCellular = path.usesInterfaceType(.cellular)
-    let isOnWifi = path.usesInterfaceType(.wifi)
-    
-    if isOnWifi && !isOnCellular && !path.isExpensive && !path.isConstrained {
+
+    if !isOnCellular && !path.isExpensive && !path.isConstrained {
      capabilities.append(.unmetered)
    }
    
@@ -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 }
@@ -52,10 +52,6 @@ class RemoteAsset extends BaseAsset {

  bool get isTrashed => deletedAt != null;

-  bool get isStacked => stackId != null;
-
-  bool get isArchived => visibility == .archive;
-
  @override
  String toString() {
    return '''Asset {
@@ -77,40 +77,4 @@ class AssetService {
    await _apiRepository.updateFavorite(remoteIds, isFavorite);
    await _remoteRepository.updateFavorite(remoteIds, isFavorite);
  }
-
-  Future<void> restoreTrash(List<String> remoteIds) 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> updateVisibility(List<String> remoteIds, AssetVisibility visibility) async {
-    if (remoteIds.isEmpty) {
-      return;
-    }
-
-    await _apiRepository.updateVisibility(remoteIds, visibility);
-    await _remoteRepository.updateVisibility(remoteIds, visibility);
-  }
 }
@@ -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));
-      }
-    });
-  }
 }
@@ -1,10 +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/utils/asset_filter.dart';

 class ActionScope {
  final BuildContext context;
@@ -17,7 +14,13 @@ class ActionScope {
 abstract class BaseAction {
  const BaseAction();

-  ActionView resolve(ActionScope scope);
+  IconData get icon;
+
+  String label(ActionScope scope);
+
+  bool isVisible(ActionScope scope) => true;
+
+  Future<void> onAction(ActionScope scope);
 }

 abstract class AssetAction<T extends BaseAsset> extends BaseAction {
@@ -25,31 +28,5 @@ abstract class AssetAction<T extends BaseAsset> extends BaseAction {

  const AssetAction({required this.assets});

-  @override
-  AssetActionView resolve(ActionScope scope);
-}
-
-abstract class ActionView {
-  final ActionScope scope;
-
-  const ActionView({required this.scope});
-
-  IconData get icon;
-
-  String get label;
-
-  bool get isVisible => true;
-
-  FutureOr<void> onAction();
-}
-
-abstract class AssetActionView<T extends BaseAsset> extends ActionView {
-  final Iterable<BaseAsset> assets;
-
-  const AssetActionView({required this.assets, required super.scope});
-
-  AssetFilter<T> get filter => .new(assets.whereType<T>());
-
-  @override
-  bool get isVisible => filter.isNotEmpty;
+  Iterable<T> filter(ActionScope scope) => assets.whereType<T>();
 }
@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -9,11 +7,10 @@ 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 {
@@ -22,11 +19,11 @@ class _ActionWidget extends ConsumerWidget {

  const _ActionWidget({required this.action, required this.builder});

-  Future<void> _onAction(FutureOr<void> Function() action) async {
+  Future<void> _onAction(ActionScope scope) async {
    try {
-      await action();
+      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}');
    }
  }

@@ -38,13 +35,11 @@ class _ActionWidget extends ConsumerWidget {
    }

    final scope = ActionScope(context: context, ref: ref, authUser: authUser);
-    final view = action.resolve(scope);
-
-    if (!view.isVisible) {
+    if (!action.isVisible(scope)) {
      return const SizedBox.shrink();
    }

-    return builder(.new(icon: view.icon, label: view.label, onAction: () => _onAction(view.onAction)));
+    return builder(.new(label: action.label(scope), onAction: () => _onAction(scope)));
  }
 }

@@ -57,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),
  );
 }

@@ -70,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),
  );
 }

@@ -82,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),
  );
 }

@@ -94,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),
  );
 }
@@ -1,68 +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/providers/routes.provider.dart';
-import 'package:immich_mobile/utils/asset_filter.dart';
-
-class ArchiveAction extends AssetAction<RemoteAsset> {
-  const ArchiveAction({required super.assets});
-
-  @override
-  AssetActionView<RemoteAsset> resolve(ActionScope scope) {
-    final hasNonArchived = AssetFilter(assets).owned(scope.authUser.id).any((asset) => asset.visibility != .archive);
-    return hasNonArchived ? ArchiveView(assets: assets, scope: scope) : UnarchiveView(assets: assets, scope: scope);
-  }
-}
-
-@visibleForTesting
-class ArchiveView extends AssetActionView<RemoteAsset> {
-  const ArchiveView({required super.assets, required super.scope});
-
-  @override
-  IconData get icon => Icons.archive_outlined;
-
-  @override
-  String get label => scope.context.t.archive;
-
-  @override
-  AssetFilter<RemoteAsset> get filter => .new(assets).owned(scope.authUser.id).archived(isArchived: false);
-
-  @override
-  bool get isVisible => !scope.ref.watch(inLockedViewProvider) && filter.isNotEmpty;
-
-  @override
-  Future<void> onAction() async {
-    final ActionScope(:ref, :context) = scope;
-    final ids = filter.map((asset) => asset.id).toList(growable: false);
-    await ref.read(assetServiceProvider).updateVisibility(ids, .archive);
-    ref.read(toastRepositoryProvider).success(context.t.archive_action_prompt(count: ids.length));
-  }
-}
-
-@visibleForTesting
-class UnarchiveView extends AssetActionView<RemoteAsset> {
-  const UnarchiveView({required super.assets, required super.scope});
-
-  @override
-  IconData get icon => Icons.unarchive_outlined;
-
-  @override
-  String get label => scope.context.t.unarchive;
-
-  @override
-  AssetFilter<RemoteAsset> get filter => .new(assets).owned(scope.authUser.id).archived();
-
-  @override
-  bool get isVisible => !scope.ref.watch(inLockedViewProvider) && filter.isNotEmpty;
-
-  @override
-  Future<void> onAction() async {
-    final ActionScope(:ref, :context) = scope;
-    final ids = filter.map((asset) => asset.id).toList(growable: false);
-    await ref.read(assetServiceProvider).updateVisibility(ids, .timeline);
-    ref.read(toastRepositoryProvider).success(context.t.unarchive_action_prompt(count: ids.length));
-  }
-}
@@ -11,23 +11,17 @@ import 'package:immich_mobile/routing/router.dart';
 class AssetDebugAction extends AssetAction<BaseAsset> {
  const AssetDebugAction({required super.assets});

-  @override
-  AssetDebugActionView resolve(ActionScope scope) => .new(assets: assets, scope: scope);
-}
-
-@visibleForTesting
-class AssetDebugActionView extends AssetActionView<BaseAsset> {
-  const AssetDebugActionView({required super.assets, required super.scope});
-
  @override
  IconData get icon => Icons.help_outline_rounded;

  @override
-  String get label => scope.context.t.troubleshoot;
+  String label(ActionScope scope) => scope.context.t.troubleshoot;

  @override
-  bool get isVisible => scope.ref.watch(settingsProvider.notifier).get(.advancedTroubleshooting) && assets.length == 1;
+  bool isVisible(ActionScope scope) =>
+      assets.length == 1 && scope.ref.watch(settingsProvider.notifier).get(.advancedTroubleshooting);

  @override
-  Future<void> onAction() async => unawaited(scope.context.pushRoute(AssetTroubleshootRoute(asset: assets.first)));
+  Future<void> onAction(ActionScope scope) async =>
+      unawaited(scope.context.pushRoute(AssetTroubleshootRoute(asset: assets.first)));
 }
@@ -3,61 +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 Iterable<BaseAsset> assets;
+class FavoriteAction extends AssetAction<RemoteAsset> {
+  final bool shouldFavorite;

-  const FavoriteAction({required this.assets});
+  FavoriteAction({required super.assets}) : shouldFavorite = assets.any((asset) => !asset.isFavorite);

  @override
-  AssetActionView<RemoteAsset> resolve(ActionScope scope) {
-    final hasNonFavorite = AssetFilter(assets).owned(scope.authUser.id).any((asset) => !asset.isFavorite);
-    return hasNonFavorite ? FavoriteView(assets: assets, scope: scope) : UnfavoriteView(assets: assets, scope: scope);
-  }
-}
-
-@visibleForTesting
-class FavoriteView extends AssetActionView<RemoteAsset> {
-  const FavoriteView({required super.assets, required super.scope});
-
-  @override
-  IconData get icon => Icons.favorite_border_rounded;
-
-  @override
-  String get label => scope.context.t.favorite;
-
-  @override
-  AssetFilter<RemoteAsset> get filter => .new(assets).owned(scope.authUser.id).favorite(isFavorite: false);
-
-  @override
-  Future<void> onAction() async {
-    final ActionScope(:ref, :context) = scope;
-    final ids = filter.map((asset) => asset.id).toList(growable: false);
-    await ref.read(assetServiceProvider).updateFavorite(ids, true);
-    ref.read(toastRepositoryProvider).success(context.t.favorite_action_prompt(count: ids.length));
-  }
-}
-
-@visibleForTesting
-class UnfavoriteView extends AssetActionView<RemoteAsset> {
-  const UnfavoriteView({required super.assets, required super.scope});
-
-  @override
-  IconData get icon => Icons.favorite_rounded;
-
-  @override
-  String get label => scope.context.t.unfavorite;
-
-  @override
-  AssetFilter<RemoteAsset> get filter => .new(assets).owned(scope.authUser.id).favorite();
-
-  @override
-  Future<void> onAction() async {
-    final ActionScope(:ref, :context) = scope;
-    final ids = filter.map((asset) => asset.id).toList(growable: false);
-    await ref.read(assetServiceProvider).updateFavorite(ids, false);
-    ref.read(toastRepositoryProvider).success(context.t.unfavorite_action_prompt(count: ids.length));
+  IconData get icon => shouldFavorite ? Icons.favorite_border_rounded : Icons.favorite_rounded;
+
+  @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);
  }
 }
@@ -11,22 +11,14 @@ import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
 class PartnerAddAction extends BaseAction {
  const PartnerAddAction();

-  @override
-  PartnerAddActionView resolve(ActionScope scope) => .new(scope: scope);
-}
-
-@visibleForTesting
-class PartnerAddActionView extends ActionView {
-  const PartnerAddActionView({required super.scope});
-
  @override
  IconData get icon => Icons.person_add_rounded;

  @override
-  String get label => scope.context.t.add_partner;
+  String label(ActionScope scope) => scope.context.t.add_partner;

  @override
-  Future<void> onAction() async {
+  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) {
@@ -43,26 +35,14 @@ class PartnerRemoveAction extends BaseAction {
  final String sharedWithId;
  final String partnerName;

-  @override
-  PartnerRemoveActionView resolve(ActionScope scope) =>
-      .new(sharedWithId: sharedWithId, partnerName: partnerName, scope: scope);
-}
-
-@visibleForTesting
-class PartnerRemoveActionView extends ActionView {
-  final String sharedWithId;
-  final String partnerName;
-
-  const PartnerRemoveActionView({required this.sharedWithId, required this.partnerName, required super.scope});
-
  @override
  IconData get icon => Icons.person_remove_rounded;

  @override
-  String get label => scope.context.t.remove;
+  String label(ActionScope scope) => scope.context.t.remove;

  @override
-  Future<void> onAction() async {
+  Future<void> onAction(ActionScope scope) async {
    final ActionScope(:context, :ref, :authUser) = scope;

    final confirmed = await showDialog<bool>(
@@ -1,36 +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 AssetAction<RemoteAsset> {
-  const RestoreAction({required super.assets});
-
-  @override
-  RestoreActionView resolve(ActionScope scope) => .new(assets: assets, scope: scope);
-}
-
-@visibleForTesting
-class RestoreActionView extends AssetActionView<RemoteAsset> {
-  const RestoreActionView({required super.assets, required super.scope});
-
-  @override
-  IconData get icon => Icons.history_rounded;
-
-  @override
-  String get label => scope.context.t.restore;
-
-  @override
-  AssetFilter<RemoteAsset> get filter => .new(assets).owned(scope.authUser.id).trashed();
-
-  @override
-  Future<void> onAction() async {
-    final ActionScope(:ref, :context) = scope;
-    final ids = filter.map((asset) => asset.id).toList(growable: false);
-    await ref.read(assetServiceProvider).restoreTrash(ids);
-    ref.read(toastRepositoryProvider).success(context.t.assets_restored_count(count: ids.length));
-  }
-}
@@ -1,65 +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 AssetAction<RemoteAsset> {
-  const StackAction({required super.assets});
-
-  @override
-  AssetActionView<RemoteAsset> resolve(ActionScope scope) {
-    final unstacked = AssetFilter(assets).owned(scope.authUser.id).any((asset) => asset.stackId == null);
-    return unstacked ? StackView(assets: assets, scope: scope) : UnstackView(assets: assets, scope: scope);
-  }
-}
-
-@visibleForTesting
-class StackView extends AssetActionView<RemoteAsset> {
-  const StackView({required super.assets, required super.scope});
-
-  @override
-  IconData get icon => Icons.filter_none_rounded;
-
-  @override
-  String get label => scope.context.t.stack;
-
-  @override
-  AssetFilter<RemoteAsset> get filter => .new(assets).owned(scope.authUser.id);
-
-  @override
-  bool get isVisible => filter.length > 1;
-
-  @override
-  Future<void> onAction() async {
-    final ActionScope(:ref, :context) = scope;
-    final ids = filter.map((asset) => asset.id).toList(growable: false);
-    await ref.read(assetServiceProvider).stack(scope.authUser.id, ids);
-    ref.read(toastRepositoryProvider).success(context.t.stacked_assets_count(count: ids.length));
-  }
-}
-
-@visibleForTesting
-class UnstackView extends AssetActionView<RemoteAsset> {
-  const UnstackView({required super.assets, required super.scope});
-
-  @override
-  IconData get icon => Icons.layers_clear_outlined;
-
-  @override
-  String get label => scope.context.t.unstack;
-
-  @override
-  AssetFilter<RemoteAsset> get filter => .new(assets).owned(scope.authUser.id);
-
-  @override
-  Future<void> onAction() async {
-    final ActionScope(:ref, :context) = scope;
-    final assets = filter.toList(growable: false);
-    final stackIds = assets.map((asset) => asset.stackId).nonNulls.toList(growable: false);
-    await ref.read(assetServiceProvider).unstack(stackIds);
-    ref.read(toastRepositoryProvider).success(context.t.unstacked_assets_count(count: assets.length));
-  }
-}
@@ -8,27 +8,17 @@ class TimelineAction extends BaseAction {
  const TimelineAction({required this.action});

  @override
-  TimelineActionView resolve(ActionScope scope) => .new(view: action.resolve(scope), scope: scope);
-}
-
-@visibleForTesting
-class TimelineActionView extends ActionView {
-  final ActionView view;
-
-  const TimelineActionView({required this.view, required super.scope});
+  IconData get icon => action.icon;

  @override
-  IconData get icon => view.icon;
+  String label(ActionScope scope) => action.label(scope);

  @override
-  String get label => view.label;
+  bool isVisible(ActionScope scope) => action.isVisible(scope);

  @override
-  bool get isVisible => view.isVisible;
-
-  @override
-  Future<void> onAction() async {
-    await view.onAction();
+  Future<void> onAction(ActionScope scope) async {
+    await action.onAction(scope);
    scope.ref.read(multiSelectProvider.notifier).reset();
  }
 }
@@ -1,24 +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.widget.dart';
-import 'package:immich_mobile/presentation/actions/archive.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_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/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, lockedFolder }
+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});
@@ -35,6 +37,12 @@ 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;
@@ -49,6 +57,11 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {

    final user = ref.read(currentUserProvider);
    final isOwner = asset is RemoteAsset && asset.ownerId == user?.id;
+    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(
@@ -68,7 +81,20 @@ 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])),
+        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(),
@@ -158,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),
@@ -169,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!,
@@ -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),
+    );
+  }
+}
@@ -49,21 +49,14 @@ class BaseActionButton extends ConsumerWidget {

    if (menuItem) {
      final iconColor = this.iconColor;
-      final onPressed = this.onPressed;

      return MenuItemButton(
-        closeOnActivate: false,
        style: MenuItemButton.styleFrom(
          alignment: Alignment.centerLeft,
          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
        ),
        leadingIcon: Icon(iconData, color: iconColor, size: 20),
-        onPressed: onPressed == null
-            ? null
-            : () {
-                onPressed();
-                MenuController.maybeOf(context)?.close();
-              },
+        onPressed: onPressed,
        child: Text(label, style: TextStyle(fontSize: 15, color: iconColor)),
      );
    }
@@ -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),
+    );
+  }
+}
@@ -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,
+    );
+  }
+}
@@ -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),
+    );
+  }
+}
@@ -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),
+    );
+  }
+}
@@ -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),
+    );
+  }
+}
@@ -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,
+    );
+  }
+}
@@ -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),
+    );
+  }
+}
@@ -4,13 +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.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';
@@ -43,10 +42,11 @@ class ViewerBottomBar extends ConsumerWidget {

    final originalTheme = context.themeData;

-    final assets = [asset];
    final actions = <Widget>[
-      ActionColumnButtonWidget(action: RestoreAction(assets: assets)),
-      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) ...[
@@ -4,9 +4,7 @@ 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.widget.dart';
-import 'package:immich_mobile/presentation/actions/archive.action.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
-import 'package:immich_mobile/presentation/actions/stack.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';
@@ -16,7 +14,10 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_
 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';
@@ -76,7 +77,7 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {
    }

    final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [FavoriteAction(assets: assets), ArchiveAction(assets: assets), StackAction(assets: assets)];
+    final actions = [FavoriteAction(assets: assets)];

    return BaseBottomSheet(
      controller: sheetController,
@@ -87,6 +88,7 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {
        const ShareActionButton(source: ActionSource.timeline),
        if (multiselect.hasRemote) ...[
          const ShareLinkActionButton(source: ActionSource.timeline),
+          const UnArchiveActionButton(source: ActionSource.timeline),
          ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
          if (multiselect.onlyRemote) const DownloadActionButton(source: ActionSource.timeline),
          isTrashEnable
@@ -95,6 +97,8 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {
          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),
      ],
@@ -5,10 +5,9 @@ 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.widget.dart';
-import 'package:immich_mobile/presentation/actions/archive.action.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
-import 'package:immich_mobile/presentation/actions/stack.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';
@@ -17,7 +16,9 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_
 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';
@@ -67,7 +68,7 @@ class FavoriteBottomSheet extends ConsumerWidget {
    }

    final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [FavoriteAction(assets: assets), ArchiveAction(assets: assets), StackAction(assets: assets)];
+    final actions = [FavoriteAction(assets: assets)];

    return BaseBottomSheet(
      initialChildSize: 0.4,
@@ -78,6 +79,7 @@ class FavoriteBottomSheet extends ConsumerWidget {
        if (multiselect.hasRemote) ...[
          const ShareLinkActionButton(source: ActionSource.timeline),
          ...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)
@@ -85,6 +87,8 @@ class FavoriteBottomSheet extends ConsumerWidget {
          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),
      ],
@@ -4,11 +4,9 @@ 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.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/favorite.action.dart';
-import 'package:immich_mobile/presentation/actions/stack.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';
@@ -16,10 +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';
@@ -83,12 +84,7 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
    }

    final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [
-      AssetDebugAction(assets: assets),
-      FavoriteAction(assets: assets),
-      ArchiveAction(assets: assets),
-      StackAction(assets: assets),
-    ];
+    final actions = [AssetDebugAction(assets: assets)];

    return BaseBottomSheet(
      controller: sheetController,
@@ -105,10 +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)
@@ -4,10 +4,9 @@ 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.widget.dart';
-import 'package:immich_mobile/presentation/actions/archive.action.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
-import 'package:immich_mobile/presentation/actions/stack.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';
@@ -18,7 +17,9 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_al
 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';
@@ -85,7 +86,7 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
    }

    final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [FavoriteAction(assets: assets), ArchiveAction(assets: assets), StackAction(assets: assets)];
+    final actions = [FavoriteAction(assets: assets)];

    return BaseBottomSheet(
      controller: sheetController,
@@ -99,6 +100,7 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
          const ShareLinkActionButton(source: ActionSource.timeline),

          if (ownsAlbum) ...[
+            const ArchiveActionButton(source: ActionSource.timeline),
            ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
          ],
          const DownloadActionButton(source: ActionSource.timeline),
@@ -109,6 +111,8 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
            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),
@@ -2,33 +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.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);
-
    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)),
-              ),
+              DeleteTrashActionButton(source: ActionSource.timeline),
+              RestoreTrashActionButton(source: ActionSource.timeline),
            ],
          ),
        ),
@@ -156,6 +156,50 @@ 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);
@@ -191,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);
@@ -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());
@@ -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);
@@ -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,7 +41,7 @@ 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))));
  }

@@ -79,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 {
@@ -108,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 {
@@ -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);
-  }
-}
@@ -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);
@@ -8,10 +8,8 @@ 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.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/stack.action.dart';
-import 'package:immich_mobile/presentation/actions/restore.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';
@@ -23,6 +21,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_f
 import 'package:immich_mobile/presentation/widgets/action_buttons/open_in_browser_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/restore_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/set_album_cover.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/set_profile_picture_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
@@ -30,6 +29,8 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_act
 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';

@@ -199,11 +200,19 @@ enum ActionButtonType {
        menuItem: menuItem,
      ),
      ActionButtonType.slideshow => SlideshowActionButton(iconOnly: iconOnly, menuItem: menuItem),
-      ActionButtonType.archive ||
-      ActionButtonType.unarchive => ActionMenuItemWidget(action: ArchiveAction(assets: [context.asset])),
+      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])),
+      ActionButtonType.restoreTrash => RestoreActionButton(
+        source: context.source,
+        iconOnly: iconOnly,
+        menuItem: menuItem,
+      ),
      ActionButtonType.deletePermanent => DeletePermanentActionButton(
        source: context.source,
        iconOnly: iconOnly,
@@ -239,7 +248,7 @@ enum ActionButtonType {
        menuItem: menuItem,
      ),
      ActionButtonType.likeActivity => LikeActivityActionButton(iconOnly: iconOnly, menuItem: menuItem),
-      ActionButtonType.unstack => ActionMenuItemWidget(action: StackAction(assets: [context.asset])),
+      ActionButtonType.unstack => UnStackActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
      ActionButtonType.openInBrowser => OpenInBrowserActionButton(
        remoteId: context.asset.remoteId!,
        origin: context.timelineOrigin,
@@ -1,23 +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> 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);
-}
@@ -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);
@@ -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(),
-  };
-}
@@ -3,7 +3,7 @@ Immich API

 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:

- API version: 3.0.0-rc.4
+- API version: 3.0.0-rc.3
 - Generator version: 7.22.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen

@@ -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();
@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone

 publish_to: 'none'
-version: 3.0.0-rc.4+3052
+version: 3.0.0-rc.3+3051

 environment:
  sdk: '>=3.12.0 <4.0.0'
@@ -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();
-}
@@ -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 {}

@@ -1,4 +1,5 @@
@Skip('Flaky test, needs investigation')
+@Tags(['widget'])
 library;

 import 'package:drift/drift.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,
    );
  }
 }
@@ -1,10 +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:mocktail/mocktail.dart' as mock;
 import 'package:mocktail/mocktail.dart';

@@ -15,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();
@@ -28,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 +69,6 @@ class ServiceMocks {

  void _stubAssetService() {
    when(asset.updateFavorite).thenAnswer((_) async {});
-    when(asset.stack).thenAnswer((_) async {});
-    when(asset.unstack).thenAnswer((_) async {});
-    when(asset.restoreTrash).thenAnswer((_) async {});
-    when(asset.updateVisibility).thenAnswer((_) async {});
  }
 }

@@ -102,31 +76,13 @@ void _registerFallbacks() {
  registerFallbackValue(LocalAlbumFactory.create());
  registerFallbackValue(LocalAssetFactory.create());
  registerFallbackValue(Uint8List(0));
-  registerFallbackValue(AssetVisibility.timeline);
 }

-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());

@@ -154,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();

@@ -171,24 +127,7 @@ extension type const UserServiceStub(MockUserService service) implements Stub<Mo
      () => service.createProfileImage(any(), any());
 }

-extension type const AssetServiceStub(MockAssetService service) implements Stub<MockAssetService> {
+extension type const AssetStub(MockAssetService service) implements Stub<MockAssetService> {
  Future<void> Function() get updateFavorite =>
      () => service.updateFavorite(any(), any());
-
-  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());
-
-  Future<void> Function() get updateVisibility =>
-      () => service.updateVisibility(any(), any());
-}
-
-extension type const NativeSyncApiStub(MockNativeSyncApi api) implements Stub<MockNativeSyncApi> {
-  Future<List<HashResult>> Function() get hashAssets =>
-      () => api.hashAssets(any(), allowNetworkAccess: any(named: 'allowNetworkAccess'));
 }
@@ -1,107 +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: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 view = await tester.pumpTestAction(context, ArchiveAction(assets: [asset]));
-
-      expect(view, isA<ArchiveView>());
-      expect(view.icon, Icons.archive_outlined);
-      expect(view.label, StaticTranslations.instance.archive);
-
-      await view.onAction();
-      verify(() => assetService.updateVisibility([asset.id], .archive)).called(1);
-    });
-
-    testWidgets('unarchive the eligible owned assets', (tester) async {
-      final asset = owned(visibility: .archive);
-      final view = await tester.pumpTestAction(context, ArchiveAction(assets: [asset]));
-
-      expect(view, isA<UnarchiveView>());
-      expect(view.icon, Icons.unarchive_outlined);
-      expect(view.label, StaticTranslations.instance.unarchive);
-
-      await view.onAction();
-      verify(() => assetService.updateVisibility([asset.id], .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 view = await tester.pumpTestAction(context, ArchiveAction(assets: [mine, theirs]));
-      expect(view, isA<UnarchiveView>());
-
-      await view.onAction();
-      verify(() => assetService.updateVisibility([mine.id], .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, ArchiveAction(assets: [first, second]));
-
-      verify(() => assetService.updateVisibility([first.id, second.id], .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, ArchiveAction(assets: [stale, alreadyArchived]));
-
-      verify(() => assetService.updateVisibility([stale.id], .archive)).called(1);
-    });
-
-    testWidgets('reports the archived count through the toast repository', (tester) async {
-      final toast = context.repository.toast;
-
-      await tester.pumpTestAction(context, ArchiveAction(assets: [owned(), owned()]));
-
-      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,
-        ArchiveAction(
-          assets: [
-            owned(visibility: .archive),
-            owned(visibility: .archive),
-          ],
-        ),
-      );
-
-      final message = verify(() => toast.success(captureAny())).captured.single as String;
-      expect(message, StaticTranslations.instance.unarchive_action_prompt(count: 2));
-    });
-  });
-}
@@ -6,7 +6,7 @@ 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;
@@ -23,8 +23,8 @@ void main() {
  group('AssetDebugAction', () {
    testWidgets('visible for a single asset when advanced troubleshooting is on', (tester) async {
      await tester.pumpTestWidget(
-        context,
        ActionIconButtonWidget(action: AssetDebugAction(assets: [RemoteAssetFactory.create()])),
+        overrides: context.overrides,
      );

      expect(find.byType(ImmichIconButton), findsOneWidget);
@@ -32,10 +32,10 @@ void main() {

    testWidgets('hidden for multiple assets', (tester) async {
      await tester.pumpTestWidget(
-        context,
        ActionIconButtonWidget(
          action: AssetDebugAction(assets: [RemoteAssetFactory.create(), RemoteAssetFactory.create()]),
        ),
+        overrides: context.overrides,
      );

      expect(find.byType(ImmichIconButton), findsNothing);
@@ -44,8 +44,8 @@ void main() {
    testWidgets('hidden when advanced troubleshooting is off', (tester) async {
      await StoreService.I.put(StoreKey.advancedTroubleshooting, false);
      await tester.pumpTestWidget(
-        context,
        ActionIconButtonWidget(action: AssetDebugAction(assets: [RemoteAssetFactory.create()])),
+        overrides: context.overrides,
      );

      expect(find.byType(ImmichIconButton), findsNothing);
@@ -1,99 +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/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 view = await tester.pumpTestAction(context, FavoriteAction(assets: [asset]));

-      expect(view, isA<FavoriteView>());
-      expect(view.icon, Icons.favorite_border_rounded);
-      expect(view.label, StaticTranslations.instance.favorite);
+      await tester.pumpTestAction(FavoriteAction(assets: [asset]), overrides: overrides());

-      await view.onAction();
-      verify(() => assetService.updateFavorite([asset.id], 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 view = await tester.pumpTestAction(context, FavoriteAction(assets: [asset]));

-      expect(view, isA<UnfavoriteView>());
-      expect(view.icon, Icons.favorite_rounded);
-      expect(view.label, StaticTranslations.instance.unfavorite);
+      await tester.pumpTestAction(FavoriteAction(assets: [asset]), overrides: overrides());

-      await view.onAction();
-      verify(() => assetService.updateFavorite([asset.id], 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 view = await tester.pumpTestAction(context, FavoriteAction(assets: [mine, theirs]));
-      expect(view, isA<UnfavoriteView>());

-      await view.onAction();
-      verify(() => assetService.updateFavorite([mine.id], 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, FavoriteAction(assets: [first, second]));
+      await tester.pumpTestAction(FavoriteAction(assets: [first, second]), overrides: overrides());

-      verify(() => assetService.updateFavorite([first.id, second.id], 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, FavoriteAction(assets: [stale, alreadyFavorite]));
+      await tester.pumpTestAction(FavoriteAction(assets: [stale, alreadyFavorite]), overrides: overrides());

-      verify(() => assetService.updateFavorite([stale.id], 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, FavoriteAction(assets: [owned(), owned()]));
-
-      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, FavoriteAction(assets: [owned(isFavorite: true), owned(isFavorite: true)]));
-
-      final message = verify(() => toast.success(captureAny())).captured.single as String;
-      expect(message, StaticTranslations.instance.unfavorite_action_prompt(count: 2));
+      expect(find.byType(SnackBar), findsOneWidget);
    });
  });
 }
@@ -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,24 +31,22 @@ void main() {
    testWidgets('creates a partner for the selected candidate', (tester) async {
      final candidate = UserFactory.create();

-      await tester.pumpTestAction(context, const PartnerAddAction(), 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,
-        const PartnerAddAction(),
-        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);
    });
  });

@@ -56,27 +54,27 @@ void main() {
    testWidgets('deletes the partner after confirmation', (tester) async {
      final partner = UserFactory.create();
      await tester.pumpTestAction(
-        context,
        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,
        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);
    });
  });
 }
@@ -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, RestoreAction(assets: [asset]));
-
-      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, RestoreAction(assets: [mine, theirs]));
-
-      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, RestoreAction(assets: [trashed, live]));
-
-      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, RestoreAction(assets: [first, second]));
-
-      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, RestoreAction(assets: [owned(), owned()]));
-
-      final message = verify(() => toast.success(captureAny())).captured.single as String;
-      expect(message, StaticTranslations.instance.assets_restored_count(count: 2));
-    });
-  });
-}
@@ -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/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 view = await tester.pumpTestAction(context, StackAction(assets: [first, second]));
-
-      expect(view, isA<StackView>());
-      expect(view.icon, Icons.filter_none_rounded);
-      expect(view.label, StaticTranslations.instance.stack);
-
-      await view.onAction();
-      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 view = await tester.pumpTestAction(context, StackAction(assets: [asset]));
-
-      expect(view, isA<UnstackView>());
-      expect(view.icon, Icons.layers_clear_outlined);
-      expect(view.label, StaticTranslations.instance.unstack);
-
-      await view.onAction();
-      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 view = await tester.pumpTestAction(context, StackAction(assets: [first, second]));
-
-      expect(view, isA<StackView>());
-
-      await view.onAction();
-      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, StackAction(assets: [mine, other, theirs]));
-
-      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, StackAction(assets: [first, second]));
-
-      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, StackAction(assets: [owned(), owned()]));
-
-      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,
-        StackAction(
-          assets: [
-            owned(stackId: 'stack-1'),
-            owned(stackId: 'stack-2'),
-          ],
-        ),
-      );
-
-      final message = verify(() => toast.success(captureAny())).captured.single as String;
-      expect(message, StaticTranslations.instance.unstacked_assets_count(count: 2));
-    });
-  });
-}
@@ -7,7 +7,7 @@ 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({this.visible = true, this.error});
@@ -18,30 +18,21 @@ class _FakeAction extends BaseAction {
  bool ran = false;
  bool? selectionDuringOnAction;

-  @override
-  ActionView resolve(ActionScope scope) => _FakeActionView(this, scope);
-}
-
-class _FakeActionView extends ActionView {
-  final _FakeAction action;
-
-  _FakeActionView(this.action, ActionScope scope) : super(scope: scope);
-
  @override
  IconData get icon => Icons.bolt;

  @override
-  String get label => 'fake';
+  String label(ActionScope scope) => 'fake';

  @override
-  bool get isVisible => action.visible;
+  bool isVisible(ActionScope scope) => visible;

  @override
-  Future<void> onAction() async {
-    action.ran = true;
-    action.selectionDuringOnAction = scope.ref.read(multiSelectProvider).isEnabled;
-    if (action.error != null) {
-      throw action.error!;
+  Future<void> onAction(ActionScope scope) async {
+    ran = true;
+    selectionDuringOnAction = scope.ref.read(multiSelectProvider).isEnabled;
+    if (error != null) {
+      throw error!;
    }
  }
 }
@@ -57,7 +48,8 @@ void main() {
    context.dispose();
  });

-  List<Override> overrides() => [
+  List<Override> seededOverrides() => [
+    ...context.overrides,
    multiSelectProvider.overrideWith(
      () => MultiSelectNotifier(
        MultiSelectState(selectedAssets: {RemoteAssetFactory.create()}, lockedSelectionAssets: const {}),
@@ -69,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);
@@ -77,7 +68,7 @@ void main() {
          return const SizedBox.shrink();
        },
      ),
-      overrides: overrides(),
+      overrides: seededOverrides(),
    );
    return (scope, container);
  }
@@ -86,7 +77,7 @@ void main() {
    testWidgets('runs the wrapped action and then clears the selection', (tester) async {
      final inner = _FakeAction();
      final (scope, container) = await pumpScope(tester);
-      await TimelineAction(action: inner).resolve(scope).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');
@@ -98,7 +89,7 @@ void main() {
      final inner = _FakeAction(error: error);
      final (scope, container) = await pumpScope(tester);

-      await expectLater(TimelineAction(action: inner).resolve(scope).onAction(), throwsA(same(error)));
+      await expectLater(TimelineAction(action: inner).onAction(scope), throwsA(same(error)));

      expect(inner.ran, isTrue);
      expect(container.read(multiSelectProvider).isEnabled, isTrue);
@@ -106,8 +97,8 @@ void main() {

    testWidgets('delegates visibility to the wrapped action', (tester) async {
      await tester.pumpTestWidget(
-        context,
        ActionIconButtonWidget(action: TimelineAction(action: _FakeAction(visible: false))),
+        overrides: context.overrides,
      );

      expect(find.byType(ActionIconButtonWidget), findsOneWidget);
@@ -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();
@@ -13,22 +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_ui/immich_ui.dart';
 import 'package:mocktail/mocktail.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();
  }

@@ -37,15 +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),
-  ];
+  List<Override> get overrides => [currentUserProvider.overrideWith((ref) => CurrentUserProvider(mocks.user.service))];

  static Future<PresentationContext> create() async {
    TestUtils.init();
@@ -59,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(),
@@ -81,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,
@@ -98,25 +86,10 @@ extension PumpPresentationWidget on WidgetTester {
    await pumpAndSettle();
  }

-  Future<ActionView> pumpTestAction(
-    PresentationContext context,
-    BaseAction action, {
-    List<Override> overrides = const [],
-  }) async {
-    late ActionView view;
-    await pumpTestWidget(
-      context,
-      Consumer(
-        builder: (innerContext, ref, _) {
-          view = action.resolve(ActionScope(context: innerContext, ref: ref, authUser: context.currentUser));
-          return ActionIconButtonWidget(action: action);
-        },
-      ),
-      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 view;
  }

  Future<void> pumpUntilFound(Finder finder, {int maxFrames = 10}) async {
@@ -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);
      });
    });
  });
@@ -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]);
-      });
-    });
-  });
-}
@@ -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();
  }
 }
@@ -16206,7 +16206,7 @@
  "info": {
    "title": "Immich",
    "description": "Immich API",
-    "version": "3.0.0-rc.4",
+    "version": "3.0.0-rc.3",
    "contact": {}
  },
  "tags": [
@@ -1,6 +1,6 @@
 {
  "name": "immich-monorepo",
-  "version": "3.0.0-rc.4",
+  "version": "3.0.0-rc.3",
  "description": "Monorepo for Immich",
  "type": "module",
  "private": true,
@@ -1,6 +1,6 @@
 {
  "name": "@immich/cli",
-  "version": "3.0.0-rc.4",
+  "version": "3.0.0-rc.3",
  "description": "Command Line Interface (CLI) for Immich",
  "repository": {
    "type": "git",
@@ -1,6 +1,6 @@
 {
  "name": "@immich/sdk",
-  "version": "3.0.0-rc.4",
+  "version": "3.0.0-rc.3",
  "description": "Auto-generated TypeScript SDK for the Immich API",
  "repository": {
    "type": "git",
@@ -1,6 +1,6 @@
 /**
 * Immich
- * 3.0.0-rc.4
+ * 3.0.0-rc.3
 * DO NOT MODIFY - This file has been generated using oazapfts.
 * See https://www.npmjs.com/package/oazapfts
 */
@@ -1,6 +1,6 @@
 {
  "name": "immich",
-  "version": "3.0.0-rc.4",
+  "version": "3.0.0-rc.3",
  "description": "",
  "author": "",
  "private": true,
@@ -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;
@@ -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();
@@ -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,
      };

@@ -1,6 +1,6 @@
 {
  "name": "immich-web",
-  "version": "3.0.0-rc.4",
+  "version": "3.0.0-rc.3",
  "license": "GNU Affero General Public License version 3",
  "type": "module",
  "scripts": {