Book 820 - Save Preference (Exchange, Sportsbook)

src/actions/AuthActions.js

@@ -1,4 +1,4 @@
-import {LoadingStatus, ActionTypes, Config} from '../constants';
+import {LoadingStatus, ActionTypes, Config, BookieModes} from '../constants';
 import {
   CommunicationService,
   KeyGeneratorService,
@@ -22,6 +22,7 @@ import {TransactionBuilder, ChainTypes} from 'peerplaysjs-lib';
 import {SoftwareUpdateActions} from '.';
 import Immutable from 'immutable';
 import AllSportsActions from './AllSportsActions';
+import StorageUtils from '../utility/StorageUtils';
 
 const ACCOUNT_UPDATE = `${ChainTypes.reserved_spaces.protocol_ids}.${ChainTypes.operations.account_update}`; // eslint-disable-line
 
@@ -177,7 +178,14 @@ class AuthActions {
         .then(() => {
           log.debug('Login succeed.');
           // Navigate to home page
-          dispatch(NavigateActions.navigateTo('/exchange'));
+          const mode = StorageUtils.getBookMode();
+
+          if (mode === BookieModes.SPORTSBOOK) {
+            dispatch(NavigateActions.navigateTo('/sportsbook'));
+          } else {
+            dispatch(NavigateActions.navigateTo('/exchange'));   
+          }
+
           // Set login status to done
           dispatch(AuthPrivateActions.setLoginLoadingStatusAction(LoadingStatus.DONE));
         })

src/components/AllSports/AllSports.jsx

@@ -6,13 +6,14 @@ import {AllSportsSelector, QuickBetDrawerSelector} from '../../selectors';
 import PeerPlaysLogo from '../PeerPlaysLogo';
 import {DateUtils} from '../../utility';
 import Loading from '../Loading';
+import {bindActionCreators} from 'redux';
+import {Config} from '../../constants';
 
-const MAX_EVENTS_PER_WIDGET = 3;
-const {getData} = AllSportsActions;
+const MAX_EVENTS_PER_WIDGET = Config.maxEvents;
 
 class AllSports extends PureComponent {
   componentDidMount() {
-    this.props.dispatch(getData());
+    this.props.getData();
   }
 
   render() {
@@ -61,4 +62,11 @@ const mapStateToProps = (state) => ({
   canCreateBet: QuickBetDrawerSelector.canAcceptBet(state)
 });
 
-export default connect(mapStateToProps)(AllSports);
+const mapDispatchToProps = (dispatch) => bindActionCreators(
+  {
+    getData: AllSportsActions.getData
+  },
+  dispatch
+);
+
+export default connect(mapStateToProps, mapDispatchToProps)(AllSports);

src/components/App/TitleBar/SportsbookToggle.jsx

@@ -7,6 +7,8 @@ import {I18n} from 'react-redux-i18n';
 import {BookieModes} from '../../../constants';
 import {EventPageSelector} from '../../../selectors';
 import {ChainTypes} from 'peerplaysjs-lib';
+import StorageUtils from '../../../utility/StorageUtils';
+import StorageItems from '../../../constants/StorageItems';
 
 class SportsbookToggle extends PureComponent {
   constructor(props) {
@@ -27,6 +29,8 @@ class SportsbookToggle extends PureComponent {
       subroute = '/BettingMarketGroup/' + this.props.bmgID;
     }
 
+    StorageUtils.set(StorageItems.BOOKIE_MODE_PREFERENCE, mode);
+
     switch (mode) {
       case BookieModes.EXCHANGE: {
         this.props.setMode(BookieModes.EXCHANGE);

src/components/SportsBook/SportsBook.jsx

@@ -4,28 +4,28 @@ import {bindActionCreators} from 'redux';
 import {BackingWidgetContainer} from '../BettingWidgets';
 import {EventPageSelector} from '../../selectors';
 import {ObjectUtils, SportsbookUtils} from '../../utility';
-import {NavigateActions} from '../../actions';
-
-const MAX_EVENTS = 3;
+import {NavigateActions, AllSportsActions} from '../../actions';
+import {Config} from '../../constants';
 
 class SportsBook extends PureComponent {
-  render() {
 
+  componentDidMount() {
+    this.props.getData();
+  }
+
+  render() {
     return (
       <div className='all-sports-wrapper'>
         <div className='banner-ad-header' />
         {
           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) {
+              if (bmgs) {
                 let bmg = bmgs.first();
 
                 if (bmg && SportsbookUtils.hasBettingMarkets(bmg)) {
@@ -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);

src/constants/Config.js

@@ -27,6 +27,7 @@ const Config = {
   hardUpdateGracePeriod: 43200, // 12 Hour Hard-Update Grace Period
   coinTransactionFee: 0.00001,
   mCoinTransactionFee: 0.01,
+  maxEvents: 3,
   broadcastAccount: {
     name: process.env.accounts.broadcasts.name,
     keys: {

src/constants/StorageItems.js

@@ -0,0 +1,5 @@
+const StorageItems = {
+  BOOKIE_MODE_PREFERENCE: 'BOOKIE_MODE_PREFERENCE',
+};
+
+export default StorageItems;

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) {

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;