settings fix

src/modules/api/chat/chat-api.ts

@@ -338,13 +338,13 @@ export const chatApi = {
     if (data.description) {
       formData.append('description', data.description);
     }
-    if (data.members_can_edit_settings) {
+    if (data.hasOwnProperty('members_can_edit_settings')) {
       formData.append('members_can_edit_settings', JSON.stringify(data.members_can_edit_settings));
     }
-    if (data.members_can_send_messages) {
+    if (data.hasOwnProperty('members_can_send_messages')) {
       formData.append('members_can_send_messages', JSON.stringify(data.members_can_send_messages));
     }
-    if (data.members_can_add_new_members) {
+    if (data.hasOwnProperty('members_can_add_new_members')) {
       formData.append(
         'members_can_add_new_members',
         JSON.stringify(data.members_can_add_new_members)
@@ -431,19 +431,19 @@ export const chatApi = {
     formData.append('token', data.token);
     formData.append('group_token', data.group_token);
 
-    if (data.members_can_edit_settings) {
+    if (data.hasOwnProperty('members_can_edit_settings')) {
       formData.append('members_can_edit_settings', JSON.stringify(data.members_can_edit_settings));
     }
-    if (data.members_can_add_new_members) {
+    if (data.hasOwnProperty('members_can_add_new_members')) {
       formData.append(
         'members_can_add_new_members',
         JSON.stringify(data.members_can_add_new_members)
       );
     }
-    if (data.members_can_send_messages) {
+    if (data.hasOwnProperty('members_can_send_messages')) {
       formData.append('members_can_send_messages', JSON.stringify(data.members_can_send_messages));
     }
-    if (data.members_can_see_members) {
+    if (data.hasOwnProperty('members_can_see_members')) {
       formData.append('members_can_see_members', JSON.stringify(data.members_can_see_members));
     }
     if (data.name) {

src/screens/InAppScreens/MessagesScreen/Components/EditGroupModal.tsx

@@ -173,20 +173,23 @@ const SearchModal = () => {
           }
 
           if (removedUsers.length > 0) {
-            removedUsers.forEach(async (userId: number) => {
-              await removeFromGroup(
-                {
-                  token: data.token,
-                  group_token: data.groupToken,
-                  uid: userId
-                },
-                {
-                  onSuccess: (res) => {
-                    data && data.refetchMembers();
-                  }
-                }
-              );
-            });
+            await Promise.all(
+              removedUsers.map(
+                async (userId: number) =>
+                  await removeFromGroup(
+                    {
+                      token: data.token,
+                      group_token: data.groupToken,
+                      uid: userId
+                    },
+                    {
+                      onSuccess: () => {
+                        data && data.refetchMembers();
+                      }
+                    }
+                  )
+              )
+            );
           }
 
           await editGroup(groupData, {