diff --git a/integration_test/duniter/data/gecko_tests.json b/integration_test/duniter/data/gecko_tests.json old mode 100644 new mode 100755 diff --git a/integration_test/general_actions.dart b/integration_test/general_actions.dart index 8a734cd..612675a 100644 --- a/integration_test/general_actions.dart +++ b/integration_test/general_actions.dart @@ -145,6 +145,7 @@ Future onboardingNewChest() async { // Check if string "ĞD" is present in screen await waitFor('Mon portefeuille co'); await waitFor('0.0 $currencyName'); + // await waitFor('Scanner un'); } Future addDerivation() async { diff --git a/lib/screens/onBoarding/11_congratulations.dart b/lib/screens/onBoarding/11_congratulations.dart index 61bd8b0..d372db2 100644 --- a/lib/screens/onBoarding/11_congratulations.dart +++ b/lib/screens/onBoarding/11_congratulations.dart @@ -55,13 +55,24 @@ Widget finishButton(BuildContext context) { child: ElevatedButton( key: keyGoWalletsHome, style: ElevatedButton.styleFrom( - foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground + foregroundColor: Colors.white, elevation: 4, + backgroundColor: orangeC, // foreground ), onPressed: () { - // sleep(const Duration(milliseconds: 50)); - Navigator.popUntil(homeContext, ModalRoute.withName('/')); - // sleep(const Duration(milliseconds: 500)); - Navigator.pushNamed(homeContext, '/mywallets'); + //TODO: fix bad widget ancestor when pupUntil (multi_chest test failed) + + // Navigator.popUntil(homeContext, ModalRoute.withName('/')); + // Navigator.of(homeContext, rootNavigator: true) + // .popUntil(ModalRoute.withName('/')); + // while (Navigator.of(homeContext).canPop()) { + // Navigator.of(homeContext).pop(); + // } + + // Navigator.pushNamed(homeContext, '/mywallets'); + + Navigator.pushNamedAndRemoveUntil( + context, '/mywallets', (route) => route.isFirst); + // Navigator.pushNamedAndRemoveUntil( // homeContext, '/mywallets', ModalRoute.withName('/')); },