From df566ce08519f9e5d58a849cfc2036c2f6369e38 Mon Sep 17 00:00:00 2001
From: Julian Kobrynski <julian.kobrynski@callstack.com>
Date: Mon, 3 Feb 2025 16:01:55 +0100
Subject: [PATCH 01/29] add an option to display action buttons in tooltips

---
 .../ProductTrainingContext/TOOLTIPS.ts        |  2 +
 .../ProductTrainingContext/index.tsx          | 58 +++++++++++++------
 src/languages/en.ts                           |  2 +
 src/languages/es.ts                           |  2 +
 4 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/src/components/ProductTrainingContext/TOOLTIPS.ts b/src/components/ProductTrainingContext/TOOLTIPS.ts
index 2e553b21681a..fa907d040659 100644
--- a/src/components/ProductTrainingContext/TOOLTIPS.ts
+++ b/src/components/ProductTrainingContext/TOOLTIPS.ts
@@ -27,6 +27,7 @@ type TooltipData = {
     name: ProductTrainingTooltipName;
     priority: number;
     shouldShow: (props: ShouldShowConditionProps) => boolean;
+    shouldRenderActionButtons?: boolean;
 };
 
 const TOOLTIPS: Record<ProductTrainingTooltipName, TooltipData> = {
@@ -129,6 +130,7 @@ const TOOLTIPS: Record<ProductTrainingTooltipName, TooltipData> = {
         name: SCAN_TEST_TOOLTIP,
         priority: 900,
         shouldShow: () => false,
+        shouldRenderActionButtons: true,
     },
 };
 
diff --git a/src/components/ProductTrainingContext/index.tsx b/src/components/ProductTrainingContext/index.tsx
index a7806574126d..0d8a115f2a4e 100644
--- a/src/components/ProductTrainingContext/index.tsx
+++ b/src/components/ProductTrainingContext/index.tsx
@@ -1,6 +1,7 @@
 import React, {createContext, useCallback, useContext, useEffect, useMemo, useState} from 'react';
 import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
 import Text from '@components/Text';
@@ -176,35 +177,54 @@ const useProductTrainingContext = (tooltipName: ProductTrainingTooltipName, shou
     const renderProductTrainingTooltip = useCallback(() => {
         const tooltip = TOOLTIPS[tooltipName];
         return (
-            <View style={[styles.alignItemsCenter, styles.flexRow, styles.justifyContentCenter, styles.flexWrap, styles.textAlignCenter, styles.gap3, styles.p2]}>
-                <Icon
-                    src={Expensicons.Lightbulb}
-                    fill={theme.tooltipHighlightText}
-                    medium
-                />
-                <Text style={[styles.productTrainingTooltipText, styles.textWrap, styles.mw100]}>
-                    {tooltip.content.map(({text, isBold}) => {
-                        const translatedText = translate(text);
-                        return (
-                            <Text
-                                key={text}
-                                style={[styles.productTrainingTooltipText, isBold && styles.textBold]}
-                            >
-                                {translatedText}
-                            </Text>
-                        );
-                    })}
-                </Text>
+            <View>
+                <View style={[styles.alignItemsCenter, styles.flexRow, styles.justifyContentCenter, styles.flexWrap, styles.textAlignCenter, styles.gap3, styles.p2]}>
+                    <Icon
+                        src={Expensicons.Lightbulb}
+                        fill={theme.tooltipHighlightText}
+                        medium
+                    />
+                    <Text style={[styles.productTrainingTooltipText, styles.textWrap, styles.mw100]}>
+                        {tooltip.content.map(({text, isBold}) => {
+                            const translatedText = translate(text);
+                            return (
+                                <Text
+                                    key={text}
+                                    style={[styles.productTrainingTooltipText, isBold && styles.textBold]}
+                                >
+                                    {translatedText}
+                                </Text>
+                            );
+                        })}
+                    </Text>
+                </View>
+                {!!tooltip?.shouldRenderActionButtons && (
+                    <View style={[styles.alignItemsCenter, styles.justifyContentBetween, styles.flexRow, styles.ph1, styles.pb1]}>
+                        <Button
+                            success
+                            text={translate('productTrainingTooltip.scanTestTooltip.tryItOut')}
+                            style={[styles.flex1, styles.ph1]}
+                        />
+                        <Button
+                            text={translate('productTrainingTooltip.scanTestTooltip.noThanks')}
+                            style={[styles.flex1, styles.ph1]}
+                        />
+                    </View>
+                )}
             </View>
         );
     }, [
         styles.alignItemsCenter,
+        styles.flex1,
         styles.flexRow,
         styles.flexWrap,
         styles.gap3,
+        styles.justifyContentBetween,
         styles.justifyContentCenter,
         styles.mw100,
         styles.p2,
+        styles.pb1,
+        styles.ph1,
         styles.productTrainingTooltipText,
         styles.textAlignCenter,
         styles.textBold,
diff --git a/src/languages/en.ts b/src/languages/en.ts
index f2e4428bb6ae..4be67b29ba0a 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -5731,6 +5731,8 @@ const translations = {
             part6: 'Now,',
             part7: ' submit your expense',
             part8: ' and watch the magic happen!',
+            tryItOut: 'Try it out',
+            noThanks: 'No thanks',
         },
     },
     discardChangesConfirmation: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 9e44e060487d..91dc232ec783 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -6251,6 +6251,8 @@ const translations = {
             part6: 'Ahora,',
             part7: ' envía tu gasto y',
             part8: ' ¡observa cómo ocurre la magia!',
+            tryItOut: 'Prueba esto',
+            noThanks: 'No, gracias',
         },
     },
     discardChangesConfirmation: {

From 96f9177a34bdacc607b67fba4ec4bf36b8c1c319 Mon Sep 17 00:00:00 2001
From: kubabutkiewicz <jakub.butkiewicz94@gmail.com>
Date: Tue, 4 Feb 2025 16:06:58 +0100
Subject: [PATCH 02/29] add check for displaying Manager McTest as recipeint

---
 src/libs/OptionsListUtils.ts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index f15582254424..57b314a06ce1 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -12,6 +12,7 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {
     Beta,
+    DismissedProductTraining,
     Login,
     OnyxInputOrEntry,
     PersonalDetails,
@@ -38,6 +39,7 @@ import ModifiedExpenseMessage from './ModifiedExpenseMessage';
 import Navigation from './Navigation/Navigation';
 import Parser from './Parser';
 import Performance from './Performance';
+import Permissions from './Permissions';
 import {getDisplayNameOrDefault} from './PersonalDetailsUtils';
 import {addSMSDomainIfPhoneNumber, parsePhoneNumber} from './PhoneNumber';
 import {canSendInvoiceFromWorkspace} from './PolicyUtils';
@@ -400,6 +402,12 @@ Onyx.connect({
     callback: (value) => (activePolicyID = value),
 });
 
+let nvpDismissedProductTraining: OnyxEntry<DismissedProductTraining>;
+Onyx.connect({
+    key: ONYXKEYS.NVP_DISMISSED_PRODUCT_TRAINING,
+    callback: (value) => (nvpDismissedProductTraining = value),
+});
+
 /**
  * @param defaultValues {login: accountID} In workspace invite page, when new user is added we pass available data to opt in
  * @returns Returns avatar data for a list of user accountIDs
@@ -1408,6 +1416,13 @@ function getValidReports(
     return validReportOptions;
 }
 
+/**
+ * Whether user submitted already an expense or scanned receipt
+ */
+function getIsUserSubmittedExpenseOrScannedReceipt(): boolean {
+    return !!nvpDismissedProductTraining?.[CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.SCAN_TEST_TOOLTIP];
+}
+
 /**
  * Options are reports and personal details. This function filters out the options that are not valid to be displayed.
  */
@@ -1429,6 +1444,8 @@ function getValidOptions(
     const loginsToExclude: Record<string, boolean> = {
         [CONST.EMAIL.NOTIFICATIONS]: true,
         ...excludeLogins,
+        // Exclude Manager McTest if user submitted expense or scanned receipt and when selection is made from Create or Submit flow
+        [CONST.EMAIL.MANAGER_MCTEST]: !(Permissions.canUseManagerMcTest(config.betas) && !getIsUserSubmittedExpenseOrScannedReceipt() && config.action),
     };
     // If we're including selected options from the search results, we only want to exclude them if the search input is empty
     // This is because on certain pages, we show the selected options at the top when the search input is empty

From cbc2279df36acef01e8977208e0420f4f89e3319 Mon Sep 17 00:00:00 2001
From: kubabutkiewicz <jakub.butkiewicz94@gmail.com>
Date: Tue, 4 Feb 2025 18:17:45 +0100
Subject: [PATCH 03/29] add tests

---
 tests/unit/OptionsListUtilsTest.ts | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/tests/unit/OptionsListUtilsTest.ts b/tests/unit/OptionsListUtilsTest.ts
index 8c3618bf695c..a0d7806b167f 100644
--- a/tests/unit/OptionsListUtilsTest.ts
+++ b/tests/unit/OptionsListUtilsTest.ts
@@ -457,6 +457,15 @@ describe('OptionsListUtils', () => {
         },
     };
 
+    const PERSONAL_DETAILS_WITH_MANAGER_MCTEST: PersonalDetailsList = {
+        ...PERSONAL_DETAILS,
+        '1003': {
+            accountID: 1003,
+            displayName: 'Manager McTest',
+            login: CONST.EMAIL.MANAGER_MCTEST,
+            reportID: '',
+        },
+    };
     const policyID = 'ABC123';
 
     const POLICY: Policy = {
@@ -487,6 +496,8 @@ describe('OptionsListUtils', () => {
                 },
                 [`${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const]: POLICY,
                 [ONYXKEYS.NVP_ACTIVE_POLICY_ID]: activePolicyID,
+                [ONYXKEYS.NVP_DISMISSED_PRODUCT_TRAINING]: {},
+                [ONYXKEYS.BETAS]: [CONST.BETAS.NEWDOT_MANAGER_MCTEST],
             },
         });
         Onyx.registerLogger(() => {});
@@ -498,6 +509,7 @@ describe('OptionsListUtils', () => {
     let OPTIONS_WITH_CHRONOS: OptionsListUtils.OptionList;
     let OPTIONS_WITH_RECEIPTS: OptionsListUtils.OptionList;
     let OPTIONS_WITH_WORKSPACE_ROOM: OptionsListUtils.OptionList;
+    let OPTIONS_WITH_MANAGER_MCTEST: OptionsListUtils.OptionList;
 
     beforeEach(() => {
         Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}10`, reportNameValuePairs);
@@ -506,6 +518,7 @@ describe('OptionsListUtils', () => {
         OPTIONS_WITH_CHRONOS = OptionsListUtils.createOptionList(PERSONAL_DETAILS_WITH_CHRONOS, REPORTS_WITH_CHRONOS);
         OPTIONS_WITH_RECEIPTS = OptionsListUtils.createOptionList(PERSONAL_DETAILS_WITH_RECEIPTS, REPORTS_WITH_RECEIPTS);
         OPTIONS_WITH_WORKSPACE_ROOM = OptionsListUtils.createOptionList(PERSONAL_DETAILS, REPORTS_WITH_WORKSPACE_ROOMS);
+        OPTIONS_WITH_MANAGER_MCTEST = OptionsListUtils.createOptionList(PERSONAL_DETAILS_WITH_MANAGER_MCTEST);
     });
 
     it('getSearchOptions()', () => {
@@ -621,6 +634,23 @@ describe('OptionsListUtils', () => {
         // Filtering of personalDetails that have reports is done in filterOptions
         expect(results.personalDetails.length).toBe(Object.values(OPTIONS_WITH_RECEIPTS.personalDetails).length - 2);
         expect(results.personalDetails).not.toEqual(expect.arrayContaining([expect.objectContaining({login: 'receipts@expensify.com'})]));
+
+        // Test for check if Manager McTest is correctly included or excluded from the results
+        const options = OptionsListUtils.getValidOptions(
+            {reports: OPTIONS_WITH_MANAGER_MCTEST.reports, personalDetails: OPTIONS_WITH_MANAGER_MCTEST.personalDetails},
+            {includeP2P: true, action: 'create'},
+        );
+        expect(options.personalDetails).toEqual(expect.arrayContaining([expect.objectContaining({login: CONST.EMAIL.MANAGER_MCTEST})]));
+
+        return waitForBatchedUpdates()
+            .then(() => Onyx.set(ONYXKEYS.NVP_DISMISSED_PRODUCT_TRAINING, {[CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.SCAN_TEST_TOOLTIP]: new Date() as unknown as string}))
+            .then(() => {
+                const options1 = OptionsListUtils.getValidOptions(
+                    {reports: OPTIONS_WITH_MANAGER_MCTEST.reports, personalDetails: OPTIONS_WITH_MANAGER_MCTEST.personalDetails},
+                    {includeP2P: true, action: 'create'},
+                );
+                expect(options1.personalDetails).not.toEqual(expect.arrayContaining([expect.objectContaining({login: CONST.EMAIL.MANAGER_MCTEST})]));
+            });
     });
 
     it('getValidOptions() for group Chat', () => {

From 6abe419bd4c38310855801e6c3904d78406b33fe Mon Sep 17 00:00:00 2001
From: kubabutkiewicz <jakub.butkiewicz94@gmail.com>
Date: Tue, 4 Feb 2025 18:18:43 +0100
Subject: [PATCH 04/29] improve naming

---
 tests/unit/OptionsListUtilsTest.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unit/OptionsListUtilsTest.ts b/tests/unit/OptionsListUtilsTest.ts
index a0d7806b167f..be0088431145 100644
--- a/tests/unit/OptionsListUtilsTest.ts
+++ b/tests/unit/OptionsListUtilsTest.ts
@@ -645,11 +645,11 @@ describe('OptionsListUtils', () => {
         return waitForBatchedUpdates()
             .then(() => Onyx.set(ONYXKEYS.NVP_DISMISSED_PRODUCT_TRAINING, {[CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.SCAN_TEST_TOOLTIP]: new Date() as unknown as string}))
             .then(() => {
-                const options1 = OptionsListUtils.getValidOptions(
+                const optionsWhenUserAlreadySubmittedExpense = OptionsListUtils.getValidOptions(
                     {reports: OPTIONS_WITH_MANAGER_MCTEST.reports, personalDetails: OPTIONS_WITH_MANAGER_MCTEST.personalDetails},
                     {includeP2P: true, action: 'create'},
                 );
-                expect(options1.personalDetails).not.toEqual(expect.arrayContaining([expect.objectContaining({login: CONST.EMAIL.MANAGER_MCTEST})]));
+                expect(optionsWhenUserAlreadySubmittedExpense.personalDetails).not.toEqual(expect.arrayContaining([expect.objectContaining({login: CONST.EMAIL.MANAGER_MCTEST})]));
             });
     });
 

From 6108c901ec39bc0bc29822fa1554d0dff6df0a19 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 5 Feb 2025 13:08:18 +0100
Subject: [PATCH 05/29] Remove hybrid app check from getEnvironment

---
 src/libs/Environment/getEnvironment/index.native.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/libs/Environment/getEnvironment/index.native.ts b/src/libs/Environment/getEnvironment/index.native.ts
index 5dac0ad1d73e..6d298c3fdae9 100644
--- a/src/libs/Environment/getEnvironment/index.native.ts
+++ b/src/libs/Environment/getEnvironment/index.native.ts
@@ -1,4 +1,3 @@
-import {NativeModules} from 'react-native';
 import Config from 'react-native-config';
 import betaChecker from '@libs/Environment/betaChecker';
 import CONST from '@src/CONST';
@@ -29,12 +28,6 @@ function getEnvironment(): Promise<Environment> {
             return;
         }
 
-        // If we don't use Development, and we're in the HybridApp, we should use Production
-        if (NativeModules.HybridAppModule) {
-            environment = CONST.ENVIRONMENT.PRODUCTION;
-            return;
-        }
-
         // If we haven't set the environment yet and we aren't on dev/adhoc, check to see if this is a beta build
         betaChecker.isBetaBuild().then((isBeta) => {
             environment = isBeta ? CONST.ENVIRONMENT.STAGING : CONST.ENVIRONMENT.PRODUCTION;

From 0664f7e0ac6a25916518f670846a6e0bbbaca3d5 Mon Sep 17 00:00:00 2001
From: kubabutkiewicz <jakub.butkiewicz94@gmail.com>
Date: Wed, 5 Feb 2025 13:25:58 +0100
Subject: [PATCH 06/29] fix tests

---
 tests/unit/OptionsListUtilsTest.ts | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/unit/OptionsListUtilsTest.ts b/tests/unit/OptionsListUtilsTest.ts
index be0088431145..d807b87283b6 100644
--- a/tests/unit/OptionsListUtilsTest.ts
+++ b/tests/unit/OptionsListUtilsTest.ts
@@ -497,7 +497,6 @@ describe('OptionsListUtils', () => {
                 [`${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const]: POLICY,
                 [ONYXKEYS.NVP_ACTIVE_POLICY_ID]: activePolicyID,
                 [ONYXKEYS.NVP_DISMISSED_PRODUCT_TRAINING]: {},
-                [ONYXKEYS.BETAS]: [CONST.BETAS.NEWDOT_MANAGER_MCTEST],
             },
         });
         Onyx.registerLogger(() => {});
@@ -636,18 +635,27 @@ describe('OptionsListUtils', () => {
         expect(results.personalDetails).not.toEqual(expect.arrayContaining([expect.objectContaining({login: 'receipts@expensify.com'})]));
 
         // Test for check if Manager McTest is correctly included or excluded from the results
-        const options = OptionsListUtils.getValidOptions(
+        let options = OptionsListUtils.getValidOptions(
             {reports: OPTIONS_WITH_MANAGER_MCTEST.reports, personalDetails: OPTIONS_WITH_MANAGER_MCTEST.personalDetails},
-            {includeP2P: true, action: 'create'},
+            {includeP2P: true, action: 'create', betas: [CONST.BETAS.NEWDOT_MANAGER_MCTEST]},
         );
         expect(options.personalDetails).toEqual(expect.arrayContaining([expect.objectContaining({login: CONST.EMAIL.MANAGER_MCTEST})]));
 
+        // Manager McTest shouldn't be included to recipients when its not an IOU action
+        options = OptionsListUtils.getValidOptions(
+            {reports: OPTIONS_WITH_MANAGER_MCTEST.reports, personalDetails: OPTIONS_WITH_MANAGER_MCTEST.personalDetails},
+            {includeP2P: true, betas: [CONST.BETAS.NEWDOT_MANAGER_MCTEST]},
+        );
+
+        expect(options.personalDetails).not.toEqual(expect.arrayContaining([expect.objectContaining({login: CONST.EMAIL.MANAGER_MCTEST})]));
+
         return waitForBatchedUpdates()
             .then(() => Onyx.set(ONYXKEYS.NVP_DISMISSED_PRODUCT_TRAINING, {[CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.SCAN_TEST_TOOLTIP]: new Date() as unknown as string}))
             .then(() => {
+                // Manager McTest shouldn't be included to recipients when the user has already submitted an expense
                 const optionsWhenUserAlreadySubmittedExpense = OptionsListUtils.getValidOptions(
                     {reports: OPTIONS_WITH_MANAGER_MCTEST.reports, personalDetails: OPTIONS_WITH_MANAGER_MCTEST.personalDetails},
-                    {includeP2P: true, action: 'create'},
+                    {includeP2P: true, action: 'create', betas: [CONST.BETAS.NEWDOT_MANAGER_MCTEST]},
                 );
                 expect(optionsWhenUserAlreadySubmittedExpense.personalDetails).not.toEqual(expect.arrayContaining([expect.objectContaining({login: CONST.EMAIL.MANAGER_MCTEST})]));
             });

From f1a42df76acd0f7a3b9e91c0075ddb81377b38b4 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Wed, 5 Feb 2025 20:25:10 +0100
Subject: [PATCH 07/29] debug

---
 src/components/LHNOptionsList/LHNOptionsList.tsx | 11 ++++++++++-
 src/hooks/useLHNEstimatedListSize/index.ts       | 14 ++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/components/LHNOptionsList/LHNOptionsList.tsx b/src/components/LHNOptionsList/LHNOptionsList.tsx
index 841fb55380e2..0759b32df11b 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.tsx
+++ b/src/components/LHNOptionsList/LHNOptionsList.tsx
@@ -242,9 +242,15 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
     );
 
     const onLayout = useCallback(() => {
+        // eslint-disable-next-line no-console
+        console.group('[dev] LHNOptionsList onLayout');
         const offset = getScrollOffset(route);
+        console.debug('[dev] offset', offset);
 
         if (!(offset && flashListRef.current)) {
+            console.debug('[dev] return');
+            // eslint-disable-next-line no-console
+            console.groupEnd();
             return;
         }
 
@@ -253,7 +259,10 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
             if (!(offset && flashListRef.current)) {
                 return;
             }
-            flashListRef.current.scrollToOffset({offset});
+            console.debug('[dev] scrollToOffset');
+            // eslint-disable-next-line no-console
+            console.groupEnd();
+            flashListRef.current.scrollToOffset({offset, animated: false});
         });
     }, [route, flashListRef, getScrollOffset]);
 
diff --git a/src/hooks/useLHNEstimatedListSize/index.ts b/src/hooks/useLHNEstimatedListSize/index.ts
index d9b5cb9d3ec0..a26e7a8f65eb 100644
--- a/src/hooks/useLHNEstimatedListSize/index.ts
+++ b/src/hooks/useLHNEstimatedListSize/index.ts
@@ -1,8 +1,18 @@
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import variables from '@styles/variables';
 import type UseLHNEstimatedListSize from './types';
 
 /**
- * This is the web implementation. It is intentionally left unimplemented because it does not function correctly on the web.
+ * This a native specific implementation for FlashList of LHNOptionsList. It calculates estimated visible height and width of the list. It is not the scroll content size. Defining this prop will enable the list to be rendered immediately. Without it, the list first needs to measure its size, leading to a small delay during the first render.
  */
-const useLHNEstimatedListSize: UseLHNEstimatedListSize = () => undefined;
+const useLHNEstimatedListSize: UseLHNEstimatedListSize = () => {
+    const {windowHeight, windowWidth} = useWindowDimensions();
+    const listHeight = windowHeight - variables.bottomTabHeight;
+
+    return {
+        height: listHeight,
+        width: windowWidth,
+    };
+};
 
 export default useLHNEstimatedListSize;

From f4a8f96c2673f4ad315834cfd11a3bb5fdeb2b13 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Thu, 6 Feb 2025 16:28:20 +0100
Subject: [PATCH 08/29] revert useLHNEstimatedListSize

---
 src/hooks/useLHNEstimatedListSize/index.ts | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/hooks/useLHNEstimatedListSize/index.ts b/src/hooks/useLHNEstimatedListSize/index.ts
index a26e7a8f65eb..d9b5cb9d3ec0 100644
--- a/src/hooks/useLHNEstimatedListSize/index.ts
+++ b/src/hooks/useLHNEstimatedListSize/index.ts
@@ -1,18 +1,8 @@
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import variables from '@styles/variables';
 import type UseLHNEstimatedListSize from './types';
 
 /**
- * This a native specific implementation for FlashList of LHNOptionsList. It calculates estimated visible height and width of the list. It is not the scroll content size. Defining this prop will enable the list to be rendered immediately. Without it, the list first needs to measure its size, leading to a small delay during the first render.
+ * This is the web implementation. It is intentionally left unimplemented because it does not function correctly on the web.
  */
-const useLHNEstimatedListSize: UseLHNEstimatedListSize = () => {
-    const {windowHeight, windowWidth} = useWindowDimensions();
-    const listHeight = windowHeight - variables.bottomTabHeight;
-
-    return {
-        height: listHeight,
-        width: windowWidth,
-    };
-};
+const useLHNEstimatedListSize: UseLHNEstimatedListSize = () => undefined;
 
 export default useLHNEstimatedListSize;

From 294962f6601b297adde5315c42e697945348c4ee Mon Sep 17 00:00:00 2001
From: FitseTLT <engfitsum@gmail.com>
Date: Thu, 6 Feb 2025 19:11:09 +0300
Subject: [PATCH 09/29] show loading on submit button after confirmed

---
 src/components/MoneyRequestConfirmationList.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx
index 5b3877050e7a..00aca3b48d7b 100755
--- a/src/components/MoneyRequestConfirmationList.tsx
+++ b/src/components/MoneyRequestConfirmationList.tsx
@@ -959,6 +959,7 @@ function MoneyRequestConfirmationList({
                 }}
                 enterKeyEventListenerPriority={1}
                 useKeyboardShortcuts
+                isLoading={isConfirmed}
             />
         ) : (
             <ButtonWithDropdownMenu
@@ -967,6 +968,7 @@ function MoneyRequestConfirmationList({
                 options={splitOrRequestOptions}
                 buttonSize={CONST.DROPDOWN_BUTTON_SIZE.LARGE}
                 enterKeyEventListenerPriority={1}
+                isLoading={isConfirmed}
                 useKeyboardShortcuts
             />
         );
@@ -984,7 +986,7 @@ function MoneyRequestConfirmationList({
                 {button}
             </>
         );
-    }, [isReadOnly, iouType, confirm, bankAccountRoute, iouCurrencyCode, policyID, splitOrRequestOptions, styles.ph1, styles.mb2, errorMessage]);
+    }, [isReadOnly, iouType, confirm, isConfirmed, bankAccountRoute, iouCurrencyCode, policyID, splitOrRequestOptions, styles.ph1, styles.mb2, errorMessage]);
 
     const listFooterContent = (
         <MoneyRequestConfirmationListFooter

From eba049a86da15fbceac8c0b88131736a29100ddb Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Thu, 6 Feb 2025 18:34:08 +0100
Subject: [PATCH 10/29] Add scroll index management to
 ScrollOffsetContextProvider

---
 .../ScrollOffsetContextProvider.tsx           | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/components/ScrollOffsetContextProvider.tsx b/src/components/ScrollOffsetContextProvider.tsx
index 78d8c5ed61fb..232b4809a6e7 100644
--- a/src/components/ScrollOffsetContextProvider.tsx
+++ b/src/components/ScrollOffsetContextProvider.tsx
@@ -16,6 +16,12 @@ type ScrollOffsetContextValue = {
     /** Get scroll offset value for given screen */
     getScrollOffset: (route: PlatformStackRouteProp<ParamListBase>) => number | undefined;
 
+    /** Save scroll index of flashlist on given screen */
+    saveScrollIndex: (route: PlatformStackRouteProp<ParamListBase>, scrollIndex: number) => void;
+
+    /** Get scroll index value for given screen */
+    getScrollIndex: (route: PlatformStackRouteProp<ParamListBase>) => number | undefined;
+
     /** Clean scroll offsets of screen that aren't anymore in the state */
     cleanStaleScrollOffsets: (state: State) => void;
 };
@@ -87,13 +93,26 @@ function ScrollOffsetContextProvider({children, priorityMode}: ScrollOffsetConte
         }
     }, []);
 
+    const saveScrollIndex: ScrollOffsetContextValue['saveScrollIndex'] = useCallback((route, scrollIndex) => {
+        scrollOffsetsRef.current[getKey(route)] = scrollIndex;
+    }, []);
+
+    const getScrollIndex: ScrollOffsetContextValue['getScrollIndex'] = useCallback((route) => {
+        if (!scrollOffsetsRef.current) {
+            return;
+        }
+        return scrollOffsetsRef.current[getKey(route)];
+    }, []);
+
     const contextValue = useMemo(
         (): ScrollOffsetContextValue => ({
             saveScrollOffset,
             getScrollOffset,
             cleanStaleScrollOffsets,
+            saveScrollIndex,
+            getScrollIndex,
         }),
-        [saveScrollOffset, getScrollOffset, cleanStaleScrollOffsets],
+        [saveScrollOffset, getScrollOffset, cleanStaleScrollOffsets, saveScrollIndex, getScrollIndex],
     );
 
     return <ScrollOffsetContext.Provider value={contextValue}>{children}</ScrollOffsetContext.Provider>;

From 4619a3a3f00d6111e15b45ca9f20beaf3a554626 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Thu, 6 Feb 2025 18:34:57 +0100
Subject: [PATCH 11/29] Add scroll index management to LHNOptionsList component

---
 src/components/LHNOptionsList/LHNOptionsList.tsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/LHNOptionsList/LHNOptionsList.tsx b/src/components/LHNOptionsList/LHNOptionsList.tsx
index 0759b32df11b..2bb1c6ed1e79 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.tsx
+++ b/src/components/LHNOptionsList/LHNOptionsList.tsx
@@ -31,7 +31,7 @@ import type {LHNOptionsListProps, RenderItemProps} from './types';
 const keyExtractor = (item: string) => `report_${item}`;
 
 function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optionMode, shouldDisableFocusOptions = false, onFirstItemRendered = () => {}}: LHNOptionsListProps) {
-    const {saveScrollOffset, getScrollOffset} = useContext(ScrollOffsetContext);
+    const {saveScrollOffset, getScrollOffset, saveScrollIndex, getScrollIndex} = useContext(ScrollOffsetContext);
     const flashListRef = useRef<FlashList<string>>(null);
     const route = useRoute();
 
@@ -49,6 +49,7 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
     const {translate, preferredLocale} = useLocalize();
     const estimatedListSize = useLHNEstimatedListSize();
     const shouldShowEmptyLHN = data.length === 0;
+    const estimatedItemSize = optionMode === CONST.OPTION_MODE.COMPACT ? variables.optionRowHeightCompact : variables.optionRowHeight;
 
     // When the first item renders we want to call the onFirstItemRendered callback.
     // At this point in time we know that the list is actually displaying items.
@@ -237,8 +238,9 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
                 return;
             }
             saveScrollOffset(route, e.nativeEvent.contentOffset.y);
+            saveScrollIndex(route, Math.ceil(e.nativeEvent.contentOffset.y / estimatedItemSize));
         },
-        [route, saveScrollOffset],
+        [estimatedItemSize, route, saveScrollIndex, saveScrollOffset],
     );
 
     const onLayout = useCallback(() => {
@@ -254,6 +256,8 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
             return;
         }
 
+        return;
+
         // We need to use requestAnimationFrame to make sure it will scroll properly on iOS.
         requestAnimationFrame(() => {
             if (!(offset && flashListRef.current)) {
@@ -288,12 +292,13 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
                     testID="lhn-options-list"
                     keyExtractor={keyExtractor}
                     renderItem={renderItem}
-                    estimatedItemSize={optionMode === CONST.OPTION_MODE.COMPACT ? variables.optionRowHeightCompact : variables.optionRowHeight}
+                    estimatedItemSize={estimatedItemSize}
                     extraData={extraData}
                     showsVerticalScrollIndicator={false}
                     onLayout={onLayout}
                     onScroll={onScroll}
                     estimatedListSize={estimatedListSize}
+                    initialScrollIndex={getScrollIndex(route)}
                 />
             )}
         </View>

From 1b596fd5e6ced5bc0d4e04479c52601e3cc75d3d Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Thu, 6 Feb 2025 18:37:16 +0100
Subject: [PATCH 12/29] Add scroll index management to
 ScrollOffsetContextProvider

---
 src/components/ScrollOffsetContextProvider.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/ScrollOffsetContextProvider.tsx b/src/components/ScrollOffsetContextProvider.tsx
index 232b4809a6e7..98340ea6d994 100644
--- a/src/components/ScrollOffsetContextProvider.tsx
+++ b/src/components/ScrollOffsetContextProvider.tsx
@@ -39,6 +39,8 @@ type ScrollOffsetContextProviderProps = ScrollOffsetContextProviderOnyxProps & {
 const defaultValue: ScrollOffsetContextValue = {
     saveScrollOffset: () => {},
     getScrollOffset: () => undefined,
+    saveScrollIndex: () => {},
+    getScrollIndex: () => undefined,
     cleanStaleScrollOffsets: () => {},
 };
 

From b08e3ec9b1aad127970aeb6cd00030b2e4df03ff Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Thu, 6 Feb 2025 18:41:18 +0100
Subject: [PATCH 13/29] Refactor LHNOptionsList to improve scroll index
 calculation and add platform checks

---
 .../LHNOptionsList/LHNOptionsList.tsx         | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/components/LHNOptionsList/LHNOptionsList.tsx b/src/components/LHNOptionsList/LHNOptionsList.tsx
index 2bb1c6ed1e79..08c957927930 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.tsx
+++ b/src/components/LHNOptionsList/LHNOptionsList.tsx
@@ -17,6 +17,7 @@ import usePrevious from '@hooks/usePrevious';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {isValidDraftComment} from '@libs/DraftCommentUtils';
+import getPlatform from '@libs/getPlatform';
 import {getIOUReportIDOfLastAction, getLastMessageTextForReport} from '@libs/OptionsListUtils';
 import {getOriginalMessage, getSortedReportActionsForDisplay, isMoneyRequestAction} from '@libs/ReportActionsUtils';
 import {canUserPerformWriteAction} from '@libs/ReportUtils';
@@ -50,6 +51,8 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
     const estimatedListSize = useLHNEstimatedListSize();
     const shouldShowEmptyLHN = data.length === 0;
     const estimatedItemSize = optionMode === CONST.OPTION_MODE.COMPACT ? variables.optionRowHeightCompact : variables.optionRowHeight;
+    const platform = getPlatform();
+    const isWebOrDesktop = platform === CONST.PLATFORM.WEB || platform === CONST.PLATFORM.DESKTOP;
 
     // When the first item renders we want to call the onFirstItemRendered callback.
     // At this point in time we know that the list is actually displaying items.
@@ -238,37 +241,26 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
                 return;
             }
             saveScrollOffset(route, e.nativeEvent.contentOffset.y);
-            saveScrollIndex(route, Math.ceil(e.nativeEvent.contentOffset.y / estimatedItemSize));
+            saveScrollIndex(route, Math.floor(e.nativeEvent.contentOffset.y / estimatedItemSize));
         },
         [estimatedItemSize, route, saveScrollIndex, saveScrollOffset],
     );
 
     const onLayout = useCallback(() => {
-        // eslint-disable-next-line no-console
-        console.group('[dev] LHNOptionsList onLayout');
         const offset = getScrollOffset(route);
-        console.debug('[dev] offset', offset);
 
-        if (!(offset && flashListRef.current)) {
-            console.debug('[dev] return');
-            // eslint-disable-next-line no-console
-            console.groupEnd();
+        if (!(offset && flashListRef.current) || isWebOrDesktop) {
             return;
         }
 
-        return;
-
         // We need to use requestAnimationFrame to make sure it will scroll properly on iOS.
         requestAnimationFrame(() => {
             if (!(offset && flashListRef.current)) {
                 return;
             }
-            console.debug('[dev] scrollToOffset');
-            // eslint-disable-next-line no-console
-            console.groupEnd();
-            flashListRef.current.scrollToOffset({offset, animated: false});
+            flashListRef.current.scrollToOffset({offset, animated: true});
         });
-    }, [route, flashListRef, getScrollOffset]);
+    }, [getScrollOffset, route, isWebOrDesktop]);
 
     return (
         <View style={[style ?? styles.flex1, shouldShowEmptyLHN ? styles.emptyLHNWrapper : undefined]}>

From 6f0c65a89910acdd7b6a2241192fe9c6659e0a59 Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Thu, 6 Feb 2025 18:44:23 -0800
Subject: [PATCH 14/29] Use vars.OP_VAULT for 1Password vault

---
 .../composite/setupGitForOSBotify/action.yml  |  2 +-
 .../setupGitForOSBotifyApp/action.yml         |  2 +-
 .github/workflows/androidBump.yml             |  2 +-
 .github/workflows/buildAndroid.yml            |  2 +-
 .github/workflows/compareNDandODbuilds.yml    | 12 +++---
 .github/workflows/deploy.yml                  | 38 +++++++++----------
 .github/workflows/testBuild.yml               | 12 +++---
 .github/workflows/testBuildHybrid.yml         | 18 ++++-----
 8 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/.github/actions/composite/setupGitForOSBotify/action.yml b/.github/actions/composite/setupGitForOSBotify/action.yml
index 9495ba07b0ac..adf90789976c 100644
--- a/.github/actions/composite/setupGitForOSBotify/action.yml
+++ b/.github/actions/composite/setupGitForOSBotify/action.yml
@@ -16,7 +16,7 @@ runs:
       shell: bash
       env:
         OP_SERVICE_ACCOUNT_TOKEN: ${{ inputs.OP_SERVICE_ACCOUNT_TOKEN }}
-      run: op read "op://Mobile-Deploy-CI/OSBotify-private-key.asc/OSBotify-private-key.asc" --force --out-file ./OSBotify-private-key.asc
+      run: op read "op://${{ vars.OP_VAULT }}/OSBotify-private-key.asc/OSBotify-private-key.asc" --force --out-file ./OSBotify-private-key.asc
 
     - name: Import OSBotify GPG Key
       shell: bash
diff --git a/.github/actions/composite/setupGitForOSBotifyApp/action.yml b/.github/actions/composite/setupGitForOSBotifyApp/action.yml
index 128dcf48e934..559bff9a648b 100644
--- a/.github/actions/composite/setupGitForOSBotifyApp/action.yml
+++ b/.github/actions/composite/setupGitForOSBotifyApp/action.yml
@@ -31,7 +31,7 @@ runs:
       shell: bash
       env:
         OP_SERVICE_ACCOUNT_TOKEN: ${{ inputs.OP_SERVICE_ACCOUNT_TOKEN }}
-      run: op read "op://Mobile-Deploy-CI/OSBotify-private-key.asc/OSBotify-private-key.asc" --force --out-file ./OSBotify-private-key.asc
+      run: op read "op://${{ vars.OP_VAULT }}/OSBotify-private-key.asc/OSBotify-private-key.asc" --force --out-file ./OSBotify-private-key.asc
 
     - name: Import OSBotify GPG Key
       shell: bash
diff --git a/.github/workflows/androidBump.yml b/.github/workflows/androidBump.yml
index 5ea71c028e15..56955c8809cd 100644
--- a/.github/workflows/androidBump.yml
+++ b/.github/workflows/androidBump.yml
@@ -28,7 +28,7 @@ jobs:
         working-directory: android/app
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
-        run: op read "op://Mobile-Deploy-CI/android-fastlane-json-key.json/android-fastlane-json-key.json" --force --out-file ./android-fastlane-json-key.json
+        run: op read "op://${{ vars.OP_VAULT }}/android-fastlane-json-key.json/android-fastlane-json-key.json" --force --out-file ./android-fastlane-json-key.json
 
       - name: Get status from Google Play and generate next rollout percentage
         id: checkAndroidStatus
diff --git a/.github/workflows/buildAndroid.yml b/.github/workflows/buildAndroid.yml
index c4d33b00bef4..404a8b48a0f0 100644
--- a/.github/workflows/buildAndroid.yml
+++ b/.github/workflows/buildAndroid.yml
@@ -92,7 +92,7 @@ jobs:
         working-directory: android/app
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
-        run: op read "op://Mobile-Deploy-CI/New Expensify my-upload-key.keystore/my-upload-key.keystore" --force --out-file ./my-upload-key.keystore
+        run: op read "op://${{ vars.OP_VAULT }}/New Expensify my-upload-key.keystore/my-upload-key.keystore" --force --out-file ./my-upload-key.keystore
 
       - name: Get package version
         id: getPackageVersion
diff --git a/.github/workflows/compareNDandODbuilds.yml b/.github/workflows/compareNDandODbuilds.yml
index 99a5de896501..fb555085cb31 100644
--- a/.github/workflows/compareNDandODbuilds.yml
+++ b/.github/workflows/compareNDandODbuilds.yml
@@ -57,8 +57,8 @@ jobs:
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
         run: |
-          op read "op://Mobile-Deploy-CI/android-fastlane-json-key.json/android-fastlane-json-key.json" --force --out-file ./android-fastlane-json-key.json
-          op read "op://Mobile-Deploy-CI/New Expensify my-upload-key.keystore/my-upload-key.keystore" --force --out-file ./my-upload-key.keystore
+          op read "op://${{ vars.OP_VAULT }}/android-fastlane-json-key.json/android-fastlane-json-key.json" --force --out-file ./android-fastlane-json-key.json
+          op read "op://${{ vars.OP_VAULT }}/New Expensify my-upload-key.keystore/my-upload-key.keystore" --force --out-file ./my-upload-key.keystore
           
           # Copy the keystore to the Android directory for Fullstory
           cp ./upload-key.keystore Mobile-Expensify/Android 
@@ -70,9 +70,9 @@ jobs:
           export-env: false
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
-          ANDROID_UPLOAD_KEYSTORE_PASSWORD: op://Mobile-Deploy-CI/Repository-Secrets/ANDROID_UPLOAD_KEYSTORE_PASSWORD
-          ANDROID_UPLOAD_KEYSTORE_ALIAS: op://Mobile-Deploy-CI/Repository-Secrets/ANDROID_UPLOAD_KEYSTORE_ALIAS
-          ANDROID_UPLOAD_KEY_PASSWORD: op://Mobile-Deploy-CI/Repository-Secrets/ANDROID_UPLOAD_KEY_PASSWORD
+          ANDROID_UPLOAD_KEYSTORE_PASSWORD: op://${{ vars.OP_VAULT }}/Repository-Secrets/ANDROID_UPLOAD_KEYSTORE_PASSWORD
+          ANDROID_UPLOAD_KEYSTORE_ALIAS: op://${{ vars.OP_VAULT }}/Repository-Secrets/ANDROID_UPLOAD_KEYSTORE_ALIAS
+          ANDROID_UPLOAD_KEY_PASSWORD: op://${{ vars.OP_VAULT }}/Repository-Secrets/ANDROID_UPLOAD_KEY_PASSWORD
 
       - name: Build Android Release
         working-directory: Mobile-Expensify/Android
@@ -113,7 +113,7 @@ jobs:
         working-directory: android/app
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
-        run: op read "op://Mobile-Deploy-CI/New Expensify my-upload-key.keystore/my-upload-key.keystore" --force --out-file ./my-upload-key.keystore
+        run: op read "op://${{ vars.OP_VAULT }}/New Expensify my-upload-key.keystore/my-upload-key.keystore" --force --out-file ./my-upload-key.keystore
 
       - name: Build Android Release
         working-directory: android
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 75a1fd773a2d..e0d8d0db7119 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -91,7 +91,7 @@ jobs:
         working-directory: android/app
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
-        run: op read "op://Mobile-Deploy-CI/android-fastlane-json-key.json/android-fastlane-json-key.json" --force --out-file ./android-fastlane-json-key.json
+        run: op read "op://${{ vars.OP_VAULT }}/android-fastlane-json-key.json/android-fastlane-json-key.json" --force --out-file ./android-fastlane-json-key.json
 
       - name: Upload Android app to Google Play
         run: bundle exec fastlane android upload_google_play_internal
@@ -155,9 +155,9 @@ jobs:
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
         run: |
-          op read "op://Mobile-Deploy-CI/firebase.json/firebase.json" --force --out-file ./firebase.json
-          op read "op://Mobile-Deploy-CI/upload-key.keystore/upload-key.keystore" --force --out-file ./upload-key.keystore
-          op read "op://Mobile-Deploy-CI/android-fastlane-json-key.json/android-fastlane-json-key.json" --force --out-file ./android-fastlane-json-key.json
+          op read "op://${{ vars.OP_VAULT }}/firebase.json/firebase.json" --force --out-file ./firebase.json
+          op read "op://${{ vars.OP_VAULT }}/upload-key.keystore/upload-key.keystore" --force --out-file ./upload-key.keystore
+          op read "op://${{ vars.OP_VAULT }}/android-fastlane-json-key.json/android-fastlane-json-key.json" --force --out-file ./android-fastlane-json-key.json
 
           # Copy the keystore to the Android directory for Fullstory
           cp ./upload-key.keystore Mobile-Expensify/Android 
@@ -169,9 +169,9 @@ jobs:
           export-env: false
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
-          ANDROID_UPLOAD_KEYSTORE_PASSWORD: op://Mobile-Deploy-CI/Repository-Secrets/ANDROID_UPLOAD_KEYSTORE_PASSWORD
-          ANDROID_UPLOAD_KEYSTORE_ALIAS: op://Mobile-Deploy-CI/Repository-Secrets/ANDROID_UPLOAD_KEYSTORE_ALIAS
-          ANDROID_UPLOAD_KEY_PASSWORD: op://Mobile-Deploy-CI/Repository-Secrets/ANDROID_UPLOAD_KEY_PASSWORD
+          ANDROID_UPLOAD_KEYSTORE_PASSWORD: op://${{ vars.OP_VAULT }}/Repository-Secrets/ANDROID_UPLOAD_KEYSTORE_PASSWORD
+          ANDROID_UPLOAD_KEYSTORE_ALIAS: op://${{ vars.OP_VAULT }}/Repository-Secrets/ANDROID_UPLOAD_KEYSTORE_ALIAS
+          ANDROID_UPLOAD_KEY_PASSWORD: op://${{ vars.OP_VAULT }}/Repository-Secrets/ANDROID_UPLOAD_KEY_PASSWORD
 
       - name: Get Android native version
         id: getAndroidVersion
@@ -295,8 +295,8 @@ jobs:
           export-env: false
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
-          DESKTOP_CERTIFICATE_BASE64: "op://Mobile-Deploy-CI/Desktop Certificates.p12/CSC_LINK"
-          DESKTOP_CERTIFICATE_PASSWORD: "op://Mobile-Deploy-CI/Desktop Certificates.p12/CSC_KEY_PASSWORD"
+          DESKTOP_CERTIFICATE_BASE64: "op://${{ vars.OP_VAULT }}/Desktop Certificates.p12/CSC_LINK"
+          DESKTOP_CERTIFICATE_PASSWORD: "op://${{ vars.OP_VAULT }}/Desktop Certificates.p12/CSC_KEY_PASSWORD"
 
       - name: Build desktop app
         run: |
@@ -375,10 +375,10 @@ jobs:
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
         run: |
-          op read "op://Mobile-Deploy-CI/NewApp_AppStore/NewApp_AppStore.mobileprovision" --force --out-file ./NewApp_AppStore.mobileprovision
-          op read "op://Mobile-Deploy-CI/NewApp_AppStore_Notification_Service/NewApp_AppStore_Notification_Service.mobileprovision" --force --out-file ./NewApp_AppStore_Notification_Service.mobileprovision
-          op read "op://Mobile-Deploy-CI/New Expensify Distribution Certificate/Certificates.p12" --force --out-file ./Certificates.p12
-          op read "op://Mobile-Deploy-CI/ios-fastlane-json-key.json/ios-fastlane-json-key.json" --force --out-file ./ios-fastlane-json-key.json
+          op read "op://${{ vars.OP_VAULT }}/NewApp_AppStore/NewApp_AppStore.mobileprovision" --force --out-file ./NewApp_AppStore.mobileprovision
+          op read "op://${{ vars.OP_VAULT }}/NewApp_AppStore_Notification_Service/NewApp_AppStore_Notification_Service.mobileprovision" --force --out-file ./NewApp_AppStore_Notification_Service.mobileprovision
+          op read "op://${{ vars.OP_VAULT }}/New Expensify Distribution Certificate/Certificates.p12" --force --out-file ./Certificates.p12
+          op read "op://${{ vars.OP_VAULT }}/ios-fastlane-json-key.json/ios-fastlane-json-key.json" --force --out-file ./ios-fastlane-json-key.json
 
       - name: Get iOS native version
         id: getIOSVersion
@@ -498,12 +498,12 @@ jobs:
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
         run: |
-          op read "op://Mobile-Deploy-CI/firebase.json/firebase.json" --force --out-file ./firebase.json
-          op read "op://Mobile-Deploy-CI/OldApp_AppStore/OldApp_AppStore.mobileprovision" --force --out-file ./OldApp_AppStore.mobileprovision
-          op read "op://Mobile-Deploy-CI/OldApp_AppStore_Share_Extension/OldApp_AppStore_Share_Extension.mobileprovision" --force --out-file ./OldApp_AppStore_Share_Extension.mobileprovision
-          op read "op://Mobile-Deploy-CI/OldApp_AppStore_Notification_Service/OldApp_AppStore_Notification_Service.mobileprovision" --force --out-file ./OldApp_AppStore_Notification_Service.mobileprovision
-          op read "op://Mobile-Deploy-CI/ios-fastlane-json-key.json/ios-fastlane-json-key.json" --force --out-file ./ios-fastlane-json-key.json
-          op read "op://Mobile-Deploy-CI/New Expensify Distribution Certificate/Certificates.p12" --force --out-file ./Certificates.p12
+          op read "op://${{ vars.OP_VAULT }}/firebase.json/firebase.json" --force --out-file ./firebase.json
+          op read "op://${{ vars.OP_VAULT }}/OldApp_AppStore/OldApp_AppStore.mobileprovision" --force --out-file ./OldApp_AppStore.mobileprovision
+          op read "op://${{ vars.OP_VAULT }}/OldApp_AppStore_Share_Extension/OldApp_AppStore_Share_Extension.mobileprovision" --force --out-file ./OldApp_AppStore_Share_Extension.mobileprovision
+          op read "op://${{ vars.OP_VAULT }}/OldApp_AppStore_Notification_Service/OldApp_AppStore_Notification_Service.mobileprovision" --force --out-file ./OldApp_AppStore_Notification_Service.mobileprovision
+          op read "op://${{ vars.OP_VAULT }}/ios-fastlane-json-key.json/ios-fastlane-json-key.json" --force --out-file ./ios-fastlane-json-key.json
+          op read "op://${{ vars.OP_VAULT }}/New Expensify Distribution Certificate/Certificates.p12" --force --out-file ./Certificates.p12
 
       - name: Set current App version in Env
         run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV"
diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index 3914f9c29cff..e6af1475d604 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -184,10 +184,10 @@ jobs:
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
         run: |
-          op read "op://Mobile-Deploy-CI/NewApp_AdHoc/NewApp_AdHoc.mobileprovision" --force --out-file ./NewApp_AdHoc.mobileprovision
-          op read "op://Mobile-Deploy-CI/NewApp_AdHoc_Notification_Service/NewApp_AdHoc_Notification_Service.mobileprovision" --force --out-file ./NewApp_AdHoc_Notification_Service.mobileprovision
-          op read "op://Mobile-Deploy-CI/NewApp_AdHoc_Share_Extension.mobileprovision/NewApp_AdHoc_Share_Extension.mobileprovision" --force --out-file ./NewApp_AdHoc_Share_Extension.mobileprovision
-          op read "op://Mobile-Deploy-CI/New Expensify Distribution Certificate/Certificates.p12" --force --out-file ./Certificates.p12
+          op read "op://${{ vars.OP_VAULT }}/NewApp_AdHoc/NewApp_AdHoc.mobileprovision" --force --out-file ./NewApp_AdHoc.mobileprovision
+          op read "op://${{ vars.OP_VAULT }}/NewApp_AdHoc_Notification_Service/NewApp_AdHoc_Notification_Service.mobileprovision" --force --out-file ./NewApp_AdHoc_Notification_Service.mobileprovision
+          op read "op://${{ vars.OP_VAULT }}/NewApp_AdHoc_Share_Extension.mobileprovision/NewApp_AdHoc_Share_Extension.mobileprovision" --force --out-file ./NewApp_AdHoc_Share_Extension.mobileprovision
+          op read "op://${{ vars.OP_VAULT }}/New Expensify Distribution Certificate/Certificates.p12" --force --out-file ./Certificates.p12
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -239,8 +239,8 @@ jobs:
           export-env: false
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
-          DESKTOP_CERTIFICATE_BASE64: "op://Mobile-Deploy-CI/Desktop Certificates.p12/CSC_LINK"
-          DESKTOP_CERTIFICATE_PASSWORD: "op://Mobile-Deploy-CI/Desktop Certificates.p12/CSC_KEY_PASSWORD"
+          DESKTOP_CERTIFICATE_BASE64: "op://${{ vars.OP_VAULT }}/Desktop Certificates.p12/CSC_LINK"
+          DESKTOP_CERTIFICATE_PASSWORD: "op://${{ vars.OP_VAULT }}/Desktop Certificates.p12/CSC_KEY_PASSWORD"
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
diff --git a/.github/workflows/testBuildHybrid.yml b/.github/workflows/testBuildHybrid.yml
index 9ef2e593a827..6a1e61147c66 100644
--- a/.github/workflows/testBuildHybrid.yml
+++ b/.github/workflows/testBuildHybrid.yml
@@ -183,8 +183,8 @@ jobs:
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
         run: |
-          op read "op://Mobile-Deploy-CI/upload-key.keystore/upload-key.keystore" --force --out-file ./upload-key.keystore
-          op read "op://Mobile-Deploy-CI/android-fastlane-json-key.json/android-fastlane-json-key.json" --force --out-file ./android-fastlane-json-key.json
+          op read "op://${{ vars.OP_VAULT }}/upload-key.keystore/upload-key.keystore" --force --out-file ./upload-key.keystore
+          op read "op://${{ vars.OP_VAULT }}/android-fastlane-json-key.json/android-fastlane-json-key.json" --force --out-file ./android-fastlane-json-key.json
 
           # Copy the keystore to the Android directory for Fullstory
           cp ./upload-key.keystore Mobile-Expensify/Android
@@ -196,9 +196,9 @@ jobs:
           export-env: false
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
-          ANDROID_UPLOAD_KEYSTORE_PASSWORD: op://Mobile-Deploy-CI/Repository-Secrets/ANDROID_UPLOAD_KEYSTORE_PASSWORD
-          ANDROID_UPLOAD_KEYSTORE_ALIAS: op://Mobile-Deploy-CI/Repository-Secrets/ANDROID_UPLOAD_KEYSTORE_ALIAS
-          ANDROID_UPLOAD_KEY_PASSWORD: op://Mobile-Deploy-CI/Repository-Secrets/ANDROID_UPLOAD_KEY_PASSWORD
+          ANDROID_UPLOAD_KEYSTORE_PASSWORD: op://${{ vars.OP_VAULT }}/Repository-Secrets/ANDROID_UPLOAD_KEYSTORE_PASSWORD
+          ANDROID_UPLOAD_KEYSTORE_ALIAS: op://${{ vars.OP_VAULT }}/Repository-Secrets/ANDROID_UPLOAD_KEYSTORE_ALIAS
+          ANDROID_UPLOAD_KEY_PASSWORD: op://${{ vars.OP_VAULT }}/Repository-Secrets/ANDROID_UPLOAD_KEY_PASSWORD
 
       - name: Build Android app
         id: build
@@ -305,10 +305,10 @@ jobs:
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
         run: |
-          op read "op://Mobile-Deploy-CI/OldApp_AdHoc/OldApp_AdHoc.mobileprovision" --force --out-file ./OldApp_AdHoc.mobileprovision
-          op read "op://Mobile-Deploy-CI/OldApp_AdHoc_Share_Extension/OldApp_AdHoc_Share_Extension.mobileprovision" --force --out-file ./OldApp_AdHoc_Share_Extension.mobileprovision
-          op read "op://Mobile-Deploy-CI/OldApp_AdHoc_Notification_Service/OldApp_AdHoc_Notification_Service.mobileprovision" --force --out-file ./OldApp_AdHoc_Notification_Service.mobileprovision
-          op read "op://Mobile-Deploy-CI/New Expensify Distribution Certificate/Certificates.p12" --force --out-file ./Certificates.p12
+          op read "op://${{ vars.OP_VAULT }}/OldApp_AdHoc/OldApp_AdHoc.mobileprovision" --force --out-file ./OldApp_AdHoc.mobileprovision
+          op read "op://${{ vars.OP_VAULT }}/OldApp_AdHoc_Share_Extension/OldApp_AdHoc_Share_Extension.mobileprovision" --force --out-file ./OldApp_AdHoc_Share_Extension.mobileprovision
+          op read "op://${{ vars.OP_VAULT }}/OldApp_AdHoc_Notification_Service/OldApp_AdHoc_Notification_Service.mobileprovision" --force --out-file ./OldApp_AdHoc_Notification_Service.mobileprovision
+          op read "op://${{ vars.OP_VAULT }}/New Expensify Distribution Certificate/Certificates.p12" --force --out-file ./Certificates.p12
 
       - name: Build AdHoc app
         run: bundle exec fastlane ios build_adhoc_hybrid

From 3d643dfbd70fe8286a2629239f648554d0ed2fc2 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Fri, 7 Feb 2025 12:46:20 +0800
Subject: [PATCH 15/29] fix tooltip appears below the composer when going back
 from another page

---
 .../ReportActionCompose.tsx                   | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose/ReportActionCompose.tsx b/src/pages/home/report/ReportActionCompose/ReportActionCompose.tsx
index 0a461bdf756a..5aa911785b14 100644
--- a/src/pages/home/report/ReportActionCompose/ReportActionCompose.tsx
+++ b/src/pages/home/report/ReportActionCompose/ReportActionCompose.tsx
@@ -1,9 +1,9 @@
-import {useIsFocused} from '@react-navigation/native';
+import {useFocusEffect} from '@react-navigation/native';
 import lodashDebounce from 'lodash/debounce';
 import noop from 'lodash/noop';
 import React, {memo, useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import type {MeasureInWindowOnSuccessCallback, NativeSyntheticEvent, TextInputFocusEventData, TextInputSelectionChangeEventData} from 'react-native';
-import {View} from 'react-native';
+import {InteractionManager, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {useOnyx} from 'react-native-onyx';
 import {runOnUI, useSharedValue} from 'react-native-reanimated';
@@ -136,11 +136,24 @@ function ReportActionCompose({
     const personalDetails = usePersonalDetails();
     const [blockedFromConcierge] = useOnyx(ONYXKEYS.NVP_BLOCKED_FROM_CONCIERGE);
     const [shouldShowComposeInput = true] = useOnyx(ONYXKEYS.SHOULD_SHOW_COMPOSE_INPUT);
-    const isScreenFocused = useIsFocused();
+    const [isScreenTransitionEnded, setIsScreenTransitionEnded] = useState(false);
+
+    useFocusEffect(
+        React.useCallback(() => {
+            const task = InteractionManager.runAfterInteractions(() => {
+                setIsScreenTransitionEnded(true);
+            });
+
+            return () => {
+                task.cancel();
+                setIsScreenTransitionEnded(false);
+            };
+        }, []),
+    );
 
     const {renderProductTrainingTooltip, hideProductTrainingTooltip, shouldShowProductTrainingTooltip} = useProductTrainingContext(
         CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.WORKSAPCE_CHAT_CREATE,
-        shouldShowEducationalTooltip && isScreenFocused,
+        shouldShowEducationalTooltip && isScreenTransitionEnded,
     );
 
     /**

From 56002f44eec91403c710738d5fa8dc469b877c21 Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Fri, 7 Feb 2025 17:13:55 +0800
Subject: [PATCH 16/29] fix test

---
 tests/perf-test/ReportActionCompose.perf-test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/perf-test/ReportActionCompose.perf-test.tsx b/tests/perf-test/ReportActionCompose.perf-test.tsx
index 64a79892f61e..a0011ca5bcb6 100644
--- a/tests/perf-test/ReportActionCompose.perf-test.tsx
+++ b/tests/perf-test/ReportActionCompose.perf-test.tsx
@@ -39,7 +39,7 @@ jest.mock('@react-navigation/native', () => {
         }),
         useIsFocused: () => true,
         useNavigationState: () => {},
-        useFocusEffect: (cb: EffectCallback) => cb(),
+        useFocusEffect: jest.fn(),
     };
 });
 

From 7ca86a145bf9309ad33c1854b77eeff6759f44bd Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Fri, 7 Feb 2025 17:22:47 +0800
Subject: [PATCH 17/29] lint

---
 tests/perf-test/ReportActionCompose.perf-test.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/perf-test/ReportActionCompose.perf-test.tsx b/tests/perf-test/ReportActionCompose.perf-test.tsx
index a0011ca5bcb6..ea2b321b7aaf 100644
--- a/tests/perf-test/ReportActionCompose.perf-test.tsx
+++ b/tests/perf-test/ReportActionCompose.perf-test.tsx
@@ -1,5 +1,4 @@
 import {fireEvent, screen} from '@testing-library/react-native';
-import type {EffectCallback} from 'react';
 import React from 'react';
 import Onyx from 'react-native-onyx';
 import type Animated from 'react-native-reanimated';

From 9b0878de9756625f4737d95dad8d16c0d6b30abb Mon Sep 17 00:00:00 2001
From: kubabutkiewicz <jakub.butkiewicz94@gmail.com>
Date: Fri, 7 Feb 2025 13:22:48 +0100
Subject: [PATCH 18/29] add option to config to show manager mc test

---
 src/libs/OptionsListUtils.ts                               | 4 +++-
 src/pages/iou/request/MoneyRequestParticipantsSelector.tsx | 1 +
 tests/unit/OptionsListUtilsTest.ts                         | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index a7f689376156..dde921308bb3 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -207,6 +207,7 @@ type GetOptionsConfig = {
     shouldSeparateWorkspaceChat?: boolean;
     shouldSeparateSelfDMChat?: boolean;
     excludeHiddenReports?: boolean;
+    canShowManagerMcTest?: boolean;
 } & GetValidReportsConfig;
 
 type GetUserToInviteConfig = {
@@ -1437,6 +1438,7 @@ function getValidOptions(
         shouldSeparateSelfDMChat = false,
         shouldSeparateWorkspaceChat = false,
         excludeHiddenReports = false,
+        canShowManagerMcTest = false,
         ...config
     }: GetOptionsConfig = {},
 ): Options {
@@ -1445,7 +1447,7 @@ function getValidOptions(
         [CONST.EMAIL.NOTIFICATIONS]: true,
         ...excludeLogins,
         // Exclude Manager McTest if user submitted expense or scanned receipt and when selection is made from Create or Submit flow
-        [CONST.EMAIL.MANAGER_MCTEST]: !(Permissions.canUseManagerMcTest(config.betas) && !getIsUserSubmittedExpenseOrScannedReceipt() && config.action),
+        [CONST.EMAIL.MANAGER_MCTEST]: !(Permissions.canUseManagerMcTest(config.betas) && !getIsUserSubmittedExpenseOrScannedReceipt() && canShowManagerMcTest),
     };
     // If we're including selected options from the search results, we only want to exclude them if the search input is empty
     // This is because on certain pages, we show the selected options at the top when the search input is empty
diff --git a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
index 6303155eebbe..0c333ed71cba 100644
--- a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
+++ b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
@@ -123,6 +123,7 @@ function MoneyRequestParticipantsSelector({participants = CONST.EMPTY_ARRAY, onF
                 shouldSeparateSelfDMChat: iouType !== CONST.IOU.TYPE.INVOICE,
                 shouldSeparateWorkspaceChat: true,
                 includeSelfDM: !isMovingTransactionFromTrackExpense(action) && iouType !== CONST.IOU.TYPE.INVOICE,
+                canShowManagerMcTest: true,
             },
         );
 
diff --git a/tests/unit/OptionsListUtilsTest.ts b/tests/unit/OptionsListUtilsTest.ts
index d807b87283b6..75ad8de5a561 100644
--- a/tests/unit/OptionsListUtilsTest.ts
+++ b/tests/unit/OptionsListUtilsTest.ts
@@ -637,7 +637,7 @@ describe('OptionsListUtils', () => {
         // Test for check if Manager McTest is correctly included or excluded from the results
         let options = OptionsListUtils.getValidOptions(
             {reports: OPTIONS_WITH_MANAGER_MCTEST.reports, personalDetails: OPTIONS_WITH_MANAGER_MCTEST.personalDetails},
-            {includeP2P: true, action: 'create', betas: [CONST.BETAS.NEWDOT_MANAGER_MCTEST]},
+            {includeP2P: true, canShowManagerMcTest: true, betas: [CONST.BETAS.NEWDOT_MANAGER_MCTEST]},
         );
         expect(options.personalDetails).toEqual(expect.arrayContaining([expect.objectContaining({login: CONST.EMAIL.MANAGER_MCTEST})]));
 
@@ -655,7 +655,7 @@ describe('OptionsListUtils', () => {
                 // Manager McTest shouldn't be included to recipients when the user has already submitted an expense
                 const optionsWhenUserAlreadySubmittedExpense = OptionsListUtils.getValidOptions(
                     {reports: OPTIONS_WITH_MANAGER_MCTEST.reports, personalDetails: OPTIONS_WITH_MANAGER_MCTEST.personalDetails},
-                    {includeP2P: true, action: 'create', betas: [CONST.BETAS.NEWDOT_MANAGER_MCTEST]},
+                    {includeP2P: true, canShowManagerMcTest: true, betas: [CONST.BETAS.NEWDOT_MANAGER_MCTEST]},
                 );
                 expect(optionsWhenUserAlreadySubmittedExpense.personalDetails).not.toEqual(expect.arrayContaining([expect.objectContaining({login: CONST.EMAIL.MANAGER_MCTEST})]));
             });

From 2e7355989a472eb0682993cf2cfd419c8ba0bff3 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Fri, 7 Feb 2025 15:16:06 +0100
Subject: [PATCH 19/29] Remove animated scrolling from LHNOptionsList component

---
 src/components/LHNOptionsList/LHNOptionsList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/LHNOptionsList/LHNOptionsList.tsx b/src/components/LHNOptionsList/LHNOptionsList.tsx
index 08c957927930..25e3bc5aa4a4 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.tsx
+++ b/src/components/LHNOptionsList/LHNOptionsList.tsx
@@ -258,7 +258,7 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
             if (!(offset && flashListRef.current)) {
                 return;
             }
-            flashListRef.current.scrollToOffset({offset, animated: true});
+            flashListRef.current.scrollToOffset({offset});
         });
     }, [getScrollOffset, route, isWebOrDesktop]);
 

From c411f4d58ec2c46742915c646191ac070b9ada35 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Fri, 7 Feb 2025 15:24:48 +0100
Subject: [PATCH 20/29] Set initialScrollIndex to undefined for mobile in
 LHNOptionsList component

---
 src/components/LHNOptionsList/LHNOptionsList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/LHNOptionsList/LHNOptionsList.tsx b/src/components/LHNOptionsList/LHNOptionsList.tsx
index 25e3bc5aa4a4..469b6a7930cc 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.tsx
+++ b/src/components/LHNOptionsList/LHNOptionsList.tsx
@@ -290,7 +290,7 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
                     onLayout={onLayout}
                     onScroll={onScroll}
                     estimatedListSize={estimatedListSize}
-                    initialScrollIndex={getScrollIndex(route)}
+                    initialScrollIndex={isWebOrDesktop ? getScrollIndex(route) : undefined}
                 />
             )}
         </View>

From 784fa2521a8e4a0acfe1087d36b5e6daece35e61 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Fri, 7 Feb 2025 15:33:42 +0100
Subject: [PATCH 21/29] Add conditional scroll index saving for web and desktop
 in LHNOptionsList component

---
 src/components/LHNOptionsList/LHNOptionsList.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/LHNOptionsList/LHNOptionsList.tsx b/src/components/LHNOptionsList/LHNOptionsList.tsx
index 469b6a7930cc..8922371ec57b 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.tsx
+++ b/src/components/LHNOptionsList/LHNOptionsList.tsx
@@ -241,9 +241,11 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
                 return;
             }
             saveScrollOffset(route, e.nativeEvent.contentOffset.y);
-            saveScrollIndex(route, Math.floor(e.nativeEvent.contentOffset.y / estimatedItemSize));
+            if (isWebOrDesktop) {
+                saveScrollIndex(route, Math.floor(e.nativeEvent.contentOffset.y / estimatedItemSize));
+            }
         },
-        [estimatedItemSize, route, saveScrollIndex, saveScrollOffset],
+        [estimatedItemSize, isWebOrDesktop, route, saveScrollIndex, saveScrollOffset],
     );
 
     const onLayout = useCallback(() => {

From 76a6b395752aa05b170108975b2b2cd39e8ea6f7 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Fri, 7 Feb 2025 15:40:39 +0100
Subject: [PATCH 22/29] retest


From b6cad0c57725518c4647ef825a722743ec28e9a6 Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Mon, 10 Feb 2025 13:31:32 +0700
Subject: [PATCH 23/29] Handle initial personal details load after reset

---
 src/components/OptionListContextProvider.tsx | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/components/OptionListContextProvider.tsx b/src/components/OptionListContextProvider.tsx
index 09b996dc826e..ea30a48ad90d 100644
--- a/src/components/OptionListContextProvider.tsx
+++ b/src/components/OptionListContextProvider.tsx
@@ -88,6 +88,17 @@ function OptionsListContextProvider({children}: OptionsListProviderProps) {
             return;
         }
 
+        // Handle initial personal details load
+        if (!prevPersonalDetails) {
+            const {personalDetails: newPersonalDetailsOptions, reports: newReports} = createOptionList(personalDetails, reports);
+            setOptions((prevOptions) => ({
+                ...prevOptions,
+                personalDetails: newPersonalDetailsOptions,
+                reports: newReports,
+            }));
+            return;
+        }
+
         const newReportOptions: Array<{
             replaceIndex: number;
             newReportOption: SearchOption<Report>;

From c7f2b5e96788c420ba39839baae93542108c3bac Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Mon, 10 Feb 2025 11:08:59 +0100
Subject: [PATCH 24/29] Refactor ScrollOffsetContextProvider to use useOnyx for
 priority mode and simplify props

---
 .../ScrollOffsetContextProvider.tsx           | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/components/ScrollOffsetContextProvider.tsx b/src/components/ScrollOffsetContextProvider.tsx
index 98340ea6d994..64c2479247ab 100644
--- a/src/components/ScrollOffsetContextProvider.tsx
+++ b/src/components/ScrollOffsetContextProvider.tsx
@@ -1,13 +1,12 @@
 import type {ParamListBase} from '@react-navigation/native';
 import React, {createContext, useCallback, useEffect, useMemo, useRef} from 'react';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import usePrevious from '@hooks/usePrevious';
 import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {NavigationPartialRoute, State} from '@libs/Navigation/types';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
-import type {PriorityMode} from '@src/types/onyx';
 
 type ScrollOffsetContextValue = {
     /** Save scroll offset of flashlist on given screen */
@@ -26,12 +25,7 @@ type ScrollOffsetContextValue = {
     cleanStaleScrollOffsets: (state: State) => void;
 };
 
-type ScrollOffsetContextProviderOnyxProps = {
-    /** The chat priority mode */
-    priorityMode: PriorityMode;
-};
-
-type ScrollOffsetContextProviderProps = ScrollOffsetContextProviderOnyxProps & {
+type ScrollOffsetContextProviderProps = {
     /** Actual content wrapped by this component */
     children: React.ReactNode;
 };
@@ -54,7 +48,8 @@ function getKey(route: PlatformStackRouteProp<ParamListBase> | NavigationPartial
     return `${route.name}-global`;
 }
 
-function ScrollOffsetContextProvider({children, priorityMode}: ScrollOffsetContextProviderProps) {
+function ScrollOffsetContextProvider({children}: ScrollOffsetContextProviderProps) {
+    const priorityMode = useOnyx(ONYXKEYS.NVP_PRIORITY_MODE);
     const scrollOffsetsRef = useRef<Record<string, number>>({});
     const previousPriorityMode = usePrevious(priorityMode);
 
@@ -120,11 +115,7 @@ function ScrollOffsetContextProvider({children, priorityMode}: ScrollOffsetConte
     return <ScrollOffsetContext.Provider value={contextValue}>{children}</ScrollOffsetContext.Provider>;
 }
 
-export default withOnyx<ScrollOffsetContextProviderProps, ScrollOffsetContextProviderOnyxProps>({
-    priorityMode: {
-        key: ONYXKEYS.NVP_PRIORITY_MODE,
-    },
-})(ScrollOffsetContextProvider);
+export default ScrollOffsetContextProvider;
 
 export {ScrollOffsetContext};
 

From 426860de3ced54ebe8261c72da018ec34e8a5ad0 Mon Sep 17 00:00:00 2001
From: Mykhailo Kravchenko <rezkiy37@gmail.com>
Date: Mon, 10 Feb 2025 11:15:27 +0100
Subject: [PATCH 25/29] Refactor ScrollOffsetContextProvider to destructure
 priorityMode from useOnyx

---
 src/components/ScrollOffsetContextProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ScrollOffsetContextProvider.tsx b/src/components/ScrollOffsetContextProvider.tsx
index 64c2479247ab..aba45db33e00 100644
--- a/src/components/ScrollOffsetContextProvider.tsx
+++ b/src/components/ScrollOffsetContextProvider.tsx
@@ -49,7 +49,7 @@ function getKey(route: PlatformStackRouteProp<ParamListBase> | NavigationPartial
 }
 
 function ScrollOffsetContextProvider({children}: ScrollOffsetContextProviderProps) {
-    const priorityMode = useOnyx(ONYXKEYS.NVP_PRIORITY_MODE);
+    const [priorityMode] = useOnyx(ONYXKEYS.NVP_PRIORITY_MODE);
     const scrollOffsetsRef = useRef<Record<string, number>>({});
     const previousPriorityMode = usePrevious(priorityMode);
 

From 78df6684ee5f61f50d4cbc3595b15214509c0d4a Mon Sep 17 00:00:00 2001
From: Zuzanna Furtak <zuzkafurtak@gmail.com>
Date: Mon, 10 Feb 2025 20:31:27 +0000
Subject: [PATCH 26/29] Fix getPolicyName

---
 src/libs/ReportUtils.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index c7c92ac79469..12f748a86d06 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1062,8 +1062,7 @@ function getPolicyName({report, returnEmptyIfNotFound = false, policy, policies,
     if (isEmptyObject(report) || (isEmptyObject(policies) && isEmptyObject(allPolicies) && !report?.policyName)) {
         return noPolicyFound;
     }
-
-    const finalPolicy = policy ?? policies?.find((p) => p.id === report.policyID) ?? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`];
+    const finalPolicy = isEmptyObject(policy) ? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`] : policy ?? policies?.find((p) => p.id === report.policyID);
 
     const parentReport = getRootParentReport({report, reports});
 

From 8fd03598c5012cfbe24fe794a9dd0bbb03fb0bda Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Tue, 11 Feb 2025 10:23:29 +0700
Subject: [PATCH 27/29] refine comment

---
 src/components/OptionListContextProvider.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/OptionListContextProvider.tsx b/src/components/OptionListContextProvider.tsx
index ea30a48ad90d..d08426019b2f 100644
--- a/src/components/OptionListContextProvider.tsx
+++ b/src/components/OptionListContextProvider.tsx
@@ -88,7 +88,8 @@ function OptionsListContextProvider({children}: OptionsListProviderProps) {
             return;
         }
 
-        // Handle initial personal details load
+        // Handle initial personal details load. This initialization is required here specifically to prevent 
+        // UI freezing that occurs when resetting the app from the troubleshooting page.
         if (!prevPersonalDetails) {
             const {personalDetails: newPersonalDetailsOptions, reports: newReports} = createOptionList(personalDetails, reports);
             setOptions((prevOptions) => ({

From 84bfa7ccc7e29efb359ac88d60801290d13498cf Mon Sep 17 00:00:00 2001
From: Wildan Muhlis <muhliswildan@gmail.com>
Date: Tue, 11 Feb 2025 10:34:48 +0700
Subject: [PATCH 28/29] prettier

---
 src/components/OptionListContextProvider.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/OptionListContextProvider.tsx b/src/components/OptionListContextProvider.tsx
index d08426019b2f..1603de9e3d10 100644
--- a/src/components/OptionListContextProvider.tsx
+++ b/src/components/OptionListContextProvider.tsx
@@ -88,7 +88,7 @@ function OptionsListContextProvider({children}: OptionsListProviderProps) {
             return;
         }
 
-        // Handle initial personal details load. This initialization is required here specifically to prevent 
+        // Handle initial personal details load. This initialization is required here specifically to prevent
         // UI freezing that occurs when resetting the app from the troubleshooting page.
         if (!prevPersonalDetails) {
             const {personalDetails: newPersonalDetailsOptions, reports: newReports} = createOptionList(personalDetails, reports);

From b3aa8afda74eaaf0c5125b62f0c1161b75e73257 Mon Sep 17 00:00:00 2001
From: Linh Vo <vovanlinh29546@gmail.com>
Date: Tue, 11 Feb 2025 12:00:25 +0700
Subject: [PATCH 29/29] fix: expand and collapse tooltip not dissmissed

---
 .../AttachmentPickerWithMenuItems.tsx                  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
index 463ea3683c8d..a28b5af11d62 100644
--- a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
+++ b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
@@ -292,7 +292,10 @@ function AttachmentPickerWithMenuItems({
                                 </View>
                                 <View style={expandCollapseButtonContainerStyles}>
                                     {isComposerFullSize ? (
-                                        <Tooltip text={translate('reportActionCompose.collapse')}>
+                                        <Tooltip
+                                            text={translate('reportActionCompose.collapse')}
+                                            key="composer-collapse"
+                                        >
                                             <PressableWithFeedback
                                                 onPress={(e) => {
                                                     e?.preventDefault();
@@ -313,7 +316,10 @@ function AttachmentPickerWithMenuItems({
                                             </PressableWithFeedback>
                                         </Tooltip>
                                     ) : (
-                                        <Tooltip text={translate('reportActionCompose.expand')}>
+                                        <Tooltip
+                                            text={translate('reportActionCompose.expand')}
+                                            key="composer-expand"
+                                        >
                                             <PressableWithFeedback
                                                 onPress={(e) => {
                                                     e?.preventDefault();