mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2024-12-23 12:09:43 +00:00
some fixes after merge
This commit is contained in:
parent
26e3a6caa8
commit
ce952294af
6 changed files with 6 additions and 18 deletions
|
@ -11,7 +11,7 @@ class AddressValidator extends TextValidator {
|
||||||
: super(
|
: super(
|
||||||
errorMessage: S.current.error_text_address,
|
errorMessage: S.current.error_text_address,
|
||||||
useAdditionalValidation: type == CryptoCurrency.btc
|
useAdditionalValidation: type == CryptoCurrency.btc
|
||||||
? bitcoin.Address.validateAddress
|
? (String txt) => validateAddress(address: txt, network: BitcoinNetwork.mainnet)
|
||||||
: type == CryptoCurrency.zano
|
: type == CryptoCurrency.zano
|
||||||
? ZanoUtils.validateAddress
|
? ZanoUtils.validateAddress
|
||||||
: null,
|
: null,
|
||||||
|
|
|
@ -31,8 +31,6 @@ class SeedValidator extends Validator<MnemonicItem> {
|
||||||
return monero!.getMoneroWordList(language);
|
return monero!.getMoneroWordList(language);
|
||||||
case WalletType.haven:
|
case WalletType.haven:
|
||||||
return haven!.getMoneroWordList(language);
|
return haven!.getMoneroWordList(language);
|
||||||
case WalletType.zano:
|
|
||||||
return zano!.getWordList(language);
|
|
||||||
case WalletType.ethereum:
|
case WalletType.ethereum:
|
||||||
return ethereum!.getEthereumWordList(language);
|
return ethereum!.getEthereumWordList(language);
|
||||||
case WalletType.bitcoinCash:
|
case WalletType.bitcoinCash:
|
||||||
|
@ -44,6 +42,8 @@ class SeedValidator extends Validator<MnemonicItem> {
|
||||||
return polygon!.getPolygonWordList(language);
|
return polygon!.getPolygonWordList(language);
|
||||||
case WalletType.solana:
|
case WalletType.solana:
|
||||||
return solana!.getSolanaWordList(language);
|
return solana!.getSolanaWordList(language);
|
||||||
|
case WalletType.zano:
|
||||||
|
return zano!.getWordList(language);
|
||||||
default:
|
default:
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
|
@ -795,9 +795,6 @@ Future<void> setup({
|
||||||
|
|
||||||
getIt.registerFactory(() => ConnectionSyncPage(getIt.get<DashboardViewModel>()));
|
getIt.registerFactory(() => ConnectionSyncPage(getIt.get<DashboardViewModel>()));
|
||||||
|
|
||||||
getIt.registerFactory(
|
|
||||||
() => ConnectionSyncPage(getIt.get<DashboardViewModel>()));
|
|
||||||
|
|
||||||
getIt.registerFactory(() => SecurityBackupPage(
|
getIt.registerFactory(() => SecurityBackupPage(
|
||||||
getIt.get<SecuritySettingsViewModel>(), getIt.get<AuthService>()));
|
getIt.get<SecuritySettingsViewModel>(), getIt.get<AuthService>()));
|
||||||
|
|
||||||
|
|
|
@ -388,18 +388,6 @@ Node? getZanoDefaultNode({required Box<Node> nodes}) {
|
||||||
?? nodes.values.firstWhereOrNull((node) => node.type == WalletType.zano);
|
?? nodes.values.firstWhereOrNull((node) => node.type == WalletType.zano);
|
||||||
}
|
}
|
||||||
|
|
||||||
Node? getZanoDefaultNode({required Box<Node> nodes}) {
|
|
||||||
return nodes.values.firstWhereOrNull(
|
|
||||||
(Node node) => node.uriRaw == zanoDefaultNodeUri)
|
|
||||||
?? nodes.values.firstWhereOrNull((node) => node.type == WalletType.zano);
|
|
||||||
}
|
|
||||||
|
|
||||||
Node? getZanoDefaultNode({required Box<Node> nodes}) {
|
|
||||||
return nodes.values.firstWhereOrNull(
|
|
||||||
(Node node) => node.uriRaw == zanoDefaultNodeUri)
|
|
||||||
?? nodes.values.firstWhereOrNull((node) => node.type == WalletType.zano);
|
|
||||||
}
|
|
||||||
|
|
||||||
Node getMoneroDefaultNode({required Box<Node> nodes}) {
|
Node getMoneroDefaultNode({required Box<Node> nodes}) {
|
||||||
final timeZone = DateTime.now().timeZoneOffset.inHours;
|
final timeZone = DateTime.now().timeZoneOffset.inHours;
|
||||||
var nodeUri = '';
|
var nodeUri = '';
|
||||||
|
|
|
@ -71,6 +71,7 @@ class ProvidersHelper {
|
||||||
return [ProviderType.askEachTime, ProviderType.onramper, ProviderType.robinhood];
|
return [ProviderType.askEachTime, ProviderType.onramper, ProviderType.robinhood];
|
||||||
case WalletType.none:
|
case WalletType.none:
|
||||||
case WalletType.haven:
|
case WalletType.haven:
|
||||||
|
case WalletType.zano:
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -102,6 +103,7 @@ class ProvidersHelper {
|
||||||
case WalletType.banano:
|
case WalletType.banano:
|
||||||
case WalletType.none:
|
case WalletType.none:
|
||||||
case WalletType.haven:
|
case WalletType.haven:
|
||||||
|
case WalletType.zano:
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,6 +43,7 @@ abstract class AdvancedPrivacySettingsViewModelBase with Store {
|
||||||
case WalletType.haven:
|
case WalletType.haven:
|
||||||
case WalletType.nano:
|
case WalletType.nano:
|
||||||
case WalletType.banano:
|
case WalletType.banano:
|
||||||
|
case WalletType.zano:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue