Merge pull request #15 from Azuro-protocol/migrate-to-sdk-v7-toolkit-v6

migrate to sdk v7 and toolkit v6

Author: on47sky

package-lock.json

@@ -9,16 +9,17 @@
     "dev": "npm run watch-icons & next dev",
     "build": "npm run build-icons && next build",
     "start": "next start",
+    "lint-ts": "tsc --noEmit",
     "lint": "next lint && tsc --noEmit",
     "------  Icons --------------------------------------------------------------------------": "",
     "watch-icons": "node bin/icons --watch",
     "build-icons": "node bin/icons"
   },
   "dependencies": {
     "@azuro-org/dictionaries": "^3.0.28",
-    "@azuro-org/sdk": "6.2.2",
+    "@azuro-org/sdk": "7.0.2",
     "@azuro-org/sdk-social-aa-connector": "^1.1.8",
-    "@azuro-org/toolkit": "5.1.8",
+    "@azuro-org/toolkit": "6.0.1",
     "@floating-ui/react-dom-interactions": "^0.13.3",
     "@glidejs/glide": "^3.6.2",
     "@headlessui/react": "2.2.9",
@@ -28,14 +29,14 @@
     "@locmod/intl": "1.0.5",
     "@locmod/local-storage": "1.0.4",
     "@locmod/modal": "3.0.2",
-    "axios": "^1.13.1",
+    "axios": "^1.13.5",
     "classnames": "^2.5.1",
     "cookies-next": "^5.1.0",
     "copy-to-clipboard": "^3.3.3",
     "dayjs": "^1.11.13",
     "formular": "3.1.6",
     "graphql": "^16.9.0",
-    "next": "15.5.9",
+    "next": "15.5.12",
     "react": "^19.2.3",
     "react-dom": "^19.2.3",
     "react-xmasonry": "^3.0.6",

package.json

@@ -2,7 +2,7 @@
 
 import { useEffect } from 'react'
 import { useGame, useGameState } from '@azuro-org/sdk'
-import { GameState, type GameQuery } from '@azuro-org/toolkit'
+import { GameState, type GameData } from '@azuro-org/toolkit'
 import { useParams } from 'next/navigation'
 import { liveStatisticsGameIdStore } from 'helpers/stores'
 
@@ -11,7 +11,7 @@ import Markets, { MarketsSkeleton } from 'compositions/event/Markets/Markets'
 
 
 type ContentProps = {
-  game: NonNullable<GameQuery['game']>
+  game: GameData
 }
 
 const Content: React.FC<ContentProps> = ({ game }) => {

src/app/[sportSlug]/[countrySlug]/[leagueSlug]/[gameId]/page.tsx

@@ -40,7 +40,6 @@ const AcceptedBets: React.FC = () => {
       affiliate: process.env.NEXT_PUBLIC_AFFILIATE_ADDRESS as Address,
     },
     itemsPerPage: 500,
-    orderDir: OrderDirection.Desc,
   }
   const { data, isLoading } = useBets(props)
 

src/compositions/AcceptedBets/AcceptedBets.tsx

@@ -20,7 +20,7 @@ type BetCardProps = {
 const BetCard: React.FC<BetCardProps> = ({ bet }) => {
   const {
     tokenId, createdAt, status: graphBetStatus, amount, outcomes, freebetId,
-    isWin, isCashedOut,
+    isWin, isCashedOut, orderState,
   } = bet
 
   const { betToken } = useChain()
@@ -45,6 +45,7 @@ const BetCard: React.FC<BetCardProps> = ({ bet }) => {
           Boolean(games.length) && (
             <BetStatus
               graphBetStatus={graphBetStatus}
+              orderState={orderState}
               games={games}
               isWin={isWin}
               isCashedOut={isCashedOut}

src/compositions/AcceptedBets/components/BetCard/BetCard.tsx

@@ -152,7 +152,7 @@ const BetDetailsModal: ModalComponent<BetDetailsModalProps> = (props) => {
   const { appChain, betToken } = useChain()
 
   const {
-    tokenId, createdAt, status: graphBetStatus, amount, outcomes, freebetId, totalOdds, possibleWin,
+    tokenId, createdAt, orderState, status: graphBetStatus, amount, outcomes, freebetId, totalOdds, possibleWin,
     isWin, isCashedOut,
   } = bet
 
@@ -191,6 +191,7 @@ const BetDetailsModal: ModalComponent<BetDetailsModalProps> = (props) => {
               Boolean(games.length) && (
                 <BetStatus
                   graphBetStatus={graphBetStatus}
+                  orderState={orderState}
                   games={games}
                   isWin={isWin}
                   isCashedOut={isCashedOut}

src/compositions/AcceptedBets/components/BetDetailsModal/BetDetailsModal.tsx

@@ -1,5 +1,7 @@
 import React, { useMemo } from 'react'
-import { getBetStatus, type GraphBetStatus, type GameQuery, BetStatus as TBetStatus } from '@azuro-org/toolkit'
+import {
+  getBetStatus, type GraphBetStatus, type GameData, BetStatus as TBetStatus, BetOrderState,
+} from '@azuro-org/toolkit'
 import { Message } from '@locmod/intl'
 import cx from 'classnames'
 
@@ -30,11 +32,21 @@ const statusData: Data = {
     title: messages[TBetStatus.Canceled],
     color: 'text-grey-60',
   },
+  [TBetStatus.Rejected]: {
+    icon: 'interface/declined',
+    title: messages[TBetStatus.Canceled],
+    color: 'text-grey-60',
+  },
   [TBetStatus.PendingResolution]: {
     icon: 'interface/pending',
     title: messages[TBetStatus.PendingResolution],
     color: 'text-accent-blue',
   },
+  [TBetStatus.Preparing]: {
+    icon: 'interface/pending',
+    title: messages[TBetStatus.Preparing],
+    color: 'text-accent-blue',
+  },
   [TBetStatus.Resolved]: {
     icon: 'interface/win',
     title: messages[TBetStatus.Resolved],
@@ -43,19 +55,21 @@ const statusData: Data = {
 }
 
 type BetStatusProps = {
-  graphBetStatus: GraphBetStatus
-  games: NonNullable<GameQuery['game']>[]
+  graphBetStatus: GraphBetStatus | null
+  orderState: BetOrderState
+  games: GameData[]
   isWin: boolean | null
   isCashedOut: boolean
 }
 
-const BetStatus: React.FC<BetStatusProps> = ({ graphBetStatus, games, isWin, isCashedOut }) => {
+const BetStatus: React.FC<BetStatusProps> = ({ graphBetStatus, orderState, games, isWin, isCashedOut }) => {
   const betStatus = useMemo(() => {
     return getBetStatus({
       graphStatus: graphBetStatus,
+      orderState,
       games: games!,
     })
-  }, [])
+  }, [graphBetStatus, orderState, games])
 
   let { icon, title, color } = statusData[betStatus]
 

src/compositions/BetStatus/BetStatus.tsx

@@ -17,6 +17,9 @@ export default {
   [BetStatus.Resolved]: {
     en: 'Resolved',
   },
+  [BetStatus.Preparing]: {
+    en: 'Preparing',
+  },
   win: {
     en: 'Won',
   },

src/compositions/BetStatus/messages.ts

@@ -5,7 +5,7 @@ import { useParams } from 'next/navigation'
 import { Message } from '@locmod/intl'
 import cx from 'classnames'
 import { useGame, useLiveStatistics } from '@azuro-org/sdk'
-import { type GamesQuery } from '@azuro-org/toolkit'
+import { type GameData } from '@azuro-org/toolkit'
 import { useIsMounted } from 'hooks'
 import { closeModal } from '@locmod/modal'
 import { liveStatisticsGameIdStore } from 'helpers/stores'
@@ -21,7 +21,7 @@ import messages from './messages'
 
 type ContentProps = {
   storeGameId: string
-  game: GamesQuery['games'][0]
+  game: GameData
   isGamePage: boolean
   withCollapse?: boolean
   withClearButton?: boolean

src/compositions/LiveStatistics/LiveStatistics.tsx

@@ -1,12 +1,12 @@
-import { type GamesQuery } from '@azuro-org/toolkit'
+import { type GameData } from '@azuro-org/toolkit'
 
 import { OpponentLogo } from 'components/dataDisplay'
 
 import TotalScore, { type TotalScoreProps } from '../TotalScore/TotalScore'
 
 
 type ScoreBoardProps = {
-  participants: GamesQuery['games'][0]['participants']
+  participants: GameData['participants']
 } & TotalScoreProps
 
 const ScoreBoard: React.FC<ScoreBoardProps> = ({ sportId, scoreBoard, participants }) => {