[PAY-1435] Navigate to chat after unblocking user on mobile (#3578)

AudiusProject · Jun 13, 2023 · a6c8ece · a6c8ece
1 parent ee1b6c3
commit a6c8ece
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/packages/mobile/src/components/block-messages-drawer/BlockMessagesDrawer.tsx b/packages/mobile/src/components/block-messages-drawer/BlockMessagesDrawer.tsx
@@ -17,7 +17,7 @@ import { useColor } from 'app/utils/theme'
 
 const { getUser } = cacheUsersSelectors
 const { getDoesBlockUser } = chatSelectors
-const { blockUser, unblockUser } = chatActions
+const { blockUser, unblockUser, createChat } = chatActions
 
 const BLOCK_MESSAGES_MODAL_NAME = 'BlockMessages'
 
@@ -106,7 +106,7 @@ export const BlockMessagesDrawer = () => {
   const neutralLight2 = useColor('neutralLight2')
   const neutral = useColor('neutral')
   const dispatch = useDispatch()
-  const { userId } = useSelector((state: AppState) =>
+  const { userId, shouldOpenChat } = useSelector((state: AppState) =>
     getData<'BlockMessages'>(state)
   )
   const user = useSelector((state) => getUser(state, { id: userId }))
@@ -116,6 +116,9 @@ export const BlockMessagesDrawer = () => {
   const handleConfirmPress = useCallback(() => {
     if (doesBlockUser) {
       dispatch(unblockUser({ userId }))
+      if (shouldOpenChat) {
+        dispatch(createChat({ userIds: [userId] }))
+      }
     } else {
       dispatch(blockUser({ userId }))
     }
@@ -125,7 +128,7 @@ export const BlockMessagesDrawer = () => {
         visible: false
       })
     )
-  }, [dispatch, doesBlockUser, userId])
+  }, [dispatch, doesBlockUser, shouldOpenChat, userId])
 
   const handleCancelPress = useCallback(() => {
     dispatch(

diff --git a/packages/mobile/src/components/inbox-unavailable-drawer/InboxUnavailableDrawer.tsx b/packages/mobile/src/components/inbox-unavailable-drawer/InboxUnavailableDrawer.tsx
@@ -24,7 +24,7 @@ import { useColor } from 'app/utils/theme'
 
 import { UserBadges } from '../user-badges'
 
-const { unblockUser } = chatActions
+const { unblockUser, createChat } = chatActions
 const { getCanCreateChat } = chatSelectors
 const { getUser } = cacheUsersSelectors
 const { beginTip } = tippingActions
@@ -151,7 +151,9 @@ export const InboxUnavailableDrawer = () => {
   const styles = useStyles()
   const neutralLight2 = useColor('neutralLight2')
 
-  const { userId } = useSelector((state) => getData<'InboxUnavailable'>(state))
+  const { userId, shouldOpenChat } = useSelector((state) =>
+    getData<'InboxUnavailable'>(state)
+  )
   const user = useSelector((state) => getUser(state, { id: userId }))
   const { callToAction } = useSelector((state) =>
     getCanCreateChat(state, { userId })
@@ -168,8 +170,11 @@ export const InboxUnavailableDrawer = () => {
 
   const handleUnblockPress = useCallback(() => {
     dispatch(unblockUser({ userId }))
+    if (shouldOpenChat) {
+      dispatch(createChat({ userIds: [userId] }))
+    }
     closeDrawer()
-  }, [dispatch, userId, closeDrawer])
+  }, [dispatch, userId, shouldOpenChat, closeDrawer])
 
   const handleLearnMorePress = useCallback(() => {
     // TODO: Link to blog

diff --git a/packages/mobile/src/screens/chat-screen/ChatUserListItem.tsx b/packages/mobile/src/screens/chat-screen/ChatUserListItem.tsx
@@ -177,7 +177,7 @@ export const ChatUserListItem = ({ userId }: ChatUserListItemProps) => {
         setVisibility({
           drawer: 'InboxUnavailable',
           visible: true,
-          data: { userId: user.user_id }
+          data: { userId: user.user_id, shouldOpenChat: true }
         })
       )
     }

diff --git a/packages/mobile/src/screens/profile-screen/MessageLockedButton.tsx b/packages/mobile/src/screens/profile-screen/MessageLockedButton.tsx
@@ -38,7 +38,7 @@ export const MessageLockedButton = (props: MessageLockedButtonProps) => {
       setVisibility({
         drawer: 'InboxUnavailable',
         visible: true,
-        data: { userId }
+        data: { userId, shouldOpenChat: true }
       })
     )
   }, [dispatch, userId])

diff --git a/packages/mobile/src/store/drawers/slice.ts b/packages/mobile/src/store/drawers/slice.ts
@@ -56,10 +56,10 @@ export type DrawerData = {
   ChatActions: { userId: number; chatId: string }
   CreateChatActions: { userId: number }
   ProfileActions: undefined
-  BlockMessages: { userId: number }
+  BlockMessages: { userId: number; shouldOpenChat: boolean }
   DeleteChat: { chatId: string }
   SupportersInfo: undefined
-  InboxUnavailable: { userId: number }
+  InboxUnavailable: { userId: number; shouldOpenChat: boolean }
 }
 
 export type DrawersState = { [drawer in Drawer]: boolean | 'closing' } & {