Skip to content

Dashboard: Migrate engine/relayers page from chakra to tailwind, remove chakra provider from engine layout #7724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions apps/dashboard/src/@/components/blocks/wallet-address.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export function WalletAddress(props: {
className?: string;
iconClassName?: string;
client: ThirdwebClient;
preventOpenOnFocus?: boolean;
}) {
// default back to zero address if no address provided
const address = useMemo(() => props.address || ZERO_ADDRESS, [props.address]);
Expand Down Expand Up @@ -68,10 +67,7 @@ export function WalletAddress(props: {

return (
<HoverCard>
<HoverCardTrigger
asChild
tabIndex={props.preventOpenOnFocus ? -1 : undefined}
>
<HoverCardTrigger asChild tabIndex={-1}>
<Button
className={cn(
"flex flex-row items-center gap-2 px-0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,6 @@ function TokenInfoUI(props: {
className="h-auto py-0 text-sm"
client={props.contract.client}
iconClassName="hidden"
preventOpenOnFocus
/>
</div>
) : (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { ChakraProviderSetup } from "chakra/ChakraProviderSetup";
import { getAuthToken } from "@/api/auth-token";
import {
Breadcrumb,
Expand Down Expand Up @@ -59,32 +58,30 @@ export default async function Layout(props: {
}

return (
<ChakraProviderSetup>
<div className="flex grow flex-col">
<EngineInstanceHeader
instance={instance}
rootPath={engineRootLayoutPath}
teamSlug={params.team_slug}
/>
<div className="flex grow flex-col">
<EngineInstanceHeader
instance={instance}
rootPath={engineRootLayoutPath}
teamSlug={params.team_slug}
/>

<EngineSidebarLayout
<EngineSidebarLayout
engineId={params.engineId}
projectSlug={params.project_slug}
teamSlug={params.team_slug}
>
<EnsureEnginePermission
accountId={account.id}
authToken={authToken}
engineId={params.engineId}
instance={instance}
projectSlug={params.project_slug}
teamSlug={params.team_slug}
>
<EnsureEnginePermission
accountId={account.id}
authToken={authToken}
engineId={params.engineId}
instance={instance}
projectSlug={params.project_slug}
teamSlug={params.team_slug}
>
<div>{props.children}</div>
</EnsureEnginePermission>
</EngineSidebarLayout>
</div>
</ChakraProviderSetup>
<div>{props.children}</div>
</EnsureEnginePermission>
</EngineSidebarLayout>
</div>
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,6 @@ function EditModalContent({
<WalletAddress
address={backendWallet.address}
client={client}
preventOpenOnFocus
iconClassName="size-4"
className="h-auto py-0"
/>
Expand Down Expand Up @@ -609,7 +608,6 @@ const SendFundsModal = ({
address={fromWallet.address}
client={client}
iconClassName="size-4"
preventOpenOnFocus
className="h-auto py-0"
/>
</div>
Expand Down Expand Up @@ -802,7 +800,6 @@ function DeleteModal({
<WalletAddress
address={backendWallet.address}
client={client}
preventOpenOnFocus
iconClassName="size-4"
className="h-auto py-1"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,6 @@ function CancelTransactionButton({
shortenAddress={false}
className="h-auto py-1"
iconClassName="size-4"
preventOpenOnFocus
/>
</div>

Expand Down
Loading
Loading