From 8b2e6ad50894a04a6b8f2990256a538e1de8250e Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Thu, 15 Jan 2026 09:07:40 -0600
Subject: [PATCH 1/2] fix restore height display bug

---
 .../edit_refresh_height_view.dart                         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/edit_refresh_height_view.dart b/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/edit_refresh_height_view.dart
index b83be7e09..05d51ac80 100644
--- a/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/edit_refresh_height_view.dart
+++ b/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/edit_refresh_height_view.dart
@@ -110,7 +110,13 @@ class _EditRefreshHeightViewState extends ConsumerState<EditRefreshHeightView> {
           .restoreHeight
           .toString();
     } else if (wallet is CryptonoteWallet && wallet.wallet != null) {
-      _controller.text = wallet.getRefreshFromBlockHeight().toString();
+      wallet.getRefreshFromBlockHeight().then((height) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          if (mounted) {
+            _controller.text = height.toString();
+          }
+        });
+      });
     } else {
       _controller.text = ref
           .read(pWalletInfo(widget.walletId))

From 0920b726e7aab5df0985f8ac439e7d920431cff5 Mon Sep 17 00:00:00 2001
From: julian <julian@cypherstack.com>
Date: Thu, 15 Jan 2026 09:21:05 -0600
Subject: [PATCH 2/2] fix non firo view only new wallet creation bug

---
 .../new_wallet_options/new_wallet_options_view.dart            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/pages/add_wallet_views/new_wallet_options/new_wallet_options_view.dart b/lib/pages/add_wallet_views/new_wallet_options/new_wallet_options_view.dart
index 1e7e9b99c..e3a874a45 100644
--- a/lib/pages/add_wallet_views/new_wallet_options/new_wallet_options_view.dart
+++ b/lib/pages/add_wallet_views/new_wallet_options/new_wallet_options_view.dart
@@ -421,7 +421,8 @@ class _NewWalletOptionsViewState extends ConsumerState<NewWalletOptionsView> {
                         .state,
                     mnemonicPassphrase: passwordController.text,
                     convertToViewOnly: _convertToViewOnly,
-                    convertToViewOnlySpark: _convertToViewOnly && _firoFlag,
+                    convertToViewOnlySpark:
+                        widget.coin is Firo && _convertToViewOnly && _firoFlag,
                   );
                 } else {
                   ref.read(pNewWalletOptions.notifier).state = null;