Skip to content

Commit b1db7b8

Browse files
arcoravenarcoraven
authored
Merge branch 'main' into ph/selfServeCancel
2 parents 49b3b2a + 958bedd commit b1db7b8

File tree

39 files changed

+798
-360
lines changed

39 files changed

+798
-360
lines changed

‎.changeset/chilly-mangos-decide.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@thirdweb-dev/react-native-adapter": minor
3+
---
4+
5+
Updated required dependencies

‎.changeset/six-drinks-joke.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"thirdweb": minor
3+
---
4+
5+
Add ERC1155 extension: mintToBatch

‎.changeset/soft-colts-eat.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"thirdweb": minor
3+
---
4+
5+
Support for enclave wallet migration in React Native
6+
7+
this change requires the latest version of the `@thirdweb-dev/react-native-adapter` package to be installed.

‎apps/dashboard/src/components/devRelEvents/DevRelEvent.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { Flex, Icon, Image } from "@chakra-ui/react";
1+
import { Flex, Image } from "@chakra-ui/react";
22
import { useTrack } from "hooks/analytics/useTrack";
3-
import { FiCalendar, FiClock } from "react-icons/fi";
3+
import { CalendarIcon, ClockIcon } from "lucide-react";
44
import { Card, Heading, LinkButton, Text } from "tw-components";
55

66
interface EventProps {
@@ -53,7 +53,7 @@ export const DevRelEvent: React.FC<EventProps> = ({
5353
}}
5454
>
5555
<Flex align="center" gap={1} wrap="wrap">
56-
<Icon as={FiCalendar} color="gray.300" />
56+
<CalendarIcon className="size-4 text-gray-300" />
5757
<Text color="gray.300">
5858
{new Date(timestamp).toLocaleDateString("en-US", {
5959
weekday: "long",
@@ -64,7 +64,7 @@ export const DevRelEvent: React.FC<EventProps> = ({
6464
</Text>
6565
</Flex>
6666
<Flex align="center" gap={1}>
67-
<Icon as={FiClock} color="gray.300" />
67+
<ClockIcon className="size-4 text-gray-300" />
6868
<Text color="gray.300">
6969
{new Date(timestamp).toLocaleTimeString("en-US", {
7070
hour: "numeric",

‎apps/dashboard/src/components/homepage/sections/FeatureItem.tsx‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import { Flex, Icon, Tooltip } from "@chakra-ui/react";
2-
import { AiOutlineDollarCircle } from "react-icons/ai";
3-
import { IoCheckmarkCircle } from "react-icons/io5";
1+
import { Flex, Tooltip } from "@chakra-ui/react";
2+
import { CircleCheckIcon, CircleDollarSignIcon } from "lucide-react";
43
import { Card, Text } from "tw-components";
54

65
interface FeatureItemProps {
@@ -12,7 +11,7 @@ export const FeatureItem: React.FC<FeatureItemProps> = ({ text }) => {
1211

1312
return (
1413
<Flex gap={2} alignItems="flex-start">
15-
<Icon as={IoCheckmarkCircle} boxSize={5} mt={0.5} />
14+
<CircleCheckIcon className="size-6 fill-white text-black" />
1615
{Array.isArray(text) ? (
1716
<Flex alignItems="center" justifyItems="center" gap={2}>
1817
<Text>{titleStr}</Text>
@@ -34,13 +33,7 @@ export const FeatureItem: React.FC<FeatureItemProps> = ({ text }) => {
3433
boxShadow="none"
3534
>
3635
<Flex display={{ base: "none", md: "block" }} mb={-0.5}>
37-
<Icon
38-
position="relative"
39-
top={0.5}
40-
as={AiOutlineDollarCircle}
41-
boxSize={4}
42-
color="blue.500"
43-
/>
36+
<CircleDollarSignIcon className="relative size-4 text-blue-500" />
4437
</Flex>
4538
</Tooltip>
4639
<Text

‎apps/dashboard/src/components/ipfs-upload/dropzone.tsx‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
Divider,
1111
Flex,
1212
GridItem,
13-
Icon,
1413
Input,
1514
Progress,
1615
SimpleGrid,
@@ -22,10 +21,9 @@ import { PINNED_FILES_QUERY_KEY_ROOT } from "components/storage/your-files";
2221
import { useErrorHandler } from "contexts/error-handler";
2322
import { useTrack } from "hooks/analytics/useTrack";
2423
import { replaceIpfsUrl } from "lib/sdk";
24+
import { ExternalLinkIcon, Trash2Icon, UploadIcon } from "lucide-react";
2525
import { type Dispatch, type SetStateAction, useMemo, useState } from "react";
2626
import { useDropzone } from "react-dropzone";
27-
import { BsFillCloudUploadFill } from "react-icons/bs";
28-
import { FiExternalLink, FiTrash2, FiUploadCloud } from "react-icons/fi";
2927
import { toast } from "sonner";
3028
import { MediaRenderer } from "thirdweb/react";
3129
import { useActiveAccount } from "thirdweb/react";
@@ -92,7 +90,7 @@ export const IpfsUploadDropzone: React.FC = () => {
9290
) : (
9391
<div
9492
className={cn(
95-
"flex items-center justify-center rounded-xl border-2 border-border border-solid bg-transparent hover:border-blue-600 dark:border-blue-400",
93+
"flex h-full items-center justify-center rounded-xl border-2 border-border border-solid bg-transparent hover:border-blue-600 dark:border-blue-400",
9694
address ? "cursor-pointer" : "cursor-default",
9795
)}
9896
{...getRootProps()}
@@ -101,29 +99,13 @@ export const IpfsUploadDropzone: React.FC = () => {
10199

102100
{
103101
<Flex direction="column" gap={2} p={6} align="center">
102+
<UploadIcon className="mb-2 size-8 text-gray-600" />
104103
{isDragActive ? (
105-
<>
106-
<Icon
107-
as={BsFillCloudUploadFill}
108-
boxSize={8}
109-
mb={2}
110-
color="gray.600"
111-
/>
112-
<Text size="label.lg">Drop the files here</Text>
113-
</>
104+
<Text size="label.lg">Drop the files here</Text>
114105
) : (
115-
<>
116-
<Icon
117-
as={BsFillCloudUploadFill}
118-
boxSize={8}
119-
mb={2}
120-
color="gray.600"
121-
/>
122-
<Text size="label.lg" textAlign="center" lineHeight="150%">
123-
Drag and drop your file or folder here to upload it to
124-
IPFS
125-
</Text>
126-
</>
106+
<Text size="label.lg" textAlign="center" lineHeight="150%">
107+
Drag and drop your file or folder here to upload it to IPFS
108+
</Text>
127109
)}
128110
</Flex>
129111
}
@@ -260,7 +242,7 @@ const FileUpload: React.FC<FileUploadProps> = ({ files, updateFiles }) => {
260242
category={TRACKING_CATEGORY}
261243
label="open-in-gateway"
262244
aria-label="Open in gateway"
263-
icon={<Icon as={FiExternalLink} />}
245+
icon={<ExternalLinkIcon className="size-4" />}
264246
variant="ghost"
265247
isExternal
266248
size="sm"
@@ -285,7 +267,7 @@ const FileUpload: React.FC<FileUploadProps> = ({ files, updateFiles }) => {
285267
aria-label="Remove File"
286268
category={TRACKING_CATEGORY}
287269
label="remove-file"
288-
icon={<Icon as={FiTrash2} />}
270+
icon={<Trash2Icon className="size-4" />}
289271
variant="ghost"
290272
onClick={(e) => {
291273
e.stopPropagation();
@@ -465,7 +447,7 @@ const FileUpload: React.FC<FileUploadProps> = ({ files, updateFiles }) => {
465447
category={TRACKING_CATEGORY}
466448
href={mainIpfsUri}
467449
textDecor="none!important"
468-
rightIcon={<Icon as={FiExternalLink} />}
450+
rightIcon={<ExternalLinkIcon className="size-4" />}
469451
colorScheme="green"
470452
isExternal
471453
onClick={() => {
@@ -483,7 +465,7 @@ const FileUpload: React.FC<FileUploadProps> = ({ files, updateFiles }) => {
483465
isLoading={storageUpload.isPending}
484466
loadingText="Uploading..."
485467
colorScheme="green"
486-
leftIcon={<Icon as={FiUploadCloud} />}
468+
leftIcon={<UploadIcon className="size-4" />}
487469
onClick={() => {
488470
setIpfsHashes([]);
489471
trackEvent({

‎apps/dashboard/src/components/landing-pages/guide-showcase.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { Flex, Icon, SimpleGrid } from "@chakra-ui/react";
1+
import { Flex, SimpleGrid } from "@chakra-ui/react";
22
import { GuideCard } from "components/product-pages/common/GuideCard";
3-
import { FiArrowRight } from "react-icons/fi";
3+
import { MoveRightIcon } from "lucide-react";
44
import { Heading, TrackedLink, type TrackedLinkProps } from "tw-components";
55

66
type BlogPost = {
@@ -94,7 +94,7 @@ export const LandingGuidesShowcase: React.FC<LandingGuidesShowcaseProps> = ({
9494
>
9595
{customSolution}
9696
</Heading>
97-
<Icon as={FiArrowRight} />
97+
<MoveRightIcon className="size-4" />
9898
</Flex>
9999
</TrackedLink>
100100
)}
@@ -121,7 +121,7 @@ export const LandingGuidesShowcase: React.FC<LandingGuidesShowcaseProps> = ({
121121
See all of our {solution.replace("-", " ")}{" "}
122122
{caseStudies ? "case studies" : "guides"}
123123
</Heading>
124-
<Icon as={FiArrowRight} />
124+
<MoveRightIcon className="size-4" />
125125
</Flex>
126126
</TrackedLink>
127127
)}

‎apps/dashboard/src/components/product-pages/homepage/CodeSelector.tsx‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import { Flex, Icon } from "@chakra-ui/react";
1+
import { Flex } from "@chakra-ui/react";
22
import { useTrack } from "hooks/analytics/useTrack";
3+
import { FileTextIcon, SquareTerminalIcon } from "lucide-react";
34
import { themes } from "prism-react-renderer";
45
import { useState } from "react";
5-
import { AiOutlineCode } from "react-icons/ai";
6-
import { CgFileDocument } from "react-icons/cg";
76
import {
87
Card,
98
CodeBlock,
@@ -155,12 +154,12 @@ export const CodeSelector: React.FC<CodeSelectorProps> = ({
155154
/>
156155

157156
{/* Links for Replit and Docs */}
158-
<Flex justify="end" gap={6} position="absolute" bottom={0} right={2}>
157+
<Flex justify="end" gap={4} position="absolute" bottom={0} right={2}>
159158
<CustomLinkButton
160159
px={4}
161160
text="Docs"
162161
href={docs}
163-
icon={<Icon color="white" as={CgFileDocument} />}
162+
icon={<FileTextIcon className="size-4 text-white" />}
164163
onClick={() =>
165164
trackEvent({
166165
category: "code-selector",
@@ -173,7 +172,7 @@ export const CodeSelector: React.FC<CodeSelectorProps> = ({
173172
<CustomLinkButton
174173
text="Run"
175174
href={`https://replit.com/@thirdweb/${activeLanguage}-sdk`}
176-
icon={<Icon color="white" as={AiOutlineCode} />}
175+
icon={<SquareTerminalIcon className="size-4 text-white" />}
177176
onClick={() =>
178177
trackEvent({
179178
category: "code-selector",

‎apps/dashboard/src/components/selects/NetworkSelectorButton.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import { useStore } from "@/lib/reactive";
66
import { popularChains } from "@3rdweb-sdk/react/components/popularChains";
77
import { ChainIcon } from "components/icons/ChainIcon";
88
import { useActiveChainAsDashboardChain } from "lib/v5-adapter";
9+
import { ChevronDownIcon } from "lucide-react";
910
import { useTheme } from "next-themes";
1011
import { useEffect, useMemo, useRef, useState } from "react";
11-
import { BiChevronDown } from "react-icons/bi";
1212
import { useActiveWallet } from "thirdweb/react";
1313
import { useNetworkSwitcherModal } from "thirdweb/react";
1414
import { useFavoriteChainIds } from "../../app/(dashboard)/(chain)/components/client/star-button";
@@ -199,7 +199,7 @@ export const NetworkSelectorButton: React.FC<NetworkSelectorButtonProps> = ({
199199
<ChainIcon ipfsSrc={chain?.icon?.url} size={20} />
200200
{chain?.name || "Select Network"}
201201

202-
<BiChevronDown className="ml-auto size-4" />
202+
<ChevronDownIcon className="ml-auto size-4" />
203203
</Button>
204204

205205
<LazyConfigureNetworkModal

‎packages/react-native-adapter/package.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@
2323
},
2424
"./package.json": "./package.json"
2525
},
26-
"files": [
27-
"dist/*",
28-
"src/*"
29-
],
26+
"files": ["dist/*", "src/*"],
3027
"dependencies": {
28+
"@aws-sdk/client-kms": "3.670.0",
3129
"@aws-sdk/client-lambda": "3.670.0",
3230
"@aws-sdk/credential-providers": "3.670.0",
3331
"@mobile-wallet-protocol/client": "0.0.3",

0 commit comments

Comments
 (0)