[pull] main from cloudflare:main

.github/workflows/semgrep.yml

@@ -1,7 +1,7 @@
 on:
   pull_request: {}
   workflow_dispatch: {}
-  push: 
+  push:
     branches:
       - main
       - master
@@ -18,7 +18,7 @@ jobs:
       SEMGREP_APP_URL: https://cloudflare.semgrep.dev
       SEMGREP_VERSION_CHECK_URL: https://cloudflare.semgrep.dev/api/check-version
     container:
-      image: returntocorp/semgrep
+      image: semgrep/semgrep
     steps:
       - uses: actions/checkout@v4
       - run: semgrep ci

app/components/CopyButton.tsx

@@ -1,42 +1,58 @@
 import { VisuallyHidden } from '@radix-ui/react-visually-hidden'
-import type { FC } from 'react'
-import { useState } from 'react'
+import {
+	type ComponentProps,
+	type ElementRef,
+	forwardRef,
+	type ReactNode,
+	useState,
+} from 'react'
 import { useTimeoutFn } from 'react-use'
-import { useRoomUrl } from '~/hooks/useRoomUrl'
 import { Button } from './Button'
 import { Icon } from './Icon/Icon'
-import { Tooltip } from './Tooltip'
 
-interface CopyButtonProps {}
-
-export const CopyButton: FC<CopyButtonProps> = () => {
-	const [copied, setCopied] = useState(false)
+interface CopyButtonProps extends ComponentProps<'button'> {
+	contentValue: string
+	copiedMessage?: ReactNode
+}
 
-	const roomUrl = useRoomUrl()
+export const CopyButton = forwardRef<ElementRef<'button'>, CopyButtonProps>(
+	(
+		{
+			children = <VisuallyHidden>Copy</VisuallyHidden>,
+			copiedMessage = <VisuallyHidden>Copied!</VisuallyHidden>,
+			contentValue,
+			onClick,
+			...rest
+		},
+		ref
+	) => {
+		const [copied, setCopied] = useState(false)
 
-	const [_isReady, _cancel, reset] = useTimeoutFn(() => {
-		setCopied(false)
-	}, 2000)
+		const [_isReady, _cancel, reset] = useTimeoutFn(() => {
+			setCopied(false)
+		}, 2000)
 
-	return (
-		<Tooltip
-			content={copied ? 'Copied!' : 'Copy URL'}
-			open={copied ? true : undefined}
-		>
+		return (
 			<Button
 				displayType="secondary"
-				onClick={() => {
-					navigator.clipboard.writeText(roomUrl)
+				onClick={(e) => {
+					onClick && onClick(e)
+					navigator.clipboard.writeText(contentValue)
 					setCopied(true)
 					reset()
 				}}
+				ref={ref}
+				className="flex items-center gap-2 text-xs"
+				{...rest}
 			>
 				<Icon
 					type={copied ? 'ClipboardDocumentCheckIcon' : 'ClipboardDocumentIcon'}
 					className="text-xl"
 				/>
-				<VisuallyHidden>{copied ? 'Copied!' : 'Copy URL'}</VisuallyHidden>
+				{copied ? copiedMessage : children}
 			</Button>
-		</Tooltip>
-	)
-}
+		)
+	}
+)
+
+CopyButton.displayName = 'CopyButton'

app/components/LeaveRoomButton.tsx

@@ -7,18 +7,24 @@ import { Tooltip } from './Tooltip'
 
 interface LeaveRoomButtonProps {
 	navigateToFeedbackPage: boolean
+	meetingId?: string
 }
 
 export const LeaveRoomButton: FC<LeaveRoomButtonProps> = ({
 	navigateToFeedbackPage,
+	meetingId,
 }) => {
 	const navigate = useNavigate()
 	return (
 		<Tooltip content="Leave">
 			<Button
 				displayType="danger"
 				onClick={() => {
-					navigate(navigateToFeedbackPage ? '/call-quality-feedback' : '/')
+					const params = new URLSearchParams()
+					if (meetingId) params.set('meetingId', meetingId)
+					navigate(
+						navigateToFeedbackPage ? `/call-quality-feedback?${params}` : '/'
+					)
 				}}
 			>
 				<VisuallyHidden>Leave</VisuallyHidden>