ordering-ui-react-native 0.21.89 → 0.21.91

package/package.json

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

package/themes/business/src/components/OrderSummary/index.tsx

@@ -140,8 +140,10 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
         } </br>`
         : ''
       }
-         ${t('ZIPCODE', 'Zipcode')}: ${order?.customer.zipcode}
-         </p>  
+        ${order?.customer.zipcode ?
+        `${t('ZIPCODE', 'Zipcode')}: ${order?.customer.zipcode}`
+        : ''}
+         </p>
 
         <h1>${t('BUSINESS_DETAILS', 'Business details')}</h1>
         <p style="font-size: 27px"> 
@@ -241,15 +243,18 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
         : ''
       }
 
-        ${order?.summary?.delivery_price > 0
-        ? `<div style="font-size: 25px;"> ${t(
-          'DELIVERY_FEE',
-          'Delivery Fee',
-        )}
-              </div>`
-        : ''
-      }
+      ${order?.summary?.delivery_price > 0 ?
+        ` <div style="display: flex">
+          <div style="font-size: 26px; width: 70%; display: flex; justify-content: flex-start"> 
+            ${t('DELIVERY_FEE', 'Delivery Fee')}
+          </div>
+
+          <div style="font-size: 26px; width: 30%; display: flex; justify-content: flex-end">
+            ${parsePrice(order?.summary?.delivery_price ?? 0)}
+          </div>` :
+        ''}
 
+        </div>
         <div style="display: flex">
 
           <div style="font-size: 26px; width: 70%; display: flex; justify-content: flex-start"> 

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

@@ -1,27 +1,37 @@
 import React from 'react';
 import FastImage from 'react-native-fast-image'
-import { StyleSheet, TouchableOpacity, View } from 'react-native';
+import { StyleSheet, TouchableOpacity, useWindowDimensions } from 'react-native';
 import {
 	AddressDetails as AddressDetailsController,
 	useOrder,
 	useLanguage,
 } from 'ordering-components/native';
+import { useTheme } from 'styled-components/native';
 
 import { ADContainer, ADHeader, ADAddress, ADMap } from './styles';
-
-import { useTheme } from 'styled-components/native';
-import { OText, OIcon } from '../shared';
-import { useWindowDimensions } from 'react-native';
+import { OText } from '../shared';
+import { getTypesText } from '../../utils';
 
 const AddressDetailsUI = (props: any) => {
-	const { navigation, addressToShow, isCartPending, googleMapsUrl, apiKey } =
-		props;
+	const {
+		navigation,
+		addressToShow,
+		isCartPending,
+		googleMapsUrl,
+		apiKey
+	} = props;
 
 	const theme = useTheme();
 	const [orderState] = useOrder();
+	const [{ options }] = useOrder();
 	const [, t] = useLanguage();
 	const { width } = useWindowDimensions();
 
+	const orderTypeText = {
+		key: getTypesText(options?.type || 1),
+		value: t(getTypesText(options?.type || 1), 'Delivery')
+	}
+
 	const styles = StyleSheet.create({
 		productStyle: {
 			width,
@@ -39,7 +49,7 @@ const AddressDetailsUI = (props: any) => {
 						lineHeight={24}
 						color={theme.colors.textNormal}
 					>
-						{t('DELIVERY_ADDRESS', 'Delivery address')}
+						{t(`${orderTypeText.key}_ADDRESS`, `${orderTypeText.value} address`)}
 					</OText>
 				)}
 			</ADHeader>

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

@@ -318,7 +318,7 @@ const MultiCheckoutUI = (props: any) => {
           </TopHeader>
         </View>
       </SafeAreaView>
-      <Container pt={0} noPadding onScroll={handleScroll}>
+      <Container pt={0} noPadding onScroll={handleScroll} showsVerticalScrollIndicator={false}>
         <View style={styles.wrapperNavbar}>
           <NavBar
             hideArrowLeft