@finspringinnovations/fixeddepositsdk 1.0.2 → 1.0.4

package/lib/screens/FindIFSC.js

@@ -137,17 +137,7 @@ const FindIFSC = ({ onGoBack, onSelect, initialSearchTerm }) => {
     const handleBackPress = () => {
         (0, helpers_1.navigate)('AddBankAccount');
     };
-    // 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();
-    }, []);
+    // Removed screen-level hardware back handler to allow only header back button navigation
     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: bank_1.BANK_STRINGS.FIND_IFSC_TITLE, onBackPress: handleBackPress, backgroundColor: colors.primary }),
         react_1.default.createElement(react_native_1.ScrollView, { style: styles.container, showsVerticalScrollIndicator: false },

package/lib/screens/NomineeDetail.js

@@ -36,26 +36,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const datetimepicker_1 = __importDefault(require("@react-native-community/datetimepicker"));
 const react_1 = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const Ionicons_1 = __importDefault(require("react-native-vector-icons/Ionicons"));
-const datetimepicker_1 = __importDefault(require("@react-native-community/datetimepicker"));
 // import DatePicker from 'react-native-date-picker'; // Commented out old date picker
-const SafeAreaWrapper_1 = __importDefault(require("../components/SafeAreaWrapper"));
+const native_1 = require("@react-navigation/native");
+const customerApi_1 = require("../api/customerApi");
+const workflowApi_1 = require("../api/workflowApi");
 const components_1 = require("../components");
 const ActionButton_1 = __importDefault(require("../components/ActionButton"));
+const SafeAreaWrapper_1 = __importDefault(require("../components/SafeAreaWrapper"));
 const TextFieldWithLabel_1 = __importDefault(require("../components/TextFieldWithLabel"));
-const ThemeContext_1 = require("../theme/ThemeContext");
-const customerApi_1 = require("../api/customerApi");
-const MasterDataProvider_1 = require("../providers/MasterDataProvider");
-const store_1 = require("../store");
 const appDataConfig_1 = require("../config/appDataConfig");
-const workflowApi_1 = require("../api/workflowApi");
-const native_1 = require("@react-navigation/native");
-const helpers_1 = require("../navigation/helpers");
 const base64Images_1 = require("../constants/strings/base64Images");
-const nominee_1 = require("../constants/strings/nominee");
 const common_1 = require("../constants/strings/common");
+const nominee_1 = require("../constants/strings/nominee");
+const helpers_1 = require("../navigation/helpers");
+const MasterDataProvider_1 = require("../providers/MasterDataProvider");
+const store_1 = require("../store");
+const ThemeContext_1 = require("../theme/ThemeContext");
 const makeNominationOptions = ['Yes', 'No'];
 const NomineeDetail = ({ onGoBack, onSave, initialData }) => {
     var _a;
@@ -500,17 +500,7 @@ const NomineeDetail = ({ onGoBack, onSave, initialData }) => {
             (0, helpers_1.navigate)('Employee');
         }
     };
-    // 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]);
+    // Removed screen-level hardware back handler to allow only header back button navigation
     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: nominee_1.NOMINEE_STRINGS.NOMINEE_DETAILS_TITLE, 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 },
@@ -523,7 +513,7 @@ const NomineeDetail = ({ onGoBack, onSave, initialData }) => {
                             renderDropdown(nominee_1.NOMINEE_STRINGS.RELATIONSHIP_LABEL, form.relationship, 'relationship', nomineeRelationOptions, 'relationship'),
                             renderDateField(nominee_1.NOMINEE_STRINGS.DATE_OF_BIRTH_LABEL, form.dateOfBirth, 'dateOfBirth'),
                             showDatePicker && (react_1.default.createElement(react_native_1.View, { style: styles.datePickerContainer },
-                                react_1.default.createElement(datetimepicker_1.default, { value: selectedDate, mode: "date", display: react_native_1.Platform.OS === 'ios' ? 'spinner' : 'default', onChange: onDateChange, maximumDate: new Date(new Date().getFullYear() - 18, new Date().getMonth(), new Date().getDate()), themeVariant: "light" }))),
+                                react_1.default.createElement(datetimepicker_1.default, { value: selectedDate, mode: "date", display: react_native_1.Platform.OS === 'ios' ? 'spinner' : 'default', onChange: onDateChange, maximumDate: new Date(new Date().getFullYear() - 18, new Date().getMonth(), new Date().getDate()), minimumDate: new Date(new Date().getFullYear() - 100, 0, 1), themeVariant: "light" }))),
                             react_1.default.createElement(react_native_1.View, { style: styles.checkboxContainer },
                                 react_1.default.createElement(react_native_1.TouchableOpacity, { style: styles.checkbox, onPress: () => updateField('printNameOnCertificate', !form.printNameOnCertificate) },
                                     react_1.default.createElement(react_native_1.View, { style: [styles.checkboxBox, form.printNameOnCertificate && styles.checkboxChecked] }, form.printNameOnCertificate ? (react_1.default.createElement(react_native_1.Image, { source: { uri: ((0, ThemeContext_1.useTheme)().themeName === 'dark') ? base64Images_1.base64Images.checkBoxDark : base64Images_1.base64Images.filledCheckBox }, style: { width: 22, height: 22 }, resizeMode: "contain" })) : (((0, ThemeContext_1.useTheme)().themeName === 'dark') ? (react_1.default.createElement(react_native_1.Image, { source: { uri: base64Images_1.base64Images.unCheckBoxDark }, style: { width: 22, height: 22 }, resizeMode: "contain" })) : null))),

package/lib/screens/PayNow.js

@@ -148,17 +148,7 @@ const PayNow = ({ onGoBack, onConfirm, fdData }) => {
             (0, helpers_1.navigate)('BankDetail');
         }
     };
-    // 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]);
+    // Removed screen-level hardware back handler to allow only header back button navigation
     return (react_1.default.createElement(SafeAreaWrapper_1.default, { includeTop: false, bottomPadding: 25, statusBarColor: "#000000", statusBarStyle: "light-content" },
         react_1.default.createElement(react_native_1.View, { style: styles.container },
             react_1.default.createElement(react_native_1.ScrollView, { showsVerticalScrollIndicator: false, contentContainerStyle: styles.scrollContent },

package/lib/screens/Payment.js

@@ -40,9 +40,9 @@ const react_1 = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const react_native_webview_1 = require("react-native-webview");
 const SafeAreaWrapper_1 = __importDefault(require("../components/SafeAreaWrapper"));
+const encryptionConfig_1 = require("../config/encryptionConfig");
 const ThemeContext_1 = require("../theme/ThemeContext");
 const encryption_1 = require("../utils/encryption");
-const encryptionConfig_1 = require("../config/encryptionConfig");
 const Payment = ({ onGoBack, onPaymentSuccess, onPaymentFailure, paymentUrl, successUrl = 'payment/success', failureUrl = 'payment/failure', }) => {
     const colors = (0, ThemeContext_1.useColors)();
     const styles = createStyles(colors);
@@ -149,16 +149,7 @@ const Payment = ({ onGoBack, onPaymentSuccess, onPaymentFailure, paymentUrl, suc
         }
     };
     // Disable hardware back button on Payment screen
-    (0, react_1.useEffect)(() => {
-        if (react_native_1.Platform.OS !== 'android')
-            return;
-        const onBackPress = () => {
-            // Return true to prevent default behavior (block back button)
-            return true;
-        };
-        const backHandler = react_native_1.BackHandler.addEventListener('hardwareBackPress', onBackPress);
-        return () => backHandler.remove();
-    }, []);
+    // Removed screen-level hardware back handler to allow only header back button navigation
     return (react_1.default.createElement(SafeAreaWrapper_1.default, { includeTop: false, 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 },

package/lib/screens/PaymentStatus.js

@@ -36,24 +36,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const native_1 = require("@react-navigation/native");
 const react_1 = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const Ionicons_1 = __importDefault(require("react-native-vector-icons/Ionicons"));
-const base64Images_1 = require("../constants/strings/base64Images");
-const SafeAreaWrapper_1 = __importDefault(require("../components/SafeAreaWrapper"));
+const customerApi_1 = require("../api/customerApi");
+const fdApi_1 = require("../api/fdApi");
 const components_1 = require("../components");
 const ActionButton_1 = __importDefault(require("../components/ActionButton"));
-const ThemeContext_1 = require("../theme/ThemeContext");
-const fdApi_1 = require("../api/fdApi");
-const customerApi_1 = require("../api/customerApi");
-const store_1 = require("../store");
+const SafeAreaWrapper_1 = __importDefault(require("../components/SafeAreaWrapper"));
+const apiConfig_1 = require("../config/apiConfig");
 const appDataConfig_1 = require("../config/appDataConfig");
-const helpers_1 = require("../navigation/helpers");
-const paymentSession_1 = require("../state/paymentSession");
-const native_1 = require("@react-navigation/native");
 const bank_1 = require("../constants/strings/bank");
+const base64Images_1 = require("../constants/strings/base64Images");
 const common_1 = require("../constants/strings/common");
-const apiConfig_1 = require("../config/apiConfig");
+const helpers_1 = require("../navigation/helpers");
+const paymentSession_1 = require("../state/paymentSession");
+const store_1 = require("../store");
+const ThemeContext_1 = require("../theme/ThemeContext");
 const PaymentStatus = ({ onRetry, onContinue, status, transactionId, fdData }) => {
     var _a;
     const colors = (0, ThemeContext_1.useColors)();
@@ -301,20 +301,16 @@ const PaymentStatus = ({ onRetry, onContinue, status, transactionId, fdData }) =
             }
         }
     };
-    // Disable hardware back button on PaymentStatus screen
-    (0, react_1.useEffect)(() => {
-        if (react_native_1.Platform.OS !== 'android')
-            return;
-        const onBackPress = () => {
-            // Return true to prevent default behavior (block back button)
-            return true;
-        };
-        const backHandler = react_native_1.BackHandler.addEventListener('hardwareBackPress', onBackPress);
-        return () => backHandler.remove();
-    }, []);
+    // Back button: navigate to FDList for all statuses
+    const handleNavigateToFDList = () => {
+        (0, helpers_1.navigate)('FDList');
+    };
+    // Removed screen-level hardware back handler to allow only header back button navigation
     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 +342,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

@@ -587,17 +587,7 @@ const ReviewKYC = ({ onGoBack, onContinue, initialData, }) => {
             (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]);
+    // Removed screen-level hardware back handler to allow only header back button navigation
     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 },
@@ -631,7 +621,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 })))));
 };

package/lib/types/workflowTypes.d.ts

@@ -1,2 +1,2 @@
 import { WORKFLOW_STATES } from '../config/workflowConstants';
-export type WorkflowStateSriram = typeof WORKFLOW_STATES.START | typeof WORKFLOW_STATES.INITIATION | typeof WORKFLOW_STATES.CREATE_FD | typeof WORKFLOW_STATES.OCCUPATION | typeof WORKFLOW_STATES.NOMINEE | typeof WORKFLOW_STATES.BANK_DETAILS | typeof WORKFLOW_STATES.KYC | typeof WORKFLOW_STATES.PAYMENT | typeof WORKFLOW_STATES.END;
+export type WorkflowStateSriram = typeof WORKFLOW_STATES[keyof typeof WORKFLOW_STATES] | string;

package/package.json

@@ -1,51 +1,51 @@
 {
-    "name": "@finspringinnovations/fixeddepositsdk",
-    "version": "1.0.2",
-    "description": "FD SDK for React Native applications",
-    "main": "lib/index.js",
-    "types": "lib/index.d.ts",
-    "files": [
-        "lib",
-        "src",
-        "README.md"
-    ],
-    "scripts": {
-        "build": "tsc",
-        "clean": "rm -rf lib",
-        "prepublishOnly": "yarn clean && yarn build",
-        "lint": "eslint src --ext .ts,.tsx"
-    },
-    "keywords": [
-        "react-native",
-        "sdk",
-        "typescript",
-        "android",
-        "ios",
-        "fd"
-    ],
-    "peerDependencies": {
-        "@finspringinnovations/mahindrafdsdk": ">=1.0.0",
-        "@finspringinnovations/shriramfdsdk": ">=1.0.0",
-        "react": ">=16.8.0",
-        "react-native": ">=0.60.0"
-    },
-    "devDependencies": {
-        "@types/react": "^18.2.0",
-        "@types/react-native": "^0.72.0",
-        "@typescript-eslint/eslint-plugin": "^6.0.0",
-        "@typescript-eslint/parser": "^6.0.0",
-        "eslint": "^8.0.0",
-        "typescript": "^5.0.0"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/your-org/my-sdks.git",
-        "directory": "packages/fdsdk"
-    },
-    "license": "MIT",
-    "react-native": "src/index.tsx",
-    "dependencies": {
-        "@finspringinnovations/mahindrafdsdk": "^1.0.1",
-        "@finspringinnovations/shriramfdsdk": "^1.0.1"
-    }
-}
+	"name": "@finspringinnovations/fixeddepositsdk",
+	"version": "1.0.4",
+	"description": "FD SDK for React Native applications",
+	"main": "lib/index.js",
+	"types": "lib/index.d.ts",
+	"files": [
+		"lib",
+		"src",
+		"README.md"
+	],
+	"scripts": {
+		"build": "tsc",
+		"clean": "rm -rf lib",
+		"prepublishOnly": "yarn clean && yarn build",
+		"lint": "eslint src --ext .ts,.tsx"
+	},
+	"keywords": [
+		"react-native",
+		"sdk",
+		"typescript",
+		"android",
+		"ios",
+		"fd"
+	],
+	"peerDependencies": {
+		"@finspringinnovations/mahindrafdsdk": ">=1.0.0",
+		"@finspringinnovations/shriramfdsdk": ">=1.0.0",
+		"react": ">=16.8.0",
+		"react-native": ">=0.60.0"
+	},
+	"devDependencies": {
+		"@types/react": "^18.2.0",
+		"@types/react-native": "^0.72.0",
+		"@typescript-eslint/eslint-plugin": "^6.0.0",
+		"@typescript-eslint/parser": "^6.0.0",
+		"eslint": "^8.0.0",
+		"typescript": "^5.0.0"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/your-org/my-sdks.git",
+		"directory": "packages/fdsdk"
+	},
+	"license": "MIT",
+	"react-native": "src/index.tsx",
+	"dependencies": {
+		"@finspringinnovations/mahindrafdsdk": "^1.0.1",
+		"@finspringinnovations/shriramfdsdk": "^1.0.1"
+	}
+}

package/src/api/customerApi.ts

@@ -123,6 +123,7 @@ export const customerApi = baseApi.injectEndpoints({
                     "customer_id",            // ← ADD THIS
                     "current_task",
                     "current_state",
+                    "current_state_caption",
                     "fd_id",
                 ];
 

package/src/api/fdApi.ts

@@ -142,9 +142,36 @@ export const fdApi = baseApi.injectEndpoints({
                 };
             },
         }),
+
+        getPaymentUrl: builder.query<
+            { status?: string; statusCode?: number; message?: string; data?: Array<{ paymentUrl?: string; transactionId?: string }> },
+            { providerId?: string; workflowInstanceId?: string; userreferenceid?: string; applicationid?: string; entityid?: string; applicationId: string; panNo: string; isRetry?: boolean }
+        >({
+            query: (params) => {
+                const { providerId, workflowInstanceId, userreferenceid, applicationid, entityid, applicationId, panNo, isRetry = false } = params;
+                const qs = new URLSearchParams({
+                    applicationId,
+                    panNo,
+                    isRetry: String(isRetry),
+                }).toString();
+                return {
+                    url: `fd/payment/url?${qs}`,
+                    method: 'GET',
+                    headers: {
+                        provider: providerId || '{{shriramprovider}}',
+                        workflowInstanceId: workflowInstanceId || '{{workflowInstanceId}}',
+                        userreferenceid: userreferenceid || '{{userreferenceid}}',
+                        applicationid: applicationid || applicationId || '{{applicationid}}',
+                        entityid: entityid || '{{entityid}}',
+                        encryptdecrypt: 'true',
+                    },
+                };
+            },
+        }),
     }),
 });
 
 export const { useCreateFDMutation, useFdBankAccountMutation,
     useFdBankDetailsQuery, useFdBankDetailsSearchMutation,
-    usePaymentReverseFeedMutation, usePaymentRetryMutation } = fdApi;
+    usePaymentReverseFeedMutation, usePaymentRetryMutation,
+    useLazyGetPaymentUrlQuery } = fdApi;