ordering-ui-react-native 0.17.66 → 0.17.67-release

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

@@ -63,12 +63,12 @@ export const WalletTransactions = (props: any) => {
           (transactionsList?.error ||
             !transactionsList.list?.[`wallet:${currentWalletSelected?.id}`]?.length) &&
         (
-          <NotFoundSource
-            content={transactionsList?.error
+          <OText color={theme.colors.disabled} size={16} style={{ textAlign: 'center' }}>
+            {transactionsList?.error
               ? t('ERROR_NOT_FOUND_TRANSACTIONS', 'Sorry, an error has occurred')
               : t('NOT_FOUND_TRANSACTIONS', 'No transactions to show at this time.')
             }
-          />
+          </OText>
         )}
       </View>
     </Container>

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

@@ -3,6 +3,7 @@ import { Pressable, StyleSheet, View, ScrollView, TouchableOpacity, Platform } f
 import { useTheme } from 'styled-components/native'
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
 import FastImage from 'react-native-fast-image'
+import NavBar from '../NavBar'
 import {
   WalletList,
   useLanguage,
@@ -27,6 +28,7 @@ import {
 import { OButton, OIcon, OText, OModal } from '../shared';
 import { NotFoundSource } from '../NotFoundSource';
 import { WalletTransactions } from '../WalletTransactions'
+import { GiftCardUI } from '../GiftCard/GiftCardUI'
 
 const WalletsUI = (props: any) => {
   const {
@@ -47,6 +49,7 @@ const WalletsUI = (props: any) => {
   const [{ parsePrice }] = useUtils()
   const [{ configs }] = useConfig()
 
+
   const styles = StyleSheet.create({
     logoStyle: {
       width: 120,
@@ -57,12 +60,20 @@ const WalletsUI = (props: any) => {
       flexDirection: 'column',
       justifyContent: 'center',
       alignItems: 'center',
+    },
+    dividerStyle: {
+      height: 8,
+      backgroundColor: theme.colors.backgroundGray100,
+      marginVertical: 25,
+      marginHorizontal: -40,
+      width: '100%'
     }
   });
 
   const [tabSelected, setTabSelected] = useState(isWalletCashEnabled ? 'cash' : 'credit_point')
   const [openHistory, setOpenHistory] = useState(false)
-  const isChewLayout = theme?.wallets_view?.components?.layout?.type === 'chew'
+  const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
+  const hideWalletsTheme = theme?.bar_menu?.components?.wallets?.hidden
 
   const isWalletEnabled = configs?.cash_wallet?.value && configs?.wallet_enabled?.value === '1' && (isWalletCashEnabled || isWalletPointsEnabled)
 
@@ -109,27 +120,41 @@ const WalletsUI = (props: any) => {
 
   return (
     <>
-      <Container>
+      <Container
+        pdng={Platform.OS === 'ios' ? '10px' : '0'}
+      >
         <Header>
-        <OText
-          size={20}
-          style={{
-            marginTop: 30,
-            color: theme.colors.textNormal,
-          }}
-          weight={Platform.OS === 'ios' ? '600' : 'bold'}
-        >{t('WALLETS', 'Wallets')}</OText>
-          {isChewLayout && (
-            <OButton
-              text={t('WALLET_HISTORY', 'Wallet history')}
-              bgColor={theme.colors.white}
-              borderColor={theme.colors.lightGray}
-              imgRightSrc={null}
-              textStyle={{ fontSize: 12, color: theme.colors.disabled }}
-              onClick={() => setOpenHistory(true)}
-              style={{ borderRadius: 8, height: 40 }}
+          <View style={{
+            ...{
+              width: '100%',
+              display: 'flex',
+              flexDirection: hideWalletsTheme ? 'column' : 'row',
+              justifyContent: hideWalletsTheme ? 'flex-start' : 'space-between',
+              alignItems: hideWalletsTheme ? 'flex-start' : 'center',
+              marginTop: hideWalletsTheme ? 0 : 10,
+            },
+          }}>
+            <NavBar
+              title={t('WALLETS', 'Wallets')}
+              titleAlign={'center'}
+              onActionLeft={goToBack}
+              showCall={false}
+              paddingTop={10}
+              btnStyle={{ paddingLeft: 0 }}
+              hideArrowLeft={!hideWalletsTheme}
             />
-          )}
+            {isChewLayout && !openHistory && (
+              <OButton
+                text={t('WALLET_HISTORY', 'Wallet history')}
+                bgColor={theme.colors.white}
+                borderColor={theme.colors.lightGray}
+                imgRightSrc={null}
+                textStyle={{ fontSize: 12, color: theme.colors.disabled }}
+                onClick={() => setOpenHistory(true)}
+                style={{ borderRadius: 8, height: 40, width: hideWalletsTheme ? '100%' : 150, marginTop: hideWalletsTheme ? 10 : 0 }}
+              />
+            )}
+          </View>
         </Header>
 
         {!walletList.loading &&
@@ -153,8 +178,8 @@ const WalletsUI = (props: any) => {
                         borderBottomWidth: 1,
                         borderBottomColor:
                           tabSelected === wallet.type
-                          ? theme.colors.textNormal
-                          : theme.colors.border
+                            ? theme.colors.textNormal
+                            : theme.colors.border
                       }}
                     >
                       <OText>
@@ -170,9 +195,9 @@ const WalletsUI = (props: any) => {
                   <LoyaltyContent>
                     <LoyaltyWrapp>
                       <OText size={20}>
-                        {`${t('LOYALTY_LEVEL_TITLE', 'Your level is')}:`}
+                        {`${t('LOYALTY_LEVEL_TITLE', 'Your level is')}`}
                       </OText>
-                      {/* {loyaltyLevel.image ? (
+                      {loyaltyLevel.image ? (
                         <FastImage
                           style={styles.logoStyle}
                           source={{
@@ -187,7 +212,7 @@ const WalletsUI = (props: any) => {
                           source={theme.images.dummies.loyaltyLevel}
                           resizeMode='contain'
                         />
-                      )} */}
+                      )}
                       <OText
                         size={22}
                         weight='bold'
@@ -213,6 +238,14 @@ const WalletsUI = (props: any) => {
                   </OText>
                 </BalanceElement>
 
+                {currentWalletSelected?.type === 'cash' && (
+                  <>
+                    <View style={styles.dividerStyle} />
+                    <GiftCardUI navigation={navigation} />
+                    <View style={styles.dividerStyle} />
+                  </>
+                )}
+
                 {!isChewLayout && (
                   <WalletTransactions
                     transactionsList={transactionsList}
@@ -266,15 +299,18 @@ const WalletsUI = (props: any) => {
         <ScrollView>
           <WalletTransactionsWrapper>
             <OButton
+              imgLeftStyle={{ width: 18 }}
               imgRightSrc={null}
               style={{
                 borderWidth: 0,
-                backgroundColor: theme.colors.white,
-                padding: 0,
-                paddingHorizontal: 0,
-                width: 30,
+                width: 26,
+                height: 26,
+                backgroundColor: '#FFF',
+                borderColor: '#FFF',
+                shadowColor: '#FFF',
                 paddingLeft: 0,
-                paddingRight: 0
+                paddingRight: 0,
+                marginBottom: 10
               }}
               onClick={() => setOpenHistory(false)}
               icon={AntDesignIcon}

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

@@ -1,13 +1,12 @@
 import styled from 'styled-components/native'
 
 export const Container = styled.View`
-  display: flex;
-  flex-direction: column;
+  padding-horizontal: 20px;
+  padding-bottom: 20px;
+  padding-top: ${(props: any) => props.pdng};
 `
 export const Header = styled.View`
   flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
 `
 export const SectionContent = styled.View`
   width: 100%;

package/themes/original/src/components/shared/OButton.tsx

@@ -12,6 +12,7 @@ import {
 import * as React from 'react';
 import styled, { useTheme } from 'styled-components/native';
 import { OIcon } from './';
+import { css } from 'styled-components';
 
 const StyledButton = styled.View<Props>`
 	background-color: ${(props: any) => props.theme.colors.primary};
@@ -26,6 +27,9 @@ const StyledButton = styled.View<Props>`
 	padding-left: 20px;
 	padding-right: 20px;
 	position: relative;
+	${(props: any) => props?.theme?.general?.components?.buttons?.borderRadius && css`
+      border-radius: ${props?.theme?.general?.components?.buttons?.borderRadius}px;
+  `}
 `
 const StyledButtonDisabled = styled(StyledButton)`
 	background-color: ${(props: any) => props.theme.colors.disabled};
@@ -115,12 +119,12 @@ const OButton = (props: Props): React.ReactElement => {
 			style={{ width: props.isCircle ? 52 : props.style?.width, ...props.parentStyle }}
 			disabled={props.isDisabledWithSameStyles}
 		>
-			<StyledButton style={props.bgColor ? { ...props.style, backgroundColor: props.bgColor, borderColor: props.borderColor } : props.style}>
+			<StyledButton style={props.bgColor ? { ...props.style, backgroundColor: props.bgColor, borderColor: props.borderColor, borderRadius: parseInt(theme?.general?.components?.buttons?.borderRadius) || props.style?.borderRadius } : { ...props.style, borderRadius: parseInt(theme?.general?.components?.buttons?.borderRadius) || props.style?.borderRadius }}>
 				{props.icon ? (
 					<props.icon {...props.iconProps} />
 				) : null}
 				{props.imgLeftSrc ? (
-					<OIcon style={props.imgLeftStyle} src={props.imgLeftSrc} />
+					<OIcon style={props.imgLeftStyle} src={props.imgLeftSrc} color={theme.colors.textNormal} />
 				) : null}
 				{props.text ? (
 					<StyledText style={props.textStyle}>{props.text}</StyledText>

package/themes/original/src/components/shared/OInput.tsx

@@ -100,7 +100,12 @@ const OInput = (props: Props): React.ReactElement => {
 				ref={(e: any) => {
 					props.forwardRef && (props.forwardRef.current = e)
 				}}
-				style={props?.inputStyle}
+				style={{
+          ...(theme?.general?.components?.inputs?.color && {
+            color: theme?.general?.components?.inputs?.color
+          }),
+					...props?.inputStyle
+				}}
 				onFocus={() => setInputFocused(true)}
 				onBlur={() => setInputFocused(false)}
 			/>

package/themes/original/src/components/shared/OModal.tsx

@@ -52,7 +52,7 @@ const OModal = (props: Props): React.ReactElement => {
 
 	const theme = useTheme();
 
-	const RenderSafeAreaView = () => (
+	const renderSafeAreaView = () => (
 		<SafeAreaView style={styles.container}>
 			{!entireModal ? (
 				<View style={styles.centeredView}>
@@ -101,10 +101,10 @@ const OModal = (props: Props): React.ReactElement => {
 					enabled
 					behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
 				>
-					<RenderSafeAreaView/>
+					{renderSafeAreaView()}
 				</KeyboardView>
 			) : (
-				<RenderSafeAreaView/>
+				renderSafeAreaView()
 			)}
 		</Modal>
 	);

package/themes/original/src/types/index.tsx

@@ -19,6 +19,7 @@ export interface LoginParams {
 	notificationState?: any;
 	handleReCaptcha?: any;
 	enableReCaptcha?: any;
+	isGuest?: any;
 	otpType?: string,
 	setOtpType: (type: string) => void,
 	generateOtpCode: (values?: any) => void,
@@ -91,7 +92,8 @@ export interface AddressFormParams {
 	hasAddressDefault?: any,
 	isFromCheckout?: boolean
 	afterSignup?: boolean
-	isGuestFromStore?: boolean
+	isGuestFromStore?: boolean,
+	businessSlug?: number | string
 }
 export interface SignupParams {
 	navigation?: any;
@@ -118,6 +120,7 @@ export interface SignupParams {
 	useSignUpOtpEmail?: boolean;
 	useSignUpOtpCellphone?: boolean;
 	willVerifyOtpState?: boolean;
+	isGuest?: any;
 	numOtpInputs?: number;
 	handleChangePromotions: () => void;
 	handleChangeInput?: (in1: any, in2: any) => void;
@@ -222,6 +225,7 @@ export interface BusinessControllerParams {
 	handleUpdateBusinessList?: any;
 	enableIntersection?: boolean;
 	isCustomLayout?: boolean;
+	getBusinessOffer?: any;
 	handleCustomUpdate?: (businessId: number, changes: any) => {};
 }
 export interface BusinessProductsListingParams {
@@ -248,6 +252,11 @@ export interface BusinessProductsListingParams {
 	handleUpdateProducts?: any;
 	professionalSelected?: any;
 	handleChangeProfessionalSelected?: any;
+	handleUpdateProfessionals?: any;
+	onBusinessClick?: any;
+	onNavigationRedirect?: any;
+	businessSingleId?: number | string
+	fromMulti?: boolean
 }
 export interface BusinessBasicInformationParams {
 	navigation?: any;
@@ -299,6 +308,7 @@ export interface BusinessProductsListParams {
 	handleUpdateProducts?: any,
 	navigation?: any;
 	previouslyProducts?: any;
+	businessSingleId?: number | string
 }
 export interface SingleProductCardParams {
 	businessId: any;
@@ -314,6 +324,8 @@ export interface SingleProductCardParams {
 	navigation?: any;
 	isPreviously?: any;
 	isProductId?: any;
+	viewString?: string;
+	businessSingleId?: number
 }
 export interface BusinessInformationParams {
 	navigation?: any,
@@ -342,6 +354,8 @@ export interface NotFoundSourceParams {
 	conditioned?: boolean,
 	onClickButton?: any,
 	children?: any
+	hideImage?: any
+	btnStyle?: any
 }
 export interface OrdersOptionParams {
 	orderList?: any,
@@ -360,8 +374,8 @@ export interface OrdersOptionParams {
 	preOrders?: boolean,
 	reorderState?: any,
 	handleReorder?: (orderId: number) => {},
-	setOrdersLength?: ({ activeOrdersLength, previousOrdersLength }: { activeOrdersLength: number, previousOrdersLength: number }) => void,
-	ordersLength: { activeOrdersLength: number, previousOrdersLength: number },
+	setOrdersLength?: ({ activeOrdersLength, previousOrdersLength, preordersLength }: { activeOrdersLength: number, previousOrdersLength: number, preordersLength: number }) => void,
+	ordersLength: { activeOrdersLength: number, previousOrdersLength: number, preordersLength: number },
 	setSelectedOrderId?: any,
 	setOpenMessges?: any,
 	loadMoreStatus?: boolean,
@@ -379,6 +393,7 @@ export interface OrdersOptionParams {
 	BusinessControllerSkeletons?: any,
 	businessPaginationProps?: any,
 	businesses?: any
+	businessId?: any;
 }
 export interface ActiveOrdersParams {
 	orders?: any,
@@ -422,6 +437,7 @@ export interface OrderDetailsParams {
 	onNavigationRedirect?: any,
 	reorderState?: any,
 	handleReorder?: any,
+	hideViaText?: boolean,
 }
 export interface ProductItemAccordionParams {
 	key?: any;
@@ -433,7 +449,8 @@ export interface ProductItemAccordionParams {
 	onDeleteProduct?: (product: any) => void,
 	onEditProduct?: (product: any) => void,
 	offsetDisabled?: any,
-	isFromCheckout?: any
+	isFromCheckout?: any,
+	isDisabledEdit?: any
 }
 export interface ReviewOrderParams {
 	order?: { id: number, business_id: number, logo: string, driver: any, products: Array<any>, review: any, user_review: any };
@@ -532,6 +549,7 @@ export interface FloatingButtonParams {
 }
 export interface MomentOptionParams {
 	navigation: any;
+	isCart?: any;
 	nopadding?: boolean;
 	datesList: Array<any>;
 	hoursList: Array<any>;
@@ -555,6 +573,9 @@ export interface BusinessPreorderParams {
 	goToBack: any;
 	business: any;
 	handleBusinessClick: (value: any) => {};
+	getActualSchedule?: any;
+	cateringPreorder?: boolean;
+	preorderLeadTime?: number
 }
 export interface BusinessMenuListParams {
 	menu: any;
@@ -578,7 +599,7 @@ export interface UpsellingProductsParams {
 	business?: any;
 	businessId?: number;
 	cartProducts?: Array<any>;
-	handleUpsellingPage: () => void;
+	handleUpsellingPage: (cart ?: any) => void;
 	openUpselling: boolean;
 	canOpenUpselling?: boolean;
 	setCanOpenUpselling?: (value: any) => void;
@@ -589,6 +610,8 @@ export interface UpsellingProductsParams {
 	products?: any;
 	onNavigationRedirect?: any;
 	onGoBack?: any;
+	singleBusiness?: any;
+	isFranchiseApp?: any;
 }
 
 export interface GoogleMapsParams {
@@ -602,7 +625,8 @@ export interface GoogleMapsParams {
 	isSetInputs?: boolean,
 	locations?: Array<any>,
 	setSaveLocation?: (val: boolean) => void,
-	handleToggleMap?: () => void
+	handleToggleMap?: () => void,
+	isIntGeoCoder: boolean
 }
 
 export interface HelpParams {
@@ -698,6 +722,10 @@ export interface otpParams {
 	handleLoginOtp: (code: string) => void,
 	setAlertState: any;
 	pinCount: number;
+	otpError: any,
+	setOtpError: any
+	isCheckingCode: boolean
+	setCheckingCode: (value: boolean) => void
 }
 
 export interface FavoriteParams {
@@ -724,7 +752,7 @@ export interface SingleOrderCardParams {
 	pastOrders: any,
 	isMessageView?: any,
 	handleClickOrder: (value: any) => {},
-	handleRemoveCart: () => {},
+	handleRemoveCart: (value: any) => {},
 	cartState: any
 }
 
@@ -753,13 +781,16 @@ export interface ServiceFormParams {
 	professionalList: any,
 	productObject?: any,
 	professionalListState?: any,
-	isCartProduct?: any
+	isCartProduct?: any,
+	actionStatus?: any,
+	handleCreateGuestUser?: any
 }
 
 export interface ProfessionalFilterParams {
 	professionals?: any,
 	professionalSelected?: any,
-	handleChangeProfessionalSelected: any
+	handleChangeProfessionalSelected: any,
+	handleUpdateProfessionals?: any
 }
 
 export interface ProfessionalProfileParams {
@@ -776,7 +807,8 @@ export interface OrderItAgainParams {
 	currentCart: any,
 	handleUpdateProducts: any,
 	navigation: any,
-	searchValue?: string
+	searchValue?: string,
+	businessSingleId?: number | string
 }
 
 export interface PreviousProductsOrderedParams {