pg: minor tweaks

glamsystems · Oct 6, 2024 · 1a17605 · 1a17605
1 parent 12857a4
commit 1a17605
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/anchor/src/client/base.ts b/anchor/src/client/base.ts
@@ -777,7 +777,7 @@ export class BaseClient {
       openfundsMetadataId: fundAccount.openfunds.toBase58(),
       fundUri: `https://playground.glam.systems/products/${fundPDA}`,
       //@ts-ignore
-      imageKey: (fundModel.shareClasses[0]?.id || fundPDA).toBase58(),
+      imageKey: (fundAccount.shareClasses[0] || fundPDA).toBase58(),
       ...this.getOpenfundsFromAccounts(fundAccount, openfundsAccount, [
         firstShareClass,
       ]),

diff --git a/playground/src/app/access/components/columns.tsx b/playground/src/app/access/components/columns.tsx
@@ -7,6 +7,7 @@ import { DataTableColumnHeader } from "./data-table-column-header";
 import { DataTableRowActions } from "./data-table-row-actions";
 import Sparkle from "../../../utils/Sparkle";
 import TruncateAddress from "@/utils/TruncateAddress";
+import { ExplorerLink } from "@/components/ExplorerLink";
 
 const tagColors: Record<string, string> = {
   stake:
@@ -28,24 +29,29 @@ interface KeyData {
 
 // Use the defined type in ColumnDef
 export const columns: ColumnDef<KeyData>[] = [
-  {
-    accessorKey: "label",
-    header: ({ column }) => (
-      <DataTableColumnHeader column={column} title="Label" />
-    ),
-    cell: ({ row }) => (
-      <div className="w-[100px] truncate">{row.getValue("label")}</div>
-    ),
-    enableSorting: true,
-    enableHiding: false,
-  },
+  // {
+  //   accessorKey: "label",
+  //   header: ({ column }) => (
+  //     <DataTableColumnHeader column={column} title="Label" />
+  //   ),
+  //   cell: ({ row }) => (
+  //     <div className="w-[100px] truncate">{row.getValue("label")}</div>
+  //   ),
+  //   enableSorting: true,
+  //   enableHiding: false,
+  // },
   {
     accessorKey: "pubkey",
     header: ({ column }) => (
       <DataTableColumnHeader column={column} title="Key" />
     ),
     cell: ({ row }) => (
-      <div className="w-[100px] truncate">{row.getValue("pubkey")}</div>
+      <div className="w-[100px]">
+        <ExplorerLink
+          path={`/account/${row.getValue("pubkey")}`}
+          label={row.getValue("pubkey")}
+        />
+      </div>
     ),
     enableSorting: false,
     enableHiding: false,
@@ -58,12 +64,12 @@ export const columns: ColumnDef<KeyData>[] = [
     cell: ({ row }) => {
       const tags = row.getValue("tags") as KeyData["tags"];
       return (
-        <div className="flex space-x-2">
+        <div className="space-x-2">
           {tags.map((tag) => (
             <Badge
               key={tag}
               variant="default"
-              className={`pointer-events-none capitalize font-normal rounded-none dark:bg-opacity-25 ${tagColors[tag]}`}
+              className={`my-1 pointer-events-none capitalize font-normal rounded-none dark:bg-opacity-25 ${tagColors[tag]}`}
             >
               {tag}
             </Badge>

diff --git a/playground/src/components/ExplorerLink.tsx b/playground/src/components/ExplorerLink.tsx
@@ -23,7 +23,6 @@ export function ExplorerLink({
   explorer?: string;
 }) {
   const cluster = useCluster();
-  console.log(cluster);
   let href = cluster.getExplorerUrl(path);
   if (explorer == "solana.fm") {
     href = href
@@ -35,6 +34,9 @@ export function ExplorerLink({
       href={href}
       target="_blank"
       rel="noopener noreferrer"
+      onClick={(e) => {
+        e.stopPropagation();
+      }}
       className={className ? className : `link font-mono`}
     >
       {ellipsify(label)}