mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-10-21 06:18:42 +02:00
Remove words length from pre-seed warning (#2208)
* Remove words length from pre-seed warning * Adjust backup to default node selection if null Gracefully handle Decred failure Minor fixes
This commit is contained in:
+1
-3
@@ -15,7 +15,6 @@ import 'package:cake_wallet/core/backup_service_v3.dart';
|
||||
import 'package:cake_wallet/core/new_wallet_arguments.dart';
|
||||
import 'package:cake_wallet/buy/robinhood/robinhood_buy_provider.dart';
|
||||
import 'package:cake_wallet/core/auth_service.dart';
|
||||
import 'package:cake_wallet/core/backup_service.dart';
|
||||
import 'package:cake_wallet/core/key_service.dart';
|
||||
import 'package:cake_wallet/core/new_wallet_type_arguments.dart';
|
||||
import 'package:cake_wallet/core/secure_storage.dart';
|
||||
@@ -1203,8 +1202,7 @@ Future<void> setup({
|
||||
);
|
||||
});
|
||||
|
||||
getIt.registerFactoryParam<PreSeedPage, int, void>(
|
||||
(seedPhraseLength, _) => PreSeedPage(seedPhraseLength));
|
||||
getIt.registerFactory<PreSeedPage>(() => PreSeedPage());
|
||||
|
||||
getIt.registerFactoryParam<TransactionSuccessPage, String, void>(
|
||||
(content, _) => TransactionSuccessPage(content: content));
|
||||
|
||||
+2
-7
@@ -9,7 +9,6 @@ import 'package:cake_wallet/di.dart';
|
||||
import 'package:cake_wallet/entities/contact_record.dart';
|
||||
import 'package:cake_wallet/entities/qr_view_data.dart';
|
||||
import 'package:cake_wallet/entities/wallet_edit_page_arguments.dart';
|
||||
import 'package:cake_wallet/entities/wallet_nft_response.dart';
|
||||
import 'package:cake_wallet/exchange/trade.dart';
|
||||
import 'package:cake_wallet/generated/i18n.dart';
|
||||
import 'package:cake_wallet/routes.dart';
|
||||
@@ -140,7 +139,6 @@ import 'package:cw_core/wallet_type.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:cake_wallet/src/screens/cake_pay/cake_pay.dart';
|
||||
import 'src/screens/buy/buy_sell_page.dart';
|
||||
import 'src/screens/dashboard/pages/nft_import_page.dart';
|
||||
|
||||
@@ -603,13 +601,10 @@ Route<dynamic> createRoute(RouteSettings settings) {
|
||||
return MaterialPageRoute<void>(builder: (_) => getIt.get<FaqPage>());
|
||||
|
||||
case Routes.preSeedPage:
|
||||
return MaterialPageRoute<void>(
|
||||
builder: (_) => getIt.get<PreSeedPage>(param1: settings.arguments as int));
|
||||
return MaterialPageRoute<void>(builder: (_) => getIt.get<PreSeedPage>());
|
||||
|
||||
case Routes.walletGroupExistingSeedDescriptionPage:
|
||||
return MaterialPageRoute<void>(
|
||||
builder: (_) => WalletGroupExistingSeedDescriptionPage(
|
||||
seedPhraseWordsLength: settings.arguments as int));
|
||||
return MaterialPageRoute<void>(builder: (_) => WalletGroupExistingSeedDescriptionPage());
|
||||
|
||||
case Routes.transactionSuccessPage:
|
||||
return MaterialPageRoute<void>(
|
||||
|
||||
@@ -104,11 +104,9 @@ class _WalletNameFormState extends State<WalletNameForm> {
|
||||
if (state is ExecutedSuccessfullyState) {
|
||||
if (widget.isChildWallet) {
|
||||
Navigator.of(navigatorKey.currentContext ?? context).pushNamed(
|
||||
Routes.walletGroupExistingSeedDescriptionPage,
|
||||
arguments: _walletNewVM.seedPhraseWordsLength);
|
||||
Routes.walletGroupExistingSeedDescriptionPage);
|
||||
} else {
|
||||
Navigator.of(navigatorKey.currentContext ?? context)
|
||||
.pushNamed(Routes.preSeedPage, arguments: _walletNewVM.seedPhraseWordsLength);
|
||||
Navigator.of(navigatorKey.currentContext ?? context).pushNamed(Routes.preSeedPage);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -9,9 +9,7 @@ import 'package:cake_wallet/themes/theme_base.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class WalletGroupExistingSeedDescriptionPage extends BasePage {
|
||||
WalletGroupExistingSeedDescriptionPage({required this.seedPhraseWordsLength});
|
||||
|
||||
final int seedPhraseWordsLength;
|
||||
WalletGroupExistingSeedDescriptionPage();
|
||||
|
||||
@override
|
||||
String get title => S.current.wallet_group;
|
||||
@@ -69,8 +67,7 @@ class WalletGroupExistingSeedDescriptionPage extends BasePage {
|
||||
child: PrimaryButton(
|
||||
key: ValueKey(
|
||||
'wallet_group_existing_seed_description_page_verify_seed_button_key'),
|
||||
onPressed: () => Navigator.pushNamed(context, Routes.preSeedPage,
|
||||
arguments: seedPhraseWordsLength),
|
||||
onPressed: () => Navigator.pushNamed(context, Routes.preSeedPage),
|
||||
text: S.current.verify_seed,
|
||||
color: Theme.of(context).cardColor,
|
||||
textColor: currentTheme.type == ThemeType.dark
|
||||
|
||||
@@ -4,9 +4,7 @@ import 'package:cake_wallet/src/screens/Info_page.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
|
||||
class PreSeedPage extends InfoPage {
|
||||
PreSeedPage(this.seedPhraseLength);
|
||||
|
||||
final int seedPhraseLength;
|
||||
PreSeedPage();
|
||||
|
||||
@override
|
||||
bool get onWillPop => false;
|
||||
@@ -15,7 +13,7 @@ class PreSeedPage extends InfoPage {
|
||||
String get pageTitle => S.current.pre_seed_title;
|
||||
|
||||
@override
|
||||
String get pageDescription => S.current.pre_seed_description(seedPhraseLength.toString());
|
||||
String get pageDescription => S.current.pre_seed_description;
|
||||
|
||||
@override
|
||||
String get buttonText => S.current.pre_seed_button_text;
|
||||
|
||||
@@ -52,38 +52,6 @@ abstract class WalletNewVMBase extends WalletCreationVM with Store {
|
||||
bool get showLanguageSelector =>
|
||||
newWalletArguments?.mnemonic == null && hasLanguageSelector;
|
||||
|
||||
int get seedPhraseWordsLength {
|
||||
switch (type) {
|
||||
case WalletType.monero:
|
||||
case WalletType.wownero:
|
||||
return advancedPrivacySettingsViewModel.isPolySeed ? 16 : 25;
|
||||
case WalletType.tron:
|
||||
case WalletType.solana:
|
||||
case WalletType.polygon:
|
||||
case WalletType.ethereum:
|
||||
case WalletType.bitcoinCash:
|
||||
return advancedPrivacySettingsViewModel.seedPhraseLength.value;
|
||||
case WalletType.bitcoin:
|
||||
case WalletType.litecoin:
|
||||
return seedSettingsViewModel.bitcoinSeedType == BitcoinSeedType.bip39
|
||||
? advancedPrivacySettingsViewModel.seedPhraseLength.value
|
||||
: 24;
|
||||
case WalletType.nano:
|
||||
case WalletType.banano:
|
||||
return seedSettingsViewModel.nanoSeedType == NanoSeedType.bip39
|
||||
? advancedPrivacySettingsViewModel.seedPhraseLength.value
|
||||
: 24;
|
||||
case WalletType.none:
|
||||
return 24;
|
||||
case WalletType.haven:
|
||||
return 25;
|
||||
case WalletType.zano:
|
||||
return 26;
|
||||
case WalletType.decred:
|
||||
return 15;
|
||||
}
|
||||
}
|
||||
|
||||
bool get hasSeedType =>
|
||||
newWalletArguments?.mnemonic == null &&
|
||||
[WalletType.monero, WalletType.wownero].contains(type);
|
||||
|
||||
Reference in New Issue
Block a user