ordering-ui-react-native 0.17.44 → 0.17.45-release

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

@@ -49,6 +49,8 @@ const ProfileListUI = (props: ProfileParams) => {
 
 	const theme = useTheme();
 
+  const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
+
 	const langPickerStyle = StyleSheet.create({
 		inputAndroid: {
 			color: theme.colors.textNormal,
@@ -89,8 +91,7 @@ const ProfileListUI = (props: ProfileParams) => {
 			marginEnd: 14
 		},
 		pagePadding: {
-			paddingLeft: 40,
-			paddingRight: 40
+			paddingHorizontal: isChewLayout ? 20 : 40
 		},
 		messageIconStyle: {
 			fontSize: 18,
@@ -163,10 +164,7 @@ const ProfileListUI = (props: ProfileParams) => {
 	}, [removeAccountState])
 
 	return (
-		<View style={{ flex: 1, height: height - top - bottom - 62, paddingTop: 20 }}>
-			{/* <OText size={24} style={{ marginTop: 15, paddingHorizontal: 40 }}>
-				{t('PROFILE', 'Profile')}
-			</OText> */}
+		<View style={{ flex: 1, height: height - top - bottom, paddingTop: 20 }}>
 			<CenterView style={styles.pagePadding}>
 				{user?.photo && (
 					<View style={styles.photo}>
@@ -183,7 +181,7 @@ const ProfileListUI = (props: ProfileParams) => {
 				<View style={{ flexBasis: '70%' }}>
 					<OText size={20} lineHeight={30} weight={Platform.OS === 'ios' ? '500' : 'bold'} color={theme.colors.textNormal}>{user?.name} {user?.lastname}</OText>
 					<TouchableOpacity onPress={() => navigation.navigate('ProfileForm', { ...detailProps })}>
-						<OText size={12} lineHeight={18} color={theme.colors.textSecondary} style={{ textDecorationLine: 'underline' }}>{t('VIEW_ACCOUNT', 'View account')}</OText>
+						<OText size={12} lineHeight={18} color={theme.colors.primary} style={{ textDecorationLine: 'underline' }}>{t('VIEW_ACCOUNT', 'View account')}</OText>
 					</TouchableOpacity>
 				</View>
 			</CenterView>

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

@@ -16,9 +16,8 @@ import { ProfileParams } from '../../types';
 import { UserFormDetailsUI } from '../UserFormDetails';
 
 import { OIcon, OIconButton, OModal } from '../shared';
-import { CenterView } from './styles';
+import { CenterView, Container } from './styles';
 import NavBar from '../NavBar';
-import { Container } from '../../layouts/Container';
 import { VerifyPhone } from '../VerifyPhone'
 import Ionicons from 'react-native-vector-icons/Ionicons'
 import FastImage from 'react-native-fast-image'
@@ -51,11 +50,6 @@ const ProfileUI = (props: ProfileParams) => {
 			shadowOpacity: 0.2,
 			backgroundColor: theme.colors.white,
 		},
-		pagePadding: {
-			paddingLeft: 40,
-			paddingRight: 40,
-			justifyContent: 'center',
-		},
 		navBarStyle: {
 			paddingLeft: 40,
 			paddingRight: 40,
@@ -284,17 +278,22 @@ const ProfileUI = (props: ProfileParams) => {
 
 	return (
 		<>
-			<NavBar
-				title={t('ACCOUNT', 'Account')}
-				titleAlign={'center'}
-				onActionLeft={() => navigation.goBack()}
-				showCall={false}
-				style={{ paddingHorizontal: 40, paddingVertical: Platform.OS === 'ios' ? 0 : 30 }}
-			/>
-			<KeyboardAvoidingView behavior={Platform.OS == 'ios' ? 'padding' : 'height'} enabled style={{ flex: 1, flexDirection: 'column', justifyContent: 'center' }}>
-				<Container noPadding>
-
-					<CenterView style={styles.pagePadding}>
+			<Container
+				pdng={Platform.OS === 'ios' ? '20px' : '10px'}
+			>
+				<NavBar
+					title={t('ACCOUNT', 'Account')}
+					titleAlign={'center'}
+					onActionLeft={() => navigation.goBack()}
+					showCall={false}
+					btnStyle={{ paddingLeft: 0 }}
+				/>
+				<KeyboardAvoidingView
+					behavior={Platform.OS == 'ios' ? 'padding' : 'height'}
+					enabled={Platform.OS === 'ios' ? true : false}
+					style={{ flex: 1, flexDirection: 'column', justifyContent: 'center' }}
+				>
+					<CenterView>
 						<View style={styles.photo}>
 							{user?.photo ? (
 								<FastImage
@@ -317,17 +316,15 @@ const ProfileUI = (props: ProfileParams) => {
 							onClick={() => handleImagePicker()}
 						/>
 					</CenterView>
-					<View style={{ height: 8, marginLeft: -40, marginRight: -40, backgroundColor: theme.colors.backgroundGray100, marginVertical: 32, zIndex: 10 }} />
+					<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginVertical: 32, zIndex: 10 }} />
 					<Spinner visible={formState?.loading || verifyPhoneState?.loading} />
-					<View style={styles.pagePadding}>
-						<UserFormDetailsUI
-							{...props}
-							isEdit
-							setWillVerifyOtpState={setWillVerifyOtpState}
-						/>
-					</View>
-				</Container>
-			</KeyboardAvoidingView>
+					<UserFormDetailsUI
+						{...props}
+						isEdit
+						setWillVerifyOtpState={setWillVerifyOtpState}
+					/>
+				</KeyboardAvoidingView>
+			</Container>
 			<OModal
 				open={isModalVisible}
 				onClose={() => setIsModalVisible(false)}

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

@@ -9,6 +9,13 @@ export const UserData = styled.View`
   text-align: center;
 `
 
+export const Container = styled.ScrollView`
+    position: relative;
+    flex: 1;
+	  padding-top: ${(props: any) => props.pdng};
+    margin-bottom: 40px;
+`
+
 export const Names = styled.View`
   flex-direction: row;
 `

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

@@ -54,7 +54,7 @@ export const WalletTransactionItem = (props: any) => {
           <OText>{item?.description}</OText>
         </DescriptionBlock>
       )}
-      {!!item?.code && (
+      {/* {!!item?.code && (
         <DescriptionBlock>
           <OText weight={'bold'}>
             {t('CODE', 'Code')}
@@ -63,7 +63,7 @@ export const WalletTransactionItem = (props: any) => {
             </OText>
           </OText>
         </DescriptionBlock>
-      )}
+      )} */}
     </Container>
   )
 }

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

@@ -1,8 +1,9 @@
 import React, { useState, useEffect } from 'react'
-import { Pressable, StyleSheet, View, ScrollView, TouchableOpacity } from 'react-native';
+import { Pressable, StyleSheet, View, ScrollView, TouchableOpacity, Platform } from 'react-native';
 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 === 'chew'
+  const hideWalletsTheme = theme?.bar_menu?.components?.wallets?.hidden
 
   const isWalletEnabled = configs?.cash_wallet?.value && configs?.wallet_enabled?.value === '1' && (isWalletCashEnabled || isWalletPointsEnabled)
 
@@ -109,20 +120,41 @@ const WalletsUI = (props: any) => {
 
   return (
     <>
-      <Container>
+      <Container
+        pdng={Platform.OS === 'ios' ? '10px' : '0'}
+      >
         <Header>
-        <OText size={24}>{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 && (
+              <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 &&
@@ -146,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>
@@ -163,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={{
@@ -180,7 +212,7 @@ const WalletsUI = (props: any) => {
                           source={theme.images.dummies.loyaltyLevel}
                           resizeMode='contain'
                         />
-                      )} */}
+                      )}
                       <OText
                         size={22}
                         weight='bold'
@@ -206,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}
@@ -259,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%;
@@ -34,10 +33,12 @@ export const OTabs = styled.View`
   flex-direction: row;
   width: 100%;
   flex-wrap: wrap;
+  padding-vertical: 5px;
 `;
 
 export const OTab = styled.View`
   padding-horizontal: 10px;
+  padding-vertical: 10px;
 `;
 
 export const LoyaltyContent = styled.View`

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

@@ -1,16 +1,21 @@
 import React from 'react';
 import { Platform } from 'react-native';
 import OText from './OText';
+import { useTheme } from 'styled-components/native'
 
 const HeaderTitle = (props: any) => {
   const { text, style } = props
+	const theme = useTheme();
+
   return (
     <OText
-      size={24}
+      size={20}
+      weight={Platform.OS === 'ios' ? '600' : 'bold'}
       style={style ?? {
         marginTop: Platform.OS === 'android' ? 50 : 30,
-        paddingHorizontal: 40,
-        textTransform: 'capitalize'
+        paddingHorizontal: props.ph ?? 40,
+        textTransform: 'capitalize',
+        color: props.titleColor || theme.colors.textNormal,
       }}
     >
       {text}

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

@@ -3,6 +3,7 @@ import { ImageSourcePropType, ImageStyle, ViewStyle, TextInputProps, TextStyle }
 import styled from 'styled-components/native';
 import OIcon from './OIcon';
 import MaterialIcon from 'react-native-vector-icons/MaterialIcons'
+import { useTheme } from 'styled-components/native';
 
 const Input = styled.TextInput`
   flex-grow: 1;
@@ -39,6 +40,7 @@ interface Props extends TextInputProps {
 	inputStyle?: TextStyle;
 	wrapperRef?: any;
 	onPress?: any;
+	isFocusHighlight?: boolean
 }
 
 const Wrapper = styled.Pressable`
@@ -54,12 +56,16 @@ const Wrapper = styled.Pressable`
 `;
 
 const OInput = (props: Props): React.ReactElement => {
+	const theme = useTheme();
+	const [inputFocused, setInputFocused] = React.useState(false)
 	return (
 		<Wrapper
 			onPress={() => { props.forwardRef?.current?.focus?.(); props.onPress && props.onPress() }}
 			style={{
 				backgroundColor: props.bgColor,
-				borderColor: props.borderColor,
+				borderColor: !props.isFocusHighlight
+					? props.borderColor
+					: inputFocused ? theme.colors.primary : theme.colors.border,
 				...props.style,
 			}}>
 			{props.icon ? (
@@ -94,7 +100,14 @@ 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)}
 			/>
 			{props.iconRight && (
 				<OIcon
@@ -114,6 +127,7 @@ OInput.defaultProps = {
 	iconColor: '#959595',
 	bgColor: 'white',
 	borderColor: 'white',
+	isFocusHighlight: false
 };
 
 export default OInput;

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/layouts/Container.tsx

@@ -18,7 +18,7 @@ export const Container = (props: any) => {
     <View
       style={{
         flex: 1,
-        paddingTop: insets.top,
+        paddingTop: props.pt ?? insets.top,
         backgroundColor: theme.colors.backgroundPage
       }}
     >