ordering-ui-react-native 0.11.40 → 0.11.41

package/package.json

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

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/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) => (