Refactor portal columns and constants, update portal components to us…

…e new constants and column definitions
Consensys · Dec 5, 2024 · 9b79dfa · 9b79dfa
1 parent a67eede
commit 9b79dfa
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 24 deletions.
diff --git a/explorer/src/constants/columns/portal.tsx b/explorer/src/constants/columns/portal.tsx
@@ -6,7 +6,7 @@ import { Chain } from "viem";
 import { TdHandler } from "@/components/DataTable/components/TdHandler";
 import { HelperIndicator } from "@/components/HelperIndicator";
 import { Link } from "@/components/Link";
-import { EMPTY_0X_STRING, EMPTY_STRING, ZERO } from "@/constants";
+import { EMPTY_STRING, ZERO, ZERO_ADDRESS } from "@/constants";
 import { toPortalById } from "@/routes/constants";
 import { getBlockExplorerLink } from "@/utils";
 import { cropString } from "@/utils/stringUtils";
@@ -72,13 +72,13 @@ export const portalColumnsOption = {
 export const skeletonPortals = (count: number) =>
   Array(count)
     .fill(null)
-    .map((_, index) => ({
-      id: `0x${index.toString(16).padStart(40, "0")}` as `0x${string}`,
+    .map(() => ({
+      id: ZERO_ADDRESS,
       name: EMPTY_STRING,
       description: EMPTY_STRING,
-      ownerAddress: `${EMPTY_0X_STRING}${"0".repeat(40)}` as `0x${string}`,
+      ownerAddress: ZERO_ADDRESS,
       ownerName: EMPTY_STRING,
-      modules: [] as `0x${string}`[],
+      modules: [],
       isRevocable: false,
       attestationCounter: ZERO,
     }));
diff --git a/explorer/src/constants/index.ts b/explorer/src/constants/index.ts
@@ -10,6 +10,7 @@ export const DASH = "-";
 export const ZERO_STRING = "0";
 export const TEN = 10;
 export const ZERO = 0;
+export const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000" as `0x${string}`;
 export const ITEMS_PER_PAGE_DEFAULT = 10;
 export const ITEMS_SEARCHED_DEFAULT = 100;
 export const CURRENT_PAGE_DEFAULT = 1;

diff --git a/explorer/src/pages/Issuer/components/Portals/index.tsx b/explorer/src/pages/Issuer/components/Portals/index.tsx
@@ -20,12 +20,7 @@ export const Portals: React.FC<IPortalProps> = ({ address }) => {
   const location = useLocation();
 
   const { data: portals } = useSWR(`${SWRKeys.GET_PORTALS_BY_ISSUER}/${address}`, () =>
-    sdk.portal.findBy(undefined, undefined, { ownerAddress: address }).then((portalList) =>
-      portalList.map((portal) => ({
-        ...portal,
-        id: portal.id as `0x${string}`,
-      })),
-    ),
+    sdk.portal.findBy(undefined, undefined, { ownerAddress: address }),
   );
 
   if (!portals) return null;
@@ -49,22 +44,22 @@ export const Portals: React.FC<IPortalProps> = ({ address }) => {
             </tr>
           </thead>
           <tbody className="divide-y">
-            {portals.map(({ id, name, description, attestationCounter }) => (
-              <tr key={id}>
+            {portals.map((portal) => (
+              <tr key={portal.id}>
                 <td className="px-6 py-4 whitespace-nowrap text-xs font-medium">
                   <Button
-                    name={name}
+                    name={portal.name}
                     handler={() =>
-                      navigate(toPortalById(id).replace(CHAIN_ID_ROUTE, network), {
+                      navigate(toPortalById(portal.id).replace(CHAIN_ID_ROUTE, network), {
                         state: { from: location.pathname },
                       })
                     }
                     buttonType={EButtonType.TRANSPARENT}
                     iconRight={<ArrowRight />}
                   />
                 </td>
-                <td className="px-6 py-4 whitespace-nowrap text-xs">{description}</td>
-                <td className="px-6 py-4 whitespace-nowrap text-xs font-medium">{attestationCounter}</td>
+                <td className="px-6 py-4 whitespace-nowrap text-xs">{portal.description}</td>
+                <td className="px-6 py-4 whitespace-nowrap text-xs font-medium">{portal.attestationCounter}</td>
               </tr>
             ))}
           </tbody>

diff --git a/explorer/src/pages/Module/components/ModulePortals/index.tsx b/explorer/src/pages/Module/components/ModulePortals/index.tsx
@@ -19,13 +19,7 @@ export const ModulePortals: React.FC<{ moduleId: Address }> = ({ moduleId }) =>
 
   const { data: portals, isLoading } = useSWR(
     `${SWRKeys.GET_MODULE_PORTAL_LIST}/${moduleId}/${chain.id}`,
-    async () => {
-      const portalList = await sdk.portal.findBy(5, 0, { modules_contains: [moduleId] }, "attestationCounter", "desc");
-      return portalList.map((portal) => ({
-        ...portal,
-        id: portal.id as `0x${string}`,
-      }));
-    },
+    async () => sdk.portal.findBy(undefined, undefined, { modules_contains: [moduleId] }),
     {
       shouldRetryOnError: false,
     },