Merge pull request #2964 from Giveth/develop

Hotifx on sorting for QF

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "givethdapp",
-	"version": "2.17.1",
+	"version": "2.17.2",
 	"private": true,
 	"scripts": {
 		"build": "next build",

pages/index.tsx

@@ -29,7 +29,7 @@ export const HOME_QUERY_VARIABLES = {
 	skipLatestUpdates: 0,
 	fromDate: '2021-01-01',
 	limit: 12,
-	sortingBy: EProjectsSortBy.GIVPOWER,
+	sortingBy: EProjectsSortBy.INSTANT_BOOSTING,
 };
 
 const HomeRoute = (props: IHomeRoute) => {

pages/qf/index.tsx

@@ -34,7 +34,7 @@ export const QF_PROJECTS = {
 	variables: {
 		limit: 15,
 		skip: 0,
-		sortingBy: EProjectsSortBy.GIVPOWER,
+		sortingBy: EProjectsSortBy.INSTANT_BOOSTING,
 		filters: [EProjectsFilter.ACTIVE_QF_ROUND],
 	},
 	notifyOnNetworkStatusChange: true,

src/apollo/gql/gqlOptions.ts

@@ -4,7 +4,7 @@ export const OPTIONS_HOME_PROJECTS = {
 	variables: {
 		limit: 15,
 		skip: 0,
-		sortingBy: EProjectsSortBy.GIVPOWER,
+		sortingBy: EProjectsSortBy.INSTANT_BOOSTING,
 	},
 	notifyOnNetworkStatusChange: true,
 };

src/components/views/donate/QFToast.tsx

@@ -17,10 +17,13 @@ import InternalLink from '@/components/InternalLink';
 const QFToast = () => {
 	const { info } = usePassport();
 	const { passportState, currentRound } = info;
+
 	const isEligible = passportState === EPassportState.ELIGIBLE;
 	const isNotEligible = passportState === EPassportState.NOT_ELIGIBLE;
 	const { formatMessage, locale } = useIntl();
 
+	if (passportState === EPassportState.LOADING) return null;
+
 	const color = isEligible
 		? semanticColors.jade['500']
 		: semanticColors.golden['700'];

src/components/views/donate/SuccessView.tsx

@@ -23,6 +23,7 @@ import LottieControl from '@/components/LottieControl';
 import { EContentType } from '@/lib/constants/shareContent';
 import QFToast from '@/components/views/donate/QFToast';
 import { useAppSelector } from '@/features/hooks';
+import { EPassportState, usePassport } from '@/hooks/usePassport';
 
 const SuccessView: FC = () => {
 	const { formatMessage } = useIntl();
@@ -34,6 +35,9 @@ const SuccessView: FC = () => {
 
 	const [givethSlug, setGivethSlug] = useState<string>('');
 	const { project } = useDonateData();
+	const {
+		info: { passportState },
+	} = usePassport();
 
 	const message = hasMultipleTxs ? (
 		<>
@@ -95,7 +99,9 @@ const SuccessView: FC = () => {
 					</ExternalLink>
 				</GivBackContainer>
 			)}
-			{hasActiveQFRound && <QFToast />}
+			{hasActiveQFRound && passportState !== EPassportState.LOADING && (
+				<QFToast />
+			)}
 			<SocialBoxWrapper>
 				<SocialBox
 					project={project}

src/components/views/projects/ProjectsSortSelect.tsx

@@ -11,6 +11,7 @@ import {
 	P,
 	IconFast16,
 	IconFlash16,
+	IconRocketInSpace16,
 } from '@giveth/ui-design-system';
 import Select, {
 	components,
@@ -43,11 +44,11 @@ const ProjectsSortSelect = () => {
 	const { formatMessage } = useIntl();
 
 	const sortByOptions = [
-		// {
-		// 	label: formatMessage({ id: 'label.givpower' }),
-		// 	value: EProjectsSortBy.INSTANT_BOOSTING,
-		// 	icon: <IconRocketInSpace16 color={brandColors.deep[900]} />,
-		// },
+		{
+			label: formatMessage({ id: 'label.givpower' }),
+			value: EProjectsSortBy.INSTANT_BOOSTING,
+			icon: <IconRocketInSpace16 color={brandColors.deep[900]} />,
+		},
 		{
 			label: formatMessage({ id: 'label.rank' }),
 			value: EProjectsSortBy.GIVPOWER,

src/context/projects.context.tsx

@@ -30,12 +30,12 @@ interface IProjectsContext {
 }
 
 const variablesDefaultValue = {
-	sortingBy: EProjectsSortBy.GIVPOWER,
+	sortingBy: EProjectsSortBy.INSTANT_BOOSTING,
 	filters: undefined,
 };
 
 const variablesDefaultValueWithQF = {
-	sortingBy: EProjectsSortBy.GIVPOWER,
+	sortingBy: EProjectsSortBy.INSTANT_BOOSTING,
 	filters: [EProjectsFilter.ACTIVE_QF_ROUND],
 };
 
@@ -65,7 +65,7 @@ export const ProjectsProvider = (props: {
 	const router = useRouter();
 
 	useEffect(() => {
-		let sort = EProjectsSortBy.GIVPOWER;
+		let sort = EProjectsSortBy.INSTANT_BOOSTING;
 		if (router.query.sort) {
 			switch ((router.query.sort as string).toLowerCase()) {
 				case EProjectsSortBy.MOST_FUNDED.toLowerCase():