Merge branch 'main' into uv/refactor_example_app

Author: uddish

android/src/main/java/com/intercom/reactnative/IntercomModule.java

@@ -136,16 +136,16 @@ public void loginUserWithUserAttributes(ReadableMap params, Promise promise) {
     Boolean hasEmail = params.hasKey("email") && IntercomHelpers.getValueAsStringForKey(params, "email").length() > 0;
     Boolean hasUserId = params.hasKey("userId") && IntercomHelpers.getValueAsStringForKey(params, "userId").length() > 0;
     Registration registration = null;
-    String userId = IntercomHelpers.getValueAsStringForKey(params, "userId");
-    if (hasEmail) {
+    if (hasEmail && hasUserId) {
       String email = IntercomHelpers.getValueAsStringForKey(params, "email");
-      if (hasUserId) {
-        registration = new Registration().withEmail(email).withUserId(userId);
-      } else {
-        registration = Registration.create().withEmail(email);
-      }
+      String userId = IntercomHelpers.getValueAsStringForKey(params, "userId");
+      registration = new Registration().withEmail(email).withUserId(userId);
+    } else if (hasEmail) {
+      String email = IntercomHelpers.getValueAsStringForKey(params, "email");
+      registration = new Registration().withEmail(email);
     } else if (hasUserId) {
-      registration = Registration.create().withUserId(userId);
+      String userId = IntercomHelpers.getValueAsStringForKey(params, "userId");
+      registration = new Registration().withUserId(userId);
     } else {
       Log.e(NAME, "loginUserWithUserAttributes called with invalid userId or email");
       Log.e(NAME, "You must provide userId or email");

example/README.md

@@ -0,0 +1,45 @@
+# Welcome to @intercom/intercom-react-native example app 👋
+
+## Installation
+
+To get started with the @intercom/intercom-react-native example app, please follow the instructions below:
+
+1. Generate a new .env file by running the following command in your terminal:
+```sh
+sh scripts/generateEnv.sh
+```
+
+This command will create a .env file inside the example directory.
+
+1. Fill in the required Android and iOS API keys and workspace IDs in the .env file. Other variables are optional.
+
+2. Install the dependencies by running the following command in the project directory:
+
+```sh
+yarn
+```
+
+### Android
+
+To run the app on Android, execute the following command:
+
+
+```sh
+yarn example android --variant=fossDebug
+```
+
+### iOS
+For iOS, you need to install the necessary pods. Go to the example/ios directory in your terminal and run:
+
+```sh
+pod install
+```
+
+Once the pods are installed, go back to the project's root directory and execute the following command to run the app on iOS:
+
+```sh
+yarn example ios
+```
+
+### Notes:
+Please note that there is a known bug that prevents the iOS app from building on the latest Xcode. Therefore, it's recommended to use Xcode 14.2.

example/ios/Podfile.lock

@@ -73,9 +73,9 @@ PODS:
     - FlipperKit/FlipperKitNetworkPlugin
   - fmt (6.2.1)
   - glog (0.3.5)
-  - Intercom (15.0.0)
-  - intercom-react-native (5.0.0):
-    - Intercom (~> 15.0.0)
+  - Intercom (15.0.2)
+  - intercom-react-native (5.1.2):
+    - Intercom (~> 15.0.2)
     - React-Core
   - libevent (2.1.12)
   - OpenSSL-Universal (1.1.1100)
@@ -533,8 +533,8 @@ SPEC CHECKSUMS:
   FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
-  Intercom: c4d9286eb12277dd104e7a49aead819337772716
-  intercom-react-native: 83a85583016a294827177465301795ec46e5a310
+  Intercom: bb499c2bdeacaabb498c94572afa5fcfd74294eb
+  intercom-react-native: 00d89b6267abc4470949a071bfac4550fbeb6deb
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
   RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda

intercom-react-native.podspec

@@ -17,5 +17,5 @@ Pod::Spec.new do |s|
   s.resource_bundles = { 'IntercomFramework' => ['ios/assets/*'] }
 
   s.dependency "React-Core"
-  s.dependency "Intercom", '~> 15.0.0'
+  s.dependency "Intercom", '~> 15.0.2'
 end

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intercom/intercom-react-native",
-  "version": "5.1.1",
+  "version": "5.1.2",
   "description": "React Native wrapper to bridge our iOS and Android SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",