be-components 2.0.7 → 2.0.8

package/src/Squares/api/index.ts

@@ -1,6 +1,6 @@
 import axios from "axios"
 import { APIOverrides } from "../../ApiOverrides"
-import type { BuySquaresResponseProps, EventProps, LeagueProps, OfferResponseProps, PlayerSquareProps, PublicPlayerProps, SquareOfferProps, SquarePrizeProps, SquareProps, SquareResultProps, SquaresCompetitionProps, SquaresPayoutProps, SquaresTypeProps, SquareValueProps } from "../../types"
+import type { BuySquaresResponseProps, EventProps, LeagueProps, OfferResponseProps, PlayerBalanceProps, PlayerSquareProps, PublicPlayerProps, SquareOfferProps, SquarePrizeProps, SquareProps, SquareResultProps, SquaresCompetitionProps, SquaresPayoutProps, SquaresTypeProps, SquareValueProps } from "../../types"
 import moment from "moment-mini"
 
 let AUTH_SVC_API = ''
@@ -30,8 +30,10 @@ const SquaresApi = {
         const resp = await axios.get(`${EVENT_SVC_API}/v1/leagues/league/${league_id}`)
         return resp.data.league
     },
-    buySquares: async(sq_comp_id:string, player_squares:PlayerSquareProps[]):Promise<BuySquaresResponseProps> => {
-        const resp = await axios.post(`${TP_SVC_API}/tp/squares/square/buy`, { sq_comp_id, player_squares })
+    buySquares: async(sq_comp_id:string, player_squares:PlayerSquareProps[], promo_balance?:boolean):Promise<BuySquaresResponseProps> => {
+      console.log('HEre')
+      console.log(promo_balance)
+        const resp = await axios.post(`${TP_SVC_API}/tp/squares/square/buy`, { sq_comp_id, player_squares, promo_balance })
         if(resp.data.saved_player_squares.length != player_squares.length){ alert('Some of your bids could not be processed as they were outbid before purchasing') }
         console.log(resp.data)
         return resp.data
@@ -40,6 +42,11 @@ const SquaresApi = {
         const resp = await axios.post(`${TP_SVC_API}/tp/squares/square/offer`, { square_offer })
         return resp.data
     },
+    getMyBalance: async():Promise<PlayerBalanceProps> => {
+      const resp = await axios.get(`${AUTH_SVC_API}/v1/players/player/balance/me`);
+      console.log(resp.data)
+      return resp.data.player_balance
+    },
     getPlayersByPlayerIds : async(player_ids:string[]):Promise<PublicPlayerProps[]> => {
         if(player_ids.length == 0){ return [] }
         const resp = await axios.post(`${AUTH_SVC_API}/v1/players/bulk/get`, { player_ids })

package/src/Squares/components/BidForm.tsx

@@ -1,9 +1,9 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { ActivityIndicator, FlatList, TouchableOpacity, View, ScrollView } from 'react-native';
 import { view_styles } from '../../constants/styles';
-import { Text } from '../../Components';
+import { Checkbox, Text } from '../../Components';
 import Colors from '../../constants/colors';
-import type { PlayerSquareProps, SquareProps } from '../../types';
+import type { PlayerBalanceProps, PlayerSquareProps, SquareProps } from '../../types';
 import BidToggle from './BidToggle';
 
 type BidFormProps = {
@@ -11,20 +11,25 @@ type BidFormProps = {
     market_type:string,
     home_abbr?:string,
     width:number,
+    player_balance?:PlayerBalanceProps,
     away_abbr?:string,
     submit_ready: { is_loading:boolean, is_ready:Boolean }
-    onSubmitBid: () => void,
+    onSubmitBid: (promo_balance?:boolean) => void,
     onClearBids: () => void,
     onBidAmountChange: (player_bid:PlayerSquareProps, square:SquareProps, direction: 'increase'|'decrease') => void,
     onRequestAuthenticate: () => void,
     square_bids:PlayerSquareProps[],
     squares:SquareProps[]
 }
-const BidForm = ({ player_id, width, market_type, home_abbr, away_abbr, submit_ready, square_bids, squares, onSubmitBid, onClearBids, onBidAmountChange, onRequestAuthenticate }:BidFormProps) => {
+const BidForm = ({ player_id, player_balance, width, market_type, home_abbr, away_abbr, submit_ready, square_bids, squares, onSubmitBid, onClearBids, onBidAmountChange, onRequestAuthenticate }:BidFormProps) => {
+    const [ promo_balance, setPromoBalance ] = useState(false);
+    
     const cl = market_type == 'FOR_MONEY' ? '$' : 'E'
     const total_bid_amount = square_bids.reduce((a,b) => a + b.purchase_price, 0)
 
-
+    let can_submit = player_balance && total_bid_amount < player_balance.balance ? true : false
+    if(player_balance && promo_balance && player_balance.promo_balance > total_bid_amount){ can_submit = true }
+    
     const renderBids = (data: { item:PlayerSquareProps, index:number }) => {
         let square = squares.find(s => s.sq_square_id == data.item.sq_square_id)
         if(!square){ return ( <></> ) }
@@ -60,12 +65,32 @@ const BidForm = ({ player_id, width, market_type, home_abbr, away_abbr, submit_r
                     <Text style={{ flex:1 }} theme='body'>Total</Text>
                     <Text theme='header_2'>{cl}{total_bid_amount.toFixed(2)}</Text>
                 </View>
+                {player_balance && player_balance.promo_balance > 0 ?
+                <TouchableOpacity style={{ ...view_styles.body_row, margin:5, padding:5, backgroundColor:Colors.incentive.gold, borderRadius:8 }} onPress={() => setPromoBalance(!promo_balance)}>
+                    <Checkbox
+                        checked={promo_balance}
+                        disabled
+                        
+                        size={26}
+                        onSelect={() => setPromoBalance(!promo_balance)}
+                    />
+                    <View style={{ flex:1, marginLeft:10 }}>
+                        <Text size={12} color={Colors.shades.white} weight='bold'>${player_balance.promo_balance.toFixed(2)} Promotion Available</Text>
+                        <Text size={10} color={Colors.shades.white} weight='regular' style={{ marginTop:3 }}>Press / Click here to use promo balance</Text>
+                    </View>
+                </TouchableOpacity>
+                :<></>}
                 <View style={{ ...view_styles.body_row }}>
-                    <TouchableOpacity style={{ flex:1/3, padding:12, borderRadius:4, borderWidth:1, borderColor:Colors.brand.cobalt, justifyContent:'center', alignItems:'center', marginRight:4 }} onPress={() => onClearBids()}>
+                    <TouchableOpacity 
+                        style={{ flex:1/3, padding:12, borderRadius:4, borderWidth:1, borderColor:Colors.brand.cobalt, justifyContent:'center', alignItems:'center', marginRight:4}} onPress={() => onClearBids()}>
                         <Text size={14} weight='semibold' textAlign='center' color={Colors.brand.cobalt}>Clear</Text>
                     </TouchableOpacity>
                     {player_id ?
-                    <TouchableOpacity style={{ flex:2/3, padding:12, borderRadius:4, backgroundColor:submit_ready.is_ready?Colors.highlights.highlight400:Colors.highlights.highlight200, justifyContent:'center', alignItems:'center', marginLeft:4, opacity:submit_ready.is_loading?0.5:1 }} onPress={() => onSubmitBid()}>
+                    <TouchableOpacity 
+                        style={{ flex:2/3, padding:12, borderRadius:4, backgroundColor:submit_ready.is_ready?Colors.highlights.highlight400:Colors.highlights.highlight200, justifyContent:'center', alignItems:'center', marginLeft:4, opacity:submit_ready.is_loading || !can_submit?0.5:1 }} onPress={() => onSubmitBid(promo_balance)}
+                        disabled={!can_submit}
+
+                        >
                         {submit_ready.is_loading ?
                         <ActivityIndicator size='small' color={Colors.shades.white}/>
                         :

package/src/Squares/components/OfferForm.tsx

@@ -1,13 +1,14 @@
 import React from 'react';
 import { ActivityIndicator, FlatList, TouchableOpacity, View } from "react-native"
 import { Text } from "../../Components"
-import type { PlayerSquareProps, SquareOfferProps, SquareProps } from "../../types"
+import type { PlayerBalanceProps, PlayerSquareProps, SquareOfferProps, SquareProps } from "../../types"
 import BidToggle from "./BidToggle"
 import { view_styles } from "../../constants/styles"
 import Colors from "../../constants/colors"
 
 type OfferFormProps = {
     player_id?:string,
+    player_balance?:PlayerBalanceProps,
     market_type:string,
     home_abbr?:string,
     away_abbr?:string,
@@ -22,10 +23,12 @@ type OfferFormProps = {
     squares:SquareProps[]
 }
 
-const OfferForm = ({ player_id, market_type, width, squares, submit_ready, home_abbr, away_abbr, player_squares, draft_square_offers, onRequestAuthenticate, onOfferAmountChange, onClearOffers, onSubmitOffer }:OfferFormProps) => {
+const OfferForm = ({ player_id, player_balance, market_type, width, squares, submit_ready, home_abbr, away_abbr, player_squares, draft_square_offers, onRequestAuthenticate, onOfferAmountChange, onClearOffers, onSubmitOffer }:OfferFormProps) => {
     const cl = market_type == 'FOR_MONEY' ? '$' : 'E'
     const total_offer_amount = draft_square_offers.reduce((a,b) => a + b.amount, 0)
 
+    let can_submit = player_balance && total_offer_amount < player_balance.balance ? true : false
+    
     
     const renderDraftOffers = (data: { item:SquareOfferProps, index:number }) => {
         let ps = player_squares.find(psQ => psQ.sq_player_square_id == data.item.sq_player_square_id)
@@ -74,7 +77,9 @@ const OfferForm = ({ player_id, market_type, width, squares, submit_ready, home_
                         <Text size={14} weight='semibold' textAlign='center' color={Colors.brand.cobalt}>Clear</Text>
                     </TouchableOpacity>
                     {player_id ?
-                    <TouchableOpacity style={{ flex:2/3, padding:12, borderRadius:4, backgroundColor:submit_ready.is_ready?Colors.highlights.highlight400:Colors.highlights.highlight200, justifyContent:'center', alignItems:'center', marginLeft:4, opacity:submit_ready.is_loading?0.5:1 }} onPress={() => onSubmitOffer()}>
+                    <TouchableOpacity 
+                    disabled={!can_submit}
+                    style={{ flex:2/3, padding:12, borderRadius:4, backgroundColor:submit_ready.is_ready?Colors.highlights.highlight400:Colors.highlights.highlight200, justifyContent:'center', alignItems:'center', marginLeft:4, opacity:submit_ready.is_loading || !can_submit ? 0.5:1 }} onPress={() => onSubmitOffer()}>
                         {submit_ready.is_loading ?
                         <ActivityIndicator size='small' color={Colors.shades.white}/>
                         :

package/src/Squares/index.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from "react"
 import { ActivityIndicator, View, Image, TouchableOpacity, ScrollView } from 'react-native';
-import type { BuySquaresResponseProps, EventProps, LeagueProps, OfferResponseProps, PlayerSquareProps, PublicPlayerProps, SquareOfferProps, SquarePrizeProps, SquareProps, SquareResultProps, SquaresCompetitionProps, SquaresPayoutProps, SquaresTypeProps } from "../types"
+import type { BuySquaresResponseProps, EventProps, LeagueProps, OfferResponseProps, PlayerBalanceProps, PlayerSquareProps, PublicPlayerProps, SquareOfferProps, SquarePrizeProps, SquareProps, SquareResultProps, SquaresCompetitionProps, SquaresPayoutProps, SquaresTypeProps } from "../types"
 import Colors from "../constants/colors";
 import { SqauresHelpers, SquaresApi } from "./api";
 import { Button, Icons, Text } from "../Components";
@@ -36,7 +36,12 @@ const SquaresModule = ({ sq_comp_id, player_id, distinct_id, onRequestAuthentica
     const [ bid_form_expanded, setBidFormExpanded ] = useState(false);
     const [ updated_from_bid, setUpdatedFromBid ]= useState<BuySquaresResponseProps>();
     const [ updated_from_offer, setUpdatedFromOffer ]= useState<OfferResponseProps>();
+    const [ my_data, setMyData ] = useState<{
+        player_balance?:PlayerBalanceProps
+    }>({
 
+    })
+    const { player_balance } = my_data;
     const [ module_data, setModuleData ] = useState<{
         loading:boolean,
         loaded:boolean,
@@ -86,7 +91,7 @@ const SquaresModule = ({ sq_comp_id, player_id, distinct_id, onRequestAuthentica
         if(!sq_comp_id){ return }
         if(!loaded){ SquaresApi.setEnvironment(); }
         getDataFromServer(sq_comp_id);
-    },[sq_comp_id])
+    },[sq_comp_id, player_id])
 
     useEffect(() => {
         if(!updated_from_bid?.squares_competition){ return }
@@ -104,7 +109,14 @@ const SquaresModule = ({ sq_comp_id, player_id, distinct_id, onRequestAuthentica
         const evs = await SquaresApi.getEventsByEventIds([d.squares_competition.event_id]);
         const league_id = evs[0]?.league_id
         let unique_player_ids = [ ...new Set(d.player_squares.map(ps => ps.player_id)) ]
-        if(player_id){ unique_player_ids.push(player_id) }
+        if(player_id){ 
+            unique_player_ids.push(player_id) 
+            const pb = await SquaresApi.getMyBalance();
+            setMyData({
+                ...my_data,
+                player_balance:pb
+            })
+        }
         let ps = await SquaresApi.getPlayersByPlayerIds(unique_player_ids)
         let l:LeagueProps | undefined = undefined
         if(league_id){
@@ -129,7 +141,7 @@ const SquaresModule = ({ sq_comp_id, player_id, distinct_id, onRequestAuthentica
     }
 
 
-    const handleSubmitBid = async() => {
+    const handleSubmitBid = async(promo_balance?:boolean) => {
         if(!squares_competition){ return }
         if(!player_id){ return onRequestAuthenticate(squares_competition.auth_strategy_id) }
         if(!submit_ready.is_ready){
@@ -143,7 +155,7 @@ const SquaresModule = ({ sq_comp_id, player_id, distinct_id, onRequestAuthentica
         if(submit_ready.is_loading){ return } //Prevent button mashing
         //SUBMIT BIDS!
         setBoardData({ ...board_data, submit_ready: { ...submit_ready, is_loading:true } })
-        await SquaresApi.buySquares(squares_competition.sq_comp_id, square_bids)
+        await SquaresApi.buySquares(squares_competition.sq_comp_id, square_bids, promo_balance)
         //if(needs_reload){ handleUpdateBoardFromBuy(resp) } //If we somehow got disconnected from the socket, we need to load it
         setBoardData({ ...board_data, square_bids:[], submit_ready:{ is_loading: false, is_ready: false } })
         setBidFormExpanded(false);
@@ -440,6 +452,7 @@ const SquaresModule = ({ sq_comp_id, player_id, distinct_id, onRequestAuthentica
             <View style={{ position:'absolute', bottom:0, left:0, right:0, top:0, justifyContent:module_size.width > 500 ? 'center' : 'flex-end', alignItems:'center', backgroundColor:Colors.shades.black_faded }}>
                 <BidForm
                     player_id={player_id}
+                    player_balance={player_balance}
                     home_abbr={home_abbr}
                     away_abbr={away_abbr}
                     width={module_size.width}
@@ -450,7 +463,7 @@ const SquaresModule = ({ sq_comp_id, player_id, distinct_id, onRequestAuthentica
                     square_bids={square_bids}
                     onClearBids={handleClearBids}
                     onRequestAuthenticate={() => onRequestAuthenticate(squares_competition.auth_strategy_id)}
-                    onSubmitBid={() => handleSubmitBid()}
+                    onSubmitBid={(promo_balance) => handleSubmitBid(promo_balance)}
                 />
             </View>
             :<></>}
@@ -460,6 +473,7 @@ const SquaresModule = ({ sq_comp_id, player_id, distinct_id, onRequestAuthentica
                     player_id={player_id}
                     draft_square_offers={draft_square_offers}
                     home_abbr={home_abbr}
+                    player_balance={player_balance}
                     width={module_size.width}
                     away_abbr={away_abbr}
                     squares={squares}

package/src/types.d.ts

@@ -1605,7 +1605,7 @@ export interface BuySquaresResponseProps { squares_competition:SquaresCompetitio
 
 export interface PlayerSquareProps  {
     sq_player_square_id:string, sq_comp_id:string, sq_square_id:string, player_id:string, purchase_price:number,
-    status:string, create_datetime:any, last_update_datetime:any
+    status:string, promo_balance?:boolean, create_datetime:any, last_update_datetime:any
 }
 
 export interface SquareResultProps  {