From dfd9ed988e99d0412d96dcee831c75ff0c87762c Mon Sep 17 00:00:00 2001
From: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Date: Fri, 8 Aug 2025 01:45:24 +0530
Subject: [PATCH] re-assign initial state on page change

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

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 3bbfc43f61..23038ec30f 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -223,13 +223,14 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   void _onPageChanged(int index, PhotoViewControllerBase? controller) {
     _onAssetChanged(index);
     viewController = controller;
+    initialPhotoViewState = controller?.value ?? initialPhotoViewState;
 
     // If the bottom sheet is showing, we need to adjust scale the asset to
     // emulate the zoom effect
-    // if (showingBottomSheet) {
-    //   initialScale = controller?.scale;
-    //   controller?.scale = _getScaleForBottomSheet;
-    // }
+    if (showingBottomSheet) {
+      initialScale = controller?.scale;
+      // controller?.scale = _getScaleForBottomSheet;
+    }
   }
 
   void _onDragStart(
@@ -429,7 +430,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
 
   void _openBottomSheet(BuildContext ctx, {double extent = _kBottomSheetMinimumExtent}) {
     ref.read(assetViewerProvider.notifier).setBottomSheet(true);
-    // initialScale = viewController?.scale;
+    initialScale = viewController?.scale;
     // viewController?.updateMultiple(scale: _getScaleForBottomSheet);
     previousExtent = _kBottomSheetMinimumExtent;
     sheetCloseController = showBottomSheet(