react-native-srschat 0.1.52 → 0.1.54

package/src/components/email.js

@@ -32,6 +32,18 @@ export const EmailForm = ({ panHandlers }) => {
   const messageInputRef = useRef(null);
   const emailInputRef = useRef(null);
 
+  const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+
+  const validateEmail = (email) => {
+    if (!email) {
+      return "Email address is required";
+    }
+    if (!emailRegex.test(email)) {
+      return "Please enter a valid email address";
+    }
+    return "";
+  };
+
   const handleComposeEmail = async () => {
     setIsComposing(true);
     setError("");
@@ -59,13 +71,13 @@ export const EmailForm = ({ panHandlers }) => {
   };
 
   const handleSubmit = async () => {
-    if (!userEmail || !subject || !message) {
-      setError("Please fill in all fields");
+    const emailError = validateEmail(userEmail);
+    if (emailError) {
+      setError(emailError);
       return;
     }
-
-    if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(userEmail)) {
-      setError("Please enter a valid email address");
+    if (!subject || !message) {
+      setError("Please fill in all fields");
       return;
     }
 
@@ -138,19 +150,36 @@ export const EmailForm = ({ panHandlers }) => {
           ref={emailInputRef}
           style={styles.input}
           value={userEmail}
-          onChangeText={setUserEmail}
+          onChangeText={(text) => {
+            setUserEmail(text);
+            const emailValidationError = validateEmail(text);
+            if (emailValidationError) {
+              setError(emailValidationError);
+            } else if (error === "Please enter a valid email address" || error === "Email address is required") {
+              setError("");
+            }
+          }}
           placeholder="Your Email"
           onFocus={() =>
             scrollViewRef.current?.scrollToFocusedInput(
               findNodeHandle(emailInputRef.current)
             )
           }
+          keyboardType="email-address"
+          autoCapitalize="none"
         />
         <TextInput
           ref={subjectInputRef}
           style={styles.input}
           value={subject}
-          onChangeText={setSubject}
+          onChangeText={(text) => {
+            setSubject(text);
+            if (error && !validateEmail(userEmail) && !message) {
+              setError("");
+            } else if (error === "Please fill in all fields" && text && message) {
+              setError("");
+            }
+          }}
           placeholder="Subject"
           onFocus={() =>
             scrollViewRef.current?.scrollToFocusedInput(
@@ -162,7 +191,14 @@ export const EmailForm = ({ panHandlers }) => {
           ref={messageInputRef}
           style={styles.textArea}
           value={message}
-          onChangeText={setMessage}
+          onChangeText={(text) => {
+            setMessage(text);
+            if (error && !validateEmail(userEmail) && !subject) {
+              setError("");
+            } else if (error === "Please fill in all fields" && text && subject) {
+              setError("");
+            }
+          }}
           placeholder="Message"
           multiline
           onFocus={() =>

package/src/components/header.js

@@ -32,7 +32,7 @@ export const Header = () => {
           height={35}
         /> */}
         <CloudinaryImage
-          cldImg="posiden"
+          cldImg="logos/HPSG_HPlus_Logo_White"
           imageStyle={{ width: 150, height: 35 }}
         />
       </View>

package/src/components/productCard.js

@@ -49,13 +49,7 @@ export const ProductCard = ({ prod, onFocusQuantityInput, messageId }) => {
   
   const currentMinPackQtyForSelectedUom = getMinPackQtyForUom(selectedUom);
 
-  const [quantity, setQuantity] = useState(() => {
-    if (valid) {
-      // Initial quantity is min pack, not limited by maxQuantity
-      return currentMinPackQtyForSelectedUom;
-    }
-    return 0;
-  });
+  const [quantity, setQuantity] = useState(0);
 
   // Add keyboard listeners to detect when keyboard appears/disappears
   useEffect(() => {
@@ -170,52 +164,76 @@ export const ProductCard = ({ prod, onFocusQuantityInput, messageId }) => {
     });
   };
 
-  const validateMinPackQty = () => {
-    if (quantity % currentMinPackQtyForSelectedUom !== 0) {
-      Alert.alert(
-        "Invalid Quantity",
-        `Please enter a quantity that is a multiple of the min pack qty (${currentMinPackQtyForSelectedUom}).`
-      );
-      setQuantity(currentMinPackQtyForSelectedUom);
-      return false; // Indicates validation failed
-    }
-    return true; // Indicates validation passed
-  }
-
   const handleAddToCart = () => {
-    if (!validateMinPackQty()) {
-      return; // Return early if validation fails
+    if (!valid || quantity <= 0) {
+      if (quantity <= 0 && valid) {
+          // Optionally, alert the user that quantity must be greater than 0
+          // Alert.alert("Invalid Quantity", "Please enter a quantity greater than 0.");
+      }
+      return;
     }
-    //call add to cart logging endpoint
-    try{
-      const discount = discountsString ? discountsString : discountsArray.join(", ");
-      const payload = {
-        product_name: prod.product_details.product_name,
-        time_stamp: new Date().toISOString(),
-        user_id: data.user_id,
-        session_id: sessionId,
-        quantity: quantity,
-        uom: selectedUom,
-        is_sale: isOnSale,
-        discount_string: discount,
-        message_id: messageId
+
+    const executeAddToCartLogic = (qtyToAdd) => {
+      try {
+        const discount = discountsString ? discountsString : (Array.isArray(discountsArray) ? discountsArray.join(", ") : "");
+        const payload = {
+          product_name: prod.product_details.product_name,
+          time_stamp: new Date().toISOString(),
+          user_id: data.user_id,
+          session_id: sessionId,
+          quantity: qtyToAdd,
+          uom: selectedUom,
+          is_sale: isOnSale,
+          discount_string: discount,
+          message_id: messageId
+        };
+        console.log("add to cart payload", payload);
+        axios.post(ADD_TO_CART_URL, payload)
+          .then(response => {
+            console.log("log addToCart response", response);
+          })
+          .catch(error => {
+            console.log("log addToCart error", error);
+          });
+      } catch (error) {
+        console.log("log addToCart error", error);
       }
-      console.log("add to cart payload", payload)
-      axios.post(ADD_TO_CART_URL, payload)
-      .then(response => {
-        console.log("log addToCart response", response)
-      })
-      .catch(error => {
-        console.log("log addToCart error", error)
-      })
-    } catch (error) {
-      console.log("log addToCart error", error)
+      onAddToCartClick({
+        selectedUom: selectedUom,
+        quantity: qtyToAdd,
+        product: prod
+      });
+    };
+
+    if (currentMinPackQtyForSelectedUom > 1 && quantity % currentMinPackQtyForSelectedUom !== 0) {
+      const roundedResult = Math.ceil(quantity / currentMinPackQtyForSelectedUom) * currentMinPackQtyForSelectedUom;
+
+      Alert.alert(
+        `Item #${prod.part_number} is sold in multiples of ${currentMinPackQtyForSelectedUom} ${selectedUom}`,
+        `The quantity will be rounded up to ${roundedResult} ${selectedUom} in your cart. Do you want to proceed?`,
+        [
+          {
+            text: 'Cancel',
+            onPress: () => {
+              setQuantity(0); // Reset quantity to 0
+            },
+            style: 'cancel',
+          },
+          {
+            text: 'Proceed',
+            onPress: () => {
+              setQuantity(roundedResult); // Set quantity to the adjusted amount
+              executeAddToCartLogic(roundedResult); // Proceed with adding to cart
+            },
+          },
+        ],
+        { cancelable: true } // User can dismiss the alert by tapping outside on Android
+      );
+    } else {
+      // No rounding needed, or item is sold individually (min pack <= 1)
+      // Proceed with the current quantity (which is > 0 at this point)
+      executeAddToCartLogic(quantity);
     }
-    onAddToCartClick({
-      selectedUom: selectedUom,
-      quantity: quantity,
-      product: prod 
-    });
   };
   
   const handleProductClick = () => {
@@ -228,18 +246,10 @@ export const ProductCard = ({ prod, onFocusQuantityInput, messageId }) => {
   };
   
   const handleUomChange = (newUom) => {
-    const newMinPack = getMinPackQtyForUom(newUom);
-    const isProductCurrentlyValid = prod.inventory_info?.is_valid || false; 
-
     setSelectedUom(newUom); 
 
-    let qtyToSet;
-    if (isProductCurrentlyValid) { // Only depends on validity now
-        qtyToSet = newMinPack; 
-    } else { 
-        qtyToSet = 0;
-    }
-    setQuantity(qtyToSet);
+    // Always set quantity to 0 when UOM changes
+    setQuantity(0);
   };
   
   const openUomPicker = () => {

package/src/contexts/AppContext.js

@@ -78,11 +78,15 @@ export const AppProvider = ({ data, onProductCardClick, onAddToCartClick, uiConf
         if (uiConfig.toggleChat === false){
           setShowModal("Icon");
         }else{
-          if ((uiConfig.showWelcome === true || cachedState.showWelcome === true) && (messages.length <2)){
-            // console.log("showWelcome", uiConfig.showWelcome, cachedState.showWelcome)
-            setShowModal("Welcome");
+          if (!disclaimer){
+            setShowModal("Form")
           }else{
-            setShowModal("ChatWindow");
+            if ((uiConfig.showWelcome === true || cachedState.showWelcome === true) && (messages.length <2)){
+              // console.log("showWelcome", uiConfig.showWelcome, cachedState.showWelcome)
+              setShowModal("Welcome");
+            }else{
+              setShowModal("ChatWindow");
+            }
           }
         }
 

package/src/layout/welcome.js

@@ -31,7 +31,7 @@ export const Welcome = ({ panHandlers }) => {
             {/* Logo container with absolute positioning */}
             <View style={styles.logoContainer}>
               <CloudinaryImage
-                cldImg="posiden"
+                cldImg="logos/HPSG_HPlus_Logo_White"
                 imageStyle={{ width: 150, height: 35 }}
               />
             </View>