Merge branch 'dev' of github.com:thales-markets/thales-sport-markets …

…into dev

src/constants/markets.ts

@@ -27,7 +27,8 @@ export enum SportFilterEnum {
     Baseball = 'Baseball',
     Hockey = 'Hockey',
     UFC = 'UFC',
-    Motosport = 'Motosport',
+    Tennis = 'Tennis',
+    // Motosport = 'Motosport',
 }
 
 export const COLLATERALS = [

src/constants/queryKeys.ts

@@ -11,6 +11,12 @@ export const QUERY_KEYS = {
     ParlayAmmData: (networkId: NetworkId) => ['parlayAmmData', networkId],
     Market: (marketAddress: string, networkId: NetworkId) => ['market', marketAddress, networkId],
     LiveResult: (marketId: string) => ['liveResult', marketId],
+    EnetpulseLiveResult: (marketId: string, gameDate: string, sportTag: number) => [
+        'enetpulseLiveResult',
+        marketId,
+        gameDate,
+        sportTag,
+    ],
     ChildMarkets: (marketAddress: string, networkId: NetworkId) => ['childMarkets', marketAddress, networkId],
     PositionDetails: (
         marketAddress: string,

src/constants/tags.ts

@@ -172,6 +172,24 @@ export const TAGS_LIST: Tags = [
         hidden: false,
         priority: 702,
     },
+    {
+        id: 9153,
+        label: 'Tennis',
+        logo: `/logos/Tennis/atp.png`,
+        logoClass: 'icon-league league--atp',
+        favourite: false,
+        hidden: false,
+        priority: 602,
+    },
+    {
+        id: 9156,
+        label: 'Tennis',
+        logo: `/logos/Tennis/atp.png`,
+        logoClass: 'icon-league league--atp',
+        favourite: false,
+        hidden: false,
+        priority: 603,
+    },
 ];
 
 export const SPORTS_MAP: SportsMap = {
@@ -195,9 +213,24 @@ export const SPORTS_MAP: SportsMap = {
     9019: 'Soccer',
     9100: 'Motosport',
     9101: 'Motosport',
+    9153: 'Tennis',
+    9156: 'Tennis',
 };
 
-export const TAGS_OF_MARKETS_WITHOUT_DRAW_ODDS = [9001, 9002, 9003, 9004, 9005, 9006, 9008, 9007, 9100, 9101];
+export const TAGS_OF_MARKETS_WITHOUT_DRAW_ODDS = [
+    9001,
+    9002,
+    9003,
+    9004,
+    9005,
+    9006,
+    9008,
+    9007,
+    9100,
+    9101,
+    9153,
+    9156,
+];
 
 export const SPORTS_TAGS_MAP: SportsTagsMap = {
     Football: [9001, 9002],
@@ -207,6 +240,7 @@ export const SPORTS_TAGS_MAP: SportsTagsMap = {
     Soccer: [9010, 9011, 9012, 9013, 9014, 9015, 9016, 9017, 9018, 9019],
     UFC: [9007],
     Motosport: [9100, 9101],
+    Tennis: [9153, 9156],
 };
 
 export enum TAGS_FLAGS {
@@ -231,10 +265,12 @@ export enum TAGS_FLAGS {
     MOTOGP = 9101,
 }
 
+export const ENETPULSE_SPORTS = [9153, 9156];
+
 export const MLS_TAG = 9010;
 export const FIFA_WC_TAG = 9018;
 
-export const PERSON_COMPETITIONS = [9007, 9100, 9101];
+export const PERSON_COMPETITIONS = [9007, 9100, 9101, 9153, 9156];
 
 export enum BetType {
     WINNER = 0,
@@ -277,6 +313,8 @@ export const SCORING_MAP: SportsMap = {
     9019: 'goals',
     9100: '',
     9101: '',
+    9153: 'gems',
+    9156: 'gems',
 };
 
 export const MATCH_RESOLVE_MAP: SportsMap = {
@@ -300,6 +338,8 @@ export const MATCH_RESOLVE_MAP: SportsMap = {
     9019: 'regular',
     9100: '',
     9101: '',
+    9153: '',
+    9156: '',
 };
 
 export const SPORT_PERIODS_MAP: SportsMap = {
@@ -321,4 +361,6 @@ export const SPORT_PERIODS_MAP: SportsMap = {
     9017: 'half',
     9018: 'half',
     9019: 'half',
+    9153: 'set',
+    9156: 'set',
 };

src/pages/Markets/Home/MarketListCard/MarketListCard.tsx

@@ -1,8 +1,9 @@
 import SPAAnchor from 'components/SPAAnchor';
 import TimeRemaining from 'components/TimeRemaining';
 import Tooltip from 'components/Tooltip';
-import { BetType } from 'constants/tags';
+import { BetType, ENETPULSE_SPORTS } from 'constants/tags';
 import { t } from 'i18next';
+import useEnetpulseSportMarketLiveResultQuery from 'queries/markets/useEnetpulseSportMarketLiveResultQuery';
 import useSportMarketLiveResultQuery from 'queries/markets/useSportMarketLiveResultQuery';
 import React, { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
@@ -19,24 +20,24 @@ import Odds from './components/Odds';
 import {
     Arrow,
     ClubLogo,
+    MainContainer,
     MatchInfoConatiner,
     MatchTimeLabel,
-    MainContainer,
-    SecondRowContainer,
     OddsWrapper,
     Result,
     ResultLabel,
     ResultWrapper,
+    SecondRowContainer,
     TeamLogosConatiner,
     TeamNameLabel,
     TeamNamesConatiner,
     TeamsInfoConatiner,
-    VSLabel,
-    Wrapper,
-    TotalMarketsContainer,
-    TotalMarketsLabel,
     TotalMarkets,
     TotalMarketsArrow,
+    TotalMarketsContainer,
+    TotalMarketsLabel,
+    VSLabel,
+    Wrapper,
 } from './styled-components';
 
 // 3 for double chance, 1 for spread, 1 for total
@@ -68,7 +69,9 @@ const MarketListCard: React.FC<MarketRowCardProps> = ({ market, language }) => {
     const isGameRegularlyResolved = market.isResolved && !market.isCanceled;
     const isPendingResolution = isGameStarted && !isGameResolved;
     const showOdds = !isPendingResolution && !isGameResolved && !market.isPaused;
-    const gameIdString = Web3.utils.toAscii(market.gameId);
+    const isEnetpulseSport = ENETPULSE_SPORTS.includes(Number(market.tags[0]));
+    const gameIdString = Web3.utils.hexToAscii(market.gameId);
+    const gameDate = new Date(market.maturityDate).toISOString().split('T')[0];
 
     const doubleChanceMarkets = market.childMarkets.filter((market) => market.betType === BetType.DOUBLE_CHANCE);
     const spreadTotalMarkets = market.childMarkets.filter((market) => market.betType !== BetType.DOUBLE_CHANCE);
@@ -78,14 +81,30 @@ const MarketListCard: React.FC<MarketRowCardProps> = ({ market, language }) => {
     const showSecondRowOnMobile = isMobile && hasChildMarkets;
 
     const useLiveResultQuery = useSportMarketLiveResultQuery(gameIdString, {
-        enabled: isAppReady && isPendingResolution,
+        enabled: isAppReady && isPendingResolution && !isEnetpulseSport,
+    });
+
+    const useEnetpulseLiveResultQuery = useEnetpulseSportMarketLiveResultQuery(gameIdString, gameDate, market.tags[0], {
+        enabled: isAppReady && isEnetpulseSport,
     });
 
     useEffect(() => {
-        if (useLiveResultQuery.isSuccess && useLiveResultQuery.data) {
-            setLiveResultInfo(useLiveResultQuery.data);
+        if (isEnetpulseSport) {
+            if (useEnetpulseLiveResultQuery.isSuccess && useEnetpulseLiveResultQuery.data) {
+                setLiveResultInfo(useEnetpulseLiveResultQuery.data);
+            }
+        } else {
+            if (useLiveResultQuery.isSuccess && useLiveResultQuery.data) {
+                setLiveResultInfo(useLiveResultQuery.data);
+            }
         }
-    }, [useLiveResultQuery, useLiveResultQuery.data]);
+    }, [
+        useLiveResultQuery,
+        useLiveResultQuery.data,
+        useEnetpulseLiveResultQuery,
+        useEnetpulseLiveResultQuery.data,
+        isEnetpulseSport,
+    ]);
 
     return (
         <Wrapper isResolved={isGameRegularlyResolved}>
@@ -102,6 +121,9 @@ const MarketListCard: React.FC<MarketRowCardProps> = ({ market, language }) => {
                             component={
                                 <MatchTimeLabel>
                                     {formatShortDateWithTime(market.maturityDate)}{' '}
+                                    {isEnetpulseSport && liveResultInfo?.tournamentName
+                                        ? '| ' + liveResultInfo?.tournamentName
+                                        : ''}
                                     {isFifaWCGame(market.tags[0]) && (
                                         <Tooltip overlay={t(`common.fifa-tooltip`)} iconFontSize={12} marginLeft={2} />
                                     )}
@@ -181,6 +203,7 @@ const MarketListCard: React.FC<MarketRowCardProps> = ({ market, language }) => {
                         liveResultInfo={liveResultInfo}
                         isCanceled={market.isCanceled}
                         isPaused={market.isPaused}
+                        isEnetpulseSport={isEnetpulseSport}
                     />
                 )}
             </MainContainer>

src/pages/Markets/Home/MarketListCard/components/MatchStatus/MatchStatus.tsx

@@ -12,9 +12,16 @@ type MatchStatusProps = {
     isCanceled: boolean;
     isPaused: boolean;
     liveResultInfo: SportMarketLiveResult | undefined;
+    isEnetpulseSport: boolean;
 };
 
-const MatchStatus: React.FC<MatchStatusProps> = ({ isPendingResolution, isCanceled, isPaused, liveResultInfo }) => {
+const MatchStatus: React.FC<MatchStatusProps> = ({
+    isPendingResolution,
+    isCanceled,
+    isPaused,
+    liveResultInfo,
+    isEnetpulseSport,
+}) => {
     const { t } = useTranslation();
 
     const displayClockTime = liveResultInfo?.displayClock.replaceAll("'", '');
@@ -23,18 +30,23 @@ const MatchStatus: React.FC<MatchStatusProps> = ({ isPendingResolution, isCancel
         <Container bottomAlign={isPendingResolution}>
             {isPendingResolution ? (
                 <FlexDivRow>
-                    {liveResultInfo?.status != GAME_STATUS.FINAL && liveResultInfo?.status != GAME_STATUS.FULL_TIME && (
-                        <MatchPeriodContainer>
-                            <MatchPeriodLabel>{`${getOrdinalNumberLabel(Number(liveResultInfo?.period))} ${t(
-                                `markets.market-card.${SPORT_PERIODS_MAP[Number(liveResultInfo?.sportId)]}`
-                            )}`}</MatchPeriodLabel>
-                            <FlexDivCentered>
-                                <MatchPeriodLabel className="red">
-                                    {displayClockTime}
-                                    <MatchPeriodLabel className="blink">&prime;</MatchPeriodLabel>
-                                </MatchPeriodLabel>
-                            </FlexDivCentered>
-                        </MatchPeriodContainer>
+                    {liveResultInfo?.status != GAME_STATUS.FINAL &&
+                        liveResultInfo?.status != GAME_STATUS.FULL_TIME &&
+                        !isEnetpulseSport && (
+                            <MatchPeriodContainer>
+                                <MatchPeriodLabel>{`${getOrdinalNumberLabel(Number(liveResultInfo?.period))} ${t(
+                                    `markets.market-card.${SPORT_PERIODS_MAP[Number(liveResultInfo?.sportId)]}`
+                                )}`}</MatchPeriodLabel>
+                                <FlexDivCentered>
+                                    <MatchPeriodLabel className="red">
+                                        {displayClockTime}
+                                        <MatchPeriodLabel className="blink">&prime;</MatchPeriodLabel>
+                                    </MatchPeriodLabel>
+                                </FlexDivCentered>
+                            </MatchPeriodContainer>
+                        )}
+                    {isEnetpulseSport && (
+                        <Status color={STATUS_COLOR.STARTED}>{t('markets.market-card.pending')}</Status>
                     )}
                     <ScoreContainer>
                         <TeamScoreLabel>{liveResultInfo?.homeScore}</TeamScoreLabel>