5 files changed, 109 insertions, 2 deletions
diff --git a/src/components/messages/ChannelPreview.tsx b/src/components/messages/ChannelPreview.tsx
index a7a7268a..8bd3a745 100644
--- a/src/components/messages/ChannelPreview.tsx
+++ b/src/components/messages/ChannelPreview.tsx
@@ -5,6 +5,7 @@ import {TouchableOpacity} from 'react-native-gesture-handler';
 import {useStore} from 'react-redux';
 import {ChannelPreviewMessengerProps} from 'stream-chat-react-native';
 import {ChatContext} from '../../App';
+import {TAGG_LIGHT_BLUE_2} from '../../constants';
 import {
   LocalAttachmentType,
   LocalChannelType,
@@ -89,7 +90,7 @@ const styles = StyleSheet.create({
   },
   online: {
     position: 'absolute',
-    backgroundColor: '#6EE7E7',
+    backgroundColor: TAGG_LIGHT_BLUE_2,
     width: normalize(18),
     height: normalize(18),
     borderRadius: normalize(18) / 2,
diff --git a/src/components/messages/ChatHeader.tsx b/src/components/messages/ChatHeader.tsx
index 67a7f1fe..7ddaa7e6 100644
--- a/src/components/messages/ChatHeader.tsx
+++ b/src/components/messages/ChatHeader.tsx
@@ -5,6 +5,7 @@ import {Text} from 'react-native-animatable';
 import {TouchableOpacity} from 'react-native-gesture-handler';
 import {useDispatch, useStore} from 'react-redux';
 import {ChatContext} from '../../App';
+import {TAGG_LIGHT_BLUE_2} from '../../constants';
 import {ScreenType} from '../../types';
 import {
   ChatHeaderHeight,
@@ -87,7 +88,7 @@ const styles = StyleSheet.create({
   },
   online: {
     position: 'absolute',
-    backgroundColor: '#6EE7E7',
+    backgroundColor: TAGG_LIGHT_BLUE_2,
     width: normalize(16),
     height: normalize(16),
     borderRadius: normalize(16) / 2,
diff --git a/src/components/messages/DateHeader.tsx b/src/components/messages/DateHeader.tsx
new file mode 100644
index 00000000..cc7dce2c
--- /dev/null
+++ b/src/components/messages/DateHeader.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import {View, Text, StyleSheet} from 'react-native';
+import {getFormatedDate, normalize} from '../../utils';
+
+interface DateHeaderProps {
+  date: object;
+}
+
+const DateHeader: React.FC<DateHeaderProps> = ({date}) => {
+  return (
+    <View style={styles.dateContainer}>
+      <Text style={styles.dateHeader}>{getFormatedDate(date)}</Text>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  dateHeader: {
+    color: '#7A7A7A',
+    fontWeight: '600',
+    fontSize: normalize(11),
+    textAlign: 'center',
+    marginVertical: '5%',
+  },
+  dateContainer: {backgroundColor: 'transparent'},
+});
+
+export default DateHeader;
diff --git a/src/components/messages/MessageFooter.tsx b/src/components/messages/MessageFooter.tsx
new file mode 100644
index 00000000..2ed8c6ed
--- /dev/null
+++ b/src/components/messages/MessageFooter.tsx
@@ -0,0 +1,75 @@
+import moment from 'moment';
+import React from 'react';
+import {normalize} from '../../utils';
+import {useMessageContext} from 'stream-chat-react-native-core';
+import {View, Text, Image, StyleSheet} from 'react-native';
+
+const MessageFooter: React.FC = () => {
+  const message = useMessageContext();
+
+  if (message.message.type === 'deleted') {
+    return <></>;
+  } else {
+    const printTime = moment(message.message.created_at).format('h:mmA');
+    if (message.lastGroupMessage) {
+      return (
+        <View
+          style={[
+            message.isMyMessage ? styles.userMessage : styles.userXMessage,
+            styles.generalMessage,
+          ]}>
+          {readReceipts(message)}
+          <Text style={styles.time}>{printTime}</Text>
+        </View>
+      );
+    } else {
+      return <></>;
+    }
+  }
+};
+
+const readReceipts = (message) => {
+  const readByLocal = message.message.readBy;
+  if (message.isMyMessage) {
+    if (readByLocal) {
+      return (
+        <Image
+          source={require('../../assets/icons/messages/read_icon.png')}
+          style={styles.icon}
+        />
+      );
+    } else if (message.message.status === 'received') {
+      return (
+        <Image
+          source={require('../../assets/icons/messages/delivered_icon.png')}
+          style={styles.icon}
+        />
+      );
+    } else if (message.message.status === 'sending') {
+      return (
+        <Image
+          source={require('../../assets/icons/messages/sent_icon.png')}
+          style={styles.icon}
+        />
+      );
+    } else {
+      return <></>;
+    }
+  }
+};
+
+export const styles = StyleSheet.create({
+  time: {
+    fontSize: normalize(11),
+    color: '#7A7A7A',
+    lineHeight: normalize(13),
+  },
+  userMessage: {
+    marginRight: 5,
+  },
+  userXMessage: {marginLeft: 5},
+  generalMessage: {marginTop: 4, flexDirection: 'row'},
+  icon: {width: 15, height: 15},
+});
+
+export default MessageFooter;
diff --git a/src/components/messages/index.ts b/src/components/messages/index.ts
index d08e9454..b19067ca 100644
--- a/src/components/messages/index.ts
+++ b/src/components/messages/index.ts
@@ -5,3 +5,5 @@ export {default as ChatHeader} from './ChatHeader';
 export {default as ChatInputSubmit} from './ChatInputSubmit';
 export {default as MessageAvatar} from './MessageAvatar';
 export {default as TypingIndicator} from './TypingIndicator';
+export {default as MessageFooter} from './MessageFooter';
+export {default as DateHeader} from './DateHeader';