be-components 2.4.9 → 2.5.0

package/src/MarketMaker/index.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { View } from 'react-native';
 import { MarketMakerApi, MarketMaketHelpers } from './api';
-import type { BestAvailableResponseProps, EventProps, ExternalPriceProps, FundingRequestProps, FundOrderProps, FundOwnershipProps, FundProps, LeagueProps, MarketProps, MatchProps, OrderProps, PublicPlayerProps, TournamentProps, TradeProps } from '../types';
+import type { AthleteProps, BestAvailableResponseProps, EventProps, ExternalPriceProps, FundingRequestProps, FundOrderProps, FundOwnershipProps, FundProps, LeagueProps, MarketProps, MatchProps, OrderProps, PublicPlayerProps, TournamentProps, TradeProps } from '../types';
 //import { view_styles } from '../constants/styles';
 import Colors from '../constants/colors';
 import ContestSelector from './components/ContestSelector';
@@ -13,12 +13,18 @@ import { usePlayerLocation } from '../LocationTracker/LocationStatus';
 import ManageFundForm from './components/ManageFundForm';
 import FundingRequestList from './components/FundingRequestList';
 import FundOwnershipList from './components/FundOwnershipList';
+import SocketManager from '../Socket';
+import OrderForm from './components/OrderForm';
 
 type MarketMakerProps = {
-    player_id:string
+    player_id:string,
+    access_token:string,
+    distinct_id:string
 }
 
-const MarketMaker = ({ player_id }:MarketMakerProps) => {
+const MarketMaker = ({ player_id, access_token, distinct_id }:MarketMakerProps) => {
+    const [ ba_socket_data, setBASocketData ] = useState<BestAvailableResponseProps | undefined>(undefined);
+    const [ socket_fund, setSocketFund ] = useState<{ fund:FundProps, orders:OrderProps[] } | undefined>(undefined);
     const [ module_data, setModuleData ] = useState<{
         loaded:boolean,
         loading:boolean,
@@ -41,7 +47,13 @@ const MarketMaker = ({ player_id }:MarketMakerProps) => {
     const { loaded, leagues, events, markets, funds } = module_data;
 
     const [ editing_fund, setEditingFund ] = useState<FundProps | undefined>(undefined);
-
+    const [ draft_order, setDraftOrder ] = useState<{
+        visible:boolean,
+        order?:OrderProps,
+        available?:number
+    }>({
+        visible:false
+    })
     const [ set_market_form_data, setMarketFormData ] = useState<{
         set_market_form_key:string,
         set_market_orders:OrderProps[],
@@ -55,14 +67,19 @@ const MarketMaker = ({ player_id }:MarketMakerProps) => {
         set_market_prices:[]
     });
     const { set_market_form_key, set_market_orders, set_market_form_visible, set_market_market, set_market_prices } = set_market_form_data;
-
+    const [ market_data, setMarketData ] = useState<{
+        best_available:BestAvailableResponseProps
+    }>({
+        best_available: { events: [], tournaments: [], matches: [] }
+    });
+    const { best_available } = market_data;
     const [ dash_data, setDashData ] = useState<{
         fund?:FundProps,
         loaded:boolean,
         loading:boolean,
         external_name?:string,
         players:PublicPlayerProps[],
-        best_available:BestAvailableResponseProps,
+        athletes:AthleteProps[],
         funding_requests:FundingRequestProps[],
         fund_ownerships:FundOwnershipProps[],
         selected_markets:MarketProps[],
@@ -79,10 +96,10 @@ const MarketMaker = ({ player_id }:MarketMakerProps) => {
         external_name: 'Consensus',
         players:[],
         funding_requests:[],
+        athletes:[],
         fund_ownerships:[],
         fund_orders:[],
         selected_markets:[],
-        best_available: { events: [], tournaments: [], matches: [] },
         orders:[],
         trades:[],
         external_prices: [],
@@ -90,7 +107,7 @@ const MarketMaker = ({ player_id }:MarketMakerProps) => {
         selected_matches:[],
         selected_tournaments:[]
     });
-    const { fund, selected_events, players, fund_orders, fund_ownerships, funding_requests, external_name, selected_matches, selected_tournaments, selected_markets, trades, external_prices, best_available, orders } = dash_data;
+    const { fund, selected_events, athletes, players, fund_orders, fund_ownerships, funding_requests, external_name, selected_matches, selected_tournaments, selected_markets, trades, external_prices, orders } = dash_data;
     const { available_orders } = MarketMaketHelpers.getMarketDataFromBestAvailable(best_available);
     const selectable_markets = MarketMaketHelpers.getSelectableMarkets(selected_events, selected_tournaments, selected_matches, markets);
 
@@ -107,6 +124,25 @@ const MarketMaker = ({ player_id }:MarketMakerProps) => {
         getDashData(fund.fund_id);
     },[fund]);
 
+    useEffect(() => {
+        if(!ba_socket_data){ return }
+        //Reconcile and update ba_socket data!
+        setMarketData({
+            ...market_data,
+            best_available: MarketMaketHelpers.updateBestAvailable(best_available, ba_socket_data)
+        })
+    },[ba_socket_data]);
+
+    useEffect(() => {
+        if(!socket_fund){ return }
+        if(socket_fund.fund.fund_id != fund?.fund_id){ return }
+        setDashData({
+            ...dash_data,
+            orders: orders.filter(o => socket_fund.orders.find(no => no.order_id == o.order_id)).concat(socket_fund.orders),
+            fund: socket_fund.fund
+        })
+    },[socket_fund])
+
     const loadModule = async() => {
         setModuleData({ ...module_data, loading:true });
         setDashData({ ...dash_data, loading:true });
@@ -128,24 +164,36 @@ const MarketMaker = ({ player_id }:MarketMakerProps) => {
 
     const getDashData = async(fund_id:string) => {
         //Now load Dash data
+        console.log('1')
         const ba = await MarketMakerApi.getBestAvailableOrders();
+        console.log('2')
+
         const fund_response = await MarketMakerApi.getFundById(fund_id);
+        console.log('3')
+
         if(!fund_response){
             alert('Failed to get details for selected fund');
             return setDashData({ ...dash_data, loading:false });
         }
         const fr_requests = await MarketMakerApi.getFundingRequestsByFundId(fund_id);
+        console.log('4')
+
         const my_action_data = await getDataForMyAction(fund_response.orders, markets);
+        console.log('5')
+
         //Based on my action -- lets auto select events and grab all that data!!
-        let ep = await MarketMakerApi.getPricesByEvents('team', my_action_data.events.map(e => e.event_id))
         let player_ids = [ ...new Set(fr_requests.map(r => r.player_id).concat(fund_response.fund_ownerships.map(o => o.player_id)).map(id => id))]
         let plays = await MarketMakerApi.getPlayersByIds(player_ids)
+        console.log('6')
 
+        setMarketData({
+            ...market_data,
+            best_available: ba
+        });
         setDashData({
             ...dash_data,
             loaded:true,
             loading:false,
-            best_available: ba,
             funding_requests:fr_requests,
             players:plays,
             fund_ownerships: fund_response.fund_ownerships,
@@ -153,27 +201,32 @@ const MarketMaker = ({ player_id }:MarketMakerProps) => {
             fund_orders: fund_response.fund_orders,
             selected_events: my_action_data.events,
             trades: my_action_data.trades,
-            external_prices: ep,
+            external_prices: my_action_data.prices,
             selected_markets: my_action_data.markets
         })
     }
 
+
     const getDataForMyAction = async(orders:OrderProps[], markets:MarketProps[]) => {
         const ev_ids = orders.filter(o => o.event_type == 'team').map(o => o.event_id);
         const mks = markets.filter(m => orders.map(o => o.market_id.toString()).includes(m.market_id.toString()))
         const evs = await MarketMakerApi.getEventsByEventIds(ev_ids);
-        const ts = await MarketMakerApi.getLatestTradesByEvents('team', ev_ids)
-        return { events:evs, trades:ts, markets:mks }
+        const ts = await MarketMakerApi.getLatestTradesByEvents('team', ev_ids);
+        const ps = await MarketMakerApi.getPricesByEvents('team', ev_ids);
+        return { events:evs, trades:ts, markets:mks, prices: ps }
     }
 
     const handleSelectEvent = async(e:EventProps) => {
         if(dash_data.loading){ return }//No mashy
         setDashData({ ...dash_data, loading: true });
         const prices = await MarketMakerApi.getPricesByEvent(e.event_id, 'team');
+        let athlete_ids = [ ...new Set(prices.filter(p => p.participant_type == 'athlete').map(p => p.participant_id)) ]
+        let aths = await MarketMakerApi.getAthletesByIds(athlete_ids)
         const tds = await MarketMakerApi.getLatestTradesByEvents('team', [e.event_id]);
         setDashData({
             ...dash_data,
             loading:false,
+            athletes:aths,
             selected_events: selected_events.concat(e),
             trades: trades.filter(t => t.event_id != e.event_id).concat(tds),
             external_prices: external_prices.filter(p => p.event_id != e.event_id).concat(prices)
@@ -243,7 +296,7 @@ const MarketMaker = ({ player_id }:MarketMakerProps) => {
                                 ...dash_data,
                                 funding_requests: funding_requests.filter(fr => fr.funding_request_id != fr_id)
                             })
-                        }}
+                        }} 
                     />
                     :<></>}
                     <ContestSelector 
@@ -268,11 +321,12 @@ const MarketMaker = ({ player_id }:MarketMakerProps) => {
                         selected_markets={selected_markets.map(m => m.market_id)}
                     />
                 </View>
-                <View style={{ flexGrow:1 }}>
+                <View style={{ flexGrow:1, flexShrink:1}}>
                     <Dashboard
                         loaded={dash_data.loaded}
                         leagues={leagues}
                         fund={fund}
+                        athletes={athletes}
                         events={selected_events}
                         tournaments={selected_tournaments}
                         matches={selected_matches}
@@ -283,6 +337,14 @@ const MarketMaker = ({ player_id }:MarketMakerProps) => {
                         external_name={external_name}
                         orders={orders}
                         fund_orders={fund_orders}
+                        onOrder={async(o, avail) => {
+                            console.log(o)
+                            setDraftOrder({
+                                visible:true,
+                                order: o,
+                                available:avail
+                            })
+                        }}
                         onDepositFund={async(amount) => {
                             if(!fund){ return alert('Unable to process') }
                             const dep_resp = await MarketMakerApi.depositRequest(fund.fund_id, amount);
@@ -295,7 +357,7 @@ const MarketMaker = ({ player_id }:MarketMakerProps) => {
                             setDashData({
                                 ...dash_data,
                                 fund: layoff_resp.fund,
-                                orders: layoff_resp.orders
+                                orders: orders.filter(o => !layoff_resp.orders.find(newo => newo.order_id == o.order_id)).concat(layoff_resp.orders)
                             })
                         }}
                         onWorkCapital={async(amount) => {
@@ -312,7 +374,7 @@ const MarketMaker = ({ player_id }:MarketMakerProps) => {
                             const new_orders = await MarketMakerApi.cancelOrders(order_ids)
                             setDashData({
                                 ...dash_data,
-                                orders: orders.filter(o => !new_orders.find(no => no.order_id == o.order_id))
+                                orders: orders.filter(o => !new_orders.find(no => no.order_id == o.order_id)).concat(new_orders)
                             })
                         }}
                         onSetMarket={(orders, market, prices) => {
@@ -330,6 +392,28 @@ const MarketMaker = ({ player_id }:MarketMakerProps) => {
                             })
                         }}
                     />
+                    {fund && draft_order.order && draft_order.visible ?
+                    <View style={{ position:'absolute', bottom:0, left:0, right:0, top:0, backgroundColor:Colors.shades.black_faded, justifyContent:'center', alignItems:'center' }}>
+                        <OrderForm
+                            fund={fund}
+                            order={draft_order.order}
+                            available={draft_order.available}
+                            onClose={() => setDraftOrder({ visible:false })}
+                            onSubmit={async(order) => {
+                                if(!fund){ return alert('Unable to process') }
+                                if(!location.region || !location.coordinates){ return alert('Location could not be verified to process orders') }
+                                const new_orders = await MarketMakerApi.addOrdersToFund(fund.fund_id, [{ ...order, location: location.coordinates, region: location.region }]);
+                                setDashData({
+                                    ...dash_data,
+                                    fund_orders: fund_orders.concat(new_orders.fund_orders),
+                                    orders:orders.concat(new_orders.orders)
+                                })
+                                setDraftOrder({ visible:false });
+                            }}
+
+                        />
+                    </View>
+                    :<></>}
                     {fund && set_market_form_visible && set_market_market ?
                     <View style={{ position:'absolute', bottom:0, left:0, right:0, top:0, backgroundColor:Colors.shades.black_faded, justifyContent:'center', alignItems:'center' }}>
                         <SetMarketForm
@@ -339,14 +423,14 @@ const MarketMaker = ({ player_id }:MarketMakerProps) => {
                             orders={set_market_orders}
                             prices={set_market_prices}
                             spread_pct='5'
-                            onSetMarket={async(fund_orders) => {
+                            onSetMarket={async(fo) => {
                                 if(!fund){ return alert('Unable to process') }
-                                const new_os = await MarketMakerApi.addOrdersToFund(fund.fund_id, fund_orders)
-                                console.log(new_os)
-                                if(new_os.length == 0){ return alert('Unable to process') }
+                                const new_os = await MarketMakerApi.addOrdersToFund(fund.fund_id, fo)
+                                if(new_os.orders.length == 0){ return alert('Unable to process') }
                                 setDashData({
                                     ...dash_data,
-                                    orders: orders.concat(new_os)
+                                    orders: orders.concat(new_os.orders),
+                                    fund_orders: fund_orders.concat(new_os.fund_orders)
                                 })
                                 setMarketFormData({ set_market_form_visible: false, set_market_orders:[], set_market_form_key:'', set_market_prices:[] })
                             }}
@@ -371,6 +455,22 @@ const MarketMaker = ({ player_id }:MarketMakerProps) => {
                     :<></>}
                 </View>
             </View>
+            <SocketManager
+                subscribed_events={['V1_LOAD_BEST_AVAILABLE', 'V1_UPDATE_FUND']}
+                access_token={access_token}
+                distinct_id={distinct_id}
+                onConnect={() => console.log('connected!')}
+                onDisconnect={() => console.log('Disconnected')}
+                onSocketEvent={(ev) => {
+                    switch(ev.type){
+                        case 'V1_LOAD_BEST_AVAILABLE':
+                            return setBASocketData(ev.data);
+                        case 'V1_UPDATE_FUND':
+                            return setSocketFund(ev.data)
+                        default: return
+                    }
+                }}
+            />
         </View>
     )
 }

package/src/Socket/index.tsx

@@ -26,10 +26,13 @@ const SocketManager = ({ access_token, distinct_id, onSocketEvent, subscribed_ev
     },[])
 
     useEffect(() => {
+
         if(visible){ 
-            console.log(ws?.readyState)
            if(!ws || ws.readyState != 1) { return connectSocket(access_token, distinct_id) }
-           if(access_token && distinct_id){ socketAuthenticate(access_token, distinct_id) }
+           if(access_token && distinct_id){ 
+            console.log('authningn')
+            socketAuthenticate(access_token, distinct_id) 
+        }
         }
         else {
             if(ws){ ws.close() }

package/src/types.d.ts

@@ -1903,6 +1903,7 @@ export interface OrderProps {
     side_type: 'athlete' | 'team' | 'side';
     reversed?:boolean,
     draft_liquidity?:number,
+    fund_id?:string,
     reference_order_id?:string,
     be_type: 'market' | 'prop' | 'ind'; //The old be-type of order so we can compare to historical orders
     buy_sell_ind: 'buy' | 'sell'; //Indicates whether this order is selling a position or attempting to buy one