Merge branch 'main' into greg/tool-2837-sdk-smart-accounts-use-6492-even-when-already-deployed

Author: gregfromstl

.changeset/cyan-shrimps-battle.md

@@ -64,7 +64,7 @@ export async function getTeams() {
   return null;
 }
 
-type TeamNebulWaitList = {
+type TeamNebulaWaitList = {
   onWaitlist: boolean;
   createdAt: null | string;
 };
@@ -86,7 +86,7 @@ export async function getTeamNebulaWaitList(teamSlug: string) {
   );
 
   if (res.ok) {
-    return (await res.json()).result as TeamNebulWaitList;
+    return (await res.json()).result as TeamNebulaWaitList;
   }
 
   return null;

.changeset/fair-planes-doubt.md

@@ -20,7 +20,7 @@ export const AllVariants: Story = {
 
 function Component() {
   return (
-    <div className="flex min-h-screen flex-col gap-6 bg-background p-6 text-foregroun">
+    <div className="flex min-h-screen flex-col gap-6 bg-background p-6 text-foreground">
       <Variants size="default" />
       <Variants size="sm" />
       <Variants size="icon" />
@@ -58,7 +58,7 @@ function Variants(props: {
           {props.size === "icon" ? (
             <StarIcon className="size-4" />
           ) : (
-            "Desctructive"
+            "Destructive"
           )}
         </Button>
       </div>

.changeset/little-beds-dress.md

@@ -15,7 +15,7 @@ const buttonVariants = cva(
         destructive:
           "bg-destructive hover:bg-destructive/90 text-semibold text-destructive-foreground ",
         outline:
-          "border border-input bg-transaprent hover:bg-accent hover:text-accent-foreground text-semibold",
+          "border border-input bg-transparent hover:bg-accent hover:text-accent-foreground text-semibold",
         secondary:
           "bg-secondary hover:bg-secondary/80 text-semibold text-secondary-foreground ",
         ghost: "hover:bg-accent text-semibold hover:text-accent-foreground",

.changeset/metal-mails-ring.md

@@ -31,7 +31,7 @@ function randomName() {
 
 function Component() {
   return (
-    <div className="flex min-h-screen flex-col gap-10 bg-background p-6 text-foregroun">
+    <div className="flex min-h-screen flex-col gap-10 bg-background p-6 text-foreground">
       <BadgeContainer label="5 items, no placeholder, no label, value filled">
         <SelectDemo listItems={5} selectFirst />
       </BadgeContainer>

.changeset/pink-gorillas-try.md

@@ -32,7 +32,7 @@ export function useThirdwebClient(jwt?: string) {
   });
 
   return useMemo(
-    // prfer jwt from props over the one from the token query if it exists
+    // prefer jwt from props over the one from the token query if it exists
     () => getThirdwebClient(jwt || query.data),
     [jwt, query.data],
   );

.changeset/yellow-experts-sparkle.md

@@ -100,7 +100,7 @@ function DashboardRouterTopProgressBarInner() {
     }
 
     async function startEffect() {
-      // if the loading state remains for atleast 500ms start the progress bar
+      // if the loading state remains for at least 500ms start the progress bar
       await wait(500);
       if (isMounted) {
         updateProgressBar(0, 100);

apps/dashboard/src/@/api/team.ts

@@ -143,7 +143,7 @@ body {
   min-height: 100%;
 }
 
-/* Fix colors on autofilled inputs  */
+/* Fix colors on auto-filled inputs  */
 input:-webkit-autofill,
 input:-webkit-autofill:hover,
 input:-webkit-autofill:focus,

apps/dashboard/src/@/components/ui/button.stories.tsx

@@ -22,7 +22,7 @@ export interface InternalTransaction {
 export function useActivity(contract: ThirdwebContract, autoUpdate?: boolean) {
   const abiQuery = useResolveContractAbi(contract);
 
-  // Get all the PreprareEvents from the contract abis
+  // Get all the Prepare Events from the contract abis
   const events: PreparedEvent<AbiEvent>[] = useMemo(() => {
     const eventsItems = (abiQuery.data || []).filter((o) => o.type === "event");
     const eventSignatures = eventsItems.map((event) => formatAbiItem(event));

apps/dashboard/src/@/components/ui/button.tsx

@@ -47,7 +47,7 @@ export const AddChainToWallet: React.FC<AddChainToWalletProps> = (props) => {
         className="w-full gap-2"
         variant="outline"
         onClick={() => {
-          // Connct directly to this chain
+          // Connect directly to this chain
           if (!account) {
             return customConnectModal({ chain: props.chain });
           }

apps/dashboard/src/@/components/ui/select.stories.tsx

@@ -12,7 +12,7 @@ export async function FaucetSection(props: {
 }) {
   const { chain, twAccount } = props;
 
-  // Check eligibilty.
+  // Check eligibility.
   const sanitizedChainName = chain.name.replace("Mainnet", "").trim();
   const amountToGive = getFaucetClaimAmount(props.chain.chainId);
 

apps/dashboard/src/@/constants/thirdweb.client.ts

@@ -162,7 +162,7 @@ export default async function ChainPageLayout(props: {
             {/* Gas Sponsored badge - Mobile */}
             {chainMetadata?.gasSponsored && (
               <div className="flex md:hidden">
-                <GasSponseredBadge />
+                <GasSponsoredBadge />
               </div>
             )}
 
@@ -182,7 +182,7 @@ export default async function ChainPageLayout(props: {
               {/* Gas Sponsored badge - Desktop */}
               {chainMetadata?.gasSponsored && (
                 <div className="hidden md:block">
-                  <GasSponseredBadge />
+                  <GasSponsoredBadge />
                 </div>
               )}
             </div>
@@ -221,7 +221,7 @@ export default async function ChainPageLayout(props: {
   );
 }
 
-function GasSponseredBadge() {
+function GasSponsoredBadge() {
   return (
     <div className="flex items-center gap-2 rounded-full bg-[hsla(335,57%,51%,0.2)] px-2.5 py-1 text-[hsl(334,81.12%,69.65%)]">
       <TicketCheckIcon className="size-4" />

apps/dashboard/src/@/lib/DashboardRouter.tsx

@@ -13,7 +13,7 @@ import { ListerOnly } from "@3rdweb-sdk/react/components/roles/lister-only";
 import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
 import { isAlchemySupported } from "lib/wallet/nfts/alchemy";
 import { isMoralisSupported } from "lib/wallet/nfts/moralis";
-import { isSimpleHashSupported } from "lib/wallet/nfts/simpleHash";
+import { useSimplehashSupport } from "lib/wallet/nfts/simpleHash";
 import { PlusIcon } from "lucide-react";
 import { useState } from "react";
 import type { ThirdwebContract } from "thirdweb";
@@ -40,9 +40,12 @@ export const CreateListingButton: React.FC<CreateListingButtonProps> = ({
   const [open, setOpen] = useState(false);
   const [listingMode, setListingMode] =
     useState<(typeof LISTING_MODES)[number]>("Select NFT");
+
+  const simplehashQuery = useSimplehashSupport(contract.chain.id);
+
   const isSupportedChain =
     contract.chain.id &&
-    (isSimpleHashSupported(contract.chain.id) ||
+    (simplehashQuery.data ||
       isAlchemySupported(contract.chain.id) ||
       isMoralisSupported(contract.chain.id));
   return (

apps/dashboard/src/@/styles/globals.css

@@ -21,7 +21,7 @@ import { useAllChainsData } from "hooks/chains/allChains";
 import { useTxNotifications } from "hooks/useTxNotifications";
 import { isAlchemySupported } from "lib/wallet/nfts/alchemy";
 import { isMoralisSupported } from "lib/wallet/nfts/moralis";
-import { isSimpleHashSupported } from "lib/wallet/nfts/simpleHash";
+import { useSimplehashSupport } from "lib/wallet/nfts/simpleHash";
 import type { WalletNFT } from "lib/wallet/nfts/types";
 import { CircleAlertIcon, InfoIcon } from "lucide-react";
 import Link from "next/link";
@@ -112,10 +112,10 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
   const { idToChain } = useAllChainsData();
   const network = idToChain.get(chainId);
   const [isFormLoading, setIsFormLoading] = useState(false);
-
+  const simplehashQuery = useSimplehashSupport(contract.chain.id);
   const isSupportedChain =
     chainId &&
-    (isSimpleHashSupported(chainId) ||
+    (!!simplehashQuery.data ||
       isAlchemySupported(chainId) ||
       isMoralisSupported(chainId));
 

apps/dashboard/src/@3rdweb-sdk/react/hooks/useActivity.ts

@@ -51,7 +51,7 @@ export const AccountsTable: React.FC<AccountsTableProps> = ({ contract }) => {
   const totalAccountsQuery = useReadContract(totalAccounts, { contract });
 
   // the total size should never be more than max int size (that would be hella wallets!)
-  // so converting the totalAccounts to a nunber should be safe here
+  // so converting the totalAccounts to a number should be safe here
   const totalAccountsNum = useMemo(
     () => Number(totalAccountsQuery.data || 0),
     [totalAccountsQuery.data],

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/add-chain-to-wallet.tsx

@@ -1,9 +1,8 @@
 "use client";
 
 import { Button } from "@/components/ui/button";
-import { Card } from "@/components/ui/card";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
-import { Tooltip } from "@chakra-ui/react";
 import { TransactionButton } from "components/buttons/TransactionButton";
 import type { ThirdwebContract } from "thirdweb";
 import * as ERC4337Ext from "thirdweb/extensions/erc4337";
@@ -53,23 +52,11 @@ export const CreateAccountButton: React.FC<CreateAccountButtonProps> = ({
 
   if (isAccountDeployedQuery.data && accountsForAddressQuery.data?.length) {
     return (
-      <Tooltip
-        label={
-          <Card className="bg-card px-4 py-2">
-            <p>You can only initialize one account per EOA.</p>
-          </Card>
-        }
-        bg="transparent"
-        boxShadow="none"
-        bgColor="backgroundHighlight"
-        borderRadius="lg"
-        placement="right"
-        shouldWrapChildren
-      >
+      <ToolTipLabel label="You can only initialize one account per EOA.">
         <Button variant="primary" disabled>
           Account Created
         </Button>
-      </Tooltip>
+      </ToolTipLabel>
     );
   }
 

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/FaucetSection.tsx

@@ -52,7 +52,7 @@ export default async function Layout(props: {
   // check if the contract exists
   const isValidContract = await isContractDeployed(contract).catch(() => false);
   if (!isValidContract) {
-    // TODO - replace 404 with a better page to upsale deploy or other thirdweb products
+    // TODO - replace 404 with a better page to upsell deploy or other thirdweb products
     notFound();
   }
   const contractPageMetadata = await getContractPageMetadata(contract);

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/(chainPage)/layout.tsx

@@ -82,7 +82,7 @@ export function AdvancedNFTMetadataFormGroup<
               <Input {...field} />
             </FormControl>
             <FormDescription>
-              If you already have your NFT Animation URL preuploaded, you can
+              If you already have your NFT Animation URL pre-uploaded, you can
               set the URL or URI here.
             </FormDescription>
             <FormMessage />

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/list-button.tsx

@@ -59,7 +59,7 @@ const ClaimTabERC1155: React.FC<ClaimTabProps> = ({
           if (approveTx) {
             const approvalPromise = sendAndConfirmTx.mutateAsync(approveTx);
             toast.promise(approvalPromise, {
-              success: "Approved succesfully",
+              success: "Approved successfully",
               error: "Failed to approve ERC20",
             });
             await approvalPromise;

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/list-form.tsx

@@ -361,7 +361,7 @@ export const UpdateNftMetadata: React.FC<UpdateNftMetadataForm> = ({
               <FormLabel>Image URL</FormLabel>
               <Input max="6" {...register("customImage")} />
               <FormHelperText>
-                If you already have your NFT image preuploaded, you can set the
+                If you already have your NFT image pre-uploaded, you can set the
                 URL or URI here.
               </FormHelperText>
               <FormErrorMessage>
@@ -372,7 +372,7 @@ export const UpdateNftMetadata: React.FC<UpdateNftMetadataForm> = ({
               <FormLabel>Animation URL</FormLabel>
               <Input max="6" {...register("customAnimationUrl")} />
               <FormHelperText>
-                If you already have your NFT Animation URL preuploaded, you can
+                If you already have your NFT Animation URL pre-uploaded, you can
                 set the URL or URI here.
               </FormHelperText>
               <FormErrorMessage>

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/components/accounts-table.tsx

@@ -294,7 +294,7 @@ export const LazyMintNftForm: React.FC<LazyMintNftFormParams> = ({
                 <FormLabel>Image URL</FormLabel>
                 <Input max="6" {...register("customImage")} />
                 <FormHelperText>
-                  If you already have your NFT image preuploaded, you can set
+                  If you already have your NFT image pre-uploaded, you can set
                   the URL or URI here.
                 </FormHelperText>
                 <FormErrorMessage>
@@ -305,7 +305,7 @@ export const LazyMintNftForm: React.FC<LazyMintNftFormParams> = ({
                 <FormLabel>Animation URL</FormLabel>
                 <Input max="6" {...register("customAnimationUrl")} />
                 <FormHelperText>
-                  If you already have your NFT Animation URL preuploaded, you
+                  If you already have your NFT Animation URL pre-uploaded, you
                   can set the URL or URI here.
                 </FormHelperText>
                 <FormErrorMessage>

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/components/create-account-button.tsx

@@ -317,7 +317,7 @@ export const NFTMintForm: React.FC<NFTMintForm> = ({
                 <FormLabel>Image URL</FormLabel>
                 <Input max="6" {...register("customImage")} />
                 <FormHelperText>
-                  If you already have your NFT image preuploaded, you can set
+                  If you already have your NFT image pre-uploaded, you can set
                   the URL or URI here.
                 </FormHelperText>
                 <FormErrorMessage>
@@ -328,7 +328,7 @@ export const NFTMintForm: React.FC<NFTMintForm> = ({
                 <FormLabel>Animation URL</FormLabel>
                 <Input max="6" {...register("customAnimationUrl")} />
                 <FormHelperText>
-                  If you already have your NFT Animation URL preuploaded, you
+                  If you already have your NFT Animation URL pre-uploaded, you
                   can set the URL or URI here.
                 </FormHelperText>
                 <FormErrorMessage>

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/layout.tsx

@@ -70,7 +70,7 @@ export const NFTRevealButton: React.FC<NFTRevealButtonProps> = ({
     );
   }
 
-  return batchesQuery.data?.length ? (
+  return (
     <MinterOnly contract={contract}>
       <Sheet open={open} onOpenChange={setOpen}>
         <SheetTrigger asChild>
@@ -168,5 +168,5 @@ export const NFTRevealButton: React.FC<NFTRevealButtonProps> = ({
         </SheetContent>
       </Sheet>
     </MinterOnly>
-  ) : null;
+  );
 };

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/nft/AdvancedNFTMetadataFormGroup.tsx

@@ -247,7 +247,7 @@ export const SharedMetadataForm: React.FC<{
                 <FormLabel>Image URL</FormLabel>
                 <Input max="6" {...register("customImage")} />
                 <FormHelperText>
-                  If you already have your NFT image preuploaded, you can set
+                  If you already have your NFT image pre-uploaded, you can set
                   the URL or URI here.
                 </FormHelperText>
                 <FormErrorMessage>
@@ -258,7 +258,7 @@ export const SharedMetadataForm: React.FC<{
                 <FormLabel>Animation URL</FormLabel>
                 <Input max="6" {...register("customAnimationUrl")} />
                 <FormHelperText>
-                  If you already have your NFT Animation URL preuploaded, you
+                  If you already have your NFT Animation URL pre-uploaded, you
                   can set the URL or URI here.
                 </FormHelperText>
                 <FormErrorMessage>