diff --git a/apps/web/pages/booking/[uid].tsx b/apps/web/pages/booking/[uid].tsx index e8f2fbd66f..afada8d7a1 100644 --- a/apps/web/pages/booking/[uid].tsx +++ b/apps/web/pages/booking/[uid].tsx @@ -486,48 +486,24 @@ export default function Success(props: SuccessProps) {
{t("where")}
{!rescheduleLocation || locationToDisplay === rescheduleLocationToDisplay ? ( - locationToDisplay.startsWith("http") ? ( - - {providerName || "Link"} - - - ) : ( - locationToDisplay - ) + ) : ( <> - {!!formerTime && - (locationToDisplay.startsWith("http") ? ( - - {providerName || "Link"} - - - ) : ( -

{locationToDisplay}

- ))} - {rescheduleLocationToDisplay.startsWith("http") ? ( - - {rescheduleProviderName || "Link"} - - - ) : ( - rescheduleLocationToDisplay + {!!formerTime && ( + )} + + )}
@@ -830,6 +806,29 @@ export default function Success(props: SuccessProps) { ); } +const DisplayLocation = ({ + locationToDisplay, + providerName, + className, +}: { + locationToDisplay: string; + providerName?: string; + className?: string; +}) => + locationToDisplay.startsWith("http") ? ( + + {providerName || "Link"} + + + ) : ( +

{locationToDisplay}

+ ); + Success.isBookingPage = true; Success.PageWrapper = PageWrapper; diff --git a/apps/web/pages/video/[uid].tsx b/apps/web/pages/video/[uid].tsx index aacbb1d028..49fd7e26eb 100644 --- a/apps/web/pages/video/[uid].tsx +++ b/apps/web/pages/video/[uid].tsx @@ -333,11 +333,14 @@ export async function getServerSideProps(context: GetServerSidePropsContext) { }); } + const videoReferences = bookingObj.references.filter((reference) => reference.type.includes("_video")); + const latestVideoReference = videoReferences[videoReferences.length - 1]; + return { props: { - meetingUrl: bookingObj.references[0].meetingUrl ?? "", - ...(typeof bookingObj.references[0].meetingPassword === "string" && { - meetingPassword: bookingObj.references[0].meetingPassword, + meetingUrl: latestVideoReference.meetingUrl ?? "", + ...(typeof latestVideoReference.meetingPassword === "string" && { + meetingPassword: latestVideoReference.meetingPassword, }), booking: { ...bookingObj,