Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-01-09 12:29:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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.

Browse source
This commit is contained in:
M 2020-10-26 11:38:01 +02:00
parent 082a5f0b6c
commit e2c6cb6f4b
4 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/generated/i18n.dart
View file

@ -97,7 +97,7 @@ class S implements WidgetsLocalizations {
String get faq => "FAQ"; String get faq => "FAQ";
String get fetching => "Fetching"; String get fetching => "Fetching";
String get filters => "Filter"; String get filters => "Filter";
String get first_wallet_text => "Awesome wallet for Monero and Bitcoin"; String get first_wallet_text => "Awesome wallet for Monero";
String get full_balance => "Full Balance"; String get full_balance => "Full Balance";
String get hidden_balance => "Hidden Balance"; String get hidden_balance => "Hidden Balance";
String get id => "ID: "; String get id => "ID: ";

4
lib/router.dart
View file

@ -137,8 +137,8 @@ Route<dynamic> createRoute(RouteSettings settings) {
case Routes.restoreWalletOptionsFromWelcome: case Routes.restoreWalletOptionsFromWelcome:
return CupertinoPageRoute<void>( return CupertinoPageRoute<void>(
builder: (_) => getIt.get<SetupPinCodePage>( builder: (_) => getIt.get<SetupPinCodePage>(
param1: (BuildContext context, dynamic _) => param1: (PinCodeState<PinCodeWidget> context, dynamic _) =>
Navigator.pushNamed(context, Routes.restoreWallet)), Navigator.pushNamed(context.context, Routes.restoreWallet)),
fullscreenDialog: true); fullscreenDialog: true);
case Routes.seed: case Routes.seed:

5
lib/src/screens/restore/wallet_restore_page.dart
View file

@ -47,9 +47,6 @@ class WalletRestorePage extends BasePage {
Theme.of(context).primaryTextTheme.title.color), Theme.of(context).primaryTextTheme.title.color),
)); ));
@override
String get title => S.current.restore_title_from_seed;
final WalletRestoreViewModel walletRestoreViewModel; final WalletRestoreViewModel walletRestoreViewModel;
final PageController _controller; final PageController _controller;
final List<Widget> _pages; final List<Widget> _pages;
@ -105,7 +102,7 @@ class WalletRestorePage extends BasePage {
return LoadingPrimaryButton( return LoadingPrimaryButton(
onPressed: () => onPressed: () =>
walletRestoreViewModel.create(options: _credentials()), walletRestoreViewModel.create(options: _credentials()),
text: S.of(context).seed_language_next, text: S.of(context).restore_recover,
color: Colors.green, color: Colors.green,
textColor: Colors.white, textColor: Colors.white,
isLoading: walletRestoreViewModel.state is IsExecutingState); isLoading: walletRestoreViewModel.state is IsExecutingState);

2
res/values/strings_en.arb
View file

@ -1,7 +1,7 @@
{ {
"welcome" : "Welcome to", "welcome" : "Welcome to",
"cake_wallet" : "Cake Wallet", "cake_wallet" : "Cake Wallet",
"first_wallet_text" : "Awesome wallet for Monero and Bitcoin", "first_wallet_text" : "Awesome wallet for Monero",
"please_make_selection" : "Please make selection below to create or recover your wallet.", "please_make_selection" : "Please make selection below to create or recover your wallet.",
"create_new" : "Create New Wallet", "create_new" : "Create New Wallet",
"restore_wallet" : "Restore Wallet", "restore_wallet" : "Restore Wallet",