Skip to content

Commit 7887aff

Browse files
authored
Merge pull request #39 from cometchat-pro/v2
V2
2 parents 437b875 + bcae969 commit 7887aff

File tree

7 files changed

+42
-40
lines changed

7 files changed

+42
-40
lines changed

CometChatWorkspace/cometchat-app/cometchat-pro-react-native-ui-kit/src/components/Calls/CometChatOutgoingCall/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class CometChatOutgoingCall extends React.PureComponent {
3232

3333
this.callScreenManager = null;
3434
this.theme = { ...theme, ...this.props.theme };
35+
3536
this.outgoingAlert = new Sound(outgoingCallAlert);
3637
}
3738

CometChatWorkspace/cometchat-app/cometchat-pro-react-native-ui-kit/src/components/Calls/CometChatOutgoingDirectCall/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ class CometChatOutgoingDirectCall extends React.Component {
9191
this.props.close();
9292
},
9393
onError: (error) => {
94+
this.props.actionGenerated(actions.CALL_ERROR, error);
95+
9496
console.log('Call Error: ', error);
9597
},
9698
});

CometChatWorkspace/cometchat-app/cometchat-pro-react-native-ui-kit/src/components/Chats/CometChatConversationList/index.js

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ class CometChatConversationList extends React.Component {
4444
};
4545
this.chatListRef = React.createRef();
4646
this.theme = { ...theme, ...this.props.theme };
47+
4748
this.audio = new Sound(incomingOtherMessageAlert);
4849
this.UIKitSettingsBuilder = new UIKitSettings();
4950
}
@@ -76,7 +77,8 @@ class CometChatConversationList extends React.Component {
7677
}
7778

7879
checkRestrictions = async () => {
79-
let isMessagesSoundEnabled = await this.context.FeatureRestriction.isMessagesSoundEnabled();
80+
let isMessagesSoundEnabled =
81+
await this.context.FeatureRestriction.isMessagesSoundEnabled();
8082
this.setState({ isMessagesSoundEnabled });
8183
};
8284

@@ -183,11 +185,8 @@ class CometChatConversationList extends React.Component {
183185
const message = this.props.messageToMarkRead;
184186
this.makeConversation(message)
185187
.then((response) => {
186-
const {
187-
conversationKey,
188-
conversationObj,
189-
conversationList,
190-
} = response;
188+
const { conversationKey, conversationObj, conversationList } =
189+
response;
191190

192191
if (conversationKey > -1) {
193192
const unreadMessageCount = this.makeUnreadMessageCount(
@@ -584,9 +583,8 @@ class CometChatConversationList extends React.Component {
584583
const { conversationKey, conversationObj, conversationList } = response;
585584

586585
if (conversationKey > -1) {
587-
const unreadMessageCount = this.makeUnreadMessageCount(
588-
conversationObj,
589-
);
586+
const unreadMessageCount =
587+
this.makeUnreadMessageCount(conversationObj);
590588
const lastMessageObj = this.makeLastMessage(message, conversationObj);
591589

592590
const conversationWithObj = { ...conversationObj.conversationWith };
@@ -654,9 +652,8 @@ class CometChatConversationList extends React.Component {
654652
conversationList.splice(conversationKey, 1);
655653
this.setState({ conversationList: conversationList });
656654
} else {
657-
const unreadMessageCount = this.makeUnreadMessageCount(
658-
conversationObj,
659-
);
655+
const unreadMessageCount =
656+
this.makeUnreadMessageCount(conversationObj);
660657
const lastMessageObj = this.makeLastMessage(
661658
message,
662659
conversationObj,
@@ -700,9 +697,8 @@ class CometChatConversationList extends React.Component {
700697
const { conversationKey, conversationObj, conversationList } = response;
701698

702699
if (conversationKey > -1) {
703-
const unreadMessageCount = this.makeUnreadMessageCount(
704-
conversationObj,
705-
);
700+
const unreadMessageCount =
701+
this.makeUnreadMessageCount(conversationObj);
706702
const lastMessageObj = this.makeLastMessage(message, conversationObj);
707703

708704
const conversationWithObj = { ...conversationObj.conversationWith };
@@ -749,9 +745,8 @@ class CometChatConversationList extends React.Component {
749745
const { conversationKey, conversationObj, conversationList } = response;
750746
if (conversationKey > -1) {
751747
if (options && this.loggedInUser.uid !== options.user.uid) {
752-
const unreadMessageCount = this.makeUnreadMessageCount(
753-
conversationObj,
754-
);
748+
const unreadMessageCount =
749+
this.makeUnreadMessageCount(conversationObj);
755750
const lastMessageObj = this.makeLastMessage(
756751
message,
757752
conversationObj,

CometChatWorkspace/cometchat-app/cometchat-pro-react-native-ui-kit/src/components/Messages/CometChatMessageComposer/index.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,12 @@ export default class CometChatMessageComposer extends React.PureComponent {
8585
}
8686

8787
checkRestrictions = async () => {
88-
let isLiveReactionsEnabled = await this.context.FeatureRestriction.isLiveReactionsEnabled();
89-
let isTypingIndicatorsEnabled = await this.context.FeatureRestriction.isTypingIndicatorsEnabled();
90-
let isSmartRepliesEnabled = await this.context.FeatureRestriction.isSmartRepliesEnabled();
88+
let isLiveReactionsEnabled =
89+
await this.context.FeatureRestriction.isLiveReactionsEnabled();
90+
let isTypingIndicatorsEnabled =
91+
await this.context.FeatureRestriction.isTypingIndicatorsEnabled();
92+
let isSmartRepliesEnabled =
93+
await this.context.FeatureRestriction.isSmartRepliesEnabled();
9194
this.setState({
9295
restrictions: {
9396
isLiveReactionsEnabled,

CometChatWorkspace/cometchat-app/cometchat-pro-react-native-ui-kit/src/components/Users/CometChatUserList/controller.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export class UserListManager {
88

99
constructor(searchKey) {
1010
this.searchKey = searchKey;
11+
this.initializeUsersRequest();
1112
}
1213

1314
initializeUsersRequest = () => {

CometChatWorkspace/cometchat-app/ios/Podfile.lock

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -200,18 +200,18 @@ PODS:
200200
- React
201201
- react-native-document-picker (4.3.0):
202202
- React-Core
203-
- react-native-image-picker (3.2.1):
203+
- react-native-image-picker (3.8.1):
204204
- React-Core
205205
- react-native-keep-awake (4.0.0):
206206
- React
207-
- react-native-safe-area-context (3.1.9):
207+
- react-native-safe-area-context (3.2.0):
208208
- React-Core
209209
- react-native-video (5.1.1):
210210
- React-Core
211211
- react-native-video/Video (= 5.1.1)
212212
- react-native-video/Video (5.1.1):
213213
- React-Core
214-
- react-native-webview (11.6.2):
214+
- react-native-webview (11.6.3):
215215
- React-Core
216216
- React-RCTActionSheet (0.63.3):
217217
- React-Core/RCTActionSheetHeaders (= 0.63.3)
@@ -275,21 +275,21 @@ PODS:
275275
- React-jsi (= 0.63.3)
276276
- rn-fetch-blob (0.12.0):
277277
- React-Core
278-
- RNCAsyncStorage (1.13.4):
278+
- RNCAsyncStorage (1.15.5):
279279
- React-Core
280-
- RNCMaskedView (0.1.10):
280+
- RNCMaskedView (0.1.11):
281281
- React
282-
- RNCPicker (1.9.11):
282+
- RNCPicker (1.16.1):
283283
- React-Core
284284
- RNFastImage (8.3.4):
285285
- React-Core
286286
- SDWebImage (~> 5.8)
287287
- SDWebImageWebPCoder (~> 0.6.1)
288-
- RNGestureHandler (1.10.1):
288+
- RNGestureHandler (1.10.3):
289289
- React-Core
290-
- RNReanimated (1.13.2):
290+
- RNReanimated (1.13.3):
291291
- React-Core
292-
- RNScreens (2.17.1):
292+
- RNScreens (2.18.1):
293293
- React-Core
294294
- RNSound (0.11.0):
295295
- React
@@ -470,11 +470,11 @@ SPEC CHECKSUMS:
470470
React-jsinspector: 8e68ffbfe23880d3ee9bafa8be2777f60b25cbe2
471471
react-native-cometchat-rtc: 338b6cbf76fe2db7b400b7675dbb435d294d2906
472472
react-native-document-picker: 20f652c2402d3ddc81f396d8167c3bd978add4a2
473-
react-native-image-picker: 64d12e81f3d9dad0af107fe6536b295d51932ec0
473+
react-native-image-picker: 31971f6184e7c1dcb4fc1f122e1ba2c3fb11ef1e
474474
react-native-keep-awake: afad8a51dfef9fe9655a6344771be32c8596d774
475-
react-native-safe-area-context: b6e0e284002381d2ff29fa4fff42b4d8282e3c94
475+
react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79
476476
react-native-video: 0bb76b6d6b77da3009611586c7dbf817b947f30e
477-
react-native-webview: 193d233c29eacce1f42ca2637dab7ba79c25a6de
477+
react-native-webview: d172aa35a17915e1ae9a1c476d20984c1efaf4f0
478478
React-RCTActionSheet: 53ea72699698b0b47a6421cb1c8b4ab215a774aa
479479
React-RCTAnimation: 1befece0b5183c22ae01b966f5583f42e69a83c2
480480
React-RCTBlob: 0b284339cbe4b15705a05e2313a51c6d8b51fa40
@@ -486,13 +486,13 @@ SPEC CHECKSUMS:
486486
React-RCTVibration: 8e9fb25724a0805107fc1acc9075e26f814df454
487487
ReactCommon: 4167844018c9ed375cc01a843e9ee564399e53c3
488488
rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
489-
RNCAsyncStorage: 44539979e1f234262d64d3ce86ec21cceb1b2c5e
490-
RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f
491-
RNCPicker: 6780c753e9e674065db90d9c965920516402579d
489+
RNCAsyncStorage: 56a3355a10b5d660c48c6e37325ac85ebfd09885
490+
RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
491+
RNCPicker: 61c7a0645b9e4ac67960aa7f22a3effcecfdfb8d
492492
RNFastImage: d4870d58f5936111c56218dbd7fcfc18e65b58ff
493-
RNGestureHandler: 5e58135436aacc1c5d29b75547d3d2b9430d052c
494-
RNReanimated: e03f7425cb7a38dcf1b644d680d1bfc91c3337ad
495-
RNScreens: b6c9607e6fe47c1b6e2f1910d2acd46dd7ecea3a
493+
RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
494+
RNReanimated: 514a11da3a2bcc6c3dfd9de32b38e2b9bf101926
495+
RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d
496496
RNSound: da030221e6ac7e8290c6b43f2b5f2133a8e225b0
497497
RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59
498498
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d

CometChatWorkspace/cometchat-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "example",
3-
"version": "2.3.4-1",
3+
"version": "2.3.4-2",
44
"private": true,
55
"scripts": {
66
"android": "react-native run-android",

0 commit comments

Comments
 (0)