khalid/statement issues

src/common/rivetsExtra.es6

@@ -67,7 +67,7 @@ rv.formatters['has-value'] = hasValue;
 /* localise price format*/
 rv.formatters['format-price'] = (value, currency) => hasValue(value) ? formatPrice(value, currency) : undefined;
 /* comma added format*/
-rv.formatters['add-comma'] = (value, decimal_points) => (parseFloat(value)) ?  addComma(value, decimal_points) : undefined;
+rv.formatters['add-comma'] = (value, decimal_points) => value ?  addComma(value, decimal_points) : undefined;
 /* rivets formater to capitalize string */
 rv.formatters.capitalize = {
    read: (value) => _.capitalize(value),

src/statement/statement.es6

@@ -30,6 +30,7 @@ export const init = ($menuLink) => {
 
 let loading = false;
 let is_specific_date_shown = false; /* is data for a specific date is shown */
+let scroll_end_reached = false;
 
 const refreshTable  = (yyy_mm_dd) => {
    const processing_msg = $('#' + table.attr('id') + '_processing').css('top','200px').show();
@@ -79,6 +80,7 @@ const refreshTable  = (yyy_mm_dd) => {
       table.api().rows.add(rows);
       table.api().draw();
       loading = false;
+      if (data.statement.count === 0) scroll_end_reached = true;
       processing_msg.hide();
    };
 
@@ -97,6 +99,7 @@ const refreshTable  = (yyy_mm_dd) => {
 }
 
 const initStatement = () => {
+   scroll_end_reached = false;
    statement = windows.createBlankWindow($('<div/>'), {
       title: 'Statement'.i18n(),
       dialogClass: 'statement',
@@ -173,7 +176,7 @@ const initStatement = () => {
          innerHeight = statement.innerHeight(),
          scrollHeight = statement[0].scrollHeight,
          postion = (scrollTop + innerHeight) / scrollHeight;
-      if(postion > 0.75 && !loading && !is_specific_date_shown){
+      if(postion > 0.75 && !loading && !is_specific_date_shown && !scroll_end_reached){
          refreshTable({clear:false});
       }
    });

src/viewtransaction/viewTransaction.es6

@@ -45,6 +45,12 @@ const showMarketDataDisruptionWindow = () => {
    window.dd = market_data_disruption_win;
 };
 
+const countDecimals = (value) => {
+  if ((value % 1) !== 0) 
+      return value.toString().split(".")[1].length;  
+  return 0;
+};
+
 const initChart = (root, state, options) => {
    let data = [];
    let type = '';
@@ -233,11 +239,11 @@ const updateIndicative = (data, state) => {
     state.proposal_open_contract.current_spot = contract.current_spot;
     state.proposal_open_contract.current_spot_time = contract.current_spot_time;
     state.proposal_open_contract.bid_price = contract.bid_price;
-    state.proposal_open_contract.entry_tick = contract.entry_tick;
+    state.proposal_open_contract.entry_tick = countDecimals(contract.entry_tick) < 3 ? contract.entry_tick.toFixed(3) : contract.entry_tick;
     state.proposal_open_contract.entry_tick_time = contract.entry_tick_time;
     state.proposal_open_contract.status = contract.status;
     state.proposal_open_contract.is_sold = contract.is_sold;
-    state.proposal_open_contract.exit_tick = contract.exit_tick;
+    state.proposal_open_contract.exit_tick = countDecimals(contract.exit_tick) < 3 ? contract.exit_tick.toFixed(3) : contract.exit_tick;
     state.proposal_open_contract.exit_tick_time = contract.exit_tick_time;
     state.proposal_open_contract.date_expiry = contract.date_expiry;
     state.proposal_open_contract.sell_price = contract.sell_price;