Merge remote-tracking branch 'origin/main' into joaquim/smart-linking

thirdweb-dev · Sep 23, 2024 · f292a8d · f292a8d
2 parents 620f204 + 1133ccc
commit f292a8d
Show file tree

Hide file tree

Showing 264 changed files with 2,544 additions and 9,706 deletions.
diff --git a/.changeset/dull-rockets-joke.md b/.changeset/dull-rockets-joke.md
@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+[ReactNative] Respect icon theme color in connect button and detail modal
diff --git a/.changeset/loud-beds-pull.md b/.changeset/loud-beds-pull.md
@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Fix abi resolution fallback
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -11,7 +11,6 @@ packages/thirdweb/src/react/ @joaquim-verges @gregfromstl @MananTank @jnsdls @ed
 packages/thirdweb/src/reactive/ @joaquim-verges @gregfromstl @MananTank @jnsdls
 packages/thirdweb/src/gas/ @joaquim-verges @jnsdls
 packages/thirdweb/src/pay/ @joaquim-verges @gregfromstl @MananTank @jnsdls @edwardysun
-packages/typedoc-gen/ @MananTank @jnsdls @joaquim-verges
 packages/service-utils/ @arcoraven @jnsdls @joaquim-verges
 packages/eslint-config-thirdweb/ @jnsdls @joaquim-verges
 packages/tw-tsconfig/ @jnsdls @joaquim-verges

diff --git a/apps/dashboard/.eslintrc.js b/apps/dashboard/.eslintrc.js
@@ -55,6 +55,8 @@ module.exports = {
               "FormErrorMessage",
               "MenuGroup",
               "MenuItem",
+              "VStack",
+              "HStack",
               // also the types
               "ButtonProps",
               "BadgeProps",

diff --git a/apps/dashboard/knip.json b/apps/dashboard/knip.json
@@ -3,6 +3,6 @@
   "next": true,
   "ignore": ["src/@/components/ui/**"],
   "project": ["src/**"],
-  "ignoreBinaries": ["only-allow", "knip", "biome"],
+  "ignoreBinaries": ["only-allow", "biome"],
   "ignoreDependencies": ["@storybook/blocks", "@thirdweb-dev/service-utils"]
 }
diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json
@@ -111,21 +111,21 @@
     "@next/bundle-analyzer": "14.2.12",
     "@next/eslint-plugin-next": "14.2.12",
     "@playwright/test": "1.47.1",
-    "@storybook/addon-essentials": "8.3.1",
-    "@storybook/addon-interactions": "8.3.1",
-    "@storybook/addon-links": "8.3.1",
-    "@storybook/addon-onboarding": "8.3.1",
+    "@storybook/addon-essentials": "8.3.2",
+    "@storybook/addon-interactions": "8.3.2",
+    "@storybook/addon-links": "8.3.2",
+    "@storybook/addon-onboarding": "8.3.2",
     "@storybook/addon-viewport": "8.3.1",
     "@storybook/blocks": "8.3.1",
     "@storybook/nextjs": "8.3.1",
-    "@storybook/react": "8.3.1",
-    "@storybook/test": "8.3.1",
+    "@storybook/react": "8.3.2",
+    "@storybook/test": "8.3.2",
     "@types/color": "^3.0.6",
     "@types/node": "20.14.9",
     "@types/papaparse": "^5.3.14",
     "@types/pluralize": "^0.0.33",
     "@types/qrcode": "^1.5.5",
-    "@types/react": "^18.3.7",
+    "@types/react": "^18.3.8",
     "@types/react-dom": "^18",
     "@types/react-table": "^7.7.20",
     "@types/spdx-correct": "^3.1.3",
@@ -138,9 +138,10 @@
     "eslint-config-biome": "1.8.3",
     "eslint-plugin-react-compiler": "0.0.0-experimental-ca16900-20240916",
     "eslint-plugin-storybook": "^0.8.0",
+    "knip": "^5.30.4",
     "next-sitemap": "^4.2.3",
     "postcss": "8.4.47",
-    "storybook": "8.3.1",
+    "storybook": "8.3.2",
     "tailwindcss": "3.4.12",
     "typescript": "5.6.2"
   }

diff --git a/apps/dashboard/src/app/team/[team_slug]/(team)/~/usage/UsagePage.tsx b/apps/dashboard/src/app/team/[team_slug]/(team)/~/usage/UsagePage.tsx
@@ -2,7 +2,6 @@
 
 import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { useAccount, useAccountUsage } from "@3rdweb-sdk/react/hooks/useApi";
-import { HStack } from "@chakra-ui/react";
 import { BillingPeriod } from "components/settings/Account/Billing/Period";
 import { BillingPlan } from "components/settings/Account/Billing/Plan";
 import { Usage } from "components/settings/Account/Usage";
@@ -24,14 +23,10 @@ export const SettingsUsagePage = () => {
     <div className="flex flex-col gap-8">
       <div className="flex flex-col">
         <h1 className="font-semibold text-3xl tracking-tight mb-2">Usage</h1>
-        <HStack
-          justifyContent="space-between"
-          flexDir={{ base: "column", lg: "row" }}
-          alignItems={{ base: "flex-start", lg: "center" }}
-        >
+        <div className="flex flex-col lg:flex-row justify-between items-start lg:items-center">
           <BillingPlan account={account} />
           <BillingPeriod account={account} usage={usageQuery.data} />
-        </HStack>
+        </div>
       </div>
 
       <Usage usage={usageQuery.data} usagePending={usageQuery.isPending} />

diff --git a/apps/dashboard/src/components/engine/overview/backend-wallets-table.tsx b/apps/dashboard/src/components/engine/overview/backend-wallets-table.tsx
@@ -23,7 +23,6 @@ import {
   Select,
   Stack,
   type UseDisclosureReturn,
-  VStack,
   useDisclosure,
 } from "@chakra-ui/react";
 import { useQuery } from "@tanstack/react-query";
@@ -341,7 +340,7 @@ const ReceiveFundsModal = ({
         <ModalHeader>Receive Funds</ModalHeader>
         <ModalCloseButton />
         <ModalBody>
-          <VStack spacing={4} pb={8}>
+          <div className="flex flex-col gap-4 pb-8">
             <Text w="full" textAlign="left">
               Fund this address or QR code:
             </Text>
@@ -355,7 +354,7 @@ const ReceiveFundsModal = ({
               rounded="lg"
               w={200}
             />
-          </VStack>
+          </div>
         </ModalBody>
       </ModalContent>
     </Modal>

diff --git a/apps/dashboard/src/components/hackathon/HacakthonEarnFooter.tsx b/apps/dashboard/src/components/hackathon/HacakthonEarnFooter.tsx
@@ -1,4 +1,4 @@
-import { Flex, Icon, VStack } from "@chakra-ui/react";
+import { Flex, Icon } from "@chakra-ui/react";
 import { ImMagicWand } from "@react-icons/all-files/im/ImMagicWand";
 import { ChakraNextImage } from "components/Image";
 import { useTrack } from "hooks/analytics/useTrack";
@@ -15,17 +15,7 @@ export const HackathonEarnFooter = ({
   const trackEvent = useTrack();
 
   return (
-    <VStack
-      bg='url("/assets/hackathon/footer-bg.png")'
-      bgSize="cover"
-      bgRepeat="no-repeat"
-      bgPosition="center"
-      w="100%"
-      py={20}
-      gap={10}
-      borderTopRadius="50px"
-      px={6}
-    >
+    <div className="flex flex-col items-center bg-[url('/assets/hackathon/footer-bg.png')] bg-cover bg-no-repeat bg-center w-full py-20 gap-10 rounded-t-[50px] px-6">
       <ChakraNextImage
         src={require("../../../public/assets/landingpage/earnxtw.svg")}
         alt="Hackathon"
@@ -108,6 +98,6 @@ export const HackathonEarnFooter = ({
           Submission
         </LinkButton>
       </Flex>
-    </VStack>
+    </div>
   );
 };
diff --git a/apps/dashboard/src/components/hackathon/HackathonFooter.tsx b/apps/dashboard/src/components/hackathon/HackathonFooter.tsx
@@ -1,4 +1,4 @@
-import { Flex, Icon, VStack } from "@chakra-ui/react";
+import { Flex, Icon } from "@chakra-ui/react";
 import { ImMagicWand } from "@react-icons/all-files/im/ImMagicWand";
 import { ChakraNextImage } from "components/Image";
 import { useTrack } from "hooks/analytics/useTrack";
@@ -15,17 +15,7 @@ export const HackathonFooter = ({
   const trackEvent = useTrack();
 
   return (
-    <VStack
-      bg='url("/assets/hackathon/footer-bg.png")'
-      bgSize="cover"
-      bgRepeat="no-repeat"
-      bgPosition="center"
-      w="100%"
-      py={20}
-      gap={10}
-      borderTopRadius="50px"
-      px={6}
-    >
+    <div className="flex flex-col items-center bg-[url('/assets/hackathon/footer-bg.png')] bg-cover bg-no-repeat bg-center w-full py-20 gap-10 rounded-t-[50px] px-6">
       <ChakraNextImage
         src={require("../../../public/assets/landingpage/thirdwebw.svg")}
         alt="hackathon-partner"
@@ -104,6 +94,6 @@ export const HackathonFooter = ({
           Submission
         </LinkButton>
       </Flex>
-    </VStack>
+    </div>
   );
 };
diff --git a/apps/dashboard/src/components/hackathon/Judges.tsx b/apps/dashboard/src/components/hackathon/Judges.tsx
@@ -1,4 +1,4 @@
-import { Flex, SimpleGrid, VStack } from "@chakra-ui/react";
+import { Flex, SimpleGrid } from "@chakra-ui/react";
 import { Heading, Text, TrackedLink } from "tw-components";
 import { MaskedAvatar } from "tw-components/masked-avatar";
 
@@ -35,7 +35,7 @@ export const Judges = ({ TRACKING_CATEGORY }: JudgesProps) => {
   ];
 
   return (
-    <VStack spacing={8} position="relative">
+    <div className="gap-8 relative flex flex-col">
       <Heading size="title.2xl">Judges</Heading>
       <SimpleGrid
         columns={{ base: 1, lg: 4 }}
@@ -71,6 +71,6 @@ export const Judges = ({ TRACKING_CATEGORY }: JudgesProps) => {
           </Flex>
         ))}
       </SimpleGrid>
-    </VStack>
+    </div>
   );
 };
diff --git a/apps/dashboard/src/components/hackathon/JudgesEarn.tsx b/apps/dashboard/src/components/hackathon/JudgesEarn.tsx
@@ -1,4 +1,4 @@
-import { Flex, SimpleGrid, VStack } from "@chakra-ui/react";
+import { Flex, SimpleGrid } from "@chakra-ui/react";
 import { Heading, Text } from "tw-components";
 import { MaskedAvatar } from "tw-components/masked-avatar";
 
@@ -27,7 +27,7 @@ export const JudgesEarn = () => {
   ];
 
   return (
-    <VStack spacing={8} position="relative">
+    <div className="flex flex-col gap-8 relative">
       <Heading size="title.2xl">Judges</Heading>
       <SimpleGrid
         columns={{ base: 1, lg: 4 }}
@@ -52,6 +52,6 @@ export const JudgesEarn = () => {
           </Flex>
         ))}
       </SimpleGrid>
-    </VStack>
+    </div>
   );
 };
diff --git a/apps/dashboard/src/components/hackathon/common/AvatarShowcase.tsx b/apps/dashboard/src/components/hackathon/common/AvatarShowcase.tsx
@@ -1,4 +1,4 @@
-import { Avatar, Flex, VStack } from "@chakra-ui/react";
+import { Avatar, Flex } from "@chakra-ui/react";
 import { Heading, Text, TrackedLink } from "tw-components";
 
 interface AvatarShowcaseProps {
@@ -18,7 +18,7 @@ export const AvatarShowcase: React.FC<AvatarShowcaseProps> = ({
   trackingCategory,
 }) => {
   return (
-    <VStack spacing={12}>
+    <div className="flex flex-col gap-12">
       <Heading size="title.2xl">{title}</Heading>
       <Flex
         maxW="container.md"
@@ -68,6 +68,6 @@ export const AvatarShowcase: React.FC<AvatarShowcaseProps> = ({
           </Flex>
         ))}
       </Flex>
-    </VStack>
+    </div>
   );
 };
diff --git a/apps/dashboard/src/components/onboarding/General.tsx b/apps/dashboard/src/components/onboarding/General.tsx
@@ -1,5 +1,5 @@
 import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
-import { Flex, FocusLock, VStack } from "@chakra-ui/react";
+import { Flex, FocusLock } from "@chakra-ui/react";
 import { AccountForm } from "components/settings/Account/AccountForm";
 import { useState } from "react";
 import { useActiveWallet, useDisconnect } from "thirdweb/react";
@@ -60,7 +60,7 @@ const OnboardingGeneral: React.FC<OnboardingGeneralProps> = ({
           onDuplicateError={onDuplicate}
         />
 
-        <VStack justifyContent="center" w="full" gap={2}>
+        <div className="flex flex-col justify-center w-full gap-2">
           {!existing ? (
             <>
               <Button
@@ -94,7 +94,7 @@ const OnboardingGeneral: React.FC<OnboardingGeneralProps> = ({
               I don&apos;t have an account
             </Button>
           )}
-        </VStack>
+        </div>
       </Flex>
     </FocusLock>
   );

diff --git a/apps/dashboard/src/components/onboarding/Steps.tsx b/apps/dashboard/src/components/onboarding/Steps.tsx
@@ -1,3 +1,4 @@
+import { cn } from "@/lib/utils";
 import { CustomConnectWallet } from "@3rdweb-sdk/react/components/connect-wallet";
 import {
   AccountStatus,
@@ -6,7 +7,7 @@ import {
   useApiKeys,
 } from "@3rdweb-sdk/react/hooks/useApi";
 import { useLoggedInUser } from "@3rdweb-sdk/react/hooks/useLoggedInUser";
-import { Flex, HStack, VStack, useBreakpointValue } from "@chakra-ui/react";
+import { Flex, useBreakpointValue } from "@chakra-ui/react";
 import { ChakraNextImage } from "components/Image";
 import { OPSponsoredChains } from "constants/chains";
 import { useTrack } from "hooks/analytics/useTrack";
@@ -273,15 +274,15 @@ export const OnboardingSteps: React.FC<OnboardingStepsProps> = ({
       overflow="hidden"
       className="bg-muted/50"
     >
-      <VStack
-        gap={2}
-        alignItems="flex-start"
-        p={6}
-        w={rightImageDark && !isMobile ? "60%" : "100%"}
+      <div
+        className={cn(
+          "gap-2 flex flex-col items-start p-6",
+          rightImageDark && !isMobile ? "w-[60%]" : "w-full",
+        )}
       >
         <Heading size="title.sm">{title}</Heading>
         <Text>{description}</Text>
-        <HStack mt={4} alignItems="center">
+        <div className="flex flex-row mt-4 items-center">
           {isLoggedIn ? (
             <Button
               size="sm"
@@ -307,8 +308,8 @@ export const OnboardingSteps: React.FC<OnboardingStepsProps> = ({
               Skip
             </Button>
           )}
-        </HStack>
-      </VStack>
+        </div>
+      </div>
       {rightImageDark && !isMobile && theme === "dark" && (
         <ChakraNextImage src={rightImageDark} alt={""} w="50%" priority />
       )}

diff --git a/apps/dashboard/src/components/onboarding/Title.tsx b/apps/dashboard/src/components/onboarding/Title.tsx
@@ -1,4 +1,3 @@
-import { VStack } from "@chakra-ui/react";
 import { Heading, Text } from "tw-components";
 
 interface OnboardingTitleProps {
@@ -11,14 +10,14 @@ export const OnboardingTitle: React.FC<OnboardingTitleProps> = ({
   description,
 }) => {
   return (
-    <VStack alignItems="flex-start" gap={3}>
+    <div className="flex flex-col gap-3 items-start">
       <Heading size="title.sm">{heading}</Heading>
 
       {description && (
         <Text size="body.md" fontWeight="medium">
           {description}
         </Text>
       )}
-    </VStack>
+    </div>
   );
 };