TimeTilAvailable for force closed channels: Throw error on NaN input and move field down.

Author: valentinewallace

src/helper.js

@@ -329,8 +329,12 @@ export const generateArc = (x, y, radius, startAngle, endAngle) => {
  * @return {string} The amount of time the blocks is equivalent to.
  */
 export const getTimeTilAvailable = numBlocks => {
-  const days = Math.floor(numBlocks / (24 * 6));
-  const hours = Math.floor((numBlocks % (24 * 6)) / 6);
+  let num = Number(numBlocks);
+  if (isNaN(num)) {
+    throw new Error('Invalid input!');
+  }
+  const days = Math.floor(num / (24 * 6));
+  const hours = Math.floor((num % (24 * 6)) / 6);
   const daysString = days === 1 ? 'day' : 'days';
   const hoursString = hours === 1 ? 'hour' : 'hours';
   return `${days} ${daysString} and ${hours} ${hoursString}`;

src/view/channel-detail.js

@@ -42,17 +42,17 @@ const ChannelDetailView = ({ store, nav }) => (
             {store.selectedChannel.closingTxId}
           </DetailField>
         ) : null}
-        {store.selectedChannel.timeTilAvailable ? (
-          <DetailField name="Time Til Available">
-            {store.selectedChannel.timeTilAvailable}
-          </DetailField>
-        ) : null}
         <DetailField name="Remote Node Public Key">
           {store.selectedChannel.remotePubkey}
         </DetailField>
         <DetailField name="Status">
           {store.selectedChannel.statusLabel}
         </DetailField>
+        {store.selectedChannel.timeTilAvailable ? (
+          <DetailField name="Time Til Available">
+            {store.selectedChannel.timeTilAvailable}
+          </DetailField>
+        ) : null}
         <DetailField name="Capacity">
           {store.selectedChannel.capacityLabel} {store.unitLabel}
         </DetailField>

test/unit/helper.spec.js

@@ -825,9 +825,12 @@ describe('Helpers Unit Tests', () => {
       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 error on undefined', () => {
+      expect(
+        helpers.getTimeTilAvailable.bind(undefined),
+        'to throw',
+        /Invalid/
+      );
     });
 
     it('should work for 1 day and 1 hour', () => {