Merge remote-tracking branch 'origin/dev' into march-madness

src/assets/images/banner/10.json

@@ -0,0 +1,26 @@
+[
+    {
+        "image": "instant-payouts.jpg",
+        "url": ""
+    },
+    {
+        "image": "easy-as-connect-wallet.jpg",
+        "url": ""
+    },
+    {
+        "image": "vaults.jpg",
+        "url": "https://overtimemarkets.xyz/#/vaults"
+    },
+    {
+        "image": "refer-friends.jpg",
+        "url": "https://overtimemarkets.xyz/#/referral"
+    },
+    {
+        "image": "stake-thales.jpg",
+        "url": "https://thalesmarket.io/token"
+    },
+    {
+        "image": "parlay-leaderboard.jpg",
+        "url": "https://overtimemarkets.xyz/#/parlay-leaderboard"
+    }
+]

src/assets/images/banner/420.json

@@ -0,0 +1,26 @@
+[
+    {
+        "image": "instant-payouts.jpg",
+        "url": ""
+    },
+    {
+        "image": "easy-as-connect-wallet.jpg",
+        "url": ""
+    },
+    {
+        "image": "vaults.jpg",
+        "url": "https://overtimemarkets.xyz/#/vaults"
+    },
+    {
+        "image": "refer-friends.jpg",
+        "url": "https://overtimemarkets.xyz/#/referral"
+    },
+    {
+        "image": "stake-thales.jpg",
+        "url": "https://thalesmarket.io/token"
+    },
+    {
+        "image": "parlay-leaderboard.jpg",
+        "url": "https://overtimemarkets.xyz/#/parlay-leaderboard"
+    }
+]

src/assets/images/banner/42161.json

@@ -0,0 +1,26 @@
+[
+    {
+        "image": "arbitrum.png",
+        "url": ""
+    },
+    {
+        "image": "instant-payouts.jpg",
+        "url": ""
+    },
+    {
+        "image": "easy-as-connect-wallet.jpg",
+        "url": ""
+    },
+    {
+        "image": "refer-friends.jpg",
+        "url": "https://overtimemarkets.xyz/#/referral"
+    },
+    {
+        "image": "stake-thales.jpg",
+        "url": "https://thalesmarket.io/token"
+    },
+    {
+        "image": "parlay-leaderboard.jpg",
+        "url": "https://overtimemarkets.xyz/#/parlay-leaderboard"
+    }
+]

src/components/BannerCarousel/BannerCarousel.tsx

@@ -1,53 +1,24 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useMemo } from 'react';
 import styled from 'styled-components';
 import 'react-responsive-carousel/lib/styles/carousel.min.css';
 import { Carousel } from 'react-responsive-carousel';
+import { Banner, useBannersQuery } from 'queries/banners/useBannersQuery';
+import { useSelector } from 'react-redux';
+import { RootState } from 'redux/rootReducer';
+import { getNetworkId } from 'redux/modules/wallet';
 
 const BannerCarousel: React.FC = () => {
-    const [urlMap, setUrlMap] = useState<Record<number, string>>({});
-    const [imageCount, setImageCount] = useState<number>(0);
+    const networkId = useSelector((state: RootState) => getNetworkId(state));
 
-    useEffect(() => {
-        const fetchData = async () => {
-            try {
-                const response = await fetch(`https://api.thalesmarket.io/banner-image-count`);
-                if (response) {
-                    const json = await response.json();
-                    setImageCount(json.count);
-                }
-            } catch (e) {}
-        };
-        fetchData();
-    }, []);
+    const bannersQuery = useBannersQuery(networkId);
 
-    useEffect(() => {
-        const map = {} as Record<number, string>;
-        const fetchData = async () => {
-            for (let i = 1; i <= imageCount; i++) {
-                try {
-                    const response = await fetch(`https://api.thalesmarket.io/banner-json/${i}`);
-                    if (response) {
-                        const json = await response.json();
-                        map[i] = json.url;
-                    }
-                } catch (e) {}
-            }
-            setUrlMap(map);
-        };
-        fetchData();
-    }, [imageCount]);
-
-    const getStyledDivs = useCallback(() => {
-        const divList = [];
-        for (let i = 1; i <= imageCount; i++) {
-            divList.push(<StyledDiv key={i} hasHref={!!urlMap[i]} index={i} />);
-        }
-        return divList;
-    }, [imageCount, urlMap]);
+    const banners: Banner[] = useMemo(() => {
+        return bannersQuery.isSuccess && bannersQuery.data ? bannersQuery.data : [];
+    }, [bannersQuery.isSuccess, bannersQuery.data]);
 
     return (
         <Container>
-            {!!imageCount && (
+            {banners.length > 0 && (
                 <Carousel
                     transitionTime={1000}
                     interval={10000}
@@ -58,12 +29,14 @@ const BannerCarousel: React.FC = () => {
                     dynamicHeight={true}
                     autoPlay={true}
                     onClickItem={(index) => {
-                        if (urlMap[index + 1]) {
-                            window.open(urlMap[index + 1]);
+                        if (banners[index].url !== '') {
+                            window.open(banners[index].url);
                         }
                     }}
                 >
-                    {getStyledDivs()}
+                    {banners.map((banner: Banner) => (
+                        <StyledDiv key={banner.image} hasHref={banner.url !== ''} image={banner.image} />
+                    ))}
                 </Carousel>
             )}
         </Container>
@@ -85,12 +58,12 @@ const Container = styled.div`
     }
 `;
 
-const StyledDiv = styled.div<{ index: number; hasHref?: boolean }>`
+const StyledDiv = styled.div<{ image: string; hasHref: boolean }>`
     max-width: 100%;
     width: 1700px;
     height: 165px;
     margin: -1px;
-    background-image: ${(props) => `url(https://api.thalesmarket.io/banner-image/${props.index})`};
+    background-image: ${(props) => `url(${props.image})`};
     cursor: ${(props) => (props.hasHref ? 'pointer' : 'default')};
     background-position: center;
 `;

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,
@@ -109,6 +115,7 @@ export const QUERY_KEYS = {
         Tokens: () => ['bungee', 'tokens'],
     },
     MarchMadness: (walletAddress: string, networkId: NetworkId) => ['marchMadness', walletAddress, networkId],
+    Banners: (networkId: NetworkId) => ['banners', networkId],
 };
 
 export default QUERY_KEYS;

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',
 };