Merge branch 'develop' into release-2.23.0

Giveth · Feb 25, 2024 · ef8d160 · ef8d160
2 parents 7cb5f81 + f3e567c
commit ef8d160
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 87 deletions.
diff --git a/pages/referral.tsx b/pages/referral.tsx
@@ -1,5 +1,5 @@
-import GIVferralView from '@/components/views/GIVferral.view';
+import ErrorsIndex from '@/components/views/Errors/ErrorsIndex';
 
 export default function GIVferralRoute() {
-	return <GIVferralView />;
+	return <ErrorsIndex statusCode='404' />;
 }
diff --git a/src/components/DonateSocialBox.tsx b/src/components/DonateSocialBox.tsx
@@ -8,7 +8,6 @@ import { IProject } from '@/apollo/types/types';
 import { EContentType } from '@/lib/constants/shareContent';
 import { Flex } from '@/components/styled-components/Flex';
 import ShareLikeBadge from '@/components/badges/ShareLikeBadge';
-import ShareRewardModal from '@/components/modals/ShareRewardedModal';
 import ShareModal from '@/components/modals/ShareModal';
 
 interface ISocialBox {
@@ -27,21 +26,13 @@ const DonateSocialBox: FC<ISocialBox> = props => {
 
 	return (
 		<Social isDonateFooter={isDonateFooter}>
-			{showModal &&
-				slug &&
-				(verified ? (
-					<ShareRewardModal
-						contentType={EContentType.thisProject}
-						setShowModal={setShowModal}
-						projectHref={slug}
-					/>
-				) : (
-					<ShareModal
-						contentType={EContentType.thisProject}
-						setShowModal={setShowModal}
-						projectHref={slug}
-					/>
-				))}
+			{showModal && slug && (
+				<ShareModal
+					contentType={EContentType.thisProject}
+					setShowModal={setShowModal}
+					projectHref={slug}
+				/>
+			)}
 			<BLead>
 				{isDonateFooter
 					? formatMessage({ id: 'label.cant_donate' })

diff --git a/src/components/badges/ShareLikeBadge.tsx b/src/components/badges/ShareLikeBadge.tsx
@@ -25,7 +25,7 @@ const ShareLikeBadge = (props: {
 		type === 'share'
 			? formatMessage({ id: 'label.share' })
 			: type === 'reward'
-				? formatMessage({ id: 'label.share_and_get_rewarded' })
+				? formatMessage({ id: 'label.share' })
 				: formatMessage({ id: 'label.like' });
 	const icon = isShare ? (
 		<IconShare

diff --git a/src/components/project-card/ProjectCardLikeAndShareButtons.tsx b/src/components/project-card/ProjectCardLikeAndShareButtons.tsx
@@ -11,7 +11,6 @@ import {
 import styled, { css } from 'styled-components';
 import { captureException } from '@sentry/nextjs';
 import { useWeb3Modal } from '@web3modal/wagmi/react';
-import ShareModalAndGetReward from '../modals/ShareRewardedModal';
 import { likeProject, unlikeProject } from '@/lib/reaction';
 import { isSSRMode, showToastError } from '@/lib/helpers';
 import { Flex } from '../styled-components/Flex';
@@ -126,20 +125,14 @@ const ProjectCardLikeAndShareButtons: FC<IProjectCardLikeAndShareButtons> = ({
 
 	return (
 		<>
-			{showShare &&
-				(verified ? (
-					<ShareModalAndGetReward
-						contentType={EContentType.thisProject}
-						setShowModal={setShowShare}
-						projectHref={slug}
-					/>
-				) : (
-					<ShareModal
-						setShowModal={setShowShare}
-						projectHref={slug}
-						contentType={EContentType.thisProject}
-					/>
-				))}
+			{showShare && (
+				<ShareModal
+					setShowModal={setShowShare}
+					projectHref={slug}
+					contentType={EContentType.thisProject}
+				/>
+			)}
+
 			<BadgeWrapper>
 				<Flex gap='6px'>
 					{verified && (

diff --git a/src/components/views/project/projectActionCard/AdminActions.tsx b/src/components/views/project/projectActionCard/AdminActions.tsx
@@ -18,7 +18,6 @@ import { capitalizeAllWords } from '@/lib/helpers';
 import { Dropdown, IOption, OptionType } from '@/components/Dropdown';
 import { idToProjectEdit } from '@/lib/routeCreators';
 import ShareModal from '@/components/modals/ShareModal';
-import ShareRewardedModal from '@/components/modals/ShareRewardedModal';
 import { EContentType } from '@/lib/constants/shareContent';
 import useMediaQuery from '@/hooks/useMediaQuery';
 import { device } from '@/lib/constants/constants';
@@ -83,7 +82,7 @@ export const AdminActions = () => {
 		},
 		{
 			label: formatMessage({
-				id: verified ? 'label.share_and_get_rewarded' : 'label.share',
+				id: 'label.share',
 			}),
 			type: OptionType.ITEM,
 			icon: <IconShare16 />,
@@ -116,21 +115,13 @@ export const AdminActions = () => {
 					projectId={projectData?.id}
 				/>
 			)}
-			{showShareModal &&
-				(verified ? (
-					<ShareRewardedModal
-						contentType={EContentType.thisProject}
-						setShowModal={setShowShareModal}
-						projectHref={slug}
-						projectTitle={project.title}
-					/>
-				) : (
-					<ShareModal
-						contentType={EContentType.thisProject}
-						setShowModal={setShowShareModal}
-						projectHref={slug}
-					/>
-				))}
+			{showShareModal && (
+				<ShareModal
+					contentType={EContentType.thisProject}
+					setShowModal={setShowShareModal}
+					projectHref={slug}
+				/>
+			)}
 		</Wrapper>
 	) : (
 		<MobileWrapper
@@ -163,21 +154,13 @@ export const AdminActions = () => {
 							projectId={projectData?.id}
 						/>
 					)}
-					{showShareModal &&
-						(verified ? (
-							<ShareRewardedModal
-								contentType={EContentType.thisProject}
-								setShowModal={setShowShareModal}
-								projectHref={slug}
-								projectTitle={project.title}
-							/>
-						) : (
-							<ShareModal
-								contentType={EContentType.thisProject}
-								setShowModal={setShowShareModal}
-								projectHref={slug}
-							/>
-						))}
+					{showShareModal && (
+						<ShareModal
+							contentType={EContentType.thisProject}
+							setShowModal={setShowShareModal}
+							projectHref={slug}
+						/>
+					)}
 				</MobileActionsModal>
 			)}
 		</MobileWrapper>

diff --git a/src/components/views/project/projectActionCard/ProjectPublicActions.tsx b/src/components/views/project/projectActionCard/ProjectPublicActions.tsx
@@ -18,7 +18,6 @@ import { useWeb3Modal } from '@web3modal/wagmi/react';
 import useDetectDevice from '@/hooks/useDetectDevice';
 import ShareModal from '@/components/modals/ShareModal';
 import ShareLikeBadge from '@/components/badges/ShareLikeBadge';
-import ShareRewardedModal from '@/components/modals/ShareRewardedModal';
 import { EContentType } from '@/lib/constants/shareContent';
 import { useProjectContext } from '@/context/project.context';
 import { Flex } from '@/components/styled-components/Flex';
@@ -179,22 +178,13 @@ export const ProjectPublicActions = () => {
 					size='small'
 				/>
 			</BadgeWrapper>
-			{showModal &&
-				slug &&
-				(verified ? (
-					<ShareRewardedModal
-						contentType={EContentType.thisProject}
-						setShowModal={setShowShareModal}
-						projectHref={slug}
-						projectTitle={project.title}
-					/>
-				) : (
-					<ShareModal
-						contentType={EContentType.thisProject}
-						setShowModal={setShowShareModal}
-						projectHref={slug}
-					/>
-				))}
+			{showModal && slug && (
+				<ShareModal
+					contentType={EContentType.thisProject}
+					setShowModal={setShowShareModal}
+					projectHref={slug}
+				/>
+			)}
 		</ProjectPublicActionsWrapper>
 	);
 };

diff --git a/src/components/views/projects/ProjectsIndex.tsx b/src/components/views/projects/ProjectsIndex.tsx
@@ -25,7 +25,6 @@ import { useProjectsContext } from '@/context/projects.context';
 
 import { FlexCenter } from '@/components/styled-components/Flex';
 import { ProjectsMiddleBanner } from './MiddleBanners/ProjectsMiddleBanner';
-import FloatingButtonReferral from '@/components/FloatingReferral';
 import { ActiveQFProjectsBanner } from './qfBanner/ActiveQFProjectsBanner';
 import { PassportBanner } from '@/components/PassportBanner';
 import { QFProjectsMiddleBanner } from './MiddleBanners/QFMiddleBanner';
@@ -234,7 +233,7 @@ const ProjectsIndex = (props: IProjectsView) => {
 								/>
 							))}
 						</ProjectsContainer>
-						<FloatingButtonReferral />
+						{/* <FloatingButtonReferral /> */}
 					</ProjectsWrapper>
 				) : isQF && !activeRound ? (
 					<QFNoResultBanner />

diff --git a/src/components/views/userProfile/projectsTab/ProjectItem.tsx b/src/components/views/userProfile/projectsTab/ProjectItem.tsx
@@ -49,7 +49,7 @@ const ProjectItem = ({ project, setProjects }: IProjectItem) => {
 							)}
 						</Flex>
 					</Subline>
-					<Link href={`project/${project.slug}`}>
+					<Link href={`/project/${project.slug}`}>
 						<H2>{project.title}</H2>
 					</Link>
 				</div>
@@ -85,7 +85,7 @@ const ProjectItem = ({ project, setProjects }: IProjectItem) => {
 							<VerificationBadge
 								isVerified={project?.verified}
 								verificationStatus={
-									project?.verificationFormStatus
+									project.projectVerificationForm?.status
 								}
 							/>
 						</div>