diff --git a/src/components/EmojiPicker/EmojiPicker.tsx b/src/components/EmojiPicker/EmojiPicker.tsx
index 40d3534736e3..642bbba7c635 100644
--- a/src/components/EmojiPicker/EmojiPicker.tsx
+++ b/src/components/EmojiPicker/EmojiPicker.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
+import React, {Activity, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
import type {ForwardedRef, RefObject} from 'react';
import {Dimensions, View} from 'react-native';
import type {Emoji} from '@assets/emojis/types';
@@ -265,15 +265,17 @@ function EmojiPicker({viewportOffsetTop, ref}: EmojiPickerProps) {
shouldWrapModalChildrenInScrollViewIfBottomDockedInLandscapeMode={false}
>
-
- {
- emojiSearchInput.current = el;
- }}
- />
-
+
+
+ {
+ emojiSearchInput.current = el;
+ }}
+ />
+
+
);
diff --git a/src/pages/inbox/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx b/src/pages/inbox/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
index 949ffdebca88..46d92156765e 100644
--- a/src/pages/inbox/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
+++ b/src/pages/inbox/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
@@ -1,6 +1,6 @@
import {useIsFocused} from '@react-navigation/native';
import {accountIDSelector} from '@selectors/Session';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import React, {Activity, useCallback, useEffect, useMemo, useState} from 'react';
import {View} from 'react-native';
import type {OnyxEntry} from 'react-native-onyx';
import AttachmentPicker from '@components/AttachmentPicker';
@@ -531,37 +531,39 @@ function AttachmentPickerWithMenuItems({
)}
- {
- setMenuVisibility(false);
- onItemSelected();
-
- // In order for the file picker to open dynamically, the click
- // function must be called from within a event handler that was initiated
- // by the user on Safari.
- if (index === menuItems.length - 1) {
- if (isSafari()) {
- triggerAttachmentPicker();
- return;
+
+ {
+ setMenuVisibility(false);
+ onItemSelected();
+
+ // In order for the file picker to open dynamically, the click
+ // function must be called from within a event handler that was initiated
+ // by the user on Safari.
+ if (index === menuItems.length - 1) {
+ if (isSafari()) {
+ triggerAttachmentPicker();
+ return;
+ }
+ close(() => {
+ triggerAttachmentPicker();
+ });
}
- close(() => {
- triggerAttachmentPicker();
- });
- }
- }}
- anchorPosition={popoverAnchorPosition ?? {horizontal: 0, vertical: 0}}
- anchorAlignment={{
- horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
- vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
- }}
- menuItems={menuItems}
- anchorRef={actionButtonRef}
- />
+ }}
+ anchorPosition={popoverAnchorPosition ?? {horizontal: 0, vertical: 0}}
+ anchorAlignment={{
+ horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
+ vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+ }}
+ menuItems={menuItems}
+ anchorRef={actionButtonRef}
+ />
+
>
);
}}