Merge branch 'main' of github.com:Expensify/App

Author: jakubkalinski0

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 1009036405
+        versionName "9.3.64-5"
         // 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.5</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.5</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.5</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-5",
   "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

package.json

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