Skip to content
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/actions/acceptInvite.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use server";

import { getAuthToken } from "../../app/api/lib/getAuthToken";
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
import { API_SERVER_URL } from "../constants/env";

export async function acceptInvite(options: {
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/actions/billing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import "server-only";

import { API_SERVER_URL } from "@/constants/env";
import { getAuthToken } from "../../app/api/lib/getAuthToken";
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
import type { ProductSKU } from "../lib/billing";

export type GetBillingCheckoutUrlOptions = {
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/actions/confirmEmail.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use server";

import { getAuthToken } from "../../app/api/lib/getAuthToken";
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
import { API_SERVER_URL } from "../constants/env";

export async function confirmEmailWithOTP(otp: string) {
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/actions/getAccount.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use server";

import { getRawAccount } from "../../app/account/settings/getAccount";
import { getRawAccount } from "../../app/(app)/account/settings/getAccount";

export async function getRawAccountAction() {
return getRawAccount();
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/actions/getBalancesFromMoralis.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { defineDashboardChain } from "lib/defineDashboardChain";
import { ZERO_ADDRESS, isAddress, toTokens } from "thirdweb";
import { getWalletBalance } from "thirdweb/wallets";
import { getUserThirdwebClient } from "../../app/api/lib/getAuthToken";
import { getUserThirdwebClient } from "../../app/(app)/api/lib/getAuthToken";

type BalanceQueryResponse = Array<{
balance: string;
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/actions/proxies.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use server";

import { getAuthToken } from "../../app/api/lib/getAuthToken";
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
import { API_SERVER_URL } from "../constants/env";

type ProxyActionParams = {
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/actions/sendTeamInvite.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use server";

import { getAuthToken } from "../../app/api/lib/getAuthToken";
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
import { API_SERVER_URL } from "../constants/env";

export async function sendTeamInvites(options: {
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/actions/updateAccount.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"use server";
import { getAuthToken } from "../../app/api/lib/getAuthToken";
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
import { API_SERVER_URL } from "../constants/env";

export async function updateAccount(values: {
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/api/analytics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import type {
WalletStats,
WalletUserStats,
} from "types/analytics";
import { getAuthToken } from "../../app/api/lib/getAuthToken";
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
import { getChains } from "./chain";

async function fetchAnalytics(
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/api/chain.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "server-only";
import type { ChainMetadata } from "thirdweb/chains";
import type { ChainService } from "../../app/(dashboard)/(chain)/types/chain";
import type { ChainService } from "../../app/(app)/(dashboard)/(chain)/types/chain";
import { API_SERVER_URL, THIRDWEB_API_SECRET } from "../constants/env";

export async function getGasSponsoredChains() {
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/api/linked-wallets.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getAuthToken } from "../../app/api/lib/getAuthToken";
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
import { API_SERVER_URL } from "../constants/env";

export type LinkedWallet = {
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/api/projects.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import "server-only";
import { API_SERVER_URL } from "@/constants/env";
import type { ProjectResponse } from "@thirdweb-dev/service-utils";
import { getAuthToken } from "../../app/api/lib/getAuthToken";
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";

export type Project = ProjectResponse;

Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/api/team-invites.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getAuthToken } from "../../app/api/lib/getAuthToken";
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
import { API_SERVER_URL } from "../constants/env";

export type TeamInvite = {
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/api/team-members.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "server-only";
import { API_SERVER_URL } from "@/constants/env";
import { getAuthToken } from "../../app/api/lib/getAuthToken";
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";

const TeamAccountRole = {
OWNER: "OWNER",
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/api/team-subscription.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getAuthToken } from "../../app/api/lib/getAuthToken";
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
import { API_SERVER_URL } from "../constants/env";
import type { ProductSKU } from "../lib/billing";

Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/api/team.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import "server-only";
import { API_SERVER_URL, THIRDWEB_API_SECRET } from "@/constants/env";
import type { TeamResponse } from "@thirdweb-dev/service-utils";
import { getAuthToken } from "../../app/api/lib/getAuthToken";
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";

export type Team = TeamResponse & { stripeCustomerId: string | null };

Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/api/universal-bridge/developer.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"use server";
import { getAuthToken } from "app/api/lib/getAuthToken";
import { getAuthToken } from "app/(app)/api/lib/getAuthToken";

const UB_BASE_URL = process.env.NEXT_PUBLIC_THIRDWEB_BRIDGE_HOST;

Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/components/blocks/app-footer.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Button } from "@/components/ui/button";
import { cn } from "@/lib/utils";
import { ThirdwebMiniLogo } from "app/components/ThirdwebMiniLogo";
import { ThirdwebMiniLogo } from "app/(app)/components/ThirdwebMiniLogo";
import { GithubIcon } from "components/icons/brand-icons/GithubIcon";
import { InstagramIcon } from "components/icons/brand-icons/InstagramIcon";
import { LinkedInIcon } from "components/icons/brand-icons/LinkedinIcon";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from "@/components/ui/select";
import type { Meta, StoryObj } from "@storybook/react";
import { useState } from "react";
import { BadgeContainer } from "../../../stories/utils";
import { BadgeContainer } from "stories/utils";
import { type CodeEnvironment, CodeSegment } from "./code-segment.client";

const meta = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Meta, StoryObj } from "@storybook/react";
import { useState } from "react";
import { BadgeContainer } from "../../stories/utils";
import { BadgeContainer } from "stories/utils";
import { PaginationButtons } from "./pagination-buttons";

const meta = {
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/@/constants/thirdweb.client.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useQuery } from "@tanstack/react-query";
import { useMemo } from "react";
import { useActiveAccount } from "thirdweb/react";
import type { GetAuthTokenResponse } from "../../app/api/auth/get-auth-token/route";
import type { GetAuthTokenResponse } from "../../app/(app)/api/auth/get-auth-token/route";
import { LAST_USED_TEAM_ID } from "../../constants/cookies";
import { getCookie } from "../../lib/cookie";
import { getThirdwebClient } from "./thirdweb.server";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { Button } from "@/components/ui/button";
import { useThirdwebClient } from "@/constants/thirdweb.client";
import { useStore } from "@/lib/reactive";
import { getSDKTheme } from "app/components/sdk-component-theme";
import { getSDKTheme } from "app/(app)/components/sdk-component-theme";
import { CustomChainRenderer } from "components/selects/CustomChainRenderer";
import { mapV4ChainToV5Chain } from "contexts/map-chains";
import { useTrack } from "hooks/analytics/useTrack";
Expand All @@ -19,8 +19,8 @@ import {
useActiveAccount,
useConnectModal,
} from "thirdweb/react";
import { useFavoriteChainIds } from "../../../../app/(dashboard)/(chain)/components/client/star-button";
import { doLogout } from "../../../../app/login/auth-actions";
import { useFavoriteChainIds } from "../../../../app/(app)/(dashboard)/(chain)/components/client/star-button";
import { doLogout } from "../../../../app/(app)/login/auth-actions";
import { LazyConfigureNetworkModal } from "../../../../components/configure-networks/LazyConfigureNetworkModal";
import { useAllChainsData } from "../../../../hooks/chains/allChains";
import {
Expand Down
4 changes: 2 additions & 2 deletions apps/dashboard/src/@3rdweb-sdk/react/hooks/useEngine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import {
useQuery,
useQueryClient,
} from "@tanstack/react-query";
import type { ResultItem } from "app/team/[team_slug]/(team)/~/engine/(instance)/[engineId]/metrics/components/StatusCodes";
import type { ResultItem } from "app/(app)/team/[team_slug]/(team)/~/engine/(instance)/[engineId]/metrics/components/StatusCodes";
import type { EngineBackendWalletType } from "lib/engine";
import { useState } from "react";
import { useActiveAccount } from "thirdweb/react";
import invariant from "tiny-invariant";
import type { EngineStatus } from "../../../app/team/[team_slug]/(team)/~/engine/(instance)/[engineId]/overview/components/transactions-table";
import type { EngineStatus } from "../../../app/(app)/team/[team_slug]/(team)/~/engine/(instance)/[engineId]/overview/components/transactions-table";
import { engineKeys } from "../cache-keys";

// Engine instances
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use client";

import { getSDKTheme } from "app/components/sdk-component-theme";
import { getSDKTheme } from "app/(app)/components/sdk-component-theme";
import { useV5DashboardChain } from "lib/v5-adapter";
import { useTheme } from "next-themes";
import type { ThirdwebClient } from "thirdweb";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import type { Address } from "thirdweb";
import { checksumAddress } from "thirdweb/utils";
import { getRoutes } from "../../../utils";
import { ChainlistPagination } from "../client/pagination";
import { RouteListCard } from "../server/routelist-card";
import { RouteListRow } from "../server/routelist-row";
import { RouteListCard } from "./routelist-card";
import { RouteListRow } from "./routelist-row";

export type SearchParams = Partial<{
includeDeprecated: boolean;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import "server-only";

import { BRIDGE_URL, DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/env";
import { getAuthToken } from "app/api/lib/getAuthToken";
import { getAuthToken } from "app/(app)/api/lib/getAuthToken";
import type { Route } from "./types/route";

export async function getRoutes({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { CustomConnectWallet } from "@3rdweb-sdk/react/components/connect-wallet
import { zodResolver } from "@hookform/resolvers/zod";
import { Turnstile } from "@marsidev/react-turnstile";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import type { CanClaimResponseType } from "app/api/testnet-faucet/can-claim/CanClaimResponseType";
import type { CanClaimResponseType } from "app/(app)/api/testnet-faucet/can-claim/CanClaimResponseType";
import { mapV4ChainToV5Chain } from "contexts/map-chains";
import { useTrack } from "hooks/analytics/useTrack";
import Link from "next/link";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { cn } from "@/lib/utils";
import Link from "next/link";
import type { ThirdwebClient } from "thirdweb";
import type { ChainMetadata } from "thirdweb/chains";
import { mapV4ChainToV5Chain } from "../../../../../../../contexts/map-chains";
import { mapV4ChainToV5Chain } from "../../../../../../../../contexts/map-chains";
import { ChainIcon } from "../../../../components/server/chain-icon";
import { AddChainToWallet } from "../client/add-chain-to-wallet";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ import { ChevronDownIcon, TicketCheckIcon } from "lucide-react";
import type { Metadata } from "next";
import Link from "next/link";
import { redirect } from "next/navigation";
import { getThirdwebClient } from "../../../../../@/constants/thirdweb.server";
import { mapV4ChainToV5Chain } from "../../../../../contexts/map-chains";
import { getThirdwebClient } from "../../../../../../@/constants/thirdweb.server";
import { mapV4ChainToV5Chain } from "../../../../../../contexts/map-chains";
import { NebulaFloatingChatButton } from "../../../../../nebula-app/(app)/components/FloatingChat/FloatingChat";
import {
getAuthToken,
getAuthTokenWalletAddress,
} from "../../../../api/lib/getAuthToken";
import { NebulaFloatingChatButton } from "../../../../nebula-app/(app)/components/FloatingChat/FloatingChat";
import { StarButton } from "../../components/client/star-button";
import { getChain, getChainMetadata } from "../../utils";
import { AddChainToWallet } from "./components/client/add-chain-to-wallet";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import {
} from "@/components/ui/sheet";
import { TabButtons } from "@/components/ui/tabs";
import { ListerOnly } from "@3rdweb-sdk/react/components/roles/lister-only";
import { isAlchemySupported } from "lib/wallet/nfts/isAlchemySupported";
import { isMoralisSupported } from "lib/wallet/nfts/isMoralisSupported";
import { PlusIcon } from "lucide-react";
import { useState } from "react";
import type { ThirdwebContract } from "thirdweb";
import { useActiveAccount } from "thirdweb/react";
import { isAlchemySupported } from "../../../../../../../lib/wallet/nfts/isAlchemySupported";
import { isMoralisSupported } from "../../../../../../../lib/wallet/nfts/isMoralisSupported";
import { CreateListingsForm } from "./list-form";

interface CreateListingButtonProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import { SolidityInput } from "contract-ui/components/solidity-inputs";
import { useTrack } from "hooks/analytics/useTrack";
import { useAllChainsData } from "hooks/chains/allChains";
import { useTxNotifications } from "hooks/useTxNotifications";
import { isAlchemySupported } from "lib/wallet/nfts/isAlchemySupported";
import { isMoralisSupported } from "lib/wallet/nfts/isMoralisSupported";
import type { WalletNFT } from "lib/wallet/nfts/types";
import { CircleAlertIcon, InfoIcon } from "lucide-react";
import Link from "next/link";
Expand Down Expand Up @@ -54,8 +56,6 @@ import { shortenAddress } from "thirdweb/utils";
import { FormErrorMessage, FormHelperText, FormLabel } from "tw-components";
import { NFTMediaWithEmptyState } from "tw-components/nft-media";
import { shortenIfAddress } from "utils/usedapp-external";
import { isAlchemySupported } from "../../../../../../../lib/wallet/nfts/isAlchemySupported";
import { isMoralisSupported } from "../../../../../../../lib/wallet/nfts/isMoralisSupported";

const LIST_FORM_ID = "marketplace-list-form";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
import { Button } from "@/components/ui/button";
import { ConfigureNetworks } from "components/configure-networks/ConfigureNetworks";
import { CheckIcon, CircleAlertIcon, RotateCcwIcon } from "lucide-react";
import { useState } from "react";
import { addChainOverrides } from "stores/chainStores";
import { ConfigureNetworks } from "../../../../../../components/configure-networks/ConfigureNetworks";

export function ConfigureCustomChain(props: {
chainSlug: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
"use client";

import { useQuery } from "@tanstack/react-query";
import type { MinimalTeamsAndProjects } from "components/contract-components/contract-deploy-form/add-to-project-card";
import type { ThirdwebClient, ThirdwebContract } from "thirdweb";
import type { ChainMetadata } from "thirdweb/chains";
import type { MinimalTeamsAndProjects } from "../../../../../../components/contract-components/contract-deploy-form/add-to-project-card";
import { ErrorPage, LoadingPage } from "../_components/page-skeletons";
import { useContractPageMetadata } from "../_hooks/useContractPageMetadata";
import { getContractPageSidebarLinks } from "../_utils/getContractPageSidebarLinks";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import { ChakraProviderSetup } from "@/components/ChakraProviderSetup";
import type { SidebarLink } from "@/components/blocks/Sidebar";
import { SidebarLayout } from "@/components/blocks/SidebarLayout";
import type { DashboardContractMetadata } from "@3rdweb-sdk/react/hooks/useDashboardContractMetadata";
import type { MinimalTeamsAndProjects } from "components/contract-components/contract-deploy-form/add-to-project-card";
import { DeprecatedAlert } from "components/shared/DeprecatedAlert";
import type { ThirdwebClient, ThirdwebContract } from "thirdweb";
import type { ChainMetadata } from "thirdweb/chains";
import type { MinimalTeamsAndProjects } from "../../../../../../components/contract-components/contract-deploy-form/add-to-project-card";
import { ContractMetadata } from "./contract-metadata";
import { PrimaryDashboardButton } from "./primary-dashboard-button";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ import {
DialogTrigger,
} from "@/components/ui/dialog";
import type { EVMContractInfo } from "@3rdweb-sdk/react";
import {
AddToProjectSelector,
type MinimalTeamsAndProjects,
} from "components/contract-components/contract-deploy-form/add-to-project-card";
import { useTrack } from "hooks/analytics/useTrack";
import { CodeIcon, PlusIcon } from "lucide-react";
import { CircleAlertIcon, ExternalLinkIcon } from "lucide-react";
Expand All @@ -21,10 +25,6 @@ import { usePathname } from "next/navigation";
import { useState } from "react";
import { toast } from "sonner";
import type { Chain, ThirdwebClient } from "thirdweb";
import {
AddToProjectSelector,
type MinimalTeamsAndProjects,
} from "../../../../../../components/contract-components/contract-deploy-form/add-to-project-card";
import { useAddContractToProject } from "../../../../../team/[team_slug]/[project_slug]/hooks/project-contracts";

const TRACKING_CATEGORY = "add_to_dashboard_upsell";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { TW_LOCAL_CHAIN_STORE } from "stores/storageKeys";
import { getAddress, getContract, isAddress } from "thirdweb";
import type { ChainMetadata } from "thirdweb/chains";
import { fetchChain } from "utils/fetchChain";
import { LAST_USED_TEAM_ID } from "../../../../../../constants/cookies";
import { LAST_USED_TEAM_ID } from "../../../../../../../constants/cookies";
import { getAuthToken } from "../../../../../api/lib/getAuthToken";

export async function getContractPageParamsInfo(params: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
import { SkeletonContainer } from "@/components/ui/skeleton";
import type { UseQueryResult } from "@tanstack/react-query";
import {
DateRangeSelector,
type Range,
getLastNDaysRange,
} from "components/analytics/date-range-selector";
import {
type AnalyticsQueryParams,
type TotalQueryResult,
Expand All @@ -17,11 +22,6 @@ import {
import { formatDate } from "date-fns";
import { useMemo, useState } from "react";
import type { ThirdwebContract } from "thirdweb";
import {
DateRangeSelector,
type Range,
getLastNDaysRange,
} from "../../../../../../components/analytics/date-range-selector";

interface ContractAnalyticsPageProps {
contract: ThirdwebContract;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
import type { Abi } from "abitype";
import { CodeOverview } from "contract-ui/tabs/code/components/code-overview";
import { CircleAlertIcon } from "lucide-react";
import type { ChainMetadata } from "thirdweb/chains";
import type { ThirdwebContract } from "thirdweb/contract";
import { CodeOverview } from "../../../../../../contract-ui/tabs/code/components/code-overview";

export function ContractCodePage(props: {
abi: Abi | undefined;
Expand Down
Loading
Loading