Main CI failing - merge result missing enum symbol PreloadState.FailureReason.WebContentProcessTerminated

platforms/react-native/modules/@shopify/checkout-kit-react-native/android/src/main/java/com/shopify/reactnative/checkoutkit/ShopifyCheckoutKitModule.java

@@ -76,7 +76,7 @@
   public void present(String checkoutURL, ReadableArray subscribedMethods) {
     releaseCheckoutListener();
 
     Activity currentActivity = getCurrentActivity();
     if (currentActivity instanceof ComponentActivity) {
       DispatchHandle dispatch = new DispatchHandle(json -> emitOnDispatch(json));
       CustomCheckoutListener listener = new CustomCheckoutListener(dispatch);
@@ -115,7 +115,7 @@
   public void preload(String checkoutURL, String requestId) {
     releaseCheckoutPreload();
 
     Activity currentActivity = getCurrentActivity();
     if (currentActivity instanceof ComponentActivity) {
       checkoutPreload = ShopifyCheckoutKit.preload(
           checkoutURL,
@@ -159,8 +159,8 @@
           event.put("statusCode", ((PreloadState.FailureReason.HttpError) reason).getStatusCode());
         } else if (reason instanceof PreloadState.FailureReason.NavigationFailed) {
           event.put("reason", "navigationFailed");
-        } else if (reason instanceof PreloadState.FailureReason.WebContentProcessTerminated) {
-          event.put("reason", "webContentProcessTerminated");
+        } else if (reason instanceof PreloadState.FailureReason.WebContentUnavailable) {
+          event.put("reason", "webContentUnavailable");
         } else if (reason instanceof PreloadState.FailureReason.ProtocolError) {
           event.put("reason", "protocolError");
         } else {

platforms/react-native/modules/@shopify/checkout-kit-react-native/api/checkout-kit-react-native.api.md

@@ -274,8 +274,7 @@ export enum LogLevel {
 export type PreloadFailureReason =
 | 'httpError'
 | 'navigationFailed'
-| 'keepAliveLost'
-| 'webContentProcessTerminated'
+| 'webContentUnavailable'
 | 'protocolError'
 | 'unknown';
 

platforms/react-native/modules/@shopify/checkout-kit-react-native/ios/ShopifyCheckoutKit.swift

@@ -376,7 +376,7 @@ extension RCTShopifyCheckoutKit {
             event["type"] = "ready"
         case .expired:
             event["type"] = "expired"
-        case let .failed(reason):
+        case let .failed(reason, _):
             event["type"] = "failed"
             event.merge(serializePreloadFailure(reason)) { _, new in new }
         }
@@ -390,16 +390,14 @@ extension RCTShopifyCheckoutKit {
         }
     }
 
-    private func serializePreloadFailure(_ reason: PreloadState.FailureReason) -> [String: Any] {
+    func serializePreloadFailure(_ reason: PreloadState.FailureReason) -> [String: Any] {
         switch reason {
         case let .httpError(statusCode):
             return ["reason": "httpError", "statusCode": statusCode]
         case .navigationFailed:
             return ["reason": "navigationFailed"]
-        case .keepAliveLost:
-            return ["reason": "keepAliveLost"]
-        case .webContentProcessTerminated:
-            return ["reason": "webContentProcessTerminated"]
+        case .webContentUnavailable:
+            return ["reason": "webContentUnavailable"]
         case .protocolError:
             return ["reason": "protocolError"]
         }

platforms/react-native/modules/@shopify/checkout-kit-react-native/src/index.d.ts

@@ -218,8 +218,7 @@ export interface PresentCallbacks {
 export type PreloadFailureReason =
   | 'httpError'
   | 'navigationFailed'
-  | 'keepAliveLost'
-  | 'webContentProcessTerminated'
+  | 'webContentUnavailable'
   | 'protocolError'
   | 'unknown';
 

platforms/react-native/modules/@shopify/checkout-kit-react-native/src/preload.ts

@@ -16,8 +16,7 @@ type NativePreloadStateEvent = {
 const failureReasons = new Set<PreloadFailureReason>([
   'httpError',
   'navigationFailed',
-  'keepAliveLost',
-  'webContentProcessTerminated',
+  'webContentUnavailable',
   'protocolError',
   'unknown',
 ]);

platforms/react-native/modules/@shopify/checkout-kit-react-native/tests/index.test.ts

@@ -300,7 +300,7 @@ describe('ShopifyCheckoutKit', () => {
       });
     });
 
-    it('normalizes terminated web content process preload failures', () => {
+    it('normalizes unavailable web content preload failures', () => {
       const onStateChange = jest.fn();
       const instance = new ShopifyCheckout();
       const subscription = instance.preload(checkoutUrl, {onStateChange});
@@ -309,17 +309,17 @@ describe('ShopifyCheckoutKit', () => {
         JSON.stringify({
           requestId: preloadRequestId(),
           type: 'failed',
-          reason: 'webContentProcessTerminated',
+          reason: 'webContentUnavailable',
         }),
       );
 
       expect(onStateChange).toHaveBeenCalledWith({
         type: 'failed',
-        reason: 'webContentProcessTerminated',
+        reason: 'webContentUnavailable',
       });
       expect(subscription.state).toEqual({
         type: 'failed',
-        reason: 'webContentProcessTerminated',
+        reason: 'webContentUnavailable',
       });
     });
 

platforms/react-native/sample/android/app/src/test/java/com/shopify/checkoutkit/reactnativedemo/ShopifyCheckoutKitModuleTest.java

@@ -173,7 +173,7 @@ public void testCanPreloadCheckout() {
   }
 
   @Test
-  public void testPreloadSerializesWebContentProcessTerminated() {
+  public void testPreloadSerializesWebContentUnavailable() {
     try (MockedStatic<ShopifyCheckoutKit> mockedShopifyCheckoutKit = Mockito
         .mockStatic(ShopifyCheckoutKit.class)) {
       String checkoutUrl = "https://shopify.com";
@@ -194,12 +194,13 @@ public void testPreloadSerializesWebContentProcessTerminated() {
           eq(mockComponentActivity),
           listenerCaptor.capture()));
       listenerCaptor.getValue().onStateChanged(new PreloadState.Failed(
-          PreloadState.FailureReason.WebContentProcessTerminated.INSTANCE));
+          PreloadState.FailureReason.WebContentUnavailable.INSTANCE,
+          "Web content process terminated."));
 
       assertThat(shopifyCheckoutKitModule.preloadStateEvent)
           .contains("\"requestId\":\"preload-request\"")
           .contains("\"type\":\"failed\"")
-          .contains("\"reason\":\"webContentProcessTerminated\"");
+          .contains("\"reason\":\"webContentUnavailable\"");
     }
   }
 

platforms/react-native/test/rct-integration-app/RCTIntegrationAppTests/ShopifyCheckoutKitTests.swift

@@ -328,6 +328,12 @@ class ShopifyCheckoutKitTests: XCTestCase {
     XCTAssertEqual(result?["preloading"] as? Bool, false)
   }
 
+  func testSerializePreloadFailureMapsUnavailableWebContent() {
+    let result = shopifyCheckoutKit.serializePreloadFailure(.webContentUnavailable)
+
+    XCTAssertEqual(result["reason"] as? String, "webContentUnavailable")
+  }
+
   func testPreloadWithInvalidURLDoesNotRetainCheckoutSheet() {
     let preloadAttemptCompleted = expectation(description: "preload attempt completed")