@finspringinnovations/fdsdk 0.0.4 → 0.0.6

package/src/screens/FDList.tsx

@@ -20,7 +20,6 @@ import { useGetCustomerApplicationsMutation } from '../api/customerApi';
 import { useGetMasterDataQuery } from '../api/masterDataApi';
 import { useMasterData } from '../providers/MasterDataProvider';
 import { useTerminateWorkflowMutation } from '../api/workflowApi';
-import { usePaymentReverseFeedMutation } from '../api/fdApi';
 import type { ColorScheme, ThemeName } from '../theme';
 import SafeAreaWrapper from '../components/SafeAreaWrapper';
 import { getUserInfoForAPI, getAppData } from '../config/appDataConfig';
@@ -99,22 +98,9 @@ const FDList: React.FC<FDListProps> = ({
         isLoading: isTerminatingWorkflow,
     }] = useTerminateWorkflowMutation();
 
-    // Payment Reverse Feed API
-    const [paymentReverseFeed, {
-        data: paymentReverseFeedResponse,
-        error: paymentReverseFeedError,
-        isLoading: isLoadingPaymentReverseFeed,
-    }] = usePaymentReverseFeedMutation();
-
     const styles = createStyles(colors, typography, spacing, themeName);
     const { setMasterData } = useMasterData();
 
-    // Redux selectors for workflow IDs
-    const workflowInstanceId = useAppSelector((state: any) => state?.onboarding?.workflowInstanceId);
-    const applicationId = useAppSelector((state: any) => state?.onboarding?.applicationId);
-    const entityId = useAppSelector((state: any) => state?.onboarding?.entityid);
-    const providerId = useAppSelector((state: any) => state?.onboarding?.providerId);
-
     // Helper function to check if customer applications is empty
     const isCustomerApplicationsEmpty = () => {
         if (!customerApplications) {
@@ -223,7 +209,12 @@ const FDList: React.FC<FDListProps> = ({
 
     const { data: masterData, isLoading: isLoadingMaster } = useGetMasterDataQuery(
         { providerId: inferredProviderId },
-        { skip: !inferredProviderId }
+        {
+            skip: !inferredProviderId,
+            refetchOnMountOrArgChange: true,
+            refetchOnFocus: true,
+            refetchOnReconnect: true,
+        }
     );
 
     // Only render once all three API calls have completed (success or error)
@@ -491,26 +482,34 @@ const FDList: React.FC<FDListProps> = ({
 
             // Persist onboarding identifiers globally for subsequent API calls (like FDCalculator)
             try {
-                // Extract workflow parameters from response
+                // Extract workflow parameters from response (support array / data[] / applications[])
                 const responseData = customerApplications?.data || customerApplications;
-                let applicationData = Array.isArray(responseData) ? responseData[0] : responseData;
+                let applicationsData: any[] = [];
+                if (Array.isArray(responseData)) {
+                    applicationsData = responseData;
+                } else if (responseData?.applications && Array.isArray(responseData.applications)) {
+                    applicationsData = responseData.applications;
+                } else if (Array.isArray(customerApplications?.applications)) {
+                    applicationsData = customerApplications.applications;
+                }
+
+                let applicationData = applicationsData.length > 0 ? applicationsData[0] : (Array.isArray(responseData) ? responseData[0] : responseData);
 
                 // Prefer the application with wf_status === 'Active'
-                if (Array.isArray(responseData)) {
-                    const activeOnly = responseData.find((app: any) => {
+                if (applicationsData.length > 0) {
+                    const activeOnly = applicationsData.find((app: any) => {
                         const status = (app.wf_status || app.status || '').toString();
                         return status === 'Active';
                     });
                     if (activeOnly) applicationData = activeOnly;
                 }
 
-                if (Array.isArray(responseData)) {
-                    completeFDData = responseData.find((app: any) => {
-                        const status = (app.wf_status || app.status || '').toString();
-                        return status === 'Completed';
-                    });
-                    setGlobalData({ completeFDData: !!completeFDData });
-                }
+                // Set completed flag robustly for downstream ReviewKYC/Aadhaar flow decisions
+                completeFDData = applicationsData.find((app: any) => {
+                    const status = (app.wf_status || app.status || '').toString().toLowerCase();
+                    return status === 'completed';
+                });
+                setGlobalData({ completeFDData: !!completeFDData });
                 if (applicationData) {
                     const ids = {
                         workflowInstanceId: applicationData.workflow_instance_id,
@@ -593,56 +592,18 @@ const FDList: React.FC<FDListProps> = ({
             // Handle error silently
         }
 
-        // If current state is payment and transactionId is available, call payment reverse feed API
+        // If current state is payment and transactionId is available,
+        // open PaymentStatus and let SSE (/events) drive status updates.
         if (currentState === WORKFLOW_STATES.PAYMENT && transactionId) {
-            try {
-                // Get user info and required IDs
-                const userInfo = getUserInfoForAPI();
-
-                // Prepare payment reverse feed request
-                const paymentReverseFeedRequest = {
-                    // Headers
-                    providerId: providerId,
-                    workflowInstanceId: workflowInstanceId,
-                    userreferenceid: userInfo.id,
-                    applicationid: applicationId,
-                    entityid: entityId,
-                    // Body
-                    transactionId: transactionId,
-                };
-
-                const response = await paymentReverseFeed(paymentReverseFeedRequest).unwrap();
-
-                // Handle the response based on payment status
-                const paymentStatus = (response?.data?.paymentStatus || '').toLowerCase();
-                const statusParam = paymentStatus === 'success' ? 'success' : paymentStatus === 'failed' ? 'failed' : 'pending';
-
-                // Build fdData for display
-                const fdDataParam = activeFD ? {
-                    companyName: activeFD.name,
-                    amount: Number(activeFD.invested) || 0,
-                    fdRate: `${activeFD.returns}% p.a.`,
-                    tenure: activeFD.maturityDate ? `${activeFD.maturityDate}` : '-',
-                    interestPayout: activeFD.interestPayout || 'Yearly',
-                } : undefined;
-
-                navigate('PaymentStatus', { status: statusParam, transactionId, fdData: fdDataParam } as any);
-                return;
-
-            } catch (error) {
-                // Handle error silently
-
-                // On error, navigate with pending status as fallback
-                const fdDataParam = activeFD ? {
-                    companyName: activeFD.name,
-                    amount: Number(activeFD.invested) || 0,
-                    fdRate: `${activeFD.returns}% p.a.`,
-                    tenure: activeFD.maturityDate ? `${activeFD.maturityDate}` : '-',
-                    interestPayout: activeFD.interestPayout || 'Yearly',
-                } : undefined;
-                navigate('PaymentStatus', { status: 'pending', transactionId, fdData: fdDataParam } as any);
-                return;
-            }
+            const fdDataParam = activeFD ? {
+                companyName: activeFD.name,
+                amount: Number(activeFD.invested) || 0,
+                fdRate: `${activeFD.returns}% p.a.`,
+                tenure: activeFD.maturityDate ? `${activeFD.maturityDate}` : '-',
+                interestPayout: activeFD.interestPayout || 'Yearly',
+            } : undefined;
+            navigate('PaymentStatus', { status: 'pending', transactionId, fdData: fdDataParam } as any);
+            return;
         }
 
         // Use workflow navigation based on current state (non-payment states or no transactionId)
@@ -1281,4 +1242,4 @@ const createStyles = (colors: ColorScheme, typography: any, spacing: any, themeN
     },
 });
 
-export default FDList;
+export default FDList;

package/src/screens/Payment.tsx

@@ -1,13 +1,14 @@
-import React, { useRef, useState, useEffect } from 'react';
+import React, { useRef, useState, useEffect, useCallback } from 'react';
 import { View, StyleSheet, ActivityIndicator, BackHandler, Platform, StatusBar } from 'react-native';
 import { WebView } from 'react-native-webview';
 import SafeAreaWrapper from '../components/SafeAreaWrapper';
 import { useColors } from '../theme/ThemeContext';
 import { decryptResponse } from '../utils/encryption';
+import { parseSSEBuffer } from '../utils/sseParser';
 import { getEncryptionConfig } from '../config/encryptionConfig';
-import { useFocusEffect } from '@react-navigation/native';
-import { getPaymentSession } from '../state/paymentSession';
-import { usePaymentStatusTimer, PaymentStatus } from '../hooks/usePaymentStatusTimer';
+import { getEnvironmentData, getUserInfoForAPI } from '../config/appDataConfig';
+import { getApiConfig, getSecureHeaders } from '../config/apiConfig';
+import { useAppSelector } from '../store';
 
 export interface PaymentProps {
     onGoBack?: () => void;
@@ -32,36 +33,27 @@ const Payment: React.FC<PaymentProps> = ({
     const styles = createStyles(colors);
     const webViewRef = useRef<WebView>(null);
     const [loading, setLoading] = useState(true);
-    const currentStatusRef = useRef<PaymentStatus>('pending');
-    const { transactionId } = getPaymentSession();
 
-    const { startTimer, stopTimer } = usePaymentStatusTimer({
-        transactionId,
-        onStatusUpdate: (status, response) => {
-            currentStatusRef.current = status;
-
-            if (status === 'success') {
-                onPaymentSuccess?.(response);
-            }
-            else if (status === 'failed') {
-                onPaymentFailure?.(response);
-            }
-            else if (status === 'pending') {
-                onPaymentPending?.(response);  
-            }
+    const applicationId = useAppSelector((state: any) => state?.onboarding?.applicationId);
+    const workflowInstanceId = useAppSelector((state: any) => state?.onboarding?.workflowInstanceId);
+    const entityId = useAppSelector((state: any) => state?.onboarding?.entityid);
+    const providerId = useAppSelector((state: any) => state?.onboarding?.providerId);
+    const sseXhrRef = useRef<XMLHttpRequest | null>(null);
+    const sseLastIndexRef = useRef<number>(0);
+    const sseBufferRef = useRef<{ value: string }>({ value: '' });
+    const onSuccessRef = useRef(onPaymentSuccess);
+    const onFailureRef = useRef(onPaymentFailure);
+    onSuccessRef.current = onPaymentSuccess;
+    onFailureRef.current = onPaymentFailure;
+
+    const stopPaymentSSE = useCallback(() => {
+        if (sseXhrRef.current) {
+            sseXhrRef.current.abort();
+            sseXhrRef.current = null;
         }
-
-    });
-
-    useFocusEffect(
-        React.useCallback(() => {
-            startTimer();
-
-        }, [startTimer, stopTimer])
-    );
-
-
-
+        sseLastIndexRef.current = 0;
+        sseBufferRef.current = { value: '' };
+    }, []);
 
     const handleNavigationStateChange = async (navState: any) => {
         const { url } = navState;
@@ -89,6 +81,163 @@ const Payment: React.FC<PaymentProps> = ({
         setLoading(false);
     };
 
+    // SSE: listen for payment status while user is on Payment WebView (same as web integration)
+    useEffect(() => {
+        if (!applicationId || !paymentUrl?.trim()) {
+            stopPaymentSSE();
+            return;
+        }
+
+        const envData = getEnvironmentData();
+        const apiConfig = getApiConfig();
+        const baseUrl = (envData?.apiBaseUrl || apiConfig?.baseUrl || '').replace(/\/$/, '');
+        const url = baseUrl ? `${baseUrl}/events?applicationId=${encodeURIComponent(applicationId)}` : '';
+
+        if (!url) return;
+
+        stopPaymentSSE();
+
+        const xhr = new XMLHttpRequest();
+        sseXhrRef.current = xhr;
+        xhr.open('GET', url);
+
+        const apiKey = envData?.apiKey || apiConfig?.headers?.['X-API-Key'] || '';
+        if (apiKey) {
+            xhr.setRequestHeader('x-api-key', apiKey);
+            xhr.setRequestHeader('X-API-Key', apiKey);
+        }
+
+        const secureHeaders = getSecureHeaders();
+        Object.entries(secureHeaders).forEach(([key, value]) => {
+            if (key.toLowerCase() !== 'content-type') {
+                xhr.setRequestHeader(key, value);
+            }
+        });
+
+        xhr.setRequestHeader('Accept', 'text/event-stream');
+        xhr.setRequestHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
+        xhr.setRequestHeader('Pragma', 'no-cache');
+        xhr.setRequestHeader('Expires', '0');
+
+        try {
+            const userInfo = getUserInfoForAPI();
+            const userRefId = userInfo?.userReferenceId || userInfo?.id;
+            if (userRefId) {
+                xhr.setRequestHeader('userreferenceid', userRefId);
+                xhr.setRequestHeader('userReferenceId', userRefId);
+            }
+        } catch {
+            // ignore
+        }
+
+        if (providerId) {
+            xhr.setRequestHeader('provider', providerId);
+            xhr.setRequestHeader('providerid', providerId);
+            xhr.setRequestHeader('providerId', providerId);
+        }
+        if (workflowInstanceId) {
+            xhr.setRequestHeader('workflowInstanceId', workflowInstanceId);
+            xhr.setRequestHeader('workflowinstanceid', workflowInstanceId);
+        }
+        if (applicationId) {
+            xhr.setRequestHeader('applicationId', applicationId);
+            xhr.setRequestHeader('applicationid', applicationId);
+        }
+        if (entityId) {
+            xhr.setRequestHeader('entityid', entityId);
+            xhr.setRequestHeader('entityId', entityId);
+        }
+
+        const handleEventData = async (rawData: string) => {
+            try {
+                const parsed = JSON.parse(rawData || '{}') as Record<string, unknown>;
+                let payload = parsed;
+                if (typeof parsed?.encryptedResponse === 'string' && parsed.encryptedResponse) {
+                    try {
+                        const config = getEncryptionConfig();
+                        const decrypted = await decryptResponse(
+                            { encryptedResponse: parsed.encryptedResponse },
+                            config
+                        );
+                        payload = (decrypted || {}) as Record<string, unknown>;
+                    } catch {
+                        // ignore and use raw payload
+                    }
+                }
+
+                const payloadData = (payload?.data as Record<string, unknown> | undefined) || {};
+                const status = String(
+                    payload?.paymentStatus ??
+                    payload?.payment_status ??
+                    payloadData?.paymentStatus ??
+                    payloadData?.payment_status ??
+                    ''
+                ).toUpperCase();
+
+                if (status === 'SUCCESS') {
+                    stopPaymentSSE();
+                    onSuccessRef.current?.(payload);
+                    return;
+                }
+
+                if (status === 'FAILED') {
+                    stopPaymentSSE();
+                    onFailureRef.current?.(payload);
+                }
+            } catch {
+                // ignore parse errors
+            }
+        };
+
+        xhr.onprogress = () => {
+            setLoading(false);
+
+            const newText = xhr.responseText.slice(sseLastIndexRef.current);
+            sseLastIndexRef.current = xhr.responseText.length;
+            if (!newText) return;
+
+            const events = parseSSEBuffer(sseBufferRef.current, newText);
+            for (const { eventType, data } of events) {
+                if (!data) continue;
+                const normalizedEventType = String(eventType || '').trim().toLowerCase();
+                if (normalizedEventType === 'fd_payment_status') {
+                    handleEventData(data);
+                } else if (normalizedEventType === 'message') {
+                    try {
+                        const parsed = JSON.parse(data) as { event?: string; [k: string]: unknown };
+                        const embeddedEvent = String(parsed?.event || '').trim().toLowerCase();
+                        if (embeddedEvent === 'fd_payment_status') {
+                            handleEventData(data);
+                        }
+                    } catch {
+                        // ignore
+                    }
+                }
+            }
+        };
+
+        xhr.onreadystatechange = () => {
+            if (
+                (xhr.readyState === XMLHttpRequest.HEADERS_RECEIVED ||
+                    xhr.readyState === XMLHttpRequest.LOADING) &&
+                xhr.status === 200
+            ) {
+                setLoading(false);
+                if (__DEV__) console.log('[Payment] SSE connected for payment status');
+            }
+        };
+
+        xhr.onerror = () => {
+            if (__DEV__) console.warn('[Payment] SSE connection error');
+        };
+
+        xhr.send();
+
+        return () => {
+            stopPaymentSSE();
+        };
+    }, [applicationId, paymentUrl, workflowInstanceId, entityId, providerId, stopPaymentSSE]);
+
     const handleMessage = async (event: any) => {
         try {
             const dataString = event.nativeEvent.data;
@@ -133,18 +282,13 @@ const Payment: React.FC<PaymentProps> = ({
                 const paymentStatus = response.data?.paymentStatus?.toLowerCase();
 
                 if (paymentStatus === 'success') {
-                    currentStatusRef.current = "success";
-                    stopTimer();
                     onPaymentSuccess?.(response);
                 } else if (paymentStatus === 'failed') {
-                    currentStatusRef.current = "failed";
-                    stopTimer();
                     onPaymentFailure?.(response);
                 } else {
                     onPaymentPending?.(response);
                 }
             } else {
-                currentStatusRef.current = "pending";
                 onPaymentPending?.(response);
             }
 
@@ -252,4 +396,3 @@ const createStyles = (colors: any) => StyleSheet.create({
 });
 
 export default Payment;
-

package/src/screens/PaymentStatus.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef, useCallback } from 'react';
 import { View, Text, StyleSheet, ScrollView, Alert, Image, BackHandler, Platform, StatusBar } from 'react-native';
 import Icon from 'react-native-vector-icons/Ionicons';
 import { base64Images } from '../constants/strings/base64Images';
@@ -9,14 +9,16 @@ import { useColors, useTypography, useTheme } from '../theme/ThemeContext';
 import { usePaymentRetryMutation } from '../api/fdApi';
 import { useGetCustomerApplicationsMutation } from '../api/customerApi';
 import { useAppSelector } from '../store';
-import { getUserInfoForAPI } from '../config/appDataConfig';
+import { getEnvironmentData, getUserInfoForAPI } from '../config/appDataConfig';
+import { getApiConfig, getSecureHeaders } from '../config/apiConfig';
 import { navigate } from '../navigation/helpers';
 import { setPaymentSession, getPaymentSession } from '../state/paymentSession';
 import { useRoute } from '@react-navigation/native';
 import { BANK_STRINGS } from '../constants/strings/bank';
 import { COMMON_STRINGS } from '../constants/strings/common';
-import { getApiConfig } from '../config/apiConfig';
-import { usePaymentStatusTimer } from '../hooks/usePaymentStatusTimer';
+import { parseSSEBuffer } from '../utils/sseParser';
+import { decryptResponse } from '../utils/encryption';
+import { getEncryptionConfig } from '../config/encryptionConfig';
 
 export interface PaymentStatusProps {
     onRetry?: () => void;
@@ -63,24 +65,9 @@ const PaymentStatus: React.FC<PaymentStatusProps> = ({
     const applicationId = useAppSelector((state: any) => state?.onboarding?.applicationId);
     const entityId = useAppSelector((state: any) => state?.onboarding?.entityid);
     const providerId = useAppSelector((state: any) => state?.onboarding?.providerId);
-
-    const {
-        startTimer,
-        stopTimer,
-        triggerStatusCheck,
-        isCheckingStatus,
-    } = usePaymentStatusTimer({
-        transactionId: finalTransactionId,
-        overrides: {
-            providerId,
-            workflowInstanceId,
-            applicationid: applicationId,
-            entityid: entityId,
-        },
-        onStatusUpdate: (nextStatus) => {
-            setCurrentStatus(nextStatus);
-        },
-    });
+    const sseXhrRef = useRef<XMLHttpRequest | null>(null);
+    const sseLastIndexRef = useRef<number>(0);
+    const sseBufferRef = useRef<{ value: string }>({ value: '' });
 
     // Payment Retry API
     const [paymentRetry, {
@@ -117,21 +104,160 @@ const PaymentStatus: React.FC<PaymentStatusProps> = ({
         return amount.toLocaleString('en-IN');
     };
 
+    const stopPaymentSSE = useCallback(() => {
+        if (sseXhrRef.current) {
+            sseXhrRef.current.abort();
+            sseXhrRef.current = null;
+        }
+        sseLastIndexRef.current = 0;
+        sseBufferRef.current = { value: '' };
+    }, []);
+
     useEffect(() => {
-        if (currentStatus === 'pending') {
-            startTimer();
-        } else {
-            stopTimer();
+        if (currentStatus !== 'pending' || !applicationId) {
+            stopPaymentSSE();
+            return;
         }
 
-        return () => {
-            stopTimer();
+        const envData = getEnvironmentData();
+        const apiConfig = getApiConfig();
+        const baseUrl = (envData?.apiBaseUrl || apiConfig?.baseUrl || '').replace(/\/$/, '');
+        const url = baseUrl ? `${baseUrl}/events?applicationId=${encodeURIComponent(applicationId)}` : '';
+
+        if (!url) return;
+
+        stopPaymentSSE();
+
+        const xhr = new XMLHttpRequest();
+        sseXhrRef.current = xhr;
+        xhr.open('GET', url);
+
+        const apiKey = envData?.apiKey || apiConfig?.headers?.['X-API-Key'] || '';
+        if (apiKey) {
+            xhr.setRequestHeader('x-api-key', apiKey);
+            xhr.setRequestHeader('X-API-Key', apiKey);
+        }
+
+        const secureHeaders = getSecureHeaders();
+        Object.entries(secureHeaders).forEach(([key, value]) => {
+            if (key.toLowerCase() !== 'content-type') {
+                xhr.setRequestHeader(key, value);
+            }
+        });
+
+        xhr.setRequestHeader('Accept', 'text/event-stream');
+        xhr.setRequestHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
+        xhr.setRequestHeader('Pragma', 'no-cache');
+        xhr.setRequestHeader('Expires', '0');
+
+        try {
+            const userInfo = getUserInfoForAPI();
+            const userRefId = userInfo?.userReferenceId || userInfo?.id;
+            if (userRefId) {
+                xhr.setRequestHeader('userreferenceid', userRefId);
+                xhr.setRequestHeader('userReferenceId', userRefId);
+            }
+        } catch {
+            // ignore
+        }
+
+        if (providerId) {
+            xhr.setRequestHeader('provider', providerId);
+            xhr.setRequestHeader('providerid', providerId);
+            xhr.setRequestHeader('providerId', providerId);
+        }
+        if (workflowInstanceId) {
+            xhr.setRequestHeader('workflowInstanceId', workflowInstanceId);
+            xhr.setRequestHeader('workflowinstanceid', workflowInstanceId);
+        }
+        if (applicationId) {
+            xhr.setRequestHeader('applicationId', applicationId);
+            xhr.setRequestHeader('applicationid', applicationId);
+        }
+        if (entityId) {
+            xhr.setRequestHeader('entityid', entityId);
+            xhr.setRequestHeader('entityId', entityId);
+        }
+
+        const handleEventData = async (rawData: string) => {
+            try {
+                const parsed = JSON.parse(rawData || '{}') as Record<string, unknown>;
+                let payload = parsed;
+                if (typeof parsed?.encryptedResponse === 'string' && parsed.encryptedResponse) {
+                    try {
+                        const config = getEncryptionConfig();
+                        const decrypted = await decryptResponse(
+                            { encryptedResponse: parsed.encryptedResponse },
+                            config
+                        );
+                        payload = (decrypted || {}) as Record<string, unknown>;
+                    } catch {
+                        // ignore and use raw payload
+                    }
+                }
+
+                const payloadData = (payload?.data as Record<string, unknown> | undefined) || {};
+                const status = String(
+                    payload?.paymentStatus ??
+                    payload?.payment_status ??
+                    payloadData?.paymentStatus ??
+                    payloadData?.payment_status ??
+                    ''
+                ).toUpperCase();
+
+                if (status === 'SUCCESS') {
+                    setCurrentStatus('success');
+                    stopPaymentSSE();
+                    return;
+                }
+
+                if (status === 'FAILED') {
+                    setCurrentStatus('failed');
+                    stopPaymentSSE();
+                }
+            } catch {
+                // ignore parse errors
+            }
         };
-    }, [currentStatus, startTimer, stopTimer]);
 
-    const handlePaymentReverseFeed = async () => {
-        await triggerStatusCheck();
-    };
+        xhr.onprogress = () => {
+            const newText = xhr.responseText.slice(sseLastIndexRef.current);
+            sseLastIndexRef.current = xhr.responseText.length;
+            if (!newText) return;
+
+            const events = parseSSEBuffer(sseBufferRef.current, newText);
+            for (const { eventType, data } of events) {
+                if (!data) continue;
+                const normalizedEventType = String(eventType || '').trim().toLowerCase();
+                if (normalizedEventType === 'fd_payment_status') {
+                    handleEventData(data);
+                } else if (normalizedEventType === 'message') {
+                    try {
+                        const parsed = JSON.parse(data) as { event?: string; [k: string]: unknown };
+                        const embeddedEvent = String(parsed?.event || '').trim().toLowerCase();
+                        if (embeddedEvent === 'fd_payment_status') {
+                            handleEventData(data);
+                        }
+                    } catch {
+                        // ignore
+                    }
+                }
+            }
+        };
+
+        xhr.send();
+
+        return () => {
+            stopPaymentSSE();
+        };
+    }, [
+        applicationId,
+        currentStatus,
+        entityId,
+        providerId,
+        stopPaymentSSE,
+        workflowInstanceId
+    ]);
 
     // Handle payment retry when status is failed
     const handlePaymentRetry = async () => {
@@ -181,9 +307,6 @@ const PaymentStatus: React.FC<PaymentStatusProps> = ({
             // Get user info from app data
             const userInfo = getUserInfoForAPI();
 
-            // Get API configuration
-            const apiConfig = getApiConfig();
-
             // Prepare request payload
             const requestPayload = {
                 userReferenceId: userInfo.id
@@ -412,13 +535,6 @@ const PaymentStatus: React.FC<PaymentStatusProps> = ({
                             disabled={isLoadingPaymentRetry}
                         />
                     )}
-                    {/* {currentStatus === 'pending' && (
-                        <ActionButton
-                            title={isCheckingStatus ? COMMON_STRINGS.CHECKING : BANK_STRINGS.REFRESH_STATUS_BUTTON}
-                            onPress={handlePaymentReverseFeed}
-                            disabled={isCheckingStatus}
-                        />
-                    )} */}
                 </View>
             </View>
         </SafeAreaWrapper>
@@ -545,4 +661,3 @@ const createStyles = (colors: any, typography: any, status: 'success' | 'failed'
 };
 
 export default PaymentStatus;
-