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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ export const CapCard = ({
cap.id,
cap.hasActiveUpload || false,
);
const enableBetaUploadProgress = useFeatureFlag("enableUploadProgress");
const [imageStatus, setImageStatus] = useState<ImageLoadingStatus>("loading");

// Helper function to create a drag preview element
Expand Down Expand Up @@ -462,10 +461,7 @@ export const CapCard = ({
error: "Failed to duplicate cap",
});
}}
disabled={
duplicateMutation.isPending ||
(enableBetaUploadProgress && cap.hasActiveUpload)
}
disabled={duplicateMutation.isPending || cap.hasActiveUpload}
className="flex gap-2 items-center rounded-lg"
>
<FontAwesomeIcon className="size-3" icon={faCopy} />
Expand Down
4 changes: 1 addition & 3 deletions apps/web/app/Layout/features.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { Effect, Store, useStore } from "@tanstack/react-store";

const defaultFeatureFlags = {
enableUploadProgress: false,
};
const defaultFeatureFlags = {};

type FeatureFlags = typeof defaultFeatureFlags;

Expand Down
4 changes: 2 additions & 2 deletions apps/web/app/Layout/providers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ function CapDevtools() {
return (
<div className="flex flex-col space-y-4 p-4">
<h1 className="text-2xl font-semibold">Cap Devtools</h1>
<div className="space-y-2">
{/*<div className="space-y-2">
<h1 className="text-lg font-semibold">Features</h1>
<label className="flex items-center space-x-2">
<input
Expand All @@ -122,7 +122,7 @@ function CapDevtools() {
/>
<span>Enable Upload Progress UI</span>
</label>
</div>
</div>*/}
<div className="space-y-2">
<h1 className="text-lg font-semibold">Cap Pro</h1>
<p className="text-xs text-muted-foreground">
Expand Down
5 changes: 1 addition & 4 deletions apps/web/app/s/[videoId]/_components/ProgressCircle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@ const MINUTE = 60 * SECOND;
const HOUR = 60 * 60 * SECOND;
const DAY = 24 * HOUR;

export function useUploadProgress(videoId: Video.VideoId, enabledRaw: boolean) {
const enableBetaUploadProgress = useFeatureFlag("enableUploadProgress");
const enabled = enableBetaUploadProgress ? enabledRaw : false;

export function useUploadProgress(videoId: Video.VideoId, enabled: boolean) {
const query = useEffectQuery({
queryKey: ["getUploadProgress", videoId],
queryFn: () =>
Expand Down