+
)}
@@ -241,9 +265,10 @@ const mapStateToProps = (state, ownProps) => {
numberOfBadBets: numberOfBadBets,
totalBetAmountFloat: totalAmount,
oddsFormat: MyAccountPageSelector.oddsFormatSelector(state),
- totalBetAmountString: totalBetAmountString,
- availableBalance: availableBalance,
- isValidBetTotal: isValidBetTotal,
+ transactionFee,
+ totalBetAmountString,
+ availableBalance,
+ isValidBetTotal,
betsError,
autoOddsPopulated,
currencySymbol,
diff --git a/src/components/BettingDrawers/MarketDrawer/Subtotal.jsx b/src/components/BettingDrawers/MarketDrawer/Subtotal.jsx
new file mode 100644
index 000000000..8e9a374a1
--- /dev/null
+++ b/src/components/BettingDrawers/MarketDrawer/Subtotal.jsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import {I18n} from 'react-redux-i18n';
+import './Subtotal.less';
+import {CurrencyUtils} from '../../../utility';
+
+const Subtotal = (props) => {
+ const amount = CurrencyUtils.toFixed(
+ 'transaction',
+ props.betAmount,
+ props.currencyFormat
+ );
+ const transactionFee = CurrencyUtils.toFixed(
+ 'transaction',
+ props.transactionFee,
+ props.currencyFormat
+ );
+ const total = CurrencyUtils.toFixed(
+ 'transaction',
+ props.betAmount + props.transactionFee,
+ props.currencyFormat
+ );
+ const currencySymbol = CurrencyUtils.getCurrencySymbol(
+ props.currencyFormat,
+ 'white'
+ );
+
+ return (
+
+
+
+ |
+ {I18n.t('market_drawer.subtotal.amount')}
+ |
+
+ {currencySymbol} {amount}
+ |
+
+
+ |
+ {I18n.t('market_drawer.subtotal.fee')}
+ |
+
+ {currencySymbol} {transactionFee}
+ |
+
+
+ |
+ {I18n.t('market_drawer.subtotal.total')}
+ |
+
+ {currencySymbol} {total}
+ |
+
+
+
+ );
+};
+
+export default Subtotal;
diff --git a/src/components/BettingDrawers/MarketDrawer/Subtotal.less b/src/components/BettingDrawers/MarketDrawer/Subtotal.less
new file mode 100644
index 000000000..e35202f9a
--- /dev/null
+++ b/src/components/BettingDrawers/MarketDrawer/Subtotal.less
@@ -0,0 +1,21 @@
+table {
+ &.subtotal {
+ color: white;
+ text-align: right;
+ float: right;
+ padding: 0 0 10px 0;
+ border-collapse: separate;
+ border-spacing: 10px 0;
+ font-size: 14px;
+ .currency-symbol {
+ margin-bottom: -1px;
+ &.mbtf {
+ width: 22px;
+ margin-bottom: 0;
+ }
+ }
+ .total {
+ font-weight: 700;
+ }
+ }
+}
diff --git a/src/components/BettingDrawers/QuickBetDrawer/QuickBetDrawer.jsx b/src/components/BettingDrawers/QuickBetDrawer/QuickBetDrawer.jsx
index 40a0c1988..da6212b22 100644
--- a/src/components/BettingDrawers/QuickBetDrawer/QuickBetDrawer.jsx
+++ b/src/components/BettingDrawers/QuickBetDrawer/QuickBetDrawer.jsx
@@ -32,6 +32,7 @@ import BetTable from '../BetTable';
import {Empty, OverlayUtils} from '../Common';
import {BettingDrawerStates, Config} from '../../../constants';
import {MyAccountPageSelector} from '../../../selectors';
+import Subtotal from '../MarketDrawer/Subtotal';
import CommonMessage from '../../CommonMessage/CommonMessage';
import CommonMessageUtils from '../../../utility/CommonMessageUtils';
@@ -84,6 +85,28 @@ class QuickBetDrawer extends PureComponent {
}
componentDidUpdate(prevProps) {
+ // Get the button element in the footer.
+ let rect = document.getElementById('btn--place-bet');
+ let footerID = 'qbd-footer';
+
+ // If the `rect` exists, we will proceed to get its location in the DOM.
+ if (rect) {
+ // Determine if the 'rect' is visible within its scrollable element. 'content
+ let rectParent = rect.parentElement.parentElement.parentElement.parentElement;
+
+ BettingModuleUtils.inViewport(rect, rectParent, footerID);
+
+ // Add event listener for scrolling/resize on the place bet button parent div.
+ // Just a precaution.
+ rectParent.addEventListener('scroll', () => {
+ BettingModuleUtils.inViewport(rect, rectParent, footerID);
+ });
+ // Window event listener for immediate update of footer while resizing.
+ window.addEventListener('resize', () => {
+ BettingModuleUtils.inViewport(rect, rectParent, footerID);
+ });
+ }
+
Ps.update(ReactDOM.findDOMNode(this.refs.bettingtable));
if (prevProps.betsError[0] !== this.props.betsError[0]) {
@@ -93,14 +116,6 @@ class QuickBetDrawer extends PureComponent {
}
render() {
- let expandedFooterStyle = '';
-
- if (this.props.isValidBetTotal){
- expandedFooterStyle = '50px';
- } else {
- expandedFooterStyle = '100px';
- }
-
return (
@@ -113,15 +128,26 @@ class QuickBetDrawer extends PureComponent {
defaultSize={ 40 }
primary='second'
allowResize={ false }
- pane1Style={ {overflowY: 'hidden', paddingBottom: expandedFooterStyle} }
+ pane1Style={ {overflowY: 'hidden'} }
>
{renderContent(this.props)}
{!this.props.bets.isEmpty() && (
-
+
)}
@@ -276,10 +300,11 @@ const mapStateToProps = (state, ownProps) => {
numberOfBadBets: numberOfBadBets,
totalBetAmountFloat: totalAmount,
oddsFormat: MyAccountPageSelector.oddsFormatSelector(state),
+ transactionFee,
currencySymbol,
- totalBetAmountString: totalBetAmountString,
- availableBalance: availableBalance,
- isValidBetTotal: isValidBetTotal,
+ totalBetAmountString,
+ availableBalance,
+ isValidBetTotal,
betsError,
autoOddsPopulated
};
diff --git a/src/components/BettingDrawers/QuickBetDrawer/QuickBetDrawer.less b/src/components/BettingDrawers/QuickBetDrawer/QuickBetDrawer.less
index 68f8fc915..3afdadee2 100644
--- a/src/components/BettingDrawers/QuickBetDrawer/QuickBetDrawer.less
+++ b/src/components/BettingDrawers/QuickBetDrawer/QuickBetDrawer.less
@@ -6,8 +6,9 @@
@quick-bet-drawer-footer-height: 40px;
#quick-bet-drawer {
- height:100%;
+ height: 100%;
background-color: @drawer_main_bg;
+ width: @quick-bet-drawer-width;
div.title {
background-color: @quick_bet_drawer_title_bg;
width: @quick-bet-drawer-width;
@@ -23,7 +24,8 @@
.place-bet {
font-size: 18px;
width: 100%;
- text-transform: none; // for displaying mB properly
+ text-transform: none; // for displaying mB properly
+ margin-bottom: 5px;
span {
padding-right: 2px;
@@ -37,12 +39,16 @@
margin-bottom: 0;
}
}
-
- }
+ }
.Pane2 {
.SplitPane {
overflow: scroll !important;
+ min-height: 100px!important;
+ height: 100%;
+ &.footer--sticky {
+ height: ~"calc(100% - 120px)"!important;
+ }
}
}
@@ -52,30 +58,41 @@
.ps-scrollbar-y-rail {
display: none !important;
}
- }
+ }
}
- div.content {
+ .content {
position: relative;
height: 100%;
}
- div.footer {
- font-size: 18px;
- align-self: flex-end;
- background-color: @quick_bet_drawer_title_bg;
- width: @quick-bet-drawer-width;
- padding: 5px;
- margin: 0 0;
+ .quick-bet-drawer {
+ &__footer {
+ font-size: 18px;
+ background-color: @quick_bet_drawer_title_bg;
+ position: absolute;
+ width: 349px;
+ padding: 5px;
+ margin: 0px 5px;
+
+ &-dimmed {
+ width: 100%;
+ opacity: .1;
+ padding-top: 5px;
- &.dimmed {
- opacity: .1;
- }
+ .place-bet {
+ left: 10px;
+ width: 339px;
+ }
+ }
- .bet_balance_error{
- color: @error;
- text-align: center;
- text-transform: uppercase;
+ &.sticky {
+ width: 350px;
+ position: fixed;
+ bottom: 0;
+ right: 0;
+ margin-right: 10px;
+ }
}
}
diff --git a/src/components/BettingWidgets/SimpleBettingWidget/SimpleBettingWidget.jsx b/src/components/BettingWidgets/SimpleBettingWidget/SimpleBettingWidget.jsx
index b0f241068..13b53f4fe 100644
--- a/src/components/BettingWidgets/SimpleBettingWidget/SimpleBettingWidget.jsx
+++ b/src/components/BettingWidgets/SimpleBettingWidget/SimpleBettingWidget.jsx
@@ -213,8 +213,6 @@ const getColumns = (renderOffer, renderOfferClick, navigateTo, currencyFormat, s
}
];
- // TODO: This is an ad-hoc method to decide whether we need to display the
- // 3rd selection for DRAW
if (sportName.toUpperCase() !== 'SOCCER') {
columns.splice(3, 1); // remove the X column group
}
@@ -333,7 +331,6 @@ class SimpleBettingWidget extends PureComponent {
return (text, record) => {
// Retrieve the nested offers data from the data record
let offers = record.get('offers');
- // let eventStatus = record.get('eventStatus');
var canBet;
canBet = isClickEnabled(record, index);
@@ -342,14 +339,11 @@ class SimpleBettingWidget extends PureComponent {
return '';
}
- // TODO: Shall we sort the list of offers first before we pass it to the betting widget?
offers = offers.sort((a, b) => {
return a.get('betting_market_id')
.localeCompare(b.get('betting_market_id'));
});
- // const betting_market_id = offers.getIn([index - 1, 'betting_market_id']);
-
let goodBetIndex = 0;
let offer;
diff --git a/src/components/CommonMessage/CommonMessage.jsx b/src/components/CommonMessage/CommonMessage.jsx
index 13259ba57..263f69ec6 100644
--- a/src/components/CommonMessage/CommonMessage.jsx
+++ b/src/components/CommonMessage/CommonMessage.jsx
@@ -6,6 +6,7 @@ import CommonMessageActions from '../../actions/CommonMessageActions';
import {Config} from '../../constants';
import MessageType from '../../constants/MessageTypes';
import _ from 'lodash';
+import Immutable from 'immutable';
const compileMessage = (props) => {
let messageList;
@@ -27,11 +28,11 @@ const compileMessage = (props) => {
return (
-
+
{pair.get('content') }
props.clearMessage(id) }>X
@@ -50,26 +51,34 @@ class CommonMessage extends PureComponent {
timeout: null
};
+ this.timerList = Immutable.List();
this.checkToAssignTimer = this.checkToAssignTimer.bind(this);
- }
- setTimer(id) {
- const {timeout} = this.state;
- clearTimeout(timeout);
+ }
- this.setState({
- timeout: setTimeout(
+ // Only the most recent message has an associated timer.
+ // Other messages will not have a timer until they are shown.
+ setTimer(id, index) {
+ if (index === 0) {
+ this.timerList = this.timerList.push(setTimeout(
this.props.clearMessage.bind(this, id), Config.commonMessageModule.timeout
- )
- });
+ ));
+ } else {
+ this.timerList.forEach((timer, index) => {
+ if (index !== this.timerList.size-1) {
+ clearTimeout(timer);
+ }
+ });
+
+ }
}
checkToAssignTimer(messages) {
- messages.forEach((msg) => {
+ messages.forEach((msg, index) => {
let msgType = msg.get('messageType');
if (msgType === MessageType.SUCCESS || msgType === MessageType.INFO) {
- this.setTimer(msg.get('id'));
+ this.setTimer(msg.get('id'), index);
}
});
}
diff --git a/src/components/CommonMessage/CommonMessage.less b/src/components/CommonMessage/CommonMessage.less
index 69ac8ae83..efa056ebc 100644
--- a/src/components/CommonMessage/CommonMessage.less
+++ b/src/components/CommonMessage/CommonMessage.less
@@ -1,7 +1,7 @@
@import (reference) '../App/Colors.less';
-.c-common-message {
- &__background{
+.cmn-msg {
+ &__bkg{
width: 100%;
top: -36px;
height: 36px;
@@ -19,23 +19,23 @@
cursor: pointer;
}
}
- &.info {
+ &--info {
background-color: fade(@system_info, 100%);
}
- &.error {
+ &--error {
background-color: fade(@system_error, 100%);
}
- &.warning {
+ &--warning {
background-color: fade(@system_warning, 100%);
}
- &.success {
+ &--success {
background-color: fade(@system_success, 100%);
}
- &.none {
+ &--none {
display: none;
}
}
- &__content {
+ &__cont {
text-align: left;
display: table-cell;
vertical-align: middle;
diff --git a/src/components/Export/Export.jsx b/src/components/Export/Export.jsx
index 8f861c87d..d51749bc4 100644
--- a/src/components/Export/Export.jsx
+++ b/src/components/Export/Export.jsx
@@ -75,7 +75,6 @@ class Export extends PureComponent {
{I18n.t('application.exportDataFetchMsg')}
- {/* TODO: Loader icon change as per mockup */}
diff --git a/src/components/Login/Login.jsx b/src/components/Login/Login.jsx
index 17740fd27..d52f0a81e 100644
--- a/src/components/Login/Login.jsx
+++ b/src/components/Login/Login.jsx
@@ -64,7 +64,6 @@ class Login extends PureComponent {
if (accountError) {
//overriding blockchain error with general error
//Note: even if the username format is incorrect it will show this generic error
- //TODO: confirm if we really need to show generic error for these errors
errors.userName = I18n.t('login.username_notfound');
throw new SubmissionError(errors);
} else {
diff --git a/src/components/Main/NavBar/AmountDropDown.jsx b/src/components/Main/NavBar/AmountDropDown.jsx
index 5f1206583..522c3dd40 100644
--- a/src/components/Main/NavBar/AmountDropDown.jsx
+++ b/src/components/Main/NavBar/AmountDropDown.jsx
@@ -8,7 +8,6 @@ import React, {PureComponent} from 'react';
let I18n = require('react-redux-i18n').I18n;
import {Card, Row, Col} from 'antd';
-//TODO Rename this component in order to match the file name (or rename the file if appropriate)
class Amount extends PureComponent {
renderAmount(amountTypeText, amount) {
return (
diff --git a/src/components/Main/NavBar/TopMenu.jsx b/src/components/Main/NavBar/TopMenu.jsx
index 55e16336c..d69464db5 100644
--- a/src/components/Main/NavBar/TopMenu.jsx
+++ b/src/components/Main/NavBar/TopMenu.jsx
@@ -127,7 +127,6 @@ class TopMenu extends PureComponent {
}
handleClick(e) {
- //TODO:handle selected menu
event.preventDefault();
this.setState({
@@ -545,7 +544,6 @@ function mapDispatchToProps(dispatch) {
{
getDepositAddress: BalanceActions.getDepositAddress,
navigateTo: NavigateActions.navigateTo,
- //TODO: Wallet Address verification and error response pending.
withdraw: BalanceActions.topMenuWithdraw,
resetWithdrawLoadingStatus: BalanceActions.resetTopMenuWithdrawLoadingStatus,
logout: AuthActions.logoutAndShowPopupIfNeeded,
diff --git a/src/components/Modal/ConnectionErrorModal/ConnectionErrorModal.jsx b/src/components/Modal/ConnectionErrorModal/ConnectionErrorModal.jsx
index 6ce340499..b4b54ed06 100644
--- a/src/components/Modal/ConnectionErrorModal/ConnectionErrorModal.jsx
+++ b/src/components/Modal/ConnectionErrorModal/ConnectionErrorModal.jsx
@@ -17,7 +17,6 @@ class ConnectionErrorModal extends PureComponent {
}
render() {
- // TODO: Currently sharing SoftwareUpdateModal styling
return (
- {/*TODO: bold text inside warning*/}
@@ -18,11 +21,8 @@ class SportsBook extends PureComponent {
this.props.allSports.map((sport) => {
const events = sport.get('events');
-
let eventsToDisplay = [];
-
- events && events.slice(0, MAX_EVENTS).forEach((e) => {
-
+ events && events.slice(0, Config.maxEvents).forEach((e) => {
let bmgs = e.get('bettingMarketGroups');
if (bmgs) {
@@ -78,9 +78,11 @@ const mapStateToProps = (state, ownProps) => {
const mapDispatchToProps = (dispatch) => bindActionCreators(
{
- navigateTo: NavigateActions.navigateTo
+ navigateTo: NavigateActions.navigateTo,
+ getData: AllSportsActions.getData
},
dispatch
);
+
export default connect(mapStateToProps, mapDispatchToProps)(SportsBook);
diff --git a/src/constants/Config.js b/src/constants/Config.js
index dcbfc5499..6d6fa0e06 100644
--- a/src/constants/Config.js
+++ b/src/constants/Config.js
@@ -24,9 +24,22 @@ const Config = {
oddsPrecision: 10000,
blockchainUrls: shuffledBlockhainUrls,
coreAsset: ASSET_ID,
+ // Entries to filter.
+ filters: {
+ eventGroup: {
+ name: ['FRIENDLY INTERNATIONAL']
+ },
+ bettingMarketGroup: {
+ description: ['MONEYLINE', 'MATCH ODDS']
+ },
+ sport: {
+ name: ['IGB LIVE!']
+ }
+ },
hardUpdateGracePeriod: 43200, // 12 Hour Hard-Update Grace Period
coinTransactionFee: 0.00001,
mCoinTransactionFee: 0.01,
+ maxEvents: 3,
broadcastAccount: {
name: process.env.accounts.broadcasts.name,
keys: {
diff --git a/src/constants/LoadingStatus.js b/src/constants/LoadingStatus.js
index 9ee5cbbd3..4855ae7ac 100644
--- a/src/constants/LoadingStatus.js
+++ b/src/constants/LoadingStatus.js
@@ -5,6 +5,8 @@ const LoadingStatus = {
BET_PLACE: 'bet_place',
BET_DELETE: 'bet_delete',
DONE: 'done',
+ DONE_UNMATCHED_BET_CANCEL: 'done_unmatched_bet_cancel',
+ DONE_UNMATCHED_BET_CANCEL_ALL: 'done_unmatched_bet_cancel_all',
ERROR: 'error',
ERROR_DISCONNECTED: 'error_disconnected',
ERROR_DESYNC: 'error_desync'
diff --git a/src/constants/MessageId.js b/src/constants/MessageId.js
index 1b45056a9..12ae1ae4b 100644
--- a/src/constants/MessageId.js
+++ b/src/constants/MessageId.js
@@ -3,6 +3,7 @@ const MessageId = {
INFO: {
},
SUCCESS: {
+ CANCEL_BET: 'suc-b-CB'
},
WARNING: {
INCOMPLETE_BET: 'war-b-IB'
diff --git a/src/constants/StorageItems.js b/src/constants/StorageItems.js
new file mode 100644
index 000000000..347339be7
--- /dev/null
+++ b/src/constants/StorageItems.js
@@ -0,0 +1,5 @@
+const StorageItems = {
+ BOOKIE_MODE_PREFERENCE: 'BOOKIE_MODE_PREFERENCE',
+};
+
+export default StorageItems;
diff --git a/src/reducers/AppReducer.js b/src/reducers/AppReducer.js
index c0da934b7..cf8948295 100644
--- a/src/reducers/AppReducer.js
+++ b/src/reducers/AppReducer.js
@@ -1,6 +1,6 @@
-import {ActionTypes, LoadingStatus, ConnectionStatus, AppBackgroundTypes,
- BookieModes} from '../constants';
+import {ActionTypes, LoadingStatus, ConnectionStatus, AppBackgroundTypes} from '../constants';
import Immutable from 'immutable';
+import StorageUtils from '../utility/StorageUtils';
const initialState = Immutable.fromJS({
appBackgroundType: AppBackgroundTypes.GRADIENT_BG,
@@ -18,8 +18,7 @@ const initialState = Immutable.fromJS({
isTitleBarTransparent: true,
gatewayAccount: {},
showLicenseScreen: false,
- bookMode: BookieModes.EXCHANGE,
-
+ bookMode: StorageUtils.getBookMode(),
});
export default function(state = initialState, action) {
diff --git a/src/reducers/CommonMessageReducer.js b/src/reducers/CommonMessageReducer.js
index 23331ccb3..43a3ee445 100644
--- a/src/reducers/CommonMessageReducer.js
+++ b/src/reducers/CommonMessageReducer.js
@@ -29,21 +29,23 @@ export default function(state = initialState, action) {
// get current state of messages
// operate on the one matching supplied id
let messageCount = state.get('messageCount');
- const newMessageCount = --messageCount;
+ const newMessageCount = messageCount > 0 ? --messageCount : 0; // cannot have negative count
+
+
const id = action.id;
const newExchangeMsgState = state.get('exchangeMessages')
.filter((m) => {
let mID = m.get('id');
// Filter exchange messages.
- return mID === 'e' + id;
+ return mID !== id;
});
const newBetslipMessageState = state.get('betslipMessages')
.filter((m) => {
let mID = m.get('id');
// Filter betslip messages.
- return mID === 'b' + id;
+ return mID !== id;
});
return state.set('exchangeMessages', newExchangeMsgState)
diff --git a/src/selectors/AllSportsSelector.js b/src/selectors/AllSportsSelector.js
index 802b79517..db806fef5 100644
--- a/src/selectors/AllSportsSelector.js
+++ b/src/selectors/AllSportsSelector.js
@@ -96,7 +96,9 @@ const getAllSportsData = createSelector(
const activeEvents = activeEventsBySportId.get(sport.get('id')) || Immutable.List();
const eventNodes = activeEvents
.map((event) => {
- if (event.get('status') !== null && event.get('status') !== undefined) {
+ let eventStatus = event.get('status');
+
+ if (eventStatus !== null && eventStatus !== undefined) {
const offers =
simpleBettingWidgetBinnedOrderBooksByEventId.get(event.get('id')) || Immutable.List();
// Find the Betting Market Group of this event
@@ -112,7 +114,7 @@ const getAllSportsData = createSelector(
event_name: event.get('name'),
time: DateUtils.getLocalDate(event.get('start_time')),
isLiveMarket: event.get('is_live_market'),
- eventStatus: event.get('status').toLowerCase(),
+ eventStatus: eventStatus.toLowerCase(),
offers,
bettingMarketGroupId: bettingMarketGroupId,
bmgAsset: bettingMarketGroupAsset
@@ -122,9 +124,8 @@ const getAllSportsData = createSelector(
}
})
.filter((eventNode) => {
- // Feature check
- const isCoreAsset = eventNode.get('bmgAsset') === coreAsset;
- return isCoreAsset ? eventNode : null;
+ // Feature check. Is the event one that matches the configured Core Asset?
+ return eventNode.get('bmgAsset') === coreAsset;
});
// Set events to the sport
sportNode = sportNode.set('events', eventNodes);
diff --git a/src/selectors/CommonSelector.js b/src/selectors/CommonSelector.js
index 218399db4..46d7bae53 100644
--- a/src/selectors/CommonSelector.js
+++ b/src/selectors/CommonSelector.js
@@ -157,6 +157,7 @@ const getSimpleBettingWidgetBinnedOrderBooksByEventId = createSelector(
) => {
let simpleBettingWidgetBinnedOrderBooksByEventId = Immutable.Map();
binnedOrderBooksByBettingMarketId.forEach((binnedOrderBook, bettingMarketId) => {
+ const filters = Config.filters;
const bettingMarket = bettingMarketsById.get(bettingMarketId);
const bettingMarketGroupId = bettingMarket && bettingMarket.get('group_id');
const bettingMarketGroup = bettingMarketGroupsById.get(bettingMarketGroupId);
@@ -169,14 +170,13 @@ const getSimpleBettingWidgetBinnedOrderBooksByEventId = createSelector(
// Ensure bettingMarketGroup exists.
// Remove instances of friendly international event group(s) from the bookie pro fun beta.
if (
- bettingMarketGroup !== undefined &&
- eventGroupName.toUpperCase() !== 'FRIENDLY INTERNATIONAL'
+ bettingMarketGroup !== undefined &&
+ !filters.eventGroup.name.includes(eventGroupName.toUpperCase())
) {
// NOTE: Assume description can be used as comparison
+ const bmgDescription = bettingMarketGroup.get('description').toUpperCase();
var passesFilters =
- !!bettingMarketGroup &&
- (bettingMarketGroup.get('description').toUpperCase() === 'MONEYLINE' ||
- bettingMarketGroup.get('description').toUpperCase() === 'MATCH ODDS');
+ !!bettingMarketGroup && filters.bettingMarketGroup.description.includes(bmgDescription);
if (eventId && passesFilters) {
// Implicit Rule: the first betting market is for the home team
diff --git a/src/selectors/MyWagerSelector.js b/src/selectors/MyWagerSelector.js
index 54222fbae..35b7d39be 100644
--- a/src/selectors/MyWagerSelector.js
+++ b/src/selectors/MyWagerSelector.js
@@ -99,7 +99,6 @@ const getRelatedBetsCollection = createSelector(
// memoized selector - function totaling stake and liability
// The following functionality only applies if all bets are under the same currency format
-// TODO: modify the logic and the UI if we support multiple currency
const getBetTotal = createSelector(
[getActiveTab, getRelatedBetsCollection, getCurrencyFormat, getAssetsById],
(activeTab, bets, currencyFormat, assetsById) => {
diff --git a/src/selectors/SidebarSelector.js b/src/selectors/SidebarSelector.js
index 0f913ae1e..8bdb2648e 100644
--- a/src/selectors/SidebarSelector.js
+++ b/src/selectors/SidebarSelector.js
@@ -81,6 +81,7 @@ const getSidebarCompleteTree = createSelector(
});
completeTree = completeTree.push(allSportsHeader);
+ const filters = Config.filters;
const sortById = (a, b) => a.get('id').localeCompare(b.get('id'));
// Sort sport by id
const sportList = sportsById.toList().sort(sortById);
@@ -136,15 +137,11 @@ const getSidebarCompleteTree = createSelector(
})
.filter((eventGroup) => {
// filter eventGroups that have no events
- let filtered = false;
- let eventName = eventGroup.get('name').toUpperCase();
+ let eventGroupName = eventGroup.get('name').toUpperCase();
// Remove friendly international from beta bookie pro fun
- if (eventGroup.get('children').size > 0 && eventName !== 'FRIENDLY INTERNATIONAL') {
- filtered = true;
- }
-
- return filtered;
+ return (eventGroup.get('children').size > 0 &&
+ !filters.eventGroup.name.includes(eventGroupName));
});
// Append event group to sport
sportNode = sportNode.set('children', eventGroupNodes);
diff --git a/src/services/CommunicationService.js b/src/services/CommunicationService.js
index b8068b016..df3c62f0b 100644
--- a/src/services/CommunicationService.js
+++ b/src/services/CommunicationService.js
@@ -1027,7 +1027,6 @@ class CommunicationService {
* Withdraw money
*/
static withdraw() {
- // TODO: Replace later
return new Promise((resolve) => {
setTimeout(() => {
resolve();
@@ -1039,7 +1038,6 @@ class CommunicationService {
* Get deposit address
*/
static getDepositAddress() {
- // TODO: Replace later
return new Promise((resolve) => {
setTimeout(() => {
resolve('THISISDUMMYDEPOSITADDRESSFORANYACCOUNTID');
diff --git a/src/services/HistoryService.js b/src/services/HistoryService.js
index fd2d3ef7e..261a558b4 100644
--- a/src/services/HistoryService.js
+++ b/src/services/HistoryService.js
@@ -170,8 +170,6 @@ class HistoryService {
*/
static convertRawHistoryToMyBets(state, rawHistory) {
- // TODO: find better place to put odds precision (this one should be
- // returned by blockchain anyway)
const oddsPrecision = Config.oddsPrecision;
const dynGlobalObject = state.getIn(['app', 'blockchainDynamicGlobalProperty']);
const globalObject = state.getIn(['app', 'blockchainGlobalProperty']);
@@ -333,6 +331,10 @@ class HistoryService {
}
case ChainTypes.operations.betting_market_group_resolved: {
+ if (!operationContent.has('resolutions')) {
+ return;
+ }
+
const resolutions = operationContent.get('resolutions');
const bettingMarketIds = resolutions.map((resolution) => resolution.get(0));
let gameResultByBettingMarketId = Immutable.Map(resolutions);
diff --git a/src/store/translations.js b/src/store/translations.js
index 898afbf09..02c75087c 100644
--- a/src/store/translations.js
+++ b/src/store/translations.js
@@ -430,7 +430,9 @@ export const translationsObject = {
good_bets_1: 'Would you like to update 1 bet with ',
good_bets: 'Would you like to update %{good_bets} bets with ',
cancel_button: 'CANCEL',
- confirm_button: 'CONFIRM BET'
+ confirm_button: 'CONFIRM BET',
+ cancel_bet: 'Bet successfully cancelled',
+ cancel_bets: 'All bets have been successfully cancelled',
},
perfect: {
good_bets_1: 'You are about to update 1 bet for a total liability of ',
@@ -483,6 +485,11 @@ export const translationsObject = {
content: {
average_odds: 'Average Odds'
}
+ },
+ subtotal: {
+ amount: 'Bet Amount:',
+ fee: 'Transaction Fee:',
+ total: 'Total:'
}
},
bet_error: {
@@ -1516,8 +1523,6 @@ export const translationsObject = {
}
]
},
- // TODO: the following should be deprecated but floating help is still referring to these
- // Revisit this after the floating help is revamped
question1: 'What is BookiePro?',
answer1:
'BookiePro is a betting exchange where people from all over the world can bet on sports.',
diff --git a/src/utility/BettingModuleUtils.js b/src/utility/BettingModuleUtils.js
index cd637b765..ab19f8bc6 100644
--- a/src/utility/BettingModuleUtils.js
+++ b/src/utility/BettingModuleUtils.js
@@ -173,10 +173,6 @@ var BettingModuleUtils = {
let exposure = 0.0;
bets.forEach((bet) => {
- // TODO: Confirm if stake should be empty or having having a zero
- // value if it is not available
- // TODO: Confirm if profit/liability should be empty or having a zero
- // value if it is not available
if (
isFieldInvalid(bet, 'odds') ||
isFieldInvalid(bet, 'stake') ||
@@ -214,7 +210,7 @@ var BettingModuleUtils = {
return (parseFloat(marketExposure) + parseFloat(betslipExposure)).toFixed(exposurePlaces);
},
- // =========== Book Percentage ===========
+ // =========== Book Percentage ===========
/**
* Calculate book percentage with provided best back/lay odds of selection. Formula is as follow:
@@ -432,6 +428,67 @@ var BettingModuleUtils = {
}
}
}
+ },
+
+ // =========== UI/DOM Manipulation ===========
+ // Subtotal DOM sticky/unsticky
+ modifyFooterLocation: function(isVisibleInDOM, rectParent, footerID) {
+ // The rectParent needs to have its height adjusted to manipulate the scrollable region of the
+ // betslip tab.
+ let footer = document.getElementById(footerID);
+ let footerClass = footer && footer.className;
+ let scrollableDiv = rectParent.children[0];
+ let scrollableDivClass = scrollableDiv.className;
+ let fCIndex = footerClass && footerClass.indexOf('sticky');
+ let sCIndex = scrollableDivClass.indexOf('footer--sticky');
+
+ if (!isVisibleInDOM) {
+ // Append the sticky class.
+ if (fCIndex === -1) {
+ footer.className = footerClass + ' sticky';
+ }
+
+ if (sCIndex === -1) {
+ scrollableDiv.className = scrollableDivClass + ' footer--sticky';
+ }
+ } else {
+ // Two children down from the rectParent is the div that has a height changing as bets are
+ // added or deleted from it. If this child elements height is less than rectParents, we can
+ // remove the sticky class from the footer.
+ let offsetAddition = 120; // To make up for the existance of footer
+
+ if (footerID.indexOf('pb') !== -1) {
+ offsetAddition = 160;
+ }
+
+ let childOfChild = rectParent.firstElementChild.firstElementChild;
+ let cOcHeight = childOfChild.offsetHeight + offsetAddition;
+ let rectParentHeight = rectParent.offsetHeight;
+
+ if (cOcHeight < rectParentHeight) {
+ if (fCIndex !== -1) {
+ footer.className = footerClass.substring(0, fCIndex - 1);
+ }
+
+ if (sCIndex !== -1) {
+ scrollableDiv.className = scrollableDivClass.substring(0, sCIndex - 1);
+ }
+ }
+ }
+ },
+
+ inViewport: function(rect, rectParent, footerID) {
+ let isVisibleInDOM;
+
+ let rectBounding = rect.getBoundingClientRect();
+ // Determing if the `rect` is visible with the following checks.
+ isVisibleInDOM =
+ rectBounding.top >= 0 &&
+ rectBounding.left >= 0 &&
+ rectBounding.bottom <= (window.innerHeight || document.documentElement.clientHeight) &&
+ rectBounding.right <= (window.innerWidth || document.documentElement.clientWidth);
+
+ this.modifyFooterLocation(isVisibleInDOM, rectParent, footerID);
}
};
diff --git a/src/utility/CommonMessageUtils.js b/src/utility/CommonMessageUtils.js
index 9d38dcd47..7bce48ada 100644
--- a/src/utility/CommonMessageUtils.js
+++ b/src/utility/CommonMessageUtils.js
@@ -3,11 +3,17 @@ import {I18n} from 'react-redux-i18n';
import MessageId from '../constants/MessageId';
import MessageLocation from '../constants/MessageLocation';
import MessageType from '../constants/MessageTypes';
+import LoadingStatus from '../constants/LoadingStatus';
var CommonMessageUtils = {
- betslipAddRemove(betsError, id) {
- // Determine what the message type is.
+ /**
+ * Determine the message type from the id.
+ *
+ * @param {string} id : the id of the message.
+ * @returns {string} : MessageType (error, warning, success, info)
+ */
+ getMessageType(id) {
let type;
if (id) {
@@ -26,35 +32,99 @@ var CommonMessageUtils = {
}
}
+ return type;
+ },
+ /**
+ * Checks if the message already exists, if it does, clear it.
+ * - should not be triggered under normal circumstances as betslip messages currently
+ * configured are ones that remove automatically on a timer.
+ * If the message does not exist, and should, dispatch the message.
+ *
+ * @param {string} message : the message to display
+ * @param {string} id : the message id to tie to the message. (used for removal/uniquen purposes)
+ * @returns {dispatch} : dispatches one of two actions. Adding a new message or
+ * removing an existing one.
+ */
+ betslipAddRemove(message, id) {
+ // Determine what the message type is.
+ let type = CommonMessageUtils.getMessageType(id);
+
// If there exists invalid bets, display warning message to indicate as such.
- if (betsError !== '') {
- return CommonMessageActions.newMessage(betsError, type, MessageLocation.BETSLIP, id);
+ if (message !== '') {
+ return CommonMessageActions.newMessage(message, type, MessageLocation.BETSLIP, id);
} else {
// If there are no erronous bets, ensure there are no warning messages to indicate
// otherwise.
- return CommonMessageActions.clearMessage(id);
+ return CommonMessageActions.resetMessages();
}
},
+ /**
+ * Dispatch a message based on the loading state provided
+ *
+ * @param {string} loadingState - the user's selected currency
+ * @returns {dispatch} : dispatches a new message
+ */
+ messageFromLoadState(loadingState) {
+ let type;
+ let message;
+ let location;
+ let id;
+
+ switch (loadingState) {
+ case LoadingStatus.DONE_UNMATCHED_BET_CANCEL: {
+ id = MessageId.BETSLIP.SUCCESS.CANCEL_BET;
+ type = CommonMessageUtils.getMessageType(id);
+ location = MessageLocation.BETSLIP;
+ message = I18n.t('market_drawer.open_bets.confirmation.imperfect.cancel_bet');
+ break;
+ }
+
+ case LoadingStatus.DONE_UNMATCHED_BET_CANCEL_ALL: {
+ id = MessageId.BETSLIP.SUCCESS.CANCEL_BET;
+ type = CommonMessageUtils.getMessageType(id);
+ location = MessageLocation.BETSLIP;
+ message = I18n.t('market_drawer.open_bets.confirmation.imperfect.cancel_bets');
+ break;
+ }
+
+ default:
+ break;
+ }
+
+ return CommonMessageActions.newMessage(message, type, location, id);
+ },
+
+ /**
+ * Based on provided paramters, determine if the message to dispatch (at a later time) should
+ * be an error or a warning.
+ * Also sets the message based on aforementioned paramters.
+ *
+ * @param {number} numberOfBets : total number of bets in the betslip to be submitted
+ * @param {number} numberOfBadBets : total number of "bad" bets in the betslip.
+ * @param {boolean} sufficientFunds : whether or not the user has sufficient funds to submit
+ * queued bets
+ * @returns {array} [message, messageId] : the message, the message id.
+ */
determineMessageAndId(numberOfBets, numberOfBadBets, sufficientFunds) {
- let betsError = '';
+ let message = '';
let messageId = '';
if (numberOfBets !== 0) {
if (numberOfBadBets > 0) {
// Incomplete bets error.
- betsError = I18n.t('bet_error.incomplete_bet');
+ message = I18n.t('bet_error.incomplete_bet');
messageId = MessageId.BETSLIP.WARNING.INCOMPLETE_BET;
}
if (!sufficientFunds) {
// Insufficient Funds for the bets existing.
- betsError = I18n.t('bet_error.insufficient_balance');
+ message = I18n.t('bet_error.insufficient_balance');
messageId = MessageId.BETSLIP.ERROR.INSUFFICIENT_FUNDS;
}
}
- return [betsError, messageId];
+ return [message, messageId];
}
};
diff --git a/src/utility/StorageUtils.js b/src/utility/StorageUtils.js
new file mode 100644
index 000000000..48683f640
--- /dev/null
+++ b/src/utility/StorageUtils.js
@@ -0,0 +1,38 @@
+let ls = window.localStorage;
+import BookieModes from '../constants/BookieModes';
+import StorageItems from '../constants/StorageItems';
+
+/**
+ * Base Storage service
+ *
+ * Used to interact with the browser's local storage.
+ */
+class StorageUtils {
+ // Generic storage get
+ static get(key) {
+ return ls.getItem(key);
+ }
+
+ static set(key, value) {
+ return ls.setItem(key, value);
+ }
+
+ static remove(key) {
+ return ls.removeItem(key);
+ }
+
+ // Get Bookie Mode from LS - has some extra logic to avoid invalid values
+ static getBookMode() {
+ const mode = ls.getItem(StorageItems.BOOKIE_MODE_PREFERENCE);
+
+ if (mode === BookieModes.EXCHANGE || mode === BookieModes.SPORTSBOOK) {
+ return mode;
+ } else {
+ return BookieModes.EXCHANGE;
+ }
+
+ }
+
+}
+
+export default StorageUtils;