Remove dupes from Connection lists; match Groups listItem height to C…

…ontacts
DiscipleTools · May 4, 2021 · 93ac17c · 93ac17c
1 parent 8c29568
commit 93ac17c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/screens/Contact/ContactDetailScreen.js b/screens/Contact/ContactDetailScreen.js
@@ -1668,7 +1668,9 @@ class ContactDetailScreen extends React.Component {
         }
       });
     }
-    return items;
+    // remove dupes
+    const set = new Set(items.map((item) => JSON.stringify(item)));
+    return [...set].map((item) => JSON.parse(item));
   };
 
   onViewOnMobileWeb = () => {
@@ -3777,7 +3779,6 @@ class ContactDetailScreen extends React.Component {
         } else {
           switch (postType) {
             case 'contacts': {
-              //listItems = [...this.state.usersContacts];
               listItems = [
                 ...this.state.subAssignedContacts,
                 ...this.state.relationContacts,

diff --git a/screens/Group/GroupDetailScreen.js b/screens/Group/GroupDetailScreen.js
@@ -1315,7 +1315,9 @@ class GroupDetailScreen extends React.Component {
         }
       });
     }
-    return items;
+    // remove dupes
+    const set = new Set(items.map((item) => JSON.stringify(item)));
+    return [...set].map((item) => JSON.parse(item));
   };
 
   renderActivityOrCommentRow = (commentOrActivity) => (
@@ -3568,7 +3570,7 @@ class GroupDetailScreen extends React.Component {
                 break;
               }
               case 'groups': {
-                collection = [...this.state.groups];
+                collection = [...this.state.connectionGroups, ...this.state.groups];
                 isGroup = true;
                 break;
               }

diff --git a/screens/Group/GroupsScreen.styles.js b/screens/Group/GroupsScreen.styles.js
@@ -2,7 +2,7 @@ import { StyleSheet } from 'react-native';
 
 export const styles = StyleSheet.create({
   flatListItem: {
-    height: 40 /* this needs auto sizing */,
+    height: 55,
     margin: 20,
     marginTop: 10,
     paddingBottom: 10,

diff --git a/shared/index.js b/shared/index.js
@@ -177,7 +177,6 @@ const formatDateToDatePicker = (timestamp = null) => {
 };
 
 const getSelectorColor = (status) => {
-  console.log(`status: ${status}`);
   let newColor;
   if (status === 'new' || status === 'unassigned' || status === 'inactive') {
     newColor = '#d9534f';