ordering-ui-react-native 0.11.37 → 0.11.41

package/themes/doordash/src/components/Messages/index.tsx

@@ -36,6 +36,9 @@ const MessagesUI = (props: MessagesParams) => {
   const [formattedMessages, setFormattedMessages] = useState<Array<any>>([])
   const [isKeyboardShow, setIsKeyboardShow] = useState(false)
 
+  const previousStatus = [1, 2, 5, 6, 10, 11, 12, 16, 17]
+  const chatDisabled = previousStatus.includes(order?.status)
+
   const onChangeMessage = (val: string) => {
     setMessage && setMessage(val)
   }
@@ -231,33 +234,49 @@ const MessagesUI = (props: MessagesParams) => {
   )
 
   const renderComposer = (props: any) => (
-    <View style={{ flexDirection: 'row', width: '80%' }}>
-      <Composer
-        {...props}
-        textInputStyle={{
-          backgroundColor: theme.colors.white,
-          borderRadius: 25,
-          paddingHorizontal: 10,
-          borderColor: '#DBDCDB',
-          borderWidth: 1,
-          color: '#010300',
-          textAlign: I18nManager.isRTL ? 'right' : 'left'
-        }}
-        textInputProps={{
-          value: message,
-          onSubmitEditing: onSubmit,
-          returnKeyType: message ? 'send' : 'done',
-          blurOnSubmit: true,
-          multiline: false,
-          numberOfLines: 1,
-          autoCorrect: false,
-          autoCompleteType: 'off',
-          enablesReturnKeyAutomatically: false
+    chatDisabled ? (
+      <View
+        style={{
+          width: '100%',
+          flexDirection: 'column',
+          alignItems: 'center'
         }}
-        placeholder={t('WRITE_MESSAGE', 'Write message...')}
-      />
-      <RenderActions {...props} />
-    </View>
+      >
+        <MaterialCommunityIcon
+          name='close-octagon-outline'
+          size={24}
+        />
+        <OText size={14}>{t('NOT_SEND_MESSAGES', 'You can\'t send messages because the order has ended')}</OText>
+      </View>
+    ) : (
+      <View style={{ flexDirection: 'row', width: '80%' }}>
+        <Composer
+          {...props}
+          textInputStyle={{
+            backgroundColor: theme.colors.white,
+            borderRadius: 25,
+            paddingHorizontal: 10,
+            borderColor: '#DBDCDB',
+            borderWidth: 1,
+            color: '#010300',
+            textAlign: I18nManager.isRTL ? 'right' : 'left'
+          }}
+          textInputProps={{
+            value: message,
+            onSubmitEditing: onSubmit,
+            returnKeyType: message ? 'send' : 'done',
+            blurOnSubmit: true,
+            multiline: false,
+            numberOfLines: 1,
+            autoCorrect: false,
+            autoCompleteType: 'off',
+            enablesReturnKeyAutomatically: false
+          }}
+          placeholder={t('WRITE_MESSAGE', 'Write message...')}
+        />
+        <RenderActions {...props} />
+      </View>
+    )
   )
 
   const renderSend = (props: any) => (

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

@@ -13,9 +13,9 @@ export const DTWrapperTips = styled.View`
   display: flex;
   flex-direction: row;
   width: 100%;
-  justify-content: space-between;
+  justify-content: space-evenly;
   align-items: center;
-  flex-wrap: wrap;
+  flex-wrap: nowrap;
 `
 
 export const DTCard = styled.View`
@@ -29,6 +29,7 @@ export const DTCard = styled.View`
   max-width: 48px;
   max-height: 48px;
   margin-right: 10px;
+  margin-left: 10px;
   margin-top: 10px;
 
   ${(props: any) => props.isActive && css`
@@ -47,7 +48,7 @@ export const DTForm = styled.View`
 export const DTLabel = styled.Text`
   font-size: 14px;
   align-self: flex-start;
-  color: ${(props: any) => props.theme.colors.textSecondary}
+  color: ${(props: any) => props.theme.colors.textSecondary};
   margin-top: 10px;
 
   ${(props: any) => props.theme?.rtl && css`

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

@@ -388,12 +388,23 @@ const LoginFormUI = (props: LoginParams) => {
 							textStyle={{ color: 'white' }}
 							imgRightSrc={null}
 							isLoading={formState.loading}
-							style={{ borderRadius: 7.6, marginTop: 10 }}
+							style={{ borderRadius: 7.6, marginTop: 10, marginBottom: 25 }}
 						/>
+						{onNavigationRedirect && registerButtonText && (
+							<View style={{ flex: 1, flexDirection: 'row', justifyContent: 'center'}}>
+								<OText size={14}>
+									{t('NEW_ON_PLATFORM', 'New on Ordering?')}
+								</OText>
+							<TouchableOpacity onPress={() => onNavigationRedirect('Signup')}>
+									<OText size={14} mLeft={5} color={theme.colors.skyBlue}>
+										{t('CREATE_ACCOUNT', 'Create account')}
+									</OText>
+								</TouchableOpacity>
+							</View>
+						)}
 					</FormInput>
 				)}
 
-
 				{useLoginByCellphone &&
 					loginTab === 'cellphone' &&
 					configs &&
@@ -429,7 +440,7 @@ const LoginFormUI = (props: LoginParams) => {
 						width: '100%',
 						justifyContent: 'space-between',
 						alignItems: 'center',
-						marginVertical: 30
+						marginVertical: 15
 					}}>
 					<View style={loginStyle.line} />
 					<OText

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

@@ -36,6 +36,8 @@ const MessagesUI = (props: MessagesParams) => {
 
 	const [formattedMessages, setFormattedMessages] = useState<Array<any>>([])
 	const [isKeyboardShow, setIsKeyboardShow] = useState(false)
+	const previousStatus = [1, 2, 5, 6, 10, 11, 12, 16, 17]
+  const chatDisabled = previousStatus.includes(order?.status)
 	const { height } = useWindowDimensions();
 	const { top, bottom } = useSafeAreaInsets();
 
@@ -236,36 +238,52 @@ const MessagesUI = (props: MessagesParams) => {
 	)
 
 	const renderComposer = (props: typeof ComposerProps) => (
-		<View style={{
-			flexDirection: 'row', width: '80%', alignItems: 'center', backgroundColor: theme.colors.backgroundGray100,
-			borderRadius: 7.6,
-		}}>
-			<Composer
-				{...props}
-				textInputStyle={{
-					height: 32,
-					minHeight: 32,
-					alignItems: 'center',
-					justifyContent: 'center',
-					paddingHorizontal: 12,
-					borderColor: '#DBDCDB',
-					color: '#010300',
-				}}
-				textInputProps={{
-					value: message,
-					onSubmitEditing: onSubmit,
-					returnKeyType: message ? 'send' : 'done',
-					blurOnSubmit: true,
-					multiline: false,
-					numberOfLines: 1,
-					autoCorrect: false,
-					autoCompleteType: 'off',
-					enablesReturnKeyAutomatically: false
-				}}
-				placeholder={t('WRITE_MESSAGE', 'Write message...')}
-			/>
-			<RenderActions {...props} />
-		</View>
+		chatDisabled ? (
+      <View
+        style={{
+          width: '100%',
+          flexDirection: 'column',
+          alignItems: 'center'
+        }}
+      >
+        <MaterialCommunityIcon
+          name='close-octagon-outline'
+          size={24}
+        />
+        <OText size={14}>{t('NOT_SEND_MESSAGES', 'You can\'t send messages because the order has ended')}</OText>
+      </View>
+    ) : (
+			<View style={{
+				flexDirection: 'row', width: '80%', alignItems: 'center', backgroundColor: theme.colors.backgroundGray100,
+				borderRadius: 7.6,
+			}}>
+				<Composer
+					{...props}
+					textInputStyle={{
+						height: 32,
+						minHeight: 32,
+						alignItems: 'center',
+						justifyContent: 'center',
+						paddingHorizontal: 12,
+						borderColor: '#DBDCDB',
+						color: '#010300',
+					}}
+					textInputProps={{
+						value: message,
+						onSubmitEditing: onSubmit,
+						returnKeyType: message ? 'send' : 'done',
+						blurOnSubmit: true,
+						multiline: false,
+						numberOfLines: 1,
+						autoCorrect: false,
+						autoCompleteType: 'off',
+						enablesReturnKeyAutomatically: false
+					}}
+					placeholder={t('WRITE_MESSAGE', 'Write message...')}
+				/>
+				<RenderActions {...props} />
+			</View>
+		)
 	)
 
 	const renderSend = (props: any) => (

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

@@ -165,29 +165,7 @@ export const ProductOptionsUI = (props: any) => {
 		Object.keys(errors).length > 0;
 
 	const ExtraOptions = ({ eID, options }: any) => (
-		<ExtraOptionWrap
-			horizontal
-			showsHorizontalScrollIndicator={false}
-			style={{ marginBottom: 20 }}
-			contentContainerStyle={{ paddingHorizontal: 33 }}>
 			<>
-				<TouchableOpacity
-					key={`eopt_all_0`}
-					onPress={() => setSelectedOpt(0)}
-					style={[
-						styles.extraItem,
-						{
-							borderBottomColor:
-								selOpt == 0 ? theme.colors.textNormal : theme.colors.border,
-						},
-					]}>
-					<OText
-						color={selOpt == 0 ? theme.colors.textNormal : theme.colors.textSecondary}
-						size={selOpt == 0 ? 14 : 12}
-						weight={selOpt == 0 ? '600' : 'normal'}>
-						{t('ALL', 'All')}
-					</OText>
-				</TouchableOpacity>
 				{product?.ingredients.length > 0 && (
 					<TouchableOpacity
 						key={`eopt_all_00`}
@@ -233,7 +211,6 @@ export const ProductOptionsUI = (props: any) => {
 					</React.Fragment>
 				))}
 			</>
-		</ExtraOptionWrap>
 	);
 
 	return (
@@ -354,9 +331,32 @@ export const ProductOptionsUI = (props: any) => {
 									</>
 								) : (
 									<ProductEditions>
-										{product?.extras.map((extra: any) => 
+										<ExtraOptionWrap
+											horizontal
+											showsHorizontalScrollIndicator={false}
+											style={{ marginBottom: 20 }}
+											// contentContainerStyle={{ paddingHorizontal: 33 }}
+										>
+										<TouchableOpacity
+											key={`eopt_all_0`}
+											onPress={() => setSelectedOpt(0)}
+											style={[
+												styles.extraItem,
+												{
+													borderBottomColor: selOpt == 0 ? theme.colors.textNormal : theme.colors.border,
+												},
+											]}>
+											<OText
+												color={selOpt == 0 ? theme.colors.textNormal : theme.colors.textSecondary}
+												size={selOpt == 0 ? 14 : 12}
+												weight={selOpt == 0 ? '600' : 'normal'}>
+												{t('ALL', 'All')}
+											</OText>
+										</TouchableOpacity>
+										{product?.extras.map((extra: any) => 					
 											<ExtraOptions key={extra.id} options={extra.options} />
 										)}
+										</ExtraOptionWrap>
 
 										{selOpt == 0 ? (
 											<>