From 43808992ec852b28969d6f45d11a8259c0d26fe2 Mon Sep 17 00:00:00 2001
From: Konstantin Ullrich <konstantinullrich12@gmail.com>
Date: Wed, 21 May 2025 00:24:30 +0200
Subject: [PATCH] misc-seed-page-fixes (#2280)

* feat: Trim pasted seed

* fix: Fix Seed Type selection
---
 .../wallet_restore_from_seed_form.dart        | 35 +++++++++++++------
 lib/src/widgets/seed_widget.dart              |  6 ++--
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/lib/src/screens/restore/wallet_restore_from_seed_form.dart b/lib/src/screens/restore/wallet_restore_from_seed_form.dart
index 431574b38..deffa0748 100644
--- a/lib/src/screens/restore/wallet_restore_from_seed_form.dart
+++ b/lib/src/screens/restore/wallet_restore_from_seed_form.dart
@@ -82,8 +82,11 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
 
   @override
   void initState() {
-    // _setSeedType(widget.seedTypeViewModel.moneroSeedType);
-    _setSeedType(MoneroSeedType.defaultSeedType);
+    if (widget.type == WalletType.monero) {
+      _setSeedType(widget.seedSettingsViewModel.moneroSeedType);
+    } else {
+      _setSeedType(MoneroSeedType.defaultSeedType);
+    }
     _setLanguageLabel(language);
 
     if (passwordTextEditingController != null) {
@@ -118,7 +121,8 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
     }
 
     if (repeatedPasswordListener != null) {
-      repeatedPasswordTextEditingController?.removeListener(repeatedPasswordListener!);
+      repeatedPasswordTextEditingController
+          ?.removeListener(repeatedPasswordListener!);
     }
 
     super.dispose();
@@ -158,11 +162,13 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
                 alignment: Alignment.centerRight,
                 children: [
                   BaseTextFormField(
-                    key: ValueKey('wallet_restore_from_seed_wallet_name_textfield_key'),
+                    key: ValueKey(
+                        'wallet_restore_from_seed_wallet_name_textfield_key'),
                     controller: nameTextEditingController,
                     hintText: S.of(context).wallet_name,
                     suffixIcon: IconButton(
-                      key: ValueKey('wallet_restore_from_seed_wallet_name_refresh_button_key'),
+                      key: ValueKey(
+                          'wallet_restore_from_seed_wallet_name_refresh_button_key'),
                       onPressed: () async {
                         final rName = await generateName();
                         FocusManager.instance.primaryFocus?.unfocus();
@@ -202,12 +208,15 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
             language: language,
             type: widget.type,
             onSeedChange: onSeedChange,
-            seedTextFieldKey: ValueKey('wallet_restore_from_seed_wallet_seeds_textfield_key'),
-            pasteButtonKey: ValueKey('wallet_restore_from_seed_wallet_seeds_paste_button_key'),
+            seedTextFieldKey:
+                ValueKey('wallet_restore_from_seed_wallet_seeds_textfield_key'),
+            pasteButtonKey: ValueKey(
+                'wallet_restore_from_seed_wallet_seeds_paste_button_key'),
           ),
           if ([WalletType.monero, WalletType.wownero].contains(widget.type))
             GestureDetector(
-              key: ValueKey('wallet_restore_from_seed_seedtype_picker_button_key'),
+              key: ValueKey(
+                  'wallet_restore_from_seed_seedtype_picker_button_key'),
               onTap: () async {
                 await showPopUp<void>(
                     context: context,
@@ -215,7 +224,9 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
                           items: _getItems(),
                           selectedAtIndex: isPolyseed
                               ? 1
-                              : (seedTypeController.value.text.contains("14") && widget.type == WalletType.wownero) || isBip39
+                              : (seedTypeController.value.text.contains("14") &&
+                                          widget.type == WalletType.wownero) ||
+                                      isBip39
                                   ? 2
                                   : 0,
                           mainAxisAlignment: MainAxisAlignment.start,
@@ -249,7 +260,8 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
                 obscureText: true)
           ],
           if (widget.displayLanguageSelector)
-            if (!seedTypeController.value.text.contains("14") && widget.displayLanguageSelector)
+            if (!seedTypeController.value.text.contains("14") &&
+                widget.displayLanguageSelector)
               GestureDetector(
                 onTap: () async {
                   await showPopUp<void>(
@@ -279,7 +291,8 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
             BlockchainHeightWidget(
               focusNode: widget.blockHeightFocusNode,
               key: blockchainHeightKey,
-              blockHeightTextFieldKey: ValueKey('wallet_restore_from_seed_blockheight_textfield_key'),
+              blockHeightTextFieldKey: ValueKey(
+                  'wallet_restore_from_seed_blockheight_textfield_key'),
               onHeightOrDateEntered: widget.onHeightOrDateEntered,
               hasDatePicker:
                   [WalletType.monero, WalletType.wownero].contains(widget.type),
diff --git a/lib/src/widgets/seed_widget.dart b/lib/src/widgets/seed_widget.dart
index 9b3726afb..5a43a6808 100644
--- a/lib/src/widgets/seed_widget.dart
+++ b/lib/src/widgets/seed_widget.dart
@@ -146,12 +146,12 @@ class SeedWidgetState extends State<SeedWidget> {
   }
 
   Future<void> _pasteText() async {
-    final value = await Clipboard.getData('text/plain');
+    final value = (await Clipboard.getData('text/plain'))?.text?.trim();
 
-    if (value?.text?.isNotEmpty ?? false) {
+    if (value?.isNotEmpty ?? false) {
       setState(() {
         _showPlaceholder = false;
-        controller.text = value!.text!;
+        controller.text = value!;
       });
     }
   }