diff --git a/src/app/(app)/rates/page.tsx b/src/app/(app)/rates/page.tsx
index fc4cbe7..bc6c892 100644
--- a/src/app/(app)/rates/page.tsx
+++ b/src/app/(app)/rates/page.tsx
@@ -483,7 +483,7 @@ export default function RatesPage() {
           <div>
             <p className="text-xs font-bold">Alert Created</p>
             <p className="text-[10px] opacity-80">
-              We'll notify you at the threshold
+              We will notify you at the threshold
             </p>
           </div>
           <button
diff --git a/src/app/(app)/review/page.tsx b/src/app/(app)/review/page.tsx
index b81660f..1884932 100644
--- a/src/app/(app)/review/page.tsx
+++ b/src/app/(app)/review/page.tsx
@@ -102,7 +102,7 @@ export default function ReviewPage() {
               <span className="material-symbols-outlined text-red-500 mt-0.5 shrink-0 text-sm">warning</span>
               <div>
                 <p className="text-[10px] font-bold text-red-700 mb-0.5 uppercase">Security Verification</p>
-                <p className="text-[10px] text-gray-500">Double-check the recipient's wallet address. Assets sent on Stellar cannot be reversed.</p>
+                <p className="text-[10px] text-gray-500">Double-check the recipient{"'"}s wallet address. Assets sent on Stellar cannot be reversed.</p>
               </div>
             </div>
           </div>
diff --git a/src/app/api/stellar/send/route.ts b/src/app/api/stellar/send/route.ts
index 162144a..e3c8369 100644
--- a/src/app/api/stellar/send/route.ts
+++ b/src/app/api/stellar/send/route.ts
@@ -70,11 +70,12 @@ export async function POST(request: NextRequest) {
       toAmount,
       recipientAddress,
     }, 201);
-  } catch (err: any) {
+  } catch (err: unknown) {
     console.error("Send error:", err);
-    if (err.message?.includes("Invalid recipient")) {
-      return errorResponse(err.message, 400);
+    const message = err instanceof Error ? err.message : "Unknown error";
+    if (message.includes("Invalid recipient")) {
+      return errorResponse(message, 400);
     }
-    return errorResponse(err.message || "Failed to build transaction", 500);
+    return errorResponse(message || "Failed to build transaction", 500);
   }
 }
\ No newline at end of file
diff --git a/src/app/api/stellar/submit/route.ts b/src/app/api/stellar/submit/route.ts
index e2e68ef..84f1968 100644
--- a/src/app/api/stellar/submit/route.ts
+++ b/src/app/api/stellar/submit/route.ts
@@ -65,8 +65,9 @@ export async function POST(request: NextRequest) {
       fromAmount: updated.fromAmount,
       toAmount: updated.toAmount,
     });
-  } catch (err: any) {
+  } catch (err: unknown) {
     console.error("Submit error:", err);
-    return errorResponse(err.message || "Failed to submit transaction", 500);
+    const message = err instanceof Error ? err.message : "Unknown error";
+    return errorResponse(message, 500);
   }
 }
\ No newline at end of file
diff --git a/src/lib/stellar.ts b/src/lib/stellar.ts
index d3e58d5..e647107 100644
--- a/src/lib/stellar.ts
+++ b/src/lib/stellar.ts
@@ -24,16 +24,41 @@ export async function createTestnetAccount(): Promise<{
   publicKey: string;
   secretKey: string;
 }> {
-  // TODO(contributor): Generate a Keypair.random(), fund via Friendbot
-  // (https://friendbot.stellar.org?addr=<publicKey> for testnet),
-  // return the publicKey and secretKey. Do NOT store the secretKey server-side
-  // in production — return it to the client once so the user can save it.
-  console.warn("[STUB] createTestnetAccount returning mock keypair");
   const keypair = Keypair.random();
-  return {
-    publicKey: keypair.publicKey(),
-    secretKey: keypair.secret(),
-  };
+  const publicKey = keypair.publicKey();
+  const secretKey = keypair.secret();
+
+  // Only attempt Friendbot funding on testnet
+  if (NETWORK === "testnet") {
+    const friendbotUrl = `https://friendbot.stellar.org?addr=${publicKey}`;
+    console.log(`[createTestnetAccount] Funding ${publicKey} via Friendbot...`);
+
+    try {
+      const response = await fetch(friendbotUrl, { method: "GET" });
+
+      if (!response.ok) {
+        // Friendbot returns 400+ when the account is already funded or on error.
+        // We treat this as non-fatal — the keypair is still valid.
+        const body = await response.text();
+        console.warn(
+          `[createTestnetAccount] Friendbot responded with ${response.status}: ${body}`
+        );
+      } else {
+        const result = await response.json();
+        console.log(
+          `[createTestnetAccount] Friendbot success: hash=${result.hash}`
+        );
+      }
+    } catch (err) {
+      // Network errors, timeouts, etc. — log and continue.
+      console.warn(
+        `[createTestnetAccount] Friendbot request failed:`,
+        err
+      );
+    }
+  }
+
+  return { publicKey, secretKey };
 }
 
 // TODO(contributor): implement Horizon polling or streaming to resolve