Merge pull request #516 from elizaOS/develop

ship

Author: JoeyKhd

packages/client/src/components/grid-view.tsx

@@ -28,22 +28,22 @@ export const GridItem = ({ token }: { token: IToken }) => {
         <div className="absolute left-0 bottom-0 p-2 px-3 w-full z-10">
           <div className="flex items-center gap-4 justify-between">
             <div className="flex items-center gap-2 w-full min-w-0">
-              <div className="bg-autofun-background-muted/65 px-1 text-autofun-text-primary text-lg font-bold font-dm-mono uppercase leading-normal tracking-widest truncate min-w-0 drop-shadow-[0_0px_2px_rgba(0,0,0,0.4)] z-[2]">
+              <div className="bg-autofun-background-muted/65 px-1 text-autofun-text-primary text-base md:text-md xl:text-xl font-bold font-dm-mono uppercase leading-normal tracking-widest truncate min-w-0 drop-shadow-[0_0px_2px_rgba(0,0,0,0.4)] z-[2]">
                 ${token.ticker}
               </div>
               <Verified isVerified={token?.verified ? true : false} />
             </div>
-            <div className="bg-autofun-background-muted/65 px-1 text-autofun-text-primary text-lg shrink-0 font-medium font-dm-mono drop-shadow-[0_0px_2px_rgba(0,0,0,0.4)] z-[2]">
+            <div className="bg-autofun-background-muted/65 px-1 text-autofun-text-primary text-base md:text-lg xl:text-xl font-medium shrink-0 font-dm-mono drop-shadow-[0_0px_2px_rgba(0,0,0,0.4)] z-[2]">
               {fromNow(token.createdAt, true)}
             </div>
           </div>
         </div>
         <div className="flex flex-col w-full min-w-0 z-10">
           <div className="absolute flex flex-col top-0 right-0 p-2 px-3 items-end min-w-0 gap-2">
-            <div className="bg-autofun-background-muted/65 px-1 text-autofun-text-highlight text-xl font-medium font-dm-mono leading-7 truncate drop-shadow-[0_0px_2px_rgba(0,0,0,0.4)] z-[2]">
+            <div className="bg-autofun-background-muted/65 px-1 text-autofun-text-highlight text-base md:text-lg xl:text-xl font-medium font-dm-mono leading-7 truncate drop-shadow-[0_0px_2px_rgba(0,0,0,0.4)] z-[2]">
               MC {abbreviateNumber(token.marketCapUSD)}
             </div>
-            <div className="bg-autofun-background-muted/65 px-1 text-autofun-text-primary text-xl font-medium font-dm-mono leading-7 truncate drop-shadow-[0_0px_2px_rgba(0,0,0,0.4)] z-[2]">
+            <div className="bg-autofun-background-muted/65 px-1 text-autofun-text-primary text-base md:text-lg xl:text-xl font-medium font-dm-mono leading-7 truncate drop-shadow-[0_0px_2px_rgba(0,0,0,0.4)] z-[2]">
               Vol {abbreviateNumber(token.volume24h)}
             </div>
           </div>

packages/client/src/components/swaps-table.tsx

@@ -10,7 +10,7 @@ import usePause from "@/hooks/use-pause";
 import { IToken } from "@/types";
 import {
   formatNumber,
-  formatNumberSubscript,
+  formatNumberSubscriptSmart,
   fromNow,
   LAMPORTS_PER_SOL,
   resizeImage,
@@ -162,8 +162,7 @@ export default function SwapsTable({ token }: { token: IToken }) {
                             className="size-2.5 rounded-full"
                           />
                           <span className="text-sm">
-                            {formatNumberSubscript(Number(solana), 2)}
-                            {/* {formatNumber(solana, true, true)} */}
+                            {formatNumberSubscriptSmart(Number(solana), 2)}
                           </span>
                           {usdValue ? (
                             <span className="text-autofun-text-secondary text-xs">

packages/client/src/components/verified.tsx

@@ -9,7 +9,11 @@ export default function Verified({ isVerified }: { isVerified?: boolean }) {
         <span>Verified</span>
       </Tooltip>
 
-      <img src="/verified.svg" id="verified" className="size-5 select-none" />
+      <img
+        src="/verified.svg"
+        id="verified"
+        className="size-4 lg:size-5 select-none"
+      />
     </Fragment>
   );
 }

packages/client/src/utils/index.ts

@@ -138,6 +138,43 @@ export const formatNumberSubscript = (
   }
 };
 
+export const formatNumberSubscriptSmart = (
+  num: number,
+  decimals: number = 4,
+): string => {
+  if (num === 0) return "0";
+  let sign = "";
+  if (num < 0) {
+    sign = "-";
+    num = Math.abs(num);
+  }
+
+  if (num >= 1) {
+    return sign + num.toFixed(decimals).toString();
+  }
+
+  const expStr = num.toExponential();
+  const [mantissa, exponentStr] = expStr.split("e");
+  const exponent = parseInt(exponentStr, 10);
+  let totalZeros = -exponent - 1;
+
+  if (totalZeros < 0) {
+    totalZeros = 0;
+  }
+
+  if (totalZeros >= decimals) {
+    const mantissaDigits = mantissa.replace(".", "").slice(0, decimals + 1);
+    return sign + "0." + toSubscript(totalZeros) + mantissaDigits;
+  } else {
+    const roundedMantissa =
+      Math.ceil(Number(mantissa) * 10 ** decimals) / 10 ** decimals;
+    const roundedString = roundedMantissa.toFixed(decimals);
+    const mantissaDigits = roundedString.replace(".", "").slice(0, decimals);
+
+    return sign + "0." + "0".repeat(totalZeros) + mantissaDigits;
+  }
+};
+
 export const isFromDomain = (url: string, domain: string): boolean => {
   // if url does not have http or https, add it
   if (!url.startsWith("http") && !url.startsWith("https")) {

packages/server/src/routes/token.ts

@@ -1319,7 +1319,7 @@ tokenRouter.get("/tokens", async (c) => {
     // Define the two token addresses to prioritize
     const priorityTokenAddresses: string[] = [
       "8btUuvx2Bu4zTd8g1tN5wCKMULyPgqiPaDiJbFbWkFUN",
-      "D7qqKEr7JFpAd82m9nvJL2psdPmU1oW54g1LHvDUYFAN",
+      "CdZuiJEgdwQVZBWZrd6MvYwZshsT5HvB6tJYAjzuUTAP",
       "HN8GGgzBFvuePPL3DGPg7uuq2dVgLApnNcW4pxY9a11o",
       "J3NrhzUeKBSA3tJQjNq77zqpWJNz3FS9TrX7H7SLKcom",
     ];