Skip to content

Commit 216279d

Browse files
joaquim-vergesjoaquim-verges
committed
fix project update
1 parent 0de87b1 commit 216279d

File tree

4 files changed

+49
-54
lines changed

4 files changed

+49
-54
lines changed

‎apps/dashboard/src/app/team/[team_slug]/[project_slug]/transactions/server-wallets/components/create-server-wallet.client.tsx‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
"use client";
2+
import type { Project } from "@/api/projects";
3+
import { CopyTextButton } from "@/components/ui/CopyTextButton";
24
import { Spinner } from "@/components/ui/Spinner/Spinner";
35
import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
46
import { Button } from "@/components/ui/button";
7+
import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
58
import {
69
Dialog,
710
DialogContent,
@@ -12,7 +15,6 @@ import { THIRDWEB_VAULT_URL } from "@/constants/env";
1215
import { useDashboardRouter } from "@/lib/DashboardRouter";
1316
import { cn } from "@/lib/utils";
1417
import { updateProjectClient } from "@3rdweb-sdk/react/hooks/useApi";
15-
import { Checkbox } from "@radix-ui/react-checkbox";
1618
import { useMutation } from "@tanstack/react-query";
1719
import {
1820
createAccessToken,
@@ -23,12 +25,9 @@ import {
2325
import { Loader2 } from "lucide-react";
2426
import { useState } from "react";
2527
import { toast } from "sonner";
26-
import { CopyTextButton } from "../../../../../../../@/components/ui/CopyTextButton";
27-
import { CheckboxWithLabel } from "../../../../../../../@/components/ui/checkbox";
2828

2929
export default function CreateServerWallet(props: {
30-
projectId: string;
31-
teamId: string;
30+
project: Project;
3231
managementAccessToken: string | undefined;
3332
}) {
3433
const router = useDashboardRouter();
@@ -48,8 +47,8 @@ export default function CreateServerWallet(props: {
4847
request: {
4948
options: {
5049
metadata: {
51-
projectId: props.projectId,
52-
teamId: props.teamId,
50+
projectId: props.project.id,
51+
teamId: props.project.teamId,
5352
purpose: "Thirdweb Project Server Wallet Service Account",
5453
},
5554
},
@@ -74,13 +73,13 @@ export default function CreateServerWallet(props: {
7473
{
7574
key: "projectId",
7675
rule: {
77-
pattern: props.projectId,
76+
pattern: props.project.id,
7877
},
7978
},
8079
{
8180
key: "teamId",
8281
rule: {
83-
pattern: props.teamId,
82+
pattern: props.project.teamId,
8483
},
8584
},
8685
{
@@ -97,13 +96,13 @@ export default function CreateServerWallet(props: {
9796
{
9897
key: "projectId",
9998
rule: {
100-
pattern: props.projectId,
99+
pattern: props.project.id,
101100
},
102101
},
103102
{
104103
key: "teamId",
105104
rule: {
106-
pattern: props.teamId,
105+
pattern: props.project.teamId,
107106
},
108107
},
109108
{
@@ -116,8 +115,8 @@ export default function CreateServerWallet(props: {
116115
},
117116
],
118117
metadata: {
119-
projectId: props.projectId,
120-
teamId: props.teamId,
118+
projectId: props.project.id,
119+
teamId: props.project.teamId,
121120
purpose: "Thirdweb Project Server Wallet Access Token",
122121
},
123122
},
@@ -141,13 +140,13 @@ export default function CreateServerWallet(props: {
141140
{
142141
key: "projectId",
143142
rule: {
144-
pattern: props.projectId,
143+
pattern: props.project.id,
145144
},
146145
},
147146
{
148147
key: "teamId",
149148
rule: {
150-
pattern: props.teamId,
149+
pattern: props.project.teamId,
151150
},
152151
},
153152
{
@@ -164,13 +163,13 @@ export default function CreateServerWallet(props: {
164163
{
165164
key: "projectId",
166165
rule: {
167-
pattern: props.projectId,
166+
pattern: props.project.id,
168167
},
169168
},
170169
{
171170
key: "teamId",
172171
rule: {
173-
pattern: props.teamId,
172+
pattern: props.project.teamId,
174173
},
175174
},
176175
{
@@ -187,13 +186,13 @@ export default function CreateServerWallet(props: {
187186
{
188187
key: "projectId",
189188
rule: {
190-
pattern: props.projectId,
189+
pattern: props.project.id,
191190
},
192191
},
193192
{
194193
key: "teamId",
195194
rule: {
196-
pattern: props.teamId,
195+
pattern: props.project.teamId,
197196
},
198197
},
199198
{
@@ -211,13 +210,13 @@ export default function CreateServerWallet(props: {
211210
{
212211
key: "projectId",
213212
rule: {
214-
pattern: props.projectId,
213+
pattern: props.project.id,
215214
},
216215
},
217216
{
218217
key: "teamId",
219218
rule: {
220-
pattern: props.teamId,
219+
pattern: props.project.teamId,
221220
},
222221
},
223222
{
@@ -234,13 +233,13 @@ export default function CreateServerWallet(props: {
234233
{
235234
key: "projectId",
236235
rule: {
237-
pattern: props.projectId,
236+
pattern: props.project.id,
238237
},
239238
},
240239
{
241240
key: "teamId",
242241
rule: {
243-
pattern: props.teamId,
242+
pattern: props.project.teamId,
244243
},
245244
},
246245
{
@@ -253,8 +252,8 @@ export default function CreateServerWallet(props: {
253252
},
254253
],
255254
metadata: {
256-
projectId: props.projectId,
257-
teamId: props.teamId,
255+
projectId: props.project.id,
256+
teamId: props.project.teamId,
258257
purpose: "Thirdweb Project Server Wallet Access Token",
259258
},
260259
},
@@ -276,11 +275,12 @@ export default function CreateServerWallet(props: {
276275
// store the management access token in the project
277276
await updateProjectClient(
278277
{
279-
projectId: props.projectId,
280-
teamId: props.teamId,
278+
projectId: props.project.id,
279+
teamId: props.project.teamId,
281280
},
282281
{
283282
services: [
283+
...props.project.services,
284284
{
285285
name: "engineCloud",
286286
managementAccessToken: managementAccessTokenRes.data.accessToken,
@@ -317,8 +317,8 @@ export default function CreateServerWallet(props: {
317317
request: {
318318
options: {
319319
metadata: {
320-
projectId: props.projectId,
321-
teamId: props.teamId,
320+
projectId: props.project.id,
321+
teamId: props.project.teamId,
322322
type: "server-wallet",
323323
},
324324
},
@@ -343,16 +343,17 @@ export default function CreateServerWallet(props: {
343343
});
344344

345345
const handleCreateServerWallet = async () => {
346-
if (!props.managementAccessToken) {
347-
const initResult = await initialiseProjectWithVaultMutation.mutateAsync();
348-
await createEoaMutation.mutateAsync({
349-
managementAccessToken: initResult.managementAccessToken.accessToken,
350-
});
351-
} else {
352-
await createEoaMutation.mutateAsync({
353-
managementAccessToken: props.managementAccessToken,
354-
});
355-
}
346+
// FIXME uncomment this
347+
// if (!props.managementAccessToken) {
348+
const initResult = await initialiseProjectWithVaultMutation.mutateAsync();
349+
await createEoaMutation.mutateAsync({
350+
managementAccessToken: initResult.managementAccessToken.accessToken,
351+
});
352+
// } else {
353+
// await createEoaMutation.mutateAsync({
354+
// managementAccessToken: props.managementAccessToken,
355+
// });
356+
// }
356357
};
357358

358359
const handleCloseModal = () => {

‎apps/dashboard/src/app/team/[team_slug]/[project_slug]/transactions/server-wallets/page.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ export default async function TransactionsServerWalletsPage(props: {
5656
<div className="flex flex-col gap-8">
5757
<ServerWalletsTable
5858
wallets={eoas.data.items as Wallet[]}
59-
projectId={project.id}
60-
teamId={project.teamId}
59+
project={project}
6160
managementAccessToken={managementAccessToken ?? undefined}
6261
/>
6362
<KeyManagement

‎apps/dashboard/src/app/team/[team_slug]/[project_slug]/transactions/server-wallets/wallet-table/wallet-table-ui.client.tsx‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,14 @@ import { formatDistanceToNowStrict } from "date-fns";
1515
import { format } from "date-fns/format";
1616
import CreateServerWallet from "../components/create-server-wallet.client";
1717
import type { Wallet } from "./types";
18-
18+
import type { Project } from "@/api/projects";
1919
export function ServerWalletsTableUI({
2020
wallets,
21-
projectId,
22-
teamId,
21+
project,
2322
managementAccessToken,
2423
}: {
2524
wallets: Wallet[];
26-
projectId: string;
27-
teamId: string;
25+
project: Project;
2826
managementAccessToken: string | undefined;
2927
}) {
3028
return (
@@ -41,8 +39,7 @@ export function ServerWalletsTableUI({
4139
</div>
4240
</div>
4341
<CreateServerWallet
44-
projectId={projectId}
45-
teamId={teamId}
42+
project={project}
4643
managementAccessToken={managementAccessToken}
4744
/>
4845
</div>

‎apps/dashboard/src/app/team/[team_slug]/[project_slug]/transactions/server-wallets/wallet-table/wallet-table.tsx‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1+
import type { Project } from "@/api/projects";
12
import type { Wallet } from "./types";
23
import { ServerWalletsTableUI } from "./wallet-table-ui.client";
34

45
export function ServerWalletsTable({
56
wallets,
6-
projectId,
7-
teamId,
7+
project,
88
managementAccessToken,
99
}: {
1010
wallets: Wallet[];
11-
projectId: string;
12-
teamId: string;
11+
project: Project;
1312
managementAccessToken: string | undefined;
1413
}) {
1514
return (
1615
<ServerWalletsTableUI
1716
wallets={wallets}
18-
projectId={projectId}
19-
teamId={teamId}
17+
project={project}
2018
managementAccessToken={managementAccessToken}
2119
/>
2220
);

0 commit comments

Comments
 (0)