Merge branch 'master' into tma784-style-message-input

# Conflicts:
#	src/screens/chat/ChatListScreen.tsx
#	src/screens/chat/ChatScreen.tsx

3 files changed, 3 insertions, 0 deletions

diff --git a/src/store/actions/user.ts b/src/store/actions/user.ts
index 3ebd4190..c7d0d5a7 100644
--- a/src/store/actions/user.ts
+++ b/src/store/actions/user.ts
@@ -233,3 +233,4 @@ export const suggestedPeopleAnimatedTutorialFinished = (
     console.log('Error while updating suggested people linked state: ', error);
   }
 };
+
diff --git a/src/store/initialStates.ts b/src/store/initialStates.ts
index 02331eb6..7fd3ac5a 100644
--- a/src/store/initialStates.ts
+++ b/src/store/initialStates.ts
@@ -117,6 +117,7 @@ export const EMPTY_SCREEN_TO_USERS_LIST: Record<
   [ScreenType.Search]: EMPTY_USERX_LIST,
   [ScreenType.Notifications]: EMPTY_USERX_LIST,
   [ScreenType.SuggestedPeople]: EMPTY_USERX_LIST,
+  [ScreenType.Chat]: EMPTY_USERX_LIST,
 };
 
 export const INITIAL_CATEGORIES_STATE = {
diff --git a/src/store/reducers/userReducer.ts b/src/store/reducers/userReducer.ts
index 9ff9ba01..a8789c1d 100644
--- a/src/store/reducers/userReducer.ts
+++ b/src/store/reducers/userReducer.ts
@@ -90,5 +90,6 @@ export const {
   setReplyPosted,
   setSuggestedPeopleImage,
   clearHeaderAndProfileImages,
+  // setChatClientReady,
 } = userDataSlice.actions;
 export const userDataReducer = userDataSlice.reducer;