[PAY-1700] Replace navigation if coming from ChatUserListScreen (#3879)

AudiusProject · Aug 14, 2023 · 9c9d7f4 · 9c9d7f4
1 parent eaef4e6
commit 9c9d7f4
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/packages/common/src/store/pages/chat/sagas.ts b/packages/common/src/store/pages/chat/sagas.ts
@@ -373,7 +373,8 @@ function* doSetMessageReaction(action: ReturnType<typeof setMessageReaction>) {
 }
 
 function* doCreateChat(action: ReturnType<typeof createChat>) {
-  const { userIds, skipNavigation, presetMessage } = action.payload
+  const { userIds, skipNavigation, presetMessage, replaceNavigation } =
+    action.payload
   const { track, make } = yield* getContext('analytics')
   try {
     const audiusSdk = yield* getContext('audiusSdk')
@@ -387,7 +388,7 @@ function* doCreateChat(action: ReturnType<typeof createChat>) {
 
     // Optimistically go to the chat. If we fail to create it, we'll toast
     if (!skipNavigation) {
-      yield* put(goToChat({ chatId, presetMessage }))
+      yield* put(goToChat({ chatId, presetMessage, replaceNavigation }))
     }
 
     try {

diff --git a/packages/common/src/store/pages/chat/slice.ts b/packages/common/src/store/pages/chat/slice.ts
@@ -132,6 +132,7 @@ const slice = createSlice({
         userIds: ID[]
         skipNavigation?: boolean
         presetMessage?: string
+        replaceNavigation?: boolean
       }>
     ) => {
       // triggers saga
@@ -159,7 +160,11 @@ const slice = createSlice({
     fetchUnreadMessagesCountFailed: (_state) => {},
     goToChat: (
       _state,
-      _action: PayloadAction<{ chatId?: string; presetMessage?: string }>
+      _action: PayloadAction<{
+        chatId?: string
+        presetMessage?: string
+        replaceNavigation?: boolean
+      }>
     ) => {
       // triggers saga
     },

diff --git a/packages/mobile/src/screens/chat-screen/ChatUserListItem.tsx b/packages/mobile/src/screens/chat-screen/ChatUserListItem.tsx
@@ -162,7 +162,13 @@ export const ChatUserListItem = ({
   const handlePress = useCallback(() => {
     if (user?.user_id) {
       Keyboard.dismiss()
-      dispatch(createChat({ userIds: [user.user_id], presetMessage }))
+      dispatch(
+        createChat({
+          userIds: [user.user_id],
+          presetMessage,
+          replaceNavigation: true
+        })
+      )
     }
   }, [dispatch, presetMessage, user?.user_id])
 

diff --git a/packages/mobile/src/store/chat/sagas.ts b/packages/mobile/src/store/chat/sagas.ts
@@ -1,4 +1,5 @@
 import { chatActions } from '@audius/common'
+import { StackActions } from '@react-navigation/native'
 import { takeLatest } from 'redux-saga/effects'
 
 import { navigationRef } from 'app/components/navigation-container/NavigationContainer'
@@ -8,15 +9,21 @@ const { goToChat } = chatActions
 function* watchGoToChat() {
   yield takeLatest(goToChat, function* (action: ReturnType<typeof goToChat>) {
     const {
-      payload: { chatId, presetMessage }
+      payload: { chatId, presetMessage, replaceNavigation }
     } = action
     if (navigationRef.isReady()) {
       if (!chatId) {
         // @ts-ignore navigationRef is not parametrized correctly (PAY-1141)
         navigationRef.navigate('ChatList')
       } else {
-        // @ts-ignore navigationRef is not parametrized correctly (PAY-1141)
-        navigationRef.navigate('Chat', { chatId, presetMessage })
+        if (replaceNavigation) {
+          navigationRef.current?.dispatch(
+            StackActions.replace('Chat', { chatId, presetMessage })
+          )
+        } else {
+          // @ts-ignore navigationRef is not parametrized correctly (PAY-1141)
+          navigationRef.navigate('Chat', { chatId, presetMessage })
+        }
       }
     }
   })