@finspringinnovations/fdsdk 0.0.4 → 0.0.5

package/lib/screens/Payment.js

@@ -43,34 +43,22 @@ const SafeAreaWrapper_1 = __importDefault(require("../components/SafeAreaWrapper
 const ThemeContext_1 = require("../theme/ThemeContext");
 const encryption_1 = require("../utils/encryption");
 const encryptionConfig_1 = require("../config/encryptionConfig");
-const native_1 = require("@react-navigation/native");
-const paymentSession_1 = require("../state/paymentSession");
-const usePaymentStatusTimer_1 = require("../hooks/usePaymentStatusTimer");
+const store_1 = require("../store");
+const usePaymentSSE_1 = require("../hooks/usePaymentSSE");
 const Payment = ({ onGoBack, onPaymentSuccess, onPaymentFailure, onPaymentPending, paymentUrl, successUrl = 'payment/success', failureUrl = 'payment/failure', }) => {
     const colors = (0, ThemeContext_1.useColors)();
     const styles = createStyles(colors);
     const webViewRef = (0, react_1.useRef)(null);
     const [loading, setLoading] = (0, react_1.useState)(true);
-    const currentStatusRef = (0, react_1.useRef)('pending');
-    const { transactionId } = (0, paymentSession_1.getPaymentSession)();
-    const { startTimer, stopTimer } = (0, usePaymentStatusTimer_1.usePaymentStatusTimer)({
-        transactionId,
-        onStatusUpdate: (status, response) => {
-            currentStatusRef.current = status;
-            if (status === 'success') {
-                onPaymentSuccess === null || onPaymentSuccess === void 0 ? void 0 : onPaymentSuccess(response);
-            }
-            else if (status === 'failed') {
-                onPaymentFailure === null || onPaymentFailure === void 0 ? void 0 : onPaymentFailure(response);
-            }
-            else if (status === 'pending') {
-                onPaymentPending === null || onPaymentPending === void 0 ? void 0 : onPaymentPending(response);
-            }
-        }
-    });
-    (0, native_1.useFocusEffect)(react_1.default.useCallback(() => {
-        startTimer();
-    }, [startTimer, stopTimer]));
+    const applicationId = (0, store_1.useAppSelector)((state) => { var _a; return (_a = state === null || state === void 0 ? void 0 : state.onboarding) === null || _a === void 0 ? void 0 : _a.applicationId; });
+    const workflowInstanceId = (0, store_1.useAppSelector)((state) => { var _a; return (_a = state === null || state === void 0 ? void 0 : state.onboarding) === null || _a === void 0 ? void 0 : _a.workflowInstanceId; });
+    const entityId = (0, store_1.useAppSelector)((state) => { var _a; return (_a = state === null || state === void 0 ? void 0 : state.onboarding) === null || _a === void 0 ? void 0 : _a.entityid; });
+    const providerId = (0, store_1.useAppSelector)((state) => { var _a; return (_a = state === null || state === void 0 ? void 0 : state.onboarding) === null || _a === void 0 ? void 0 : _a.providerId; });
+    const { start: startPaymentSSE, stop: stopPaymentSSE } = (0, usePaymentSSE_1.usePaymentSSE)();
+    const onSuccessRef = (0, react_1.useRef)(onPaymentSuccess);
+    const onFailureRef = (0, react_1.useRef)(onPaymentFailure);
+    onSuccessRef.current = onPaymentSuccess;
+    onFailureRef.current = onPaymentFailure;
     const handleNavigationStateChange = async (navState) => {
         const { url } = navState;
         if (url.includes('payment/status')) {
@@ -92,6 +80,37 @@ const Payment = ({ onGoBack, onPaymentSuccess, onPaymentFailure, onPaymentPendin
     const handleLoadEnd = () => {
         setLoading(false);
     };
+    // SSE: listen for payment status while user is on Payment WebView (same as web integration)
+    (0, react_1.useEffect)(() => {
+        if (!applicationId || !(paymentUrl === null || paymentUrl === void 0 ? void 0 : paymentUrl.trim()))
+            return;
+        startPaymentSSE(applicationId, {
+            onPaymentStatus: (status, payload) => {
+                var _a, _b;
+                const normalized = String(status || '').toUpperCase();
+                if (normalized === 'SUCCESS') {
+                    stopPaymentSSE();
+                    (_a = onSuccessRef.current) === null || _a === void 0 ? void 0 : _a.call(onSuccessRef, payload);
+                    return;
+                }
+                if (normalized === 'FAILED') {
+                    stopPaymentSSE();
+                    (_b = onFailureRef.current) === null || _b === void 0 ? void 0 : _b.call(onFailureRef, payload);
+                }
+            },
+            onError: () => {
+                if (__DEV__)
+                    console.warn('[Payment] SSE connection error');
+            },
+            onConnected: () => {
+                if (__DEV__)
+                    console.log('[Payment] SSE connected for payment status');
+            },
+        }, { workflowInstanceId, applicationId, entityid: entityId, providerId });
+        return () => {
+            stopPaymentSSE();
+        };
+    }, [applicationId, paymentUrl, workflowInstanceId, entityId, providerId, startPaymentSSE, stopPaymentSSE]);
     const handleMessage = async (event) => {
         var _a, _b, _c;
         try {
@@ -130,13 +149,9 @@ const Payment = ({ onGoBack, onPaymentSuccess, onPaymentFailure, onPaymentPendin
                 // Check payment status in data
                 const paymentStatus = (_c = (_b = response.data) === null || _b === void 0 ? void 0 : _b.paymentStatus) === null || _c === void 0 ? void 0 : _c.toLowerCase();
                 if (paymentStatus === 'success') {
-                    currentStatusRef.current = "success";
-                    stopTimer();
                     onPaymentSuccess === null || onPaymentSuccess === void 0 ? void 0 : onPaymentSuccess(response);
                 }
                 else if (paymentStatus === 'failed') {
-                    currentStatusRef.current = "failed";
-                    stopTimer();
                     onPaymentFailure === null || onPaymentFailure === void 0 ? void 0 : onPaymentFailure(response);
                 }
                 else {
@@ -144,7 +159,6 @@ const Payment = ({ onGoBack, onPaymentSuccess, onPaymentFailure, onPaymentPendin
                 }
             }
             else {
-                currentStatusRef.current = "pending";
                 onPaymentPending === null || onPaymentPending === void 0 ? void 0 : onPaymentPending(response);
             }
             setLoading(false);

package/lib/screens/PaymentStatus.js

@@ -53,8 +53,7 @@ const paymentSession_1 = require("../state/paymentSession");
 const native_1 = require("@react-navigation/native");
 const bank_1 = require("../constants/strings/bank");
 const common_1 = require("../constants/strings/common");
-const apiConfig_1 = require("../config/apiConfig");
-const usePaymentStatusTimer_1 = require("../hooks/usePaymentStatusTimer");
+const usePaymentSSE_1 = require("../hooks/usePaymentSSE");
 const PaymentStatus = ({ onRetry, onContinue, status, transactionId, fdData }) => {
     var _a;
     const colors = (0, ThemeContext_1.useColors)();
@@ -75,18 +74,7 @@ const PaymentStatus = ({ onRetry, onContinue, status, transactionId, fdData }) =
     const applicationId = (0, store_1.useAppSelector)((state) => { var _a; return (_a = state === null || state === void 0 ? void 0 : state.onboarding) === null || _a === void 0 ? void 0 : _a.applicationId; });
     const entityId = (0, store_1.useAppSelector)((state) => { var _a; return (_a = state === null || state === void 0 ? void 0 : state.onboarding) === null || _a === void 0 ? void 0 : _a.entityid; });
     const providerId = (0, store_1.useAppSelector)((state) => { var _a; return (_a = state === null || state === void 0 ? void 0 : state.onboarding) === null || _a === void 0 ? void 0 : _a.providerId; });
-    const { startTimer, stopTimer, triggerStatusCheck, isCheckingStatus, } = (0, usePaymentStatusTimer_1.usePaymentStatusTimer)({
-        transactionId: finalTransactionId,
-        overrides: {
-            providerId,
-            workflowInstanceId,
-            applicationid: applicationId,
-            entityid: entityId,
-        },
-        onStatusUpdate: (nextStatus) => {
-            setCurrentStatus(nextStatus);
-        },
-    });
+    const { start: startPaymentSSE, stop: stopPaymentSSE } = (0, usePaymentSSE_1.usePaymentSSE)();
     // Payment Retry API
     const [paymentRetry, { data: paymentRetryResponse, error: paymentRetryError, isLoading: isLoadingPaymentRetry, }] = (0, fdApi_1.usePaymentRetryMutation)();
     // Get Customer Applications API
@@ -111,19 +99,31 @@ const PaymentStatus = ({ onRetry, onContinue, status, transactionId, fdData }) =
         return amount.toLocaleString('en-IN');
     };
     (0, react_1.useEffect)(() => {
-        if (currentStatus === 'pending') {
-            startTimer();
-        }
-        else {
-            stopTimer();
+        if (currentStatus !== 'pending' || !applicationId) {
+            stopPaymentSSE();
+            return;
         }
+        startPaymentSSE(applicationId, {
+            onPaymentStatus: (status) => {
+                const normalized = String(status || '').toUpperCase();
+                if (normalized === 'SUCCESS') {
+                    setCurrentStatus('success');
+                    stopPaymentSSE();
+                    return;
+                }
+                if (normalized === 'FAILED') {
+                    setCurrentStatus('failed');
+                    stopPaymentSSE();
+                }
+            },
+            onError: () => {
+                // keep pending state; stream can be restarted on re-render
+            },
+        });
         return () => {
-            stopTimer();
+            stopPaymentSSE();
         };
-    }, [currentStatus, startTimer, stopTimer]);
-    const handlePaymentReverseFeed = async () => {
-        await triggerStatusCheck();
-    };
+    }, [applicationId, currentStatus, startPaymentSSE, stopPaymentSSE]);
     // Handle payment retry when status is failed
     const handlePaymentRetry = async () => {
         var _a;
@@ -167,8 +167,6 @@ const PaymentStatus = ({ onRetry, onContinue, status, transactionId, fdData }) =
         try {
             // Get user info from app data
             const userInfo = (0, appDataConfig_1.getUserInfoForAPI)();
-            // Get API configuration
-            const apiConfig = (0, apiConfig_1.getApiConfig)();
             // Prepare request payload
             const requestPayload = {
                 userReferenceId: userInfo.id

package/lib/screens/ReviewKYC.js

@@ -162,7 +162,6 @@ const ReviewKYC = ({ onGoBack, onContinue, initialData, }) => {
     const [fieldErrors, setFieldErrors] = (0, react_1.useState)({});
     // State to track marital status dropdown visibility
     const [showMaritalStatusMenu, setShowMaritalStatusMenu] = (0, react_1.useState)(false);
-    const [isGoingBack, setIsGoingBack] = (0, react_1.useState)(false);
     // Ref to track currently focused text input
     const focusedTextInputRef = (0, react_1.useRef)(null);
     // Refs for each text field
@@ -229,23 +228,12 @@ const ReviewKYC = ({ onGoBack, onContinue, initialData, }) => {
     // Validate individual field and set error
     const validateField = (field, value) => {
         if (!value || value.trim().length === 0) {
-            // Use "District" for area field
-            if (field === 'area') {
-                return 'District is required';
-            }
             return `${field.charAt(0).toUpperCase() + field.slice(1)} is required`;
         }
         // Minimum 2 characters validation for text fields (excluding PAN, pincode, dateOfBirth, maritalStatus)
         const textFields = ['area', 'city', 'addressLine1', 'addressLine2', 'state', 'country'];
         if (textFields.includes(field)) {
             if (value.trim().length < 2) {
-                // Use "Address" for addressLine1 and addressLine2
-                if (field === 'addressLine1' || field === 'addressLine2') {
-                    return 'Address must be at least 2 characters';
-                }
-                else if (field === 'area') {
-                    return 'District must be at least 2 characters';
-                }
                 return `${field.charAt(0).toUpperCase() + field.slice(1)} must be at least 2 characters`;
             }
         }
@@ -271,7 +259,7 @@ const ReviewKYC = ({ onGoBack, onContinue, initialData, }) => {
         if (!error)
             return null;
         return (react_1.default.createElement(react_native_1.View, { style: styles.errorContainer },
-            react_native_1.Platform.OS === 'android' && (react_1.default.createElement(Ionicons_1.default, { name: "warning", size: 16, color: colors.error || '#FF0000', style: styles.errorIcon })),
+            react_1.default.createElement(Ionicons_1.default, { name: "warning", size: 16, color: colors.error || '#FF0000', style: styles.errorIcon }),
             react_1.default.createElement(react_native_1.Text, { style: styles.errorText }, error)));
     };
     // Enhanced field validation functions
@@ -446,6 +434,7 @@ const ReviewKYC = ({ onGoBack, onContinue, initialData, }) => {
                 return;
             }
             const data = (0, globalData_1.getGlobalData)();
+            console.log('panRapidNumber global data check', data, panRapidNumber);
             // Decide next screen based on panrapidnumber existence
             if (panRapidNumber && data.completeFDData) {
                 (0, helpers_1.navigate)('PayNow', { fdData: fdDataFromRoute });
@@ -466,12 +455,7 @@ const ReviewKYC = ({ onGoBack, onContinue, initialData, }) => {
         }
     };
     const renderInputField = (label, value, field, placeholder, editable = true, variant = 'text', maxLength, textInputRef) => (react_1.default.createElement(react_native_1.View, null,
-        react_1.default.createElement(TextFieldWithLabel_1.default, { label: label, value: value, onChangeText: (text) => updateField(field, text), placeholder: placeholder, editable: editable, variant: variant, maxLength: maxLength, keyboardType: variant === 'numeric' ? 'numeric' : variant === 'email' ? 'email-address' : 'default', autoCapitalize: variant === 'email' ? 'none' : 'words', onFocus: () => textInputRef && handleFieldFocus(textInputRef), textInputRef: textInputRef, returnKeyType: "done", onSubmitEditing: () => {
-                if (textInputRef === null || textInputRef === void 0 ? void 0 : textInputRef.current) {
-                    textInputRef.current.blur();
-                }
-                react_native_1.Keyboard.dismiss();
-            } }),
+        react_1.default.createElement(TextFieldWithLabel_1.default, { label: label, value: value, onChangeText: (text) => updateField(field, text), placeholder: placeholder, editable: editable, variant: variant, maxLength: maxLength, keyboardType: variant === 'numeric' ? 'numeric' : variant === 'email' ? 'email-address' : 'default', autoCapitalize: variant === 'email' ? 'none' : 'words', onFocus: () => textInputRef && handleFieldFocus(textInputRef), textInputRef: textInputRef }),
         renderFieldError(field)));
     const renderMaritalStatusDropdown = () => {
         return (react_1.default.createElement(react_native_1.View, null,
@@ -493,93 +477,59 @@ const ReviewKYC = ({ onGoBack, onContinue, initialData, }) => {
     const renderDateField = (label, value, field, editable = true, textInputRef) => (react_1.default.createElement(react_native_1.View, null,
         react_1.default.createElement(TextFieldWithLabel_1.default, { label: label, value: value, onChangeText: (text) => updateField(field, text), variant: "date", placeholder: "DD/MM/YYYY", maxLength: 10, dateFormat: "DD/MM/YYYY", editable: editable, onFocus: () => textInputRef && handleFieldFocus(textInputRef), textInputRef: textInputRef, onDatePress: () => {
                 // TODO: Implement date picker if needed
-            }, returnKeyType: "done", onSubmitEditing: () => {
-                if (textInputRef === null || textInputRef === void 0 ? void 0 : textInputRef.current) {
-                    textInputRef.current.blur();
-                }
-                react_native_1.Keyboard.dismiss();
             } }),
         renderFieldError(field)));
-    // Handler for back button (used by both header and hardware back button)
-    const handleBackPress = async () => {
-        setIsGoingBack(true);
-        try {
-            const userInfo = (0, appDataConfig_1.getUserInfoForAPI)();
-            await previousState({
-                providerId: defaultProviderId,
-                workflowInstanceId,
-                userreferenceid: userInfo.userReferenceId,
-                applicationid: applicationId,
-                entityid: entityId,
-            });
-        }
-        catch (e) {
-            // Handle error silently
-        }
-        finally {
-            setIsGoingBack(false);
-            //onGoBack?.();
-            (0, helpers_1.navigate)('FDCalculator');
-        }
-    };
-    // Handle Android hardware back button
-    (0, react_1.useEffect)(() => {
-        if (react_native_1.Platform.OS !== 'android')
-            return;
-        const onHardwareBackPress = () => {
-            handleBackPress();
-            return true; // Prevent default behavior
-        };
-        const backHandler = react_native_1.BackHandler.addEventListener('hardwareBackPress', onHardwareBackPress);
-        return () => backHandler.remove();
-    }, [defaultProviderId, workflowInstanceId, applicationId, entityId]);
-    return (react_1.default.createElement(SafeAreaWrapper_1.default, { includeTop: false, bottomPadding: 25, statusBarColor: "#000000", statusBarStyle: "light-content" },
-        react_1.default.createElement(components_1.Header, { title: "Review KYC", onBackPress: handleBackPress, backgroundColor: colors.primary }),
-        react_1.default.createElement(react_native_1.KeyboardAvoidingView, { behavior: react_native_1.Platform.OS === 'ios' ? 'padding' : undefined, style: styles.keyboardAvoidingView, keyboardVerticalOffset: react_native_1.Platform.OS === 'ios' ? 0 : 0 },
-            react_1.default.createElement(react_native_1.ScrollView, { style: styles.container, showsVerticalScrollIndicator: false, scrollEnabled: !isLoadingPanRapid, keyboardShouldPersistTaps: "handled", contentContainerStyle: styles.scrollContent },
-                react_1.default.createElement(react_native_1.TouchableWithoutFeedback, { onPress: isLoadingPanRapid ? undefined : closeDropdown },
+    return (react_1.default.createElement(SafeAreaWrapper_1.default, { includeTop: false, bottomPadding: 25, statusBarColor: "#f8f9fa", statusBarStyle: "dark-content" },
+        react_1.default.createElement(components_1.Header, { title: "Review KYC", onBackPress: async () => {
+                try {
+                    const userInfo = (0, appDataConfig_1.getUserInfoForAPI)();
+                    await previousState({
+                        providerId: defaultProviderId,
+                        workflowInstanceId,
+                        userreferenceid: userInfo.userReferenceId,
+                        applicationid: applicationId,
+                        entityid: entityId,
+                    });
+                }
+                catch (e) {
+                    // Handle error silently
+                }
+                finally {
+                    //onGoBack?.();
+                    (0, helpers_1.navigate)('FDCalculator');
+                }
+            }, backgroundColor: colors.primary }),
+        react_1.default.createElement(react_native_1.ScrollView, { style: styles.container, showsVerticalScrollIndicator: false, scrollEnabled: !isLoadingPanRapid },
+            react_1.default.createElement(react_native_1.TouchableWithoutFeedback, { onPress: isLoadingPanRapid ? undefined : closeDropdown },
+                react_1.default.createElement(react_native_1.View, null,
                     react_1.default.createElement(react_native_1.View, null,
-                        react_1.default.createElement(react_native_1.View, null,
-                            react_1.default.createElement(TextFieldWithLabel_1.default, { label: "PAN Card", value: kycData.panCard, onChangeText: (text) => updateField('panCard', text), placeholder: "Enter PAN Card", editable: false, variant: "text", maxLength: 10, keyboardType: "default", autoCapitalize: "characters", onFocus: () => handleFieldFocus(panCardRef), textInputRef: panCardRef, returnKeyType: "done", onSubmitEditing: () => {
-                                    if (panCardRef === null || panCardRef === void 0 ? void 0 : panCardRef.current) {
-                                        panCardRef.current.blur();
-                                    }
-                                    react_native_1.Keyboard.dismiss();
-                                } }),
-                            renderFieldError('panCard')),
-                        renderDateField('Date of Birth', kycData.dateOfBirth, 'dateOfBirth', false, dateOfBirthRef),
-                        renderMaritalStatusDropdown(),
-                        renderInputField('District', kycData.area, 'area', 'Enter District', true, 'text', 50, areaRef),
-                        renderInputField('City', kycData.city, 'city', 'Enter City', true, 'text', 30, cityRef),
-                        renderInputField('Address line 1', kycData.addressLine1, 'addressLine1', 'Enter Address Line 1', true, 'text', 100, addressLine1Ref),
-                        renderInputField('Address line 2', kycData.addressLine2, 'addressLine2', 'Enter Address Line 2', true, 'text', 100, addressLine2Ref),
-                        renderInputField('Pincode', kycData.pincode, 'pincode', 'Enter Pincode', true, 'numeric', 6, pincodeRef),
-                        renderInputField('State', kycData.state, 'state', 'Enter State', true, 'text', undefined, stateRef),
-                        renderInputField('Country', kycData.country, 'country', 'Enter Country', true, 'text', undefined, countryRef),
-                        react_1.default.createElement(react_native_1.View, { style: styles.checkboxContainer },
-                            react_1.default.createElement(react_native_1.TouchableOpacity, { style: styles.checkbox, onPress: () => updateField('useExistingAddress', !kycData.useExistingAddress) },
-                                react_1.default.createElement(react_native_1.View, { style: [
-                                        styles.checkboxBox,
-                                        kycData.useExistingAddress && styles.checkboxChecked
-                                    ] }, 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(TextFieldWithLabel_1.default, { label: "Pan Card", value: kycData.panCard, onChangeText: (text) => updateField('panCard', text), placeholder: "Enter PAN Card", editable: false, variant: "text", maxLength: 10, keyboardType: "default", autoCapitalize: "characters", onFocus: () => handleFieldFocus(panCardRef), textInputRef: panCardRef }),
+                        renderFieldError('panCard')),
+                    renderDateField('Date of Birth', kycData.dateOfBirth, 'dateOfBirth', false, dateOfBirthRef),
+                    renderMaritalStatusDropdown(),
+                    renderInputField('Area', kycData.area, 'area', 'Enter Area', true, 'text', 50, areaRef),
+                    renderInputField('City', kycData.city, 'city', 'Enter City', true, 'text', 30, cityRef),
+                    renderInputField('Address line 1', kycData.addressLine1, 'addressLine1', 'Enter Address Line 1', true, 'text', 100, addressLine1Ref),
+                    renderInputField('Address line 2', kycData.addressLine2, 'addressLine2', 'Enter Address Line 2', true, 'text', 100, addressLine2Ref),
+                    renderInputField('Pincode', kycData.pincode, 'pincode', 'Enter Pincode', true, 'numeric', 6, pincodeRef),
+                    renderInputField('State', kycData.state, 'state', 'Enter State', true, 'text', undefined, stateRef),
+                    renderInputField('Country', kycData.country, 'country', 'Enter Country', true, 'text', undefined, countryRef),
+                    react_1.default.createElement(react_native_1.View, { style: styles.checkboxContainer },
+                        react_1.default.createElement(react_native_1.TouchableOpacity, { style: styles.checkbox, onPress: () => updateField('useExistingAddress', !kycData.useExistingAddress) },
+                            react_1.default.createElement(react_native_1.View, { style: [
+                                    styles.checkboxBox,
+                                    kycData.useExistingAddress && styles.checkboxChecked
+                                ] }, 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" })),
-        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 })))));
+        isLoadingPanRapid && (react_1.default.createElement(react_native_1.View, { style: styles.loadingOverlay, pointerEvents: "auto" }))));
 };
 const createStyles = (colors, typography, themeName) => react_native_1.StyleSheet.create({
-    keyboardAvoidingView: {
-        flex: 1,
-    },
     container: {
         flex: 1,
         paddingHorizontal: 16,
         paddingTop: 20,
     },
-    scrollContent: {
-        flexGrow: 1,
-    },
     checkboxContainer: {
         flexDirection: 'row',
         alignItems: 'flex-start',
@@ -652,8 +602,6 @@ const createStyles = (colors, typography, themeName) => react_native_1.StyleShee
         right: 0,
         bottom: 0,
         backgroundColor: 'rgba(0, 0, 0, 0.3)',
-        justifyContent: 'center',
-        alignItems: 'center',
         zIndex: 1000,
     },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@finspringinnovations/fdsdk",
-    "version": "0.0.4",
+    "version": "0.0.5",
     "description": "FD SDK for React Native applications",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

package/src/api/baseApi.ts

@@ -339,6 +339,11 @@ const baseQueryWithEncryption: BaseQueryFn<
         baseUrl: apiConfig.baseUrl,
         timeout: apiConfig.timeout,
         prepareHeaders: (headers, { getState }) => {
+            // Disable HTTP-level caching for all SDK API calls
+            headers.set('Cache-Control', 'no-cache, no-store, must-revalidate');
+            headers.set('Pragma', 'no-cache');
+            headers.set('Expires', '0');
+
             const token = (getState() as any)?.auth?.token;
             if (token) headers.set('authorization', `Bearer ${token}`);
 
@@ -439,9 +444,14 @@ const baseQueryWithEncryption: BaseQueryFn<
     // Log response
     const duration = Date.now() - timestamp;
 
+    const statusFromMeta = result.meta?.response?.status;
+    const statusFromError = typeof result.error?.status === 'number' ? result.error.status : undefined;
+    const status = statusFromMeta ?? statusFromError ?? (result.error ? 0 : 200);
+    const statusText = result.meta?.response?.statusText || (result.error ? 'ERROR' : 'OK');
+
     const responseLogData: ResponseLogData = {
-        status: result.meta?.response?.status || 200,
-        statusText: result.meta?.response?.statusText || 'OK',
+        status,
+        statusText,
         headers: {},
         data: result.data,
         timestamp: Date.now(),
@@ -454,8 +464,7 @@ const baseQueryWithEncryption: BaseQueryFn<
 
     // Log response details in DEV mode (AFTER decryption)
     if (__DEV__) {
-        const status = result.meta?.response?.status || 200;
-        const isSuccess = status >= 200 && status < 300;
+        const isSuccess = !result.error && status >= 200 && status < 300;
 
         console.log('═══════════════════════════════════════════════════════════════');
         console.log(isSuccess ? '✅ [ShriramSDK] API RESPONSE - SUCCESS' : '❌ [ShriramSDK] API RESPONSE - ERROR');
@@ -464,7 +473,7 @@ const baseQueryWithEncryption: BaseQueryFn<
         console.log('🔗 Endpoint:', url);
         console.log('📌 Full URL:', `${apiConfig.baseUrl}${url}`);
         console.log('🔧 Method:', method);
-        console.log('📊 Status:', status, result.meta?.response?.statusText || 'OK');
+        console.log('📊 Status:', status, statusText);
         console.log('⏱️  Duration:', `${duration}ms`);
         console.log('🔐 Encryption:', currentEncryptionState ? 'Enabled' : 'Disabled');
         console.log('🆔 Request ID:', requestId);
@@ -507,7 +516,11 @@ export const baseApi = createApi({
     baseQuery: baseQueryWithEncryption,
     tagTypes: ['InterestRate'],
     endpoints: () => ({}),
+    keepUnusedDataFor: 0,
+    refetchOnMountOrArgChange: true,
+    refetchOnFocus: true,
+    refetchOnReconnect: true,
 });
 
 // Export hooks
-export const { usePrefetch } = baseApi;
+export const { usePrefetch } = baseApi;

package/src/api/masterDataApi.ts

@@ -12,17 +12,35 @@ export const masterDataApi = baseApi.injectEndpoints({
                 const request = {
                     url: 'masterdata',
                     method: 'GET' as const,
+                    cache: 'no-store' as const,
                     headers: {
                         workflowInstanceId: '{{workflowInstanceId}}',
                         'x-api-key': '{{X-API-KEY}}',
                         encryptdecrypt: 'false',
+                        'Cache-Control': 'no-cache, no-store, must-revalidate',
+                        Pragma: 'no-cache',
+                        Expires: '0',
                         provider: providerId || '{{shriramprovider}}',
                     },
                 };
                 return request;
             },
-            transformResponse: (response) => {
-                return response;
+            transformResponse: (response: any) => {
+                if (response == null) return response;
+                // If API returns a JSON string, parse it
+                let data = response;
+                if (typeof response === 'string') {
+                    try {
+                        data = JSON.parse(response);
+                    } catch {
+                        return response;
+                    }
+                }
+                // Unwrap { data: ... } so consumers get a consistent shape
+                if (typeof data === 'object' && data !== null && 'data' in data && Object.keys(data).length === 1) {
+                    return data.data;
+                }
+                return data;
             },
         }),
     }),
@@ -31,4 +49,4 @@ export const masterDataApi = baseApi.injectEndpoints({
 
 export const {
     useGetMasterDataQuery
-} = masterDataApi;
+} = masterDataApi;

package/src/api/workflowApi.ts

@@ -9,6 +9,38 @@ export interface TerminateWorkflowRequest {
 
 export type TerminateWorkflowResponse = any; // Replace with concrete type when available
 
+const TASK_ID_TO_CAPTION: Record<string, string> = {
+    '11042': 'SHRIRAM_V1_S1_T1_START',
+    '11043': 'SHRIRAM_V1_S1_T2_GET_PERSONAL_DETAILS_AND_BASIC_FD_INFO',
+    '11044': 'SHRIRAM_V1_S1_T3_END',
+    '11050': 'SHRIRAM_V1_S2_T1_KYC_START',
+    '11051': 'SHRIRAM_V1_S2_T2_CHECK_FOR_PAN_RAPID_STATUS',
+    '11052': 'SHRIRAM_V1_S2_T3_CHECK_IF_AADHAAR_ALREADY_VERIFIED',
+    '11045': 'SHRIRAM_V1_S2_T4_SEND_AADHAR_OTP',
+    '11046': 'SHRIRAM_V1_S2_T5_CHECK_FOR_OTP',
+    '11047': 'SHRIRAM_V1_S2_T6_VALIDATE_AADHAR_OTP',
+    '11053': 'SHRIRAM_V1_S2_T7_AADHAAR_VERIFIED',
+    '11049': 'SHRIRAM_V1_S2_T8_TERMINATE_TASK_AND_WORKFLOW_AFTER_KYC_RETRIES',
+    '11048': 'SHRIRAM_V1_S2_T9_KYC_END',
+    '11054': 'SHRIRAM_V1_S3_T1_OCCUPATION_START',
+    '11055': 'SHRIRAM_V1_S3_T2_CAPTURE_OCCUPATION_DETAILS',
+    '11056': 'SHRIRAM_V1_S3_T3_OCCUPATION_END',
+    '11057': 'SHRIRAM_V1_S4_T1_NOMINEE_START',
+    '11058': 'SHRIRAM_V1_S4_T2_CAPTURE_NOMINEE_DETAILS',
+    '11059': 'SHRIRAM_V1_S4_T3_NOMINEE_END',
+    '11060': 'SHRIRAM_V1_S5_T1_BANK_DETAILS_START',
+    '11061': 'SHRIRAM_V1_S5_T2_CAPTURE_BANK_DETAILS',
+    '11062': 'SHRIRAM_V1_S5_T3_BANK_DETAILS_END',
+    '11063': 'SHRIRAM_V1_S6_T1_FD_CREATION_START',
+    '11064': 'SHRIRAM_V1_S6_T2_CREATE_FD',
+    '11065': 'SHRIRAM_V1_S6_T3_FD_CREATION_END',
+    '11069': 'SHRIRAM_V1_S7_T1_PAYMENT_START',
+    '11068': 'SHRIRAM_V1_S7_T2_PAYMENT',
+    '11067': 'SHRIRAM_V1_S7_T3_CHECK_FOR_PAYMENT_STATUS',
+    '11070': 'SHRIRAM_V1_S7_T4_TERMINATE_TASK_AND_WORKFLOW_AFTER_PAYMENT_RETRIES',
+    '11066': 'SHRIRAM_V1_S7_T5_PAYMENT_END',
+};
+
 export const workflowApi = baseApi.injectEndpoints({
     endpoints: (builder) => ({
         terminateWorkflow: builder.mutation<
@@ -37,11 +69,28 @@ export const workflowApi = baseApi.injectEndpoints({
         updateTask: builder.mutation<any, any>({
             query: (body) => {
                 const { providerId, workflowInstanceId, userreferenceid, applicationid, entityid, ...requestBody } = body;
+                const normalizedRequestBody = { ...requestBody } as Record<string, any>;
+
+                // Backend now expects caption-based field name.
+                // Keep compatibility if any caller still passes targetTaskId.
+                if (!normalizedRequestBody.targetTaskCaption && normalizedRequestBody.targetTaskId) {
+                    normalizedRequestBody.targetTaskCaption = normalizedRequestBody.targetTaskId;
+                    delete normalizedRequestBody.targetTaskId;
+                }
+
+                // Normalize numeric task IDs to caption values if provided.
+                if (normalizedRequestBody.targetTaskCaption !== undefined && normalizedRequestBody.targetTaskCaption !== null) {
+                    const key = String(normalizedRequestBody.targetTaskCaption).trim();
+                    if (TASK_ID_TO_CAPTION[key]) {
+                        normalizedRequestBody.targetTaskCaption = TASK_ID_TO_CAPTION[key];
+                    }
+                }
+
                 return {
                     url: 'taskflow/update',
                     method: 'POST',
                     body: {
-                        ...requestBody,
+                        ...normalizedRequestBody,
                         workflowInstanceId: workflowInstanceId,
                     },
                     headers: {