@propel-nsl/propel-react-native-sdk 1.1.2 → 1.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@propel-nsl/propel-react-native-sdk",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Propel Mobile SDK - React Native Core",
   "files": [
     "src/",

package/src/navigation/SDKMainTabNavigator.tsx

@@ -54,12 +54,12 @@ const HIDDEN_SCREENS = [
 
 const getTabBarHeight = (): number => {
   if (Platform.OS === 'ios') {
-    return screenHeight > 800 ? VSCALE(40) : VSCALE(45);
+    return screenHeight > 800 ? VSCALE(50) : VSCALE(55);
   }
   if (Platform.OS === 'android') {
-    return screenHeight > 800 ? VSCALE(35) : VSCALE(55);
+    return screenHeight > 800 ? VSCALE(50) : VSCALE(60);
   }
-  return VSCALE(50);
+  return VSCALE(55);
 };
 
 // DashboardStack - contains Dashboard and its nested screens
@@ -289,22 +289,26 @@ const styles = StyleSheet.create({
     backgroundColor: '#FFFFFF',
     borderTopWidth: 1,
     borderTopColor: '#E5E7EB',
-    paddingTop: VSCALE(8),
+    paddingTop: VSCALE(6),
+    paddingHorizontal: SCALE(4),
   },
   tabItem: {
     flex: 1,
     alignItems: 'center',
     justifyContent: 'center',
-    minHeight: VSCALE(45),
+    minHeight: VSCALE(50),
+    paddingVertical: VSCALE(4),
   },
   tabItemContent: {
     alignItems: 'center',
     justifyContent: 'center',
+    gap: VSCALE(2),
   },
   tabLabel: {
-    fontSize: SCALE(10),
-    marginTop: VSCALE(3),
+    fontSize: SCALE(9),
+    marginTop: VSCALE(2),
     fontWeight: '400',
+    textAlign: 'center',
   },
   iconContainer: {
     justifyContent: 'center',

package/src/screens/Dashboard/index.tsx

@@ -59,7 +59,7 @@ const Dashboard: React.FC<Props> = ({ navigation }) => {
 
   // Debug screen state changes
   useEffect(() => {
-    console.log("🔍 Dashboard screen state changed to:", screen);
+    // Screen state changed
   }, [screen]);
 
   const {
@@ -84,11 +84,6 @@ const Dashboard: React.FC<Props> = ({ navigation }) => {
     (s: RootState) => s.auth.dashboardInfoLoading,
   );
 
-  console.log(
-    "myOrdersValidateOtpSuccessMessage",
-    myOrdersValidateOtpSuccessMessage,
-  );
-  console.log("otpModalVisible", otpModalVisible);
 
   useEffect(() => {
     if (otpModalVisible && myOrdersValidateOtpSuccessMessage) {
@@ -157,7 +152,6 @@ const Dashboard: React.FC<Props> = ({ navigation }) => {
 
   useEffect(() => {
     if (sdkAuthError) {
-      console.log("🔴 SDK Auth failed, closing SDK:", sdkAuthError);
       if (NativeModules.PropelSDKBridge?.closeSDKWithError) {
         NativeModules.PropelSDKBridge.closeSDKWithError(sdkAuthError);
       } else if (NativeModules.PropelSDKBridge?.closeSDK) {
@@ -188,7 +182,6 @@ const Dashboard: React.FC<Props> = ({ navigation }) => {
     useCallback(() => {
       return () => {
         // This runs when the screen loses focus (unmounts or navigates away)
-        console.log('🔍 Dashboard: Screen losing focus, closing modals');
         setOtpModalVisible(false);
         setMessagepopUpVisible(false);
       };
@@ -200,25 +193,18 @@ const Dashboard: React.FC<Props> = ({ navigation }) => {
   }, [cartId, dispatch]);
 
   const handleBackToHost = () => {
-    console.log('🔙 Dashboard: handleBackToHost called');
     // Clear all auth state before exiting SDK to prevent stale data on next launch
     dispatch(clearAllAuthState());
     
     // Check if we're in RN host mode (hostNavigation or onClose available)
     if (hostNavigation) {
-      console.log('🚀 Dashboard: RN Host Mode - Using hostNavigation.goBack()');
       hostNavigation.goBack();
     } else if (onClose) {
-      console.log('🚀 Dashboard: RN Host Mode - Using onClose callback');
       onClose();
     } else if (NativeModules.PropelSDKBridge?.closeSDK) {
-      console.log('🚀 Dashboard: Native Mode - Using NativeModules.PropelSDKBridge.closeSDK()');
       NativeModules.PropelSDKBridge.closeSDK();
     } else if (NativeModules.PropelSDKBridge?.dismiss) {
-      console.log('🚀 Dashboard: Native Mode - Using NativeModules.PropelSDKBridge.dismiss()');
       NativeModules.PropelSDKBridge.dismiss();
-    } else {
-      console.log('⚠️ Dashboard: No closeSDK method available');
     }
   };
 
@@ -226,7 +212,6 @@ const Dashboard: React.FC<Props> = ({ navigation }) => {
   useFocusEffect(
     useCallback(() => {
       const onBackPress = () => {
-        console.log('🔙 Dashboard: Hardware back pressed - calling handleBackToHost');
         handleBackToHost();
         return true; // Prevent default back behavior
       };
@@ -240,29 +225,24 @@ const Dashboard: React.FC<Props> = ({ navigation }) => {
   const navigateToDashboardScreen = (screenName: string, params?: any) => {
     // Navigate within DashboardStack for screens that are part of the stack
     // For screens like MyCart, we need to navigate within the stack
-    console.log("🧭 Dashboard navigateToDashboardScreen:", screenName, params);
     
     // Get parent navigator (Tab navigator) to navigate to hidden tabs
     const parentNav = (navigation as any).getParent?.();
     if (parentNav?.navigate) {
-      console.log("🧭 Using parent tab navigator for:", screenName);
       parentNav.navigate(screenName, params);
     } else {
       // Fallback to direct navigation within stack
-      console.log("🧭 Using direct navigation for:", screenName);
       (navigation as any).navigate(screenName, params);
     }
   };
 
   const handleRedemptionHistoryPress = () => {
-    console.log("🟢 Dashboard action pressed: RedemptionHistory");
     setScreen(ROUTES.REDEMPTION_HISTORY); // Set screen state for API call condition
     setOtpModalVisible(true);
     dispatch(myOrdersGenerateOtpRequest({}));
   };
 
   const handleMyOrdersPress = () => {
-    console.log("🟢 Dashboard action pressed: MyOrders");
     setScreen(ROUTES.MY_ORDERS); // Set screen state for API call condition
     setOtpModalVisible(true);
     dispatch(myOrdersGenerateOtpRequest({}));
@@ -270,7 +250,6 @@ const Dashboard: React.FC<Props> = ({ navigation }) => {
   };
 
   const handleMyVouchersPress = () => {
-    console.log("🟢 Dashboard action pressed: MyEVouchers");
     // navigateToDashboardScreen("MyEVouchers", { from: "Dashboard" });
     setScreen(ROUTES.MY_E_VOUCHERS);
     dispatch(resetAuthState("validateEVouchersError" as any));
@@ -280,43 +259,26 @@ const Dashboard: React.FC<Props> = ({ navigation }) => {
   };
 
   const handleVerify = async (otp: string) => {
-    console.log("🔍 Dashboard handleVerify called with:", { otp, screen });
     try {
       if (screen === ROUTES.MY_ORDERS || screen === ROUTES.REDEMPTION_HISTORY) {
-        console.log(
-          "🚀 Dashboard dispatching myOrdersValidateOtpRequest with OTP:",
-          otp,
-        );
         dispatch(
           myOrdersValidateOtpRequest({
             otp: otp,
           }),
         );
       } else if (screen === ROUTES.MY_E_VOUCHERS) {
-        console.log(
-          "🚀 Dashboard dispatching validateEVouchersRequest with OTP:",
-          otp,
-        );
         dispatch(
           validateEVouchersRequest({
             otp: otp,
           }),
         );
-      } else {
-        console.log("⚠️ Dashboard handleVerify: No matching screen condition", {
-          screen,
-          MY_ORDERS: ROUTES.MY_ORDERS,
-          MY_E_VOUCHERS: ROUTES.MY_E_VOUCHERS,
-          REDEMPTION_HISTORY: ROUTES.REDEMPTION_HISTORY,
-        });
       }
     } catch (error) {
-      console.error("Error getting dynamic headers:", error);
+      // Error handling
     }
   };
 
   const navigateToCart = () => {
-    console.log("🧭 Dashboard navigateToCart called");
     // Use the same logic as navigateToDashboardScreen for consistency
     navigateToDashboardScreen("MyCart", { from: "Dashboard" });
   };

package/src/screens/MyCart/index.tsx

@@ -202,7 +202,7 @@ const MyCart: React.FC<MyCartProps> = ({ navigation }) => {
           </Text>
           <CustomImage source={Images.greyDownArrow} imgStyle={styles.icon} />
         </TouchableOpacity>
-        <Text style={styles.productPoints}>{item?.amount_cents / 100} points</Text>
+        <Text style={styles.productPoints}>₹{item?.amount_cents / 100}</Text>
       </View>
     </View>
   );

package/src/screens/PaymentMethod/index.tsx

@@ -42,8 +42,6 @@ const PaymentMethod: React.FC<{
   const [showPointsApply, setShowPointsApply] = useState(false);
   const [amountModalVisible, setAmountModalVisible] = useState(false);
   const [checkoutPoints, setCheckoutPoints] = useState<number>(0);
-  const [showOtpModal, setShowOtpModal] = useState(false);
-  const [pendingCheckoutPayload, setPendingCheckoutPayload] = useState<any>(null);
   const dispatch = useAppDispatch();
   const [showLoader, setShowLoader] = useState(false);
 
@@ -53,11 +51,6 @@ const PaymentMethod: React.FC<{
     cartId,
     checkoutSuccessMessage,
     checkoutError,
-    myOrdersGenerateOtpLoading,
-    myOrdersGenerateOtpError,
-    myOrdersValidateOtpLoading,
-    myOrdersValidateOtpError,
-    myOrdersValidateOtpData,
   } = useAppSelector((state: RootState) => state.auth);
 
   const route = useRoute<
@@ -91,22 +84,6 @@ const PaymentMethod: React.FC<{
     }
   }, [cartId, dispatch]);
 
-  useEffect(() => {
-  //  if (!skipAddress && myOrdersValidateOtpData && pendingCheckoutPayload) 
-    if (myOrdersValidateOtpData && pendingCheckoutPayload && cartId){
-    setShowOtpModal(false);
-    setShowLoader(true);
-    // Use current cartId from Redux state to ensure we have the latest cart ID
-    const checkoutPayload = {
-      ...pendingCheckoutPayload,
-      orderId: cartId,
-      order_id: cartId,
-    };
-    dispatch(checkoutRequest(checkoutPayload));
-    setPendingCheckoutPayload(null);
-  } 
-}, [myOrdersValidateOtpData, pendingCheckoutPayload, cartId, dispatch]);
-
 
   return (
     <View style={styles.container}>
@@ -162,7 +139,7 @@ const PaymentMethod: React.FC<{
                 onPress={() => setShowPointsBreakdown(!showPointsBreakdown)}
               >
                 <Text style={styles.pointsText}>
-                  {viewMyCartData?.amount_cents / 100} Points
+                  ₹{viewMyCartData?.amount_cents / 100}
                 </Text>
                 <CustomImage
                   source={
@@ -253,7 +230,7 @@ const PaymentMethod: React.FC<{
       <View style={styles.bottomCTA}>
         <View style={styles.priceSection}>
           <Text style={styles.priceText}>
-            {viewMyCartData?.total_amount_cents / 100} points
+            ₹{viewMyCartData?.total_amount_cents / 100}
           </Text>
           <TouchableOpacity
             activeOpacity={0.7}
@@ -308,19 +285,13 @@ const PaymentMethod: React.FC<{
               ],
               skipAddress,
             };
-
-               
-
-  
-            setPendingCheckoutPayload(payload);
-
-            dispatch(
-              myOrdersGenerateOtpRequest({
+            setShowLoader(true);
+            const checkoutPayload = {
+              ...payload,
+              orderId: cartId,
               order_id: cartId,
-              otp_type: 'orders_confirm_otp',
-              })
-          );
-            setShowOtpModal(true);
+            };
+            dispatch(checkoutRequest(checkoutPayload));
             
           }}
         >
@@ -352,35 +323,7 @@ const PaymentMethod: React.FC<{
     }}
   />
 )}
-     <OTPModal
-        visible={showOtpModal}
-        onClose={() => {
-          setShowOtpModal(false);
-          setPendingCheckoutPayload(null);
-        }}
-        onResend={() => dispatch(
-  myOrdersGenerateOtpRequest({
-    order_id: cartId,
-    otp_type: 'orders_confirm_otp',
-  }))}
-        onVerify={(otp: string) => {
-  if (otp && otp.trim()) {
-    dispatch(
-      myOrdersValidateOtpRequest({
-        order_id: cartId,
-        otp,
-        otp_type: 'orders_confirm_otp',
-        next: pendingCheckoutPayload,
-      })
-    );
-  }
-}}
-        loading={!!myOrdersGenerateOtpLoading || !!myOrdersValidateOtpLoading}
-        errorMessage={myOrdersValidateOtpError || myOrdersGenerateOtpError}
-        title={OTP_TITLE}
-        subtitle={OTP_SUBTITLE}
-      />
-     {showLoader && <CustomLoader message={PROCESSING_ORDER} />}
+     {showLoader && <CustomLoader text={PROCESSING_ORDER} />}
 
     </View>
   );

package/src-app/components/OTPModal.tsx

@@ -1,402 +1,3 @@
-// import React, { useState, useRef, useEffect } from 'react';
-// import {
-//   View,
-//   Text,
-//   StyleSheet,
-//   Modal,
-//   TouchableOpacity,
-//   Animated,
-//   TouchableWithoutFeedback,
-//   Dimensions,
-//   KeyboardAvoidingView,   
-//   Platform,               
-//   ScrollView,             
-// } from 'react-native';
-// import { OtpInput } from 'react-native-otp-entry';
-// import { useAppSelector } from '../hooks/useAppSelector';
-// import { RootState } from '../redux/store';
-// import CustomButton from './CustomButton';
-// import FontFamily from '../constants/Fonts';
-// import CustomError from './CustomError';
-// import {
-//   DIDNT_RECEIVE_OTP,
-//   ENTER_4_DIGIT_CODE,
-//   OTP,
-//   OTP_DIGIT,
-//   OTP_LENGTH,
-//   OTP_SENT,
-//   RESEND_OTP,
-//   TEXT,
-// } from '../constants/Messages';
-// import { colors } from '../styles/colors';
-
-// const { height: screenHeight } = Dimensions.get('window');
-
-// interface OTPModalProps {
-//   visible: boolean;
-//   onClose: () => void;
-//   onVerify: (otp: string) => void;
-//   onNavigateToOrders: () => void;
-//   phoneNumber?: string;
-//   onResend?: () => void;
-//   resetOtpTrigger?: number;
-//   otpLength?: number;
-//   screen?: string;
-// }
-
-// function maskPhoneNumber(phone: string): string {
-//   if (!phone) return '';
-//   const clean = phone.replace(/\D/g, '');
-//   if (clean.length <= 4) return clean;
-//   if (clean.length <= 6) {
-//     return clean;
-//   }
-//   const first2 = clean.slice(0, 2);
-//   const last2 = clean.slice(-2);
-//   const maskedLength = clean.length - 4;
-//   return `${first2}${'*'.repeat(maskedLength)}${last2}`;
-// }
-
-// const OTPModal: React.FC<OTPModalProps> = ({
-//   visible,
-//   onClose,
-//   onVerify,
-//   onNavigateToOrders,
-//   phoneNumber,
-//   onResend,
-//   resetOtpTrigger,
-//   otpLength = 6,
-//   screen,
-// }) => {
-//   const [countdown, setCountdown] = useState(60);
-//   const slideAnim = useRef(new Animated.Value(screenHeight)).current;
-//   const {
-//     mobileNumber: reduxMobileNumber,
-//     myOrdersValidateOtpError,
-//     validateEVouchersError,
-//   } = useAppSelector((state: RootState) => state.auth);
-//   const displayNumber = phoneNumber || reduxMobileNumber || '';
-//   const [newOtp, setNewOtp] = useState('');
-
-//   useEffect(() => {
-//     if (visible) {
-//       setCountdown(60);
-//       setNewOtp('');
-//       Animated.timing(slideAnim, {
-//         toValue: 0,
-//         duration: 300,
-//         useNativeDriver: true,
-//       }).start();
-//     } else {
-//       Animated.timing(slideAnim, {
-//         toValue: screenHeight,
-//         duration: 300,
-//         useNativeDriver: true,
-//       }).start();
-//     }
-//   }, [visible]);
-
-//   useEffect(() => {
-//     let timer: NodeJS.Timeout;
-//     if (visible && countdown > 0) {
-//       timer = setTimeout(() => setCountdown(countdown - 1), 1000);
-//     }
-//     return () => clearTimeout(timer);
-//   }, [visible, countdown]);
-
-//   const handleVerify = () => {
-//     onVerify(newOtp);
-//   };
-
-//   const handleResendOTP = () => {
-//     setCountdown(60);
-//     setNewOtp('');
-//     onResend?.();
-//   };
-
-//   const formatTime = (seconds: number) => {
-//     const mins = Math.floor(seconds / 60);
-//     const secs = seconds % 60;
-//     return `${mins.toString().padStart(2, '0')} : ${secs
-//       .toString()
-//       .padStart(2, '0')}`;
-//   };
-
-//   if (!visible) return null;
-
-//   return (
-//     <Modal
-//       transparent
-//       visible={visible}
-//       animationType="none"
-//       onRequestClose={onClose}
-//       statusBarTranslucent   
-//     >
-//       <TouchableWithoutFeedback onPress={onClose}>
-//         <View style={styles.overlay}>
-//           <TouchableWithoutFeedback>
-//             {/* ⬇️ KeyboardAvoidingView makes the sheet rise with the keyboard */}
-//             <KeyboardAvoidingView
-//               behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-//               keyboardVerticalOffset={Platform.OS === 'ios' ? 12 : 0}
-//               style={{ width: '100%' }}
-//             >
-//               <Animated.View
-//                 style={[
-//                   styles.modalContainer,
-//                   {
-//                     transform: [{ translateY: slideAnim }],
-//                     height: myOrdersValidateOtpError ? 370 : 334,
-//                   },
-//                 ]}
-//               >
-//                 <ScrollView
-//                   keyboardShouldPersistTaps="handled"
-//                   contentContainerStyle={styles.sheetContent}
-//                   showsVerticalScrollIndicator={false}
-//                 >
-//                   <View style={styles.handleBar} />
-
-//                   {(myOrdersValidateOtpError || validateEVouchersError) && (
-//                     <CustomError
-//                       message={
-//                         myOrdersValidateOtpError || validateEVouchersError || ''
-//                       }
-//                     />
-//                   )}
-
-//                   <Text style={styles.title}>{ENTER_4_DIGIT_CODE}</Text>
-
-//                   <Text style={styles.subtitle}>
-//                     {OTP_SENT} {maskPhoneNumber(displayNumber)}
-//                   </Text>
-
-//                   <OtpInput
-//                     numberOfDigits={OTP_LENGTH}
-//                     focusColor="green"
-//                     autoFocus={false}
-//                     hideStick={false}
-//                     placeholder=""
-//                     blurOnFilled={true}
-//                     disabled={false}
-//                     type="numeric"
-//                     secureTextEntry={false}
-//                     focusStickBlinkingDuration={500}
-//                     onFocus={() => {}}
-//                     onBlur={() => {}}
-//                     onTextChange={setNewOtp}
-//                     onFilled={() => {}}
-//                     textInputProps={{
-//                       accessibilityLabel: OTP,
-//                     }}
-//                     textProps={{
-//                       accessibilityRole: TEXT,
-//                       accessibilityLabel: OTP_DIGIT,
-//                       allowFontScaling: false,
-//                     }}
-//                     theme={{
-//                       containerStyle: styles.container,
-//                       pinCodeContainerStyle: styles.pinCodeBox,
-//                       pinCodeTextStyle: styles.pinCodeText,
-//                       focusStickStyle: styles.focusStick,
-//                       focusedPinCodeContainerStyle: styles.activePinBox,
-//                       placeholderTextStyle: styles.placeholderTextStyle,
-//                       disabledPinCodeContainerStyle:
-//                         styles.disabledPinCodeContainer,
-//                     }}
-//                   />
-
-//                   <View style={styles.resendContainer}>
-//                     <View style={styles.resendTextContainer}>
-//                       <Text style={styles.resendText}>{DIDNT_RECEIVE_OTP}</Text>
-//                       {countdown > 0 ? (
-//                         <Text style={styles.resendLinkDisabled}>{RESEND_OTP}</Text>
-//                       ) : (
-//                         <TouchableOpacity onPress={handleResendOTP}>
-//                           <Text style={styles.resendLinkActive}>
-//                             {RESEND_OTP}
-//                           </Text>
-//                         </TouchableOpacity>
-//                       )}
-//                     </View>
-//                     <Text style={styles.countdown}>
-//                       {formatTime(countdown)}
-//                     </Text>
-//                   </View>
-
-//                   <CustomButton
-//                     title="Verify"
-//                     onPress={handleVerify}
-//                     disabled={newOtp.length !== OTP_LENGTH}
-//                   />
-//                 </ScrollView>
-//               </Animated.View>
-//             </KeyboardAvoidingView>
-//           </TouchableWithoutFeedback>
-//         </View>
-//       </TouchableWithoutFeedback>
-//     </Modal>
-//   );
-// };
-
-// const styles = StyleSheet.create({
-//   overlay: {
-//     flex: 1,
-//     backgroundColor: 'rgba(0, 0, 0, 0.5)',
-//     justifyContent: 'flex-end',
-//     alignItems: 'center',
-//   },
-//   modalContainer: {
-//     width: 393,
-//     maxWidth: '100%',
-//     height: 334,
-//     backgroundColor: colors.background,
-//     borderTopLeftRadius: 30,
-//     borderTopRightRadius: 30,
-//     paddingHorizontal: 20,
-//     paddingTop: 18,
-//     paddingBottom: 36,
-//     maxHeight: screenHeight * 0.9, 
-//     alignSelf: 'stretch',
-//   },
-//   sheetContent: {
-//     paddingBottom: 8, 
-//   },
-//   handleBar: {
-//     width: 48,
-//     height: 4,
-//     backgroundColor: colors.outline,
-//     borderRadius: 6,
-//     alignSelf: 'center',
-//     marginBottom: 15,
-//   },
-//   title: {
-//     fontFamily: FontFamily.LEXEND_MEDIUM,
-//     fontSize: 16,
-//     fontWeight: '500',
-//     color: colors.black,
-//     textTransform: 'capitalize',
-//     marginBottom: 8,
-//   },
-//   subtitle: {
-//     fontFamily: FontFamily.LEXEND_REGULAR,
-//     fontSize: 12,
-//     fontWeight: '400',
-//     color: colors.onSurfaceVariant,
-//     lineHeight: 18,
-//     marginBottom: 24,
-//   },
-
-//   resendContainer: {
-//     flexDirection: 'row',
-//     justifyContent: 'space-between',
-//     alignItems: 'center',
-//     marginBottom: 32,
-//   },
-//   resendTextContainer: {
-//     flexDirection: 'row',
-//     alignItems: 'center',
-//   },
-//   resendText: {
-//     fontFamily: FontFamily.LEXEND_REGULAR,
-//     fontSize: 12,
-//     fontWeight: '400',
-//     color: colors.black,
-//     lineHeight: 18,
-//   },
-//   resendLink: {
-//     fontFamily: FontFamily.LEXEND_MEDIUM,
-//     fontSize: 12,
-//     fontWeight: '500',
-//     color: colors.red,
-//     lineHeight: 18,
-//     textDecorationLine: 'underline',
-//     marginLeft: 6,
-//   },
-//   resendLinkActive: {
-//     fontFamily: FontFamily.LEXEND_MEDIUM,
-//     fontSize: 12,
-//     fontWeight: '500',
-//     color: colors.red,
-//     lineHeight: 18,
-//     textDecorationLine: 'underline',
-//     marginLeft: 6,
-//   },
-//   countdown: {
-//     fontFamily: FontFamily.LEXEND_REGULAR,
-//     fontSize: 12,
-//     fontWeight: '400',
-//     color: colors.black,
-//     lineHeight: 18,
-//   },
-
-//   // OTP Input Styles
-//   container: {
-//     flexDirection: 'row',
-//     justifyContent: 'space-between',
-//     paddingHorizontal: 0,
-//     marginBottom: 16,
-//   },
-//   pinCodeBox: {
-//     width: 49,
-//     height: 62,
-//     borderWidth: 1,
-//     borderRadius: 12,
-//     borderColor: colors.outline,
-//     justifyContent: 'center',
-//     alignItems: 'center',
-//     backgroundColor: colors.background,
-//   },
-//   pinCodeText: {
-//     fontFamily: FontFamily.LEXEND_REGULAR,
-//     fontSize: 18,
-//     fontWeight: '400',
-//     color: colors.black,
-//     textAlign: 'center',
-//   },
-//   focusStick: {
-//     width: 2,
-//     height: 30,
-//     backgroundColor: colors.darkGrey,
-//     borderRadius: 1,
-//   },
-//   activePinBox: {
-//     borderColor: colors.darkGrey,
-//     borderWidth: 2,
-//     backgroundColor: colors.background,
-//   },
-
-//   disabledPinCodeContainer: {
-//     borderColor: colors.outlineVariant,
-//     borderWidth: 1,
-//     backgroundColor: colors.surface,
-//     opacity: 0.6,
-//   },
-//   placeholderTextStyle: {
-//     fontFamily: FontFamily.LEXEND_REGULAR,
-//     fontSize: 18,
-//     fontWeight: '400',
-//     color: colors.placeholderColor,
-//     textAlign: 'center',
-//   },
-//   resendLinkDisabled: {
-//   fontFamily: FontFamily.LEXEND_MEDIUM,
-//   fontSize: 12,
-//   fontWeight: '500',
-//   color: colors.onSurfaceVariant,  
-//   lineHeight: 18,
-//   textDecorationLine: 'none',       
-//   marginLeft: 6,
-// },
-
-// });
-
-// export default OTPModal;
-
-
-
-
-
 import React, { useState, useEffect } from 'react';
 import {
   View,
@@ -473,8 +74,6 @@ const OTPModal: React.FC<OTPModalProps> = ({
   const displayNumber = phoneNumber || reduxMobileNumber || '';
   const [newOtp, setNewOtp] = useState('');
   
-  console.log("newOtp...",newOtp?.length);
-  
 
   useEffect(() => {
     if (visible) {
@@ -492,7 +91,6 @@ const OTPModal: React.FC<OTPModalProps> = ({
   }, [visible, countdown]);
 
   const handleVerify = () => {
-    console.log('🔍 OTPModal handleVerify called with OTP:', newOtp);
     onVerify(newOtp);
   };
 
@@ -512,7 +110,6 @@ const OTPModal: React.FC<OTPModalProps> = ({
 
 
   if (!visible) {
-    console.log('🔍 OTPModal not visible, returning null');
     return null;
   }
 

package/src-app/constants/Messages.ts

@@ -43,7 +43,7 @@ export const DELIVERY_CHARGES = "Delivery Charges";
 export const ERROR_TITLE = "Error";
 export const ITEM_ADDED_TO_CART_SUCCESSFULLY = "Item added to cart successfully!";
 export const SUCCESS = 'success';
-export const INSUFFICIENT_BALANCE= "Insufficient Apna Points Balance";
+export const INSUFFICIENT_BALANCE= "Insufficient Balance";
 export const EMPTY_CART_TITLE= "Your cart is empty";
 export const EMPTY_CART_SUBTITLE= "Looks like you haven't added anything to your cart yet.";
 export const ITEM_DELETE_TITLE="Are you sure you want to delete the item ?";

package/src-app/redux/authSlice.ts

@@ -350,7 +350,6 @@ const authSlice = createSlice({
       state.myOrdersGenerateOtpError = action.payload;
     },
     myOrdersValidateOtpRequest(state, _action: PayloadAction<any>) {
-      console.log("🔄 Reducer: myOrdersValidateOtpRequest called");
       state.myOrdersValidateOtpLoading = true;
       state.myOrdersValidateOtpError = null;
       state.myOrdersValidateOtpData = null;

package/src-app/services/index.ts

@@ -269,7 +269,7 @@ export const myOrdersGenerateOtpApi = async (params?: {
       config.params = params;
     }
 
-    const response = await api1.get(ENDPOINTS.MY_ORDERS_GENERATE_OTP, config);
+    const response = await api.get(ENDPOINTS.MY_ORDERS_GENERATE_OTP, config);
     return response;
   } catch (error: any) {
     throw error;
@@ -280,29 +280,35 @@ export const myOrdersValidateOtpApi = async (
   arg: { otp: string; order_id?: string; otp_type?: 'orders_confirm_otp' } | string
 ) => {
   try {
-    console.log("🌐 API: myOrdersValidateOtpApi called with arg:", arg);
     const headers = await getAuthHeader();
     const params = typeof arg === 'string' ? { otp: arg } : arg;
-    const listRes = await api1.get(ENDPOINTS.MY_ORDERS, {
-            headers,
+    
+    // Step 1: Validate OTP first
+    const validateRes = await api.get(ENDPOINTS.MY_ORDERS_VALIDATE_OTP, {
+      headers,
+      params: { otp: params.otp },
+    });
+    
+    // Step 2: If validation successful, fetch orders
+    const listRes = await api.get(ENDPOINTS.MY_ORDERS, {
+      headers,
       params: { otp: params.otp },
     });
+    
     const raw = listRes?.data;
-    const orders =
-      raw?.orders ?? raw?.data ?? (Array.isArray(raw) ? raw : raw?.items ?? raw);
-
-    const result = { ...listRes, data: { orders } };
-    console.log("🌐 API: myOrdersValidateOtpApi returning:", result);
+    const orders = raw?.orders ?? raw?.data ?? (Array.isArray(raw) ? raw : raw?.items ?? raw);
+    const pagination = raw?.pagination;
+
+    const result = { 
+      ...listRes, 
+      data: { 
+        orders,
+        pagination 
+      } 
+    };
+    
     return result;
   } catch (error: any) {
-    console.log("🌐 API: myOrdersValidateOtpApi ERROR DETAILS:");
-    console.log("  - Error message:", error?.message);
-    console.log("  - Status code:", error?.response?.status);
-    console.log("  - Status text:", error?.response?.statusText);
-    console.log("  - Response data:", JSON.stringify(error?.response?.data, null, 2));
-    console.log("  - Response headers:", JSON.stringify(error?.response?.headers, null, 2));
-    console.log("  - Full error object:", error);
-    
     const errMsg = error?.response?.data?.message || error.message || 'Unknown error';
   
     throw error;