From d22a884b5e8fd813c97a653f44ce0a868023b5ea Mon Sep 17 00:00:00 2001
From: jonesmarvin8 <83104039+jonesmarvin8@users.noreply.github.com>
Date: Tue, 28 Apr 2026 20:48:02 -0400
Subject: [PATCH] Update public.rs

---
 .../native_token_transfer/public.rs           | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/wallet/src/program_facades/native_token_transfer/public.rs b/wallet/src/program_facades/native_token_transfer/public.rs
index 77cdd7aa..011dfc1e 100644
--- a/wallet/src/program_facades/native_token_transfer/public.rs
+++ b/wallet/src/program_facades/native_token_transfer/public.rs
@@ -34,23 +34,23 @@ impl NativeTokenTransfer<'_> {
 
         // Fetch nonces for both accounts unconditionally
         let mut nonces = self
+            .0
+            .get_accounts_nonces(vec![from])
+            .await
+            .map_err(ExecutionFailureKind::SequencerError)?;
+        let to_signing_key = self.0.storage.user_data.get_pub_account_signing_key(to);
+        if let Some(_to_signing_key) = to_signing_key {
+            let to_nonces = self
                 .0
-                .get_accounts_nonces(vec![from])
+                .get_accounts_nonces(vec![to])
                 .await
                 .map_err(ExecutionFailureKind::SequencerError)?;
-            let to_signing_key = self.0.storage.user_data.get_pub_account_signing_key(to);
-            if let Some(_to_signing_key) = to_signing_key {
-                let to_nonces = self
-                    .0
-                    .get_accounts_nonces(vec![to])
-                    .await
-                    .map_err(ExecutionFailureKind::SequencerError)?;
-                nonces.extend(to_nonces);
-            } else {
-                println!(
-                    "Receiver's account ({to}) private key not found in wallet. Proceeding with only sender's key."
-                );
-            }
+            nonces.extend(to_nonces);
+        } else {
+            println!(
+                "Receiver's account ({to}) private key not found in wallet. Proceeding with only sender's key."
+            );
+        }
 
         let message = Message::try_new(program_id, account_ids, nonces, balance_to_move).unwrap();