Skip to content
Open
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
2 changes: 2 additions & 0 deletions next.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ const nextConfig: NextConfig = {
devIndicators: false,
images: {
dangerouslyAllowSVG: true,
contentSecurityPolicy: "default-src 'self'; script-src 'none'; sandbox;",
contentDispositionType: "attachment",
remotePatterns: [
{ protocol: "https", hostname: "avatars.githubusercontent.com" },
{ protocol: "https", hostname: "api.dicebear.com" },
Expand Down
4 changes: 3 additions & 1 deletion src/app/auth/callback/CallbackClient.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ export function CallbackClient() {
<>
<p className="font-medium text-rose-600">{error}</p>
<p className="mt-2 text-sm text-slate-500 dark:text-slate-400">
Make sure the mergefi-backend is running and reachable.
{searchParams.get("token")
? "Make sure the mergefi-backend is running and reachable."
: "Please return to /connect and try signing in again."}
</p>
</>
) : (
Expand Down
8 changes: 7 additions & 1 deletion src/app/auth/callback/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@ import { CallbackClient } from "./CallbackClient";

export default function AuthCallbackPage() {
return (
<Suspense>
<Suspense
fallback={
<div className="mx-auto max-w-md px-6 py-24 text-center text-slate-500 dark:text-slate-400">
Finishing sign-in…
</div>
}
>
<CallbackClient />
</Suspense>
);
Expand Down
4 changes: 3 additions & 1 deletion src/app/issues/[id]/IssueActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ export function IssueActions({ bounty }: { bounty: Bounty }) {
? "Payout complete"
: bounty.status === "in_review"
? "Awaiting PR merge"
: "No action available"}
: bounty.status === "merged"
? "Payout pending"
: "No action available"}
</Button>
)}
</div>
Expand Down