@finspringinnovations/fixeddepositsdk 1.0.2 → 1.0.3

package/lib/components/PendingFDBottomSheet.js

@@ -24,7 +24,7 @@ const PendingFDBottomSheet = ({ visible, onClose, onContinue, onBookNew, pending
     return (react_1.default.createElement(react_native_1.Modal, { visible: visible, transparent: true, animationType: "slide", onRequestClose: onClose },
         react_1.default.createElement(react_native_1.View, { style: styles.overlay },
             react_1.default.createElement(react_native_1.View, { style: styles.bottomSheet },
-                react_1.default.createElement(react_native_1.SafeAreaView, { style: styles.safeArea },
+                react_1.default.createElement(react_native_1.SafeAreaView, null,
                     react_1.default.createElement(react_native_1.View, { style: styles.header },
                         react_1.default.createElement(react_native_1.View, { style: styles.headerContent },
                             react_1.default.createElement(react_native_1.Text, { style: styles.title }, "Please Wait! You also have a pending journey with progress saved:"),
@@ -33,16 +33,20 @@ const PendingFDBottomSheet = ({ visible, onClose, onContinue, onBookNew, pending
                     react_1.default.createElement(react_native_1.View, { style: styles.content },
                         react_1.default.createElement(react_native_1.Text, { style: styles.sectionTitle }, "Pending FDs"),
                         react_1.default.createElement(ActiveFDCard_1.default, { name: pendingFDData.name, invested: pendingFDData.invested, value: pendingFDData.value, returns: pendingFDData.returns, maturityDate: pendingFDData.maturityDate, logoType: pendingFDData.logoType }),
-                        react_1.default.createElement(react_native_1.TouchableOpacity, { style: [styles.bookNewButton, isBookingNewLoading && styles.disabledButton], onPress: onBookNew, disabled: isBookingNewLoading }, isBookingNewLoading ? (react_1.default.createElement(react_native_1.View, { style: styles.loadingContainer },
+                        react_1.default.createElement(react_native_1.View, { style: { height: 24 } }),
+                        react_1.default.createElement(react_native_1.TouchableOpacity, { style: [
+                                styles.bookNewButton,
+                                isBookingNewLoading && styles.disabledButton,
+                            ], onPress: onBookNew, disabled: isBookingNewLoading }, isBookingNewLoading ? (react_1.default.createElement(react_native_1.View, { style: styles.loadingContainer },
                             react_1.default.createElement(react_native_1.ActivityIndicator, { size: "small", color: colors.primary }),
                             react_1.default.createElement(react_native_1.Text, { style: [styles.bookNewText, { marginLeft: spacing.sm }] }, "Terminating workflow..."))) : (react_1.default.createElement(react_native_1.Text, { style: styles.bookNewText }, "No, I want to book a new FD"))),
-                        themeName === 'dark' ? (react_1.default.createElement(ActionButton_1.default, { title: "Continue", onPress: onContinue, variant: "primary", style: styles.continueButtonWrapper })) : (react_1.default.createElement(react_native_1.TouchableOpacity, { style: styles.continueButton, onPress: onContinue },
-                            react_1.default.createElement(react_native_1.Text, { style: styles.continueButtonText }, "Continue")))))))));
+                        react_1.default.createElement(react_native_1.View, { style: styles.footer }, themeName === 'dark' ? (react_1.default.createElement(ActionButton_1.default, { title: "Continue", onPress: onContinue, variant: "primary", style: styles.continueButtonWrapper })) : (react_1.default.createElement(react_native_1.TouchableOpacity, { style: styles.continueButton, onPress: onContinue },
+                            react_1.default.createElement(react_native_1.Text, { style: styles.continueButtonText }, "Continue"))))))))));
 };
 const createStyles = (colors, typography, spacing, themeName) => react_native_1.StyleSheet.create({
     overlay: {
         flex: 1,
-        backgroundColor: 'rgba(0, 0, 0, 0.5)',
+        backgroundColor: 'rgba(0,0,0,0.5)',
         justifyContent: 'flex-end',
     },
     bottomSheet: {
@@ -53,10 +57,6 @@ const createStyles = (colors, typography, spacing, themeName) => react_native_1.
         borderWidth: themeName === 'dark' ? 1 : 0,
         borderColor: themeName === 'dark' ? '#ffffff' : 'transparent',
         maxHeight: react_native_1.Dimensions.get('window').height * 0.8,
-        minHeight: react_native_1.Platform.OS === 'ios' ? 430 : 400,
-    },
-    safeArea: {
-        flex: 1,
     },
     header: {
         paddingHorizontal: spacing.lg,
@@ -69,7 +69,7 @@ const createStyles = (colors, typography, spacing, themeName) => react_native_1.
         alignItems: 'flex-start',
     },
     title: {
-        fontSize: 17,
+        fontSize: 15,
         fontWeight: '500',
         color: themeName === 'dark' ? colors.labelColor : '#333',
         flex: 1,
@@ -85,18 +85,25 @@ const createStyles = (colors, typography, spacing, themeName) => react_native_1.
         alignItems: 'center',
     },
     content: {
-        flex: 1,
         paddingHorizontal: spacing.lg,
         paddingTop: spacing.lg,
-        paddingBottom: react_native_1.Platform.OS === 'ios' ? 20 : 0,
+        paddingBottom: react_native_1.Platform.OS === 'ios' ? 20 : spacing.lg,
     },
-    sectionTitle: Object.assign(Object.assign({}, typography.styles.h3), { color: themeName === 'dark' ? colors.labelColor : '#333', marginBottom: spacing.md }),
+    sectionTitle: Object.assign(Object.assign({}, typography.styles.h4), { color: themeName === 'dark' ? colors.labelColor : '#333', marginBottom: spacing.md }),
     bookNewButton: {
-        marginTop: spacing.xxxl,
-        marginBottom: spacing.xxxl,
+        marginTop: spacing.xl,
+        marginBottom: spacing.xl,
         alignItems: 'center',
+        justifyContent: 'center',
+        paddingVertical: 12,
+        paddingHorizontal: spacing.lg,
+        borderWidth: 1,
+        borderColor: themeName === 'dark' ? colors.labelColor : '#333',
+        borderRadius: themeName === 'dark' ? 10 : 30,
+        width: 330,
+        alignSelf: 'center',
     },
-    bookNewText: Object.assign(Object.assign({}, typography.styles.body2), { color: themeName === 'dark' ? colors.labelColor : '#000000' }),
+    bookNewText: Object.assign(Object.assign({}, typography.styles.buttonSmall), { color: themeName === 'dark' ? colors.labelColor : '#000' }),
     disabledButton: {
         opacity: 0.6,
     },
@@ -105,6 +112,9 @@ const createStyles = (colors, typography, spacing, themeName) => react_native_1.
         alignItems: 'center',
         justifyContent: 'center',
     },
+    footer: {
+        paddingTop: spacing.sm,
+    },
     continueButtonWrapper: {
         marginBottom: react_native_1.Platform.OS === 'ios' ? spacing.lg + 20 : spacing.lg,
     },
@@ -112,11 +122,10 @@ const createStyles = (colors, typography, spacing, themeName) => react_native_1.
         height: 50,
         backgroundColor: '#007AFF',
         borderRadius: 25,
-        paddingHorizontal: spacing.lg,
         alignItems: 'center',
         justifyContent: 'center',
         marginBottom: react_native_1.Platform.OS === 'ios' ? spacing.lg + 20 : spacing.lg,
     },
-    continueButtonText: Object.assign(Object.assign({}, typography.styles.button), { color: 'white', fontWeight: '600' }),
+    continueButtonText: Object.assign(Object.assign({}, typography.styles.button), { color: '#fff', fontWeight: '600', fontSize: 16 }),
 });
 exports.default = PendingFDBottomSheet;

package/lib/config/appDataConfig.js

@@ -86,6 +86,7 @@ const initializeSDK = (appData, onValidationError) => {
     // Import and call environment logging
     Promise.resolve().then(() => __importStar(require('./apiConfig'))).then(({ logEnvironmentInfo }) => {
         logEnvironmentInfo();
+        console.log('SDK initialized with app data:', { logEnvironmentInfo });
     });
 };
 exports.initializeSDK = initializeSDK;
@@ -274,7 +275,7 @@ const setSDKColors = (customColors) => {
     // Best-effort: propagate to external SDKs when they are available
     try {
         // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const shriram = require('@finspringinnovations/shriramsdk');
+        const shriram = require('@finspringinnovations/shriramfdsdk');
         if (shriram && typeof shriram.setSDKColors === 'function') {
             shriram.setSDKColors(customColors);
         }
@@ -284,7 +285,7 @@ const setSDKColors = (customColors) => {
     }
     try {
         // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const mahindra = require('@finspringinnovations/mahindrasdk');
+        const mahindra = require('@finspringinnovations/mahindrafdsdk');
         if (mahindra && typeof mahindra.setSDKColors === 'function') {
             mahindra.setSDKColors(customColors);
         }

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

@@ -86,7 +86,7 @@ export declare const FD_STRINGS: {
     readonly AMOUNT_NOTE: "Note: The entered amount should be in multiples of ₹1000";
     readonly AMOUNT_MIN_MAX: "Min: ₹5 K | Max: ₹5 Cr";
     readonly AMOUNT_MULTIPLES_ERROR: "Amount must be in multiples of ₹1,000";
-    readonly SENIOR_CITIZEN_BENEFIT: "+0.25% p.a. more for senior citizens";
+    readonly SENIOR_CITIZEN_BENEFIT: "+0.5% p.a. more for senior citizens";
     readonly TAX_RESIDENT_CONFIRMATION: "I confirm I am a tax resident of India";
     readonly TAX_RESIDENT_ERROR: "Please confirm that you are a tax resident of India to proceed";
     readonly WITHDRAWAL_INFO: "Withdrawal allowed after 3 months";
@@ -95,7 +95,7 @@ export declare const FD_STRINGS: {
     readonly TRUSTED_BY: "Trusted By ";
     readonly CRORES_INDIANS: "4.6 Crores Indians";
     readonly AAA_RATING: "Stable Rating";
-    readonly RATING: "AA+";
+    readonly RATING: "AAA";
     readonly TENURE_12_MONTHS: "12 Months";
     readonly TENURE_24_MONTHS: "24 Months";
     readonly TENURE_36_MONTHS: "36 Months";

package/lib/constants/strings/fd.js

@@ -106,7 +106,7 @@ exports.FD_STRINGS = {
     AMOUNT_MIN_MAX: 'Min: ₹5 K | Max: ₹5 Cr',
     AMOUNT_MULTIPLES_ERROR: 'Amount must be in multiples of ₹1,000',
     // Senior citizen benefits
-    SENIOR_CITIZEN_BENEFIT: '+0.25% p.a. more for senior citizens',
+    SENIOR_CITIZEN_BENEFIT: '+0.5% p.a. more for senior citizens',
     // Tax resident confirmation
     TAX_RESIDENT_CONFIRMATION: 'I confirm I am a tax resident of India',
     TAX_RESIDENT_ERROR: 'Please confirm that you are a tax resident of India to proceed',
@@ -119,7 +119,7 @@ exports.FD_STRINGS = {
     TRUSTED_BY: 'Trusted By ',
     CRORES_INDIANS: '4.6 Crores Indians',
     AAA_RATING: 'Stable Rating',
-    RATING: 'AA+',
+    RATING: 'AAA',
     // Fallback tenure options
     TENURE_12_MONTHS: '12 Months',
     TENURE_24_MONTHS: '24 Months',

package/lib/navigation/RootNavigator.js

@@ -67,10 +67,129 @@ 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)();
+    react_1.default.useEffect(() => {
+        if (masterData) {
+            const dataToSet = masterData.data || masterData;
+            setMasterData(dataToSet);
+        }
+    }, [masterData, setMasterData]);
+    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]);
+    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]);
+    react_1.default.useEffect(() => {
+        if (routeParams.shriramSDKGlobalData) {
+            try {
+                const completeFDData = !!routeParams.shriramSDKGlobalData;
+                (0, shriramfdsdk_1.setGlobalData)({ 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: onSDKExit, onPanRequired: onSDKPanRequired }));
+};
+const MahindraSDKContent = ({ masterData, routeParams, onSDKExit, onSDKPanRequired, }) => {
+    const { setMasterData } = (0, mahindrafdsdk_1.useMasterData)();
+    const mahindraDispatch = (0, mahindrafdsdk_1.useAppDispatch)();
+    react_1.default.useEffect(() => {
+        if (masterData) {
+            const dataToSet = masterData.data || masterData;
+            setMasterData(dataToSet);
+        }
+    }, [masterData, setMasterData]);
+    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]);
+    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: 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_2.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_2.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)();
@@ -248,142 +367,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,7 +381,7 @@ 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;
         }),

package/lib/screens/FDCalculator.js

@@ -552,7 +552,7 @@ const FDCalculator = ({ onGoBack, onNavigateToReviewKYC, fdData }) => {
                 react_1.default.createElement(react_native_1.Image, { source: { uri: base64Images_1.base64Images.backArrow }, style: [styles.backIcon, { tintColor: themeName === 'dark' ? colors.headerText : undefined }], resizeMode: "contain", width: 24, height: 24 }))),
         react_1.default.createElement(react_native_1.View, { style: { flex: 1, justifyContent: 'space-between' } },
             react_1.default.createElement(react_native_1.ScrollView, { style: styles.scrollContainer, contentContainerStyle: styles.scrollContent, showsVerticalScrollIndicator: false, onScrollBeginDrag: closeAllMenus, scrollEnabled: !(isOnboarding || isBooking), keyboardShouldPersistTaps: "handled", bounces: true, alwaysBounceVertical: true },
-                react_1.default.createElement(components_1.CompanyHeader, { companyName: (effectiveFdData === null || effectiveFdData === void 0 ? void 0 : effectiveFdData.name) || '', rating: (effectiveFdData === null || effectiveFdData === void 0 ? void 0 : effectiveFdData.creditRating) || 'AA+' }),
+                react_1.default.createElement(components_1.CompanyHeader, { companyName: (effectiveFdData === null || effectiveFdData === void 0 ? void 0 : effectiveFdData.name) || '', rating: "AAA" }),
                 react_1.default.createElement(components_1.AmountInput, { label: strings_1.FD_STRINGS.INVESTMENT_AMOUNT_LABEL, value: amount, onChangeText: handleAmountChange, onFocus: closeAllMenus, placeholder: strings_1.FD_STRINGS.AMOUNT_PLACEHOLDER, noteText: strings_1.FD_STRINGS.AMOUNT_NOTE, minMaxText: strings_1.FD_STRINGS.AMOUNT_MIN_MAX, errorMessage: amountError }),
                 react_1.default.createElement(components_1.DropdownSelector, { label: strings_1.FD_STRINGS.TENURE_LABEL, value: tenureValue || strings_1.COMMON_STRINGS.SELECT, onPress: () => {
                         react_native_1.Keyboard.dismiss();

package/lib/screens/FDList.js

@@ -77,8 +77,8 @@ function getStaticCreditRatingForFD(fd) {
     if (logoType === 'mahindra')
         return 'AAA';
     if (logoType === 'shriram')
-        return 'AA+';
-    return 'AA+';
+        return 'AAA';
+    return 'AAA';
 }
 /** Statuses that count as pending/active (in-progress) workflow. */
 const PENDING_ACTIVE_STATUSES = ['active', 'pending', 'in_progress', 'in-progress'];
@@ -943,23 +943,23 @@ const FDList = ({ onGoBack, onSelectFD, onNavigateToFDCalculator, onNavigateToEx
                         if (shriramComplete)
                             ShriramSDKGlobalDataPayment = shriramComplete;
                     }
-                    const fdListSelectedDataPayment = activeFD ? {
+                    const fdListSelectedDataPayment = fdDisplay ? {
                         id: appData.fd_id || appData.fdId || 'active-fd',
                         providerId: providerIdFromApp,
-                        name: activeFD.name,
+                        name: fdDisplay.name,
                         accountNumber: appData.account_number || appData.accountNumber || '',
-                        roi: `${activeFD.returns}% p.a.`,
-                        tenure: activeFD.maturityDate || '-',
-                        amount: Number(activeFD.invested) || 0,
-                        maturityDate: activeFD.maturityDate || '-',
+                        roi: `${fdDisplay.returns}% p.a.`,
+                        tenure: fdDisplay.maturityDate || '-',
+                        amount: Number(fdDisplay.invested) || 0,
+                        maturityDate: fdDisplay.maturityDate || '-',
                         status: 'active',
                         creditRating: getStaticCreditRatingForFD({
-                            name: activeFD.name,
+                            name: fdDisplay.name,
                             providerId: providerIdFromApp,
                         }),
-                        companyName: activeFD.name,
-                        fdRate: `${activeFD.returns}% p.a.`,
-                        interestPayout: activeFD.interestPayout || 'Yearly',
+                        companyName: fdDisplay.name,
+                        fdRate: `${fdDisplay.returns}% p.a.`,
+                        interestPayout: fdDisplay.interestPayout || 'Yearly',
                     } : null;
                     const masterDataPayment = ShriramMasterData;
                     (0, helpers_1.navigate)('ExternalSDK', {
@@ -1019,23 +1019,23 @@ const FDList = ({ onGoBack, onSelectFD, onNavigateToFDCalculator, onNavigateToEx
                         if (shriramComplete)
                             ShriramSDKGlobalDataPayment = shriramComplete;
                     }
-                    const fdListSelectedDataPayment = activeFD ? {
+                    const fdListSelectedDataPayment = fdDisplay ? {
                         id: appData.fd_id || appData.fdId || 'active-fd',
                         providerId: providerIdFromApp,
-                        name: activeFD.name,
+                        name: fdDisplay.name,
                         accountNumber: appData.account_number || appData.accountNumber || '',
-                        roi: `${activeFD.returns}% p.a.`,
-                        tenure: activeFD.maturityDate || '-',
-                        amount: Number(activeFD.invested) || 0,
-                        maturityDate: activeFD.maturityDate || '-',
+                        roi: `${fdDisplay.returns}% p.a.`,
+                        tenure: fdDisplay.maturityDate || '-',
+                        amount: Number(fdDisplay.invested) || 0,
+                        maturityDate: fdDisplay.maturityDate || '-',
                         status: 'active',
                         creditRating: getStaticCreditRatingForFD({
-                            name: activeFD.name,
+                            name: fdDisplay.name,
                             providerId: providerIdFromApp,
                         }),
-                        companyName: activeFD.name,
-                        fdRate: `${activeFD.returns}% p.a.`,
-                        interestPayout: activeFD.interestPayout || 'Yearly',
+                        companyName: fdDisplay.name,
+                        fdRate: `${fdDisplay.returns}% p.a.`,
+                        interestPayout: fdDisplay.interestPayout || 'Yearly',
                     } : null;
                     const masterDataPayment = ShriramMasterData;
                     (0, helpers_1.navigate)('ExternalSDK', {
@@ -1151,25 +1151,26 @@ const FDList = ({ onGoBack, onSelectFD, onNavigateToFDCalculator, onNavigateToEx
             // Get onboardingIds - use the one from appData if available, otherwise from Redux store
             const onboardingIdsToPass = onboardingIdsFromApp || onboardingIds;
             // Get fdListSelectedData (already set in Redux, but we need it for navigation)
-            const fdListSelectedDataToPass = activeFD ? {
+            // Use fdDisplay (derived from the tapped app) not activeFD (always first active app)
+            const fdListSelectedDataToPass = fdDisplay ? {
                 id: appData.fd_id || appData.fdId || 'active-fd',
                 providerId: providerIdFromApp,
-                name: activeFD.name,
+                name: fdDisplay.name,
                 accountNumber: appData.account_number || appData.accountNumber || '',
-                roi: `${activeFD.returns}% p.a.`,
-                tenure: activeFD.tenure_in_months
-                    ? `${activeFD.tenure_in_months} Months`
+                roi: `${fdDisplay.returns}% p.a.`,
+                tenure: appData.tenure_in_months
+                    ? `${appData.tenure_in_months} Months`
                     : '-',
-                amount: Number(activeFD.invested) || 0,
-                maturityDate: activeFD.maturityDate || '-',
+                amount: Number(fdDisplay.invested) || 0,
+                maturityDate: fdDisplay.maturityDate || '-',
                 status: 'active',
                 creditRating: getStaticCreditRatingForFD({
-                    name: activeFD.name,
+                    name: fdDisplay.name,
                     providerId: providerIdFromApp,
                 }),
-                companyName: activeFD.name,
-                fdRate: `${activeFD.returns}% p.a.`,
-                interestPayout: activeFD.interestPayout || '',
+                companyName: fdDisplay.name,
+                fdRate: `${fdDisplay.returns}% p.a.`,
+                interestPayout: fdDisplay.interestPayout || '',
             } : null;
             // Navigate to appropriate SDK if provider is detected
             if (isMahindra || isShriram) {

package/lib/screens/PaymentStatus.js

@@ -301,6 +301,10 @@ const PaymentStatus = ({ onRetry, onContinue, status, transactionId, fdData }) =
             }
         }
     };
+    // Back button: navigate to FDList for all statuses
+    const handleNavigateToFDList = () => {
+        (0, helpers_1.navigate)('FDList');
+    };
     // Disable hardware back button on PaymentStatus screen
     (0, react_1.useEffect)(() => {
         if (react_native_1.Platform.OS !== 'android')
@@ -315,6 +319,8 @@ const PaymentStatus = ({ onRetry, onContinue, status, transactionId, fdData }) =
     return (react_1.default.createElement(SafeAreaWrapper_1.default, { includeTop: true, bottomPadding: 0, statusBarColor: "#000000", statusBarStyle: "light-content" },
         react_native_1.Platform.OS === 'ios' && react_1.default.createElement(react_native_1.StatusBar, { barStyle: "light-content" }),
         react_1.default.createElement(react_native_1.View, { style: styles.container },
+            react_1.default.createElement(react_native_1.TouchableOpacity, { onPress: handleNavigateToFDList, style: styles.backIconBtn },
+                react_1.default.createElement(Ionicons_1.default, { name: "arrow-back", size: 24, color: colors.text })),
             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 },
@@ -346,6 +352,13 @@ const createStyles = (colors, typography, status) => {
             flex: 1,
             backgroundColor: colors.background,
         },
+        backIconBtn: {
+            position: 'absolute',
+            top: 16,
+            left: 16,
+            zIndex: 10,
+            padding: 8,
+        },
         headerTitle: {
             fontSize: 14,
             fontWeight: '600',

package/lib/screens/ReviewKYC.js

@@ -631,7 +631,8 @@ const ReviewKYC = ({ onGoBack, onContinue, initialData, }) => {
                                     ] }, kycData.useExistingAddress ? (react_1.default.createElement(react_native_1.Image, { source: { uri: (themeName === 'dark') ? base64Images_1.base64Images.checkBoxDark : base64Images_1.base64Images.filledCheckBox }, resizeMode: "cover", width: 20, height: 20 })) : ((themeName === 'dark') ? (react_1.default.createElement(react_native_1.Image, { source: { uri: base64Images_1.base64Images.unCheckBoxDark }, resizeMode: "cover", width: 20, height: 20 })) : null))),
                             react_1.default.createElement(react_native_1.Text, { style: styles.checkboxText }, "For existing customers, we'll use the address from our records. For new customers, the address from your Aadhar card will be used. To update, please raise a service request with valid address proof.")))))),
         react_1.default.createElement(ActionButton_1.default, { title: "Continue", onPress: handleContinue, disabled: !kycData.useExistingAddress || isLoadingPanRapid || !validateForm(), loading: isLoadingPanRapid }),
-        isLoadingPanRapid && (react_1.default.createElement(react_native_1.View, { style: styles.loadingOverlay, pointerEvents: "auto" })),
+        isLoadingPanRapid && (react_1.default.createElement(react_native_1.View, { style: styles.loadingOverlay, pointerEvents: "auto" },
+            react_1.default.createElement(react_native_1.ActivityIndicator, { size: "large", color: colors.primary }))),
         isGoingBack && (react_1.default.createElement(react_native_1.View, { style: styles.loadingOverlay, pointerEvents: "auto" },
             react_1.default.createElement(react_native_1.ActivityIndicator, { size: "large", color: colors.primary })))));
 };