boxpay-checkout-reactnative-sdk 1.0.0-beta24 → 1.0.0-beta26

package/src/screens/savedAddressScreen.tsx

@@ -111,14 +111,16 @@ const SavedAddressScreen = ({ navigation }: Props) => {
 
 
     useEffect(() => {
-        const backHandler = BackHandler.addEventListener(
-            'hardwareBackPress',
-            onProceedBack
+        BackHandler.addEventListener(
+          'hardwareBackPress',
+          () => {
+            if (loading) {
+              return true; 
+            }
+            return onProceedBack(); // Allow back navigation if not loading
+          }
         );
-        return () => {
-            backHandler.remove();
-        };
-    }, []);
+      });
     useEffect(() => {
         if(updateAddress || isEditClicked) {
             const { firstName, lastName } = extractNames(selectedAddress?.name ?? "");
@@ -212,7 +214,6 @@ const SavedAddressScreen = ({ navigation }: Props) => {
                 onClickAddress={(address : FetchSavedAddress) => {
                     setSelectedAddress(address)
                     setUpdateAddress(true)
-                    console.log(address);
                 }}
                 onClickOtherOptions={(address : FetchSavedAddress) => {
                     setSelectedAddress(address)
@@ -228,7 +229,7 @@ const SavedAddressScreen = ({ navigation }: Props) => {
         visible={isOptionsClicked}
         onClose={() => setIsOptionsClicked(false)}
         onEdit={() => setIsEditClicked(true)}
-        onSetDefault={() => console.log("Set as Default clicked")}
+        onSetDefault={() => setUpdateAddress(true)}
         onDelete={() => setIsDeleteConfirmationVisible(true)}
         label= {selectedAddress?.labelName ? selectedAddress?.labelName ?? "" : selectedAddress?.labelType ?? ""}
         address={formatAddress({

package/src/screens/upiTimerScreen.tsx

@@ -114,13 +114,10 @@ const UpiTimerScreen = ({ route, navigation }: Props) => {
   };
 
   useEffect(() => {
-    const backHandler = BackHandler.addEventListener(
+    BackHandler.addEventListener(
       'hardwareBackPress',
       onProceedBack
     );
-    return () => {
-      backHandler.remove();
-    };
   }, []);
 
   const formatTime = () => {

package/src/screens/walletScreen.tsx

@@ -98,7 +98,11 @@ const WalletScreen = ({ navigation }: Props) => {
       }
     );
 
-    return () => backHandler.remove();
+    return () => {
+      if (backHandler) {
+        backHandler.remove();
+      }
+    };
   });
 
   useEffect(() => {

package/src/serviceRequest.ts

@@ -2,9 +2,6 @@ import axios from 'axios';
 import { generateRandomAlphanumericString, getEndpoint } from './utils/stringUtils'; // adjust path accordingly
 import { checkoutDetailsHandler } from './sharedContext/checkoutDetailsHandler';
 
-// Create an Axios instance if needed
-
-const { checkoutDetails } = checkoutDetailsHandler;
 // const version = process.env.SDK_VERSION
 
 const api = axios.create({});
@@ -12,6 +9,7 @@ const api = axios.create({});
 // Add request interceptor
 api.interceptors.request.use(
   (config) => {
+    const { checkoutDetails } = checkoutDetailsHandler;
     config.baseURL = `${getEndpoint(checkoutDetails.env)}${checkoutDetails.token}`
     config.headers['X-Request-Id'] = generateRandomAlphanumericString(10);
     config.headers['X-Client-Connector-Name'] = 'React Native SDK';

package/src/styles/components/savedAddressCardStyles.ts

@@ -33,6 +33,7 @@ const styles = StyleSheet.create({
       fontSize: 14,
       fontFamily: 'Poppins-SemiBold',
       color: "#2D2B32",
+      marginBottom:10
     },
     selectedTag: {
       backgroundColor: "#FFF0F6",
@@ -40,7 +41,8 @@ const styles = StyleSheet.create({
       paddingVertical: 2,
       borderRadius: 6,
       marginLeft: 8,
-      borderColor:"#FFADD2"
+      borderColor:"#FFADD2",
+      borderWidth:1
     },
     selectedTagText: {
       fontSize: 10,
@@ -48,11 +50,9 @@ const styles = StyleSheet.create({
       color: "#EB2F96",
     },
     addressText: {
-      marginTop: 10,
       fontSize: 12,
       fontFamily: 'Poppins-Regular',
       color: "#7F7D83",
-      lineHeight: 20,
     },
     imageStyle : {
       width : 20,

package/src/styles/screens/savedAddressScreenStyles.ts

@@ -22,7 +22,6 @@ const styles = StyleSheet.create({
     },
     mainHeadingText  :{
         marginTop: 16,
-        marginBottom: 8,
         marginHorizontal: 16,
         color: '#020815B5',
         fontFamily: 'Poppins-SemiBold',
@@ -37,21 +36,18 @@ const styles = StyleSheet.create({
         backgroundColor: 'white',
         flexDirection: 'row',
         borderRadius: 12,
-        alignItems:'center'
+        justifyContent:'center'
       },
       imageStyle : {
         height: 20,
         width: 20,
         marginStart: 12,
-        marginTop: 20,
         tintColor: brandColor
       },
       insideContainerClickableText : {
         fontSize: 14,
         color: brandColor,
         fontFamily: 'Poppins-SemiBold',
-        flexShrink: 1,
-        marginTop: -4,
       }
 })