feat: lock action

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

@@ -78,7 +78,6 @@ sealed class BaseAsset {
   bool get hasLocal => storage == AssetState.local || storage == AssetState.merged;
   bool get isLocalOnly => storage == AssetState.local;
   bool get isRemoteOnly => storage == AssetState.remote;
-  bool get isMerged => storage == AssetState.merged;
 
   bool get isEditable => false;
 

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

@@ -109,22 +109,4 @@ class AssetService {
     await _apiRepository.update(remoteIds, isFavorite: isFavorite, visibility: visibility);
     await _remoteRepository.update(remoteIds, isFavorite: isFavorite, visibility: visibility);
   }
-
-  Future<void> trash(List<String> remoteIds) async {
-    if (remoteIds.isEmpty) {
-      return;
-    }
-
-    await _apiRepository.delete(remoteIds, false);
-    await _remoteRepository.trash(remoteIds);
-  }
-
-  Future<void> delete(List<String> remoteIds) async {
-    if (remoteIds.isEmpty) {
-      return;
-    }
-
-    await _apiRepository.delete(remoteIds, true);
-    await _remoteRepository.delete(remoteIds);
-  }
 }

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

@@ -183,12 +183,6 @@ class RemoteAlbumService {
     return album.added.length;
   }
 
-  Future<int> removeAssets({required String albumId, required List<String> assetIds}) async {
-    final result = await _albumApiRepository.removeAssets(albumId, assetIds);
-    await _repository.removeAssets(albumId, result.removed);
-    return result.removed.length;
-  }
-
   /// !TODO The name here is not clear as we have addAssets method above,
   /// which is only add remote assets to album, for the next PR, we will allow
   /// adding local assets from album from the timeline as well with this flow.

mobile/lib/presentation/actions/asset_actions.dart

@@ -2,7 +2,6 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/archive.action.dart';
 import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';
-import 'package:immich_mobile/presentation/actions/delete.action.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
 import 'package:immich_mobile/presentation/actions/lock.action.dart';
 import 'package:immich_mobile/presentation/actions/stack.action.dart';
@@ -13,8 +12,6 @@ class AssetActions {
   final ArchiveAction archive;
   final StackAction stack;
   final LockAction lock;
-  final DeleteAction delete;
-  final CleanupLocalAction cleanup;
 
   const AssetActions({
     required this.debug,
@@ -22,17 +19,13 @@ class AssetActions {
     required this.archive,
     required this.stack,
     required this.lock,
-    required this.delete,
-    required this.cleanup,
   });
 
-  factory AssetActions.from(ActionScope scope, List<BaseAsset> assets) => .new(
+  static AssetActions from(ActionScope scope, List<BaseAsset> assets) => .new(
     debug: AssetDebugAction(assets: assets, scope: scope),
     favorite: FavoriteAction(assets: assets, scope: scope),
     archive: ArchiveAction(assets: assets, scope: scope),
     stack: StackAction(assets: assets, scope: scope),
     lock: LockAction(assets: assets, scope: scope),
-    delete: DeleteAction(assets: assets, scope: scope),
-    cleanup: CleanupLocalAction(assets: assets, scope: scope),
   );
 }

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

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

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

@@ -1,177 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/extensions/platform_extensions.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/store.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';
-import 'package:immich_mobile/providers/server_info.provider.dart';
-import 'package:immich_mobile/services/cleanup.service.dart';
-import 'package:immich_mobile/utils/asset_filter.dart';
-import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
-
-class DeleteAction extends BaseAction {
-  final List<String> localIds;
-  final List<String> remoteIds;
-  final bool trash;
-
-  DeleteAction._({
-    required this.localIds,
-    required this.remoteIds,
-    required super.scope,
-    required this.trash,
-    super.isVisible,
-  }) : super(icon: Icons.delete_outline, label: trash ? scope.context.t.trash : scope.context.t.delete);
-
-  factory DeleteAction({required Iterable<BaseAsset> assets, required ActionScope scope}) {
-    final ActionScope(:ref) = scope;
-
-    final localIds = <String>[];
-    final ownedRemote = <RemoteAsset>[];
-    for (final asset in assets) {
-      if (asset.localId case final id?) {
-        localIds.add(id);
-      }
-
-      if (asset case final RemoteAsset remote when remote.ownerId == scope.authUser.id) {
-        ownedRemote.add(remote);
-      }
-    }
-    final remoteIds = ownedRemote.map((asset) => asset.id).toList(growable: false);
-
-    final trashEnabled = ref.watch(serverInfoProvider.select((state) => state.serverFeatures.trash));
-    // Assets already in trash or in locked page should be permanently deleted irrespective of the trash feature being enabled
-    final trash = trashEnabled && !ownedRemote.every((asset) => asset.isTrashed || asset.isLocked);
-
-    return ._(
-      localIds: localIds,
-      remoteIds: remoteIds,
-      trash: trash,
-      scope: scope,
-      isVisible: remoteIds.isNotEmpty || localIds.isNotEmpty,
-    );
-  }
-
-  @override
-  Future<void> onAction() async {
-    final ActionScope(:ref, :context) = scope;
-    final toast = ref.read(toastRepositoryProvider);
-
-    // Local-only
-    // Single prompt on iOS & Android (without MANAGE_MEDIA)
-    // No prompt on Android (with MANAGE_MEDIA)
-    if (remoteIds.isEmpty) {
-      if (localIds.isEmpty) {
-        return;
-      }
-
-      final count = await cleanupLocalAssets(assetIds: localIds, scope: scope);
-      if (!context.mounted || count <= 0) {
-        return;
-      }
-      toast.success(context.t.cleanup_deleted_assets(count: count));
-      return;
-    }
-
-    // Trash
-    // No prompt on Android (with MANAGE_MEDIA)
-    // Single prompt on iOS & Android (without MANAGE_MEDIA)
-    // TODO(shenlong): Handle the native prompt response and skip deleting trash when user cancels the prompt
-    if (trash) {
-      if (localIds.isNotEmpty) {
-        await cleanupLocalAssets(assetIds: localIds, scope: scope);
-        if (!context.mounted) {
-          return;
-        }
-      }
-      await ref.read(assetServiceProvider).trash(remoteIds);
-      toast.success(context.t.trash_action_prompt(count: remoteIds.length));
-      return;
-    }
-
-    // Permanent delete
-    // Single prompt on Android (with MANAGE_MEDIA)
-    // Double prompts on iOS & Android (without MANAGE_MEDIA)
-    final confirmed = await showDialog<bool>(
-      context: context,
-      builder: (_) =>
-          const ConfirmDialog(title: 'delete_dialog_title', content: 'delete_dialog_alert', ok: 'delete_permanently'),
-    );
-    if (confirmed != true || !context.mounted) {
-      return;
-    }
-
-    // Perform server deletion first so we don't remove the only local copy if the server delete fails
-    await ref.read(assetServiceProvider).delete(remoteIds);
-    if (localIds.isNotEmpty && context.mounted) {
-      await cleanupLocalAssets(assetIds: localIds, scope: scope, requestPrompt: false);
-    }
-
-    if (!context.mounted) {
-      return;
-    }
-
-    toast.success(context.t.delete_permanently_action_prompt(count: remoteIds.length));
-  }
-}
-
-class CleanupLocalAction extends BaseAction {
-  final List<String> assetIds;
-
-  CleanupLocalAction._({required this.assetIds, required super.scope})
-    : super(
-        icon: Icons.no_cell_outlined,
-        label: scope.context.t.control_bottom_app_bar_delete_from_local,
-        isVisible: assetIds.isNotEmpty,
-      );
-
-  factory CleanupLocalAction({required Iterable<BaseAsset> assets, required ActionScope scope}) => ._(
-    assetIds: AssetFilter(assets).backedUp().map((asset) => asset.localId).nonNulls.toList(growable: false),
-    scope: scope,
-  );
-
-  @override
-  Future<void> onAction() async {
-    final ActionScope(:ref, :context) = scope;
-    final count = await cleanupLocalAssets(assetIds: assetIds, scope: scope);
-    if (!context.mounted || count <= 0) {
-      return;
-    }
-    ref.read(toastRepositoryProvider).success(context.t.cleanup_deleted_assets(count: count));
-  }
-}
-
-@visibleForTesting
-Future<int> cleanupLocalAssets({
-  required List<String> assetIds,
-  required ActionScope scope,
-  bool requestPrompt = true,
-}) async {
-  final ActionScope(:ref, :context) = scope;
-
-  /// OS prompts on iOS & Android (without MANAGE_MEDIA)
-  /// Custom prompt on Android (with MANAGE_MEDIA)
-  final requireUserPrompt =
-      requestPrompt && CurrentPlatform.isAndroid && ref.read(storeServiceProvider).get(.manageLocalMediaAndroid, false);
-  if (requireUserPrompt) {
-    final confirmed = await showDialog<bool>(
-      context: context,
-      builder: (_) => ConfirmDialog(
-        title: context.t.move_to_device_trash,
-        content: context.t.free_up_space_description,
-        ok: context.t.ok,
-      ),
-    );
-
-    if (confirmed != true) {
-      return 0;
-    }
-  }
-
-  if (!context.mounted) {
-    return 0;
-  }
-
-  return await ref.read(cleanupServiceProvider).deleteLocalAssets(assetIds);
-}

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

@@ -1,31 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/domain/services/timeline.service.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class OpenInBrowserAction extends BaseAction {
-  final String remoteId;
-  final TimelineOrigin origin;
-
-  OpenInBrowserAction({required this.remoteId, required this.origin, required super.scope})
-    : super(icon: Icons.open_in_browser, label: scope.context.t.open_in_browser);
-
-  @override
-  Future<void> onAction() async {
-    final serverEndpoint = Store.get(.serverEndpoint).replaceFirst('/api', '');
-
-    final originPath = switch (origin) {
-      .favorite => '/favorites',
-      .trash => '/trash',
-      .archive => '/archive',
-      _ => '',
-    };
-
-    final url = Uri.parse('$serverEndpoint$originPath/photos/$remoteId');
-    if (await canLaunchUrl(url)) {
-      await launchUrl(url, mode: .externalApplication);
-    }
-  }
-}

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

@@ -1,33 +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/album.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';
-import 'package:immich_mobile/utils/asset_filter.dart';
-
-class RemoveFromAlbumAction extends BaseAction {
-  final String albumId;
-  final List<String> assetIds;
-
-  RemoveFromAlbumAction._({required super.scope, required this.albumId, required this.assetIds, super.isVisible})
-    : super(icon: Icons.remove_circle_outline, label: scope.context.t.remove_from_album);
-
-  factory RemoveFromAlbumAction({
-    required Iterable<BaseAsset> assets,
-    required String albumId,
-    required ActionScope scope,
-  }) {
-    final assetIds = AssetFilter(assets).map((asset) => asset.remoteId).nonNulls.toList(growable: false);
-
-    return RemoveFromAlbumAction._(scope: scope, albumId: albumId, assetIds: assetIds, isVisible: assetIds.isNotEmpty);
-  }
-
-  @override
-  Future<void> onAction() async {
-    final ActionScope(:ref, :context) = scope;
-
-    final count = await ref.read(remoteAlbumServiceProvider).removeAssets(albumId: albumId, assetIds: assetIds);
-    ref.read(toastRepositoryProvider).success(context.t.remove_from_album_action_prompt(count: count));
-  }
-}

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

@@ -1,32 +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/album.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';
-import 'package:immich_mobile/utils/asset_filter.dart';
-
-class SetAlbumCoverAction extends BaseAction {
-  final String albumId;
-  final List<String> assetIds;
-
-  SetAlbumCoverAction._({required super.scope, required this.albumId, required this.assetIds, super.isVisible})
-    : super(icon: Icons.image_outlined, label: scope.context.t.set_as_album_cover);
-
-  factory SetAlbumCoverAction({
-    required Iterable<BaseAsset> assets,
-    required String albumId,
-    required ActionScope scope,
-  }) {
-    final assetIds = AssetFilter(assets).map((asset) => asset.remoteId).nonNulls.toList(growable: false);
-    return SetAlbumCoverAction._(scope: scope, albumId: albumId, assetIds: assetIds, isVisible: assetIds.length == 1);
-  }
-
-  @override
-  Future<void> onAction() async {
-    final ActionScope(:ref, :context) = scope;
-
-    await ref.read(remoteAlbumServiceProvider).updateAlbum(albumId, thumbnailAssetId: assetIds.first);
-    ref.read(toastRepositoryProvider).success(context.t.album_cover_updated);
-  }
-}

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

@@ -1,18 +0,0 @@
-import 'dart:async';
-
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/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/routing/router.dart';
-
-class SetProfilePictureAction extends BaseAction {
-  final BaseAsset asset;
-
-  SetProfilePictureAction({required this.asset, required super.scope})
-    : super(icon: Icons.account_circle_outlined, label: scope.context.t.set_as_profile_picture);
-
-  @override
-  Future<void> onAction() async => unawaited(scope.context.pushRoute(ProfilePictureCropRoute(asset: asset)));
-}

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

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

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

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

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

@@ -0,0 +1,92 @@
+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/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+
+/// This delete action has the following behavior:
+/// - Set the deletedAt information, put the asset in the trash in the server
+/// which will be permanently deleted after the number of days configure by the admin
+/// - Prompt to delete the asset locally
+class DeleteActionButton extends ConsumerWidget {
+  final ActionSource source;
+  final bool showConfirmation;
+  final bool iconOnly;
+  final bool menuItem;
+  const DeleteActionButton({
+    super.key,
+    required this.source,
+    this.showConfirmation = false,
+    this.iconOnly = false,
+    this.menuItem = false,
+  });
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    if (showConfirmation) {
+      final confirm = await showDialog<bool>(
+        context: context,
+        builder: (context) => AlertDialog(
+          title: Text('delete'.t(context: context)),
+          content: Text('delete_action_confirmation_message'.t(context: context)),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.of(context).pop(false),
+              child: Text('cancel'.t(context: context)),
+            ),
+            TextButton(
+              onPressed: () => Navigator.of(context).pop(true),
+              child: Text(
+                'confirm'.t(context: context),
+                style: TextStyle(color: context.colorScheme.error),
+              ),
+            ),
+          ],
+        ),
+      );
+      if (confirm != true) {
+        return;
+      }
+    }
+
+    if (source == ActionSource.viewer) {
+      EventStream.shared.emit(const ViewerReloadAssetEvent());
+    }
+
+    final result = await ref.read(actionProvider.notifier).trashRemoteAndDeleteLocal(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'delete_action_prompt'.t(context: context, args: {'count': result.count.toString()});
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      maxWidth: 110.0,
+      iconData: Icons.delete_sweep_outlined,
+      label: "delete".t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}

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

@@ -0,0 +1,68 @@
+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';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+
+/// This delete action has the following behavior:
+/// - Prompt to delete the asset locally
+class DeleteLocalActionButton extends ConsumerWidget {
+  final ActionSource source;
+  final bool iconOnly;
+  final bool menuItem;
+
+  const DeleteLocalActionButton({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).deleteLocal(source, context);
+    if (result == null) {
+      return;
+    }
+
+    ref.read(multiSelectProvider.notifier).reset();
+
+    if (source == ActionSource.viewer) {
+      EventStream.shared.emit(const ViewerReloadAssetEvent());
+    }
+
+    if (result.count == 0) {
+      return;
+    }
+
+    ref.invalidate(localAlbumProvider);
+
+    final successMessage = 'delete_local_action_prompt'.t(context: context, args: {'count': result.count.toString()});
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      maxWidth: 95.0,
+      iconData: Icons.no_cell_outlined,
+      label: "control_bottom_app_bar_delete_from_local".t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}

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

@@ -0,0 +1,80 @@
+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/asset_grid/permanent_delete_dialog.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+
+/// This delete action has the following behavior:
+/// - Delete permanently on the server
+/// - Prompt to delete the asset locally
+class DeletePermanentActionButton extends ConsumerWidget {
+  final ActionSource source;
+  final bool iconOnly;
+  final bool menuItem;
+  final bool useShortLabel;
+
+  const DeletePermanentActionButton({
+    super.key,
+    required this.source,
+    this.iconOnly = false,
+    this.menuItem = false,
+    this.useShortLabel = false,
+  });
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final count = source == ActionSource.viewer ? 1 : ref.read(multiSelectProvider).selectedAssets.length;
+    final confirm =
+        await showDialog<bool>(
+          context: context,
+          builder: (context) => PermanentDeleteDialog(count: count),
+        ) ??
+        false;
+    if (!confirm) {
+      return;
+    }
+
+    if (source == ActionSource.viewer) {
+      EventStream.shared.emit(const ViewerReloadAssetEvent());
+    }
+
+    final result = await ref.read(actionProvider.notifier).deleteRemoteAndLocal(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'delete_permanently_action_prompt'.t(
+      context: context,
+      args: {'count': result.count.toString()},
+    );
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      maxWidth: 110.0,
+      iconData: Icons.delete_forever,
+      label: useShortLabel ? "delete".t(context: context) : "delete_permanently".t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}

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

@@ -0,0 +1,67 @@
+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/asset_grid/permanent_delete_dialog.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+
+/// This delete action has the following behavior:
+/// - Delete permanently on the server
+/// - Prompt to delete the asset locally
+///
+/// This action is used when the asset is selected in multi-selection mode in the trash page
+class DeleteTrashActionButton extends ConsumerWidget {
+  final ActionSource source;
+
+  const DeleteTrashActionButton({super.key, required this.source});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final selectCount = ref.watch(multiSelectProvider.select((s) => s.selectedAssets.length));
+
+    final confirmDelete =
+        await showDialog<bool>(
+          context: context,
+          builder: (context) => PermanentDeleteDialog(count: selectCount),
+        ) ??
+        false;
+    if (!confirmDelete) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).deleteRemoteAndLocal(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'assets_permanently_deleted_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: Icon(Icons.delete_forever, color: Colors.red[400]),
+      label: Text(
+        "delete".t(context: context),
+        style: TextStyle(fontSize: 14, color: Colors.red[400], fontWeight: FontWeight.bold),
+      ),
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}

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

@@ -0,0 +1,58 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+class OpenInBrowserActionButton extends ConsumerWidget {
+  final String remoteId;
+  final TimelineOrigin origin;
+  final bool iconOnly;
+  final bool menuItem;
+
+  const OpenInBrowserActionButton({
+    super.key,
+    required this.remoteId,
+    required this.origin,
+    this.iconOnly = false,
+    this.menuItem = false,
+  });
+
+  void _onTap() async {
+    final serverEndpoint = Store.get(StoreKey.serverEndpoint).replaceFirst('/api', '');
+
+    String originPath = '';
+    switch (origin) {
+      case TimelineOrigin.favorite:
+        originPath = '/favorites';
+        break;
+      case TimelineOrigin.trash:
+        originPath = '/trash';
+        break;
+      case TimelineOrigin.archive:
+        originPath = '/archive';
+        break;
+      default:
+        break;
+    }
+
+    final url = '$serverEndpoint$originPath/photos/$remoteId';
+    if (await canLaunchUrl(Uri.parse(url))) {
+      await launchUrl(Uri.parse(url), mode: LaunchMode.externalApplication);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      label: 'open_in_browser'.t(context: context),
+      iconData: Icons.open_in_browser,
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: _onTap,
+    );
+  }
+}

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

@@ -0,0 +1,65 @@
+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 RemoveFromAlbumActionButton extends ConsumerWidget {
+  final String albumId;
+  final ActionSource source;
+  final bool iconOnly;
+  final bool menuItem;
+
+  const RemoveFromAlbumActionButton({
+    super.key,
+    required this.albumId,
+    required this.source,
+    this.iconOnly = false,
+    this.menuItem = false,
+  });
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    if (source == ActionSource.viewer) {
+      EventStream.shared.emit(const ViewerReloadAssetEvent());
+    }
+
+    final result = await ref.read(actionProvider.notifier).removeFromAlbum(source, albumId);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'remove_from_album_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.remove_circle_outline,
+      label: "remove_from_album".t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context, ref),
+      maxWidth: 100,
+    );
+  }
+}

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

@@ -0,0 +1,56 @@
+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 SetAlbumCoverActionButton extends ConsumerWidget {
+  final String albumId;
+  final ActionSource source;
+  final bool iconOnly;
+  final bool menuItem;
+
+  const SetAlbumCoverActionButton({
+    super.key,
+    required this.albumId,
+    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).setAlbumCover(source, albumId);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'album_cover_updated'.t(context: context);
+
+    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.image_outlined,
+      label: 'set_as_album_cover'.t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context, ref),
+      maxWidth: 100,
+    );
+  }
+}

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

@@ -0,0 +1,35 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/routing/router.dart';
+
+class SetProfilePictureActionButton extends ConsumerWidget {
+  final BaseAsset asset;
+  final bool iconOnly;
+  final bool menuItem;
+
+  const SetProfilePictureActionButton({super.key, required this.asset, this.iconOnly = false, this.menuItem = false});
+
+  void _onTap(BuildContext context) {
+    if (!context.mounted) {
+      return;
+    }
+
+    context.pushRoute(ProfilePictureCropRoute(asset: asset));
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.account_circle_outlined,
+      label: "set_as_profile_picture".t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context),
+      maxWidth: 100,
+    );
+  }
+}

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

@@ -2,23 +2,26 @@ import 'dart:async';
 
 import 'package:auto_route/auto_route.dart';
 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/generated/translations.g.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/models/search/search_filter.model.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/pages/search/paginated_search.provider.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/routing/router.dart';
 
-class SimilarPhotosAction extends BaseAction {
+class SimilarPhotosActionButton extends ConsumerWidget {
   final String assetId;
+  final bool iconOnly;
+  final bool menuItem;
 
-  SimilarPhotosAction({required this.assetId, required super.scope})
-    : super(icon: Icons.compare, label: scope.context.t.view_similar_photos);
+  const SimilarPhotosActionButton({super.key, required this.assetId, this.iconOnly = false, this.menuItem = false});
 
-  @override
-  Future<void> onAction() async {
-    final ActionScope(:context, :ref) = scope;
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
 
     ref.invalidate(assetViewerProvider);
     ref.invalidate(paginatedSearchProvider);
@@ -40,4 +43,16 @@ class SimilarPhotosAction extends BaseAction {
 
     unawaited(context.navigateTo(const DriftSearchRoute()));
   }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.compare,
+      label: "view_similar_photos".t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context, ref),
+      maxWidth: 100,
+    );
+  }
 }

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

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

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

@@ -0,0 +1,58 @@
+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';
+
+/// This delete action has the following behavior:
+/// - Set the deletedAt information, put the asset in the trash in the server
+/// which will be permanently deleted after the number of days configure by the admin
+class TrashActionButton extends ConsumerWidget {
+  final ActionSource source;
+  final bool iconOnly;
+  final bool menuItem;
+
+  const TrashActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    if (source == ActionSource.viewer) {
+      EventStream.shared.emit(const ViewerReloadAssetEvent());
+    }
+
+    final result = await ref.read(actionProvider.notifier).trash(source);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'trash_action_prompt'.t(context: context, args: {'count': result.count.toString()});
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      maxWidth: 85.0,
+      iconData: Icons.delete_outline_rounded,
+      label: "control_bottom_app_bar_trash_from_immich".t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}

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

@@ -1,13 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/delete.action.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/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
@@ -17,6 +20,7 @@ import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.da
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/utils/semver.dart';
 import 'package:immich_mobile/widgets/asset_viewer/video_controls.dart';
 
@@ -31,6 +35,8 @@ class ViewerBottomBar extends ConsumerWidget {
     }
 
     final isReadonlyModeEnabled = ref.watch(readonlyModeProvider);
+    final user = ref.watch(currentUserProvider);
+    final isOwner = asset is RemoteAsset && asset.ownerId == user?.id;
     final showingDetails = ref.watch(assetViewerProvider.select((s) => s.showingDetails));
     final isInLockedView = ref.watch(inLockedViewProvider);
     final serverInfo = ref.watch(serverInfoProvider);
@@ -41,7 +47,6 @@ class ViewerBottomBar extends ConsumerWidget {
     final assets = [asset];
     final scope = ActionScope.from(context, ref);
     final restore = RestoreAction(assets: assets, scope: scope);
-    final delete = DeleteAction(assets: assets, scope: scope);
     final actions = <Widget>[
       if (restore.isVisible) ActionColumnButtonWidget(action: restore),
       const ShareActionButton(source: ActionSource.viewer),
@@ -54,8 +59,14 @@ class ViewerBottomBar extends ConsumerWidget {
             const EditImageActionButton(),
           if (asset.hasRemote) AddActionButton(originalTheme: originalTheme),
         ],
-
-        if (delete.isVisible) ActionColumnButtonWidget(action: delete),
+        if (isOwner) ...[
+          if (asset.isLocalOnly)
+            const DeleteLocalActionButton(source: ActionSource.viewer)
+          else if (asset.isTrashed)
+            const DeletePermanentActionButton(source: ActionSource.viewer, useShortLabel: true)
+          else
+            const DeleteActionButton(source: ActionSource.viewer, showConfirmation: true),
+        ],
       ],
     ];
 

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

@@ -7,14 +7,18 @@ import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/asset_actions.dart';
 import 'package:immich_mobile/presentation/actions/timeline.action.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/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/trash_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';
+import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
@@ -43,6 +47,7 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {
   @override
   Widget build(BuildContext context) {
     final multiselect = ref.watch(multiSelectProvider);
+    final isTrashEnable = ref.watch(serverInfoProvider.select((state) => state.serverFeatures.trash));
 
     Future<void> addToAlbum(RemoteAlbum album) async {
       final result = await ref.read(actionProvider.notifier).addToAlbum(ActionSource.timeline, album);
@@ -83,15 +88,17 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {
           ...[
             actions.favorite,
             actions.archive,
-            actions.delete,
-            actions.cleanup,
             actions.stack,
             actions.lock,
           ].map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
           if (multiselect.onlyRemote) const DownloadActionButton(source: ActionSource.timeline),
+          isTrashEnable
+              ? const TrashActionButton(source: ActionSource.timeline)
+              : const DeletePermanentActionButton(source: ActionSource.timeline),
           const EditDateTimeActionButton(source: ActionSource.timeline),
           const EditLocationActionButton(source: ActionSource.timeline),
         ],
+        if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),
       ],
       slivers: [
         const AddToAlbumHeader(),

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

@@ -8,14 +8,18 @@ import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/asset_actions.dart';
 import 'package:immich_mobile/presentation/actions/timeline.action.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/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/trash_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';
+import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
@@ -25,6 +29,7 @@ class FavoriteBottomSheet extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final multiselect = ref.watch(multiSelectProvider);
+    final isTrashEnable = ref.watch(serverInfoProvider.select((state) => state.serverFeatures.trash));
 
     Future<void> addAssetsToAlbum(RemoteAlbum album) async {
       final selectedAssets = multiselect.selectedAssets;
@@ -73,15 +78,17 @@ class FavoriteBottomSheet extends ConsumerWidget {
           ...[
             actions.favorite,
             actions.archive,
-            actions.delete,
-            actions.cleanup,
             actions.stack,
             actions.lock,
           ].map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
           if (multiselect.onlyRemote) const DownloadActionButton(source: ActionSource.timeline),
+          isTrashEnable
+              ? const TrashActionButton(source: ActionSource.timeline)
+              : const DeletePermanentActionButton(source: ActionSource.timeline),
           const EditDateTimeActionButton(source: ActionSource.timeline),
           const EditLocationActionButton(source: ActionSource.timeline),
         ],
+        if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),
       ],
       slivers: multiselect.hasRemote
           ? [const AddToAlbumHeader(), AlbumSelector(onAlbumSelected: addAssetsToAlbum)]

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

@@ -8,16 +8,21 @@ import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/asset_actions.dart';
 import 'package:immich_mobile/presentation/actions/timeline.action.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';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/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/trash_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';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user_metadata.provider.dart';
+import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
@@ -46,6 +51,7 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
   @override
   Widget build(BuildContext context) {
     final multiselect = ref.watch(multiSelectProvider);
+    final isTrashEnable = ref.watch(serverInfoProvider.select((state) => state.serverFeatures.trash));
     final tagsEnabled = ref.watch(
       userMetadataPreferencesProvider.select((value) => value.valueOrNull?.tagsEnabled ?? false),
     );
@@ -87,8 +93,6 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
           actions.debug,
           actions.favorite,
           actions.archive,
-          actions.delete,
-          actions.cleanup,
           actions.stack,
           actions.lock,
         ].map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
@@ -96,10 +100,16 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
         if (multiselect.hasRemote) ...[
           const ShareLinkActionButton(source: ActionSource.timeline),
           if (multiselect.onlyRemote) const DownloadActionButton(source: ActionSource.timeline),
+          isTrashEnable
+              ? const TrashActionButton(source: ActionSource.timeline)
+              : const DeletePermanentActionButton(source: ActionSource.timeline),
           if (tagsEnabled) const BulkTagAssetsActionButton(source: ActionSource.timeline),
           const EditDateTimeActionButton(source: ActionSource.timeline),
           const EditLocationActionButton(source: ActionSource.timeline),
+          if (multiselect.onlyLocal || multiselect.hasMerged) const DeleteActionButton(source: ActionSource.timeline),
         ],
+        if (multiselect.onlyLocal || multiselect.hasMerged)
+          const DeleteLocalActionButton(source: ActionSource.timeline),
         if (multiselect.onlyLocal) const UploadActionButton(source: ActionSource.timeline),
       ],
       slivers: [

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

@@ -3,16 +3,12 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/asset_actions.dart';
-import 'package:immich_mobile/presentation/actions/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/share_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';
 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 LocalAlbumBottomSheet extends ConsumerStatefulWidget {
@@ -63,22 +59,15 @@ class _LocalAlbumBottomSheetState extends ConsumerState<LocalAlbumBottomSheet> {
       return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);
     }
 
-    final scope = ActionScope.from(context, ref);
-    final assets = ref.watch(multiSelectProvider).selectedAssets.toList(growable: false);
-    final actions = AssetActions.from(scope, assets);
-
     return BaseBottomSheet(
       controller: sheetController,
       initialChildSize: 0.25,
       maxChildSize: 0.85,
       shouldCloseOnMinExtent: false,
-      actions: [
-        const ShareActionButton(source: ActionSource.timeline),
-        ...[
-          actions.delete,
-          actions.cleanup,
-        ].map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
-        const UploadActionButton(source: ActionSource.timeline),
+      actions: const [
+        ShareActionButton(source: ActionSource.timeline),
+        DeleteLocalActionButton(source: ActionSource.timeline),
+        UploadActionButton(source: ActionSource.timeline),
       ],
       slivers: [
         const AddToAlbumHeader(),

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

@@ -3,9 +3,9 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/asset_actions.dart';
 import 'package:immich_mobile/presentation/actions/lock.action.dart';
 import 'package:immich_mobile/presentation/actions/timeline.action.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
@@ -16,10 +16,8 @@ class LockedFolderBottomSheet extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final multiselect = ref.watch(multiSelectProvider);
     final scope = ActionScope.from(context, ref);
-    final assets = ref.watch(multiSelectProvider).selectedAssets.toList(growable: false);
-    final actions = AssetActions.from(scope, assets);
-
     return BaseBottomSheet(
       initialChildSize: 0.25,
       maxChildSize: 0.4,
@@ -27,10 +25,12 @@ class LockedFolderBottomSheet extends ConsumerWidget {
       actions: [
         const ShareActionButton(source: ActionSource.timeline),
         const DownloadActionButton(source: ActionSource.timeline),
-        ...[
-          actions.delete,
-          LockAction(assets: assets, scope: scope),
-        ].map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
+        const DeletePermanentActionButton(source: ActionSource.timeline),
+        ActionColumnButtonWidget(
+          action: TimelineAction(
+            action: LockAction(assets: multiselect.selectedAssets.toList(growable: false), scope: scope),
+          ),
+        ),
       ],
     );
   }

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

@@ -6,17 +6,21 @@ import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/asset_actions.dart';
-import 'package:immich_mobile/presentation/actions/remove_from_album.action.dart';
-import 'package:immich_mobile/presentation/actions/set_album_cover.action.dart';
 import 'package:immich_mobile/presentation/actions/timeline.action.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/set_album_cover.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/trash_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';
+import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -47,6 +51,7 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
   @override
   Widget build(BuildContext context) {
     final multiselect = ref.watch(multiSelectProvider);
+    final isTrashEnable = ref.watch(serverInfoProvider.select((state) => state.serverFeatures.trash));
     final ownsAlbum = ref.watch(currentUserProvider)?.id == widget.album.ownerId;
 
     Future<void> addToAlbum(RemoteAlbum album) async {
@@ -78,8 +83,7 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
     }
 
     final scope = ActionScope.from(context, ref);
-    final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = AssetActions.from(scope, assets);
+    final actions = AssetActions.from(scope, multiselect.selectedAssets.toList(growable: false));
 
     return BaseBottomSheet(
       controller: sheetController,
@@ -96,30 +100,23 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
             ...[
               actions.favorite,
               actions.archive,
-              actions.delete,
-              actions.cleanup,
               actions.stack,
               actions.lock,
             ].map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
           ],
           const DownloadActionButton(source: ActionSource.timeline),
           if (ownsAlbum) ...[
+            isTrashEnable
+                ? const TrashActionButton(source: ActionSource.timeline)
+                : const DeletePermanentActionButton(source: ActionSource.timeline),
             const EditDateTimeActionButton(source: ActionSource.timeline),
             const EditLocationActionButton(source: ActionSource.timeline),
           ],
         ],
-        if (ownsAlbum)
-          ActionColumnButtonWidget(
-            action: TimelineAction(
-              action: RemoveFromAlbumAction(assets: assets, albumId: widget.album.id, scope: scope),
-            ),
-          ),
-        if (ownsAlbum)
-          ActionColumnButtonWidget(
-            action: TimelineAction(
-              action: SetAlbumCoverAction(assets: assets, albumId: widget.album.id, scope: scope),
-            ),
-          ),
+        if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),
+        if (ownsAlbum) RemoveFromAlbumActionButton(source: ActionSource.timeline, albumId: widget.album.id),
+        if (ownsAlbum && multiselect.selectedAssets.length == 1)
+          SetAlbumCoverActionButton(source: ActionSource.timeline, albumId: widget.album.id),
       ],
       slivers: ownsAlbum
           ? [const AddToAlbumHeader(), AlbumSelector(onAlbumSelected: addToAlbum, onKeyboardExpanded: onKeyboardExpand)]

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

@@ -1,11 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/delete.action.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';
 
 class TrashBottomBar extends ConsumerWidget {
@@ -26,9 +27,13 @@ class TrashBottomBar extends ConsumerWidget {
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceEvenly,
             children: [
-              DeleteAction(assets: assets, scope: scope),
-              RestoreAction(assets: assets, scope: scope),
-            ].map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))).toList(growable: false),
+              const DeleteTrashActionButton(source: ActionSource.timeline),
+              ActionColumnButtonWidget(
+                action: TimelineAction(
+                  action: RestoreAction(assets: assets, scope: scope),
+                ),
+              ),
+            ],
           ),
         ),
       ),

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

@@ -125,6 +125,18 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
+  Future<ActionResult> trash(ActionSource source) async {
+    final ids = _getOwnedRemoteIdsForSource(source);
+
+    try {
+      await _service.trash(ids);
+      return ActionResult(count: ids.length, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to 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);
@@ -306,6 +318,33 @@ class ActionNotifier extends Notifier<void> {
     );
   }
 
+  Future<ActionResult> removeFromAlbum(ActionSource source, String albumId) async {
+    final ids = _getRemoteIdsForSource(source);
+    try {
+      final removedCount = await _service.removeFromAlbum(ids, albumId);
+      return ActionResult(count: removedCount, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to remove assets from album', error, stack);
+      return ActionResult(count: ids.length, success: false, error: error.toString());
+    }
+  }
+
+  Future<ActionResult> setAlbumCover(ActionSource source, String albumId) async {
+    final assets = _getAssets(source);
+    final asset = assets.first;
+    if (asset is! RemoteAsset) {
+      return const ActionResult(count: 1, success: false, error: 'Asset must be remote');
+    }
+
+    try {
+      await _service.setAlbumCover(albumId, asset.id);
+      return const ActionResult(count: 1, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to set album cover', error, stack);
+      return ActionResult(count: 1, success: false, error: error.toString());
+    }
+  }
+
   Future<ActionResult> updateDescription(ActionSource source, String description) async {
     final ids = _getRemoteIdsForSource(source);
     if (ids.length != 1) {

mobile/lib/services/action.service.dart

@@ -83,6 +83,11 @@ class ActionService {
     await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.timeline);
   }
 
+  Future<void> trash(List<String> remoteIds) async {
+    await _assetApiRepository.delete(remoteIds, false);
+    await _remoteAssetRepository.trash(remoteIds);
+  }
+
   Future<int> emptyTrash(String userId) async {
     final count = await _assetApiRepository.emptyTrash();
     await _remoteAssetRepository.emptyTrash(userId);
@@ -194,6 +199,14 @@ class ActionService {
     );
   }
 
+  Future<int> removeFromAlbum(List<String> remoteIds, String albumId) async {
+    final result = await _albumApiRepository.removeAssets(albumId, remoteIds);
+    if (result.removed.isNotEmpty) {
+      await _remoteAlbumRepository.removeAssets(albumId, result.removed);
+    }
+    return result.removed.length;
+  }
+
   Future<bool> updateDescription(String assetId, String description) async {
     // update remote first, then local to ensure consistency
     await _assetApiRepository.updateDescription(assetId, description);

mobile/lib/utils/action_button.utils.dart

@@ -12,22 +12,25 @@ import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/archive.action.dart';
 import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';
-import 'package:immich_mobile/presentation/actions/cast.action.dart';
-import 'package:immich_mobile/presentation/actions/delete.action.dart';
 import 'package:immich_mobile/presentation/actions/lock.action.dart';
-import 'package:immich_mobile/presentation/actions/open_in_browser.action.dart';
-import 'package:immich_mobile/presentation/actions/remove_from_album.action.dart';
 import 'package:immich_mobile/presentation/actions/restore.action.dart';
-import 'package:immich_mobile/presentation/actions/set_album_cover.action.dart';
-import 'package:immich_mobile/presentation/actions/set_profile_picture.action.dart';
-import 'package:immich_mobile/presentation/actions/similar_photos.action.dart';
-import 'package:immich_mobile/presentation/actions/slideshow.action.dart';
 import 'package:immich_mobile/presentation/actions/stack.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/cast_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/like_activity_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/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/set_album_cover.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/set_profile_picture_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/similar_photos_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/slideshow_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/routing/router.dart';
 
@@ -82,7 +85,9 @@ enum ActionButtonType {
   removeFromLockFolder,
   removeFromAlbum,
   restoreTrash,
+  trash,
   deleteLocal,
+  deletePermanent,
   delete,
   advancedInfo;
 
@@ -107,12 +112,25 @@ enum ActionButtonType {
         !context.isInLockedView && //
             context.asset.hasRemote && //
             !context.asset.hasLocal,
+      ActionButtonType.trash =>
+        context.isOwner && //
+            !context.isInLockedView && //
+            context.asset.hasRemote && //
+            context.isTrashEnabled && //
+            context.timelineOrigin != TimelineOrigin.trash,
       ActionButtonType.restoreTrash =>
         context.isOwner && //
             !context.isInLockedView && //
             context.asset.hasRemote && //
             context.timelineOrigin == TimelineOrigin.trash,
-      ActionButtonType.delete => true, //
+      ActionButtonType.deletePermanent =>
+        context.isOwner && //
+            context.asset.hasRemote && //
+            (!context.isTrashEnabled || context.timelineOrigin == TimelineOrigin.trash || context.isInLockedView),
+      ActionButtonType.delete =>
+        context.isOwner && //
+            !context.isInLockedView && //
+            context.asset.hasRemote,
       ActionButtonType.moveToLockFolder =>
         context.isOwner && //
             !context.isInLockedView && //
@@ -123,7 +141,7 @@ enum ActionButtonType {
             context.asset.hasRemote,
       ActionButtonType.deleteLocal =>
         !context.isInLockedView && //
-            context.asset.isMerged,
+            context.asset.hasLocal,
       ActionButtonType.upload =>
         !context.isInLockedView && //
             context.asset.storage == AssetState.local,
@@ -186,45 +204,64 @@ enum ActionButtonType {
         iconOnly: iconOnly,
         menuItem: menuItem,
       ),
-      ActionButtonType.slideshow => ActionMenuItemWidget(action: SlideshowAction(scope: scope)),
+      ActionButtonType.slideshow => SlideshowActionButton(iconOnly: iconOnly, menuItem: menuItem),
       ActionButtonType.archive || ActionButtonType.unarchive => ActionMenuItemWidget(
         action: ArchiveAction(assets: [context.asset], scope: scope),
       ),
       ActionButtonType.download => DownloadActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
+      ActionButtonType.trash => TrashActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
       ActionButtonType.restoreTrash => ActionMenuItemWidget(
         action: RestoreAction(assets: [context.asset], scope: scope),
       ),
-      ActionButtonType.delete => ActionMenuItemWidget(
-        action: DeleteAction(assets: [context.asset], scope: scope),
+      ActionButtonType.deletePermanent => DeletePermanentActionButton(
+        source: context.source,
+        iconOnly: iconOnly,
+        menuItem: menuItem,
       ),
+      ActionButtonType.delete => DeleteActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
       ActionButtonType.moveToLockFolder => ActionMenuItemWidget(
         action: LockAction(assets: [context.asset], scope: scope),
       ),
       ActionButtonType.removeFromLockFolder => ActionMenuItemWidget(
         action: LockAction(assets: [context.asset], scope: scope),
       ),
-      ActionButtonType.deleteLocal => ActionMenuItemWidget(
-        action: CleanupLocalAction(assets: [context.asset], scope: scope),
+      ActionButtonType.deleteLocal => DeleteLocalActionButton(
+        source: context.source,
+        iconOnly: iconOnly,
+        menuItem: menuItem,
       ),
       ActionButtonType.upload => UploadActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
-      ActionButtonType.removeFromAlbum => ActionMenuItemWidget(
-        action: RemoveFromAlbumAction(assets: [context.asset], albumId: context.currentAlbum!.id, scope: scope),
+      ActionButtonType.removeFromAlbum => RemoveFromAlbumActionButton(
+        albumId: context.currentAlbum!.id,
+        source: context.source,
+        iconOnly: iconOnly,
+        menuItem: menuItem,
       ),
-      ActionButtonType.setAlbumCover => ActionMenuItemWidget(
-        action: SetAlbumCoverAction(assets: [context.asset], albumId: context.currentAlbum!.id, scope: scope),
+      ActionButtonType.setAlbumCover => SetAlbumCoverActionButton(
+        albumId: context.currentAlbum!.id,
+        source: context.source,
+        iconOnly: iconOnly,
+        menuItem: menuItem,
       ),
       ActionButtonType.likeActivity => LikeActivityActionButton(iconOnly: iconOnly, menuItem: menuItem),
       ActionButtonType.unstack => ActionMenuItemWidget(
         action: StackAction(assets: [context.asset], scope: scope),
       ),
-      ActionButtonType.openInBrowser => ActionMenuItemWidget(
-        action: OpenInBrowserAction(remoteId: context.asset.remoteId!, origin: context.timelineOrigin, scope: scope),
+      ActionButtonType.openInBrowser => OpenInBrowserActionButton(
+        remoteId: context.asset.remoteId!,
+        origin: context.timelineOrigin,
+        iconOnly: iconOnly,
+        menuItem: menuItem,
       ),
-      ActionButtonType.similarPhotos => ActionMenuItemWidget(
-        action: SimilarPhotosAction(assetId: (context.asset as RemoteAsset).id, scope: scope),
+      ActionButtonType.similarPhotos => SimilarPhotosActionButton(
+        assetId: (context.asset as RemoteAsset).id,
+        iconOnly: iconOnly,
+        menuItem: menuItem,
       ),
-      ActionButtonType.setProfilePicture => ActionMenuItemWidget(
-        action: SetProfilePictureAction(asset: context.asset, scope: scope),
+      ActionButtonType.setProfilePicture => SetProfilePictureActionButton(
+        asset: context.asset,
+        iconOnly: iconOnly,
+        menuItem: menuItem,
       ),
       ActionButtonType.openInfo => BaseActionButton(
         label: 'info'.tr(),
@@ -242,7 +279,7 @@ enum ActionButtonType {
           EventStream.shared.emit(ScrollToDateEvent(context.asset.createdAt));
         },
       ),
-      ActionButtonType.cast => ActionMenuItemWidget(action: CastAction(scope: scope)),
+      ActionButtonType.cast => CastActionButton(iconOnly: iconOnly, menuItem: menuItem),
     };
   }
 
@@ -253,6 +290,8 @@ enum ActionButtonType {
     // 0: info
     ActionButtonType.openInfo => 0,
     // 10: move, remove, and delete
+    ActionButtonType.trash => 10,
+    ActionButtonType.deletePermanent => 10,
     ActionButtonType.removeFromLockFolder => 10,
     ActionButtonType.removeFromAlbum => 10,
     ActionButtonType.unstack => 10,
@@ -280,6 +319,7 @@ class ActionButtonBuilder {
     ActionButtonType.archive,
     ActionButtonType.unarchive,
     ActionButtonType.restoreTrash,
+    ActionButtonType.deletePermanent,
   };
 
   static List<Widget> build(ActionButtonContext context, BuildContext buildContext, WidgetRef ref) {

mobile/lib/utils/asset_filter.dart

@@ -20,5 +20,5 @@ extension type const AssetFilter<T extends BaseAsset>(Iterable<T> assets) implem
   AssetFilter<RemoteAsset> trashed({bool isTrashed = true}) => remote().where((asset) => asset.isTrashed == isTrashed);
 
   AssetFilter<LocalAsset> local() => AssetFilter(assets.whereType<LocalAsset>());
-  AssetFilter<BaseAsset> backedUp() => where((asset) => asset.isMerged);
+  AssetFilter<LocalAsset> backedUp() => local().where((asset) => asset.remoteAssetId != null);
 }

mobile/test/domain/service.mock.dart

@@ -1,14 +1,10 @@
 import 'package:immich_mobile/domain/services/asset.service.dart';
 import 'package:immich_mobile/domain/services/partner.service.dart';
-import 'package:immich_mobile/domain/services/remote_album.service.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/domain/utils/background_sync.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/services/cleanup.service.dart';
-import 'package:immich_mobile/services/gcast.service.dart';
-import 'package:immich_mobile/services/server_info.service.dart';
 import 'package:mocktail/mocktail.dart';
 
 class MockStoreService extends Mock implements StoreService {}
@@ -24,11 +20,3 @@ class MockPartnerService extends Mock implements PartnerService {}
 class MockAssetService extends Mock implements AssetService {}
 
 class MockUserService extends Mock implements UserService {}
-
-class MockRemoteAlbumService extends Mock implements RemoteAlbumService {}
-
-class MockGCastService extends Mock implements GCastService {}
-
-class MockCleanupService extends Mock implements CleanupService {}
-
-class MockServerInfoService extends Mock implements ServerInfoService {}

mobile/test/unit/factories/local_asset_factory.dart

@@ -5,13 +5,12 @@ import '../../utils.dart';
 class LocalAssetFactory {
   const LocalAssetFactory();
 
-  static LocalAsset create({String? id, String? name, String? remoteId}) {
+  static LocalAsset create({String? id, String? name}) {
     id = TestUtils.uuid(id);
 
     return LocalAsset(
       id: id,
       name: name ?? 'local_$id.jpg',
-      remoteId: remoteId,
       type: AssetType.image,
       createdAt: TestUtils.yesterday(),
       updatedAt: TestUtils.now(),

mobile/test/unit/factories/remote_album_factory.dart

@@ -1,38 +0,0 @@
-import 'package:immich_mobile/domain/models/album/album.model.dart';
-
-import '../../utils.dart';
-
-class RemoteAlbumFactory {
-  const RemoteAlbumFactory();
-
-  static RemoteAlbum create({
-    String? id,
-    String? name,
-    String? ownerId,
-    String? description,
-    DateTime? createdAt,
-    DateTime? updatedAt,
-    String? thumbnailAssetId,
-    bool isActivityEnabled = false,
-    AlbumAssetOrder order = AlbumAssetOrder.desc,
-    int assetCount = 0,
-    String? ownerName,
-    bool isShared = false,
-  }) {
-    id = TestUtils.uuid(id);
-    return RemoteAlbum(
-      id: id,
-      name: name ?? 'remote_album_$id',
-      ownerId: TestUtils.uuid(ownerId),
-      description: description ?? '',
-      createdAt: TestUtils.date(createdAt),
-      updatedAt: TestUtils.date(updatedAt),
-      thumbnailAssetId: thumbnailAssetId,
-      isActivityEnabled: isActivityEnabled,
-      order: order,
-      assetCount: assetCount,
-      ownerName: ownerName ?? 'owner_$id',
-      isShared: isShared,
-    );
-  }
-}

mobile/test/unit/factories/remote_asset_factory.dart

@@ -13,7 +13,6 @@ class RemoteAssetFactory {
     AssetVisibility visibility = AssetVisibility.timeline,
     String? stackId,
     DateTime? deletedAt,
-    String? localId,
   }) {
     id = TestUtils.uuid(id);
 
@@ -30,7 +29,6 @@ class RemoteAssetFactory {
       stackId: stackId,
       isEdited: false,
       deletedAt: deletedAt,
-      localId: localId,
     );
   }
 }

mobile/test/unit/mocks.dart

@@ -1,7 +1,6 @@
 import 'dart:typed_data';
 
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/album/album.model.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';
@@ -14,7 +13,6 @@ import '../domain/service.mock.dart';
 import '../infrastructure/repository.mock.dart';
 import 'factories/local_album_factory.dart';
 import 'factories/local_asset_factory.dart';
-import 'factories/remote_album_factory.dart';
 import 'factories/user_factory.dart';
 
 class RepositoryMocks {
@@ -60,8 +58,6 @@ class ServiceMocks {
   final partner = PartnerServiceStub(MockPartnerService());
   final user = UserServiceStub(MockUserService());
   final asset = AssetServiceStub(MockAssetService());
-  final album = RemoteAlbumServiceStub(MockRemoteAlbumService());
-  final cleanup = CleanupServiceStub(MockCleanupService());
 
   ServiceMocks() {
     resetAll();
@@ -72,13 +68,9 @@ class ServiceMocks {
     partner.reset();
     user.reset();
     asset.reset();
-    album.reset();
-    cleanup.reset();
     _stubUserService();
     _stubPartnerService();
     _stubAssetService();
-    _stubRemoteAlbumService();
-    _stubCleanupService();
   }
 
   void _stubUserService() {
@@ -103,17 +95,6 @@ class ServiceMocks {
     when(asset.stack).thenAnswer((_) async {});
     when(asset.unstack).thenAnswer((_) async {});
     when(asset.restoreTrash).thenAnswer((_) async {});
-    when(asset.trash).thenAnswer((_) async {});
-    when(asset.delete).thenAnswer((_) async {});
-  }
-
-  void _stubRemoteAlbumService() {
-    when(album.removeAssets).thenAnswer((_) async => 0);
-    when(album.updateAlbum).thenAnswer((_) async => RemoteAlbumFactory.create());
-  }
-
-  void _stubCleanupService() {
-    when(cleanup.deleteLocalAssets).thenAnswer((_) async => 0);
   }
 }
 
@@ -208,28 +189,6 @@ extension type const AssetServiceStub(MockAssetService service) implements Stub<
 
   Future<void> Function() get restoreTrash =>
       () => service.restoreTrash(any());
-
-  Future<void> Function() get trash =>
-      () => service.trash(any());
-
-  Future<void> Function() get delete =>
-      () => service.delete(any());
-}
-
-extension type const RemoteAlbumServiceStub(MockRemoteAlbumService service) implements Stub<MockRemoteAlbumService> {
-  Future<int> Function() get removeAssets =>
-      () => service.removeAssets(
-        albumId: any(named: 'albumId'),
-        assetIds: any(named: 'assetIds'),
-      );
-
-  Future<RemoteAlbum> Function() get updateAlbum =>
-      () => service.updateAlbum(any(), thumbnailAssetId: any(named: 'thumbnailAssetId'));
-}
-
-extension type const CleanupServiceStub(MockCleanupService service) implements Stub<MockCleanupService> {
-  Future<int> Function() get deleteLocalAssets =>
-      () => service.deleteLocalAssets(any());
 }
 
 extension type const NativeSyncApiStub(MockNativeSyncApi api) implements Stub<MockNativeSyncApi> {

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

@@ -1,221 +0,0 @@
-import 'package:flutter/foundation.dart';
-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/domain/models/store.model.dart';
-import 'package:immich_mobile/domain/services/store.service.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/presentation/actions/delete.action.dart';
-import 'package:immich_mobile/providers/server_info.provider.dart';
-import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
-import 'package:mocktail/mocktail.dart';
-
-import '../../../domain/service.mock.dart';
-import '../../factories/local_asset_factory.dart';
-import '../../factories/remote_asset_factory.dart';
-import '../../riverpod_mocks.dart';
-import '../presentation_context.dart';
-
-void main() {
-  late PresentationContext context;
-  late MockAssetService assetService;
-  late MockCleanupService cleanupService;
-
-  setUp(() async {
-    context = await PresentationContext.create();
-    assetService = context.service.asset.service;
-    cleanupService = context.service.cleanup.service;
-  });
-
-  tearDown(() async {
-    debugDefaultTargetPlatformOverride = null;
-    await StoreService.I.put(StoreKey.manageLocalMediaAndroid, false);
-    context.dispose();
-  });
-
-  RemoteAsset owned({AssetVisibility visibility = .timeline, DateTime? deletedAt, String? localId}) =>
-      RemoteAssetFactory.create(
-        ownerId: context.currentUser.id,
-        visibility: visibility,
-        deletedAt: deletedAt,
-        localId: localId,
-      );
-
-  List<Override> disableTrash() => [
-    serverInfoProvider.overrideWith((ref) => FakeServerInfoNotifier(trashEnabled: false)),
-  ];
-
-  Future<void> respondToDialog(WidgetTester tester, {required bool confirm}) async {
-    await tester.pump(const Duration(milliseconds: 300));
-    expect(find.byType(ConfirmDialog), findsOneWidget);
-    await tester.tap(find.byType(TextButton).at(confirm ? 1 : 0)); // [cancel, ok]
-    await tester.pumpAndSettle();
-  }
-
-  group('DeleteAction', () {
-    group('trash', () {
-      testWidgets('trashes a remote-only owned asset', (tester) async {
-        final asset = owned();
-
-        await tester.pumpTestAction(context, (scope) => DeleteAction(assets: [asset], scope: scope));
-        await tester.pumpAndSettle();
-
-        verify(() => assetService.trash([asset.id])).called(1);
-        verifyNever(() => assetService.delete(any()));
-        verifyNever(() => cleanupService.deleteLocalAssets(any()));
-      });
-
-      testWidgets('ignores assets owned by someone else', (tester) async {
-        final mine = owned();
-        final theirs = RemoteAssetFactory.create();
-
-        await tester.pumpTestAction(context, (scope) => DeleteAction(assets: [mine, theirs], scope: scope));
-        await tester.pumpAndSettle();
-
-        verify(() => assetService.trash([mine.id])).called(1);
-      });
-
-      testWidgets('trashes a merged asset and removes its device copy', (tester) async {
-        final asset = owned(localId: 'local');
-
-        await tester.pumpTestAction(context, (scope) => DeleteAction(assets: [asset], scope: scope));
-        await tester.pumpAndSettle();
-
-        verify(() => cleanupService.deleteLocalAssets(['local'])).called(1);
-        verify(() => assetService.trash([asset.id])).called(1);
-      });
-    });
-
-    group('permanent', () {
-      testWidgets('permanently deletes when the trash feature is disabled', (tester) async {
-        final asset = owned();
-
-        await tester.pumpTestAction(
-          context,
-          (scope) => DeleteAction(assets: [asset], scope: scope),
-          overrides: disableTrash(),
-        );
-        await respondToDialog(tester, confirm: true);
-
-        verify(() => assetService.delete([asset.id])).called(1);
-        verifyNever(() => assetService.trash(any()));
-      });
-
-      testWidgets('permanently deletes a merged asset and removes its device copy', (tester) async {
-        final asset = owned(localId: 'local');
-
-        await tester.pumpTestAction(
-          context,
-          (scope) => DeleteAction(assets: [asset], scope: scope),
-          overrides: disableTrash(),
-        );
-        await respondToDialog(tester, confirm: true);
-
-        verify(() => assetService.delete([asset.id])).called(1);
-        verify(() => cleanupService.deleteLocalAssets(['local'])).called(1);
-      });
-
-      testWidgets('permanently deletes already trashed assets even with trash enabled', (tester) async {
-        final asset = owned(deletedAt: DateTime(2024));
-
-        await tester.pumpTestAction(context, (scope) => DeleteAction(assets: [asset], scope: scope));
-        await respondToDialog(tester, confirm: true);
-
-        verify(() => assetService.delete([asset.id])).called(1);
-        verifyNever(() => assetService.trash(any()));
-      });
-
-      testWidgets('permanently deletes locked folder assets even with trash enabled', (tester) async {
-        final asset = owned(visibility: .locked, localId: 'local');
-
-        await tester.pumpTestAction(context, (scope) => DeleteAction(assets: [asset], scope: scope));
-        await respondToDialog(tester, confirm: true);
-
-        verify(() => assetService.delete([asset.id])).called(1);
-        verify(() => cleanupService.deleteLocalAssets(['local'])).called(1);
-      });
-
-      testWidgets('does nothing when the confirmation is cancelled', (tester) async {
-        final asset = owned(visibility: .locked, localId: 'local');
-
-        await tester.pumpTestAction(context, (scope) => DeleteAction(assets: [asset], scope: scope));
-        await respondToDialog(tester, confirm: false);
-
-        verifyNever(() => assetService.delete(any()));
-        verifyNever(() => cleanupService.deleteLocalAssets(any()));
-      });
-    });
-
-    group('local only', () {
-      testWidgets('removes the device copy with no remote call', (tester) async {
-        final asset = LocalAssetFactory.create();
-
-        await tester.pumpTestAction(context, (scope) => DeleteAction(assets: [asset], scope: scope));
-        await tester.pumpAndSettle();
-
-        verify(() => cleanupService.deleteLocalAssets([asset.id])).called(1);
-        verifyNever(() => assetService.trash(any()));
-        verifyNever(() => assetService.delete(any()));
-      });
-    });
-
-    group('prompt handling', () {
-      testWidgets('permanent delete shows a single app dialog', (tester) async {
-        final asset = owned(localId: 'local');
-
-        await tester.pumpTestAction(
-          context,
-          (scope) => DeleteAction(assets: [asset], scope: scope),
-          overrides: disableTrash(),
-        );
-        await tester.pump(const Duration(milliseconds: 300));
-
-        expect(find.text(StaticTranslations.instance.delete_dialog_title), findsOneWidget);
-        await tester.tap(find.byType(TextButton).at(1));
-        await tester.pumpAndSettle();
-
-        expect(find.text(StaticTranslations.instance.move_to_device_trash), findsNothing);
-        verify(() => assetService.delete([asset.id])).called(1);
-        verify(() => cleanupService.deleteLocalAssets(['local'])).called(1);
-      });
-
-      testWidgets('local only delete on Android with MANAGE_MEDIA shows the prompt', (tester) async {
-        debugDefaultTargetPlatformOverride = TargetPlatform.android;
-        await StoreService.I.put(StoreKey.manageLocalMediaAndroid, true);
-        final asset = LocalAssetFactory.create();
-
-        await tester.pumpTestAction(context, (scope) => DeleteAction(assets: [asset], scope: scope));
-        await tester.pump(const Duration(milliseconds: 300));
-
-        expect(find.text(StaticTranslations.instance.move_to_device_trash), findsOneWidget);
-        await tester.tap(find.byType(TextButton).at(1)); // confirm
-        await tester.pumpAndSettle();
-
-        verify(() => cleanupService.deleteLocalAssets([asset.id])).called(1);
-        debugDefaultTargetPlatformOverride = null;
-      });
-    });
-  });
-
-  group('CleanupLocalAction', () {
-    testWidgets('deletes only backed up device copies', (tester) async {
-      final backedUp = LocalAssetFactory.create(remoteId: 'remote');
-      final localOnly = LocalAssetFactory.create();
-
-      await tester.pumpTestAction(context, (scope) => CleanupLocalAction(assets: [backedUp, localOnly], scope: scope));
-      await tester.pumpAndSettle();
-
-      verify(() => cleanupService.deleteLocalAssets([backedUp.id])).called(1);
-    });
-
-    testWidgets('is hidden when no backed up assets are selected', (tester) async {
-      final action = await tester.pumpActionButton(
-        context,
-        (scope) => CleanupLocalAction(assets: [LocalAssetFactory.create()], scope: scope),
-      );
-
-      expect(action.isVisible, isFalse);
-    });
-  });
-}

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

@@ -1,56 +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/remove_from_album.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 MockRemoteAlbumService albumService;
-
-  setUp(() async {
-    context = await PresentationContext.create();
-    albumService = context.service.album.service;
-  });
-
-  tearDown(() {
-    context.dispose();
-  });
-
-  RemoteAsset remote() => RemoteAssetFactory.create(ownerId: context.currentUser.id);
-
-  group('RemoveFromAlbumAction', () {
-    testWidgets('removes the selected remote assets from the album', (tester) async {
-      final first = remote();
-      final second = remote();
-      final albumId = 'album';
-      final action = await tester.pumpTestAction(
-        context,
-        (scope) => RemoveFromAlbumAction(assets: [first, second], albumId: albumId, scope: scope),
-      );
-
-      expect(action.icon, Icons.remove_circle_outline);
-      expect(action.label, StaticTranslations.instance.remove_from_album);
-      verify(() => albumService.removeAssets(albumId: albumId, assetIds: [first.id, second.id])).called(1);
-    });
-
-    testWidgets('reports the removed count through the toast repository', (tester) async {
-      final toast = context.repository.toast;
-      final albumId = 'album';
-      when(context.service.album.removeAssets).thenAnswer((_) async => 2);
-
-      await tester.pumpTestAction(
-        context,
-        (scope) => RemoveFromAlbumAction(assets: [remote(), remote()], albumId: albumId, scope: scope),
-      );
-
-      final message = verify(() => toast.success(captureAny())).captured.single as String;
-      expect(message, StaticTranslations.instance.remove_from_album_action_prompt(count: 2));
-    });
-  });
-}

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

@@ -1,51 +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/set_album_cover.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 MockRemoteAlbumService albumService;
-
-  setUp(() async {
-    context = await PresentationContext.create();
-    albumService = context.service.album.service;
-  });
-
-  tearDown(() {
-    context.dispose();
-  });
-
-  RemoteAsset remote() => RemoteAssetFactory.create(ownerId: context.currentUser.id);
-
-  group('SetAlbumCoverAction', () {
-    testWidgets('sets the selected asset as the album cover', (tester) async {
-      final asset = remote();
-      const albumId = 'album';
-      final action = await tester.pumpTestAction(
-        context,
-        (scope) => SetAlbumCoverAction(assets: [asset], albumId: albumId, scope: scope),
-      );
-
-      expect(action.icon, Icons.image_outlined);
-      expect(action.label, StaticTranslations.instance.set_as_album_cover);
-      verify(() => albumService.updateAlbum(albumId, thumbnailAssetId: asset.id)).called(1);
-    });
-
-    testWidgets('is hidden unless exactly one remote asset is selected', (tester) async {
-      const albumId = 'album';
-      final action = await tester.pumpActionButton(
-        context,
-        (scope) => SetAlbumCoverAction(assets: [remote(), remote()], albumId: albumId, scope: scope),
-      );
-
-      expect(action.isVisible, isFalse);
-    });
-  });
-}

mobile/test/unit/presentation/presentation_context.dart

@@ -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/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/providers/server_info.provider.dart';
-import 'package:immich_mobile/services/cleanup.service.dart';
-import 'package:immich_mobile/services/gcast.service.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 '../../domain/service.mock.dart';
 import '../../test_utils.dart';
 import '../factories/user_factory.dart';
 import '../mocks.dart';
-import '../riverpod_mocks.dart';
 
 class PresentationContext {
   PresentationContext._({required UserDto user})
@@ -50,10 +44,6 @@ class PresentationContext {
     currentUserProvider.overrideWith((ref) => CurrentUserProvider(service.user.service)),
     assetServiceProvider.overrideWithValue(service.asset.service),
     partnerServiceProvider.overrideWithValue(service.partner.service),
-    remoteAlbumServiceProvider.overrideWithValue(service.album.service),
-    cleanupServiceProvider.overrideWithValue(service.cleanup.service),
-    gCastServiceProvider.overrideWithValue(MockGCastService()),
-    serverInfoProvider.overrideWith((ref) => FakeServerInfoNotifier()),
     toastRepositoryProvider.overrideWithValue(repository.toast),
   ];
 

mobile/test/unit/riverpod_mocks.dart

@@ -1,9 +0,0 @@
-import 'package:immich_mobile/providers/server_info.provider.dart';
-
-import '../domain/service.mock.dart';
-
-class FakeServerInfoNotifier extends ServerInfoNotifier {
-  FakeServerInfoNotifier({bool trashEnabled = true}) : super(MockServerInfoService()) {
-    state = state.copyWith(serverFeatures: state.serverFeatures.copyWith(trash: trashEnabled));
-  }
-}

mobile/test/unit/utils/asset_filter_test.dart

@@ -52,7 +52,7 @@ void main() {
         final offlinePhoto = LocalAssetFactory.create();
         final remotePhoto = RemoteAssetFactory.create();
 
-        final AssetFilter<BaseAsset> syncedPhotos = AssetFilter(<BaseAsset>[
+        final AssetFilter<LocalAsset> syncedPhotos = AssetFilter(<BaseAsset>[
           syncedPhoto,
           offlinePhoto,
           remotePhoto,

mobile/test/utils_legacy/action_button_utils_test.dart

@@ -447,6 +447,60 @@ void main() {
       });
     });
 
+    group('trash button', () {
+      test('should show when owner, not locked, has remote, and trash enabled', () {
+        final remoteAsset = createRemoteAsset();
+        final context = ActionButtonContext(
+          asset: remoteAsset,
+          isOwner: true,
+          isArchived: false,
+          isTrashEnabled: true,
+          isInLockedView: false,
+          currentAlbum: null,
+          advancedTroubleshooting: false,
+          isStacked: false,
+          source: ActionSource.timeline,
+        );
+
+        expect(ActionButtonType.trash.shouldShow(context), isTrue);
+      });
+
+      test('should not show when trash disabled', () {
+        final remoteAsset = createRemoteAsset();
+        final context = ActionButtonContext(
+          asset: remoteAsset,
+          isOwner: true,
+          isArchived: false,
+          isTrashEnabled: false,
+          isInLockedView: false,
+          currentAlbum: null,
+          advancedTroubleshooting: false,
+          isStacked: false,
+          source: ActionSource.timeline,
+        );
+
+        expect(ActionButtonType.trash.shouldShow(context), isFalse);
+      });
+
+      test('should not show when asset is already trashed', () {
+        final remoteAsset = createRemoteAsset(deletedAt: DateTime(2024));
+        final context = ActionButtonContext(
+          asset: remoteAsset,
+          isOwner: true,
+          isArchived: false,
+          isTrashEnabled: true,
+          isInLockedView: false,
+          currentAlbum: null,
+          advancedTroubleshooting: false,
+          isStacked: false,
+          source: ActionSource.viewer,
+          timelineOrigin: TimelineOrigin.trash,
+        );
+
+        expect(ActionButtonType.trash.shouldShow(context), isFalse);
+      });
+    });
+
     group('restoreTrash button', () {
       test('should show when owner, not locked, has remote, and is in trash timeline', () {
         final remoteAsset = createRemoteAsset();
@@ -485,6 +539,60 @@ void main() {
       });
     });
 
+    group('deletePermanent button', () {
+      test('should show when owner, not locked, has remote, and trash disabled', () {
+        final remoteAsset = createRemoteAsset();
+        final context = ActionButtonContext(
+          asset: remoteAsset,
+          isOwner: true,
+          isArchived: false,
+          isTrashEnabled: false,
+          isInLockedView: false,
+          currentAlbum: null,
+          advancedTroubleshooting: false,
+          isStacked: false,
+          source: ActionSource.timeline,
+        );
+
+        expect(ActionButtonType.deletePermanent.shouldShow(context), isTrue);
+      });
+
+      test('should not show when trash enabled', () {
+        final remoteAsset = createRemoteAsset();
+        final context = ActionButtonContext(
+          asset: remoteAsset,
+          isOwner: true,
+          isArchived: false,
+          isTrashEnabled: true,
+          isInLockedView: false,
+          currentAlbum: null,
+          advancedTroubleshooting: false,
+          isStacked: false,
+          source: ActionSource.timeline,
+        );
+
+        expect(ActionButtonType.deletePermanent.shouldShow(context), isFalse);
+      });
+
+      test('should show when asset is trashed even with trash enabled', () {
+        final remoteAsset = createRemoteAsset(deletedAt: DateTime(2024));
+        final context = ActionButtonContext(
+          asset: remoteAsset,
+          isOwner: true,
+          isArchived: false,
+          isTrashEnabled: true,
+          isInLockedView: false,
+          currentAlbum: null,
+          advancedTroubleshooting: false,
+          isStacked: false,
+          source: ActionSource.viewer,
+          timelineOrigin: TimelineOrigin.trash,
+        );
+
+        expect(ActionButtonType.deletePermanent.shouldShow(context), isTrue);
+      });
+    });
+
     group('delete button', () {
       test('should show when owner, not locked, and has remote', () {
         final remoteAsset = createRemoteAsset();
@@ -524,7 +632,7 @@ void main() {
     });
 
     group('deleteLocal button', () {
-      test('should not show when asset is local only', () {
+      test('should show when not locked and asset is local only', () {
         final localAsset = createLocalAsset();
         final context = ActionButtonContext(
           asset: localAsset,
@@ -538,6 +646,23 @@ void main() {
           source: ActionSource.timeline,
         );
 
+        expect(ActionButtonType.deleteLocal.shouldShow(context), isTrue);
+      });
+
+      test('should not show when asset is not local only', () {
+        final remoteAsset = createRemoteAsset();
+        final context = ActionButtonContext(
+          asset: remoteAsset,
+          isOwner: true,
+          isArchived: false,
+          isTrashEnabled: true,
+          isInLockedView: false,
+          currentAlbum: null,
+          advancedTroubleshooting: false,
+          isStacked: false,
+          source: ActionSource.timeline,
+        );
+
         expect(ActionButtonType.deleteLocal.shouldShow(context), isFalse);
       });