Merge branch 'main' into docs/troubleshoot-jest-failing

Author: prithivraj

.circleci/config.yml

@@ -16,20 +16,27 @@ setup_env_file: &setup_env_file
 executors:
   default:
     docker:
-      - image: circleci/node:12
+      - image: circleci/node:14
     working_directory: ~/project
 
 orbs:
   android: circleci/[email protected]
 
+# Always run job
+run_always: &run_always
+  filters:
+    tags:
+      only: /.*/
 
+# Only run on release
 run_on_release: &run_on_release
   filters:
     tags:
       only: /.*/
     branches:
       ignore: /.*/
 
+
 commands:
   attach_project:
     steps:
@@ -223,34 +230,42 @@ jobs:
             yarn install
 
       - run:
-          name: Release package
-          command: npm run release --ci
+          name: Publish the package
+          command: npm publish
 
 
 workflows:
+  version: 2.1
   build-and-test:
     jobs:
-      - install-dependencies
+      - install-dependencies:
+          <<: *run_always
       - lint:
+          <<: *run_always
           requires:
             - install-dependencies
       - typescript:
+          <<: *run_always
           requires:
             - install-dependencies
       - unit-tests:
+          <<: *run_always
           requires:
             - install-dependencies
       - build-package:
+          <<: *run_always
           requires:
             - install-dependencies
       - android-e2e-test:
+          <<: *run_always
           requires:
             - install-dependencies
             - lint
             - typescript
             - unit-tests
             - build-package
       - ios-e2e-test:
+          <<: *run_always
           requires:
             - install-dependencies
             - lint

.github/workflows/fossa-license-scan.yml

@@ -0,0 +1,24 @@
+# More information on this workflow can be found here: https://stackoverflow.com/c/intercom/questions/1270
+
+name: FOSSA License Scan
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  fossa:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Attempt build
+        uses: intercom/attempt-build-action@main
+        continue-on-error: true
+      - name: Run FOSSA
+        uses: intercom/fossa-action@main
+        with:
+          fossa-api-key: ${{ secrets.FOSSA_API_KEY }}
+          fossa-event-receiver-token: ${{ secrets.FOSSA_EVENT_RECEIVER_TOKEN }}
+          datadog-api-key: ${{ secrets.DATADOG_API_KEY }}

README.md

@@ -89,16 +89,16 @@ public void onCreate() {
 }
 ```
 
-- Open `android/build.gradle` and change `minSdkVersion` to **21**
+- Open `android/build.gradle` and change `minSdkVersion` to **21**, `compileSdkVersion` and `targetSdkVersion` to at least **31**
 
 ```Gradle
 buildscript {
     // ...
     ext {
         buildToolsVersion = "29.0.2"
         minSdkVersion = 21 // <-- Here
-        compileSdkVersion = 29
-        targetSdkVersion = 29
+        compileSdkVersion = 31 // <-- Here
+        targetSdkVersion = 31 // <-- Here
     }
     // ...
 }
@@ -177,6 +177,12 @@ import com.intercom.reactnative.IntercomModule;
 
 public class MainNotificationService extends FirebaseMessagingService {
 
+  @Override
+  public void onNewToken(String refreshedToken) {
+    IntercomModule.sendTokenToIntercom(getApplication(), refreshedToken);
+    //DO LOGIC HERE
+  }
+
   public void onMessageReceived(RemoteMessage remoteMessage) {
     if (IntercomModule.isIntercomPush(remoteMessage)) {
       IntercomModule.handleRemotePushMessage(getApplication(), remoteMessage);

android/build.gradle

@@ -23,10 +23,10 @@ def safeExtGet(prop, fallback) {
 }
 
 android {
-    compileSdkVersion safeExtGet('IntercomReactNative_compileSdkVersion', 30)
+    compileSdkVersion safeExtGet('IntercomReactNative_compileSdkVersion', 31)
     defaultConfig {
         minSdkVersion safeExtGet('IntercomReactNative_minSdkVersion', 21)
-        targetSdkVersion safeExtGet('IntercomReactNative_targetSdkVersion', 30)
+        targetSdkVersion safeExtGet('IntercomReactNative_targetSdkVersion', 31)
         versionCode 1
         versionName "1.0"
         buildConfigField 'String', 'INTERCOM_VERSION_NAME', packageVersion
@@ -60,5 +60,5 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
     implementation 'com.google.firebase:firebase-messaging:20.2.+'
-    implementation 'io.intercom.android:intercom-sdk:10.3.+'
+    implementation 'io.intercom.android:intercom-sdk:12.1.1'
 }

example/android/app/src/main/AndroidManifest.xml

@@ -14,6 +14,7 @@
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
+        android:exported="true"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
         android:launchMode="singleTask"
         android:windowSoftInputMode="adjustResize">

example/android/build.gradle

@@ -7,8 +7,8 @@ buildscript {
     ext {
         buildToolsVersion = "30.0.2"
         minSdkVersion = 21
-        compileSdkVersion = 30
-        targetSdkVersion = 30
+        compileSdkVersion = 31
+        targetSdkVersion = 31
         ndkVersion = "20.1.5948944"
     }
     repositories {

example/e2e/helpers.ts

@@ -45,7 +45,17 @@ const closeOverlay = async (customCloseButtonId?: string) => {
   await closeButton.waitForDisplayed({ timeout: 22000 });
   await closeButton.click();
 };
+
+const closeModalOverlay = async (customCloseButtonId?: string) => {
+  const buttonId = browser.isAndroid ? `~Close` : customCloseButtonId || `~intercom modal close button`;
+
+  const closeButton = await $(buttonId);
+  await closeButton.waitForDisplayed({ timeout: 22000 });
+  await closeButton.click();
+};
+
 browser.addCommand('closeOverlay', closeOverlay);
+browser.addCommand('closeModalOverlay', closeModalOverlay);
 
 const closeArticleOverlay = async () => {
   if (browser.isAndroid) {
@@ -55,7 +65,7 @@ const closeArticleOverlay = async () => {
     await closeButton.waitForDisplayed({ timeout: 22000 });
     await closeButton.click();
   } else {
-    await closeOverlay();
+    await closeModalOverlay();
   }
 };
 browser.addCommand('closeArticleOverlay', closeArticleOverlay);

example/e2e/tests/mainIntercom.e2e.ts

@@ -70,7 +70,7 @@ describe('Intercom E2E', () => {
   it('Should display carousel', async () => {
     await driver.scrollToElementByAccessibilityLabel('display-carousel');
     await (await $('~display-carousel')).click();
-    await driver.closeOverlay();
+    await driver.closeModalOverlay();
   });
 
   it('Should get unread messages count', async () => {
@@ -135,9 +135,9 @@ describe('Intercom E2E', () => {
     await (await $('~authenticated')).waitForDisplayed({ timeout: 12000 });
   });
 
-  it('Should set logout ', async () => {
+  /* it('Should set logout ', async () => {
     await driver.scrollToElementByAccessibilityLabel('logout');
     await (await $('~logout')).click();
     await (await $('~unauthenticated')).waitForDisplayed({ timeout: 12000 });
-  });
+  }); */
 });

example/ios/Podfile.lock

@@ -72,9 +72,9 @@ PODS:
     - FlipperKit/FlipperKitNetworkPlugin
   - fmt (6.2.1)
   - glog (0.3.5)
-  - Intercom (11.0.1)
-  - intercom-react-native (2.0.1):
-    - Intercom (~> 11.0.0)
+  - Intercom (12.0.0)
+  - intercom-react-native (3.0.0):
+    - Intercom (~> 12.0.0)
     - React-Core
   - libevent (2.1.12)
   - OpenSSL-Universal (1.1.180)
@@ -404,6 +404,8 @@ DEPENDENCIES:
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
+  https://cdn.cocoapods.org/:
+    - Intercom
   trunk:
     - boost-for-react-native
     - CocoaAsyncSocket
@@ -417,7 +419,6 @@ SPEC REPOS:
     - Flipper-RSocket
     - FlipperKit
     - fmt
-    - Intercom
     - libevent
     - OpenSSL-Universal
     - YogaKit
@@ -489,7 +490,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
-  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
+  DoubleConversion: cde416483dac037923206447da6e1454df403714
   FBLazyVector: 33c82491102f20ecddb6c6a2c273696ace3191e0
   FBReactNativeSpec: df8f81d2a7541ee6755a047b398a5cb5a72acd0e
   Flipper: b1fddf9a17c32097b2b4c806ad158b2f36bb2692
@@ -502,9 +503,9 @@ SPEC CHECKSUMS:
   Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
   FlipperKit: aec2d931adeee48a07bab1ea8bcc8a6bb87dfce4
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 5337263514dd6f09803962437687240c5dc39aa4
-  Intercom: ce64b3b0be34bb3f24527f2554a37b86f3d54363
-  intercom-react-native: dfb9c1556eff6cfdc262bf9e148ee59804371632
+  glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
+  Intercom: d706bc52b0e80758b38ceadce9143b76577100fb
+  intercom-react-native: 43841bfc8d4e4eb4acad9d860e9dd10c80b8ed4b
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
   RCT-Folly: 0dd9e1eb86348ecab5ba76f910b56f4b5fef3c46
@@ -537,4 +538,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 1d6700a56b42f5d113c60bf174c5b9390544aece
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3

example/metro.config.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const blacklist = require('metro-config/src/defaults/blacklist');
+const blacklist = require('metro-config/src/defaults/exclusionList');
 const escape = require('escape-string-regexp');
 const pak = require('../package.json');