Merge main and resolve conflicts

Author: OlGierd03

.github/actions/javascript/failureNotifier/failureNotifier.ts

@@ -122,6 +122,8 @@ ${errorMessage}
 1. **Why the PR caused the job to fail?**
 2. **Address any underlying issues.**
 
+**For detailed instructions, check [this SO](https://stackoverflowteams.com/c/expensify/questions/21936).**
+
 **🐛 We appreciate your help in squashing this bug!**`;
 
         await octokit.rest.issues.create({

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009036400
-        versionName "9.3.64-0"
+        versionCode 1009036401
+        versionName "9.3.64-1"
         // 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

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

cspell.json

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.3.64.0</string>
+	<string>9.3.64.1</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.64</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.64.0</string>
+	<string>9.3.64.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.64</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.64.0</string>
+	<string>9.3.64.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/ShareViewController/Info.plist

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.3.64-0",
+  "version": "9.3.64-1",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

package-lock.json

@@ -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