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
436 changes: 237 additions & 199 deletions components/escrow/FundEscrowButton.tsx

Large diffs are not rendered by default.

37 changes: 32 additions & 5 deletions components/landing-page/navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ import WalletRequiredModal from '@/components/wallet/WalletRequiredModal';
import { WalletTrigger } from '../wallet/WalletTrigger';
import { NotificationBell } from '../notifications/NotificationBell';
import CreateProjectModal from '@/features/projects/components/CreateProjectModal';
import WalletNotReadyModal from '@/components/wallet/WalletNotReadyModal';
import { useWalletContext } from '../providers/wallet-provider';

const BRAND_COLOR = '#a7f950';
const ACTIONS = {
Expand Down Expand Up @@ -200,12 +202,16 @@ function AuthenticatedActions() {
const {
executeProtectedAction,
showWalletModal,
showNotReadyModal,
notReadyReasons,
closeWalletModal,
closeNotReadyModal,
handleWalletConnected,
} = useProtectedAction({
actionName: ACTIONS.CREATE_PROJECT,
onSuccess: () => setCreateProjectModalOpen(true),
});
const { onOpenWallet } = useWalletContext();

return (
<>
Expand Down Expand Up @@ -294,17 +300,31 @@ function AuthenticatedActions() {
actionName={ACTIONS.CREATE_PROJECT}
onWalletConnected={handleWalletConnected}
/>
<WalletNotReadyModal
open={showNotReadyModal}
onOpenChange={closeNotReadyModal}
reasons={notReadyReasons}
actionName={ACTIONS.CREATE_PROJECT}
onOpenWallet={onOpenWallet}
/>
</>
);
}

function UnauthenticatedActions() {
const [createProjectModalOpen, setCreateProjectModalOpen] = useState(false);
const { showWalletModal, closeWalletModal, handleWalletConnected } =
useProtectedAction({
actionName: ACTIONS.CREATE_PROJECT,
onSuccess: () => setCreateProjectModalOpen(true),
});
const {
showWalletModal,
showNotReadyModal,
notReadyReasons,
closeWalletModal,
closeNotReadyModal,
handleWalletConnected,
} = useProtectedAction({
actionName: ACTIONS.CREATE_PROJECT,
onSuccess: () => setCreateProjectModalOpen(true),
});
const { onOpenWallet } = useWalletContext();

return (
<>
Expand Down Expand Up @@ -334,6 +354,13 @@ function UnauthenticatedActions() {
actionName={ACTIONS.CREATE_PROJECT}
onWalletConnected={handleWalletConnected}
/>
<WalletNotReadyModal
open={showNotReadyModal}
onOpenChange={closeNotReadyModal}
reasons={notReadyReasons}
actionName={ACTIONS.CREATE_PROJECT}
onOpenWallet={onOpenWallet}
/>
</>
);
}
Expand Down
62 changes: 39 additions & 23 deletions components/modals/fund-project/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ import { fundCrowdfundingProject } from '@/features/projects/api';
import { useWalletContext } from '@/components/providers/wallet-provider';
import { useWalletProtection } from '@/hooks/use-wallet-protection';
import { signTransaction } from '@/lib/config/wallet-kit';
import WalletRequiredModal from '@/components/wallet/WalletRequiredModal';
import WalletNotReadyModal from '@/components/wallet/WalletNotReadyModal';
import { WalletSheet } from '@/components/wallet/WalletSheet';
import {
useFundEscrow,
useSendTransaction,
Expand Down Expand Up @@ -82,9 +85,19 @@ const FundProject = ({ open, setOpen, project }: FundProjectProps) => {

// Wallet hooks
const { walletAddress } = useWalletContext();
const { requireWallet } = useWalletProtection({
const {
requireWallet,
showWalletModal,
showNotReadyModal,
notReadyReasons,
handleWalletConnected,
closeWalletModal,
closeNotReadyModal,
} = useWalletProtection({
actionName: 'fund project',
});

const [isWalletDrawerOpen, setIsWalletDrawerOpen] = useState(false);
// Form data state
const [formData, setFormData] = useState<FundProjectFormData>({
amount: {},
Expand Down Expand Up @@ -292,29 +305,11 @@ const FundProject = ({ open, setOpen, project }: FundProjectProps) => {
setError(null);

const walletValid = await requireWallet(async () => {
if (!walletAddress) {
setError('Wallet address is required');
setFlowStep('form');
setIsLoading(false);
setIsSubmitting(false);
return;
}

if (!project.contractId) {
setError(
'This project does not have an escrow contract set up. Please contact the project creator or support if you believe this is an error.'
);
setFlowStep('form');
setIsLoading(false);
setIsSubmitting(false);
return;
}

try {
// Step 1: Prepare the payload according to FundEscrowPayload type
const payload: FundEscrowPayload = {
contractId: project.contractId,
signer: walletAddress,
contractId: project.contractId!,
signer: walletAddress!,
amount: fundingAmount,
};

Expand Down Expand Up @@ -342,7 +337,7 @@ const FundProject = ({ open, setOpen, project }: FundProjectProps) => {
// Step 3: Sign transaction with wallet
const signedXdr = await signTransaction({
unsignedTransaction,
address: walletAddress,
address: walletAddress!,
});

// Extract transaction hash from signed XDR
Expand Down Expand Up @@ -405,7 +400,7 @@ const FundProject = ({ open, setOpen, project }: FundProjectProps) => {
setIsLoading(false);
setIsSubmitting(false);
}
});
}, fundingAmount);

if (!walletValid) {
setFlowStep('form');
Expand Down Expand Up @@ -593,6 +588,27 @@ const FundProject = ({ open, setOpen, project }: FundProjectProps) => {
isSubmitting={isSubmitting}
/>
)}

{/* Wallet Modals */}
<WalletRequiredModal
open={showWalletModal}
onOpenChange={closeWalletModal}
actionName='fund project'
onWalletConnected={handleWalletConnected}
/>

<WalletNotReadyModal
open={showNotReadyModal}
onOpenChange={closeNotReadyModal}
reasons={notReadyReasons}
onOpenWallet={() => setIsWalletDrawerOpen(true)}
actionName='fund project'
/>

<WalletSheet
open={isWalletDrawerOpen}
onOpenChange={setIsWalletDrawerOpen}
/>
</BoundlessSheet>
);
};
Expand Down
16 changes: 16 additions & 0 deletions components/providers/wallet-provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ type WalletContextType = {
syncWallet: () => Promise<void>;
getSupportedTrustlineAssets: () => Promise<SupportedTrustlineAsset[]>;
addTrustline: (assetCode: string) => Promise<void>;
isWalletOpen: boolean;
onOpenWallet: () => void;
onCloseWallet: () => void;
};

const WalletContext = createContext<WalletContextType | undefined>(undefined);
Expand Down Expand Up @@ -123,6 +126,16 @@ export const WalletProvider = ({ children }: { children: ReactNode }) => {
const isLoading = isSessionLoading || walletLoading;
const hasWalletFromSession = !!session?.user?.wallet?.address;

const [isWalletOpen, setIsWalletOpen] = useState(false);

const onOpenWallet = useCallback(() => {
setIsWalletOpen(true);
}, []);

const onCloseWallet = useCallback(() => {
setIsWalletOpen(false);
}, []);

return (
<WalletContext.Provider
value={{
Expand All @@ -139,6 +152,9 @@ export const WalletProvider = ({ children }: { children: ReactNode }) => {
syncWallet,
getSupportedTrustlineAssets,
addTrustline,
isWalletOpen,
onOpenWallet,
onCloseWallet,
}}
>
{children}
Expand Down
9 changes: 5 additions & 4 deletions components/wallet/LandingWalletWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import { useState } from 'react';
import { FamilyWalletButton } from './FamilyWalletButton';
import { FamilyWalletDrawer, DrawerView } from './FamilyWalletDrawer';
import { useAuthStatus } from '@/hooks/use-auth';
import { useWalletContext } from '@/components/providers/wallet-provider';

export function LandingWalletWrapper() {
const [open, setOpen] = useState(false);
const [drawerView, setDrawerView] = useState<DrawerView>('main');
const { isAuthenticated, isLoading } = useAuthStatus();
const { isWalletOpen, onOpenWallet, onCloseWallet } = useWalletContext();

if (isLoading || !isAuthenticated) {
return null;
Expand All @@ -19,13 +20,13 @@ export function LandingWalletWrapper() {
<FamilyWalletButton
onOpenDrawer={view => {
if (view) setDrawerView(view);
setOpen(true);
onOpenWallet();
}}
/>
<FamilyWalletDrawer
open={open}
open={isWalletOpen}
initialView={drawerView}
onOpenChange={setOpen}
onOpenChange={onCloseWallet}
/>
Comment on lines 26 to 30
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Verify the FamilyWalletDrawer onOpenChange prop type
ast-grep --pattern $'interface FamilyWalletDrawerProps {
  $$$
  onOpenChange: $_
  $$$
}'

Repository: boundlessfi/boundless

Length of output: 408


🏁 Script executed:

#!/bin/bash
# Find and examine the wallet-provider.tsx file to check onCloseWallet definition
fd -t f "wallet-provider" --type f

Repository: boundlessfi/boundless

Length of output: 105


🏁 Script executed:

#!/bin/bash
# Search for onCloseWallet definition in context
rg "onCloseWallet" -A 3 -B 3 --type ts --type tsx

Repository: boundlessfi/boundless

Length of output: 92


🏁 Script executed:

#!/bin/bash
# Read the wallet-provider.tsx file
wc -l components/providers/wallet-provider.tsx

Repository: boundlessfi/boundless

Length of output: 109


🏁 Script executed:

#!/bin/bash
# Search for onCloseWallet with correct syntax
rg "onCloseWallet" -A 3 -B 3 components/providers/wallet-provider.tsx

Repository: boundlessfi/boundless

Length of output: 531


🏁 Script executed:

#!/bin/bash
# Examine FamilyWalletDrawer implementation to see how onOpenChange is used
cat -n components/wallet/FamilyWalletDrawer.tsx | head -100

Repository: boundlessfi/boundless

Length of output: 3810


🏁 Script executed:

#!/bin/bash
# Search for calls to onOpenChange in FamilyWalletDrawer
rg "onOpenChange" components/wallet/FamilyWalletDrawer.tsx -A 2 -B 2

Repository: boundlessfi/boundless

Length of output: 687


Type mismatch: onCloseWallet signature doesn't match FamilyWalletDrawer.onOpenChange.

The FamilyWalletDrawer component calls onOpenChange(isOpen) with a boolean argument, but onCloseWallet from the wallet context is typed as () => void and doesn't accept parameters. This causes a TypeScript type error when passing onCloseWallet to the onOpenChange prop.

Update onCloseWallet in wallet-provider.tsx to accept the boolean parameter:

-  const onCloseWallet = useCallback(() => {
-    setIsWalletOpen(false);
+  const onCloseWallet = useCallback((open?: boolean) => {
+    setIsWalletOpen(open ?? false);
   }, []);

And update the type in WalletContextType:

-  onCloseWallet: () => void;
+  onCloseWallet: (open?: boolean) => void;
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@components/wallet/LandingWalletWrapper.tsx` around lines 26 - 30, The
onCloseWallet handler signature conflicts with FamilyWalletDrawer.onOpenChange
because onOpenChange passes a boolean (isOpen); update the onCloseWallet
function in wallet-provider.tsx to accept a boolean parameter (e.g.,
onCloseWallet(isOpen: boolean)) and update the WalletContextType to reflect the
new signature; adjust the implementation to ignore the arg if unnecessary (call
existing close logic) and update any other callers to accept/forward the boolean
so the prop passed to FamilyWalletDrawer matches onOpenChange.

</>
);
Expand Down
Loading
Loading