From d94532b1d911d28f687c6aafb5dd031741f86983 Mon Sep 17 00:00:00 2001 From: RealOrangeOne Date: Fri, 11 Mar 2016 10:32:32 +0000 Subject: [PATCH] use moment plugin to calculate duration --- app/components/app.js | 2 ++ app/components/projects/ProjectItem.js | 7 +++---- package.json | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/components/app.js b/app/components/app.js index c8d65ea..0455a62 100644 --- a/app/components/app.js +++ b/app/components/app.js @@ -5,6 +5,8 @@ import RouteMapper from './navigation/RouteMapper'; import GlobalStyles from '../settings/styles'; import BusyIndicator from 'react-native-busy-indicator'; +require('moment-duration-format'); + const { Navigator, StyleSheet, diff --git a/app/components/projects/ProjectItem.js b/app/components/projects/ProjectItem.js index 9fb76d2..afb29e1 100644 --- a/app/components/projects/ProjectItem.js +++ b/app/components/projects/ProjectItem.js @@ -1,6 +1,7 @@ import React from 'react-native'; import GlobalStyles from '../../settings/styles'; import { getProjectRecentBuilds } from '../../api/CircleCI'; +import moment from 'moment'; const { View, @@ -68,10 +69,8 @@ export default class ProjectItem extends React.Component { } _displayMoreInfo(mostRecentBuild) { - let seconds = Math.floor(mostRecentBuild.build_time_millis / 1000); - const minutes = Math.floor(seconds / 60); - seconds = seconds - (minutes * 60); - const buildTime = minutes + ':' + seconds; + const mask = mostRecentBuild.build_time_millis <= 60000 ? 'ss[s]' : 'm:ss'; + const buildTime = moment.duration(mostRecentBuild.build_time_millis, 'ms').format(mask); const commit = mostRecentBuild.all_commit_details[0]; return ( diff --git a/package.json b/package.json index 170d79b..8cf5fa6 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "dependencies": { "immutable": "=3.7.6", "moment": "=2.11.2", + "moment-duration-format": "=1.3.0", "react-native": "=0.20.0", "react-native-busy-indicator": "=1.0.6", "react-native-modalbox": "=1.3.1",