diff --git a/src/components/Rewards/AppQuests/AppQuestCard.tsx b/src/components/Rewards/AppQuests/AppQuestCard.tsx index 36c77b9f..3cb4a9e1 100644 --- a/src/components/Rewards/AppQuests/AppQuestCard.tsx +++ b/src/components/Rewards/AppQuests/AppQuestCard.tsx @@ -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); } @@ -254,6 +255,7 @@ type AppQuestCardProps = { userId?: string; completedMap?: Record; questProgressMap?: Record; + isNew?: boolean; setErrorMessage?: (errorMessage: string) => void; }; @@ -274,6 +276,7 @@ const AppQuestCard: FC = ({ userId, completedMap = {}, questProgressMap = {}, + isNew = false, setErrorMessage, }) => { @@ -382,7 +385,7 @@ const AppQuestCard: FC = ({ = ({ + { isNew && New} { 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, @@ -78,12 +76,12 @@ 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) => { @@ -91,11 +89,11 @@ const AppQuestSection = () => { 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 ( { `} > diff --git a/src/components/Rewards/utils/activityTypeArray.ts b/src/components/Rewards/utils/activityTypeArray.ts index 854ce631..1202a781 100644 --- a/src/components/Rewards/utils/activityTypeArray.ts +++ b/src/components/Rewards/utils/activityTypeArray.ts @@ -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)); diff --git a/src/components/Rewards/utils/skipVerificationActivities.ts b/src/components/Rewards/utils/skipVerificationActivities.ts index e829c4f8..944b7022 100644 --- a/src/components/Rewards/utils/skipVerificationActivities.ts +++ b/src/components/Rewards/utils/skipVerificationActivities.ts @@ -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)); diff --git a/src/queries/types/rewards.ts b/src/queries/types/rewards.ts index 2a375f7b..ba6e12ea 100644 --- a/src/queries/types/rewards.ts +++ b/src/queries/types/rewards.ts @@ -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}` diff --git a/static/assets/website/rewards/NewTag.png b/static/assets/website/rewards/NewTag.png new file mode 100644 index 00000000..55ccdcda Binary files /dev/null and b/static/assets/website/rewards/NewTag.png differ diff --git a/static/assets/website/rewards/cetra-bg.webp b/static/assets/website/rewards/cetra-bg.webp new file mode 100644 index 00000000..3def3d42 Binary files /dev/null and b/static/assets/website/rewards/cetra-bg.webp differ diff --git a/static/assets/website/rewards/zappi-bg.webp b/static/assets/website/rewards/zappi-bg.webp index 967747aa..709804f7 100644 Binary files a/static/assets/website/rewards/zappi-bg.webp and b/static/assets/website/rewards/zappi-bg.webp differ