@swype-org/react-sdk 0.1.7 → 0.1.9

package/dist/index.cjs

@@ -1957,13 +1957,16 @@ function computeSmartDefaults(accts, transferAmount) {
   let bestAccount = null;
   let bestWallet = null;
   let bestBalance = -1;
+  let bestIsActive = false;
   for (const acct of accts) {
     for (const wallet of acct.wallets) {
       const walletBal = wallet.balance.available.amount;
-      if (walletBal > bestBalance) {
+      const isActive = wallet.status === "ACTIVE";
+      if (walletBal > bestBalance || walletBal === bestBalance && isActive && !bestIsActive) {
         bestBalance = walletBal;
         bestAccount = acct;
         bestWallet = wallet;
+        bestIsActive = isActive;
       }
     }
   }
@@ -2009,7 +2012,8 @@ function buildSelectSourceChoices(options) {
 function SwypePayment({
   destination,
   onComplete,
-  onError
+  onError,
+  useWalletConnector
 }) {
   const { apiBaseUrl, tokens, depositAmount } = useSwypeConfig();
   const { ready, authenticated, login, getAccessToken } = reactAuth.usePrivy();
@@ -2206,18 +2210,43 @@ function SwypePayment({
     try {
       const token = await getAccessToken();
       if (!token) throw new Error("Not authenticated");
+      let effectiveSourceType = sourceType;
+      let effectiveSourceId = sourceId;
+      if (effectiveSourceType === "accountId") {
+        const acct = accounts.find((a) => a.id === effectiveSourceId);
+        const activeWallet = acct?.wallets.find((w) => w.status === "ACTIVE");
+        if (activeWallet) {
+          effectiveSourceType = "walletId";
+          effectiveSourceId = activeWallet.id;
+        }
+      }
+      const isActiveWallet = effectiveSourceType === "walletId" && accounts.some(
+        (a) => a.wallets.some((w) => w.id === effectiveSourceId && w.status === "ACTIVE")
+      );
+      if (!isActiveWallet) {
+        let found = false;
+        for (const acct of accounts) {
+          for (const wallet of acct.wallets) {
+            if (wallet.status === "ACTIVE" && wallet.sources.some((s) => s.balance.available.amount >= parsedAmount)) {
+              effectiveSourceType = "walletId";
+              effectiveSourceId = wallet.id;
+              found = true;
+              break;
+            }
+          }
+          if (found) break;
+        }
+      }
       const t = await createTransfer(apiBaseUrl, token, {
-        sourceType,
-        sourceId,
+        sourceType: effectiveSourceType,
+        sourceId: effectiveSourceId,
         destination,
         amount: parsedAmount
       });
       setTransfer(t);
       if (t.authorizationSessions && t.authorizationSessions.length > 0) {
-        const selectedAccount = accounts.find((a) => a.id === selectedAccountId);
-        const selectedWallet = selectedWalletId ? selectedAccount?.wallets.find((w) => w.id === selectedWalletId) : null;
-        const isWalletAuthorized = selectedWallet?.status === "ACTIVE";
-        if (isMobile() && !isWalletAuthorized) {
+        const shouldUseWalletConnector = useWalletConnector ?? !isMobile();
+        if (!shouldUseWalletConnector) {
           setMobileFlow(true);
           pollingTransferIdRef.current = t.id;
           polling.startPolling(t.id);
@@ -2245,13 +2274,12 @@ function SwypePayment({
     destination,
     apiBaseUrl,
     getAccessToken,
+    accounts,
     authExecutor,
     transferSigning,
     polling,
     onError,
-    accounts,
-    selectedAccountId,
-    selectedWalletId
+    useWalletConnector
   ]);
   const handleNewPayment = () => {
     setStep("ready");