Merge branch 'main' into patch-3

1 files changed, 5 insertions, 1 deletions

diff --git a/src/lib/hooks/useIntentHandler.ts b/src/lib/hooks/useIntentHandler.ts
index de9a96da9..d1e2de31d 100644
--- a/src/lib/hooks/useIntentHandler.ts
+++ b/src/lib/hooks/useIntentHandler.ts
@@ -3,6 +3,7 @@ import * as Linking from 'expo-linking'
 import {isNative} from 'platform/detection'
 import {useComposerControls} from 'state/shell'
 import {useSession} from 'state/session'
+import {useCloseAllActiveElements} from 'state/util'
 
 type IntentType = 'compose'
 
@@ -42,6 +43,7 @@ export function useIntentHandler() {
 }
 
 function useComposeIntent() {
+  const closeAllActiveElements = useCloseAllActiveElements()
   const {openComposer} = useComposerControls()
   const {hasSession} = useSession()
 
@@ -55,6 +57,8 @@ function useComposeIntent() {
     }) => {
       if (!hasSession) return
 
+      closeAllActiveElements()
+
       const imageUris = imageUrisStr
         ?.split(',')
         .filter(part => {
@@ -82,6 +86,6 @@ function useComposeIntent() {
         })
       }, 500)
     },
-    [openComposer, hasSession],
+    [hasSession, closeAllActiveElements, openComposer],
   )
 }