@mezo-org/passport 0.4.0-dev.6 → 0.4.0-dev.61

package/dist/src/utils/numbers.js

@@ -1,29 +1,40 @@
 /**
- * Formats a number or bigint into a human-readable string with K, M, B, or T suffix.
+ * Formats a number or bigint into compact string with K, M, B, or T suffix.
  * @param value The number or bigint to format.
  * @param decimals Number of decimal places to include (ignored for bigint to avoid floating point issues).
  * @returns The formatted number as a string.
  */
-export function formatHumanReadableNumber(value, decimals = 4) {
-    const suffixes = ["", "K", "M", "B", "T"];
-    const numericValue = typeof value === "bigint" ? Number(value) : value;
-    if (numericValue < 1000)
-        return numericValue.toFixed(decimals);
-    const magnitude = Math.floor(Math.log10(numericValue) / 3);
-    if (magnitude >= suffixes.length) {
-        const max = 10 ** ((suffixes.length - 1) * 3) * 1000 - 1;
-        const capped = max / 10 ** ((suffixes.length - 1) * 3);
-        return `> ${capped.toFixed(0)}${suffixes[suffixes.length - 1]}`;
-    }
-    const scaledValue = numericValue / 10 ** (magnitude * 3);
-    return `${scaledValue.toFixed(decimals)}${suffixes[magnitude]}`;
+export function formatNumberToCompactString(value, decimals = 4) {
+    return value.toLocaleString("en-US", {
+        notation: "compact",
+        compactDisplay: "short",
+        maximumFractionDigits: decimals,
+    });
+}
+/**
+ * Formats a number or string into a locale-sensitive string with the desired number of decimals.
+ * @param value The number or string to format.
+ * @param desiredDecimals The number of decimal places to include.
+ * @returns The formatted number as a string.
+ * @see https://github.com/thesis/acre/blob/2078d339f4ddce79e69c78529c9d72910dd2640a/dapp/src/utils/numbersUtils.ts#L5-L19
+ */
+export function formatNumberToLocaleString(value, desiredDecimals = 0) {
+    const number = typeof value === "number" ? value : parseFloat(value);
+    if (number === 0 && desiredDecimals === 0)
+        return "0";
+    if (number === 0)
+        return `0.${"0".repeat(desiredDecimals)}`;
+    return number.toLocaleString("en-US", {
+        minimumFractionDigits: desiredDecimals,
+        maximumFractionDigits: desiredDecimals,
+    });
 }
 /**
  * Returns a number rounded up to the desired number of decimals.
  * @param amount The number to round up.
  * @param desiredDecimals The number of decimals to round up to.
  * @returns The rounded up number.
- * @see https://github.com/thesis/acre/blob/main/dapp/src/utils/numbersUtils.ts#L1-L3
+ * @see https://github.com/thesis/acre/blob/2078d339f4ddce79e69c78529c9d72910dd2640a/dapp/src/utils/numbersUtils.ts#L1-L3
  */
 export function roundUpNumber(amount, desiredDecimals = 2) {
     return Math.ceil(amount * 10 ** desiredDecimals) / 10 ** desiredDecimals;
@@ -35,9 +46,9 @@ export function roundUpNumber(amount, desiredDecimals = 2) {
  * @param fixedPointDecimals The number of decimals in the fixed point bigint.
  * @param desiredDecimals The number of decimals in the output number.
  * @returns The floating point number truncated to `desiredDecimals`.
- * @see https://github.com/tahowallet/extension/blob/main/background/lib/fixed-point.ts#L216-L239
+ * @see https://github.com/tahowallet/extension/blob/f6b26b7cb4a0a0278b1fccc6319626638f1a6dfa/background/lib/fixed-point.ts#L216-L239
  */
-export function fromFixedPoint(fixedPoint, fixedPointDecimals, desiredDecimals = 2) {
+export function fromFixedPoint(fixedPoint, fixedPointDecimals, desiredDecimals = 4) {
     const fixedPointDesiredDecimalsAmount = fixedPoint /
         10n ** BigInt(Math.max(1, fixedPointDecimals - desiredDecimals));
     const formattedAmount = Number(fixedPointDesiredDecimalsAmount) /
@@ -45,22 +56,16 @@ export function fromFixedPoint(fixedPoint, fixedPointDecimals, desiredDecimals =
     return formattedAmount;
 }
 /**
- * Display a cryptoAsset amount correctly with desired decimals.
+ * Display a token amount correctly with desired decimals.
  * The function returns a string with a language-sensitive representation of this number.
- * - If the amount entered is zero, return the result with the desired decimals.
- *   For example, 0.00 for a precision of 2.
- * - If `formattedAmount` is less than the minimum amount to display
- *  for the specified precision return information about this.
- *  For example, <0.01 for a precision of 2.
- *  - Other amounts are formatted according to the use of the `bigIntToUserAmount` function.
- * @param amount The amount of tokens to format.
- * @param decimals The number of decimals the cryptoAsset has.
+ * @param amount The fixed point number to convert.
+ * @param decimals The number of decimals in the fixed point number.
  * @param desiredDecimals The number of decimals to display.
- * @param withRoundUp If true, the amount will be rounded up.
- * @returns The formatted cryptoAsset amount.
- * @see https://github.com/thesis/acre/blob/main/dapp/src/utils/numbersUtils.ts#L57-L87
+ * @param withRoundUp Whether to round up the number.
+ * @returns The formatted number as a string.
+ * @see https://github.com/thesis/acre/blob/2078d339f4ddce79e69c78529c9d72910dd2640a/dapp/src/utils/numbersUtils.ts#L57-L87
  */
-export function formatTokenAmount(amount, decimals = 18, desiredDecimals = 2, withRoundUp = false) {
+export const fromFixedPointToString = (amount, decimals = 18, desiredDecimals = 4, withRoundUp = false) => {
     const fixedPoint = BigInt(amount);
     if (fixedPoint === 0n) {
         return `0.${"0".repeat(desiredDecimals)}`;
@@ -74,8 +79,54 @@ export function formatTokenAmount(amount, decimals = 18, desiredDecimals = 2, wi
         return `<0.${"0".repeat(desiredDecimals - 1)}1`;
     }
     const finalFormattedAmount = withRoundUp
-        ? roundUpNumber(formattedAmount, desiredDecimals)
+        ? Math.ceil(formattedAmount * 10 ** desiredDecimals) / 10 ** desiredDecimals
         : formattedAmount;
-    return formatHumanReadableNumber(finalFormattedAmount, desiredDecimals);
-}
+    return formatNumberToLocaleString(finalFormattedAmount, desiredDecimals);
+};
+/**
+ * Converts a floating-point number or string to a bigint representation
+ * scaled by the specified number of decimal places (default: 18).
+ *
+ * This function avoids floating-point precision issues by manually
+ * parsing and scaling the number.
+ *
+ * @param amount - A number or string containing a floating point number.
+ * @param decimals - Number of decimals to scale to (default: 18).
+ * @returns A bigint representation scaled to the given decimal places.
+ * @see https://github.com/thesis/mezo-portal/blob/3bd4f39cb77c39948af2886a6ce7415a0c60307a/dapp/src/shared/utils/numbers.ts#L55
+ */
+export const fromFloatToBigInt = (amount, decimals = 18) => {
+    const FLOATING_POINT_REGEX = /^-?\d{1,3}(,\d{3})*(\.\d+)?$|^-?\d+(\.\d+)?$/;
+    const parseToFixedPointNumber = (floatingPointString) => {
+        if (!floatingPointString.match(FLOATING_POINT_REGEX)) {
+            return undefined;
+        }
+        const [whole, decimalsPart, ...extra] = floatingPointString.split(".");
+        if (extra.length > 0)
+            return undefined;
+        const noThousandsSeparatorWhole = whole.replace(/,/g, "");
+        const setDecimals = decimalsPart ?? "";
+        try {
+            return {
+                amount: BigInt([noThousandsSeparatorWhole, setDecimals].join("")),
+                decimals: setDecimals.length,
+            };
+        }
+        catch {
+            return undefined;
+        }
+    };
+    const convertFixedPoint = (fixedPoint, fixedPointDecimals, targetDecimals) => {
+        if (fixedPointDecimals >= targetDecimals) {
+            return fixedPoint / 10n ** BigInt(fixedPointDecimals - targetDecimals);
+        }
+        return fixedPoint * 10n ** BigInt(targetDecimals - fixedPointDecimals);
+    };
+    const parsedAmount = amount.toString();
+    const fixedPointAmount = parseToFixedPointNumber(parsedAmount);
+    if (typeof fixedPointAmount === "undefined") {
+        return 0n;
+    }
+    return convertFixedPoint(fixedPointAmount.amount, fixedPointAmount.decimals, decimals);
+};
 //# sourceMappingURL=numbers.js.map

package/dist/src/utils/numbers.js.map

@@ -1 +1 @@
-{"version":3,"file":"numbers.js","sourceRoot":"","sources":["../../../src/utils/numbers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"numbers.js","sourceRoot":"","sources":["../../../src/utils/numbers.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/numbers.test.js

@@ -1,26 +1,29 @@
-import { formatHumanReadableNumber, formatTokenAmount, fromFixedPoint, roundUpNumber, } from "./numbers";
-describe("formatHumanReadableNumber", () => {
+import { formatNumberToCompactString, fromFixedPoint, roundUpNumber, formatNumberToLocaleString, fromFixedPointToString, } from "./numbers";
+describe("formatNumberToCompactString", () => {
     it("formats number less than 1000 with decimals", () => {
-        expect(formatHumanReadableNumber(123.456789, 2)).toBe("123.46");
+        expect(formatNumberToCompactString(123.456789, 2)).toBe("123.46");
     });
     it("formats thousands with K", () => {
-        expect(formatHumanReadableNumber(12_345, 2)).toBe("12.35K");
+        expect(formatNumberToCompactString(12_345, 2)).toBe("12.35K");
     });
     it("formats millions with M", () => {
-        expect(formatHumanReadableNumber(12_345_678, 2)).toBe("12.35M");
+        expect(formatNumberToCompactString(12_345_678, 2)).toBe("12.35M");
     });
     it("formats billions with B", () => {
-        expect(formatHumanReadableNumber(12_345_678_901, 2)).toBe("12.35B");
+        expect(formatNumberToCompactString(12_345_678_901, 2)).toBe("12.35B");
     });
     it("formats trillions with T", () => {
-        expect(formatHumanReadableNumber(12_345_678_901_234, 2)).toBe("12.35T");
+        expect(formatNumberToCompactString(12_345_678_901_234, 2)).toBe("12.35T");
     });
     it("formats bigint as readable number", () => {
-        expect(formatHumanReadableNumber(1234567890123456789n, 2)).toBe("> 1000T");
+        expect(formatNumberToCompactString(1234567890123456789n, 2)).toBe("1,234,567.89T");
     });
     it("caps at > 1000T for huge numbers", () => {
         const hugeNumber = 10 ** 18; // 1e18
-        expect(formatHumanReadableNumber(hugeNumber, 2)).toBe("> 1000T");
+        expect(formatNumberToCompactString(hugeNumber, 2)).toBe("1,000,000T");
+    });
+    it("formats numbers with trailing zeros correctly", () => {
+        expect(formatNumberToCompactString(1_000, 2)).toBe("1K");
     });
 });
 describe("roundUpNumber", () => {
@@ -37,7 +40,7 @@ describe("roundUpNumber", () => {
 describe("fromFixedPoint", () => {
     it("converts fixed point with 18 decimals to float", () => {
         const raw = 1234567890000000000n; // 1.23456789 ETH in 18 decimals
-        expect(fromFixedPoint(raw, 18, 4)).toBe(1.2345);
+        expect(fromFixedPoint(raw, 18)).toBe(1.2345);
     });
     it("converts with truncation to 2 decimals", () => {
         const raw = 987654321000000000n; // ~0.987654321 ETH
@@ -48,21 +51,120 @@ describe("fromFixedPoint", () => {
         expect(fromFixedPoint(raw, 6, 2)).toBe(1000000000000000000);
     });
 });
-describe("formatTokenAmount", () => {
-    it("formats zero value with desired decimals", () => {
-        expect(formatTokenAmount(0, 18, 3)).toBe("0.000");
-        expect(formatTokenAmount("0", 18, 2)).toBe("0.00");
+describe("formatNumberToLocaleString", () => {
+    it("formats zero with 0 decimals", () => {
+        expect(formatNumberToLocaleString(0, 0)).toBe("0");
+    });
+    it("formats zero with >0 decimals", () => {
+        expect(formatNumberToLocaleString(0, 2)).toBe("0.00");
+        expect(formatNumberToLocaleString(0, 4)).toBe("0.0000");
+    });
+    it("formats small decimal number", () => {
+        expect(formatNumberToLocaleString(0.123456, 2)).toBe("0.12");
+        expect(formatNumberToLocaleString(0.123456, 4)).toBe("0.1235");
+    });
+    it("formats number just above 1", () => {
+        expect(formatNumberToLocaleString(1.000001, 3)).toBe("1.000");
+        expect(formatNumberToLocaleString(1.234567, 2)).toBe("1.23");
+    });
+    it("formats whole number", () => {
+        expect(formatNumberToLocaleString(1234, 0)).toBe("1,234");
+        expect(formatNumberToLocaleString(1000, 2)).toBe("1,000.00");
     });
-    it("returns <0.01 if amount is less than minimum display value", () => {
-        expect(formatTokenAmount("1", 18, 2)).toBe("<0.01"); // 1 wei = 1e-18
+    it("formats number with trailing decimal zeroes", () => {
+        expect(formatNumberToLocaleString(10.1, 3)).toBe("10.100");
+        expect(formatNumberToLocaleString(5.0, 2)).toBe("5.00");
     });
-    it("formats a normal value without rounding", () => {
-        const result = formatTokenAmount("1230000000000000000", 18, 2);
-        expect(result).toBe("1.23");
+    it("formats string input", () => {
+        expect(formatNumberToLocaleString("123.456", 2)).toBe("123.46");
+        expect(formatNumberToLocaleString("0.00123", 4)).toBe("0.0012");
     });
-    it("formats with rounding if withRoundUp = true", () => {
-        const result = formatTokenAmount("1234560000000000000", 18, 2, true);
-        expect(result).toBe("1.24");
+    it("formats negative number", () => {
+        expect(formatNumberToLocaleString(-123.456, 2)).toBe("-123.46");
+        expect(formatNumberToLocaleString("-0.00999", 3)).toBe("-0.010");
+    });
+    it("formats large number with commas", () => {
+        expect(formatNumberToLocaleString(12345678.9, 2)).toBe("12,345,678.90");
+    });
+    it("handles max decimals safely", () => {
+        expect(formatNumberToLocaleString(1.123456789, 8)).toBe("1.12345679");
+        expect(formatNumberToLocaleString("0.000000000000000001", 18)).toBe("0.000000000000000001");
+    });
+    it("defaults to 0 decimals if not passed", () => {
+        expect(formatNumberToLocaleString(1234.567)).toBe("1,235"); // rounds up by default
+    });
+});
+describe("fromFixedPointToString", () => {
+    const toFixedPoint = (num) => BigInt(Math.round(num * 1e18));
+    const cases = [
+        { input: 2.0, expected: "2.000" },
+        { input: 2.009, expected: "2.009" },
+        { input: 2.01, expected: "2.010" },
+        { input: 2.015, expected: "2.016" },
+        { input: 2.05, expected: "2.050" },
+        { input: 2.09, expected: "2.090" },
+    ];
+    describe("withRoundUp: true", () => {
+        cases.forEach(({ input, expected }) => {
+            it(`formats ${input} → ${expected}`, () => {
+                const fixed = toFixedPoint(input);
+                expect(fromFixedPointToString(fixed, 18, 3, true)).toBe(expected);
+            });
+        });
+    });
+    describe("withRoundUp: false", () => {
+        const noRoundCases = [
+            { input: 2.0099, expected: "2.009" },
+            { input: 2.0159, expected: "2.015" },
+            { input: 2.0101, expected: "2.010" },
+            { input: 2.0199, expected: "2.019" },
+        ];
+        noRoundCases.forEach(({ input, expected }) => {
+            it(`formats ${input} → ${expected} (no rounding)`, () => {
+                const fixed = toFixedPoint(input);
+                expect(fromFixedPointToString(fixed, 18, 3, false)).toBe(expected);
+            });
+        });
+    });
+    describe("zero handling", () => {
+        it("formats 0 → 0.000 (3 decimals)", () => {
+            expect(fromFixedPointToString(0n, 18, 3)).toBe("0.000");
+        });
+        it("formats 0 → 0.0000 (4 decimals)", () => {
+            expect(fromFixedPointToString(0n, 18, 4)).toBe("0.0000");
+        });
+    });
+    describe("very small numbers below display threshold", () => {
+        it("returns <0.0001 for small number (3 decimals)", () => {
+            const small = BigInt(123); // ~1.23e-16
+            expect(fromFixedPointToString(small, 18, 4)).toBe("<0.0001");
+        });
+        it("returns <0.01 for small number with only 2 decimals", () => {
+            const tiny = BigInt(9999999999999); // <0.01
+            expect(fromFixedPointToString(tiny, 18, 2)).toBe("<0.01");
+        });
+    });
+    describe("input types", () => {
+        it("accepts bigint", () => {
+            const amount = 2100000000000000000n;
+            expect(fromFixedPointToString(amount, 18, 3)).toBe("2.100");
+        });
+        it("accepts string", () => {
+            expect(fromFixedPointToString("2000000000000000000", 18, 3)).toBe("2.000");
+        });
+        it("accepts number", () => {
+            expect(fromFixedPointToString(Number("1000000000000000000"), 18, 3)).toBe("1.000");
+        });
+    });
+    describe("high values", () => {
+        it("formats 1_000_000.123456789 correctly", () => {
+            const big = toFixedPoint(1_000_000.123456789);
+            expect(fromFixedPointToString(big, 18, 6)).toBe("1,000,000.123456");
+        });
+        it("formats 1e12 ETH", () => {
+            const big = BigInt("1000000000000000000000000000000");
+            expect(fromFixedPointToString(big, 18, 2)).toBe("1,000,000,000,000.00");
+        });
     });
 });
 //# sourceMappingURL=numbers.test.js.map

package/dist/src/utils/numbers.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"numbers.test.js","sourceRoot":"","sources":["../../../src/utils/numbers.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"numbers.test.js","sourceRoot":"","sources":["../../../src/utils/numbers.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mezo-org/passport",
-  "version": "0.4.0-dev.6",
+  "version": "0.4.0-dev.61",
   "main": "dist/src/index.js",
   "license": "GPL-3.0-only",
   "scripts": {
@@ -28,8 +28,6 @@
     "@types/jest": "^29.5.12",
     "@types/node": "^20.11.30",
     "@types/react": "^18.2.64",
-    "@types/ungap__structured-clone": "^1.2.0",
-    "@ungap/structured-clone": "^1.3.0",
     "eslint": "^8.57.1",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
@@ -39,17 +37,21 @@
     "typescript": "^5.4.3"
   },
   "dependencies": {
-    "@mezo-org/mezo-clay": "0.1.0-dev.18",
-    "@mezo-org/orangekit": "1.0.0-beta.40-dev.0",
-    "@mezo-org/sign-in-with-wallet": "1.0.0-beta.8"
+    "@mezo-org/mezo-clay": "0.1.0-dev.27",
+    "@mezo-org/mezod-contracts": "^1.0.0",
+    "@mezo-org/musd-contracts": "^1.0.1",
+    "@mezo-org/orangekit": "1.0.0-beta.40-dev.14",
+    "@mezo-org/sign-in-with-wallet": "1.0.0-beta.8",
+    "qrcode.react": "^4.2.0",
+    "styletron-engine-monolithic": "^1.0.0",
+    "usehooks-ts": "^3.1.1",
+    "zustand": "^5.0.3"
   },
   "peerDependencies": {
     "@rainbow-me/rainbowkit": "2.0.2",
     "@tanstack/react-query": "^5.28.4",
     "react": "^18.2.0",
-    "styletron-engine-monolithic": "^1.0.0",
-    "usehooks-ts": "^3.1.1",
     "viem": "2.22.8",
     "wagmi": "2.5.12"
   }
-}
+}

package/src/api/auth.ts

@@ -82,7 +82,9 @@ export class AuthApiClient extends ApiClient {
     environment: keyof typeof AUTH_API_ENDPOINTS_BY_ENV = "mainnet",
     apiUrl?: string,
   ) {
-    super(apiUrl ?? AUTH_API_ENDPOINTS_BY_ENV[environment])
+    super({
+      apiUrl: apiUrl ?? AUTH_API_ENDPOINTS_BY_ENV[environment],
+    })
   }
 
   async getSession(code?: string) {

package/src/api/client.ts

@@ -5,10 +5,19 @@ type RequestHandlerOptions = Omit<RequestInit, "credentials" | "body"> & {
   queryParams?: Record<string, string | undefined>
 }
 
+const ENDS_WITH_VERSIONING_REGEX = /\/v\d+(?=\/|$)/
+const TRAILING_SLASH_REGEX = /\/$/
+
 export abstract class ApiClient {
   private apiUrl: string
 
-  constructor(apiUrl: string) {
+  constructor(opts: { apiUrl: string; removeVersioning?: boolean }) {
+    const { apiUrl, removeVersioning = false } = opts
+
+    if (removeVersioning) {
+      this.apiUrl = apiUrl.replace(ENDS_WITH_VERSIONING_REGEX, "")
+      return
+    }
     this.apiUrl = apiUrl
   }
 
@@ -33,7 +42,7 @@ export abstract class ApiClient {
       const { method, body, queryParams = {}, ...restOptions } = options
 
       // If last character in apiUrl is forward slash we are removing it
-      const authApiUrlRoute = this.apiUrl.replace(/\/$/, "")
+      const authApiUrlRoute = this.apiUrl.replace(TRAILING_SLASH_REGEX, "")
       const url = new URL(`${authApiUrlRoute}${endpoint}`)
 
       // Removes falsy values (e.g. null, undefined etc.) from query params and

package/src/api/portal.ts

@@ -6,25 +6,19 @@ type PortalStatistics = {
   tvl: number
   currentUsdPerBtc: string
   currentUsdPerEth: string
+  currentUsdPerTToken: string
   usdPerBtc24hChange: string
 }
 
 type PortalMats = {
-  address: string
   totalMats: number
-  matsFromDeposits: number
-  matsFromReferrals: number
-  matsFromSecondaryReferrals: number
-  netMatsTransferred: number
-  dailyMats: number
-  dailyMatsFromDeposits: number
-  dailyMatsFromReferrals: number
-  dailyMatsFromSecondaryReferrals: number
+  inactiveMats: number
+  matsActivated: boolean
 }
 
 export const PORTAL_API_ENDPOINTS_BY_ENV = {
-  mainnet: "https://api.mezo.org/api/v1",
-  testnet: "https://api.test.mezo.org/api/v1",
+  mainnet: "https://api.mezo.org/api/",
+  testnet: "https://api.test.mezo.org/api/",
 }
 
 export class PortalApiClient extends ApiClient {
@@ -32,11 +26,14 @@ export class PortalApiClient extends ApiClient {
     environment: keyof typeof PORTAL_API_ENDPOINTS_BY_ENV = "mainnet",
     apiUrl?: string,
   ) {
-    super(apiUrl ?? PORTAL_API_ENDPOINTS_BY_ENV[environment])
+    super({
+      apiUrl: apiUrl ?? PORTAL_API_ENDPOINTS_BY_ENV[environment],
+      removeVersioning: true,
+    })
   }
 
   async getPortalStatistics() {
-    const data = await this.handleRequest<PortalStatistics>("/statistics", {
+    const data = await this.handleRequest<PortalStatistics>("/v1/statistics", {
       method: "GET",
     })
 
@@ -45,7 +42,7 @@ export class PortalApiClient extends ApiClient {
 
   async getPortalMats(address: string) {
     const data = await this.handleRequest<PortalMats>(
-      `/accounts/${address}/mats`,
+      `/v2/account/${address}/mats`,
       {
         method: "GET",
       },

package/src/components/Dropdown/ConnectedTrigger.tsx

@@ -1,54 +1,74 @@
-import { Block, ButtonProps, useStyletron } from "@mezo-org/mezo-clay"
-import React, { forwardRef, ReactNode } from "react"
+import { Block, Button, ButtonProps, useStyletron } from "@mezo-org/mezo-clay"
+import React, { forwardRef, ReactNode, useMemo } from "react"
 
-type ConnectedTriggerProps = Omit<ButtonProps, "children"> & {
+type ConnectedTriggerProps = Omit<ButtonProps, "children" | "size"> & {
   avatar: ReactNode
+  size?: "medium" | "large"
 }
 
 const ConnectedTrigger = forwardRef<HTMLButtonElement, ConnectedTriggerProps>(
   (props, ref) => {
-    const { onClick, avatar, ...restProps } = props
+    const { onClick, avatar, size = "medium", ...restProps } = props
 
     const [, theme] = useStyletron()
 
+    const avatarSize = useMemo(() => {
+      const sizeMap = {
+        medium: theme.sizing.scale950,
+        large: theme.sizing.scale1400,
+      }
+
+      return sizeMap[size]
+    }, [theme, size])
+
+    const buttonPadding = useMemo(() => {
+      const paddingMap = {
+        medium: theme.sizing.scale0,
+        large: theme.sizing.scale100,
+      }
+
+      return paddingMap[size]
+    }, [theme, size])
+
     return (
-      <Block
-        as="button"
+      <Button
         overrides={{
-          Block: {
+          BaseButton: {
             props: { ref, ...restProps },
             style: {
-              border: "none",
-              background: "none",
-              padding: 0,
-              margin: 0,
-              cursor: "pointer",
+              borderRadius: "100%",
+              overflow: "hidden",
+              padding: buttonPadding,
             },
           },
         }}
         onClick={onClick}
       >
-        <Block
-          width={theme.sizing.scale950}
-          height={theme.sizing.scale950}
-          overrides={{
-            Block: {
-              style: {
-                borderRadius: "100%",
-                border: `2px solid ${theme.colors.contentPrimary}`,
-                boxSizing: "border-box",
-                overflow: "hidden",
+        {typeof avatar === "string" ? (
+          <Block
+            width={avatarSize}
+            height={avatarSize}
+            as="img"
+            src={avatar}
+            alt=""
+          />
+        ) : (
+          <Block
+            width={avatarSize}
+            height={avatarSize}
+            overrides={{
+              Block: {
+                style: {
+                  borderRadius: "100%",
+                  overflow: "hidden",
+                },
               },
-            },
-          }}
-        >
-          {typeof avatar === "string" ? (
-            <Block as="img" src={avatar} alt="" />
-          ) : (
-            avatar
-          )}
-        </Block>
-      </Block>
+            }}
+          >
+            {avatar}
+          </Block>
+        )}
+      </Button>
     )
   },
 )