From c38174fb7dcf2821c3779d25b4eb1fb416c44b2c Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Sat, 22 Feb 2025 22:15:05 +0100
Subject: [PATCH] wording change weetwen new safe and import safe success
---
assets/translations/en.json | 1 +
assets/translations/es.json | 1 +
assets/translations/fr.json | 1 +
assets/translations/it.json | 1 +
lib/screens/myWallets/restore_chest.dart | 4 +++-
lib/screens/onBoarding/10.dart | 7 ++++---
lib/screens/onBoarding/11_congratulations.dart | 5 +++--
lib/screens/onBoarding/7.dart | 5 +++--
lib/screens/onBoarding/8.dart | 5 +++--
lib/screens/onBoarding/9.dart | 6 ++++--
10 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/assets/translations/en.json b/assets/translations/en.json
index 1ce582e..327015c 100644
--- a/assets/translations/en.json
+++ b/assets/translations/en.json
@@ -68,6 +68,7 @@
"iNotedMyPassword": "I noted my password",
"geckoWillCheckPassword": "Gecko will check with you if you have remembered your secret code.\n\n Type your secret code in the field below to check that you have written it down correctly.",
"yourChestAndWalletWereCreatedSuccessfully": "Super!\n\nYour safe and your first portfolio have been created with great success.\n\nCongratulations!",
+ "yourChestAndWalletWereRestoredSuccessfully": "Super!\n\nYour safe and your portfolios have been restored with great success.\n\nCongratulations!",
"allGood": "That's all good!",
"areYouSureToForgetSafe": "Are you sure you want to forget the safe \"{}\"?",
"areYouSureForgetAllChests": "Are you sure you want to forget all your safes?",
diff --git a/assets/translations/es.json b/assets/translations/es.json
index 4c748ca..f8305dd 100644
--- a/assets/translations/es.json
+++ b/assets/translations/es.json
@@ -68,6 +68,7 @@
"iNotedMyPassword": "He anotado mi contraseña",
"GeckoWillCheckPassword": "Ğecko comprobará contigo si has recordado tu contraseña. Escribe tu contraseña en el cuadro de abajo para comprobar que lo has apuntado correctamente.",
"yourChestAndWalletWereCreatedSuccessfully": "¡Genial!\n\nTu cofre y tu primer monedero han sido creados con éxito.\n\n¡Felicidades!",
+ "yourChestAndWalletWereRestoredSuccessfully": "¡Genial!\n\nTu cofre y tus monederos han sido restaurados con éxito.\n\n¡Felicidades!",
"allGood": "¡Todo bien!",
"areYouSureToForgetSafe": "¿Seguro de que quieres olvidar el cofre \"{}\"?",
"areYouSureForgetAllChests": "¿Seguro de que quieres olvidar todos tus cofres?",
diff --git a/assets/translations/fr.json b/assets/translations/fr.json
index 0e460a1..dbb574b 100644
--- a/assets/translations/fr.json
+++ b/assets/translations/fr.json
@@ -68,6 +68,7 @@
"iNotedMyPassword": "J'ai noté mon code secret",
"geckoWillCheckPassword": "Gecko va vérifier avec vous si vous avez bien mémorisé votre code secret.\n\nTapez votre code secret dans le champ ci-dessous pour vérifier que vous l’avez bien noté.",
"yourChestAndWalletWereCreatedSuccessfully": "Top !\n\nVotre coffre et votre premier portefeuille ont été créés avec un immense succès.\n\nFélicitations !",
+ "yourChestAndWalletWereRestoredSuccessfully": "Top !\n\nVotre coffre et vos portefeuilles ont été restaurés avec succès.\n\nFélicitations !",
"allGood": "C’est tout bon !",
"areYouSureToForgetSafe": "Êtes-vous sûr de vouloir oublier le coffre \"{}\" ?",
"areYouSureForgetAllChests": "Êtes-vous sûr de vouloir oublier tous vos coffres ?",
diff --git a/assets/translations/it.json b/assets/translations/it.json
index d55018f..ef25e2f 100644
--- a/assets/translations/it.json
+++ b/assets/translations/it.json
@@ -67,6 +67,7 @@
"iNotedMyPassword": "Ho annotato la password",
"GeckoWillCheckPassword": "Ğecko controllará insieme a te se ti ricordi la password. Scrivi la password per controllare che l'hai appuntata correttamente.",
"yourChestAndWalletWereCreatedSuccessfully": "Fantastico!\n\nIl tuo scrigno e il primo portafoglio sono stati creati con successo.\n\nCongratulazioni!",
+ "yourChestAndWalletWereRestoredSuccessfully": "Fantastico!\n\nIl tuo scrigno e i tuoi portafogli sono stati recuperati con successo.\n\nCongratulazioni!",
"allGood": "Tutto bene!",
"areYouSureToForgetSafe": "Sicuro che vuoi eliminare lo scrigno \"{}\"?",
"areYouSureForgetAllChests": "Sicuro che vuoi dimenticare tutti i tuoi scrigni?",
diff --git a/lib/screens/myWallets/restore_chest.dart b/lib/screens/myWallets/restore_chest.dart
index abef035..dbf6268 100644
--- a/lib/screens/myWallets/restore_chest.dart
+++ b/lib/screens/myWallets/restore_chest.dart
@@ -102,7 +102,9 @@ class RestoreChest extends StatelessWidget {
await Navigator.push(
context,
FaderTransition(
- page: skipIntro ? const OnboardingStepNine(scanDerivation: true) : const OnboardingStepSeven(scanDerivation: true),
+ page: skipIntro
+ ? const OnboardingStepNine(scanDerivation: true, fromRestore: true)
+ : const OnboardingStepSeven(scanDerivation: true, fromRestore: true),
isFast: true),
);
} else {
diff --git a/lib/screens/onBoarding/10.dart b/lib/screens/onBoarding/10.dart
index e29be21..58f966e 100644
--- a/lib/screens/onBoarding/10.dart
+++ b/lib/screens/onBoarding/10.dart
@@ -26,13 +26,14 @@ import 'package:provider/provider.dart';
class OnboardingStepTen extends StatefulWidget {
const OnboardingStepTen({
Key? validationKey,
- this.scanDerivation = false,
required this.pinCode,
+ this.scanDerivation = false,
+ this.fromRestore = false,
}) : super(key: validationKey);
final bool scanDerivation;
final String pinCode;
-
+ final bool fromRestore;
@override
State<OnboardingStepTen> createState() => _OnboardingStepTenState();
}
@@ -241,7 +242,7 @@ class _OnboardingStepTenState extends State<OnboardingStepTen> {
Navigator.push(
context,
- FaderTransition(page: const OnboardingStepEleven(), isFast: false),
+ FaderTransition(page: OnboardingStepEleven(fromRestore: widget.fromRestore), isFast: false),
);
} else {
hasError = true;
diff --git a/lib/screens/onBoarding/11_congratulations.dart b/lib/screens/onBoarding/11_congratulations.dart
index 6f01848..d7f99ab 100644
--- a/lib/screens/onBoarding/11_congratulations.dart
+++ b/lib/screens/onBoarding/11_congratulations.dart
@@ -11,7 +11,8 @@ import 'package:gecko/widgets/commons/build_text.dart';
import 'package:gecko/widgets/commons/top_appbar.dart';
class OnboardingStepEleven extends StatelessWidget {
- const OnboardingStepEleven({super.key});
+ const OnboardingStepEleven({super.key, this.fromRestore = false});
+ final bool fromRestore;
@override
Widget build(BuildContext context) {
@@ -32,7 +33,7 @@ class OnboardingStepEleven extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
ScaledSizedBox(height: isTall ? 25 : 5),
- BuildText(text: "yourChestAndWalletWereCreatedSuccessfully".tr()),
+ BuildText(text: fromRestore ? "yourChestAndWalletWereRestoredSuccessfully".tr() : "yourChestAndWalletWereCreatedSuccessfully".tr()),
ScaledSizedBox(height: isTall ? 15 : 5),
Image.asset(
'assets/onBoarding/gecko-clin.gif',
diff --git a/lib/screens/onBoarding/7.dart b/lib/screens/onBoarding/7.dart
index 4d5ac23..cb6bf00 100644
--- a/lib/screens/onBoarding/7.dart
+++ b/lib/screens/onBoarding/7.dart
@@ -9,8 +9,9 @@ import 'package:gecko/widgets/commons/offline_info.dart';
import 'package:gecko/widgets/commons/top_appbar.dart';
class OnboardingStepSeven extends StatelessWidget {
- const OnboardingStepSeven({super.key, this.scanDerivation = false});
+ const OnboardingStepSeven({super.key, this.scanDerivation = false, this.fromRestore = false});
final bool scanDerivation;
+ final bool fromRestore;
@override
Widget build(BuildContext context) {
@@ -24,7 +25,7 @@ class OnboardingStepSeven extends StatelessWidget {
text: 'geckoWillGenerateAPassword'.tr(),
assetName: 'coffre-fort-code-secret-dans-telephone.png',
buttonText: '>',
- nextScreen: OnboardingStepEight(scanDerivation: scanDerivation),
+ nextScreen: OnboardingStepEight(scanDerivation: scanDerivation, fromRestore: fromRestore),
pagePosition: 6,
boxHeight: 320),
),
diff --git a/lib/screens/onBoarding/8.dart b/lib/screens/onBoarding/8.dart
index 6816489..e6084d4 100644
--- a/lib/screens/onBoarding/8.dart
+++ b/lib/screens/onBoarding/8.dart
@@ -9,8 +9,9 @@ import 'package:gecko/widgets/commons/offline_info.dart';
import 'package:gecko/widgets/commons/top_appbar.dart';
class OnboardingStepEight extends StatelessWidget {
- const OnboardingStepEight({super.key, this.scanDerivation = false});
+ const OnboardingStepEight({super.key, this.scanDerivation = false, this.fromRestore = false});
final bool scanDerivation;
+ final bool fromRestore;
@override
Widget build(BuildContext context) {
@@ -24,7 +25,7 @@ class OnboardingStepEight extends StatelessWidget {
text: 'thisPasswordProtectsYourWalletsInASecureChest'.tr(),
assetName: 'coffre-fort-protege-les-portefeuilles.png',
buttonText: '>',
- nextScreen: OnboardingStepNine(scanDerivation: scanDerivation),
+ nextScreen: OnboardingStepNine(scanDerivation: scanDerivation, fromRestore: fromRestore),
pagePosition: 7,
isMd: true,
boxHeight: 320),
diff --git a/lib/screens/onBoarding/9.dart b/lib/screens/onBoarding/9.dart
index 1303649..ef400b6 100644
--- a/lib/screens/onBoarding/9.dart
+++ b/lib/screens/onBoarding/9.dart
@@ -16,8 +16,9 @@ import 'package:gecko/widgets/commons/top_appbar.dart';
import 'package:pin_code_fields/pin_code_fields.dart';
class OnboardingStepNine extends StatefulWidget {
- const OnboardingStepNine({super.key, this.scanDerivation = false});
+ const OnboardingStepNine({super.key, this.scanDerivation = false, this.fromRestore = false});
final bool scanDerivation;
+ final bool fromRestore;
@override
State<OnboardingStepNine> createState() => _OnboardingStepNineState();
@@ -122,7 +123,8 @@ class _OnboardingStepNineState extends State<OnboardingStepNine> {
if (isPinComplex(pin)) {
Navigator.push(
context,
- FaderTransition(page: OnboardingStepTen(scanDerivation: widget.scanDerivation, pinCode: enterPin.text), isFast: false),
+ FaderTransition(
+ page: OnboardingStepTen(scanDerivation: widget.scanDerivation, pinCode: enterPin.text, fromRestore: widget.fromRestore), isFast: false),
);
} else {
hasError = true;
--
GitLab