Merge pull request #42 from dappforce/dev/epic

Contest Integration
dappforce · Sep 10, 2024 · 064e5d7 · 064e5d7
2 parents f7a60c9 + 19fcf97
commit 064e5d7
Show file tree

Hide file tree

Showing 21 changed files with 600 additions and 106 deletions.
diff --git a/src/assets/emojis/calendar.png b/src/assets/emojis/calendar.png
diff --git a/src/assets/emojis/finish.png b/src/assets/emojis/finish.png
diff --git a/src/assets/emojis/trophy.png b/src/assets/emojis/trophy.png
diff --git a/src/components/TabButtons.tsx b/src/components/TabButtons.tsx
@@ -15,9 +15,10 @@ export default function TabButtons({
   return (
     <div
       className={cx(
-        'grid grid-cols-2 gap-px rounded-full bg-background-light text-sm font-medium',
+        'grid gap-px rounded-full bg-background-light text-sm font-medium',
         className
       )}
+      style={{ gridTemplateColumns: `repeat(${tabs.length}, 1fr)` }}
     >
       {tabs.map((tab) => (
         <Button

diff --git a/src/components/chats/hooks/useTokenGatedRequirement.ts b/src/components/chats/hooks/useTokenGatedRequirement.ts
@@ -7,6 +7,7 @@ import {
 import { ExternalTokenChain } from '@/services/datahub/generated-query'
 import { getBalanceQuery } from '@/services/datahub/leaderboard/points-balance/query'
 import { useMyMainAddress } from '@/stores/my-account'
+import { formatBalanceToNumber } from '@/utils/formatBalance'
 import { convertToBigInt } from '@/utils/strings'
 import { IdentityProvider } from '@subsocial/data-hub-sdk'
 
@@ -66,15 +67,15 @@ export default function useTokenGatedRequirement(
     )
     passRequirement =
       convertToBigInt(tokenBalance?.amount ?? 0) >= externalTokenRequirement
-    amountRequired = Number(
-      externalTokenRequirement /
-        BigInt(10 ** Number(contentContainer?.externalToken?.decimals ?? 0))
+    amountRequired = formatBalanceToNumber(
+      externalTokenRequirement,
+      contentContainer?.externalToken?.decimals ?? 0
     )
     requiredToken = contentContainer?.externalToken?.name ?? ''
     currentToken = tokenBalance
-    remainingNeeded = Number(
-      (externalTokenRequirement - convertToBigInt(tokenBalance?.amount ?? 0)) /
-        BigInt(10 ** Number(contentContainer?.externalToken?.decimals ?? 0))
+    remainingNeeded = formatBalanceToNumber(
+      externalTokenRequirement - convertToBigInt(tokenBalance?.amount ?? 0),
+      contentContainer?.externalToken?.decimals ?? 0
     )
   } else if (pointsRequirement > 0) {
     isLoading = loadingPoints

diff --git a/src/hooks/useRedirectToTgBotOnDesktop.tsx b/src/hooks/useRedirectToTgBotOnDesktop.tsx
@@ -1,6 +1,5 @@
 import { getReferralIdInUrl } from '@/components/referral/ReferralUrlChanger'
 import { getReferralLink } from '@/components/referral/utils'
-import { isTouchDevice } from '@/utils/device'
 import { useMiniAppRaw } from '@tma.js/sdk-react'
 import { useEffect } from 'react'
 import useIsMounted from './useIsMounted'
@@ -11,9 +10,7 @@ const useRedirectToTgBotOnDesktop = () => {
 
   const hasTelegramLoginInfo = app?.result
   useEffect(() => {
-    const isMobile = isTouchDevice()
-
-    if (!isMobile && !hasTelegramLoginInfo && isMounted) {
+    if (!hasTelegramLoginInfo && isMounted) {
       window.location.href = getReferralLink(getReferralIdInUrl())
     }
   }, [hasTelegramLoginInfo, isMounted])

diff --git a/...ules/telegram/HomePage/ContestPreview.tsx → ...egram/HomePage/HomePageContestPreview.tsx b/...ules/telegram/HomePage/ContestPreview.tsx → ...egram/HomePage/HomePageContestPreview.tsx
@@ -7,7 +7,7 @@ import { isDef } from '@subsocial/utils'
 import { useState } from 'react'
 import LeaderboardModal from '../FriendsPage/LeaderboardModal'
 
-const ContestPreview = () => {
+const HomePageContestPreview = () => {
   const { data: referrersData } = getReferralLeaderboardQuery(true).useQuery({})
   const [isOpen, setIsOpen] = useState(false)
 
@@ -79,4 +79,4 @@ const ContestPreviewItem = ({ item, withDivider }: ContestPreviewItemProps) => {
   )
 }
 
-export default ContestPreview
+export default HomePageContestPreview
diff --git a/src/modules/telegram/HomePage/index.tsx b/src/modules/telegram/HomePage/index.tsx
@@ -4,7 +4,7 @@ import { env } from '@/env.mjs'
 import useTgNoScroll from '@/hooks/useTgNoScroll'
 import PointsWidget from '@/modules/points/PointsWidget'
 import Image from 'next/image'
-import ContestPreview from './ContestPreview'
+import HomePageContestPreview from './HomePageContestPreview'
 import MemesPreview from './MemesPreview'
 import TasksPreview from './TasksPreview'
 
@@ -32,7 +32,7 @@ const HomePageContent = () => {
         chatId={env.NEXT_PUBLIC_MAIN_CHAT_ID}
         hubId={env.NEXT_PUBLIC_MAIN_SPACE_ID}
       />
-      <ContestPreview />
+      <HomePageContestPreview />
       <TasksPreview />
     </div>
   )

diff --git a/src/modules/telegram/MenuPage/index.tsx b/src/modules/telegram/MenuPage/index.tsx
@@ -75,7 +75,8 @@ function MenuPageContent({ setPage }: ContentProps) {
       },
     ],
     [
-      { title: 'Leaderboards', icon: '🏆', href: '/tg/leaderboards' },
+      { title: 'Contests', icon: '🏆', href: '/tg/channels/contests' },
+      { title: 'Leaderboards', icon: '🥇', href: '/tg/leaderboards' },
       { title: 'Airdrop', icon: '💰', href: '/tg/airdrop' },
       { title: 'Premium Features', icon: '🎩', href: '/tg/premium' },
       { title: 'Tap The Cat', icon: '🐈', href: '/tg/tap' },