Merge pull request #2043 from daostack/bugfix/CW-2016-hide-membership…

…-request-step when join a 0 contribute common/space- payment details page opens #2016
daostack · Sep 7, 2023 · 3f74a4e · 3f74a4e
2 parents ac0d7b2 + 4550c26
commit 3f74a4e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/...Common/components/CommonDetailContainer/MembershipRequestModal/MembershipRequestModal.tsx b/...Common/components/CommonDetailContainer/MembershipRequestModal/MembershipRequestModal.tsx
@@ -51,7 +51,7 @@ const INIT_DATA: IMembershipRequestData = {
 interface IProps extends Pick<ModalProps, "isShowing" | "onClose"> {
   common: Common;
   governance: Governance;
-  shouldShowLoadingAfterSuccessfulCreation?: boolean;
+  showLoadingAfterSuccessfulCreation?: boolean;
   onCreationStageReach?: (reached: boolean) => void;
   onRequestCreated?: () => void;
 }
@@ -69,7 +69,7 @@ export function MembershipRequestModal(props: IProps) {
     onClose,
     common,
     governance,
-    shouldShowLoadingAfterSuccessfulCreation = false,
+    showLoadingAfterSuccessfulCreation = false,
     onCreationStageReach,
     onRequestCreated,
   } = props;
@@ -189,7 +189,7 @@ export function MembershipRequestModal(props: IProps) {
           />
         );
       case MembershipRequestStage.Created:
-        return shouldShowLoadingAfterSuccessfulCreation ? (
+        return showLoadingAfterSuccessfulCreation && isAutomaticAcceptance ? (
           <MembershipRequestCreating
             userData={userData}
             setUserData={setUserData}

diff --git a/src/pages/common/providers/CommonData/CommonData.tsx b/src/pages/common/providers/CommonData/CommonData.tsx
@@ -318,11 +318,8 @@ const CommonData: FC<CommonDataProps> = (props) => {
         onClose={handleCommonJoinModalClose}
         common={common}
         governance={governance}
-        shouldShowLoadingAfterSuccessfulCreation={
-          governance.proposals[ProposalsTypes.MEMBER_ADMITTANCE]?.global
-            .votingDuration === 0
-        }
         onRequestCreated={handleCommonJoinRequestCreated}
+        showLoadingAfterSuccessfulCreation
       />
       <JoinProjectModal
         isShowing={

diff --git a/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx b/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx
@@ -566,6 +566,12 @@ const FeedLayout: ForwardRefRenderFunction<FeedLayoutRef, FeedLayoutProps> = (
     [getCommonPagePath, handleFeedItemClick],
   );
 
+  useEffect(() => {
+    if (commonMember && isCommonJoinModalOpen) {
+      onCommonJoinModalClose();
+    }
+  }, [commonMember?.id]);
+
   useEffect(() => {
     if (!outerGovernance && selectedItemCommonData?.id) {
       fetchGovernance(selectedItemCommonData.id);
@@ -805,6 +811,7 @@ const FeedLayout: ForwardRefRenderFunction<FeedLayoutRef, FeedLayoutProps> = (
                   onClose={onCommonJoinModalClose}
                   common={outerCommon}
                   governance={governance}
+                  showLoadingAfterSuccessfulCreation
                 />
                 <JoinProjectModal
                   isShowing={isProjectJoinModalOpen}