Fixed loading of setup pin screen from welcome screen for restore case. Renamed 'Next' to 'Restore' for confirm button on restore wallet screen. Removed 'Bitcoin' from welcome screen.
M committed
Oct 26, 2020 at 11:38 UTC
e2c6cb6f4b7e2f1ab063c4bd6e741b8cae9151e6
4 files changed
+5
-8
lib/generated/i18n.dart
+1
-1
@@ -97,7 +97,7 @@ class S implements WidgetsLocalizations {
97
String get faq => "FAQ";
98
String get fetching => "Fetching";
99
String get filters => "Filter";
100
- String get first_wallet_text => "Awesome wallet for Monero and Bitcoin";
100
+ String get first_wallet_text => "Awesome wallet for Monero";
101
String get full_balance => "Full Balance";
102
String get hidden_balance => "Hidden Balance";
103
String get id => "ID: ";
lib/router.dart
+2
-2
@@ -137,8 +137,8 @@ Route<dynamic> createRoute(RouteSettings settings) {
137
case Routes.restoreWalletOptionsFromWelcome:
138
return CupertinoPageRoute<void>(
139
builder: (_) => getIt.get<SetupPinCodePage>(
140
- param1: (BuildContext context, dynamic _) =>
141
- Navigator.pushNamed(context, Routes.restoreWallet)),
140
+ param1: (PinCodeState<PinCodeWidget> context, dynamic _) =>
141
+ Navigator.pushNamed(context.context, Routes.restoreWallet)),
142
fullscreenDialog: true);
143
144
case Routes.seed:
lib/src/screens/restore/wallet_restore_page.dart
+1
-4
@@ -47,9 +47,6 @@ class WalletRestorePage extends BasePage {
47
Theme.of(context).primaryTextTheme.title.color),
48
));
49
50
- @override
51
- String get title => S.current.restore_title_from_seed;
52
-
50
final WalletRestoreViewModel walletRestoreViewModel;
51
final PageController _controller;
52
final List<Widget> _pages;
@@ -105,7 +102,7 @@ class WalletRestorePage extends BasePage {
102
return LoadingPrimaryButton(
103
onPressed: () =>
104
walletRestoreViewModel.create(options: _credentials()),
108
- text: S.of(context).seed_language_next,
105
+ text: S.of(context).restore_recover,
106
color: Colors.green,
107
textColor: Colors.white,
108
isLoading: walletRestoreViewModel.state is IsExecutingState);
res/values/strings_en.arb
+1
-1
@@ -1,7 +1,7 @@
1
{
2
"welcome" : "Welcome to",
3
"cake_wallet" : "Cake Wallet",
4
- "first_wallet_text" : "Awesome wallet for Monero and Bitcoin",
4
+ "first_wallet_text" : "Awesome wallet for Monero",
5
"please_make_selection" : "Please make selection below to create or recover your wallet.",
6
"create_new" : "Create New Wallet",
7
"restore_wallet" : "Restore Wallet",