about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/components/dms/ActionsWrapper.tsx3
-rw-r--r--src/screens/Messages/Conversation/MessagesList.tsx1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/components/dms/ActionsWrapper.tsx b/src/components/dms/ActionsWrapper.tsx
index 107e5eb8e..19a3e0424 100644
--- a/src/components/dms/ActionsWrapper.tsx
+++ b/src/components/dms/ActionsWrapper.tsx
@@ -1,5 +1,5 @@
 import React, {useCallback} from 'react'
-import {Pressable, View} from 'react-native'
+import {Keyboard, Pressable, View} from 'react-native'
 import Animated, {
   cancelAnimation,
   runOnJS,
@@ -38,6 +38,7 @@ export function ActionsWrapper({
   // Reanimated's `runOnJS` doesn't like refs, so we can't use `runOnJS(menuControl.open)()`. Instead, we'll use this
   // function
   const open = useCallback(() => {
+    Keyboard.dismiss()
     menuControl.open()
   }, [menuControl])
 
diff --git a/src/screens/Messages/Conversation/MessagesList.tsx b/src/screens/Messages/Conversation/MessagesList.tsx
index b96dbd95b..e00cf11cd 100644
--- a/src/screens/Messages/Conversation/MessagesList.tsx
+++ b/src/screens/Messages/Conversation/MessagesList.tsx
@@ -225,6 +225,7 @@ export function MessagesList() {
             initialNumToRender={isWeb ? 50 : 25}
             maxToRenderPerBatch={isWeb ? 50 : 25}
             keyboardDismissMode="on-drag"
+            keyboardShouldPersistTaps="handled"
             maintainVisibleContentPosition={{
               minIndexForVisible: 1,
             }}