@finspringinnovations/fixeddepositsdk 1.0.2 → 1.0.3

package/src/navigation/RootNavigator.tsx

@@ -66,6 +66,150 @@ import { useTheme } from '../theme/ThemeContext';
 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();
+
+    React.useEffect(() => {
+        if (masterData) {
+            const dataToSet = masterData.data || masterData;
+            setMasterData(dataToSet);
+        }
+    }, [masterData, setMasterData]);
+
+    React.useEffect(() => {
+        if (routeParams.fdListSelectedData) {
+            try {
+                shriramDispatch(setShriramFDListSelected(routeParams.fdListSelectedData));
+            } catch (e) {
+                console.log('[RootNavigator] Error setting Shriram FDListSelected:', e);
+            }
+        }
+    }, [routeParams.fdListSelectedData, shriramDispatch]);
+
+    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]);
+
+    React.useEffect(() => {
+        if (routeParams.shriramSDKGlobalData) {
+            try {
+                const completeFDData = !!routeParams.shriramSDKGlobalData;
+                setShriramGlobalData({ 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={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();
+
+    React.useEffect(() => {
+        if (masterData) {
+            const dataToSet = masterData.data || masterData;
+            setMasterData(dataToSet);
+        }
+    }, [masterData, setMasterData]);
+
+    React.useEffect(() => {
+        if (routeParams.fdListSelectedData) {
+            try {
+                mahindraDispatch(setMahindraFDListSelected(routeParams.fdListSelectedData));
+            } catch (e) {
+                console.log('[RootNavigator] Error setting Mahindra FDListSelected:', e);
+            }
+        }
+    }, [routeParams.fdListSelectedData, mahindraDispatch]);
+
+    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={onSDKExit}
+            onPanRequired={onSDKPanRequired}
+        />
+    );
+};
+// ───────────────────────────────────────────────────────────────────────────
+
 interface RootNavigatorProps {
     config?: SDKNavigationConfig;
     onExit?: (fdDetails?: any) => void;
@@ -81,6 +225,36 @@ const RootNavigator: React.FC<RootNavigatorProps> = ({
     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();
@@ -316,157 +490,6 @@ const RootNavigator: React.FC<RootNavigatorProps> = ({
                         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>
@@ -474,7 +497,12 @@ const RootNavigator: React.FC<RootNavigatorProps> = ({
                                     <ShriramThemeProvider theme={fdsdkTheme as any} initialTheme={fdsdkThemeName as any}>
                                         <NavigationIndependentTree>
                                             <NavigationContainer ref={shriramNavigationRef}>
-                                                <ShriramSDKWithMasterData masterData={externalMasterData} />
+                                                <ShriramSDKContent
+                                                    masterData={externalMasterData}
+                                                    routeParams={routeParams}
+                                                    onSDKExit={handleShriramExit}
+                                                    onSDKPanRequired={handleShriramPanRequired}
+                                                />
                                             </NavigationContainer>
                                         </NavigationIndependentTree>
                                     </ShriramThemeProvider>
@@ -490,7 +518,12 @@ const RootNavigator: React.FC<RootNavigatorProps> = ({
                                     <MahindraThemeProvider theme={fdsdkTheme as any} initialTheme={fdsdkThemeName as any}>
                                         <NavigationIndependentTree>
                                             <NavigationContainer ref={mahindraNavigationRef}>
-                                                <MahindraSDKWithMasterData masterData={externalMasterData} />
+                                                <MahindraSDKContent
+                                                    masterData={externalMasterData}
+                                                    routeParams={routeParams}
+                                                    onSDKExit={handleMahindraExit}
+                                                    onSDKPanRequired={handleMahindraPanRequired}
+                                                />
                                             </NavigationContainer>
                                         </NavigationIndependentTree>
                                     </MahindraThemeProvider>

package/src/screens/FDCalculator.tsx

@@ -285,7 +285,7 @@ const FDCalculator: React.FC<FDCalculatorProps> = ({ onGoBack, onNavigateToRevie
     }, [interestRates]);
 
     useEffect(() => {
-        console.log("following are the tenure options at the fd",tenureOptions)   
+        console.log("following are the tenure options at the fd", tenureOptions)
     })
 
     const [tenureValue, setTenureValue] = useState<string>('');
@@ -636,7 +636,7 @@ const FDCalculator: React.FC<FDCalculatorProps> = ({ onGoBack, onNavigateToRevie
                     {/* Company Header */}
                     <CompanyHeader
                         companyName={effectiveFdData?.name || ''}
-                        rating={effectiveFdData?.creditRating || 'AA+'}
+                        rating="AAA"
                     />
 
                     {/* Amount Input */}
@@ -998,5 +998,5 @@ const createStyles = (typography: any, colors: any, themeName: string) => StyleS
         backgroundColor: 'rgba(0, 0, 0, 0.3)',
         zIndex: 1000,
     },
-    
+
 });

package/src/screens/FDList.tsx

@@ -60,8 +60,8 @@ function getLogoTypeForFD(fd: { name?: string; providerId?: string }): 'shriram'
 function getStaticCreditRatingForFD(fd: { name?: string; providerId?: string }): string {
     const logoType = getLogoTypeForFD(fd);
     if (logoType === 'mahindra') return 'AAA';
-    if (logoType === 'shriram') return 'AA+';
-    return 'AA+';
+    if (logoType === 'shriram') return 'AAA';
+    return 'AAA';
 }
 
 /** Statuses that count as pending/active (in-progress) workflow. */
@@ -1086,23 +1086,23 @@ const FDList: React.FC<FDListProps> = ({
                         const shriramComplete = completeApplications.find((app: any) => (app.fd_provider_id || app.fdProviderId || app.provider_id || app.providerId || '').toLowerCase() === ShriramProviderId.toLowerCase());
                         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' as const,
                         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;
 
@@ -1157,23 +1157,23 @@ const FDList: React.FC<FDListProps> = ({
                         const shriramComplete = completeApplications.find((app: any) => (app.fd_provider_id || app.fdProviderId || app.provider_id || app.providerId || '').toLowerCase() === ShriramProviderId.toLowerCase());
                         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' as const,
                         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;
                     navigate('ExternalSDK', {
@@ -1277,25 +1277,26 @@ const FDList: React.FC<FDListProps> = ({
             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' as const,
                 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
@@ -1304,7 +1305,7 @@ const FDList: React.FC<FDListProps> = ({
                 const sdkType = isMahindra ? 'mahindra' : 'shriram';
                 if (!initializeExternalSDKFromFDList(sdkType)) return;
                 // #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:'H2',location:'fdsdk/screens/FDList.tsx:1315',message:'Pending continue pre-navigation payload',data:{forcedSdkType:forcedSdkType||null,resolvedSdkType:sdkType,providerIdFromApp:providerIdFromApp||null,onboardingProviderId:onboardingIdsToPass?.providerId||null,fdListSelectedProviderId:fdListSelectedDataToPass?.providerId||null,usingMahindraMasterData:!!(sdkType==='mahindra'&&masterDataToPass),usingShriramMasterData:!!(sdkType==='shriram'&&masterDataToPass),masterDataHasDataKey:!!masterDataToPass?.data},timestamp:Date.now()})}).catch(()=>{});
+                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: 'H2', location: 'fdsdk/screens/FDList.tsx:1315', message: 'Pending continue pre-navigation payload', data: { forcedSdkType: forcedSdkType || null, resolvedSdkType: sdkType, providerIdFromApp: providerIdFromApp || null, onboardingProviderId: onboardingIdsToPass?.providerId || null, fdListSelectedProviderId: fdListSelectedDataToPass?.providerId || null, usingMahindraMasterData: !!(sdkType === 'mahindra' && masterDataToPass), usingShriramMasterData: !!(sdkType === 'shriram' && masterDataToPass), masterDataHasDataKey: !!masterDataToPass?.data }, timestamp: Date.now() }) }).catch(() => { });
                 // #endregion agent log
 
                 navigate('ExternalSDK', {

package/src/screens/PaymentStatus.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { View, Text, StyleSheet, ScrollView, Alert, Image, BackHandler, Platform, StatusBar } from 'react-native';
+import { View, Text, StyleSheet, ScrollView, Alert, Image, BackHandler, Platform, StatusBar, TouchableOpacity } from 'react-native';
 import Icon from 'react-native-vector-icons/Ionicons';
 import { base64Images } from '../constants/strings/base64Images';
 import SafeAreaWrapper from '../components/SafeAreaWrapper';
@@ -334,6 +334,11 @@ const PaymentStatus: React.FC<PaymentStatusProps> = ({
         }
     };
 
+    // Back button: navigate to FDList for all statuses
+    const handleNavigateToFDList = () => {
+        navigate('FDList');
+    };
+
     // Disable hardware back button on PaymentStatus screen
     useEffect(() => {
         if (Platform.OS !== 'android') return;
@@ -361,9 +366,9 @@ const PaymentStatus: React.FC<PaymentStatusProps> = ({
             {Platform.OS === 'ios' && <StatusBar barStyle="light-content" />}
 
             <View style={styles.container}>
-                {/* <Text style={styles.headerTitle}>
-                    {status === 'success' ? 'PAYMENT SUCCESSFUL' : 'PAYMENT FAILED'}
-                </Text> */}
+                <TouchableOpacity onPress={handleNavigateToFDList} style={styles.backIconBtn}>
+                    <Icon name="arrow-back" size={24} color={colors.text} />
+                </TouchableOpacity>
 
                 <ScrollView
                     showsVerticalScrollIndicator={false}
@@ -479,6 +484,13 @@ const createStyles = (colors: any, typography: any, status: 'success' | 'failed'
             flex: 1,
             backgroundColor: colors.background,
         },
+        backIconBtn: {
+            position: 'absolute',
+            top: 16,
+            left: 16,
+            zIndex: 10,
+            padding: 8,
+        },
         headerTitle: {
             fontSize: 14,
             fontWeight: '600',

package/src/screens/ReviewKYC.tsx

@@ -946,6 +946,7 @@ const ReviewKYC: React.FC<ReviewKYCProps> = ({
             {/* Overlay to disable screen interactions during API call */}
             {isLoadingPanRapid && (
                 <View style={styles.loadingOverlay} pointerEvents="auto">
+                    <ActivityIndicator size="large" color={colors.primary} />
                 </View>
             )}
             {/* Loading overlay for back navigation */}