From 34968798802d9d11f269653df1675737989f294c Mon Sep 17 00:00:00 2001
From: Cong Pham <ptcong411@gmail.com>
Date: Sun, 2 Jun 2024 16:40:49 +0700
Subject: [PATCH 1/2] handle focus after edit report item

---
 src/pages/home/report/ReportActionItemMessageEdit.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionItemMessageEdit.tsx b/src/pages/home/report/ReportActionItemMessageEdit.tsx
index 6cb03e8dae05..0fabc3303d2e 100644
--- a/src/pages/home/report/ReportActionItemMessageEdit.tsx
+++ b/src/pages/home/report/ReportActionItemMessageEdit.tsx
@@ -2,7 +2,7 @@ import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import lodashDebounce from 'lodash/debounce';
 import type {ForwardedRef} from 'react';
 import React, {forwardRef, useCallback, useEffect, useMemo, useRef, useState} from 'react';
-import {Keyboard, View} from 'react-native';
+import {InteractionManager, Keyboard, View} from 'react-native';
 import type {NativeSyntheticEvent, TextInput, TextInputFocusEventData, TextInputKeyPressEventData} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import type {Emoji} from '@assets/emojis/types';
@@ -406,6 +406,11 @@ function ReportActionItemMessageEdit(
                             style={[styles.textInputCompose, styles.flex1, styles.bgTransparent]}
                             onFocus={() => {
                                 setIsFocused(true);
+                                InteractionManager.runAfterInteractions(() => {
+                                    requestAnimationFrame(() => {
+                                        reportScrollManager.scrollToIndex(index, true);
+                                    });
+                                });
                                 reportScrollManager.scrollToIndex(index, true);
                                 setShouldShowComposeInputKeyboardAware(false);
 

From 2c2e59808d8b9fe5f6d43dbd4e7b32f6cfc7889c Mon Sep 17 00:00:00 2001
From: Cong Pham <ptcong411@gmail.com>
Date: Mon, 3 Jun 2024 20:53:57 +0700
Subject: [PATCH 2/2] remove redundant code

---
 src/pages/home/report/ReportActionItemMessageEdit.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionItemMessageEdit.tsx b/src/pages/home/report/ReportActionItemMessageEdit.tsx
index 0fabc3303d2e..1483e9046d88 100644
--- a/src/pages/home/report/ReportActionItemMessageEdit.tsx
+++ b/src/pages/home/report/ReportActionItemMessageEdit.tsx
@@ -411,7 +411,6 @@ function ReportActionItemMessageEdit(
                                         reportScrollManager.scrollToIndex(index, true);
                                     });
                                 });
-                                reportScrollManager.scrollToIndex(index, true);
                                 setShouldShowComposeInputKeyboardAware(false);
 
                                 // Clear active report action when another action gets focused