Skip to content

Commit 440537f

Browse files
muhsin-kmuhsin-k
committed
Merge branch 'develop'
2 parents f2f5752 + e8ffdda commit 440537f

File tree

9 files changed

+66
-201
lines changed

9 files changed

+66
-201
lines changed

‎README.md‎

Lines changed: 39 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<h1>
2-
chatwoot-react-native-widget (Work in progress)
2+
chatwoot-react-native-widget
33
</h1>
44

55
![](https://img.shields.io/npm/v/@chatwoot/react-native-widget?style=flat)
66
![](https://img.shields.io/npm/dt/@chatwoot/react-native-widget.svg)
77
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](http://makeapullrequest.com)
88
![](https://img.shields.io/npm/l/@chatwoot/@chatwoot/react-native-widget)
99

10-
11-
- **Supported Chatwoot version:** 1.13.2+
10+
- **Supported Chatwoot version:** 1.18.0+
1211

1312
<img src="https://user-images.githubusercontent.com/12408980/112000864-99ef4d80-8adb-11eb-94c1-9901a13b4dd4.png" alt="screenshot" width="350">
1413

@@ -70,15 +69,19 @@ const App = () => {
7069
<Text style={styles.buttonText}>Open widget</Text>
7170
</TouchableOpacity>
7271
</View>
73-
<ChatWootWidget
74-
websiteToken={websiteToken}
75-
locale={locale}
76-
baseUrl={baseUrl}
77-
closeModal={() => toggleWidget(false)}
78-
isModalVisible={showWidget}
79-
user={user}
80-
customAttributes={customAttributes}
81-
/>
72+
{
73+
showWidget&&
74+
<ChatWootWidget
75+
websiteToken={websiteToken}
76+
locale={locale}
77+
baseUrl={baseUrl}
78+
closeModal={() => toggleWidget(false)}
79+
isModalVisible={showWidget}
80+
user={user}
81+
customAttributes={customAttributes}
82+
/>
83+
}
84+
8285
</SafeAreaView>
8386
);
8487
};
@@ -127,16 +130,34 @@ The whole example is in the `/example` folder.
127130
</tr></thead>
128131
<tbody>
129132
<tr>
133+
<td>baseUrl</td>
134+
<td> - </td>
135+
<td> String </td>
136+
<td>Chatwoot installation URL</td>
137+
</tr>
138+
<tr>
130139
<td>websiteToken</td>
131140
<td> - </td>
132141
<td> String </td>
133-
<td>The website token copyied from website channel</td>
142+
<td>Website channel token</td>
134143
</tr>
135144
<tr>
136-
<td>baseUrl</td>
137-
<td> - </td>
145+
<td>locale</td>
146+
<td> en </td>
138147
<td> String </td>
139-
<td>Chatwoot installation url</td>
148+
<td>Locale</td>
149+
</tr>
150+
<tr>
151+
<td>isModalVisible</td>
152+
<td> false </td>
153+
<td> Boolean </td>
154+
<td>Widget is visible or not</td>
155+
</tr>
156+
<tr>
157+
<td>closeModal</td>
158+
<td> - </td>
159+
<td> Function </td>
160+
<td>Close event</td>
140161
</tr>
141162
<tr>
142163
<td>user</td>
@@ -145,7 +166,7 @@ The whole example is in the `/example` folder.
145166
<td>User information about the user like email, username and avatar_url</td>
146167
</tr>
147168
<tr>
148-
<td>customattributes</td>
169+
<td>customAttributes</td>
149170
<td> {} </td>
150171
<td> Object </td>
151172
<td>Additional information about the customer</td>
@@ -159,4 +180,4 @@ Feel free to send us feedback on [Twitter](https://twitter.com/chatwootapp) or [
159180

160181
If there's anything you'd like to chat about, please feel free to join our [Discord](https://discord.gg/cJXdrwS) chat!
161182

162-
_Chatwoot_ &copy; 2017-2020, Chatwoot Inc - Released under the MIT License.
183+
_Chatwoot_ &copy; 2017-2021, Chatwoot Inc - Released under the MIT License.

‎examples/.ruby-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.7.3

‎examples/ios/Podfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ target 'examples' do
2121
#
2222
# Note that if you have use_frameworks! enabled, Flipper will not work and
2323
# you should disable the next line.
24-
use_flipper!()
24+
# use_flipper!()
2525

26-
post_install do |installer|
27-
react_native_post_install(installer)
28-
end
26+
# post_install do |installer|
27+
# react_native_post_install(installer)
28+
# end
2929
end

‎examples/ios/Podfile.lock‎

Lines changed: 3 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
PODS:
22
- boost-for-react-native (1.63.0)
3-
- CocoaAsyncSocket (7.6.5)
43
- DoubleConversion (1.1.6)
54
- FBLazyVector (0.64.0)
65
- FBReactNativeSpec (0.64.0):
@@ -10,55 +9,7 @@ PODS:
109
- React-Core (= 0.64.0)
1110
- React-jsi (= 0.64.0)
1211
- ReactCommon/turbomodule/core (= 0.64.0)
13-
- Flipper (0.75.1):
14-
- Flipper-Folly (~> 2.5)
15-
- Flipper-RSocket (~> 1.3)
16-
- Flipper-DoubleConversion (1.1.7)
17-
- Flipper-Folly (2.5.1):
18-
- boost-for-react-native
19-
- Flipper-DoubleConversion
20-
- Flipper-Glog
21-
- libevent (~> 2.1.12)
22-
- OpenSSL-Universal (= 1.1.180)
23-
- Flipper-Glog (0.3.6)
24-
- Flipper-PeerTalk (0.0.4)
25-
- Flipper-RSocket (1.3.0):
26-
- Flipper-Folly (~> 2.5)
27-
- FlipperKit (0.75.1):
28-
- FlipperKit/Core (= 0.75.1)
29-
- FlipperKit/Core (0.75.1):
30-
- Flipper (~> 0.75.1)
31-
- FlipperKit/CppBridge
32-
- FlipperKit/FBCxxFollyDynamicConvert
33-
- FlipperKit/FBDefines
34-
- FlipperKit/FKPortForwarding
35-
- FlipperKit/CppBridge (0.75.1):
36-
- Flipper (~> 0.75.1)
37-
- FlipperKit/FBCxxFollyDynamicConvert (0.75.1):
38-
- Flipper-Folly (~> 2.5)
39-
- FlipperKit/FBDefines (0.75.1)
40-
- FlipperKit/FKPortForwarding (0.75.1):
41-
- CocoaAsyncSocket (~> 7.6)
42-
- Flipper-PeerTalk (~> 0.0.4)
43-
- FlipperKit/FlipperKitHighlightOverlay (0.75.1)
44-
- FlipperKit/FlipperKitLayoutPlugin (0.75.1):
45-
- FlipperKit/Core
46-
- FlipperKit/FlipperKitHighlightOverlay
47-
- FlipperKit/FlipperKitLayoutTextSearchable
48-
- YogaKit (~> 1.18)
49-
- FlipperKit/FlipperKitLayoutTextSearchable (0.75.1)
50-
- FlipperKit/FlipperKitNetworkPlugin (0.75.1):
51-
- FlipperKit/Core
52-
- FlipperKit/FlipperKitReactPlugin (0.75.1):
53-
- FlipperKit/Core
54-
- FlipperKit/FlipperKitUserDefaultsPlugin (0.75.1):
55-
- FlipperKit/Core
56-
- FlipperKit/SKIOSNetworkPlugin (0.75.1):
57-
- FlipperKit/Core
58-
- FlipperKit/FlipperKitNetworkPlugin
5912
- glog (0.3.5)
60-
- libevent (2.1.12)
61-
- OpenSSL-Universal (1.1.180)
6213
- RCT-Folly (2020.01.13.00):
6314
- boost-for-react-native
6415
- DoubleConversion
@@ -321,32 +272,11 @@ PODS:
321272
- RNCAsyncStorage (1.14.1):
322273
- React-Core
323274
- Yoga (1.14.0)
324-
- YogaKit (1.18.1):
325-
- Yoga (~> 1.14)
326275

327276
DEPENDENCIES:
328277
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
329278
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
330279
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
331-
- Flipper (~> 0.75.1)
332-
- Flipper-DoubleConversion (= 1.1.7)
333-
- Flipper-Folly (~> 2.5)
334-
- Flipper-Glog (= 0.3.6)
335-
- Flipper-PeerTalk (~> 0.0.4)
336-
- Flipper-RSocket (~> 1.3)
337-
- FlipperKit (~> 0.75.1)
338-
- FlipperKit/Core (~> 0.75.1)
339-
- FlipperKit/CppBridge (~> 0.75.1)
340-
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.75.1)
341-
- FlipperKit/FBDefines (~> 0.75.1)
342-
- FlipperKit/FKPortForwarding (~> 0.75.1)
343-
- FlipperKit/FlipperKitHighlightOverlay (~> 0.75.1)
344-
- FlipperKit/FlipperKitLayoutPlugin (~> 0.75.1)
345-
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.75.1)
346-
- FlipperKit/FlipperKitNetworkPlugin (~> 0.75.1)
347-
- FlipperKit/FlipperKitReactPlugin (~> 0.75.1)
348-
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.75.1)
349-
- FlipperKit/SKIOSNetworkPlugin (~> 0.75.1)
350280
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
351281
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
352282
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
@@ -380,17 +310,6 @@ DEPENDENCIES:
380310
SPEC REPOS:
381311
trunk:
382312
- boost-for-react-native
383-
- CocoaAsyncSocket
384-
- Flipper
385-
- Flipper-DoubleConversion
386-
- Flipper-Folly
387-
- Flipper-Glog
388-
- Flipper-PeerTalk
389-
- Flipper-RSocket
390-
- FlipperKit
391-
- libevent
392-
- OpenSSL-Universal
393-
- YogaKit
394313

395314
EXTERNAL SOURCES:
396315
DoubleConversion:
@@ -456,20 +375,10 @@ EXTERNAL SOURCES:
456375

457376
SPEC CHECKSUMS:
458377
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
459-
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
460378
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
461379
FBLazyVector: 49cbe4b43e445b06bf29199b6ad2057649e4c8f5
462-
FBReactNativeSpec: 71cf5d0dc1eb6a2658f808c272b9a5b82b519e88
463-
Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
464-
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
465-
Flipper-Folly: f7a3caafbd74bda4827954fd7a6e000e36355489
466-
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
467-
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
468-
Flipper-RSocket: 602921fee03edacf18f5d6f3d3594ba477f456e5
469-
FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00
380+
FBReactNativeSpec: f6af9bcec43fcc256bbcc3458fffc8e61c2d40e6
470381
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
471-
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
472-
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
473382
RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
474383
RCTRequired: 2f8cb5b7533219bf4218a045f92768129cf7050a
475384
RCTTypeSafety: 512728b73549e72ad7330b92f3d42936f2a4de5b
@@ -496,8 +405,7 @@ SPEC CHECKSUMS:
496405
ReactCommon: cfe2b7fd20e0dbd2d1185cd7d8f99633fbc5ff05
497406
RNCAsyncStorage: fe58eec522885718d6b297b7b658bf87d7ca557b
498407
Yoga: 8c8436d4171c87504c648ae23b1d81242bdf3bbf
499-
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
500408

501-
PODFILE CHECKSUM: 0d237943ab8cacaf88579854196cfc4cc012030b
409+
PODFILE CHECKSUM: 3f57f8f9a44ff9ba5fc829e5392025271d888429
502410

503-
COCOAPODS: 1.10.1
411+
COCOAPODS: 1.10.2

‎examples/ios/examples.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@
160160
00E356EA1AD99517003FC87E /* Sources */,
161161
00E356EB1AD99517003FC87E /* Frameworks */,
162162
00E356EC1AD99517003FC87E /* Resources */,
163-
D9385E89B8D1C6674A29025A /* [CP] Embed Pods Frameworks */,
164163
029F5A2E4A473244021919BE /* [CP] Copy Pods Resources */,
165164
);
166165
buildRules = (
@@ -183,7 +182,6 @@
183182
13B07F8C1A680F5B00A75B9A /* Frameworks */,
184183
13B07F8E1A680F5B00A75B9A /* Resources */,
185184
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
186-
C99DE30812F0CB0D16A2A7C7 /* [CP] Embed Pods Frameworks */,
187185
5448A424E984FABB77C4498D /* [CP] Copy Pods Resources */,
188186
);
189187
buildRules = (
@@ -343,40 +341,6 @@
343341
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-examples/Pods-examples-resources.sh\"\n";
344342
showEnvVarsInLog = 0;
345343
};
346-
C99DE30812F0CB0D16A2A7C7 /* [CP] Embed Pods Frameworks */ = {
347-
isa = PBXShellScriptBuildPhase;
348-
buildActionMask = 2147483647;
349-
files = (
350-
);
351-
inputFileListPaths = (
352-
"${PODS_ROOT}/Target Support Files/Pods-examples/Pods-examples-frameworks-${CONFIGURATION}-input-files.xcfilelist",
353-
);
354-
name = "[CP] Embed Pods Frameworks";
355-
outputFileListPaths = (
356-
"${PODS_ROOT}/Target Support Files/Pods-examples/Pods-examples-frameworks-${CONFIGURATION}-output-files.xcfilelist",
357-
);
358-
runOnlyForDeploymentPostprocessing = 0;
359-
shellPath = /bin/sh;
360-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-examples/Pods-examples-frameworks.sh\"\n";
361-
showEnvVarsInLog = 0;
362-
};
363-
D9385E89B8D1C6674A29025A /* [CP] Embed Pods Frameworks */ = {
364-
isa = PBXShellScriptBuildPhase;
365-
buildActionMask = 2147483647;
366-
files = (
367-
);
368-
inputFileListPaths = (
369-
"${PODS_ROOT}/Target Support Files/Pods-examples-examplesTests/Pods-examples-examplesTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
370-
);
371-
name = "[CP] Embed Pods Frameworks";
372-
outputFileListPaths = (
373-
"${PODS_ROOT}/Target Support Files/Pods-examples-examplesTests/Pods-examples-examplesTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
374-
);
375-
runOnlyForDeploymentPostprocessing = 0;
376-
shellPath = /bin/sh;
377-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-examples-examplesTests/Pods-examples-examplesTests-frameworks.sh\"\n";
378-
showEnvVarsInLog = 0;
379-
};
380344
FD10A7F022414F080027D42C /* Start Packager */ = {
381345
isa = PBXShellScriptBuildPhase;
382346
buildActionMask = 2147483647;
@@ -561,7 +525,7 @@
561525
COPY_PHASE_STRIP = NO;
562526
ENABLE_STRICT_OBJC_MSGSEND = YES;
563527
ENABLE_TESTABILITY = YES;
564-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
528+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
565529
GCC_C_LANGUAGE_STANDARD = gnu99;
566530
GCC_DYNAMIC_NO_PIC = NO;
567531
GCC_NO_COMMON_BLOCKS = YES;
@@ -626,7 +590,7 @@
626590
COPY_PHASE_STRIP = YES;
627591
ENABLE_NS_ASSERTIONS = NO;
628592
ENABLE_STRICT_OBJC_MSGSEND = YES;
629-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
593+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
630594
GCC_C_LANGUAGE_STANDARD = gnu99;
631595
GCC_NO_COMMON_BLOCKS = YES;
632596
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

‎examples/yarn.lock‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,9 +704,21 @@
704704
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
705705
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
706706

707+
<<<<<<< HEAD
707708
"@chatwoot/react-native-widget@^0.0.3":
708709
version "0.0.3"
709710
resolved "https://registry.yarnpkg.com/@chatwoot/react-native-widget/-/react-native-widget-0.0.3.tgz#072b74d8fcb17564b8529bc537d33e0159787870"
711+
=======
712+
"@chatwoot/react-native-widget@../chatwoot-react-native-widget-0.0.6.tgz":
713+
version "0.0.6"
714+
resolved "../chatwoot-react-native-widget-0.0.6.tgz#671d5a500ad9f5544597af5231fe7fbf9c9789c1"
715+
dependencies:
716+
react-native-modal "^11.7.0"
717+
718+
"@chatwoot/react-native-widget@^0.0.3":
719+
version "0.0.3"
720+
resolved "https://registry.npmjs.org/@chatwoot/react-native-widget/-/react-native-widget-0.0.3.tgz#072b74d8fcb17564b8529bc537d33e0159787870"
721+
>>>>>>> develop
710722
integrity sha512-fhvc2mhIXHd039kJEthLt92yQcOR6ApeMOGFmDc2JXFlGE46d+oKJuVjU1x1lMtUT6Ndez6nGbrtp89ev6Ntpg==
711723
dependencies:
712724
react-native-modal "^11.7.0"

0 commit comments

Comments
 (0)