@finspringinnovations/fixeddepositsdk 1.0.2 → 1.0.4

package/src/navigation/RootNavigator.tsx

@@ -1,687 +1,703 @@
-import React, { useEffect } from 'react';
 import { createStackNavigator } from '@react-navigation/stack';
+import React, { useEffect } from 'react';
+import { Alert, BackHandler, Platform } from 'react-native';
 import type { RootStackParamList, SDKNavigationConfig } from './types';
-import { BackHandler, Platform, Alert } from 'react-native';
-import { navigationRef } from './helpers';
 
 // Import screens
-import FDListScreen from '../screens/FDList';
-import FDCalculatorScreen from '../screens/FDCalculator';
 import AadhaarVerificationScreen from '../screens/AadhaarVerification';
-import ReviewKYCScreen from '../screens/ReviewKYC';
-import EmployeeScreen from '../screens/Employee';
-import NomineeDetailScreen from '../screens/NomineeDetail';
-import BankDetailScreen from '../screens/BankDetail';
 import AddBankAccountScreen from '../screens/AddBankAccount';
+import BankDetailScreen from '../screens/BankDetail';
+import EmployeeScreen from '../screens/Employee';
+import FDCalculatorScreen from '../screens/FDCalculator';
+import FDListScreen from '../screens/FDList';
 import FindIFSCScreen from '../screens/FindIFSC';
+import NomineeDetailScreen from '../screens/NomineeDetail';
 import PayNowScreen from '../screens/PayNow';
 import PaymentScreen from '../screens/Payment';
 import PaymentStatusScreen from '../screens/PaymentStatus';
+import ReviewKYCScreen from '../screens/ReviewKYC';
 
 // Import full SDK navigators and initialization functions
 import {
-    initializeSDK as initializeShriramSDK,
-    initializeEnvironment as initializeShriramEnvironment,
-    RootNavigator as ShriramRootNavigator,
-    navigationRef as shriramNavigationRef,
-    ThemeProvider as ShriramThemeProvider,
-    ApiProvider as ShriramApiProvider,
-    MasterDataProvider as ShriramMasterDataProvider,
-    useMasterData as useShriramMasterData,
-    useAppDispatch as useShriramAppDispatch,
-    setFDListSelected as setShriramFDListSelected,
-    setOnboardingIds as setShriramOnboardingIds,
-    setGlobalData as setShriramGlobalData,
-    type AppData as ShriramAppData,
-    type EnvironmentData as ShriramEnvironmentData
-} from '@finspringinnovations/shriramfdsdk';
-import {
-    initializeSDK as initializeMahindraSDK,
-    initializeEnvironment as initializeMahindraEnvironment,
-    RootNavigator as MahindraRootNavigator,
-    navigationRef as mahindraNavigationRef,
-    ThemeProvider as MahindraThemeProvider,
-    ApiProvider as MahindraApiProvider,
-    MasterDataProvider as MahindraMasterDataProvider,
-    useMasterData as useMahindraMasterData,
-    useAppDispatch as useMahindraAppDispatch,
-    setFDListSelected as setMahindraFDListSelected,
-    setOnboardingIds as setMahindraOnboardingIds,
-    type AppData as MahindraAppData,
-    type EnvironmentData as MahindraEnvironmentData
+	initializeEnvironment as initializeMahindraEnvironment,
+	initializeSDK as initializeMahindraSDK,
+	ApiProvider as MahindraApiProvider,
+	MasterDataProvider as MahindraMasterDataProvider,
+	navigationRef as mahindraNavigationRef,
+	RootNavigator as MahindraRootNavigator,
+	ThemeProvider as MahindraThemeProvider,
+	setFDListSelected as setMahindraFDListSelected,
+	setOnboardingIds as setMahindraOnboardingIds,
+	setPaymentSession as setMahindraPaymentSession,
+	useAppDispatch as useMahindraAppDispatch,
+	useMasterData as useMahindraMasterData,
+	type AppData as MahindraAppData,
+	type EnvironmentData as MahindraEnvironmentData
 } from '@finspringinnovations/mahindrafdsdk';
+import {
+	initializeEnvironment as initializeShriramEnvironment,
+	initializeSDK as initializeShriramSDK,
+	setFDListSelected as setShriramFDListSelected,
+	setGlobalData as setShriramGlobalData,
+	setOnboardingIds as setShriramOnboardingIds,
+	ApiProvider as ShriramApiProvider,
+	MasterDataProvider as ShriramMasterDataProvider,
+	navigationRef as shriramNavigationRef,
+	RootNavigator as ShriramRootNavigator,
+	ThemeProvider as ShriramThemeProvider,
+	useAppDispatch as useShriramAppDispatch,
+	useMasterData as useShriramMasterData,
+	type AppData as ShriramAppData,
+	type EnvironmentData as ShriramEnvironmentData
+} from '@finspringinnovations/shriramfdsdk';
 
 // Import NavigationContainer and tree wrappers
 import { NavigationContainer, NavigationIndependentTree } from '@react-navigation/native';
 
 // Import navigation helpers
-import { goBack, navigate, replace, pop } from './helpers';
 import { getPaymentSession } from '../state/paymentSession';
+import { goBack, navigate, pop } from './helpers';
 
 // Import data getters from fdsdk
 import { getAppData, getEnvironmentData } from '../config/appDataConfig';
 import { useMasterData } from '../providers/MasterDataProvider';
 import { useTheme } from '../theme/ThemeContext';
 
-const Stack = createStackNavigator<RootStackParamList>();
+const Stack = createStackNavigator < RootStackParamList > ();
 const MahindraRootNavigatorAny = MahindraRootNavigator as React.ComponentType<any>;
 
+// ─── Module-level SDK content components ───────────────────────────────────
+// Defined OUTSIDE the render prop so React sees a stable component type on
+// every parent re-render. Defining them inside the render prop creates a new
+// function reference each render, causing React to unmount + remount the
+// entire SDK NavigationContainer (and all child screens) on every render.
+
+interface ShriramSDKContentProps {
+	masterData: any;
+	routeParams: any;
+	onSDKExit: (fdDetails?: any) => void;
+	onSDKPanRequired: () => void;
+}
+
+const ShriramSDKContent: React.FC<ShriramSDKContentProps> = ({
+	masterData,
+	routeParams,
+	onSDKExit,
+	onSDKPanRequired,
+}) => {
+	const { setMasterData } = useShriramMasterData();
+	const shriramDispatch = useShriramAppDispatch();
+
+	const [initialized, setInitialized] = React.useState(false);
+
+	React.useEffect(() => {
+		// Perform all dispatches sequentially to ensure state is ready
+		if (masterData) {
+			const dataToSet = masterData.data || masterData;
+			setMasterData(dataToSet);
+		}
+
+		if (routeParams.fdListSelectedData) {
+			try {
+				shriramDispatch(setShriramFDListSelected(routeParams.fdListSelectedData));
+			} catch (e) {
+				console.log('[RootNavigator] Error setting Shriram FDListSelected:', e);
+			}
+		}
+
+		if (routeParams.onboardingIds) {
+			try {
+				shriramDispatch(setShriramOnboardingIds({
+					...routeParams.onboardingIds,
+					providerId: routeParams.providerId || routeParams.onboardingIds?.providerId,
+				}));
+			} catch (e) {
+				console.log('[RootNavigator] Error setting Shriram OnboardingIds:', e);
+			}
+		}
+
+		if (routeParams.shriramSDKGlobalData) {
+			try {
+				const completeFDData = !!routeParams.shriramSDKGlobalData;
+				setShriramGlobalData({ 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 (
+		<ShriramRootNavigator
+			config={{
+				initialRouteName: routeParams.initialRouteName || 'FDCalculator',
+				initialPaymentStatusParams: routeParams.initialPaymentStatusParams,
+				initialFDContext: {
+					providerId: routeParams.providerId,
+					fdListSelectedData: routeParams.fdListSelectedData,
+					completeFDData: routeParams.completeFDData,
+				},
+			} as any}
+			onExit={onSDKExit}
+			onPanRequired={onSDKPanRequired}
+		/>
+	);
+};
+
+interface MahindraSDKContentProps {
+	masterData: any;
+	routeParams: any;
+	onSDKExit: (fdDetails?: any) => void;
+	onSDKPanRequired: () => void;
+}
+
+const MahindraSDKContent: React.FC<MahindraSDKContentProps> = ({
+	masterData,
+	routeParams,
+	onSDKExit,
+	onSDKPanRequired,
+}) => {
+	const { setMasterData } = useMahindraMasterData();
+	const mahindraDispatch = useMahindraAppDispatch();
+
+	const [initialized, setInitialized] = React.useState(false);
+
+	React.useEffect(() => {
+		// Perform all dispatches sequentially to ensure state is ready
+		if (masterData) {
+			const dataToSet = masterData.data || masterData;
+			setMasterData(dataToSet);
+		}
+
+		if (routeParams.fdListSelectedData) {
+			try {
+				mahindraDispatch(setMahindraFDListSelected(routeParams.fdListSelectedData));
+			} catch (e) {
+				console.log('[RootNavigator] Error setting Mahindra FDListSelected:', e);
+			}
+		}
+
+		if (routeParams.onboardingIds) {
+			try {
+				mahindraDispatch(setMahindraOnboardingIds({
+					...routeParams.onboardingIds,
+					providerId: routeParams.providerId || routeParams.onboardingIds?.providerId,
+				}));
+			} catch (e) {
+				console.log('[RootNavigator] Error setting Mahindra OnboardingIds:', e);
+			}
+		}
+
+		if (routeParams.initialPaymentUrl) {
+			setMahindraPaymentSession({
+				paymentUrl: routeParams.initialPaymentUrl,
+				transactionId: routeParams.initialPaymentTransactionId,
+			});
+		}
+
+		setInitialized(true);
+	}, [masterData, routeParams, mahindraDispatch, setMasterData]);
+
+	if (!initialized) {
+		return null;
+	}
+
+
+	return (
+		<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}
+		/>
+	);
+};
+// ───────────────────────────────────────────────────────────────────────────
+
 interface RootNavigatorProps {
-    config?: SDKNavigationConfig;
-    onExit?: (fdDetails?: any) => void;
-    onPanRequired?: () => void;
+	config?: SDKNavigationConfig;
+	onExit?: (fdDetails?: any) => void;
+	onPanRequired?: () => void;
 }
 
 const RootNavigator: React.FC<RootNavigatorProps> = ({
-    config = {},
-    onExit,
-    onPanRequired,
+	config = {},
+	onExit,
+	onPanRequired,
 }) => {
-    // State to track external SDK navigation
-    const [externalSDK, setExternalSDK] = React.useState<'shriram' | 'mahindra' | null>(null);
-    const [externalSDKFDData, setExternalSDKFDData] = React.useState<any>(null);
-
-    // Get master data and theme from fdsdk – same theme (and themeName for dark/primary) is passed to Shriram and Mahindra
-    const { masterData } = useMasterData();
-    const { theme: fdsdkTheme, themeName: fdsdkThemeName } = useTheme();
-
-    // Handle Android hardware back button
-    useEffect(() => {
-        if (Platform.OS !== 'android') return;
-
-        let lastBackPressTime = 0;
-
-        const onBackPress = () => {
-            // Check if navigation is ready
-            if (!navigationRef.current?.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 = navigationRef.current?.getCurrentRoute()?.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") {
-                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
-            goBack(); // This calls the same function as the header back button
-            return true;
-        };
-
-        const subscription = BackHandler.addEventListener("hardwareBackPress", onBackPress);
-
-        return () => {
-            subscription.remove();
-        };
-    }, []);
-
-    const {
-        initialRouteName = 'FDList',
-        customScreenOptions = {},
-    } = config;
-
-    const ensureExternalSdkInitialized = React.useCallback((sdkType: 'shriram' | 'mahindra') => {
-        const appData = getAppData();
-        const storedEnv = getEnvironmentData();
-        const envData = storedEnv as ShriramEnvironmentData & MahindraEnvironmentData | null;
-
-        if (!appData) {
-            Alert.alert('Error', 'FDSDK app data is missing. Please restart the flow.');
-            return false;
-        }
-        if (!envData) {
-            Alert.alert('Error', 'FDSDK environment data is missing. Please initialize environment from host app.');
-            return false;
-        }
-
-        try {
-            if (sdkType === 'shriram') {
-                initializeShriramEnvironment(envData as ShriramEnvironmentData);
-                initializeShriramSDK(appData as ShriramAppData);
-            } else {
-                initializeMahindraEnvironment(envData as MahindraEnvironmentData);
-                initializeMahindraSDK(appData as MahindraAppData);
-            }
-            return true;
-        } catch (error: any) {
-            Alert.alert(
-                'Error',
-                `Failed to initialize ${sdkType === 'shriram' ? 'Shriram' : 'Mahindra'} SDK: ${error?.message || 'Unknown error'}`
-            );
-            return false;
-        }
-    }, []);
-
-    // Default screen options
-    const defaultScreenOptions = {
-        headerShown: false,
-        cardStyle: { backgroundColor: '#f8f9fa' },
-        animationEnabled: true,
-        gestureEnabled: true,
-        ...customScreenOptions,
-    };
-
-    return (
-        <Stack.Navigator
-            initialRouteName={initialRouteName}
-            screenOptions={defaultScreenOptions}
-        >
-            <Stack.Screen
-                name="FDList"
-                options={{ title: 'Fixed Deposits' }}
-            >
-                {(props) => (
-                    <FDListScreen
-                        onGoBack={() => {
-                            onExit?.();
-                        }}
-                        onSelectFD={(fdId) => {
-                            // FD selected
-                        }}
-                        onNavigateToFDCalculator={(fdData) => {
-                            navigate('FDCalculator', { fdData });
-                        }}
-                        onNavigateToExternalSDK={(sdkType, fdData, context) => {
-                            try {
-                                // Get app data and environment data from fdsdk
-                                const appData = getAppData();
-                                const envData = getEnvironmentData();
-
-                                // Validate that we have the required data
-                                if (!appData) {
-                                    console.error('Cannot navigate to external SDK: App data not initialized');
-                                    Alert.alert('Error', 'App data not available. Please initialize the SDK first.');
-                                    return;
-                                }
-
-                                if (!envData) {
-                                    console.error('Cannot navigate to external SDK: Environment data not initialized');
-                                    Alert.alert('Error', 'Environment data not available. Please initialize the SDK first.');
-                                    return;
-                                }
-
-                                // Initialize the target SDK with all data
-                                if (sdkType === 'shriram') {
-                                    try {
-                                        // Initialize Shriram SDK
-                                        initializeShriramEnvironment(envData as ShriramEnvironmentData);
-                                        initializeShriramSDK(appData as ShriramAppData);
-
-                                        // Navigate to external SDK
-                                        setExternalSDK('shriram');
-                                        setExternalSDKFDData(fdData);
-                                        navigate('ExternalSDK', {
-                                            sdkType: 'shriram',
-                                            fdData,
-                                            providerId: context?.providerId,
-                                            fdListSelectedData: context?.fdListSelectedData,
-                                            completeFDData: context?.completeFDData,
-                                            onboardingIds: context?.onboardingIds,
-                                        });
-                                    } catch (error: any) {
-                                        console.error('Failed to initialize Shriram SDK:', error);
-                                        Alert.alert('Error', `Failed to initialize Shriram SDK: ${error?.message || 'Unknown error'}`);
-                                    }
-                                } else if (sdkType === 'mahindra') {
-                                    try {
-                                        // Initialize Mahindra SDK
-                                        initializeMahindraEnvironment(envData as MahindraEnvironmentData);
-                                        initializeMahindraSDK(appData as MahindraAppData);
-
-                                        // Navigate to external SDK
-                                        setExternalSDK('mahindra');
-                                        setExternalSDKFDData(fdData);
-                                        navigate('ExternalSDK', {
-                                            sdkType: 'mahindra',
-                                            fdData,
-                                            providerId: context?.providerId,
-                                            fdListSelectedData: context?.fdListSelectedData,
-                                            completeFDData: context?.completeFDData,
-                                            onboardingIds: context?.onboardingIds,
-                                        });
-                                    } catch (error: any) {
-                                        console.error('Failed to initialize Mahindra SDK:', error);
-                                        Alert.alert('Error', `Failed to initialize Mahindra SDK: ${error?.message || 'Unknown error'}`);
-                                    }
-                                } else {
-                                    console.warn('Unknown SDK type:', sdkType);
-                                }
-                            } catch (error: any) {
-                                console.error('Error in onNavigateToExternalSDK:', error);
-                                Alert.alert('Error', `Navigation error: ${error?.message || 'Unknown error'}`);
-                            }
-                        }}
-                        {...props}
-                    />
-                )}
-            </Stack.Screen>
-
-            <Stack.Screen
-                name="FDCalculator"
-                options={{ title: 'FD Calculator' }}
-            >
-                {(props) => (
-                    <FDCalculatorScreen
-                        onGoBack={() => goBack()}
-                        onNavigateToReviewKYC={() => navigate('ReviewKYC', { fdData: props.route.params?.fdData })}
-                        fdData={(props.route.params as any)?.fdData}
-                        {...props}
-                    />
-                )}
-            </Stack.Screen>
-
-            <Stack.Screen
-                name="ExternalSDK"
-                options={{ title: 'External SDK', gestureEnabled: false }}
-            >
-                {(props) => {
-                    const { sdkType } = (props.route.params as any) || {};
-                    const routeParams = (props.route.params as any) || {};
-                    const externalMasterData = routeParams.masterData;
-                    // #region agent log
-                    fetch('http://127.0.0.1:7653/ingest/94b18a39-caf3-48fd-98f5-bf1838d9491a',{method:'POST',headers:{'Content-Type':'application/json','X-Debug-Session-Id':'04da7c'},body:JSON.stringify({sessionId:'04da7c',runId:'pending-masterdata-trace',hypothesisId:'H3',location:'fdsdk/navigation/RootNavigator.tsx:295',message:'ExternalSDK route handoff',data:{sdkType:sdkType||null,providerId:routeParams?.providerId||null,onboardingProviderId:routeParams?.onboardingIds?.providerId||null,fdListSelectedProviderId:routeParams?.fdListSelectedData?.providerId||null,hasMasterData:!!externalMasterData,masterDataHasDataKey:!!externalMasterData?.data},timestamp:Date.now()})}).catch(()=>{});
-                    // #endregion agent log
-                    console.log('[RootNavigator][DEBUG][ExternalSDK] ENTRY', {
-                        sdkType,
-                        providerId: routeParams.providerId,
-                        onboardingProviderId: routeParams.onboardingIds?.providerId,
-                        fdListSelectedProviderId: routeParams.fdListSelectedData?.providerId,
-                        hasMasterData: !!externalMasterData,
-                        masterDataTopKeys: externalMasterData ? Object.keys(externalMasterData).slice(0, 20) : [],
-                        nestedDataTopKeys: externalMasterData?.data ? Object.keys(externalMasterData.data).slice(0, 20) : [],
-                    });
-                    if (sdkType === 'shriram' || sdkType === 'mahindra') {
-                        const ok = ensureExternalSdkInitialized(sdkType);
-                        if (!ok) return null;
-                    }
-
-                    // Component to set master data and initial FD context in external SDK
-                    const ShriramSDKWithMasterData: React.FC<{ masterData: any }> = ({ masterData }) => {
-                        const { setMasterData } = useShriramMasterData();
-                        const shriramDispatch = useShriramAppDispatch();
-                        const routeParams = (props.route.params as any) || {};
-
-                        // Set master data
-                        React.useEffect(() => {
-                            if (masterData) {
-                                const dataToSet = masterData.data || masterData;
-                                setMasterData(dataToSet);
-                            }
-                        }, [masterData, setMasterData]);
-
-                        // Set FDListSelectedData using Shriram setter
-                        React.useEffect(() => {
-                            if (routeParams.fdListSelectedData) {
-                                try {
-                                    shriramDispatch(setShriramFDListSelected(routeParams.fdListSelectedData));
-                                } catch (e) {
-                                    console.log('[RootNavigator] Error setting Shriram FDListSelected:', e);
-                                }
-                            }
-                        }, [routeParams.fdListSelectedData, shriramDispatch]);
-
-                        // Set OnboardingIds using Shriram setter
-                        React.useEffect(() => {
-                            if (routeParams.onboardingIds) {
-                                try {
-                                    shriramDispatch(setShriramOnboardingIds({
-                                        ...routeParams.onboardingIds,
-                                        providerId: routeParams.providerId || routeParams.onboardingIds?.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.useEffect(() => {
-                            if (routeParams.shriramSDKGlobalData) {
-                                try {
-                                    const completeFDData = !!routeParams.shriramSDKGlobalData;
-                                    setShriramGlobalData({ completeFDData });
-                                    console.log('[RootNavigator] Set ShriramSDKGlobalData completeFDData:', completeFDData);
-                                } catch (e) {
-                                    console.log('[RootNavigator] Error setting Shriram GlobalData:', e);
-                                }
-                            }
-                        }, [routeParams.shriramSDKGlobalData]);
-
-                        return (
-                            <ShriramRootNavigator
-                                config={{
-                                    initialRouteName: routeParams.initialRouteName || 'FDCalculator',
-                                    initialPaymentStatusParams: routeParams.initialPaymentStatusParams,
-                                    initialFDContext: {
-                                        providerId: routeParams.providerId,
-                                        fdListSelectedData: routeParams.fdListSelectedData,
-                                        completeFDData: routeParams.completeFDData,
-                                    },
-                                } as any}
-                                onExit={(fdDetails?: any) => {
-                                    // When exiting external SDK, go back to FDList
-                                    setExternalSDK(null);
-                                    setExternalSDKFDData(null);
-                                    navigate('FDList');
-                                    if (fdDetails) {
-                                        onExit?.(fdDetails);
-                                    }
-                                }}
-                                onPanRequired={() => {
-                                    // Exit full SDK flow back to host app and notify callback
-                                    setExternalSDK(null);
-                                    setExternalSDKFDData(null);
-                                    onPanRequired?.();
-                                    onExit?.();
-                                }}
-                            />
-                        );
-                    };
-
-                    const MahindraSDKWithMasterData: React.FC<{ masterData: any }> = ({ masterData }) => {
-                        const { setMasterData } = useMahindraMasterData();
-                        const mahindraDispatch = useMahindraAppDispatch();
-
-                        // Set master data
-                        React.useEffect(() => {
-                            if (masterData) {
-                                const dataToSet = masterData.data || masterData;
-                                setMasterData(dataToSet);
-                            }
-                        }, [masterData, setMasterData]);
-
-                        // Set FDListSelectedData using Mahindra setter
-                        React.useEffect(() => {
-                            if (routeParams.fdListSelectedData) {
-                                try {
-                                    mahindraDispatch(setMahindraFDListSelected(routeParams.fdListSelectedData));
-                                } catch (e) {
-                                    console.log('[RootNavigator] Error setting Mahindra FDListSelected:', e);
-                                }
-                            }
-                        }, [routeParams.fdListSelectedData, mahindraDispatch]);
-
-                        // Set OnboardingIds using Mahindra setter
-                        React.useEffect(() => {
-                            if (routeParams.onboardingIds) {
-                                try {
-                                    mahindraDispatch(setMahindraOnboardingIds({
-                                        ...routeParams.onboardingIds,
-                                        providerId: routeParams.providerId || routeParams.onboardingIds?.providerId,
-                                    }));
-                                } catch (e) {
-                                    console.log('[RootNavigator] Error setting Mahindra OnboardingIds:', e);
-                                }
-                            }
-                        }, [routeParams.onboardingIds, mahindraDispatch]);
-
-                        return (
-                            <MahindraRootNavigatorAny
-                                config={{
-                                    initialRouteName: routeParams.initialRouteName || 'FDCalculator',
-                                    forceFetchCustomerDetails: !!routeParams.forceFetchCustomerDetails,
-                                    initialFDContext: {
-                                        providerId: routeParams.providerId,
-                                        fdListSelectedData: routeParams.fdListSelectedData,
-                                        completeFDData: routeParams.completeFDData,
-                                    },
-                                }}
-                                onExit={(fdDetails?: any) => {
-                                    // When exiting external SDK, go back to FDList
-                                    setExternalSDK(null);
-                                    setExternalSDKFDData(null);
-                                    navigate('FDList');
-                                    if (fdDetails) {
-                                        onExit?.(fdDetails);
-                                    }
-                                }}
-                                onPanRequired={() => {
-                                    // Exit full SDK flow back to host app and notify callback
-                                    setExternalSDK(null);
-                                    setExternalSDKFDData(null);
-                                    onPanRequired?.();
-                                    onExit?.();
-                                }}
-                            />
-                        );
-                    };
-
-                    if (sdkType === 'shriram') {
-                        return (
-                            <ShriramApiProvider>
-                                <ShriramMasterDataProvider>
-                                    <ShriramThemeProvider theme={fdsdkTheme as any} initialTheme={fdsdkThemeName as any}>
-                                        <NavigationIndependentTree>
-                                            <NavigationContainer ref={shriramNavigationRef}>
-                                                <ShriramSDKWithMasterData masterData={externalMasterData} />
-                                            </NavigationContainer>
-                                        </NavigationIndependentTree>
-                                    </ShriramThemeProvider>
-                                </ShriramMasterDataProvider>
-                            </ShriramApiProvider>
-                        );
-                    }
-
-                    if (sdkType === 'mahindra') {
-                        return (
-                            <MahindraApiProvider>
-                                <MahindraMasterDataProvider>
-                                    <MahindraThemeProvider theme={fdsdkTheme as any} initialTheme={fdsdkThemeName as any}>
-                                        <NavigationIndependentTree>
-                                            <NavigationContainer ref={mahindraNavigationRef}>
-                                                <MahindraSDKWithMasterData masterData={externalMasterData} />
-                                            </NavigationContainer>
-                                        </NavigationIndependentTree>
-                                    </MahindraThemeProvider>
-                                </MahindraMasterDataProvider>
-                            </MahindraApiProvider>
-                        );
-                    }
-
-                    return null;
-                }}
-            </Stack.Screen>
-
-            <Stack.Screen
-                name="AadhaarVerification"
-                options={{ title: 'Aadhaar Verification' }}
-            >
-                {(props) => (
-                    <AadhaarVerificationScreen
-                        onGoBack={() => goBack()}
-                        onVerificationComplete={() => {
-                            navigate('Employee');
-                        }}
-                        {...props}
-                    />
-                )}
-            </Stack.Screen>
-
-            <Stack.Screen
-                name="ReviewKYC"
-                options={{ title: 'Review KYC' }}
-            >
-                {(props) => (
-                    <ReviewKYCScreen
-                        onGoBack={() => goBack()}
-                        onContinue={() => {
-                            navigate('Employee');
-                        }}
-                        {...props}
-                    />
-                )}
-            </Stack.Screen>
-
-            <Stack.Screen
-                name="Employee"
-                options={{ title: 'Occupation' }}
-            >
-                {(props) => (
-                    <EmployeeScreen
-                        onGoBack={() => goBack()}
-                        onContinue={() => {
-                            navigate('NomineeDetail');
-                        }}
-                        {...props}
-                    />
-                )}
-            </Stack.Screen>
-
-            <Stack.Screen
-                name="NomineeDetail"
-                options={{ title: 'Nominee Details' }}
-            >
-                {(props) => (
-                    <NomineeDetailScreen
-                        onGoBack={() => goBack()}
-                        onSave={() => {
-                            navigate('BankDetail');
-                        }}
-                        {...props}
-                    />
-                )}
-            </Stack.Screen>
-
-            <Stack.Screen
-                name="BankDetail"
-                options={{ title: 'Bank Details' }}
-            >
-                {(props) => (
-                    <BankDetailScreen
-                        onGoBack={() => goBack()}
-                        onContinue={() => {
-                            navigate('PayNow');
-                        }}
-                        onAddAccount={() => {
-                            navigate('AddBankAccount');
-                        }}
-                        {...props}
-                    />
-                )}
-            </Stack.Screen>
-
-            <Stack.Screen
-                name="AddBankAccount"
-                options={{ title: 'Add Bank Account' }}
-            >
-                {(props) => (
-                    <AddBankAccountScreen
-                        onGoBack={() => goBack()}
-                        onContinue={() => {
-                            goBack();
-                        }}
-                        onFindIFSC={() => {
-                            navigate('FindIFSC');
-                        }}
-                        selectedIFSC={(() => {
-                            const params = (props.route.params as any);
-                            return params?.selectedIFSC;
-                        })()}
-                        {...props}
-                    />
-                )}
-            </Stack.Screen>
-
-            <Stack.Screen
-                name="FindIFSC"
-                options={{ title: 'Find IFSC' }}
-            >
-                {(props) => (
-                    <FindIFSCScreen
-                        onGoBack={() => goBack()}
-                        onSelect={(ifscData) => {
-                            pop(1);
-                            navigate('AddBankAccount', { selectedIFSC: ifscData });
-                        }}
-                        initialSearchTerm={(props.route.params as any)?.initialSearchTerm}
-                        {...props}
-                    />
-                )}
-            </Stack.Screen>
-
-            <Stack.Screen
-                name="PayNow"
-                options={{ title: 'Pay Now' }}
-            >
-                {(props) => (
-                    <PayNowScreen
-                        onGoBack={() => goBack()}
-                        onConfirm={() => {
-                            // onConfirm is handled inside PayNow after createFD; keep fallback
-                        }}
-                        fdData={(props.route.params as any)?.fdData}
-                        {...props}
-                    />
-                )}
-            </Stack.Screen>
-
-            <Stack.Screen
-                name="Payment"
-                options={{ title: 'Payment' }}
-            >
-                {(props) => (
-                    <PaymentScreen
-                        onGoBack={() => goBack()}
-                        paymentUrl={(props.route.params as any)?.paymentUrl ?? getPaymentSession().paymentUrl ?? ''}
-                        onPaymentSuccess={(data) => {
-                            navigate('PaymentStatus', {
-                                status: 'success',
-                                paymentData: data
-                            } as any);
-                        }}
-                        onPaymentFailure={(error) => {
-                            navigate('PaymentStatus', {
-                                status: 'failed',
-                                paymentData: error
-                            } as any);
-                        }}
-                        {...props}
-                    />
-                )}
-            </Stack.Screen>
-
-            <Stack.Screen
-                name="PaymentStatus"
-                options={{ title: 'Payment Status' }}
-            >
-                {(props) => (
-                    <PaymentStatusScreen
-                        status={(props.route.params as any)?.status || 'pending'}
-                        transactionId={(props.route.params as any)?.transactionId}
-                        fdData={(props.route.params as any)?.fdData}
-                        onRetry={() => {
-                            navigate('Payment');
-                        }}
-                        onContinue={(fdDetails) => {
-                            onExit?.(fdDetails);
-                        }}
-                        {...props}
-                    />
-                )}
-            </Stack.Screen>
-        </Stack.Navigator>
-    );
+	// State to track external SDK navigation
+	const [externalSDK, setExternalSDK] = React.useState < 'shriram' | 'mahindra' | null > (null);
+	const [externalSDKFDData, setExternalSDKFDData] = React.useState < any > (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.useCallback((fdDetails?: any) => {
+		setExternalSDK(null);
+		setExternalSDKFDData(null);
+		navigate('FDList');
+		if (fdDetails) onExit?.(fdDetails);
+	}, [onExit]);
+
+	const handleShriramPanRequired = React.useCallback(() => {
+		setExternalSDK(null);
+		setExternalSDKFDData(null);
+		onPanRequired?.();
+		onExit?.();
+	}, [onExit, onPanRequired]);
+
+	const handleMahindraExit = React.useCallback((fdDetails?: any) => {
+		setExternalSDK(null);
+		setExternalSDKFDData(null);
+		navigate('FDList');
+		if (fdDetails) onExit?.(fdDetails);
+	}, [onExit]);
+
+	const handleMahindraPanRequired = React.useCallback(() => {
+		setExternalSDK(null);
+		setExternalSDKFDData(null);
+		onPanRequired?.();
+		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 } = useMasterData();
+	const { theme: fdsdkTheme, themeName: fdsdkThemeName } = useTheme();
+
+	// Handle Android hardware back button
+	useEffect(() => {
+		if (Platform.OS !== 'android') return;
+
+		const onBackPress = () => {
+			// Return true to consume the event and do nothing (stop back navigation)
+			return true;
+		};
+
+		const subscription = BackHandler.addEventListener("hardwareBackPress", onBackPress);
+
+		return () => {
+			subscription.remove();
+		};
+	}, []);
+
+	const {
+		initialRouteName = 'FDList',
+		customScreenOptions = {},
+	} = config;
+
+	const ensureExternalSdkInitialized = React.useCallback((sdkType: 'shriram' | 'mahindra') => {
+		const appData = getAppData();
+		const storedEnv = getEnvironmentData();
+		const envData = storedEnv as ShriramEnvironmentData & MahindraEnvironmentData | null;
+
+		if (!appData) {
+			Alert.alert('Error', 'FDSDK app data is missing. Please restart the flow.');
+			return false;
+		}
+		if (!envData) {
+			Alert.alert('Error', 'FDSDK environment data is missing. Please initialize environment from host app.');
+			return false;
+		}
+
+		try {
+			if (sdkType === 'shriram') {
+				initializeShriramEnvironment(envData as ShriramEnvironmentData);
+				initializeShriramSDK(appData as ShriramAppData);
+			} else {
+				initializeMahindraEnvironment(envData as MahindraEnvironmentData);
+				initializeMahindraSDK(appData as MahindraAppData);
+			}
+			return true;
+		} catch (error: any) {
+			Alert.alert(
+				'Error',
+				`Failed to initialize ${sdkType === 'shriram' ? 'Shriram' : 'Mahindra'} SDK: ${error?.message || 'Unknown error'}`
+			);
+			return false;
+		}
+	}, []);
+
+	// Default screen options
+	const defaultScreenOptions = {
+		headerShown: false,
+		cardStyle: { backgroundColor: '#f8f9fa' },
+		animationEnabled: true,
+		gestureEnabled: false,
+		...customScreenOptions,
+	};
+
+	return (
+		<Stack.Navigator
+			initialRouteName={initialRouteName}
+			screenOptions={defaultScreenOptions}
+		>
+			<Stack.Screen
+				name="FDList"
+				options={{ title: 'Fixed Deposits' }}
+			>
+				{(props) => (
+					<FDListScreen
+						onGoBack={() => {
+							onExit?.();
+						}}
+						onSelectFD={(fdId) => {
+							// FD selected
+						}}
+						onNavigateToFDCalculator={(fdData) => {
+							navigate('FDCalculator', { fdData });
+						}}
+						onNavigateToExternalSDK={(sdkType, fdData, context) => {
+							try {
+								// Get app data and environment data from fdsdk
+								const appData = getAppData();
+								const envData = getEnvironmentData();
+
+								// Validate that we have the required data
+								if (!appData) {
+									console.error('Cannot navigate to external SDK: App data not initialized');
+									Alert.alert('Error', 'App data not available. Please initialize the SDK first.');
+									return;
+								}
+
+								if (!envData) {
+									console.error('Cannot navigate to external SDK: Environment data not initialized');
+									Alert.alert('Error', 'Environment data not available. Please initialize the SDK first.');
+									return;
+								}
+
+								// Initialize the target SDK with all data
+								if (sdkType === 'shriram') {
+									try {
+										// Initialize Shriram SDK
+										initializeShriramEnvironment(envData as ShriramEnvironmentData);
+										initializeShriramSDK(appData as ShriramAppData);
+
+										// Navigate to external SDK
+										setExternalSDK('shriram');
+										setExternalSDKFDData(fdData);
+										navigate('ExternalSDK', {
+											sdkType: 'shriram',
+											fdData,
+											providerId: context?.providerId,
+											fdListSelectedData: context?.fdListSelectedData,
+											completeFDData: context?.completeFDData,
+											onboardingIds: context?.onboardingIds,
+										});
+									} catch (error: any) {
+										console.error('Failed to initialize Shriram SDK:', error);
+										Alert.alert('Error', `Failed to initialize Shriram SDK: ${error?.message || 'Unknown error'}`);
+									}
+								} else if (sdkType === 'mahindra') {
+									try {
+										// Initialize Mahindra SDK
+										initializeMahindraEnvironment(envData as MahindraEnvironmentData);
+										initializeMahindraSDK(appData as MahindraAppData);
+
+										// Navigate to external SDK
+										setExternalSDK('mahindra');
+										setExternalSDKFDData(fdData);
+										navigate('ExternalSDK', {
+											sdkType: 'mahindra',
+											fdData,
+											providerId: context?.providerId,
+											fdListSelectedData: context?.fdListSelectedData,
+											completeFDData: context?.completeFDData,
+											onboardingIds: context?.onboardingIds,
+										});
+									} catch (error: any) {
+										console.error('Failed to initialize Mahindra SDK:', error);
+										Alert.alert('Error', `Failed to initialize Mahindra SDK: ${error?.message || 'Unknown error'}`);
+									}
+								} else {
+									console.warn('Unknown SDK type:', sdkType);
+								}
+							} catch (error: any) {
+								console.error('Error in onNavigateToExternalSDK:', error);
+								Alert.alert('Error', `Navigation error: ${error?.message || 'Unknown error'}`);
+							}
+						}}
+						{...props}
+					/>
+				)}
+			</Stack.Screen>
+
+			<Stack.Screen
+				name="FDCalculator"
+				options={{ title: 'FD Calculator' }}
+			>
+				{(props) => (
+					<FDCalculatorScreen
+						onGoBack={() => goBack()}
+						onNavigateToReviewKYC={() => navigate('ReviewKYC', { fdData: props.route.params?.fdData })}
+						fdData={(props.route.params as any)?.fdData}
+						{...props}
+					/>
+				)}
+			</Stack.Screen>
+
+			<Stack.Screen
+				name="ExternalSDK"
+				options={{ title: 'External SDK', gestureEnabled: false }}
+			>
+				{(props) => {
+					const { sdkType } = (props.route.params as any) || {};
+					const routeParams = (props.route.params as any) || {};
+					const externalMasterData = routeParams.masterData;
+					// #region agent log
+					fetch('http://127.0.0.1:7653/ingest/94b18a39-caf3-48fd-98f5-bf1838d9491a', { method: 'POST', headers: { 'Content-Type': 'application/json', 'X-Debug-Session-Id': '04da7c' }, body: JSON.stringify({ sessionId: '04da7c', runId: 'pending-masterdata-trace', hypothesisId: 'H3', location: 'fdsdk/navigation/RootNavigator.tsx:295', message: 'ExternalSDK route handoff', data: { sdkType: sdkType || null, providerId: routeParams?.providerId || null, onboardingProviderId: routeParams?.onboardingIds?.providerId || null, fdListSelectedProviderId: routeParams?.fdListSelectedData?.providerId || null, hasMasterData: !!externalMasterData, masterDataHasDataKey: !!externalMasterData?.data }, timestamp: Date.now() }) }).catch(() => { });
+					// #endregion agent log
+					console.log('[RootNavigator][DEBUG][ExternalSDK] ENTRY', {
+						sdkType,
+						providerId: routeParams.providerId,
+						onboardingProviderId: routeParams.onboardingIds?.providerId,
+						fdListSelectedProviderId: routeParams.fdListSelectedData?.providerId,
+						hasMasterData: !!externalMasterData,
+						masterDataTopKeys: externalMasterData ? Object.keys(externalMasterData).slice(0, 20) : [],
+						nestedDataTopKeys: externalMasterData?.data ? Object.keys(externalMasterData.data).slice(0, 20) : [],
+					});
+					if (sdkType === 'shriram' || sdkType === 'mahindra') {
+						const ok = ensureExternalSdkInitialized(sdkType);
+						if (!ok) return null;
+					}
+
+					if (sdkType === 'shriram') {
+						return (
+							<ShriramApiProvider>
+								<ShriramMasterDataProvider>
+									<ShriramThemeProvider theme={fdsdkTheme as any} initialTheme={fdsdkThemeName as any}>
+										<NavigationIndependentTree>
+											<NavigationContainer ref={shriramNavigationRef}>
+												<ShriramSDKContent
+													masterData={externalMasterData}
+													routeParams={routeParams}
+													onSDKExit={handleShriramExit}
+													onSDKPanRequired={handleShriramPanRequired}
+												/>
+											</NavigationContainer>
+										</NavigationIndependentTree>
+									</ShriramThemeProvider>
+								</ShriramMasterDataProvider>
+							</ShriramApiProvider>
+						);
+					}
+
+					if (sdkType === 'mahindra') {
+						return (
+							<MahindraApiProvider>
+								<MahindraMasterDataProvider>
+									<MahindraThemeProvider theme={fdsdkTheme as any} initialTheme={fdsdkThemeName as any}>
+										<NavigationIndependentTree>
+											<NavigationContainer ref={mahindraNavigationRef}>
+												<MahindraSDKContent
+													masterData={externalMasterData}
+													routeParams={routeParams}
+													onSDKExit={handleMahindraExit}
+													onSDKPanRequired={handleMahindraPanRequired}
+												/>
+											</NavigationContainer>
+										</NavigationIndependentTree>
+									</MahindraThemeProvider>
+								</MahindraMasterDataProvider>
+							</MahindraApiProvider>
+						);
+					}
+
+					return null;
+				}}
+			</Stack.Screen>
+
+			<Stack.Screen
+				name="AadhaarVerification"
+				options={{ title: 'Aadhaar Verification' }}
+			>
+				{(props) => (
+					<AadhaarVerificationScreen
+						onGoBack={() => goBack()}
+						onVerificationComplete={() => {
+							navigate('Employee');
+						}}
+						{...props}
+					/>
+				)}
+			</Stack.Screen>
+
+			<Stack.Screen
+				name="ReviewKYC"
+				options={{ title: 'Review KYC' }}
+			>
+				{(props) => (
+					<ReviewKYCScreen
+						onGoBack={() => goBack()}
+						onContinue={() => {
+							navigate('Employee');
+						}}
+						{...props}
+					/>
+				)}
+			</Stack.Screen>
+
+			<Stack.Screen
+				name="Employee"
+				options={{ title: 'Occupation' }}
+			>
+				{(props) => (
+					<EmployeeScreen
+						onGoBack={() => goBack()}
+						onContinue={() => {
+							navigate('NomineeDetail');
+						}}
+						{...props}
+					/>
+				)}
+			</Stack.Screen>
+
+			<Stack.Screen
+				name="NomineeDetail"
+				options={{ title: 'Nominee Details' }}
+			>
+				{(props) => (
+					<NomineeDetailScreen
+						onGoBack={() => goBack()}
+						onSave={() => {
+							navigate('BankDetail');
+						}}
+						{...props}
+					/>
+				)}
+			</Stack.Screen>
+
+			<Stack.Screen
+				name="BankDetail"
+				options={{ title: 'Bank Details' }}
+			>
+				{(props) => (
+					<BankDetailScreen
+						onGoBack={() => goBack()}
+						onContinue={() => {
+							navigate('PayNow');
+						}}
+						onAddAccount={() => {
+							navigate('AddBankAccount');
+						}}
+						{...props}
+					/>
+				)}
+			</Stack.Screen>
+
+			<Stack.Screen
+				name="AddBankAccount"
+				options={{ title: 'Add Bank Account' }}
+			>
+				{(props) => (
+					<AddBankAccountScreen
+						onGoBack={() => goBack()}
+						onContinue={() => {
+							goBack();
+						}}
+						onFindIFSC={() => {
+							navigate('FindIFSC');
+						}}
+						selectedIFSC={(() => {
+							const params = (props.route.params as any);
+							return params?.selectedIFSC;
+						})()}
+						{...props}
+					/>
+				)}
+			</Stack.Screen>
+
+			<Stack.Screen
+				name="FindIFSC"
+				options={{ title: 'Find IFSC' }}
+			>
+				{(props) => (
+					<FindIFSCScreen
+						onGoBack={() => goBack()}
+						onSelect={(ifscData) => {
+							pop(1);
+							navigate('AddBankAccount', { selectedIFSC: ifscData });
+						}}
+						initialSearchTerm={(props.route.params as any)?.initialSearchTerm}
+						{...props}
+					/>
+				)}
+			</Stack.Screen>
+
+			<Stack.Screen
+				name="PayNow"
+				options={{ title: 'Pay Now' }}
+			>
+				{(props) => (
+					<PayNowScreen
+						onGoBack={() => goBack()}
+						onConfirm={() => {
+							// onConfirm is handled inside PayNow after createFD; keep fallback
+						}}
+						fdData={(props.route.params as any)?.fdData}
+						{...props}
+					/>
+				)}
+			</Stack.Screen>
+
+			<Stack.Screen
+				name="Payment"
+				options={{ title: 'Payment' }}
+			>
+				{(props) => (
+					<PaymentScreen
+						onGoBack={() => goBack()}
+						paymentUrl={(props.route.params as any)?.paymentUrl ?? getPaymentSession().paymentUrl ?? ''}
+						onPaymentSuccess={(data) => {
+							navigate('PaymentStatus', {
+								status: 'success',
+								paymentData: data
+							} as any);
+						}}
+						onPaymentFailure={(error) => {
+							navigate('PaymentStatus', {
+								status: 'failed',
+								paymentData: error
+							} as any);
+						}}
+						{...props}
+					/>
+				)}
+			</Stack.Screen>
+
+			<Stack.Screen
+				name="PaymentStatus"
+				options={{ title: 'Payment Status' }}
+			>
+				{(props) => (
+					<PaymentStatusScreen
+						status={(props.route.params as any)?.status || 'pending'}
+						transactionId={(props.route.params as any)?.transactionId}
+						fdData={(props.route.params as any)?.fdData}
+						onRetry={() => {
+							navigate('Payment');
+						}}
+						onContinue={(fdDetails) => {
+							onExit?.(fdDetails);
+						}}
+						{...props}
+					/>
+				)}
+			</Stack.Screen>
+		</Stack.Navigator>
+	);
 };
 
 export default RootNavigator;