BOOK-776: as a user my unmatched and matched bets should be displayed sorted

package.json

@@ -57,8 +57,8 @@
     "moment": "~2.17.1",
     "numeral": "~2.0.4",
     "object-assign": "4.1.1",
-    "peerplaysjs-lib": "pbsa/peerplaysjs-lib",
-    "peerplaysjs-ws": "pbsa/peerplaysjs-ws",
+    "peerplaysjs-lib": "peerplays-network/peerplaysjs-lib",
+    "peerplaysjs-ws": "peerplays-network/peerplaysjs-ws",
     "perfect-scrollbar": "~0.6.11",
     "postcss-loader": "1.2.2",
     "promise": "7.1.1",

src/actions/MarketDrawerActions.js

@@ -9,7 +9,7 @@ import {
 import Immutable from 'immutable';
 import moment from 'moment';
 import BetActions from './BetActions';
-import {CurrencyUtils, ObjectUtils} from '../utility';
+import {CurrencyUtils, ObjectUtils, BettingModuleUtils} from '../utility';
 
 class MarketDrawerPrivateActions {
   static updateOpenBetsLoadingStatus(loadingStatus) {
@@ -379,15 +379,19 @@ class MarketDrawerActions {
           return formattedBet;
         };
 
-        const openedUnmatchedBets = unmatchedBetsById
+        let openedUnmatchedBets = unmatchedBetsById
           .filter(filterRelatedBet)
           .map(formatBet)
           .toList();
-        const openedMatchedBets = matchedBetsById
+        let openedMatchedBets = matchedBetsById
           .filter(filterRelatedBet)
           .map(formatBet)
           .toList();
 
+        // Sort the bets by id incrementally
+        openedUnmatchedBets = BettingModuleUtils.sortBetsById(openedUnmatchedBets);
+        openedMatchedBets = BettingModuleUtils.sortBetsById(openedMatchedBets);
+
         dispatch(
           MarketDrawerPrivateActions.getOpenBets(
             openedUnmatchedBets,

src/utility/BettingModuleUtils.js

@@ -428,6 +428,32 @@ var BettingModuleUtils = {
         }
       }
     }
+  },
+
+  /**
+   * Takes in an immutable list of bets and sorts them by id incrementally.
+   * @param {Immutable.List} bets
+   * @returns {Immutable.List} sorted.
+   */
+  sortBetsById: function(bets) {
+    const sorted = bets.sort((a, b) => {
+      // Split by .
+      const aId = a.get('id').split('.');
+      // Select the ending number of the id
+      const aIdEnd = parseInt(aId[2], 0);
+
+      const bId = b.get('id').split('.');
+      const bIdEnd = parseInt(bId[2], 0);
+
+      // Sort
+      if (aIdEnd < bIdEnd) {
+        return -1;
+      } else {
+        return 1;
+      }
+    });
+
+    return sorted;
   }
 };