From fe336c5c4327b0bfe3e4f83a0c20ee6b26df9fbe Mon Sep 17 00:00:00 2001
From: Willian Mitsuda <wmitsuda@gmail.com>
Date: Mon, 6 Sep 2021 03:43:20 -0300
Subject: [PATCH] Refactorings

---
 src/AddressTransactions.tsx | 16 ++++++---------
 src/Transaction.tsx         | 21 +++++++++++---------
 src/address/Contracts.tsx   | 39 +++++++++++++++++++++----------------
 src/components/NavTab.tsx   | 23 ++++++++++++----------
 src/components/TabGroup.tsx |  7 -------
 5 files changed, 53 insertions(+), 53 deletions(-)
 delete mode 100644 src/components/TabGroup.tsx

diff --git a/src/AddressTransactions.tsx b/src/AddressTransactions.tsx
index cb17b4b..659c1eb 100644
--- a/src/AddressTransactions.tsx
+++ b/src/AddressTransactions.tsx
@@ -216,16 +216,12 @@ const AddressTransactions: React.FC = () => {
             </StandardSubtitle>
             <Tab.Group>
               <Tab.List className="flex space-x-2 border-l border-r border-t rounded-t-lg bg-white">
-                <Tab as={Fragment}>
-                  <NavTab href={`/address/${checksummedAddress}`}>
-                    Overview
-                  </NavTab>
-                </Tab>
-                <Tab as={Fragment}>
-                  <NavTab href={`/address/${checksummedAddress}/contract`}>
-                    Contract
-                  </NavTab>
-                </Tab>
+                <NavTab href={`/address/${checksummedAddress}`}>
+                  Overview
+                </NavTab>
+                <NavTab href={`/address/${checksummedAddress}/contract`}>
+                  Contract
+                </NavTab>
               </Tab.List>
               <Tab.Panels>
                 <Switch>
diff --git a/src/Transaction.tsx b/src/Transaction.tsx
index 63ec3ca..e204633 100644
--- a/src/Transaction.tsx
+++ b/src/Transaction.tsx
@@ -1,9 +1,9 @@
 import React, { useMemo, useContext } from "react";
 import { Route, Switch, useParams } from "react-router-dom";
+import { Tab } from "@headlessui/react";
 import StandardFrame from "./StandardFrame";
 import StandardSubtitle from "./StandardSubtitle";
 import ContentFrame from "./ContentFrame";
-import TabGroup from "./components/TabGroup";
 import NavTab from "./components/NavTab";
 import Details from "./transaction/Details";
 import Logs from "./transaction/Logs";
@@ -56,14 +56,17 @@ const Transaction: React.FC = () => {
       )}
       {txData && (
         <SelectionContext.Provider value={selectionCtx}>
-          <TabGroup>
-            <NavTab href={`/tx/${txhash}`}>Overview</NavTab>
-            {txData.confirmedData?.blockNumber !== undefined && (
-              <NavTab href={`/tx/${txhash}/logs`}>
-                Logs{txData && ` (${txData.confirmedData?.logs?.length ?? 0})`}
-              </NavTab>
-            )}
-          </TabGroup>
+          <Tab.Group>
+            <Tab.List className="flex space-x-2 border-l border-r border-t rounded-t-lg bg-white">
+              <NavTab href={`/tx/${txhash}`}>Overview</NavTab>
+              {txData.confirmedData?.blockNumber !== undefined && (
+                <NavTab href={`/tx/${txhash}/logs`}>
+                  Logs
+                  {txData && ` (${txData.confirmedData?.logs?.length ?? 0})`}
+                </NavTab>
+              )}
+            </Tab.List>
+          </Tab.Group>
           <Switch>
             <Route path="/tx/:txhash/" exact>
               <Details
diff --git a/src/address/Contracts.tsx b/src/address/Contracts.tsx
index 892fe67..5237320 100644
--- a/src/address/Contracts.tsx
+++ b/src/address/Contracts.tsx
@@ -1,5 +1,6 @@
-import React, { useState, useEffect, useContext } from "react";
-import { ethers } from "ethers";
+import React, { useState, useEffect, useContext, Fragment } from "react";
+import { commify } from "@ethersproject/units";
+import { Tab } from "@headlessui/react";
 import ContentFrame from "../ContentFrame";
 import InfoRow from "../components/InfoRow";
 import Contract from "./Contract";
@@ -40,7 +41,7 @@ const Contracts: React.FC<ContractsProps> = ({
               <span>
                 <span className="font-bold text-green-600">Yes</span> with{" "}
                 <span className="font-bold text-green-600">
-                  {ethers.utils.commify(optimizer?.runs)}
+                  {commify(optimizer?.runs)}
                 </span>{" "}
                 runs
               </span>
@@ -56,20 +57,24 @@ const Contracts: React.FC<ContractsProps> = ({
         )}
         {rawMetadata !== undefined && rawMetadata !== null && (
           <div>
-            <div className="flex truncate">
-              {Object.entries(rawMetadata.sources).map(([k]) => (
-                <button
-                  className={`border-b-2 border-transparent rounded-t text-sm px-2 py-1 ${
-                    selected === k
-                      ? "border-orange-300 font-bold bg-gray-200 text-gray-500"
-                      : "hover:border-orange-200 bg-gray-100 hover:text-gray-500 text-gray-400 transition-transform transition-colors duration-75 transform origin-bottom scale-95 hover:scale-100"
-                  }`}
-                  onClick={() => setSelected(k)}
-                >
-                  {k}
-                </button>
-              ))}
-            </div>
+            <Tab.Group>
+              <Tab.List className="flex truncate">
+                {Object.entries(rawMetadata.sources).map(([k]) => (
+                  <Tab key={k} as={Fragment}>
+                    <button
+                      className={`border-b-2 border-transparent rounded-t text-sm px-2 py-1 ${
+                        selected === k
+                          ? "border-orange-300 font-bold bg-gray-200 text-gray-500"
+                          : "hover:border-orange-200 bg-gray-100 hover:text-gray-500 text-gray-400 transition-transform transition-colors duration-75 transform origin-bottom scale-95 hover:scale-100"
+                      }`}
+                      onClick={() => setSelected(k)}
+                    >
+                      {k}
+                    </button>
+                  </Tab>
+                ))}
+              </Tab.List>
+            </Tab.Group>
             {selected && (
               <Contract
                 checksummedAddress={checksummedAddress}
diff --git a/src/components/NavTab.tsx b/src/components/NavTab.tsx
index c3b6d54..83cf6d8 100644
--- a/src/components/NavTab.tsx
+++ b/src/components/NavTab.tsx
@@ -1,20 +1,23 @@
-import React from "react";
+import React, { Fragment } from "react";
 import { NavLink } from "react-router-dom";
+import { Tab } from "@headlessui/react";
 
 type NavTabProps = {
   href: string;
 };
 
 const NavTab: React.FC<NavTabProps> = ({ href, children }) => (
-  <NavLink
-    className="text-gray-500 border-transparent hover:text-link-blue text-sm font-bold px-3 py-3 border-b-2"
-    activeClassName="text-link-blue border-link-blue"
-    to={href}
-    exact
-    replace
-  >
-    {children}
-  </NavLink>
+  <Tab as={Fragment}>
+    <NavLink
+      className="text-gray-500 border-transparent hover:text-link-blue text-sm font-bold px-3 py-3 border-b-2"
+      activeClassName="text-link-blue border-link-blue"
+      to={href}
+      exact
+      replace
+    >
+      {children}
+    </NavLink>
+  </Tab>
 );
 
 export default NavTab;
diff --git a/src/components/TabGroup.tsx b/src/components/TabGroup.tsx
deleted file mode 100644
index f1bdecb..0000000
--- a/src/components/TabGroup.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-const TabGroup: React.FC = ({ children }) => (
-  <div className="flex space-x-2 border-l border-r border-t rounded-t-lg bg-white">
-    {children}
-  </div>
-);
-
-export default TabGroup;