Merge pull request #246 from royshouvik/fix-sorting-issues

Fix incorrect sorting order

Author: tladendo

components/ChallengeCardContainer/sortingFunctionStore.js

@@ -2,12 +2,12 @@ const getTimeStamp = dateTime => new Date(dateTime).getTime();
 
 export default {
   'Most recent': item => -getTimeStamp(item.submissionEndTimestamp),
-  'Time to register': item => getTimeStamp(item.registrationEndDate),
+  'Time to register': item => getTimeStamp(item.registrationEndDate || item.submissionEndDate),
   'Time to submit': item => item.submissionEndTimestamp,
   'Phase end time': item => item.currentPhaseRemainingTime,
   '# of registrants': item => -item.numRegistrants,
   '# of submissions': item => -item.numSubmissions,
   'Prize high to low': item => -item.totalPrize,
-  'Title A-Z': item => item.challengeName,
+  'Title A-Z': item => item.name,
   'Current phase': item => item.status,
 };

components/ChallengeStatus/ChallengeStatus.jsx

@@ -36,12 +36,12 @@ const getTimeLeft = (date, currentPhase) => {
   }
   const duration = moment.duration(moment(date).diff(moment()));
   const h = duration.hours();
-  const d = duration.days();
+  const d = duration.asDays();
   const m = duration.minutes();
   const late = (d < 0 || h < 0 || m < 0);
   const suffix = h !== 0 ? 'h' : 'min';
   let text = '';
-  if (d !== 0) text += `${Math.abs(d)}d `;
+  if (d !== 0) text += `${Math.abs(parseInt(d, 10))}d `;
   if (h !== 0) text += `${Math.abs(h)}`;
   if (h !== 0 && m !== 0) text += ':';
   if (m !== 0) text += `${Math.abs(m)}`;