Merge branch 'master' into CRS-283-edit-message-emoji-opacity

Author: Amin Mahboubi

examples/commerce/package.json

@@ -7,7 +7,7 @@
     "react-dom": "^16.12.0",
     "react-scripts": "2.1.4",
     "stream-chat": "^2.3.0",
-    "stream-chat-react": "0.12.1"
+    "stream-chat-react": "^2.4.1"
   },
   "scripts": {
     "start": "react-scripts start",

examples/commerce/src/App.js

@@ -9,7 +9,6 @@ import {
   MessageInputFlat,
   MessageCommerce,
   ChannelHeader,
-  TypingIndicator,
   Window,
 } from 'stream-chat-react';
 import 'stream-chat-react/dist/css/index.css';
@@ -69,12 +68,7 @@ class App extends Component {
             >
               <Window>
                 <ChannelHeader />
-                {this.state.open && (
-                  <MessageList
-                    TypingIndicator={TypingIndicator}
-                    Message={MessageCommerce}
-                  />
-                )}
+                {this.state.open && <MessageList Message={MessageCommerce} />}
                 <MessageInput
                   onFocus={!this.state.open ? this.toggleDemo : null}
                   Input={MessageInputFlat}

examples/commerce/yarn.lock

@@ -7,7 +7,7 @@
     "react-dom": "^16.12.0",
     "react-scripts": "2.1.4",
     "stream-chat": "^2.3.0",
-    "stream-chat-react": "0.12.1"
+    "stream-chat-react": "^2.4.1"
   },
   "scripts": {
     "start": "react-scripts start",

examples/livestream/package.json

@@ -6,10 +6,9 @@
     "react": "^16.12.0",
     "react-app-polyfill": "^1.0.2",
     "react-dom": "^16.12.0",
-    "react-markdown": "^4.0.6",
     "react-scripts": "2.1.4",
     "stream-chat": "^2.3.0",
-    "stream-chat-react": "0.12.1"
+    "stream-chat-react": "^2.4.1"
   },
   "scripts": {
     "start": "react-scripts start",

examples/livestream/yarn.lock

@@ -15,7 +15,6 @@ import {
   ChannelList,
   Window,
   Thread,
-  TypingIndicator,
 } from 'stream-chat-react';
 import 'stream-chat-react/dist/css/index.css';
 import './App.css';
@@ -68,7 +67,7 @@ class App extends Component {
         <Channel>
           <Window>
             <ChannelHeader />
-            <MessageList TypingIndicator={TypingIndicator} />
+            <MessageList />
             <MessageInput Input={MessageInputFlat} focus />
           </Window>
           <Thread Message={MessageSimple} />