be-components 6.0.0 → 6.0.1

package/src/MarketComponents/components/MyOrderList/api/index.ts

@@ -279,6 +279,8 @@ export const MyOrdersHelpers = {
         let offer_probability = open_amt / potential_winnings
         let offer_odds = MarketComponentHelpers.calcAmericanOddsFromProbability(offer_probability)
         let earnings = winnings + cash_rcvd - original_stake
+        let net_earnings = net_winnings + cash_rcvd - original_stake
+
         let roi = earnings / original_stake
         return order_stats.push({
             stat_id: h,
@@ -288,6 +290,7 @@ export const MyOrdersHelpers = {
             unique_order_titles,
             original_stake,
             roi,
+            net_earnings,
             wins,
             net_winnings,
             commission,
@@ -369,6 +372,7 @@ export const MyOrdersHelpers = {
     let offer_probability = open_amt / potential_winnings
     let offer_odds = MarketComponentHelpers.calcAmericanOddsFromProbability(offer_probability)
     let earnings = winnings + cash_rcvd - original_stake
+    let net_earnings = net_winnings + cash_rcvd - original_stake
     let roi = earnings / resolved_stake
     return {
         stat_id: 'ALL',
@@ -381,6 +385,7 @@ export const MyOrdersHelpers = {
         losses,
         commission,
         net_winnings,
+        net_earnings,
         unresolved_potential_net_winnings,
         unique_order_titles,
         draws,

package/src/MarketComponents/components/TournamentMarket/index.tsx

@@ -1,6 +1,5 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { FlatList, ActivityIndicator, Image } from 'react-native';
-import Colors from '../../../constants/colors';
 import type { AthleteProps, BestAvailableOrderProps, EventOrderStatProps, LeagueProps, MarketProps, MatchProps, OrderProps, TeamProps, TournamentProps, TradeProps } from '../../../types';
 import { Icons, LinearDiagnal } from '../../../Components';
 import { MarketComponentApi, MarketComponentHelpers } from '../../api';
@@ -238,7 +237,18 @@ const TournamentMarket = ({ tournament, float, wrap_markets, width, style, marke
     return (
         <View float={float} style={[{ borderRadius:8 }, style]}>
             <View type='header' transparent nativeID='event_header_data' style={{ flexDirection:'row', alignItems:'center', flexWrap:'wrap', padding:10, borderBottomWidth:1, borderBottomColor:C.borders.light }}>
-                {league ?
+                {onActivate ?
+                <Button
+                    float
+                    style={{ marginRight:5, opacity: activate_loading || tournament.status == 'closed' ? 0.5 : 1, backgroundColor:C.text.success, padding:0, height:34, width:34, justifyContent:'center', alignItems:'center', borderRadius:100 }}
+                    disabled={activate_loading || tournament.status == 'closed'}
+                    loading={activate_loading} 
+                    
+                    onPress={() => onActivate(tournament.tournament_id, 'tournament')}
+                >
+                    <Icons.RefreshIcon size={20} color={C.text.white} />
+                </Button>
+                :league ?
                 <Image
                     source={{ uri: league.league_image }}
                     style={{ height:40, width: 40, marginRight:10 }}
@@ -249,17 +259,6 @@ const TournamentMarket = ({ tournament, float, wrap_markets, width, style, marke
                     <Text theme='h2'>{tournament.tournament_name}</Text>
                     <Text style={{ marginTop:3 }} theme='description'>{moment(tournament.scheduled_datetime).format('MMM DD YYYY')}</Text>
                 </View>
-                {onActivate && tournament.status != 'closed' ?
-                <Button
-                    title={'Refresh'}
-                    style={{ opacity: activate_loading ? 0.5 : 1, marginLeft:5 }}
-                    disabled={activate_loading}
-                    loading={activate_loading}
-                    title_color={Colors.shades.white}
-                    backgroundColor={Colors.utility.success}
-                    onPress={() => onActivate(tournament.tournament_id, 'tournament')}
-                />
-                :<></>}
                 {onShare ?
                 <Button style={{ marginLeft:10 }} onPress={() => onShare(tournament)}>
                     <Icons.ShareIcon size={14} color={C.text.action} />

package/src/types.d.ts

@@ -2215,7 +2215,7 @@ export interface OrderStatsProps {
     original_stake:number,
     delayed_cash:number,
     wins:number,
-    
+    net_earnings:number,
     losses:number,
     draws:number
     unresolved_stake:number,