From 16d22d5f730e11549fb4c2659f833bf851a9fce1 Mon Sep 17 00:00:00 2001
From: Willian Mitsuda <wmitsuda@gmail.com>
Date: Thu, 29 Jul 2021 23:05:23 -0300
Subject: [PATCH] Column reorder; add column icons

---
 src/special/BlockRecord.tsx | 14 ++++++------
 src/special/Blocks.tsx      | 43 +++++++++++++++++++++++++------------
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/src/special/BlockRecord.tsx b/src/special/BlockRecord.tsx
index 01a499a..1cd20d4 100644
--- a/src/special/BlockRecord.tsx
+++ b/src/special/BlockRecord.tsx
@@ -21,7 +21,6 @@ const BlockRecord: React.FC<BlockRecordProps> = ({ block }) => {
       <div>
         <BlockLink blockTag={block.number} />
       </div>
-      <div className="text-right">{block.baseFeePerGas?.toString()} wei</div>
       <div
         className={`text-right ${
           block.gasUsed.gt(gasTarget)
@@ -33,6 +32,13 @@ const BlockRecord: React.FC<BlockRecordProps> = ({ block }) => {
       >
         {ethers.utils.commify(block.gasUsed.toString())}
       </div>
+      <div className="text-right">
+        {ethers.utils.commify(gasTarget.toString())}
+      </div>
+      <div className="text-right">{block.baseFeePerGas?.toString()} wei</div>
+      <div className="text-right col-span-2">
+        {ethers.utils.commify(ethers.utils.formatEther(totalReward))} Ether
+      </div>
       <div className="text-right">
         {ethers.utils.commify(
           ethers.utils.formatUnits(
@@ -42,12 +48,6 @@ const BlockRecord: React.FC<BlockRecordProps> = ({ block }) => {
         )}{" "}
         Gwei
       </div>
-      <div className="text-right">
-        {ethers.utils.commify(gasTarget.toString())}
-      </div>
-      <div className="text-right col-span-2">
-        {ethers.utils.commify(ethers.utils.formatEther(totalReward))} Ether
-      </div>
     </div>
   );
 };
diff --git a/src/special/Blocks.tsx b/src/special/Blocks.tsx
index e5deccc..575845f 100644
--- a/src/special/Blocks.tsx
+++ b/src/special/Blocks.tsx
@@ -2,7 +2,12 @@ import React, { useState, useEffect, useContext } from "react";
 import { ethers } from "ethers";
 import { Transition } from "@headlessui/react";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faBurn, faGasPump } from "@fortawesome/free-solid-svg-icons";
+import {
+  faBurn,
+  faCoins,
+  faCube,
+  faGasPump,
+} from "@fortawesome/free-solid-svg-icons";
 import BlockRecord from "./BlockRecord";
 import { ExtendedBlock, readBlock } from "../useErigonHooks";
 import { RuntimeContext } from "../useRuntime";
@@ -38,42 +43,52 @@ const Blocks: React.FC<BlocksProps> = ({ latestBlock }) => {
     <div className="w-full mb-auto">
       <div className="m-10 divide-y-2">
         <div className="grid grid-cols-8 px-3 py-2">
-          <div>Block</div>
-          <div className="text-right">Base fee</div>
+          <div className="flex space-x-1 items-baseline">
+            <span className="text-gray-500">
+              <FontAwesomeIcon icon={faCube} />
+            </span>
+            <span>Block</span>
+          </div>
           <div className="text-right flex space-x-1 justify-end items-baseline">
             <span className="text-gray-500">
               <FontAwesomeIcon icon={faGasPump} />
             </span>
             <span>Gas used</span>
           </div>
+          <div className="text-right">Gas target</div>
+          <div className="text-right">Base fee</div>
+          <div className="text-right col-span-2 flex space-x-1 justify-end items-baseline">
+            <span className="text-yellow-400">
+              <FontAwesomeIcon icon={faCoins} />
+            </span>
+            <span>Rewards</span>
+          </div>
           <div className="text-right flex space-x-1 justify-end items-baseline">
             <span className="text-orange-500">
               <FontAwesomeIcon icon={faBurn} />
             </span>
             <span>Burnt fees</span>
           </div>
-          <div className="text-right">Gas target</div>
-          <div className="text-right col-span-2">Rewards</div>
         </div>
         <div className="grid grid-cols-8 px-3 py-3 animate-pulse items-center">
           <div>
             <div className="w-20 h-4 bg-gray-200 rounded-md"></div>
           </div>
+          <div className="justify-self-end">
+            <div className="w-20 h-4 bg-gray-200 rounded-md"></div>
+          </div>
+          <div className="justify-self-end">
+            <div className="w-20 h-4 bg-gray-200 rounded-md"></div>
+          </div>
           <div className="justify-self-end">
             <div className="w-10 h-4 bg-gray-200 rounded-md"></div>
           </div>
-          <div className="justify-self-end">
-            <div className="w-20 h-4 bg-gray-200 rounded-md"></div>
-          </div>
-          <div className="justify-self-end">
-            <div className="w-36 h-4 bg-gray-200 rounded-md"></div>
-          </div>
-          <div className="justify-self-end">
-            <div className="w-20 h-4 bg-gray-200 rounded-md"></div>
-          </div>
           <div className="justify-self-end col-span-2">
             <div className="w-56 h-4 bg-gray-200 rounded-md"></div>
           </div>
+          <div className="justify-self-end">
+            <div className="w-36 h-4 bg-gray-200 rounded-md"></div>
+          </div>
         </div>
         {blocks.map((b, i) => (
           <Transition