Rename @cartridge/ui-next to @cartridge/ui

examples/next/package.json

@@ -15,7 +15,7 @@
   "dependencies": {
     "@cartridge/connector": "workspace:*",
     "@cartridge/controller": "workspace:*",
-    "@cartridge/ui-next": "workspace:*",
+    "@cartridge/ui": "workspace:*",
     "@starknet-react/chains": "^0.1.3",
     "@starknet-react/core": "^3.0.2",
     "next": "^14.2.5",

examples/next/src/app/globals.css

@@ -1,6 +1,6 @@
-@import "@cartridge/ui-next/dist/themes/default.css";
-@import "@cartridge/ui-next/dist/themes/dark.css";
-@import "@cartridge/ui-next/dist/themes/fonts.css";
+@import "@cartridge/ui/dist/themes/default.css";
+@import "@cartridge/ui/dist/themes/dark.css";
+@import "@cartridge/ui/dist/themes/fonts.css";
 
 @tailwind base;
 @tailwind components;

examples/next/src/app/token/page.tsx

@@ -11,7 +11,7 @@ import { ConnectWallet } from "components/ConnectWallet";
 import { useTokenContract } from "hooks/token";
 import { Abi } from "starknet";
 import Erc20Abi from "abi/erc20.json";
-import { Button, Input } from "@cartridge/ui-next";
+import { Button, Input } from "@cartridge/ui";
 
 function UserBalance() {
   const { account } = useAccount();

examples/next/src/components/ColorModeToggle.tsx

@@ -10,7 +10,7 @@ import {
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuTrigger,
-} from "@cartridge/ui-next";
+} from "@cartridge/ui";
 
 export function ColorModeToggle() {
   const { setTheme } = useTheme();

examples/next/src/components/ConnectWallet.tsx

@@ -3,7 +3,7 @@
 import { useAccount, useConnect, useDisconnect } from "@starknet-react/core";
 import ControllerConnector from "@cartridge/connector/controller";
 import React, { useEffect, useState, useRef } from "react";
-import { Button } from "@cartridge/ui-next";
+import { Button } from "@cartridge/ui";
 
 export function ConnectWallet() {
   const { connect, connectors } = useConnect();

examples/next/src/components/DelegateAccount.tsx

@@ -4,7 +4,7 @@ import { useAccount } from "@starknet-react/core";
 import { useCallback, useEffect, useState } from "react";
 import { constants } from "starknet";
 import ControllerConnector from "@cartridge/connector/controller";
-import { Button, Input } from "@cartridge/ui-next";
+import { Button, Input } from "@cartridge/ui";
 
 export const DelegateAccount = () => {
   const [chainId] = useState<constants.StarknetChainId>(

examples/next/src/components/Header.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { Button } from "@cartridge/ui-next";
+import { Button } from "@cartridge/ui";
 import ControllerConnector from "@cartridge/connector/controller";
 import {
   useAccount,

examples/next/src/components/InvalidTxn.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { Button } from "@cartridge/ui-next";
+import { Button } from "@cartridge/ui";
 import { useAccount, useSendTransaction } from "@starknet-react/core";
 
 const ETH_CONTRACT =

examples/next/src/components/LookupControllers.tsx

@@ -4,7 +4,7 @@ import { useAccount } from "@starknet-react/core";
 import { useCallback, useState } from "react";
 import ControllerConnector from "@cartridge/connector/controller";
 import { lookupAddresses, lookupUsernames } from "@cartridge/controller";
-import { Button } from "@cartridge/ui-next";
+import { Button } from "@cartridge/ui";
 
 export function LookupControllers() {
   const { address, connector } = useAccount();

examples/next/src/components/ManualTransferEth.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { Button } from "@cartridge/ui-next";
+import { Button } from "@cartridge/ui";
 import { useAccount, useNetwork } from "@starknet-react/core";
 import { useCallback, useState } from "react";
 import { ETH_CONTRACT_ADDRESS } from "./providers/StarknetProvider";

examples/next/src/components/Profile.tsx

@@ -2,7 +2,7 @@
 
 import { useAccount } from "@starknet-react/core";
 import ControllerConnector from "@cartridge/connector/controller";
-import { Button } from "@cartridge/ui-next";
+import { Button } from "@cartridge/ui";
 
 export function Profile() {
   const { account, connector } = useAccount();

examples/next/src/components/RegisterSession.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useAccount } from "@starknet-react/core";
-import { Button } from "@cartridge/ui-next";
+import { Button } from "@cartridge/ui";
 import { ec, stark } from "starknet";
 import { useCallback, useState } from "react";
 

examples/next/src/components/Settings.tsx

@@ -2,7 +2,7 @@
 
 import { useAccount, useDisconnect } from "@starknet-react/core";
 import ControllerConnector from "@cartridge/connector/controller";
-import { Button } from "@cartridge/ui-next";
+import { Button } from "@cartridge/ui";
 
 export function Settings() {
   const { account, connector } = useAccount();

examples/next/src/components/SignMessage.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { Button, Textarea } from "@cartridge/ui-next";
+import { Button, Textarea } from "@cartridge/ui";
 import { useAccount, useSignTypedData } from "@starknet-react/core";
 import { useCallback, useState } from "react";
 import {

examples/next/src/components/Transfer.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { Button } from "@cartridge/ui-next";
+import { Button } from "@cartridge/ui";
 import { useAccount, useNetwork } from "@starknet-react/core";
 import { useCallback, useState } from "react";
 import { STRK_CONTRACT_ADDRESS } from "./providers/StarknetProvider";

examples/next/tailwind.config.ts

@@ -1,10 +1,10 @@
-import { cartridgeTWPreset } from "@cartridge/ui-next/preset";
+import { cartridgeTWPreset } from "@cartridge/ui/preset";
 import { Config } from "tailwindcss";
 
 const config: Config = {
   content: [
     "./src/**/*.{ts,tsx}",
-    "./node_modules/@cartridge/ui-next/dist/**/*.{js,jsx}",
+    "./node_modules/@cartridge/ui/dist/**/*.{js,jsx}",
   ],
   presets: [cartridgeTWPreset],
 };

package.json

@@ -20,7 +20,7 @@
     "connector": "pnpm --filter @cartridge/connector",
     "account-wasm": "pnpm --filter @cartridge/account-wasm",
     "book": "pnpm --filter @cartridge/documentation",
-    "ui:next": "pnpm --filter @cartridge/ui-next",
+    "ui": "pnpm --filter @cartridge/ui",
     "profile": "pnpm --filter @cartridge/profile",
     "utils": "pnpm --filter @cartridge/utils",
     "example:next": "pnpm --filter @cartridge/controller-example-next",
@@ -43,4 +43,4 @@
     "vercel": "^37.4.2",
     "@types/react": "^18.3.12"
   }
-}
+}

packages/keychain/.storybook/preview.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import type { Preview, ReactRenderer } from "@storybook/react";
 import { withThemeByClassName } from "@storybook/addon-themes";
-import { SonnerToaster } from "@cartridge/ui-next";
+import { SonnerToaster } from "@cartridge/ui";
 
 import { StoryParameters } from "./mock";
 import { Provider } from "./provider";

packages/keychain/.storybook/provider.tsx

@@ -3,7 +3,7 @@ import { QueryClient, QueryClientProvider } from "react-query";
 import { controllerConfigs } from "@cartridge/presets";
 import { mainnet } from "@starknet-react/chains";
 import { StarknetConfig, publicProvider, voyager } from "@starknet-react/core";
-import { useThemeEffect } from "@cartridge/ui-next";
+import { useThemeEffect } from "@cartridge/ui";
 import { BrowserRouter } from "react-router-dom";
 
 import { ConnectionContext } from "../src/components/provider/connection";

packages/keychain/package.json

@@ -23,7 +23,7 @@
     "@cartridge/account-wasm": "workspace:*",
     "@cartridge/controller": "workspace:*",
     "@cartridge/penpal": "^6.2.3",
-    "@cartridge/ui-next": "workspace:*",
+    "@cartridge/ui": "workspace:*",
     "@cartridge/utils": "workspace:*",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",

packages/keychain/src/components/DeployController.tsx

@@ -11,7 +11,7 @@ import {
   Spinner,
   WandIcon,
   Button,
-} from "@cartridge/ui-next";
+} from "@cartridge/ui";
 import { Funding } from "./funding";
 import { useConnection } from "@/hooks/connection";
 import { ControllerErrorAlert, ErrorAlert } from "./ErrorAlert";

packages/keychain/src/components/ErrorAlert.tsx

@@ -10,7 +10,7 @@ import {
   AccordionContent,
   cn,
   Separator,
-} from "@cartridge/ui-next";
+} from "@cartridge/ui";
 import React, {
   ReactElement,
   useCallback,

packages/keychain/src/components/ErrorBoundary.tsx

@@ -1,6 +1,6 @@
 import React, { PropsWithChildren, useEffect } from "react";
 import { Container, Content, Footer } from "./layout";
-import { AlertIcon, ExternalIcon, Button } from "@cartridge/ui-next";
+import { AlertIcon, ExternalIcon, Button } from "@cartridge/ui";
 import { useConnection } from "@/hooks/connection";
 import { CARTRIDGE_DISCORD_LINK } from "@/const";
 import { usePostHog } from "posthog-js/react";

packages/keychain/src/components/ExecutionContainer.tsx

@@ -1,5 +1,5 @@
 import { useState, useCallback, useEffect, useRef } from "react";
-import { Button } from "@cartridge/ui-next";
+import { Button } from "@cartridge/ui";
 import { Container, Footer } from "@/components/layout";
 import { useConnection } from "@/hooks/connection";
 import { ControllerError } from "@/utils/connection";

packages/keychain/src/components/Fees.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 import { formatUnits } from "viem";
 import { useChainId } from "@/hooks/connection";
-import { ErrorAlertIcon, EthereumIcon, Spinner } from "@cartridge/ui-next";
+import { ErrorAlertIcon, EthereumIcon, Spinner } from "@cartridge/ui";
 
 export function Fees({
   maxFee,

packages/keychain/src/components/Loading.tsx

@@ -1,4 +1,4 @@
-import { Spinner } from "@cartridge/ui-next";
+import { Spinner } from "@cartridge/ui";
 
 export function PageLoading() {
   return (

packages/keychain/src/components/SignMessage.tsx

@@ -9,7 +9,7 @@ import {
   CardTitle,
   CardListContent,
   CardListItem,
-} from "@cartridge/ui-next";
+} from "@cartridge/ui";
 import { useController } from "@/hooks/controller";
 
 export function SignMessage({

packages/keychain/src/components/Transaction.tsx

@@ -1,11 +1,6 @@
 import { ReactNode, useEffect, useMemo, useState } from "react";
 import { constants } from "starknet";
-import {
-  CheckIcon,
-  ExternalIcon,
-  Spinner,
-  StarknetIcon,
-} from "@cartridge/ui-next";
+import { CheckIcon, ExternalIcon, Spinner, StarknetIcon } from "@cartridge/ui";
 import { useController } from "@/hooks/controller";
 import { useChainName } from "@/hooks/chain";
 import { StarkscanUrl } from "@cartridge/utils";

packages/keychain/src/components/connect/CreateSession.tsx

@@ -18,7 +18,7 @@ import {
   SelectValue,
   Button,
   Checkbox,
-} from "@cartridge/ui-next";
+} from "@cartridge/ui";
 
 export function CreateSession({
   policies,

packages/keychain/src/components/connect/Logout.tsx

@@ -1,5 +1,5 @@
 import { Container, Footer } from "@/components/layout";
-import { LogoutDuoIcon, Button } from "@cartridge/ui-next";
+import { LogoutDuoIcon, Button } from "@cartridge/ui";
 import { useConnection } from "@/hooks/connection";
 import { ResponseCodes } from "@cartridge/controller";
 

packages/keychain/src/components/connect/SessionConsent.tsx

@@ -1,4 +1,4 @@
-import { VerifiedIcon } from "@cartridge/ui-next";
+import { VerifiedIcon } from "@cartridge/ui";
 import { useConnection } from "@/hooks/connection";
 import { useMemo } from "react";
 import { Link } from "react-router-dom";

packages/keychain/src/components/connect/Upgrade.tsx

@@ -1,4 +1,4 @@
-import { BoltIcon, CircleIcon } from "@cartridge/ui-next";
+import { BoltIcon, CircleIcon } from "@cartridge/ui";
 import { ExecutionContainer } from "@/components/ExecutionContainer";
 import { Content } from "@/components/layout";
 import { useConnection } from "@/hooks/connection";

packages/keychain/src/components/connect/authenticate/Unsupported.tsx

@@ -1,4 +1,4 @@
-import { AlertIcon } from "@cartridge/ui-next";
+import { AlertIcon } from "@cartridge/ui";
 import { Container } from "@/components/layout";
 import { useEffect, useState } from "react";
 

packages/keychain/src/components/connect/authenticate/index.tsx

@@ -1,5 +1,5 @@
 import { useState, useCallback } from "react";
-import { Button } from "@cartridge/ui-next";
+import { Button } from "@cartridge/ui";
 import { Unsupported, useIsSupported } from "./Unsupported";
 import { doSignup } from "@/hooks/account";
 import { Container, Content, Footer } from "@/components/layout";

packages/keychain/src/components/connect/create/CreateController.tsx

@@ -1,6 +1,6 @@
 import { useRef, useState, useEffect } from "react";
 import { Container, Footer, Content } from "@/components/layout";
-import { Button, cn, Input } from "@cartridge/ui-next";
+import { Button, cn, Input } from "@cartridge/ui";
 import { useControllerTheme } from "@/hooks/theme";
 import { usePostHog } from "posthog-js/react";
 import { useDebounce } from "@/hooks/debounce";

packages/keychain/src/components/connect/create/Legal.tsx

@@ -1,4 +1,4 @@
-import { LockIcon } from "@cartridge/ui-next";
+import { LockIcon } from "@cartridge/ui";
 import { Link } from "react-router-dom";
 
 export const Legal = () => (

packages/keychain/src/components/connect/create/StatusTray.tsx

@@ -1,5 +1,5 @@
 import { ValidationState } from "./useUsernameValidation";
-import { cn, ExternalIcon } from "@cartridge/ui-next";
+import { cn, ExternalIcon } from "@cartridge/ui";
 import { useMemo } from "react";
 import { Link } from "react-router-dom";
 

packages/keychain/src/components/failure.tsx

@@ -1,5 +1,5 @@
 import { Container } from "@/components/layout";
-import { AlertIcon, ExternalIcon } from "@cartridge/ui-next";
+import { AlertIcon, ExternalIcon } from "@cartridge/ui";
 import { CARTRIDGE_DISCORD_LINK } from "@/const";
 import { Link } from "react-router-dom";
 

packages/keychain/src/components/funding/AmountSelection.tsx

@@ -1,10 +1,4 @@
-import {
-  DollarIcon,
-  Button,
-  cn,
-  useDisclosure,
-  Input,
-} from "@cartridge/ui-next";
+import { DollarIcon, Button, cn, useDisclosure, Input } from "@cartridge/ui";
 import { useState } from "react";
 
 export const DEFAULT_AMOUNT = 5;

packages/keychain/src/components/funding/Balance.tsx

@@ -5,7 +5,7 @@ import {
   CardListItem,
   CardTitle,
   CoinsIcon,
-} from "@cartridge/ui-next";
+} from "@cartridge/ui";
 import { TokenPair } from "@cartridge/utils/api/cartridge";
 import { formatEther } from "viem";
 import {

packages/keychain/src/components/funding/DepositEth.tsx

@@ -26,7 +26,7 @@ import {
   Button,
   CopyAddress,
   Separator,
-} from "@cartridge/ui-next";
+} from "@cartridge/ui";
 import { useConnection } from "@/hooks/connection";
 import { ErrorAlert } from "../ErrorAlert";
 import { parseEther } from "viem";

packages/keychain/src/components/funding/PurchaseCredits.tsx

@@ -6,7 +6,7 @@ import {
   Button,
   CopyAddress,
   Separator,
-} from "@cartridge/ui-next";
+} from "@cartridge/ui";
 import { useConnection } from "@/hooks/connection";
 import { AmountSelection, DEFAULT_AMOUNT } from "./AmountSelection";
 import { ErrorAlert } from "@/components/ErrorAlert";

packages/keychain/src/components/funding/StripeCheckout.tsx

@@ -7,7 +7,7 @@ import {
 import { StripePaymentElementOptions } from "@stripe/stripe-js";
 import { Container, Content, Footer } from "@/components/layout";
 import { useController } from "@/hooks/controller";
-import { CoinsIcon, CopyAddress, Button } from "@cartridge/ui-next";
+import { CoinsIcon, CopyAddress, Button } from "@cartridge/ui";
 import { ErrorAlert } from "@/components/ErrorAlert";
 
 type StripeCheckoutProps = {

packages/keychain/src/components/funding/index.tsx

@@ -7,7 +7,7 @@ import {
   CoinsIcon,
   EthereumIcon,
   CopyAddress,
-} from "@cartridge/ui-next";
+} from "@cartridge/ui";
 import { DepositEth } from "./DepositEth";
 import { PurchaseCredits } from "./PurchaseCredits";
 import { Balance, BalanceType } from "./Balance";

packages/keychain/src/components/layout/Content.tsx

@@ -1,4 +1,4 @@
-import { cn } from "@cartridge/ui-next";
+import { cn } from "@cartridge/ui";
 import { PropsWithChildren } from "react";
 
 export function Content({

packages/keychain/src/components/layout/container/header/BackButton.tsx

@@ -1,4 +1,4 @@
-import { ArrowIcon, Button } from "@cartridge/ui-next";
+import { ArrowIcon, Button } from "@cartridge/ui";
 import { isIframe } from "@cartridge/utils";
 
 export function BackButton({ onClick }: { onClick?: () => void }) {