Validate and fix wallet name on Done

bitcoinppl · Dec 1, 2024 · 713bb83 · 713bb83
1 parent 981073d
commit 713bb83
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/ios/Cove/Flows/SelectedWalletFlow/SelectedWalletScreen.swift b/ios/Cove/Flows/SelectedWalletFlow/SelectedWalletScreen.swift
@@ -192,12 +192,6 @@ struct SelectedWalletScreen: View {
                 let _ = try? await model.rust.forceUpdateHeight()
             }
             .onAppear {
-                if metadata.name.isEmpty {
-                    model.dispatch(
-                        action: .updateName(
-                            metadata.masterFingerprint?.asUppercase() ?? "Unnamed Wallet"))
-                }
-
                 UIRefreshControl.appearance().tintColor = UIColor.white
             }
             .scrollIndicators(.hidden)

diff --git a/rust/src/view_model/wallet.rs b/rust/src/view_model/wallet.rs
@@ -513,6 +513,21 @@ impl RustWalletViewModel {
         Ok(())
     }
 
+    #[uniffi::method]
+    pub fn validate_metadata(&self) {
+        if self.metadata.read().name.trim().is_empty() {
+            let name = self
+                .metadata
+                .read()
+                .master_fingerprint
+                .as_ref()
+                .map(|f| f.as_uppercase())
+                .unwrap_or_else(|| "Unnamed Wallet".to_string());
+
+            self.dispatch(WalletViewModelAction::UpdateName(name));
+        }
+    }
+
     #[uniffi::method]
     pub async fn start_wallet_scan(&self) -> Result<(), Error> {
         debug!("start_wallet_scan: {}", self.id);
@@ -811,7 +826,6 @@ impl RustWalletViewModel {
     #[uniffi::method]
     pub fn dispatch(&self, action: WalletViewModelAction) {
         match action {
-            WalletViewModelAction::UpdateName(name) if name.is_empty() => {}
             WalletViewModelAction::UpdateName(name) => {
                 let mut metadata = self.metadata.write();
                 metadata.name = name;