ordering-ui-react-native 0.14.52 → 0.14.55

package/package.json

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

package/themes/original/index.tsx

@@ -32,6 +32,7 @@ import { Wallets } from './src/components/Wallets';
 import { PaymentOptionWallet } from './src/components/PaymentOptionWallet';
 import { ProductForm } from './src/components/ProductForm';
 import { UpsellingProducts } from './src/components/UpsellingProducts';
+import { VerifyEmail } from './src/components/VerifyEmail';
 
 import { Toast } from './src/components/shared/OToast';
 import {
@@ -94,6 +95,7 @@ export {
   PaymentOptionWallet,
   ProductForm,
   UpsellingProducts,
+  VerifyEmail,
 
 	// OComponents
 	Toast,

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

@@ -127,6 +127,8 @@ const CheckoutUI = (props: any) => {
 	const [openChangeStore, setOpenChangeStore] = useState(false)
 	const [isDeliveryOptionModalVisible, setIsDeliveryOptionModalVisible] = useState(false)
 
+  const isWalletEnabled = configs?.wallet_enabled?.value === '1'
+
 	const driverTipsOptions = typeof configs?.driver_tip_options?.value === 'string'
 		? JSON.parse(configs?.driver_tip_options?.value) || []
 		: configs?.driver_tip_options?.value || []
@@ -506,7 +508,7 @@ const CheckoutUI = (props: any) => {
 						</ChSection>
 					)}
 
-          {!cartState.loading && cart && (
+          {!cartState.loading && cart && isWalletEnabled && (
             <WalletPaymentOptionContainer>
               <PaymentOptionWallet
                 cart={cart}

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

@@ -5,7 +5,7 @@ import { useTheme } from 'styled-components/native';
 import { OIcon, OText } from '../shared';
 
 const LogoutButtonUI = (props: any) => {
-	const { handleLogoutClick, text, color } = props
+	const { handleLogoutClick, text, color, iconSize } = props
 	const theme = useTheme();
 
 	return (
@@ -15,7 +15,7 @@ const LogoutButtonUI = (props: any) => {
 		>
 			<OIcon
 				src={theme.images.general.logout}
-				width={17}
+				width={iconSize ?? 17}
 				color={color ? color : theme.colors.textNormal}
 				style={{ marginEnd: 14 }}
 			/>

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

@@ -55,7 +55,7 @@ const PaymentOptionWalletUI = (props: any) => {
   }
 
   const handleOnChange = (position: any, wallet: any) => {
-    const updatedCheckedState = checkedState.map((item, index) =>
+    const updatedCheckedState = checkedState.map((item: any, index: any) =>
       index === position ? !item : item
     );
 
@@ -85,7 +85,7 @@ const PaymentOptionWalletUI = (props: any) => {
         walletsState.result?.length > 0 &&
       (
         <>
-          {walletsState.result?.map((wallet: any, idx: any) => wallet.valid && (
+          {walletsState.result?.map((wallet: any, idx: any) => wallet.valid && wallet.balance >= 0 && (
             <Container
               key={wallet.id}
               isBottomBorder={idx === walletsState.result?.filter((wallet: any) => wallet.valid)?.length - 1}

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

@@ -212,7 +212,9 @@ export const ProductOptionsUI = (props: any) => {
 	}
 
 	const handleRedirectLogin = () => {
-		navigation.navigate('Login');
+		navigation.navigate('Login', {
+			store_slug:  props.businessSlug
+		});
 	};
 
 	const handleSwitchQtyUnit = (val: string) => {

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

@@ -5,6 +5,7 @@ import {
 	useLanguage,
 	ToastType,
 	useToast,
+  useConfig
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 import { useForm } from 'react-hook-form';
@@ -91,12 +92,15 @@ const ProfileListUI = (props: ProfileParams) => {
 
 	const [{ user }] = useSession();
 	const [, t] = useLanguage();
+	const [{ configs }] = useConfig();
 	const [, { showToast }] = useToast();
 	const { errors } = useForm();
 
 	const { height } = useWindowDimensions();
 	const { top, bottom } = useSafeAreaInsets();
 
+  const isWalletEnabled = configs?.wallet_enabled?.value === '1'
+
 	const onRedirect = (route: string, params?: any) => {
 		navigation.navigate(route, params)
 	}
@@ -161,10 +165,12 @@ const ProfileListUI = (props: ProfileParams) => {
 						<MessageCircle name='message1' style={styles.messageIconStyle} color={theme.colors.textNormal} />
 						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('MESSAGES', 'Messages')}</OText>
 					</ListItem>
-					<ListItem onPress={() => onRedirect('Wallets', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
-						<Ionicons name='wallet-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
-						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('WALLETS', 'Wallets')}</OText>
-					</ListItem>
+          {!isWalletEnabled && (
+            <ListItem onPress={() => onRedirect('Wallets', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
+              <Ionicons name='wallet-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
+              <OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('WALLETS', 'Wallets')}</OText>
+            </ListItem>
+          )}
 					<ListItem onPress={() => navigation.navigate('Help', {})} activeOpacity={0.7}>
 						<OIcon src={theme.images.general.ic_help} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />
 						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('HELP', 'Help')}</OText>

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

@@ -0,0 +1,303 @@
+import React, { useEffect, useState, useRef } from 'react';
+import { useTheme } from 'styled-components/native';
+import {
+  StyleSheet,
+  Text,
+  View,
+  TextInput,
+  SafeAreaView,
+  TouchableOpacity,
+} from 'react-native';
+import {
+  VerifyEmail as VerifyEmailController,
+  useToast,
+  useSession,
+  useLanguage,
+  ToastType
+} from 'ordering-components/native';
+
+import { OText, OInput, OButton } from '../shared';
+import { LogoutButton } from '../LogoutButton'
+
+import {
+  Container,
+  InputsSection,
+  WrapperText,
+  InputWrapper,
+  WrappCountdown,
+  CountDownContainer,
+  OtpSection,
+  DigitInput,
+  ButtonsActions,
+  WrapperActions
+} from './styles'
+
+const TIME_COUNTDOWN = 60 * 10 // 10 minutes
+const CODE_LENGTH = 6;
+
+const VerifyEmailUI = (props: any) => {
+  const {
+    verifyEmailState,
+    cleanErrorsState,
+    sendVerifyEmailCode,
+    checkVerifyEmailCode,
+  } = props
+
+  const theme = useTheme();
+  const [, t] = useLanguage()
+  const [{ user }] = useSession()
+  const [, { showToast }] = useToast();
+
+  const ref = useRef<TextInput>(null);
+
+  const [otpState, setOtpState] = useState('')
+  const [emailVerification, setEmailVerification] = useState(false)
+
+  const [timer, setTimer] = useState(`${TIME_COUNTDOWN / 60}:00`)
+  const [isSendCodeAgain, setIsSendCodeAgain] = useState(false)
+  const [containerIsFocused, setContainerIsFocused] = useState(false);
+
+  const codeDigitsArray = new Array(CODE_LENGTH).fill(0);
+
+  const style = StyleSheet.create({
+    inputContainer: {
+      borderWidth: 1,
+      borderRadius: 7.6,
+      padding: 12,
+      borderColor: theme.colors.disabled,
+    },
+    inputContainerFocused: {
+      borderColor: theme.colors.primary,
+    },
+    hiddenCodeInput: {
+      position: 'absolute',
+      height: 0,
+      width: 0,
+      opacity: 0,
+    },
+    inputStyle: {
+      marginBottom: 28,
+      borderWidth: 1,
+      borderColor: theme.colors.border,
+      borderRadius: 7.6,
+    },
+    btnStyle: {
+      borderRadius: 7.6,
+      marginTop: 5,
+      marginBottom: 2
+    }
+  });
+
+  const handleOnPress = () => {
+    setContainerIsFocused(true);
+    ref?.current?.focus();
+  };
+
+  const handleOnBlur = () => {
+    setContainerIsFocused(false);
+  };
+
+  const toDigitInput = (_value: number, idx: number) => {
+    const emptyInputChar = '0';
+    const digit = otpState[idx] || emptyInputChar;
+
+    const isCurrentDigit = idx === otpState.length;
+    const isLastDigit = idx === CODE_LENGTH - 1;
+    const isCodeFull = otpState.length === CODE_LENGTH;
+
+    const isFocused = isCurrentDigit || (isLastDigit && isCodeFull);
+
+    const containerStyle =
+      containerIsFocused && isFocused
+        ? {...style.inputContainer, ...style.inputContainerFocused}
+        : style.inputContainer;
+
+    return (
+      <View key={idx} style={containerStyle}>
+        <Text
+          style={{
+            fontSize: 20,
+            color: otpState[idx] ? theme.colors.black : theme.colors.disabled
+          }}
+        >
+          {digit}
+        </Text>
+      </View>
+    );
+  };
+
+  const handleSendOtp = () => {
+    setTimer(`${TIME_COUNTDOWN / 60}:00`)
+    setIsSendCodeAgain(true)
+    sendVerifyEmailCode({ email: user?.email })
+  }
+
+  useEffect(() => {
+    let _timer = TIME_COUNTDOWN - 1;
+    let minutes = 0;
+    let seconds = 0;
+    const interval = setInterval(() => {
+      minutes = _timer / 60;
+      seconds = _timer % 60;
+
+      minutes = minutes < 10 ? 0 + minutes : minutes;
+      seconds = seconds < 10 ? 0 + seconds : seconds;
+
+      const formatMinutes = parseInt(minutes.toString()) < 10
+        ? `0${parseInt(minutes.toString())}`
+        : parseInt(minutes.toString());
+
+      const formatseconds = parseInt(seconds.toString()) < 10
+        ? `0${parseInt(seconds.toString())}`
+        : parseInt(seconds.toString());
+
+      setTimer(`${formatMinutes}:${formatseconds}`);
+
+      if (--_timer < 0) {
+        clearInterval(interval);
+      }
+
+      if (timer === `${TIME_COUNTDOWN / 60}:00` && isSendCodeAgain) {
+        setIsSendCodeAgain(false)
+        clearInterval(interval);
+      }
+    }, 1000);
+
+    return () => clearInterval(interval)
+  }, [isSendCodeAgain])
+
+  useEffect(() => {
+    if (otpState?.length === CODE_LENGTH) {
+      if (emailVerification) {
+        checkVerifyEmailCode({ code: otpState })
+        return
+      }
+    }
+  }, [otpState])
+
+  useEffect(() => {
+    if (verifyEmailState?.errorSendCode || verifyEmailState?.errorCheckCode) {
+      showToast(
+        ToastType.Error,
+        verifyEmailState?.errorSendCode?.[0]
+          ?? verifyEmailState?.errorCheckCode?.[0]
+          ?? t('ERROR', 'Error'),
+      );
+      setTimeout(() => {
+        cleanErrorsState();
+        setOtpState('');
+      }, 2000);
+    }
+  }, [verifyEmailState])
+
+  useEffect(() => {
+    if (!verifyEmailState?.loadingSendCode) {
+      setEmailVerification(!!verifyEmailState?.resultSendCode)
+    }
+  }, [verifyEmailState])
+
+  return (
+    <SafeAreaView style={{ flex: 1 }}>
+      <Container>
+        <WrapperActions>
+          <WrapperText>
+            <OText size={22} weight='bold' style={{ marginBottom: 10 }}>
+              {t('VERIFICATION_CODE', 'Verification Code')}
+            </OText>
+            <OText size={14} color={theme.colors.disabled} style={{ textAlign: 'center', paddingVertical: 20 }}>
+              {!emailVerification ? (
+                t('VERIFICATION_CODE_MESSAGE', 'In order to continue using our platform please verify your email')
+              ) : (
+                t('VERIFICATION_CODE_SENT_MESSAGE', 'Please type the verification code sent to your email')
+              )}
+            </OText>
+          </WrapperText>
+          <View style={{ position: 'absolute', top: 0, right: 0 }}>
+            <LogoutButton iconSize={20} />
+          </View>
+        </WrapperActions>
+
+        {!emailVerification ? (
+          <InputWrapper>
+            <OInput
+              placeholder={user?.email}
+              style={style.inputStyle}
+              icon={theme.images.general.email}
+              isDisabled
+            />
+          </InputWrapper>
+        ) : (
+          <>
+            <WrappCountdown>
+              <CountDownContainer color={timer === '00:00' ? theme.colors.error: theme.colors.success}>
+                <OText
+                  size={26}
+                  color={timer === '00:00' ? theme.colors.error: theme.colors.success}
+                >
+                  {timer}
+                </OText>
+              </CountDownContainer>
+            </WrappCountdown>
+
+            <InputsSection>
+              <OtpSection>
+                <DigitInput
+                  disabled={otpState.length === CODE_LENGTH}
+                  onPress={handleOnPress}
+                >
+                  {codeDigitsArray.map(toDigitInput)}
+                </DigitInput>
+                <TextInput
+                  ref={ref}
+                  value={otpState}
+                  placeholder='0'
+                  onChangeText={setOtpState}
+                  onSubmitEditing={handleOnBlur}
+                  keyboardType="number-pad"
+                  returnKeyType="done"
+                  textContentType="oneTimeCode"
+                  maxLength={CODE_LENGTH}
+                  style={style.hiddenCodeInput}
+                />
+              </OtpSection>
+            </InputsSection>
+
+            <WrapperText>
+              <TouchableOpacity
+                onPress={handleSendOtp}
+              >
+                <OText color={theme.colors.primary}>
+                  {t('RESEND_AGAIN', 'Resend again?')}
+                </OText>
+              </TouchableOpacity>
+            </WrapperText>
+          </>
+        )}
+      </Container>
+      <ButtonsActions>
+        <View style={{ width: '100%' }}>
+          <OButton
+            onClick={emailVerification ? () => setEmailVerification(false) : handleSendOtp}
+            text={emailVerification ? t('CANCEL', 'Cancel') : t('SEND_CODE', 'Send code')}
+            bgColor={emailVerification ? theme.colors.secundary : theme.colors.primary}
+            borderColor={emailVerification ? theme.colors.secundary : theme.colors.primary}
+            textStyle={{ color: emailVerification ? 'black' : 'white' }}
+            imgRightSrc={null}
+            isLoading={verifyEmailState?.loadingSendCode || verifyEmailState?.loadingCheckCode}
+            style={emailVerification ? style.btnStyle : { borderRadius: 7.6 }}
+          />
+        </View>
+      </ButtonsActions>
+    </SafeAreaView>
+  )
+}
+
+export const VerifyEmail = (props: any) => {
+  const verifyProps = {
+    ...props,
+    UIComponent: VerifyEmailUI
+  }
+  return (
+    <VerifyEmailController {...verifyProps} />
+  )
+}

package/themes/original/src/components/VerifyEmail/styles.tsx

@@ -0,0 +1,77 @@
+import styled from 'styled-components/native';
+
+export const Container = styled.View`
+  padding: 20px;
+`
+
+export const WrapperText = styled.View`
+  display: flex;
+  flex-direction: column;
+  margin: 0 auto 0px;
+  align-items: center;
+`
+
+export const InputWrapper = styled.View``
+
+export const WrapperActions = styled.View`
+  position: relative;
+`
+
+export const ButtonsActions = styled.View`
+  position: absolute;
+  bottom: 0px;
+  left: 0;
+  right: 0;
+  padding: 12px 40px;
+  flex-direction: row;
+  border-top-width: 1px;
+  border-color: ${(props: any) => props.theme.colors.border};
+  width: 100%;
+  justify-content: space-between;
+  background-color: #FFF;
+  z-index: 1000;
+  justify-content: space-between;
+`
+
+export const OtpSection = styled.SafeAreaView`
+  flex: 1;
+  align-items: center;
+  justify-content: center;
+`
+
+export const DigitInput = styled.Pressable`
+  width: 80%;
+  flex-direction: row;
+  justify-content: space-between;
+`
+
+export const CountDownContainer = styled.View`
+  background-color: ${(props: any) => `${props.color}4D`};
+  border-radius: 7.6px;
+  padding: 5px 0px 0px;
+  margin: 0 auto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 80%;
+`
+
+export const WrappCountdown = styled.View`
+  padding-bottom: 20px;
+  padding-top: 20px;
+`
+
+export const InputsSection = styled.View`
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  padding-bottom: 20px;
+`
+
+export const ErrorSection = styled.View`
+  margin-bottom: 20px;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+`

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

@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React, { useState, useEffect } from 'react'
 import { Pressable, View } from 'react-native';
 import { useTheme } from 'styled-components/native'
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
@@ -60,6 +60,14 @@ const WalletsUI = (props: any) => {
     navigation?.canGoBack() && navigation.goBack()
   }
 
+  useEffect(() => {
+    if (configs?.wallet_enabled?.value === '0') {
+      navigation.navigate('BottomTab', {
+        screen: 'Profile'
+      })
+    }
+  }, [configs])
+
   return (
     <Container>
       <NavBar