ordering-ui-react-native 0.17.18-release → 0.17.19-release

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.17.18-release",
+  "version": "0.17.19-release",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/src/components/StripeMethodForm/index.tsx

@@ -25,9 +25,9 @@ export const StripeMethodForm = (props: StripeMethodFormParams) => {
   const [{ configs }] = useConfig()
   const applePay = ['global_apple_pay', 'apple_pay']
   const googlePay = ['global_google_pay', 'google_pay']
+
   useEffect(() => {
     if (Platform.OS === 'ios') {
-      setErrors(t('GOOGLE_PAY_NOT_SUPPORTED', 'Google pay not supported'))
       setMethodPaySupported({
         enabled: false,
         loading: false
@@ -78,7 +78,7 @@ export const StripeMethodForm = (props: StripeMethodFormParams) => {
         setPlaceByMethodPay(false)
       }
     }
-    if (googlePay.includes(paymethod)) {
+    if (googlePay.includes(paymethod) && !methodPaySupported?.enabled) {
       initialize();
     }
   }, [initGooglePay, paymethod]);
@@ -87,9 +87,8 @@ export const StripeMethodForm = (props: StripeMethodFormParams) => {
     if (applePay.includes(paymethod) && !paymethod) return
     if (Platform.OS === 'android') {
       setPlaceByMethodPay(false)
-      setErrors(t('APPLE_PAY_NOT_SUPPORTED', 'Apple pay not supported'))
       setMethodPaySupported({
-        enabled: false,
+        ...methodPaySupported,
         loading: false
       })
       return
@@ -111,7 +110,6 @@ export const StripeMethodForm = (props: StripeMethodFormParams) => {
         enabled: true,
         loading: false
       })
-      return;
     } else if (paymentMethod) {
       setMethodPaySupported({
         enabled: true,

package/themes/original/src/components/LoginForm/index.tsx

@@ -255,10 +255,18 @@ const LoginFormUI = (props: LoginParams) => {
 		setOtpType(type)
 	}
 
-	const handleLoginOtp = (code: string) => {
+	const handleLoginOtp = async (code: string) => {
 		if (!code) return
-		handleButtonLoginClick({ code })
-		setWillVerifyOtpState(false)
+		const logged = await handleButtonLoginClick({ code })
+		if (logged){
+			setWillVerifyOtpState(false)
+		} else {
+			setAlertState({
+				open: true,
+				title: '',
+				content: t('OTP_CODE_INCORRECT', 'Otp code incorrect')
+			})
+		}
 	}
 
 	const closeAlert = () => {

package/themes/original/src/components/MultiCartsPaymethodsAndWallets/index.tsx

@@ -13,6 +13,7 @@ import { getIconCard, flatArray } from '../../utils'
 import { StripeElementsForm } from '../StripeElementsForm'
 import { StripeCardsList } from '../StripeCardsList'
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
+import { useApplePay } from '@stripe/stripe-react-native';
 
 import {
   PMContainer,
@@ -44,6 +45,7 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
   const [, t] = useLanguage()
   const [{ configs }] = useConfig()
   const [{ parsePrice }] = useUtils()
+	const { confirmApplePayPayment } = useApplePay()
 
   const [addCardOpen, setAddCardOpen] = useState({ stripe: false, stripeConnect: false });
 
@@ -92,7 +94,7 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
 		if (methodsPay.includes(paymethodSelected?.gateway)) {
       if (typeof paymethodSelected?.paymethod_data === 'string'){
         const sourceId =  JSON.parse(paymethodSelected?.paymethod_data)?.source_id
-        sourceId && handlePlaceOrder()
+        sourceId && handlePlaceOrder(confirmApplePayPayment)
       }
 		}
 	}, [JSON.stringify(paymethodSelected)])
@@ -100,7 +102,7 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
   const renderPaymethods = ({ item }: any) => {
     return (
       <>
-        {item?.gateway === 'apple_pay' ? (
+        {item?.gateway === 'global_apple_pay' ? (
           <TouchableOpacity
             onPress={() => handleSelectPaymethod({ ...item, paymethod: { gateway: item.gateway }, paymethod_id: item?.id })}
           >
@@ -123,7 +125,7 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
                 src={getPayIcon(item?.gateway ?? item.paymethod?.gateway)}
                 width={20}
                 height={20}
-                color={item?.gateway === 'apple_pay' ? '' : paymethodSelected?.id === item.id ? theme.colors.white : theme.colors.backgroundDark}
+                color={item?.gateway === 'global_apple_pay' ? '' : paymethodSelected?.id === item.id ? theme.colors.white : theme.colors.backgroundDark}
               />
               <OText
                 size={10}

package/themes/original/src/components/MultiCheckout/index.tsx

@@ -166,9 +166,9 @@ const MultiCheckoutUI = (props: any) => {
     setPhoneUpdate(val)
   }
 
-  const handlePlaceOrder = () => {
+  const handlePlaceOrder = (confirmPayment ?: any) => {
     if (!userErrors.length) {
-      handleGroupPlaceOrder && handleGroupPlaceOrder()
+      handleGroupPlaceOrder && handleGroupPlaceOrder(confirmPayment)
       return
     }
     let stringError = ''