Merge branch 'main' into yash/ref-constructor-params

Author: kumaryash90

.github/workflows/issue.yml

@@ -5,7 +5,7 @@ on:
     types: [opened, edited]
 
 env:
-  VALID_ISSUE_PREFIXES: "CNCT|DASH"
+  VALID_ISSUE_PREFIXES: "CNCT|DASH|PROT"
 
 jobs:
   linear:

apps/dashboard/framer-rewrites.js

@@ -28,4 +28,7 @@ module.exports = [
   // -- TPP --
   "/trusted-partner-program",
   "/trusted-partner-program/:partner_slug",
+  // -- legal --
+  "/terms",
+  "/privacy-policy",
 ];

apps/dashboard/redirects.js

@@ -301,6 +301,24 @@ async function redirects() {
       destination: "/community/ambassadors",
       permanent: false,
     },
+    // redirect `/tos` to `/terms`
+    {
+      source: "/tos",
+      destination: "/terms",
+      permanent: false,
+    },
+    // redirect `/privacy` to `/privacy-policy`
+    {
+      source: "/privacy",
+      destination: "/privacy-policy",
+      permanent: false,
+    },
+    // redirect `/mission` to `/home`
+    {
+      source: "/mission",
+      destination: "/home",
+      permanent: false,
+    },
     ...legacyDashboardToTeamRedirects,
   ];
 }

apps/dashboard/src/@/components/blocks/app-footer.tsx

@@ -107,14 +107,14 @@ export function AppFooter(props: AppFooterProps) {
           </Link>
           <Link
             className="px-[10px] py-[6px] text-muted-foreground text-sm hover:underline"
-            href="https://thirdweb.com/privacy"
+            href="https://thirdweb.com/privacy-policy"
             target="_blank"
           >
             Privacy Policy
           </Link>
           <Link
             className="px-[10px] py-[6px] text-muted-foreground text-sm hover:underline"
-            href="https://thirdweb.com/tos"
+            href="https://thirdweb.com/terms"
             target="_blank"
           >
             Terms of Service

apps/dashboard/src/@3rdweb-sdk/react/components/connect-wallet/index.tsx

@@ -163,8 +163,8 @@ export const CustomConnectWallet = (props: {
         theme={getSDKTheme(t)}
         client={thirdwebClient}
         connectModal={{
-          privacyPolicyUrl: "/privacy",
-          termsOfServiceUrl: "/tos",
+          privacyPolicyUrl: "/privacy-policy",
+          termsOfServiceUrl: "/terms",
           showThirdwebBranding: false,
           welcomeScreen: () => <ConnectWalletWelcomeScreen theme={t} />,
         }}
@@ -308,8 +308,8 @@ export function useCustomConnectModal() {
           url: "https://thirdweb.com",
         },
         chain: options?.chain,
-        privacyPolicyUrl: "/privacy",
-        termsOfServiceUrl: "/tos",
+        privacyPolicyUrl: "/privacy-policy",
+        termsOfServiceUrl: "/terms",
         showThirdwebBranding: false,
         welcomeScreen: () => (
           <ConnectWalletWelcomeScreen

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

@@ -1,5 +1,4 @@
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-import { Flex } from "@chakra-ui/react";
 import type { Abi } from "abitype";
 import { getContractFunctionsFromAbi } from "components/contract-components/getContractFunctionsFromAbi";
 import { ContractFunctionsOverview } from "components/contract-functions/contract-functions";
@@ -33,26 +32,24 @@ export const ContractExplorerPage: React.FC<ContractExplorePageProps> = ({
 
   const functions = getContractFunctionsFromAbi(abi);
   return (
-    <Flex direction="column" h="70vh">
+    <div className="flex h-[70vh] flex-col">
       {functions && functions.length > 0 ? (
         <ContractFunctionsOverview
           onlyFunctions
           functions={functions}
           contract={contract}
         />
       ) : (
-        <div className="flex items-center justify-center">
-          <Flex direction="column" textAlign="center" gap={2}>
-            <h2 className="font-semibold text-2xl tracking-tight">
-              No callable functions discovered in ABI.
-            </h2>
-            <p className="text-muted-foreground text-sm">
-              Please note that proxy contracts are not yet supported in the
-              explorer, check back soon for full proxy support.
-            </p>
-          </Flex>
+        <div className="flex flex-col items-center justify-center gap-2 text-center">
+          <h2 className="font-semibold text-2xl tracking-tight">
+            No callable functions discovered in ABI.
+          </h2>
+          <p className="text-muted-foreground text-sm">
+            Please note that proxy contracts are not yet supported in the
+            explorer, check back soon for full proxy support.
+          </p>
         </div>
       )}
-    </Flex>
+    </div>
   );
 };

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/components/airdrop-tab.tsx

@@ -8,7 +8,7 @@ import {
   SheetTitle,
   SheetTrigger,
 } from "@/components/ui/sheet";
-import { Flex } from "@chakra-ui/react";
+import { cn } from "@/lib/utils";
 import { TransactionButton } from "components/buttons/TransactionButton";
 import { useTrack } from "hooks/analytics/useTrack";
 import { UploadIcon } from "lucide-react";
@@ -114,44 +114,41 @@ const AirdropTab: React.FC<AirdropTabProps> = ({ contract, tokenId }) => {
         })}
       >
         <div className="flex flex-col gap-2">
-          <div className="mb-3 flex w-full flex-col gap-6 md:flex-row">
-            <Flex direction={{ base: "column", md: "row" }} gap={4}>
-              <Sheet open={open} onOpenChange={setOpen}>
-                <SheetTrigger asChild>
-                  <Button variant="primary" className="gap-2">
-                    Upload addresses <UploadIcon className="size-4" />
-                  </Button>
-                </SheetTrigger>
-                <SheetContent className="w-full overflow-y-auto sm:min-w-[540px] lg:min-w-[700px]">
-                  <SheetHeader>
-                    <SheetTitle className="mb-5 text-left">
-                      Airdrop NFTs
-                    </SheetTitle>
-                  </SheetHeader>
-                  <AirdropUpload
-                    onClose={() => setOpen(false)}
-                    setAirdrop={(value) =>
-                      setValue("addresses", value, { shouldDirty: true })
-                    }
-                  />
-                </SheetContent>
-              </Sheet>
+          <div className="mb-3 flex w-full flex-col gap-4 md:flex-row">
+            <Sheet open={open} onOpenChange={setOpen}>
+              <SheetTrigger asChild>
+                <Button variant="primary" className="gap-2">
+                  Upload addresses <UploadIcon className="size-4" />
+                </Button>
+              </SheetTrigger>
+              <SheetContent className="w-full overflow-y-auto sm:min-w-[540px] lg:min-w-[700px]">
+                <SheetHeader>
+                  <SheetTitle className="mb-5 text-left">
+                    Airdrop NFTs
+                  </SheetTitle>
+                </SheetHeader>
+                <AirdropUpload
+                  onClose={() => setOpen(false)}
+                  setAirdrop={(value) =>
+                    setValue("addresses", value, { shouldDirty: true })
+                  }
+                />
+              </SheetContent>
+            </Sheet>
 
-              <Flex
-                gap={2}
-                direction="row"
-                align="center"
-                justify="center"
-                color={addresses.length === 0 ? "orange.500" : "green.500"}
-              >
-                {addresses.length > 0 && (
-                  <p>
-                    ● <strong>{addresses.length} addresses</strong> ready to be
-                    airdropped
-                  </p>
-                )}
-              </Flex>
-            </Flex>
+            <div
+              className={cn("flex flex-row items-center justify-center gap-2", {
+                "text-orange-500": addresses.length === 0,
+                "text-green-500": addresses.length > 0,
+              })}
+            >
+              {addresses.length > 0 && (
+                <p>
+                  ● <strong>{addresses.length} addresses</strong> ready to be
+                  airdropped
+                </p>
+              )}
+            </div>
           </div>
           <p>
             You can airdrop to a maximum of 250 addresses at a time. If you have

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/nft-property.tsx

@@ -1,4 +1,3 @@
-import { Flex } from "@chakra-ui/react";
 import { Card, Text } from "tw-components";
 
 interface NftPropertyProps {
@@ -8,7 +7,7 @@ interface NftPropertyProps {
 
 export const NftProperty: React.FC<NftPropertyProps> = ({ property }) => {
   return (
-    <Card as={Flex} flexDir="column" gap={2}>
+    <Card className="flex flex-col gap-2">
       {property?.trait_type && (
         <Text
           size="label.sm"

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/proposals/components/proposal.tsx

@@ -4,7 +4,6 @@ import {
   tokensDelegated,
   votingTokenDecimals,
 } from "@3rdweb-sdk/react/hooks/useVote";
-import { Flex } from "@chakra-ui/react";
 import { TransactionButton } from "components/buttons/TransactionButton";
 import { CheckIcon, MinusIcon, XIcon } from "lucide-react";
 import { useState } from "react";
@@ -81,22 +80,19 @@ export const Proposal: React.FC<IProposal> = ({ proposal, contract }) => {
 
   return (
     <Card key={proposal.proposalId.toString()}>
-      <Flex mb="8px">
-        <Flex
-          paddingY="0px"
-          paddingX="16px"
-          borderRadius="25px"
-          bg={
+      <div
+        className="mb-2 rounded-md bg-gray-500 px-4 py-0"
+        style={{
+          background:
             ProposalStateToMetadataMap[
               proposal.stateLabel as keyof typeof VoteExt.ProposalState
-            ] || "gray.500"
-          }
-        >
-          <Text color="white">
-            {`${proposal.stateLabel?.charAt(0).toUpperCase()}${proposal.stateLabel?.slice(1)}`}
-          </Text>
-        </Flex>
-      </Flex>
+            ] || undefined,
+        }}
+      >
+        <Text color="white">
+          {`${proposal.stateLabel?.charAt(0).toUpperCase()}${proposal.stateLabel?.slice(1)}`}
+        </Text>
+      </div>
       <Text>
         <strong>Proposal:</strong> {proposal.description}
       </Text>
@@ -134,7 +130,7 @@ export const Proposal: React.FC<IProposal> = ({ proposal, contract }) => {
       !hasVotedQuery.data &&
       !hasVotedQuery.isPending &&
       tokensDelegatedQuery.data ? (
-        <Flex mt="24px" gap={2}>
+        <div className="mt-6 flex gap-2">
           <TransactionButton
             txChainID={contract.chain.id}
             size="sm"
@@ -175,7 +171,7 @@ export const Proposal: React.FC<IProposal> = ({ proposal, contract }) => {
               Abstain
             </div>
           </TransactionButton>
-        </Flex>
+        </div>
       ) : (
         canExecuteQuery.data && (
           <Button

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

@@ -1,6 +1,4 @@
 "use client";
-
-import { Flex } from "@chakra-ui/react";
 import type { ThirdwebContract } from "thirdweb";
 import { Card, Heading, LinkButton, Text } from "tw-components";
 import { TokenAirdropButton } from "./components/airdrop-button";
@@ -25,7 +23,7 @@ export const ContractTokensPage: React.FC<ContractTokenPageProps> = ({
 }) => {
   if (!isERC20) {
     return (
-      <Card as={Flex} flexDir="column" gap={3}>
+      <Card className="flex flex-col gap-3">
         {/* TODO  extract this out into it's own component and make it better */}
         <Heading size="subtitle.md">No Token extension enabled</Heading>
         <Text>
@@ -46,7 +44,7 @@ export const ContractTokensPage: React.FC<ContractTokenPageProps> = ({
   }
 
   return (
-    <Flex direction="column" gap={6}>
+    <div className="flex flex-col gap-6">
       <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
         <Heading size="title.sm">Contract Tokens</Heading>
         <div className="flex flex-col gap-3 md:flex-row">
@@ -59,6 +57,6 @@ export const ContractTokensPage: React.FC<ContractTokenPageProps> = ({
       </div>
 
       <TokenSupply contract={contract} />
-    </Flex>
+    </div>
   );
 };