Merge pull request #2091 from The-Commit-Company/develop

Merging develop into v3-alpha

Author: nikkothari22

apps/mobile/components/features/channel-settings/Members/ChannelMemberRow.tsx

@@ -65,16 +65,9 @@ const ChannelMemberRow = ({ member }: { member: Member }) => {
         const { deleteDoc, error, loading: deletingDoc } = useFrappeDeleteDoc()
         const { mutate } = useSWRConfig()
 
-        const { data: memberInfo, error: errorFetchingChannelMember } = useFrappeGetCall<{ message: { name: string } }>('frappe.client.get_value', {
-            doctype: "Raven Channel Member",
-            filters: JSON.stringify({ channel_id: channelId, user_id: member?.name }),
-            fieldname: JSON.stringify(["name"])
-        }, undefined, {
-            revalidateOnFocus: false
-        })
 
         const deleteMember = async () => {
-            return deleteDoc('Raven Channel Member', memberInfo?.message.name).then(() => {
+            return deleteDoc('Raven Channel Member', member?.channel_member_name).then(() => {
                 toast.success(`Removed ${member.full_name} from the channel`)
                 mutate(["channel_members", channelId])
             })
@@ -164,4 +157,4 @@ const ChannelMemberRow = ({ member }: { member: Member }) => {
     )
 }
 
-export default ChannelMemberRow
+export default ChannelMemberRow

frontend/src/components/feature/channel-member-details/remove-members/RemoveChannelMemberModal.tsx

@@ -24,17 +24,9 @@ export const RemoveChannelMemberModal = ({ onClose, member }: RemoveChannelMembe
     const { mutate } = useSWRConfig()
     const channelData = channel?.channelData
 
-    const { data: memberInfo, error: errorFetchingChannelMember } = useFrappeGetCall<{ message: { name: string } }>('frappe.client.get_value', {
-        doctype: "Raven Channel Member",
-        filters: JSON.stringify({ channel_id: channelID, user_id: member?.name }),
-        fieldname: JSON.stringify(["name"])
-    }, undefined, {
-        revalidateOnFocus: false
-    })
-
     const onSubmit = async () => {
-        return deleteDoc('Raven Channel Member', memberInfo?.message.name).then(() => {
-            toast.success(`Removed`)
+        return deleteDoc('Raven Channel Member', member?.channel_member_name).then(() => {
+            toast.success(`Removed ${member?.full_name} from ${channelData?.channel_name}`)
             onClose()
             mutate(["channel_members", channelID])
         })
@@ -54,7 +46,6 @@ export const RemoveChannelMemberModal = ({ onClose, member }: RemoveChannelMembe
                 </AlertDialog.Title>
 
                 <Flex direction={'column'} gap='2'>
-                    <ErrorBanner error={errorFetchingChannelMember} />
                     <ErrorBanner error={error} />
                     <Text size='2'>This person will no longer have access to the channel.</Text>
                 </Flex>
@@ -85,7 +76,6 @@ export const RemoveChannelMemberModal = ({ onClose, member }: RemoveChannelMembe
             </Dialog.Title>
 
             <Flex direction={'column'} gap='2'>
-                <ErrorBanner error={errorFetchingChannelMember} />
                 <ErrorBanner error={error} />
                 <Text size='1'>This person will no longer have access to the channel and can only rejoin by invitation.</Text>
             </Flex>
@@ -103,4 +93,4 @@ export const RemoveChannelMemberModal = ({ onClose, member }: RemoveChannelMembe
     }
 
 
-}
+}

raven/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.8.7"
+__version__ = "2.8.8"
 
 from raven.raven_integrations.doctype.raven_incoming_webhook.raven_incoming_webhook import (  # noqa
 	handle_incoming_webhook as webhook,