Merge pull request #69 from intercom/vinesh/release_3_0_4

Release 3.0.4

Author: theVinesh

android/build.gradle

@@ -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:12.2.2'
+    implementation 'io.intercom.android:intercom-sdk:12.4.1'
 }

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

@@ -19,6 +19,7 @@ public class IntercomErrorCodes {
   public static final String SET_LAUNCHER_VISIBILITY = "208";
   public static final String SET_BOTTOM_PADDING = "209";
   public static final String DISPLAY_HELP_CENTER_COLLECTIONS = "210";
+  public static final String DISPLAY_SURVEY = "211";
   public static final String HANDLE_PUSH_MESSAGE = "301";
   public static final String SEND_TOKEN_TO_INTERCOM = "302";
   public static final String FETCH_HELP_CENTER_COLLECTIONS = "901";

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

@@ -413,6 +413,19 @@ public void displayCarousel(String carouselId, Promise promise) {
     }
   }
 
+  @ReactMethod
+  public void displaySurvey(String surveyId, Promise promise) {
+    try {
+      Intercom.client().displaySurvey(surveyId);
+      Log.d(NAME, "displaySurvey");
+      promise.resolve(true);
+    } catch (Exception err) {
+      Log.e(NAME, "displaySurvey error:");
+      Log.e(NAME, err.toString());
+      promise.reject(IntercomErrorCodes.DISPLAY_SURVEY, err.toString());
+    }
+  }
+
   @ReactMethod
   public void displayArticle(String articleId, Promise promise) {
     try {

example/.env.example

@@ -3,6 +3,7 @@ IOS_INTERCOM_KEY=$IOS_INTERCOM_KEY
 ANDROID_INTERCOM_APP_ID=$ANDROID_INTERCOM_APP_ID
 ANDROID_INTERCOM_KEY=$ANDROID_INTERCOM_KEY
 CAROUSEL_ID=$CAROUSEL_ID
+SURVEY_ID=$SURVEY_ID
 EVENT_NAME=$EVENT_NAME
 ARTICLE_ID=$ARTICLE_ID
 USER_NAME=$USER_NAME

example/ios/Podfile.lock

@@ -72,9 +72,9 @@ PODS:
     - FlipperKit/FlipperKitNetworkPlugin
   - fmt (6.2.1)
   - glog (0.3.5)
-  - Intercom (12.0.0)
-  - intercom-react-native (3.0.0):
-    - Intercom (~> 12.0.0)
+  - Intercom (12.4.0)
+  - intercom-react-native (3.0.4):
+    - Intercom (~> 12.4.0)
     - React-Core
   - libevent (2.1.12)
   - OpenSSL-Universal (1.1.180)
@@ -341,7 +341,7 @@ PODS:
     - React-cxxreact (= 0.65.1)
     - React-jsi (= 0.65.1)
     - React-perflogger (= 0.65.1)
-  - RNCAsyncStorage (1.15.14):
+  - RNCAsyncStorage (1.17.6):
     - React-Core
   - Yoga (1.14.0)
   - YogaKit (1.18.1):
@@ -404,8 +404,6 @@ DEPENDENCIES:
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
-  https://cdn.cocoapods.org/:
-    - Intercom
   trunk:
     - boost-for-react-native
     - CocoaAsyncSocket
@@ -419,6 +417,7 @@ SPEC REPOS:
     - Flipper-RSocket
     - FlipperKit
     - fmt
+    - Intercom
     - libevent
     - OpenSSL-Universal
     - YogaKit
@@ -490,7 +489,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
-  DoubleConversion: cde416483dac037923206447da6e1454df403714
+  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
   FBLazyVector: 33c82491102f20ecddb6c6a2c273696ace3191e0
   FBReactNativeSpec: df8f81d2a7541ee6755a047b398a5cb5a72acd0e
   Flipper: b1fddf9a17c32097b2b4c806ad158b2f36bb2692
@@ -503,9 +502,9 @@ SPEC CHECKSUMS:
   Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
   FlipperKit: aec2d931adeee48a07bab1ea8bcc8a6bb87dfce4
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
-  Intercom: d706bc52b0e80758b38ceadce9143b76577100fb
-  intercom-react-native: 43841bfc8d4e4eb4acad9d860e9dd10c80b8ed4b
+  glog: 5337263514dd6f09803962437687240c5dc39aa4
+  Intercom: 43bbc1feee8192066601fd414d5e8ff381d8a4c8
+  intercom-react-native: f4736830a2162d0e3bde175e030aaad1dd2aec13
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
   RCT-Folly: 0dd9e1eb86348ecab5ba76f910b56f4b5fef3c46
@@ -532,7 +531,7 @@ SPEC CHECKSUMS:
   React-RCTVibration: 92d41c2442e5328cc4d342cd7f78e5876b68bae5
   React-runtimeexecutor: 85187f19dd9c47a7c102f9994f9d14e4dc2110de
   ReactCommon: eafed38eec7b591c31751bfa7494801618460459
-  RNCAsyncStorage: ea6b5c280997b2b32a587793163b1f10e580c4f7
+  RNCAsyncStorage: 466b9df1a14bccda91da86e0b7d9a345d78e1673
   Yoga: aa0cb45287ebe1004c02a13f279c55a95f1572f4
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 

example/package.json

@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",
-    "@babel/runtime": "^7.12.5",
+    "@babel/runtime": "^7.18.3",
     "@types/react-native": "^0.64.13",
     "babel-plugin-module-resolver": "^4.1.0",
     "metro-react-native-babel-preset": "^0.66.0",

example/scripts/generateEnv.sh

@@ -5,6 +5,7 @@ echo IOS_INTERCOM_KEY=$IOS_INTERCOM_KEY >>.env
 echo ANDROID_INTERCOM_APP_ID=$ANDROID_INTERCOM_APP_ID >>.env
 echo ANDROID_INTERCOM_KEY=$ANDROID_INTERCOM_KEY >>.env
 echo CAROUSEL_ID=$CAROUSEL_ID >>.env
+echo SURVEY_ID=$SURVEY_ID >>.env
 echo EVENT_NAME=$EVENT_NAME >>.env
 echo ARTICLE_ID=$ARTICLE_ID >>.env
 echo USER_NAME=$USER_NAME >>.env

example/src/App.tsx

@@ -27,6 +27,7 @@ const AUTK_KEY = 'auth';
 const COLLECTIONS: string[] = []; //Provide help center collections ids
 // To change, replace values in .env
 const CAROUSEL_ID = Config.CAROUSEL_ID;
+const SURVEY_ID = Config.SURVEY_ID;
 const EVENT_NAME = Config.EVENT_NAME;
 const ARTICLE_ID = Config.ARTICLE_ID;
 const USER_NAME = Config.USER_NAME;
@@ -48,6 +49,7 @@ export default function App() {
 
   const [articleId, setArticleId] = useState<string | undefined>(ARTICLE_ID);
   const [carouselId, setCarouselId] = useState<string | undefined>(CAROUSEL_ID);
+  const [surveyId, setSurveyId] = useState<string | undefined>(SURVEY_ID);
   const [eventName, setEventName] = useState<string | undefined>(EVENT_NAME);
   const [collectionId, setCollectionId] = useState<string | undefined>(
     COLLECTION_ID
@@ -353,6 +355,27 @@ export default function App() {
             }
           }}
         />
+        <Input
+          title="Survey Id"
+          accessibilityLabel="survey-id"
+          value={surveyId}
+          onChangeText={(val) => {
+            setSurveyId(val);
+          }}
+          placeholder="Survey Id"
+        />
+        <Button
+          accessibilityLabel="display-survey"
+          disabled={!loggedUser}
+          title={'Display Survey'}
+          onPress={() => {
+            if (surveyId) {
+              Intercom.displaySurvey(surveyId);
+            } else {
+              showEmptyAlertMessage('Survey Id');
+            }
+          }}
+        />
         <Button
           accessibilityLabel="get-unreads"
           disabled={!loggedUser}