From 71c4f507ac43f03e0f15fa19678ba2cdd0f2abc9 Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Wed, 25 Jun 2025 23:12:50 +0300
Subject: [PATCH] Update unspent_coins_list_page.dart

---
 .../unspent_coins/unspent_coins_list_page.dart      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/src/screens/unspent_coins/unspent_coins_list_page.dart b/lib/src/screens/unspent_coins/unspent_coins_list_page.dart
index 965926d63..3a085f474 100644
--- a/lib/src/screens/unspent_coins/unspent_coins_list_page.dart
+++ b/lib/src/screens/unspent_coins/unspent_coins_list_page.dart
@@ -41,14 +41,17 @@ class UnspentCoinsListPage extends BasePage {
   final UnspentCoinsListViewModel unspentCoinsListViewModel;
 
   Future<void> handleOnPopInvoked(BuildContext context) async {
+    final navigator = Navigator.of(context);
     final hasChanged = unspentCoinsListViewModel.hasAdjustableFieldChanged;
     if (unspentCoinsListViewModel.items.isEmpty || !hasChanged) {
-      Navigator.of(context).pop();
-    } else {
-      unspentCoinsListViewModel.setIsDisposing(true);
-      await unspentCoinsListViewModel.dispose();
-      Navigator.of(context).pop();
+      if (navigator.canPop()) navigator.pop();
+      return;
     }
+
+    unspentCoinsListViewModel.setIsDisposing(true);
+    await unspentCoinsListViewModel.dispose();
+    Navigator.of(context).pop();
+    if (navigator.canPop()) navigator.pop();
   }
 
   @override