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..3c47ea203 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,18 @@ class UnspentCoinsListPage extends BasePage { final UnspentCoinsListViewModel unspentCoinsListViewModel; Future 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(); + + if (navigator.canPop()) navigator.pop(); + if (navigator.canPop()) navigator.pop(); } @override