@finspringinnovations/fdsdk 0.0.4 → 0.0.6

package/src/screens/ReviewKYC.tsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { useRoute } from '@react-navigation/native';
-import { View, Text, StyleSheet, ScrollView, TouchableOpacity, Alert, Image, TouchableWithoutFeedback, Keyboard, TextInput, BackHandler, Platform, ActivityIndicator, KeyboardAvoidingView } from 'react-native';
+import { View, Text, StyleSheet, ScrollView, TouchableOpacity, Alert, Image, TouchableWithoutFeedback, Keyboard, TextInput } from 'react-native';
 import Icon from 'react-native-vector-icons/Ionicons';
 import SafeAreaWrapper from '../components/SafeAreaWrapper';
 import { Header, DropdownSelector } from '../components';
@@ -209,7 +209,6 @@ const ReviewKYC: React.FC<ReviewKYCProps> = ({
 
     // State to track marital status dropdown visibility
     const [showMaritalStatusMenu, setShowMaritalStatusMenu] = useState(false);
-    const [isGoingBack, setIsGoingBack] = useState(false);
 
     // Ref to track currently focused text input
     const focusedTextInputRef = useRef<TextInput | null>(null);
@@ -287,10 +286,6 @@ const ReviewKYC: React.FC<ReviewKYCProps> = ({
     // Validate individual field and set error
     const validateField = (field: keyof KYCData, value: string): string => {
         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`;
         }
 
@@ -298,12 +293,6 @@ const ReviewKYC: React.FC<ReviewKYCProps> = ({
         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`;
             }
         }
@@ -334,9 +323,7 @@ const ReviewKYC: React.FC<ReviewKYCProps> = ({
 
         return (
             <View style={styles.errorContainer}>
-                {Platform.OS === 'android' && (
-                    <Icon name="warning" size={16} color={colors.error || '#FF0000'} style={styles.errorIcon} />
-                )}
+                <Icon name="warning" size={16} color={colors.error || '#FF0000'} style={styles.errorIcon} />
                 <Text style={styles.errorText}>{error}</Text>
             </View>
         );
@@ -550,6 +537,8 @@ const ReviewKYC: React.FC<ReviewKYCProps> = ({
                 return;
             }
             const data = getGlobalData();
+
+            console.log('panRapidNumber global data check', data, panRapidNumber);
             // Decide next screen based on panrapidnumber existence
             if (panRapidNumber && data.completeFDData) {
                 navigate('PayNow', { fdData: fdDataFromRoute });
@@ -597,13 +586,6 @@ const ReviewKYC: React.FC<ReviewKYCProps> = ({
                 autoCapitalize={variant === 'email' ? 'none' : 'words'}
                 onFocus={() => textInputRef && handleFieldFocus(textInputRef)}
                 textInputRef={textInputRef}
-                returnKeyType="done"
-                onSubmitEditing={() => {
-                    if (textInputRef?.current) {
-                        textInputRef.current.blur();
-                    }
-                    Keyboard.dismiss();
-                }}
             />
             {renderFieldError(field)}
         </View>
@@ -674,163 +656,119 @@ const ReviewKYC: React.FC<ReviewKYCProps> = ({
                 onDatePress={() => {
                     // TODO: Implement date picker if needed
                 }}
-                returnKeyType="done"
-                onSubmitEditing={() => {
-                    if (textInputRef?.current) {
-                        textInputRef.current.blur();
-                    }
-                    Keyboard.dismiss();
-                }}
             />
             {renderFieldError(field)}
         </View>
     );
 
-    // Handler for back button (used by both header and hardware back button)
-    const handleBackPress = async () => {
-        setIsGoingBack(true);
-        try {
-            const userInfo = getUserInfoForAPI();
-            await previousState({
-                providerId: defaultProviderId,
-                workflowInstanceId,
-                userreferenceid: userInfo.userReferenceId,
-                applicationid: applicationId,
-                entityid: entityId,
-            });
-        } catch (e) {
-            // Handle error silently
-        } finally {
-            setIsGoingBack(false);
-            //onGoBack?.();
-            navigate('FDCalculator');
-        }
-    };
-
-    // 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();
-    }, [defaultProviderId, workflowInstanceId, applicationId, entityId]);
-
     return (
         <SafeAreaWrapper
             includeTop={false}
             bottomPadding={25}
-            statusBarColor="#000000"
-            statusBarStyle="light-content"
+            statusBarColor="#f8f9fa"
+            statusBarStyle="dark-content"
         >
             <Header
                 title="Review KYC"
-                onBackPress={handleBackPress}
+                onBackPress={async () => {
+                    try {
+                        const userInfo = getUserInfoForAPI();
+                        await previousState({
+                            providerId: defaultProviderId,
+                            workflowInstanceId,
+                            userreferenceid: userInfo.userReferenceId,
+                            applicationid: applicationId,
+                            entityid: entityId,
+                        });
+                    } catch (e) {
+                        // Handle error silently
+                    } finally {
+                        //onGoBack?.();
+                        navigate('FDCalculator');
+                    }
+                }}
                 backgroundColor={colors.primary}
             />
 
-            <KeyboardAvoidingView
-                behavior={Platform.OS === 'ios' ? 'padding' : undefined}
-                style={styles.keyboardAvoidingView}
-                keyboardVerticalOffset={Platform.OS === 'ios' ? 0 : 0}
+            <ScrollView
+                style={styles.container}
+                showsVerticalScrollIndicator={false}
+                scrollEnabled={!isLoadingPanRapid}
             >
-                <ScrollView
-                    style={styles.container}
-                    showsVerticalScrollIndicator={false}
-                    scrollEnabled={!isLoadingPanRapid}
-                    keyboardShouldPersistTaps="handled"
-                    contentContainerStyle={styles.scrollContent}
-                >
-                    <TouchableWithoutFeedback onPress={isLoadingPanRapid ? undefined : closeDropdown}>
+                <TouchableWithoutFeedback onPress={isLoadingPanRapid ? undefined : closeDropdown}>
+                    <View>
                         <View>
-                            <View>
-                                <TextFieldWithLabel
-                                    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?.current) {
-                                            panCardRef.current.blur();
-                                        }
-                                        Keyboard.dismiss();
-                                    }}
-                                />
-                                {renderFieldError('panCard')}
-                            </View>
-
-                            {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)}
-
-                            <View style={styles.checkboxContainer}>
-                                <TouchableOpacity
-                                    style={styles.checkbox}
-                                    onPress={() => updateField('useExistingAddress', !kycData.useExistingAddress)}
-                                >
-                                    <View style={[
-                                        styles.checkboxBox,
-                                        kycData.useExistingAddress && styles.checkboxChecked
-                                    ]}>
-                                        {kycData.useExistingAddress ? (
+                            <TextFieldWithLabel
+                                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')}
+                        </View>
+
+                        {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)}
+
+                        <View style={styles.checkboxContainer}>
+                            <TouchableOpacity
+                                style={styles.checkbox}
+                                onPress={() => updateField('useExistingAddress', !kycData.useExistingAddress)}
+                            >
+                                <View style={[
+                                    styles.checkboxBox,
+                                    kycData.useExistingAddress && styles.checkboxChecked
+                                ]}>
+                                    {kycData.useExistingAddress ? (
+                                        <Image
+                                            source={{ uri: (themeName === 'dark') ? base64Images.checkBoxDark : base64Images.filledCheckBox }}
+                                            resizeMode="cover"
+                                            width={20}
+                                            height={20}
+                                        />
+                                    ) : (
+                                        (themeName === 'dark') ? (
                                             <Image
-                                                source={{ uri: (themeName === 'dark') ? base64Images.checkBoxDark : base64Images.filledCheckBox }}
+                                                source={{ uri: base64Images.unCheckBoxDark }}
                                                 resizeMode="cover"
                                                 width={20}
                                                 height={20}
                                             />
-                                        ) : (
-                                            (themeName === 'dark') ? (
-                                                <Image
-                                                    source={{ uri: base64Images.unCheckBoxDark }}
-                                                    resizeMode="cover"
-                                                    width={20}
-                                                    height={20}
-                                                />
-                                            ) : null
-                                        )}
-                                    </View>
-                                </TouchableOpacity>
-                                <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.
-                                </Text>
-                            </View>
+                                        ) : null
+                                    )}
+                                </View>
+                            </TouchableOpacity>
+                            <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.
+                            </Text>
+                        </View>
 
 
-                        </View>
-                    </TouchableWithoutFeedback>
-                </ScrollView>
-            </KeyboardAvoidingView>
+                    </View>
+                </TouchableWithoutFeedback>
+            </ScrollView>
             <ActionButton
                 title="Continue"
                 onPress={handleContinue}
@@ -842,28 +780,16 @@ const ReviewKYC: React.FC<ReviewKYCProps> = ({
                 <View style={styles.loadingOverlay} pointerEvents="auto">
                 </View>
             )}
-            {/* Loading overlay for back navigation */}
-            {isGoingBack && (
-                <View style={styles.loadingOverlay} pointerEvents="auto">
-                    <ActivityIndicator size="large" color={colors.primary} />
-                </View>
-            )}
         </SafeAreaWrapper>
     );
 };
 
 const createStyles = (colors: any, typography: any, themeName?: string) => StyleSheet.create({
-    keyboardAvoidingView: {
-        flex: 1,
-    },
     container: {
         flex: 1,
         paddingHorizontal: 16,
         paddingTop: 20,
     },
-    scrollContent: {
-        flexGrow: 1,
-    },
     checkboxContainer: {
         flexDirection: 'row',
         alignItems: 'flex-start',
@@ -947,10 +873,8 @@ const createStyles = (colors: any, typography: any, themeName?: string) => Style
         right: 0,
         bottom: 0,
         backgroundColor: 'rgba(0, 0, 0, 0.3)',
-        justifyContent: 'center',
-        alignItems: 'center',
         zIndex: 1000,
     },
 });
 
-export default ReviewKYC;
+export default ReviewKYC;

package/src/utils/sseParser.ts

@@ -11,13 +11,29 @@ export function parseSSEBuffer(
 
     buffer.value += chunk;
 
-    let idx: number;
+    let idx = -1;
+    let delimiterLength = 0;
+    const findDelimiter = () => {
+        const unixIdx = buffer.value.indexOf('\n\n');
+        const windowsIdx = buffer.value.indexOf('\r\n\r\n');
+        if (windowsIdx >= 0 && (unixIdx < 0 || windowsIdx < unixIdx)) {
+            idx = windowsIdx;
+            delimiterLength = 4;
+            return true;
+        }
+        if (unixIdx >= 0) {
+            idx = unixIdx;
+            delimiterLength = 2;
+            return true;
+        }
+        return false;
+    };
 
-    while ((idx = buffer.value.indexOf('\n\n')) >= 0) {
+    while (findDelimiter()) {
 
         const block = buffer.value.slice(0, idx);
 
-        buffer.value = buffer.value.slice(idx + 2);
+        buffer.value = buffer.value.slice(idx + delimiterLength);
 
         let eventType = 'message';
 
@@ -37,4 +53,4 @@ export function parseSSEBuffer(
         }
     }
     return results;
-}
+}