UI bug fix import wallet

android/app/src/main/java/org/bitcoinppl/cove_core/cove.kt

@@ -1402,8 +1402,6 @@ external fun uniffi_cove_checksum_method_rustwalletmanager_amount_in_fiat(
 ): Short
 external fun uniffi_cove_checksum_method_rustwalletmanager_balance(
 ): Short
-external fun uniffi_cove_checksum_method_rustwalletmanager_balance_in_fiat(
-): Short
 external fun uniffi_cove_checksum_method_rustwalletmanager_broadcast_transaction(
 ): Short
 external fun uniffi_cove_checksum_method_rustwalletmanager_convert_and_display_fiat(
@@ -2338,12 +2336,10 @@ external fun uniffi_cove_fn_constructor_rustwalletmanager_try_new_from_xpub(`xpu
 ): Long
 external fun uniffi_cove_fn_method_rustwalletmanager_address_at(`ptr`: Long,`index`: Int,
 ): Long
-external fun uniffi_cove_fn_method_rustwalletmanager_amount_in_fiat(`ptr`: Long,`amount`: Long,
-): Long
+external fun uniffi_cove_fn_method_rustwalletmanager_amount_in_fiat(`ptr`: Long,`amount`: Long,uniffi_out_err: UniffiRustCallStatus, 
+): RustBuffer.ByValue
 external fun uniffi_cove_fn_method_rustwalletmanager_balance(`ptr`: Long,
 ): Long
-external fun uniffi_cove_fn_method_rustwalletmanager_balance_in_fiat(`ptr`: Long,
-): Long
 external fun uniffi_cove_fn_method_rustwalletmanager_broadcast_transaction(`ptr`: Long,`signedTransaction`: Long,
 ): Long
 external fun uniffi_cove_fn_method_rustwalletmanager_convert_and_display_fiat(`ptr`: Long,`amount`: Long,`prices`: Long,`withSuffix`: Byte,uniffi_out_err: UniffiRustCallStatus, 
@@ -3328,7 +3324,7 @@ private fun uniffiCheckApiChecksums(lib: IntegrityCheckingUniffiLib) {
     if (lib.uniffi_cove_checksum_method_ffiapp_listen_for_updates() != 31459.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
-    if (lib.uniffi_cove_checksum_method_ffiapp_load_and_reset_default_route() != 39591.toShort()) {
+    if (lib.uniffi_cove_checksum_method_ffiapp_load_and_reset_default_route() != 12168.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
     if (lib.uniffi_cove_checksum_method_ffiapp_load_and_reset_default_route_after() != 60004.toShort()) {
@@ -3757,15 +3753,12 @@ private fun uniffiCheckApiChecksums(lib: IntegrityCheckingUniffiLib) {
     if (lib.uniffi_cove_checksum_method_rustwalletmanager_address_at() != 13093.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
-    if (lib.uniffi_cove_checksum_method_rustwalletmanager_amount_in_fiat() != 35706.toShort()) {
+    if (lib.uniffi_cove_checksum_method_rustwalletmanager_amount_in_fiat() != 61774.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
     if (lib.uniffi_cove_checksum_method_rustwalletmanager_balance() != 14970.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
-    if (lib.uniffi_cove_checksum_method_rustwalletmanager_balance_in_fiat() != 19007.toShort()) {
-        throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
-    }
     if (lib.uniffi_cove_checksum_method_rustwalletmanager_broadcast_transaction() != 63043.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
@@ -8917,7 +8910,7 @@ public interface FfiAppInterface {
     fun `listenForUpdates`(`updater`: FfiReconcile)
 
     /**
-     * Load and reset the default route after 800ms delay
+     * Load and reset the default route after default delay
      */
     fun `loadAndResetDefaultRoute`(`route`: Route)
 
@@ -9323,7 +9316,7 @@ open class FfiApp: Disposable, AutoCloseable, FfiAppInterface
 
 
     /**
-     * Load and reset the default route after 800ms delay
+     * Load and reset the default route after default delay
      */override fun `loadAndResetDefaultRoute`(`route`: Route)
         = 
     callWithHandle {
@@ -17894,12 +17887,13 @@ public interface RustWalletManagerInterface {
      */
     suspend fun `addressAt`(`index`: kotlin.UInt): AddressInfo
 
-    suspend fun `amountInFiat`(`amount`: Amount): kotlin.Double
+    /**
+     * Sync method using cached prices, returns None if no cached prices
+     */
+    fun `amountInFiat`(`amount`: Amount): kotlin.Double?
 
     suspend fun `balance`(): Balance
 
-    suspend fun `balanceInFiat`(): kotlin.Double
-
     suspend fun `broadcastTransaction`(`signedTransaction`: BitcoinTransaction)
 
     fun `convertAndDisplayFiat`(`amount`: Amount, `prices`: PriceResponse, `withSuffix`: kotlin.Boolean = true): kotlin.String
@@ -18128,25 +18122,20 @@ open class RustWalletManager: Disposable, AutoCloseable, RustWalletManagerInterf
     }
 
 
-    @Throws(WalletManagerException::class)
-    @Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
-    override suspend fun `amountInFiat`(`amount`: Amount) : kotlin.Double {
-        return uniffiRustCallAsync(
-        callWithHandle { uniffiHandle ->
-            UniffiLib.uniffi_cove_fn_method_rustwalletmanager_amount_in_fiat(
-                uniffiHandle,
-                FfiConverterTypeAmount.lower(`amount`),
-            )
-        },
-        { future, callback, continuation -> UniffiLib.ffi_cove_rust_future_poll_f64(future, callback, continuation) },
-        { future, continuation -> UniffiLib.ffi_cove_rust_future_complete_f64(future, continuation) },
-        { future -> UniffiLib.ffi_cove_rust_future_free_f64(future) },
-        // lift function
-        { FfiConverterDouble.lift(it) },
-        // Error FFI converter
-        WalletManagerException.ErrorHandler,
+    /**
+     * Sync method using cached prices, returns None if no cached prices
+     */override fun `amountInFiat`(`amount`: Amount): kotlin.Double? {
+            return FfiConverterOptionalDouble.lift(
+    callWithHandle {
+    uniffiRustCall() { _status ->
+    UniffiLib.uniffi_cove_fn_method_rustwalletmanager_amount_in_fiat(
+        it,
+        FfiConverterTypeAmount.lower(`amount`),_status)
+}
+    }
     )
     }
+
 
 
     @Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
@@ -18169,27 +18158,6 @@ open class RustWalletManager: Disposable, AutoCloseable, RustWalletManagerInterf
     }
 
 
-    @Throws(WalletManagerException::class)
-    @Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
-    override suspend fun `balanceInFiat`() : kotlin.Double {
-        return uniffiRustCallAsync(
-        callWithHandle { uniffiHandle ->
-            UniffiLib.uniffi_cove_fn_method_rustwalletmanager_balance_in_fiat(
-                uniffiHandle,
-
-            )
-        },
-        { future, callback, continuation -> UniffiLib.ffi_cove_rust_future_poll_f64(future, callback, continuation) },
-        { future, continuation -> UniffiLib.ffi_cove_rust_future_complete_f64(future, continuation) },
-        { future -> UniffiLib.ffi_cove_rust_future_free_f64(future) },
-        // lift function
-        { FfiConverterDouble.lift(it) },
-        // Error FFI converter
-        WalletManagerException.ErrorHandler,
-    )
-    }
-
-
     @Throws(WalletManagerException::class)
     @Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
     override suspend fun `broadcastTransaction`(`signedTransaction`: BitcoinTransaction) {
@@ -42547,6 +42515,38 @@ public object FfiConverterOptionalFloat: FfiConverterRustBuffer<kotlin.Float?> {
 
 
 
+/**
+ * @suppress
+ */
+public object FfiConverterOptionalDouble: FfiConverterRustBuffer<kotlin.Double?> {
+    override fun read(buf: ByteBuffer): kotlin.Double? {
+        if (buf.get().toInt() == 0) {
+            return null
+        }
+        return FfiConverterDouble.read(buf)
+    }
+
+    override fun allocationSize(value: kotlin.Double?): ULong {
+        if (value == null) {
+            return 1UL
+        } else {
+            return 1UL + FfiConverterDouble.allocationSize(value)
+        }
+    }
+
+    override fun write(value: kotlin.Double?, buf: ByteBuffer) {
+        if (value == null) {
+            buf.put(0)
+        } else {
+            buf.put(1)
+            FfiConverterDouble.write(value, buf)
+        }
+    }
+}
+
+
+
+
 /**
  * @suppress
  */

ios/Cove.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		AC85E3B52EE343C300BCEE4B /* SwiftUIIntrospect in Frameworks */ = {isa = PBXBuildFile; productRef = AC85E3B42EE343C300BCEE4B /* SwiftUIIntrospect */; };
 		AC9AB5792C34956C00BAE3BE /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC9AB5782C34956C00BAE3BE /* Logger.swift */; };
 		ACA4CBEF2C2365430008F63E /* KeychainSwift in Frameworks */ = {isa = PBXBuildFile; productRef = ACA4CBEE2C2365430008F63E /* KeychainSwift */; };
 		ACC61E2F2ECBD8BE00D13947 /* MijickPopups in Frameworks */ = {isa = PBXBuildFile; productRef = ACC61E2E2ECBD8BE00D13947 /* MijickPopups */; };
@@ -54,6 +55,7 @@
 				ACD0053C2DB5309A003DC493 /* CoveCore in Frameworks */,
 				ACA4CBEF2C2365430008F63E /* KeychainSwift in Frameworks */,
 				ACC61E2F2ECBD8BE00D13947 /* MijickPopups in Frameworks */,
+				AC85E3B52EE343C300BCEE4B /* SwiftUIIntrospect in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -103,6 +105,7 @@
 				ACA4CBEE2C2365430008F63E /* KeychainSwift */,
 				ACD0053B2DB5309A003DC493 /* CoveCore */,
 				ACC61E2E2ECBD8BE00D13947 /* MijickPopups */,
+				AC85E3B42EE343C300BCEE4B /* SwiftUIIntrospect */,
 			);
 			productName = Cove;
 			productReference = D0245F4C2C0F7B4E0042B447 /* Cove.app */;
@@ -136,6 +139,7 @@
 				ACA4CBED2C2365430008F63E /* XCRemoteSwiftPackageReference "keychain-swift" */,
 				ACD0053A2DB5309A003DC493 /* XCLocalSwiftPackageReference "CoveCore" */,
 				ACC61E2D2ECBD8BE00D13947 /* XCRemoteSwiftPackageReference "Popups" */,
+				AC85E3B32EE343C300BCEE4B /* XCRemoteSwiftPackageReference "swiftui-introspect" */,
 			);
 			productRefGroup = D0245F4D2C0F7B4E0042B447 /* Products */;
 			projectDirPath = "";
@@ -302,7 +306,7 @@
 				CODE_SIGN_ENTITLEMENTS = Cove/Cove.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_ASSET_PATHS = "\"Cove/Preview Content\"";
 				DEVELOPMENT_TEAM = Q8UP8C53Y8;
 				ENABLE_APP_SANDBOX = YES;
@@ -352,7 +356,7 @@
 				CODE_SIGN_ENTITLEMENTS = Cove/Cove.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_ASSET_PATHS = "\"Cove/Preview Content\"";
 				DEVELOPMENT_TEAM = Q8UP8C53Y8;
 				ENABLE_APP_SANDBOX = YES;
@@ -424,6 +428,14 @@
 /* End XCLocalSwiftPackageReference section */
 
 /* Begin XCRemoteSwiftPackageReference section */
+		AC85E3B32EE343C300BCEE4B /* XCRemoteSwiftPackageReference "swiftui-introspect" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/siteline/swiftui-introspect";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 26.0.0;
+			};
+		};
 		ACA4CBED2C2365430008F63E /* XCRemoteSwiftPackageReference "keychain-swift" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/evgenyneu/keychain-swift";
@@ -443,6 +455,11 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
+		AC85E3B42EE343C300BCEE4B /* SwiftUIIntrospect */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = AC85E3B32EE343C300BCEE4B /* XCRemoteSwiftPackageReference "swiftui-introspect" */;
+			productName = SwiftUIIntrospect;
+		};
 		ACA4CBEE2C2365430008F63E /* KeychainSwift */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = ACA4CBED2C2365430008F63E /* XCRemoteSwiftPackageReference "keychain-swift" */;

ios/Cove/AppManager.swift

@@ -1,6 +1,8 @@
 import Observation
 import SwiftUI
 
+private let walletModeChangeDelayMs = 250
+
 @Observable final class AppManager: FfiReconcile {
     static let shared = AppManager()
 
@@ -239,6 +241,7 @@ import SwiftUI
 
                 case let .fiatPricesChanged(prices):
                     self.prices = prices
+                    self.walletManager?.updateFiatBalance()
 
                 case let .feesChanged(fees):
                     self.fees = fees
@@ -262,7 +265,7 @@ import SwiftUI
                     self.loadWallets()
 
                     Task {
-                        try? await Task.sleep(for: .milliseconds(200))
+                        try? await Task.sleep(for: .milliseconds(walletModeChangeDelayMs))
                         await MainActor.run {
                             withAnimation { self.isLoading = false }
                         }

ios/Cove/Components/KeyboardAccessory/KeyboardAccessoryHost.swift

@@ -35,16 +35,36 @@ final class KeyboardAccessoryController: ObservableObject {
     private var container: UIView?
     private weak var currentResponder: UIView?
     private var isAttached: Bool = false
-    private var notificationObserver: NSObjectProtocol?
+    private var didBecomeActiveObserver: NSObjectProtocol?
+    private var keyboardDidShowObserver: NSObjectProtocol?
+    private var keyboardWillHideObserver: NSObjectProtocol?
 
     init() {
-        notificationObserver = NotificationCenter.default.addObserver(
+        didBecomeActiveObserver = NotificationCenter.default.addObserver(
             forName: UIApplication.didBecomeActiveNotification,
             object: nil,
             queue: .main
         ) { [weak self] _ in
             self?.reattachIfNeeded()
         }
+
+        keyboardDidShowObserver = NotificationCenter.default.addObserver(
+            forName: UIResponder.keyboardWillShowNotification,
+            object: nil,
+            queue: .main
+        ) { [weak self] _ in
+            self?.reattachOnKeyboardShow()
+        }
+
+        keyboardWillHideObserver = NotificationCenter.default.addObserver(
+            forName: UIResponder.keyboardWillHideNotification,
+            object: nil,
+            queue: .main
+        ) { [weak self] _ in
+            // mark as detached so we know to reattach when keyboard shows again
+            self?.isAttached = false
+            self?.currentResponder = nil
+        }
     }
 
     /// Reattach the accessory view when app returns from background/notification center.
@@ -66,8 +86,31 @@ final class KeyboardAccessoryController: ObservableObject {
         }
     }
 
+    /// Reattach accessory when keyboard appears after focus transitions.
+    /// Handles the case where first responder changes between text fields.
+    private func reattachOnKeyboardShow() {
+        guard let container = self.container else { return }
+
+        // re-capture first responder
+        UIResponder.captureCurrentFirstResponder(from: nil)
+        guard let responder = UIResponder.currentFirstResponderView else { return }
+
+        // always reattach when keyboard shows (we track hide state via keyboardWillHide)
+        // force rebuild: clear first, then re-set
+        self.setAccessory(on: responder, accessoryView: nil, forceReload: false)
+        self.setAccessory(on: responder, accessoryView: container, forceReload: true)
+        self.currentResponder = responder
+        self.isAttached = true
+    }
+
     deinit {
-        if let observer = notificationObserver {
+        if let observer = didBecomeActiveObserver {
+            NotificationCenter.default.removeObserver(observer)
+        }
+        if let observer = keyboardDidShowObserver {
+            NotificationCenter.default.removeObserver(observer)
+        }
+        if let observer = keyboardWillHideObserver {
             NotificationCenter.default.removeObserver(observer)
         }
     }