event description updates for merged users

app/components/activity/EventDescription.jsx

@@ -47,8 +47,11 @@ const ReplyButton = styled(Button)`
 `
 const Username = ({ id }) => (
   <Query query={GET_USER} variables={{ id }}>
-    {({ data, loading }) => {
-      if (loading || !data || !data.user) {
+    {({ data, loading, error }) => {
+      if (error) {
+        return <em>[User has been deleted]</em>
+      }
+      if (loading || !data) {
         return `...`
       }
       const { givenNames, surname } = data.user.identities[0].name
@@ -244,10 +247,16 @@ const EventDescription = ({ audit, manuscript }) => {
     )
   }
   if (objectType === 'team') {
-    if (changes.role_name === 'submitter') {
+    if (
+      changes.role_name === 'submitter' ||
+      (originalData && originalData.role_name === 'submitter')
+    ) {
       return `Became submitter`
     }
-    if (changes.role_name === 'reviewer') {
+    if (
+      changes.role_name === 'reviewer' ||
+      (originalData && originalData.role_name === 'reviewer')
+    ) {
       if (audit.user.id === changes.user_id) {
         return `Became reviewer`
       }