github-such-software/hash-wallet
1
0
Fork 1
mirror of https://github.com/Such-Software/hash-wallet.git synced 2026-10-22 06:28:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into CWA-147-password-rename

Browse Source
This commit is contained in:
M
2020-01-10 11:21:10 +02:00
parent 7ee8842b97 96f1c3d325
commit f318b51060
8 changed files with 158 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/generated/i18n.dart
+1 -1
View File
@@ -5349,7 +5349,7 @@ class $zh extends S {
@override
String get trade_state_timeout => "超时";
@override
String get nodes => "节点数";
String get nodes => "节点";
@override
String get seed_share => "分享种子";
@override
lib/src/screens/restore/restore_wallet_from_seed_page.dart
+6
View File
@@ -62,10 +62,16 @@ class _RestoreFromSeedFormState extends State<RestoreFromSeedForm> {
alignment: Alignment.bottomCenter,
child: PrimaryButton(
onPressed: () {
walletRestorationStore.validateSeed(_seedKey.currentState.items);
_seedKey.currentState.setErrorMessage(walletRestorationStore.errorMessage);
if (!walletRestorationStore.isValid) {
_seedKey.currentState.invalidate();
return;
}
_seedKey.currentState.validated();
Navigator.of(context).pushNamed(
Routes.restoreWalletFromSeedDetails,
arguments: _seedKey.currentState.items);
lib/src/stores/node_list/node_list_store.dart
+1 -1
View File
@@ -72,7 +72,7 @@ abstract class NodeListBase with Store {
void validateNodeAddress(String value) {
const pattern =
'^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\$';
'^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\$|^[0-9a-zA-Z.]+\$';
final regExp = RegExp(pattern);
isValid = regExp.hasMatch(value);
errorMessage = isValid ? null : S.current.error_text_node_address;
lib/src/stores/wallet_restoration/wallet_restoration_store.dart
+1 -2
View File
@@ -76,13 +76,12 @@ abstract class WalleRestorationStoreBase with Store {
@action
void setSeed(List<MnemoticItem> seed) {
this.seed = seed;
validateSeed(seed);
}
@action
void validateSeed(List<MnemoticItem> seed) {
final _seed = seed != null ? seed : this.seed;
bool isValid = _seed.length == 25;
bool isValid = _seed != null ? _seed.length == 25 : false;
if (!isValid) {
errorMessage = S.current.wallet_restoration_store_incorrect_seed_length;