@plusscommunities/pluss-circles-app 8.0.4 → 8.0.6-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/module/actions/ChatActions.js +3 -3
- package/dist/module/actions/ChatActions.js.map +1 -1
- package/dist/module/actions/GroupActions.js +18 -18
- package/dist/module/actions/GroupActions.js.map +1 -1
- package/dist/module/actions/index.js +3 -3
- package/dist/module/actions/index.js.map +1 -1
- package/dist/module/actions/types.js +2 -2
- package/dist/module/actions/types.js.map +1 -1
- package/dist/module/assets/fonts.js +1 -1
- package/dist/module/assets/fonts.js.map +1 -1
- package/dist/module/components/chat/Chat.js +83 -101
- package/dist/module/components/chat/Chat.js.map +1 -1
- package/dist/module/components/chat/ChatList.js +49 -49
- package/dist/module/components/chat/ChatList.js.map +1 -1
- package/dist/module/components/chat/ContactsList.js +21 -21
- package/dist/module/components/chat/ContactsList.js.map +1 -1
- package/dist/module/components/chat/KioskPeoplePage.js +38 -37
- package/dist/module/components/chat/KioskPeoplePage.js.map +1 -1
- package/dist/module/components/chat/PeopleContainer.js +5 -5
- package/dist/module/components/chat/PeopleContainer.js.map +1 -1
- package/dist/module/components/chat/PeoplePage.js +41 -41
- package/dist/module/components/chat/PeoplePage.js.map +1 -1
- package/dist/module/components/common/SwipeableUserListing.js +22 -22
- package/dist/module/components/common/SwipeableUserListing.js.map +1 -1
- package/dist/module/components/common/index.js +2 -2
- package/dist/module/components/common/index.js.map +1 -1
- package/dist/module/components/events/EventInvitePopup.js +40 -40
- package/dist/module/components/events/EventInvitePopup.js.map +1 -1
- package/dist/module/components/groups/EditGroup.js +62 -62
- package/dist/module/components/groups/EditGroup.js.map +1 -1
- package/dist/module/components/groups/GroupDetails.js +32 -32
- package/dist/module/components/groups/GroupDetails.js.map +1 -1
- package/dist/module/components/groups/GroupsList.js +10 -10
- package/dist/module/components/groups/GroupsList.js.map +1 -1
- package/dist/module/components/groups/GroupsWidget.js +18 -18
- package/dist/module/components/groups/GroupsWidget.js.map +1 -1
- package/dist/module/components/groups/NewGroup.js +101 -101
- package/dist/module/components/groups/NewGroup.js.map +1 -1
- package/dist/module/components/groups/PublicGroup.js +17 -17
- package/dist/module/components/groups/PublicGroup.js.map +1 -1
- package/dist/module/components/groups/PublicGroupAction.js +39 -39
- package/dist/module/components/groups/PublicGroupAction.js.map +1 -1
- package/dist/module/components/notifications/GroupInvite.js +25 -25
- package/dist/module/components/notifications/GroupInvite.js.map +1 -1
- package/dist/module/components/notifications/GroupInviteAction.js +44 -44
- package/dist/module/components/notifications/GroupInviteAction.js.map +1 -1
- package/dist/module/components/notifications/GroupMessage.js +17 -17
- package/dist/module/components/notifications/GroupMessage.js.map +1 -1
- package/dist/module/components/takeover/TakeoverBackground.js +5 -5
- package/dist/module/components/takeover/TakeoverBackground.js.map +1 -1
- package/dist/module/config/index.js +2 -2
- package/dist/module/config/index.js.map +1 -1
- package/dist/module/core.config.js +1 -1
- package/dist/module/core.config.js.map +1 -1
- package/dist/module/feature.config.js +27 -27
- package/dist/module/feature.config.js.map +1 -1
- package/dist/module/index.js +14 -14
- package/dist/module/index.js.map +1 -1
- package/dist/module/js/Colors.js +1 -1
- package/dist/module/js/Colors.js.map +1 -1
- package/dist/module/js/NavigationService.js +1 -1
- package/dist/module/js/NavigationService.js.map +1 -1
- package/dist/module/js/Styles.js +1 -1
- package/dist/module/js/Styles.js.map +1 -1
- package/dist/module/js/circles/MapStateToDirectMessages.js +2 -2
- package/dist/module/js/circles/MapStateToDirectMessages.js.map +1 -1
- package/dist/module/js/index.js +3 -3
- package/dist/module/js/index.js.map +1 -1
- package/dist/module/reducers/ChatsReducer.js +4 -4
- package/dist/module/reducers/ChatsReducer.js.map +1 -1
- package/dist/module/reducers/GroupsReducer.js +5 -5
- package/dist/module/reducers/GroupsReducer.js.map +1 -1
- package/dist/module/reducers/reducerKeys.js +1 -1
- package/dist/module/reducers/reducerKeys.js.map +1 -1
- package/dist/module/values.config.default.js +25 -25
- package/dist/module/values.config.default.js.map +1 -1
- package/dist/module/values.config.groups.js +25 -25
- package/dist/module/values.config.groups.js.map +1 -1
- package/dist/module/values.config.js +25 -25
- package/dist/module/values.config.js.map +1 -1
- package/dist/module/webapi/circleActions.js +31 -31
- package/dist/module/webapi/circleActions.js.map +1 -1
- package/dist/module/webapi/helper.js +1 -1
- package/dist/module/webapi/helper.js.map +1 -1
- package/dist/module/webapi/index.js +3 -3
- package/dist/module/webapi/index.js.map +1 -1
- package/dist/module/webapi/messageActions.js +10 -10
- package/dist/module/webapi/messageActions.js.map +1 -1
- package/package.json +54 -54
- package/src/actions/ChatActions.js +55 -55
- package/src/actions/GroupActions.js +245 -237
- package/src/actions/index.js +3 -3
- package/src/actions/types.js +2 -2
- package/src/assets/fonts.js +1 -1
- package/src/components/chat/Chat.js +730 -669
- package/src/components/chat/ChatList.js +603 -512
- package/src/components/chat/ContactsList.js +186 -169
- package/src/components/chat/KioskPeoplePage.js +315 -291
- package/src/components/chat/PeopleContainer.js +14 -14
- package/src/components/chat/PeoplePage.js +450 -383
- package/src/components/common/SwipeableUserListing.js +118 -106
- package/src/components/common/index.js +2 -2
- package/src/components/events/EventInvitePopup.js +587 -505
- package/src/components/groups/EditGroup.js +607 -538
- package/src/components/groups/GroupDetails.js +385 -305
- package/src/components/groups/GroupsList.js +91 -79
- package/src/components/groups/GroupsWidget.js +122 -116
- package/src/components/groups/NewGroup.js +758 -639
- package/src/components/groups/PublicGroup.js +129 -101
- package/src/components/groups/PublicGroupAction.js +312 -244
- package/src/components/notifications/GroupInvite.js +167 -139
- package/src/components/notifications/GroupInviteAction.js +371 -273
- package/src/components/notifications/GroupMessage.js +110 -102
- package/src/components/takeover/TakeoverBackground.js +24 -18
- package/src/config/index.js +4 -4
- package/src/core.config.js +27 -3
- package/src/feature.config.js +257 -245
- package/src/index.js +24 -21
- package/src/js/Colors.js +5 -3
- package/src/js/NavigationService.js +5 -4
- package/src/js/Styles.js +1 -1
- package/src/js/circles/MapStateToDirectMessages.js +6 -6
- package/src/js/index.js +3 -3
- package/src/reducers/ChatsReducer.js +66 -53
- package/src/reducers/GroupsReducer.js +203 -190
- package/src/reducers/reducerKeys.js +1 -1
- package/src/values.config.default.js +29 -29
- package/src/values.config.groups.js +29 -29
- package/src/values.config.js +29 -29
- package/src/webapi/circleActions.js +109 -109
- package/src/webapi/helper.js +1 -1
- package/src/webapi/index.js +3 -3
- package/src/webapi/messageActions.js +47 -47
|
@@ -1,548 +1,617 @@
|
|
|
1
|
-
import React, { Component } from
|
|
2
|
-
import _ from
|
|
3
|
-
import { connect } from
|
|
4
|
-
import { Platform, Dimensions, ImageBackground, Text, ScrollView, TouchableOpacity, View, KeyboardAvoidingView } from 'react-native';
|
|
5
|
-
import { Icon } from '@rneui/themed';
|
|
1
|
+
import React, { Component } from "react";
|
|
2
|
+
import _ from "lodash";
|
|
3
|
+
import { connect } from "react-redux";
|
|
6
4
|
import {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
5
|
+
Platform,
|
|
6
|
+
Dimensions,
|
|
7
|
+
ImageBackground,
|
|
8
|
+
Text,
|
|
9
|
+
ScrollView,
|
|
10
|
+
TouchableOpacity,
|
|
11
|
+
View,
|
|
12
|
+
KeyboardAvoidingView,
|
|
13
|
+
} from "react-native";
|
|
14
|
+
import { Icon } from "@rneui/themed";
|
|
15
|
+
import {
|
|
16
|
+
ProfilePic,
|
|
17
|
+
FormCard,
|
|
18
|
+
FormCardSection,
|
|
19
|
+
Header,
|
|
20
|
+
Spinner,
|
|
21
|
+
ImageUploader,
|
|
22
|
+
InlineButton,
|
|
23
|
+
StickyFooter,
|
|
24
|
+
TextStyle,
|
|
25
|
+
UserListing,
|
|
26
|
+
} from "../common";
|
|
27
|
+
import {
|
|
28
|
+
LINEGREY,
|
|
29
|
+
BG_GREY,
|
|
30
|
+
getMainBrandingColourFromState,
|
|
31
|
+
} from "../../js/Colors";
|
|
32
|
+
import NavigationService from "../../js/NavigationService";
|
|
33
|
+
import { TEXT_LIGHT } from "../../js/index";
|
|
34
|
+
import { createGroup, loadGroups, editGroup } from "../../actions";
|
|
35
|
+
import EventInvitePopup from "../events/EventInvitePopup";
|
|
36
|
+
import { values } from "../../values.config";
|
|
37
|
+
import { Colours } from "@plusscommunities/pluss-core-app";
|
|
38
|
+
|
|
39
|
+
const PHOTO_WIDTH = Dimensions.get("window").width - 48;
|
|
27
40
|
|
|
28
41
|
class EditGroup extends Component {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
42
|
+
state = {
|
|
43
|
+
group: null,
|
|
44
|
+
message: "",
|
|
45
|
+
title: "",
|
|
46
|
+
error: null,
|
|
47
|
+
|
|
48
|
+
submittingGroup: false,
|
|
49
|
+
groupImage: null,
|
|
50
|
+
|
|
51
|
+
showUserSelect: false,
|
|
52
|
+
allUsers: [],
|
|
53
|
+
audience: [],
|
|
54
|
+
invites: [],
|
|
55
|
+
contacts: [],
|
|
56
|
+
selected: [],
|
|
57
|
+
pending: [],
|
|
58
|
+
usersToAdd: [],
|
|
59
|
+
usersToRemove: [],
|
|
60
|
+
searchText: "",
|
|
61
|
+
showErrors: false,
|
|
62
|
+
|
|
63
|
+
inviteOpen: false,
|
|
64
|
+
};
|
|
65
|
+
|
|
66
|
+
componentDidMount() {
|
|
67
|
+
this.parseGroup(this.props.groups);
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
onPressBack() {
|
|
71
|
+
NavigationService.goBack();
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
onSubmitSend() {
|
|
75
|
+
this.setState({ error: null });
|
|
76
|
+
if (!this.props.connected) {
|
|
77
|
+
this.setState({ error: "No internet connection detected." });
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
if (this.state.submittingGroup || this.state.uploadingImage) {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
this.setState({ submittingGroup: true });
|
|
85
|
+
|
|
86
|
+
const group = {
|
|
87
|
+
...this.state.group,
|
|
88
|
+
Title: this.state.title,
|
|
89
|
+
CreatorId: this.state.group.CreatorId,
|
|
90
|
+
};
|
|
91
|
+
|
|
92
|
+
if (this.state.groupImage != null && !_.isEmpty(this.state.groupImage)) {
|
|
93
|
+
group.Image = this.state.groupImage;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
this.props.editGroup(
|
|
97
|
+
group,
|
|
98
|
+
this.state.usersToAdd,
|
|
99
|
+
this.state.usersToRemove,
|
|
100
|
+
);
|
|
101
|
+
this.onPressBack();
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
onChangeTitle(value) {
|
|
105
|
+
this.setState({ title: value });
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
onUploadStarted = () => {
|
|
109
|
+
this.setState({
|
|
110
|
+
uploadingImage: true,
|
|
111
|
+
});
|
|
112
|
+
};
|
|
113
|
+
|
|
114
|
+
onUploadSuccess = (uri) => {
|
|
115
|
+
this.setState({
|
|
116
|
+
uploadingImage: false,
|
|
117
|
+
groupImage: uri.replace("/general/", "/general1400/"),
|
|
118
|
+
});
|
|
119
|
+
};
|
|
120
|
+
|
|
121
|
+
onUploadFailed = () => {
|
|
122
|
+
this.setState({
|
|
123
|
+
uploadingImage: false,
|
|
124
|
+
groupImage: null,
|
|
125
|
+
});
|
|
126
|
+
};
|
|
127
|
+
|
|
128
|
+
getInvited() {
|
|
129
|
+
return [
|
|
130
|
+
..._.filter(this.state.group.Invites || [], (u) => {
|
|
131
|
+
return this.state.usersToRemove.indexOf(u.userId) === -1;
|
|
132
|
+
}),
|
|
133
|
+
...this.state.usersToAdd,
|
|
134
|
+
];
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
getPendingChanges() {
|
|
138
|
+
return [...this.state.usersToRemove, ...this.state.usersToAdd];
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
getAttendees() {
|
|
142
|
+
return [
|
|
143
|
+
..._.filter(this.state.group.Audience || [], (u) => {
|
|
144
|
+
return this.state.usersToRemove.indexOf(u.userId) === -1;
|
|
145
|
+
}),
|
|
146
|
+
...this.state.usersToAdd,
|
|
147
|
+
];
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
parseGroup(groupz) {
|
|
151
|
+
const newStates = {};
|
|
152
|
+
let newGrop = {};
|
|
153
|
+
_.forEach(groupz, (group) => {
|
|
154
|
+
if (
|
|
155
|
+
!_.isUndefined(this.props.chat.key) &&
|
|
156
|
+
group.Id === this.props.chat.key
|
|
157
|
+
) {
|
|
158
|
+
newGrop = { ...group };
|
|
159
|
+
} else if (group.Id === this.props.chat.Id) {
|
|
160
|
+
newGrop = { ...group };
|
|
161
|
+
}
|
|
162
|
+
});
|
|
163
|
+
|
|
164
|
+
newStates.group = { ...newGrop };
|
|
165
|
+
newStates.title = newGrop.Title;
|
|
166
|
+
if (!_.isEmpty(newGrop.Image)) {
|
|
167
|
+
newStates.groupImage = newGrop.Image;
|
|
168
|
+
}
|
|
169
|
+
newStates.audience = [...newGrop.Audience];
|
|
170
|
+
if (!_.isUndefined(newGrop.Invites)) {
|
|
171
|
+
newStates.invites = [...newGrop.Invites];
|
|
172
|
+
newStates.allUsers = [...newGrop.Invites, ...newGrop.Audience];
|
|
173
|
+
} else {
|
|
174
|
+
newStates.allUsers = [...newGrop.Audience];
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
this.setState(newStates);
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
addToAudience(user) {
|
|
181
|
+
const indexToRemove = this.state.usersToRemove.indexOf(user.userId);
|
|
182
|
+
if (indexToRemove > -1) {
|
|
183
|
+
const newUsersToRemove = [...this.state.usersToRemove];
|
|
184
|
+
newUsersToRemove.splice(indexToRemove, 1);
|
|
185
|
+
this.setState({
|
|
186
|
+
usersToRemove: newUsersToRemove,
|
|
187
|
+
});
|
|
188
|
+
} else {
|
|
189
|
+
const newUsersToAdd = [...this.state.usersToAdd];
|
|
190
|
+
newUsersToAdd.push(user);
|
|
191
|
+
this.setState({ usersToAdd: newUsersToAdd });
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
removeFromAudience(user) {
|
|
196
|
+
const indexToAdd = _.findIndex(this.state.usersToAdd, (u) => {
|
|
197
|
+
return u.userId === user.userId;
|
|
198
|
+
});
|
|
199
|
+
if (indexToAdd > -1) {
|
|
200
|
+
const newUsersToAdd = [...this.state.usersToAdd];
|
|
201
|
+
newUsersToAdd.splice(indexToAdd, 1);
|
|
202
|
+
this.setState({
|
|
203
|
+
usersToAdd: newUsersToAdd,
|
|
204
|
+
});
|
|
205
|
+
} else {
|
|
206
|
+
const newUsersToRemove = [...this.state.usersToRemove];
|
|
207
|
+
newUsersToRemove.push(user.userId);
|
|
208
|
+
this.setState({ usersToRemove: newUsersToRemove });
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
toggleAdmin = (user) => {
|
|
213
|
+
const index = this.state.group.Audience.indexOf(user);
|
|
214
|
+
if (index > -1) {
|
|
215
|
+
const newUsers = [...this.state.group.Audience];
|
|
216
|
+
newUsers[index].isAdmin = !newUsers[index].isAdmin;
|
|
217
|
+
this.setState({ group: { ...this.state.group, Audience: newUsers } });
|
|
218
|
+
}
|
|
219
|
+
};
|
|
220
|
+
|
|
221
|
+
closeInvitePopup() {
|
|
222
|
+
this.setState({
|
|
223
|
+
inviteOpen: false,
|
|
224
|
+
inviteAttendeeList: null,
|
|
225
|
+
inviteRepToShow: null,
|
|
226
|
+
inviteRepIdToShow: null,
|
|
227
|
+
});
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
openInvite() {
|
|
231
|
+
this.setState({ inviteOpen: true });
|
|
232
|
+
}
|
|
233
|
+
|
|
234
|
+
nextPage() {
|
|
235
|
+
this.setState({ page: 2, title: this.state.title });
|
|
236
|
+
}
|
|
237
|
+
|
|
238
|
+
clickCreate() {
|
|
239
|
+
if (this.state.title.length < 1) {
|
|
240
|
+
this.setState({ showErrors: true });
|
|
241
|
+
return;
|
|
242
|
+
}
|
|
243
|
+
if (this.state.uploadingImage) {
|
|
244
|
+
return;
|
|
245
|
+
}
|
|
246
|
+
this.onSubmitSend();
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
showUploadMenu() {
|
|
250
|
+
if (this.state.uploadingImage || this.state.submittingGroup) {
|
|
251
|
+
return;
|
|
252
|
+
}
|
|
253
|
+
this.imageUploader.showUploadMenu();
|
|
254
|
+
}
|
|
255
|
+
|
|
256
|
+
renderInvitePopup() {
|
|
257
|
+
return (
|
|
258
|
+
<EventInvitePopup
|
|
259
|
+
isNewEvent
|
|
260
|
+
onNewEventInvite={this.addToAudience.bind(this)}
|
|
261
|
+
onNewEventRemove={this.removeFromAudience.bind(this)}
|
|
262
|
+
isSearchable
|
|
263
|
+
source="residents"
|
|
264
|
+
attendees={this.getAttendees()}
|
|
265
|
+
attendingStatusText="Member"
|
|
266
|
+
invited={this.getInvited()}
|
|
267
|
+
invitedText="Added"
|
|
268
|
+
visible={this.state.inviteOpen}
|
|
269
|
+
onClose={this.closeInvitePopup.bind(this)}
|
|
270
|
+
showStatusText
|
|
271
|
+
editButtons
|
|
272
|
+
/>
|
|
273
|
+
);
|
|
274
|
+
}
|
|
275
|
+
|
|
276
|
+
renderUploadMenu() {
|
|
277
|
+
return (
|
|
278
|
+
<ImageUploader
|
|
279
|
+
ref={(ref) => (this.imageUploader = ref)}
|
|
280
|
+
onUploadStarted={this.onUploadStarted}
|
|
281
|
+
onUploadSuccess={this.onUploadSuccess}
|
|
282
|
+
onUploadFailed={this.onUploadFailed}
|
|
283
|
+
onLibrarySelected={this.onUploadSuccess}
|
|
284
|
+
size={{ width: 700 }}
|
|
285
|
+
quality={0.8}
|
|
286
|
+
fileName={"groupImage"}
|
|
287
|
+
popupTitle={`Add ${values.entityName} Cover Image`}
|
|
288
|
+
/>
|
|
289
|
+
);
|
|
290
|
+
}
|
|
291
|
+
|
|
292
|
+
renderInnerImage() {
|
|
293
|
+
if (!this.state.uploadingImage && this.state.groupImage === null) {
|
|
294
|
+
return (
|
|
295
|
+
<View>
|
|
296
|
+
<Icon
|
|
297
|
+
name="camera"
|
|
298
|
+
//style={styles.uploadButtonInner}
|
|
299
|
+
type="font-awesome"
|
|
300
|
+
iconStyle={{ color: TEXT_LIGHT, fontSize: 20, marginBottom: 13 }}
|
|
301
|
+
/>
|
|
302
|
+
<Text
|
|
303
|
+
style={{
|
|
304
|
+
fontSize: 13,
|
|
305
|
+
fontFamily: "sf-regular",
|
|
306
|
+
color: TEXT_LIGHT,
|
|
307
|
+
}}
|
|
308
|
+
>
|
|
309
|
+
Upload group image
|
|
310
|
+
</Text>
|
|
311
|
+
</View>
|
|
312
|
+
);
|
|
313
|
+
}
|
|
314
|
+
return this.renderImage();
|
|
315
|
+
}
|
|
316
|
+
|
|
317
|
+
renderImage() {
|
|
318
|
+
if (this.state.uploadingImage) {
|
|
319
|
+
return <Spinner />;
|
|
320
|
+
}
|
|
321
|
+
if (this.state.groupImage) {
|
|
322
|
+
return (
|
|
323
|
+
<ImageBackground
|
|
324
|
+
style={{
|
|
325
|
+
flex: 1,
|
|
326
|
+
height: "100%",
|
|
327
|
+
width: "100%",
|
|
328
|
+
borderRadius: 4,
|
|
329
|
+
justifyContent: "center",
|
|
330
|
+
alignContent: "center",
|
|
331
|
+
}}
|
|
332
|
+
imageStyle={{ borderRadius: 4 }}
|
|
333
|
+
source={{ uri: this.state.groupImage }}
|
|
334
|
+
>
|
|
335
|
+
<View>
|
|
336
|
+
<Icon
|
|
337
|
+
name="camera"
|
|
338
|
+
//style={styles.uploadButtonInner}
|
|
339
|
+
type="font-awesome"
|
|
340
|
+
iconStyle={{ color: "#fff", fontSize: 20, marginBottom: 13 }}
|
|
341
|
+
/>
|
|
342
|
+
<Text
|
|
343
|
+
style={{
|
|
344
|
+
fontSize: 13,
|
|
345
|
+
fontFamily: "sf-regular",
|
|
346
|
+
color: "#fff",
|
|
347
|
+
textAlign: "center",
|
|
348
|
+
}}
|
|
349
|
+
>
|
|
350
|
+
Upload {values.entityName} image
|
|
351
|
+
</Text>
|
|
352
|
+
</View>
|
|
353
|
+
</ImageBackground>
|
|
354
|
+
);
|
|
355
|
+
}
|
|
356
|
+
}
|
|
357
|
+
|
|
358
|
+
renderPage() {
|
|
359
|
+
return (
|
|
360
|
+
<View>
|
|
361
|
+
<FormCard style={{ marginTop: 16 }}>
|
|
362
|
+
<FormCardSection
|
|
363
|
+
label={`${_.capitalize(values.entityName)} name`}
|
|
364
|
+
placeholder={`${_.capitalize(values.entityName)} name`}
|
|
365
|
+
textValue={this.state.title}
|
|
366
|
+
onChangeText={(value) => {
|
|
367
|
+
this.onChangeTitle(value);
|
|
368
|
+
}}
|
|
369
|
+
editable={this.state.submittingGroup === false}
|
|
370
|
+
isValid={() => {
|
|
371
|
+
return this.state.title.length > 1;
|
|
372
|
+
}}
|
|
373
|
+
required
|
|
374
|
+
/>
|
|
375
|
+
</FormCard>
|
|
376
|
+
<View style={{ padding: 24 }}>
|
|
377
|
+
<TouchableOpacity
|
|
378
|
+
activeOpacity={0.8}
|
|
379
|
+
onPress={this.showUploadMenu.bind(this)}
|
|
380
|
+
>
|
|
381
|
+
<View style={styles.imageContainer}>{this.renderInnerImage()}</View>
|
|
382
|
+
</TouchableOpacity>
|
|
383
|
+
</View>
|
|
384
|
+
<View style={{ paddingVertical: 24, paddingHorizontal: 8 }}>
|
|
385
|
+
<View style={{ paddingHorizontal: 16 }}>
|
|
386
|
+
<TextStyle type="detailLabel">Members</TextStyle>
|
|
387
|
+
</View>
|
|
388
|
+
{this.getAttendees().map((user) => {
|
|
389
|
+
return (
|
|
390
|
+
<UserListing
|
|
391
|
+
key={user.userId}
|
|
392
|
+
user={user}
|
|
393
|
+
rightContent={(() => {
|
|
394
|
+
if (this.state.usersToAdd.indexOf(user) > -1) {
|
|
395
|
+
return null;
|
|
396
|
+
}
|
|
397
|
+
return (
|
|
398
|
+
<InlineButton
|
|
399
|
+
onPress={() => {
|
|
400
|
+
this.toggleAdmin(user);
|
|
401
|
+
}}
|
|
402
|
+
style={{
|
|
403
|
+
borderColor: this.props.colourBrandingMain,
|
|
404
|
+
borderWidth: 1,
|
|
405
|
+
}}
|
|
406
|
+
textStyle={{ color: this.props.colourBrandingMain }}
|
|
407
|
+
>
|
|
408
|
+
{user.isAdmin ? "Remove admin" : "Make admin"}
|
|
409
|
+
</InlineButton>
|
|
410
|
+
);
|
|
411
|
+
})()}
|
|
412
|
+
statusText={(() => {
|
|
413
|
+
if (this.state.usersToAdd.indexOf(user) > -1) {
|
|
414
|
+
return "Added";
|
|
415
|
+
}
|
|
416
|
+
if (user.isAdmin) {
|
|
417
|
+
return "Admin";
|
|
418
|
+
}
|
|
419
|
+
return "Member";
|
|
420
|
+
})()}
|
|
421
|
+
/>
|
|
422
|
+
);
|
|
423
|
+
})}
|
|
424
|
+
</View>
|
|
425
|
+
</View>
|
|
426
|
+
);
|
|
427
|
+
}
|
|
428
|
+
|
|
429
|
+
renderPreviewAtts() {
|
|
430
|
+
return (
|
|
431
|
+
<View style={styles.attendeePreviews}>
|
|
432
|
+
{this.state.allUsers.map((user, index) => {
|
|
433
|
+
if (index < 3) {
|
|
434
|
+
return (
|
|
435
|
+
<ProfilePic
|
|
436
|
+
ProfilePic={user.profilePic}
|
|
437
|
+
Diameter={36}
|
|
438
|
+
style={[styles.profilePic, { left: index * -20 }]}
|
|
439
|
+
key={user.userId}
|
|
440
|
+
/>
|
|
441
|
+
);
|
|
442
|
+
}
|
|
443
|
+
return null;
|
|
444
|
+
})}
|
|
445
|
+
</View>
|
|
446
|
+
);
|
|
447
|
+
}
|
|
448
|
+
|
|
449
|
+
renderInviteButton() {
|
|
450
|
+
const changes = this.getPendingChanges();
|
|
451
|
+
return (
|
|
452
|
+
<View style={{ flexDirection: "row" }}>
|
|
453
|
+
{this.renderPreviewAtts()}
|
|
454
|
+
<View style={styles.fill}>
|
|
455
|
+
<InlineButton
|
|
456
|
+
onPress={this.openInvite.bind(this)}
|
|
457
|
+
style={[
|
|
458
|
+
styles.inviteButton,
|
|
459
|
+
{ borderColor: this.props.colourBrandingMain },
|
|
460
|
+
]}
|
|
461
|
+
color="#fff"
|
|
462
|
+
textStyle={{ color: this.props.colourBrandingMain }}
|
|
463
|
+
>
|
|
464
|
+
Manage members
|
|
465
|
+
</InlineButton>
|
|
466
|
+
<View style={styles.attendingContainer}>
|
|
467
|
+
<Text style={styles.tix} numberOfLines={1}>
|
|
468
|
+
<Text>{this.state.group.Audience.length}</Text>
|
|
469
|
+
{" members"}
|
|
470
|
+
</Text>
|
|
471
|
+
<Text
|
|
472
|
+
style={[
|
|
473
|
+
styles.tix,
|
|
474
|
+
changes.length > 0 && { color: Colours.COLOUR_RED },
|
|
475
|
+
]}
|
|
476
|
+
numberOfLines={1}
|
|
477
|
+
>
|
|
478
|
+
<Text>{changes.length}</Text>
|
|
479
|
+
{" changes made"}
|
|
480
|
+
</Text>
|
|
481
|
+
</View>
|
|
482
|
+
</View>
|
|
483
|
+
</View>
|
|
484
|
+
);
|
|
485
|
+
}
|
|
486
|
+
|
|
487
|
+
render() {
|
|
488
|
+
if (!this.state.group) {
|
|
489
|
+
return null;
|
|
490
|
+
}
|
|
491
|
+
return (
|
|
492
|
+
<KeyboardAvoidingView
|
|
493
|
+
behavior={"padding"}
|
|
494
|
+
style={{ position: "relative", flex: 1, backgroundColor: "#fff" }}
|
|
495
|
+
>
|
|
496
|
+
<View style={styles.greyContainer}>
|
|
497
|
+
{this.renderUploadMenu()}
|
|
498
|
+
<Header
|
|
499
|
+
leftIcon="close"
|
|
500
|
+
leftIconType="pluss"
|
|
501
|
+
leftText="Cancel"
|
|
502
|
+
leftIconStyle={{ color: this.props.colourBrandingMain }}
|
|
503
|
+
onPressLeft={this.onPressBack.bind(this)}
|
|
504
|
+
rightText="Done"
|
|
505
|
+
onPressRight={this.clickCreate.bind(this)}
|
|
506
|
+
optionalRightStyle={this.state.submittingGroup && { opacity: 0.2 }}
|
|
507
|
+
text={this.state.title.length > 1 ? this.state.title : " "}
|
|
508
|
+
/>
|
|
509
|
+
<ScrollView style={{ flex: 1 }} keyboardShouldPersistTaps={"handled"}>
|
|
510
|
+
{this.state.submittingGroup && (
|
|
511
|
+
<View style={{ marginTop: 16 }}>
|
|
512
|
+
<Spinner size={"small"} />
|
|
513
|
+
</View>
|
|
514
|
+
)}
|
|
515
|
+
{this.renderPage()}
|
|
516
|
+
</ScrollView>
|
|
517
|
+
|
|
518
|
+
<StickyFooter style={styles.footer}>
|
|
519
|
+
{this.renderInviteButton()}
|
|
520
|
+
</StickyFooter>
|
|
521
|
+
</View>
|
|
522
|
+
|
|
523
|
+
{this.renderInvitePopup()}
|
|
524
|
+
</KeyboardAvoidingView>
|
|
525
|
+
);
|
|
526
|
+
}
|
|
460
527
|
}
|
|
461
528
|
|
|
462
529
|
const styles = {
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
530
|
+
footer: {
|
|
531
|
+
paddingHorizontal: 16,
|
|
532
|
+
flexDirection: "row",
|
|
533
|
+
alignItems: "center",
|
|
534
|
+
},
|
|
535
|
+
footerButton: {
|
|
536
|
+
flex: 1,
|
|
537
|
+
},
|
|
538
|
+
profilePic: {
|
|
539
|
+
borderWidth: 1,
|
|
540
|
+
borderColor: "#fff",
|
|
541
|
+
},
|
|
542
|
+
fill: {
|
|
543
|
+
flex: 1,
|
|
544
|
+
flexDirection: "row-reverse",
|
|
545
|
+
justifyContent: "space-between",
|
|
546
|
+
},
|
|
547
|
+
attendeePreviews: {
|
|
548
|
+
width: 90,
|
|
549
|
+
height: 36,
|
|
550
|
+
flexDirection: "row",
|
|
551
|
+
},
|
|
552
|
+
inviteButton: {
|
|
553
|
+
height: 36,
|
|
554
|
+
//width: 142,
|
|
555
|
+
justifyContent: "center",
|
|
556
|
+
alignItems: "center",
|
|
557
|
+
borderRadius: 5,
|
|
558
|
+
marginLeft: 8,
|
|
559
|
+
borderWidth: 1,
|
|
560
|
+
flex: 1,
|
|
561
|
+
},
|
|
562
|
+
viewContainer: {
|
|
563
|
+
flex: 1,
|
|
564
|
+
backgroundColor: "#fff",
|
|
565
|
+
},
|
|
566
|
+
container: {
|
|
567
|
+
flex: 1,
|
|
568
|
+
position: "relative",
|
|
569
|
+
},
|
|
570
|
+
greyContainer: {
|
|
571
|
+
flex: 1,
|
|
572
|
+
backgroundColor: BG_GREY,
|
|
573
|
+
},
|
|
574
|
+
uploadButton: {
|
|
575
|
+
width: "100%",
|
|
576
|
+
//height: 150,
|
|
577
|
+
alignContent: "center",
|
|
578
|
+
position: "absolute",
|
|
579
|
+
flexDirection: "row",
|
|
580
|
+
justifyContent: "center",
|
|
581
|
+
top: 65,
|
|
582
|
+
},
|
|
583
|
+
imageContainer: {
|
|
584
|
+
width: PHOTO_WIDTH,
|
|
585
|
+
height: PHOTO_WIDTH * 0.8,
|
|
586
|
+
backgroundColor: "#fff",
|
|
587
|
+
borderStyle: "dashed",
|
|
588
|
+
justifyContent: "center",
|
|
589
|
+
alignItems: "center",
|
|
590
|
+
borderWidth: 1,
|
|
591
|
+
borderColor: LINEGREY,
|
|
592
|
+
borderRadius: 4,
|
|
593
|
+
},
|
|
594
|
+
attendingContainer: {
|
|
595
|
+
paddingLeft: 8,
|
|
596
|
+
},
|
|
597
|
+
tix: {
|
|
598
|
+
fontFamily: "sf-semibold",
|
|
599
|
+
color: TEXT_LIGHT,
|
|
600
|
+
fontSize: 14,
|
|
601
|
+
flex: 1,
|
|
602
|
+
},
|
|
536
603
|
};
|
|
537
604
|
|
|
538
|
-
const mapStateToProps = state => {
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
605
|
+
const mapStateToProps = (state) => {
|
|
606
|
+
return {
|
|
607
|
+
connected: state.connection.connected,
|
|
608
|
+
user: state.user,
|
|
609
|
+
blockedUserKeys: state[values.reducerKeyChats].blockedUsers,
|
|
610
|
+
groups: state[values.reducerKey].list,
|
|
611
|
+
colourBrandingMain: getMainBrandingColourFromState(state),
|
|
612
|
+
};
|
|
546
613
|
};
|
|
547
614
|
|
|
548
|
-
export default connect(mapStateToProps, { createGroup, loadGroups, editGroup })(
|
|
615
|
+
export default connect(mapStateToProps, { createGroup, loadGroups, editGroup })(
|
|
616
|
+
EditGroup,
|
|
617
|
+
);
|