From 60c082c58352891e684ad7f76af761cd08509ad6 Mon Sep 17 00:00:00 2001
From: nicktytarenko <nicktytarenko@gmail.com>
Date: Wed, 9 Sep 2026 21:11:56 +0300
Subject: [PATCH 1/3] Add RFP Contribute CTA and funding-pool mode on
 contribute

---
 app/grant/[id]/[slug]/layout.tsx              |   2 +
 components/Funding/PaymentRequestButton.tsx   |  18 +-
 components/Funding/PaymentStep.tsx            |  16 +-
 components/Funding/QuickAmountSelector.tsx    |   5 +-
 .../modals/ContributeToFundraiseModal.tsx     | 214 +++++++++++-------
 .../work/WorkHeader/WorkHeaderGrant.tsx       | 118 ++++++----
 types/grant.ts                                |   2 +-
 7 files changed, 243 insertions(+), 132 deletions(-)

diff --git a/app/grant/[id]/[slug]/layout.tsx b/app/grant/[id]/[slug]/layout.tsx
index 9ed97032e..7efd0c2d2 100644
--- a/app/grant/[id]/[slug]/layout.tsx
+++ b/app/grant/[id]/[slug]/layout.tsx
@@ -73,11 +73,13 @@ export default async function GrantSlugLayout({ params, children }: Props) {
             work={work}
             metadata={metadata}
             amountUsd={grant?.amount?.usd}
+            grantAmountUsd={grant?.amount?.usd}
             grantId={grantId?.toString()}
             isActive={isActive}
             isPending={isPending}
             organization={grant?.organization}
             applicationVisibility={grant?.applicationVisibility}
+            fundingPool={grant?.fundingPool ?? null}
             preTitle={
               <RegisteredReportRouteTrackerLoader
                 currentStage="grant"
diff --git a/components/Funding/PaymentRequestButton.tsx b/components/Funding/PaymentRequestButton.tsx
index f822b9257..68a69dad7 100644
--- a/components/Funding/PaymentRequestButton.tsx
+++ b/components/Funding/PaymentRequestButton.tsx
@@ -5,16 +5,15 @@ import { PaymentRequestButtonElement, useStripe } from '@stripe/react-stripe-js'
 import type { PaymentRequest, PaymentRequestPaymentMethodEvent } from '@stripe/stripe-js';
 import { Button } from '@/components/ui/Button';
 import { StripeProvider } from './StripeProvider';
-import { PaymentService } from '@/services/payment.service';
-import { ID } from '@/types/root';
+import { PaymentService, type PaymentIntentTarget } from '@/services/payment.service';
 
 interface PaymentRequestButtonProps {
   /** Amount in cents */
   amountCents: number;
   /** Amount in RSC for creating payment intent */
   amountInRsc: number;
-  /** Fundraise ID for the contribution */
-  fundraiseId: ID;
+  /** Fundraise or funding pool target for the contribution */
+  paymentTarget: PaymentIntentTarget;
   /** Label shown in the payment sheet */
   label?: string;
   /** Button text to show when payment method is not available */
@@ -34,7 +33,7 @@ interface PaymentRequestButtonProps {
 function PaymentRequestButtonInner({
   amountCents,
   amountInRsc,
-  fundraiseId,
+  paymentTarget,
   label = 'Fund Research',
   unavailableText = 'Not available on this device',
   onSuccess,
@@ -104,9 +103,10 @@ function PaymentRequestButtonInner({
 
       try {
         // Create payment intent on our backend
-        const { clientSecret } = await PaymentService.createPaymentIntent(amountInRsc, {
-          fundraiseId,
-        });
+        const { clientSecret } = await PaymentService.createPaymentIntent(
+          amountInRsc,
+          paymentTarget
+        );
 
         // Confirm the payment with the payment method from Apple Pay/Google Pay
         const { error: confirmError, paymentIntent } = await stripe!.confirmCardPayment(
@@ -149,7 +149,7 @@ function PaymentRequestButtonInner({
     return () => {
       paymentRequest.off('paymentmethod', handlePaymentMethod);
     };
-  }, [paymentRequest, stripe, amountInRsc, fundraiseId, onSuccess, onError]);
+  }, [paymentRequest, stripe, amountInRsc, paymentTarget, onSuccess, onError]);
 
   // Still checking availability
   if (canMakePayment === null) {
diff --git a/components/Funding/PaymentStep.tsx b/components/Funding/PaymentStep.tsx
index 30ed3974d..c575bf245 100644
--- a/components/Funding/PaymentStep.tsx
+++ b/components/Funding/PaymentStep.tsx
@@ -25,8 +25,8 @@ import {
   PAYMENT_PROCESSING_FEE,
   METHODS_WITH_PROCESSING_FEE,
 } from './lib/constants';
-import { ID } from '@/types/root';
 import AnalyticsService, { LogEvent } from '@/services/analytics.service';
+import type { PaymentIntentTarget } from '@/services/payment.service';
 
 interface PaymentStepProps {
   /** Amount in RSC (before fees) */
@@ -39,8 +39,8 @@ interface PaymentStepProps {
   rscBalance: number;
   /** User's funding credits balance (excludes promotional RSC) */
   fundingCreditsBalance?: number;
-  /** Fundraise ID for payment request button */
-  fundraiseId: ID;
+  /** Fundraise or funding pool target for Apple Pay / Google Pay */
+  paymentTarget: PaymentIntentTarget;
   /** Wallet payment method availability from Stripe (resolved at modal level) */
   walletAvailability: WalletAvailability;
   /** Whether the fundraise has a non-profit org (shows Endaoment option) */
@@ -71,7 +71,7 @@ export function PaymentStep({
   amountDisplay,
   rscBalance,
   fundingCreditsBalance = 0,
-  fundraiseId,
+  paymentTarget,
   walletAvailability,
   hasNonprofit = false,
   isProcessing = false,
@@ -176,13 +176,15 @@ export function PaymentStep({
       // Track payment method selection
       if (method) {
         AnalyticsService.logEvent(LogEvent.FUNDRAISE_CONTRIBUTION_PAYMENT_METHOD_SELECTED, {
-          fundraise_id: fundraiseId,
+          ...('fundingPoolId' in paymentTarget
+            ? { funding_pool_id: paymentTarget.fundingPoolId }
+            : { fundraise_id: paymentTarget.fundraiseId }),
           payment_method: method,
           amount_usd: amountInUsd,
         });
       }
     },
-    [fundraiseId, amountInUsd]
+    [paymentTarget, amountInUsd]
   );
 
   // Dummy handlers for PaymentWidget (we handle the action in this component)
@@ -324,7 +326,7 @@ export function PaymentStep({
             <PaymentRequestButton
               amountCents={Math.round(totalDueUsd * 100)}
               amountInRsc={amountInRsc}
-              fundraiseId={fundraiseId}
+              paymentTarget={paymentTarget}
               label="Fund Research"
               unavailableText={
                 selectedMethod === 'apple_pay'
diff --git a/components/Funding/QuickAmountSelector.tsx b/components/Funding/QuickAmountSelector.tsx
index e55b5fe74..faa9ddf36 100644
--- a/components/Funding/QuickAmountSelector.tsx
+++ b/components/Funding/QuickAmountSelector.tsx
@@ -20,6 +20,8 @@ interface QuickAmountSelectorProps {
   onAmountSelect: (amount: number) => void;
   /** Remaining goal amount in USD */
   remainingGoalUsd: number;
+  /** Hide the Remaining button (e.g. unbounded RFP pool contributions) */
+  showRemaining?: boolean;
   /** Optional class name */
   className?: string;
 }
@@ -32,6 +34,7 @@ export const QuickAmountSelector: FC<QuickAmountSelectorProps> = ({
   selectedAmount,
   onAmountSelect,
   remainingGoalUsd,
+  showRemaining = true,
   className,
 }) => {
   const handleAmountClick = useCallback(
@@ -79,7 +82,7 @@ export const QuickAmountSelector: FC<QuickAmountSelectorProps> = ({
       ))}
 
       {/* Remaining button */}
-      {remainingGoalUsd > 0 && (
+      {showRemaining && remainingGoalUsd > 0 && (
         <button
           type="button"
           onClick={handleFundRemaining}
diff --git a/components/modals/ContributeToFundraiseModal.tsx b/components/modals/ContributeToFundraiseModal.tsx
index 793108786..7a9d8682d 100644
--- a/components/modals/ContributeToFundraiseModal.tsx
+++ b/components/modals/ContributeToFundraiseModal.tsx
@@ -1,14 +1,16 @@
 'use client';
 
-import { useState, useCallback, useRef, useEffect } from 'react';
+import { useState, useCallback, useRef, useEffect, useMemo } from 'react';
 import { toast } from 'react-hot-toast';
 import { FundraiseService } from '@/services/fundraise.service';
-import { PaymentService } from '@/services/payment.service';
+import { FundingPoolService } from '@/services/funding-pool.service';
+import { PaymentService, type PaymentIntentTarget } from '@/services/payment.service';
 import { extractApiErrorMessage } from '@/services/lib/serviceUtils';
 import AnalyticsService, { LogEvent } from '@/services/analytics.service';
 import { useUser } from '@/contexts/UserContext';
 import { useExchangeRate } from '@/contexts/ExchangeRateContext';
 import { Fundraise } from '@/types/funding';
+import { FundingPool } from '@/types/grant';
 import { Work } from '@/types/work';
 import { ArrowLeft, MoveRight, DollarSign } from 'lucide-react';
 import {
@@ -30,29 +32,28 @@ import { useNonprofitByFundraiseId } from '@/hooks/useNonprofitByFundraiseId';
 import { getAvailableAndPromotionalRscBalance } from '@/components/ResearchCoin/lib/promotionalBalance';
 
 import AuthContent from '@/components/Auth/AuthContent';
-interface ContributeToFundraiseModalProps {
+
+interface ContributeModalCommonProps {
   isOpen: boolean;
   onClose: () => void;
   onContributeSuccess?: () => void;
-  fundraise: Fundraise;
-  /** Title of the proposal being funded */
+  /** Title of the proposal / RFP being funded */
   proposalTitle?: string;
-  /** Work object containing author information */
+  /** Work object containing author information (proposal fundraise only) */
   work?: Work;
-  /** Replaces the "Fund Proposal" heading. */
+  /** Replaces the default heading. */
   headerTitle?: string;
   /** Replaces the `proposalTitle` subtitle. */
   headerSubtitle?: string;
   /**
-   * Progress figures to show instead of the target fundraise's own. Pooled
-   * campaigns contribute to one fundraise but present the pool's totals, since
-   * that's the goal the funder is actually backing.
+   * Progress figures to show instead of the target's own. Pooled campaigns
+   * contribute to one fundraise but present the pool's totals, since that's
+   * the goal the funder is actually backing.
    */
   progressOverride?: { currentAmountUsd: number; goalAmountUsd: number };
   /**
-   * Whether to offer the Endaoment donor-advised fund option. Pooled campaigns
-   * turn it off: the target is picked for the funder, so tax-deductibility
-   * would vary by draw.
+   * Whether to offer the Endaoment donor-advised fund option. Forced off in
+   * fundingPool mode (RSC / credits / card / Apple Pay only).
    */
   allowDafPayment?: boolean;
   /** Replaces the default contribution success toast. */
@@ -64,6 +65,23 @@ interface ContributeToFundraiseModalProps {
   maxAmountUsd?: number;
 }
 
+export type ContributeToFundraiseModalProps = ContributeModalCommonProps &
+  (
+    | {
+        /** @default 'fundraise' */
+        mode?: 'fundraise';
+        fundraise: Fundraise;
+        fundingPool?: never;
+        grantAmount?: never;
+      }
+    | {
+        mode: 'fundingPool';
+        fundingPool: FundingPool;
+        grantAmount: { usd: number };
+        fundraise?: never;
+      }
+  );
+
 type ModalView = 'funding' | 'auth' | 'payment';
 
 /**
@@ -101,30 +119,42 @@ export function ContributeToFundraiseModal(props: ContributeToFundraiseModalProp
   );
 }
 
-function ContributeToFundraiseModalInner({
-  isOpen,
-  onClose,
-  onContributeSuccess,
-  fundraise,
-  proposalTitle,
-  work,
-  headerTitle,
-  headerSubtitle,
-  progressOverride,
-  allowDafPayment = true,
-  successMessage,
-  maxAmountUsd,
-}: Readonly<ContributeToFundraiseModalProps>) {
+function ContributeToFundraiseModalInner(props: Readonly<ContributeToFundraiseModalProps>) {
+  const {
+    isOpen,
+    onClose,
+    onContributeSuccess,
+    proposalTitle,
+    work,
+    headerTitle,
+    headerSubtitle,
+    progressOverride,
+    successMessage,
+    maxAmountUsd,
+  } = props;
+
+  const isPoolMode = props.mode === 'fundingPool';
+  const fundraise = !isPoolMode ? props.fundraise : undefined;
+  const fundingPool = isPoolMode ? props.fundingPool : undefined;
+  const grantAmount = isPoolMode ? props.grantAmount : undefined;
+  // DAF is never offered for RFP funding pools.
+  const allowDafPayment = isPoolMode ? false : (props.allowDafPayment ?? true);
+
   const { user, refreshUser } = useUser();
   const walletAvailability = useWalletAvailability();
   const { exchangeRate } = useExchangeRate();
   const isMobile = useIsMobile();
   // Skipping the id entirely when DAF is off avoids the hook's nonprofit-link
   // and EIN-search round trips on every open.
-  const { nonprofit } = useNonprofitByFundraiseId(allowDafPayment ? fundraise.id : undefined);
+  const { nonprofit } = useNonprofitByFundraiseId(
+    allowDafPayment && fundraise ? fundraise.id : undefined
+  );
   const hasNonprofit = allowDafPayment && nonprofit !== null;
   const contributionSuccessMessage =
-    successMessage ?? 'Your contribution has been successfully added to the fundraise.';
+    successMessage ??
+    (isPoolMode
+      ? 'Your contribution has been added to the RFP funding pool.'
+      : 'Your contribution has been successfully added to the fundraise.');
   const [amountUsd, setAmountUsd] = useState(100);
   const [isContributing, setIsContributing] = useState(false);
   const [error, setError] = useState<string | null>(null);
@@ -136,6 +166,20 @@ function ContributeToFundraiseModalInner({
   // Store Stripe context for credit card payments
   const stripeContextRef = useRef<StripePaymentContext | null>(null);
 
+  const paymentTarget: PaymentIntentTarget = useMemo(() => {
+    if (isPoolMode && fundingPool) {
+      return { fundingPoolId: fundingPool.id };
+    }
+    return { fundraiseId: fundraise!.id };
+  }, [isPoolMode, fundingPool, fundraise]);
+
+  const analyticsTarget = useMemo(() => {
+    if (isPoolMode && fundingPool) {
+      return { funding_pool_id: fundingPool.id };
+    }
+    return { fundraise_id: fundraise!.id };
+  }, [isPoolMode, fundingPool, fundraise]);
+
   // Handle Stripe context updates from CreditCardForm
   const handleStripeReady = useCallback((context: StripePaymentContext | null) => {
     stripeContextRef.current = context;
@@ -147,7 +191,6 @@ function ContributeToFundraiseModalInner({
   const fundingCreditsBalance = user?.fundingCredits ?? 0;
 
   // Calculate conversions
-  const rscToUsd = (rsc: number) => (exchangeRate ? rsc * exchangeRate : 0);
   const usdToRsc = (usd: number) => (exchangeRate ? usd / exchangeRate : 0);
 
   // Get amount in RSC (derived from USD amount)
@@ -202,7 +245,7 @@ function ContributeToFundraiseModalInner({
   useEffect(() => {
     if (isOpen) {
       AnalyticsService.logEvent(LogEvent.FUNDRAISE_CONTRIBUTION_AMOUNT_STEP, {
-        fundraise_id: fundraise.id,
+        ...analyticsTarget,
         amount_usd: amountUsd,
         amount_rsc: amountInRsc,
       });
@@ -217,30 +260,40 @@ function ContributeToFundraiseModalInner({
     } else {
       // Track funnel step: user reached payment step
       AnalyticsService.logEvent(LogEvent.FUNDRAISE_CONTRIBUTION_PAYMENT_STEP, {
-        fundraise_id: fundraise.id,
+        ...analyticsTarget,
         amount_usd: amountUsd,
         amount_rsc: amountInRsc,
       });
       setCurrentView('payment');
     }
-  }, [user, fundraise.id, amountUsd, amountInRsc]);
+  }, [user, analyticsTarget, amountUsd, amountInRsc]);
 
   const handleAuthSuccess = useCallback(async () => {
     AnalyticsService.logEvent(LogEvent.FUNDRAISE_CONTRIBUTION_PAYMENT_STEP, {
-      fundraise_id: fundraise.id,
+      ...analyticsTarget,
       amount_usd: amountUsd,
       amount_rsc: amountInRsc,
     });
     refreshUser?.();
     setCurrentView('payment');
-  }, [fundraise.id, amountUsd, amountInRsc, refreshUser]);
+  }, [analyticsTarget, amountUsd, amountInRsc, refreshUser]);
+
+  const handleClose = useCallback(() => {
+    setCurrentView('funding');
+    setSelectedQuickAmount(100);
+    setAmountUsd(100);
+    setError(null);
+    setAmountError(undefined);
+    setIsSliderControlled(false);
+    onClose();
+  }, [onClose]);
 
   const handleConfirmPayment = async (paymentMethod: Exclude<PaymentMethodType, 'endaoment'>) => {
     try {
       if (amountUsd < minAmountUsd) {
         setError(`Minimum contribution is $${minAmountUsd}`);
         AnalyticsService.logEvent(LogEvent.FUNDRAISE_CONTRIBUTION_PAYMENT_ERROR, {
-          fundraise_id: fundraise.id,
+          ...analyticsTarget,
           payment_method: paymentMethod,
           error_type: 'validation',
           error_message: 'Amount below minimum',
@@ -255,7 +308,7 @@ function ContributeToFundraiseModalInner({
           })}`
         );
         AnalyticsService.logEvent(LogEvent.FUNDRAISE_CONTRIBUTION_PAYMENT_ERROR, {
-          fundraise_id: fundraise.id,
+          ...analyticsTarget,
           payment_method: paymentMethod,
           error_type: 'validation',
           error_message: 'Amount above maximum',
@@ -269,12 +322,19 @@ function ContributeToFundraiseModalInner({
       if (paymentMethod === 'rsc' || paymentMethod === 'funding_credits') {
         // The backend draws from funding credits only when that payment method
         // is selected. Otherwise it draws from available and promotional RSC.
-        await FundraiseService.contributeToFundraise(
-          fundraise.id,
-          amountInRsc,
-          'rsc',
-          paymentMethod === 'funding_credits'
-        );
+        if (isPoolMode && fundingPool) {
+          await FundingPoolService.createContribution(fundingPool.id, {
+            amount: amountInRsc,
+            useCredits: paymentMethod === 'funding_credits',
+          });
+        } else if (fundraise) {
+          await FundraiseService.contributeToFundraise(
+            fundraise.id,
+            amountInRsc,
+            'rsc',
+            paymentMethod === 'funding_credits'
+          );
+        }
         toast.success(contributionSuccessMessage);
       } else if (paymentMethod === 'credit_card') {
         // Credit card payment flow:
@@ -286,7 +346,7 @@ function ContributeToFundraiseModalInner({
         if (!stripeContext) {
           setError('Payment form is not ready. Please try again.');
           AnalyticsService.logEvent(LogEvent.FUNDRAISE_CONTRIBUTION_PAYMENT_ERROR, {
-            fundraise_id: fundraise.id,
+            ...analyticsTarget,
             payment_method: paymentMethod,
             error_type: 'stripe',
             error_message: 'Payment form not ready',
@@ -297,10 +357,11 @@ function ContributeToFundraiseModalInner({
 
         const { stripe, cardElement } = stripeContext;
 
-        // Step 1: Create payment intent with amount and fundraise ID (backend adds fees and handles contribution)
-        const { clientSecret } = await PaymentService.createPaymentIntent(amountInRsc, {
-          fundraiseId: fundraise.id,
-        });
+        // Step 1: Create payment intent (backend adds fees and handles contribution)
+        const { clientSecret } = await PaymentService.createPaymentIntent(
+          amountInRsc,
+          paymentTarget
+        );
 
         // Step 2: Confirm payment with Stripe
         const { error: stripeError, paymentIntent: stripePaymentIntent } =
@@ -315,7 +376,7 @@ function ContributeToFundraiseModalInner({
             'We had an issue processing your credit card. Choose a different payment method.'
           );
           AnalyticsService.logEvent(LogEvent.FUNDRAISE_CONTRIBUTION_PAYMENT_ERROR, {
-            fundraise_id: fundraise.id,
+            ...analyticsTarget,
             payment_method: paymentMethod,
             error_type: 'stripe',
             error_message: 'Card payment failed',
@@ -329,7 +390,7 @@ function ContributeToFundraiseModalInner({
             'We had an issue processing your credit card. Choose a different payment method.'
           );
           AnalyticsService.logEvent(LogEvent.FUNDRAISE_CONTRIBUTION_PAYMENT_ERROR, {
-            fundraise_id: fundraise.id,
+            ...analyticsTarget,
             payment_method: paymentMethod,
             error_type: 'stripe',
             error_message: 'Payment not succeeded',
@@ -350,7 +411,7 @@ function ContributeToFundraiseModalInner({
 
       // Track successful payment
       AnalyticsService.logEvent(LogEvent.FUNDRAISE_CONTRIBUTION_PAYMENT_SUCCESSFUL, {
-        fundraise_id: fundraise.id,
+        ...analyticsTarget,
         payment_method: paymentMethod,
         amount_usd: amountUsd,
         amount_rsc: amountInRsc,
@@ -365,9 +426,9 @@ function ContributeToFundraiseModalInner({
 
       handleClose();
     } catch (err) {
-      console.error('Failed to contribute to fundraise:', err);
+      console.error('Failed to contribute:', err);
       AnalyticsService.logEvent(LogEvent.FUNDRAISE_CONTRIBUTION_PAYMENT_ERROR, {
-        fundraise_id: fundraise.id,
+        ...analyticsTarget,
         payment_method: paymentMethod,
         error_type: 'api',
         error_message: 'Request failed',
@@ -391,9 +452,14 @@ function ContributeToFundraiseModalInner({
   }, []);
 
   // Calculate amounts in USD for display
-  const currentAmountUsd = progressOverride?.currentAmountUsd ?? fundraise.amountRaised?.usd ?? 0;
-  const goalAmountUsd = progressOverride?.goalAmountUsd ?? fundraise.goalAmount?.usd ?? 0;
+  const currentAmountUsd = isPoolMode
+    ? (progressOverride?.currentAmountUsd ?? fundingPool?.amountRaised.usd ?? 0)
+    : (progressOverride?.currentAmountUsd ?? fundraise?.amountRaised?.usd ?? 0);
+  const goalAmountUsd = isPoolMode
+    ? (progressOverride?.goalAmountUsd ?? grantAmount?.usd ?? 0)
+    : (progressOverride?.goalAmountUsd ?? fundraise?.goalAmount?.usd ?? 0);
   const remainingGoalUsd = Math.max(0, goalAmountUsd - currentAmountUsd);
+  const quickAmountCeilingUsd = isPoolMode && remainingGoalUsd <= 0 ? 10000 : remainingGoalUsd;
 
   const handleBack = useCallback(() => {
     if (currentView === 'payment' || currentView === 'auth') {
@@ -401,18 +467,10 @@ function ContributeToFundraiseModalInner({
     }
   }, [currentView]);
 
-  const handleClose = useCallback(() => {
-    setCurrentView('funding');
-    setSelectedQuickAmount(100);
-    setAmountUsd(100);
-    setError(null);
-    setAmountError(undefined);
-    setIsSliderControlled(false);
-    onClose();
-  }, [onClose]);
-
   const handleEndaomentPaymentConfirm = useCallback(
     async (originFundId: string) => {
+      if (!fundraise) return;
+
       try {
         setIsContributing(true);
         setError(null);
@@ -425,7 +483,7 @@ function ContributeToFundraiseModalInner({
 
         // Track successful payment
         AnalyticsService.logEvent(LogEvent.FUNDRAISE_CONTRIBUTION_PAYMENT_SUCCESSFUL, {
-          fundraise_id: fundraise.id,
+          ...analyticsTarget,
           payment_method: 'endaoment',
           amount_usd: amountUsd,
           amount_rsc: amountInRsc,
@@ -440,7 +498,7 @@ function ContributeToFundraiseModalInner({
       } catch (err) {
         console.error('Failed to contribute via Endaoment:', err);
         AnalyticsService.logEvent(LogEvent.FUNDRAISE_CONTRIBUTION_PAYMENT_ERROR, {
-          fundraise_id: fundraise.id,
+          ...analyticsTarget,
           payment_method: 'endaoment',
           error_type: 'api',
           error_message: 'Request failed',
@@ -451,7 +509,8 @@ function ContributeToFundraiseModalInner({
       }
     },
     [
-      fundraise.id,
+      fundraise,
+      analyticsTarget,
       amountUsd,
       amountInRsc,
       refreshUser,
@@ -466,7 +525,7 @@ function ContributeToFundraiseModalInner({
     (paymentMethod?: 'apple_pay' | 'google_pay') => {
       // Track successful payment
       AnalyticsService.logEvent(LogEvent.FUNDRAISE_CONTRIBUTION_PAYMENT_SUCCESSFUL, {
-        fundraise_id: fundraise.id,
+        ...analyticsTarget,
         payment_method: paymentMethod || 'payment_request',
         amount_usd: amountUsd,
         amount_rsc: amountInRsc,
@@ -480,7 +539,7 @@ function ContributeToFundraiseModalInner({
       handleClose();
     },
     [
-      fundraise.id,
+      analyticsTarget,
       amountUsd,
       amountInRsc,
       refreshUser,
@@ -490,21 +549,23 @@ function ContributeToFundraiseModalInner({
     ]
   );
 
+  const defaultTitle = isPoolMode ? 'Contribute to RFP' : 'Fund Proposal';
+
   // Get title based on current view
   const getTitle = () => {
     switch (currentView) {
       case 'funding':
-        return headerTitle ?? 'Fund Proposal';
+        return headerTitle ?? defaultTitle;
       case 'auth':
         return 'Sign in to continue';
       case 'payment':
         return 'Select Payment Method';
       default:
-        return headerTitle ?? 'Fund Proposal';
+        return headerTitle ?? defaultTitle;
     }
   };
 
-  // Get subtitle - show proposal title on funding and payment screens
+  // Get subtitle - show proposal/RFP title on funding and payment screens
   const getSubtitle = () => {
     if (currentView === 'funding' || currentView === 'payment') {
       return headerSubtitle ?? proposalTitle;
@@ -528,7 +589,7 @@ function ContributeToFundraiseModalInner({
             amountDisplay={getAmountDisplay()}
             rscBalance={rscBalance}
             fundingCreditsBalance={fundingCreditsBalance}
-            fundraiseId={fundraise.id}
+            paymentTarget={paymentTarget}
             isProcessing={isContributing}
             error={error}
             walletAvailability={walletAvailability}
@@ -574,7 +635,8 @@ function ContributeToFundraiseModalInner({
                 <QuickAmountSelector
                   selectedAmount={selectedQuickAmount}
                   onAmountSelect={handleQuickAmountSelect}
-                  remainingGoalUsd={remainingGoalUsd}
+                  remainingGoalUsd={quickAmountCeilingUsd}
+                  showRemaining={!isPoolMode || remainingGoalUsd > 0}
                 />
               </div>
 
@@ -596,7 +658,7 @@ function ContributeToFundraiseModalInner({
                     setAmountError(undefined);
                     setIsSliderControlled(true); // Slider sets linear visual mode
                   }}
-                  authors={work?.authors.map((a) => a.authorProfile)}
+                  authors={isPoolMode ? undefined : work?.authors.map((a) => a.authorProfile)}
                 />
               )}
             </div>
diff --git a/components/work/WorkHeader/WorkHeaderGrant.tsx b/components/work/WorkHeader/WorkHeaderGrant.tsx
index ca0e6da17..b0c66df8a 100644
--- a/components/work/WorkHeader/WorkHeaderGrant.tsx
+++ b/components/work/WorkHeader/WorkHeaderGrant.tsx
@@ -1,15 +1,17 @@
 'use client';
 
 import { type ReactNode, useState, useCallback } from 'react';
-import { ArrowUpFromLine, Lock } from 'lucide-react';
+import { ArrowUpFromLine, Coins, Lock } from 'lucide-react';
+import { useRouter } from 'next/navigation';
 import { Work } from '@/types/work';
 import { WorkMetadata } from '@/services/metadata.service';
 import { Button } from '@/components/ui/Button';
 import { Tabs } from '@/components/ui/Tabs';
 import { SubmitProposalTooltip } from '@/components/tooltips/SubmitProposalTooltip';
+import { ContributeToFundraiseModal } from '@/components/modals/ContributeToFundraiseModal';
 import { useGrantTab, type GrantBannerTab } from '@/components/Funding/GrantPageContent';
 import { useFundraises } from '@/contexts/FundraiseContext';
-import type { GrantApplicationVisibility } from '@/types/grant';
+import type { FundingPool, GrantApplicationVisibility } from '@/types/grant';
 import { WorkHeader } from './WorkHeader';
 import { WorkHeaderGrantEyebrow } from './WorkHeaderGrantEyebrow';
 
@@ -17,11 +19,13 @@ interface WorkHeaderGrantProps {
   work: Work;
   metadata: WorkMetadata;
   amountUsd?: number;
+  grantAmountUsd?: number;
   grantId?: string;
   isActive?: boolean;
   isPending?: boolean;
   organization?: string;
   applicationVisibility?: GrantApplicationVisibility;
+  fundingPool?: FundingPool | null;
   className?: string;
   preTitle?: ReactNode;
 }
@@ -30,15 +34,19 @@ export function WorkHeaderGrant({
   work,
   metadata,
   amountUsd,
+  grantAmountUsd,
   grantId,
   isActive = true,
   isPending = false,
   organization,
   applicationVisibility,
+  fundingPool = null,
   className,
   preTitle,
 }: WorkHeaderGrantProps) {
+  const router = useRouter();
   const [isApplyModalOpen, setIsApplyModalOpen] = useState(false);
+  const [isContributeModalOpen, setIsContributeModalOpen] = useState(false);
   const { activeTab, setActiveTab, activity } = useGrantTab();
   const { proposalCount } = useFundraises();
 
@@ -52,6 +60,12 @@ export function WorkHeaderGrant({
   );
 
   const requiresPrivateApplications = applicationVisibility === 'PRIVATE';
+  const canContributeToPool = !!grantId && isActive && fundingPool?.status === 'OPEN';
+
+  const handleContributeSuccess = useCallback(() => {
+    setIsContributeModalOpen(false);
+    router.refresh();
+  }, [router]);
 
   const subtitle = organization ? (
     <div className="flex flex-wrap items-center gap-x-2 gap-y-1">
@@ -63,18 +77,32 @@ export function WorkHeaderGrant({
   const primaryAction =
     grantId && isActive ? (
       <>
-        <SubmitProposalTooltip isPrivate={requiresPrivateApplications}>
-          <Button
-            data-testid="grant-submit-proposal"
-            variant="default"
-            size="lg"
-            onClick={() => setIsApplyModalOpen(true)}
-            className="gap-2 w-full max-sm:!text-xs max-sm:!h-8 max-sm:!px-2"
-          >
-            Submit Proposal
-            <ArrowUpFromLine className="w-4 h-4 sm:w-5 sm:h-5" />
-          </Button>
-        </SubmitProposalTooltip>
+        <div className="flex flex-col sm:flex-row gap-2 w-full">
+          {canContributeToPool && (
+            <Button
+              data-testid="grant-contribute"
+              variant="outlined"
+              size="lg"
+              onClick={() => setIsContributeModalOpen(true)}
+              className="gap-2 w-full sm:flex-1 max-sm:!text-xs max-sm:!h-8 max-sm:!px-2"
+            >
+              <Coins className="w-4 h-4 sm:w-5 sm:h-5" />
+              Contribute
+            </Button>
+          )}
+          <SubmitProposalTooltip isPrivate={requiresPrivateApplications}>
+            <Button
+              data-testid="grant-submit-proposal"
+              variant="default"
+              size="lg"
+              onClick={() => setIsApplyModalOpen(true)}
+              className="gap-2 w-full sm:flex-1 max-sm:!text-xs max-sm:!h-8 max-sm:!px-2"
+            >
+              Submit Proposal
+              <ArrowUpFromLine className="w-4 h-4 sm:w-5 sm:h-5" />
+            </Button>
+          </SubmitProposalTooltip>
+        </div>
         {requiresPrivateApplications && (
           <div className="hidden sm:flex items-center justify-center gap-1.5 text-xs text-gray-500">
             <Lock className="h-3 w-3 shrink-0" />
@@ -130,31 +158,45 @@ export function WorkHeaderGrant({
     },
   ];
 
-  const tabs = (
-    <Tabs tabs={grantTabs} activeTab={activeTab} onTabChange={handleTabChange} />
-  );
+  const tabs = <Tabs tabs={grantTabs} activeTab={activeTab} onTabChange={handleTabChange} />;
+
+  const grantTitle = work.note?.post?.grant?.shortTitle || work.title;
 
   return (
-    <WorkHeader
-      work={work}
-      metadata={metadata}
-      className={className}
-      eyebrow={eyebrow}
-      preTitle={preTitle}
-      subtitle={subtitle}
-      tabs={tabs}
-      primaryAction={primaryAction}
-      hideVoteWidget
-      grantModalProps={
-        grantId
-          ? {
-              isApplyToGrantModalOpen: isApplyModalOpen,
-              onCloseApplyToGrantModal: () => setIsApplyModalOpen(false),
-              grantId,
-              grantApplicationVisibility: applicationVisibility,
-            }
-          : undefined
-      }
-    />
+    <>
+      <WorkHeader
+        work={work}
+        metadata={metadata}
+        className={className}
+        eyebrow={eyebrow}
+        preTitle={preTitle}
+        subtitle={subtitle}
+        tabs={tabs}
+        primaryAction={primaryAction}
+        hideVoteWidget
+        grantModalProps={
+          grantId
+            ? {
+                isApplyToGrantModalOpen: isApplyModalOpen,
+                onCloseApplyToGrantModal: () => setIsApplyModalOpen(false),
+                grantId,
+                grantApplicationVisibility: applicationVisibility,
+              }
+            : undefined
+        }
+      />
+
+      {fundingPool?.status === 'OPEN' && (
+        <ContributeToFundraiseModal
+          mode="fundingPool"
+          isOpen={isContributeModalOpen}
+          onClose={() => setIsContributeModalOpen(false)}
+          onContributeSuccess={handleContributeSuccess}
+          fundingPool={fundingPool}
+          grantAmount={{ usd: grantAmountUsd ?? amountUsd ?? 0 }}
+          proposalTitle={grantTitle}
+        />
+      )}
+    </>
   );
 }
diff --git a/types/grant.ts b/types/grant.ts
index eda19cf86..3535eb9fa 100644
--- a/types/grant.ts
+++ b/types/grant.ts
@@ -131,7 +131,7 @@ export interface Grant {
   endDate: string;
   contacts: Contact[];
   applicationVisibility: GrantApplicationVisibility;
-  /** Null until ensure / create; slim feed serializers may omit the field entirely. */
+  /** Null when omitted (slim feed) or not yet backfilled; BE creates pools on grant create. */
   fundingPool: FundingPool | null;
   applicants?: AuthorProfile[];
   reviewedBy?: {

From dcac83740f017188340a8d9ef3c446a3f618742b Mon Sep 17 00:00:00 2001
From: nicktytarenko <nicktytarenko@gmail.com>
Date: Wed, 9 Sep 2026 21:28:27 +0300
Subject: [PATCH 2/3] Add RFP funding pool contribute flow and badge totals

---
 app/grant/[id]/[slug]/layout.tsx                      | 4 +++-
 components/Feed/items/FeedItemGrantWithApplicants.tsx | 6 +++---
 components/Fund/FundraiseProgress.tsx                 | 5 ++---
 components/Fund/FundraiseProgressV2.tsx               | 5 ++---
 components/Funding/GrantCard.tsx                      | 3 ++-
 components/Funding/GrantCarousel.tsx                  | 6 ++++--
 components/work/WorkHeader/WorkHeaderProposal.tsx     | 5 ++---
 7 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/grant/[id]/[slug]/layout.tsx b/app/grant/[id]/[slug]/layout.tsx
index 7efd0c2d2..96857b875 100644
--- a/app/grant/[id]/[slug]/layout.tsx
+++ b/app/grant/[id]/[slug]/layout.tsx
@@ -12,6 +12,7 @@ import { GrantTabProvider } from '@/components/Funding/GrantPageContent';
 import { WorkHeaderGrant } from '@/components/work/WorkHeader/index';
 import { RegisteredReportRouteTrackerLoader } from '@/components/work/RegisteredReportRouteTrackerLoader';
 import { SearchHistoryTracker } from '@/components/work/SearchHistoryTracker';
+import { getGrantBadgeAmount } from '@/types/grant';
 
 interface Props {
   params: Promise<{
@@ -61,6 +62,7 @@ export default async function GrantSlugLayout({ params, children }: Props) {
   const isPending = grant?.status === 'PENDING';
   const isActive =
     grant?.status === 'OPEN' && (grant?.endDate ? isDeadlineInFuture(grant.endDate) : true);
+  const badgeAmountUsd = grant ? getGrantBadgeAmount(grant).usd : undefined;
 
   const metadata = await MetadataService.get(work.unifiedDocumentId?.toString() || '');
 
@@ -72,7 +74,7 @@ export default async function GrantSlugLayout({ params, children }: Props) {
           <WorkHeaderGrant
             work={work}
             metadata={metadata}
-            amountUsd={grant?.amount?.usd}
+            amountUsd={badgeAmountUsd}
             grantAmountUsd={grant?.amount?.usd}
             grantId={grantId?.toString()}
             isActive={isActive}
diff --git a/components/Feed/items/FeedItemGrantWithApplicants.tsx b/components/Feed/items/FeedItemGrantWithApplicants.tsx
index c54b18586..e0de09367 100644
--- a/components/Feed/items/FeedItemGrantWithApplicants.tsx
+++ b/components/Feed/items/FeedItemGrantWithApplicants.tsx
@@ -16,6 +16,7 @@ import { useCurrencyPreference } from '@/contexts/CurrencyPreferenceContext';
 import { useExchangeRate } from '@/contexts/ExchangeRateContext';
 import { formatCurrency } from '@/utils/currency';
 import { Application } from '@/types/funding';
+import { getGrantBadgeAmount } from '@/types/grant';
 
 interface FeedItemGrantWithApplicantsProps {
   entry: FeedEntry;
@@ -149,9 +150,8 @@ export const FeedItemGrantWithApplicants: FC<FeedItemGrantWithApplicantsProps> =
     slug: content.slug,
   });
 
-  const budgetAmount = showUSD
-    ? Math.round(grant.amount?.usd || 0)
-    : Math.round(grant.amount?.rsc || 0);
+  const badgeAmount = getGrantBadgeAmount(grant);
+  const budgetAmount = showUSD ? Math.round(badgeAmount.usd) : Math.round(badgeAmount.rsc);
 
   const allProposals = grant.applicants?.filter((a) => a.fundraise) ?? [];
   const shown = expanded ? allProposals : allProposals.slice(0, VISIBLE_PROPOSALS);
diff --git a/components/Fund/FundraiseProgress.tsx b/components/Fund/FundraiseProgress.tsx
index c76354cd4..29bc04b1e 100644
--- a/components/Fund/FundraiseProgress.tsx
+++ b/components/Fund/FundraiseProgress.tsx
@@ -3,7 +3,7 @@
 import { FC, useState } from 'react';
 import { Progress } from '@/components/ui/Progress';
 import { ContributorsButton } from '@/components/ui/ContributorsButton';
-import { Clock } from 'lucide-react';
+import { Clock, Coins } from 'lucide-react';
 import { formatDeadline, formatExactTime } from '@/utils/date';
 import { isFundraiseActive } from '@/components/Fund/lib/fundraiseUtils';
 import type { Fundraise } from '@/types/funding';
@@ -12,7 +12,6 @@ import { Button } from '@/components/ui/Button';
 import { cn } from '@/utils/styles';
 import { CurrencyBadge } from '@/components/ui/CurrencyBadge';
 import { ContributeToFundraiseModal } from '@/components/modals/ContributeToFundraiseModal';
-import { Icon } from '../ui/icons';
 import { useCurrencyPreference } from '@/contexts/CurrencyPreferenceContext';
 import { useShareModalContext } from '@/contexts/ShareContext';
 import { useRouter } from 'next/navigation';
@@ -257,7 +256,7 @@ export const FundraiseProgress: FC<FundraiseProgressProps> = ({
               )}
               onClick={handleContributeClick}
             >
-              <Icon name="giveRSC" size={18} color="white" />
+              <Coins className="w-[18px] h-[18px]" />
               Fund proposal
             </Button>
           ) : onDetailsClick ? (
diff --git a/components/Fund/FundraiseProgressV2.tsx b/components/Fund/FundraiseProgressV2.tsx
index 3d0e91ae9..32a6c5455 100644
--- a/components/Fund/FundraiseProgressV2.tsx
+++ b/components/Fund/FundraiseProgressV2.tsx
@@ -4,7 +4,7 @@ import { FC, useState } from 'react';
 import { Progress } from '@/components/ui/Progress';
 import { AvatarStack } from '@/components/ui/AvatarStack';
 import { ContributorsButton } from '@/components/ui/ContributorsButton';
-import { Clock } from 'lucide-react';
+import { Clock, Coins } from 'lucide-react';
 import { formatDeadline, formatExactTime, formatDate } from '@/utils/date';
 import { isFundraiseActive } from '@/components/Fund/lib/fundraiseUtils';
 import type { Fundraise } from '@/types/funding';
@@ -13,7 +13,6 @@ import { Button } from '@/components/ui/Button';
 import { cn } from '@/utils/styles';
 import { CurrencyBadge } from '@/components/ui/CurrencyBadge';
 import { ContributeToFundraiseModal } from '@/components/modals/ContributeToFundraiseModal';
-import { Icon } from '../ui/icons';
 import { useCurrencyPreference } from '@/contexts/CurrencyPreferenceContext';
 import { useShareModalContext } from '@/contexts/ShareContext';
 import { useRouter } from 'next/navigation';
@@ -347,7 +346,7 @@ export const FundraiseProgress: FC<FundraiseProgressProps> = ({
                   className="flex items-center gap-1.5 bg-orange-500 hover:bg-orange-600 text-white font-semibold transition-all duration-200 border-0"
                   onClick={handleContributeClick}
                 >
-                  <Icon name="giveRSC" size={20} color="white" />
+                  <Coins className="w-5 h-5" />
                   Fund this research
                 </Button>
               ) : onDetailsClick ? (
diff --git a/components/Funding/GrantCard.tsx b/components/Funding/GrantCard.tsx
index 919493d0d..aaa4154f2 100644
--- a/components/Funding/GrantCard.tsx
+++ b/components/Funding/GrantCard.tsx
@@ -4,6 +4,7 @@ import { FC } from 'react';
 import Image from 'next/image';
 import Link from 'next/link';
 import { FeedEntry, FeedGrantContent } from '@/types/feed';
+import { getGrantBadgeAmount } from '@/types/grant';
 import { cn } from '@/utils/styles';
 import { buildWorkUrl } from '@/utils/url';
 import { Users } from 'lucide-react';
@@ -31,7 +32,7 @@ export const GrantCard: FC<GrantCardProps> = ({ entry, className }) => {
 
   const isClosed = grant.status === 'CLOSED';
   const applicantCount = grant.applicants?.length ?? 0;
-  const amount = grant.amount?.usd ?? 0;
+  const amount = getGrantBadgeAmount(grant).usd;
 
   return (
     <Link
diff --git a/components/Funding/GrantCarousel.tsx b/components/Funding/GrantCarousel.tsx
index 24f9cfeb6..7c6271153 100644
--- a/components/Funding/GrantCarousel.tsx
+++ b/components/Funding/GrantCarousel.tsx
@@ -3,6 +3,7 @@
 import { FC, useRef, useState, useEffect } from 'react';
 import Link from 'next/link';
 import { FeedEntry, FeedGrantContent } from '@/types/feed';
+import { getGrantBadgeAmount } from '@/types/grant';
 import { Carousel } from '@/components/ui/Carousel';
 import { FundingProposalCard } from './FundingProposalCard';
 import { ProposalCardSkeleton } from '@/components/skeletons/ProposalCardSkeleton';
@@ -80,6 +81,7 @@ export const GrantCarousel: FC<GrantCarouselProps> = ({
 
   const hasFetchedProposals = hasBeenVisible && (entries.length > 0 || !isLoading);
   const showSkeleton = !hasFetchedProposals;
+  const badgeUsd = getGrantBadgeAmount(grantData).usd;
 
   return (
     <section ref={sectionRef} className={cn('py-5', className)}>
@@ -90,7 +92,7 @@ export const GrantCarousel: FC<GrantCarouselProps> = ({
             {getShortTitle(content.grant.shortTitle, content.title)}
           </h2>
         </Link>
-        {grantData.amount?.usd && (
+        {badgeUsd > 0 && (
           <span
             className={cn(
               'inline-flex items-center px-2 py-0.5 rounded-md text-xs font-bold font-mono',
@@ -99,7 +101,7 @@ export const GrantCarousel: FC<GrantCarouselProps> = ({
                 : 'bg-green-50 border border-green-200 text-green-700'
             )}
           >
-            {formatCompactUSD(grantData.amount.usd)} pool
+            {formatCompactUSD(badgeUsd)} pool
           </span>
         )}
       </div>
diff --git a/components/work/WorkHeader/WorkHeaderProposal.tsx b/components/work/WorkHeader/WorkHeaderProposal.tsx
index feb495b50..93dafa010 100644
--- a/components/work/WorkHeader/WorkHeaderProposal.tsx
+++ b/components/work/WorkHeader/WorkHeaderProposal.tsx
@@ -1,11 +1,10 @@
 'use client';
 
 import { type ReactNode, useState } from 'react';
-import { Globe2, Link2 } from 'lucide-react';
+import { Coins, Globe2, Link2 } from 'lucide-react';
 import { Work } from '@/types/work';
 import { WorkMetadata } from '@/services/metadata.service';
 import { Button } from '@/components/ui/Button';
-import { Icon } from '@/components/ui/icons';
 import { BaseMenuItem } from '@/components/ui/form/BaseMenu';
 import { ConfirmationModal } from '@/components/ui/form/ConfirmationModal';
 import { ContributeToFundraiseModal } from '@/components/modals/ContributeToFundraiseModal';
@@ -119,7 +118,7 @@ export function WorkHeaderProposal({
         onClick={() => setIsFundModalOpen(true)}
         className="hidden tablet:flex gap-2"
       >
-        <Icon name="giveRSC" size={20} color="white" />
+        <Coins className="w-5 h-5" />
         Fund Proposal
       </Button>
     ) : undefined;

From 8e496f654d22d1590e288a91426b51e8e5a4437f Mon Sep 17 00:00:00 2001
From: nicktytarenko <nicktytarenko@gmail.com>
Date: Thu, 10 Sep 2026 13:47:01 +0300
Subject: [PATCH 3/3] Remove unused grantAmountUsd prop from GrantSlugLayout
 and WorkHeaderGrant components; update ContributeToFundraiseModal to handle
 funding pool mode without grant amount.

---
 app/grant/[id]/[slug]/layout.tsx              |  1 -
 .../modals/ContributeToFundraiseModal.tsx     | 34 +++++++++++--------
 .../work/WorkHeader/WorkHeaderGrant.tsx       |  3 --
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/app/grant/[id]/[slug]/layout.tsx b/app/grant/[id]/[slug]/layout.tsx
index 96857b875..af03de82d 100644
--- a/app/grant/[id]/[slug]/layout.tsx
+++ b/app/grant/[id]/[slug]/layout.tsx
@@ -75,7 +75,6 @@ export default async function GrantSlugLayout({ params, children }: Props) {
             work={work}
             metadata={metadata}
             amountUsd={badgeAmountUsd}
-            grantAmountUsd={grant?.amount?.usd}
             grantId={grantId?.toString()}
             isActive={isActive}
             isPending={isPending}
diff --git a/components/modals/ContributeToFundraiseModal.tsx b/components/modals/ContributeToFundraiseModal.tsx
index 7a9d8682d..3d0ceaffa 100644
--- a/components/modals/ContributeToFundraiseModal.tsx
+++ b/components/modals/ContributeToFundraiseModal.tsx
@@ -46,9 +46,8 @@ interface ContributeModalCommonProps {
   /** Replaces the `proposalTitle` subtitle. */
   headerSubtitle?: string;
   /**
-   * Progress figures to show instead of the target's own. Pooled campaigns
-   * contribute to one fundraise but present the pool's totals, since that's
-   * the goal the funder is actually backing.
+   * Progress figures to show instead of the fundraise's own (e.g. app/pool campaigns).
+   * Ignored in fundingPool mode — the RFP pool is unbounded extra money with no goal.
    */
   progressOverride?: { currentAmountUsd: number; goalAmountUsd: number };
   /**
@@ -72,12 +71,10 @@ export type ContributeToFundraiseModalProps = ContributeModalCommonProps &
         mode?: 'fundraise';
         fundraise: Fundraise;
         fundingPool?: never;
-        grantAmount?: never;
       }
     | {
         mode: 'fundingPool';
         fundingPool: FundingPool;
-        grantAmount: { usd: number };
         fundraise?: never;
       }
   );
@@ -136,7 +133,6 @@ function ContributeToFundraiseModalInner(props: Readonly<ContributeToFundraiseMo
   const isPoolMode = props.mode === 'fundingPool';
   const fundraise = !isPoolMode ? props.fundraise : undefined;
   const fundingPool = isPoolMode ? props.fundingPool : undefined;
-  const grantAmount = isPoolMode ? props.grantAmount : undefined;
   // DAF is never offered for RFP funding pools.
   const allowDafPayment = isPoolMode ? false : (props.allowDafPayment ?? true);
 
@@ -451,15 +447,16 @@ function ContributeToFundraiseModalInner(props: Readonly<ContributeToFundraiseMo
     setIsSliderControlled(false); // Quick buttons set scaled visual mode
   }, []);
 
-  // Calculate amounts in USD for display
+  // Calculate amounts in USD for display.
+  const poolRaisedUsd = fundingPool?.amountRaised.usd ?? 0;
   const currentAmountUsd = isPoolMode
-    ? (progressOverride?.currentAmountUsd ?? fundingPool?.amountRaised.usd ?? 0)
+    ? poolRaisedUsd
     : (progressOverride?.currentAmountUsd ?? fundraise?.amountRaised?.usd ?? 0);
   const goalAmountUsd = isPoolMode
-    ? (progressOverride?.goalAmountUsd ?? grantAmount?.usd ?? 0)
+    ? 0
     : (progressOverride?.goalAmountUsd ?? fundraise?.goalAmount?.usd ?? 0);
   const remainingGoalUsd = Math.max(0, goalAmountUsd - currentAmountUsd);
-  const quickAmountCeilingUsd = isPoolMode && remainingGoalUsd <= 0 ? 10000 : remainingGoalUsd;
+  const quickAmountCeilingUsd = isPoolMode ? 10000 : remainingGoalUsd;
 
   const handleBack = useCallback(() => {
     if (currentView === 'payment' || currentView === 'auth') {
@@ -636,12 +633,21 @@ function ContributeToFundraiseModalInner(props: Readonly<ContributeToFundraiseMo
                   selectedAmount={selectedQuickAmount}
                   onAmountSelect={handleQuickAmountSelect}
                   remainingGoalUsd={quickAmountCeilingUsd}
-                  showRemaining={!isPoolMode || remainingGoalUsd > 0}
+                  showRemaining={!isPoolMode}
                 />
               </div>
 
-              {/* Funding Impact Preview with Slider */}
-              {goalAmountUsd > 0 && (
+              {isPoolMode && poolRaisedUsd > 0 && (
+                <p className="text-sm text-gray-600">
+                  Raised so far{' '}
+                  <span className="font-mono font-medium text-gray-900 tabular-nums">
+                    {formatUsd(poolRaisedUsd)}
+                  </span>
+                </p>
+              )}
+
+              {/* Goal progress + slider — proposal fundraises only (pool has no goal). */}
+              {!isPoolMode && goalAmountUsd > 0 && (
                 <FundingImpactPreview
                   currentAmountUsd={currentAmountUsd}
                   goalAmountUsd={goalAmountUsd}
@@ -658,7 +664,7 @@ function ContributeToFundraiseModalInner(props: Readonly<ContributeToFundraiseMo
                     setAmountError(undefined);
                     setIsSliderControlled(true); // Slider sets linear visual mode
                   }}
-                  authors={isPoolMode ? undefined : work?.authors.map((a) => a.authorProfile)}
+                  authors={work?.authors.map((a) => a.authorProfile)}
                 />
               )}
             </div>
diff --git a/components/work/WorkHeader/WorkHeaderGrant.tsx b/components/work/WorkHeader/WorkHeaderGrant.tsx
index b0c66df8a..651f55ffc 100644
--- a/components/work/WorkHeader/WorkHeaderGrant.tsx
+++ b/components/work/WorkHeader/WorkHeaderGrant.tsx
@@ -19,7 +19,6 @@ interface WorkHeaderGrantProps {
   work: Work;
   metadata: WorkMetadata;
   amountUsd?: number;
-  grantAmountUsd?: number;
   grantId?: string;
   isActive?: boolean;
   isPending?: boolean;
@@ -34,7 +33,6 @@ export function WorkHeaderGrant({
   work,
   metadata,
   amountUsd,
-  grantAmountUsd,
   grantId,
   isActive = true,
   isPending = false,
@@ -193,7 +191,6 @@ export function WorkHeaderGrant({
           onClose={() => setIsContributeModalOpen(false)}
           onContributeSuccess={handleContributeSuccess}
           fundingPool={fundingPool}
-          grantAmount={{ usd: grantAmountUsd ?? amountUsd ?? 0 }}
           proposalTitle={grantTitle}
         />
       )}