From c90f97f4ecfaa6b274e472faaa4aba49530a5c23 Mon Sep 17 00:00:00 2001
From: Roie Natan
Date: Thu, 19 Oct 2023 13:44:28 +0100
Subject: [PATCH 01/37] about page root common: show join common button
---
.../MembershipRequestModal/MembershipRequestIntroduce.tsx | 4 ++--
.../CommonEntranceJoin/CommonEntranceJoin.module.scss | 2 +-
.../components/CommonEntranceJoin/CommonEntranceJoin.tsx | 2 +-
.../components/CommonTopNavigation/CommonTopNavigation.tsx | 2 +-
src/pages/common/providers/CommonData/CommonData.tsx | 3 ---
5 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/pages/OldCommon/components/CommonDetailContainer/MembershipRequestModal/MembershipRequestIntroduce.tsx b/src/pages/OldCommon/components/CommonDetailContainer/MembershipRequestModal/MembershipRequestIntroduce.tsx
index 56e4cc4274..8d36895b95 100644
--- a/src/pages/OldCommon/components/CommonDetailContainer/MembershipRequestModal/MembershipRequestIntroduce.tsx
+++ b/src/pages/OldCommon/components/CommonDetailContainer/MembershipRequestModal/MembershipRequestIntroduce.tsx
@@ -1,11 +1,11 @@
import React, { useCallback } from "react";
import { useSelector } from "react-redux";
import { Formik, FormikConfig } from "formik";
-import { Button } from "@/shared/components";
import { Form, TextField, LinksArray } from "@/shared/components/Form/Formik";
import { ScreenSize, MAX_LINK_TITLE_LENGTH } from "@/shared/constants";
import { CommonLink } from "@/shared/models";
import { getScreenSize } from "@/shared/store/selectors";
+import { Button, ButtonVariant } from "@/shared/ui-kit";
import { parseLinksForSubmission } from "@/shared/utils";
import { IStageProps } from "./MembershipRequestModal";
import { MembershipRequestStage } from "./constants";
@@ -95,7 +95,7 @@ export default function MembershipRequestIntroduce(props: IStageProps) {
className="membership-request-introduce__submit-button"
type="submit"
disabled={!isValid}
- shouldUseFullWidth={isMobileView}
+ variant={ButtonVariant.PrimaryPink}
>
Continue
diff --git a/src/pages/common/components/CommonTabPanels/components/AboutTab/components/CommonEntranceInfo/components/CommonEntranceJoin/CommonEntranceJoin.module.scss b/src/pages/common/components/CommonTabPanels/components/AboutTab/components/CommonEntranceInfo/components/CommonEntranceJoin/CommonEntranceJoin.module.scss
index a7bc347d2c..4ce189cea1 100644
--- a/src/pages/common/components/CommonTabPanels/components/AboutTab/components/CommonEntranceInfo/components/CommonEntranceJoin/CommonEntranceJoin.module.scss
+++ b/src/pages/common/components/CommonTabPanels/components/AboutTab/components/CommonEntranceInfo/components/CommonEntranceJoin/CommonEntranceJoin.module.scss
@@ -2,9 +2,9 @@
@import "../../../../../../../../../../styles/sizes";
.joinButton {
- max-width: 8.5rem;
margin-top: 1.75rem;
padding: 0 0.875rem;
+ width: 100%;
@include tablet {
margin-top: 1.625rem;
diff --git a/src/pages/common/components/CommonTabPanels/components/AboutTab/components/CommonEntranceInfo/components/CommonEntranceJoin/CommonEntranceJoin.tsx b/src/pages/common/components/CommonTabPanels/components/AboutTab/components/CommonEntranceInfo/components/CommonEntranceJoin/CommonEntranceJoin.tsx
index db5c6179d9..e1136a86d1 100644
--- a/src/pages/common/components/CommonTabPanels/components/AboutTab/components/CommonEntranceInfo/components/CommonEntranceJoin/CommonEntranceJoin.tsx
+++ b/src/pages/common/components/CommonTabPanels/components/AboutTab/components/CommonEntranceInfo/components/CommonEntranceJoin/CommonEntranceJoin.tsx
@@ -67,7 +67,7 @@ const CommonEntranceJoin: FC = (props) => {
page
)}
- {withJoinRequest && (isJoinAllowed || isJoinPending) && (
+ {!isProject && (isJoinAllowed || isJoinPending) && (