Skip to content

Commit 9843c3c

Browse files
authored
feat: handle label restore field from cupcake (#2551)
1 parent 2a0bbe0 commit 9843c3c

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

lib/src/screens/restore/wallet_restore_from_keys_form.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ class WalletRestoreFromKeysFormState extends State<WalletRestoreFromKeysForm> {
4444
{required bool displayWalletPassword, RestoredWallet? restoredWallet})
4545
: formKey = GlobalKey<FormState>(),
4646
blockchainHeightKey = GlobalKey<BlockchainHeightState>(),
47-
nameController = TextEditingController(),
47+
nameController = restoredWallet != null
48+
? TextEditingController(text: restoredWallet.name)
49+
: TextEditingController(),
4850
addressController = restoredWallet != null
4951
? TextEditingController(text: restoredWallet.address)
5052
: TextEditingController(),
@@ -57,7 +59,9 @@ class WalletRestoreFromKeysFormState extends State<WalletRestoreFromKeysForm> {
5759
privateKeyController = restoredWallet != null
5860
? TextEditingController(text: restoredWallet.privateKey)
5961
: TextEditingController(),
60-
nameTextEditingController = TextEditingController(),
62+
nameTextEditingController = restoredWallet != null
63+
? TextEditingController(text: restoredWallet.name)
64+
: TextEditingController(),
6165
passwordTextEditingController = displayWalletPassword ? TextEditingController() : null,
6266
repeatedPasswordTextEditingController =
6367
displayWalletPassword ? TextEditingController() : null;

lib/view_model/restore/restore_wallet.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ class RestoredWallet {
99
{required this.restoreMode,
1010
required this.type,
1111
required this.address,
12+
this.name,
1213
this.txId,
1314
this.spendKey,
1415
this.viewKey,
@@ -22,6 +23,7 @@ class RestoredWallet {
2223

2324
final WalletRestoreMode restoreMode;
2425
final WalletType type;
26+
final String? name;
2527
final String? address;
2628
final String? txId;
2729
final String? spendKey;
@@ -41,6 +43,7 @@ class RestoredWallet {
4143
json['address'] = codeParsed["primaryAddress"];
4244
json['view_key'] = codeParsed["privateViewKey"];
4345
json['height'] = codeParsed["restoreHeight"].toString();
46+
json['label'] = codeParsed["label"];
4447
}
4548
} catch (e) {
4649
// fine, we don't care, it is only for monero anyway
@@ -51,6 +54,7 @@ class RestoredWallet {
5154
json['view_key'] ??= json['xpub'];
5255
final height = json['height'] as String?;
5356
return RestoredWallet(
57+
name: json['label'] as String?,
5458
restoreMode: json['mode'] as WalletRestoreMode,
5559
type: json['type'] as WalletType,
5660
address: json['address'] as String?,

0 commit comments

Comments
 (0)