ordering-ui-react-native 0.14.52 → 0.14.53

package/package.json

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

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/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/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/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