Refactor force close Time Til Available and add add'l tests.

Author: valentinewallace

src/action/channel.js

@@ -3,7 +3,7 @@
  * call the corresponding GRPC apis for channel management.
  */
 
-import { toSatoshis, poll, formatTimeTilMaturity } from '../helper';
+import { toSatoshis, poll, getTimeTilAvailable } from '../helper';
 import * as log from './log';
 
 class ChannelAction {
@@ -160,7 +160,7 @@ class ChannelAction {
         limboBalance: pfcc.limboBalance,
         maturityHeight: pfcc.maturityHeight,
         blocksTilMaturity: pfcc.blocksTilMaturity,
-        timeTilAvailable: formatTimeTilMaturity(pfcc.blocksTilMaturity),
+        timeTilAvailable: getTimeTilAvailable(pfcc.blocksTilMaturity),
         status: 'pending-force-closing',
       }));
       const wccs = response.waitingCloseChannels.map(wcc => ({

src/helper.js

@@ -328,8 +328,10 @@ export const generateArc = (x, y, radius, startAngle, endAngle) => {
  * @param  {number} numBlocks The number of blocks to convert.
  * @return {string} The amount of time the blocks is equivalent to.
  */
-export const formatTimeTilMaturity = numBlocks => {
+export const getTimeTilAvailable = numBlocks => {
   const days = Math.floor(numBlocks / (24 * 6));
   const hours = Math.floor((numBlocks % (24 * 6)) / 6);
-  return `${days} days and ${hours} hours`;
+  const daysString = days === 1 ? 'day' : 'days';
+  const hoursString = hours === 1 ? 'hour' : 'hours';
+  return `${days} ${daysString} and ${hours} ${hoursString}`;
 };

src/view/channel-detail.js

@@ -42,7 +42,7 @@ const ChannelDetailView = ({ store, nav }) => (
             {store.selectedChannel.closingTxId}
           </DetailField>
         ) : null}
-        {store.selectedChannel.blocksTilMaturity ? (
+        {store.selectedChannel.timeTilAvailable ? (
           <DetailField name="Time Til Available">
             {store.selectedChannel.timeTilAvailable}
           </DetailField>

test/unit/helper.spec.js

@@ -818,11 +818,28 @@ describe('Helpers Unit Tests', () => {
     });
   });
 
-  describe('formatTimeTilMaturity()', () => {
+  describe('getTimeTilAvailable()', () => {
     it('should format blocks to human-readable time', () => {
       const numBlocks = 463;
-      const time = helpers.formatTimeTilMaturity(numBlocks);
+      const time = helpers.getTimeTilAvailable(numBlocks);
       expect(time, 'to equal', '3 days and 5 hours');
     });
+
+    it('should show NaN for undefined', () => {
+      const time = helpers.getTimeTilAvailable(undefined);
+      expect(time, 'to equal', 'NaN days and NaN hours');
+    });
+
+    it('should work for 1 day and 1 hour', () => {
+      const numBlocks = 150;
+      const time = helpers.getTimeTilAvailable(numBlocks);
+      expect(time, 'to equal', '1 day and 1 hour');
+    });
+
+    it('should work for 0', () => {
+      const numBlocks = 0;
+      const time = helpers.getTimeTilAvailable(numBlocks);
+      expect(time, 'to equal', '0 days and 0 hours');
+    });
   });
 });