diff --git a/packages/component-manuscript/src/components/ManuscriptLayout.js b/packages/component-manuscript/src/components/ManuscriptLayout.js
index e9d46aa19c314190e49577a80db5d482fb8c8ac8..619331cf13e8d0e144524be8dbcc934adc5bd84a 100644
--- a/packages/component-manuscript/src/components/ManuscriptLayout.js
+++ b/packages/component-manuscript/src/components/ManuscriptLayout.js
@@ -47,12 +47,8 @@ const ManuscriptLayout = ({
   heExpanded,
   onHEResponse,
   toggleAssignHE,
-  onInviteReviewer,
   toggleHEResponse,
   heResponseExpanded,
-  onReviewerResponse,
-  onResendReviewerInvite,
-  onRevokeReviewerInvite,
   toggleReviewerResponse,
   invitationsWithReviewers,
   publonReviewers,
@@ -69,8 +65,8 @@ const ManuscriptLayout = ({
   reviewerDetailsExpanded,
   editorialCommentsExpanded,
   toggleEditorialComments,
-  onInvitePublonReviewer,
   submitRevision,
+  inviteReviewer,
 }) => (
   <Root pb={30}>
     {!isEmpty(collection) && !isEmpty(fragment) ? (
@@ -154,7 +150,7 @@ const ManuscriptLayout = ({
           <ResponseToInvitation
             expanded={reviewerResponseExpanded}
             label="Do you agree to review this manuscript?"
-            onResponse={onReviewerResponse}
+            onResponse={inviteReviewer.onReviewerResponse}
             title="Respond to Invitation to Review"
             toggle={toggleReviewerResponse}
           />
@@ -186,14 +182,11 @@ const ManuscriptLayout = ({
             isFetching={isFetching.publonsFetching}
             journal={journal}
             mb={2}
-            onInvitePublonReviewer={onInvitePublonReviewer}
-            onInviteReviewer={onInviteReviewer}
-            onResendReviewerInvite={onResendReviewerInvite}
-            onRevokeReviewerInvite={onRevokeReviewerInvite}
             publonReviewers={publonReviewers}
             reviewerReports={reviewerReports}
             scrollIntoView
             toggle={toggleReviewerDetails}
+            {...inviteReviewer}
           />
         )}
         {get(currentUser, 'permissions.authorCanViewReportsDetails', false) && (