From e81a79224c4cd6dd1d33ef8e5edf3f661cfa105e Mon Sep 17 00:00:00 2001
From: Santo Shakil <santoshakil@users.noreply.github.com>
Date: Tue, 21 Jul 2026 19:38:45 +0600
Subject: [PATCH] fix(mobile): stop double close animation when dismissing an
 asset (#29413)

---
 .../widgets/asset_viewer/asset_viewer.page.dart             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
index abef9ceff8..25f99e2361 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -174,6 +174,12 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
       return;
     }
 
+    // The viewer is closing; don't flip the current asset now. Flipping it swaps
+    // the grid tile hero keys mid pop and animates the close on two tiles (#23779).
+    if (!mounted || !(ModalRoute.of(context)?.isActive ?? true)) {
+      return;
+    }
+
     AssetViewer._setAsset(ref, asset);
     _preloader.preload(index, context.sizeData);
     _handleCasting();