From ea43d66ce070df8426e23333f1e677229cf2006c Mon Sep 17 00:00:00 2001 From: poka Date: Fri, 17 Nov 2023 14:09:06 +0100 Subject: [PATCH] fix: double home screen after forget all safes --- lib/providers/my_wallets.dart | 6 ++-- .../onBoarding/11_congratulations.dart | 29 ++++++++++--------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/lib/providers/my_wallets.dart b/lib/providers/my_wallets.dart index 4bb07e4..c5d2c3b 100644 --- a/lib/providers/my_wallets.dart +++ b/lib/providers/my_wallets.dart @@ -104,10 +104,8 @@ class MyWalletsProvider with ChangeNotifier { myWalletProvider.pinCode = ''; - await Navigator.of(context).pushNamedAndRemoveUntil( - '/', - ModalRoute.withName('/'), - ); + await Navigator.of(context) + .pushNamedAndRemoveUntil('/', (Route route) => false); } return 0; } catch (e) { diff --git a/lib/screens/onBoarding/11_congratulations.dart b/lib/screens/onBoarding/11_congratulations.dart index 52d757c..f6193fb 100644 --- a/lib/screens/onBoarding/11_congratulations.dart +++ b/lib/screens/onBoarding/11_congratulations.dart @@ -1,10 +1,8 @@ // ignore_for_file: file_names import 'dart:math'; - import 'package:confetti/confetti.dart'; import 'package:easy_localization/easy_localization.dart'; - import 'package:flutter/material.dart'; import 'package:gecko/globals.dart'; import 'package:gecko/models/widgets_keys.dart'; @@ -91,17 +89,20 @@ Widget finishButton(BuildContext context) { width: 380 * ratio, height: 60 * ratio, child: ElevatedButton( - key: keyGoWalletsHome, - style: ElevatedButton.styleFrom( - foregroundColor: Colors.white, elevation: 4, - backgroundColor: orangeC, // foreground - ), - onPressed: () { - Navigator.pushNamedAndRemoveUntil( - context, '/mywallets', ModalRoute.withName('/')); - }, - child: Text("accessMyChest".tr(), - style: - TextStyle(fontSize: 22 * ratio, fontWeight: FontWeight.w600))), + key: keyGoWalletsHome, + style: ElevatedButton.styleFrom( + foregroundColor: Colors.white, + elevation: 4, + backgroundColor: orangeC, + ), + onPressed: () { + Navigator.pushNamedAndRemoveUntil( + context, '/mywallets', ModalRoute.withName('/')); + }, + child: Text( + "accessMyChest".tr(), + style: TextStyle(fontSize: 22 * ratio, fontWeight: FontWeight.w600), + ), + ), ); }