@finspringinnovations/fixeddepositsdk 1.0.3 → 1.0.4

package/src/navigation/types.ts

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

package/src/navigation/workflowNavigator.ts

@@ -1,98 +1,161 @@
-import { navigate } from './helpers';
-import type { InvestmentData, CustomerData, AppData, FDData } from '../types/dataTypes';
+import { MAHINDRA_WORKFLOW_STATES, SHRIRAM_WORKFLOW_STATES, WORKFLOW_STATES } from '../config/workflowConstants';
+import type { AppData, CustomerData, FDData, InvestmentData } from '../types/dataTypes';
 import type { WorkflowStateSriram } from '../types/workflowTypes';
-import { WORKFLOW_STATES } from '../config/workflowConstants';
+import { navigate } from './helpers';
 
 /**
  * Centralized navigation for FD workflow based on Flutter implementation
  */
 export async function handleWorkflowNavigation({
-    workflowState,
-    investmentData,
-    customerData,
-    appData,
-    fdData,
-    completedApplications = [],
-    transactionId,
+	workflowState,
+	investmentData,
+	customerData,
+	appData,
+	fdData,
+	completedApplications = [],
+	transactionId,
 }: {
-    workflowState: WorkflowStateSriram;
-    investmentData?: InvestmentData;
-    customerData?: CustomerData;
-    appData?: AppData;
-    fdData?: FDData;
-    completedApplications?: any[];
-    transactionId?: string;
+	workflowState: WorkflowStateSriram;
+	investmentData?: InvestmentData;
+	customerData?: CustomerData;
+	appData?: AppData;
+	fdData?: FDData;
+	completedApplications?: any[];
+	transactionId?: string;
 }) {
 
-    switch (workflowState) {
-        case WORKFLOW_STATES.START:
-        case WORKFLOW_STATES.INITIATION:
-            // No navigation required
-            break;
-
-        case WORKFLOW_STATES.CREATE_FD:
-            // Navigate to FD overview first, then to occupation
-            navigate('PayNow', {
-                fdData: fdData ? {
-                    companyName: fdData.name,
-                    amount: fdData.amount,
-                    fdRate: fdData.roi,
-                    tenure: fdData.tenure,
-                    interestPayout: 'Yearly' // Default value
-                } : undefined
-            } as any);
-            // The flow will continue to occupation after FD selection
-            break;
-
-        case WORKFLOW_STATES.OCCUPATION:
-            navigate('Employee');
-            break;
-
-        case WORKFLOW_STATES.NOMINEE:
-            navigate('NomineeDetail');
-            break;
-
-        case WORKFLOW_STATES.BANK_DETAILS:
-            navigate('BankDetail');
-            break;
-
-        case WORKFLOW_STATES.KYC:
-            navigate('ReviewKYC');
-            break;
-
-        case WORKFLOW_STATES.PAYMENT:
-            // Handle payment status check and navigation
-            if (transactionId) {
-                // Navigate to payment screen with transaction ID
-                navigate('Payment');
-            } else {
-                navigate('PayNow', {
-                    fdData: fdData ? {
-                        companyName: fdData.name,
-                        amount: fdData.amount,
-                        fdRate: fdData.roi,
-                        tenure: fdData.tenure,
-                        interestPayout: '' // Default value
-                    } : undefined
-                } as any);
-            }
-            break;
-
-        case WORKFLOW_STATES.END:
-            navigate('PaymentStatus', {
-                transactionId,
-                fdData: fdData ? {
-                    companyName: fdData.name,
-                    amount: fdData.amount,
-                    fdRate: fdData.roi,
-                    tenure: fdData.tenure,
-                    interestPayout: '' // Default value
-                } : undefined
-            });
-            break;
-
-        default:
-    }
+	// Normalize workflow state from caption if needed
+	let normalizedState = workflowState;
+
+	// Map Shriram captions to common states if necessary, or handle directly
+	const isShriramCaption = Object.values(SHRIRAM_WORKFLOW_STATES).includes(workflowState as any);
+	const isMahindraCaption = Object.values(MAHINDRA_WORKFLOW_STATES).includes(workflowState as any);
+
+	if (isShriramCaption) {
+		if (workflowState === SHRIRAM_WORKFLOW_STATES.START || workflowState === SHRIRAM_WORKFLOW_STATES.INITIATION) normalizedState = WORKFLOW_STATES.START;
+		else if (workflowState === SHRIRAM_WORKFLOW_STATES.KYC) normalizedState = WORKFLOW_STATES.KYC;
+		else if (workflowState === SHRIRAM_WORKFLOW_STATES.OCCUPATION) normalizedState = WORKFLOW_STATES.OCCUPATION;
+		else if (workflowState === SHRIRAM_WORKFLOW_STATES.NOMINEE) normalizedState = WORKFLOW_STATES.NOMINEE;
+		else if (workflowState === SHRIRAM_WORKFLOW_STATES.BANK_DETAILS) normalizedState = WORKFLOW_STATES.BANK_DETAILS;
+		else if (workflowState === SHRIRAM_WORKFLOW_STATES.CREATE_FD) normalizedState = WORKFLOW_STATES.CREATE_FD;
+		else if (workflowState === SHRIRAM_WORKFLOW_STATES.PAYMENT) normalizedState = WORKFLOW_STATES.PAYMENT;
+		else if (workflowState === SHRIRAM_WORKFLOW_STATES.END) normalizedState = WORKFLOW_STATES.END;
+	} else if (isMahindraCaption) {
+		if (workflowState === MAHINDRA_WORKFLOW_STATES.START || workflowState === MAHINDRA_WORKFLOW_STATES.INITIATION) normalizedState = WORKFLOW_STATES.START;
+		else if (workflowState === MAHINDRA_WORKFLOW_STATES.KYC || workflowState === MAHINDRA_WORKFLOW_STATES.AADHAAR_VERIFICATION) {
+			navigate('AadhaarVerification');
+			return;
+		}
+		else if (workflowState === MAHINDRA_WORKFLOW_STATES.DEMOGRAPHIC_INFO) normalizedState = WORKFLOW_STATES.KYC; // Map demographic to KYC
+		else if (workflowState === MAHINDRA_WORKFLOW_STATES.OCCUPATION) normalizedState = WORKFLOW_STATES.OCCUPATION;
+		else if (workflowState === MAHINDRA_WORKFLOW_STATES.NOMINEE) normalizedState = WORKFLOW_STATES.NOMINEE;
+		else if (workflowState === MAHINDRA_WORKFLOW_STATES.BANK_DETAILS) normalizedState = WORKFLOW_STATES.BANK_DETAILS;
+		else if (workflowState === MAHINDRA_WORKFLOW_STATES.CREATE_FD) normalizedState = WORKFLOW_STATES.CREATE_FD;
+		else if (workflowState === MAHINDRA_WORKFLOW_STATES.PAYMENT) normalizedState = WORKFLOW_STATES.PAYMENT;
+		else if (workflowState === MAHINDRA_WORKFLOW_STATES.END) normalizedState = WORKFLOW_STATES.END;
+	}
+
+	switch (normalizedState) {
+		case WORKFLOW_STATES.START:
+		case WORKFLOW_STATES.INITIATION:
+			// No navigation required
+			break;
+
+		case WORKFLOW_STATES.CREATE_FD:
+			// For Shriram, CREATE_FD means we should show payment if possible
+			if (isShriramCaption) {
+				navigate('PayNow', {
+					fdData: fdData ? {
+						companyName: fdData.name,
+						amount: fdData.amount,
+						fdRate: fdData.roi,
+						tenure: fdData.tenure,
+						interestPayout: ''
+					} : undefined
+				} as any);
+			} else {
+				// Default behavior for other providers
+				navigate('PayNow', {
+					fdData: fdData ? {
+						companyName: fdData.name,
+						amount: fdData.amount,
+						fdRate: fdData.roi,
+						tenure: fdData.tenure,
+						interestPayout: 'Yearly'
+					} : undefined
+				} as any);
+			}
+			break;
+
+		case WORKFLOW_STATES.OCCUPATION:
+			navigate('Employee');
+			break;
+
+		case WORKFLOW_STATES.NOMINEE:
+			navigate('NomineeDetail');
+			break;
+
+		case WORKFLOW_STATES.BANK_DETAILS:
+			if (isShriramCaption) {
+				navigate('ExternalSDK', { sdkType: 'shriram', initialRouteName: 'BankDetail' } as any);
+			} else if (isMahindraCaption) {
+				navigate('ExternalSDK', { sdkType: 'mahindra', initialRouteName: 'BankDetail' } as any);
+			} else {
+				navigate('BankDetail');
+			}
+			break;
+
+		case WORKFLOW_STATES.KYC:
+			navigate('ReviewKYC');
+			break;
+
+		case WORKFLOW_STATES.PAYMENT:
+			// Handle payment status check and navigation
+			if (transactionId) {
+				navigate('Payment');
+			} else {
+				navigate('PayNow', {
+					fdData: fdData ? {
+						companyName: fdData.name,
+						amount: fdData.amount,
+						fdRate: fdData.roi,
+						tenure: fdData.tenure,
+						interestPayout: ''
+					} : undefined
+				} as any);
+			}
+			break;
+
+		case WORKFLOW_STATES.END:
+			if (isShriramCaption) {
+				navigate('ExternalSDK', {
+					sdkType: 'shriram',
+					initialRouteName: 'PayNow',
+					fdData: fdData ? {
+						companyName: fdData.name,
+						amount: fdData.amount,
+						fdRate: fdData.roi,
+						tenure: fdData.tenure,
+						interestPayout: ''
+					} : undefined
+				} as any);
+			} else {
+				navigate('PaymentStatus', {
+					transactionId,
+					fdData: fdData ? {
+						companyName: fdData.name,
+						amount: fdData.amount,
+						fdRate: fdData.roi,
+						tenure: fdData.tenure,
+						interestPayout: ''
+					} : undefined
+				});
+			}
+			break;
+
+		default:
+			break;
+	}
 }
 
 /**
@@ -100,13 +163,13 @@ export async function handleWorkflowNavigation({
  */
 export function handleFDSelection(fdData: FDData, investmentData?: InvestmentData) {
 
-    // Store FD data in Redux (this should be done in FDList component)
-    // Then navigate to occupation screen
-    handleWorkflowNavigation({
-        workflowState: WORKFLOW_STATES.OCCUPATION,
-        investmentData,
-        fdData,
-    });
+	// Store FD data in Redux (this should be done in FDList component)
+	// Then navigate to occupation screen
+	handleWorkflowNavigation({
+		workflowState: WORKFLOW_STATES.OCCUPATION,
+		investmentData,
+		fdData,
+	});
 }
 
 /**
@@ -114,18 +177,18 @@ export function handleFDSelection(fdData: FDData, investmentData?: InvestmentDat
  */
 export function navigateFDCreationFlow(fdData: FDData, investmentData?: InvestmentData) {
 
-    // This represents the complete flow from FD selection to payment
-    const flow = [
-        WORKFLOW_STATES.OCCUPATION,    // Employee screen
-        WORKFLOW_STATES.NOMINEE,       // NomineeDetail screen  
-        WORKFLOW_STATES.BANK_DETAILS,  // BankDetail screen
-        WORKFLOW_STATES.PAYMENT,       // PayNow screen
-    ];
-
-    // Start with occupation
-    handleWorkflowNavigation({
-        workflowState: WORKFLOW_STATES.OCCUPATION,
-        investmentData,
-        fdData,
-    });
+	// This represents the complete flow from FD selection to payment
+	const flow = [
+		WORKFLOW_STATES.OCCUPATION,    // Employee screen
+		WORKFLOW_STATES.NOMINEE,       // NomineeDetail screen  
+		WORKFLOW_STATES.BANK_DETAILS,  // BankDetail screen
+		WORKFLOW_STATES.PAYMENT,       // PayNow screen
+	];
+
+	// Start with occupation
+	handleWorkflowNavigation({
+		workflowState: WORKFLOW_STATES.OCCUPATION,
+		investmentData,
+		fdData,
+	});
 }

package/src/screens/AadhaarVerification.tsx

@@ -692,22 +692,8 @@ const AadhaarVerification: React.FC<AadhaarVerificationProps> = ({
         }
     };
 
-    // Handle Android hardware back button
-    useEffect(() => {
-        if (Platform.OS !== 'android') return;
+    // Removed screen-level hardware back handler to allow only header back button navigation
 
-        const onHardwareBackPress = () => {
-            handleBackPress();
-            return true; // Prevent default behavior
-        };
-
-        const backHandler = BackHandler.addEventListener(
-            'hardwareBackPress',
-            onHardwareBackPress
-        );
-
-        return () => backHandler.remove();
-    }, [defultProviderId, workflowInstanceId, applicationId, entityId]);
 
     return (
         <SafeAreaWrapper

package/src/screens/AddBankAccount.tsx

@@ -311,22 +311,8 @@ const AddBankAccount: React.FC<AddBankAccountProps> = ({ onGoBack, onContinue, o
         navigate('BankDetail');
     };
 
-    // Handle Android hardware back button
-    useEffect(() => {
-        if (Platform.OS !== 'android') return;
-
-        const onHardwareBackPress = () => {
-            handleBackPress();
-            return true; // Prevent default behavior
-        };
-
-        const backHandler = BackHandler.addEventListener(
-            'hardwareBackPress',
-            onHardwareBackPress
-        );
-
-        return () => backHandler.remove();
-    }, []);
+    // Removed screen-level hardware back handler to allow only header back button navigation
+
 
     return (
         <SafeAreaWrapper

package/src/screens/BankDetail.tsx

@@ -613,22 +613,8 @@ const BankDetail: React.FC<BankDetailProps> = ({ onGoBack, onContinue, onAddAcco
         }
     };
 
-    // Handle Android hardware back button
-    useEffect(() => {
-        if (Platform.OS !== 'android') return;
-
-        const onHardwareBackPress = () => {
-            handleBackPress();
-            return true; // Prevent default behavior
-        };
-
-        const backHandler = BackHandler.addEventListener(
-            'hardwareBackPress',
-            onHardwareBackPress
-        );
+	// Removed screen-level hardware back handler to allow only header back button navigation
 
-        return () => backHandler.remove();
-    }, [defaultProviderId, workflowInstanceId, applicationId, entityId, appData?.userReferenceId]);
 
     return (
         <SafeAreaWrapper

package/src/screens/Employee.tsx

@@ -583,22 +583,8 @@ const Employee: React.FC<EmployeeProps> = ({ onGoBack, onContinue, initialData }
         }
     };
 
-    // Handle Android hardware back button
-    useEffect(() => {
-        if (Platform.OS !== 'android') return;
+	// Removed screen-level hardware back handler to allow only header back button navigation
 
-        const onHardwareBackPress = () => {
-            handleBackPress();
-            return true; // Prevent default behavior
-        };
-
-        const backHandler = BackHandler.addEventListener(
-            'hardwareBackPress',
-            onHardwareBackPress
-        );
-
-        return () => backHandler.remove();
-    }, [defaultProviderId, workflowInstanceId, applicationId]);
 
     return (
         <SafeAreaWrapper

package/src/screens/FDCalculator.tsx

@@ -584,22 +584,8 @@ const FDCalculator: React.FC<FDCalculatorProps> = ({ onGoBack, onNavigateToRevie
         return fallback;
     }, [effectiveMasterData]);
 
-    // Handle Android hardware back button - use same navigation as header back button
-    useEffect(() => {
-        if (Platform.OS !== 'android') return;
-
-        const onHardwareBackPress = () => {
-            navigate('FDList'); // Same as header back button
-            return true; // Prevent default behavior
-        };
+    // Removed screen-level hardware back handler to allow only header back button navigation
 
-        const backHandler = BackHandler.addEventListener(
-            'hardwareBackPress',
-            onHardwareBackPress
-        );
-
-        return () => backHandler.remove();
-    }, []);
 
     return (
         <SafeAreaWrapper