react-native-fpay 0.4.20 → 0.4.21

package/src/ui/screens/SendScreen.tsx

@@ -25,6 +25,7 @@ import type {
   FPUserInfo,
   FPTransferRecipient,
   FPSendWalletPaymentRequest,
+  FPInternalTransferRecipient,
 } from '../../core/types';
 import styled from 'styled-components/native';
 import Ionicons from 'react-native-vector-icons/Ionicons';
@@ -339,51 +340,74 @@ const SendScreen = ({
   };
 
   const handleProcessingTransaction = async (temptId: string) => {
-    console.log('Got in here for processing');
     try {
-      setLoading(true);
-      setShowConfirmationModal(false);
-      let response: any = null;
-      switch (transactionPayload?.channel) {
-        case 'transfer':
-        case 'bluetooth':
-        case 'proximity':
-          if ('isBank' in transactionPayload && transactionPayload.isBank) {
-            response = (await transferAPI.sendToBank(
-              transactionPayload as FPSendPaymentRequest,
-              temptId
-            )) || null;
-          } else {
-            response = (await transferAPI.sendToWallet(
-              transactionPayload as FPSendWalletPaymentRequest,
-              temptId
-            )) || null;
-          }
-          break;
-        case 'nqr':
-          response = await nqrAPI.pay(
+    setLoading(true);
+    setShowConfirmationModal(false);
+    let response: any = null;
+
+    const recipient = transactionPayload?.recipient as any;
+
+    switch (transactionPayload?.channel) {
+      case 'transfer':
+      case 'bluetooth':
+      case 'proximity': {
+        // Internal transfer — recipient has id + type (AGENT/TERMINAL)
+        if (recipient?.id && recipient?.type && ['AGENT', 'TERMINAL'].includes(recipient.type)) {
+          response = await transferAPI.sendToWallet(
             {
               ...transactionPayload,
-              sender: user ?? undefined,
-              narration: `Send ${formatted} to ${transactionPayload.recipient.accountName}`,
+              recipient: {
+                agent_id: recipient.id,
+                type:     recipient.type,
+              },
             },
             temptId
           );
-          break;
-        case 'nfc':
-          response = await nfcAPI.pay(
-            {
-              ...transactionPayload,
-              sender: user ?? undefined,
-              narration: `Send ${formatted} to ${transactionPayload.recipient.accountName}`,
-            },
+        }
+        // Bank transfer — recipient has accountNumber + bankCode
+        else if (recipient?.bankCode) {
+          response = await transferAPI.sendToBank(
+            transactionPayload as FPSendPaymentRequest,
+            temptId
+          );
+        }
+        // Wallet transfer — recipient has accountNumber + userId/agentId
+        else {
+          response = await transferAPI.sendToWallet(
+            transactionPayload as FPSendWalletPaymentRequest,
             temptId
           );
-          break;
-        default:
-          onError?.({ message: 'Invalid channel' } as FPError);
-          break;
+        }
+        break;
       }
+
+      case 'nqr':
+        response = await nqrAPI.pay(
+          {
+            ...transactionPayload,
+            sender:   user ?? undefined,
+            narration: `Send ${formatted} to ${recipient?.accountName ?? ''}`,
+          },
+          temptId
+        );
+        break;
+
+      case 'nfc':
+        response = await nfcAPI.pay(
+          {
+            ...transactionPayload,
+            sender:   user ?? undefined,
+            narration: `Send ${formatted} to ${recipient?.accountName ?? ''}`,
+          },
+          temptId
+        );
+        break;
+
+      default:
+        onError?.({ message: 'Invalid channel' } as FPError);
+        return;
+    }
+
       
       if (!response?.status) {
         // Show failed result screen

package/src/ui/screens/sub/sendPayment/ProximitySubScreen.tsx

@@ -266,14 +266,14 @@ export function ProximitySubScreen({
         sender_type: 'USER',
         recipient: {
           accountNumber: selected.accountNumber || '',
-          type: selected.userType === 'VIRTUAL_ACCOUNT_USER' ? 'USER' : 'AGENT',
+          type: selected.userType === 'AGENT' ? 'USER' : 'AGENT',
           accountName: selected.displayName || '',
           agentId:
-            selected.userType === 'VIRTUAL_ACCOUNT_USER'
+            selected.userType === 'AGENT'
               ? undefined
               : selected.userId,
           userId:
-            selected.userType === 'VIRTUAL_ACCOUNT_USER'
+            selected.userType === 'AGENT'
               ? selected.userId
               : undefined,
         },

package/src/ui/screens/sub/sendPayment/TransferSubScreen.tsx

@@ -186,6 +186,7 @@ export function TransferSubScreen({
   const [isVerifying, setIsVerifying] = useState<boolean>(false);
 
   const [showBankList, setShowBankList] = useState<boolean>(false);
+  const user = getFPStore().user
 
   const [banks, setBanks] = useState<any>(getFPStore().banks);
   const [filteredBanks, setFilteredBanks] = useState<any>([]);
@@ -218,6 +219,8 @@ export function TransferSubScreen({
     if (!accountDetail) return;
 
     try {
+      
+
       const base = {
         recipient: accountDetail,
         amount: Number(amount), // keep as number — host app converts if needed
@@ -228,10 +231,13 @@ export function TransferSubScreen({
       };
 
       if (!isBank) {
+        const recipient = {...base.recipient, id: base.recipient.ownerId};
+        delete recipient.ownerId;
         onProcessTransaction?.({
           ...base,
           sender_id: getFPStore().psspId ?? '',
-          sender_type: 'USER' as const,
+          sender_type: user?.type,
+          recipient,
         });
       } else if (isBank && bank) {
         onProcessTransaction?.({