Fix internal market trade history rendering

src/app/components/pages/Market.jsx

@@ -13,8 +13,8 @@ import TransactionError from 'app/components/elements/TransactionError';
 import DepthChart from 'app/components/elements/DepthChart';
 import Orderbook from 'app/components/elements/Orderbook';
 import OrderHistory from 'app/components/elements/OrderHistory';
-import { Order } from 'app/utils/MarketOrder';
-import { TradeHistory } from 'app/utils/MarketTradeHistory';
+import { MarketOrder } from 'app/utils/MarketOrder';
+import { MarketTradeHistory } from 'app/utils/MarketTradeHistory';
 import { roundUp, roundDown } from 'app/utils/MarketUtils';
 import tt from 'counterpart';
 import {
@@ -269,7 +269,7 @@ class Market extends React.Component {
             if (typeof orders == 'undefined') return { bids: [], asks: [] };
             return ['bids', 'asks'].reduce((out, side) => {
                 out[side] = orders[side].map((o) => {
-                    return new Order(o, side);
+                    return new MarketOrder(o, side);
                 });
                 return out;
             }, {});
@@ -423,10 +423,11 @@ class Market extends React.Component {
             if (!trades || !trades.length) {
                 return [];
             }
+
             // eslint-disable-next-line no-shadow
             const norm = (trades) => {
                 return trades.map((t) => {
-                    return new TradeHistory(t);
+                    return new MarketTradeHistory(t);
                 });
             };
 

src/app/redux/MarketReducer.js

@@ -62,7 +62,7 @@ export default function reducer(state = defaultState, action = {}) {
             return state.set('history', payload);
 
         case APPEND_TRADE_HISTORY:
-            return state.set('history', [...payload, ...state.get('history')]);
+            return state.set('history', [...state.get('history'), ...payload]);
 
         case TOGGLE_OPEN_ORDERS_SORT:
             const toggledColumn = action.payload.column || 'created';

src/app/redux/MarketSaga.js

@@ -17,7 +17,6 @@ export const wait = (ms) => new Promise((resolve) => {
     });
 
 let polling = false;
-let last_trade = null;
 
 export function* fetchMarket(location_change_action) {
     const { pathname } = location_change_action.payload;
@@ -26,7 +25,7 @@ export function* fetchMarket(location_change_action) {
         return;
     }
 
-    if (polling == true) return;
+    if (polling === true) return;
     polling = true;
 
     while (polling) {
@@ -34,26 +33,8 @@ export function* fetchMarket(location_change_action) {
             const state = yield call([api, api.getOrderBookAsync], 500);
             yield put(marketActions.receiveOrderbook(state));
 
-            let trades;
-            if (last_trade == null) {
-                trades = yield call([api, api.getRecentTradesAsync], 25);
-                yield put(marketActions.receiveTradeHistory(trades));
-            } else {
-                const start = last_trade.toISOString().slice(0, -5);
-                trades = yield call(
-                    [api, api.getTradeHistoryAsync],
-                    start,
-                    '1969-12-31T23:59:59',
-                    1000
-                );
-                trades = trades.reverse();
-                yield put(marketActions.appendTradeHistory(trades));
-            }
-            if (trades.length > 0) {
-                last_trade = new Date(
-                    new Date(Date.parse(trades[0].date)).getTime() + 1000
-                );
-            }
+            const trades = yield call([api, api.getRecentTradesAsync], 1000);
+            yield put(marketActions.receiveTradeHistory(trades));
 
             const state3 = yield call([api, api.getTickerAsync]);
             yield put(marketActions.receiveTicker(state3));

src/app/utils/MarketOrder.js

@@ -2,7 +2,7 @@ import { roundDown, roundUp } from './MarketUtils';
 
 const precision = 1000;
 
-export class Order {
+export class MarketOrder {
     constructor(order, side) {
         this.side = side;
         this.price = parseFloat(order.real_price);
@@ -40,7 +40,7 @@ export class Order {
     }
 
     add(order) {
-        return new Order(
+        return new MarketOrder(
             {
                 real_price: this.price,
                 hive: this.hive + order.hive,
@@ -60,4 +60,4 @@ export class Order {
     }
 }
 
-export default Order;
+export default MarketOrder;