From 56dc8bbe0786c51d3e7263ab1780409027a6c37b Mon Sep 17 00:00:00 2001
From: nicktytarenko <nicktytarenko@gmail.com>
Date: Wed, 17 Jun 2026 23:26:59 +0300
Subject: [PATCH 1/4] Fix profile member text and funding modal navigation
 flash.

---
 .../Funding/OpenFundingOpportunityModal.tsx   | 42 ++++++++++++++-----
 components/profile/ProfileHeroBanner.tsx      | 10 ++++-
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/components/Funding/OpenFundingOpportunityModal.tsx b/components/Funding/OpenFundingOpportunityModal.tsx
index 2697310a9..97d462633 100644
--- a/components/Funding/OpenFundingOpportunityModal.tsx
+++ b/components/Funding/OpenFundingOpportunityModal.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { useEffect, useState, useTransition } from 'react';
 import Link from 'next/link';
 import { Dialog } from '@headlessui/react';
 import {
@@ -109,17 +109,36 @@ export const OpenFundingOpportunityModal = ({
 }: OpenFundingOpportunityModalProps) => {
   const initialStep: Step = minimal ? 'method' : 'benefits';
   const [step, setStep] = useState<Step>(initialStep);
+  const [pendingMethod, setPendingMethod] = useState<FundingOpportunityCreationMethod | null>(null);
+  const [isPending, startTransition] = useTransition();
+
+  const handleClose = () => {
+    if (isPending) return;
+    onClose();
+  };
+
+  const handleConfirmMethod = (method: FundingOpportunityCreationMethod) => {
+    setPendingMethod(method);
+    startTransition(() => {
+      onConfirm(method);
+    });
+  };
 
   // Reset to the first step whenever the modal is reopened so a returning user
   // always starts from the configured entry step rather than a stale step.
+  // Skip while a route transition is pending so the method step doesn't flash
+  // back to the initial step before navigation completes.
   useEffect(() => {
-    if (!isOpen) setStep(initialStep);
-  }, [isOpen, initialStep]);
+    if (!isOpen && !isPending) {
+      setStep(initialStep);
+      setPendingMethod(null);
+    }
+  }, [isOpen, initialStep, isPending]);
 
   return (
     <BaseModal
-      isOpen={isOpen}
-      onClose={onClose}
+      isOpen={isOpen || isPending}
+      onClose={handleClose}
       showCloseButton={false}
       padding="p-0"
       className={cn(
@@ -134,7 +153,7 @@ export const OpenFundingOpportunityModal = ({
             {/* Mobile close button (lives in the title section on small screens) */}
             <button
               type="button"
-              onClick={onClose}
+              onClick={handleClose}
               className="absolute top-4 right-4 z-20 inline-flex h-8 w-8 items-center justify-center rounded-full bg-black/5 text-gray-500 transition-colors hover:bg-black/10 hover:text-gray-700 md:hidden"
               aria-label="Close"
             >
@@ -172,7 +191,7 @@ export const OpenFundingOpportunityModal = ({
         <div className="relative flex flex-1 flex-col p-6 md:p-10">
           <button
             type="button"
-            onClick={onClose}
+            onClick={handleClose}
             className="absolute top-4 right-4 z-10 hidden h-8 w-8 items-center justify-center rounded-full bg-gray-100 text-gray-500 transition-colors hover:bg-gray-200 hover:text-gray-700 md:inline-flex"
             aria-label="Close"
           >
@@ -252,9 +271,10 @@ export const OpenFundingOpportunityModal = ({
                     key={option.id}
                     type="button"
                     onClick={() =>
-                      option.id === 'upload' ? setStep('upload') : onConfirm(option.id)
+                      option.id === 'upload' ? setStep('upload') : handleConfirmMethod(option.id)
                     }
-                    className="group flex w-full items-center gap-4 rounded-xl border border-gray-200 bg-white px-4 py-3.5 text-left transition-colors hover:border-rhBlue-300 hover:bg-blue-50/50"
+                    disabled={pendingMethod === option.id}
+                    className="group flex w-full items-center gap-4 rounded-xl border border-gray-200 bg-white px-4 py-3.5 text-left transition-colors hover:border-rhBlue-300 hover:bg-blue-50/50 disabled:pointer-events-none disabled:opacity-60"
                   >
                     <div className="flex h-[46px] w-[46px] flex-shrink-0 items-center justify-center rounded-2xl bg-blue-50">
                       {option.icon}
@@ -282,7 +302,7 @@ export const OpenFundingOpportunityModal = ({
                 href={WHITE_GLOVE_BOOKING_URL}
                 target="_blank"
                 rel="noopener noreferrer"
-                onClick={onClose}
+                onClick={handleClose}
                 className="group flex w-full items-center gap-4 rounded-xl border border-rhBlue-200 bg-blue-50/60 px-4 py-3.5 text-left transition-colors hover:border-rhBlue-300 hover:bg-blue-50"
               >
                 <div className="flex h-[46px] w-[46px] flex-shrink-0 items-center justify-center rounded-2xl bg-rhBlue-600">
@@ -305,7 +325,7 @@ export const OpenFundingOpportunityModal = ({
               description="Import a Word, OpenDocument, or Markdown file and we'll set up your funding opportunity from it."
               documentType="GRANT"
               onBack={() => setStep('method')}
-              onClose={onClose}
+              onClose={handleClose}
             />
           )}
         </div>
diff --git a/components/profile/ProfileHeroBanner.tsx b/components/profile/ProfileHeroBanner.tsx
index 014bb2acc..2202975f7 100644
--- a/components/profile/ProfileHeroBanner.tsx
+++ b/components/profile/ProfileHeroBanner.tsx
@@ -45,6 +45,8 @@ export function ProfileHeroBanner({ author, refetchAuthorInfo, tabBar }: Profile
     if (!isOwnProfile) setIsEditModalOpen(false);
   }, [isOwnProfile]);
 
+  const membershipDuration = author.createdDate ? specificTimeSince(author.createdDate) : null;
+
   return (
     <>
       <HeroHeader tabBar={tabBar}>
@@ -100,13 +102,17 @@ export function ProfileHeroBanner({ author, refetchAuthorInfo, tabBar }: Profile
 
             <div className="flex flex-col gap-1">
               <ProfileEducation educations={author.education ?? []} />
-              {author.createdDate && (
+              {membershipDuration && (
                 <div className="flex items-baseline gap-2 text-gray-600">
                   <FontAwesomeIcon
                     icon={faBirthdayCake}
                     className="h-5 w-5 self-start text-[#6B7280]"
                   />
-                  <span>Member for {specificTimeSince(author.createdDate)}</span>
+                  <span>
+                    {membershipDuration === 'just joined'
+                      ? 'Member just joined'
+                      : `Member for ${membershipDuration}`}
+                  </span>
                 </div>
               )}
             </div>

From ebbf6de23e4fb99302dcf6d279936fe4e02d2f1b Mon Sep 17 00:00:00 2001
From: nicktytarenko <nicktytarenko@gmail.com>
Date: Wed, 17 Jun 2026 23:51:43 +0300
Subject: [PATCH 2/4] const

---
 components/profile/ProfileHeroBanner.tsx | 4 ++--
 utils/date.ts                            | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/profile/ProfileHeroBanner.tsx b/components/profile/ProfileHeroBanner.tsx
index 2202975f7..ab2639684 100644
--- a/components/profile/ProfileHeroBanner.tsx
+++ b/components/profile/ProfileHeroBanner.tsx
@@ -7,7 +7,7 @@ import { VerifiedBadge } from '@/components/ui/VerifiedBadge';
 import { Button } from '@/components/ui/Button';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faBirthdayCake } from '@fortawesome/pro-light-svg-icons';
-import { specificTimeSince } from '@/utils/date';
+import { specificTimeSince, MEMBERSHIP_JUST_JOINED } from '@/utils/date';
 import { AuthorProfile } from '@/types/authorProfile';
 import { calculateProfileCompletion } from '@/utils/profileCompletion';
 import { useUser } from '@/contexts/UserContext';
@@ -109,7 +109,7 @@ export function ProfileHeroBanner({ author, refetchAuthorInfo, tabBar }: Profile
                     className="h-5 w-5 self-start text-[#6B7280]"
                   />
                   <span>
-                    {membershipDuration === 'just joined'
+                    {membershipDuration === MEMBERSHIP_JUST_JOINED
                       ? 'Member just joined'
                       : `Member for ${membershipDuration}`}
                   </span>
diff --git a/utils/date.ts b/utils/date.ts
index 8aca98afc..f04ecc8bb 100644
--- a/utils/date.ts
+++ b/utils/date.ts
@@ -135,6 +135,8 @@ export function isDeadlineInFuture(deadline: string): boolean {
   return deadlineDate.isAfter(now);
 }
 
+export const MEMBERSHIP_JUST_JOINED = 'just joined';
+
 export function specificTimeSince(dateInput: string | Date): string {
   const now = dayjs.utc();
   const joined = dayjs.utc(dateInput);
@@ -157,7 +159,7 @@ export function specificTimeSince(dateInput: string | Date): string {
   if (days > 0) result.push(`${days} day${days > 1 ? 's' : ''}`);
 
   if (result.length === 0) {
-    return 'just joined';
+    return MEMBERSHIP_JUST_JOINED;
   } else if (result.length === 1) {
     return result[0];
   } else if (result.length === 2) {

From db69a482697ee8743af390452b3660327ab02d43 Mon Sep 17 00:00:00 2001
From: nicktytarenko <nicktytarenko@gmail.com>
Date: Thu, 18 Jun 2026 22:46:31 +0300
Subject: [PATCH 3/4] No "proposals found"

---
 components/Funding/ProposalFeed.tsx           | 2 +-
 components/Funding/ProposalSortAndFilters.tsx | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/components/Funding/ProposalFeed.tsx b/components/Funding/ProposalFeed.tsx
index d27c5c4fc..a4bd2337a 100644
--- a/components/Funding/ProposalFeed.tsx
+++ b/components/Funding/ProposalFeed.tsx
@@ -29,7 +29,7 @@ export const ProposalFeed: FC<ProposalFeedProps> = ({ className }) => {
         showPostHeaders={false}
         noEntriesElement={
           <div className="py-12 text-center">
-            <p className="text-gray-500">No proposals found</p>
+            <p className="text-gray-500">No proposals submitted yet</p>
           </div>
         }
       />
diff --git a/components/Funding/ProposalSortAndFilters.tsx b/components/Funding/ProposalSortAndFilters.tsx
index 0d10e9126..9614c3199 100644
--- a/components/Funding/ProposalSortAndFilters.tsx
+++ b/components/Funding/ProposalSortAndFilters.tsx
@@ -68,6 +68,12 @@ interface ProposalSortAndFiltersProps {
 }
 
 export const ProposalSortAndFilters: FC<ProposalSortAndFiltersProps> = ({ className }) => {
+  const { entries, isLoading } = useFundraises();
+
+  if (!isLoading && entries.length === 0) {
+    return null;
+  }
+
   return (
     <div className={cn('flex items-center justify-end mt-2 sm:mt-4 mb-2', className)}>
       <SortDropdown />

From d2f98b7babf7aa8ddc374e966661837079a1f362 Mon Sep 17 00:00:00 2001
From: nicktytarenko <nicktytarenko@gmail.com>
Date: Thu, 18 Jun 2026 22:52:24 +0300
Subject: [PATCH 4/4] Proposal count not show up on "proposals" tab on RFP

---
 app/grant/[id]/[slug]/layout.tsx              |  1 +
 app/grant/[id]/[slug]/page.tsx                |  7 ++----
 app/layouts/PageLayout.tsx                    |  5 +++--
 components/Funding/ProposalCount.tsx          |  4 ++--
 .../work/WorkHeader/WorkHeaderGrant.tsx       | 22 ++++++++++++++++++-
 contexts/FundraiseContext.tsx                 | 12 +++++++++-
 services/feed.service.ts                      |  4 +++-
 7 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/app/grant/[id]/[slug]/layout.tsx b/app/grant/[id]/[slug]/layout.tsx
index 9643aa24a..6e6d67e97 100644
--- a/app/grant/[id]/[slug]/layout.tsx
+++ b/app/grant/[id]/[slug]/layout.tsx
@@ -68,6 +68,7 @@ export default async function GrantSlugLayout({ params, children }: Props) {
   return (
     <GrantTabProvider defaultTab="details" grantId={grantId}>
       <PageLayout
+        fundraiseGrantId={grantId ? Number(grantId) : undefined}
         topBanner={
           <WorkHeaderGrant
             work={work}
diff --git a/app/grant/[id]/[slug]/page.tsx b/app/grant/[id]/[slug]/page.tsx
index ca91b7dd5..f8150136e 100644
--- a/app/grant/[id]/[slug]/page.tsx
+++ b/app/grant/[id]/[slug]/page.tsx
@@ -4,7 +4,6 @@ import { PostService } from '@/services/post.service';
 import { getWorkMetadata } from '@/lib/metadata-helpers';
 import { ProposalFeed } from '@/components/Funding/ProposalFeed';
 import { ProposalSortAndFilters } from '@/components/Funding/ProposalSortAndFilters';
-import { FundraiseProvider } from '@/contexts/FundraiseContext';
 import { GrantContentSwitcher } from '@/components/Funding/GrantContentSwitcher';
 
 interface Props {
@@ -48,10 +47,8 @@ export default async function GrantSlugPage({ params }: Props) {
       hasDescription={!!grant?.description}
       grantId={grantId}
     >
-      <FundraiseProvider grantId={grantId ? Number(grantId) : undefined}>
-        {grant?.description && <ProposalSortAndFilters />}
-        <ProposalFeed />
-      </FundraiseProvider>
+      {grant?.description && <ProposalSortAndFilters />}
+      <ProposalFeed />
     </GrantContentSwitcher>
   );
 }
diff --git a/app/layouts/PageLayout.tsx b/app/layouts/PageLayout.tsx
index 1fc1d1396..0b014e793 100644
--- a/app/layouts/PageLayout.tsx
+++ b/app/layouts/PageLayout.tsx
@@ -29,6 +29,7 @@ interface PageLayoutProps {
   className?: string;
   sidebarContentClassName?: string;
   topBanner?: ReactNode;
+  fundraiseGrantId?: number;
   /**
    * Drop the 860px main-content cap and let content fill the page container
    * (~1180px). Useful when `rightSidebar` is false and the page wants the
@@ -129,10 +130,10 @@ function PageLayoutInner({
   );
 }
 
-export function PageLayout(props: PageLayoutProps) {
+export function PageLayout({ fundraiseGrantId, ...props }: PageLayoutProps) {
   return (
     <GrantProvider>
-      <FundraiseProvider>
+      <FundraiseProvider grantId={fundraiseGrantId}>
         <FeedTabsVisibilityProvider>
           <TopBarSlotProvider>
             <PageLayoutInner {...props} />
diff --git a/components/Funding/ProposalCount.tsx b/components/Funding/ProposalCount.tsx
index 62db184fb..b31e88628 100644
--- a/components/Funding/ProposalCount.tsx
+++ b/components/Funding/ProposalCount.tsx
@@ -4,14 +4,14 @@ import { FC } from 'react';
 import { useFundraises } from '@/contexts/FundraiseContext';
 
 export const ProposalCount: FC = () => {
-  const { entries, isLoading } = useFundraises();
+  const { proposalCount, isLoading } = useFundraises();
 
   if (isLoading) return <p className="mt-12 text-sm text-gray-600">&nbsp;</p>;
 
   return (
     <p className="mt-12 text-sm text-gray-600">
       <span className="font-semibold">
-        {entries.length} proposal{entries.length !== 1 ? 's' : ''}
+        {proposalCount} proposal{proposalCount !== 1 ? 's' : ''}
       </span>{' '}
       competing for funding
     </p>
diff --git a/components/work/WorkHeader/WorkHeaderGrant.tsx b/components/work/WorkHeader/WorkHeaderGrant.tsx
index e88dd0f55..4dd00e653 100644
--- a/components/work/WorkHeader/WorkHeaderGrant.tsx
+++ b/components/work/WorkHeader/WorkHeaderGrant.tsx
@@ -8,6 +8,7 @@ import { Button } from '@/components/ui/Button';
 import { Tabs } from '@/components/ui/Tabs';
 import { SubmitProposalTooltip } from '@/components/tooltips/SubmitProposalTooltip';
 import { useGrantTab, type GrantBannerTab } from '@/components/Funding/GrantPageContent';
+import { useFundraises } from '@/contexts/FundraiseContext';
 import type { GrantApplicationVisibility } from '@/types/grant';
 import { WorkHeader } from './WorkHeader';
 import { WorkHeaderGrantEyebrow } from './WorkHeaderGrantEyebrow';
@@ -37,6 +38,7 @@ export function WorkHeaderGrant({
 }: WorkHeaderGrantProps) {
   const [isApplyModalOpen, setIsApplyModalOpen] = useState(false);
   const { activeTab, setActiveTab, activity } = useGrantTab();
+  const { proposalCount } = useFundraises();
 
   const handleTabChange = useCallback(
     (tabId: string) => setActiveTab(tabId as GrantBannerTab),
@@ -83,7 +85,25 @@ export function WorkHeaderGrant({
 
   const grantTabs = [
     { id: 'details' as const, label: 'Details' },
-    { id: 'proposals' as const, label: 'Proposals' },
+    {
+      id: 'proposals' as const,
+      label: (
+        <div className="flex items-center">
+          <span>Proposals</span>
+          {proposalCount > 0 && (
+            <span
+              className={`ml-2 py-0.5 px-2 rounded-full text-xs ${
+                activeTab === 'proposals'
+                  ? 'bg-primary-100 text-primary-600'
+                  : 'bg-gray-100 text-gray-600'
+              }`}
+            >
+              {proposalCount}
+            </span>
+          )}
+        </div>
+      ),
+    },
     {
       id: 'activity' as const,
       label: (
diff --git a/contexts/FundraiseContext.tsx b/contexts/FundraiseContext.tsx
index c26801df6..af0c373ce 100644
--- a/contexts/FundraiseContext.tsx
+++ b/contexts/FundraiseContext.tsx
@@ -50,6 +50,7 @@ interface FundraiseProviderProps {
 
 export function FundraiseProvider({ children, grantId }: FundraiseProviderProps) {
   const [entries, setEntries] = useState<FeedEntry[]>([]);
+  const [totalCount, setTotalCount] = useState(0);
   const [isLoading, setIsLoading] = useState(true);
   const [isLoadingMore, setIsLoadingMore] = useState(false);
   const [hasMore, setHasMore] = useState(false);
@@ -81,6 +82,12 @@ export function FundraiseProvider({ children, grantId }: FundraiseProviderProps)
   const [activated, setActivated] = useState(false);
   const activate = useCallback(() => setActivated(true), []);
 
+  useEffect(() => {
+    if (grantId != null) {
+      setActivated(true);
+    }
+  }, [grantId]);
+
   const fetchProposals = useCallback(async () => {
     setEntries([]);
     setIsLoading(true);
@@ -95,6 +102,7 @@ export function FundraiseProvider({ children, grantId }: FundraiseProviderProps)
         ordering: feedParams.ordering,
       });
       setEntries(result.entries);
+      setTotalCount(result.count);
       setHasMore(result.hasMore && result.entries.length >= PAGE_SIZE);
       setPage(1);
     } catch (error) {
@@ -126,6 +134,7 @@ export function FundraiseProvider({ children, grantId }: FundraiseProviderProps)
         ordering: feedParams.ordering,
       });
       setEntries((prev) => [...prev, ...result.entries]);
+      setTotalCount(result.count);
       setHasMore(result.hasMore && result.entries.length >= PAGE_SIZE);
       setPage(nextPage);
     } catch (error) {
@@ -164,7 +173,7 @@ export function FundraiseProvider({ children, grantId }: FundraiseProviderProps)
       isLoadingMore,
       hasMore,
       loadMore,
-      proposalCount: entries.length,
+      proposalCount: totalCount,
       statusFilter,
       setStatusFilter,
       taxDeductible,
@@ -178,6 +187,7 @@ export function FundraiseProvider({ children, grantId }: FundraiseProviderProps)
     }),
     [
       entries,
+      totalCount,
       activated,
       isLoading,
       isLoadingMore,
diff --git a/services/feed.service.ts b/services/feed.service.ts
index 3b00264f5..31a8dc658 100644
--- a/services/feed.service.ts
+++ b/services/feed.service.ts
@@ -28,7 +28,7 @@ export class FeedService {
     status?: string;
     userId?: string;
     viewAsUserId?: number;
-  }): Promise<{ entries: FeedEntry[]; hasMore: boolean }> {
+  }): Promise<{ entries: FeedEntry[]; hasMore: boolean; count: number }> {
     const queryParams = new URLSearchParams();
     if (params?.page) queryParams.append('page', params.page.toString());
     if (params?.pageSize) queryParams.append('page_size', params.pageSize.toString());
@@ -84,6 +84,7 @@ export class FeedService {
       return {
         entries: transformedEntries,
         hasMore: !!response.next,
+        count: response.count ?? transformedEntries.length,
       };
     } catch (error) {
       console.error('Error fetching feed:', error);
@@ -91,6 +92,7 @@ export class FeedService {
       return {
         entries: [],
         hasMore: false,
+        count: 0,
       };
     }
   }