@finspringinnovations/fixeddepositsdk 1.0.2 → 1.0.4

package/lib/navigation/RootNavigator.js

@@ -36,41 +36,168 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const react_1 = __importStar(require("react"));
 const stack_1 = require("@react-navigation/stack");
+const react_1 = __importStar(require("react"));
 const react_native_1 = require("react-native");
-const helpers_1 = require("./helpers");
 // Import screens
-const FDList_1 = __importDefault(require("../screens/FDList"));
-const FDCalculator_1 = __importDefault(require("../screens/FDCalculator"));
 const AadhaarVerification_1 = __importDefault(require("../screens/AadhaarVerification"));
-const ReviewKYC_1 = __importDefault(require("../screens/ReviewKYC"));
-const Employee_1 = __importDefault(require("../screens/Employee"));
-const NomineeDetail_1 = __importDefault(require("../screens/NomineeDetail"));
-const BankDetail_1 = __importDefault(require("../screens/BankDetail"));
 const AddBankAccount_1 = __importDefault(require("../screens/AddBankAccount"));
+const BankDetail_1 = __importDefault(require("../screens/BankDetail"));
+const Employee_1 = __importDefault(require("../screens/Employee"));
+const FDCalculator_1 = __importDefault(require("../screens/FDCalculator"));
+const FDList_1 = __importDefault(require("../screens/FDList"));
 const FindIFSC_1 = __importDefault(require("../screens/FindIFSC"));
+const NomineeDetail_1 = __importDefault(require("../screens/NomineeDetail"));
 const PayNow_1 = __importDefault(require("../screens/PayNow"));
 const Payment_1 = __importDefault(require("../screens/Payment"));
 const PaymentStatus_1 = __importDefault(require("../screens/PaymentStatus"));
+const ReviewKYC_1 = __importDefault(require("../screens/ReviewKYC"));
 // Import full SDK navigators and initialization functions
-const shriramfdsdk_1 = require("@finspringinnovations/shriramfdsdk");
 const mahindrafdsdk_1 = require("@finspringinnovations/mahindrafdsdk");
+const shriramfdsdk_1 = require("@finspringinnovations/shriramfdsdk");
 // Import NavigationContainer and tree wrappers
 const native_1 = require("@react-navigation/native");
 // Import navigation helpers
-const helpers_2 = require("./helpers");
 const paymentSession_1 = require("../state/paymentSession");
+const helpers_1 = require("./helpers");
 // Import data getters from fdsdk
 const appDataConfig_1 = require("../config/appDataConfig");
 const MasterDataProvider_1 = require("../providers/MasterDataProvider");
 const ThemeContext_1 = require("../theme/ThemeContext");
 const Stack = (0, stack_1.createStackNavigator)();
 const MahindraRootNavigatorAny = mahindrafdsdk_1.RootNavigator;
+const ShriramSDKContent = ({ masterData, routeParams, onSDKExit, onSDKPanRequired, }) => {
+    const { setMasterData } = (0, shriramfdsdk_1.useMasterData)();
+    const shriramDispatch = (0, shriramfdsdk_1.useAppDispatch)();
+    const [initialized, setInitialized] = react_1.default.useState(false);
+    react_1.default.useEffect(() => {
+        var _a;
+        // Perform all dispatches sequentially to ensure state is ready
+        if (masterData) {
+            const dataToSet = masterData.data || masterData;
+            setMasterData(dataToSet);
+        }
+        if (routeParams.fdListSelectedData) {
+            try {
+                shriramDispatch((0, shriramfdsdk_1.setFDListSelected)(routeParams.fdListSelectedData));
+            }
+            catch (e) {
+                console.log('[RootNavigator] Error setting Shriram FDListSelected:', e);
+            }
+        }
+        if (routeParams.onboardingIds) {
+            try {
+                shriramDispatch((0, shriramfdsdk_1.setOnboardingIds)(Object.assign(Object.assign({}, routeParams.onboardingIds), { providerId: routeParams.providerId || ((_a = routeParams.onboardingIds) === null || _a === void 0 ? void 0 : _a.providerId) })));
+            }
+            catch (e) {
+                console.log('[RootNavigator] Error setting Shriram OnboardingIds:', e);
+            }
+        }
+        if (routeParams.shriramSDKGlobalData) {
+            try {
+                const completeFDData = !!routeParams.shriramSDKGlobalData;
+                (0, shriramfdsdk_1.setGlobalData)({ completeFDData });
+            }
+            catch (e) {
+                console.log('[RootNavigator] Error setting Shriram GlobalData:', e);
+            }
+        }
+        setInitialized(true);
+    }, [masterData, routeParams, shriramDispatch, setMasterData]);
+    if (!initialized) {
+        return null; // Or a loading spinner if preferred
+    }
+    return (react_1.default.createElement(shriramfdsdk_1.RootNavigator, { config: {
+            initialRouteName: routeParams.initialRouteName || 'FDCalculator',
+            initialPaymentStatusParams: routeParams.initialPaymentStatusParams,
+            initialFDContext: {
+                providerId: routeParams.providerId,
+                fdListSelectedData: routeParams.fdListSelectedData,
+                completeFDData: routeParams.completeFDData,
+            },
+        }, onExit: onSDKExit, onPanRequired: onSDKPanRequired }));
+};
+const MahindraSDKContent = ({ masterData, routeParams, onSDKExit, onSDKPanRequired, }) => {
+    const { setMasterData } = (0, mahindrafdsdk_1.useMasterData)();
+    const mahindraDispatch = (0, mahindrafdsdk_1.useAppDispatch)();
+    const [initialized, setInitialized] = react_1.default.useState(false);
+    react_1.default.useEffect(() => {
+        var _a;
+        // Perform all dispatches sequentially to ensure state is ready
+        if (masterData) {
+            const dataToSet = masterData.data || masterData;
+            setMasterData(dataToSet);
+        }
+        if (routeParams.fdListSelectedData) {
+            try {
+                mahindraDispatch((0, mahindrafdsdk_1.setFDListSelected)(routeParams.fdListSelectedData));
+            }
+            catch (e) {
+                console.log('[RootNavigator] Error setting Mahindra FDListSelected:', e);
+            }
+        }
+        if (routeParams.onboardingIds) {
+            try {
+                mahindraDispatch((0, mahindrafdsdk_1.setOnboardingIds)(Object.assign(Object.assign({}, routeParams.onboardingIds), { providerId: routeParams.providerId || ((_a = routeParams.onboardingIds) === null || _a === void 0 ? void 0 : _a.providerId) })));
+            }
+            catch (e) {
+                console.log('[RootNavigator] Error setting Mahindra OnboardingIds:', e);
+            }
+        }
+        if (routeParams.initialPaymentUrl) {
+            (0, mahindrafdsdk_1.setPaymentSession)({
+                paymentUrl: routeParams.initialPaymentUrl,
+                transactionId: routeParams.initialPaymentTransactionId,
+            });
+        }
+        setInitialized(true);
+    }, [masterData, routeParams, mahindraDispatch, setMasterData]);
+    if (!initialized) {
+        return null;
+    }
+    return (react_1.default.createElement(MahindraRootNavigatorAny, { config: {
+            initialRouteName: routeParams.initialRouteName || 'FDCalculator',
+            forceFetchCustomerDetails: !!routeParams.forceFetchCustomerDetails,
+            initialPaymentStatusParams: routeParams.initialPaymentStatusParams,
+            initialFDContext: {
+                providerId: routeParams.providerId,
+                fdListSelectedData: routeParams.fdListSelectedData,
+                completeFDData: routeParams.completeFDData,
+            },
+        }, onExit: onSDKExit, onPanRequired: onSDKPanRequired }));
+};
 const RootNavigator = ({ config = {}, onExit, onPanRequired, }) => {
     // State to track external SDK navigation
     const [externalSDK, setExternalSDK] = react_1.default.useState(null);
     const [externalSDKFDData, setExternalSDKFDData] = react_1.default.useState(null);
+    // Stable exit callbacks — defined here so they're memoized across renders
+    // and can be passed as stable props to the module-level SDK content components.
+    const handleShriramExit = react_1.default.useCallback((fdDetails) => {
+        setExternalSDK(null);
+        setExternalSDKFDData(null);
+        (0, helpers_1.navigate)('FDList');
+        if (fdDetails)
+            onExit === null || onExit === void 0 ? void 0 : onExit(fdDetails);
+    }, [onExit]);
+    const handleShriramPanRequired = react_1.default.useCallback(() => {
+        setExternalSDK(null);
+        setExternalSDKFDData(null);
+        onPanRequired === null || onPanRequired === void 0 ? void 0 : onPanRequired();
+        onExit === null || onExit === void 0 ? void 0 : onExit();
+    }, [onExit, onPanRequired]);
+    const handleMahindraExit = react_1.default.useCallback((fdDetails) => {
+        setExternalSDK(null);
+        setExternalSDKFDData(null);
+        (0, helpers_1.navigate)('FDList');
+        if (fdDetails)
+            onExit === null || onExit === void 0 ? void 0 : onExit(fdDetails);
+    }, [onExit]);
+    const handleMahindraPanRequired = react_1.default.useCallback(() => {
+        setExternalSDK(null);
+        setExternalSDKFDData(null);
+        onPanRequired === null || onPanRequired === void 0 ? void 0 : onPanRequired();
+        onExit === null || onExit === void 0 ? void 0 : onExit();
+    }, [onExit, onPanRequired]);
     // Get master data and theme from fdsdk – same theme (and themeName for dark/primary) is passed to Shriram and Mahindra
     const { masterData } = (0, MasterDataProvider_1.useMasterData)();
     const { theme: fdsdkTheme, themeName: fdsdkThemeName } = (0, ThemeContext_1.useTheme)();
@@ -78,35 +205,8 @@ const RootNavigator = ({ config = {}, onExit, onPanRequired, }) => {
     (0, react_1.useEffect)(() => {
         if (react_native_1.Platform.OS !== 'android')
             return;
-        let lastBackPressTime = 0;
         const onBackPress = () => {
-            var _a, _b, _c;
-            // Check if navigation is ready
-            if (!((_a = helpers_1.navigationRef.current) === null || _a === void 0 ? void 0 : _a.isReady())) {
-                return false;
-            }
-            const now = Date.now();
-            // Ignore synthetic back events triggered during forward navigation (debounce)
-            if (now - lastBackPressTime < 300) {
-                return false;
-            }
-            lastBackPressTime = now;
-            const currentRoute = (_c = (_b = helpers_1.navigationRef.current) === null || _b === void 0 ? void 0 : _b.getCurrentRoute()) === null || _c === void 0 ? void 0 : _c.name;
-            // Block back on Payment and PaymentStatus screens
-            if (currentRoute === "Payment" || currentRoute === "PaymentStatus") {
-                return true; // block hardware back
-            }
-            // FD Calculator should always redirect to FD List
-            if (currentRoute === "FDCalculator") {
-                helpers_1.navigationRef.current.navigate('FDList');
-                return true;
-            }
-            // Skip FDList - let screen-specific handler handle it
-            if (currentRoute === "FDList") {
-                return false; // Let screen-specific handler handle it
-            }
-            // Enable back navigation everywhere else - use the same goBack() helper that header back buttons use
-            (0, helpers_2.goBack)(); // This calls the same function as the header back button
+            // Return true to consume the event and do nothing (stop back navigation)
             return true;
         };
         const subscription = react_native_1.BackHandler.addEventListener("hardwareBackPress", onBackPress);
@@ -144,14 +244,14 @@ const RootNavigator = ({ config = {}, onExit, onPanRequired, }) => {
         }
     }, []);
     // Default screen options
-    const defaultScreenOptions = Object.assign({ headerShown: false, cardStyle: { backgroundColor: '#f8f9fa' }, animationEnabled: true, gestureEnabled: true }, customScreenOptions);
+    const defaultScreenOptions = Object.assign({ headerShown: false, cardStyle: { backgroundColor: '#f8f9fa' }, animationEnabled: true, gestureEnabled: false }, customScreenOptions);
     return (react_1.default.createElement(Stack.Navigator, { initialRouteName: initialRouteName, screenOptions: defaultScreenOptions },
         react_1.default.createElement(Stack.Screen, { name: "FDList", options: { title: 'Fixed Deposits' } }, (props) => (react_1.default.createElement(FDList_1.default, Object.assign({ onGoBack: () => {
                 onExit === null || onExit === void 0 ? void 0 : onExit();
             }, onSelectFD: (fdId) => {
                 // FD selected
             }, onNavigateToFDCalculator: (fdData) => {
-                (0, helpers_2.navigate)('FDCalculator', { fdData });
+                (0, helpers_1.navigate)('FDCalculator', { fdData });
             }, onNavigateToExternalSDK: (sdkType, fdData, context) => {
                 try {
                     // Get app data and environment data from fdsdk
@@ -177,7 +277,7 @@ const RootNavigator = ({ config = {}, onExit, onPanRequired, }) => {
                             // Navigate to external SDK
                             setExternalSDK('shriram');
                             setExternalSDKFDData(fdData);
-                            (0, helpers_2.navigate)('ExternalSDK', {
+                            (0, helpers_1.navigate)('ExternalSDK', {
                                 sdkType: 'shriram',
                                 fdData,
                                 providerId: context === null || context === void 0 ? void 0 : context.providerId,
@@ -199,7 +299,7 @@ const RootNavigator = ({ config = {}, onExit, onPanRequired, }) => {
                             // Navigate to external SDK
                             setExternalSDK('mahindra');
                             setExternalSDKFDData(fdData);
-                            (0, helpers_2.navigate)('ExternalSDK', {
+                            (0, helpers_1.navigate)('ExternalSDK', {
                                 sdkType: 'mahindra',
                                 fdData,
                                 providerId: context === null || context === void 0 ? void 0 : context.providerId,
@@ -224,7 +324,7 @@ const RootNavigator = ({ config = {}, onExit, onPanRequired, }) => {
             } }, props)))),
         react_1.default.createElement(Stack.Screen, { name: "FDCalculator", options: { title: 'FD Calculator' } }, (props) => {
             var _a;
-            return (react_1.default.createElement(FDCalculator_1.default, Object.assign({ onGoBack: () => (0, helpers_2.goBack)(), onNavigateToReviewKYC: () => { var _a; return (0, helpers_2.navigate)('ReviewKYC', { fdData: (_a = props.route.params) === null || _a === void 0 ? void 0 : _a.fdData }); }, fdData: (_a = props.route.params) === null || _a === void 0 ? void 0 : _a.fdData }, props)));
+            return (react_1.default.createElement(FDCalculator_1.default, Object.assign({ onGoBack: () => (0, helpers_1.goBack)(), onNavigateToReviewKYC: () => { var _a; return (0, helpers_1.navigate)('ReviewKYC', { fdData: (_a = props.route.params) === null || _a === void 0 ? void 0 : _a.fdData }); }, fdData: (_a = props.route.params) === null || _a === void 0 ? void 0 : _a.fdData }, props)));
         }),
         react_1.default.createElement(Stack.Screen, { name: "ExternalSDK", options: { title: 'External SDK', gestureEnabled: false } }, (props) => {
             var _a, _b, _c, _d;
@@ -248,142 +348,13 @@ const RootNavigator = ({ config = {}, onExit, onPanRequired, }) => {
                 if (!ok)
                     return null;
             }
-            // Component to set master data and initial FD context in external SDK
-            const ShriramSDKWithMasterData = ({ masterData }) => {
-                const { setMasterData } = (0, shriramfdsdk_1.useMasterData)();
-                const shriramDispatch = (0, shriramfdsdk_1.useAppDispatch)();
-                const routeParams = props.route.params || {};
-                // Set master data
-                react_1.default.useEffect(() => {
-                    if (masterData) {
-                        const dataToSet = masterData.data || masterData;
-                        setMasterData(dataToSet);
-                    }
-                }, [masterData, setMasterData]);
-                // Set FDListSelectedData using Shriram setter
-                react_1.default.useEffect(() => {
-                    if (routeParams.fdListSelectedData) {
-                        try {
-                            shriramDispatch((0, shriramfdsdk_1.setFDListSelected)(routeParams.fdListSelectedData));
-                        }
-                        catch (e) {
-                            console.log('[RootNavigator] Error setting Shriram FDListSelected:', e);
-                        }
-                    }
-                }, [routeParams.fdListSelectedData, shriramDispatch]);
-                // Set OnboardingIds using Shriram setter
-                react_1.default.useEffect(() => {
-                    var _a;
-                    if (routeParams.onboardingIds) {
-                        try {
-                            shriramDispatch((0, shriramfdsdk_1.setOnboardingIds)(Object.assign(Object.assign({}, routeParams.onboardingIds), { providerId: routeParams.providerId || ((_a = routeParams.onboardingIds) === null || _a === void 0 ? void 0 : _a.providerId) })));
-                        }
-                        catch (e) {
-                            console.log('[RootNavigator] Error setting Shriram OnboardingIds:', e);
-                        }
-                    }
-                }, [routeParams.onboardingIds, shriramDispatch]);
-                // Set GlobalData using Shriram setter if present - only set completeFDData boolean
-                react_1.default.useEffect(() => {
-                    if (routeParams.shriramSDKGlobalData) {
-                        try {
-                            const completeFDData = !!routeParams.shriramSDKGlobalData;
-                            (0, shriramfdsdk_1.setGlobalData)({ completeFDData });
-                            console.log('[RootNavigator] Set ShriramSDKGlobalData completeFDData:', completeFDData);
-                        }
-                        catch (e) {
-                            console.log('[RootNavigator] Error setting Shriram GlobalData:', e);
-                        }
-                    }
-                }, [routeParams.shriramSDKGlobalData]);
-                return (react_1.default.createElement(shriramfdsdk_1.RootNavigator, { config: {
-                        initialRouteName: routeParams.initialRouteName || 'FDCalculator',
-                        initialPaymentStatusParams: routeParams.initialPaymentStatusParams,
-                        initialFDContext: {
-                            providerId: routeParams.providerId,
-                            fdListSelectedData: routeParams.fdListSelectedData,
-                            completeFDData: routeParams.completeFDData,
-                        },
-                    }, onExit: (fdDetails) => {
-                        // When exiting external SDK, go back to FDList
-                        setExternalSDK(null);
-                        setExternalSDKFDData(null);
-                        (0, helpers_2.navigate)('FDList');
-                        if (fdDetails) {
-                            onExit === null || onExit === void 0 ? void 0 : onExit(fdDetails);
-                        }
-                    }, onPanRequired: () => {
-                        // Exit full SDK flow back to host app and notify callback
-                        setExternalSDK(null);
-                        setExternalSDKFDData(null);
-                        onPanRequired === null || onPanRequired === void 0 ? void 0 : onPanRequired();
-                        onExit === null || onExit === void 0 ? void 0 : onExit();
-                    } }));
-            };
-            const MahindraSDKWithMasterData = ({ masterData }) => {
-                const { setMasterData } = (0, mahindrafdsdk_1.useMasterData)();
-                const mahindraDispatch = (0, mahindrafdsdk_1.useAppDispatch)();
-                // Set master data
-                react_1.default.useEffect(() => {
-                    if (masterData) {
-                        const dataToSet = masterData.data || masterData;
-                        setMasterData(dataToSet);
-                    }
-                }, [masterData, setMasterData]);
-                // Set FDListSelectedData using Mahindra setter
-                react_1.default.useEffect(() => {
-                    if (routeParams.fdListSelectedData) {
-                        try {
-                            mahindraDispatch((0, mahindrafdsdk_1.setFDListSelected)(routeParams.fdListSelectedData));
-                        }
-                        catch (e) {
-                            console.log('[RootNavigator] Error setting Mahindra FDListSelected:', e);
-                        }
-                    }
-                }, [routeParams.fdListSelectedData, mahindraDispatch]);
-                // Set OnboardingIds using Mahindra setter
-                react_1.default.useEffect(() => {
-                    var _a;
-                    if (routeParams.onboardingIds) {
-                        try {
-                            mahindraDispatch((0, mahindrafdsdk_1.setOnboardingIds)(Object.assign(Object.assign({}, routeParams.onboardingIds), { providerId: routeParams.providerId || ((_a = routeParams.onboardingIds) === null || _a === void 0 ? void 0 : _a.providerId) })));
-                        }
-                        catch (e) {
-                            console.log('[RootNavigator] Error setting Mahindra OnboardingIds:', e);
-                        }
-                    }
-                }, [routeParams.onboardingIds, mahindraDispatch]);
-                return (react_1.default.createElement(MahindraRootNavigatorAny, { config: {
-                        initialRouteName: routeParams.initialRouteName || 'FDCalculator',
-                        forceFetchCustomerDetails: !!routeParams.forceFetchCustomerDetails,
-                        initialFDContext: {
-                            providerId: routeParams.providerId,
-                            fdListSelectedData: routeParams.fdListSelectedData,
-                            completeFDData: routeParams.completeFDData,
-                        },
-                    }, onExit: (fdDetails) => {
-                        // When exiting external SDK, go back to FDList
-                        setExternalSDK(null);
-                        setExternalSDKFDData(null);
-                        (0, helpers_2.navigate)('FDList');
-                        if (fdDetails) {
-                            onExit === null || onExit === void 0 ? void 0 : onExit(fdDetails);
-                        }
-                    }, onPanRequired: () => {
-                        // Exit full SDK flow back to host app and notify callback
-                        setExternalSDK(null);
-                        setExternalSDKFDData(null);
-                        onPanRequired === null || onPanRequired === void 0 ? void 0 : onPanRequired();
-                        onExit === null || onExit === void 0 ? void 0 : onExit();
-                    } }));
-            };
             if (sdkType === 'shriram') {
                 return (react_1.default.createElement(shriramfdsdk_1.ApiProvider, null,
                     react_1.default.createElement(shriramfdsdk_1.MasterDataProvider, null,
                         react_1.default.createElement(shriramfdsdk_1.ThemeProvider, { theme: fdsdkTheme, initialTheme: fdsdkThemeName },
                             react_1.default.createElement(native_1.NavigationIndependentTree, null,
                                 react_1.default.createElement(native_1.NavigationContainer, { ref: shriramfdsdk_1.navigationRef },
-                                    react_1.default.createElement(ShriramSDKWithMasterData, { masterData: externalMasterData })))))));
+                                    react_1.default.createElement(ShriramSDKContent, { masterData: externalMasterData, routeParams: routeParams, onSDKExit: handleShriramExit, onSDKPanRequired: handleShriramPanRequired })))))));
             }
             if (sdkType === 'mahindra') {
                 return (react_1.default.createElement(mahindrafdsdk_1.ApiProvider, null,
@@ -391,57 +362,57 @@ const RootNavigator = ({ config = {}, onExit, onPanRequired, }) => {
                         react_1.default.createElement(mahindrafdsdk_1.ThemeProvider, { theme: fdsdkTheme, initialTheme: fdsdkThemeName },
                             react_1.default.createElement(native_1.NavigationIndependentTree, null,
                                 react_1.default.createElement(native_1.NavigationContainer, { ref: mahindrafdsdk_1.navigationRef },
-                                    react_1.default.createElement(MahindraSDKWithMasterData, { masterData: externalMasterData })))))));
+                                    react_1.default.createElement(MahindraSDKContent, { masterData: externalMasterData, routeParams: routeParams, onSDKExit: handleMahindraExit, onSDKPanRequired: handleMahindraPanRequired })))))));
             }
             return null;
         }),
-        react_1.default.createElement(Stack.Screen, { name: "AadhaarVerification", options: { title: 'Aadhaar Verification' } }, (props) => (react_1.default.createElement(AadhaarVerification_1.default, Object.assign({ onGoBack: () => (0, helpers_2.goBack)(), onVerificationComplete: () => {
-                (0, helpers_2.navigate)('Employee');
+        react_1.default.createElement(Stack.Screen, { name: "AadhaarVerification", options: { title: 'Aadhaar Verification' } }, (props) => (react_1.default.createElement(AadhaarVerification_1.default, Object.assign({ onGoBack: () => (0, helpers_1.goBack)(), onVerificationComplete: () => {
+                (0, helpers_1.navigate)('Employee');
             } }, props)))),
-        react_1.default.createElement(Stack.Screen, { name: "ReviewKYC", options: { title: 'Review KYC' } }, (props) => (react_1.default.createElement(ReviewKYC_1.default, Object.assign({ onGoBack: () => (0, helpers_2.goBack)(), onContinue: () => {
-                (0, helpers_2.navigate)('Employee');
+        react_1.default.createElement(Stack.Screen, { name: "ReviewKYC", options: { title: 'Review KYC' } }, (props) => (react_1.default.createElement(ReviewKYC_1.default, Object.assign({ onGoBack: () => (0, helpers_1.goBack)(), onContinue: () => {
+                (0, helpers_1.navigate)('Employee');
             } }, props)))),
-        react_1.default.createElement(Stack.Screen, { name: "Employee", options: { title: 'Occupation' } }, (props) => (react_1.default.createElement(Employee_1.default, Object.assign({ onGoBack: () => (0, helpers_2.goBack)(), onContinue: () => {
-                (0, helpers_2.navigate)('NomineeDetail');
+        react_1.default.createElement(Stack.Screen, { name: "Employee", options: { title: 'Occupation' } }, (props) => (react_1.default.createElement(Employee_1.default, Object.assign({ onGoBack: () => (0, helpers_1.goBack)(), onContinue: () => {
+                (0, helpers_1.navigate)('NomineeDetail');
             } }, props)))),
-        react_1.default.createElement(Stack.Screen, { name: "NomineeDetail", options: { title: 'Nominee Details' } }, (props) => (react_1.default.createElement(NomineeDetail_1.default, Object.assign({ onGoBack: () => (0, helpers_2.goBack)(), onSave: () => {
-                (0, helpers_2.navigate)('BankDetail');
+        react_1.default.createElement(Stack.Screen, { name: "NomineeDetail", options: { title: 'Nominee Details' } }, (props) => (react_1.default.createElement(NomineeDetail_1.default, Object.assign({ onGoBack: () => (0, helpers_1.goBack)(), onSave: () => {
+                (0, helpers_1.navigate)('BankDetail');
             } }, props)))),
-        react_1.default.createElement(Stack.Screen, { name: "BankDetail", options: { title: 'Bank Details' } }, (props) => (react_1.default.createElement(BankDetail_1.default, Object.assign({ onGoBack: () => (0, helpers_2.goBack)(), onContinue: () => {
-                (0, helpers_2.navigate)('PayNow');
+        react_1.default.createElement(Stack.Screen, { name: "BankDetail", options: { title: 'Bank Details' } }, (props) => (react_1.default.createElement(BankDetail_1.default, Object.assign({ onGoBack: () => (0, helpers_1.goBack)(), onContinue: () => {
+                (0, helpers_1.navigate)('PayNow');
             }, onAddAccount: () => {
-                (0, helpers_2.navigate)('AddBankAccount');
+                (0, helpers_1.navigate)('AddBankAccount');
             } }, props)))),
-        react_1.default.createElement(Stack.Screen, { name: "AddBankAccount", options: { title: 'Add Bank Account' } }, (props) => (react_1.default.createElement(AddBankAccount_1.default, Object.assign({ onGoBack: () => (0, helpers_2.goBack)(), onContinue: () => {
-                (0, helpers_2.goBack)();
+        react_1.default.createElement(Stack.Screen, { name: "AddBankAccount", options: { title: 'Add Bank Account' } }, (props) => (react_1.default.createElement(AddBankAccount_1.default, Object.assign({ onGoBack: () => (0, helpers_1.goBack)(), onContinue: () => {
+                (0, helpers_1.goBack)();
             }, onFindIFSC: () => {
-                (0, helpers_2.navigate)('FindIFSC');
+                (0, helpers_1.navigate)('FindIFSC');
             }, selectedIFSC: (() => {
                 const params = props.route.params;
                 return params === null || params === void 0 ? void 0 : params.selectedIFSC;
             })() }, props)))),
         react_1.default.createElement(Stack.Screen, { name: "FindIFSC", options: { title: 'Find IFSC' } }, (props) => {
             var _a;
-            return (react_1.default.createElement(FindIFSC_1.default, Object.assign({ onGoBack: () => (0, helpers_2.goBack)(), onSelect: (ifscData) => {
-                    (0, helpers_2.pop)(1);
-                    (0, helpers_2.navigate)('AddBankAccount', { selectedIFSC: ifscData });
+            return (react_1.default.createElement(FindIFSC_1.default, Object.assign({ onGoBack: () => (0, helpers_1.goBack)(), onSelect: (ifscData) => {
+                    (0, helpers_1.pop)(1);
+                    (0, helpers_1.navigate)('AddBankAccount', { selectedIFSC: ifscData });
                 }, initialSearchTerm: (_a = props.route.params) === null || _a === void 0 ? void 0 : _a.initialSearchTerm }, props)));
         }),
         react_1.default.createElement(Stack.Screen, { name: "PayNow", options: { title: 'Pay Now' } }, (props) => {
             var _a;
-            return (react_1.default.createElement(PayNow_1.default, Object.assign({ onGoBack: () => (0, helpers_2.goBack)(), onConfirm: () => {
+            return (react_1.default.createElement(PayNow_1.default, Object.assign({ onGoBack: () => (0, helpers_1.goBack)(), onConfirm: () => {
                     // onConfirm is handled inside PayNow after createFD; keep fallback
                 }, 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) => {
             var _a, _b, _c;
-            return (react_1.default.createElement(Payment_1.default, Object.assign({ onGoBack: () => (0, helpers_2.goBack)(), paymentUrl: (_c = (_b = (_a = props.route.params) === null || _a === void 0 ? void 0 : _a.paymentUrl) !== null && _b !== void 0 ? _b : (0, paymentSession_1.getPaymentSession)().paymentUrl) !== null && _c !== void 0 ? _c : '', onPaymentSuccess: (data) => {
-                    (0, helpers_2.navigate)('PaymentStatus', {
+            return (react_1.default.createElement(Payment_1.default, Object.assign({ onGoBack: () => (0, helpers_1.goBack)(), paymentUrl: (_c = (_b = (_a = props.route.params) === null || _a === void 0 ? void 0 : _a.paymentUrl) !== null && _b !== void 0 ? _b : (0, paymentSession_1.getPaymentSession)().paymentUrl) !== null && _c !== void 0 ? _c : '', onPaymentSuccess: (data) => {
+                    (0, helpers_1.navigate)('PaymentStatus', {
                         status: 'success',
                         paymentData: data
                     });
                 }, onPaymentFailure: (error) => {
-                    (0, helpers_2.navigate)('PaymentStatus', {
+                    (0, helpers_1.navigate)('PaymentStatus', {
                         status: 'failed',
                         paymentData: error
                     });
@@ -450,7 +421,7 @@ const RootNavigator = ({ config = {}, onExit, onPanRequired, }) => {
         react_1.default.createElement(Stack.Screen, { name: "PaymentStatus", options: { title: 'Payment Status' } }, (props) => {
             var _a, _b, _c;
             return (react_1.default.createElement(PaymentStatus_1.default, Object.assign({ status: ((_a = props.route.params) === null || _a === void 0 ? void 0 : _a.status) || 'pending', transactionId: (_b = props.route.params) === null || _b === void 0 ? void 0 : _b.transactionId, fdData: (_c = props.route.params) === null || _c === void 0 ? void 0 : _c.fdData, onRetry: () => {
-                    (0, helpers_2.navigate)('Payment');
+                    (0, helpers_1.navigate)('Payment');
                 }, onContinue: (fdDetails) => {
                     onExit === null || onExit === void 0 ? void 0 : onExit(fdDetails);
                 } }, props)));

package/lib/navigation/types.d.ts

@@ -105,12 +105,15 @@ export type RootStackParamList = {
         masterData?: any;
         onboardingIds?: any;
         initialRouteName?: string;
-        /** When opening Shriram with initialRouteName 'PaymentStatus', pass status/transactionId/fdData here */
+        /** When opening Shriram/Mahindra with initialRouteName 'PaymentStatus', pass status/transactionId/fdData here */
         initialPaymentStatusParams?: {
             status?: 'success' | 'failed' | 'pending';
             transactionId?: string;
             fdData?: any;
         };
+        /** When opening Mahindra with initialRouteName 'Payment', pass the resolved payment URL and transactionId here */
+        initialPaymentUrl?: string;
+        initialPaymentTransactionId?: string;
         shriramSDKGlobalData?: any;
         mahindraSDKGlobalData?: any;
         forceFetchCustomerDetails?: boolean;

package/lib/navigation/workflowNavigator.d.ts

@@ -1,4 +1,4 @@
-import type { InvestmentData, CustomerData, AppData, FDData } from '../types/dataTypes';
+import type { AppData, CustomerData, FDData, InvestmentData } from '../types/dataTypes';
 import type { WorkflowStateSriram } from '../types/workflowTypes';
 /**
  * Centralized navigation for FD workflow based on Flutter implementation