stream-chat-react-native-core 6.6.8 → 6.6.9-beta.1

package/README.md

@@ -10,7 +10,7 @@
 [![NPM](https://img.shields.io/npm/v/stream-chat-react-native.svg)](https://www.npmjs.com/package/stream-chat-react-native)
 [![Build Status](https://github.com/GetStream/stream-chat-react-native/actions/workflows/release.yml/badge.svg)](https://github.com/GetStream/stream-chat-react-native/actions)
 [![Component Reference](https://img.shields.io/badge/docs-component%20reference-blue.svg)](https://getstream.io/chat/docs/sdk/reactnative)
-![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-466%20KB-blue)
+![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-467%20KB-blue)
 
 <img align="right" src="https://getstream.imgix.net/images/ios-chat-tutorial/iphone_chat_art@3x.png?auto=format,enhance" width="50%" />
 

package/lib/commonjs/components/Message/MessageSimple/MessageStatus.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.MessageStatus = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactNative = require("react-native");
+var _ChannelContext = require("../../../contexts/channelContext/ChannelContext");
 var _MessageContext = require("../../../contexts/messageContext/MessageContext");
 var _ThemeContext = require("../../../contexts/themeContext/ThemeContext");
 var _Check = require("../../../icons/Check");
@@ -16,6 +17,8 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _this = this,
   _jsxFileName = "/home/runner/work/stream-chat-react-native/stream-chat-react-native/package/src/components/Message/MessageSimple/MessageStatus.tsx";
 var MessageStatusWithContext = function MessageStatusWithContext(props) {
+  var _useChannelContext = (0, _ChannelContext.useChannelContext)(),
+    channel = _useChannelContext.channel;
   var message = props.message,
     threadList = props.threadList;
   var _useTheme = (0, _ThemeContext.useTheme)(),
@@ -40,15 +43,25 @@ var MessageStatusWithContext = function MessageStatusWithContext(props) {
     return null;
   }
   if ((0, _useMessageList.isMessageWithStylesReadByAndDateSeparator)(message)) {
+    var members = channel == null ? void 0 : channel.state.members;
+    var otherMembers = Object.values(members).filter(function (member) {
+      var _message$user;
+      return member.user_id !== ((_message$user = message.user) == null ? void 0 : _message$user.id);
+    });
+    var hasOtherMembersGreaterThanOne = otherMembers.length > 1;
+    var hasReadByGreaterThanOne = typeof message.readBy === 'number' && message.readBy > 1;
+    var shouldDisplayReadByCount = hasOtherMembersGreaterThanOne && hasReadByGreaterThanOne;
+    var countOfReadBy = typeof message.readBy === 'number' && hasOtherMembersGreaterThanOne ? message.readBy - 1 : 0;
+    var showDoubleCheck = hasReadByGreaterThanOne || message.readBy === true;
     return (0, _jsxRuntime.jsxs)(_reactNative.View, {
       style: [styles.statusContainer, statusContainer],
-      children: [typeof message.readBy === 'number' ? (0, _jsxRuntime.jsx)(_reactNative.Text, {
+      children: [shouldDisplayReadByCount ? (0, _jsxRuntime.jsx)(_reactNative.Text, {
         style: [styles.readByCount, {
           color: accent_blue
         }, readByCount],
         testID: "read-by-container",
-        children: message.readBy
-      }) : null, message.type !== 'error' ? typeof message.readBy === 'number' || message.readBy === true ? (0, _jsxRuntime.jsx)(_CheckAll.CheckAll, Object.assign({
+        children: countOfReadBy
+      }) : null, message.type !== 'error' ? showDoubleCheck ? (0, _jsxRuntime.jsx)(_CheckAll.CheckAll, Object.assign({
         pathFill: accent_blue
       }, checkAllIcon)) : (0, _jsxRuntime.jsx)(_Check.Check, Object.assign({
         pathFill: grey_dark

package/lib/commonjs/components/Message/MessageSimple/MessageStatus.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_MessageContext","_ThemeContext","_Check","_CheckAll","_Time","_utils","_useMessageList","_jsxRuntime","_this","_jsxFileName","MessageStatusWithContext","props","message","threadList","_useTheme","useTheme","_useTheme$theme","theme","_useTheme$theme$color","colors","accent_blue","grey_dark","_useTheme$theme$messa","messageSimple","status","checkAllIcon","checkIcon","readByCount","statusContainer","timeIcon","MessageStatusTypes","SENDING","jsx","View","style","styles","testID","children","Time","Object","assign","FAILED","isMessageWithStylesReadByAndDateSeparator","jsxs","readBy","Text","color","type","CheckAll","pathFill","Check","RECEIVED","areEqual","prevProps","nextProps","prevMessage","prevThreadList","nextMessage","nextThreadList","threadListEqual","messageEqual","MemoizedMessageStatus","React","memo","MessageStatus","exports","_useMessageContext","useMessageContext","displayName","StyleSheet","create","fontSize","fontWeight","paddingRight","alignItems","flexDirection","justifyContent"],"sourceRoot":"../../../../../src","sources":["components/Message/MessageSimple/MessageStatus.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_ChannelContext","_MessageContext","_ThemeContext","_Check","_CheckAll","_Time","_utils","_useMessageList","_jsxRuntime","_this","_jsxFileName","MessageStatusWithContext","props","_useChannelContext","useChannelContext","channel","message","threadList","_useTheme","useTheme","_useTheme$theme","theme","_useTheme$theme$color","colors","accent_blue","grey_dark","_useTheme$theme$messa","messageSimple","status","checkAllIcon","checkIcon","readByCount","statusContainer","timeIcon","MessageStatusTypes","SENDING","jsx","View","style","styles","testID","children","Time","Object","assign","FAILED","isMessageWithStylesReadByAndDateSeparator","members","state","otherMembers","values","filter","member","_message$user","user_id","user","id","hasOtherMembersGreaterThanOne","length","hasReadByGreaterThanOne","readBy","shouldDisplayReadByCount","countOfReadBy","showDoubleCheck","jsxs","Text","color","type","CheckAll","pathFill","Check","RECEIVED","areEqual","prevProps","nextProps","prevMessage","prevThreadList","nextMessage","nextThreadList","threadListEqual","messageEqual","MemoizedMessageStatus","React","memo","MessageStatus","exports","_useMessageContext","useMessageContext","displayName","StyleSheet","create","fontSize","fontWeight","paddingRight","alignItems","flexDirection","justifyContent"],"sourceRoot":"../../../../../src","sources":["components/Message/MessageSimple/MessageStatus.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "6.6.8"
+  "version": "6.6.9-beta.1"
 }

package/lib/module/components/Message/MessageSimple/MessageStatus.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.MessageStatus = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactNative = require("react-native");
+var _ChannelContext = require("../../../contexts/channelContext/ChannelContext");
 var _MessageContext = require("../../../contexts/messageContext/MessageContext");
 var _ThemeContext = require("../../../contexts/themeContext/ThemeContext");
 var _Check = require("../../../icons/Check");
@@ -16,6 +17,8 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _this = this,
   _jsxFileName = "/home/runner/work/stream-chat-react-native/stream-chat-react-native/package/src/components/Message/MessageSimple/MessageStatus.tsx";
 var MessageStatusWithContext = function MessageStatusWithContext(props) {
+  var _useChannelContext = (0, _ChannelContext.useChannelContext)(),
+    channel = _useChannelContext.channel;
   var message = props.message,
     threadList = props.threadList;
   var _useTheme = (0, _ThemeContext.useTheme)(),
@@ -40,15 +43,25 @@ var MessageStatusWithContext = function MessageStatusWithContext(props) {
     return null;
   }
   if ((0, _useMessageList.isMessageWithStylesReadByAndDateSeparator)(message)) {
+    var members = channel == null ? void 0 : channel.state.members;
+    var otherMembers = Object.values(members).filter(function (member) {
+      var _message$user;
+      return member.user_id !== ((_message$user = message.user) == null ? void 0 : _message$user.id);
+    });
+    var hasOtherMembersGreaterThanOne = otherMembers.length > 1;
+    var hasReadByGreaterThanOne = typeof message.readBy === 'number' && message.readBy > 1;
+    var shouldDisplayReadByCount = hasOtherMembersGreaterThanOne && hasReadByGreaterThanOne;
+    var countOfReadBy = typeof message.readBy === 'number' && hasOtherMembersGreaterThanOne ? message.readBy - 1 : 0;
+    var showDoubleCheck = hasReadByGreaterThanOne || message.readBy === true;
     return (0, _jsxRuntime.jsxs)(_reactNative.View, {
       style: [styles.statusContainer, statusContainer],
-      children: [typeof message.readBy === 'number' ? (0, _jsxRuntime.jsx)(_reactNative.Text, {
+      children: [shouldDisplayReadByCount ? (0, _jsxRuntime.jsx)(_reactNative.Text, {
         style: [styles.readByCount, {
           color: accent_blue
         }, readByCount],
         testID: "read-by-container",
-        children: message.readBy
-      }) : null, message.type !== 'error' ? typeof message.readBy === 'number' || message.readBy === true ? (0, _jsxRuntime.jsx)(_CheckAll.CheckAll, Object.assign({
+        children: countOfReadBy
+      }) : null, message.type !== 'error' ? showDoubleCheck ? (0, _jsxRuntime.jsx)(_CheckAll.CheckAll, Object.assign({
         pathFill: accent_blue
       }, checkAllIcon)) : (0, _jsxRuntime.jsx)(_Check.Check, Object.assign({
         pathFill: grey_dark

package/lib/module/components/Message/MessageSimple/MessageStatus.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_MessageContext","_ThemeContext","_Check","_CheckAll","_Time","_utils","_useMessageList","_jsxRuntime","_this","_jsxFileName","MessageStatusWithContext","props","message","threadList","_useTheme","useTheme","_useTheme$theme","theme","_useTheme$theme$color","colors","accent_blue","grey_dark","_useTheme$theme$messa","messageSimple","status","checkAllIcon","checkIcon","readByCount","statusContainer","timeIcon","MessageStatusTypes","SENDING","jsx","View","style","styles","testID","children","Time","Object","assign","FAILED","isMessageWithStylesReadByAndDateSeparator","jsxs","readBy","Text","color","type","CheckAll","pathFill","Check","RECEIVED","areEqual","prevProps","nextProps","prevMessage","prevThreadList","nextMessage","nextThreadList","threadListEqual","messageEqual","MemoizedMessageStatus","React","memo","MessageStatus","exports","_useMessageContext","useMessageContext","displayName","StyleSheet","create","fontSize","fontWeight","paddingRight","alignItems","flexDirection","justifyContent"],"sourceRoot":"../../../../../src","sources":["components/Message/MessageSimple/MessageStatus.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_ChannelContext","_MessageContext","_ThemeContext","_Check","_CheckAll","_Time","_utils","_useMessageList","_jsxRuntime","_this","_jsxFileName","MessageStatusWithContext","props","_useChannelContext","useChannelContext","channel","message","threadList","_useTheme","useTheme","_useTheme$theme","theme","_useTheme$theme$color","colors","accent_blue","grey_dark","_useTheme$theme$messa","messageSimple","status","checkAllIcon","checkIcon","readByCount","statusContainer","timeIcon","MessageStatusTypes","SENDING","jsx","View","style","styles","testID","children","Time","Object","assign","FAILED","isMessageWithStylesReadByAndDateSeparator","members","state","otherMembers","values","filter","member","_message$user","user_id","user","id","hasOtherMembersGreaterThanOne","length","hasReadByGreaterThanOne","readBy","shouldDisplayReadByCount","countOfReadBy","showDoubleCheck","jsxs","Text","color","type","CheckAll","pathFill","Check","RECEIVED","areEqual","prevProps","nextProps","prevMessage","prevThreadList","nextMessage","nextThreadList","threadListEqual","messageEqual","MemoizedMessageStatus","React","memo","MessageStatus","exports","_useMessageContext","useMessageContext","displayName","StyleSheet","create","fontSize","fontWeight","paddingRight","alignItems","flexDirection","justifyContent"],"sourceRoot":"../../../../../src","sources":["components/Message/MessageSimple/MessageStatus.tsx"],"mappings":";;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAEA,IAAAE,eAAA,GAAAF,OAAA;AACA,IAAAG,eAAA,GAAAH,OAAA;AAIA,IAAAI,aAAA,GAAAJ,OAAA;AACA,IAAAK,MAAA,GAAAL,OAAA;AACA,IAAAM,SAAA,GAAAN,OAAA;AACA,IAAAO,KAAA,GAAAP,OAAA;AAEA,IAAAQ,MAAA,GAAAR,OAAA;AAEA,IAAAS,eAAA,GAAAT,OAAA;AAAmG,IAAAU,WAAA,GAAAV,OAAA;AAAA,IAAAW,KAAA;EAAAC,YAAA;AAMnG,IAAMC,wBAAwB,GAAG,SAA3BA,wBAAwBA,CAG5BC,KAAwD,EACrD;EACH,IAAAC,kBAAA,GAAoB,IAAAC,iCAAiB,EAAqB,CAAC;IAAnDC,OAAO,GAAAF,kBAAA,CAAPE,OAAO;EACf,IAAQC,OAAO,GAAiBJ,KAAK,CAA7BI,OAAO;IAAEC,UAAU,GAAKL,KAAK,CAApBK,UAAU;EAE3B,IAAAC,SAAA,GAOI,IAAAC,sBAAQ,EAAC,CAAC;IAAAC,eAAA,GAAAF,SAAA,CANZG,KAAK;IAAAC,qBAAA,GAAAF,eAAA,CACHG,MAAM;IAAIC,WAAW,GAAAF,qBAAA,CAAXE,WAAW;IAAEC,SAAS,GAAAH,qBAAA,CAATG,SAAS;IAAAC,qBAAA,GAAAN,eAAA,CAChCO,aAAa,CACXC,MAAM;IAAIC,YAAY,GAAAH,qBAAA,CAAZG,YAAY;IAAEC,SAAS,GAAAJ,qBAAA,CAATI,SAAS;IAAEC,WAAW,GAAAL,qBAAA,CAAXK,WAAW;IAAEC,eAAe,GAAAN,qBAAA,CAAfM,eAAe;IAAEC,QAAQ,GAAAP,qBAAA,CAARO,QAAQ;EAK/E,IAAIjB,OAAO,CAACY,MAAM,KAAKM,yBAAkB,CAACC,OAAO,EAAE;IACjD,OACE,IAAA3B,WAAA,CAAA4B,GAAA,EAACrC,YAAA,CAAAsC,IAAI;MAACC,KAAK,EAAE,CAACC,MAAM,CAACP,eAAe,EAAEA,eAAe,CAAE;MAACQ,MAAM,EAAC,mBAAmB;MAAAC,QAAA,EAChF,IAAAjC,WAAA,CAAA4B,GAAA,EAAC/B,KAAA,CAAAqC,IAAI,EAAAC,MAAA,CAAAC,MAAA,KAAKX,QAAQ,CAAG;IAAC,CAClB,CAAC;EAEX;EAEA,IAAIhB,UAAU,IAAID,OAAO,CAACY,MAAM,KAAKM,yBAAkB,CAACW,MAAM,EAAE;IAC9D,OAAO,IAAI;EACb;EAEA,IAAI,IAAAC,yDAAyC,EAAC9B,OAAO,CAAC,EAAE;IACtD,IAAM+B,OAAO,GAAGhC,OAAO,oBAAPA,OAAO,CAAEiC,KAAK,CAACD,OAAO;IACtC,IAAME,YAAY,GAAGN,MAAM,CAACO,MAAM,CAACH,OAAO,CAAC,CAACI,MAAM,CAChD,UAACC,MAAM;MAAA,IAAAC,aAAA;MAAA,OAAKD,MAAM,CAACE,OAAO,OAAAD,aAAA,GAAKrC,OAAO,CAACuC,IAAI,qBAAZF,aAAA,CAAcG,EAAE;IAAA,CACjD,CAAC;IACD,IAAMC,6BAA6B,GAAGR,YAAY,CAACS,MAAM,GAAG,CAAC;IAC7D,IAAMC,uBAAuB,GAAG,OAAO3C,OAAO,CAAC4C,MAAM,KAAK,QAAQ,IAAI5C,OAAO,CAAC4C,MAAM,GAAG,CAAC;IACxF,IAAMC,wBAAwB,GAAGJ,6BAA6B,IAAIE,uBAAuB;IACzF,IAAMG,aAAa,GACjB,OAAO9C,OAAO,CAAC4C,MAAM,KAAK,QAAQ,IAAIH,6BAA6B,GAAGzC,OAAO,CAAC4C,MAAM,GAAG,CAAC,GAAG,CAAC;IAC9F,IAAMG,eAAe,GAAGJ,uBAAuB,IAAI3C,OAAO,CAAC4C,MAAM,KAAK,IAAI;IAE1E,OACE,IAAApD,WAAA,CAAAwD,IAAA,EAACjE,YAAA,CAAAsC,IAAI;MAACC,KAAK,EAAE,CAACC,MAAM,CAACP,eAAe,EAAEA,eAAe,CAAE;MAAAS,QAAA,GACpDoB,wBAAwB,GACvB,IAAArD,WAAA,CAAA4B,GAAA,EAACrC,YAAA,CAAAkE,IAAI;QACH3B,KAAK,EAAE,CAACC,MAAM,CAACR,WAAW,EAAE;UAAEmC,KAAK,EAAE1C;QAAY,CAAC,EAAEO,WAAW,CAAE;QACjES,MAAM,EAAC,mBAAmB;QAAAC,QAAA,EAEzBqB;MAAa,CACV,CAAC,GACL,IAAI,EACP9C,OAAO,CAACmD,IAAI,KAAK,OAAO,GACvBJ,eAAe,GACb,IAAAvD,WAAA,CAAA4B,GAAA,EAAChC,SAAA,CAAAgE,QAAQ,EAAAzB,MAAA,CAAAC,MAAA;QAACyB,QAAQ,EAAE7C;MAAY,GAAKK,YAAY,CAAG,CAAC,GAErD,IAAArB,WAAA,CAAA4B,GAAA,EAACjC,MAAA,CAAAmE,KAAK,EAAA3B,MAAA,CAAAC,MAAA;QAACyB,QAAQ,EAAE5C;MAAU,GAAKK,SAAS,CAAG,CAC7C,GACC,IAAI;IAAA,CACJ,CAAC;EAEX;EAEA,IAAId,OAAO,CAACY,MAAM,KAAKM,yBAAkB,CAACqC,QAAQ,IAAIvD,OAAO,CAACmD,IAAI,KAAK,WAAW,EAAE;IAClF,OACE,IAAA3D,WAAA,CAAA4B,GAAA,EAACrC,YAAA,CAAAsC,IAAI;MAACC,KAAK,EAAE,CAACC,MAAM,CAACP,eAAe,EAAEA,eAAe,CAAE;MAACQ,MAAM,EAAC,qBAAqB;MAAAC,QAAA,EAClF,IAAAjC,WAAA,CAAA4B,GAAA,EAACjC,MAAA,CAAAmE,KAAK,EAAA3B,MAAA,CAAAC,MAAA;QAACyB,QAAQ,EAAE5C;MAAU,GAAKK,SAAS,CAAG;IAAC,CACzC,CAAC;EAEX;EAEA,OAAO,IAAI;AACb,CAAC;AAED,IAAM0C,QAAQ,GAAG,SAAXA,QAAQA,CACZC,SAA4D,EAC5DC,SAA4D,EACzD;EACH,IAAiBC,WAAW,GAAiCF,SAAS,CAA9DzD,OAAO;IAA2B4D,cAAc,GAAKH,SAAS,CAAxCxD,UAAU;EACxC,IAAiB4D,WAAW,GAAiCH,SAAS,CAA9D1D,OAAO;IAA2B8D,cAAc,GAAKJ,SAAS,CAAxCzD,UAAU;EAExC,IAAM8D,eAAe,GAAGH,cAAc,KAAKE,cAAc;EACzD,IAAI,CAACC,eAAe,EAAE;IACpB,OAAO,KAAK;EACd;EAEA,IAAMC,YAAY,GAChBL,WAAW,CAAC/C,MAAM,KAAKiD,WAAW,CAACjD,MAAM,IACzC+C,WAAW,CAACR,IAAI,KAAKU,WAAW,CAACV,IAAI,IACrC,CAAC,IAAArB,yDAAyC,EAAC6B,WAAW,CAAC,IAAIA,WAAW,CAACf,MAAM,OAC1E,IAAAd,yDAAyC,EAAC+B,WAAW,CAAC,IAAIA,WAAW,CAACjB,MAAM,CAAC;EAClF,IAAI,CAACoB,YAAY,EAAE;IACjB,OAAO,KAAK;EACd;EAEA,OAAO,IAAI;AACb,CAAC;AAED,IAAMC,qBAAqB,GAAGC,iBAAK,CAACC,IAAI,CACtCxE,wBAAwB,EACxB6D,QACF,CAAoC;AAM7B,IAAMY,aAAa,GAAAC,OAAA,CAAAD,aAAA,GAAG,SAAhBA,aAAaA,CAGxBxE,KAA6C,EAC1C;EACH,IAAA0E,kBAAA,GAAgC,IAAAC,iCAAiB,EAAqB,CAAC;IAA/DvE,OAAO,GAAAsE,kBAAA,CAAPtE,OAAO;IAAEC,UAAU,GAAAqE,kBAAA,CAAVrE,UAAU;EAE3B,OAAO,IAAAT,WAAA,CAAA4B,GAAA,EAAC6C,qBAAqB,EAAAtC,MAAA,CAAAC,MAAA;IAAO5B,OAAO,EAAPA,OAAO;IAAEC,UAAU,EAAVA;EAAU,GAAQL,KAAK,CAAG,CAAC;AAC1E,CAAC;AAEDwE,aAAa,CAACI,WAAW,GAAG,sCAAsC;AAElE,IAAMjD,MAAM,GAAGkD,uBAAU,CAACC,MAAM,CAAC;EAC/B3D,WAAW,EAAE;IACX4D,QAAQ,EAAE,EAAE;IACZC,UAAU,EAAE,KAAK;IACjBC,YAAY,EAAE;EAChB,CAAC;EACD7D,eAAe,EAAE;IACf8D,UAAU,EAAE,UAAU;IACtBC,aAAa,EAAE,KAAK;IACpBC,cAAc,EAAE,QAAQ;IACxBH,YAAY,EAAE;EAChB;AACF,CAAC,CAAC","ignoreList":[]}

package/lib/module/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "6.6.8"
+  "version": "6.6.9-beta.1"
 }

package/lib/typescript/components/Message/MessageSimple/MessageStatus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageStatus.d.ts","sourceRoot":"","sources":["../../../../../src/components/Message/MessageSimple/MessageStatus.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EACL,mBAAmB,EAEpB,MAAM,iDAAiD,CAAC;AAKzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAKtE,MAAM,MAAM,6BAA6B,CACvC,kBAAkB,SAAS,yBAAyB,GAAG,yBAAyB,IAC9E,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC,CAAC;AA4F5E,MAAM,MAAM,kBAAkB,CAC5B,kBAAkB,SAAS,yBAAyB,GAAG,yBAAyB,IAC9E,OAAO,CAAC,6BAA6B,CAAC,kBAAkB,CAAC,CAAC,CAAC;AAE/D,eAAO,MAAM,aAAa;KACxB,kBAAkB,SAAS,yBAAyB,qCAE7C,kBAAkB,CAAC,kBAAkB,CAAC;;CAK9C,CAAC"}
+{"version":3,"file":"MessageStatus.d.ts","sourceRoot":"","sources":["../../../../../src/components/Message/MessageSimple/MessageStatus.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EACL,mBAAmB,EAEpB,MAAM,iDAAiD,CAAC;AAKzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAKtE,MAAM,MAAM,6BAA6B,CACvC,kBAAkB,SAAS,yBAAyB,GAAG,yBAAyB,IAC9E,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC,CAAC;AAwG5E,MAAM,MAAM,kBAAkB,CAC5B,kBAAkB,SAAS,yBAAyB,GAAG,yBAAyB,IAC9E,OAAO,CAAC,6BAA6B,CAAC,kBAAkB,CAAC,CAAC,CAAC;AAE/D,eAAO,MAAM,aAAa;KACxB,kBAAkB,SAAS,yBAAyB,qCAE7C,kBAAkB,CAAC,kBAAkB,CAAC;;CAK9C,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stream-chat-react-native-core",
   "description": "The official React Native and Expo components for Stream Chat, a service for building chat applications",
-  "version": "6.6.8",
+  "version": "6.6.9-beta.1",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"

package/src/components/Message/MessageSimple/MessageStatus.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 
+import { useChannelContext } from '../../../contexts/channelContext/ChannelContext';
 import {
   MessageContextValue,
   useMessageContext,
@@ -23,6 +24,7 @@ const MessageStatusWithContext = <
 >(
   props: MessageStatusPropsWithContext<StreamChatGenerics>,
 ) => {
+  const { channel } = useChannelContext<StreamChatGenerics>();
   const { message, threadList } = props;
 
   const {
@@ -47,18 +49,29 @@ const MessageStatusWithContext = <
   }
 
   if (isMessageWithStylesReadByAndDateSeparator(message)) {
+    const members = channel?.state.members;
+    const otherMembers = Object.values(members).filter(
+      (member) => member.user_id !== message.user?.id,
+    );
+    const hasOtherMembersGreaterThanOne = otherMembers.length > 1;
+    const hasReadByGreaterThanOne = typeof message.readBy === 'number' && message.readBy > 1;
+    const shouldDisplayReadByCount = hasOtherMembersGreaterThanOne && hasReadByGreaterThanOne;
+    const countOfReadBy =
+      typeof message.readBy === 'number' && hasOtherMembersGreaterThanOne ? message.readBy - 1 : 0;
+    const showDoubleCheck = hasReadByGreaterThanOne || message.readBy === true;
+
     return (
       <View style={[styles.statusContainer, statusContainer]}>
-        {typeof message.readBy === 'number' ? (
+        {shouldDisplayReadByCount ? (
           <Text
             style={[styles.readByCount, { color: accent_blue }, readByCount]}
             testID='read-by-container'
           >
-            {message.readBy}
+            {countOfReadBy}
           </Text>
         ) : null}
         {message.type !== 'error' ? (
-          typeof message.readBy === 'number' || message.readBy === true ? (
+          showDoubleCheck ? (
             <CheckAll pathFill={accent_blue} {...checkAllIcon} />
           ) : (
             <Check pathFill={grey_dark} {...checkIcon} />

package/src/components/Message/MessageSimple/__tests__/MessageStatus.test.js

@@ -2,6 +2,12 @@ import React from 'react';
 
 import { cleanup, render, waitFor } from '@testing-library/react-native';
 
+import { Channel } from '../../..';
+import { ChannelsStateProvider } from '../../../../contexts/channelsStateContext/ChannelsStateContext';
+import { getOrCreateChannelApi } from '../../../../mock-builders/api/getOrCreateChannel';
+import { useMockedApis } from '../../../../mock-builders/api/useMockedApis';
+import { generateChannelResponse } from '../../../../mock-builders/generator/channel';
+import { generateMember } from '../../../../mock-builders/generator/member';
 import { generateMessage } from '../../../../mock-builders/generator/message';
 import { generateStaticUser, generateUser } from '../../../../mock-builders/generator/user';
 import { getTestClientWithUser } from '../../../../mock-builders/mock';
@@ -10,26 +16,54 @@ import { Chat } from '../../../Chat/Chat';
 import { MessageStatus } from '../MessageStatus';
 
 let chatClient;
-let id;
 let i18nInstance;
-
+let channel;
 describe('MessageStatus', () => {
-  beforeAll(async () => {
+  const user1 = generateUser({ id: 'id1', name: 'name1' });
+  const user2 = generateUser({ id: 'id2', name: 'name2' });
+  const user3 = generateUser({ id: 'id3', name: 'name3' });
+  const messages = [generateMessage({ user: user1 })];
+  const members = [
+    generateMember({ user: user1 }),
+    generateMember({ user: user2 }),
+    generateMember({ user: user3 }),
+  ];
+  beforeAll(() => {
     id = 'testID';
-    chatClient = await getTestClientWithUser({ id });
     i18nInstance = new Streami18n();
   });
+  beforeEach(async () => {
+    jest.clearAllMocks();
+    const mockedChannel = generateChannelResponse({
+      members,
+      messages,
+    });
+
+    chatClient = await getTestClientWithUser(user1);
+    useMockedApis(chatClient, [getOrCreateChannelApi(mockedChannel)]);
+    channel = chatClient.channel('messaging', mockedChannel.id);
+  });
   afterEach(cleanup);
 
+  renderMessageStatus = (options, channelProps) =>
+    render(
+      <ChannelsStateProvider>
+        <Chat client={chatClient}>
+          <Channel channel={channel} {...channelProps}>
+            <MessageStatus {...options} />
+          </Channel>
+        </Chat>
+      </ChannelsStateProvider>,
+    );
+
   it('should render message status with delivered container', async () => {
     const user = generateUser();
     const message = generateMessage({ user });
 
-    const { getByTestId } = render(
-      <Chat client={chatClient} i18nInstance={i18nInstance}>
-        <MessageStatus lastReceivedId={message.id} message={{ ...message, status: 'received' }} />
-      </Chat>,
-    );
+    const { getByTestId } = renderMessageStatus({
+      lastReceivedId: message.id,
+      message: { ...message, status: 'received' },
+    });
 
     await waitFor(() => {
       expect(getByTestId('delivered-container')).toBeTruthy();
@@ -40,30 +74,33 @@ describe('MessageStatus', () => {
     const user = generateUser();
     const message = generateMessage({ readBy: 2, user });
 
-    const { getByTestId, getByText, rerender, toJSON } = render(
-      <Chat client={chatClient} i18nInstance={i18nInstance}>
-        <MessageStatus lastReceivedId={message.id} message={message} />
-      </Chat>,
-    );
+    const { getByTestId, getByText, rerender, toJSON } = renderMessageStatus({
+      lastReceivedId: message.id,
+      message,
+    });
 
     await waitFor(() => {
       expect(getByTestId('read-by-container')).toBeTruthy();
-      expect(getByText(message.readBy.toString())).toBeTruthy();
+      expect(getByText((message.readBy - 1).toString())).toBeTruthy();
     });
 
     const staticUser = generateStaticUser(0);
     const staticMessage = generateMessage({ readBy: 2, staticUser });
 
     rerender(
-      <Chat client={chatClient} i18nInstance={i18nInstance}>
-        <MessageStatus lastReceivedId={staticMessage.id} message={staticMessage} />
-      </Chat>,
+      <ChannelsStateProvider>
+        <Chat client={chatClient} i18nInstance={i18nInstance}>
+          <Channel channel={channel}>
+            <MessageStatus lastReceivedId={staticMessage.id} message={staticMessage} />
+          </Channel>
+        </Chat>
+      </ChannelsStateProvider>,
     );
 
     await waitFor(() => {
       expect(toJSON()).toMatchSnapshot();
       expect(getByTestId('read-by-container')).toBeTruthy();
-      expect(getByText(staticMessage.readBy.toString())).toBeTruthy();
+      expect(getByText((staticMessage.readBy - 1).toString())).toBeTruthy();
     });
   });
 
@@ -71,11 +108,9 @@ describe('MessageStatus', () => {
     const user = generateUser();
     const message = generateMessage({ user });
 
-    const { getByTestId } = render(
-      <Chat client={chatClient} i18nInstance={i18nInstance}>
-        <MessageStatus message={{ ...message, status: 'sending' }} />
-      </Chat>,
-    );
+    const { getByTestId } = renderMessageStatus({
+      message: { ...message, status: 'sending' },
+    });
 
     await waitFor(() => {
       expect(getByTestId('sending-container')).toBeTruthy();

package/src/components/Message/MessageSimple/__tests__/__snapshots__/MessageStatus.test.js.snap

@@ -2,106 +2,124 @@
 
 exports[`MessageStatus should render message status with read by container 1`] = `
 <View
+  keyboardVerticalOffset={86.5}
+  onLayout={[Function]}
   style={
-    [
-      {
-        "alignItems": "flex-end",
-        "flexDirection": "row",
-        "justifyContent": "center",
-        "paddingRight": 3,
-      },
-      {},
-    ]
+    {
+      "paddingBottom": 0,
+    }
   }
 >
-  <Text
-    style={
-      [
-        {
-          "fontSize": 11,
-          "fontWeight": "700",
-          "paddingRight": 3,
-        },
-        {
-          "color": "#005FFF",
-        },
-        {},
-      ]
-    }
-    testID="read-by-container"
-  >
-    2
-  </Text>
-  <RNSVGSvgView
-    align="xMidYMid"
-    bbHeight={16}
-    bbWidth={16}
-    focusable={false}
-    height={16}
-    meetOrSlice={0}
-    minX={0}
-    minY={0}
-    pathFill="#005FFF"
+  <View
     style={
-      [
-        {
-          "backgroundColor": "transparent",
-          "borderWidth": 0,
-        },
-        {
-          "flex": 0,
-          "height": 16,
-          "width": 16,
-        },
-      ]
+      {
+        "height": "100%",
+      }
     }
-    vbHeight={24}
-    vbWidth={24}
-    width={16}
   >
-    <RNSVGGroup
-      fill={
-        {
-          "payload": 4278190080,
-          "type": 0,
-        }
+    <View
+      style={
+        [
+          {
+            "alignItems": "flex-end",
+            "flexDirection": "row",
+            "justifyContent": "center",
+            "paddingRight": 3,
+          },
+          {},
+        ]
       }
     >
-      <RNSVGPath
-        clipRule={0}
-        d="M2.293 11.293a1 1 0 011.414 0l4 4a1 1 0 11-1.414 1.414l-4-4a1 1 0 010-1.414zM9.293 12.293a1 1 0 011.414 0l3 3a1 1 0 01-1.414 1.414l-3-3a1 1 0 010-1.414z"
-        fill={
-          {
-            "payload": 4278214655,
-            "type": 0,
-          }
-        }
-        fillRule={0}
-        propList={
+      <Text
+        style={
           [
-            "fill",
-            "fillRule",
+            {
+              "fontSize": 11,
+              "fontWeight": "700",
+              "paddingRight": 3,
+            },
+            {
+              "color": "#005FFF",
+            },
+            {},
           ]
         }
-      />
-      <RNSVGPath
-        clipRule={0}
-        d="M15.707 7.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414-1.414l8-8a1 1 0 011.414 0zM21.707 7.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414-1.414l8-8a1 1 0 011.414 0z"
-        fill={
-          {
-            "payload": 4278214655,
-            "type": 0,
-          }
-        }
-        fillRule={0}
-        propList={
+        testID="read-by-container"
+      >
+        1
+      </Text>
+      <RNSVGSvgView
+        align="xMidYMid"
+        bbHeight={16}
+        bbWidth={16}
+        focusable={false}
+        height={16}
+        meetOrSlice={0}
+        minX={0}
+        minY={0}
+        pathFill="#005FFF"
+        style={
           [
-            "fill",
-            "fillRule",
+            {
+              "backgroundColor": "transparent",
+              "borderWidth": 0,
+            },
+            {
+              "flex": 0,
+              "height": 16,
+              "width": 16,
+            },
           ]
         }
-      />
-    </RNSVGGroup>
-  </RNSVGSvgView>
+        vbHeight={24}
+        vbWidth={24}
+        width={16}
+      >
+        <RNSVGGroup
+          fill={
+            {
+              "payload": 4278190080,
+              "type": 0,
+            }
+          }
+        >
+          <RNSVGPath
+            clipRule={0}
+            d="M2.293 11.293a1 1 0 011.414 0l4 4a1 1 0 11-1.414 1.414l-4-4a1 1 0 010-1.414zM9.293 12.293a1 1 0 011.414 0l3 3a1 1 0 01-1.414 1.414l-3-3a1 1 0 010-1.414z"
+            fill={
+              {
+                "payload": 4278214655,
+                "type": 0,
+              }
+            }
+            fillRule={0}
+            propList={
+              [
+                "fill",
+                "fillRule",
+              ]
+            }
+          />
+          <RNSVGPath
+            clipRule={0}
+            d="M15.707 7.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414-1.414l8-8a1 1 0 011.414 0zM21.707 7.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414-1.414l8-8a1 1 0 011.414 0z"
+            fill={
+              {
+                "payload": 4278214655,
+                "type": 0,
+              }
+            }
+            fillRule={0}
+            propList={
+              [
+                "fill",
+                "fillRule",
+              ]
+            }
+          />
+        </RNSVGGroup>
+      </RNSVGSvgView>
+    </View>
+  </View>
 </View>
 `;

package/src/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "6.6.8"
+  "version": "6.6.9-beta.1"
 }