diff --git a/package.json b/package.json index dfe6b12f5f..385f9477d9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "givethdapp", - "version": "2.17.1", + "version": "2.17.2", "private": true, "scripts": { "build": "next build", diff --git a/pages/index.tsx b/pages/index.tsx index 6812bb7ccb..14ffe29d84 100644 --- a/pages/index.tsx +++ b/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) => { diff --git a/pages/qf/index.tsx b/pages/qf/index.tsx index 2001cbe07f..73da283ecd 100644 --- a/pages/qf/index.tsx +++ b/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, diff --git a/src/apollo/gql/gqlOptions.ts b/src/apollo/gql/gqlOptions.ts index f15a616fbe..c52f92e494 100644 --- a/src/apollo/gql/gqlOptions.ts +++ b/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, }; diff --git a/src/components/views/donate/QFToast.tsx b/src/components/views/donate/QFToast.tsx index b4f8a72382..bbfe90861c 100644 --- a/src/components/views/donate/QFToast.tsx +++ b/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']; diff --git a/src/components/views/donate/SuccessView.tsx b/src/components/views/donate/SuccessView.tsx index e9312f19c6..b452a22766 100644 --- a/src/components/views/donate/SuccessView.tsx +++ b/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(''); const { project } = useDonateData(); + const { + info: { passportState }, + } = usePassport(); const message = hasMultipleTxs ? ( <> @@ -95,7 +99,9 @@ const SuccessView: FC = () => { )} - {hasActiveQFRound && } + {hasActiveQFRound && passportState !== EPassportState.LOADING && ( + + )} { const { formatMessage } = useIntl(); const sortByOptions = [ - // { - // label: formatMessage({ id: 'label.givpower' }), - // value: EProjectsSortBy.INSTANT_BOOSTING, - // icon: , - // }, + { + label: formatMessage({ id: 'label.givpower' }), + value: EProjectsSortBy.INSTANT_BOOSTING, + icon: , + }, { label: formatMessage({ id: 'label.rank' }), value: EProjectsSortBy.GIVPOWER, diff --git a/src/context/projects.context.tsx b/src/context/projects.context.tsx index 2231daf4cc..b032c07126 100644 --- a/src/context/projects.context.tsx +++ b/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():