cozy-sharing 40.1.6 → 40.1.8

package/dist/hooks/useResolveRecipients.js

@@ -0,0 +1,53 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { useCallback } from 'react';
+import { useClient } from 'cozy-client';
+import { getOrCreateFromArray } from '../helpers/contacts';
+import { DOCTYPE_CONTACTS } from '../models';
+/**
+ * Turns the recipients picked in a sharing form into contacts, creating the
+ * missing ones, and splits them by the selected sharing right.
+ *
+ * @returns {Function} `resolveRecipients(pendingRecipients, selectedOption, createContact?)`
+ * resolving to `{ recipients, readOnlyRecipients }`, ready to be passed to `share`
+ */
+
+export var useResolveRecipients = function useResolveRecipients() {
+  var client = useClient();
+  return useCallback( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(pendingRecipients) {
+      var selectedOption,
+          createContact,
+          contacts,
+          isReadOnly,
+          _args = arguments;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            selectedOption = _args.length > 1 && _args[1] !== undefined ? _args[1] : 'readWrite';
+            createContact = _args.length > 2 && _args[2] !== undefined ? _args[2] : function (contact) {
+              return client.create(DOCTYPE_CONTACTS, contact);
+            };
+            _context.next = 4;
+            return getOrCreateFromArray(client, pendingRecipients, createContact);
+
+          case 4:
+            contacts = _context.sent;
+            isReadOnly = selectedOption === 'readOnly';
+            return _context.abrupt("return", {
+              recipients: isReadOnly ? [] : contacts,
+              readOnlyRecipients: isReadOnly ? contacts : []
+            });
+
+          case 7:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+
+    return function (_x) {
+      return _ref.apply(this, arguments);
+    };
+  }(), [client]);
+};

package/dist/hooks/useResolveRecipients.spec.js

@@ -0,0 +1,140 @@
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { renderHook } from '@testing-library/react-hooks';
+import { useResolveRecipients } from './useResolveRecipients';
+import { getOrCreateFromArray } from '../helpers/contacts';
+var mockClient = {
+  create: jest.fn()
+};
+jest.mock('cozy-client', function () {
+  return {
+    useClient: function useClient() {
+      return mockClient;
+    }
+  };
+});
+jest.mock('../helpers/contacts', function () {
+  return {
+    getOrCreateFromArray: jest.fn()
+  };
+});
+var contacts = [{
+  _id: 'alice'
+}, {
+  _id: 'bob'
+}];
+describe('useResolveRecipients', function () {
+  beforeEach(function () {
+    jest.clearAllMocks();
+    getOrCreateFromArray.mockResolvedValue(contacts);
+  });
+  it('gives read-write rights by default', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var _renderHook, result, resolved;
+
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _renderHook = renderHook(function () {
+            return useResolveRecipients();
+          }), result = _renderHook.result;
+          _context.next = 3;
+          return result.current([{
+            email: 'alice@cozy.cc'
+          }]);
+
+        case 3:
+          resolved = _context.sent;
+          expect(resolved).toEqual({
+            recipients: contacts,
+            readOnlyRecipients: []
+          });
+
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+  it('gives read-only rights when the read-only option is selected', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var _renderHook2, result, resolved;
+
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _renderHook2 = renderHook(function () {
+            return useResolveRecipients();
+          }), result = _renderHook2.result;
+          _context2.next = 3;
+          return result.current([], 'readOnly');
+
+        case 3:
+          resolved = _context2.sent;
+          expect(resolved).toEqual({
+            recipients: [],
+            readOnlyRecipients: contacts
+          });
+
+        case 5:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })));
+  it('creates missing contacts with the client by default', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+    var _renderHook3, result, pendingRecipients, createContact;
+
+    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _renderHook3 = renderHook(function () {
+            return useResolveRecipients();
+          }), result = _renderHook3.result;
+          pendingRecipients = [{
+            email: 'alice@cozy.cc'
+          }];
+          _context3.next = 4;
+          return result.current(pendingRecipients);
+
+        case 4:
+          createContact = getOrCreateFromArray.mock.calls[0][2];
+          createContact({
+            email: [{
+              address: 'alice@cozy.cc'
+            }]
+          });
+          expect(getOrCreateFromArray).toHaveBeenCalledWith(mockClient, pendingRecipients, expect.any(Function));
+          expect(mockClient.create).toHaveBeenCalledWith('io.cozy.contacts', {
+            email: [{
+              address: 'alice@cozy.cc'
+            }]
+          });
+
+        case 8:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  })));
+  it('creates missing contacts with the given function', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+    var _renderHook4, result, createContact;
+
+    return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          _renderHook4 = renderHook(function () {
+            return useResolveRecipients();
+          }), result = _renderHook4.result;
+          createContact = jest.fn();
+          _context4.next = 4;
+          return result.current([], 'readWrite', createContact);
+
+        case 4:
+          expect(getOrCreateFromArray).toHaveBeenCalledWith(mockClient, [], createContact);
+
+        case 5:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  })));
+});

package/dist/index.js

@@ -32,7 +32,7 @@ export { ShareButtonWithRecipients } from './ShareButtonWithRecipients';
 export { DOCUMENT_TYPE } from './helpers/documentType';
 export { getRecipientsFromSharing } from './state';
 export { default as OpenSharingLinkButton } from './OpenSharingLinkButton';
-export { PermissionTypeMenu } from './components/Recipient/PermissionTypeMenu';
+export { default as PermissionTypeMenu } from './components/Recipient/PermissionTypeMenuWrapper';
 export { default as OpenSharingLinkFabButton } from './OpenSharingLinkFabButton';
 export { NativeFileSharingProvider, useNativeFileSharing } from './providers/NativeFileSharingProvider';
 export { createCozySharingLink } from './actions/createCozySharingLink';

package/docs/share-modal-architecture.md

@@ -20,8 +20,8 @@ flowchart TD
     SharingContent --> ShareByEmail
     ConfirmTrustedRecipientsDialog --> DumbConfirmTrustedRecipientsDialog
     DumbConfirmTrustedRecipientsDialog --> ShareDialogTwoStepsConfirmationContainer
-    ShareByEmail --> ShareRecipientsInput
-    ShareRecipientsInput --> ShareAutosuggest
+    ShareByEmail --> ShareAutosuggestWrapper
+    ShareAutosuggestWrapper --> ShareAutosuggest
 ```
 
 ### Specific case of `ShareDialogTwoStepsConfirmationContainer`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "40.1.6",
+  "version": "40.1.8",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -58,7 +58,7 @@
     "cozy-intent": "^2.31.1",
     "cozy-minilog": "^3.10.1",
     "cozy-ui": "^140.5.0",
-    "cozy-ui-plus": "^14.1.1",
+    "cozy-ui-plus": "^14.1.3",
     "jest": "30.3.0",
     "jest-environment-jsdom": "30.3.0",
     "react": "16.12.0",
@@ -84,5 +84,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "d6b5c4b1938d425b6d1d6da2c479d2056db4b171"
+  "gitHead": "3d97a76d7d6b7a07f27fa4d25b17b26474e1fdc0"
 }

package/src/components/FederatedFolder/FederatedFolderModal.jsx

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types'
 import React, { useCallback, useEffect, useState } from 'react'
 
-import { useClient } from 'cozy-client'
 import minilog from 'cozy-minilog'
 import Button from 'cozy-ui/transpiled/react/Buttons'
 import { FixedDialog } from 'cozy-ui/transpiled/react/CozyDialogs'
@@ -12,15 +11,15 @@ import ConfirmDialogProvider, {
 } from 'cozy-ui/transpiled/react/providers/ConfirmDialog'
 import { useI18n } from 'twake-i18n'
 
-import { getOrCreateFromArray } from '../../helpers/contacts'
 import withLocales from '../../hoc/withLocales'
 import { usePendingRecipients } from '../../hooks/usePendingRecipients'
+import { useResolveRecipients } from '../../hooks/useResolveRecipients'
 import { useSharingContext } from '../../hooks/useSharingContext'
 import styles from '../../styles/share.styl'
 import AntivirusAlert from '../AntivirusAlert'
 import { default as DumbShareByEmail } from '../ShareByEmail'
 import ShareByLink from '../ShareByLink'
-import WhoHasAccess from '../WhoHasAccess'
+import WhoHasAccessWrapper from '../WhoHasAccessWrapper'
 
 const log = minilog('FederatedFolderModal')
 
@@ -38,7 +37,7 @@ const FederatedFolderModalContent = ({
   // we close the popup and we do not want to see briefly the new contacts added
   // in members before the modal closes. That's why when clicking on "Share"
   // we do not use the reactive existingDocument and existingRecipients.
-  const client = useClient()
+  const resolveRecipients = useResolveRecipients()
   const { t } = useI18n()
   const {
     canReshare,
@@ -162,13 +161,8 @@ const FederatedFolderModalContent = ({
     setFrozenRecipients(recipients)
 
     try {
-      const contacts = await getOrCreateFromArray(
-        client,
-        pendingRecipients,
-        contact => client.create('io.cozy.contacts', contact)
-      )
-      const readWriteRecipients = selectedOption === 'readOnly' ? [] : contacts
-      const readOnlyRecipients = selectedOption === 'readOnly' ? contacts : []
+      const { recipients: readWriteRecipients, readOnlyRecipients } =
+        await resolveRecipients(pendingRecipients, selectedOption)
 
       await share({
         description: folderName,
@@ -275,7 +269,7 @@ const FederatedFolderModalContent = ({
               </>
             )}
           </div>
-          <WhoHasAccess
+          <WhoHasAccessWrapper
             isOwner={isCurrentUserOwner}
             canManageSharing={canManageSharing}
             isSharedDrive

package/src/components/FederatedFolder/FederatedFolderModal.spec.jsx

@@ -61,6 +61,7 @@ jest.mock('cozy-ui/transpiled/react/providers/Alert', () => ({
 jest.mock('../../hoc/withLocales', () => Component => Component)
 
 jest.mock('../../helpers/contacts', () => ({
+  ...jest.requireActual('../../helpers/contacts'),
   getOrCreateFromArray: jest.fn()
 }))
 

package/src/components/Recipient/DowngradePermissionConfirmDialog.jsx

@@ -3,7 +3,6 @@ import React from 'react'
 import snarkdown from 'snarkdown'
 
 import { Icon, FolderOutlined, ArrowUp } from '@linagora/twake-icons'
-import { useClient } from 'cozy-client'
 import Button from 'cozy-ui/transpiled/react/Buttons'
 import { ConfirmDialog } from 'cozy-ui/transpiled/react/CozyDialogs'
 import Timeline from 'cozy-ui/transpiled/react/Timeline'
@@ -17,23 +16,16 @@ import Typography from 'cozy-ui/transpiled/react/Typography'
 import { useI18n } from 'twake-i18n'
 
 import { DEFAULT_DISPLAY_NAME } from '../../helpers/recipients'
-import { useFetchDocumentPath } from '../../hooks/useFetchDocumentPath'
-import { useSharingContext } from '../../hooks/useSharingContext'
 import { getDisplayName } from '../../models'
 
 const DowngradePermissionConfirmDialog = ({
   document,
   recipient,
+  sharedParentName,
   onCancel,
   onConfirm
 }) => {
   const { t } = useI18n()
-  const client = useClient()
-  const { getSharedParentPath } = useSharingContext()
-
-  const documentPath = useFetchDocumentPath(client, document)
-  const sharedParentPath = documentPath && getSharedParentPath(documentPath)
-  const parentFolderName = sharedParentPath?.split('/').pop()
   const contactName = getDisplayName(recipient, t(DEFAULT_DISPLAY_NAME))
   const [before, afterOpen] = snarkdown(
     t('DowngradePermissionConfirmDialog.content', { contactName })
@@ -68,7 +60,7 @@ const DowngradePermissionConfirmDialog = ({
                 <TimelineConnector />
               </TimelineSeparator>
               <TimelineContent>
-                <Typography variant="body2">{parentFolderName}</Typography>
+                <Typography variant="body2">{sharedParentName}</Typography>
                 <div>
                   <s>
                     <Typography display="inline" variant="caption">
@@ -147,6 +139,7 @@ const DowngradePermissionConfirmDialog = ({
 DowngradePermissionConfirmDialog.propTypes = {
   document: PropTypes.object.isRequired,
   recipient: PropTypes.object.isRequired,
+  sharedParentName: PropTypes.string,
   onCancel: PropTypes.func.isRequired,
   onConfirm: PropTypes.func.isRequired
 }

package/src/components/Recipient/GroupRecipient.jsx

@@ -1,6 +1,5 @@
 import React, { useState } from 'react'
 
-import { useClient } from 'cozy-client'
 import Fade from 'cozy-ui/transpiled/react/Fade'
 import ListItem from 'cozy-ui/transpiled/react/ListItem'
 import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon'
@@ -21,7 +20,6 @@ import { GroupAvatar } from '../Avatar/GroupAvatar'
 const GroupRecipient = props => {
   const { name, color, members, fadeIn, isOwner } = props
   const { t } = useI18n()
-  const client = useClient()
   const { isMobile } = useBreakpoints()
 
   const [isDetailOpened, setDetailOpened] = useState(false)
@@ -30,9 +28,7 @@ const GroupRecipient = props => {
   const nbMemberReady = members.filter(
     member => !['revoked', 'mail-not-sent'].includes(member.status)
   ).length
-  const isUserInsideMembers = members.some(
-    member => member.instance === client.options.uri
-  )
+  const isUserInsideMembers = members.some(member => member.isCurrentUser)
 
   const toogleDetailOpened = () => {
     setDetailOpened(!isDetailOpened)

package/src/components/Recipient/GroupRecipient.stories.jsx

@@ -13,7 +13,9 @@ const meta = {
       { status: 'pending' },
       { status: 'revoked' }
     ],
-    groupIndex: 0
+    groupIndex: 0,
+    onRevokeGroup: () => {},
+    onLeaveGroup: () => {}
   }
 }
 

package/src/components/Recipient/GroupRecipientDetailWithAccess.jsx

@@ -1,6 +1,5 @@
 import React from 'react'
 
-import { useClient } from 'cozy-client'
 import Avatar from 'cozy-ui/transpiled/react/Avatar'
 import List from 'cozy-ui/transpiled/react/List'
 import ListItem from 'cozy-ui/transpiled/react/ListItem'
@@ -14,7 +13,6 @@ import { getInitials, getDisplayName } from '../../models'
 
 const GroupRecipientDetailWithAccess = ({ withAccess }) => {
   const { t } = useI18n()
-  const client = useClient()
 
   return (
     <div>
@@ -24,7 +22,6 @@ const GroupRecipientDetailWithAccess = ({ withAccess }) => {
       <List>
         {withAccess.map(recipient => {
           const name = getDisplayName(recipient)
-          const isMe = recipient.instance === client.options.uri
 
           return (
             <ListItem disableGutters key={recipient.index} size="small">
@@ -36,7 +33,7 @@ const GroupRecipientDetailWithAccess = ({ withAccess }) => {
                 secondary={
                   <MemberRecipientStatus
                     status={recipient.status}
-                    isMe={isMe}
+                    isMe={Boolean(recipient.isCurrentUser)}
                     instance={recipient.instance}
                     email={recipient.email}
                     name={recipient.name || recipient.public_name}

package/src/components/Recipient/GroupRecipientPermissions.jsx

@@ -13,7 +13,6 @@ import Typography from 'cozy-ui/transpiled/react/Typography'
 import { useI18n } from 'twake-i18n'
 
 import { permission } from './actions/permission'
-import { useSharingContext } from '../../hooks/useSharingContext'
 import { GroupAvatar } from '../Avatar/GroupAvatar'
 
 const GroupRecipientPermissions = ({
@@ -26,11 +25,12 @@ const GroupRecipientPermissions = ({
   read_only = false,
   className,
   isUserInsideMembers,
-  document
+  document,
+  onRevokeGroup,
+  onLeaveGroup
 }) => {
   const { t } = useI18n()
   const buttonRef = useRef()
-  const { revokeGroup, revokeSelf } = useSharingContext()
 
   const [isMenuDisplayed, setMenuDisplayed] = useState(false)
   const [revoking, setRevoking] = useState(false)
@@ -44,9 +44,9 @@ const GroupRecipientPermissions = ({
   const handleRevocation = async () => {
     setRevoking(true)
     if (isOwner) {
-      await revokeGroup(document, sharingId, groupIndex)
+      await onRevokeGroup(document, sharingId, groupIndex)
     } else {
-      await revokeSelf(document)
+      await onLeaveGroup(document)
     }
     setRevoking(false)
   }

package/src/components/Recipient/GroupRecipientPermissions.stories.jsx

@@ -5,6 +5,8 @@ const meta = {
   args: {
     onRevoke: () => {},
     onRevokeSelf: () => {},
+    onRevokeGroup: () => {},
+    onLeaveGroup: () => {},
     type: 'two-way',
     status: 'ready',
     groupIndex: 0

package/src/components/Recipient/LinkRecipient.jsx

@@ -19,7 +19,6 @@ import {
   getPermissionExpiresDate
 } from '../../helpers/permissions'
 import { FADE_IN_DURATION } from '../../helpers/recipients'
-import { useSharingContext } from '../../hooks/useSharingContext'
 import { ShareRestrictionModal } from '../ShareRestrictionModal/ShareRestrictionModal'
 
 const LinkRecipientTextReadOnly = ({ textPrimary, textSecondary }) => {
@@ -55,19 +54,18 @@ const LinkRecipientText = ({ onClick, textPrimary, textSecondary }) => {
 const LinkRecipient = props => {
   const { t, f, lang } = useI18n()
   const { isMobile } = useBreakpoints()
-  const { getDocumentPermissions } = useSharingContext()
 
   const {
     recipientConfirmationData,
     verifyRecipient,
     fadeIn,
     document,
-    isReadOnly
+    isReadOnly,
+    permissions
   } = props
 
   const [openShareRestrictionModal, setOpenShareRestrictionModal] =
     useState(false)
-  const permissions = getDocumentPermissions(document?._id)
   const hasPassword = checkIsPermissionHasPassword(permissions)
   const expiresDate = getPermissionExpiresDate(permissions)
   const dateFormatted = expiresDate

package/src/components/Recipient/LinkRecipient.stories.jsx

@@ -6,6 +6,10 @@ const meta = {
     recipientConfirmationData: false,
     verifyRecipient: () => true,
     document: { _id: '123' },
+    documentType: 'Files',
+    permissions: [],
+    onUpdateLinkPermissions: () => {},
+    onRevokeLink: () => {},
     fadeIn: false
   }
 }

package/src/components/Recipient/LinkRecipientPermissions.jsx

@@ -15,21 +15,20 @@ import { setReadOnlySharedPermission } from './actions/setReadOnlySharedPermissi
 import { setReadWriteSharedPermission } from './actions/setReadWriteSharedPermission'
 import { isOnlyReadOnlyLinkAllowed } from '../../helpers/link'
 import { checkIsReadOnlyPermissions } from '../../helpers/permissions'
-import { useSharingContext } from '../../hooks/useSharingContext'
 import { WRITE_PERMS, READ_ONLY_PERMS } from '../ShareRestrictionModal/helpers'
 
-const LinkRecipientPermissions = ({ document, isReadOnly }) => {
+const LinkRecipientPermissions = ({
+  document,
+  documentType,
+  isReadOnly,
+  permissions,
+  onUpdateLinkPermissions,
+  onRevokeLink
+}) => {
   const { t } = useI18n()
   const buttonRef = useRef()
   const [isMenuDisplayed, setMenuDisplayed] = useState(false)
-  const {
-    updateDocumentPermissions,
-    revokeSharingLink,
-    documentType,
-    getDocumentPermissions
-  } = useSharingContext()
 
-  const permissions = getDocumentPermissions(document._id)
   const isReadOnlyPermissions = checkIsReadOnlyPermissions(permissions)
   const type = isReadOnlyPermissions ? 'one-way' : 'two-way'
 
@@ -38,11 +37,11 @@ const LinkRecipientPermissions = ({ document, isReadOnly }) => {
 
   const handleSetType = newType => {
     const verbs = newType === 'one-way' ? READ_ONLY_PERMS : WRITE_PERMS
-    updateDocumentPermissions(document, { verbs })
+    onUpdateLinkPermissions(document, { verbs })
     hideMenu()
   }
 
-  const handleRevocation = () => revokeSharingLink(document)
+  const handleRevocation = () => onRevokeLink(document)
 
   const actionsToShow = [setReadOnlySharedPermission]
   if (!isOnlyReadOnlyLinkAllowed({ documentType })) {
@@ -87,7 +86,12 @@ const LinkRecipientPermissions = ({ document, isReadOnly }) => {
 }
 
 LinkRecipientPermissions.propTypes = {
-  document: PropTypes.object.isRequired
+  document: PropTypes.object.isRequired,
+  documentType: PropTypes.string.isRequired,
+  isReadOnly: PropTypes.bool,
+  permissions: PropTypes.arrayOf(PropTypes.object).isRequired,
+  onUpdateLinkPermissions: PropTypes.func.isRequired,
+  onRevokeLink: PropTypes.func.isRequired
 }
 
 export default LinkRecipientPermissions

package/src/components/Recipient/LinkRecipientPermissions.stories.jsx

@@ -3,7 +3,11 @@ import LinkRecipientPermissions from './LinkRecipientPermissions'
 const meta = {
   component: LinkRecipientPermissions,
   args: {
-    document: { _id: '123' }
+    document: { _id: '123' },
+    documentType: 'Files',
+    permissions: [],
+    onUpdateLinkPermissions: () => {},
+    onRevokeLink: () => {}
   }
 }
 

package/src/components/Recipient/MemberRecipient.jsx

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types'
 import React from 'react'
 
-import { useClient } from 'cozy-client'
 import Fade from 'cozy-ui/transpiled/react/Fade'
 import ListItem from 'cozy-ui/transpiled/react/ListItem'
 import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon'
@@ -22,13 +21,13 @@ import { MemberAvatar } from '../Avatar/MemberAvatar'
 
 const MemberRecipient = props => {
   const { t } = useI18n()
-  const client = useClient()
   const { isMobile } = useBreakpoints()
 
   const {
     instance,
     isOwner,
     status,
+    isCurrentUser = false,
     recipientConfirmationData,
     verifyRecipient,
     fadeIn,
@@ -36,8 +35,7 @@ const MemberRecipient = props => {
     ...rest
   } = props
 
-  const isMe =
-    (isOwner && status === 'owner') || instance === client.options.uri
+  const isMe = (isOwner && status === 'owner') || isCurrentUser
   const defaultDisplayName = t(DEFAULT_DISPLAY_NAME)
   const name = getDisplayName(rest, defaultDisplayName)
 
@@ -52,6 +50,7 @@ const MemberRecipient = props => {
       instance={instance}
       isOwner={isOwner}
       status={status}
+      isCurrentUser={isCurrentUser}
     />
   )
 
@@ -88,6 +87,7 @@ MemberRecipient.propTypes = {
   instance: PropTypes.string,
   isOwner: PropTypes.bool,
   status: PropTypes.string,
+  isCurrentUser: PropTypes.bool,
   recipientConfirmationData: PropTypes.object,
   verifyRecipient: PropTypes.func,
   isOrgSharedDrive: PropTypes.bool