diff --git a/lib/src/screens/restore/wallet_restore_from_keys_form.dart b/lib/src/screens/restore/wallet_restore_from_keys_form.dart index 5713ad7d0..8ab0f021c 100644 --- a/lib/src/screens/restore/wallet_restore_from_keys_form.dart +++ b/lib/src/screens/restore/wallet_restore_from_keys_form.dart @@ -44,7 +44,9 @@ class WalletRestoreFromKeysFormState extends State { {required bool displayWalletPassword, RestoredWallet? restoredWallet}) : formKey = GlobalKey(), blockchainHeightKey = GlobalKey(), - nameController = TextEditingController(), + nameController = restoredWallet != null + ? TextEditingController(text: restoredWallet.name) + : TextEditingController(), addressController = restoredWallet != null ? TextEditingController(text: restoredWallet.address) : TextEditingController(), @@ -57,7 +59,9 @@ class WalletRestoreFromKeysFormState extends State { privateKeyController = restoredWallet != null ? TextEditingController(text: restoredWallet.privateKey) : TextEditingController(), - nameTextEditingController = TextEditingController(), + nameTextEditingController = restoredWallet != null + ? TextEditingController(text: restoredWallet.name) + : TextEditingController(), passwordTextEditingController = displayWalletPassword ? TextEditingController() : null, repeatedPasswordTextEditingController = displayWalletPassword ? TextEditingController() : null; diff --git a/lib/view_model/restore/restore_wallet.dart b/lib/view_model/restore/restore_wallet.dart index 1ca8dd0cf..d84a96d5b 100644 --- a/lib/view_model/restore/restore_wallet.dart +++ b/lib/view_model/restore/restore_wallet.dart @@ -9,6 +9,7 @@ class RestoredWallet { {required this.restoreMode, required this.type, required this.address, + this.name, this.txId, this.spendKey, this.viewKey, @@ -22,6 +23,7 @@ class RestoredWallet { final WalletRestoreMode restoreMode; final WalletType type; + final String? name; final String? address; final String? txId; final String? spendKey; @@ -41,6 +43,7 @@ class RestoredWallet { json['address'] = codeParsed["primaryAddress"]; json['view_key'] = codeParsed["privateViewKey"]; json['height'] = codeParsed["restoreHeight"].toString(); + json['label'] = codeParsed["label"]; } } catch (e) { // fine, we don't care, it is only for monero anyway @@ -51,6 +54,7 @@ class RestoredWallet { json['view_key'] ??= json['xpub']; final height = json['height'] as String?; return RestoredWallet( + name: json['label'] as String?, restoreMode: json['mode'] as WalletRestoreMode, type: json['type'] as WalletType, address: json['address'] as String?,