Skip to content

Commit fbadb54

Browse files
committed
Merge remote-tracking branch 'origin/main' into ph/addSmartWalletTypes
2 parents ec0ee3a + f98059c commit fbadb54

File tree

17 files changed

+270
-114
lines changed

17 files changed

+270
-114
lines changed

.changeset/dull-mails-sleep.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/honest-papayas-remember.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/mean-mails-exercise.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

.changeset/new-rules-buy.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/olive-trees-play.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"thirdweb": patch
3+
---
4+
5+
Optimize ERC20 transferBatch

.changeset/red-garlics-play.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

apps/dashboard/framer-rewrites.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
// add framer paths here
22
module.exports = [
3+
// -- home
34
"/",
5+
// -- product landing pages --
6+
// -- connect
47
"/connect/sign-in",
8+
// -- contracts
59
"/contracts/modular-contracts",
6-
"/unlimited-wallets",
10+
"/contracts/explore",
11+
"/contracts/deployment-tool",
12+
// -- engine
713
"/engine",
14+
// -- solutions pages --
815
"/solutions/gaming",
916
"/solutions/consumer-apps",
17+
"/solutions/defi",
18+
// -- campaigns --
19+
"/unlimited-wallets",
1020
];
Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
const LOGGED_IN_ONLY_PATHS = [
2-
// anything that _starts_ with /dashboard is logged in only
3-
"/dashboard",
4-
// team pages are logged in only
5-
"/team",
6-
// anything that _starts_ with /cli is logged in only
7-
"/cli",
8-
// publish page
9-
"/contracts/publish",
10-
];
11-
121
export function isLoginRequired(pathname: string) {
13-
return LOGGED_IN_ONLY_PATHS.some((path) => pathname.startsWith(path));
2+
// remove '/' in front and then split by '/'
3+
const paths = pathname.slice(1).split("/");
4+
5+
// /dashboard, /team, /cli
6+
if (paths[0] === "dashboard" || paths[0] === "team" || paths[0] === "cli") {
7+
return true;
8+
}
9+
10+
// /contracts/publish
11+
if (paths[0] === "contracts" && paths[1] === "publish") {
12+
return true;
13+
}
14+
15+
return false;
1416
}

apps/dashboard/src/components/engine/engine-instances-table.tsx

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -430,34 +430,22 @@ function DeleteSubscriptionModalContent(props: {
430430

431431
<form onSubmit={form.handleSubmit(onSubmit)}>
432432
{/* Reason */}
433-
<FormControl isRequired>
433+
<FormControl>
434434
<FormLabel className="!text-base">
435435
Please share your feedback to help us improve Engine.
436436
</FormLabel>
437437
<RadioGroup>
438438
<div className="flex flex-col gap-2">
439-
<Radio
440-
value="USING_SELF_HOSTED"
441-
{...form.register("reason", { required: true })}
442-
>
439+
<Radio value="USING_SELF_HOSTED" {...form.register("reason")}>
443440
<span className="text-sm"> Migrating to self-hosted </span>
444441
</Radio>
445-
<Radio
446-
value="TOO_EXPENSIVE"
447-
{...form.register("reason", { required: true })}
448-
>
442+
<Radio value="TOO_EXPENSIVE" {...form.register("reason")}>
449443
<span className="text-sm"> Too expensive </span>
450444
</Radio>
451-
<Radio
452-
value="MISSING_FEATURES"
453-
{...form.register("reason", { required: true })}
454-
>
445+
<Radio value="MISSING_FEATURES" {...form.register("reason")}>
455446
<span className="text-sm"> Missing features </span>
456447
</Radio>
457-
<Radio
458-
value="OTHER"
459-
{...form.register("reason", { required: true })}
460-
>
448+
<Radio value="OTHER" {...form.register("reason")}>
461449
<span className="text-sm"> Other </span>
462450
</Radio>
463451
</div>

packages/thirdweb/.size-limit.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
{
2020
"name": "thirdweb/chains (tree-shaking)",
2121
"path": "./dist/esm/exports/chains.js",
22-
"limit": "500 B",
22+
"limit": "600 B",
2323
"import": "{ ethereum }"
2424
},
2525
{

0 commit comments

Comments
 (0)