merge: pull latest main

# Conflicts:
#	src/components/LHNOptionsList/OptionRowLHN.tsx

Author: BartekObudzinski

cspell.json

@@ -640,6 +640,7 @@
         "rideshare",
         "RNCORE",
         "RNFS",
+        "RNLinksdk",
         "rnmapbox",
         "RNTL",
         "RNVP",

patches/react-native-plaid-link-sdk/details.md

@@ -0,0 +1,26 @@
+# `react-native-plaid-link-sdk` patches
+
+### [react-native-plaid-link-sdk+12.5.3+001+fix-oauth-hybrid-app-ios.patch](react-native-plaid-link-sdk+12.5.3+001+fix-oauth-hybrid-app-ios.patch)
+
+- Reason:
+
+    ```
+    Fixes Plaid OAuth getting stuck in a retry loop on HybridApp iOS (e.g.
+    Banco Santander ES). HybridApp routes the bank's universal-link return
+    through JS Linking, so LinkKit never sees the callback URL and re-fires
+    OAuth after its internal timeout. The patch exposes [PLKHandler
+    resumeAfterTermination:] to JS so we can forward the URL back into the SDK.
+
+    The patch:
+    1. Adds RCT_EXPORT_METHOD(continueFromRedirectUri:) to RNLinksdk.mm.
+    2. Tracks the active module via a static sSharedInstance, set when
+       createPlaidLink succeeds and cleared on exit/handoff, so the
+       forwarder can resolve the correct handler.
+    3. Adds the matching continueFromRedirectUri Spec entry to
+       src/fabric/NativePlaidLinkModuleiOS.ts (required on New Architecture
+       so the TurboModule codegen exposes the method to JS).
+    ```
+
+- Upstream PR/issue: -
+- E/App issue: https://github.com/Expensify/App/issues/87757
+- PR introducing patch: https://github.com/Expensify/App/pull/88534

patches/react-native-plaid-link-sdk/react-native-plaid-link-sdk+12.5.3+001+fix-oauth-hybrid-app-ios.patch

@@ -0,0 +1,75 @@
+diff --git a/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.mm b/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.mm
+index cca454e..a1b66d7 100644
+--- a/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.mm
++++ b/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.mm
+@@ -12,6 +12,12 @@ static NSString* const kRNLinkKitEventNameKey = @"event";
+ static NSString* const kRNLinkKitEventMetadataKey = @"metadata";
+ static NSString* const kRNLinkKitVersionConstant = @"version";
+ 
++// Tracks the module instance whose linkHandler is currently active for OAuth.
++// Set when createPlaidLink succeeds, cleared whenever linkHandler is nilled.
++// Lets JS forward universal-link OAuth redirects back into the SDK via
++// the RCT_EXPORT_METHOD continueFromRedirectUri: below.
++static RNLinksdk *sSharedInstance = nil;
++
+ @interface RNLinksdk ()
+ @property (nonatomic, strong) id<PLKHandler> linkHandler;
+ @property (nonatomic, strong) UIViewController* presentingViewController;
+@@ -92,6 +98,9 @@ RCT_EXPORT_METHOD(createPlaidLink:(NSString*)token noLoadingState:(BOOL)noLoadin
+             }
+             strongSelf.exitCallback = nil;
+             strongSelf.linkHandler = nil;
++            if (sSharedInstance == strongSelf) {
++                sSharedInstance = nil;
++            }
+         }
+     };
+ 
+@@ -108,6 +117,9 @@ RCT_EXPORT_METHOD(createPlaidLink:(NSString*)token noLoadingState:(BOOL)noLoadin
+                 if (strongSelf.presentingViewController == nil) {
+                     // Deallocate the handler it's no longer needed.
+                     strongSelf.linkHandler = nil;
++                    if (sSharedInstance == strongSelf) {
++                        sSharedInstance = nil;
++                    }
+                 }
+             }
+         }
+@@ -121,6 +133,9 @@ RCT_EXPORT_METHOD(createPlaidLink:(NSString*)token noLoadingState:(BOOL)noLoadin
+     NSError *creationError = nil;
+     self.linkHandler = [RNPlaidHelper createWithLinkTokenConfiguration:config error:&creationError];
+     self.creationError = creationError;
++    if (self.linkHandler) {
++        sSharedInstance = self;
++    }
+ }
+ 
+ RCT_EXPORT_METHOD(open:(BOOL)fullScreen onSuccess:(RCTResponseSenderBlock)onSuccess onExit:(RCTResponseSenderBlock)onExit) {
+@@ -175,6 +190,15 @@ RCT_EXPORT_METHOD(open:(BOOL)fullScreen onSuccess:(RCTResponseSenderBlock)onSucc
+     }
+ }
+ 
++RCT_EXPORT_METHOD(continueFromRedirectUri:(NSString *)urlString) {
++    NSURL *url = [NSURL URLWithString:urlString];
++    RNLinksdk *instance = sSharedInstance;
++    if (url == nil || instance == nil || instance.linkHandler == nil) {
++        return;
++    }
++    [instance.linkHandler resumeAfterTermination:url];
++}
++
+ RCT_EXPORT_METHOD(dismiss) {
+     [self.presentingViewController dismissViewControllerAnimated:YES
+                                                       completion:nil];
+diff --git a/node_modules/react-native-plaid-link-sdk/src/fabric/NativePlaidLinkModuleiOS.ts b/node_modules/react-native-plaid-link-sdk/src/fabric/NativePlaidLinkModuleiOS.ts
+index a783aa9..a15e91f 100644
+--- a/node_modules/react-native-plaid-link-sdk/src/fabric/NativePlaidLinkModuleiOS.ts
++++ b/node_modules/react-native-plaid-link-sdk/src/fabric/NativePlaidLinkModuleiOS.ts
+@@ -12,6 +12,7 @@ export interface Spec extends TurboModule {
+         onSuccess: (result: UnsafeObject<LinkSuccess>) => void,
+         onExit: (error: UnsafeObject<LinkError>, result: UnsafeObject<LinkExit>) => void,
+       ): void;
++    continueFromRedirectUri(urlString: string): void;
+     dismiss(): void;
+     submit(
+       phoneNumber: string | undefined,

src/CONST/index.ts

@@ -8233,6 +8233,7 @@ const CONST = {
         },
     },
     DEFAULT_REPORT_METADATA: {isLoadingInitialReportActions: true},
+    DEFAULT_REPORT_LOADING_STATE: {isLoadingInitialReportActions: true},
     UPGRADE_PATHS: {
         CATEGORIES: 'categories',
         REPORTS: 'reports',

src/ONYXKEYS.ts

@@ -484,6 +484,10 @@ const ONYXKEYS = {
     // Stores last visited path
     LAST_VISITED_PATH: 'lastVisitedPath',
 
+    /** Map of reportID → DB-formatted timestamp for when the user last visited each report.
+     *  Only consumed by `findLastAccessedReport` / `getMostRecentlyVisitedReport` for navigation fallbacks. */
+    REPORT_LAST_VISIT_TIMES: 'reportLastVisitTimes',
+
     // Stores the recently used report fields
     RECENTLY_USED_REPORT_FIELDS: 'recentlyUsedReportFields',
 
@@ -732,10 +736,17 @@ const ONYXKEYS = {
         REPORT: 'report_',
         REPORT_NAME_VALUE_PAIRS: 'reportNameValuePairs_',
         REPORT_DRAFT: 'reportDraft_',
-        // REPORT_METADATA is a perf optimization used to hold loading states (isLoadingInitialReportActions, isLoadingOlderReportActions, isLoadingNewerReportActions).
-        // A lot of components are connected to the Report entity and do not care about the actions. Setting the loading state
-        // directly on the report caused a lot of unnecessary re-renders
+        // REPORT_METADATA holds report-level business state that is NOT the report itself
+        // (optimistic flag, pending chat members, report-level errors, DEW pendingExpenseAction).
+        // Loading flags / pagination cursors / last-visit timestamp live in dedicated
+        // keys below (REPORT_LOADING_STATE, REPORT_PAGINATION_STATE, REPORT_LAST_VISIT_TIMES)
+        // so they don't ripple to every subscriber of the report's business state.
         REPORT_METADATA: 'reportMetadata_',
+        /** Session-scoped loading/error flags for a report's action list.
+         *  Registered as RAM-only in `setup/index.ts`. */
+        RAM_ONLY_REPORT_LOADING_STATE: 'reportLoadingState_',
+        /** Pagination cursors for a report's action list. */
+        REPORT_PAGINATION_STATE: 'reportPaginationState_',
         REPORT_ACTIONS: 'reportActions_',
         REPORT_ACTIONS_DRAFTS: 'reportActionsDrafts_',
         REPORT_ACTIONS_PAGES: 'reportActionsPages_',
@@ -1262,6 +1273,8 @@ type OnyxCollectionValuesMapping = {
     [ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS]: OnyxTypes.ReportNameValuePairs;
     [ONYXKEYS.COLLECTION.REPORT_DRAFT]: OnyxTypes.Report;
     [ONYXKEYS.COLLECTION.REPORT_METADATA]: OnyxTypes.ReportMetadata;
+    [ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE]: OnyxTypes.ReportLoadingState;
+    [ONYXKEYS.COLLECTION.REPORT_PAGINATION_STATE]: OnyxTypes.ReportPaginationState;
     [ONYXKEYS.COLLECTION.REPORT_ACTIONS]: OnyxTypes.ReportActions;
     [ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS]: OnyxTypes.ReportActionsDrafts;
     [ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES]: OnyxTypes.Pages;
@@ -1457,6 +1470,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.ONBOARDING_LAST_VISITED_PATH]: string;
     [ONYXKEYS.RAM_ONLY_IS_SEARCHING_FOR_REPORTS]: boolean;
     [ONYXKEYS.LAST_VISITED_PATH]: string | undefined;
+    [ONYXKEYS.REPORT_LAST_VISIT_TIMES]: OnyxTypes.ReportLastVisitTimes;
     [ONYXKEYS.RECENTLY_USED_REPORT_FIELDS]: OnyxTypes.RecentlyUsedReportFields;
     [ONYXKEYS.RAM_ONLY_UPDATE_REQUIRED]: boolean;
     [ONYXKEYS.SUPPORTAL_PERMISSION_DENIED]: OnyxTypes.SupportalPermissionDenied | null;