fix modal showModal

packages/component-modal/src/components/withModal.js

@@ -20,8 +20,10 @@ const mapDispatch = modalKey => (dispatch, propss) => ({
 
 const mapDispatch2 = (dispatch, props) => ({
   hideModal: () => dispatch(hideModal()),
-  showModal: (modalProps = {}) =>
-    dispatch(showModal(props.modalKey, modalProps)),
+  showModal: (modalProps = {}) => {
+    console.log('showing modal dispatch', modalProps, props)
+    dispatch(showModal(props.modalKey, modalProps))
+  },
   setModalError: errorMessage => dispatch(setModalError(errorMessage)),
 })
 
@@ -34,6 +36,7 @@ export const withModal2 = mapperFn => BaseComponent =>
       modalError,
       modalsVisibility,
       modalKey,
+      showModal,
       ...rest
     } = baseProps
     return (

packages/components-faraday/src/components/Reviewers/InviteReviewers.js

@@ -38,28 +38,32 @@ const InviteReviewersModal = compose(
     collectionId,
     reviewers,
     getReviewers,
-  }) => (
-    <Root>
-      <CloseIcon data-test="icon-modal-hide" onClick={hideModal}>
-        <Icon color={theme.colorPrimary}>x</Icon>
-      </CloseIcon>
+  }) => {
+    console.log('InviteReviewersModal ->', showModal)
+    return (
+      <Root>
+        <CloseIcon data-test="icon-modal-hide" onClick={hideModal}>
+          <Icon color={theme.colorPrimary}>x</Icon>
+        </CloseIcon>
 
-      <Title>Invite Reviewers</Title>
+        <Title>Invite Reviewers</Title>
 
-      <Subtitle>Invite reviewer</Subtitle>
-      <ReviewerForm collectionId={collectionId} getReviewers={getReviewers} />
+        <Subtitle>Invite reviewer</Subtitle>
+        <ReviewerForm collectionId={collectionId} getReviewers={getReviewers} />
 
-      <Subtitle>Reviewers Info</Subtitle>
-      <ReviewersList
-        collectionId={collectionId}
-        reviewers={reviewers}
-        showModal={showModal}
-      />
-    </Root>
-  ),
+        <Subtitle>Reviewers Info</Subtitle>
+        <ReviewersList
+          collectionId={collectionId}
+          reviewers={reviewers}
+          showModal={showModal}
+        />
+      </Root>
+    )
+  },
 )
 
 const ModalSwitcher = ({ type, ...rest }) => {
+  console.log('modal switcher', type, rest)
   switch (type) {
     case 'invite-reviewers':
       return <InviteReviewersModal {...rest} />
@@ -73,11 +77,10 @@ export default compose(
     modalComponent: ModalSwitcher,
   })),
   withHandlers({
-    showInviteModal: ({ showModal, hideModal, project, reviewers }) => () => {
+    showInviteModal: ({ showModal, hideModal, project }) => () => {
       showModal({
         type: 'invite-reviewers',
         collectionId: project.id,
-        reviewers,
         onConfirm: () => {
           hideModal()
         },

packages/components-faraday/src/components/Reviewers/ReviewerList.js

@@ -111,6 +111,7 @@ export default compose(
       inviteReviewer,
       collectionId,
     }) => reviewer => () => {
+      console.log('show confirm resend', showModal)
       showModal({
         title: 'Resend confirmation',
         onConfirm: () => {