Merge branch 'main' into dependabot/npm_and_yarn/example/e2e/follow-redirects-and-appium-base-driver-1.15.6

Author: uddish

.circleci/config.yml

@@ -3,8 +3,8 @@ version: 2.1
 # Default VM config to be used for macOS builds
 macos_config: &macos_config
   macos:
-    xcode: 14.0.0
-  resource_class: macos.x86.medium.gen2
+    xcode: 15.3.0
+  resource_class: macos.m1.large.gen1
   shell: /bin/bash --login -eo pipefail
 
 setup_env_file: &setup_env_file
@@ -16,7 +16,7 @@ setup_env_file: &setup_env_file
 executors:
   default:
     docker:
-      - image: circleci/node:14
+      - image: cimg/node:22.2.0
     working_directory: ~/project
 
 orbs:
@@ -53,6 +53,7 @@ jobs:
       - run:
           name: Install dependencies
           command: |
+            corepack enable
             yarn install --cwd example
             yarn install --cwd example/e2e
             yarn install

.gitignore

@@ -60,3 +60,4 @@ android/keystores/debug.keystore
 lib/
 
 .env
+google-services.json

README.md

@@ -26,7 +26,10 @@ ___
     - [Push Notifications](#ios-push-notifications)
     - [Push notification deep links support](#ios-push-notification-deep-links-support)
   - [Expo](#expo)
-    - [Limitations](#limitations)
+    - [Push Notifications](#expo-push-notifications)
+    - [Push notification deep links support](#expo-push-notification-deep-links-support)
+      - [Android](#android-deep-link)
+      - [iOS](#ios-deep-link)
 - [Common methods](#methods)
   - [Types](#types)
 - [Usage](#usage)
@@ -278,10 +281,21 @@ public class MainNotificationService extends FirebaseMessagingService {
 
 ```
 
-See the [example app](https://github.com/intercom/intercom-react-native/blob/main/example/src/App.tsx) for an example of how to handle deep linking in your app.
+Add the following in your `MainActivity`
+
+```kotlin
+  override fun onNewIntent(intent: Intent) {
+    super.onNewIntent(intent)
+    setIntent(intent)
+  }
+```
+
+See the [example app](https://github.com/intercom/intercom-react-native/blob/main/sandboxes/NotificationsSandbox/App.tsx) for an example of how to handle deep linking in your app.
 
 ### IOS
 
+Intercom for iOS requires a **minimum iOS version of 15.**
+
 ```sh
 cd ios
 pod install
@@ -324,12 +338,15 @@ See [How to manually link IOS Intercom SDK](docs/IOS-MANUAL-LINKING.md)
 Add this permission to your `Info.plist`
 
 ```xml
-<key>NSPhotoLibraryUsageDescription</key>
-<string>Send photos to support center</string>
+<key>NSCameraUsageDescription</key>
+<string>Access your camera to take photos within a conversation</string>
 ```
 
 #### iOS: Push Notifications
 
+>**Note**: You should request user permission to display push notifications.
+e.g. [react-native-permissions](https://github.com/zoontek/react-native-permissions)
+
 Add **Push Notifications** and **Background Modes > Remote Notifications** [Details HERE](https://developer.apple.com/documentation/xcode/adding-capabilities-to-your-app)
 
 
@@ -468,11 +485,124 @@ The plugin provides props for extra customization. Every time you change the pro
 }
 ```
 
+#### Expo: Push notifications
+
+Add the following configurations into your `app.json` or `app.config.js`:
+
+Place your `google-services.json` inside the project's root and link it
+
+```json
+{
+  "expo": {
+    ...
+    "android": {
+      "googleServicesFile": "./google-services.json",
+      ...
+    }
+  }
+```
+
+Add the necessary permission descriptions to infoPlist key.
+
+```json
+{
+  "expo": {
+    ...
+    "ios": {
+      ...
+      "infoPlist": {
+        "NSCameraUsageDescription": "This is just a sample text to access the Camera",
+      }
+      ...
+    }
+  }
+}
+```
+
+>**Note**: You should request user permission to display push notifications.
+e.g. [react-native-permissions](https://github.com/zoontek/react-native-permissions)
+
 Next, rebuild your app as described in the ["Adding custom native code"](https://docs.expo.io/workflow/customizing/) guide.
 
-#### Limitations
+#### Expo: Push notification deep links support
+
+> **Note**: You can read more on Expo [documentation](https://docs.expo.dev/guides/deep-linking)
+
+#### Android: Deep Link
+
+```json
+{
+  "expo": {
+    "android": {
+       "intentFilters": [
+        {
+          "action": "VIEW",
+          "data": [
+            {
+              "host": "Your app scheme(app)"
+            }
+          ],
+          "category": ["BROWSABLE", "DEFAULT"]
+        }
+      ]
+    }
+  }
+}
+```
+
+#### Android: App Links
+
+```json
+{
+  "expo": {
+    "android": {
+      "intentFilters": [
+        {
+          "action": "VIEW",
+          "autoVerify": true,
+          "data": [
+            {
+              "scheme": "https",
+              "host": "Your app url(www.app.com)",
+              "pathPrefix": "Your url prefix e.g. /settings)"
+            }
+          ],
+          "category": ["BROWSABLE", "DEFAULT"]
+        }
+      ]
+    }
+  }
+}
+```
+
+#### iOS: Deep Link
+
+```json
+{
+  "expo": {
+    "ios": {
+      "infoPlist": {
+        "LSApplicationQueriesSchemes": ["Your app scheme(app)"]
+      }
+    }
+  }
+}
+```
+
+#### iOS: Universal Link
+
+```json
+{
+  "expo": {
+    "ios": {
+      "infoPlist": {
+        "IntercomUniversalLinkDomains": ["Your app url(www.app.com)"]
+      }
+    }
+  }
+}
+```
 
-- **No push notifications support**: Intercom push notifications currently aren't supported by this config plugin extension. This will be added in the future.
 
 
 ## Methods

android/build.gradle

@@ -1,73 +1,73 @@
- def packageJsonFile = file('../package.json')
- def packageJson = new groovy.json.JsonSlurper().parseText(packageJsonFile.text)
- def packageVersion = '"' + packageJson.version + '"'
+def packageJsonFile = file('../package.json')
+def packageJson = new groovy.json.JsonSlurper().parseText(packageJsonFile.text)
+def packageVersion = '"' + packageJson.version + '"'
 
 
 buildscript {
-    if (project == rootProject) {
-        repositories {
-            google()
-            mavenCentral()
-        }
+  ext {
+    buildToolsVersion = "34.0.0"
+    minSdkVersion = 21
+    compileSdkVersion = 34
+    targetSdkVersion = 34
+    ndkVersion = "25.1.8937393"
+    kotlinVersion = "1.8.0"
+  }
+  if (project == rootProject) {
+    repositories {
+      google()
+      mavenCentral()
+    }
 
-        dependencies {
-            classpath 'com.android.tools.build:gradle:3.5.3'
-        }
+    dependencies {
+      classpath("com.android.tools.build:gradle")
+      classpath("com.facebook.react:react-native-gradle-plugin")
+      classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
     }
+  }
 }
 
 apply plugin: 'com.android.library'
 
 def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+  rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
 android {
-    // Compatibility for AGP v. <4.2/Gradle 8
-    def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
-    if (agpVersion >= 7) {
-      namespace 'com.intercom.reactnative'
-    }
+  namespace 'com.intercom.reactnative'
+  compileSdk rootProject.ext.compileSdkVersion
+  buildToolsVersion rootProject.ext.buildToolsVersion
 
-    compileSdkVersion safeExtGet('IntercomReactNative_compileSdkVersion', 34)
-    defaultConfig {
-        minSdkVersion safeExtGet('IntercomReactNative_minSdkVersion', 21)
-        targetSdkVersion safeExtGet('IntercomReactNative_targetSdkVersion', 34)
-        versionCode 1
-        versionName "1.0"
-        buildConfigField 'String', 'INTERCOM_VERSION_NAME', packageVersion
-    }
+  defaultConfig {
+    minSdkVersion rootProject.ext.minSdkVersion
+    targetSdkVersion rootProject.ext.targetSdkVersion
+    versionCode 1
+    versionName "1.0"
+    buildConfigField 'String', 'INTERCOM_VERSION_NAME', packageVersion
+  }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-    }
-    lintOptions {
-        disable 'GradleCompatible'
-    }
-
-    if (agpVersion < 8) {
-      compileOptions {
-          sourceCompatibility JavaVersion.VERSION_1_8
-          targetCompatibility JavaVersion.VERSION_1_8
-      }
+  buildTypes {
+    release {
+      minifyEnabled false
     }
+  }
+  lintOptions {
+    disable 'GradleCompatible'
+  }
 }
 
 repositories {
-    mavenCentral()
-    mavenLocal()
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url("$rootDir/../node_modules/react-native/android")
-    }
-    google()
+  mavenCentral()
+  mavenLocal()
+  maven {
+    // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+    url("$rootDir/../node_modules/react-native/android")
+  }
+  google()
 }
 
 dependencies {
-    //noinspection GradleDynamicVersion
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation "com.google.firebase:firebase-messaging:${safeExtGet('firebaseMessagingVersion', '20.2.+')}"
-    implementation 'io.intercom.android:intercom-sdk:15.4.0'
+  //noinspection GradleDynamicVersion
+  implementation "com.facebook.react:react-native:+"  // From node_modules
+  implementation "com.google.firebase:firebase-messaging:${safeExtGet('firebaseMessagingVersion', '20.2.+')}"
+  implementation 'io.intercom.android:intercom-sdk:15.10.+'
 }

android/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest package="com.intercom.reactnative" xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>

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

@@ -228,7 +228,7 @@ public void setLogLevel(String logLevel, Promise promise) {
       Log.d(NAME, "setLogLevel");
       promise.resolve(true);
     } catch (Exception err) {
-      Log.e(NAME, "getUnreadConversationCount error:");
+      Log.e(NAME, "setLogLevel error:");
       Log.e(NAME, err.toString());
       promise.reject(IntercomErrorCodes.SET_LOG_LEVEL, err.toString());
     }

example/README.md

@@ -30,7 +30,7 @@ Please set up your React Native Development Environment for Android as described
 To run the app on Android, execute the following command:
 
 ```sh
-yarn example android --variant=fossDebug
+yarn example android
 ```
 
 To run the app on Android, execute the following command: