ordering-ui-react-native 0.16.52 → 0.16.53-release

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

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import { Pressable, StyleSheet, View } from 'react-native';
+import { Pressable, StyleSheet, View, ScrollView, TouchableOpacity } from 'react-native';
 import { useTheme } from 'styled-components/native'
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
 import FastImage from 'react-native-fast-image'
@@ -9,23 +9,24 @@ import {
   useUtils,
   useConfig
 } from 'ordering-components/native'
+import AntDesignIcon from 'react-native-vector-icons/AntDesign'
 
 import {
   Container,
+  Header,
   BalanceElement,
-  TransactionsWrapper,
   OTabs,
   OTab,
   SectionContent,
   LoyaltyContent,
   LoyaltyWrapp,
-  LoyaltyImg
+  LoyaltyImg,
+  WalletTransactionsWrapper
 } from './styles'
 
-import NavBar from '../NavBar'
-import { OText } from '../shared';
+import { OButton, OIcon, OText, OModal } from '../shared';
 import { NotFoundSource } from '../NotFoundSource';
-import { WalletTransactionItem } from '../WalletTransactionItem'
+import { WalletTransactions } from '../WalletTransactions'
 
 const WalletsUI = (props: any) => {
   const {
@@ -60,6 +61,8 @@ const WalletsUI = (props: any) => {
   });
 
   const [tabSelected, setTabSelected] = useState(isWalletCashEnabled ? 'cash' : 'credit_point')
+  const [openHistory, setOpenHistory] = useState(false)
+  const isChewLayout = theme?.header?.components?.layout?.type === 'chew'
 
   const isWalletEnabled = configs?.cash_wallet?.value && configs?.wallet_enabled?.value === '1' && (isWalletCashEnabled || isWalletPointsEnabled)
 
@@ -74,7 +77,7 @@ const WalletsUI = (props: any) => {
       isActive: isWalletCashEnabled
     },
     credit_point: {
-      name: t('CREDITS_POINTS_WALLET', 'Credit Points Wallet'),
+      name: t('POINTS_WALLET', 'Points Wallet'),
       value: 1,
       isActive: isWalletPointsEnabled
     }
@@ -98,180 +101,189 @@ const WalletsUI = (props: any) => {
   }, [configs])
 
   useEffect(() => {
-    if(refreshWallets){
+    if (refreshWallets) {
       getWallets()
       setRefreshWallets && setRefreshWallets(false)
     }
   }, [refreshWallets])
 
   return (
-    <Container>
-      <NavBar
-        title={t('WALLETS', 'Wallets')}
-        titleAlign={'center'}
-        onActionLeft={goToBack}
-        showCall={false}
-        paddingTop={10}
-        btnStyle={{ paddingLeft: 0 }}
-      />
+    <>
+      <Container>
+        <Header>
+        <OText size={24} style={{ marginTop: 30 }}>{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 }}
+            />
+          )}
+        </Header>
 
-      {!walletList.loading &&
-        !userLoyaltyLevel.loading &&
-        !walletList.error &&
-        walletList.wallets?.length > 0 &&
-      (
-        <>
-          <OTabs
-            horizontal
-            showsHorizontalScrollIndicator={false}
-          >
-            {walletList.wallets?.map((wallet: any) => walletName[wallet.type]?.isActive && (
-              <Pressable
-                key={wallet.id}
-                onPress={() => handleChangeTab(wallet)}
+        {!walletList.loading &&
+          !userLoyaltyLevel.loading &&
+          !walletList.error &&
+          walletList.wallets?.length > 0 &&
+          (
+            <>
+              <OTabs
+                horizontal
+                showsHorizontalScrollIndicator={false}
               >
-                <OTab isSelected={tabSelected === wallet.type}>
-                  <OText size={18}>
-                    {walletName[wallet.type]?.name}
-                  </OText>
-                </OTab>
-              </Pressable>
-            ))}
-          </OTabs>
+                {walletList.wallets?.map((wallet: any) => walletName[wallet.type]?.isActive && (
+                  <TouchableOpacity
+                    key={wallet.id}
+                    onPress={() => handleChangeTab(wallet)}
+                  >
+                    <OTab
+                      isSelected={tabSelected === wallet.type}
+                      style={{
+                        borderBottomWidth: 1,
+                        borderBottomColor:
+                          tabSelected === wallet.type
+                          ? theme.colors.textNormal
+                          : theme.colors.border
+                      }}
+                    >
+                      <OText>
+                        {walletName[wallet.type]?.name}
+                      </OText>
+                    </OTab>
+                  </TouchableOpacity>
+                ))}
+              </OTabs>
 
-          <SectionContent>
-            {!!loyaltyLevel && tabSelected === 'credit_point' && (
-              <LoyaltyContent>
-                <LoyaltyWrapp>
-                  <OText size={20}>
-                    {`${t('LOYALTY_LEVEL_TITLE', 'Your level is')}:`}
+              <SectionContent>
+                {!!loyaltyLevel && tabSelected === 'credit_point' && (
+                  <LoyaltyContent>
+                    <LoyaltyWrapp>
+                      <OText size={20}>
+                        {`${t('LOYALTY_LEVEL_TITLE', 'Your level is')}:`}
+                      </OText>
+                      {/* {loyaltyLevel.image ? (
+                        <FastImage
+                          style={styles.logoStyle}
+                          source={{
+                            uri: loyaltyLevel.image,
+                            priority: FastImage.priority.high,
+                            cache: FastImage.cacheControl.web
+                          }}
+                          resizeMode={FastImage.resizeMode.contain}
+                        />
+                      ) : (
+                        <LoyaltyImg
+                          source={theme.images.dummies.loyaltyLevel}
+                          resizeMode='contain'
+                        />
+                      )} */}
+                      <OText
+                        size={22}
+                        weight='bold'
+                        style={{ textTransform: 'uppercase' }}
+                        color={theme.colors.primary}
+                      >
+                        {loyaltyLevel.name}
+                      </OText>
+                    </LoyaltyWrapp>
+                  </LoyaltyContent>
+                )}
+                <BalanceElement>
+                  <OText size={20} style={{ fontWeight: '600' }}>
+                    {currentWalletSelected?.type === 'cash'
+                      ? parsePrice(currentWalletSelected?.balance)
+                      : currentWalletSelected?.balance
+                    }
                   </OText>
-                  {loyaltyLevel.image ? (
-                    <FastImage
-                      style={styles.logoStyle}
-                      source={{
-                        uri: loyaltyLevel.image,
-                        priority: FastImage.priority.high,
-                        cache:FastImage.cacheControl.web
-                      }}
-                      resizeMode={FastImage.resizeMode.contain}
-                    />
-                  ) : (
-                    <LoyaltyImg
-                      source={theme.images.dummies.loyaltyLevel}
-                      resizeMode='contain'
-                    />
-                  )}
-                  <OText
-                    size={22}
-                    weight='bold'
-                    style={{ textTransform: 'uppercase' }}
-                    color={theme.colors.primary}
-                  >
-                    {loyaltyLevel.name}
+                  <OText style={{ paddingLeft: 5 }}>
+                    {currentWalletSelected?.type === 'cash'
+                      ? configs?.stripe_currency?.value
+                      : t('POINTS', 'Points')}
                   </OText>
-                </LoyaltyWrapp>
-              </LoyaltyContent>
-            )}
-            <BalanceElement>
-              <OText size={20} style={{fontWeight: '600'}}>
-                {currentWalletSelected?.type === 'cash'
-                  ? parsePrice(currentWalletSelected?.balance)
-                  : currentWalletSelected?.balance
-                }
-              </OText>
-              <OText style={{ paddingLeft: 5 }}>
-                {currentWalletSelected?.type === 'cash'
-                  ? configs?.stripe_currency?.value
-                  : t('POINTS', 'Points')}
-              </OText>
-            </BalanceElement>
+                </BalanceElement>
 
-            <View style={{ marginTop: 20, width: '100%', paddingHorizontal: 1, paddingBottom: 40 }}>
-              {!transactionsList?.loading &&
-                !transactionsList?.error &&
-                transactionsList.list?.[`wallet:${currentWalletSelected?.id}`]?.length > 0 &&
-              (
-                <>
-                  <OText style={{fontSize: 20}}>
-                    {t('TRANSACTIONS_HISTORY', 'Transactions history')}
-                  </OText>
-                  <TransactionsWrapper>
-                    {transactionsList.list?.[`wallet:${currentWalletSelected?.id}`]?.map((transaction: any, i: number) =>(
-                      <WalletTransactionItem
-                        idx={i}
-                        type={currentWalletSelected?.type}
-                        key={transaction.id}
-                        item={transaction}
-                        withFormatPrice={currentWalletSelected?.type === 'cash'}
-                      />
-                    ))}
-                  </TransactionsWrapper>
-                </>
-              )}
+                {!isChewLayout && (
+                  <WalletTransactions
+                    transactionsList={transactionsList}
+                    currentWalletSelected={currentWalletSelected}
+                  />
+                )}
+              </SectionContent>
+            </>
+          )}
 
-              {(transactionsList?.loading || !transactionsList.list?.[`wallet:${currentWalletSelected?.id}`]) && (
-                <View>
-                  {[...Array(4).keys()].map(i => (
-                    <View style={{ marginBottom: 10 }} key={i}>
-                      <Placeholder Animation={Fade}>
-                        <PlaceholderLine width={100} height={100} style={{ marginBottom: 0, borderRadius: 8 }} />
-                      </Placeholder>
-                    </View>
-                  ))}
+        {(walletList?.loading || userLoyaltyLevel.loading) && (
+          <>
+            <View>
+              <Placeholder Animation={Fade}>
+                <PlaceholderLine width={100} height={40} style={{ marginBottom: 0 }} />
+              </Placeholder>
+            </View>
+            <View style={{ marginTop: 10, marginBottom: 20 }}>
+              <Placeholder Animation={Fade}>
+                <PlaceholderLine width={100} height={40} style={{ marginBottom: 0 }} />
+              </Placeholder>
+            </View>
+            <View>
+              {[...Array(4).keys()].map(i => (
+                <View style={{ marginBottom: 10 }} key={i}>
+                  <Placeholder Animation={Fade}>
+                    <PlaceholderLine width={100} height={60} style={{ marginBottom: 0 }} />
+                  </Placeholder>
                 </View>
-              )}
-
-              {!transactionsList?.loading &&
-                !(transactionsList?.loading && transactionsList.list?.[`wallet:${currentWalletSelected?.id}`]) &&
-                (transactionsList?.error ||
-                  !transactionsList.list?.[`wallet:${currentWalletSelected?.id}`]?.length) &&
-              (
-                <NotFoundSource
-                  content={transactionsList?.error
-                    ? t('ERROR_NOT_FOUND_TRANSACTIONS', 'Sorry, an error has occurred')
-                    : t('NOT_FOUND_TRANSACTIONS', 'No transactions to show at this time.')
-                  }
-                />
-              )}
+              ))}
             </View>
-          </SectionContent>
-        </>
-      )}
+          </>
+        )}
 
-      {(walletList?.loading || userLoyaltyLevel.loading) && (
-        <>
-          <View>
-            <Placeholder Animation={Fade}>
-              <PlaceholderLine width={100} height={40} style={{ marginBottom: 0 }} />
-            </Placeholder>
-          </View>
-          <View style={{ marginTop: 10, marginBottom: 20 }}>
-            <Placeholder Animation={Fade}>
-              <PlaceholderLine width={100} height={40} style={{ marginBottom: 0 }} />
-            </Placeholder>
-          </View>
-          <View>
-            {[...Array(4).keys()].map(i => (
-              <View style={{ marginBottom: 10 }} key={i}>
-                <Placeholder Animation={Fade}>
-                  <PlaceholderLine width={100} height={60} style={{ marginBottom: 0 }} />
-                </Placeholder>
-              </View>
-            ))}
-          </View>
-        </>
-      )}
+        {!walletList?.loading && !userLoyaltyLevel.loading && (walletList?.error || !walletList?.wallets?.length) && (
+          <NotFoundSource
+            content={walletList?.error
+              ? t('ERROR_NOT_FOUND_WALLETS', 'Sorry, an error has occurred')
+              : t('NOT_FOUND_WALLETS', 'No wallets to show at this time.')
+            }
+          />
+        )}
+      </Container>
 
-      {!walletList?.loading && !userLoyaltyLevel.loading && (walletList?.error || !walletList?.wallets?.length) && (
-        <NotFoundSource
-          content={walletList?.error
-            ? t('ERROR_NOT_FOUND_WALLETS', 'Sorry, an error has occurred')
-            : t('NOT_FOUND_WALLETS', 'No wallets to show at this time.')
-          }
-        />
-      )}
-    </Container>
+      <OModal
+        open={openHistory}
+        onClose={() => setOpenHistory(false)}
+        entireModal
+        customClose
+      >
+        <ScrollView>
+          <WalletTransactionsWrapper>
+            <OButton
+              imgRightSrc={null}
+              style={{
+                borderWidth: 0,
+                backgroundColor: theme.colors.white,
+                padding: 0,
+                paddingHorizontal: 0,
+                width: 30,
+                paddingLeft: 0,
+                paddingRight: 0
+              }}
+              onClick={() => setOpenHistory(false)}
+              icon={AntDesignIcon}
+              iconProps={{
+                name: 'arrowleft',
+                size: 26
+              }}
+            />
+            <WalletTransactions
+              transactionsList={transactionsList}
+              currentWalletSelected={currentWalletSelected}
+            />
+          </WalletTransactionsWrapper>
+        </ScrollView>
+      </OModal>
+    </>
   )
 }
 

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

@@ -4,7 +4,11 @@ export const Container = styled.View`
   display: flex;
   flex-direction: column;
 `
-
+export const Header = styled.View`
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+`
 export const SectionContent = styled.View`
   width: 100%;
   display: flex;
@@ -14,13 +18,6 @@ export const SectionContent = styled.View`
   margin-top: 20px;
 `
 
-export const TransactionsWrapper = styled.View`
-  display: flex;
-  flex-direction: column;
-  border-left-width: 2px;
-  border-left-color: ${(props: any) => props.theme.colors.disabled};
-`
-
 export const BalanceElement = styled.View`
   width: 100%;
   padding: 10px 0;
@@ -30,16 +27,19 @@ export const BalanceElement = styled.View`
   align-items: center;
   background-color: ${(props: any) => props.theme.colors.backgroundGray100};
   border-radius: 8px;
+  margin-bottom: 20px;
 `
 
 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`
@@ -62,3 +62,7 @@ export const LoyaltyImg = styled.ImageBackground`
   justify-content: center;
   align-items: center;
 `
+export const WalletTransactionsWrapper = styled.View`
+  padding-horizontal: 40px;
+  padding-top: 20px;
+`

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

@@ -0,0 +1,47 @@
+import React, { useState } from 'react'
+import { StyleSheet, ViewStyle } from 'react-native'
+import styled from 'styled-components/native'
+
+const CardContainerTouchable = styled.TouchableOpacity``
+
+interface Props {
+    children: React.ReactChildren | Element,
+    style?: Array<ViewStyle> | any,
+    onClick: any
+}
+
+export const CardAnimation = (props: Props) => {
+    const {
+        children,
+        onClick,
+        style
+    } = props
+    const [isPressed, setIsPressed] = useState(false)
+    const styles = StyleSheet.create({
+        cardAnimation: {
+            elevation: isPressed ? 2 : 0,
+            shadowColor: '#888',
+            shadowOffset: { width: 0, height: 0 },
+            shadowRadius: 0,
+            shadowOpacity: isPressed ? 0.8 : 0,
+            borderRadius: 12,
+        }
+    })
+
+    const styleProvided = style || []
+    return (
+        <CardContainerTouchable
+            onPress={onClick}
+            activeOpacity={0.8}
+            delayPressIn={20}
+            onPressIn={() => setIsPressed(true)}
+            onPressOut={() => setIsPressed(false)}
+            style={[
+                ...styleProvided,
+                styles.cardAnimation
+            ]}
+        >
+            {children}
+        </CardContainerTouchable>
+    )
+}

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/OBottomPopup.tsx

@@ -6,6 +6,7 @@ const deviceHeight = Dimensions.get('window').height
 
 interface Props {
 	open: boolean;
+	transparent?: boolean;
 	title?: string;
 	children?: any;
 	onClose?: any;
@@ -13,26 +14,30 @@ interface Props {
 	bottomContainerStyle?: any;
 	titleStyle?: any;
 	closeIcon?: any;
+	presentationStyle?: "fullScreen" | "pageSheet" | "formSheet" | "overFullScreen" | undefined
 }
 const OBottomPopup = (props: Props) => {
 	const {
 		open,
+		transparent,
 		title,
 		onClose,
 		children,
 		isStatusBar,
 		titleStyle,
 		bottomContainerStyle,
-		closeIcon
+		closeIcon,
+		presentationStyle
 	} = props
 	const { top, bottom } = useSafeAreaInsets();
+	
 	return (
 		<Modal
-			animationType='slide'
-			transparent={false}
+			animationType='fade'
+			transparent={transparent}
 			visible={open}
 			onRequestClose={() => onClose()}
-			presentationStyle={'fullScreen'}
+			presentationStyle={presentationStyle || 'fullScreen'}
 		>
 			{isStatusBar && <StatusBar translucent={false} />}
 			<View style={styles.container}>
@@ -44,19 +49,22 @@ const OBottomPopup = (props: Props) => {
 				</TouchableWithoutFeedback>
 				<View style={{ ...styles.bottomContainer, ...bottomContainerStyle }}>
 					<View style={{ paddingTop: top, paddingBottom: bottom }}>
-						{closeIcon && (
-							<TouchableOpacity onPress={onClose} style={styles.closeIconStyle}>
-								<OIcon
-									src={closeIcon}
-									width={30}
-								/>
-							</TouchableOpacity>
-						)}
-						{!!title && (
-							<Text style={{ ...styles.titleStyle, ...titleStyle }}>
-								{title}
-							</Text>
-						)}
+						<View style={styles.modalTitleStyle}>
+							{closeIcon && (
+								<TouchableOpacity onPress={() => onClose()} style={styles.closeIconStyle}>
+									<OIcon
+										src={closeIcon}
+										width={20}
+										height={20}
+									/>
+								</TouchableOpacity>
+							)}
+							{!!title && (
+								<Text style={{ ...styles.titleStyle, ...titleStyle }}>
+									{title}
+								</Text>
+							)}
+						</View>
 						{children}
 					</View>
 				</View>
@@ -69,7 +77,7 @@ const styles = StyleSheet.create({
 	container: {
 		flex: 1,
 		backgroundColor: '#000000AA',
-		justifyContent: 'flex-end',
+		justifyContent: 'flex-end'
 	},
 	touchableOutsideStyle: {
 		flex: 1,
@@ -83,12 +91,18 @@ const styles = StyleSheet.create({
 	},
 	titleStyle: {
 		fontSize: 20,
-		fontWeight: 'bold',
-		marginVertical: 10
+		fontWeight: 'bold'
 	},
 	closeIconStyle: {
-		paddingTop: 20,
-		paddingLeft: 20
+		position: 'absolute',
+		left: 25,
+		top: 25,
+		zIndex: 100
+	},
+	modalTitleStyle: {
+		position: 'relative',
+		paddingHorizontal: 10,
+		paddingVertical: 20
 	}
 })
 

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

@@ -78,6 +78,9 @@ interface Props {
 	borderColor?: string;
 	loadingStyle?: ViewStyle;
 	showNextIcon?: boolean;
+	isDisabledWithSameStyles?: boolean;
+	icon?: any;
+	iconProps?: any
 }
 
 const OButton = (props: Props): React.ReactElement => {
@@ -110,8 +113,12 @@ const OButton = (props: Props): React.ReactElement => {
 			activeOpacity={props.activeOpacity}
 			onPress={props.onClick}
 			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}>
+				{props.icon ? (
+					<props.icon {...props.iconProps} />
+				) : null}
 				{props.imgLeftSrc ? (
 					<OIcon style={props.imgLeftStyle} src={props.imgLeftSrc} />
 				) : null}
@@ -120,9 +127,9 @@ const OButton = (props: Props): React.ReactElement => {
 				) : null}
 				{props.imgRightSrc ? (
 					<EndImage style={props.imgRightStyle} source={props.imgRightSrc} />
-				) : props.showNextIcon ? 
-					<EndImage source={theme.images.general.arrow_left} 
-					style={{width: 16, tintColor: 'white', transform: [{rotate: I18nManager.isRTL ? '0deg' : '180deg'}]}} /> : null }
+				) : props.showNextIcon ?
+					<EndImage source={theme.images.general.arrow_left}
+						style={{ width: 16, tintColor: 'white', transform: [{ rotate: I18nManager.isRTL ? '0deg' : '180deg' }] }} /> : null}
 			</StyledButton>
 		</TouchableOpacity>
 	);