Simplify fingerprint checking

Only check the wallet to see if fingerprint matches

Author: praveenperera

rust/src/manager/import_wallet_manager.rs

@@ -120,7 +120,7 @@ impl RustImportWalletManager {
             .get_all(network, mode)
             .unwrap_or_default()
             .into_iter()
-            .find(|wallet_metadata| wallet_metadata.wallet_matches_fingerprint(fingerprint));
+            .find(|wallet_metadata| wallet_metadata.matches_fingerprint(fingerprint));
 
         if let Some(mut metadata) = existing_wallet {
             let id = metadata.id.clone();

rust/src/wallet/metadata.rs

@@ -207,22 +207,9 @@ impl WalletMetadata {
         Self { network, verified: true, ..me }
     }
 
-    pub fn wallet_matches_fingerprint(&self, fingerprint: Fingerprint) -> bool {
-        if let Some(saved_fingerprint) = self.master_fingerprint.as_ref()
-            && saved_fingerprint.as_ref() == &fingerprint
-        {
-            return true;
-        }
-
-        // fallback to check fingerprint with the xpub stored in keychain
-        let xpub = match Keychain::global().get_wallet_xpub(&self.id).ok().flatten() {
-            Some(xpub) => xpub,
-            None => return false,
-        };
-
-        let saved_fingerprint = xpub.fingerprint();
-        let saved_fingerprint_bytes: &[u8; 4] = saved_fingerprint.as_ref();
-        saved_fingerprint_bytes == fingerprint.as_ref()
+    pub fn matches_fingerprint(&self, fingerprint: Fingerprint) -> bool {
+        let Some(wallet_fingerprint) = self.master_fingerprint.as_ref() else { return false };
+        wallet_fingerprint.as_ref() == &fingerprint
     }
 
     pub fn preview_new() -> Self {