@finspringinnovations/fdsdk 0.0.7 → 0.0.8

package/lib/config/workflowConstants.d.ts

@@ -9,12 +9,18 @@ export declare const WORKFLOW_STATES: {
     readonly PAYMENT: 410;
     readonly END: 403;
 };
+export declare const WORKFLOW_STATE_CAPTIONS: Record<string, number>;
 export declare const WORKFLOW_TASKS: {
     readonly RESEND_OTP: 11045;
     readonly VALIDATE_OTP: 11047;
 };
 export type WorkflowState = typeof WORKFLOW_STATES[keyof typeof WORKFLOW_STATES];
 export type WorkflowTask = typeof WORKFLOW_TASKS[keyof typeof WORKFLOW_TASKS];
+/**
+ * Resolve workflow state from either current_state_caption (string) or current_state (number).
+ * Prefers caption when available so navigation is based on current_state_caption.
+ */
+export declare function resolveWorkflowState(caption: string | null | undefined, numericState: number | null | undefined): WorkflowState | null;
 export declare const getWorkflowStateName: (stateId: number) => string | undefined;
 export declare const getWorkflowTaskName: (taskId: number) => string | undefined;
 export declare const WORKFLOW_CONSTANTS: {

package/lib/config/workflowConstants.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WORKFLOW_CONSTANTS = exports.getWorkflowTaskName = exports.getWorkflowStateName = exports.WORKFLOW_TASKS = exports.WORKFLOW_STATES = void 0;
-// Workflow State Constants
+exports.WORKFLOW_CONSTANTS = exports.getWorkflowTaskName = exports.getWorkflowStateName = exports.WORKFLOW_TASKS = exports.WORKFLOW_STATE_CAPTIONS = exports.WORKFLOW_STATES = void 0;
+exports.resolveWorkflowState = resolveWorkflowState;
+// Workflow State Constants (numeric)
 exports.WORKFLOW_STATES = {
     INITIATION: 404,
     START: 405,
@@ -13,11 +14,39 @@ exports.WORKFLOW_STATES = {
     PAYMENT: 410,
     END: 403,
 };
+// Workflow state captions from backend (current_state_caption) → numeric state
+exports.WORKFLOW_STATE_CAPTIONS = {
+    SHRIRAM_V1_S1_START: 405,
+    SHRIRAM_V1_S2_INITIATION: 404,
+    SHRIRAM_V1_S3_CUSTOMER_INFO_KYC: 406,
+    SHRIRAM_V1_S4_OCCUPATION: 409,
+    SHRIRAM_V1_S5_NOMINEE_DETAILS: 407,
+    SHRIRAM_V1_S6_BANK_DETAILS: 408,
+    SHRIRAM_V1_S7_FD_CREATION: 411,
+    SHRIRAM_V1_S8_PAYMENT: 410,
+    SHRIRAM_V1_S9_END: 403,
+};
 // Workflow Task Constants
 exports.WORKFLOW_TASKS = {
     RESEND_OTP: 11045,
     VALIDATE_OTP: 11047,
 };
+/**
+ * Resolve workflow state from either current_state_caption (string) or current_state (number).
+ * Prefers caption when available so navigation is based on current_state_caption.
+ */
+function resolveWorkflowState(caption, numericState) {
+    const captionStr = typeof caption === 'string' ? caption.trim() : '';
+    if (captionStr && exports.WORKFLOW_STATE_CAPTIONS[captionStr] !== undefined) {
+        return exports.WORKFLOW_STATE_CAPTIONS[captionStr];
+    }
+    const num = numericState != null ? Number(numericState) : NaN;
+    const values = Object.values(exports.WORKFLOW_STATES);
+    if (!Number.isNaN(num) && values.includes(num)) {
+        return num;
+    }
+    return null;
+}
 // Helper function to get workflow state name
 const getWorkflowStateName = (stateId) => {
     const entry = Object.entries(exports.WORKFLOW_STATES).find(([_, value]) => value === stateId);

package/lib/constants/strings/fd.d.ts

@@ -105,7 +105,7 @@ export declare const FD_STRINGS: {
     readonly LESS_THAN_1_3Y_TAB: "<1-3Y";
     readonly LESS_THAN_3_5Y_TAB: "<3-5Y";
     readonly GREATER_THAN_5Y_TAB: ">5Y";
-    readonly ACTIVE_FDS_SECTION: "Active FDs";
+    readonly ACTIVE_FDS_SECTION: "Pending FDs";
     readonly LOADING_RATES: "Loading rates...";
     readonly LOADING_APPLICATIONS: "Loading applications...";
     readonly LOADING_FD_DATA: "Searching for the best F.D. deals...";

package/lib/constants/strings/fd.js

@@ -131,7 +131,7 @@ exports.FD_STRINGS = {
     LESS_THAN_1_3Y_TAB: '<1-3Y',
     LESS_THAN_3_5Y_TAB: '<3-5Y',
     GREATER_THAN_5Y_TAB: '>5Y',
-    ACTIVE_FDS_SECTION: 'Active FDs',
+    ACTIVE_FDS_SECTION: 'Pending FDs',
     // Loading and status messages
     LOADING_RATES: 'Loading rates...',
     LOADING_APPLICATIONS: 'Loading applications...',

package/lib/screens/FDList.js

@@ -46,9 +46,11 @@ 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");
+const paymentSession_1 = require("../state/paymentSession");
 const store_1 = require("../store");
 const onboardingSlice_1 = require("../store/onboardingSlice");
 const fdListSelectedSlice_1 = require("../store/fdListSelectedSlice");
@@ -68,12 +70,15 @@ const FDList = ({ onGoBack, onSelectFD, onNavigateToFDCalculator, customStyles =
     const spacing = (0, ThemeContext_1.useSpacing)();
     const { themeName } = (0, ThemeContext_1.useTheme)();
     const dispatch = (0, store_1.useAppDispatch)();
+    const onboardingIds = (0, store_1.useAppSelector)((state) => state === null || state === void 0 ? void 0 : state.onboarding);
     const hasFetchedRatesRef = react_1.default.useRef(false);
     const isCallingInterestRatesRef = react_1.default.useRef(false);
     // API calls to fetch 
     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)();
+    const [paymentReverseFeed, { isLoading: isCheckingPaymentStatus }] = (0, fdApi_1.usePaymentReverseFeedMutation)();
+    const [paymentRetry, { isLoading: isRetryingPayment }] = (0, fdApi_1.usePaymentRetryMutation)();
     const styles = createStyles(colors, typography, spacing, themeName);
     const { setMasterData } = (0, MasterDataProvider_1.useMasterData)();
     // Helper function to check if customer applications is empty
@@ -466,6 +471,7 @@ const FDList = ({ onGoBack, onSelectFD, onNavigateToFDCalculator, customStyles =
     }, [customerApplications, dispatch]);
     // Unified handler: behave like bottom sheet Continue flow
     const handlePendingFDContinue = async () => {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         // Persist active FD data to store for use across screens
         try {
             if (activeFD) {
@@ -490,9 +496,14 @@ const FDList = ({ onGoBack, onSelectFD, onNavigateToFDCalculator, customStyles =
         catch (e) {
             // Handle error silently
         }
-        // Get current state from customer applications for workflow navigation
-        let currentState = null;
+        // Get current state (from current_state_caption first) and identifiers from customer applications for workflow navigation
+        let currentStateCaption = undefined;
+        let currentStateNumeric = undefined;
         let transactionId = undefined;
+        let applicationId = undefined;
+        let workflowInstanceId = undefined;
+        let entityId = undefined;
+        let providerIdFromApp = undefined;
         try {
             if (customerApplications && !isCustomerApplicationsEmpty()) {
                 // Normalize list
@@ -512,30 +523,85 @@ const FDList = ({ onGoBack, onSelectFD, onNavigateToFDCalculator, customStyles =
                         const s = (a.wf_status || a.status || '').toString();
                         return s === 'Active';
                     }) || applicationsData[0];
-                    currentState = appData.current_state;
-                    // Extract transactionId from application data
+                    currentStateCaption = (_a = appData.current_state_caption) !== null && _a !== void 0 ? _a : appData.currentStateCaption;
+                    currentStateNumeric = (_b = appData.current_state) !== null && _b !== void 0 ? _b : appData.currentState;
                     transactionId = appData.transaction_id || appData.transactionId;
+                    applicationId = appData.application_id || appData.applicationId || appData.id;
+                    workflowInstanceId = appData.workflow_instance_id || appData.workflowInstanceId || ((_c = appData.workflow) === null || _c === void 0 ? void 0 : _c.instanceId);
+                    entityId = appData.entity_id || appData.entityId || ((_d = appData.entity) === null || _d === void 0 ? void 0 : _d.id);
+                    providerIdFromApp = appData.provider_id || appData.providerId || appData.fd_provider_id || appData.fdProviderId;
                 }
             }
         }
         catch (error) {
             // Handle error silently
         }
-        // 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) {
-            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 });
+        // Resolve state from current_state_caption (preferred) or current_state
+        const currentState = (0, workflowConstants_1.resolveWorkflowState)(currentStateCaption, currentStateNumeric);
+        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;
+        // If FD status is payment (410 or SHRIRAM_V1_S8_PAYMENT): run reverse feed first, then navigate by result or retry and go to Payment
+        const isPaymentState = currentState === workflowConstants_1.WORKFLOW_STATES.PAYMENT || currentStateCaption === 'SHRIRAM_V1_S8_PAYMENT';
+        const resolvedAppId = applicationId || (onboardingIds === null || onboardingIds === void 0 ? void 0 : onboardingIds.applicationId);
+        const resolvedWfId = workflowInstanceId || (onboardingIds === null || onboardingIds === void 0 ? void 0 : onboardingIds.workflowInstanceId);
+        if (isPaymentState && transactionId && resolvedAppId && resolvedWfId) {
+            const userInfo = (0, appDataConfig_1.getUserInfoForAPI)();
+            const userRefId = (_e = userInfo === null || userInfo === void 0 ? void 0 : userInfo.userReferenceId) !== null && _e !== void 0 ? _e : userInfo === null || userInfo === void 0 ? void 0 : userInfo.id;
+            const providerId = providerIdFromApp || (onboardingIds === null || onboardingIds === void 0 ? void 0 : onboardingIds.providerId);
+            const resolvedEntityId = (_f = entityId !== null && entityId !== void 0 ? entityId : onboardingIds === null || onboardingIds === void 0 ? void 0 : onboardingIds.entityid) !== null && _f !== void 0 ? _f : '';
+            try {
+                const reverseFeedRes = await paymentReverseFeed({
+                    providerId,
+                    workflowInstanceId: resolvedWfId,
+                    userreferenceid: userRefId,
+                    applicationid: resolvedAppId,
+                    entityid: resolvedEntityId,
+                    transactionId,
+                }).unwrap();
+                const paymentStatus = String((_j = (_h = (_g = reverseFeedRes === null || reverseFeedRes === void 0 ? void 0 : reverseFeedRes.data) === null || _g === void 0 ? void 0 : _g.paymentStatus) !== null && _h !== void 0 ? _h : reverseFeedRes === null || reverseFeedRes === void 0 ? void 0 : reverseFeedRes.paymentStatus) !== null && _j !== void 0 ? _j : '').toUpperCase();
+                if (paymentStatus === 'SUCCESS') {
+                    (0, helpers_1.navigate)('PaymentStatus', { status: 'success', transactionId, fdData: fdDataParam });
+                    return;
+                }
+                if (paymentStatus === 'FAILED') {
+                    (0, helpers_1.navigate)('PaymentStatus', { status: 'failed', transactionId, fdData: fdDataParam });
+                    return;
+                }
+            }
+            catch (e) {
+                // Reverse feed error or no conclusive status → fall through to retry
+            }
+            // No response / still pending: hit retry payment API and navigate to Payment screen
+            try {
+                const retryRes = await paymentRetry({
+                    providerId,
+                    workflowInstanceId: resolvedWfId,
+                    userreferenceid: userRefId,
+                    applicationid: resolvedAppId,
+                    entityid: resolvedEntityId,
+                    transactionId,
+                }).unwrap();
+                const payload = Array.isArray(retryRes === null || retryRes === void 0 ? void 0 : retryRes.data) ? retryRes.data[0] : (_k = retryRes === null || retryRes === void 0 ? void 0 : retryRes.data) !== null && _k !== void 0 ? _k : retryRes;
+                const newPaymentUrl = (payload === null || payload === void 0 ? void 0 : payload.PaymentUrl) || (payload === null || payload === void 0 ? void 0 : payload.paymentUrl);
+                const newTransactionId = (payload === null || payload === void 0 ? void 0 : payload.Transactionid) || (payload === null || payload === void 0 ? void 0 : payload.transactionId) || transactionId;
+                if (newPaymentUrl) {
+                    (0, paymentSession_1.setPaymentSession)({ paymentUrl: newPaymentUrl, transactionId: newTransactionId });
+                    dispatch((0, onboardingSlice_1.setOnboardingIds)({ workflowInstanceId: resolvedWfId, applicationId: resolvedAppId, entityid: resolvedEntityId || undefined, providerId }));
+                }
+            }
+            catch (e) {
+                // Retry API failed; still navigate to Payment so user can try
+            }
+            (0, helpers_1.navigate)('Payment');
             return;
         }
-        // Use workflow navigation based on current state (non-payment states or no transactionId)
-        if (currentState && Object.values(workflowConstants_1.WORKFLOW_STATES).includes(currentState)) {
+        // Use workflow navigation based on resolved current state (from current_state_caption or current_state)
+        if (currentState != null && Object.values(workflowConstants_1.WORKFLOW_STATES).includes(currentState)) {
             (0, workflowNavigator_1.handleWorkflowNavigation)({
                 workflowState: currentState,
                 investmentData: undefined,

package/lib/screens/PaymentStatus.js

@@ -46,6 +46,7 @@ const ActionButton_1 = __importDefault(require("../components/ActionButton"));
 const ThemeContext_1 = require("../theme/ThemeContext");
 const fdApi_1 = require("../api/fdApi");
 const customerApi_1 = require("../api/customerApi");
+const workflowApi_1 = require("../api/workflowApi");
 const store_1 = require("../store");
 const appDataConfig_1 = require("../config/appDataConfig");
 const apiConfig_1 = require("../config/apiConfig");
@@ -77,6 +78,10 @@ const PaymentStatus = ({ onRetry, onContinue, status, transactionId, fdData }) =
     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; });
+    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; });
+    // Previous State API (same as Occupation / Employee screen - move FD to previous state)
+    const [previousState] = (0, workflowApi_1.usePreviousStateMutation)();
+    const [isGoingBack, setIsGoingBack] = (0, react_1.useState)(false);
     const sseXhrRef = (0, react_1.useRef)(null);
     const sseLastIndexRef = (0, react_1.useRef)(0);
     const sseBufferRef = (0, react_1.useRef)({ value: '' });
@@ -276,6 +281,13 @@ const PaymentStatus = ({ onRetry, onContinue, status, transactionId, fdData }) =
             }
         }
         catch (error) {
+            // Fallback: go to Payment screen so user can retry (e.g. when status is pending)
+            if (onRetry) {
+                onRetry();
+            }
+            else {
+                (0, helpers_1.navigate)('Payment');
+            }
         }
     };
     // Handle exit button click - fetch FD details and pass to main app
@@ -374,20 +386,46 @@ const PaymentStatus = ({ onRetry, onContinue, status, transactionId, fdData }) =
             }
         }
     };
-    // Disable hardware back button on PaymentStatus screen
+    // Back handler for pending: same as Occupation screen - call previousState API then navigate to Payment
+    const handleBackPress = (0, react_1.useCallback)(async () => {
+        var _a;
+        setIsGoingBack(true);
+        try {
+            const userInfo = (0, appDataConfig_1.getUserInfoForAPI)();
+            await previousState({
+                providerId: defaultProviderId,
+                workflowInstanceId,
+                userreferenceid: (_a = userInfo === null || userInfo === void 0 ? void 0 : userInfo.userReferenceId) !== null && _a !== void 0 ? _a : userInfo === null || userInfo === void 0 ? void 0 : userInfo.id,
+                applicationid: applicationId,
+                entityid: entityId !== null && entityId !== void 0 ? entityId : '',
+            });
+        }
+        catch (e) {
+            // Handle error silently
+        }
+        finally {
+            setIsGoingBack(false);
+            (0, helpers_1.navigate)('PayNow');
+        }
+    }, [defaultProviderId, workflowInstanceId, applicationId, entityId, previousState]);
+    // On pending: allow back (header + hardware) using same handleBackPress as Occupation. On success/failed: block hardware back.
     (0, react_1.useEffect)(() => {
         if (react_native_1.Platform.OS !== 'android')
             return;
         const onBackPress = () => {
-            // Return true to prevent default behavior (block back button)
-            return true;
+            if (currentStatus === 'pending') {
+                handleBackPress();
+                return true;
+            }
+            return true; // block back on success/failed
         };
         const backHandler = react_native_1.BackHandler.addEventListener('hardwareBackPress', onBackPress);
         return () => backHandler.remove();
-    }, []);
+    }, [currentStatus, handleBackPress]);
     return (react_1.default.createElement(SafeAreaWrapper_1.default, { includeTop: true, bottomPadding: 0, statusBarColor: colors.background, statusBarStyle: themeName === 'dark' ? 'light-content' : 'dark-content' },
         react_native_1.Platform.OS === 'ios' && react_1.default.createElement(react_native_1.StatusBar, { barStyle: themeName === 'dark' ? 'light-content' : 'dark-content' }),
         react_1.default.createElement(react_native_1.View, { style: styles.container },
+            currentStatus === 'pending' && (react_1.default.createElement(components_1.Header, { title: bank_1.BANK_STRINGS.PAYMENT_STATUS_TITLE, onBackPress: handleBackPress, backgroundColor: colors.primary })),
             react_1.default.createElement(react_native_1.ScrollView, { showsVerticalScrollIndicator: false, contentContainerStyle: styles.scrollContent },
                 react_1.default.createElement(react_native_1.View, { style: styles.iconContainer },
                     react_1.default.createElement(react_native_1.View, { style: styles.iconCircleOuter },
@@ -408,7 +446,8 @@ const PaymentStatus = ({ onRetry, onContinue, status, transactionId, fdData }) =
                     react_1.default.createElement(react_native_1.Text, { style: styles.disclaimerText }, bank_1.BANK_STRINGS.PAYMENT_SUCCESS_DISCLAIMER)))),
             react_1.default.createElement(react_native_1.View, { style: styles.footer },
                 currentStatus === 'success' && (react_1.default.createElement(ActionButton_1.default, { title: isLoadingCustomerApplications ? common_1.COMMON_STRINGS.LOADING : common_1.COMMON_STRINGS.EXIT, onPress: handleExit, disabled: isLoadingCustomerApplications })),
-                currentStatus === 'failed' && (react_1.default.createElement(ActionButton_1.default, { title: isLoadingPaymentRetry ? common_1.COMMON_STRINGS.RETRYING : bank_1.BANK_STRINGS.RETRY_PAYMENT_BUTTON, onPress: handlePaymentRetry, disabled: isLoadingPaymentRetry }))))));
+                currentStatus === 'failed' && (react_1.default.createElement(ActionButton_1.default, { title: isLoadingPaymentRetry ? common_1.COMMON_STRINGS.RETRYING : bank_1.BANK_STRINGS.RETRY_PAYMENT_BUTTON, onPress: handlePaymentRetry, disabled: isLoadingPaymentRetry })),
+                currentStatus === 'pending' && (react_1.default.createElement(ActionButton_1.default, { title: isLoadingPaymentRetry ? common_1.COMMON_STRINGS.RETRYING : bank_1.BANK_STRINGS.RETRY_PAYMENT_BUTTON, onPress: handlePaymentRetry, disabled: isLoadingPaymentRetry }))))));
 };
 const createStyles = (colors, typography, status, themeName) => {
     const isDark = themeName === 'dark';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@finspringinnovations/fdsdk",
-    "version": "0.0.7",
+    "version": "0.0.8",
     "description": "FD SDK for React Native applications",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

package/src/config/workflowConstants.ts

@@ -1,4 +1,4 @@
-// Workflow State Constants
+// Workflow State Constants (numeric)
 export const WORKFLOW_STATES = {
     INITIATION: 404,
     START: 405,
@@ -11,6 +11,19 @@ export const WORKFLOW_STATES = {
     END: 403,
 } as const;
 
+// Workflow state captions from backend (current_state_caption) → numeric state
+export const WORKFLOW_STATE_CAPTIONS: Record<string, number> = {
+    SHRIRAM_V1_S1_START: 405,
+    SHRIRAM_V1_S2_INITIATION: 404,
+    SHRIRAM_V1_S3_CUSTOMER_INFO_KYC: 406,
+    SHRIRAM_V1_S4_OCCUPATION: 409,
+    SHRIRAM_V1_S5_NOMINEE_DETAILS: 407,
+    SHRIRAM_V1_S6_BANK_DETAILS: 408,
+    SHRIRAM_V1_S7_FD_CREATION: 411,
+    SHRIRAM_V1_S8_PAYMENT: 410,
+    SHRIRAM_V1_S9_END: 403,
+};
+
 // Workflow Task Constants
 export const WORKFLOW_TASKS = {
     RESEND_OTP: 11045,
@@ -21,6 +34,23 @@ export const WORKFLOW_TASKS = {
 export type WorkflowState = typeof WORKFLOW_STATES[keyof typeof WORKFLOW_STATES];
 export type WorkflowTask = typeof WORKFLOW_TASKS[keyof typeof WORKFLOW_TASKS];
 
+/**
+ * Resolve workflow state from either current_state_caption (string) or current_state (number).
+ * Prefers caption when available so navigation is based on current_state_caption.
+ */
+export function resolveWorkflowState(caption: string | null | undefined, numericState: number | null | undefined): WorkflowState | null {
+    const captionStr = typeof caption === 'string' ? caption.trim() : '';
+    if (captionStr && WORKFLOW_STATE_CAPTIONS[captionStr] !== undefined) {
+        return WORKFLOW_STATE_CAPTIONS[captionStr] as WorkflowState;
+    }
+    const num = numericState != null ? Number(numericState) : NaN;
+    const values = Object.values(WORKFLOW_STATES) as number[];
+    if (!Number.isNaN(num) && values.includes(num)) {
+        return num as WorkflowState;
+    }
+    return null;
+}
+
 // Helper function to get workflow state name
 export const getWorkflowStateName = (stateId: number): string | undefined => {
     const entry = Object.entries(WORKFLOW_STATES).find(([_, value]) => value === stateId);

package/src/constants/strings/fd.ts

@@ -149,7 +149,7 @@ export const FD_STRINGS = {
     LESS_THAN_1_3Y_TAB: '<1-3Y',
     LESS_THAN_3_5Y_TAB: '<3-5Y',
     GREATER_THAN_5Y_TAB: '>5Y',
-    ACTIVE_FDS_SECTION: 'Active FDs',
+    ACTIVE_FDS_SECTION: 'Pending FDs',
 
     // Loading and status messages
     LOADING_RATES: 'Loading rates...',

package/src/screens/FDList.tsx

@@ -20,15 +20,17 @@ import { useGetCustomerApplicationsMutation } from '../api/customerApi';
 import { useGetMasterDataQuery } from '../api/masterDataApi';
 import { useMasterData } from '../providers/MasterDataProvider';
 import { useTerminateWorkflowMutation } from '../api/workflowApi';
+import { usePaymentReverseFeedMutation, usePaymentRetryMutation } from '../api/fdApi';
 import type { ColorScheme, ThemeName } from '../theme';
 import SafeAreaWrapper from '../components/SafeAreaWrapper';
 import { getUserInfoForAPI, getAppData } from '../config/appDataConfig';
 import { navigate } from '../navigation/helpers';
+import { setPaymentSession } from '../state/paymentSession';
 import { useAppDispatch, useAppSelector } from '../store';
 import { setOnboardingIds } from '../store/onboardingSlice';
 import { setFDListSelected } from '../store/fdListSelectedSlice';
 import { handleWorkflowNavigation } from '../navigation/workflowNavigator';
-import { WORKFLOW_STATES } from '../config/workflowConstants';
+import { WORKFLOW_STATES, WORKFLOW_STATE_CAPTIONS, resolveWorkflowState } from '../config/workflowConstants';
 import { setGlobalData } from '../utils/globalData';
 import { FD_STRINGS } from '../constants/strings';
 import { base64Images } from '../constants/strings/base64Images';
@@ -76,6 +78,7 @@ const FDList: React.FC<FDListProps> = ({
     const spacing = useSpacing();
     const { themeName } = useTheme();
     const dispatch = useAppDispatch();
+    const onboardingIds = useAppSelector((state: any) => state?.onboarding);
     const hasFetchedRatesRef = React.useRef(false);
     const isCallingInterestRatesRef = React.useRef(false);
 
@@ -98,6 +101,9 @@ const FDList: React.FC<FDListProps> = ({
         isLoading: isTerminatingWorkflow,
     }] = useTerminateWorkflowMutation();
 
+    const [paymentReverseFeed, { isLoading: isCheckingPaymentStatus }] = usePaymentReverseFeedMutation();
+    const [paymentRetry, { isLoading: isRetryingPayment }] = usePaymentRetryMutation();
+
     const styles = createStyles(colors, typography, spacing, themeName);
     const { setMasterData } = useMasterData();
 
@@ -561,9 +567,14 @@ const FDList: React.FC<FDListProps> = ({
             // Handle error silently
         }
 
-        // Get current state from customer applications for workflow navigation
-        let currentState: any = null;
+        // Get current state (from current_state_caption first) and identifiers from customer applications for workflow navigation
+        let currentStateCaption: string | null | undefined = undefined;
+        let currentStateNumeric: number | null | undefined = undefined;
         let transactionId: string | undefined = undefined;
+        let applicationId: string | undefined = undefined;
+        let workflowInstanceId: string | undefined = undefined;
+        let entityId: string | undefined = undefined;
+        let providerIdFromApp: string | undefined = undefined;
         try {
             if (customerApplications && !isCustomerApplicationsEmpty()) {
                 // Normalize list
@@ -582,32 +593,90 @@ const FDList: React.FC<FDListProps> = ({
                         const s = (a.wf_status || a.status || '').toString();
                         return s === 'Active';
                     }) || applicationsData[0];
-                    currentState = appData.current_state;
-
-                    // Extract transactionId from application data
+                    currentStateCaption = appData.current_state_caption ?? appData.currentStateCaption;
+                    currentStateNumeric = appData.current_state ?? appData.currentState;
                     transactionId = appData.transaction_id || appData.transactionId;
+                    applicationId = appData.application_id || appData.applicationId || appData.id;
+                    workflowInstanceId = appData.workflow_instance_id || appData.workflowInstanceId || appData.workflow?.instanceId;
+                    entityId = appData.entity_id || appData.entityId || appData.entity?.id;
+                    providerIdFromApp = appData.provider_id || appData.providerId || appData.fd_provider_id || appData.fdProviderId;
                 }
             }
         } catch (error) {
             // Handle error silently
         }
 
-        // If current state is payment and transactionId is available,
-        // open PaymentStatus and let SSE (/events) drive status updates.
-        if (currentState === WORKFLOW_STATES.PAYMENT && transactionId) {
-            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);
+        // Resolve state from current_state_caption (preferred) or current_state
+        const currentState = resolveWorkflowState(currentStateCaption, currentStateNumeric);
+
+        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;
+
+        // If FD status is payment (410 or SHRIRAM_V1_S8_PAYMENT): run reverse feed first, then navigate by result or retry and go to Payment
+        const isPaymentState = currentState === WORKFLOW_STATES.PAYMENT || currentStateCaption === 'SHRIRAM_V1_S8_PAYMENT';
+        const resolvedAppId = applicationId || onboardingIds?.applicationId;
+        const resolvedWfId = workflowInstanceId || onboardingIds?.workflowInstanceId;
+        if (isPaymentState && transactionId && resolvedAppId && resolvedWfId) {
+            const userInfo = getUserInfoForAPI();
+            const userRefId = userInfo?.userReferenceId ?? userInfo?.id;
+            const providerId = providerIdFromApp || onboardingIds?.providerId;
+            const resolvedEntityId = entityId ?? onboardingIds?.entityid ?? '';
+
+            try {
+                const reverseFeedRes = await paymentReverseFeed({
+                    providerId,
+                    workflowInstanceId: resolvedWfId,
+                    userreferenceid: userRefId,
+                    applicationid: resolvedAppId,
+                    entityid: resolvedEntityId,
+                    transactionId,
+                }).unwrap();
+
+                const paymentStatus = String(reverseFeedRes?.data?.paymentStatus ?? reverseFeedRes?.paymentStatus ?? '').toUpperCase();
+                if (paymentStatus === 'SUCCESS') {
+                    navigate('PaymentStatus', { status: 'success', transactionId, fdData: fdDataParam } as any);
+                    return;
+                }
+                if (paymentStatus === 'FAILED') {
+                    navigate('PaymentStatus', { status: 'failed', transactionId, fdData: fdDataParam } as any);
+                    return;
+                }
+            } catch (e) {
+                // Reverse feed error or no conclusive status → fall through to retry
+            }
+
+            // No response / still pending: hit retry payment API and navigate to Payment screen
+            try {
+                const retryRes = await paymentRetry({
+                    providerId,
+                    workflowInstanceId: resolvedWfId,
+                    userreferenceid: userRefId,
+                    applicationid: resolvedAppId,
+                    entityid: resolvedEntityId,
+                    transactionId,
+                }).unwrap();
+
+                const payload: any = Array.isArray((retryRes as any)?.data) ? (retryRes as any).data[0] : (retryRes as any)?.data ?? retryRes;
+                const newPaymentUrl = payload?.PaymentUrl || payload?.paymentUrl;
+                const newTransactionId = payload?.Transactionid || payload?.transactionId || transactionId;
+                if (newPaymentUrl) {
+                    setPaymentSession({ paymentUrl: newPaymentUrl, transactionId: newTransactionId });
+                    dispatch(setOnboardingIds({ workflowInstanceId: resolvedWfId, applicationId: resolvedAppId, entityid: resolvedEntityId || undefined, providerId }));
+                }
+            } catch (e) {
+                // Retry API failed; still navigate to Payment so user can try
+            }
+            navigate('Payment');
             return;
         }
 
-        // Use workflow navigation based on current state (non-payment states or no transactionId)
-        if (currentState && Object.values(WORKFLOW_STATES).includes(currentState)) {
+        // Use workflow navigation based on resolved current state (from current_state_caption or current_state)
+        if (currentState != null && Object.values(WORKFLOW_STATES).includes(currentState)) {
             handleWorkflowNavigation({
                 workflowState: currentState,
                 investmentData: undefined,

package/src/screens/PaymentStatus.tsx

@@ -3,11 +3,12 @@ import { View, Text, StyleSheet, ScrollView, Alert, Image, BackHandler, Platform
 import Icon from 'react-native-vector-icons/Ionicons';
 import { base64Images } from '../constants/strings/base64Images';
 import SafeAreaWrapper from '../components/SafeAreaWrapper';
-import { PaymentDetailsCard } from '../components';
+import { Header, PaymentDetailsCard } from '../components';
 import ActionButton from '../components/ActionButton';
 import { useColors, useTypography, useTheme } from '../theme/ThemeContext';
 import { usePaymentRetryMutation } from '../api/fdApi';
 import { useGetCustomerApplicationsMutation } from '../api/customerApi';
+import { usePreviousStateMutation } from '../api/workflowApi';
 import { useAppSelector } from '../store';
 import { getEnvironmentData, getUserInfoForAPI } from '../config/appDataConfig';
 import { getApiConfig, getSecureHeaders } from '../config/apiConfig';
@@ -65,6 +66,12 @@ 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 defaultProviderId = useAppSelector((state: any) => state?.onboarding?.providerId);
+
+    // Previous State API (same as Occupation / Employee screen - move FD to previous state)
+    const [previousState] = usePreviousStateMutation();
+    const [isGoingBack, setIsGoingBack] = useState(false);
+
     const sseXhrRef = useRef<XMLHttpRequest | null>(null);
     const sseLastIndexRef = useRef<number>(0);
     const sseBufferRef = useRef<{ value: string }>({ value: '' });
@@ -298,6 +305,12 @@ const PaymentStatus: React.FC<PaymentStatusProps> = ({
                 Alert.alert(BANK_STRINGS.PAYMENT_FAILED, BANK_STRINGS.PAYMENT_GATEWAY_ERROR);
             }
         } catch (error) {
+            // Fallback: go to Payment screen so user can retry (e.g. when status is pending)
+            if (onRetry) {
+                onRetry();
+            } else {
+                navigate('Payment');
+            }
         }
     };
 
@@ -412,13 +425,36 @@ const PaymentStatus: React.FC<PaymentStatusProps> = ({
         }
     };
 
-    // Disable hardware back button on PaymentStatus screen
+    // Back handler for pending: same as Occupation screen - call previousState API then navigate to Payment
+    const handleBackPress = useCallback(async () => {
+        setIsGoingBack(true);
+        try {
+            const userInfo = getUserInfoForAPI();
+            await previousState({
+                providerId: defaultProviderId,
+                workflowInstanceId,
+                userreferenceid: userInfo?.userReferenceId ?? userInfo?.id,
+                applicationid: applicationId,
+                entityid: entityId ?? '',
+            });
+        } catch (e) {
+            // Handle error silently
+        } finally {
+            setIsGoingBack(false);
+            navigate('PayNow');
+        }
+    }, [defaultProviderId, workflowInstanceId, applicationId, entityId, previousState]);
+
+    // On pending: allow back (header + hardware) using same handleBackPress as Occupation. On success/failed: block hardware back.
     useEffect(() => {
         if (Platform.OS !== 'android') return;
 
         const onBackPress = () => {
-            // Return true to prevent default behavior (block back button)
-            return true;
+            if (currentStatus === 'pending') {
+                handleBackPress();
+                return true;
+            }
+            return true; // block back on success/failed
         };
 
         const backHandler = BackHandler.addEventListener(
@@ -427,7 +463,7 @@ const PaymentStatus: React.FC<PaymentStatusProps> = ({
         );
 
         return () => backHandler.remove();
-    }, []);
+    }, [currentStatus, handleBackPress]);
 
     return (
         <SafeAreaWrapper
@@ -439,9 +475,13 @@ const PaymentStatus: React.FC<PaymentStatusProps> = ({
             {Platform.OS === 'ios' && <StatusBar barStyle={themeName === 'dark' ? 'light-content' : 'dark-content'} />}
 
             <View style={styles.container}>
-                {/* <Text style={styles.headerTitle}>
-                    {status === 'success' ? 'PAYMENT SUCCESSFUL' : 'PAYMENT FAILED'}
-                </Text> */}
+                {currentStatus === 'pending' && (
+                    <Header
+                        title={BANK_STRINGS.PAYMENT_STATUS_TITLE}
+                        onBackPress={handleBackPress}
+                        backgroundColor={colors.primary}
+                    />
+                )}
 
                 <ScrollView
                     showsVerticalScrollIndicator={false}
@@ -535,6 +575,13 @@ const PaymentStatus: React.FC<PaymentStatusProps> = ({
                             disabled={isLoadingPaymentRetry}
                         />
                     )}
+                    {currentStatus === 'pending' && (
+                        <ActionButton
+                            title={isLoadingPaymentRetry ? COMMON_STRINGS.RETRYING : BANK_STRINGS.RETRY_PAYMENT_BUTTON}
+                            onPress={handlePaymentRetry}
+                            disabled={isLoadingPaymentRetry}
+                        />
+                    )}
                 </View>
             </View>
         </SafeAreaWrapper>