fix: fixed merge conflicts

mrgnlabs · Oct 21, 2024 · 018a87d · 018a87d
1 parent 04a48a4
commit 018a87d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 21 deletions.
diff --git a/apps/marginfi-v2-trading/src/components/common/admin/admin-pool-card/admin-pool-card.tsx b/apps/marginfi-v2-trading/src/components/common/admin/admin-pool-card/admin-pool-card.tsx
@@ -3,12 +3,13 @@ import React from "react";
 import Image from "next/image";
 import Link from "next/link";
 
-import { numeralFormatter, tokenPriceFormatter, percentFormatter } from "@mrgnlabs/mrgn-common";
+import { numeralFormatter, tokenPriceFormatter, percentFormatter, shortenAddress } from "@mrgnlabs/mrgn-common";
 import { cn } from "@mrgnlabs/mrgn-utils";
 
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "~/components/ui/tooltip";
 import type { GroupData } from "~/store/tradeStore";
 import { Button } from "~/components/ui/button";
+import { IconExternalLink } from "@tabler/icons-react";
 
 type AdminPoolCardProps = {
   groupData: GroupData;
@@ -61,24 +62,15 @@ export const AdminPoolCard = ({ groupData, last }: AdminPoolCardProps) => {
         </>
       )}
       <div className="pl-5">
-        <TooltipProvider>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <Link href="https://x.com/marginfi" target="_blank">
-                <Image
-                  src="https://pbs.twimg.com/profile_images/1791110026456633344/VGViq-CJ_400x400.jpg"
-                  width={20}
-                  height={20}
-                  alt="marginfi"
-                  className="rounded-full"
-                />
-              </Link>
-            </TooltipTrigger>
-            <TooltipContent>
-              <p>Pool created by marginfi</p>
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
+        <Link
+          href={`https://solscan.io/account/${groupData.client.group.admin}`}
+          className="flex items-center gap-1.5"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          {shortenAddress(groupData.client.group.admin || "")}{" "}
+          <IconExternalLink size={15} className="-translate-y-[1px]" />
+        </Link>
       </div>
       <div className="flex items-center gap-2 justify-end">
         <Link href={`/admin/${groupData.client.group.address.toBase58()}`} className="w-full">

diff --git a/apps/marginfi-v2-trading/src/store/tradeStore.ts b/apps/marginfi-v2-trading/src/store/tradeStore.ts
@@ -153,7 +153,6 @@ type TradeStoreState = {
 const { programId } = getConfig();
 
 const USDC_MINT = new PublicKey("EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v");
-const LST_MINT = new PublicKey("LSTxxxnJzKDFSLr4dUkPcmCf5VyryEqzPLz5j4bpxFp");
 
 let fuse: Fuse<GroupData> | null = null;
 

diff --git a/apps/marginfi-v2-ui/src/components/common/Mint/MintCardWrapper.tsx b/apps/marginfi-v2-ui/src/components/common/Mint/MintCardWrapper.tsx
@@ -7,7 +7,6 @@ import { IconCheck, IconBell } from "@tabler/icons-react";
 import { MintCardProps } from "~/utils";
 import { useMrgnlendStore } from "~/store";
 import { ActionBox } from "@mrgnlabs/mrgn-ui";
-import { capture } from "@mrgnlabs/mrgn-utils";
 
 import { Button } from "~/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "~/components/ui/card";