CAKE-290 | applied WillPopScope for call of AuthPage with instanceName in the router.dart

OleksandrSobol committed Mar 26, 2021 at 13:29 UTC 8aa636a4e8b6eacf4b8a0ba1ddfbe6e6e9f92065
1 file changed +5 -1
lib/router.dart
+5 -1
@@ -60,6 +60,7 @@ import 'package:cake_wallet/src/screens/send/send_template_page.dart';
60 import 'package:cake_wallet/src/screens/exchange/exchange_template_page.dart';
61 import 'package:cake_wallet/src/screens/exchange_trade/exchange_confirm_page.dart';
62 import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_page.dart';
63 +import 'package:flutter/services.dart';
64 import 'package:hive/hive.dart';
65
66 Route<dynamic> createRoute(RouteSettings settings) {
@@ -250,7 +251,10 @@ Route<dynamic> createRoute(RouteSettings settings) {
251
252 case Routes.login:
253 return CupertinoPageRoute<void>(
253 - builder: (context) => getIt.get<AuthPage>(instanceName: 'login'),
254 + builder: (context) => WillPopScope(
255 + child: getIt.get<AuthPage>(instanceName: 'login'),
256 + onWillPop: () =>
257 + SystemChannels.platform.invokeMethod('SystemNavigator.pop')),
258 fullscreenDialog: true);
259
260 case Routes.accountCreation: