From 1948455be0262e851d1e350454c2ccad6ab4a8bd Mon Sep 17 00:00:00 2001 From: Agusti Fernandez Pardo <6601142+agustif@users.noreply.github.com> Date: Sat, 3 Sep 2022 01:55:12 +0200 Subject: [PATCH] wip: remove metamask app (#4049) * wip: disable metamask app * fix: remove dont comment * fix: remove dont comment * Update packages/app-store/index.ts Co-authored-by: Peer Richelsen * Update packages/app-store/index.ts Co-authored-by: Peer Richelsen * fix: bookingpage * fix: remove web3Details zod * removed unused web3 * Build fixes Co-authored-by: Peer Richelsen Co-authored-by: Peer Richelsen Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> Co-authored-by: zomars --- .../booking/pages/AvailabilityPage.tsx | 11 -- .../components/booking/pages/BookingPage.tsx | 29 ---- apps/web/lib/app-providers.tsx | 31 ++-- apps/web/package.json | 1 - apps/web/pages/[user].tsx | 57 +------ apps/web/pages/[user]/book.tsx | 19 --- apps/web/pages/api/book/event.ts | 7 - apps/web/pages/apps/installed.tsx | 83 +--------- apps/web/pages/d/[link]/book.tsx | 20 --- apps/web/pages/event-types/[type].tsx | 30 ---- .../web/pages/v2/event-types/[type]/index.tsx | 8 - packages/app-store/apps.browser.generated.tsx | 3 - packages/app-store/apps.server.generated.ts | 1 - packages/app-store/index.ts | 2 - packages/app-store/metamask/README.mdx | 17 --- packages/app-store/metamask/_metadata.ts | 26 ---- packages/app-store/metamask/api/add.ts | 39 ----- packages/app-store/metamask/api/index.ts | 1 - .../metamask/components/InstallAppButton.tsx | 19 --- .../app-store/metamask/components/index.ts | 1 - packages/app-store/metamask/index.ts | 2 - packages/app-store/metamask/package.json | 14 -- .../app-store/metamask/static/example1.png | Bin 90512 -> 0 bytes .../app-store/metamask/static/example2.png | Bin 527306 -> 0 bytes packages/app-store/metamask/static/icon.svg | 61 -------- .../ee/web3/abis/abiWithGetBalance.json | 9 -- .../ee/web3/components/CryptoSection.tsx | 143 ------------------ .../ee/web3/contexts/contractsContext.tsx | 48 ------ .../features/ee/web3/utils/verifyAccount.ts | 12 -- packages/lib/defaultEvents.ts | 5 +- packages/prisma/seed-app-store.ts | 1 - packages/prisma/zod-utils.ts | 6 - packages/trpc/server/routers/viewer.tsx | 58 ------- yarn.lock | 120 +-------------- 34 files changed, 22 insertions(+), 862 deletions(-) delete mode 100644 packages/app-store/metamask/README.mdx delete mode 100644 packages/app-store/metamask/_metadata.ts delete mode 100644 packages/app-store/metamask/api/add.ts delete mode 100644 packages/app-store/metamask/api/index.ts delete mode 100644 packages/app-store/metamask/components/InstallAppButton.tsx delete mode 100644 packages/app-store/metamask/components/index.ts delete mode 100644 packages/app-store/metamask/index.ts delete mode 100644 packages/app-store/metamask/package.json delete mode 100644 packages/app-store/metamask/static/example1.png delete mode 100644 packages/app-store/metamask/static/example2.png delete mode 100644 packages/app-store/metamask/static/icon.svg delete mode 100644 packages/features/ee/web3/abis/abiWithGetBalance.json delete mode 100644 packages/features/ee/web3/components/CryptoSection.tsx delete mode 100644 packages/features/ee/web3/contexts/contractsContext.tsx delete mode 100644 packages/features/ee/web3/utils/verifyAccount.ts diff --git a/apps/web/components/booking/pages/AvailabilityPage.tsx b/apps/web/components/booking/pages/AvailabilityPage.tsx index 31979efbd9..e8fc17f640 100644 --- a/apps/web/components/booking/pages/AvailabilityPage.tsx +++ b/apps/web/components/booking/pages/AvailabilityPage.tsx @@ -15,7 +15,6 @@ import { useIsBackgroundTransparent, useIsEmbed, } from "@calcom/embed-core/embed-iframe"; -import { useContracts } from "@calcom/features/ee/web3/contexts/contractsContext"; import CustomBranding from "@calcom/lib/CustomBranding"; import classNames from "@calcom/lib/classNames"; import { WEBSITE_URL } from "@calcom/lib/constants"; @@ -292,7 +291,6 @@ const AvailabilityPage = ({ profile, eventType }: Props) => { const { rescheduleUid } = query; useTheme(profile.theme); const { t } = useLocale(); - const { contracts } = useContracts(); const availabilityDatePickerEmbedStyles = useEmbedStyles("availabilityDatePicker"); const shouldAlignCentrallyInEmbed = useEmbedNonStylesConfig("align") !== "left"; const shouldAlignCentrally = !isEmbed || shouldAlignCentrallyInEmbed; @@ -313,15 +311,6 @@ const AvailabilityPage = ({ profile, eventType }: Props) => { // TODO: Improve this; useExposePlanGlobally(eventType.users.length === 1 ? eventType.users[0].plan : "PRO"); - // TODO: this needs to be extracted elsewhere - useEffect(() => { - if (eventType.metadata.smartContractAddress) { - const eventOwner = eventType.users[0]; - if (!contracts[(eventType.metadata.smartContractAddress || null) as number]) - router.replace(`/${eventOwner.username}`); - } - }, [contracts, eventType.metadata.smartContractAddress, eventType.users, router]); - const [recurringEventCount, setRecurringEventCount] = useState(eventType.recurringEvent?.count); const telemetry = useTelemetry(); diff --git a/apps/web/components/booking/pages/BookingPage.tsx b/apps/web/components/booking/pages/BookingPage.tsx index 9c238da317..5dc0754a0e 100644 --- a/apps/web/components/booking/pages/BookingPage.tsx +++ b/apps/web/components/booking/pages/BookingPage.tsx @@ -27,7 +27,6 @@ import { useIsBackgroundTransparent, useIsEmbed, } from "@calcom/embed-core/embed-iframe"; -import { useContracts } from "@calcom/features/ee/web3/contexts/contractsContext"; import CustomBranding from "@calcom/lib/CustomBranding"; import classNames from "@calcom/lib/classNames"; import { useLocale } from "@calcom/lib/hooks/useLocale"; @@ -96,7 +95,6 @@ const BookingPage = ({ const shouldAlignCentrallyInEmbed = useEmbedNonStylesConfig("align") !== "left"; const shouldAlignCentrally = !isEmbed || shouldAlignCentrallyInEmbed; const router = useRouter(); - const { contracts } = useContracts(); const { data: session } = useSession(); const isBackgroundTransparent = useIsBackgroundTransparent(); const telemetry = useTelemetry(); @@ -112,15 +110,6 @@ const BookingPage = ({ // eslint-disable-next-line react-hooks/exhaustive-deps }, []); - useEffect(() => { - if (eventType.metadata.smartContractAddress) { - const eventOwner = eventType.users[0]; - - if (!contracts[(eventType.metadata.smartContractAddress || null) as number]) - router.replace(`/${eventOwner.username}`); - } - }, [contracts, eventType.metadata.smartContractAddress, eventType.users, router]); - const mutation = useMutation(createBooking, { onSuccess: async (responseData) => { const { id, attendees, paymentUid } = responseData; @@ -192,9 +181,6 @@ const BookingPage = ({ const date = asStringOrNull(router.query.date); const [guestToggle, setGuestToggle] = useState(booking && booking.attendees.length > 1); - - const eventTypeDetail = { isWeb3Active: false, ...eventType }; - // it would be nice if Prisma at some point in the future allowed for Json; as of now this is not the case. const locations: LocationObject[] = useMemo( () => (eventType.locations as LocationObject[]) || [], @@ -344,20 +330,11 @@ const BookingPage = ({ {} ); - let web3Details: Record<"userWallet" | "userSignature", string> | undefined; - if (eventTypeDetail.metadata.smartContractAddress) { - web3Details = { - userWallet: window.web3.currentProvider.selectedAddress, - userSignature: contracts[(eventTypeDetail.metadata.smartContractAddress || null) as number], - }; - } - if (recurringDates.length) { // Identify set of bookings to one intance of recurring event to support batch changes const recurringEventId = uuidv4(); const recurringBookings = recurringDates.map((recurringDate) => ({ ...booking, - web3Details, start: dayjs(recurringDate).format(), end: dayjs(recurringDate).add(eventType.length, "minute").format(), eventTypeId: eventType.id, @@ -387,7 +364,6 @@ const BookingPage = ({ } else { mutation.mutate({ ...booking, - web3Details, start: dayjs(date).format(), end: dayjs(date).add(eventType.length, "minute").format(), eventTypeId: eventType.id, @@ -549,11 +525,6 @@ const BookingPage = ({ )} - {eventTypeDetail.isWeb3Active && eventType.metadata.smartContractAddress && ( -

- {t("requires_ownership_of_a_token") + " " + eventType.metadata.smartContractAddress} -

- )} {booking?.startTime && rescheduleUid && (

diff --git a/apps/web/lib/app-providers.tsx b/apps/web/lib/app-providers.tsx index 431b99802e..4b5d450ec0 100644 --- a/apps/web/lib/app-providers.tsx +++ b/apps/web/lib/app-providers.tsx @@ -9,7 +9,6 @@ import { ComponentProps, ReactNode } from "react"; import DynamicHelpscoutProvider from "@calcom/features/ee/support/lib/helpscout/providerDynamic"; import DynamicIntercomProvider from "@calcom/features/ee/support/lib/intercom/providerDynamic"; -import { ContractsProvider } from "@calcom/features/ee/web3/contexts/contractsContext"; import { trpc } from "@calcom/trpc/react"; import { MetaProvider } from "@calcom/ui/v2/core/Meta"; @@ -71,22 +70,20 @@ const AppProviders = (props: AppPropsWithChildren) => { const RemainingProviders = ( - - - - - {/* color-scheme makes background:transparent not work which is required by embed. We need to ensure next-theme adds color-scheme to `body` instead of `html`(https://github.com/pacocoursey/next-themes/blob/main/src/index.tsx#L74). Once that's done we can enable color-scheme support */} - - {props.children} - - - - - + + + + {/* color-scheme makes background:transparent not work which is required by embed. We need to ensure next-theme adds color-scheme to `body` instead of `html`(https://github.com/pacocoursey/next-themes/blob/main/src/index.tsx#L74). Once that's done we can enable color-scheme support */} + + {props.children} + + + + ); diff --git a/apps/web/package.json b/apps/web/package.json index d77134c99c..ab370c8685 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -43,7 +43,6 @@ "@heroicons/react": "^1.0.6", "@hookform/error-message": "^2.0.0", "@hookform/resolvers": "^2.9.7", - "@metamask/providers": "^8.1.1", "@next-auth/prisma-adapter": "^1.0.4", "@next/bundle-analyzer": "12.1.6", "@radix-ui/react-avatar": "^0.1.4", diff --git a/apps/web/pages/[user].tsx b/apps/web/pages/[user].tsx index 16d978389f..bac7e3298c 100644 --- a/apps/web/pages/[user].tsx +++ b/apps/web/pages/[user].tsx @@ -14,7 +14,6 @@ import { useEmbedStyles, useIsEmbed, } from "@calcom/embed-core/embed-iframe"; -import type { CryptoSectionProps } from "@calcom/features/ee/web3/components/CryptoSection"; import CustomBranding from "@calcom/lib/CustomBranding"; import defaultEvents, { getDynamicEventDescription, @@ -39,14 +38,6 @@ import { ssrInit } from "@server/lib/ssr"; const EventTypeDescription = dynamic(() => import("@calcom/ui/v2/modules/event-types/EventTypeDescription")); const HeadSeo = dynamic(() => import("@components/seo/head-seo")); -const CryptoSection = dynamic( - () => import("@calcom/features/ee/web3/components/CryptoSection") -); - -interface EvtsToVerify { - [evtId: string]: boolean; -} - export default function User(props: inferSSRProps) { const { users, profile, eventTypes, isDynamicGroup, dynamicNames, dynamicUsernames, isSingleUser } = props; const [user] = users; //To be used when we only have a single user, not dynamic group @@ -103,7 +94,6 @@ export default function User(props: inferSSRProps) { delete query.user; // So it doesn't display in the Link (and make tests fail) useExposePlanGlobally("PRO"); const nameOrUsername = user.name || user.username || ""; - const [evtsToVerify, setEvtsToVerify] = useState({}); const telemetry = useTelemetry(); useEffect(() => { @@ -181,20 +171,10 @@ export default function User(props: inferSSRProps) { query, }}> { - // If a token is required for this event type, add a click listener that checks whether the user verified their wallet or not - if (type.metadata.smartContractAddress && !evtsToVerify[type.id]) { - const showToast = (await import("@calcom/lib/notification")).default; - e.preventDefault(); - showToast( - "You must verify a wallet with a token belonging to the specified smart contract first", - "error" - ); - } else { - sdkActionManager?.fire("eventTypeSelected", { - eventType: type, - }); - } + onClick={async () => { + sdkActionManager?.fire("eventTypeSelected", { + eventType: type, + }); }} className="block w-full p-5" data-testid="event-type-link"> @@ -207,16 +187,6 @@ export default function User(props: inferSSRProps) { - {type.isWeb3Active && type.metadata.smartContractAddress && ( - - )}

)) )} @@ -340,21 +310,6 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) => brandColor: user.brandColor, darkBrandColor: user.darkBrandColor, }; - const usersIds = users.map((user) => user.id); - const credentials = await prisma.credential.findMany({ - where: { - userId: { - in: usersIds, - }, - }, - select: { - id: true, - type: true, - key: true, - }, - }); - - const web3Credentials = credentials.find((credential) => credential.type.includes("_web3")); const eventTypesWithHidden = isDynamicGroup ? [] : await getEventTypesWithHiddenFromDB(user.id, user.plan); const dataFetchEnd = Date.now(); @@ -366,10 +321,6 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) => const eventTypes = eventTypesRaw.map((eventType) => ({ ...eventType, metadata: (eventType.metadata || {}) as JSONObject, - isWeb3Active: - web3Credentials && web3Credentials.key - ? (((web3Credentials.key as JSONObject).isWeb3Active || false) as boolean) - : false, })); const isSingleUser = users.length === 1; diff --git a/apps/web/pages/[user]/book.tsx b/apps/web/pages/[user]/book.tsx index a886fc6d52..0aae61782f 100644 --- a/apps/web/pages/[user]/book.tsx +++ b/apps/web/pages/[user]/book.tsx @@ -111,29 +111,10 @@ export async function getServerSideProps(context: GetServerSidePropsContext) { if (!eventTypeRaw) return { notFound: true }; - const credentials = await prisma.credential.findMany({ - where: { - userId: { - in: users.map((user) => user.id), - }, - }, - select: { - id: true, - type: true, - key: true, - }, - }); - - const web3Credentials = credentials.find((credential) => credential.type.includes("_web3")); - const eventType = { ...eventTypeRaw, metadata: (eventTypeRaw.metadata || {}) as JSONObject, recurringEvent: parseRecurringEvent(eventTypeRaw.recurringEvent), - isWeb3Active: - web3Credentials && web3Credentials.key - ? (((web3Credentials.key as JSONObject).isWeb3Active || false) as boolean) - : false, }; const eventTypeObject = [eventType].map((e) => { diff --git a/apps/web/pages/api/book/event.ts b/apps/web/pages/api/book/event.ts index 2b4cd971d7..2dff786b08 100644 --- a/apps/web/pages/api/book/event.ts +++ b/apps/web/pages/api/book/event.ts @@ -19,7 +19,6 @@ import { sendScheduledEmails, sendScheduledSeatsEmails, } from "@calcom/emails"; -import verifyAccount from "@calcom/features/ee/web3/utils/verifyAccount"; import { scheduleWorkflowReminders } from "@calcom/features/ee/workflows/lib/reminders/reminderScheduler"; import { isPrismaObjOrUndefined, parseRecurringEvent } from "@calcom/lib"; import { getDefaultEvent, getGroupName, getUsernameList } from "@calcom/lib/defaultEvents"; @@ -556,12 +555,6 @@ async function handler(req: NextApiRequest) { } async function createBooking() { - // @TODO: check as metadata - if (reqBody.web3Details) { - const { web3Details } = reqBody; - await verifyAccount(web3Details.userSignature, web3Details.userWallet); - } - if (originalRescheduledBooking) { evt.title = originalRescheduledBooking?.title || evt.title; evt.description = originalRescheduledBooking?.description || evt.additionalNotes; diff --git a/apps/web/pages/apps/installed.tsx b/apps/web/pages/apps/installed.tsx index cc173a08a1..6c2194a9bd 100644 --- a/apps/web/pages/apps/installed.tsx +++ b/apps/web/pages/apps/installed.tsx @@ -1,23 +1,18 @@ -import Image from "next/image"; import React from "react"; import { InstallAppButton } from "@calcom/app-store/components"; -import { WEBSITE_URL } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import showToast from "@calcom/lib/notification"; import { trpc } from "@calcom/trpc/react"; import type { App } from "@calcom/types/App"; import { Alert } from "@calcom/ui/Alert"; import Button from "@calcom/ui/Button"; import EmptyScreen from "@calcom/ui/EmptyScreen"; import { Icon } from "@calcom/ui/Icon"; -import { List, ListItem, ListItemText, ListItemTitle } from "@calcom/ui/List"; +import { List } from "@calcom/ui/List"; import Shell, { ShellSubHeading } from "@calcom/ui/Shell"; import SkeletonLoader from "@calcom/ui/apps/SkeletonLoader"; import { QueryCell } from "@lib/QueryCell"; -import classNames from "@lib/classNames"; -import { HttpError } from "@lib/core/http/error"; import AppsShell from "@components/AppsShell"; import { CalendarListContainer } from "@components/integrations/CalendarListContainer"; @@ -144,81 +139,6 @@ const IntegrationsContainer = ({ variant, className = "" }: IntegrationsContaine ); }; -function Web3Container() { - const { t } = useLocale(); - const result = trpc.useQuery(["viewer.web3Integration"]); - const isWeb3Active = !!result.data?.isWeb3Active; - return ( - <> - {isWeb3Active && ( - <> - -
- - -
- Embed -
- - MetaMask ( - - Read more - - ) - - {t("only_book_people_and_allow")} -
- -
-
-
-
- - )} - - ); -} - -function Web3ConnectBtn() { - const { t } = useLocale(); - const utils = trpc.useContext(); - const result = trpc.useQuery(["viewer.web3Integration"]); - const mutation = trpc.useMutation("viewer.enableOrDisableWeb3", { - onSuccess: async (result) => { - const { key } = result; - if ((key as { isWeb3Active: boolean }).isWeb3Active) { - showToast(t("web3_metamask_added"), "success"); - } else { - showToast(t("web3_metamask_disconnected"), "success"); - } - utils.invalidateQueries("viewer.web3Integration"); - }, - onError: (err) => { - if (err instanceof HttpError) { - const message = `${err.statusCode}: ${err.message}`; - showToast(message, "error"); - } - }, - }); - - return ( - - ); -} - export default function IntegrationsPage() { const { t } = useLocale(); const query = trpc.useQuery(["viewer.integrations", { onlyInstalled: true }]); @@ -238,7 +158,6 @@ export default function IntegrationsPage() { - ) : ( user.id), - }, - }, - select: { - id: true, - type: true, - key: true, - }, - }); - - const web3Credentials = credentials.find((credential) => credential.type.includes("_web3")); - const eventType = { ...eventTypeRaw, metadata: (eventTypeRaw.metadata || {}) as JSONObject, recurringEvent: parseRecurringEvent(eventTypeRaw.recurringEvent), - isWeb3Active: - web3Credentials && web3Credentials.key - ? (((web3Credentials.key as JSONObject).isWeb3Active || false) as boolean) - : false, }; const eventTypeObject = [eventType].map((e) => { diff --git a/apps/web/pages/event-types/[type].tsx b/apps/web/pages/event-types/[type].tsx index b4cda4557e..7041b4b291 100644 --- a/apps/web/pages/event-types/[type].tsx +++ b/apps/web/pages/event-types/[type].tsx @@ -76,7 +76,6 @@ type OptionTypeBase = { export type FormValues = { title: string; eventTitle: string; - smartContractAddress: string; eventName: string; slug: string; length: number; @@ -559,7 +558,6 @@ const EventTypePage = (props: inferSSRProps) => { const { periodDates, periodCountCalendarDays, - smartContractAddress, giphyThankYouPage, beforeBufferTime, afterBufferTime, @@ -581,7 +579,6 @@ const EventTypePage = (props: inferSSRProps) => { afterEventBuffer: afterBufferTime, seatsPerTimeSlot: Number.isNaN(seatsPerTimeSlot) ? null : seatsPerTimeSlot, metadata: { - ...(smartContractAddress ? { smartContractAddress } : {}), ...(giphyThankYouPage ? { giphyThankYouPage } : {}), }, }); @@ -853,28 +850,6 @@ const EventTypePage = (props: inferSSRProps) => { - {eventType.isWeb3Active && ( -
-
- -
-
-
- -
-
-
- )}