review changes

# Conflicts:
#	mobile/lib/domain/services/asset.service.dart
#	mobile/lib/presentation/actions/favorite.action.dart
#	mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
#	mobile/lib/utils/action_button.utils.dart
#	mobile/test/unit/factories/remote_asset_factory.dart
#	mobile/test/unit/mocks.dart

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

@@ -77,4 +77,31 @@ class AssetService {
     await _apiRepository.updateFavorite(remoteIds, isFavorite);
     await _remoteRepository.updateFavorite(remoteIds, isFavorite);
   }
+
+  Future<void> restoreTrash(List<String> remoteIds) async {
+    if (remoteIds.isEmpty) {
+      return;
+    }
+
+    await _apiRepository.restoreTrash(remoteIds);
+    await _remoteRepository.restoreTrash(remoteIds);
+  }
+
+  Future<void> stack(String userId, List<String> remoteIds) async {
+    if (remoteIds.isEmpty) {
+      return;
+    }
+
+    final stack = await _apiRepository.stack(remoteIds);
+    await _remoteRepository.stack(userId, stack);
+  }
+
+  Future<void> unstack(List<String> stackIds) async {
+    if (stackIds.isEmpty) {
+      return;
+    }
+
+    await _remoteRepository.unStack(stackIds);
+    await _apiRepository.unStack(stackIds);
+  }
 }

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

@@ -3,8 +3,8 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';
 import 'package:immich_mobile/utils/asset_filter.dart';
-import 'package:immich_ui/immich_ui.dart';
 
 class FavoriteAction extends AssetAction<RemoteAsset> {
   final bool favorite;
@@ -32,13 +32,13 @@ class FavoriteAction extends AssetAction<RemoteAsset> {
 
   @override
   Future<void> onAction(ActionScope scope) async {
-    final ActionScope(:ref) = scope;
+    final ActionScope(:ref, :context) = scope;
     final assets = filter(scope).map((asset) => asset.id).toList(growable: false);
 
     await ref.read(assetServiceProvider).updateFavorite(assets, favorite);
     final message = favorite
-        ? StaticTranslations.instance.favorite_action_prompt(count: assets.length)
-        : StaticTranslations.instance.unfavorite_action_prompt(count: assets.length);
-    snackbar.success(message);
+        ? context.t.favorite_action_prompt(count: assets.length)
+        : context.t.unfavorite_action_prompt(count: assets.length);
+    ref.read(toastRepositoryProvider).success(message);
   }
 }

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

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

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

@@ -0,0 +1,44 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/generated/translations.g.dart';
+import 'package:immich_mobile/presentation/actions/action.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';
+import 'package:immich_mobile/utils/asset_filter.dart';
+
+class StackAction extends AssetAction<RemoteAsset> {
+  final bool shouldStack;
+
+  StackAction({required super.assets})
+    : shouldStack = assets.any((asset) => asset is RemoteAsset && asset.stackId == null);
+
+  @override
+  IconData get icon => shouldStack ? Icons.filter_none_rounded : Icons.layers_clear_outlined;
+
+  @override
+  String label(ActionScope scope) => shouldStack ? scope.context.t.stack : scope.context.t.unstack;
+
+  @override
+  Iterable<RemoteAsset> filter(ActionScope scope) => AssetFilter(assets).owned(scope.authUser.id);
+
+  @override
+  bool isVisible(ActionScope scope) => shouldStack ? filter(scope).length > 1 : filter(scope).isNotEmpty;
+
+  @override
+  Future<void> onAction(ActionScope scope) async {
+    final ActionScope(:ref, :context) = scope;
+    final assets = filter(scope).toList(growable: false);
+    final service = ref.read(assetServiceProvider);
+
+    if (shouldStack) {
+      await service.stack(scope.authUser.id, assets.map((asset) => asset.id).toList(growable: false));
+    } else {
+      await service.unstack(assets.map((asset) => asset.stackId).nonNulls.toList(growable: false));
+    }
+
+    final message = shouldStack
+        ? context.t.stacked_assets_count(count: assets.length)
+        : context.t.unstacked_assets_count(count: assets.length);
+    ref.read(toastRepositoryProvider).success(message);
+  }
+}

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

@@ -1,61 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';
-
-class FavoriteActionButton extends ConsumerWidget {
-  final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
-
-  const FavoriteActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
-
-  void _onTap(BuildContext context, WidgetRef ref) async {
-    if (!context.mounted) {
-      return;
-    }
-
-    final result = await ref.read(actionProvider.notifier).favorite(source);
-
-    if (source == ActionSource.viewer) {
-      if (result.success) {
-        final currentAsset = ref.read(assetViewerProvider).currentAsset;
-        if (currentAsset is RemoteAsset && !currentAsset.isFavorite) {
-          ref.read(assetViewerProvider.notifier).setAsset(currentAsset.copyWith(isFavorite: true));
-        }
-      }
-      return;
-    }
-
-    ref.read(multiSelectProvider.notifier).reset();
-
-    final successMessage = 'favorite_action_prompt'.t(context: context, args: {'count': result.count.toString()});
-
-    if (context.mounted) {
-      ImmichToast.show(
-        context: context,
-        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
-        gravity: ToastGravity.BOTTOM,
-        toastType: result.success ? ToastType.success : ToastType.error,
-      );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return BaseActionButton(
-      iconData: Icons.favorite_border_rounded,
-      label: "favorite".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
-      onPressed: () => _onTap(context, ref),
-    );
-  }
-}

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

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

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

@@ -1,43 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';
-
-class RestoreTrashActionButton extends ConsumerWidget {
-  final ActionSource source;
-
-  const RestoreTrashActionButton({super.key, required this.source});
-
-  void _onTap(BuildContext context, WidgetRef ref) async {
-    if (!context.mounted) {
-      return;
-    }
-
-    final result = await ref.read(actionProvider.notifier).restoreTrash(source);
-    ref.read(multiSelectProvider.notifier).reset();
-
-    final successMessage = 'assets_restored_count'.t(context: context, args: {'count': result.count.toString()});
-
-    if (context.mounted) {
-      ImmichToast.show(
-        context: context,
-        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
-        gravity: ToastGravity.BOTTOM,
-        toastType: result.success ? ToastType.success : ToastType.error,
-      );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return TextButton.icon(
-      icon: const Icon(Icons.history_rounded),
-      label: Text('restore'.t(), style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
-      onPressed: () => _onTap(context, ref),
-    );
-  }
-}

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

@@ -1,50 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';
-
-class StackActionButton extends ConsumerWidget {
-  final ActionSource source;
-
-  const StackActionButton({super.key, required this.source});
-
-  void _onTap(BuildContext context, WidgetRef ref) async {
-    if (!context.mounted) {
-      return;
-    }
-
-    final user = ref.watch(currentUserProvider);
-    if (user == null) {
-      throw Exception('User must be logged in to access stack action');
-    }
-
-    final result = await ref.read(actionProvider.notifier).stack(user.id, source);
-    ref.read(multiSelectProvider.notifier).reset();
-
-    final successMessage = 'stack_action_prompt'.t(context: context, args: {'count': result.count.toString()});
-
-    if (context.mounted) {
-      ImmichToast.show(
-        context: context,
-        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
-        gravity: ToastGravity.BOTTOM,
-        toastType: result.success ? ToastType.success : ToastType.error,
-      );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return BaseActionButton(
-      iconData: Icons.filter_none_rounded,
-      label: "stack".t(context: context),
-      onPressed: () => _onTap(context, ref),
-    );
-  }
-}

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

@@ -1,61 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';
-
-class UnFavoriteActionButton extends ConsumerWidget {
-  final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
-
-  const UnFavoriteActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
-
-  void _onTap(BuildContext context, WidgetRef ref) async {
-    if (!context.mounted) {
-      return;
-    }
-
-    final result = await ref.read(actionProvider.notifier).unFavorite(source);
-
-    if (source == ActionSource.viewer) {
-      if (result.success) {
-        final currentAsset = ref.read(assetViewerProvider).currentAsset;
-        if (currentAsset is RemoteAsset && currentAsset.isFavorite) {
-          ref.read(assetViewerProvider.notifier).setAsset(currentAsset.copyWith(isFavorite: false));
-        }
-      }
-      return;
-    }
-
-    ref.read(multiSelectProvider.notifier).reset();
-
-    final successMessage = 'unfavorite_action_prompt'.t(context: context, args: {'count': result.count.toString()});
-
-    if (context.mounted) {
-      ImmichToast.show(
-        context: context,
-        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
-        gravity: ToastGravity.BOTTOM,
-        toastType: result.success ? ToastType.success : ToastType.error,
-      );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return BaseActionButton(
-      iconData: Icons.favorite_rounded,
-      label: "unfavorite".t(context: context),
-      onPressed: () => _onTap(context, ref),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
-    );
-  }
-}

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

@@ -1,48 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';
-
-class UnStackActionButton extends ConsumerWidget {
-  final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
-
-  const UnStackActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
-
-  void _onTap(BuildContext context, WidgetRef ref) async {
-    if (!context.mounted) {
-      return;
-    }
-
-    final result = await ref.read(actionProvider.notifier).unStack(source);
-    ref.read(multiSelectProvider.notifier).reset();
-
-    final successMessage = 'unstack_action_prompt'.t(context: context, args: {'count': result.count.toString()});
-
-    if (context.mounted) {
-      ImmichToast.show(
-        context: context,
-        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
-        gravity: ToastGravity.BOTTOM,
-        toastType: result.success ? ToastType.success : ToastType.error,
-      );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return BaseActionButton(
-      iconData: Icons.layers_clear_outlined,
-      label: "unstack".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
-      onPressed: () => _onTap(context, ref),
-    );
-  }
-}

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

@@ -4,12 +4,13 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/presentation/actions/action.widget.dart';
+import 'package:immich_mobile/presentation/actions/restore.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/add_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_image_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/restore_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/ocr_toggle_button.widget.dart';
@@ -42,11 +43,10 @@ class ViewerBottomBar extends ConsumerWidget {
 
     final originalTheme = context.themeData;
 
+    final assets = [asset];
     final actions = <Widget>[
-      if (isInTrash && isOwner && asset.hasRemote)
-        const RestoreActionButton(source: ActionSource.viewer)
-      else
-        const ShareActionButton(source: ActionSource.viewer),
+      ActionColumnButtonWidget(action: RestoreAction(assets: assets)),
+      const ShareActionButton(source: ActionSource.viewer),
 
       if (!isInLockedView) ...[
         if (!isInTrash) ...[

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

@@ -5,6 +5,7 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
+import 'package:immich_mobile/presentation/actions/stack.action.dart';
 import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
@@ -14,10 +15,8 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_
 import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unarchive_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
@@ -77,7 +76,7 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {
     }
 
     final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [FavoriteAction(assets: assets)];
+    final actions = [FavoriteAction(assets: assets), StackAction(assets: assets)];
 
     return BaseBottomSheet(
       controller: sheetController,
@@ -97,8 +96,6 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {
           const EditDateTimeActionButton(source: ActionSource.timeline),
           const EditLocationActionButton(source: ActionSource.timeline),
           const MoveToLockFolderActionButton(source: ActionSource.timeline),
-          if (multiselect.selectedAssets.length > 1) const StackActionButton(source: ActionSource.timeline),
-          if (multiselect.hasStacked) const UnStackActionButton(source: ActionSource.timeline),
         ],
         if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),
       ],

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

@@ -6,6 +6,7 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
+import 'package:immich_mobile/presentation/actions/stack.action.dart';
 import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
@@ -16,9 +17,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_
 import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
@@ -68,7 +67,7 @@ class FavoriteBottomSheet extends ConsumerWidget {
     }
 
     final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [FavoriteAction(assets: assets)];
+    final actions = [FavoriteAction(assets: assets), StackAction(assets: assets)];
 
     return BaseBottomSheet(
       initialChildSize: 0.4,
@@ -87,8 +86,6 @@ class FavoriteBottomSheet extends ConsumerWidget {
           const EditDateTimeActionButton(source: ActionSource.timeline),
           const EditLocationActionButton(source: ActionSource.timeline),
           const MoveToLockFolderActionButton(source: ActionSource.timeline),
-          if (multiselect.selectedAssets.length > 1) const StackActionButton(source: ActionSource.timeline),
-          if (multiselect.hasStacked) const UnStackActionButton(source: ActionSource.timeline),
         ],
         if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),
       ],

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

@@ -5,6 +5,8 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';
+import 'package:immich_mobile/presentation/actions/favorite.action.dart';
+import 'package:immich_mobile/presentation/actions/stack.action.dart';
 import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/bulk_tag_assets_action_button.widget.dart';
@@ -14,13 +16,10 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permane
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
@@ -84,7 +83,7 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
     }
 
     final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [AssetDebugAction(assets: assets)];
+    final actions = [AssetDebugAction(assets: assets), FavoriteAction(assets: assets), StackAction(assets: assets)];
 
     return BaseBottomSheet(
       controller: sheetController,
@@ -101,14 +100,11 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
           isTrashEnable
               ? const TrashActionButton(source: ActionSource.timeline)
               : const DeletePermanentActionButton(source: ActionSource.timeline),
-          const FavoriteActionButton(source: ActionSource.timeline),
           const ArchiveActionButton(source: ActionSource.timeline),
           if (tagsEnabled) const BulkTagAssetsActionButton(source: ActionSource.timeline),
           const EditDateTimeActionButton(source: ActionSource.timeline),
           const EditLocationActionButton(source: ActionSource.timeline),
           const MoveToLockFolderActionButton(source: ActionSource.timeline),
-          if (multiselect.selectedAssets.length > 1) const StackActionButton(source: ActionSource.timeline),
-          if (multiselect.hasStacked) const UnStackActionButton(source: ActionSource.timeline),
           if (multiselect.onlyLocal || multiselect.hasMerged) const DeleteActionButton(source: ActionSource.timeline),
         ],
         if (multiselect.onlyLocal || multiselect.hasMerged)

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

@@ -5,6 +5,7 @@ import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
+import 'package:immich_mobile/presentation/actions/stack.action.dart';
 import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
@@ -17,9 +18,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_al
 import 'package:immich_mobile/presentation/widgets/action_buttons/set_album_cover.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
@@ -86,7 +85,7 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
     }
 
     final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [FavoriteAction(assets: assets)];
+    final actions = [FavoriteAction(assets: assets), StackAction(assets: assets)];
 
     return BaseBottomSheet(
       controller: sheetController,
@@ -111,8 +110,6 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
             const EditDateTimeActionButton(source: ActionSource.timeline),
             const EditLocationActionButton(source: ActionSource.timeline),
             const MoveToLockFolderActionButton(source: ActionSource.timeline),
-            if (multiselect.selectedAssets.length > 1) const StackActionButton(source: ActionSource.timeline),
-            if (multiselect.hasStacked) const UnStackActionButton(source: ActionSource.timeline),
           ],
         ],
         if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),

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

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

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

@@ -156,28 +156,6 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
-  Future<ActionResult> favorite(ActionSource source) async {
-    final ids = _getOwnedRemoteIdsForSource(source);
-    try {
-      await _service.favorite(ids);
-      return ActionResult(count: ids.length, success: true);
-    } catch (error, stack) {
-      _logger.severe('Failed to favorite assets', error, stack);
-      return ActionResult(count: ids.length, success: false, error: error.toString());
-    }
-  }
-
-  Future<ActionResult> unFavorite(ActionSource source) async {
-    final ids = _getOwnedRemoteIdsForSource(source);
-    try {
-      await _service.unFavorite(ids);
-      return ActionResult(count: ids.length, success: true);
-    } catch (error, stack) {
-      _logger.severe('Failed to unfavorite assets', error, stack);
-      return ActionResult(count: ids.length, success: false, error: error.toString());
-    }
-  }
-
   Future<ActionResult> archive(ActionSource source) async {
     final ids = _getOwnedRemoteIdsForSource(source);
     try {
@@ -235,17 +213,6 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
-  Future<ActionResult> restoreTrash(ActionSource source) async {
-    final ids = _getOwnedRemoteIdsForSource(source);
-    try {
-      await _service.restoreTrash(ids);
-      return ActionResult(count: ids.length, success: true);
-    } catch (error, stack) {
-      _logger.severe('Failed to restore trash assets', error, stack);
-      return ActionResult(count: ids.length, success: false, error: error.toString());
-    }
-  }
-
   Future<ActionResult> emptyTrash(String userId) async {
     try {
       final count = await _service.emptyTrash(userId);

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

@@ -22,8 +22,6 @@ class MultiSelectState {
   bool get hasRemote =>
       selectedAssets.any((asset) => asset.storage == AssetState.remote || asset.storage == AssetState.merged);
 
-  bool get hasStacked => selectedAssets.any((asset) => asset is RemoteAsset && asset.stackId != null);
-
   bool get hasMerged => selectedAssets.any((asset) => asset.storage == AssetState.merged);
 
   bool get onlyLocal => selectedAssets.any((asset) => asset.storage == AssetState.local);

mobile/lib/services/action.service.dart

@@ -68,16 +68,6 @@ class ActionService {
     unawaited(context.pushRoute(SharedLinkEditRoute(assetsList: remoteIds)));
   }
 
-  Future<void> favorite(List<String> remoteIds) async {
-    await _assetApiRepository.updateFavorite(remoteIds, true);
-    await _remoteAssetRepository.updateFavorite(remoteIds, true);
-  }
-
-  Future<void> unFavorite(List<String> remoteIds) async {
-    await _assetApiRepository.updateFavorite(remoteIds, false);
-    await _remoteAssetRepository.updateFavorite(remoteIds, false);
-  }
-
   Future<void> archive(List<String> remoteIds) async {
     await _assetApiRepository.updateVisibility(remoteIds, .archive);
     await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.archive);
@@ -108,11 +98,6 @@ class ActionService {
     await _remoteAssetRepository.trash(remoteIds);
   }
 
-  Future<void> restoreTrash(List<String> ids) async {
-    await _assetApiRepository.restoreTrash(ids);
-    await _remoteAssetRepository.restoreTrash(ids);
-  }
-
   Future<int> emptyTrash(String userId) async {
     final count = await _assetApiRepository.emptyTrash();
     await _remoteAssetRepository.emptyTrash(userId);

mobile/lib/utils/action_button.utils.dart

@@ -9,6 +9,8 @@ import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';
+import 'package:immich_mobile/presentation/actions/stack.action.dart';
+import 'package:immich_mobile/presentation/actions/restore.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/cast_action_button.widget.dart';
@@ -21,7 +23,6 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_f
 import 'package:immich_mobile/presentation/widgets/action_buttons/open_in_browser_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/restore_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/set_album_cover.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/set_profile_picture_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
@@ -30,7 +31,6 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/similar_photos
 import 'package:immich_mobile/presentation/widgets/action_buttons/slideshow_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unarchive_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/routing/router.dart';
 
@@ -208,11 +208,7 @@ enum ActionButtonType {
       ),
       ActionButtonType.download => DownloadActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
       ActionButtonType.trash => TrashActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
-      ActionButtonType.restoreTrash => RestoreActionButton(
-        source: context.source,
-        iconOnly: iconOnly,
-        menuItem: menuItem,
-      ),
+      ActionButtonType.restoreTrash => ActionMenuItemWidget(action: RestoreAction(assets: [context.asset])),
       ActionButtonType.deletePermanent => DeletePermanentActionButton(
         source: context.source,
         iconOnly: iconOnly,
@@ -248,7 +244,7 @@ enum ActionButtonType {
         menuItem: menuItem,
       ),
       ActionButtonType.likeActivity => LikeActivityActionButton(iconOnly: iconOnly, menuItem: menuItem),
-      ActionButtonType.unstack => UnStackActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
+      ActionButtonType.unstack => ActionMenuItemWidget(action: StackAction(assets: [context.asset])),
       ActionButtonType.openInBrowser => OpenInBrowserActionButton(
         remoteId: context.asset.remoteId!,
         origin: context.timelineOrigin,

mobile/lib/utils/asset_filter.dart

@@ -16,6 +16,8 @@ extension type const AssetFilter<T extends BaseAsset>(Iterable<T> assets) implem
   AssetFilter<RemoteAsset> notArchived() => notVisibility(.archive);
   AssetFilter<RemoteAsset> stacked() => remote().where(_isStacked);
   AssetFilter<RemoteAsset> notStacked() => remote().whereNot(_isStacked);
+  AssetFilter<RemoteAsset> trashed() => remote().where(_isTrashed);
+  AssetFilter<RemoteAsset> notTrashed() => remote().whereNot(_isTrashed);
 
   AssetFilter<LocalAsset> local() => AssetFilter(assets.whereType<LocalAsset>());
   AssetFilter<LocalAsset> backedUp() => local().where(_isBackedUp);
@@ -23,6 +25,7 @@ extension type const AssetFilter<T extends BaseAsset>(Iterable<T> assets) implem
 
 bool _isFavorite(BaseAsset asset) => asset.isFavorite;
 bool _isStacked(RemoteAsset asset) => asset.isStacked;
+bool _isTrashed(RemoteAsset asset) => asset.isTrashed;
 bool _isBackedUp(LocalAsset asset) => asset.remoteAssetId != null;
 bool Function(RemoteAsset asset) _hasVisibility(AssetVisibility visibility) =>
     (asset) => asset.visibility == visibility;

mobile/test/infrastructure/repository.mock.dart

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

mobile/test/unit/factories/remote_asset_factory.dart

@@ -12,6 +12,7 @@ class RemoteAssetFactory {
     bool isFavorite = false,
     AssetVisibility visibility = AssetVisibility.timeline,
     String? stackId,
+    DateTime? deletedAt,
   }) {
     id = TestUtils.uuid(id);
 
@@ -27,6 +28,7 @@ class RemoteAssetFactory {
       visibility: visibility,
       stackId: stackId,
       isEdited: false,
+      deletedAt: deletedAt,
     );
   }
 }

mobile/test/unit/mocks.dart

@@ -18,6 +18,7 @@ class RepositoryMocks {
   final localAlbum = LocalAlbumRepositoryStub(MockLocalAlbumRepository());
   final localAsset = LocalAssetRepositoryStub(MockDriftLocalAssetRepository());
   final trashedAsset = MockTrashedLocalAssetRepository();
+  final toast = MockToastRepository();
 
   final nativeApi = NativeSyncApiStub(MockNativeSyncApi());
 
@@ -31,6 +32,7 @@ class RepositoryMocks {
     localAsset.reset();
     reset(trashedAsset);
     nativeApi.reset();
+    reset(toast);
     _stubLocalAlbumRepository();
     _stubLocalAssetRepository();
     _stubNativeSyncApi();
@@ -89,6 +91,9 @@ class ServiceMocks {
 
   void _stubAssetService() {
     when(asset.updateFavorite).thenAnswer((_) async {});
+    when(asset.stack).thenAnswer((_) async {});
+    when(asset.unstack).thenAnswer((_) async {});
+    when(asset.restoreTrash).thenAnswer((_) async {});
   }
 }
 
@@ -167,6 +172,15 @@ extension type const UserServiceStub(MockUserService service) implements Stub<Mo
 extension type const AssetServiceStub(MockAssetService service) implements Stub<MockAssetService> {
   Future<void> Function() get updateFavorite =>
       () => service.updateFavorite(any(), any());
+
+  Future<void> Function() get stack =>
+      () => service.stack(any(), any());
+
+  Future<void> Function() get unstack =>
+      () => service.unstack(any());
+
+  Future<void> Function() get restoreTrash =>
+      () => service.restoreTrash(any());
 }
 
 extension type const NativeSyncApiStub(MockNativeSyncApi api) implements Stub<MockNativeSyncApi> {

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

@@ -1,6 +1,6 @@
-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/favorite.action.dart';
 import 'package:mocktail/mocktail.dart';
 
@@ -68,11 +68,22 @@ void main() {
       verify(() => assetService.updateFavorite([stale.id], true)).called(1);
     });
 
-    testWidgets('shows a confirmation snackbar on success', (tester) async {
-      await tester.pumpTestAction(context, FavoriteAction(assets: [owned()]));
-      await tester.pumpUntilFound(find.byType(SnackBar));
+    testWidgets('reports the favorite count through the toast repository', (tester) async {
+      final toast = context.repository.toast;
 
-      expect(find.byType(SnackBar), findsOneWidget);
+      await tester.pumpTestAction(context, FavoriteAction(assets: [owned(), owned()]));
+
+      final message = verify(() => toast.success(captureAny())).captured.single as String;
+      expect(message, StaticTranslations.instance.favorite_action_prompt(count: 2));
+    });
+
+    testWidgets('reports the unfavorite count through the toast repository', (tester) async {
+      final toast = context.repository.toast;
+
+      await tester.pumpTestAction(context, FavoriteAction(assets: [owned(isFavorite: true), owned(isFavorite: true)]));
+
+      final message = verify(() => toast.success(captureAny())).captured.single as String;
+      expect(message, StaticTranslations.instance.unfavorite_action_prompt(count: 2));
     });
   });
 }

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

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

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

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

mobile/test/unit/presentation/presentation_context.dart

@@ -14,6 +14,7 @@ import 'package:immich_mobile/infrastructure/repositories/store.repository.dart'
 import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_ui/immich_ui.dart';
@@ -43,6 +44,7 @@ class PresentationContext {
     currentUserProvider.overrideWith((ref) => CurrentUserProvider(service.user.service)),
     assetServiceProvider.overrideWithValue(service.asset.service),
     partnerServiceProvider.overrideWithValue(service.partner.service),
+    toastRepositoryProvider.overrideWithValue(repository.toast),
   ];
 
   static Future<PresentationContext> create() async {