Fix drawer dismiss crash

AudiusProject · Aug 10, 2023 · c927e9c · c927e9c
1 parent bee8bd1
commit c927e9c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/packages/mobile/src/components/block-messages-drawer/BlockMessagesDrawer.tsx b/packages/mobile/src/components/block-messages-drawer/BlockMessagesDrawer.tsx
@@ -112,7 +112,7 @@ export const BlockMessagesDrawer = () => {
   const neutral = useColor('neutral')
   const dispatch = useDispatch()
   const { data } = useDrawer('BlockMessages')
-  const { userId, shouldOpenChat, isReportAbuse } = data
+  const { userId, shouldOpenChat, isReportAbuse } = data ?? {}
   const user = useSelector((state) => getUser(state, { id: userId }))
   // Assuming blockees have already been fetched in ProfileActionsDrawer.
   const doesBlockUser = useSelector((state) => getDoesBlockUser(state, userId))

diff --git a/packages/mobile/src/components/chat-actions-drawer/ChatActionsDrawer.tsx b/packages/mobile/src/components/chat-actions-drawer/ChatActionsDrawer.tsx
@@ -52,7 +52,7 @@ export const ChatActionsDrawer = () => {
   const dispatch = useDispatch()
   const navigation = useNavigation()
   const { data } = useDrawer('ChatActions')
-  const { userId, chatId } = data
+  const { userId, chatId } = data ?? {}
   const doesBlockUser = useSelector((state: AppState) =>
     getDoesBlockUser(state, userId)
   )

diff --git a/packages/mobile/src/components/create-chat-actions-drawer/CreateChatActionsDrawer.tsx b/packages/mobile/src/components/create-chat-actions-drawer/CreateChatActionsDrawer.tsx
@@ -51,7 +51,7 @@ export const CreateChatActionsDrawer = () => {
   const dispatch = useDispatch()
   const navigation = useNavigation()
   const { data } = useDrawer('CreateChatActions')
-  const { userId } = data
+  const { userId } = data ?? {}
   const doesBlockUser = useSelector((state: AppState) =>
     getDoesBlockUser(state, userId)
   )

diff --git a/packages/mobile/src/components/delete-chat-drawer/DeleteChatDrawer.tsx b/packages/mobile/src/components/delete-chat-drawer/DeleteChatDrawer.tsx
@@ -66,7 +66,7 @@ export const DeleteChatDrawer = () => {
   const neutralLight2 = useColor('neutralLight2')
   const dispatch = useDispatch()
   const { data } = useDrawer('DeleteChat')
-  const { chatId } = data
+  const { chatId } = data ?? {}
 
   const closeDrawer = useCallback(() => {
     dispatch(

diff --git a/packages/mobile/src/components/drawers/RemoveDownloadedCollectionDrawer.tsx b/packages/mobile/src/components/drawers/RemoveDownloadedCollectionDrawer.tsx
@@ -22,7 +22,7 @@ const drawerName = 'RemoveDownloadedCollection'
 
 export const RemoveDownloadedCollectionDrawer = () => {
   const { data } = useDrawer(drawerName)
-  const { collectionId } = data
+  const { collectionId } = data ?? {}
   const dispatch = useDispatch()
 
   const isAlbum = useSelector(

diff --git a/packages/mobile/src/components/drawers/UnfavoriteDownloadedCollectionDrawer.tsx b/packages/mobile/src/components/drawers/UnfavoriteDownloadedCollectionDrawer.tsx
@@ -23,7 +23,7 @@ const { unsaveCollection } = collectionsSocialActions
 export const UnfavoriteDownloadedCollectionDrawer = () => {
   const { data } = useDrawer(drawerName)
   const dispatch = useDispatch()
-  const { collectionId } = data
+  const { collectionId } = data ?? {}
 
   const isAlbum = useSelector(
     (state: CommonState) =>