@finspringinnovations/fdsdk 0.0.3 → 0.0.5

package/src/api/masterDataApi.ts

@@ -12,17 +12,35 @@ export const masterDataApi = baseApi.injectEndpoints({
                 const request = {
                     url: 'masterdata',
                     method: 'GET' as const,
+                    cache: 'no-store' as const,
                     headers: {
                         workflowInstanceId: '{{workflowInstanceId}}',
                         'x-api-key': '{{X-API-KEY}}',
                         encryptdecrypt: 'false',
+                        'Cache-Control': 'no-cache, no-store, must-revalidate',
+                        Pragma: 'no-cache',
+                        Expires: '0',
                         provider: providerId || '{{shriramprovider}}',
                     },
                 };
                 return request;
             },
-            transformResponse: (response) => {
-                return response;
+            transformResponse: (response: any) => {
+                if (response == null) return response;
+                // If API returns a JSON string, parse it
+                let data = response;
+                if (typeof response === 'string') {
+                    try {
+                        data = JSON.parse(response);
+                    } catch {
+                        return response;
+                    }
+                }
+                // Unwrap { data: ... } so consumers get a consistent shape
+                if (typeof data === 'object' && data !== null && 'data' in data && Object.keys(data).length === 1) {
+                    return data.data;
+                }
+                return data;
             },
         }),
     }),
@@ -31,4 +49,4 @@ export const masterDataApi = baseApi.injectEndpoints({
 
 export const {
     useGetMasterDataQuery
-} = masterDataApi;
+} = masterDataApi;

package/src/api/workflowApi.ts

@@ -9,6 +9,38 @@ export interface TerminateWorkflowRequest {
 
 export type TerminateWorkflowResponse = any; // Replace with concrete type when available
 
+const TASK_ID_TO_CAPTION: Record<string, string> = {
+    '11042': 'SHRIRAM_V1_S1_T1_START',
+    '11043': 'SHRIRAM_V1_S1_T2_GET_PERSONAL_DETAILS_AND_BASIC_FD_INFO',
+    '11044': 'SHRIRAM_V1_S1_T3_END',
+    '11050': 'SHRIRAM_V1_S2_T1_KYC_START',
+    '11051': 'SHRIRAM_V1_S2_T2_CHECK_FOR_PAN_RAPID_STATUS',
+    '11052': 'SHRIRAM_V1_S2_T3_CHECK_IF_AADHAAR_ALREADY_VERIFIED',
+    '11045': 'SHRIRAM_V1_S2_T4_SEND_AADHAR_OTP',
+    '11046': 'SHRIRAM_V1_S2_T5_CHECK_FOR_OTP',
+    '11047': 'SHRIRAM_V1_S2_T6_VALIDATE_AADHAR_OTP',
+    '11053': 'SHRIRAM_V1_S2_T7_AADHAAR_VERIFIED',
+    '11049': 'SHRIRAM_V1_S2_T8_TERMINATE_TASK_AND_WORKFLOW_AFTER_KYC_RETRIES',
+    '11048': 'SHRIRAM_V1_S2_T9_KYC_END',
+    '11054': 'SHRIRAM_V1_S3_T1_OCCUPATION_START',
+    '11055': 'SHRIRAM_V1_S3_T2_CAPTURE_OCCUPATION_DETAILS',
+    '11056': 'SHRIRAM_V1_S3_T3_OCCUPATION_END',
+    '11057': 'SHRIRAM_V1_S4_T1_NOMINEE_START',
+    '11058': 'SHRIRAM_V1_S4_T2_CAPTURE_NOMINEE_DETAILS',
+    '11059': 'SHRIRAM_V1_S4_T3_NOMINEE_END',
+    '11060': 'SHRIRAM_V1_S5_T1_BANK_DETAILS_START',
+    '11061': 'SHRIRAM_V1_S5_T2_CAPTURE_BANK_DETAILS',
+    '11062': 'SHRIRAM_V1_S5_T3_BANK_DETAILS_END',
+    '11063': 'SHRIRAM_V1_S6_T1_FD_CREATION_START',
+    '11064': 'SHRIRAM_V1_S6_T2_CREATE_FD',
+    '11065': 'SHRIRAM_V1_S6_T3_FD_CREATION_END',
+    '11069': 'SHRIRAM_V1_S7_T1_PAYMENT_START',
+    '11068': 'SHRIRAM_V1_S7_T2_PAYMENT',
+    '11067': 'SHRIRAM_V1_S7_T3_CHECK_FOR_PAYMENT_STATUS',
+    '11070': 'SHRIRAM_V1_S7_T4_TERMINATE_TASK_AND_WORKFLOW_AFTER_PAYMENT_RETRIES',
+    '11066': 'SHRIRAM_V1_S7_T5_PAYMENT_END',
+};
+
 export const workflowApi = baseApi.injectEndpoints({
     endpoints: (builder) => ({
         terminateWorkflow: builder.mutation<
@@ -37,11 +69,28 @@ export const workflowApi = baseApi.injectEndpoints({
         updateTask: builder.mutation<any, any>({
             query: (body) => {
                 const { providerId, workflowInstanceId, userreferenceid, applicationid, entityid, ...requestBody } = body;
+                const normalizedRequestBody = { ...requestBody } as Record<string, any>;
+
+                // Backend now expects caption-based field name.
+                // Keep compatibility if any caller still passes targetTaskId.
+                if (!normalizedRequestBody.targetTaskCaption && normalizedRequestBody.targetTaskId) {
+                    normalizedRequestBody.targetTaskCaption = normalizedRequestBody.targetTaskId;
+                    delete normalizedRequestBody.targetTaskId;
+                }
+
+                // Normalize numeric task IDs to caption values if provided.
+                if (normalizedRequestBody.targetTaskCaption !== undefined && normalizedRequestBody.targetTaskCaption !== null) {
+                    const key = String(normalizedRequestBody.targetTaskCaption).trim();
+                    if (TASK_ID_TO_CAPTION[key]) {
+                        normalizedRequestBody.targetTaskCaption = TASK_ID_TO_CAPTION[key];
+                    }
+                }
+
                 return {
                     url: 'taskflow/update',
                     method: 'POST',
                     body: {
-                        ...requestBody,
+                        ...normalizedRequestBody,
                         workflowInstanceId: workflowInstanceId,
                     },
                     headers: {

package/src/assets/images/images.js

@@ -5,4 +5,5 @@
 export const images = {
     arrowLeft: require('./arrow-left.png'),
     chevronDown: require('./chevron-down.png'),
+    shriramLogo: require('./shriram.png'),
 };

package/src/components/FDCard.tsx

@@ -5,10 +5,12 @@ import {
     StyleSheet,
     TouchableOpacity,
     Platform,
+    Image,
 } from 'react-native';
 import { useColors, useTypography, useSpacing, useShadows, useTheme } from '../theme/ThemeContext';
 import { getBorderColor } from '../theme';
 import type { ColorScheme, ThemeName } from '../theme';
+import { base64Images } from '../constants/strings/base64Images';
 
 interface FDCardProps {
     id: string;
@@ -74,6 +76,13 @@ const FDCard: React.FC<FDCardProps> = ({
             activeOpacity={0.8}
         >
             <View style={styles.fdCardHeader}>
+                <View>
+                    <Image
+                        source={{ uri: base64Images.shriramLogo }}
+                        style={styles.logo}
+                        resizeMode="contain"
+                    />
+                </View>
                 <Text style={[styles.fdName, customStyles.name]}>{name}</Text>
             </View>
 
@@ -160,6 +169,12 @@ const createStyles = (colors: ColorScheme, typography: any, spacing: any, shadow
     roiText: {
         color: colors.success,
     },
+    logo: {
+        width: 25,
+        height: 25,
+        marginRight: 5,
+        borderRadius: 15,
+    },
 });
 
 export default FDCard;

package/src/hooks/usePaymentSSE.ts

@@ -14,9 +14,11 @@
  */
 
 import { useCallback, useRef } from 'react';
-import { parseSSEBuffer, type SSEEvent } from '../utils/sseParser';
-import { getEnvironmentData } from '../config/appDataConfig';
-import { getApiConfig } from '../config/apiConfig';
+import { parseSSEBuffer } from '../utils/sseParser';
+import { getEnvironmentData, getUserInfoForAPI } from '../config/appDataConfig';
+import { getApiConfig, getSecureHeaders } from '../config/apiConfig';
+import { decryptResponse } from '../utils/encryption';
+import { getEncryptionConfig } from '../config/encryptionConfig';
 
 // -- Types --
 
@@ -26,6 +28,13 @@ interface UsePaymentSSECallbacks {
     onConnected?: () => void;
 }
 
+export interface PaymentSSEExtraHeaders {
+    workflowInstanceId?: string;
+    applicationId?: string;
+    entityid?: string;
+    providerId?: string;
+}
+
 // -- Hook --
 
 export function usePaymentSSE() {
@@ -37,7 +46,7 @@ export function usePaymentSSE() {
     const bufferRef = useRef<{ value: string }>({ value: '' });
 
     const start = useCallback(
-        (applicationId: string, callbacks: UsePaymentSSECallbacks) => {
+        (applicationId: string, callbacks: UsePaymentSSECallbacks, extraHeaders?: PaymentSSEExtraHeaders) => {
             // Clean up any existing connection first
             if (xhrRef.current) {
                 xhrRef.current.abort();
@@ -51,8 +60,13 @@ export function usePaymentSSE() {
             // 1. Build the SSE endpoint URL
             const envData = getEnvironmentData();
             const apiConfig = getApiConfig();
-            const baseUrl = envData?.apiBaseUrl || apiConfig?.baseUrl || '';
-            const url = `${baseUrl}/events?applicationId=${encodeURIComponent(applicationId)}`;
+            const baseUrl = (envData?.apiBaseUrl || apiConfig?.baseUrl || '').replace(/\/$/, '');
+            const url = baseUrl ? `${baseUrl}/events?applicationId=${encodeURIComponent(applicationId)}` : '';
+
+            if (!url) {
+                if (__DEV__) console.warn('[usePaymentSSE] No base URL, skipping SSE');
+                return;
+            }
 
             // 2. Create XMLHttpRequest
             const xhr = new XMLHttpRequest();
@@ -65,8 +79,50 @@ export function usePaymentSSE() {
             if (apiKey) {
                 xhr.setRequestHeader('x-api-key', apiKey);
             }
+            
+            // Add secure headers (Content-Type, User-Agent, etc.)
+            const secureHeaders = getSecureHeaders();
+            Object.entries(secureHeaders).forEach(([key, value]) => {
+                if (key.toLowerCase() !== 'content-type') {
+                    xhr.setRequestHeader(key, value);
+                }
+            });
+            
+            // SSE-specific headers
             xhr.setRequestHeader('Accept', 'text/event-stream');
-            xhr.setRequestHeader('Cache-Control', 'no-cache');
+            xhr.setRequestHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
+            xhr.setRequestHeader('Pragma', 'no-cache');
+            xhr.setRequestHeader('Expires', '0');
+            
+            // Add userreferenceid header (required for authentication) - both cases
+            try {
+                const userInfo = getUserInfoForAPI();
+                const userRefId = userInfo?.userReferenceId || userInfo?.id;
+                if (userRefId) {
+                    xhr.setRequestHeader('userreferenceid', userRefId);
+                    xhr.setRequestHeader('userReferenceId', userRefId);
+                }
+            } catch {
+                if (__DEV__) console.warn('[usePaymentSSE] Could not get userReferenceId');
+            }
+            
+            // Add provider header (required for authentication)
+            if (extraHeaders?.providerId) {
+                xhr.setRequestHeader('provider', extraHeaders.providerId);
+            }
+            
+            // Add onboarding headers - both camelCase and lowercase variants
+            if (extraHeaders?.workflowInstanceId) {
+                xhr.setRequestHeader('workflowInstanceId', extraHeaders.workflowInstanceId);
+            }
+            if (extraHeaders?.applicationId) {
+                xhr.setRequestHeader('applicationId', extraHeaders.applicationId);
+                xhr.setRequestHeader('applicationid', extraHeaders.applicationId);
+            }
+            if (extraHeaders?.entityid) {
+                xhr.setRequestHeader('entityid', extraHeaders.entityid);
+                xhr.setRequestHeader('entityId', extraHeaders.entityid);
+            }
 
             // 4. Handle incoming data
             xhr.onprogress = () => {
@@ -80,17 +136,40 @@ export function usePaymentSSE() {
                 // Parse new text into SSE events
                 const events = parseSSEBuffer(bufferRef.current, newText);
 
-                // Handle each event
+                // Handle each event (support encrypted payload like web)
+                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 {
+                                if (__DEV__) console.warn('[usePaymentSSE] Decrypt failed, using raw');
+                            }
+                        }
+                        const status = String(payload?.paymentStatus ?? payload?.payment_status ?? '').toUpperCase();
+                        if (status) callbacks.onPaymentStatus(status, payload);
+                    } catch (parseError) {
+                        if (__DEV__) console.error('[usePaymentSSE] Failed to parse event data:', parseError);
+                    }
+                };
+
                 for (const { eventType, data } of events) {
+                    if (!data) continue;
                     if (eventType === 'fd_payment_status') {
+                        handleEventData(data);
+                    } else if (eventType === 'message') {
                         try {
-                            const parsed = JSON.parse(data);
-                            const status = (parsed.paymentStatus ?? '').toUpperCase();
-                            callbacks.onPaymentStatus(status, parsed);
-                        } catch (parseError) {
-                            if (__DEV__) {
-                                console.error('[usePaymentSSE] Failed to parse event data:', parseError);
-                            }
+                            const parsed = JSON.parse(data) as { event?: string; [k: string]: unknown };
+                            if (parsed?.event === 'fd_payment_status') handleEventData(data);
+                        } catch {
+                            // ignore
                         }
                     }
                 }
@@ -134,6 +213,21 @@ export function usePaymentSSE() {
 
             if (__DEV__) {
                 console.log('[usePaymentSSE] Starting SSE connection to:', url);
+                console.log('[usePaymentSSE] Headers:', {
+                    'x-api-key': apiKey ? '***' : 'missing',
+                    'userreferenceid': (() => {
+                        try {
+                            const userInfo = getUserInfoForAPI();
+                            return userInfo?.userReferenceId || userInfo?.id || 'missing';
+                        } catch {
+                            return 'missing';
+                        }
+                    })(),
+                    'provider': extraHeaders?.providerId || 'missing',
+                    'workflowInstanceId': extraHeaders?.workflowInstanceId || 'missing',
+                    'applicationId': extraHeaders?.applicationId || 'missing',
+                    'entityid': extraHeaders?.entityid || 'missing',
+                });
             }
         },
         []

package/src/navigation/RootNavigator.tsx

@@ -27,11 +27,13 @@ const Stack = createStackNavigator<RootStackParamList>();
 interface RootNavigatorProps {
     config?: SDKNavigationConfig;
     onExit?: (fdDetails?: any) => void;
+    onPanRequired?: () => void;
 }
 
 const RootNavigator: React.FC<RootNavigatorProps> = ({
     config = {},
-    onExit
+    onExit,
+    onPanRequired,
 }) => {
     // Handle Android hardware back button
     useEffect(() => {
@@ -151,6 +153,7 @@ const RootNavigator: React.FC<RootNavigatorProps> = ({
                     <FDCalculatorScreen
                         onGoBack={() => goBack()}
                         onExitSDK={() => onExit?.()}
+                        onPanRequired={onPanRequired}    // <── add this
                         onNavigateToReviewKYC={() => navigate('ReviewKYC', { fdData: props.route.params?.fdData })}
                         fdData={(props.route.params as any)?.fdData}
                         {...props}
@@ -309,15 +312,21 @@ const RootNavigator: React.FC<RootNavigatorProps> = ({
                         onGoBack={() => goBack()}
                         paymentUrl={(getPaymentSession().paymentUrl) || ''}
                         onPaymentSuccess={(data) => {
+                            const payload = data && typeof data === 'object' ? data : {};
+                            const transactionId = (payload as any)?.transactionId ?? (payload as any)?.transaction_id ?? (payload as any)?.TransactionId;
                             navigate('PaymentStatus', {
                                 status: 'success',
-                                paymentData: data
+                                paymentData: data,
+                                transactionId,
                             } as any);
                         }}
                         onPaymentFailure={(error) => {
+                            const payload = error && typeof error === 'object' ? error : {};
+                            const transactionId = (payload as any)?.transactionId ?? (payload as any)?.transaction_id ?? (payload as any)?.TransactionId;
                             navigate('PaymentStatus', {
                                 status: 'failed',
-                                paymentData: error
+                                paymentData: error,
+                                transactionId,
                             } as any);
                         }}
                         onPaymentPending={(info) => {

package/src/navigation/index.tsx

@@ -14,6 +14,7 @@ import { getSDKColors, type CustomColors } from '../config/appDataConfig';
 interface SDKNavigationContainerProps {
     config?: SDKNavigationConfig;
     onExit?: (fdDetails?: any) => void;
+    onPanRequired?: () => void;
     children?: React.ReactNode;
     theme?: ThemeName | Theme;
     colors?: CustomColors; // Custom color overrides (prop-level, highest priority)
@@ -24,6 +25,7 @@ interface SDKNavigationContainerProps {
 export const SDKNavigationContainer: React.FC<SDKNavigationContainerProps> = ({
     config,
     onExit,
+    onPanRequired,
     children,
     theme,
     colors: propColors,
@@ -37,7 +39,7 @@ export const SDKNavigationContainer: React.FC<SDKNavigationContainerProps> = ({
 
     // Choose navigator based on flag
     const navigator = useReactNavigation
-        ? <RootNavigator config={config} onExit={onExit} />
+        ? <RootNavigator config={config} onExit={onExit} onPanRequired={onPanRequired} />
         : <SimpleNavigator config={config as SimpleNavigationConfig} onExit={onExit} />;
 
     const content = children || (

package/src/screens/AadhaarVerification.tsx

@@ -295,7 +295,7 @@ const AadhaarVerification: React.FC<AadhaarVerificationProps> = ({
                         applicationid: applicationId,
                         entityid: entityId,
                         // Request params/body
-                        targetTaskId: WORKFLOW_TASKS.VALIDATE_OTP,
+                        targetTaskCaption: WORKFLOW_TASKS.VALIDATE_OTP,
                     }).unwrap();
                     setIsValidateOtpTaskCalled(true);
                 } else {
@@ -357,7 +357,7 @@ const AadhaarVerification: React.FC<AadhaarVerificationProps> = ({
                 applicationid: applicationId,
                 entityid: entityId,
                 // Request params/body
-                targetTaskId: WORKFLOW_TASKS.RESEND_OTP,
+                targetTaskCaption: WORKFLOW_TASKS.RESEND_OTP,
             }).unwrap();
 
 

package/src/screens/FDCalculator.tsx

@@ -42,6 +42,7 @@ import { base64Images } from '../constants/strings/base64Images';
 export interface FDCalculatorProps {
     onGoBack?: () => void;
     onExitSDK?: () => void;
+    onPanRequired?: () => void;
     onNavigateToReviewKYC?: () => void;
     fdData?: {
         id: string;
@@ -56,7 +57,7 @@ export interface FDCalculatorProps {
     };
 }
 
-const FDCalculator: React.FC<FDCalculatorProps> = ({ onGoBack, onExitSDK, onNavigateToReviewKYC, fdData }) => {
+const FDCalculator: React.FC<FDCalculatorProps> = ({ onGoBack, onExitSDK, onPanRequired, onNavigateToReviewKYC, fdData }) => {
     const typography = useTypography();
     const colors = useColors();
     const { themeName } = useTheme();
@@ -139,7 +140,12 @@ const FDCalculator: React.FC<FDCalculatorProps> = ({ onGoBack, onExitSDK, onNavi
 
     const { data: fallbackMasterData, isLoading: isLoadingFallback, error: fallbackError, refetch: refetchMasterData } = useGetMasterDataQuery(
         { providerId: defaultProviderId }, // Use default provider ID
-        { skip: !!masterData } // Skip if master data is already available
+        {
+            skip: !!masterData || !defaultProviderId,
+            refetchOnMountOrArgChange: true,
+            refetchOnFocus: true,
+            refetchOnReconnect: true,
+        }
     );
 
     // Use fallback master data if global master data is not available
@@ -376,7 +382,9 @@ const FDCalculator: React.FC<FDCalculatorProps> = ({ onGoBack, onExitSDK, onNavi
                         {
                             text: 'OK',
                             onPress: () => {
-                                if (onExitSDK) {
+                                if (onPanRequired) {
+                                    onPanRequired();
+                                } else if (onExitSDK) {
                                     onExitSDK();
                                 }
                             },
@@ -1008,4 +1016,4 @@ const createStyles = (typography: any, colors: any, themeName: string) => StyleS
         backgroundColor: 'rgba(0, 0, 0, 0.3)',
         zIndex: 1000,
     },
-});
+});

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;