Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/components/Rewards/AppQuests/AppQuestCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { useVerifyRewards } from '../hooks/useVerifyRewards';
import { LinkTo } from '../../../css/SharedStyling';
import LevelUpModal from '../LevelUpModal';
import { useRewardStatus } from '../../../context/rewardStatusContext';
import NewTag from '../../../../static/assets/website/rewards/NewTag.png';

const spin = keyframes`
from { transform: rotate(0deg); }
Expand Down Expand Up @@ -254,6 +255,7 @@ type AppQuestCardProps = {
userId?: string;
completedMap?: Record<string, boolean>;
questProgressMap?: Record<string, { progress: number; status: string }>;
isNew?: boolean;
setErrorMessage?: (errorMessage: string) => void;
};

Expand All @@ -274,6 +276,7 @@ const AppQuestCard: FC<AppQuestCardProps> = ({
userId,
completedMap = {},
questProgressMap = {},
isNew = false,
setErrorMessage,
}) => {

Expand Down Expand Up @@ -382,7 +385,7 @@ const AppQuestCard: FC<AppQuestCardProps> = ({
<Box
display="flex"
alignItems="center"
gap="spacing-xxs"
gap="spacing-xs"
alignSelf="stretch"
>
<LinkTo
Expand Down Expand Up @@ -411,6 +414,7 @@ const AppQuestCard: FC<AppQuestCardProps> = ({

<ArrowUpRight size={23} color='#000' />
</LinkTo>
{ isNew && <img src={NewTag} alt="New" height={20} width={54} />}
</Box>

<Text
Expand Down
77 changes: 38 additions & 39 deletions src/components/Rewards/AppQuests/AppQuestSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import { walletToFullCAIP10 } from '../../../helpers/web3helper';
import AppQuestCard from './AppQuestCard';
import { fadeInCss } from '../utils/FadeIn';
import { css } from 'styled-components';
import lastOneBg from '../../../../static/assets/website/rewards/last-one-bg.webp';
import pusdBg from '../../../../static/assets/website/rewards/pusd-bg.webp';
import zappiBg from '../../../../static/assets/website/rewards/zappi-bg.webp';
import degenChessBg from '../../../../static/assets/website/rewards/Degen-Chess-bg.webp';
import { useCountdown } from '../hooks/useCountdown';

import { Box } from '../../../blocks';
Expand All @@ -28,37 +28,35 @@ const AppQuestSection = () => {
walletAddress: caip10WalletAddress,
})

const { data: lastOneQuests } = useGetQuests({
appId: "lastone"
const { data: app1Quests } = useGetQuests({
appId: "zappi"
});

const { data: pusdQuests } = useGetQuests({
appId: "pusd"
const { data: app2Quests } = useGetQuests({
appId: "unichess"
});

const { data: lastOneQuestsProgress, refetch: refetchLastOneProgress } = useGetQuestsProgress({
appId: "lastone",
const { data: app1QuestsProgress, refetch: refetchApp1QuestsProgress } = useGetQuestsProgress({
appId: "zappi",
userId: userDetails?.userId
});

const { data: pusdQuestsProgress, refetch: refetchPusdProgress } = useGetQuestsProgress({
appId: "pusd",
const { data: app2QuestsProgress, refetch: refetchApp2QuestsProgress } = useGetQuestsProgress({
appId: "unichess",
userId: userDetails?.userId
});

const filteredLastOneQuestIds = lastOneQuests?.data?.quests?.filter((q) => q.status == 'ENABLED') || [];
const filteredPusdQuestIds = pusdQuests?.data?.quests?.filter((q) => q.status == 'ENABLED') || [];
const filteredApp1QuestIds = app1Quests?.data?.quests?.filter((q) => q.status == 'ENABLED') || [];
const filteredApp2QuestIds = app2Quests?.data?.quests?.filter((q) => q.status == 'ENABLED') || [];

const lastOneQuestIds = filteredLastOneQuestIds?.map((q) => q.id) || [];
const pusdQuestIds = filteredPusdQuestIds?.map((q) => q.id) || [];
const app1QuestIds = filteredApp1QuestIds?.map((q) => q.id) || [];
const app2QuestIds = filteredApp2QuestIds?.map((q) => q.id) || [];

const allActivityIds = [
...lastOneQuestIds,
...pusdQuestIds,
...app1QuestIds,
...app2QuestIds,
];

console.log(lastOneQuestIds, pusdQuestIds, 'kokokok')

const { data: activityStatuses, isLoading: isLoadingActivities, refetch: refetchActivities } = useGetRewardsActivity(
{
userId: userDetails?.userId as string,
Expand All @@ -78,24 +76,24 @@ const AppQuestSection = () => {

const refetchAll = () => {
refetchActivities();
refetchLastOneProgress();
refetchPusdProgress();
refetchApp1QuestsProgress();
refetchApp2QuestsProgress();
refetchQuestActivities();
};

const targetDate = "2026-07-08T14:00:00Z";
const targetDate = "2026-07-14T14:00:00Z";
const { timeLeft } = useCountdown(targetDate);

const buildCompletedMap = (quests: QuestProgress[] | undefined) => {
const map: Record<string, boolean> = {};
return map;
};

const lastOneCompletedMap = buildCompletedMap(lastOneQuestsProgress?.data?.quests);
const pusdCompletedMap = buildCompletedMap(pusdQuestsProgress?.data?.quests);
const app1CompletedMap = buildCompletedMap(app1QuestsProgress?.data?.quests);
const app2CompletedMap = buildCompletedMap(app2QuestsProgress?.data?.quests);

const enabledlastOneQuests = lastOneQuests?.data?.quests?.filter((q) => q.status === 'ENABLED');
const enabledPusdQuests = pusdQuests?.data?.quests?.filter((q) => q.status === 'ENABLED');
const enabledApp1Quests = app1Quests?.data?.quests?.filter((q) => q.status === 'ENABLED');
const enabledApp2Quests = app2Quests?.data?.quests?.filter((q) => q.status === 'ENABLED');

return (
<Box
Expand All @@ -111,39 +109,40 @@ const AppQuestSection = () => {
`}
>
<AppQuestCard
appName="PUSD Stablecoin"
appUrl="pusd.push.org"
bgImage={pusdBg}
appName="Zappi.to"
appUrl="zappi.to"
bgImage={zappiBg}
description=""
resetTime={timeLeft}
quests={enabledPusdQuests}
quests={enabledApp1Quests}
activityStatus={activityStatuses}
isLoading={isLoadingActivities}
refetchActivities={refetchAll}
userId={userDetails?.userId}
completedMap={pusdCompletedMap}
completedMap={app1CompletedMap}
questProgressMap={questProgressMap}
setErrorMessage={setErrorMessage}
titleGradient="linear-gradient(180deg, #000 16.15%, #730BE3 89.06%);"
linkColor="#4D2783"
titleGradient="linear-gradient(180deg, #000000 16.15%, #730BE3 89.06%);"
linkColor="#551798"
isNew
/>

<AppQuestCard
appName="Last One"
appUrl="lastone.fun"
bgImage={lastOneBg}
appName="Degen Chess"
appUrl="degenchess.fun"
bgImage={degenChessBg}
description=""
resetTime={timeLeft}
quests={enabledlastOneQuests}
quests={enabledApp2Quests}
activityStatus={activityStatuses}
isLoading={isLoadingActivities}
refetchActivities={refetchAll}
userId={userDetails?.userId}
completedMap={lastOneCompletedMap}
completedMap={app2CompletedMap}
questProgressMap={questProgressMap}
setErrorMessage={setErrorMessage}
titleGradient="linear-gradient(180deg, #000 16.15%, #6B30B2 89.06%);"
linkColor="#653468"
titleGradient="linear-gradient(180deg, #000000 16.15%, #5380F7 89.06%);"
linkColor="#273583"
/>
</Box>
</Box>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Rewards/utils/activityTypeArray.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const OTHER_ACTIVITY_PREFIXES = ['pusd_', 'lastone', 'moleswap_', 'boss_', 'bonus_'];
const OTHER_ACTIVITY_PREFIXES = ['zappi_', 'cetra_', 'moleswap_', 'boss_', 'bonus_'];

export const isOtherRewardActivity = (activityTypeId: string): boolean =>
OTHER_ACTIVITY_PREFIXES.some((prefix) => activityTypeId?.startsWith(prefix));
2 changes: 1 addition & 1 deletion src/components/Rewards/utils/skipVerificationActivities.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const SKIP_VERIFICATION_PREFIXES = ['pusd_', 'lastone_', 'moleswap_', 'boss_','bonus_non_cult_share_on_x_xp_boost'];
const SKIP_VERIFICATION_PREFIXES = ['zappi_', 'cetra_', 'moleswap_', 'boss_','bonus_non_cult_share_on_x_xp_boost'];

export const shouldSkipVerification = (activityTypeId: string): boolean =>
SKIP_VERIFICATION_PREFIXES.some((prefix) => activityTypeId?.startsWith(prefix));
4 changes: 2 additions & 2 deletions src/queries/types/rewards.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ export type RewardsAcitivitesResponse = {
export type ActvityType =
| "follow_push_on_discord"
| "follow_push_on_twitter"
| `lastone_${string}`
| `pusd_${string}`
| `zappi_${string}`
| `cetra_${string}`
| `moleswap_${string}`
| `boss_${string}`
| `bonus_${string}`
Expand Down
Binary file added static/assets/website/rewards/NewTag.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/assets/website/rewards/cetra-bg.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/assets/website/rewards/zappi-bg.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading