From 60d4fbb6de158b22d87acf3fbd1548d99c5337aa Mon Sep 17 00:00:00 2001
From: Tien Do Nam <dev.tien.donam@gmail.com>
Date: Tue, 4 Aug 2026 02:32:56 +0200
Subject: [PATCH] fix: pop after multi send

---
 app/lib/pages/progress_page.dart | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/lib/pages/progress_page.dart b/app/lib/pages/progress_page.dart
index b2abf57e..99d666f3 100644
--- a/app/lib/pages/progress_page.dart
+++ b/app/lib/pages/progress_page.dart
@@ -204,6 +204,18 @@ class _ProgressPageState extends State<ProgressPage> with Refena {
     final SessionState? commonSessionState = receiveSession ?? sendSession;
 
     if (commonSessionState == null) {
+      // The session no longer exists, e.g. a multi-send session that finished successfully
+      // in background gets removed while this page is still open.
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (!mounted) {
+          return;
+        }
+        if (ref.read(serverProvider)?.webUpload == true) {
+          context.global.dispatch(NavigateAction.popUntil<WebSharePage>());
+        } else {
+          context.global.dispatch(NavigateAction.popUntilRoot());
+        }
+      });
       return Scaffold(
         body: Container(),
       );