Skip to content

Commit 42b638c

Browse files
authored
Merge pull request #56 from intercom/release/2.1.0
Release 2.1.0
2 parents bf12a03 + 01bbbfb commit 42b638c

File tree

8 files changed

+23
-12
lines changed

8 files changed

+23
-12
lines changed

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@ dependencies {
6060
//noinspection GradleDynamicVersion
6161
implementation "com.facebook.react:react-native:+" // From node_modules
6262
implementation 'com.google.firebase:firebase-messaging:20.2.+'
63-
implementation 'io.intercom.android:intercom-sdk:10.6.2'
63+
implementation 'io.intercom.android:intercom-sdk:10.7.0'
6464
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<activity
1515
android:name=".MainActivity"
1616
android:label="@string/app_name"
17+
android:exported="true"
1718
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
1819
android:launchMode="singleTask"
1920
android:windowSoftInputMode="adjustResize">

example/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ buildscript {
77
ext {
88
buildToolsVersion = "30.0.2"
99
minSdkVersion = 21
10-
compileSdkVersion = 30
11-
targetSdkVersion = 30
10+
compileSdkVersion = 31
11+
targetSdkVersion = 31
1212
ndkVersion = "20.1.5948944"
1313
}
1414
repositories {

example/e2e/helpers.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,17 @@ const closeOverlay = async (customCloseButtonId?: string) => {
4545
await closeButton.waitForDisplayed({ timeout: 22000 });
4646
await closeButton.click();
4747
};
48+
49+
const closeModalOverlay = async (customCloseButtonId?: string) => {
50+
const buttonId = browser.isAndroid ? `~Close` : customCloseButtonId || `~intercom modal close button`;
51+
52+
const closeButton = await $(buttonId);
53+
await closeButton.waitForDisplayed({ timeout: 22000 });
54+
await closeButton.click();
55+
};
56+
4857
browser.addCommand('closeOverlay', closeOverlay);
58+
browser.addCommand('closeModalOverlay', closeModalOverlay);
4959

5060
const closeArticleOverlay = async () => {
5161
if (browser.isAndroid) {
@@ -55,7 +65,7 @@ const closeArticleOverlay = async () => {
5565
await closeButton.waitForDisplayed({ timeout: 22000 });
5666
await closeButton.click();
5767
} else {
58-
await closeOverlay();
68+
await closeModalOverlay();
5969
}
6070
};
6171
browser.addCommand('closeArticleOverlay', closeArticleOverlay);

example/e2e/tests/mainIntercom.e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ describe('Intercom E2E', () => {
7070
it('Should display carousel', async () => {
7171
await driver.scrollToElementByAccessibilityLabel('display-carousel');
7272
await (await $('~display-carousel')).click();
73-
await driver.closeOverlay();
73+
await driver.closeModalOverlay();
7474
});
7575

7676
it('Should get unread messages count', async () => {

example/ios/Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ PODS:
7272
- FlipperKit/FlipperKitNetworkPlugin
7373
- fmt (6.2.1)
7474
- glog (0.3.5)
75-
- Intercom (11.1.2)
76-
- intercom-react-native (2.0.4):
77-
- Intercom (~> 11.1.2)
75+
- Intercom (11.2.0)
76+
- intercom-react-native (2.1.0):
77+
- Intercom (~> 11.2.0)
7878
- React-Core
7979
- libevent (2.1.12)
8080
- OpenSSL-Universal (1.1.180)
@@ -503,8 +503,8 @@ SPEC CHECKSUMS:
503503
FlipperKit: aec2d931adeee48a07bab1ea8bcc8a6bb87dfce4
504504
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
505505
glog: 5337263514dd6f09803962437687240c5dc39aa4
506-
Intercom: 4137504754b8b082e45eda16b3e85d5c3d25dc73
507-
intercom-react-native: 65d984d37d28f19ba6702b616830cdf2bba9295a
506+
Intercom: d17f915e5b840e4c5d9f55e4b7487358469463f9
507+
intercom-react-native: 448795b154c83c180bace4f8201d85fc7e727ae6
508508
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
509509
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
510510
RCT-Folly: 0dd9e1eb86348ecab5ba76f910b56f4b5fef3c46

intercom-react-native.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ Pod::Spec.new do |s|
1717
s.resource_bundles = { 'IntercomFramework' => ['ios/assets/*'] }
1818

1919
s.dependency "React-Core"
20-
s.dependency "Intercom", '~> 11.1.2'
20+
s.dependency "Intercom", '~> 11.2.0'
2121
end

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@intercom/intercom-react-native",
3-
"version": "2.0.4",
3+
"version": "2.1.0",
44
"description": "React Native wrapper to bridge our iOS and Android SDK",
55
"main": "lib/commonjs/index",
66
"module": "lib/module/index",

0 commit comments

Comments
 (0)