@finspringinnovations/fixeddepositsdk 1.0.2 → 1.0.4

package/src/screens/PayNow.tsx

@@ -145,22 +145,8 @@ const PayNow: React.FC<PayNowProps> = ({ onGoBack, onConfirm, fdData }) => {
         }
     };
 
-    // 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]);
+    // Removed screen-level hardware back handler to allow only header back button navigation
+
 
     return (
         <SafeAreaWrapper

package/src/screens/Payment.tsx

@@ -1,223 +1,210 @@
-import React, { useRef, useState, useEffect } from 'react';
-import { View, StyleSheet, ActivityIndicator, BackHandler, Platform, StatusBar } from 'react-native';
+import React, { useRef, useState } from 'react';
+import { ActivityIndicator, Platform, StatusBar, StyleSheet, View } from 'react-native';
 import { WebView } from 'react-native-webview';
 import SafeAreaWrapper from '../components/SafeAreaWrapper';
+import { getEncryptionConfig } from '../config/encryptionConfig';
 import { useColors } from '../theme/ThemeContext';
 import { decryptResponse } from '../utils/encryption';
-import { getEncryptionConfig } from '../config/encryptionConfig';
 
 export interface PaymentProps {
-    onGoBack?: () => void;
-    onPaymentSuccess?: (data?: any) => void;
-    onPaymentFailure?: (error?: any) => void;
-    paymentUrl: string;
-    successUrl?: string;
-    failureUrl?: string;
+	onGoBack?: () => void;
+	onPaymentSuccess?: (data?: any) => void;
+	onPaymentFailure?: (error?: any) => void;
+	paymentUrl: string;
+	successUrl?: string;
+	failureUrl?: string;
 }
 
 const Payment: React.FC<PaymentProps> = ({
-    onGoBack,
-    onPaymentSuccess,
-    onPaymentFailure,
-    paymentUrl,
-    successUrl = 'payment/success',
-    failureUrl = 'payment/failure',
+	onGoBack,
+	onPaymentSuccess,
+	onPaymentFailure,
+	paymentUrl,
+	successUrl = 'payment/success',
+	failureUrl = 'payment/failure',
 }) => {
-    const colors = useColors();
-    const styles = createStyles(colors);
-    const webViewRef = useRef<WebView>(null);
-    const [loading, setLoading] = useState(true);
-
-    const handleNavigationStateChange = async (navState: any) => {
-        const { url } = navState;
-
-        if (url.includes('payment/status')) {
-            await handlePaymentStatusPage();
-            return;
-        }
-
-        if (url.includes(successUrl)) {
-            setLoading(false);
-            onPaymentSuccess?.(navState);
-            return;
-        }
-
-        if (url.includes(failureUrl)) {
-            setLoading(false);
-            onPaymentFailure?.(navState);
-            return;
-        }
-    };
-
-    const handleWebViewError = (syntheticEvent: any) => {
-        const { nativeEvent } = syntheticEvent;
-        setLoading(false);
-        onPaymentFailure?.(nativeEvent);
-    };
-
-    const handleLoadStart = () => {
-        setLoading(true);
-    };
-
-    const handleLoadEnd = () => {
-        setLoading(false);
-    };
-
-    const handleMessage = async (event: any) => {
-        try {
-            const dataString = event.nativeEvent.data;
-
-            // Check if data is empty or null
-            if (!dataString || dataString.trim() === '') {
-                return;
-            }
-
-            // Check if data looks like JSON
-            const trimmedData = dataString.trim();
-            if (!trimmedData.startsWith('{') && !trimmedData.startsWith('[') && !trimmedData.startsWith('"')) {
-                return;
-            }
-
-            const cleaned =
-                dataString.startsWith('"') && dataString.endsWith('"')
-                    ? dataString.substring(1, dataString.length - 1).replaceAll('\\"', '"')
-                    : dataString;
-
-            const parsed = JSON.parse(cleaned);
-
-            let response;
-
-            // Handle both encrypted and non-encrypted responses using the same method as API responses
-            if (parsed.encryptedResponse) {
-                const encryptionConfig = getEncryptionConfig();
-                try {
-                    // Use the same decryptResponse function used for API responses
-                    const decrypted = await decryptResponse({ encryptedResponse: parsed.encryptedResponse }, encryptionConfig);
-                    response = decrypted;
-                } catch (error) {
-                    response = parsed;
-                }
-            } else {
-                response = parsed;
-            }
-
-            // Check for success status
-            if (response.status?.toLowerCase() === 'success') {
-                // Check payment status in data
-                const paymentStatus = response.data?.paymentStatus?.toLowerCase();
-
-                if (paymentStatus === 'success') {
-                    onPaymentSuccess?.(response);
-                } else if (paymentStatus === 'failed') {
-                    onPaymentFailure?.(response);
-                } else {
-                    onPaymentFailure?.(response);
-                }
-            } else {
-                onPaymentFailure?.(response);
-            }
-
-            setLoading(false);
-        } catch (error) {
-            onPaymentFailure?.(error);
-            setLoading(false);
-        }
-    };
-
-    const handlePaymentStatusPage = async () => {
-        try {
-            setLoading(true);
-            webViewRef.current?.injectJavaScript(`
+	const colors = useColors();
+	const styles = createStyles(colors);
+	const webViewRef = useRef < WebView > (null);
+	const [loading, setLoading] = useState(true);
+
+	const handleNavigationStateChange = async (navState: any) => {
+		const { url } = navState;
+
+		if (url.includes('payment/status')) {
+			await handlePaymentStatusPage();
+			return;
+		}
+
+		if (url.includes(successUrl)) {
+			setLoading(false);
+			onPaymentSuccess?.(navState);
+			return;
+		}
+
+		if (url.includes(failureUrl)) {
+			setLoading(false);
+			onPaymentFailure?.(navState);
+			return;
+		}
+	};
+
+	const handleWebViewError = (syntheticEvent: any) => {
+		const { nativeEvent } = syntheticEvent;
+		setLoading(false);
+		onPaymentFailure?.(nativeEvent);
+	};
+
+	const handleLoadStart = () => {
+		setLoading(true);
+	};
+
+	const handleLoadEnd = () => {
+		setLoading(false);
+	};
+
+	const handleMessage = async (event: any) => {
+		try {
+			const dataString = event.nativeEvent.data;
+
+			// Check if data is empty or null
+			if (!dataString || dataString.trim() === '') {
+				return;
+			}
+
+			// Check if data looks like JSON
+			const trimmedData = dataString.trim();
+			if (!trimmedData.startsWith('{') && !trimmedData.startsWith('[') && !trimmedData.startsWith('"')) {
+				return;
+			}
+
+			const cleaned =
+				dataString.startsWith('"') && dataString.endsWith('"')
+					? dataString.substring(1, dataString.length - 1).replaceAll('\\"', '"')
+					: dataString;
+
+			const parsed = JSON.parse(cleaned);
+
+			let response;
+
+			// Handle both encrypted and non-encrypted responses using the same method as API responses
+			if (parsed.encryptedResponse) {
+				const encryptionConfig = getEncryptionConfig();
+				try {
+					// Use the same decryptResponse function used for API responses
+					const decrypted = await decryptResponse({ encryptedResponse: parsed.encryptedResponse }, encryptionConfig);
+					response = decrypted;
+				} catch (error) {
+					response = parsed;
+				}
+			} else {
+				response = parsed;
+			}
+
+			// Check for success status
+			if (response.status?.toLowerCase() === 'success') {
+				// Check payment status in data
+				const paymentStatus = response.data?.paymentStatus?.toLowerCase();
+
+				if (paymentStatus === 'success') {
+					onPaymentSuccess?.(response);
+				} else if (paymentStatus === 'failed') {
+					onPaymentFailure?.(response);
+				} else {
+					onPaymentFailure?.(response);
+				}
+			} else {
+				onPaymentFailure?.(response);
+			}
+
+			setLoading(false);
+		} catch (error) {
+			onPaymentFailure?.(error);
+			setLoading(false);
+		}
+	};
+
+	const handlePaymentStatusPage = async () => {
+		try {
+			setLoading(true);
+			webViewRef.current?.injectJavaScript(`
                 (function() {
                     window.ReactNativeWebView.postMessage(document.body.innerText);
                 })();
             `);
-        } catch (err) {
-            setLoading(false);
-            onPaymentFailure?.(err);
-        }
-    };
-
-    // Disable hardware back button on Payment screen
-    useEffect(() => {
-        if (Platform.OS !== 'android') return;
-
-        const onBackPress = () => {
-            // Return true to prevent default behavior (block back button)
-            return true;
-        };
-
-        const backHandler = BackHandler.addEventListener(
-            'hardwareBackPress',
-            onBackPress
-        );
-
-        return () => backHandler.remove();
-    }, []);
-
-    return (
-        <SafeAreaWrapper
-            includeTop={false}
-            bottomPadding={0}
-            statusBarColor="#000000"
-            statusBarStyle="light-content"
-        >
-            {Platform.OS === 'ios' && <StatusBar barStyle="light-content" />}
-
-            <View style={styles.container}>
-                {loading && (
-                    <View style={styles.loadingContainer}>
-                        <ActivityIndicator size="large" color={colors.primary} />
-                    </View>
-                )}
-
-                <WebView
-                    ref={webViewRef}
-                    source={{ uri: paymentUrl }}
-                    style={styles.webView}
-                    onNavigationStateChange={handleNavigationStateChange}
-                    onError={handleWebViewError}
-                    onLoadStart={handleLoadStart}
-                    onLoadEnd={handleLoadEnd}
-                    onMessage={handleMessage}
-                    javaScriptEnabled={true}
-                    domStorageEnabled={false}
-                    startInLoadingState={true}
-                    scalesPageToFit={true}
-                    mixedContentMode="never"
-                    allowsInlineMediaPlayback={false}
-                    mediaPlaybackRequiresUserAction={false}
-                    sharedCookiesEnabled={false}
-                    thirdPartyCookiesEnabled={false}
-                    cacheEnabled={false}
-                    originWhitelist={['*']}
-                />
-            </View>
-        </SafeAreaWrapper>
-    );
+		} catch (err) {
+			setLoading(false);
+			onPaymentFailure?.(err);
+		}
+	};
+
+	// Disable hardware back button on Payment screen
+	// Removed screen-level hardware back handler to allow only header back button navigation
+
+
+	return (
+		<SafeAreaWrapper
+			includeTop={false}
+			bottomPadding={0}
+			statusBarColor="#000000"
+			statusBarStyle="light-content"
+		>
+			{Platform.OS === 'ios' && <StatusBar barStyle="light-content" />}
+
+			<View style={styles.container}>
+				{loading && (
+					<View style={styles.loadingContainer}>
+						<ActivityIndicator size="large" color={colors.primary} />
+					</View>
+				)}
+
+				<WebView
+					ref={webViewRef}
+					source={{ uri: paymentUrl }}
+					style={styles.webView}
+					onNavigationStateChange={handleNavigationStateChange}
+					onError={handleWebViewError}
+					onLoadStart={handleLoadStart}
+					onLoadEnd={handleLoadEnd}
+					onMessage={handleMessage}
+					javaScriptEnabled={true}
+					domStorageEnabled={false}
+					startInLoadingState={true}
+					scalesPageToFit={true}
+					mixedContentMode="never"
+					allowsInlineMediaPlayback={false}
+					mediaPlaybackRequiresUserAction={false}
+					sharedCookiesEnabled={false}
+					thirdPartyCookiesEnabled={false}
+					cacheEnabled={false}
+					originWhitelist={['*']}
+				/>
+			</View>
+		</SafeAreaWrapper>
+	);
 };
 
 const createStyles = (colors: any) => StyleSheet.create({
-    container: {
-        flex: 1,
-        backgroundColor: colors.background,
-    },
-    webView: {
-        flex: 1,
-        backgroundColor: colors.background,
-        marginTop: Platform.OS === 'ios' ? 15 : 0,
-    },
-    loadingContainer: {
-        position: 'absolute',
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-        alignItems: 'center',
-        justifyContent: 'center',
-        backgroundColor: colors.background,
-        zIndex: 1,
-    },
+	container: {
+		flex: 1,
+		backgroundColor: colors.background,
+	},
+	webView: {
+		flex: 1,
+		backgroundColor: colors.background,
+		marginTop: Platform.OS === 'ios' ? 15 : 0,
+	},
+	loadingContainer: {
+		position: 'absolute',
+		top: 0,
+		left: 0,
+		right: 0,
+		bottom: 0,
+		alignItems: 'center',
+		justifyContent: 'center',
+		backgroundColor: colors.background,
+		zIndex: 1,
+	},
 });
 
 export default Payment;