Merge branch 'main' into winston/dash-398-enish-cant-download-wallet-addresses-from-dashboard

Author: ElasticBottle

apps/dashboard/.eslintrc.js

@@ -59,7 +59,6 @@ module.exports = {
               "FormHelperText",
               "FormErrorMessage",
               "MenuGroup",
-              "MenuItem",
               "VStack",
               "HStack",
               "AspectRatio",

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/index.tsx

@@ -13,6 +13,7 @@ import {
   Flex,
   Menu,
   MenuButton,
+  MenuItem,
   MenuList,
 } from "@chakra-ui/react";
 import { TransactionButton } from "components/buttons/TransactionButton";
@@ -39,7 +40,7 @@ import {
   useSendAndConfirmTransaction,
 } from "thirdweb/react";
 import invariant from "tiny-invariant";
-import { Button, Heading, MenuItem, Text } from "tw-components";
+import { Button, Heading, Text } from "tw-components";
 import * as z from "zod";
 import { ZodError } from "zod";
 import {

apps/dashboard/src/components/chain-validation/index.tsx

@@ -1,4 +1,5 @@
 import { InlineCode } from "@/components/ui/inline-code";
+import { TableContainer } from "@/components/ui/table";
 import {
   FormControl,
   Input,
@@ -15,7 +16,7 @@ import { useRpcValidation } from "hooks/chains/useRpcValidation";
 import { AlertCircleIcon, CheckCircleIcon } from "lucide-react";
 import { type ChangeEvent, useState } from "react";
 
-import { Button, Card, FormLabel, Link, TableContainer } from "tw-components";
+import { Button, Card, FormLabel, Link } from "tw-components";
 
 const StatusCheck = (props: {
   status: "success" | "error" | "warning";

apps/dashboard/src/components/contract-components/contract-table/index.tsx

@@ -1,8 +1,8 @@
+import { TableContainer } from "@/components/ui/table";
 import { Spinner, Table, Tbody, Td, Th, Thead, Tr } from "@chakra-ui/react";
 import { useMemo } from "react";
 import { type Column, type Row, useTable } from "react-table";
 import { Text } from "tw-components";
-import { TableContainer } from "tw-components/table-container";
 import type { ComponentWithChildren } from "types/component-with-children";
 import type { ContractCellContext, ContractId } from "../types";
 import { ContractDescriptionCell } from "./cells/description";
@@ -55,7 +55,7 @@ export const DeployableContractTable: ComponentWithChildren<
     data: contractIds.map((contractId) => ({ contractId })),
   });
   return (
-    <TableContainer className="relative">
+    <TableContainer>
       {isFetching && (
         <Spinner
           color="primary"

apps/dashboard/src/components/settings/Account/Billing/DowngradeDialog.tsx

@@ -8,12 +8,13 @@ import {
   Flex,
   Menu,
   MenuButton,
+  MenuItem,
   MenuList,
   Textarea,
 } from "@chakra-ui/react";
 import { ChevronDownIcon, XIcon } from "lucide-react";
 import { useRef, useState } from "react";
-import { Button, MenuItem, Text } from "tw-components";
+import { Button, Text } from "tw-components";
 
 const DOWNGRADE_OPTIONS = {
   customer_service: "Not happy with customer service",

apps/dashboard/src/components/shared/TWQueryTable.tsx

@@ -1,3 +1,4 @@
+import { TableContainer } from "@/components/ui/table";
 import {
   Box,
   ButtonGroup,
@@ -24,7 +25,7 @@ import {
 import { MoveRightIcon } from "lucide-react";
 import pluralize from "pluralize";
 import { type SetStateAction, useMemo } from "react";
-import { Button, TableContainer, Text } from "tw-components";
+import { Button, Text } from "tw-components";
 
 type TWQueryTableProps<TRowData, TInputData> = {
   // biome-ignore lint/suspicious/noExplicitAny: FIXME

apps/dashboard/src/tw-components/button.tsx

@@ -16,14 +16,14 @@ import { fontWeights, letterSpacings, lineHeights } from "theme/typography";
 import { ChakraNextLink } from "./link";
 import { convertFontSizeToCSSVar } from "./utils/typography";
 
-export const buttonSizesMap = {
+const buttonSizesMap = {
   xs: "sm",
   sm: "md",
   md: "lg",
   lg: "xl",
 } as const;
 
-export type PossibleButtonSize = keyof typeof buttonSizesMap;
+type PossibleButtonSize = keyof typeof buttonSizesMap;
 
 export interface ButtonProps extends Omit<ChakraButtonProps, "size"> {
   size?: PossibleButtonSize;

apps/dashboard/src/tw-components/index.ts

@@ -7,6 +7,4 @@ export * from "./drawer";
 export * from "./form";
 export * from "./heading";
 export * from "./link";
-export * from "./menu";
-export * from "./table-container";
 export * from "./text";