chore: format asset-utils

chore(web): use immich/ui 0.82.0
Merge branch 'main' into feat/undo-archive
2026-06-26 00:14:27 -07:00 · 2026-06-25 13:04:52 +02:00 · 2026-06-24 22:06:26 +02:00 · 2026-06-24 21:41:01 +02:00 · 2026-06-23 20:06:03 +02:00 · 2026-06-23 19:24:55 +02:00
46 changed files with 350 additions and 769 deletions
@@ -1,38 +1,35 @@
 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/asset_edit.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
-import 'package:immich_mobile/repositories/asset_api.repository.dart';

 class AssetService {
-  final RemoteAssetRepository _remoteRepository;
-  final DriftLocalAssetRepository _localRepository;
-  final AssetApiRepository _apiRepository;
+  final RemoteAssetRepository _remoteAssetRepository;
+  final DriftLocalAssetRepository _localAssetRepository;

-  const AssetService({required this._remoteRepository, required this._localRepository, required this._apiRepository});
+  const AssetService({required this._remoteAssetRepository, required this._localAssetRepository});

  Future<BaseAsset?> getAsset(BaseAsset asset) {
    final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).id;
-    return asset is LocalAsset ? _localRepository.get(id) : _remoteRepository.get(id);
+    return asset is LocalAsset ? _localAssetRepository.get(id) : _remoteAssetRepository.get(id);
  }

  Stream<BaseAsset?> watchAsset(BaseAsset asset) {
    final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).id;
-    return asset is LocalAsset ? _localRepository.watch(id) : _remoteRepository.watch(id);
+    return asset is LocalAsset ? _localAssetRepository.watch(id) : _remoteAssetRepository.watch(id);
  }

  Future<List<LocalAsset?>> getLocalAssetsByChecksum(String checksum) {
-    return _localRepository.getByChecksum(checksum);
+    return _localAssetRepository.getByChecksum(checksum);
  }

  Future<RemoteAsset?> getRemoteAssetByChecksum(String checksum) {
-    return _remoteRepository.getByChecksum(checksum);
+    return _remoteAssetRepository.getByChecksum(checksum);
  }

  Future<RemoteAsset?> getRemoteAsset(String id) {
-    return _remoteRepository.get(id);
+    return _remoteAssetRepository.get(id);
  }

  Future<List<RemoteAsset>> getStack(RemoteAsset asset) async {
@@ -40,7 +37,7 @@ class AssetService {
      return const [];
    }

-    final stack = await _remoteRepository.getStackChildren(asset);
+    final stack = await _remoteAssetRepository.getStackChildren(asset);
    // Include the primary asset in the stack as the first item
    return [asset, ...stack];
  }
@@ -51,39 +48,22 @@ class AssetService {
    }

    final id = asset is LocalAsset ? asset.remoteId! : (asset as RemoteAsset).id;
-    return _remoteRepository.getExif(id);
+    return _remoteAssetRepository.getExif(id);
  }

  Future<List<(String, String)>> getPlaces(String userId) {
-    return _remoteRepository.getPlaces(userId);
+    return _remoteAssetRepository.getPlaces(userId);
  }

  Future<(int local, int remote)> getAssetCounts() async {
-    return (await _localRepository.getCount(), await _remoteRepository.getCount());
+    return (await _localAssetRepository.getCount(), await _remoteAssetRepository.getCount());
  }

  Future<int> getLocalHashedCount() {
-    return _localRepository.getHashedCount();
+    return _localAssetRepository.getHashedCount();
  }

  Future<List<LocalAlbum>> getSourceAlbums(String localAssetId, {BackupSelection? backupSelection}) {
-    return _localRepository.getSourceAlbums(localAssetId, backupSelection: backupSelection);
-  }
-
-  Future<void> updateFavorite(List<String> remoteIds, bool isFavorite) async {
-    if (remoteIds.isEmpty) {
-      return;
-    }
-
-    await _apiRepository.updateFavorite(remoteIds, isFavorite);
-    await _remoteRepository.updateFavorite(remoteIds, isFavorite);
-  }
-
-  Future<void> applyEdits(String remoteId, List<AssetEdit> edits) async {
-    if (edits.isEmpty) {
-      await _apiRepository.removeEdits(remoteId);
-    } else {
-      await _apiRepository.editAsset(remoteId, edits);
-    }
+    return _localAssetRepository.getSourceAlbums(localAssetId, backupSelection: backupSelection);
  }
 }
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';

 class ActionScope {
@@ -22,11 +21,3 @@ abstract class BaseAction {

  Future<void> onAction(ActionScope scope);
 }
-
-abstract class AssetAction<T extends BaseAsset> extends BaseAction {
-  final Iterable<BaseAsset> assets;
-
-  const AssetAction({required this.assets});
-
-  Iterable<T> filter(ActionScope scope) => assets.whereType<T>();
-}
@@ -1,27 +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/providers/infrastructure/setting.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-
-class AssetDebugAction extends AssetAction<BaseAsset> {
-  const AssetDebugAction({required super.assets});
-
-  @override
-  IconData get icon => Icons.help_outline_rounded;
-
-  @override
-  String label(ActionScope scope) => scope.context.t.troubleshoot;
-
-  @override
-  bool isVisible(ActionScope scope) =>
-      assets.length == 1 && scope.ref.watch(settingsProvider.notifier).get(.advancedTroubleshooting);
-
-  @override
-  Future<void> onAction(ActionScope scope) async =>
-      unawaited(scope.context.pushRoute(AssetTroubleshootRoute(asset: assets.first)));
-}
@@ -1,70 +0,0 @@
-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/domain/models/asset_edit.model.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/presentation/pages/edit/editor.provider.dart';
-import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
-import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/providers/server_info.provider.dart';
-import 'package:immich_mobile/providers/websocket.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/utils/semver.dart';
-
-class EditAssetAction extends AssetAction<RemoteAsset> {
-  const EditAssetAction({required super.assets});
-
-  @override
-  IconData get icon => Icons.tune;
-
-  @override
-  String label(ActionScope scope) => scope.context.t.edit;
-
-  @override
-  Iterable<RemoteAsset> filter(ActionScope scope) =>
-      assets.where((asset) => asset is RemoteAsset && asset.ownerId == scope.authUser.id && asset.isEditable).cast();
-
-  @override
-  bool isVisible(ActionScope scope) =>
-      filter(scope).length == 1 &&
-      scope.ref.watch(serverInfoProvider).serverVersion >= const SemVer(major: 2, minor: 6, patch: 0);
-
-  @override
-  Future<void> onAction(ActionScope scope) async {
-    final ActionScope(:context, :ref) = scope;
-
-    final asset = filter(scope).first;
-    final remoteId = asset.id;
-    final repository = ref.read(remoteAssetRepositoryProvider);
-    final (edits, exif) = await (repository.getAssetEdits(remoteId), repository.getExif(remoteId)).wait;
-    if (exif == null || !context.mounted) {
-      return;
-    }
-
-    ref.read(editorStateProvider.notifier).init(edits, exif);
-    unawaited(
-      context.pushRoute(
-        DriftEditImageRoute(
-          image: Image(image: getFullImageProvider(asset, edited: false)),
-          applyEdits: (newEdits) => applyEdits(ref, remoteId, newEdits),
-        ),
-      ),
-    );
-  }
-
-  @visibleForTesting
-  static Future<void> applyEdits(WidgetRef ref, String remoteId, List<AssetEdit> edits) async {
-    final websocket = ref.read(websocketProvider.notifier);
-
-    bool isCurrentId(dynamic data) => data is Map && (data['asset'] as Map?)?['id'] == remoteId;
-    await ref.read(assetServiceProvider).applyEdits(remoteId, edits);
-    await Future.any([
-      websocket.waitForEvent('AssetEditReadyV1', isCurrentId, const Duration(seconds: 10)),
-      websocket.waitForEvent('AssetEditReadyV2', isCurrentId, const Duration(seconds: 10)),
-    ]).catchError((_) {});
-  }
-}
@@ -1,40 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_ui/immich_ui.dart';
-
-class FavoriteAction extends AssetAction<RemoteAsset> {
-  final bool shouldFavorite;
-
-  FavoriteAction({required super.assets}) : shouldFavorite = assets.any((asset) => !asset.isFavorite);
-
-  @override
-  IconData get icon => shouldFavorite ? Icons.favorite_border_rounded : Icons.favorite_rounded;
-
-  @override
-  String label(ActionScope scope) => shouldFavorite ? scope.context.t.favorite : scope.context.t.unfavorite;
-
-  @override
-  Iterable<RemoteAsset> filter(ActionScope scope) => assets
-      .where(
-        (asset) => asset is RemoteAsset && asset.ownerId == scope.authUser.id && asset.isFavorite == !shouldFavorite,
-      )
-      .cast();
-
-  @override
-  bool isVisible(ActionScope scope) => filter(scope).isNotEmpty;
-
-  @override
-  Future<void> onAction(ActionScope scope) async {
-    final ActionScope(:ref) = scope;
-    final assets = filter(scope).map((asset) => asset.id).toList(growable: false);
-
-    await ref.read(assetServiceProvider).updateFavorite(assets, shouldFavorite);
-    final message = shouldFavorite
-        ? StaticTranslations.instance.favorite_action_prompt(count: assets.length)
-        : StaticTranslations.instance.unfavorite_action_prompt(count: assets.length);
-    snackbar.success(message);
-  }
-}
@@ -1,24 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-
-class TimelineAction extends BaseAction {
-  final BaseAction action;
-
-  const TimelineAction({required this.action});
-
-  @override
-  IconData get icon => action.icon;
-
-  @override
-  String label(ActionScope scope) => action.label(scope);
-
-  @override
-  bool isVisible(ActionScope scope) => action.isVisible(scope);
-
-  @override
-  Future<void> onAction(ActionScope scope) async {
-    await action.onAction(scope);
-    scope.ref.read(multiSelectProvider.notifier).reset();
-  }
-}
@@ -12,7 +12,6 @@ import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/memory/memory_bottom_info.widget.dart';
 import 'package:immich_mobile/presentation/widgets/memory/memory_card.widget.dart';
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
-import 'package:immich_mobile/utils/system_ui.utils.dart';
 import 'package:immich_mobile/widgets/memories/memory_epilogue.dart';
 import 'package:immich_mobile/widgets/memories/memory_progress_indicator.dart';

@@ -50,7 +49,7 @@ class DriftMemoryPage extends HookConsumerWidget {
      SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
      return () {
        // Clean up to normal edge to edge when we are done
-        restoreEdgeToEdge();
+        SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
      };
    });

@@ -329,7 +328,7 @@ class DriftMemoryPage extends HookConsumerWidget {
                              // turn off full screen mode here
                              // https://github.com/Milad-Akarie/auto_route_library/issues/1799
                              context.maybePop();
-                              restoreEdgeToEdge();
+                              SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
                            },
                            shape: const CircleBorder(),
                            color: Colors.white.withValues(alpha: 0.2),
@@ -19,7 +19,6 @@ import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart'
 import 'package:immich_mobile/providers/asset_viewer/video_player_provider.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/utils/system_ui.utils.dart';
 import 'package:immich_mobile/widgets/common/immich_loading_indicator.dart';
 import 'package:immich_mobile/widgets/photo_view/photo_view.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';
@@ -77,7 +76,7 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
    _pageController.dispose();
    _crossfadeController.dispose();
    unawaited(WakelockPlus.disable());
-    unawaited(restoreEdgeToEdge());
+    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
    super.dispose();
  }

@@ -256,7 +255,7 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
  }

  void _onTapUp() async {
-    await (_showAppBar ? SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive) : restoreEdgeToEdge());
+    await SystemChrome.setEnabledSystemUIMode(_showAppBar ? SystemUiMode.immersive : SystemUiMode.edgeToEdge);

    WidgetsBinding.instance.addPostFrameCallback((_) {
      setState(() {
@@ -0,0 +1,36 @@
+import 'dart:async';
+
+import 'package:flutter/material.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';
+
+class AdvancedInfoActionButton extends ConsumerWidget {
+  final ActionSource source;
+  final bool iconOnly;
+  final bool menuItem;
+
+  const AdvancedInfoActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    unawaited(ref.read(actionProvider.notifier).troubleshoot(source, context));
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      maxWidth: 115.0,
+      iconData: Icons.help_outline_rounded,
+      label: "troubleshoot".t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}
@@ -0,0 +1,59 @@
+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/constants/enums.dart';
+import 'package:immich_mobile/domain/models/asset_edit.model.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/pages/edit/editor.provider.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/images/image_provider.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/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+
+class EditImageActionButton extends ConsumerWidget {
+  const EditImageActionButton({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final currentAsset = ref.watch(assetViewerProvider.select((s) => s.currentAsset));
+
+    Future<void> editImage(List<AssetEdit> edits) async {
+      if (currentAsset == null || currentAsset.remoteId == null) {
+        return;
+      }
+
+      await ref.read(actionProvider.notifier).applyEdits(ActionSource.viewer, edits);
+    }
+
+    Future<void> onPress() async {
+      if (currentAsset == null || currentAsset.remoteId == null) {
+        return;
+      }
+
+      final imageProvider = getFullImageProvider(currentAsset, edited: false);
+
+      final image = Image(image: imageProvider);
+      final (edits, exifInfo) = await (
+        ref.read(remoteAssetRepositoryProvider).getAssetEdits(currentAsset.remoteId!),
+        ref.read(remoteAssetRepositoryProvider).getExif(currentAsset.remoteId!),
+      ).wait;
+
+      if (exifInfo == null) {
+        return;
+      }
+
+      ref.read(editorStateProvider.notifier).init(edits, exifInfo);
+      await context.pushRoute(DriftEditImageRoute(image: image, applyEdits: editImage));
+    }
+
+    return BaseActionButton(
+      iconData: Icons.tune,
+      label: "edit".t(context: context),
+      onPressed: onPress,
+    );
+  }
+}
@@ -23,7 +23,6 @@ import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart'
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
-import 'package:immich_mobile/utils/system_ui.utils.dart';
 import 'package:immich_mobile/widgets/photo_view/photo_view.dart';

@RoutePage()
@@ -129,7 +128,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
    _reloadSubscription?.cancel();
    _stackChildrenKeepAlive?.close();

-    unawaited(restoreEdgeToEdge());
+    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);

    super.dispose();
  }
@@ -252,8 +251,10 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
  }

  void _setSystemUIMode(bool controls, bool details) {
-    final immersive = !controls || (CurrentPlatform.isIOS && details);
-    unawaited(immersive ? SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky) : restoreEdgeToEdge());
+    final mode = !controls || (CurrentPlatform.isIOS && details)
+        ? SystemUiMode.immersiveSticky
+        : SystemUiMode.edgeToEdge;
+    unawaited(SystemChrome.setEnabledSystemUIMode(mode));
  }

  @override
@@ -4,12 +4,11 @@ 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/edit.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';
@@ -20,8 +19,8 @@ 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';
-import 'package:immich_ui/immich_ui.dart';

 class ViewerBottomBar extends ConsumerWidget {
  const ViewerBottomBar({super.key});
@@ -42,7 +41,6 @@ class ViewerBottomBar extends ConsumerWidget {
    final isInTrash = ref.read(timelineServiceProvider).origin == TimelineOrigin.trash;

    final originalTheme = context.themeData;
-    final actionAsset = [asset];

    final actions = <Widget>[
      if (isInTrash && isOwner && asset.hasRemote)
@@ -53,7 +51,9 @@ class ViewerBottomBar extends ConsumerWidget {
      if (!isInLockedView) ...[
        if (!isInTrash) ...[
          if (asset.isLocalOnly) const UploadActionButton(source: ActionSource.viewer),
-          ActionColumnButtonWidget(action: EditAssetAction(assets: actionAsset)),
+          // edit sync was added in 2.6.0
+          if (asset.isEditable && serverInfo.serverVersion >= const SemVer(major: 2, minor: 6, patch: 0))
+            const EditImageActionButton(),
          if (asset.hasRemote) AddActionButton(originalTheme: originalTheme),
        ],
        if (isOwner) ...[
@@ -104,10 +104,7 @@ class ViewerBottomBar extends ConsumerWidget {
                          OcrToggleButton(asset: asset),
                          if (asset.isVideo) VideoControls(videoPlayerName: asset.heroTag),
                          if (!isReadonlyModeEnabled)
-                            ImmichColorOverride(
-                              color: Colors.white,
-                              child: Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: actions),
-                            ),
+                            Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: actions),
                        ],
                      ),
                    ),
@@ -12,7 +12,6 @@ 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/action_button.utils.dart';
-import 'package:immich_ui/immich_ui.dart';

 class ViewerKebabMenu extends ConsumerWidget {
  const ViewerKebabMenu({super.key, this.originalTheme});
@@ -50,9 +49,9 @@ class ViewerKebabMenu extends ConsumerWidget {
      timelineOrigin: timelineOrigin,
    );

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

-    return ImmichMenu(
+    return MenuAnchor(
      consumeOutsideTap: true,
      style: MenuStyle(
        backgroundColor: WidgetStatePropertyAll(context.themeData.scaffoldBackgroundColor),
@@ -63,7 +62,7 @@ class ViewerKebabMenu extends ConsumerWidget {
        ),
        padding: const WidgetStatePropertyAll(EdgeInsets.symmetric(vertical: 6)),
      ),
-      children: [
+      menuChildren: [
        ConstrainedBox(
          constraints: const BoxConstraints(minWidth: 150),
          child: Theme(
@@ -2,11 +2,12 @@ import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/favorite.action.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/viewer_kebab_menu.widget.dart';
 import 'package:immich_mobile/providers/activity.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
@@ -14,9 +15,9 @@ import 'package:immich_mobile/providers/infrastructure/asset_viewer/asset.provid
 import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/timezone.dart';
-import 'package:immich_ui/immich_ui.dart';

 class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
  const ViewerTopAppBar({super.key});
@@ -30,6 +31,8 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {

    final album = ref.watch(currentRemoteAlbumProvider);

+    final user = ref.watch(currentUserProvider);
+    final isOwner = asset is RemoteAsset && asset.ownerId == user?.id;
    final isInLockedView = ref.watch(inLockedViewProvider);
    final isReadonlyModeEnabled = ref.watch(readonlyModeProvider);

@@ -43,7 +46,6 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
    double opacity = ref.watch(assetViewerProvider.select((s) => s.backgroundOpacity)) * (showingControls ? 1 : 0);

    final originalTheme = context.themeData;
-    final assetForAction = [asset];

    final actions = <Widget>[
      if (asset.isMotionPhoto) const MotionPhotoActionButton(iconOnly: true),
@@ -61,7 +63,10 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
          },
        ),

-      ActionIconButtonWidget(action: FavoriteAction(assets: assetForAction)),
+      if (asset.hasRemote && isOwner && !asset.isFavorite)
+        const FavoriteActionButton(source: ActionSource.viewer, iconOnly: true),
+      if (asset.hasRemote && isOwner && asset.isFavorite)
+        const UnFavoriteActionButton(source: ActionSource.viewer, iconOnly: true),

      ViewerKebabMenu(originalTheme: originalTheme),
    ];
@@ -102,13 +107,7 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
                    leading: const _AppBarBackButton(),
                    middle: showingDetails ? null : _AssetInfoTitle(asset: asset),
                    trailing: !showingDetails && !isReadonlyModeEnabled
-                        ? ImmichColorOverride(
-                            color: Colors.white,
-                            child: Row(
-                              mainAxisSize: MainAxisSize.min,
-                              children: isInLockedView ? lockedViewActions : actions,
-                            ),
-                          )
+                        ? Row(mainAxisSize: MainAxisSize.min, children: isInLockedView ? lockedViewActions : actions)
                        : null,
                  ),
                ),
@@ -3,14 +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.widget.dart';
-import 'package:immich_mobile/presentation/actions/favorite.action.dart';
-import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/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';
@@ -76,9 +74,6 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {
      return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);
    }

-    final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [FavoriteAction(assets: assets)];
-
    return BaseBottomSheet(
      controller: sheetController,
      initialChildSize: 0.25,
@@ -89,7 +84,7 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {
        if (multiselect.hasRemote) ...[
          const ShareLinkActionButton(source: ActionSource.timeline),
          const UnArchiveActionButton(source: ActionSource.timeline),
-          ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
+          const FavoriteActionButton(source: ActionSource.timeline),
          if (multiselect.onlyRemote) const DownloadActionButton(source: ActionSource.timeline),
          isTrashEnable
              ? const TrashActionButton(source: ActionSource.timeline)
@@ -4,9 +4,6 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/favorite.action.dart';
-import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
@@ -18,6 +15,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_b
 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/unfavorite_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';
@@ -67,9 +65,6 @@ class FavoriteBottomSheet extends ConsumerWidget {
      ref.read(multiSelectProvider.notifier).reset();
    }

-    final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [FavoriteAction(assets: assets)];
-
    return BaseBottomSheet(
      initialChildSize: 0.4,
      maxChildSize: 0.7,
@@ -78,7 +73,7 @@ class FavoriteBottomSheet extends ConsumerWidget {
        const ShareActionButton(source: ActionSource.timeline),
        if (multiselect.hasRemote) ...[
          const ShareLinkActionButton(source: ActionSource.timeline),
-          ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
+          const UnFavoriteActionButton(source: ActionSource.timeline),
          const ArchiveActionButton(source: ActionSource.timeline),
          if (multiselect.onlyRemote) const DownloadActionButton(source: ActionSource.timeline),
          isTrashEnable
@@ -3,9 +3,8 @@ 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.widget.dart';
-import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';
-import 'package:immich_mobile/presentation/actions/timeline.action.dart';
+import 'package:immich_mobile/domain/models/setting.model.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/advanced_info_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/bulk_tag_assets_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
@@ -25,6 +24,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_
 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/setting.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';
@@ -56,6 +56,7 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
  Widget build(BuildContext context) {
    final multiselect = ref.watch(multiSelectProvider);
    final isTrashEnable = ref.watch(serverInfoProvider.select((state) => state.serverFeatures.trash));
+    final advancedTroubleshooting = ref.watch(settingsProvider.notifier).get(Setting.advancedTroubleshooting);
    final tagsEnabled = ref.watch(
      userMetadataPreferencesProvider.select((value) => value.valueOrNull?.tagsEnabled ?? false),
    );
@@ -83,9 +84,6 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
      return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);
    }

-    final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [AssetDebugAction(assets: assets)];
-
    return BaseBottomSheet(
      controller: sheetController,
      initialChildSize: widget.minChildSize ?? 0.15,
@@ -93,7 +91,9 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
      maxChildSize: 0.85,
      shouldCloseOnMinExtent: false,
      actions: [
-        ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
+        if (multiselect.selectedAssets.length == 1 && advancedTroubleshooting) ...[
+          const AdvancedInfoActionButton(source: ActionSource.timeline),
+        ],
        const ShareActionButton(source: ActionSource.timeline),
        if (multiselect.hasRemote) ...[
          const ShareLinkActionButton(source: ActionSource.timeline),
@@ -3,15 +3,13 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/favorite.action.dart';
-import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/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/remove_from_album_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/set_album_cover.widget.dart';
@@ -85,9 +83,6 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
      return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);
    }

-    final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [FavoriteAction(assets: assets)];
-
    return BaseBottomSheet(
      controller: sheetController,
      initialChildSize: 0.22,
@@ -101,7 +96,7 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>

          if (ownsAlbum) ...[
            const ArchiveActionButton(source: ActionSource.timeline),
-            ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
+            const FavoriteActionButton(source: ActionSource.timeline),
          ],
          const DownloadActionButton(source: ActionSource.timeline),
          if (ownsAlbum) ...[
@@ -135,6 +135,16 @@ class ActionNotifier extends Notifier<void> {
    };
  }

+  Future<ActionResult> troubleshoot(ActionSource source, BuildContext context) async {
+    final assets = _getAssets(source);
+    if (assets.length > 1) {
+      return ActionResult(count: assets.length, success: false, error: 'Cannot troubleshoot multiple assets');
+    }
+    unawaited(context.pushRoute(AssetTroubleshootRoute(asset: assets.first)));
+
+    return ActionResult(count: assets.length, success: true);
+  }
+
  Future<ActionResult> shareLink(ActionSource source, BuildContext context) async {
    final ids = _getRemoteIdsForSource(source);
    try {
@@ -621,6 +631,37 @@ class ActionNotifier extends Notifier<void> {
      });
    }
  }
+
+  Future<ActionResult> applyEdits(ActionSource source, List<AssetEdit> edits) async {
+    final ids = _getOwnedRemoteIdsForSource(source);
+
+    if (ids.length != 1) {
+      _logger.warning('applyEdits called with multiple assets, expected single asset');
+      return ActionResult(count: ids.length, success: false, error: 'Expected single asset for applying edits');
+    }
+
+    Future<void> editReady;
+    if (ref.read(serverInfoProvider).serverVersion >= const SemVer(major: 3, minor: 0, patch: 0)) {
+      editReady = ref.read(websocketProvider.notifier).waitForEvent("AssetEditReadyV2", (dynamic data) {
+        final eventAsset = SyncAssetV2.fromJson(data["asset"]);
+        return eventAsset?.id == ids.first;
+      }, const Duration(seconds: 10));
+    } else {
+      editReady = ref.read(websocketProvider.notifier).waitForEvent("AssetEditReadyV1", (dynamic data) {
+        final eventAsset = SyncAssetV1.fromJson(data["asset"]);
+        return eventAsset?.id == ids.first;
+      }, const Duration(seconds: 10));
+    }
+
+    try {
+      await _service.applyEdits(ids.first, edits);
+      await editReady;
+      return const ActionResult(count: 1, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to apply edits to assets', error, stack);
+      return ActionResult(count: ids.length, success: false, error: error.toString());
+    }
+  }
 }

 extension on Iterable<RemoteAsset> {
@@ -5,7 +5,6 @@ import 'package:immich_mobile/infrastructure/repositories/remote_asset.repositor
 import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/repositories/asset_api.repository.dart';

 final localAssetRepository = Provider<DriftLocalAssetRepository>(
  (ref) => DriftLocalAssetRepository(ref.watch(driftProvider)),
@@ -21,9 +20,8 @@ final trashedLocalAssetRepository = Provider<DriftTrashedLocalAssetRepository>(

 final assetServiceProvider = Provider(
  (ref) => AssetService(
-    remoteRepository: ref.watch(remoteAssetRepositoryProvider),
-    localRepository: ref.watch(localAssetRepository),
-    apiRepository: ref.watch(assetApiRepositoryProvider),
+    remoteAssetRepository: ref.watch(remoteAssetRepositoryProvider),
+    localAssetRepository: ref.watch(localAssetRepository),
  ),
 );

@@ -305,6 +305,14 @@ class ActionService {
    return true;
  }

+  Future<void> applyEdits(String remoteId, List<AssetEdit> edits) async {
+    if (edits.isEmpty) {
+      await _assetApiRepository.removeEdits(remoteId);
+    } else {
+      await _assetApiRepository.editAsset(remoteId, edits);
+    }
+  }
+
  Future<int> _deleteLocalAssets(List<String> localIds) async {
    final deletedIds = await _assetMediaRepository.deleteAll(localIds);
    if (deletedIds.isEmpty) {
@@ -1,14 +1,14 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/advanced_info_action_button.widget.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';
@@ -185,14 +185,18 @@ enum ActionButtonType {
    };
  }

-  Widget buildButton(
+  ConsumerWidget buildButton(
    ActionButtonContext context, [
    BuildContext? buildContext,
    bool iconOnly = false,
    bool menuItem = false,
  ]) {
    return switch (this) {
-      ActionButtonType.advancedInfo => ActionMenuItemWidget(action: AssetDebugAction(assets: [context.asset])),
+      ActionButtonType.advancedInfo => AdvancedInfoActionButton(
+        source: context.source,
+        iconOnly: iconOnly,
+        menuItem: menuItem,
+      ),
      ActionButtonType.share => ShareActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
      ActionButtonType.shareLink => ShareLinkActionButton(
        source: context.source,
@@ -330,7 +334,7 @@ class ActionButtonBuilder {
    return _actionTypes.where((type) => type.shouldShow(context)).map((type) => type.buildButton(context)).toList();
  }

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

@@ -1,14 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/services.dart';
-
-/// Restore the system bars and return to edge-to-edge layout.
-///
-/// On Android 15+/API 36 edge-to-edge is enforced, so calling
-/// setEnabledSystemUIMode(edgeToEdge) does NOT re-show bars that an immersive
-/// mode (immersive / immersiveSticky) previously hid. Explicitly request all
-/// overlays first, then return to edge-to-edge layout.
-Future<void> restoreEdgeToEdge() async {
-  await SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: SystemUiOverlay.values);
-  await SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-}
@@ -1,4 +1,3 @@
-export 'src/color_override.dart';
 export 'src/components/close_button.dart';
 export 'src/components/column_button.dart';
 export 'src/components/form.dart';
@@ -5,7 +5,6 @@ import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/domain/utils/background_sync.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/services/server_info.service.dart';
 import 'package:mocktail/mocktail.dart';

 class MockStoreService extends Mock implements StoreService {}
@@ -21,5 +20,3 @@ class MockPartnerService extends Mock implements PartnerService {}
 class MockAssetService extends Mock implements AssetService {}

 class MockUserService extends Mock implements UserService {}
-
-class MockServerInfoService extends Mock implements ServerInfoService {}
@@ -217,8 +217,8 @@ class MediumRepositoryContext {
  }

  Future<AssetFaceEntityData> newFace({String? assetId, String? personId, int? imageWidth, int? imageHeight}) {
-    imageWidth ??= TestUtils.randInt(999) + 2;
-    imageHeight ??= TestUtils.randInt(999) + 2;
+    imageWidth ??= TestUtils.randInt(999) + 1;
+    imageHeight ??= TestUtils.randInt(999) + 1;

    final x1 = TestUtils.randInt(imageWidth - 1);
    final y1 = TestUtils.randInt(imageHeight - 1);
@@ -5,13 +5,7 @@ import '../../utils.dart';
 class RemoteAssetFactory {
  const RemoteAssetFactory();

-  static RemoteAsset create({
-    String? id,
-    String? name,
-    String? ownerId,
-    bool isFavorite = false,
-    AssetType type = .image,
-  }) {
+  static RemoteAsset create({String? id, String? name, String? ownerId, bool isFavorite = false}) {
    id = TestUtils.uuid(id);

    return RemoteAsset(
@@ -19,7 +13,7 @@ class RemoteAssetFactory {
      name: name ?? 'remote_$id.jpg',
      ownerId: TestUtils.uuid(ownerId),
      checksum: 'checksum-$id',
-      type: type,
+      type: .image,
      createdAt: TestUtils.yesterday(),
      updatedAt: TestUtils.now(),
      isFavorite: isFavorite,
@@ -1,7 +1,6 @@
 import 'dart:typed_data';

 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/asset_edit.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:mocktail/mocktail.dart' as mock;
 import 'package:mocktail/mocktail.dart';
@@ -16,7 +15,6 @@ class RepositoryMocks {
  final localAlbum = MockLocalAlbumRepository();
  final localAsset = MockDriftLocalAssetRepository();
  final trashedAsset = MockTrashedLocalAssetRepository();
-  final remoteAsset = MockRemoteAssetRepository();

  final nativeApi = MockNativeSyncApi();

@@ -30,14 +28,12 @@ class RepositoryMocks {
    reset(localAsset);
    reset(trashedAsset);
    reset(nativeApi);
-    reset(remoteAsset);
  }
 }

 class ServiceMocks {
-  final partner = PartnerStub(MockPartnerService());
-  final user = UserStub(MockUserService());
-  final asset = AssetStub(MockAssetService());
+  final PartnerStub partner = PartnerStub(MockPartnerService());
+  final UserStub user = UserStub(MockUserService());

  ServiceMocks() {
    resetAll();
@@ -47,10 +43,8 @@ class ServiceMocks {
    _registerFallbacks();
    partner.reset();
    user.reset();
-    asset.reset();
    _stubUserService();
    _stubPartnerService();
-    _stubAssetService();
  }

  void _stubUserService() {
@@ -69,22 +63,16 @@ class ServiceMocks {
    when(partner.create).thenAnswer((_) async {});
    when(partner.delete).thenAnswer((_) async {});
  }
-
-  void _stubAssetService() {
-    when(asset.updateFavorite).thenAnswer((_) async {});
-    when(asset.applyEdits).thenAnswer((_) async {});
-  }
 }

 void _registerFallbacks() {
  registerFallbackValue(LocalAlbumFactory.create());
  registerFallbackValue(LocalAssetFactory.create());
  registerFallbackValue(Uint8List(0));
-  registerFallbackValue(<AssetEdit>[]);
 }

-extension type const Stub<T extends Mock>(T mockedClass) {
-  void reset() => mock.reset(mockedClass);
+extension type const Stub<T extends Mock>(T mockedService) {
+  void reset() => mock.reset(mockedService);
 }

 extension type const PartnerStub(MockPartnerService service) implements Stub<MockPartnerService> {
@@ -131,11 +119,3 @@ extension type const UserStub(MockUserService service) implements Stub<MockUserS
  Future<String?> Function() get createProfileImage =>
      () => service.createProfileImage(any(), any());
 }
-
-extension type const AssetStub(MockAssetService service) implements Stub<MockAssetService> {
-  Future<void> Function() get updateFavorite =>
-      () => service.updateFavorite(any(), any());
-
-  Future<void> Function() get applyEdits =>
-      () => service.applyEdits(any(), any());
-}
@@ -1,54 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/domain/services/store.service.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';
-import 'package:immich_ui/immich_ui.dart';
-
-import '../../factories/remote_asset_factory.dart';
-import '../../presentation_context.dart';
-
-void main() {
-  late PresentationContext context;
-
-  setUp(() async {
-    context = await PresentationContext.create();
-    await StoreService.I.put(StoreKey.advancedTroubleshooting, true);
-  });
-
-  tearDown(() {
-    context.dispose();
-  });
-
-  group('AssetDebugAction', () {
-    testWidgets('visible for a single asset when advanced troubleshooting is on', (tester) async {
-      await tester.pumpTestWidget(
-        ActionIconButtonWidget(action: AssetDebugAction(assets: [RemoteAssetFactory.create()])),
-        overrides: context.overrides,
-      );
-
-      expect(find.byType(ImmichIconButton), findsOneWidget);
-    });
-
-    testWidgets('hidden for multiple assets', (tester) async {
-      await tester.pumpTestWidget(
-        ActionIconButtonWidget(
-          action: AssetDebugAction(assets: [RemoteAssetFactory.create(), RemoteAssetFactory.create()]),
-        ),
-        overrides: context.overrides,
-      );
-
-      expect(find.byType(ImmichIconButton), findsNothing);
-    });
-
-    testWidgets('hidden when advanced troubleshooting is off', (tester) async {
-      await StoreService.I.put(StoreKey.advancedTroubleshooting, false);
-      await tester.pumpTestWidget(
-        ActionIconButtonWidget(action: AssetDebugAction(assets: [RemoteAssetFactory.create()])),
-        overrides: context.overrides,
-      );
-
-      expect(find.byType(ImmichIconButton), findsNothing);
-    });
-  });
-}
@@ -1,119 +0,0 @@
-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/asset_edit.model.dart';
-import 'package:immich_mobile/models/server_info/server_version.model.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/edit.action.dart';
-import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/providers/server_info.provider.dart';
-import 'package:immich_mobile/providers/websocket.provider.dart';
-import 'package:immich_ui/immich_ui.dart';
-import 'package:mocktail/mocktail.dart';
-
-import '../../../infrastructure/repository.mock.dart';
-import '../../factories/remote_asset_factory.dart';
-import '../../presentation_context.dart';
-import '../../riverpod_mocks.dart';
-
-void main() {
-  late PresentationContext context;
-
-  const supportedVersion = ServerVersion(major: 2, minor: 6, patch: 0);
-  const unsupportedVersion = ServerVersion(major: 2, minor: 5, patch: 9);
-
-  setUp(() async {
-    context = await PresentationContext.create();
-  });
-
-  tearDown(() {
-    context.dispose();
-  });
-
-  List<Override> overrides(ServerVersion version) => [
-    ...context.overrides,
-    serverInfoProvider.overrideWith((ref) => FakeServerInfoNotifier(version)),
-  ];
-
-  RemoteAsset owned({AssetType type = AssetType.image}) =>
-      RemoteAssetFactory.create(ownerId: context.currentUser.id, type: type);
-
-  Future<void> pumpAction(WidgetTester tester, EditAssetAction action, {ServerVersion version = supportedVersion}) =>
-      tester.pumpTestWidget(ActionIconButtonWidget(action: action), overrides: overrides(version));
-
-  group('EditAssetAction', () {
-    testWidgets('visible for a single owned editable asset on a supported server', (tester) async {
-      await pumpAction(tester, EditAssetAction(assets: [owned()]));
-
-      expect(find.byType(ImmichIconButton), findsOneWidget);
-    });
-
-    testWidgets('hidden when the server is older than 2.6.0', (tester) async {
-      await pumpAction(tester, EditAssetAction(assets: [owned()]), version: unsupportedVersion);
-
-      expect(find.byType(ImmichIconButton), findsNothing);
-    });
-
-    testWidgets('hidden for more than one asset', (tester) async {
-      await pumpAction(tester, EditAssetAction(assets: [owned(), owned()]));
-
-      expect(find.byType(ImmichIconButton), findsNothing);
-    });
-
-    testWidgets('hidden for an asset owned by someone else', (tester) async {
-      await pumpAction(tester, EditAssetAction(assets: [RemoteAssetFactory.create()]));
-
-      expect(find.byType(ImmichIconButton), findsNothing);
-    });
-
-    testWidgets('hidden for a non-editable asset', (tester) async {
-      await pumpAction(tester, EditAssetAction(assets: [owned(type: AssetType.video)]));
-
-      expect(find.byType(ImmichIconButton), findsNothing);
-    });
-  });
-
-  group('EditAssetAction onAction', () {
-    testWidgets('reads the edits and exif for the asset from the repository', (tester) async {
-      final asset = owned();
-      final repository = MockRemoteAssetRepository();
-      when(() => repository.getAssetEdits(any())).thenAnswer((_) async => const <AssetEdit>[]);
-      when(() => repository.getExif(any())).thenAnswer((_) async => null);
-
-      await tester.pumpTestAction(
-        EditAssetAction(assets: [asset]),
-        overrides: [...overrides(supportedVersion), remoteAssetRepositoryProvider.overrideWithValue(repository)],
-      );
-      await tester.pumpAndSettle();
-
-      verify(() => repository.getAssetEdits(asset.id)).called(1);
-      verify(() => repository.getExif(asset.id)).called(1);
-    });
-
-    testWidgets('applyEdits forwards the edits to the service and waits for both ready events', (tester) async {
-      late FakeWebsocketNotifier websocket;
-      const edits = <AssetEdit>[];
-
-      late WidgetRef capturedRef;
-      await tester.pumpTestWidget(
-        Consumer(
-          builder: (_, ref, _) {
-            capturedRef = ref;
-            return const SizedBox.shrink();
-          },
-        ),
-        overrides: [
-          ...context.overrides,
-          assetServiceProvider.overrideWithValue(context.mocks.asset.service),
-          websocketProvider.overrideWith((ref) => websocket = FakeWebsocketNotifier(ref)),
-        ],
-      );
-
-      await EditAssetAction.applyEdits(capturedRef, 'asset-1', edits);
-
-      verify(() => context.mocks.asset.service.applyEdits('asset-1', edits)).called(1);
-      expect(websocket.waitedEvents, containsAll(['AssetEditReadyV1', 'AssetEditReadyV2']));
-    });
-  });
-}
@@ -1,82 +0,0 @@
-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/presentation/actions/favorite.action.dart';
-import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:mocktail/mocktail.dart';
-
-import '../../factories/remote_asset_factory.dart';
-import '../../presentation_context.dart';
-
-void main() {
-  late PresentationContext context;
-
-  setUp(() async {
-    context = await PresentationContext.create();
-  });
-
-  tearDown(() {
-    context.dispose();
-  });
-
-  List<Override> overrides() => [
-    ...context.overrides,
-    assetServiceProvider.overrideWithValue(context.mocks.asset.service),
-  ];
-
-  RemoteAsset owned({bool isFavorite = false}) =>
-      RemoteAssetFactory.create(ownerId: context.currentUser.id, isFavorite: isFavorite);
-
-  group('FavoriteAction', () {
-    testWidgets('favorites the eligible owned assets', (tester) async {
-      final asset = owned();
-
-      await tester.pumpTestAction(FavoriteAction(assets: [asset]), overrides: overrides());
-
-      verify(() => context.mocks.asset.service.updateFavorite([asset.id], true)).called(1);
-    });
-
-    testWidgets('unfavorite the eligible owned assets', (tester) async {
-      final asset = owned(isFavorite: true);
-
-      await tester.pumpTestAction(FavoriteAction(assets: [asset]), overrides: overrides());
-
-      verify(() => context.mocks.asset.service.updateFavorite([asset.id], false)).called(1);
-    });
-
-    testWidgets('ignores assets owned by someone else', (tester) async {
-      final mine = owned();
-      final theirs = RemoteAssetFactory.create();
-
-      await tester.pumpTestAction(FavoriteAction(assets: [mine, theirs]), overrides: overrides());
-
-      verify(() => context.mocks.asset.service.updateFavorite([mine.id], true)).called(1);
-    });
-
-    testWidgets('batches every eligible owned asset into a single call', (tester) async {
-      final first = owned();
-      final second = owned();
-
-      await tester.pumpTestAction(FavoriteAction(assets: [first, second]), overrides: overrides());
-
-      verify(() => context.mocks.asset.service.updateFavorite([first.id, second.id], true)).called(1);
-    });
-
-    testWidgets('skips owned assets already in the target state', (tester) async {
-      final stale = owned();
-      final alreadyFavorite = owned(isFavorite: true);
-
-      await tester.pumpTestAction(FavoriteAction(assets: [stale, alreadyFavorite]), overrides: overrides());
-
-      verify(() => context.mocks.asset.service.updateFavorite([stale.id], true)).called(1);
-    });
-
-    testWidgets('shows a confirmation snackbar on success', (tester) async {
-      await tester.pumpTestAction(FavoriteAction(assets: [owned()]), overrides: overrides());
-      await tester.pumpUntilFound(find.byType(SnackBar));
-
-      expect(find.byType(SnackBar), findsOneWidget);
-    });
-  });
-}
@@ -5,25 +5,32 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/presentation/actions/partner.action.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:mocktail/mocktail.dart';

 import '../../factories/user_factory.dart';
+import '../../mocks.dart';
 import '../../presentation_context.dart';

 void main() {
  late PresentationContext context;
+  late UserDto currentUser;
+  final mocks = ServiceMocks();

  setUp(() async {
+    currentUser = UserFactory.createDto();
    context = await PresentationContext.create();
+    when(mocks.user.tryGetMyUser).thenReturn(currentUser);
  });

-  tearDown(() {
-    context.dispose();
+  tearDown(() async {
+    mocks.resetAll();
+    await context.dispose();
  });

  List<Override> overrides({List<User> candidates = const []}) => [
-    ...context.overrides,
-    partnerServiceProvider.overrideWithValue(context.mocks.partner.service),
+    currentUserProvider.overrideWith((ref) => CurrentUserProvider(mocks.user.service)),
+    partnerServiceProvider.overrideWithValue(mocks.partner.service),
    candidatesStateProvider.overrideWith((ref) => Stream<Iterable<User>>.value(candidates)),
  ];

@@ -36,9 +43,7 @@ void main() {
      await tester.tap(find.text(candidate.name));
      await tester.pumpAndSettle();

-      verify(
-        () => context.mocks.partner.service.create(sharedById: context.currentUser.id, sharedWithId: candidate.id),
-      ).called(1);
+      verify(() => mocks.partner.service.create(sharedById: currentUser.id, sharedWithId: candidate.id)).called(1);
    });

    testWidgets('creates nothing when the selection dialog is dismissed', (tester) async {
@@ -46,7 +51,7 @@ void main() {
      await tester.sendKeyEvent(LogicalKeyboardKey.escape); // dismiss without selecting
      await tester.pumpAndSettle();

-      verifyNever(context.mocks.partner.create);
+      verifyNever(mocks.partner.create);
    });
  });

@@ -60,9 +65,7 @@ void main() {
      await tester.tap(find.byType(TextButton).last); // confirm
      await tester.pumpAndSettle();

-      verify(
-        () => context.mocks.partner.service.delete(sharedById: context.currentUser.id, sharedWithId: partner.id),
-      ).called(1);
+      verify(() => mocks.partner.service.delete(sharedById: currentUser.id, sharedWithId: partner.id)).called(1);
    });

    testWidgets('deletes nothing when the confirmation is cancelled', (tester) async {
@@ -74,7 +77,7 @@ void main() {
      await tester.tap(find.byType(TextButton).first); // cancel
      await tester.pumpAndSettle();

-      verifyNever(context.mocks.partner.delete);
+      verifyNever(mocks.partner.delete);
    });
  });
 }
@@ -1,108 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
-import 'package:immich_mobile/presentation/actions/timeline.action.dart';
-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-
-import '../../factories/remote_asset_factory.dart';
-import '../../presentation_context.dart';
-
-class _FakeAction extends BaseAction {
-  _FakeAction({this.visible = true, this.error});
-
-  final bool visible;
-  final Object? error;
-
-  bool ran = false;
-  bool? selectionDuringOnAction;
-
-  @override
-  IconData get icon => Icons.bolt;
-
-  @override
-  String label(ActionScope scope) => 'fake';
-
-  @override
-  bool isVisible(ActionScope scope) => visible;
-
-  @override
-  Future<void> onAction(ActionScope scope) async {
-    ran = true;
-    selectionDuringOnAction = scope.ref.read(multiSelectProvider).isEnabled;
-    if (error != null) {
-      throw error!;
-    }
-  }
-}
-
-void main() {
-  late PresentationContext context;
-
-  setUp(() async {
-    context = await PresentationContext.create();
-  });
-
-  tearDown(() {
-    context.dispose();
-  });
-
-  List<Override> seededOverrides() => [
-    ...context.overrides,
-    multiSelectProvider.overrideWith(
-      () => MultiSelectNotifier(
-        MultiSelectState(selectedAssets: {RemoteAssetFactory.create()}, lockedSelectionAssets: const {}),
-      ),
-    ),
-  ];
-
-  Future<(ActionScope, ProviderContainer)> pumpScope(WidgetTester tester) async {
-    late ActionScope scope;
-    late ProviderContainer container;
-    await tester.pumpTestWidget(
-      Consumer(
-        builder: (innerContext, ref, _) {
-          scope = ActionScope(context: innerContext, ref: ref, authUser: context.currentUser);
-          container = ProviderScope.containerOf(innerContext, listen: false);
-          return const SizedBox.shrink();
-        },
-      ),
-      overrides: seededOverrides(),
-    );
-    return (scope, container);
-  }
-
-  group('TimelineAction', () {
-    testWidgets('runs the wrapped action and then clears the selection', (tester) async {
-      final inner = _FakeAction();
-      final (scope, container) = await pumpScope(tester);
-      await TimelineAction(action: inner).onAction(scope);
-
-      expect(inner.ran, isTrue);
-      expect(inner.selectionDuringOnAction, isTrue, reason: 'reset must run after the inner action, not before');
-      expect(container.read(multiSelectProvider).isEnabled, isFalse);
-    });
-
-    testWidgets('rethrows and keeps the selection when the wrapped action throws', (tester) async {
-      final error = Exception('boom');
-      final inner = _FakeAction(error: error);
-      final (scope, container) = await pumpScope(tester);
-
-      await expectLater(TimelineAction(action: inner).onAction(scope), throwsA(same(error)));
-
-      expect(inner.ran, isTrue);
-      expect(container.read(multiSelectProvider).isEnabled, isTrue);
-    });
-
-    testWidgets('delegates visibility to the wrapped action', (tester) async {
-      await tester.pumpTestWidget(
-        ActionIconButtonWidget(action: TimelineAction(action: _FakeAction(visible: false))),
-        overrides: context.overrides,
-      );
-
-      expect(find.byType(ActionIconButtonWidget), findsOneWidget);
-      expect(find.byIcon(Icons.bolt), findsNothing);
-    });
-  });
-}
@@ -13,7 +13,7 @@ void main() {
  late PresentationContext context;

  setUp(() async => context = await PresentationContext.create());
-  tearDown(() => context.dispose());
+  tearDown(() async => await context.dispose());

  group('PartnerSharedByList', () {
    testWidgets('shows the empty-state add button when there are no partners', (tester) async {
@@ -23,7 +23,7 @@ import 'mocks.dart';

 class PresentationContext {
  PresentationContext._({required UserDto user}) : currentUser = user, mocks = ServiceMocks() {
-    setup();
+    when(mocks.user.tryGetMyUser).thenReturn(currentUser);
  }

  static const String serverEndpoint = 'http://localhost:3000';
@@ -46,14 +46,10 @@ class PresentationContext {
    return PresentationContext._(user: UserFactory.createDto());
  }

-  void setup() {
-    when(mocks.user.tryGetMyUser).thenReturn(currentUser);
-  }
-
-  void dispose() {
-    addTearDown(() {
-      mocks.resetAll();
-    });
+  Future<void> dispose() async {
+    // TODO: Dispose the store and database after each test.
+    // This is currently not possible because the store is a singleton and is used across tests.
+    //  Refactor the store to be created per test to allow proper disposal.
  }
 }

@@ -77,7 +73,7 @@ extension PumpPresentationWidget on WidgetTester {
              localizationsDelegates: context.localizationDelegates,
              supportedLocales: context.supportedLocales,
              locale: context.locale,
-              home: Scaffold(body: widget),
+              home: Material(child: widget),
            ),
          ),
        ),
@@ -87,7 +83,10 @@ extension PumpPresentationWidget on WidgetTester {
  }

  Future<void> pumpTestAction(BaseAction action, {List<Override> overrides = const []}) async {
-    await pumpTestWidget(ActionIconButtonWidget(action: action), overrides: overrides);
+    await pumpTestWidget(
+      Scaffold(body: ActionIconButtonWidget(action: action)),
+      overrides: overrides,
+    );
    await tap(find.byType(ImmichIconButton));
    await pump();
  }
@@ -1,24 +0,0 @@
-import 'package:immich_mobile/models/server_info/server_version.model.dart';
-import 'package:immich_mobile/providers/server_info.provider.dart';
-import 'package:immich_mobile/providers/websocket.provider.dart';
-
-import '../domain/service.mock.dart';
-
-class FakeServerInfoNotifier extends ServerInfoNotifier {
-  FakeServerInfoNotifier([ServerVersion version = const ServerVersion(major: 2, minor: 6, patch: 0)])
-    : super(MockServerInfoService()) {
-    state = state.copyWith(serverVersion: version);
-  }
-}
-
-class FakeWebsocketNotifier extends WebsocketNotifier {
-  FakeWebsocketNotifier(super.ref);
-
-  final List<String> waitedEvents = [];
-
-  @override
-  Future<void> waitForEvent(String event, bool Function(dynamic)? predicate, Duration timeout) {
-    waitedEvents.add(event);
-    return Future.value();
-  }
-}
@@ -769,8 +769,8 @@ importers:
        specifier: workspace:*
        version: link:../packages/sdk
      '@immich/ui':
-        specifier: ^0.81.1
-        version: 0.81.1(@sveltejs/kit@2.65.1(@opentelemetry/api@1.9.1)(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3(@typescript-eslint/types@8.61.0))(vite@8.0.16(@types/node@24.13.2)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.101.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0)))(svelte@5.56.3(@typescript-eslint/types@8.61.0))(typescript@6.0.3)(vite@8.0.16(@types/node@24.13.2)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.101.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0)))(svelte@5.56.3(@typescript-eslint/types@8.61.0))
+        specifier: ^0.82.0
+        version: 0.82.0(@sveltejs/kit@2.65.1(@opentelemetry/api@1.9.1)(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3(@typescript-eslint/types@8.61.0))(vite@8.0.16(@types/node@24.13.2)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.101.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0)))(svelte@5.56.3(@typescript-eslint/types@8.61.0))(typescript@6.0.3)(vite@8.0.16(@types/node@24.13.2)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.101.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0)))(svelte@5.56.3(@typescript-eslint/types@8.61.0))
      '@mapbox/mapbox-gl-rtl-text':
        specifier: 0.4.0
        version: 0.4.0
@@ -3233,8 +3233,8 @@ packages:
    resolution: {integrity: sha512-O1SJ+BbeFVsUTF4af1MfagJZM+lPgLjI8lQ3SZNjpo8SGJReSbUl2ii03OKuGni/G0yp2GnRLpOTNSHYGtVrcg==}
    hasBin: true

-  '@immich/ui@0.81.1':
-    resolution: {integrity: sha512-7g173hArs7OS5CfHUG+ZJVQp1iCvFZzBmm+f2uH1WChlFdcwty5DLilYrDBszWuPIvu8wTX2AXTneS/KYBCUxw==}
+  '@immich/ui@0.82.0':
+    resolution: {integrity: sha512-QWVRmJgZSs9OpLghQxgtzSLlJE7pjA9dRPF3D3pYfAVzj0wHUCK7jUaMz/hO4kJhF2O4J6FSJK8lJxaxydwuQQ==}
    peerDependencies:
      '@sveltejs/kit': ^2.13.0
      svelte: ^5.0.0
@@ -15986,7 +15986,7 @@ snapshots:
      pg-connection-string: 2.13.0
      postgres: 3.4.9

-  '@immich/ui@0.81.1(@sveltejs/kit@2.65.1(@opentelemetry/api@1.9.1)(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3(@typescript-eslint/types@8.61.0))(vite@8.0.16(@types/node@24.13.2)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.101.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0)))(svelte@5.56.3(@typescript-eslint/types@8.61.0))(typescript@6.0.3)(vite@8.0.16(@types/node@24.13.2)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.101.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0)))(svelte@5.56.3(@typescript-eslint/types@8.61.0))':
+  '@immich/ui@0.82.0(@sveltejs/kit@2.65.1(@opentelemetry/api@1.9.1)(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.3(@typescript-eslint/types@8.61.0))(vite@8.0.16(@types/node@24.13.2)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.101.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0)))(svelte@5.56.3(@typescript-eslint/types@8.61.0))(typescript@6.0.3)(vite@8.0.16(@types/node@24.13.2)(esbuild@0.28.1)(jiti@2.7.0)(sass@1.101.0)(terser@5.48.0)(tsx@4.22.4)(yaml@2.9.0)))(svelte@5.56.3(@typescript-eslint/types@8.61.0))':
    dependencies:
      '@internationalized/date': 3.12.2
      '@mdi/js': 7.4.47
@@ -20957,21 +20957,21 @@ snapshots:
      signal-exit: 3.0.7
      strip-final-newline: 2.0.0

-  exiftool-vendored.exe@13.59.0:
-    optional: true
+  exiftool-vendored.exe@13.59.0: {}

-  exiftool-vendored.pl@13.59.0: {}
+  exiftool-vendored.pl@13.59.0:
+    optional: true

  exiftool-vendored@35.21.0:
    dependencies:
      '@photostructure/tz-lookup': 11.5.0
      '@types/luxon': 3.7.1
      batch-cluster: 17.3.1
-      exiftool-vendored.pl: 13.59.0
+      exiftool-vendored.exe: 13.59.0
      he: 1.2.0
      luxon: 3.7.2
    optionalDependencies:
-      exiftool-vendored.exe: 13.59.0
+      exiftool-vendored.pl: 13.59.0

  expand-template@2.0.3:
    optional: true
@@ -66,4 +66,4 @@ injectWorkspacePackages: true
 shamefullyHoist: false
 verifyDepsBeforeRun: install
 minimumReleaseAgeExclude:
-  - '@immich/ui@0.81.1'
+  - '@immich/ui@0.82.0'
@@ -27,7 +27,7 @@
    "@formatjs/icu-messageformat-parser": "^3.0.0",
    "@immich/justified-layout-wasm": "^0.4.3",
    "@immich/sdk": "workspace:*",
-    "@immich/ui": "^0.81.1",
+    "@immich/ui": "^0.82.0",
    "@mapbox/mapbox-gl-rtl-text": "0.4.0",
    "@mdi/js": "^7.4.47",
    "@noble/hashes": "^2.2.0",
@@ -14,6 +14,7 @@
  import { authManager } from '$lib/managers/auth-manager.svelte';
  import { editManager, EditToolType } from '$lib/managers/edit/edit-manager.svelte';
  import { eventManager } from '$lib/managers/event-manager.svelte';
+  import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
  import { getAssetActions } from '$lib/services/asset.service';
  import { faceManager } from '$lib/stores/face.svelte';
  import { ocrManager } from '$lib/stores/ocr.svelte';
@@ -23,6 +24,7 @@
  import type { OnUndoDelete } from '$lib/utils/actions';
  import { navigateToAsset } from '$lib/utils/asset-utils';
  import { handleError } from '$lib/utils/handle-error';
+  import { navigate } from '$lib/utils/navigation';
  import { InvocationTracker } from '$lib/utils/invocationTracker';
  import { SlideshowHistory } from '$lib/utils/slideshow-history';
  import { toTimelineAsset } from '$lib/utils/timeline-util';
@@ -149,6 +151,15 @@
    }
  };

+  const onAssetsUndoArchive = async (assets: TimelineAsset[]) => {
+    if (assets.length === 0) {
+      return;
+    }
+    const restoredAsset = assets[0];
+    await assetViewerManager.setAssetId(restoredAsset.id);
+    await navigate({ targetRoute: 'current', assetId: restoredAsset.id });
+  };
+
  onMount(() => {
    syncAssetViewerOpenClass(true);
    const slideshowStateUnsubscribe = slideshowState.subscribe((value) => {
@@ -475,7 +486,7 @@
 </script>

 <CommandPaletteDefaultProvider name={$t('assets')} actions={[Tag, TagPeople]} />
-<OnEvents {onAssetUpdate} />
+<OnEvents {onAssetUpdate} {onAssetsUndoArchive} />

 <svelte:document
  bind:fullscreenElement
@@ -309,12 +309,12 @@
    untrack(() => map?.jumpTo({ center, zoom }));
  });

-  const onAssetsDelete = async () => {
+  const onAssetsChanged = async () => {
    mapMarkers = await loadMapMarkers();
  };
 </script>

-<OnEvents {onAssetsDelete} />
+<OnEvents onAssetsDelete={onAssetsChanged} onAssetsArchive={onAssetsChanged} onAssetsUnarchive={onAssetsChanged} />

 <!--  We handle style loading ourselves so we set style blank here -->
 <MapLibre
@@ -16,6 +16,7 @@ import type {
  UserAdminResponseDto,
  WorkflowResponseDto,
 } from '@immich/sdk';
+import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
 import { BaseEventManager } from '$lib/utils/base-event-manager.svelte';
 import type { TreeNode } from '$lib/utils/tree-utils';

@@ -35,6 +36,8 @@ export type Events = {

  AssetUpdate: [AssetResponseDto];
  AssetsArchive: [string[]];
+  AssetsUnarchive: [TimelineAsset[]];
+  AssetsUndoArchive: [TimelineAsset[]];
  AssetsDelete: [string[]];
  AssetEditsApplied: [string];
  AssetsTag: [string[]];
@@ -1,4 +1,4 @@
-import { AssetOrder, getAssetInfo, getTimeBuckets, AssetOrderBy, type AssetResponseDto } from '@immich/sdk';
+import { AssetOrder, AssetOrderBy, getAssetInfo, getTimeBuckets, type AssetResponseDto } from '@immich/sdk';
 import { clamp, isEqual } from 'lodash-es';
 import { SvelteDate, SvelteSet } from 'svelte/reactivity';
 import { VirtualScrollManager } from '$lib/managers/VirtualScrollManager/VirtualScrollManager.svelte';
@@ -114,7 +114,15 @@ export class TimelineManager extends VirtualScrollManager {

    this.#unsubscribes.push(
      eventManager.on({
-        AssetUpdate: (asset: AssetResponseDto) => this.#updateAssets([toTimelineAsset(asset)]),
+        AssetUpdate: (asset: AssetResponseDto) => {
+          const timelineAsset = toTimelineAsset(asset);
+          if (this.#options.albumId || this.#options.personId) {
+            this.#updateAssets([timelineAsset]);
+          } else {
+            this.upsertAssets([timelineAsset]);
+          }
+        },
+        AssetsUnarchive: (assets) => this.upsertAssets(assets),
      }),
    );
  }
@@ -17,13 +17,14 @@ import {
  type StackResponseDto,
  type UserResponseDto,
 } from '@immich/sdk';
-import { toastManager } from '@immich/ui';
+import { toastManager, type ToastShow } from '@immich/ui';
 import { DateTime } from 'luxon';
 import { t } from 'svelte-i18n';
 import { get } from 'svelte/store';
 import type { AssetMultiSelectManager } from '$lib/managers/asset-multi-select-manager.svelte';
 import { authManager } from '$lib/managers/auth-manager.svelte';
 import { downloadManager } from '$lib/managers/download-manager.svelte';
+import { eventManager } from '$lib/managers/event-manager.svelte';
 import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
 import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
 import { downloadBlob, downloadRequest, withError } from '$lib/utils';
@@ -31,6 +32,7 @@ import { getByteUnitString } from '$lib/utils/byte-units';
 import { getFormatter } from '$lib/utils/i18n';
 import { navigate } from '$lib/utils/navigation';
 import { asQueryString } from '$lib/utils/shared-links';
+import { toTimelineAsset } from '$lib/utils/timeline-util';
 import { handleError } from './handle-error';

 export const tagAssets = async ({
@@ -298,10 +300,13 @@ export const stackAssets = async (assets: { id: string }[], showNotification = t
    if (showNotification) {
      toastManager.primary({
        description: $t('stacked_assets_count', { values: { count: stack.assets.length } }),
-        button: {
+        button: (close) => ({
          label: $t('view_stack'),
-          onclick: () => navigate({ targetRoute: 'current', assetId: stack.primaryAssetId }),
-        },
+          onclick: async () => {
+            await navigate({ targetRoute: 'current', assetId: stack.primaryAssetId });
+            close();
+          },
+        }),
      });
    }

@@ -400,7 +405,12 @@ export const toggleArchive = async (asset: AssetResponseDto) => {
    });

    asset.isArchived = data.isArchived;
-    toastManager.primary(asset.isArchived ? $t(`added_to_archive`) : $t(`removed_from_archive`));
+    if (asset.isArchived) {
+      const timelineAsset = toTimelineAsset(asset);
+      showUndoArchiveToast($t('added_to_archive'), [timelineAsset]);
+    } else {
+      toastManager.primary($t('removed_from_archive'));
+    }
  } catch (error) {
    handleError(error, $t('errors.unable_to_add_remove_archive', { values: { archived: asset.isArchived } }));
  }
@@ -408,7 +418,46 @@ export const toggleArchive = async (asset: AssetResponseDto) => {
  return asset;
 };

-export const archiveAssets = async (assets: { id: string }[], visibility: AssetVisibility) => {
+const showUndoArchiveToast = (description: string, assets: TimelineAsset[]) => {
+  const $t = get(t);
+  const toast: ToastShow & { onClose?: () => void } = {
+    description,
+    button: (close) => ({
+      label: $t('undo'),
+      onclick: () => {
+        close();
+        void undoArchiveAssets(assets);
+      },
+    }),
+  };
+  toastManager.primary(toast);
+};
+
+const undoArchiveAssets = async (assets: TimelineAsset[]) => {
+  const $t = get(t);
+  try {
+    const ids = assets.map((a) => a.id);
+    if (ids.length > 0) {
+      await updateAssets({
+        assetBulkUpdateDto: {
+          ids,
+          visibility: AssetVisibility.Timeline,
+        },
+      });
+    }
+
+    for (const asset of assets) {
+      asset.visibility = AssetVisibility.Timeline;
+    }
+    eventManager.emit('AssetsUnarchive', assets);
+    eventManager.emit('AssetsUndoArchive', assets);
+    toastManager.success($t('unarchived_count', { values: { count: assets.length } }));
+  } catch (error) {
+    handleError(error, $t('errors.unable_to_archive_unarchive', { values: { archived: false } }));
+  }
+};
+
+export const archiveAssets = async (assets: TimelineAsset[], visibility: AssetVisibility) => {
  const ids = assets.map(({ id }) => id);
  const $t = get(t);

@@ -419,11 +468,11 @@ export const archiveAssets = async (assets: { id: string }[], visibility: AssetV
      });
    }

-    toastManager.primary(
-      visibility === AssetVisibility.Archive
-        ? $t('archived_count', { values: { count: ids.length } })
-        : $t('unarchived_count', { values: { count: ids.length } }),
-    );
+    if (visibility === AssetVisibility.Archive) {
+      showUndoArchiveToast($t('archived_count', { values: { count: ids.length } }), assets);
+    } else {
+      toastManager.primary($t('unarchived_count', { values: { count: ids.length } }));
+    }
  } catch (error) {
    handleError(
      error,
@@ -165,7 +165,10 @@ export const toTimelineAsset = (unknownAsset: AssetResponseDto | TimelineAsset):
  const people = assetResponse.people?.map((person) => person.name) || [];

  const localDateTime = fromISODateTimeUTCToObject(assetResponse.localDateTime);
-  const fileCreatedAt = fromISODateTimeToObject(assetResponse.fileCreatedAt, assetResponse.exifInfo?.timeZone ?? 'UTC');
+  // Keep this consistent with the bucket loader (getTimes), which stores fileCreatedAt as UTC
+  // components. The timeline sorts assets within a day by fileCreatedAt, so a mismatched
+  // representation here would place re-inserted assets (e.g. undo archive) in the wrong spot.
+  const fileCreatedAt = fromISODateTimeUTCToObject(assetResponse.fileCreatedAt);
  const createdAt = fromISODateTimeUTCToObject(assetResponse.createdAt);

  return {
@@ -329,6 +329,7 @@
  onPersonAssetDelete={handlePersonAssetDelete}
  onAssetsDelete={updateAssetCount}
  onAssetsArchive={updateAssetCount}
+  onAssetsUnarchive={updateAssetCount}
 />

 <main
Author	SHA1	Message	Date
Yaros	18d0991b61	chore: format asset-utils	2026-06-25 13:04:52 +02:00
Yaros	fa29dc08f9	chore(web): use immich/ui 0.82.0	2026-06-24 22:06:26 +02:00
Yaros	fdcd6c7671	Merge branch 'main' into feat/undo-archive	2026-06-24 21:41:01 +02:00
Yaros	44fdaa47d3	refactor: remove undotoast component	2026-06-23 20:06:03 +02:00
Yaros	604d100bb8	chore: format undotoast	2026-06-23 19:24:55 +02:00
Yaros	ae022fd90a	fix: file placement & undo toast	2026-06-23 19:22:33 +02:00
Yaros	afa433b3ad	refactor: moved AssetsUndoArchive handler	2026-06-22 17:33:54 +02:00
Yaros	7cdc252384	refactor: use eventmanager for onundoarchive	2026-06-11 21:46:27 +02:00
Yaros	3c43b7240b	fix(web): ignore unknown assets in album timelines	2026-06-08 19:12:57 +02:00
Yaros	b966940264	chore: formatting	2026-06-08 19:02:47 +02:00
Yaros	72cca30272	feat: go back to asset on undo archive in viewer	2026-06-08 19:00:09 +02:00
Yaros	bcd01a2464	fix: restore from asset viewer	2026-06-08 18:53:42 +02:00
Yaros	a5d8415c5f	fix(web): correct timeline position on undo	2026-06-08 18:48:10 +02:00
Yaros	74e9ec4872	fix: import conflicts	2026-06-08 18:29:44 +02:00
Yaros	411487dfd7	Merge branch 'main' into feat/undo-archive	2026-06-08 18:13:43 +02:00
Yaros	524b191ccc	refactor: use event-manager	2026-03-27 13:55:42 +01:00
Yaros	075f7d507b	refactor: use primary toast	2026-03-26 19:20:11 +01:00
Yaros	c4df4d7852	Merge branch 'main' into feat/undo-archive	2026-03-26 19:11:36 +01:00
Yaros	0eaa2c3419	refactor: remove ternary	2026-03-20 17:43:22 +01:00
Yaros	554e7b28a2	refactor: remove unnecessary checks	2026-03-20 17:13:18 +01:00
Yaros	167aad7ac2	feat(web): undo archive from toast	2026-03-19 22:13:34 +01:00