@finspringinnovations/fdsdk 0.0.4 → 0.0.5

package/lib/api/baseApi.js

@@ -237,7 +237,7 @@ const generateRequestId = () => (0, uuid_1.v4)();
 // Custom Base Query with Encryption
 // ------------------------------
 const baseQueryWithEncryption = async (args, api, extraOptions) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f;
     const apiConfig = ensureApiConfig(); // 👈 Load config before first API call
     const encryptionConfig = (0, encryptionConfig_1.getEncryptionConfig)();
     const requestId = generateRequestId();
@@ -295,6 +295,10 @@ const baseQueryWithEncryption = async (args, api, extraOptions) => {
         timeout: apiConfig.timeout,
         prepareHeaders: (headers, { getState }) => {
             var _a, _b;
+            // Disable HTTP-level caching for all SDK API calls
+            headers.set('Cache-Control', 'no-cache, no-store, must-revalidate');
+            headers.set('Pragma', 'no-cache');
+            headers.set('Expires', '0');
             const token = (_b = (_a = getState()) === null || _a === void 0 ? void 0 : _a.auth) === null || _b === void 0 ? void 0 : _b.token;
             if (token)
                 headers.set('authorization', `Bearer ${token}`);
@@ -391,9 +395,13 @@ const baseQueryWithEncryption = async (args, api, extraOptions) => {
     }
     // Log response
     const duration = Date.now() - timestamp;
+    const statusFromMeta = (_b = (_a = result.meta) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.status;
+    const statusFromError = typeof ((_c = result.error) === null || _c === void 0 ? void 0 : _c.status) === 'number' ? result.error.status : undefined;
+    const status = (_d = statusFromMeta !== null && statusFromMeta !== void 0 ? statusFromMeta : statusFromError) !== null && _d !== void 0 ? _d : (result.error ? 0 : 200);
+    const statusText = ((_f = (_e = result.meta) === null || _e === void 0 ? void 0 : _e.response) === null || _f === void 0 ? void 0 : _f.statusText) || (result.error ? 'ERROR' : 'OK');
     const responseLogData = {
-        status: ((_b = (_a = result.meta) === null || _a === void 0 ? void 0 : _a.response) === null || _b === void 0 ? void 0 : _b.status) || 200,
-        statusText: ((_d = (_c = result.meta) === null || _c === void 0 ? void 0 : _c.response) === null || _d === void 0 ? void 0 : _d.statusText) || 'OK',
+        status,
+        statusText,
         headers: {},
         data: result.data,
         timestamp: Date.now(),
@@ -405,8 +413,7 @@ const baseQueryWithEncryption = async (args, api, extraOptions) => {
     apiLogger_1.apiLogger.logResponse(responseLogData);
     // Log response details in DEV mode (AFTER decryption)
     if (__DEV__) {
-        const status = ((_f = (_e = result.meta) === null || _e === void 0 ? void 0 : _e.response) === null || _f === void 0 ? void 0 : _f.status) || 200;
-        const isSuccess = status >= 200 && status < 300;
+        const isSuccess = !result.error && status >= 200 && status < 300;
         console.log('═══════════════════════════════════════════════════════════════');
         console.log(isSuccess ? '✅ [ShriramSDK] API RESPONSE - SUCCESS' : '❌ [ShriramSDK] API RESPONSE - ERROR');
         console.log('───────────────────────────────────────────────────────────────');
@@ -414,7 +421,7 @@ const baseQueryWithEncryption = async (args, api, extraOptions) => {
         console.log('🔗 Endpoint:', url);
         console.log('📌 Full URL:', `${apiConfig.baseUrl}${url}`);
         console.log('🔧 Method:', method);
-        console.log('📊 Status:', status, ((_h = (_g = result.meta) === null || _g === void 0 ? void 0 : _g.response) === null || _h === void 0 ? void 0 : _h.statusText) || 'OK');
+        console.log('📊 Status:', status, statusText);
         console.log('⏱️  Duration:', `${duration}ms`);
         console.log('🔐 Encryption:', currentEncryptionState ? 'Enabled' : 'Disabled');
         console.log('🆔 Request ID:', requestId);
@@ -451,6 +458,10 @@ exports.baseApi = (0, react_1.createApi)({
     baseQuery: baseQueryWithEncryption,
     tagTypes: ['InterestRate'],
     endpoints: () => ({}),
+    keepUnusedDataFor: 0,
+    refetchOnMountOrArgChange: true,
+    refetchOnFocus: true,
+    refetchOnReconnect: true,
 });
 // Export hooks
 exports.usePrefetch = exports.baseApi.usePrefetch;

package/lib/api/masterDataApi.js

@@ -13,17 +13,37 @@ exports.masterDataApi = baseApi_1.baseApi.injectEndpoints({
                 const request = {
                     url: 'masterdata',
                     method: 'GET',
+                    cache: 'no-store',
                     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;
+                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 (_a) {
+                        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;
             },
         }),
     }),

package/lib/api/workflowApi.js

@@ -13,6 +13,37 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.usePreviousStateMutation = exports.useUpdateStateMutation = exports.useUpdateTaskMutation = exports.useTerminateWorkflowMutation = exports.workflowApi = void 0;
 const baseApi_1 = require("./baseApi");
+const TASK_ID_TO_CAPTION = {
+    '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',
+};
 exports.workflowApi = baseApi_1.baseApi.injectEndpoints({
     endpoints: (builder) => ({
         terminateWorkflow: builder.mutation({
@@ -37,10 +68,24 @@ exports.workflowApi = baseApi_1.baseApi.injectEndpoints({
         updateTask: builder.mutation({
             query: (body) => {
                 const { providerId, workflowInstanceId, userreferenceid, applicationid, entityid } = body, requestBody = __rest(body, ["providerId", "workflowInstanceId", "userreferenceid", "applicationid", "entityid"]);
+                const normalizedRequestBody = Object.assign({}, requestBody);
+                // 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: Object.assign(Object.assign({}, requestBody), { workflowInstanceId: workflowInstanceId }),
+                    body: Object.assign(Object.assign({}, normalizedRequestBody), { workflowInstanceId: workflowInstanceId }),
                     headers: {
                         provider: providerId || '{{shriramprovider}}',
                         workflowInstanceId: workflowInstanceId || '{{workflowInstanceId}}',

package/lib/hooks/usePaymentSSE.d.ts

@@ -17,8 +17,14 @@ interface UsePaymentSSECallbacks {
     onError?: (error: any) => void;
     onConnected?: () => void;
 }
+export interface PaymentSSEExtraHeaders {
+    workflowInstanceId?: string;
+    applicationId?: string;
+    entityid?: string;
+    providerId?: string;
+}
 export declare function usePaymentSSE(): {
-    start: (applicationId: string, callbacks: UsePaymentSSECallbacks) => void;
+    start: (applicationId: string, callbacks: UsePaymentSSECallbacks, extraHeaders?: PaymentSSEExtraHeaders) => void;
     stop: () => void;
 };
 export {};

package/lib/hooks/usePaymentSSE.js

@@ -19,6 +19,8 @@ const react_1 = require("react");
 const sseParser_1 = require("../utils/sseParser");
 const appDataConfig_1 = require("../config/appDataConfig");
 const apiConfig_1 = require("../config/apiConfig");
+const encryption_1 = require("../utils/encryption");
+const encryptionConfig_1 = require("../config/encryptionConfig");
 // -- Hook --
 function usePaymentSSE() {
     // Store the XMLHttpRequest so we can abort it later
@@ -27,7 +29,7 @@ function usePaymentSSE() {
     const lastIndexRef = (0, react_1.useRef)(0);
     // SSE text buffer (persists across onprogress calls)
     const bufferRef = (0, react_1.useRef)({ value: '' });
-    const start = (0, react_1.useCallback)((applicationId, callbacks) => {
+    const start = (0, react_1.useCallback)((applicationId, callbacks, extraHeaders) => {
         var _a;
         // Clean up any existing connection first
         if (xhrRef.current) {
@@ -40,8 +42,13 @@ function usePaymentSSE() {
         // 1. Build the SSE endpoint URL
         const envData = (0, appDataConfig_1.getEnvironmentData)();
         const apiConfig = (0, apiConfig_1.getApiConfig)();
-        const baseUrl = (envData === null || envData === void 0 ? void 0 : envData.apiBaseUrl) || (apiConfig === null || apiConfig === void 0 ? void 0 : apiConfig.baseUrl) || '';
-        const url = `${baseUrl}/events?applicationId=${encodeURIComponent(applicationId)}`;
+        const baseUrl = ((envData === null || envData === void 0 ? void 0 : envData.apiBaseUrl) || (apiConfig === null || apiConfig === void 0 ? void 0 : 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();
         xhrRef.current = xhr;
@@ -51,11 +58,49 @@ function usePaymentSSE() {
         if (apiKey) {
             xhr.setRequestHeader('x-api-key', apiKey);
         }
+        // Add secure headers (Content-Type, User-Agent, etc.)
+        const secureHeaders = (0, apiConfig_1.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 = (0, appDataConfig_1.getUserInfoForAPI)();
+            const userRefId = (userInfo === null || userInfo === void 0 ? void 0 : userInfo.userReferenceId) || (userInfo === null || userInfo === void 0 ? void 0 : userInfo.id);
+            if (userRefId) {
+                xhr.setRequestHeader('userreferenceid', userRefId);
+                xhr.setRequestHeader('userReferenceId', userRefId);
+            }
+        }
+        catch (_b) {
+            if (__DEV__)
+                console.warn('[usePaymentSSE] Could not get userReferenceId');
+        }
+        // Add provider header (required for authentication)
+        if (extraHeaders === null || extraHeaders === void 0 ? void 0 : extraHeaders.providerId) {
+            xhr.setRequestHeader('provider', extraHeaders.providerId);
+        }
+        // Add onboarding headers - both camelCase and lowercase variants
+        if (extraHeaders === null || extraHeaders === void 0 ? void 0 : extraHeaders.workflowInstanceId) {
+            xhr.setRequestHeader('workflowInstanceId', extraHeaders.workflowInstanceId);
+        }
+        if (extraHeaders === null || extraHeaders === void 0 ? void 0 : extraHeaders.applicationId) {
+            xhr.setRequestHeader('applicationId', extraHeaders.applicationId);
+            xhr.setRequestHeader('applicationid', extraHeaders.applicationId);
+        }
+        if (extraHeaders === null || extraHeaders === void 0 ? void 0 : extraHeaders.entityid) {
+            xhr.setRequestHeader('entityid', extraHeaders.entityid);
+            xhr.setRequestHeader('entityId', extraHeaders.entityid);
+        }
         // 4. Handle incoming data
         xhr.onprogress = () => {
-            var _a;
             // responseText contains ALL text received so far
             // Only parse the NEW text since last call
             const newText = xhr.responseText.slice(lastIndexRef.current);
@@ -64,18 +109,46 @@ function usePaymentSSE() {
                 return;
             // Parse new text into SSE events
             const events = (0, sseParser_1.parseSSEBuffer)(bufferRef.current, newText);
-            // Handle each event
+            // Handle each event (support encrypted payload like web)
+            const handleEventData = async (rawData) => {
+                var _a, _b;
+                try {
+                    const parsed = JSON.parse(rawData || '{}');
+                    let payload = parsed;
+                    if (typeof (parsed === null || parsed === void 0 ? void 0 : parsed.encryptedResponse) === 'string' && parsed.encryptedResponse) {
+                        try {
+                            const config = (0, encryptionConfig_1.getEncryptionConfig)();
+                            const decrypted = await (0, encryption_1.decryptResponse)({ encryptedResponse: parsed.encryptedResponse }, config);
+                            payload = (decrypted || {});
+                        }
+                        catch (_c) {
+                            if (__DEV__)
+                                console.warn('[usePaymentSSE] Decrypt failed, using raw');
+                        }
+                    }
+                    const status = String((_b = (_a = payload === null || payload === void 0 ? void 0 : payload.paymentStatus) !== null && _a !== void 0 ? _a : payload === null || payload === void 0 ? void 0 : payload.payment_status) !== null && _b !== void 0 ? _b : '').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 = ((_a = parsed.paymentStatus) !== null && _a !== void 0 ? _a : '').toUpperCase();
-                        callbacks.onPaymentStatus(status, parsed);
+                        if ((parsed === null || parsed === void 0 ? void 0 : parsed.event) === 'fd_payment_status')
+                            handleEventData(data);
                     }
-                    catch (parseError) {
-                        if (__DEV__) {
-                            console.error('[usePaymentSSE] Failed to parse event data:', parseError);
-                        }
+                    catch (_a) {
+                        // ignore
                     }
                 }
             }
@@ -118,6 +191,22 @@ function usePaymentSSE() {
         xhr.send();
         if (__DEV__) {
             console.log('[usePaymentSSE] Starting SSE connection to:', url);
+            console.log('[usePaymentSSE] Headers:', {
+                'x-api-key': apiKey ? '***' : 'missing',
+                'userreferenceid': (() => {
+                    try {
+                        const userInfo = (0, appDataConfig_1.getUserInfoForAPI)();
+                        return (userInfo === null || userInfo === void 0 ? void 0 : userInfo.userReferenceId) || (userInfo === null || userInfo === void 0 ? void 0 : userInfo.id) || 'missing';
+                    }
+                    catch (_a) {
+                        return 'missing';
+                    }
+                })(),
+                'provider': (extraHeaders === null || extraHeaders === void 0 ? void 0 : extraHeaders.providerId) || 'missing',
+                'workflowInstanceId': (extraHeaders === null || extraHeaders === void 0 ? void 0 : extraHeaders.workflowInstanceId) || 'missing',
+                'applicationId': (extraHeaders === null || extraHeaders === void 0 ? void 0 : extraHeaders.applicationId) || 'missing',
+                'entityid': (extraHeaders === null || extraHeaders === void 0 ? void 0 : extraHeaders.entityid) || 'missing',
+            });
         }
     }, []);
     const stop = (0, react_1.useCallback)(() => {

package/lib/navigation/RootNavigator.js

@@ -181,14 +181,22 @@ const RootNavigator = ({ config = {}, onExit, onPanRequired, }) => {
                 }, fdData: (_a = props.route.params) === null || _a === void 0 ? void 0 : _a.fdData }, props)));
         }),
         react_1.default.createElement(Stack.Screen, { name: "Payment", options: { title: 'Payment' } }, (props) => (react_1.default.createElement(Payment_1.default, Object.assign({ onGoBack: () => (0, helpers_2.goBack)(), paymentUrl: ((0, paymentSession_1.getPaymentSession)().paymentUrl) || '', onPaymentSuccess: (data) => {
+                var _a, _b;
+                const payload = data && typeof data === 'object' ? data : {};
+                const transactionId = (_b = (_a = payload === null || payload === void 0 ? void 0 : payload.transactionId) !== null && _a !== void 0 ? _a : payload === null || payload === void 0 ? void 0 : payload.transaction_id) !== null && _b !== void 0 ? _b : payload === null || payload === void 0 ? void 0 : payload.TransactionId;
                 (0, helpers_2.navigate)('PaymentStatus', {
                     status: 'success',
-                    paymentData: data
+                    paymentData: data,
+                    transactionId,
                 });
             }, onPaymentFailure: (error) => {
+                var _a, _b;
+                const payload = error && typeof error === 'object' ? error : {};
+                const transactionId = (_b = (_a = payload === null || payload === void 0 ? void 0 : payload.transactionId) !== null && _a !== void 0 ? _a : payload === null || payload === void 0 ? void 0 : payload.transaction_id) !== null && _b !== void 0 ? _b : payload === null || payload === void 0 ? void 0 : payload.TransactionId;
                 (0, helpers_2.navigate)('PaymentStatus', {
                     status: 'failed',
-                    paymentData: error
+                    paymentData: error,
+                    transactionId,
                 });
             }, onPaymentPending: (info) => {
                 (0, helpers_2.navigate)('PaymentStatus', {

package/lib/screens/AadhaarVerification.js

@@ -297,7 +297,7 @@ const AadhaarVerification = ({ onGoBack, onVerificationComplete, }) => {
                         applicationid: applicationId,
                         entityid: entityId,
                         // Request params/body
-                        targetTaskId: workflowConstants_1.WORKFLOW_TASKS.VALIDATE_OTP,
+                        targetTaskCaption: workflowConstants_1.WORKFLOW_TASKS.VALIDATE_OTP,
                     }).unwrap();
                     setIsValidateOtpTaskCalled(true);
                 }
@@ -355,7 +355,7 @@ const AadhaarVerification = ({ onGoBack, onVerificationComplete, }) => {
                 applicationid: applicationId,
                 entityid: entityId,
                 // Request params/body
-                targetTaskId: workflowConstants_1.WORKFLOW_TASKS.RESEND_OTP,
+                targetTaskCaption: workflowConstants_1.WORKFLOW_TASKS.RESEND_OTP,
             }).unwrap();
             // 2) Then call OTP API with the updateTask response
             const response = await sendOtp({

package/lib/screens/FDCalculator.js

@@ -127,8 +127,12 @@ const FDCalculator = ({ onGoBack, onExitSDK, onPanRequired, onNavigateToReviewKY
     const defaultProviderId = (0, store_1.useAppSelector)((state) => { var _a; return (_a = state === null || state === void 0 ? void 0 : state.onboarding) === null || _a === void 0 ? void 0 : _a.providerId; }); // Default Shriram provider ID
     // Default Shriram provider ID
     const { data: fallbackMasterData, isLoading: isLoadingFallback, error: fallbackError, refetch: refetchMasterData } = (0, masterDataApi_1.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
     // Store only the data parameter after stringifying instead of complete response
     const effectiveMasterData = react_1.default.useMemo(() => {

package/lib/screens/FDList.js

@@ -46,7 +46,6 @@ const customerApi_1 = require("../api/customerApi");
 const masterDataApi_1 = require("../api/masterDataApi");
 const MasterDataProvider_1 = require("../providers/MasterDataProvider");
 const workflowApi_1 = require("../api/workflowApi");
-const fdApi_1 = require("../api/fdApi");
 const SafeAreaWrapper_1 = __importDefault(require("../components/SafeAreaWrapper"));
 const appDataConfig_1 = require("../config/appDataConfig");
 const helpers_1 = require("../navigation/helpers");
@@ -75,15 +74,8 @@ const FDList = ({ onGoBack, onSelectFD, onNavigateToFDCalculator, customStyles =
     const [getInterestRates, { data: interestRates, error: interestRatesError, isLoading: isLoadingRates, }] = (0, interestRateApi_1.useGetInterestRatesMutation)();
     const [getCustomerApplications, { data: customerApplications, error: customerApplicationsError, isLoading: isLoadingApplications, }] = (0, customerApi_1.useGetCustomerApplicationsMutation)();
     const [terminateWorkflow, { data: terminateWorkflowData, error: terminateWorkflowError, isLoading: isTerminatingWorkflow, }] = (0, workflowApi_1.useTerminateWorkflowMutation)();
-    // Payment Reverse Feed API
-    const [paymentReverseFeed, { data: paymentReverseFeedResponse, error: paymentReverseFeedError, isLoading: isLoadingPaymentReverseFeed, }] = (0, fdApi_1.usePaymentReverseFeedMutation)();
     const styles = createStyles(colors, typography, spacing, themeName);
     const { setMasterData } = (0, MasterDataProvider_1.useMasterData)();
-    // Redux selectors for workflow IDs
-    const workflowInstanceId = (0, store_1.useAppSelector)((state) => { var _a; return (_a = state === null || state === void 0 ? void 0 : state.onboarding) === null || _a === void 0 ? void 0 : _a.workflowInstanceId; });
-    const applicationId = (0, store_1.useAppSelector)((state) => { var _a; return (_a = state === null || state === void 0 ? void 0 : state.onboarding) === null || _a === void 0 ? void 0 : _a.applicationId; });
-    const entityId = (0, store_1.useAppSelector)((state) => { var _a; return (_a = state === null || state === void 0 ? void 0 : state.onboarding) === null || _a === void 0 ? void 0 : _a.entityid; });
-    const providerId = (0, store_1.useAppSelector)((state) => { var _a; return (_a = state === null || state === void 0 ? void 0 : state.onboarding) === null || _a === void 0 ? void 0 : _a.providerId; });
     // Helper function to check if customer applications is empty
     const isCustomerApplicationsEmpty = () => {
         if (!customerApplications) {
@@ -179,7 +171,12 @@ const FDList = ({ onGoBack, onSelectFD, onNavigateToFDCalculator, customStyles =
             return interestRates.data.fdrScheme[0].providerId;
         return defaultProviderId; // Use default if no rates data yet
     }, [interestRates]);
-    const { data: masterData, isLoading: isLoadingMaster } = (0, masterDataApi_1.useGetMasterDataQuery)({ providerId: inferredProviderId }, { skip: !inferredProviderId });
+    const { data: masterData, isLoading: isLoadingMaster } = (0, masterDataApi_1.useGetMasterDataQuery)({ providerId: inferredProviderId }, {
+        skip: !inferredProviderId,
+        refetchOnMountOrArgChange: true,
+        refetchOnFocus: true,
+        refetchOnReconnect: true,
+    });
     // Only render once all three API calls have completed (success or error)
     // Show loading initially until all APIs have completed
     const isAllDataReady = react_1.default.useMemo(() => {
@@ -413,25 +410,34 @@ const FDList = ({ onGoBack, onSelectFD, onNavigateToFDCalculator, customStyles =
             // Customer applications loaded successfully
             // 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 === null || customerApplications === void 0 ? void 0 : customerApplications.data) || customerApplications;
-                let applicationData = Array.isArray(responseData) ? responseData[0] : responseData;
-                // Prefer the application with wf_status === 'Active'
+                let applicationsData = [];
                 if (Array.isArray(responseData)) {
-                    const activeOnly = responseData.find((app) => {
+                    applicationsData = responseData;
+                }
+                else if ((responseData === null || responseData === void 0 ? void 0 : responseData.applications) && Array.isArray(responseData.applications)) {
+                    applicationsData = responseData.applications;
+                }
+                else if (Array.isArray(customerApplications === null || customerApplications === void 0 ? void 0 : 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 (applicationsData.length > 0) {
+                    const activeOnly = applicationsData.find((app) => {
                         const status = (app.wf_status || app.status || '').toString();
                         return status === 'Active';
                     });
                     if (activeOnly)
                         applicationData = activeOnly;
                 }
-                if (Array.isArray(responseData)) {
-                    completeFDData = responseData.find((app) => {
-                        const status = (app.wf_status || app.status || '').toString();
-                        return status === 'Completed';
-                    });
-                    (0, globalData_1.setGlobalData)({ completeFDData: !!completeFDData });
-                }
+                // Set completed flag robustly for downstream ReviewKYC/Aadhaar flow decisions
+                completeFDData = applicationsData.find((app) => {
+                    const status = (app.wf_status || app.status || '').toString().toLowerCase();
+                    return status === 'completed';
+                });
+                (0, globalData_1.setGlobalData)({ completeFDData: !!completeFDData });
                 if (applicationData) {
                     const ids = {
                         workflowInstanceId: applicationData.workflow_instance_id,
@@ -460,7 +466,6 @@ const FDList = ({ onGoBack, onSelectFD, onNavigateToFDCalculator, customStyles =
     }, [customerApplications, dispatch]);
     // Unified handler: behave like bottom sheet Continue flow
     const handlePendingFDContinue = async () => {
-        var _a;
         // Persist active FD data to store for use across screens
         try {
             if (activeFD) {
@@ -516,50 +521,18 @@ const FDList = ({ onGoBack, onSelectFD, onNavigateToFDCalculator, customStyles =
         catch (error) {
             // 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 === workflowConstants_1.WORKFLOW_STATES.PAYMENT && transactionId) {
-            try {
-                // Get user info and required IDs
-                const userInfo = (0, appDataConfig_1.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 = (((_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.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;
-                (0, helpers_1.navigate)('PaymentStatus', { status: statusParam, transactionId, fdData: fdDataParam });
-                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;
-                (0, helpers_1.navigate)('PaymentStatus', { status: 'pending', transactionId, fdData: fdDataParam });
-                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;
+            (0, helpers_1.navigate)('PaymentStatus', { status: 'pending', transactionId, fdData: fdDataParam });
+            return;
         }
         // Use workflow navigation based on current state (non-payment states or no transactionId)
         if (currentState && Object.values(workflowConstants_1.WORKFLOW_STATES).includes(currentState)) {