Merge branch 'main' into main

Author: prithivraj

.circleci/config.yml

@@ -4,6 +4,7 @@ version: 2.1
 macos_config: &macos_config
   macos:
     xcode: 12.5.0
+  resource_class: macos.x86.medium.gen2
   shell: /bin/bash --login -eo pipefail
 
 setup_env_file: &setup_env_file
@@ -15,16 +16,26 @@ 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]
 
-run_on_master: &run_on_master
+# Always run job
+run_always: &run_always
   filters:
+    tags:
+      only: /.*/
+
+# Only run on release
+run_on_release: &run_on_release
+  filters:
+    tags:
+      only: /.*/
     branches:
-      only: main
+      ignore: /.*/
+
 
 commands:
   attach_project:
@@ -219,42 +230,50 @@ 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
             - typescript
             - unit-tests
             - build-package
       - release-to-npm:
-          <<: *run_on_master
+          <<: *run_on_release
           context:
             - react-native-context
           requires:

.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.1.+'
+    implementation 'io.intercom.android:intercom-sdk:12.1.1'
 }

docs/IOS-MANUAL-LINKING.md

@@ -4,16 +4,12 @@
 
 - In project root make `react-native link` command
 - In Xcode open `YourApp.xcworkspace`, if there is no file with extension `xcworkspace` open `YourApp.xcodeproj`
-- In file browser open `./node_modules/intercom-react-native/ios`
-  - From file browser drag `Intercom.xcframework` and drop in Xcode window under YourProject name
+- [Download intercom for iOS and extract the zip](https://github.com/intercom/intercom-ios/archive/master.zip)
+- Drag Intercom.xcframework into your project. Make sure **"Copy items if needed"** is selected and click Finish.
 
-    ![Xcode linking](xcode-linking.png)
+    ![Xcode linking](https://files.readme.io/51cf138-xcframework_drag.png)
 
-___
-
-- In popup mark `Copy items if needed`
-
-![Xcode popup](xcode-popup.png)
+![Xcode popup](https://files.readme.io/031bc35-copy_items.png)
 
 ___
 

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/package.json

@@ -16,10 +16,11 @@
     "@wdio/cli": "^7.7.2",
     "appium": "^1.21.0",
     "chai": "^4.3.4",
+    "webdriver": "^7.16.13",
     "webdriverio": "^7.7.2"
   },
   "devDependencies": {
-    "@wdio/appium-service": "^7.7.3",
+    "@wdio/appium-service": "^7.16.13",
     "@wdio/local-runner": "^7.7.3",
     "@wdio/mocha-framework": "^7.7.3",
     "@wdio/spec-reporter": "^7.7.3",

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 () => {
@@ -95,7 +95,7 @@ describe('Intercom E2E', () => {
 
     const launcherId = driver.isAndroid
       ? '~Intercom launcher'
-      : '~launcher';
+      : '~intercom launcher';
     await (await $(launcherId)).waitForDisplayed({ timeout: 12000 });
     await driver.clickWithDelay('~toggle-launcher-visibility', 12000);
   });
@@ -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 });
-  });
+  }); */
 });