Skip to content

Commit d640f7b

Browse files
committed
Merge remote-tracking branch 'Dashboard/main' into Joe-ChainPageUpdates
2 parents 2c9e80e + 27d3a6e commit d640f7b

File tree

55 files changed

+3440
-1581
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+3440
-1581
lines changed

.changeset/curly-cycles-hammer.md

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

.changeset/dirty-goats-invent.md

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

.changeset/fair-plants-pretend.md

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

.changeset/serious-bananas-boil.md

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

.changeset/strong-meals-remain.md

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

.github/workflows/auto-assign.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Auto Author Assign
2+
3+
on:
4+
pull_request:
5+
types: [ opened, reopened ]
6+
7+
permissions:
8+
pull-requests: write
9+
10+
jobs:
11+
assign-author:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: toshimaru/[email protected]

apps/dashboard/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"@chakra-ui/react": "^2.8.2",
2626
"@chakra-ui/styled-system": "^2.9.2",
2727
"@chakra-ui/theme-tools": "^2.1.2",
28-
"@emotion/react": "11.13.5",
29-
"@emotion/styled": "11.13.5",
28+
"@emotion/react": "11.14.0",
29+
"@emotion/styled": "11.14.0",
3030
"@hookform/resolvers": "^3.9.1",
3131
"@marsidev/react-turnstile": "^1.1.0",
3232
"@n8tb1t/use-scroll-position": "^2.0.3",
@@ -61,7 +61,7 @@
6161
"compare-versions": "^6.1.0",
6262
"date-fns": "4.1.0",
6363
"flat": "^6.0.1",
64-
"framer-motion": "11.13.1",
64+
"framer-motion": "11.13.3",
6565
"fuse.js": "7.0.0",
6666
"input-otp": "^1.4.1",
6767
"ioredis": "^5.4.1",
@@ -88,8 +88,8 @@
8888
"recharts": "^2.13.3",
8989
"remark-gfm": "^4.0.0",
9090
"server-only": "^0.0.1",
91-
"shiki": "1.24.0",
92-
"sonner": "^1.7.0",
91+
"shiki": "1.24.1",
92+
"sonner": "^1.7.1",
9393
"spdx-correct": "^3.2.0",
9494
"swagger-ui-react": "^5.18.2",
9595
"tailwind-merge": "^2.5.5",
@@ -104,7 +104,7 @@
104104
"@chromatic-com/storybook": "3.2.2",
105105
"@next/bundle-analyzer": "15.0.4",
106106
"@next/eslint-plugin-next": "15.0.4",
107-
"@playwright/test": "1.49.0",
107+
"@playwright/test": "1.49.1",
108108
"@storybook/addon-essentials": "8.4.7",
109109
"@storybook/addon-interactions": "8.4.7",
110110
"@storybook/addon-links": "8.4.7",
@@ -120,7 +120,7 @@
120120
"@types/pluralize": "^0.0.33",
121121
"@types/qrcode": "^1.5.5",
122122
"@types/react": "19.0.1",
123-
"@types/react-dom": "19.0.1",
123+
"@types/react-dom": "19.0.2",
124124
"@types/react-table": "^7.7.20",
125125
"@types/spdx-correct": "^3.1.3",
126126
"@types/swagger-ui-react": "^4.18.3",

apps/dashboard/src/app/account/contracts/DeployedContractsPageHeader.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ export function DeployedContractsPageHeader() {
1717
setImportModalOpen(false);
1818
}}
1919
/>
20-
<div className="flex flex-col gap-4 md:pb-4 lg:flex-row lg:justify-between">
20+
<div className="flex flex-col gap-4 lg:flex-row lg:justify-between">
2121
<div>
22-
<h1 className="mb-1.5 font-semibold text-3xl tracking-tight lg:text-4xl">
23-
Your contracts
22+
<h1 className="mb-1 font-semibold text-2xl tracking-tight lg:text-3xl">
23+
Deployed contracts
2424
</h1>
2525
<p className="text-muted-foreground text-sm">
26-
The list of contract instances that you have deployed or imported
27-
with thirdweb across all networks
26+
The list of contracts that you have deployed or imported with
27+
thirdweb across all networks
2828
</p>
2929
</div>
3030
<div className="flex gap-2 [&>*]:grow">

apps/dashboard/src/app/account/contracts/_components/DeployedContractsPage.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ import { getSortedDeployedContracts } from "./getSortedDeployedContracts";
88

99
export function DeployedContractsPage(props: {
1010
address: string;
11-
className?: string;
1211
}) {
1312
return (
14-
<div className={props.className}>
13+
<div className="flex grow flex-col">
1514
<DeployedContractsPageHeader />
16-
<div className="h-6" />
15+
<div className="h-8" />
1716
<Suspense fallback={<Loading />}>
1817
<DeployedContractsPageAsync {...props} />
1918
</Suspense>
Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
1+
import { SidebarLayout } from "@/components/blocks/SidebarLayout";
2+
13
export default function Layout(props: {
24
children: React.ReactNode;
35
}) {
4-
return <div className="container flex grow flex-col">{props.children}</div>;
6+
const layoutPath = "/account/contracts";
7+
8+
return (
9+
<SidebarLayout
10+
sidebarLinks={[
11+
{
12+
href: layoutPath,
13+
label: "Deployed contracts",
14+
exactMatch: true,
15+
},
16+
{
17+
href: `${layoutPath}/published`,
18+
label: "Published contracts",
19+
exactMatch: true,
20+
},
21+
]}
22+
>
23+
{props.children}
24+
</SidebarLayout>
25+
);
526
}

0 commit comments

Comments
 (0)