fix: resolve build errors from merge conflicts in App.tsx, CampaignDetailPanel, and contract

Author: Escelit

contracts/src/lib.rs

@@ -8,6 +8,7 @@ use soroban_sdk::{
 };
 
 const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
+pub const MIN_CONTRIBUTION: i128 = 100;
 
 #[contracttype]
 #[derive(Clone, Debug, Eq, PartialEq)]
@@ -180,7 +181,8 @@ impl StellarGoalVaultContract {
         // Update campaign pledged amount (valuation)
         campaign.pledged_amount += amount;
 
-
+        let balance_key = DataKey::CampaignTokenBalance(campaign_id, token.clone());
+        let current_balance: i128 = env.storage().persistent().get(&balance_key).unwrap_or(0);
         env.storage()
             .persistent()
             .set(&balance_key, &(current_balance + amount));

frontend/src/App.tsx

@@ -1,5 +1,5 @@
-
 import { useState, useEffect, useMemo } from "react";
+import { Moon, Sun } from "lucide-react";
 import { CampaignDetailPanel } from "./components/CampaignDetailPanel";
 import { FundedConfetti } from "./components/FundedConfetti";
 import { KeyboardShortcutsOverlay } from "./components/KeyboardShortcutsOverlay";
@@ -148,6 +148,9 @@ function App() {
     null,
   );
   const [invalidUrlCampaignId, setInvalidUrlCampaignId] = useState<string | null>(null);
+  const [transactionPreview, setTransactionPreview] =
+    useState<TransactionPreviewState | null>(null);
+  const [confettiBurst, setConfettiBurst] = useState<ConfettiBurst | null>(null);
 
   const handleTransactionPreview = (data: TransactionPreviewData): Promise<boolean> => {
     return new Promise((resolve) => {
@@ -297,6 +300,18 @@ function App() {
     });
   }, [addToast, selectedCampaignId]);
 
+  useEffect(() => {
+    if (!connectedWallet) return;
+    const stop = watchFreighterAccount((address) => {
+      if (address && address !== connectedWallet) {
+        addToast(`Switched to ${address.slice(0, 16)}...`, "success");
+      } else if (!address) {
+        addToast("Wallet disconnected.", "success");
+      }
+    });
+    return stop;
+  }, [connectedWallet, addToast]);
+
   const selectedCampaign = useMemo(() => {
     const summaryCampaign =
       campaigns.find((campaign) => campaign.id === selectedCampaignId) ?? null;
@@ -357,7 +372,12 @@ function App() {
     }
   }
 
+  function handleDisconnectWallet() {
+    freighter.disconnect();
+    addToast("Wallet disconnected.", "success");
+  }
 
+  async function handlePledge(campaignId: string, amount: number, assetCode: string) {
     if (!connectedWallet) {
       addToast("Connect Freighter before submitting a pledge.", "error");
       return;
@@ -368,13 +388,17 @@ function App() {
       return;
     }
 
+    const previousCampaign = campaigns.find((c) => c.id === campaignId) ?? null;
+    setPendingPledgeCampaignId(campaignId);
 
     try {
       const transactionResult = await submitFreighterPledge({
         campaignId,
         contributor: connectedWallet,
         amount,
-
+        assetCode,
+        config: appConfig,
+        onPreview: handleTransactionPreview,
       });
 
       await reconcilePledge(campaignId, {
@@ -428,7 +452,7 @@ function App() {
       const transactionResult = await submitFreighterClaim({
         campaignId: campaign.id,
         creator: connectedWallet,
-        config: appConfig as AppConfig,
+        config: appConfig,
         onPreview: handleTransactionPreview,
       });
 
@@ -449,13 +473,39 @@ function App() {
       addToast(getErrorMessage(error), "error");
     }
   }
+
   async function handleSoftDelete(campaignId: string) {
     if (!confirm(`Soft delete campaign #${campaignId}? Data preserved, hidden from lists.`)) {
       return;
     }
 
     setActionError(null);
     setActionMessage("Soft deleting...");
+
+    try {
+      await softDeleteCampaign(campaignId);
+      await refreshCampaigns();
+      setActionMessage("Campaign soft deleted.");
+    } catch (error) {
+      setActionError(toApiError(error));
+      setActionMessage(null);
+    }
+  }
+
+  async function handleRefund(campaignId: string, contributor: string) {
+    setActionError(null);
+    setActionMessage("Preparing Soroban refund transaction...");
+
+    try {
+      const sorobanReceipt = await submitRefundTransaction(campaignId, contributor);
+      await refundCampaign(campaignId, contributor, sorobanReceipt);
+      await refreshCampaigns(campaignId);
+      await refreshSelectedData(campaignId);
+      setActionMessage("Contributor refunded successfully.");
+    } catch (error) {
+      setActionError(toApiError(error));
+      setActionMessage(null);
+    }
   }
 
   function handleSelect(campaignId: string) {
@@ -468,7 +518,34 @@ function App() {
   }
 
   return (
-
+    <div className="app-shell">
+      <header className="hero">
+        <div className="hero-topline">
+          <p className="eyebrow">Soroban crowdfunding MVP</p>
+          <div style={{ display: "flex", alignItems: "center", gap: "0.5rem" }}>
+            <WalletWidget
+              status={freighter.status}
+              publicKey={freighter.publicKey}
+              error={freighter.error}
+              onConnect={handleConnectWallet}
+            />
+            <button
+              type="button"
+              className="btn-ghost theme-toggle"
+              onClick={handleThemeToggle}
+              aria-label={`Switch to ${themeMode === "dark" ? "light" : "dark"} mode`}
+              title={`Switch to ${themeMode === "dark" ? "light" : "dark"} mode`}
+            >
+              {themeMode === "dark" ? <Sun size={18} /> : <Moon size={18} />}
+            </button>
+          </div>
+        </div>
+        <h1>Stellar Goal Vault</h1>
+        <p className="hero-copy">
+          Create funding goals, collect pledges, and reconcile claim and refund flows
+          against the backend contract integration.
+        </p>
+      </header>
 
       <section className="metric-grid animate-fade-in">
         <article className="metric-card">
@@ -548,6 +625,32 @@ function App() {
 
       <ToastContainer toasts={toasts} onDismiss={dismiss} />
 
+      {transactionPreview && (
+        <TransactionPreviewModal
+          preview={transactionPreview.data}
+          onConfirm={() => {
+            transactionPreview.resolve(true);
+            setTransactionPreview(null);
+          }}
+          onCancel={() => {
+            transactionPreview.resolve(false);
+            setTransactionPreview(null);
+          }}
+        />
+      )}
+
+      {confettiBurst && (
+        <FundedConfetti
+          key={confettiBurst.id}
+          campaignTitle={confettiBurst.campaignTitle}
+          onComplete={() => setConfettiBurst(null)}
+        />
+      )}
+
+      {isShortcutsOpen && (
+        <KeyboardShortcutsOverlay isOpen={isShortcutsOpen} onClose={() => setIsShortcutsOpen(false)} />
+      )}
+
       {import.meta.env.DEV && (
         <footer style={{ padding: "1rem", textAlign: "center", borderTop: "1px solid var(--border-color)", marginTop: "2rem" }}>
           <p style={{ margin: 0, fontSize: "0.875rem", color: "var(--text-secondary)" }}>

frontend/src/components/CampaignDetailPanel.tsx

@@ -15,7 +15,8 @@ interface CampaignDetailPanelProps {
   isLoading?: boolean;
   isPledgePending?: boolean;
   onConnectWallet?: () => Promise<void>;
-
+  onDisconnectWallet?: () => void;
+  onPledge?: (campaignId: string, amount: number, assetCode: string) => Promise<void>;
   onClaim?: (campaign: Campaign) => Promise<void>;
   onSoftDelete?: (campaignId: string) => Promise<void>;
   onRefund?: (campaignId: string, contributor: string) => Promise<void>;
@@ -197,7 +198,33 @@ export function CampaignDetailPanel({
         </div>
         <div className="wallet-connected">
           {connectedWallet ? (
-
+            <>
+              <div style={{ display: "flex", alignItems: "center", gap: 8 }}>
+                <strong className="mono">{connectedWallet.slice(0, 16)}...</strong>
+                <CopyButton
+                  value={connectedWallet}
+                  ariaLabel="Copy connected wallet address"
+                />
+              </div>
+              <button
+                className="btn-ghost"
+                type="button"
+                onClick={onDisconnectWallet}
+                disabled={isSubmitting}
+              >
+                Disconnect
+              </button>
+            </>
+          ) : (
+            <button
+              className="btn-ghost"
+              type="button"
+              onClick={() => { void onConnectWallet(); }}
+              disabled={isSubmitting || isConnectingWallet}
+            >
+              {isConnectingWallet ? "Connecting..." : "Connect Freighter"}
+            </button>
+          )}
         </div>
       </div>
 

frontend/src/hooks/useFreighter.ts

@@ -8,6 +8,7 @@ export interface UseFreighterResult {
   status: FreighterStatus;
   publicKey: string | null;
   connect: (networkPassphrase: string) => Promise<string | null>;
+  disconnect: () => void;
   error: string | null;
 }
 
@@ -40,5 +41,10 @@ export function useFreighter(): UseFreighterResult {
     }
   }, []);
 
-  return { status, publicKey, connect, error };
+  const disconnect = useCallback(() => {
+    setPublicKey(null);
+    setStatus("available");
+  }, []);
+
+  return { status, publicKey, connect, disconnect, error };
 }