Correct genesis time representation. Closes CodeChain-io#50

qria · Sep 12, 2018 · 26a651d · 26a651d
1 parent 16b84b0
commit 26a651d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/client/components/block/BlockList/BlockList.tsx b/src/client/components/block/BlockList/BlockList.tsx
@@ -67,7 +67,7 @@ class BlockList extends React.Component<Props, State> {
                                             </Col>
                                             <Col md="9">
                                                 <span className="timestamp float-right">
-                                                    {moment.unix(block.timestamp).format("YYYY-MM-DD HH:mm:ssZ")}
+                                                    {block.timestamp ? moment.unix(block.timestamp).format("YYYY-MM-DD HH:mm:ssZ") : 'Genesis'}
                                                 </span>
                                             </Col>
                                         </Row>

diff --git a/src/client/components/home/LatestBlocks/LatestBlocks.tsx b/src/client/components/home/LatestBlocks/LatestBlocks.tsx
@@ -44,7 +44,7 @@ const LatestBlocks = (props: Props) => {
                                         <CommaNumberString text={changeQuarkStringToCCC(block.miningReward)} />
                                         CCC
                                     </td>
-                                    <td>{moment.unix(block.timestamp).fromNow()}</td>
+                                    <td>{block.timestamp ? moment.unix(block.timestamp).fromNow() : 'Genesis'}</td>
                                 </tr>
                             );
                         })}

diff --git a/src/client/pages/Block/Block.tsx b/src/client/pages/Block/Block.tsx
@@ -85,7 +85,7 @@ class Block extends React.Component<Props, State> {
                                 Block <span className="block-number">#{block.number}</span>
                             </h1>
                             <span className="timestamp">
-                                {moment.unix(block.timestamp).format("YYYY-MM-DD HH:mm:ssZ")}
+                                {block.timestamp ? moment.unix(block.timestamp).format("YYYY-MM-DD HH:mm:ssZ") : 'Genesis'}
                             </span>
                         </div>
                     </Col>

diff --git a/src/client/pages/Blocks/Blocks.tsx b/src/client/pages/Blocks/Blocks.tsx
@@ -135,7 +135,7 @@ class Blocks extends React.Component<Props, State> {
                                                     />
                                                     CCC
                                                 </td>
-                                                <td>{moment.unix(block.timestamp).fromNow()}</td>
+                                                <td>{block.timestamp ? moment.unix(block.timestamp).fromNow() : 'Genesis'}</td>
                                             </tr>
                                         );
                                     })}