From a3b4b817c55427dc119c527f21a8924dcd7fae6b Mon Sep 17 00:00:00 2001
From: Faizan Shoukat Abbasi <abbasi.faizan1997@gmail.com>
Date: Tue, 27 Jan 2026 01:44:13 +0500
Subject: [PATCH 1/8] fix: add accessibilityRole header to visual headings for
 screen readers

---
 src/components/CollapsibleSection/index.tsx   |  1 +
 src/components/EmptyStateComponent/index.tsx  |  2 +-
 src/components/Header.tsx                     |  1 +
 src/components/Section/index.tsx              |  2 +-
 .../BaseSelectionListWithSections.tsx         |  2 +-
 src/components/WorkspaceEmptyStateSection.tsx |  2 +-
 .../BaseOnboardingAccounting.tsx              |  2 +-
 .../BaseOnboardingEmployees.tsx               |  2 +-
 .../BaseOnboardingInterestedFeatures.tsx      |  2 +-
 .../BaseOnboardingPersonalDetails.tsx         |  2 +-
 .../BaseOnboardingPrivateDomain.tsx           |  2 +-
 .../BaseOnboardingPurpose.tsx                 |  2 +-
 .../BaseOnboardingWorkEmail.tsx               |  2 +-
 .../BaseOnboardingWorkEmailValidation.tsx     |  2 +-
 .../BaseOnboardingWorkspaceConfirmation.tsx   |  2 +-
 .../BaseOnboardingWorkspaceCurrency.tsx       |  2 +-
 .../BaseOnboardingWorkspaceInvite.tsx         |  2 +-
 .../BaseOnboardingWorkspaceOptional.tsx       |  2 +-
 .../BaseOnboardingWorkspaces.tsx              |  2 +-
 src/pages/Search/AdvancedSearchFilters.tsx    |  2 +-
 .../step/IOURequestStepDistanceManual.tsx     | 32 +++++++++++++++++++
 .../SubscriptionPlan/SubscriptionPlanCard.tsx |  2 +-
 .../Subscription/SubscriptionPlan/index.tsx   |  2 +-
 src/pages/signin/SignInPageLayout/Footer.tsx  |  2 +-
 .../SignInPageLayout/SignInPageContent.tsx    |  1 +
 .../workspace/WorkspaceMoreFeaturesPage.tsx   |  2 +-
 .../WorkspaceCategoriesSettingsPage.tsx       |  2 +-
 .../reports/WorkspaceReportsPage.tsx          |  2 +-
 28 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/src/components/CollapsibleSection/index.tsx b/src/components/CollapsibleSection/index.tsx
index e6e3e9db19da8..5af5f2cd6d19a 100644
--- a/src/components/CollapsibleSection/index.tsx
+++ b/src/components/CollapsibleSection/index.tsx
@@ -56,6 +56,7 @@ function CollapsibleSection({title, children, titleStyle, textStyle, wrapperStyl
                 <Text
                     style={textStyle ?? [styles.flex1, styles.textStrong, styles.userSelectNone, titleStyle]}
                     dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                    accessibilityRole="header"
                 >
                     {title}
                 </Text>
diff --git a/src/components/EmptyStateComponent/index.tsx b/src/components/EmptyStateComponent/index.tsx
index ba303ad0b5eeb..bf900274c960e 100644
--- a/src/components/EmptyStateComponent/index.tsx
+++ b/src/components/EmptyStateComponent/index.tsx
@@ -103,7 +103,7 @@ function EmptyStateComponent({
                 <View style={[styles.emptyStateContent, cardStyles]}>
                     <View style={[styles.emptyStateHeader, styles.emptyStateHeaderPosition(headerMediaType === CONST.EMPTY_STATE_MEDIA.ILLUSTRATION), headerStyles]}>{HeaderComponent}</View>
                     <View style={[shouldUseNarrowLayout ? styles.p5 : styles.p8, cardContentStyles]}>
-                        <Text style={[styles.textAlignCenter, styles.textHeadlineH1, styles.mb2, titleStyles]}>{title}</Text>
+                        <Text style={[styles.textAlignCenter, styles.textHeadlineH1, styles.mb2, titleStyles]} accessibilityRole="header">{title}</Text>
                         {subtitleText ??
                             (doesSubtitleContainCustomEmojiAndMore ? (
                                 <TextWithEmojiFragment
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index a31531835bb26..a11dee0daaedc 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -77,6 +77,7 @@ function Header({title = '', subtitle = '', textStyles = [], style, containerSty
                           <Text
                               numberOfLines={numberOfTitleLines}
                               style={[styles.headerText, styles.textLarge, styles.lineHeightXLarge, textStyles]}
+                              accessibilityRole="header"
                           >
                               {title}
                           </Text>
diff --git a/src/components/Section/index.tsx b/src/components/Section/index.tsx
index 9b1fa58eb3ab8..2cda3d295e43c 100644
--- a/src/components/Section/index.tsx
+++ b/src/components/Section/index.tsx
@@ -186,7 +186,7 @@ function Section({
                         />
                     )}
                     <View style={[styles.flexShrink1, styles.w100]}>
-                        {renderTitle ? renderTitle() : !!title && <Text style={[styles.textHeadline, styles.cardSectionTitle, titleStyles]}>{title}</Text>}
+                        {renderTitle ? renderTitle() : !!title && <Text style={[styles.textHeadline, styles.cardSectionTitle, titleStyles]} accessibilityRole="header">{title}</Text>}
                     </View>
                     {cardLayout === CARD_LAYOUT.ICON_ON_RIGHT && (
                         <IconSection
diff --git a/src/components/SelectionListWithSections/BaseSelectionListWithSections.tsx b/src/components/SelectionListWithSections/BaseSelectionListWithSections.tsx
index 24020a1e79883..f459f6c7eb480 100644
--- a/src/components/SelectionListWithSections/BaseSelectionListWithSections.tsx
+++ b/src/components/SelectionListWithSections/BaseSelectionListWithSections.tsx
@@ -603,7 +603,7 @@ function BaseSelectionListWithSections<TItem extends ListItem>({
             // We do this so that we can reference the height in `getItemLayout` –
             // we need to know the heights of all list items up-front in order to synchronously compute the layout of any given list item.
             // So be aware that if you adjust the content of the section header (for example, change the font size), you may need to adjust this explicit height as well.
-            <View style={[styles.optionsListSectionHeader, styles.justifyContentCenter, sectionTitleStyles]}>
+            <View style={[styles.optionsListSectionHeader, styles.justifyContentCenter, sectionTitleStyles]} accessibilityRole="header">
                 <Text style={[styles.ph5, styles.textLabelSupporting]}>{section.title}</Text>
             </View>
         );
diff --git a/src/components/WorkspaceEmptyStateSection.tsx b/src/components/WorkspaceEmptyStateSection.tsx
index 51b99ad0c4668..889930b5d8798 100644
--- a/src/components/WorkspaceEmptyStateSection.tsx
+++ b/src/components/WorkspaceEmptyStateSection.tsx
@@ -50,7 +50,7 @@ function WorkspaceEmptyStateSection({icon, subtitle, title, containerStyle, shou
 
             <View style={[styles.w100, styles.pt5]}>
                 <View style={[styles.flexRow, styles.justifyContentCenter, styles.w100, styles.mh1, styles.flexShrink1]}>
-                    <Text style={[styles.textHeadline, styles.emptyCardSectionTitle]}>{title}</Text>
+                    <Text style={[styles.textHeadline, styles.emptyCardSectionTitle]} accessibilityRole="header">{title}</Text>
                 </View>
 
                 {(!!subtitle || !!subtitleComponent) && (
diff --git a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx
index a83bb9c737a26..4e1fb9726538c 100644
--- a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx
+++ b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx
@@ -246,7 +246,7 @@ function BaseOnboardingAccounting({shouldUseNativeStyles, route}: BaseOnboarding
                 shouldDisplayHelpButton={false}
             />
             <View style={[onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}>
-                <Text style={[styles.textHeadlineH1, styles.mb5]}>{translate('onboarding.accounting.title')}</Text>
+                <Text style={[styles.textHeadlineH1, styles.mb5]} accessibilityRole="header">{translate('onboarding.accounting.title')}</Text>
             </View>
             <ScrollView style={[onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5, styles.pt3, styles.pb8]}>
                 <View style={[styles.flexRow, styles.flexWrap, styles.gap3, styles.mb3]}>{accountingOptions.map(renderOption)}</View>
diff --git a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx
index 0bfec76ad176a..169e38b346692 100644
--- a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx
+++ b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx
@@ -85,7 +85,7 @@ function BaseOnboardingEmployees({shouldUseNativeStyles, route}: BaseOnboardingE
                 }}
                 shouldDisplayHelpButton={false}
             />
-            <Text style={[styles.textHeadlineH1, styles.mb5, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}>
+            <Text style={[styles.textHeadlineH1, styles.mb5, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]} accessibilityRole="header">
                 {translate('onboarding.employees.title')}
             </Text>
             <SelectionList
diff --git a/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx b/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx
index 49121eef6597d..71e670caa0291 100644
--- a/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx
+++ b/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx
@@ -359,7 +359,7 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin
                 shouldDisplayHelpButton={false}
             />
             <View style={[onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}>
-                <Text style={[styles.textHeadlineH1, styles.mb5]}>{translate('onboarding.interestedFeatures.title')}</Text>
+                <Text style={[styles.textHeadlineH1, styles.mb5]} accessibilityRole="header">{translate('onboarding.interestedFeatures.title')}</Text>
             </View>
 
             <ScrollView
diff --git a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
index 4b6d5718671e1..588d9a70248fb 100644
--- a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
+++ b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
@@ -196,7 +196,7 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
                 shouldTrimValues={false}
             >
                 <View style={[onboardingIsMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb5]}>
-                    <Text style={styles.textHeadlineH1}>{translate('onboarding.whatsYourName')}</Text>
+                    <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('onboarding.whatsYourName')}</Text>
                 </View>
                 <View style={styles.mb4}>
                     <InputWrapper
diff --git a/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx b/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx
index 72fb9c3b06241..c6f8df7c6ad86 100644
--- a/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx
+++ b/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx
@@ -93,7 +93,7 @@ function BaseOnboardingPrivateDomain({shouldUseNativeStyles, route}: BaseOnboard
                 keyboardShouldPersistTaps="handled"
             >
                 <View style={[styles.mb5, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5, styles.flex1]}>
-                    <Text style={styles.textHeadlineH1}>{translate('onboarding.peopleYouMayKnow')}</Text>
+                    <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('onboarding.peopleYouMayKnow')}</Text>
                     <Text style={[styles.textAlignLeft, styles.mv5]}>{translate('onboarding.workspaceYouMayJoin', {domain, email})}</Text>
                     <ValidateCodeForm
                         validateCodeActionErrorField="getAccessiblePolicies"
diff --git a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
index 18fcb3f9f670d..b3741aa4931ef 100644
--- a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
+++ b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
@@ -149,7 +149,7 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro
             <ScrollView style={[styles.flex1, styles.flexGrow1, onboardingIsMediumOrLargerScreenWidth && styles.mt5, paddingHorizontal]}>
                 <View style={styles.flex1}>
                     <View style={[onboardingIsMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb5]}>
-                        <Text style={styles.textHeadlineH1}>{translate('onboarding.purpose.title')} </Text>
+                        <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('onboarding.purpose.title')} </Text>
                     </View>
                     <MenuItemList
                         menuItems={menuItems}
diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
index 29fac93410783..53ccf2ad412b6 100644
--- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
+++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
@@ -196,7 +196,7 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
                 >
                     <View>
                         <View style={[onboardingIsMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb3]}>
-                            <Text style={styles.textHeadlineH1}>{translate('onboarding.workEmail.title')}</Text>
+                            <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('onboarding.workEmail.title')}</Text>
                         </View>
                         <View style={styles.mb2}>
                             <Text style={[styles.textNormal, styles.colorMuted]}>{translate('onboarding.workEmail.subtitle')}</Text>
diff --git a/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx b/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
index c96e566fdbce2..b31db42320dc7 100644
--- a/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
+++ b/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
@@ -102,7 +102,7 @@ function BaseOnboardingWorkEmailValidation({shouldUseNativeStyles}: BaseOnboardi
                 </View>
             ) : (
                 <View style={[styles.flex1, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}>
-                    <Text style={styles.textHeadlineH1}>{translate('onboarding.workEmailValidation.title')}</Text>
+                    <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('onboarding.workEmailValidation.title')}</Text>
                     <Text style={[styles.textNormal, styles.colorMuted, styles.textAlignLeft, styles.mt5]}>{translate('onboarding.workEmailValidation.magicCodeSent', {workEmail})}</Text>
                     <ValidateCodeForm
                         handleSubmitForm={validateAccountAndMerge}
diff --git a/src/pages/OnboardingWorkspaceConfirmation/BaseOnboardingWorkspaceConfirmation.tsx b/src/pages/OnboardingWorkspaceConfirmation/BaseOnboardingWorkspaceConfirmation.tsx
index 4e7fae5bca583..ee8cdaae2e6ae 100644
--- a/src/pages/OnboardingWorkspaceConfirmation/BaseOnboardingWorkspaceConfirmation.tsx
+++ b/src/pages/OnboardingWorkspaceConfirmation/BaseOnboardingWorkspaceConfirmation.tsx
@@ -147,7 +147,7 @@ function BaseOnboardingWorkspaceConfirmation({shouldUseNativeStyles}: BaseOnboar
                 shouldValidateOnBlur={false}
             >
                 <View style={[onboardingIsMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb3]}>
-                    <Text style={styles.textHeadlineH1}>{translate('onboarding.confirmWorkspace.title')}</Text>
+                    <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('onboarding.confirmWorkspace.title')}</Text>
                 </View>
                 <View style={styles.mb5}>
                     <Text style={[styles.textNormal, styles.colorMuted]}>{translate('onboarding.confirmWorkspace.subtitle')}</Text>
diff --git a/src/pages/OnboardingWorkspaceCurrency/BaseOnboardingWorkspaceCurrency.tsx b/src/pages/OnboardingWorkspaceCurrency/BaseOnboardingWorkspaceCurrency.tsx
index 470524c6da793..88a00553c84d7 100644
--- a/src/pages/OnboardingWorkspaceCurrency/BaseOnboardingWorkspaceCurrency.tsx
+++ b/src/pages/OnboardingWorkspaceCurrency/BaseOnboardingWorkspaceCurrency.tsx
@@ -58,7 +58,7 @@ function BaseOnboardingWorkspaceCurrency({route, shouldUseNativeStyles}: BaseOnb
                 shouldDisplayHelpButton={false}
             />
             <View style={[onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5, onboardingIsMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb5]}>
-                <Text style={styles.textHeadlineH1}>{translate('common.currency')}</Text>
+                <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('common.currency')}</Text>
             </View>
             <CurrencySelectionList
                 listItemWrapperStyle={onboardingIsMediumOrLargerScreenWidth ? [styles.pl8, styles.pr8] : []}
diff --git a/src/pages/OnboardingWorkspaceInvite/BaseOnboardingWorkspaceInvite.tsx b/src/pages/OnboardingWorkspaceInvite/BaseOnboardingWorkspaceInvite.tsx
index 1c63ee2b53b14..273c74efd14ea 100644
--- a/src/pages/OnboardingWorkspaceInvite/BaseOnboardingWorkspaceInvite.tsx
+++ b/src/pages/OnboardingWorkspaceInvite/BaseOnboardingWorkspaceInvite.tsx
@@ -207,7 +207,7 @@ function BaseOnboardingWorkspaceInvite({shouldUseNativeStyles}: BaseOnboardingWo
                 shouldDisplayHelpButton={false}
             />
             <View style={[onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5, onboardingIsMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb3]}>
-                <Text style={styles.textHeadlineH1}>{translate('onboarding.inviteMembers.title')}</Text>
+                <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('onboarding.inviteMembers.title')}</Text>
             </View>
             <View style={[onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5, onboardingIsMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb5]}>
                 <Text style={[styles.textNormal, styles.colorMuted]}>{translate('onboarding.inviteMembers.subtitle')}</Text>
diff --git a/src/pages/OnboardingWorkspaceOptional/BaseOnboardingWorkspaceOptional.tsx b/src/pages/OnboardingWorkspaceOptional/BaseOnboardingWorkspaceOptional.tsx
index d2ba9b3a78cf7..c275d4e7c1d2b 100644
--- a/src/pages/OnboardingWorkspaceOptional/BaseOnboardingWorkspaceOptional.tsx
+++ b/src/pages/OnboardingWorkspaceOptional/BaseOnboardingWorkspaceOptional.tsx
@@ -116,7 +116,7 @@ function BaseOnboardingWorkspaceOptional({shouldUseNativeStyles}: BaseOnboarding
             />
             <View style={[styles.flexGrow1, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}>
                 <View style={[onboardingIsMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb3]}>
-                    <Text style={styles.textHeadlineH1}>{translate('onboarding.workspace.title')}</Text>
+                    <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('onboarding.workspace.title')}</Text>
                 </View>
                 <View style={styles.mb2}>
                     <Text style={[styles.textNormal, styles.colorMuted]}>{translate('onboarding.workspace.subtitle')}</Text>
diff --git a/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx b/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx
index 4bbf5c377f080..0b20a8c97e0d6 100644
--- a/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx
+++ b/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx
@@ -165,7 +165,7 @@ function BaseOnboardingWorkspaces({route, shouldUseNativeStyles}: BaseOnboarding
                 showScrollIndicator
                 customListHeader={
                     <View style={[wrapperPadding, onboardingIsMediumOrLargerScreenWidth && styles.mt5, styles.mb5]}>
-                        <Text style={styles.textHeadlineH1}>{translate('onboarding.joinAWorkspace')}</Text>
+                        <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('onboarding.joinAWorkspace')}</Text>
                         <Text style={[styles.textSupporting, styles.mt3]}>{translate('onboarding.listOfWorkspaces')}</Text>
                     </View>
                 }
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 9164ce9ff1b17..c4a92000a79b2 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -673,7 +673,7 @@ function AdvancedSearchFilters() {
                                         style={[styles.reportHorizontalRule]}
                                     />
                                 )}
-                                <Text style={[styles.headerText, styles.reportHorizontalRule, index === 0 ? null : styles.mt4, styles.mb2]}>{translate(section.titleTranslationKey)}</Text>
+                                <Text style={[styles.headerText, styles.reportHorizontalRule, index === 0 ? null : styles.mt4, styles.mb2]} accessibilityRole="header">{translate(section.titleTranslationKey)}</Text>
                                 {section.items.map((item) => {
                                     return (
                                         <MenuItemWithTopDescription
diff --git a/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx b/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx
index 924aaf3ef2ecf..bcfc530a8a0f5 100644
--- a/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx
@@ -28,6 +28,7 @@ import {roundToTwoDecimalPlaces} from '@libs/NumberUtils';
 import {isArchivedReport, isPolicyExpenseChat as isPolicyExpenseChatUtils} from '@libs/ReportUtils';
 import shouldUseDefaultExpensePolicyUtil from '@libs/shouldUseDefaultExpensePolicy';
 import {getRateID} from '@libs/TransactionUtils';
+import getDistanceInMeters from '@libs/TransactionUtils/getDistanceInMeters';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -62,6 +63,7 @@ function IOURequestStepDistanceManual({
     const textInput = useRef<BaseTextInputRef | null>(null);
     const numberFormRef = useRef<NumberWithSymbolFormRef | null>(null);
     const focusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
+    const previousUnitRef = useRef<string | undefined>(undefined);
 
     const [formError, setFormError] = useState<string>('');
 
@@ -100,6 +102,36 @@ function IOURequestStepDistanceManual({
     const distance = typeof transaction?.comment?.customUnit?.quantity === 'number' ? roundToTwoDecimalPlaces(transaction.comment.customUnit.quantity) : undefined;
     const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
 
+    // Convert distance when unit changes (e.g., when recipient/workspace changes)
+    useEffect(() => {
+        const existingDistanceUnit = transaction?.comment?.customUnit?.distanceUnit ?? previousUnitRef.current;
+        const currentDistance = transaction?.comment?.customUnit?.quantity;
+
+        // Only convert if:
+        // 1. We have a previous unit (not initial load)
+        // 2. The unit actually changed
+        // 3. There's an existing distance value
+        // 4. The existing distance unit is different from the new unit
+        if (
+            previousUnitRef.current !== undefined &&
+            previousUnitRef.current !== unit &&
+            typeof currentDistance === 'number' &&
+            existingDistanceUnit &&
+            existingDistanceUnit !== unit
+        ) {
+            // Convert distance: get current distance in meters, then convert to new unit
+            const distanceInMeters = getDistanceInMeters(transaction, existingDistanceUnit);
+            const convertedDistance = DistanceRequestUtils.convertDistanceUnit(distanceInMeters, unit);
+            const roundedConvertedDistance = roundToTwoDecimalPlaces(convertedDistance);
+
+            // Update the transaction with the converted distance
+            setMoneyRequestDistance(transactionID, roundedConvertedDistance, isTransactionDraft);
+        }
+
+        // Update the previous unit ref
+        previousUnitRef.current = unit;
+    }, [unit, transaction, transactionID, isTransactionDraft]);
+
     useEffect(() => {
         if (numberFormRef.current && numberFormRef.current?.getNumber() === distance?.toString()) {
             return;
diff --git a/src/pages/settings/Subscription/SubscriptionPlan/SubscriptionPlanCard.tsx b/src/pages/settings/Subscription/SubscriptionPlan/SubscriptionPlanCard.tsx
index 87621f010df70..2bdd52c4b2ed3 100644
--- a/src/pages/settings/Subscription/SubscriptionPlan/SubscriptionPlanCard.tsx
+++ b/src/pages/settings/Subscription/SubscriptionPlan/SubscriptionPlanCard.tsx
@@ -120,7 +120,7 @@ function SubscriptionPlanCard({subscriptionPlan, isFromComparisonModal = false,
                                 />
                             </View>
                         </View>
-                        <Text style={[styles.headerText, styles.mv2, styles.textHeadlineH2]}>{title}</Text>
+                        <Text style={[styles.headerText, styles.mv2, styles.textHeadlineH2]} accessibilityRole="header">{title}</Text>
                         <Text style={styles.labelStrong}>{subtitle}</Text>
                         <Text style={[styles.textLabelSupporting, styles.textSmall]}>{note}</Text>
                         <Text style={[styles.textLabelSupporting, styles.textNormal, styles.mt3, styles.mb1]}>{description}</Text>
diff --git a/src/pages/settings/Subscription/SubscriptionPlan/index.tsx b/src/pages/settings/Subscription/SubscriptionPlan/index.tsx
index ee558d9784dc1..3a733fac0d9c9 100644
--- a/src/pages/settings/Subscription/SubscriptionPlan/index.tsx
+++ b/src/pages/settings/Subscription/SubscriptionPlan/index.tsx
@@ -23,7 +23,7 @@ function SubscriptionPlan() {
     const renderTitle = () => {
         return (
             <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
-                <Text style={[styles.textHeadline, styles.cardSectionTitle, styles.textStrong]}>{translate('subscription.yourPlan.title')}</Text>
+                <Text style={[styles.textHeadline, styles.cardSectionTitle, styles.textStrong]} accessibilityRole="header">{translate('subscription.yourPlan.title')}</Text>
                 <Button
                     small
                     text={translate('subscription.yourPlan.exploreAllPlans')}
diff --git a/src/pages/signin/SignInPageLayout/Footer.tsx b/src/pages/signin/SignInPageLayout/Footer.tsx
index 87bf16af1ebb8..3844f7975f83f 100644
--- a/src/pages/signin/SignInPageLayout/Footer.tsx
+++ b/src/pages/signin/SignInPageLayout/Footer.tsx
@@ -176,7 +176,7 @@ function Footer({navigateFocus}: FooterProps) {
                                 key={column.translationPath}
                                 style={footerColumn}
                             >
-                                <Text style={[styles.textHeadline, styles.footerTitle]}>{translate(column.translationPath)}</Text>
+                                <Text style={[styles.textHeadline, styles.footerTitle]} accessibilityRole="header">{translate(column.translationPath)}</Text>
                                 <View style={[styles.footerRow]}>
                                     {column.rows.map(({href, onPress, translationPath}) => (
                                         <Hoverable key={translationPath}>
diff --git a/src/pages/signin/SignInPageLayout/SignInPageContent.tsx b/src/pages/signin/SignInPageLayout/SignInPageContent.tsx
index 725cf43172ad4..347f6a870205c 100755
--- a/src/pages/signin/SignInPageLayout/SignInPageContent.tsx
+++ b/src/pages/signin/SignInPageLayout/SignInPageContent.tsx
@@ -42,6 +42,7 @@ function SignInPageContent({shouldShowWelcomeHeader, welcomeHeader, welcomeText,
                                         !shouldUseNarrowLayout ? styles.textAlignLeft : {},
                                         styles.mb5,
                                     ]}
+                                    accessibilityRole="header"
                                 >
                                     {welcomeHeader}
                                 </Text>
diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
index d887af9673bb6..7943f39c196cc 100644
--- a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
+++ b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
@@ -561,7 +561,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
                 <Section
                     containerStyles={[styles.ph1, styles.pv0, styles.bgTransparent, styles.noBorderRadius]}
                     childrenStyles={[styles.flexRow, styles.flexWrap, styles.columnGap3]}
-                    renderTitle={() => <Text style={styles.mutedNormalTextLabel}>{translate(section.titleTranslationKey)}</Text>}
+                    renderTitle={() => <Text style={styles.mutedNormalTextLabel} accessibilityRole="header">{translate(section.titleTranslationKey)}</Text>}
                     subtitleMuted
                 >
                     {section.items.map(renderItem)}
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
index 327cc620831f6..52ae956d9f849 100644
--- a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
+++ b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
@@ -100,7 +100,7 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet
 
     const selectionListHeaderContent = (
         <View style={[styles.mh5, styles.mt2, styles.mb1]}>
-            <Text style={[styles.headerText]}>{translate('workspace.categories.defaultSpendCategories')}</Text>
+            <Text style={[styles.headerText]} accessibilityRole="header">{translate('workspace.categories.defaultSpendCategories')}</Text>
             <Text style={[styles.mt1, styles.lh20]}>{translate('workspace.categories.spendCategoriesDescription')}</Text>
         </View>
     );
diff --git a/src/pages/workspace/reports/WorkspaceReportsPage.tsx b/src/pages/workspace/reports/WorkspaceReportsPage.tsx
index a4a2a3d7bacff..cc74bbc8b1e24 100644
--- a/src/pages/workspace/reports/WorkspaceReportsPage.tsx
+++ b/src/pages/workspace/reports/WorkspaceReportsPage.tsx
@@ -150,7 +150,7 @@ function WorkspaceReportFieldsPage({
 
     const renderReportTitle = () => (
         <OfflineWithFeedback pendingAction={policy?.pendingAction}>
-            <Text style={[styles.textHeadline, styles.cardSectionTitle, styles.accountSettingsSectionTitle, styles.mb1]}>{translate('workspace.common.reportTitle')}</Text>
+            <Text style={[styles.textHeadline, styles.cardSectionTitle, styles.accountSettingsSectionTitle, styles.mb1]} accessibilityRole="header">{translate('workspace.common.reportTitle')}</Text>
         </OfflineWithFeedback>
     );
 

From 5df9b8f770c51f90be9cef7030b548acb2db580b Mon Sep 17 00:00:00 2001
From: Faizan Shoukat Abbasi <abbasi.faizan1997@gmail.com>
Date: Tue, 27 Jan 2026 01:50:04 +0500
Subject: [PATCH 2/8] Reverted the changes to IOURequestStepDistanceManual.tsx
 from the last commit

---
 .../step/IOURequestStepDistanceManual.tsx     | 32 -------------------
 1 file changed, 32 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx b/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx
index bcfc530a8a0f5..924aaf3ef2ecf 100644
--- a/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx
@@ -28,7 +28,6 @@ import {roundToTwoDecimalPlaces} from '@libs/NumberUtils';
 import {isArchivedReport, isPolicyExpenseChat as isPolicyExpenseChatUtils} from '@libs/ReportUtils';
 import shouldUseDefaultExpensePolicyUtil from '@libs/shouldUseDefaultExpensePolicy';
 import {getRateID} from '@libs/TransactionUtils';
-import getDistanceInMeters from '@libs/TransactionUtils/getDistanceInMeters';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -63,7 +62,6 @@ function IOURequestStepDistanceManual({
     const textInput = useRef<BaseTextInputRef | null>(null);
     const numberFormRef = useRef<NumberWithSymbolFormRef | null>(null);
     const focusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
-    const previousUnitRef = useRef<string | undefined>(undefined);
 
     const [formError, setFormError] = useState<string>('');
 
@@ -102,36 +100,6 @@ function IOURequestStepDistanceManual({
     const distance = typeof transaction?.comment?.customUnit?.quantity === 'number' ? roundToTwoDecimalPlaces(transaction.comment.customUnit.quantity) : undefined;
     const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
 
-    // Convert distance when unit changes (e.g., when recipient/workspace changes)
-    useEffect(() => {
-        const existingDistanceUnit = transaction?.comment?.customUnit?.distanceUnit ?? previousUnitRef.current;
-        const currentDistance = transaction?.comment?.customUnit?.quantity;
-
-        // Only convert if:
-        // 1. We have a previous unit (not initial load)
-        // 2. The unit actually changed
-        // 3. There's an existing distance value
-        // 4. The existing distance unit is different from the new unit
-        if (
-            previousUnitRef.current !== undefined &&
-            previousUnitRef.current !== unit &&
-            typeof currentDistance === 'number' &&
-            existingDistanceUnit &&
-            existingDistanceUnit !== unit
-        ) {
-            // Convert distance: get current distance in meters, then convert to new unit
-            const distanceInMeters = getDistanceInMeters(transaction, existingDistanceUnit);
-            const convertedDistance = DistanceRequestUtils.convertDistanceUnit(distanceInMeters, unit);
-            const roundedConvertedDistance = roundToTwoDecimalPlaces(convertedDistance);
-
-            // Update the transaction with the converted distance
-            setMoneyRequestDistance(transactionID, roundedConvertedDistance, isTransactionDraft);
-        }
-
-        // Update the previous unit ref
-        previousUnitRef.current = unit;
-    }, [unit, transaction, transactionID, isTransactionDraft]);
-
     useEffect(() => {
         if (numberFormRef.current && numberFormRef.current?.getNumber() === distance?.toString()) {
             return;

From 31c48b5a199db5ffaeac7001d9b304b0ae7abbbe Mon Sep 17 00:00:00 2001
From: Faizan Shoukat Abbasi <abbasi.faizan1997@gmail.com>
Date: Tue, 27 Jan 2026 01:52:51 +0500
Subject: [PATCH 3/8] fixed prettier issues

---
 src/components/EmptyStateComponent/index.tsx          |  7 ++++++-
 src/components/Section/index.tsx                      | 11 ++++++++++-
 .../BaseSelectionListWithSections.tsx                 |  5 ++++-
 src/components/WorkspaceEmptyStateSection.tsx         |  7 ++++++-
 .../OnboardingAccounting/BaseOnboardingAccounting.tsx |  7 ++++++-
 .../OnboardingEmployees/BaseOnboardingEmployees.tsx   |  5 ++++-
 .../BaseOnboardingInterestedFeatures.tsx              |  7 ++++++-
 .../BaseOnboardingPersonalDetails.tsx                 |  7 ++++++-
 .../BaseOnboardingPrivateDomain.tsx                   |  7 ++++++-
 src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx |  7 ++++++-
 .../OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx   |  7 ++++++-
 .../BaseOnboardingWorkEmailValidation.tsx             |  7 ++++++-
 .../BaseOnboardingWorkspaceConfirmation.tsx           |  7 ++++++-
 .../BaseOnboardingWorkspaceCurrency.tsx               |  7 ++++++-
 .../BaseOnboardingWorkspaceInvite.tsx                 |  7 ++++++-
 .../BaseOnboardingWorkspaceOptional.tsx               |  7 ++++++-
 .../OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx |  7 ++++++-
 src/pages/Search/AdvancedSearchFilters.tsx            |  7 ++++++-
 .../SubscriptionPlan/SubscriptionPlanCard.tsx         |  7 ++++++-
 .../settings/Subscription/SubscriptionPlan/index.tsx  |  7 ++++++-
 src/pages/signin/SignInPageLayout/Footer.tsx          |  7 ++++++-
 src/pages/workspace/WorkspaceMoreFeaturesPage.tsx     |  9 ++++++++-
 .../categories/WorkspaceCategoriesSettingsPage.tsx    |  7 ++++++-
 src/pages/workspace/reports/WorkspaceReportsPage.tsx  |  7 ++++++-
 24 files changed, 146 insertions(+), 24 deletions(-)

diff --git a/src/components/EmptyStateComponent/index.tsx b/src/components/EmptyStateComponent/index.tsx
index bf900274c960e..0fbb0c8051a29 100644
--- a/src/components/EmptyStateComponent/index.tsx
+++ b/src/components/EmptyStateComponent/index.tsx
@@ -103,7 +103,12 @@ function EmptyStateComponent({
                 <View style={[styles.emptyStateContent, cardStyles]}>
                     <View style={[styles.emptyStateHeader, styles.emptyStateHeaderPosition(headerMediaType === CONST.EMPTY_STATE_MEDIA.ILLUSTRATION), headerStyles]}>{HeaderComponent}</View>
                     <View style={[shouldUseNarrowLayout ? styles.p5 : styles.p8, cardContentStyles]}>
-                        <Text style={[styles.textAlignCenter, styles.textHeadlineH1, styles.mb2, titleStyles]} accessibilityRole="header">{title}</Text>
+                        <Text
+                            style={[styles.textAlignCenter, styles.textHeadlineH1, styles.mb2, titleStyles]}
+                            accessibilityRole="header"
+                        >
+                            {title}
+                        </Text>
                         {subtitleText ??
                             (doesSubtitleContainCustomEmojiAndMore ? (
                                 <TextWithEmojiFragment
diff --git a/src/components/Section/index.tsx b/src/components/Section/index.tsx
index 2cda3d295e43c..5dd4b79d3d9ce 100644
--- a/src/components/Section/index.tsx
+++ b/src/components/Section/index.tsx
@@ -186,7 +186,16 @@ function Section({
                         />
                     )}
                     <View style={[styles.flexShrink1, styles.w100]}>
-                        {renderTitle ? renderTitle() : !!title && <Text style={[styles.textHeadline, styles.cardSectionTitle, titleStyles]} accessibilityRole="header">{title}</Text>}
+                        {renderTitle
+                            ? renderTitle()
+                            : !!title && (
+                                  <Text
+                                      style={[styles.textHeadline, styles.cardSectionTitle, titleStyles]}
+                                      accessibilityRole="header"
+                                  >
+                                      {title}
+                                  </Text>
+                              )}
                     </View>
                     {cardLayout === CARD_LAYOUT.ICON_ON_RIGHT && (
                         <IconSection
diff --git a/src/components/SelectionListWithSections/BaseSelectionListWithSections.tsx b/src/components/SelectionListWithSections/BaseSelectionListWithSections.tsx
index f459f6c7eb480..e5d903d595324 100644
--- a/src/components/SelectionListWithSections/BaseSelectionListWithSections.tsx
+++ b/src/components/SelectionListWithSections/BaseSelectionListWithSections.tsx
@@ -603,7 +603,10 @@ function BaseSelectionListWithSections<TItem extends ListItem>({
             // We do this so that we can reference the height in `getItemLayout` –
             // we need to know the heights of all list items up-front in order to synchronously compute the layout of any given list item.
             // So be aware that if you adjust the content of the section header (for example, change the font size), you may need to adjust this explicit height as well.
-            <View style={[styles.optionsListSectionHeader, styles.justifyContentCenter, sectionTitleStyles]} accessibilityRole="header">
+            <View
+                style={[styles.optionsListSectionHeader, styles.justifyContentCenter, sectionTitleStyles]}
+                accessibilityRole="header"
+            >
                 <Text style={[styles.ph5, styles.textLabelSupporting]}>{section.title}</Text>
             </View>
         );
diff --git a/src/components/WorkspaceEmptyStateSection.tsx b/src/components/WorkspaceEmptyStateSection.tsx
index 889930b5d8798..6b091c17b2b1b 100644
--- a/src/components/WorkspaceEmptyStateSection.tsx
+++ b/src/components/WorkspaceEmptyStateSection.tsx
@@ -50,7 +50,12 @@ function WorkspaceEmptyStateSection({icon, subtitle, title, containerStyle, shou
 
             <View style={[styles.w100, styles.pt5]}>
                 <View style={[styles.flexRow, styles.justifyContentCenter, styles.w100, styles.mh1, styles.flexShrink1]}>
-                    <Text style={[styles.textHeadline, styles.emptyCardSectionTitle]} accessibilityRole="header">{title}</Text>
+                    <Text
+                        style={[styles.textHeadline, styles.emptyCardSectionTitle]}
+                        accessibilityRole="header"
+                    >
+                        {title}
+                    </Text>
                 </View>
 
                 {(!!subtitle || !!subtitleComponent) && (
diff --git a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx
index 4e1fb9726538c..b3f84daf33aea 100644
--- a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx
+++ b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx
@@ -246,7 +246,12 @@ function BaseOnboardingAccounting({shouldUseNativeStyles, route}: BaseOnboarding
                 shouldDisplayHelpButton={false}
             />
             <View style={[onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}>
-                <Text style={[styles.textHeadlineH1, styles.mb5]} accessibilityRole="header">{translate('onboarding.accounting.title')}</Text>
+                <Text
+                    style={[styles.textHeadlineH1, styles.mb5]}
+                    accessibilityRole="header"
+                >
+                    {translate('onboarding.accounting.title')}
+                </Text>
             </View>
             <ScrollView style={[onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5, styles.pt3, styles.pb8]}>
                 <View style={[styles.flexRow, styles.flexWrap, styles.gap3, styles.mb3]}>{accountingOptions.map(renderOption)}</View>
diff --git a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx
index 169e38b346692..d2b3a671f6489 100644
--- a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx
+++ b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx
@@ -85,7 +85,10 @@ function BaseOnboardingEmployees({shouldUseNativeStyles, route}: BaseOnboardingE
                 }}
                 shouldDisplayHelpButton={false}
             />
-            <Text style={[styles.textHeadlineH1, styles.mb5, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]} accessibilityRole="header">
+            <Text
+                style={[styles.textHeadlineH1, styles.mb5, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}
+                accessibilityRole="header"
+            >
                 {translate('onboarding.employees.title')}
             </Text>
             <SelectionList
diff --git a/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx b/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx
index 71e670caa0291..1cd70a521ab61 100644
--- a/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx
+++ b/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx
@@ -359,7 +359,12 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin
                 shouldDisplayHelpButton={false}
             />
             <View style={[onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}>
-                <Text style={[styles.textHeadlineH1, styles.mb5]} accessibilityRole="header">{translate('onboarding.interestedFeatures.title')}</Text>
+                <Text
+                    style={[styles.textHeadlineH1, styles.mb5]}
+                    accessibilityRole="header"
+                >
+                    {translate('onboarding.interestedFeatures.title')}
+                </Text>
             </View>
 
             <ScrollView
diff --git a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
index 588d9a70248fb..6fc320aeea69f 100644
--- a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
+++ b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
@@ -196,7 +196,12 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
                 shouldTrimValues={false}
             >
                 <View style={[onboardingIsMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb5]}>
-                    <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('onboarding.whatsYourName')}</Text>
+                    <Text
+                        style={styles.textHeadlineH1}
+                        accessibilityRole="header"
+                    >
+                        {translate('onboarding.whatsYourName')}
+                    </Text>
                 </View>
                 <View style={styles.mb4}>
                     <InputWrapper
diff --git a/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx b/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx
index c6f8df7c6ad86..6beb9d8f8e894 100644
--- a/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx
+++ b/src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx
@@ -93,7 +93,12 @@ function BaseOnboardingPrivateDomain({shouldUseNativeStyles, route}: BaseOnboard
                 keyboardShouldPersistTaps="handled"
             >
                 <View style={[styles.mb5, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5, styles.flex1]}>
-                    <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('onboarding.peopleYouMayKnow')}</Text>
+                    <Text
+                        style={styles.textHeadlineH1}
+                        accessibilityRole="header"
+                    >
+                        {translate('onboarding.peopleYouMayKnow')}
+                    </Text>
                     <Text style={[styles.textAlignLeft, styles.mv5]}>{translate('onboarding.workspaceYouMayJoin', {domain, email})}</Text>
                     <ValidateCodeForm
                         validateCodeActionErrorField="getAccessiblePolicies"
diff --git a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
index b3741aa4931ef..91096bfd41746 100644
--- a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
+++ b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
@@ -149,7 +149,12 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro
             <ScrollView style={[styles.flex1, styles.flexGrow1, onboardingIsMediumOrLargerScreenWidth && styles.mt5, paddingHorizontal]}>
                 <View style={styles.flex1}>
                     <View style={[onboardingIsMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb5]}>
-                        <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('onboarding.purpose.title')} </Text>
+                        <Text
+                            style={styles.textHeadlineH1}
+                            accessibilityRole="header"
+                        >
+                            {translate('onboarding.purpose.title')}{' '}
+                        </Text>
                     </View>
                     <MenuItemList
                         menuItems={menuItems}
diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
index 53ccf2ad412b6..334fda5f249f2 100644
--- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
+++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
@@ -196,7 +196,12 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
                 >
                     <View>
                         <View style={[onboardingIsMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb3]}>
-                            <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('onboarding.workEmail.title')}</Text>
+                            <Text
+                                style={styles.textHeadlineH1}
+                                accessibilityRole="header"
+                            >
+                                {translate('onboarding.workEmail.title')}
+                            </Text>
                         </View>
                         <View style={styles.mb2}>
                             <Text style={[styles.textNormal, styles.colorMuted]}>{translate('onboarding.workEmail.subtitle')}</Text>
diff --git a/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx b/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
index b31db42320dc7..cc84c0dbc4f75 100644
--- a/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
+++ b/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
@@ -102,7 +102,12 @@ function BaseOnboardingWorkEmailValidation({shouldUseNativeStyles}: BaseOnboardi
                 </View>
             ) : (
                 <View style={[styles.flex1, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}>
-                    <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('onboarding.workEmailValidation.title')}</Text>
+                    <Text
+                        style={styles.textHeadlineH1}
+                        accessibilityRole="header"
+                    >
+                        {translate('onboarding.workEmailValidation.title')}
+                    </Text>
                     <Text style={[styles.textNormal, styles.colorMuted, styles.textAlignLeft, styles.mt5]}>{translate('onboarding.workEmailValidation.magicCodeSent', {workEmail})}</Text>
                     <ValidateCodeForm
                         handleSubmitForm={validateAccountAndMerge}
diff --git a/src/pages/OnboardingWorkspaceConfirmation/BaseOnboardingWorkspaceConfirmation.tsx b/src/pages/OnboardingWorkspaceConfirmation/BaseOnboardingWorkspaceConfirmation.tsx
index ee8cdaae2e6ae..8221deb1b8856 100644
--- a/src/pages/OnboardingWorkspaceConfirmation/BaseOnboardingWorkspaceConfirmation.tsx
+++ b/src/pages/OnboardingWorkspaceConfirmation/BaseOnboardingWorkspaceConfirmation.tsx
@@ -147,7 +147,12 @@ function BaseOnboardingWorkspaceConfirmation({shouldUseNativeStyles}: BaseOnboar
                 shouldValidateOnBlur={false}
             >
                 <View style={[onboardingIsMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb3]}>
-                    <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('onboarding.confirmWorkspace.title')}</Text>
+                    <Text
+                        style={styles.textHeadlineH1}
+                        accessibilityRole="header"
+                    >
+                        {translate('onboarding.confirmWorkspace.title')}
+                    </Text>
                 </View>
                 <View style={styles.mb5}>
                     <Text style={[styles.textNormal, styles.colorMuted]}>{translate('onboarding.confirmWorkspace.subtitle')}</Text>
diff --git a/src/pages/OnboardingWorkspaceCurrency/BaseOnboardingWorkspaceCurrency.tsx b/src/pages/OnboardingWorkspaceCurrency/BaseOnboardingWorkspaceCurrency.tsx
index 88a00553c84d7..f42c376bc66f5 100644
--- a/src/pages/OnboardingWorkspaceCurrency/BaseOnboardingWorkspaceCurrency.tsx
+++ b/src/pages/OnboardingWorkspaceCurrency/BaseOnboardingWorkspaceCurrency.tsx
@@ -58,7 +58,12 @@ function BaseOnboardingWorkspaceCurrency({route, shouldUseNativeStyles}: BaseOnb
                 shouldDisplayHelpButton={false}
             />
             <View style={[onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5, onboardingIsMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb5]}>
-                <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('common.currency')}</Text>
+                <Text
+                    style={styles.textHeadlineH1}
+                    accessibilityRole="header"
+                >
+                    {translate('common.currency')}
+                </Text>
             </View>
             <CurrencySelectionList
                 listItemWrapperStyle={onboardingIsMediumOrLargerScreenWidth ? [styles.pl8, styles.pr8] : []}
diff --git a/src/pages/OnboardingWorkspaceInvite/BaseOnboardingWorkspaceInvite.tsx b/src/pages/OnboardingWorkspaceInvite/BaseOnboardingWorkspaceInvite.tsx
index 273c74efd14ea..1744e3aab143f 100644
--- a/src/pages/OnboardingWorkspaceInvite/BaseOnboardingWorkspaceInvite.tsx
+++ b/src/pages/OnboardingWorkspaceInvite/BaseOnboardingWorkspaceInvite.tsx
@@ -207,7 +207,12 @@ function BaseOnboardingWorkspaceInvite({shouldUseNativeStyles}: BaseOnboardingWo
                 shouldDisplayHelpButton={false}
             />
             <View style={[onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5, onboardingIsMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb3]}>
-                <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('onboarding.inviteMembers.title')}</Text>
+                <Text
+                    style={styles.textHeadlineH1}
+                    accessibilityRole="header"
+                >
+                    {translate('onboarding.inviteMembers.title')}
+                </Text>
             </View>
             <View style={[onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5, onboardingIsMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb5]}>
                 <Text style={[styles.textNormal, styles.colorMuted]}>{translate('onboarding.inviteMembers.subtitle')}</Text>
diff --git a/src/pages/OnboardingWorkspaceOptional/BaseOnboardingWorkspaceOptional.tsx b/src/pages/OnboardingWorkspaceOptional/BaseOnboardingWorkspaceOptional.tsx
index c275d4e7c1d2b..095a95cf0bb40 100644
--- a/src/pages/OnboardingWorkspaceOptional/BaseOnboardingWorkspaceOptional.tsx
+++ b/src/pages/OnboardingWorkspaceOptional/BaseOnboardingWorkspaceOptional.tsx
@@ -116,7 +116,12 @@ function BaseOnboardingWorkspaceOptional({shouldUseNativeStyles}: BaseOnboarding
             />
             <View style={[styles.flexGrow1, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}>
                 <View style={[onboardingIsMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb3]}>
-                    <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('onboarding.workspace.title')}</Text>
+                    <Text
+                        style={styles.textHeadlineH1}
+                        accessibilityRole="header"
+                    >
+                        {translate('onboarding.workspace.title')}
+                    </Text>
                 </View>
                 <View style={styles.mb2}>
                     <Text style={[styles.textNormal, styles.colorMuted]}>{translate('onboarding.workspace.subtitle')}</Text>
diff --git a/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx b/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx
index 0b20a8c97e0d6..107dfb8572c7a 100644
--- a/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx
+++ b/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx
@@ -165,7 +165,12 @@ function BaseOnboardingWorkspaces({route, shouldUseNativeStyles}: BaseOnboarding
                 showScrollIndicator
                 customListHeader={
                     <View style={[wrapperPadding, onboardingIsMediumOrLargerScreenWidth && styles.mt5, styles.mb5]}>
-                        <Text style={styles.textHeadlineH1} accessibilityRole="header">{translate('onboarding.joinAWorkspace')}</Text>
+                        <Text
+                            style={styles.textHeadlineH1}
+                            accessibilityRole="header"
+                        >
+                            {translate('onboarding.joinAWorkspace')}
+                        </Text>
                         <Text style={[styles.textSupporting, styles.mt3]}>{translate('onboarding.listOfWorkspaces')}</Text>
                     </View>
                 }
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index c4a92000a79b2..358770b0f43b5 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -673,7 +673,12 @@ function AdvancedSearchFilters() {
                                         style={[styles.reportHorizontalRule]}
                                     />
                                 )}
-                                <Text style={[styles.headerText, styles.reportHorizontalRule, index === 0 ? null : styles.mt4, styles.mb2]} accessibilityRole="header">{translate(section.titleTranslationKey)}</Text>
+                                <Text
+                                    style={[styles.headerText, styles.reportHorizontalRule, index === 0 ? null : styles.mt4, styles.mb2]}
+                                    accessibilityRole="header"
+                                >
+                                    {translate(section.titleTranslationKey)}
+                                </Text>
                                 {section.items.map((item) => {
                                     return (
                                         <MenuItemWithTopDescription
diff --git a/src/pages/settings/Subscription/SubscriptionPlan/SubscriptionPlanCard.tsx b/src/pages/settings/Subscription/SubscriptionPlan/SubscriptionPlanCard.tsx
index 2bdd52c4b2ed3..5983ec4553b8c 100644
--- a/src/pages/settings/Subscription/SubscriptionPlan/SubscriptionPlanCard.tsx
+++ b/src/pages/settings/Subscription/SubscriptionPlan/SubscriptionPlanCard.tsx
@@ -120,7 +120,12 @@ function SubscriptionPlanCard({subscriptionPlan, isFromComparisonModal = false,
                                 />
                             </View>
                         </View>
-                        <Text style={[styles.headerText, styles.mv2, styles.textHeadlineH2]} accessibilityRole="header">{title}</Text>
+                        <Text
+                            style={[styles.headerText, styles.mv2, styles.textHeadlineH2]}
+                            accessibilityRole="header"
+                        >
+                            {title}
+                        </Text>
                         <Text style={styles.labelStrong}>{subtitle}</Text>
                         <Text style={[styles.textLabelSupporting, styles.textSmall]}>{note}</Text>
                         <Text style={[styles.textLabelSupporting, styles.textNormal, styles.mt3, styles.mb1]}>{description}</Text>
diff --git a/src/pages/settings/Subscription/SubscriptionPlan/index.tsx b/src/pages/settings/Subscription/SubscriptionPlan/index.tsx
index 3a733fac0d9c9..b5e728085f8ba 100644
--- a/src/pages/settings/Subscription/SubscriptionPlan/index.tsx
+++ b/src/pages/settings/Subscription/SubscriptionPlan/index.tsx
@@ -23,7 +23,12 @@ function SubscriptionPlan() {
     const renderTitle = () => {
         return (
             <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
-                <Text style={[styles.textHeadline, styles.cardSectionTitle, styles.textStrong]} accessibilityRole="header">{translate('subscription.yourPlan.title')}</Text>
+                <Text
+                    style={[styles.textHeadline, styles.cardSectionTitle, styles.textStrong]}
+                    accessibilityRole="header"
+                >
+                    {translate('subscription.yourPlan.title')}
+                </Text>
                 <Button
                     small
                     text={translate('subscription.yourPlan.exploreAllPlans')}
diff --git a/src/pages/signin/SignInPageLayout/Footer.tsx b/src/pages/signin/SignInPageLayout/Footer.tsx
index 3844f7975f83f..7a20508c370c0 100644
--- a/src/pages/signin/SignInPageLayout/Footer.tsx
+++ b/src/pages/signin/SignInPageLayout/Footer.tsx
@@ -176,7 +176,12 @@ function Footer({navigateFocus}: FooterProps) {
                                 key={column.translationPath}
                                 style={footerColumn}
                             >
-                                <Text style={[styles.textHeadline, styles.footerTitle]} accessibilityRole="header">{translate(column.translationPath)}</Text>
+                                <Text
+                                    style={[styles.textHeadline, styles.footerTitle]}
+                                    accessibilityRole="header"
+                                >
+                                    {translate(column.translationPath)}
+                                </Text>
                                 <View style={[styles.footerRow]}>
                                     {column.rows.map(({href, onPress, translationPath}) => (
                                         <Hoverable key={translationPath}>
diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
index 7943f39c196cc..4e48f2638cfe3 100644
--- a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
+++ b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
@@ -561,7 +561,14 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
                 <Section
                     containerStyles={[styles.ph1, styles.pv0, styles.bgTransparent, styles.noBorderRadius]}
                     childrenStyles={[styles.flexRow, styles.flexWrap, styles.columnGap3]}
-                    renderTitle={() => <Text style={styles.mutedNormalTextLabel} accessibilityRole="header">{translate(section.titleTranslationKey)}</Text>}
+                    renderTitle={() => (
+                        <Text
+                            style={styles.mutedNormalTextLabel}
+                            accessibilityRole="header"
+                        >
+                            {translate(section.titleTranslationKey)}
+                        </Text>
+                    )}
                     subtitleMuted
                 >
                     {section.items.map(renderItem)}
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
index 52ae956d9f849..df24517e8eb6e 100644
--- a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
+++ b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
@@ -100,7 +100,12 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet
 
     const selectionListHeaderContent = (
         <View style={[styles.mh5, styles.mt2, styles.mb1]}>
-            <Text style={[styles.headerText]} accessibilityRole="header">{translate('workspace.categories.defaultSpendCategories')}</Text>
+            <Text
+                style={[styles.headerText]}
+                accessibilityRole="header"
+            >
+                {translate('workspace.categories.defaultSpendCategories')}
+            </Text>
             <Text style={[styles.mt1, styles.lh20]}>{translate('workspace.categories.spendCategoriesDescription')}</Text>
         </View>
     );
diff --git a/src/pages/workspace/reports/WorkspaceReportsPage.tsx b/src/pages/workspace/reports/WorkspaceReportsPage.tsx
index cc74bbc8b1e24..4cd8e1582dd1b 100644
--- a/src/pages/workspace/reports/WorkspaceReportsPage.tsx
+++ b/src/pages/workspace/reports/WorkspaceReportsPage.tsx
@@ -150,7 +150,12 @@ function WorkspaceReportFieldsPage({
 
     const renderReportTitle = () => (
         <OfflineWithFeedback pendingAction={policy?.pendingAction}>
-            <Text style={[styles.textHeadline, styles.cardSectionTitle, styles.accountSettingsSectionTitle, styles.mb1]} accessibilityRole="header">{translate('workspace.common.reportTitle')}</Text>
+            <Text
+                style={[styles.textHeadline, styles.cardSectionTitle, styles.accountSettingsSectionTitle, styles.mb1]}
+                accessibilityRole="header"
+            >
+                {translate('workspace.common.reportTitle')}
+            </Text>
         </OfflineWithFeedback>
     );
 

From a1f74fb15ef24b1f029c3e7481bf01576d68b531 Mon Sep 17 00:00:00 2001
From: Faizan Shoukat Abbasi <abbasi.faizan1997@gmail.com>
Date: Mon, 2 Feb 2026 21:57:48 +0500
Subject: [PATCH 4/8] Fixed feedbacks

---
 .../BaseSelectionListWithSections.tsx                    | 9 ++++-----
 src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx    | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/SelectionListWithSections/BaseSelectionListWithSections.tsx b/src/components/SelectionListWithSections/BaseSelectionListWithSections.tsx
index e5d903d595324..adc7aeb8ca112 100644
--- a/src/components/SelectionListWithSections/BaseSelectionListWithSections.tsx
+++ b/src/components/SelectionListWithSections/BaseSelectionListWithSections.tsx
@@ -603,11 +603,10 @@ function BaseSelectionListWithSections<TItem extends ListItem>({
             // We do this so that we can reference the height in `getItemLayout` –
             // we need to know the heights of all list items up-front in order to synchronously compute the layout of any given list item.
             // So be aware that if you adjust the content of the section header (for example, change the font size), you may need to adjust this explicit height as well.
-            <View
-                style={[styles.optionsListSectionHeader, styles.justifyContentCenter, sectionTitleStyles]}
-                accessibilityRole="header"
-            >
-                <Text style={[styles.ph5, styles.textLabelSupporting]}>{section.title}</Text>
+            <View style={[styles.optionsListSectionHeader, styles.justifyContentCenter, sectionTitleStyles]}>
+                <Text style={[styles.ph5, styles.textLabelSupporting]} accessibilityRole="header">
+                    {section.title}
+                </Text>
             </View>
         );
     };
diff --git a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
index 91096bfd41746..255fce813054b 100644
--- a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
+++ b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
@@ -153,7 +153,7 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro
                             style={styles.textHeadlineH1}
                             accessibilityRole="header"
                         >
-                            {translate('onboarding.purpose.title')}{' '}
+                            {translate('onboarding.purpose.title')}
                         </Text>
                     </View>
                     <MenuItemList

From 6bb6c18dfa2ad1d926f3d08273212e62413a33b2 Mon Sep 17 00:00:00 2001
From: Faizan Shoukat Abbasi <abbasi.faizan1997@gmail.com>
Date: Mon, 2 Feb 2026 22:27:18 +0500
Subject: [PATCH 5/8] Fixed lint issues

---
 src/components/CollapsibleSection/index.tsx                 | 1 +
 .../BaseSelectionListWithSections.tsx                       | 6 +++++-
 src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx | 1 +
 .../BaseOnboardingInterestedFeatures.tsx                    | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/CollapsibleSection/index.tsx b/src/components/CollapsibleSection/index.tsx
index 5af5f2cd6d19a..8ac641a09eb4f 100644
--- a/src/components/CollapsibleSection/index.tsx
+++ b/src/components/CollapsibleSection/index.tsx
@@ -50,6 +50,7 @@ function CollapsibleSection({title, children, titleStyle, textStyle, wrapperStyl
                 style={[styles.pb4, styles.flexRow]}
                 role={CONST.ROLE.BUTTON}
                 accessibilityLabel={title}
+                sentryLabel="CollapsibleSection-Toggle"
                 hoverDimmingValue={1}
                 pressDimmingValue={0.2}
             >
diff --git a/src/components/SelectionListWithSections/BaseSelectionListWithSections.tsx b/src/components/SelectionListWithSections/BaseSelectionListWithSections.tsx
index adc7aeb8ca112..a443c5e9329d8 100644
--- a/src/components/SelectionListWithSections/BaseSelectionListWithSections.tsx
+++ b/src/components/SelectionListWithSections/BaseSelectionListWithSections.tsx
@@ -604,7 +604,10 @@ function BaseSelectionListWithSections<TItem extends ListItem>({
             // we need to know the heights of all list items up-front in order to synchronously compute the layout of any given list item.
             // So be aware that if you adjust the content of the section header (for example, change the font size), you may need to adjust this explicit height as well.
             <View style={[styles.optionsListSectionHeader, styles.justifyContentCenter, sectionTitleStyles]}>
-                <Text style={[styles.ph5, styles.textLabelSupporting]} accessibilityRole="header">
+                <Text
+                    style={[styles.ph5, styles.textLabelSupporting]}
+                    accessibilityRole="header"
+                >
                     {section.title}
                 </Text>
             </View>
@@ -629,6 +632,7 @@ function BaseSelectionListWithSections<TItem extends ListItem>({
                                 style={[styles.userSelectNone, styles.flexRow, styles.alignItemsCenter]}
                                 onPress={selectAllRow}
                                 accessibilityLabel={translate('workspace.people.selectAll')}
+                                sentryLabel="SelectionList-SelectAll"
                                 role="button"
                                 accessibilityState={{checked: flattenedSections.allSelected}}
                                 disabled={flattenedSections.allOptions.length === flattenedSections.disabledOptionsIndexes.length}
diff --git a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx
index b3f84daf33aea..ac337bd3b8f2a 100644
--- a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx
+++ b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx
@@ -199,6 +199,7 @@ function BaseOnboardingAccounting({shouldUseNativeStyles, route}: BaseOnboarding
                 key={item.keyForList ?? ''}
                 onPress={() => handleIntegrationSelect(item.keyForList)}
                 accessibilityLabel={item.text}
+                sentryLabel="OnboardingAccounting-SelectIntegration"
                 accessible={false}
                 hoverStyle={!item.isSelected ? styles.hoveredComponentBG : undefined}
                 style={[styles.onboardingAccountingItem, isSmallScreenWidth && styles.flexBasis100, item.isSelected && styles.activeComponentBG]}
diff --git a/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx b/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx
index 1cd70a521ab61..3fc72c525241a 100644
--- a/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx
+++ b/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx
@@ -306,6 +306,7 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin
                         handleFeatureSelect(item.id);
                     }}
                     accessibilityLabel={item.title}
+                    sentryLabel="OnboardingInterestedFeatures-ToggleFeature"
                     accessible={false}
                     hoverStyle={!isSelected ? styles.hoveredComponentBG : undefined}
                     style={[styles.onboardingInterestedFeaturesItem, isSmallScreenWidth ? styles.flexBasis100 : {maxWidth: (width - gap) / 2}, isSelected && styles.activeComponentBG]}

From e3575de041b3e87a2fd3cd9b59fbb892010ab256 Mon Sep 17 00:00:00 2001
From: Faizan Shoukat Abbasi <abbasi.faizan1997@gmail.com>
Date: Wed, 11 Feb 2026 01:46:52 +0500
Subject: [PATCH 6/8] added header for accessibility role

---
 src/pages/signin/SignInPageLayout/SignInHeroCopy.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/signin/SignInPageLayout/SignInHeroCopy.tsx b/src/pages/signin/SignInPageLayout/SignInHeroCopy.tsx
index 3102b96c2112c..6072cabd1ffbf 100644
--- a/src/pages/signin/SignInPageLayout/SignInHeroCopy.tsx
+++ b/src/pages/signin/SignInPageLayout/SignInHeroCopy.tsx
@@ -24,6 +24,7 @@ function SignInHeroCopy({customHeadline, customHeroBody}: SignInHeroCopyProps) {
                     isMediumScreenWidth && StyleUtils.getFontSizeStyle(variables.fontSizeSignInHeroMedium),
                     isLargeScreenWidth && StyleUtils.getFontSizeStyle(variables.fontSizeSignInHeroLarge),
                 ]}
+                accessibilityRole="header"
             >
                 {customHeadline ?? translate('login.hero.header')}
             </Text>

From 97400a31408ba60097cb51f9885f893b0e8e86ce Mon Sep 17 00:00:00 2001
From: Faizan Shoukat Abbasi <abbasi.faizan1997@gmail.com>
Date: Wed, 11 Feb 2026 03:16:51 +0500
Subject: [PATCH 7/8] removed extra code

---
 .../BaseOnboardingInterestedFeatures.tsx                         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx b/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx
index 8428c7f830132..e363f1cd1920b 100644
--- a/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx
+++ b/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx
@@ -310,7 +310,6 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin
                         handleFeatureSelect(item.id);
                     }}
                     accessibilityLabel={item.title}
-                    sentryLabel="OnboardingInterestedFeatures-ToggleFeature"
                     accessible={false}
                     hoverStyle={!isSelected ? styles.hoveredComponentBG : undefined}
                     style={[styles.onboardingInterestedFeaturesItem, isSmallScreenWidth ? styles.flexBasis100 : {maxWidth: (width - gap) / 2}, isSelected && styles.activeComponentBG]}

From 33af292a794423eba708ebb206f0f7b91b994861 Mon Sep 17 00:00:00 2001
From: Faizan Shoukat Abbasi <abbasi.faizan1997@gmail.com>
Date: Wed, 11 Feb 2026 03:38:01 +0500
Subject: [PATCH 8/8] fixed eslint issues

---
 src/pages/Search/AdvancedSearchFilters.tsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 75e2b83553ca6..de3a3c6176ac7 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -14,7 +14,6 @@ import type {SearchAmountFilterKeys, SearchDateFilterKeys, SearchDatePreset, Sea
 import SpacerView from '@components/SpacerView';
 import Text from '@components/Text';
 import useAdvancedSearchFilters from '@hooks/useAdvancedSearchFilters';
-import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useSingleExecution from '@hooks/useSingleExecution';
@@ -29,7 +28,7 @@ import {convertToDisplayStringWithoutCurrency} from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {createDisplayName} from '@libs/PersonalDetailsUtils';
 import {getAllTaxRates, getCleanedTagName} from '@libs/PolicyUtils';
-import {computeReportName} from '@libs/ReportNameUtils';
+import {getReportName} from '@libs/ReportNameUtils';
 import {
     buildCannedSearchQuery,
     buildQueryStringFromFilterFormValues,
@@ -554,9 +553,9 @@ function getFilterExpenseDisplayTitle(filters: Partial<SearchAdvancedFiltersForm
         : undefined;
 }
 
-function getFilterInDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, _: LocaleContextProps['translate'], reports: OnyxCollection<Report> | undefined, currentUserAccountID: number) {
+function getFilterInDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, _: LocaleContextProps['translate'], reports: OnyxCollection<Report> | undefined) {
     return filters.in
-        ?.map((id) => computeReportName(reports?.[`${ONYXKEYS.COLLECTION.REPORT}${id}`], reports, undefined, undefined, undefined, undefined, undefined, currentUserAccountID))
+        ?.map((id) => getReportName(reports?.[`${ONYXKEYS.COLLECTION.REPORT}${id}`]))
         ?.filter(Boolean)
         ?.join(', ');
 }
@@ -574,7 +573,6 @@ function AdvancedSearchFilters() {
 
     const [policies = getEmptyObject<NonNullable<OnyxCollection<Policy>>>()] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: false});
     const [currentUserLogin] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: false, selector: emailSelector});
-    const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
 
     const taxRates = getAllTaxRates(policies);
 
@@ -641,7 +639,7 @@ function AdvancedSearchFilters() {
             ) {
                 filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters[key] ?? [], personalDetails, formatPhoneNumber);
             } else if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.IN) {
-                filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters, translate, reports, currentUserAccountID);
+                filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters, translate, reports);
             } else if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.POLICY_ID) {
                 const workspacesData = workspaces.flatMap((value) => value.data);
                 filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters, workspacesData);