Merge remote-tracking branch 'origin' into fix/83781

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Author: mukhrr

.claude/commands/review-code-pr.md

@@ -1,6 +1,6 @@
 ---
 allowed-tools: Bash(gh pr diff:*),Bash(gh pr view:*),Bash(check-compiler.sh:*)
-description: Review a code contribution pull request
+description: Run the coding-standards rule linter on a PR diff. Use when user wants to review their changes against our custom rules.
 ---
 
 Perform a comprehensive PR review using a specialized subagent:

.gitignore

@@ -58,8 +58,8 @@ yarn-error.log
 # Bundled code
 dist/
 
-# Generated eslint-report HTML (npm run eslint-report)
-/reports/
+# Generated eslint-report HTML (npm run eslint-report; written under .eslint-reports/)
+/.eslint-reports/
 
 # BUCK
 buck-out/

.prettierignore

@@ -22,6 +22,7 @@ index.js
 web/snippets/**
 
 # Automatically generated files
+.eslint-reports/
 src/libs/SearchParser/searchParser.js
 src/libs/SearchParser/autocompleteParser.js
 

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009036423
-        versionName "9.3.64-23"
+        versionCode 1009036502
+        versionName "9.3.65-2"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

android/app/build.gradle

@@ -738,6 +738,7 @@ const config = defineConfig([
         '**/*.config.mjs',
         '**/node_modules/**/*',
         '**/dist/**/*',
+        '.eslint-reports/**/*',
         'android/**/build/**/*',
         'docs/vendor/**/*',
         'docs/assets/**/*',

assets/images/table-pencil.svg

@@ -3,7 +3,7 @@
 
 "../../.github/actions/javascript/getAndroidRolloutPercentage/getAndroidRolloutPercentage.ts"	"rulesdir/no-default-id-values"	1
 "../../.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.ts"	"no-restricted-imports"	1
-"../../__mocks__/@react-native-camera-roll/camera-roll.ts"	"@typescript-eslint/no-deprecated"	1
+"../../__mocks__/@react-native-camera-roll/camera-roll.ts"	"@typescript-eslint/no-deprecated/CameraRoll.save"	1
 "../../__mocks__/expo-video.tsx"	"react-hooks/refs"	2
 "../../__mocks__/react-native-safe-area-context.tsx"	"react-hooks/refs"	4
 "../../modules/ExpensifyNitroUtils/src/index.ts"	"no-restricted-syntax"	1
@@ -66,7 +66,7 @@
 "../../src/components/Form/FormProvider.tsx"	"react-hooks/immutability"	2
 "../../src/components/Form/FormProvider.tsx"	"react-hooks/refs"	2
 "../../src/components/Form/InputWrapper.tsx"	"react-hooks/refs"	1
-"../../src/components/FullscreenLoadingIndicator.tsx"	"@typescript-eslint/no-deprecated"	1
+"../../src/components/FullscreenLoadingIndicator.tsx"	"@typescript-eslint/no-deprecated/StyleSheet.absoluteFillObject"	1
 "../../src/components/GrowlNotification/index.tsx"	"no-restricted-syntax"	1
 "../../src/components/HTMLEngineProvider/index.tsx"	"no-restricted-syntax"	1
 "../../src/components/Hoverable/ActiveHoverable.tsx"	"react-hooks/refs"	3
@@ -76,8 +76,7 @@
 "../../src/components/ImportSpreadsheet.tsx"	"react-hooks/refs"	1
 "../../src/components/InteractiveStepSubPageHeader.tsx"	"no-restricted-syntax"	1
 "../../src/components/KYCWall/BaseKYCWall.tsx"	"react-hooks/refs"	2
-"../../src/components/LHNOptionsList/OptionRowLHN.tsx"	"react-hooks/preserve-manual-memoization"	1
-"../../src/components/LoadingIndicator.tsx"	"@typescript-eslint/no-deprecated"	1
+"../../src/components/LoadingIndicator.tsx"	"@typescript-eslint/no-deprecated/StyleSheet.absoluteFillObject"	1
 "../../src/components/LocaleContextProvider.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/Lottie/index.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/MagicCodeInput.tsx"	"react-hooks/refs"	1
@@ -123,7 +122,7 @@
 "../../src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx"	"react-hooks/refs"	1
 "../../src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/RoomHeaderAvatars.tsx"	"no-restricted-syntax"	2
-"../../src/components/SAMLLoadingIndicator.tsx"	"@typescript-eslint/no-deprecated"	1
+"../../src/components/SAMLLoadingIndicator.tsx"	"@typescript-eslint/no-deprecated/StyleSheet.absoluteFillObject"	1
 "../../src/components/ScreenWrapper/ScreenWrapperContainer.tsx"	"react-hooks/refs"	2
 "../../src/components/Search/FilterComponents/DateFilterBase.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/Search/FilterDropdowns/CardSelectPopup.tsx"	"react-hooks/set-state-in-effect"	1
@@ -146,7 +145,7 @@
 "../../src/components/TextInput/BaseTextInput/implementation/index.native.tsx"	"react-hooks/static-components"	1
 "../../src/components/TextInput/BaseTextInput/implementation/index.tsx"	"react-hooks/refs"	2
 "../../src/components/TextInput/BaseTextInput/implementation/index.tsx"	"react-hooks/static-components"	1
-"../../src/components/TextInput/BaseTextInput/isTextInputFocused.ts"	"@typescript-eslint/no-deprecated"	1
+"../../src/components/TextInput/BaseTextInput/isTextInputFocused.ts"	"@typescript-eslint/no-deprecated/React.MutableRefObject"	1
 "../../src/components/TextInput/index.tsx"	"no-restricted-syntax"	1
 "../../src/components/TextLinkBlock.tsx"	"no-restricted-syntax"	1
 "../../src/components/TextPicker/TextSelectorModal.tsx"	"react-hooks/set-state-in-effect"	1
@@ -171,7 +170,7 @@
 "../../src/hooks/useCancellationType.ts"	"react-hooks/set-state-in-effect"	1
 "../../src/hooks/useDebouncedState.ts"	"react-hooks/refs"	2
 "../../src/hooks/useDomainGroupFilter.ts"	"react-hooks/set-state-in-effect"	1
-"../../src/hooks/useDragAndDrop/types.ts"	"@typescript-eslint/no-deprecated"	1
+"../../src/hooks/useDragAndDrop/types.ts"	"@typescript-eslint/no-deprecated/React.MutableRefObject"	1
 "../../src/hooks/useInitial.ts"	"react-hooks/refs"	4
 "../../src/hooks/useIsBlockedToAddFeed.ts"	"react-hooks/set-state-in-effect"	1
 "../../src/hooks/useIsOwnWorkspaceChatRef.ts"	"react-hooks/refs"	2
@@ -194,7 +193,7 @@
 "../../src/hooks/useSingleExecution/index.native.ts"	"react-hooks/refs"	1
 "../../src/hooks/useStepFormSubmit.ts"	"no-restricted-syntax"	1
 "../../src/hooks/useSubStep/index.ts"	"react-hooks/refs"	2
-"../../src/libs/Accessibility/moveAccessibilityFocus/types.ts"	"@typescript-eslint/no-deprecated"	1
+"../../src/libs/Accessibility/moveAccessibilityFocus/types.ts"	"@typescript-eslint/no-deprecated/ElementRef"	1
 "../../src/libs/Clipboard/index.ts"	"no-restricted-syntax"	1
 "../../src/libs/ComposerUtils/index.ts"	"no-restricted-syntax"	1
 "../../src/libs/CurrencyUtils.ts"	"rulesdir/no-onyx-connect"	1
@@ -218,7 +217,7 @@
 "../../src/libs/Navigation/AppNavigator/Navigators/SearchFullscreenNavigator.tsx"	"no-restricted-syntax"	1
 "../../src/libs/Navigation/AppNavigator/Navigators/TestToolsModalNavigator.tsx"	"no-restricted-syntax"	1
 "../../src/libs/Navigation/AppNavigator/UserStatusHandler.tsx"	"no-restricted-syntax"	1
-"../../src/libs/Navigation/helpers/createNormalizedConfigs.ts"	"@typescript-eslint/no-deprecated"	1
+"../../src/libs/Navigation/helpers/createNormalizedConfigs.ts"	"@typescript-eslint/no-deprecated/escape"	1
 "../../src/libs/Network/enhanceParameters.ts"	"no-restricted-syntax"	1
 "../../src/libs/Network/index.ts"	"no-restricted-syntax"	1
 "../../src/libs/Notification/LocalNotification/BrowserNotifications.ts"	"no-restricted-syntax"	2
@@ -332,22 +331,21 @@
 "../../src/pages/AddressPage.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/Debug/Transaction/DebugTransactionViolations.tsx"	"no-restricted-syntax"	1
 "../../src/pages/DynamicReportChangeApproverPage.tsx"	"react-hooks/set-state-in-effect"	1
-"../../src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx"	"@typescript-eslint/no-deprecated"	1
-"../../src/pages/EnablePayments/FeesAndTerms/FeesAndTerms.tsx"	"@typescript-eslint/no-deprecated"	1
+"../../src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx"	"@typescript-eslint/no-deprecated/useSubStep"	1
+"../../src/pages/EnablePayments/FeesAndTerms/FeesAndTerms.tsx"	"@typescript-eslint/no-deprecated/useSubStep"	1
 "../../src/pages/EnablePayments/FeesAndTerms/FeesAndTerms.tsx"	"no-restricted-syntax"	2
 "../../src/pages/EnablePayments/FeesAndTerms/FeesAndTerms.tsx"	"rulesdir/no-default-id-values"	1
 "../../src/pages/EnablePayments/FeesAndTerms/substeps/TermsStep.tsx"	"react-hooks/set-state-in-effect"	1
-"../../src/pages/EnablePayments/PersonalInfo/PersonalInfo.tsx"	"@typescript-eslint/no-deprecated"	1
+"../../src/pages/EnablePayments/PersonalInfo/PersonalInfo.tsx"	"@typescript-eslint/no-deprecated/useSubStep"	1
 "../../src/pages/MissingPersonalDetails/subPages/Address.tsx"	"react-hooks/refs"	4
 "../../src/pages/MultifactorAuthentication/ValidateCodePage.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx"	"react-hooks/preserve-manual-memoization"	2
-"../../src/pages/ReimbursementAccount/EnterSignerInfo/index.tsx"	"@typescript-eslint/no-deprecated"	1
+"../../src/pages/ReimbursementAccount/EnterSignerInfo/index.tsx"	"@typescript-eslint/no-deprecated/useSubStep"	1
 "../../src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx"	"react-hooks/refs"	3
 "../../src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx"	"react-hooks/set-state-in-effect"	4
 "../../src/pages/ReimbursementAccount/USD/BeneficialOwnerInfo/subSteps/BeneficialOwnerDetailsFormSubSteps/ConfirmationUBO.tsx"	"no-restricted-syntax"	1
 "../../src/pages/ReimbursementAccount/USD/BusinessInfo/subSteps/IndustryCode/IndustryCodeSelector.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/ReportDescriptionPage.tsx"	"no-restricted-syntax"	1
-"../../src/pages/ReportDetailsPage.tsx"	"react-hooks/exhaustive-deps"	1
 "../../src/pages/ReportDetailsPage.tsx"	"react-hooks/preserve-manual-memoization"	4
 "../../src/pages/ReportParticipantsPage.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/RoomMembersPage.tsx"	"react-hooks/preserve-manual-memoization"	1
@@ -532,4 +530,4 @@
 "../../src/types/onyx/WalletOnfido.ts"	"no-restricted-syntax"	1
 "../../src/types/onyx/WalletTerms.ts"	"no-restricted-syntax"	1
 "../../src/types/onyx/WalletTransfer.ts"	"no-restricted-syntax"	1
-"../../tests/unit/useSubStepTest.tsx"	"@typescript-eslint/no-deprecated"	13
+"../../tests/unit/useSubStepTest.tsx"	"@typescript-eslint/no-deprecated/useSubStep"	13

config/eslint/eslint.config.mjs

@@ -4,6 +4,7 @@
  */
 import seatbelt from 'eslint-seatbelt';
 import reactCompilerCompatProcessor from './eslint-processor-react-compiler-compat.mjs';
+import stratifyNoDeprecatedProcessor from './eslint-processor-stratify-no-deprecated.mjs';
 
 const seatbeltProcessor = seatbelt.processors.seatbelt;
 
@@ -13,11 +14,13 @@ export default {
 
     preprocess(text, filename) {
         const [textResult] = reactCompilerCompatProcessor.preprocess(text, filename);
-        return seatbeltProcessor.preprocess(textResult, filename);
+        const [afterStratifyPreprocess] = stratifyNoDeprecatedProcessor.preprocess(textResult, filename);
+        return seatbeltProcessor.preprocess(afterStratifyPreprocess, filename);
     },
 
     postprocess(messagesPerBlock, filename) {
         const afterCompilerFilter = reactCompilerCompatProcessor.postprocess(messagesPerBlock, filename);
-        return seatbeltProcessor.postprocess([afterCompilerFilter], filename);
+        const afterStratify = stratifyNoDeprecatedProcessor.postprocess([afterCompilerFilter], filename);
+        return seatbeltProcessor.postprocess([afterStratify], filename);
     },
 };

config/eslint/eslint.seatbelt.tsv

@@ -0,0 +1,152 @@
+/**
+ * Rewrites `@typescript-eslint/no-deprecated` messages into per-API rule IDs
+ * (e.g. `@typescript-eslint/no-deprecated/StyleSheet.absoluteFillObject`) so
+ * eslint-seatbelt can ratchet each deprecated API independently.
+ */
+import {parse} from '@babel/parser';
+
+const NO_DEPRECATED_RULE_ID = '@typescript-eslint/no-deprecated';
+
+// AST keys to ignore while walking children: positions, comments, etc.
+const NON_CHILD_KEYS = new Set(['loc', 'start', 'end', 'extra', 'leadingComments', 'trailingComments', 'innerComments']);
+
+// Node types whose children are part of a single dotted/qualified expression
+// (e.g. `Foo.bar`, `Foo?.bar`, `Foo.bar` in TS type position).
+const MEMBER_LIKE_TYPES = new Set(['MemberExpression', 'OptionalMemberExpression', 'TSQualifiedName']);
+
+const sourceByFilename = new Map();
+
+const isAstNode = (value) => !!value && typeof value === 'object' && typeof value.type === 'string' && typeof value.start === 'number' && typeof value.end === 'number';
+
+/** Iterate over a node's direct AST children, skipping non-child metadata. */
+function* astChildren(node) {
+    for (const [key, value] of Object.entries(node)) {
+        if (NON_CHILD_KEYS.has(key)) {
+            continue;
+        }
+        for (const child of Array.isArray(value) ? value : [value]) {
+            if (isAstNode(child)) {
+                yield child;
+            }
+        }
+    }
+}
+
+/** Convert ESLint's 1-based (line, column) into a 0-based source offset, or -1 if line is out of range. */
+function lineColumnToOffset(source, line, column) {
+    let lineStart = 0;
+    for (let currentLine = 1; currentLine < line; currentLine++) {
+        const nextNewline = source.indexOf('\n', lineStart);
+        if (nextNewline < 0) {
+            return -1;
+        }
+        lineStart = nextNewline + 1;
+    }
+    return lineStart + column - 1;
+}
+
+/**
+ * Walk down the AST following children whose range contains `offset`.
+ * Returns the ancestor path (root → deepest) or `null` if the offset is out of range.
+ */
+function findAstPathAtOffset(root, offset) {
+    if (offset < 0 || offset < root.start || offset > root.end) {
+        return null;
+    }
+    const path = [root];
+    while (true) {
+        const current = path.at(-1);
+        let descended = false;
+        for (const child of astChildren(current)) {
+            if (offset >= child.start && offset <= child.end) {
+                path.push(child);
+                descended = true;
+                break;
+            }
+        }
+        if (!descended) {
+            return path;
+        }
+    }
+}
+
+/** Walk a path upward through any wrapping member/qualified expression and return the topmost. */
+function topOfMemberChain(path) {
+    let topIndex = path.length - 1;
+    while (topIndex > 0 && MEMBER_LIKE_TYPES.has(path.at(topIndex - 1).type)) {
+        topIndex--;
+    }
+    return path.at(topIndex);
+}
+
+function parseSourceOrNull(source) {
+    try {
+        return parse(source, {sourceType: 'module', plugins: ['typescript', 'jsx']});
+    } catch {
+        return null;
+    }
+}
+
+/** Slice the full deprecated expression (e.g. `StyleSheet.absoluteFillObject`) at the lint location, or null on miss. */
+function getDeprecatedExpressionFromSource(source, ast, message) {
+    const offset = lineColumnToOffset(source, message.line, message.column);
+    const path = findAstPathAtOffset(ast, offset);
+    if (!path) {
+        return null;
+    }
+    const top = topOfMemberChain(path);
+    return source.slice(top.start, top.end);
+}
+
+/** Fallback: parse the symbol name out of the lint message text. */
+function getSymbolNameFromMessage(message) {
+    const match = /^`([^`]+)`/.exec(message.message);
+    return match ? match.at(1) : null;
+}
+
+/** Trim; collapse whitespace and `/` to `_`. Preserves `.`, `#`, `$`, `@`. */
+function toRuleIdSuffix(apiName) {
+    return apiName.trim().replaceAll(/[\s/]+/g, '_');
+}
+
+/**
+ * @param {import('eslint').Linter.LintMessage[]} messages
+ * @param {string | null} source
+ * @returns {import('eslint').Linter.LintMessage[]}
+ */
+function stratifyMessages(messages, source) {
+    const hasNoDeprecatedMessages = messages.some((message) => message.ruleId === NO_DEPRECATED_RULE_ID);
+    const ast = source && hasNoDeprecatedMessages ? parseSourceOrNull(source) : null;
+
+    return messages.map((message) => {
+        if (message.ruleId !== NO_DEPRECATED_RULE_ID) {
+            return message;
+        }
+        const apiName = (ast && getDeprecatedExpressionFromSource(source, ast, message)) || getSymbolNameFromMessage(message);
+        if (!apiName) {
+            return message;
+        }
+        return {...message, ruleId: `${NO_DEPRECATED_RULE_ID}/${toRuleIdSuffix(apiName)}`};
+    });
+}
+
+const processor = {
+    meta: {
+        name: 'stratify-no-deprecated',
+        version: '1.0.0',
+    },
+    supportsAutofix: true,
+
+    preprocess(text, filename) {
+        sourceByFilename.set(filename, text);
+        return [text];
+    },
+
+    postprocess(messagesPerBlock, filename) {
+        const source = sourceByFilename.get(filename) ?? null;
+        sourceByFilename.delete(filename);
+        return stratifyMessages(messagesPerBlock[0], source);
+    },
+};
+
+export default processor;