ordering-ui-react-native 0.16.94 → 0.16.96

package/package.json

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

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

@@ -599,8 +599,9 @@ const AddressFormUI = (props: AddressFormParams) => {
 								/>
 
 								{(
-									(!isEditing && !formState.changes?.address) ||
-									(isEditing && !formState.changes?.address && formState.changes?.address !== undefined)) &&
+									(!isEditing && !isGuestUser && !formState.changes?.address) ||
+									(isEditing && !isGuestUser && !formState.changes?.address && formState.changes?.address !== undefined)) ||
+									(isGuestUser && !formState.changes?.address && formState.changes?.address !== undefined) &&
 								(
 										<View style={styles.pinIcon}>
 											<GPSButton

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

@@ -73,8 +73,6 @@ export const BusinessesListing = (props: any) => {
     )
   }
 
-
-
   useEffect(() => {
     (checkNotificationStatus?.checked && auth) && _getLastOrderHasNoReview()
   }, [checkNotificationStatus, auth])
@@ -82,7 +80,7 @@ export const BusinessesListing = (props: any) => {
   return (
     <>
       {((layout === 'original') || logosLayout) && <OriginalBusinessListing {...props} />}
-      {(layout === 'appointment') && !logosLayout && <AppointmentBusinessListing {...props} />}
+      {(layout === 'appointments') && !logosLayout && <AppointmentBusinessListing {...props} />}
 
       {lastOrderReview?.isReviewOpen && (
         <OBottomPopup

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

@@ -1,4 +1,16 @@
-import React, { useEffect, useRef, useCallback } from 'react';
+import React, { useEffect, useRef, useState, useCallback } from 'react';
+import {
+  View,
+  Keyboard,
+  TextInput,
+  TouchableOpacity,
+  StyleSheet,
+  Dimensions,
+  I18nManager,
+  SafeAreaView,
+  Platform,
+  Button
+} from 'react-native';
 import {
 	ProductForm as ProductOptions,
 	useSession,
@@ -15,17 +27,10 @@ import Swiper from 'react-native-swiper'
 import FastImage from 'react-native-fast-image';
 import IconAntDesign from 'react-native-vector-icons/AntDesign';
 import YoutubePlayer from "react-native-youtube-iframe"
-import { Keyboard, TextInput } from 'react-native'
-import {
-	Grayscale
-} from 'react-native-color-matrix-image-filters'
-
-import { View, TouchableOpacity, StyleSheet, Dimensions, I18nManager, SafeAreaView, Platform, Button } from 'react-native';
 
 import {
 	WrapHeader,
 	TopHeader,
-	WrapContent,
 	ProductTitle,
 	ProductDescription,
 	ProductEditions,
@@ -45,8 +50,6 @@ import { ScrollView } from 'react-native-gesture-handler';
 import { ProductOptionSubOption } from '../ProductOptionSubOption';
 import { NotFoundSource } from '../NotFoundSource';
 import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder';
-import { useState } from 'react';
-const windowHeight = Dimensions.get('window').height;
 const windowWidth = Dimensions.get('window').width;
 
 export const ProductOptionsUI = (props: any) => {
@@ -183,7 +186,6 @@ export const ProductOptionsUI = (props: any) => {
 	const [headerRefHeight, setHeaderRefHeight] = useState(0)
 	const [summaryRefHeight, setSummaryRefHeight] = useState(0)
 	const [isScrollAvailable, setIsScrollAvailable] = useState(null)
-	const [isKeyboardShow, setIsKeyboardShow] = useState(false)
 
 	const isError = (id: number) => {
 		let bgColor = theme.colors.white;
@@ -457,14 +459,10 @@ export const ProductOptionsUI = (props: any) => {
 
 	useEffect(() => {
     const keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', () => {
-      setIsKeyboardShow(true)
-    })
-    const keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', () => {
-      setIsKeyboardShow(false)
+			scrollViewRef.current.scrollToEnd({ animated: true })
     })
     return () => {
       keyboardDidShowListener.remove()
-      keyboardDidHideListener.remove()
     }
   }, [])
 
@@ -481,7 +479,8 @@ export const ProductOptionsUI = (props: any) => {
 					ref={scrollViewRef}
 					contentContainerStyle={{ paddingBottom: 80 }}
 					stickyHeaderIndices={[2]}
-					onScroll={handleScroll}>
+					onScroll={handleScroll}
+				>
 					<WrapHeader onLayout={(event: any) => setHeaderRefHeight(event.nativeEvent.layout?.height)}>
 						{loading && !product ? (
 							<View style={styles.productHeaderSkeleton}>
@@ -962,7 +961,7 @@ export const ProductOptionsUI = (props: any) => {
 								</>
 							)}
 							{!product?.hide_special_instructions && (
-								<ProductComment pb={isKeyboardShow && Platform.OS === 'ios' && 320}>
+								<ProductComment>
 									<SectionTitle>
 										<OText size={16} weight={'600'} lineHeight={24}>
 											{t('SPECIAL_COMMENT', 'Special comment')}