cozy-sharing 31.1.0 → 31.2.0

package/dist/hooks/usePendingRecipients.spec.js

@@ -0,0 +1,30 @@
+import { renderHook, act } from '@testing-library/react-hooks';
+import { usePendingRecipients } from './usePendingRecipients';
+describe('usePendingRecipients', function () {
+  it('starts with empty recipients and readWrite option', function () {
+    var _renderHook = renderHook(function () {
+      return usePendingRecipients();
+    }),
+        result = _renderHook.result;
+
+    expect(result.current.pendingRecipients).toEqual([]);
+    expect(result.current.selectedOption).toBe('readWrite');
+  });
+  it('exposes setters that update state', function () {
+    var _renderHook2 = renderHook(function () {
+      return usePendingRecipients();
+    }),
+        result = _renderHook2.result;
+
+    act(function () {
+      result.current.setPendingRecipients([{
+        email: 'a@b.c'
+      }]);
+      result.current.setSelectedOption('readOnly');
+    });
+    expect(result.current.pendingRecipients).toEqual([{
+      email: 'a@b.c'
+    }]);
+    expect(result.current.selectedOption).toBe('readOnly');
+  });
+});

package/dist/styles/autosuggest.styl

@@ -5,7 +5,7 @@
     box-sizing border-box
     position absolute
     top 100%
-    margin-top .25rem
+    margin-top .5rem
     z-index var(--zIndex-alertMobile)
     width 100%
     overflow hidden
@@ -37,12 +37,13 @@
     display flex
     flex-wrap wrap
     align-items center
-    padding .25rem .5rem
+    padding .25rem 3.5rem .25rem .5rem
     border-radius .25rem
     border 1px solid var(--borderMainColor)
     min-height 2.5rem
     max-height 6.75rem
     overflow auto
+    position relative
 
     &:hover
         border 1px solid var(--borderMainColor)
@@ -69,3 +70,8 @@
             font-size 1rem
 .recipientChip
   margin .25rem .5rem .25rem 0
+
+.endAdornment
+    position absolute
+    top .75rem
+    right 1rem

package/dist/styles/share.styl

@@ -38,45 +38,6 @@
     .coz-form-desc
         color var(--secondaryTextColor)
 
-.share-type-control
-    display flex
-    flex-direction row
-    justify-content space-between
-    padding .5rem 0 0
-
-    .select-wrapper
-        flex 0 0 49%
-        position relative
-
-        .select-option
-            padding .5rem 1.5rem .5rem 3rem
-            position relative
-
-            svg
-                position absolute
-                left 1rem
-                top 1rem
-
-
-        .select-option-label
-            line-height 2
-
-        .select-option-desc
-            line-height 1.5
-            font-size   .8125rem
-            color var(--secondaryTextColor)
-
-
-
-    button
-        flex 0 0 49%
-        margin 0
-
-:global
-    // dirty hack for react-select: its API doesn't allow to make change to active styles
-    .react-select__option:active
-        background-color var(--defaultBackgroundColor) !important
-
 input[type=text]
     width 100%
 

package/dist/stylesheet.css

@@ -312,40 +312,6 @@
 .share__coz-form-group___VsQp7 .share__coz-form-desc___2mYN4 {
   color: var(--secondaryTextColor);
 }
-.share__share-type-control___1YoRr {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  padding: 0.5rem 0 0;
-}
-.share__share-type-control___1YoRr .share__select-wrapper___3XBKC {
-  flex: 0 0 49%;
-  position: relative;
-}
-.share__share-type-control___1YoRr .share__select-wrapper___3XBKC .share__select-option___3Jp8_ {
-  padding: 0.5rem 1.5rem 0.5rem 3rem;
-  position: relative;
-}
-.share__share-type-control___1YoRr .share__select-wrapper___3XBKC .share__select-option___3Jp8_ svg {
-  position: absolute;
-  left: 1rem;
-  top: 1rem;
-}
-.share__share-type-control___1YoRr .share__select-wrapper___3XBKC .share__select-option-label___1BWz_ {
-  line-height: 2;
-}
-.share__share-type-control___1YoRr .share__select-wrapper___3XBKC .share__select-option-desc___3jOnr {
-  line-height: 1.5;
-  font-size: 0.8125rem;
-  color: var(--secondaryTextColor);
-}
-.share__share-type-control___1YoRr button {
-  flex: 0 0 49%;
-  margin: 0;
-}
-.react-select__option:active {
-  background-color: var(--defaultBackgroundColor) !important;
-}
 input[type=text] {
   width: 100%;
 }
@@ -380,7 +346,7 @@ input[type=text] {
   box-sizing: border-box;
   position: absolute;
   top: 100%;
-  margin-top: 0.25rem;
+  margin-top: 0.5rem;
   z-index: var(--zIndex-alertMobile);
   width: 100%;
   overflow: hidden;
@@ -412,12 +378,13 @@ input[type=text] {
   display: flex;
   flex-wrap: wrap;
   align-items: center;
-  padding: 0.25rem 0.5rem;
+  padding: 0.25rem 3.5rem 0.25rem 0.5rem;
   border-radius: 0.25rem;
   border: 1px solid var(--borderMainColor);
   min-height: 2.5rem;
   max-height: 6.75rem;
   overflow: auto;
+  position: relative;
 }
 .autosuggest__recipientsContainer___1JYxA:hover {
   border: 1px solid var(--borderMainColor);
@@ -449,6 +416,11 @@ input[type=text] {
 .autosuggest__recipientChip___d5I3R {
   margin: 0.25rem 0.5rem 0.25rem 0;
 }
+.autosuggest__endAdornment___2EwTN {
+  position: absolute;
+  top: 0.75rem;
+  right: 1rem;
+}
 /*  imported from button.styl  */
 
 .button__coz-btn-shared___9MFbY {

package/locales/en.json

@@ -15,11 +15,7 @@
     },
     "type": {
       "one-way": "Viewer",
-      "two-way": "Editor",
-      "desc": {
-        "one-way": "Contacts can view, download, and add the content to their Twake. If they add the content to their Twake, they will get updates you make to the content, but they won't be able to update it.",
-        "two-way": "Contacts can update, delete and add the content to their Twake. Updates on the content will be seen on other Cozies."
-      }
+      "two-way": "Editor"
     },
     "locked-type-file": "Coming soon: you will be able to change permissions you grant on the file.",
     "locked-type-folder": "Coming soon: you will be able to change permissions you grant on the folder.",
@@ -131,7 +127,7 @@
       "shareByEmail": {
         "subtitle": "By email",
         "emailPlaceholder": "Add contacts",
-        "send": "Send",
+        "send": "Share",
         "singleContactSuccess": "You sent an invite to %{email}.",
         "contactSuccess": "You sent an invite to %{smart_count} contact. |||| You sent an invite to %{smart_count} contacts.",
         "singleGroupSuccess": "You sent an invite to the members of the %{groupName} group.",
@@ -199,7 +195,7 @@
         "subtitle": "By email",
         "email": "To:",
         "emailPlaceholder": "Enter the email address or name of the recipient",
-        "send": "Send",
+        "send": "Share",
         "singleContactSuccess": "You sent an invite to %{email}.",
         "contactSuccess": "You sent an invite to %{smart_count} contact. |||| You sent an invite to %{smart_count} contacts.",
         "singleGroupSuccess": "You sent an invite to the members of the %{groupName} group.",
@@ -268,7 +264,7 @@
         "subtitle": "By email",
         "email": "email",
         "emailPlaceholder": "Enter the email address or name of the recipient",
-        "send": "Send",
+        "send": "Share",
         "singleContactSuccess": "You sent an invite to %{email}.",
         "contactSuccess": "You sent an invite to %{smart_count} contact. |||| You sent an invite to %{smart_count} contacts.",
         "singleGroupSuccess": "You sent an invite to the members of the %{groupName} group.",
@@ -332,7 +328,7 @@
         "subtitle": "By email",
         "email": "Send to:",
         "emailPlaceholder": "Enter the email address or name of the recipient",
-        "send": "Send",
+        "send": "Share",
         "error": {
           "addingRecipient": "An error occurred while adding the recipient. Please try again."
         },

package/locales/fr.json

@@ -15,11 +15,7 @@
     },
     "type": {
       "one-way": "Lecteur",
-      "two-way": "Éditeur",
-      "desc": {
-        "one-way": "Les contacts peuvent consulter, télécharger, et ajouter le contenu à leur Twake. En cas d’ajout à leur Twake, ils recevront vos modifications sur le contenu mais ils ne pourront pas le modifier.",
-        "two-way": "Les contacts peuvent modifier, supprimer et ajouter le contenu à leur Twake. Les modifications sur le contenu seront répercutées automatiquement entre vos Twake."
-      }
+      "two-way": "Éditeur"
     },
     "locked-type-file": "Bientôt : vous pourrez changer la permission donnée sur le fichier.",
     "locked-type-folder": "Bientôt : vous pourrez changer la permission donnée sur le dossier.",
@@ -128,7 +124,7 @@
       "shareByEmail": {
         "subtitle": "Par email",
         "emailPlaceholder": "Ajouter des contacts",
-        "send": "Envoyer",
+        "send": "Partager",
         "singleContactSuccess": "Vous avez envoyé une invitation à %{email}.",
         "contactSuccess": "Vous avez invité %{smart_count} contact. |||| Vous avez invité %{smart_count} contacts.",
         "singleGroupSuccess": "Vous avez invité les membres du groupe %{groupName}.",
@@ -196,7 +192,7 @@
         "subtitle": "Par email",
         "email": "À :",
         "emailPlaceholder": "Saisissez le courriel ou le nom du destinataire.",
-        "send": "Envoyer",
+        "send": "Partager",
         "singleContactSuccess": "Vous avez envoyé une invitation à %{email}.",
         "contactSuccess": "Vous avez invité %{smart_count} contact. |||| Vous avez invité %{smart_count} contacts.",
         "singleGroupSuccess": "Vous avez invité les membres du groupe %{groupName}.",
@@ -266,7 +262,7 @@
         "subtitle": "Par email",
         "email": "e-mail",
         "emailPlaceholder": "Saisissez l'email ou le nom du destinataire.",
-        "send": "Envoyer",
+        "send": "Partager",
         "singleContactSuccess": "Vous avez envoyé une invitation à %{email}.",
         "contactSuccess": "Vous avez invité %{smart_count} contact. |||| Vous avez invité %{smart_count} contacts.",
         "singleGroupSuccess": "Vous avez invité les membres du groupe %{groupName}.",
@@ -330,7 +326,7 @@
         "subtitle": "Par email",
         "email": "Envoyer à :",
         "emailPlaceholder": "Saisissez le courriel ou le nom du destinataire.",
-        "send": "Envoyer",
+        "send": "Partager",
         "error": {
           "addingRecipient": "Une erreur s'est produite lors de l'ajout du destinataire. Veuillez réessayer."
         },

package/locales/ru.json

@@ -15,11 +15,7 @@
     },
     "type": {
       "one-way": "Читатель",
-      "two-way": "Редактор",
-      "desc": {
-        "one-way": "Контакты могут просматривать, скачивать и добавлять этот элемент в свой Twake. В таком случае они будут получать ваши обновления, но не смогут обновлять содержимое сами.",
-        "two-way": "Контакты могут обновлять, удалять и добавлять этот элемент в свой Twake. Обновления содержимого будут видны на других аккаунтах."
-      }
+      "two-way": "Редактор"
     },
     "locked-type-file": "Скоро: вы сможете изменять разрешения для файла.",
     "locked-type-folder": "Скоро: вы сможете изменять разрешения для папки.",
@@ -131,7 +127,7 @@
       "shareByEmail": {
         "subtitle": "По электронной почте",
         "emailPlaceholder": "Добавить контакты",
-        "send": "Отправить",
+        "send": "Поделиться",
         "singleContactSuccess": "Вы отправили приглашение на %{email}.",
         "contactSuccess": "Вы отправили приглашение %{smart_count} контакту. |||| Вы отправили приглашение %{smart_count} контактам.",
         "singleGroupSuccess": "Вы отправили приглашение участникам группы %{groupName}.",
@@ -199,7 +195,7 @@
         "subtitle": "По электронной почте",
         "email": "Кому:",
         "emailPlaceholder": "Введите адрес электронной почты или имя получателя",
-        "send": "Отправить",
+        "send": "Поделиться",
         "singleContactSuccess": "Вы отправили приглашение на %{email}.",
         "contactSuccess": "Вы отправили приглашение %{smart_count} контакту. |||| Вы отправили приглашение %{smart_count} контактам.",
         "singleGroupSuccess": "Вы отправили приглашение участникам группы %{groupName}.",
@@ -268,7 +264,7 @@
         "subtitle": "По электронной почте",
         "email": "эл. почта",
         "emailPlaceholder": "Введите адрес электронной почты или имя получателя",
-        "send": "Отправить",
+        "send": "Поделиться",
         "singleContactSuccess": "Вы отправили приглашение на %{email}.",
         "contactSuccess": "Вы отправили приглашение %{smart_count} контакту. |||| Вы отправили приглашение %{smart_count} контактам.",
         "singleGroupSuccess": "Вы отправили приглашение участникам группы %{groupName}.",
@@ -332,7 +328,7 @@
         "subtitle": "По электронной почте",
         "email": "Отправить:",
         "emailPlaceholder": "Введите адрес электронной почты или имя получателя",
-        "send": "Отправить",
+        "send": "Поделиться",
         "error": {
           "addingRecipient": "Произошла ошибка при добавлении получателя. Пожалуйста, попробуйте еще раз."
         },

package/locales/vi.json

@@ -15,11 +15,7 @@
     },
     "type": {
       "one-way": "Người xem",
-      "two-way": "Người chỉnh sửa",
-      "desc": {
-        "one-way": "Người liên hệ có thể xem, tải xuống và thêm nội dung vào Twake của họ. Nếu họ thêm nội dung vào Twake, họ sẽ nhận được các bản cập nhật mà bạn thực hiện đối với nội dung, nhưng họ sẽ không thể cập nhật nó.",
-        "two-way": "Người liên hệ có thể cập nhật, xóa và thêm nội dung vào Twake của họ. Các bản cập nhật trên nội dung sẽ được thấy trên các Cozy khác."
-      }
+      "two-way": "Người chỉnh sửa"
     },
     "locked-type-file": "Sắp ra mắt: bạn sẽ có thể thay đổi quyền mà bạn cấp trên tệp.",
     "locked-type-folder": "Sắp ra mắt: bạn sẽ có thể thay đổi quyền mà bạn cấp trên thư mục.",
@@ -131,7 +127,7 @@
       "shareByEmail": {
         "subtitle": "Bằng email",
         "emailPlaceholder": "Thêm liên hệ",
-        "send": "Gửi",
+        "send": "Chia sẻ",
         "singleContactSuccess": "Bạn đã gửi lời mời đến %{email}.",
         "contactSuccess": "Bạn đã gửi lời mời đến %{smart_count} liên hệ. |||| Bạn đã gửi lời mời đến %{smart_count} liên hệ.",
         "singleGroupSuccess": "Bạn đã gửi lời mời đến các thành viên của nhóm %{groupName}.",
@@ -199,7 +195,7 @@
         "subtitle": "Bằng email",
         "email": "Đến:",
         "emailPlaceholder": "Nhập địa chỉ email hoặc tên người nhận",
-        "send": "Gửi",
+        "send": "Chia sẻ",
         "singleContactSuccess": "Bạn đã gửi lời mời đến %{email}.",
         "contactSuccess": "Bạn đã gửi lời mời đến %{smart_count} liên hệ. |||| Bạn đã gửi lời mời đến %{smart_count} liên hệ.",
         "singleGroupSuccess": "Bạn đã gửi lời mời đến các thành viên của nhóm %{groupName}.",
@@ -268,7 +264,7 @@
         "subtitle": "Bằng email",
         "email": "email",
         "emailPlaceholder": "Nhập địa chỉ email hoặc tên người nhận",
-        "send": "Gửi",
+        "send": "Chia sẻ",
         "singleContactSuccess": "Bạn đã gửi lời mời đến %{email}.",
         "contactSuccess": "Bạn đã gửi lời mời đến %{smart_count} liên hệ. |||| Bạn đã gửi lời mời đến %{smart_count} liên hệ.",
         "singleGroupSuccess": "Bạn đã gửi lời mời đến các thành viên của nhóm %{groupName}.",
@@ -332,7 +328,7 @@
         "subtitle": "Bằng email",
         "email": "Gửi đến:",
         "emailPlaceholder": "Nhập địa chỉ email hoặc tên người nhận",
-        "send": "Gửi",
+        "send": "Chia sẻ",
         "error": {
           "addingRecipient": "Đã xảy ra lỗi khi thêm người nhận. Vui lòng thử lại."
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-sharing",
-  "version": "31.1.0",
+  "version": "31.2.0",
   "description": "Provides sharing login for React applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -84,5 +84,5 @@
   "sideEffects": [
     "*.css"
   ],
-  "gitHead": "b8d9431a2e3312ff91f283e0ef0e53a7b466f168"
+  "gitHead": "a014359670929b248620d8bbd95621de7b5aa7bb"
 }

package/src/components/FederatedFolder/DumbFederatedFolderModal.jsx

@@ -10,42 +10,41 @@ export const DumbFederatedFolderModal = withLocales(
   ({
     title,
     document,
-    createContact,
     recipients,
-    readOnlyRecipients,
     currentRecipients,
     onRevoke,
-    onSetType,
     onSend,
     onClose,
-    onShare,
     sharingLink,
     showShareByEmail,
     autoOpenShareRestriction,
-    showGenerateLinkButton
+    showGenerateLinkButton,
+    pendingRecipients,
+    onPendingRecipientsChange,
+    selectedOption,
+    onSelectedOptionChange
   }) => {
     const { t } = useI18n()
     return (
       <DumbBatchSharedFolderModal
         title={title}
         document={document}
-        createContact={createContact}
         recipients={recipients}
-        readOnlyRecipients={readOnlyRecipients}
         currentRecipients={currentRecipients}
         onRevoke={onRevoke}
-        onSetType={onSetType}
         onSend={onSend}
         onClose={onClose}
-        onShare={onShare}
         sharingLink={sharingLink}
         showNameField={false}
         addPeopleLabel={t('FederatedFolder.addPeople')}
-        addButtonLabel={t('FederatedFolder.add')}
         shareLabel={t('FederatedFolder.share')}
         showShareByEmail={showShareByEmail}
         autoOpenShareRestriction={autoOpenShareRestriction}
         showGenerateLinkButton={showGenerateLinkButton}
+        pendingRecipients={pendingRecipients}
+        onPendingRecipientsChange={onPendingRecipientsChange}
+        selectedOption={selectedOption}
+        onSelectedOptionChange={onSelectedOptionChange}
       />
     )
   }
@@ -54,19 +53,19 @@ export const DumbFederatedFolderModal = withLocales(
 DumbFederatedFolderModal.propTypes = {
   title: PropTypes.string,
   document: PropTypes.object,
-  createContact: PropTypes.func.isRequired,
   recipients: PropTypes.array,
-  readOnlyRecipients: PropTypes.array,
   currentRecipients: PropTypes.array,
   onRevoke: PropTypes.func.isRequired,
-  onSetType: PropTypes.func.isRequired,
   onSend: PropTypes.func.isRequired,
   onClose: PropTypes.func.isRequired,
-  onShare: PropTypes.func.isRequired,
   sharingLink: PropTypes.string,
   showShareByEmail: PropTypes.bool,
   autoOpenShareRestriction: PropTypes.bool,
-  showGenerateLinkButton: PropTypes.bool
+  showGenerateLinkButton: PropTypes.bool,
+  pendingRecipients: PropTypes.array.isRequired,
+  onPendingRecipientsChange: PropTypes.func.isRequired,
+  selectedOption: PropTypes.oneOf(['readWrite', 'readOnly']).isRequired,
+  onSelectedOptionChange: PropTypes.func.isRequired
 }
 
 export default DumbFederatedFolderModal

package/src/components/FederatedFolder/FederatedFolderModal.jsx

@@ -1,20 +1,15 @@
 import PropTypes from 'prop-types'
-import React, { useState, useEffect } from 'react'
+import React, { useEffect, useState } from 'react'
 
 import { useClient } from 'cozy-client'
 import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert'
 import { useI18n } from 'twake-i18n'
 
 import { DumbFederatedFolderModal } from './DumbFederatedFolderModal'
+import { getOrCreateFromArray } from '../../helpers/contacts'
 import withLocales from '../../hoc/withLocales'
+import { usePendingRecipients } from '../../hooks/usePendingRecipients'
 import { useSharingContext } from '../../hooks/useSharingContext'
-import {
-  formatRecipients,
-  mergeAndDeduplicateRecipients,
-  moveRecipientToReadWrite,
-  moveRecipientToReadOnly,
-  RECIPIENT_INDEX_PREFIX
-} from '../SharedDrive/helpers'
 
 export const FederatedFolderModal = withLocales(
   ({
@@ -38,6 +33,22 @@ export const FederatedFolderModal = withLocales(
     const { showAlert } = useAlert()
 
     const [sharingLink, setSharingLink] = useState(null)
+    const {
+      pendingRecipients,
+      setPendingRecipients,
+      selectedOption,
+      setSelectedOption
+    } = usePendingRecipients()
+
+    // share from CozyProvider is wired to callbacks and realtime that
+    // makes existingDocument and existingRecipients reactive to changes.
+    // But we want it to be reactive only when we revoke a member. When we add member
+    // 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 [isSending, setIsSending] = useState(false)
+    const [frozenDoc, setFrozenDoc] = useState(null)
+    const [frozenRecipients, setFrozenRecipients] = useState(null)
 
     const documentPermissions = existingDocument
       ? getDocumentPermissions(existingDocument._id)
@@ -65,32 +76,33 @@ export const FederatedFolderModal = withLocales(
       getSharingById
     ])
 
-    const [federatedRecipients, setFederatedRecipients] = useState({
-      recipients: [],
-      readOnlyRecipients: []
-    })
-    const [folderName] = useState(existingDocument?.name || '')
-
-    const onShare = params => {
-      setFederatedRecipients(prev => ({
-        recipients: mergeAndDeduplicateRecipients([
-          prev.recipients,
-          params.recipients || []
-        ]),
-        readOnlyRecipients: mergeAndDeduplicateRecipients([
-          prev.readOnlyRecipients,
-          params.readOnlyRecipients || []
-        ])
-      }))
-    }
+    const folderName = existingDocument?.name || ''
 
     const onSend = async () => {
+      if (pendingRecipients.length === 0) {
+        onClose()
+        return
+      }
+
+      setIsSending(true)
+      setFrozenDoc(existingDocument)
+      setFrozenRecipients(existingRecipients)
+
       try {
+        const contacts = await getOrCreateFromArray(
+          client,
+          pendingRecipients,
+          contact => client.create('io.cozy.contacts', contact)
+        )
+        const readWriteRecipients =
+          selectedOption === 'readOnly' ? [] : contacts
+        const readOnlyRecipients = selectedOption === 'readOnly' ? contacts : []
+
         await share({
           description: folderName,
           document: existingDocument,
-          recipients: federatedRecipients.recipients,
-          readOnlyRecipients: federatedRecipients.readOnlyRecipients,
+          recipients: readWriteRecipients,
+          readOnlyRecipients,
           sharedDrive: true,
           openSharing: false
         })
@@ -108,31 +120,8 @@ export const FederatedFolderModal = withLocales(
           severity: 'error',
           variant: 'filled'
         })
-      }
-    }
-
-    const onSetType = (index, newType) => {
-      const _id = index.split(RECIPIENT_INDEX_PREFIX)[1]
-
-      if (newType === 'two-way') {
-        setFederatedRecipients(prev => moveRecipientToReadWrite(prev, _id))
-      } else {
-        setFederatedRecipients(prev => moveRecipientToReadOnly(prev, _id))
-      }
-    }
-
-    const onRevoke = async (documentOrIndex, sharingId, memberIndex) => {
-      if (
-        typeof documentOrIndex === 'string' &&
-        documentOrIndex.startsWith(RECIPIENT_INDEX_PREFIX)
-      ) {
-        const _id = documentOrIndex.split(RECIPIENT_INDEX_PREFIX)[1]
-        setFederatedRecipients(prev => ({
-          recipients: prev.recipients.filter(r => r._id !== _id),
-          readOnlyRecipients: prev.readOnlyRecipients.filter(r => r._id !== _id)
-        }))
-      } else {
-        await revoke(documentOrIndex, sharingId, memberIndex)
+      } finally {
+        setIsSending(false)
       }
     }
 
@@ -140,32 +129,26 @@ export const FederatedFolderModal = withLocales(
       ? getRecipients(existingDocument._id)
       : []
 
-    const recipients = [
-      ...existingRecipients,
-      ...formatRecipients(federatedRecipients)
-    ]
-
     const modalTitle = t('FederatedFolder.shareTitle', { name: folderName })
-
     const isSharedDrive = Boolean(existingDocument?.driveId)
 
     return (
       <DumbFederatedFolderModal
         title={modalTitle}
-        document={existingDocument}
-        createContact={contact => client.create('io.cozy.contacts', contact)}
-        recipients={recipients}
-        readOnlyRecipients={federatedRecipients.readOnlyRecipients}
-        currentRecipients={existingRecipients}
-        onRevoke={onRevoke}
-        onSetType={onSetType}
+        document={isSending ? frozenDoc : existingDocument}
+        recipients={isSending ? frozenRecipients : existingRecipients}
+        currentRecipients={isSending ? frozenRecipients : existingRecipients}
+        onRevoke={revoke}
         onSend={onSend}
         onClose={onClose}
-        onShare={onShare}
         sharingLink={sharingLink}
         showShareByEmail={!isSharedDrive}
         autoOpenShareRestriction={autoOpenShareRestriction}
         showGenerateLinkButton={showGenerateLinkButton}
+        pendingRecipients={pendingRecipients}
+        onPendingRecipientsChange={setPendingRecipients}
+        selectedOption={selectedOption}
+        onSelectedOptionChange={setSelectedOption}
       />
     )
   }