From 9330c1e0b36b4ee807fc911bd948d69bb53caf17 Mon Sep 17 00:00:00 2001
From: Collins Ikechukwu <collinschristroa@gmail.com>
Date: Mon, 24 Mar 2025 12:26:52 +0100
Subject: [PATCH 01/11] feat(project): implement funding and milestone
 management features

- Add funding and milestone functionalities to the BoundlessContract.
- Introduce helper functions to check if funding and voting periods have ended.
- Implement methods for approving, rejecting, and releasing milestones.
- Enhance project struct with new fields for milestone approvals and releases.
- Update error handling for various project states including funding and milestone operations.
- Add tests for funding operations, milestone approvals, and refunds to ensure functionality and correctness.
---
 contracts/boundless_contract/src/contract.rs  | 277 +++++++++++++++++-
 contracts/boundless_contract/src/error.rs     |  12 +
 contracts/boundless_contract/src/storage.rs   |  17 ++
 .../src/tests/create_project_test.rs          |  12 +-
 .../src/tests/init_upgrade_test.rs            |  40 ++-
 .../src/tests/milestone_funding_test.rs       | 203 +++++++++++++
 contracts/boundless_contract/src/tests/mod.rs |   1 +
 .../src/tests/vote_project_test.rs            |   1 +
 8 files changed, 553 insertions(+), 10 deletions(-)
 create mode 100644 contracts/boundless_contract/src/tests/milestone_funding_test.rs

diff --git a/contracts/boundless_contract/src/contract.rs b/contracts/boundless_contract/src/contract.rs
index dc39b581..c1d1e752 100644
--- a/contracts/boundless_contract/src/contract.rs
+++ b/contracts/boundless_contract/src/contract.rs
@@ -1,9 +1,10 @@
-use soroban_sdk::{contract, contractimpl, symbol_short, Address, BytesN, Env, String, Vec};
+use soroban_sdk::{contract, contractimpl, symbol_short, Address, BytesN, Env, String, Vec, token};
 
 use crate::{
     error::ProjectError,
     storage::{
-        get_admin, get_version, is_initialized, project_exists, read_project, set_admin, set_initialized, set_version, update_project, write_project, ContractDataKey, Project
+        get_admin, get_version, is_initialized, project_exists, read_project, set_admin, set_initialized, set_version, update_project, write_project, ContractDataKey, Project,
+        FUNDING_PERIOD_LEDGERS, VOTING_PERIOD_LEDGERS,
     },
 };
 
@@ -52,6 +53,16 @@ impl BoundlessContract {
             .unwrap_or(1)
     }
 
+    // Helper function to check if funding period has ended
+    fn is_funding_period_ended(env: &Env, project: &Project) -> bool {
+        env.ledger().timestamp() > project.funding_deadline
+    }
+
+    // Helper function to check if voting period has ended
+    fn is_voting_period_ended(env: &Env, project: &Project) -> bool {
+        env.ledger().timestamp() > project.voting_deadline
+    }
+
     pub fn create_project(
         env: Env,
         project_id: String,
@@ -67,6 +78,10 @@ impl BoundlessContract {
             return Err(ProjectError::AlreadyExists);
         }
 
+        let current_timestamp = env.ledger().timestamp();
+        let funding_deadline = current_timestamp + FUNDING_PERIOD_LEDGERS as u64;
+        let voting_deadline = funding_deadline + VOTING_PERIOD_LEDGERS as u64;
+
         let project = Project {
             project_id: project_id.clone(),
             creator: creator.clone(),
@@ -80,7 +95,12 @@ impl BoundlessContract {
             validated: false,
             is_successful: false,
             is_closed: false,
-            created_at: env.ledger().timestamp(),
+            created_at: current_timestamp,
+            funding_deadline,
+            voting_deadline,
+            milestone_approvals: Vec::new(&env),
+            milestone_releases: Vec::new(&env),
+            refund_processed: false,
         };
 
         write_project(&env, project)?;
@@ -99,6 +119,7 @@ impl BoundlessContract {
         creator: Address,
         new_metadata_uri: String,
     ) -> Result<(), ProjectError> {
+        creator.require_auth();
         let mut project = read_project(&env, &project_id)?;
 
         if project.creator != creator {
@@ -126,6 +147,7 @@ impl BoundlessContract {
         creator: Address,
         new_milestone_count: u32,
     ) -> Result<(), ProjectError> {
+        creator.require_auth();
         let mut project = read_project(&env, &project_id)?;
 
         if project.creator != creator {
@@ -154,6 +176,7 @@ impl BoundlessContract {
         caller: Address,
         new_milestone_count: u32,
     ) -> Result<(), ProjectError> {
+        caller.require_auth();
         let mut project = read_project(&env, &project_id)?;
 
         if project.creator != caller {
@@ -181,6 +204,7 @@ impl BoundlessContract {
         project_id: String,
         creator: Address,
     ) -> Result<(), ProjectError> {
+        creator.require_auth();
         let mut project = read_project(&env, &project_id)?;
 
         if project.creator != creator {
@@ -208,6 +232,7 @@ impl BoundlessContract {
         voter: Address,
         vote_value: i32,
     ) -> Result<(), ProjectError> {
+        voter.require_auth();
         let mut project = read_project(&env, &project_id)?;
 
         if vote_value != 1 && vote_value != -1 {
@@ -230,6 +255,7 @@ impl BoundlessContract {
     }
 
     pub fn withdraw_vote(env: Env, project_id: String, voter: Address) -> Result<(), ProjectError> {
+        voter.require_auth();
         let mut project = read_project(&env, &project_id)?;
 
         let index = project.votes.iter().position(|(addr, _)| addr == voter);
@@ -265,4 +291,249 @@ impl BoundlessContract {
 
         Err(ProjectError::NotVoted)
     }
+
+    pub fn release_milestone(
+        env: Env,
+        project_id: String,
+        milestone_number: u32,
+        admin: Address,
+    ) -> Result<(), ProjectError> {
+        // Verify admin authorization
+        admin.require_auth();
+        if admin != get_admin(&env) {
+            return Err(ProjectError::Unauthorized);
+        }
+
+        let mut project = read_project(&env, &project_id)?;
+
+        // Validate milestone number
+        if milestone_number >= project.milestone_count {
+            return Err(ProjectError::InvalidMilestoneNumber);
+        }
+
+        // Check if milestone is already completed
+        if project.milestone_releases.iter().any(|release| release.0 == milestone_number) {
+            return Err(ProjectError::MilestoneAlreadyCompleted);
+        }
+
+        // Check if milestone is approved
+        if !project.milestone_approvals.iter().any(|approval| approval.0 == milestone_number && approval.1) {
+            return Err(ProjectError::MilestoneNotApproved);
+        }
+
+        // Calculate milestone release amount
+        let milestone_amount = project.funding_target / project.milestone_count as u64;
+
+        // Update project state
+        project.milestone_releases.push_back((milestone_number, milestone_amount));
+        project.current_milestone = milestone_number + 1;
+
+        // If all milestones are completed, mark project as successful
+        if project.current_milestone == project.milestone_count {
+            project.is_successful = true;
+        }
+
+        update_project(&env, &project)?;
+
+        // Emit milestone release event
+        env.events().publish(
+            (symbol_short!("milestone"), symbol_short!("released")),
+            (project_id, milestone_number, milestone_amount),
+        );
+
+        Ok(())
+    }
+
+    pub fn approve_milestone(
+        env: Env,
+        project_id: String,
+        milestone_number: u32,
+        admin: Address,
+    ) -> Result<(), ProjectError> {
+        // Verify admin authorization
+        admin.require_auth();
+        if admin != get_admin(&env) {
+            return Err(ProjectError::Unauthorized);
+        }
+
+        let mut project = read_project(&env, &project_id)?;
+
+        // Validate milestone number
+        if milestone_number >= project.milestone_count {
+            return Err(ProjectError::InvalidMilestoneNumber);
+        }
+
+        // Check if milestone is already approved
+        if project.milestone_approvals.iter().any(|approval| approval.0 == milestone_number) {
+            return Err(ProjectError::MilestoneAlreadyCompleted);
+        }
+
+        // Add milestone approval
+        project.milestone_approvals.push_back((milestone_number, true));
+        update_project(&env, &project)?;
+
+        // Emit milestone approval event
+        env.events().publish(
+            (symbol_short!("milestone"), symbol_short!("approved")),
+            (project_id, milestone_number),
+        );
+
+        Ok(())
+    }
+
+    pub fn reject_milestone(
+        env: Env,
+        project_id: String,
+        milestone_number: u32,
+        admin: Address,
+    ) -> Result<(), ProjectError> {
+        // Verify admin authorization
+        admin.require_auth();
+        if admin != get_admin(&env) {
+            return Err(ProjectError::Unauthorized);
+        }
+
+        let mut project = read_project(&env, &project_id)?;
+
+        // Validate milestone number
+        if milestone_number >= project.milestone_count {
+            return Err(ProjectError::InvalidMilestoneNumber);
+        }
+
+        // Check if milestone is already approved or rejected
+        if project.milestone_approvals.iter().any(|approval| approval.0 == milestone_number) {
+            return Err(ProjectError::MilestoneAlreadyCompleted);
+        }
+
+        // Add milestone rejection
+        project.milestone_approvals.push_back((milestone_number, false));
+        update_project(&env, &project)?;
+
+        // Emit milestone rejection event
+        env.events().publish(
+            (symbol_short!("milestone"), symbol_short!("rejected")),
+            (project_id, milestone_number),
+        );
+
+        Ok(())
+    }
+
+    pub fn fund_project(
+        env: Env,
+        project_id: String,
+        amount: i128,
+        funder: Address,
+        token_contract: Address,
+    ) -> Result<(), ProjectError> {
+        funder.require_auth();
+
+        if amount <= 0 {
+            return Err(ProjectError::InvalidAmount);
+        }
+
+        let mut project = read_project(&env, &project_id)?;
+
+        if project.is_closed {
+            return Err(ProjectError::ProjectClosed);
+        }
+
+        if env.ledger().timestamp() > project.funding_deadline {
+            return Err(ProjectError::FundingDeadlinePassed);
+        }
+
+        if project.total_funded >= project.funding_target {
+            return Err(ProjectError::FundingTargetReached);
+        }
+
+        let remaining = project.funding_target - project.total_funded;
+        let contribution = if amount > remaining as i128 {
+            remaining as i128
+        } else {
+            amount
+        };
+
+        // let token_client = token::StellarAssetClient::new(&env, &token_contract);
+        
+        // For funding, we need to clawback from the funder and mint to the contract
+        token::Client::new(&env, &token_contract).transfer(&funder, &env.current_contract_address(), &contribution);
+        // token_client.clawback(&funder, &contribution);
+        // token_client.mint(&env.current_contract_address(), &contribution);
+
+        project.total_funded += contribution as u64;
+        project.backers.push_back((funder.clone(), contribution as u64));
+        update_project(&env, &project)?;
+
+        env.events().publish(
+            (symbol_short!("project"), symbol_short!("funded")),
+            (project_id, funder, contribution),
+        );
+
+        Ok(())
+    }
+
+    pub fn refund(env: Env, project_id: String, token_contract: Address) -> Result<(), ProjectError> {
+        let mut project = read_project(&env, &project_id)?;
+
+        // Check if project has failed (funding target not met by deadline)
+        if project.total_funded >= project.funding_target || env.ledger().timestamp() < project.funding_deadline {
+            return Err(ProjectError::ProjectNotFailed);
+        }
+
+        // Check if refund has already been processed
+        if project.refund_processed {
+            return Err(ProjectError::RefundAlreadyProcessed);
+        }
+
+        // Check if there are funds to refund
+        if project.total_funded == 0 {
+            return Err(ProjectError::NoFundsToRefund);
+        }
+
+        let token_client = token::Client::new(&env, &token_contract);
+
+        // Process refunds for all backers
+        for (backer, amount) in project.backers.iter() {
+            // For refunds, we need to transfer from the contract back to the backer
+            token_client.transfer(&env.current_contract_address(), &backer, &(amount as i128));
+        }
+
+        // Mark refund as processed
+        project.refund_processed = true;
+        project.is_closed = true;
+        update_project(&env, &project)?;
+
+        // Emit refund event
+        env.events().publish(
+            (symbol_short!("project"), symbol_short!("refunded")),
+            (project_id, project.total_funded),
+        );
+
+        Ok(())
+    }
+
+    pub fn get_project_funding(env: Env, project_id: String) -> Result<(u64, u64), ProjectError> {
+        let project = read_project(&env, &project_id)?;
+        Ok((project.total_funded, project.funding_target))
+    }
+
+    pub fn get_backer_contribution(
+        env: Env,
+        project_id: String,
+        backer: Address,
+    ) -> Result<u64, ProjectError> {
+        let project = read_project(&env, &project_id)?;
+        
+        for (addr, amount) in project.backers.iter() {
+            if addr == backer {
+                return Ok(amount);
+            }
+        }
+
+        Ok(0)
+    }
+
+    // pub fn get_project_backers(env: Env, project_id: String) -> Result<Vec<(Address, u64)>, ProjectError> {
+    //     let project = read_project(&env, &project_id)?;
+    //     Ok(project.backers.to_vec())
+    // }
 }
diff --git a/contracts/boundless_contract/src/error.rs b/contracts/boundless_contract/src/error.rs
index 38ab6fb5..b7f162ca 100644
--- a/contracts/boundless_contract/src/error.rs
+++ b/contracts/boundless_contract/src/error.rs
@@ -17,4 +17,16 @@ pub enum ProjectError {
     AlreadyInitialized = 100,
     NotInitialized = 101,
     UpgradeFailed = 400,
+    InvalidMilestoneNumber = 11,
+    MilestoneAlreadyCompleted = 12,
+    MilestoneNotApproved = 13,
+    NoFundsToRefund = 14,
+    ProjectNotFailed = 15,
+    RefundAlreadyProcessed = 16,
+    InvalidAmount = 17,
+    ProjectAlreadyFunded = 18,
+    FundingTargetReached = 19,
+    FundingDeadlinePassed = 20,
+    InsufficientFunds = 21,
+    InvalidFunder = 22,
 }
diff --git a/contracts/boundless_contract/src/storage.rs b/contracts/boundless_contract/src/storage.rs
index b59c0212..252e0664 100644
--- a/contracts/boundless_contract/src/storage.rs
+++ b/contracts/boundless_contract/src/storage.rs
@@ -9,6 +9,18 @@ pub(crate) const PROJECTS_BUMP_AMOUNT: u32 = 30 * DAY_IN_LEDGERS;
 #[allow(dead_code)]
 pub(crate) const PROJECTS_LIFETIME_THRESHOLD: u32 = PROJECTS_BUMP_AMOUNT - DAY_IN_LEDGERS;
 
+// Fixed periods in days
+#[allow(dead_code)]
+pub(crate) const FUNDING_PERIOD_DAYS: u32 = 30;
+#[allow(dead_code)]
+pub(crate) const VOTING_PERIOD_DAYS: u32 = 30;
+
+// Convert days to ledgers
+#[allow(dead_code)]
+pub(crate) const FUNDING_PERIOD_LEDGERS: u32 = FUNDING_PERIOD_DAYS * DAY_IN_LEDGERS;
+#[allow(dead_code)]
+pub(crate) const VOTING_PERIOD_LEDGERS: u32 = VOTING_PERIOD_DAYS * DAY_IN_LEDGERS;
+
 // Contract version and initialization storage
 #[contracttype]
 pub enum ContractDataKey {
@@ -42,6 +54,11 @@ pub struct Project {
     pub is_successful: bool,
     pub is_closed: bool,
     pub created_at: u64,
+    pub milestone_approvals: Vec<(u32, bool)>,
+    pub milestone_releases: Vec<(u32, u64)>,
+    pub refund_processed: bool,
+    pub funding_deadline: u64,
+    pub voting_deadline: u64,
 }
 
 // Enum for Project Storage Keys
diff --git a/contracts/boundless_contract/src/tests/create_project_test.rs b/contracts/boundless_contract/src/tests/create_project_test.rs
index 358a56fc..f15ce857 100644
--- a/contracts/boundless_contract/src/tests/create_project_test.rs
+++ b/contracts/boundless_contract/src/tests/create_project_test.rs
@@ -23,6 +23,7 @@ fn test_create_project_success() {
         &metadata_uri,
         &funding_target,
         &milestone_count,
+
     );
 
     let project = client.get_project(&project_id);
@@ -69,12 +70,13 @@ fn test_update_project_metadata_success() {
     let env = Env::default();
     let contract_id = env.register(BoundlessContract, ());
     let client = BoundlessContractClient::new(&env, &contract_id);
-
+    
     let creator = Address::generate(&env);
     let project_id = String::from_str(&env, "test_project");
     let metadata_uri = String::from_str(&env, "ipfs://example-metadata");
     let new_metadata_uri = String::from_str(&env, "ipfs://new-metadata");
-
+    
+    env.mock_all_auths();
     client.create_project(&project_id, &creator, &metadata_uri, &1000, &5);
     client.update_project_metadata(&project_id, &creator, &new_metadata_uri);
 
@@ -94,6 +96,7 @@ fn test_update_project_metadata_wrong_creator_fails() {
     let other_user = Address::generate(&env);
     let project_id = String::from_str(&env, "test_project");
     let metadata_uri = String::from_str(&env, "ipfs://example-metadata");
+    env.mock_all_auths();
 
     client.create_project(&project_id, &creator, &metadata_uri, &1000, &5);
     client.update_project_metadata(
@@ -112,7 +115,7 @@ fn test_modify_milestone_success() {
     let creator = Address::generate(&env);
     let project_id = String::from_str(&env, "test_project");
     let metadata_uri = String::from_str(&env, "ipfs://example-metadata");
-
+    env.mock_all_auths();
     client.create_project(&project_id, &creator, &metadata_uri, &1000, &4);
 
     client.modify_milestone(&project_id, &creator, &10);
@@ -133,7 +136,7 @@ fn test_modify_milestone_wrong_caller_fails() {
     let other_user = Address::generate(&env);
     let project_id = String::from_str(&env, "test_project");
     let metadata_uri = String::from_str(&env, "ipfs://example-metadata");
-
+    env.mock_all_auths();
     client.create_project(&project_id, &creator, &metadata_uri, &1000, &5);
     client.modify_milestone(&project_id, &other_user, &10);
 }
@@ -149,6 +152,7 @@ fn test_close_project_wrong_caller_fails() {
     let other_user = Address::generate(&env);
     let project_id = String::from_str(&env, "test_project");
     let metadata_uri = String::from_str(&env, "ipfs://example-metadata");
+    env.mock_all_auths();
 
     client.create_project(&project_id, &creator, &metadata_uri, &1000, &5);
     client.close_project(&project_id, &other_user);
diff --git a/contracts/boundless_contract/src/tests/init_upgrade_test.rs b/contracts/boundless_contract/src/tests/init_upgrade_test.rs
index 741ff652..567a06a2 100644
--- a/contracts/boundless_contract/src/tests/init_upgrade_test.rs
+++ b/contracts/boundless_contract/src/tests/init_upgrade_test.rs
@@ -3,8 +3,9 @@
 use crate::{
     contract::{BoundlessContract, BoundlessContractClient},
     error::ProjectError,
+    storage::{FUNDING_PERIOD_LEDGERS, VOTING_PERIOD_LEDGERS},
 };
-use soroban_sdk::{testutils::Address as _, Address, Env};
+use soroban_sdk::{testutils::Address as _, Address, Env, String};
 
 #[test]
 fn test_initialization() {
@@ -27,7 +28,6 @@ fn test_initialization() {
 
 #[test]
 #[should_panic(expected = "Error(Contract, #100)")]
-
 fn test_cannot_reinitialize() {
     let env = Env::default();
     env.mock_all_auths();
@@ -42,10 +42,44 @@ fn test_cannot_reinitialize() {
     // Attempt second initialization
     let result = client.initialize(&admin);
     
-    
     // Verify the error is AlreadyInitialized
 }
 
+#[test]
+fn test_project_deadlines() {
+    let env = Env::default();
+    env.mock_all_auths();
+
+    let contract_id = env.register(BoundlessContract, ());
+    let client = BoundlessContractClient::new(&env, &contract_id);
+    
+    // Initialize contract
+    let admin = Address::generate(&env);
+    client.initialize(&admin);
+
+    // Create a project
+    let creator = Address::generate(&env);
+    let project_id = String::from_str(&env, "test_project");
+    let metadata_uri = String::from_str(&env, "ipfs://example-metadata");
+    
+    client.create_project(&project_id, &creator, &metadata_uri, &1000, &5);
+
+    // Get project details
+    let project = client.get_project(&project_id);
+    
+    // Verify funding deadline is set correctly (30 days from creation)
+    assert_eq!(
+        project.funding_deadline,
+        project.created_at + FUNDING_PERIOD_LEDGERS as u64
+    );
+    
+    // Verify voting deadline is set correctly (30 days after funding deadline)
+    assert_eq!(
+        project.voting_deadline,
+        project.funding_deadline + VOTING_PERIOD_LEDGERS as u64
+    );
+}
+
 // #[test]
 // fn test_unauthorized_upgrade() {
 //     let env = Env::default();
diff --git a/contracts/boundless_contract/src/tests/milestone_funding_test.rs b/contracts/boundless_contract/src/tests/milestone_funding_test.rs
new file mode 100644
index 00000000..06eebdfd
--- /dev/null
+++ b/contracts/boundless_contract/src/tests/milestone_funding_test.rs
@@ -0,0 +1,203 @@
+#![cfg(test)]
+
+use crate::{
+    contract::{BoundlessContract, BoundlessContractClient},
+    error::ProjectError,
+};
+use soroban_sdk::{testutils::{Address as _, Ledger}, token::{self, TokenClient}, Address, Env, String};
+use token::StellarAssetClient as TokenAdminClient;
+
+fn create_token_contract<'a>(e: &Env, admin: &Address) -> (TokenClient<'a>, TokenAdminClient<'a>) {
+    let sac = e.register_stellar_asset_contract_v2(admin.clone());
+    (
+        token::Client::new(e, &sac.address()),
+        token::StellarAssetClient::new(e, &sac.address()),
+    )
+}
+// #[test]
+// fn test_milestone_operations() {
+//     let env = Env::default();
+//     env.mock_all_auths();
+
+//     // Initialize contract
+//     let contract_id = env.register_contract(None, BoundlessContract);
+//     let client = BoundlessContractClient::new(&env, &contract_id);
+    
+//     // Setup addresses
+//     let admin = Address::generate(&env);
+//     let creator = Address::generate(&env);
+//     let project_id = String::from_str(&env, "test_project");
+//     let metadata_uri = String::from_str(&env, "ipfs://example-metadata");
+    
+//     // Initialize contract
+//     client.initialize(&admin);
+    
+//     // Create project
+//     client.create_project(&project_id, &creator, &metadata_uri, &1000, &2);
+
+//     // Test approve milestone
+//     client.approve_milestone(&project_id, &0, &admin);
+//     let project = client.get_project(&project_id);
+//     assert!(project.milestone_approvals.iter().any(|(num, approved)| *num == 0 && *approved));
+
+//     // Test reject milestone
+//     client.reject_milestone(&project_id, &1, &admin);
+//     let project = client.get_project(&project_id);
+//     assert!(project.milestone_approvals.iter().any(|(num, approved)| *num == 1 && !*approved));
+
+//     // Test release milestone
+//     client.release_milestone(&project_id, &0, &admin);
+//     let project = client.get_project(&project_id);
+//     assert!(project.milestone_releases.iter().any(|(num, _)| *num == 0));
+//     assert_eq!(project.current_milestone, 1);
+// }
+
+struct FundingTest<'a> {
+    env: Env,
+    admin: Address,
+    creator: Address,
+    funder: Address,
+    token_contract: Address,
+    token_client: TokenClient<'a>,
+    token_admin_client: TokenAdminClient<'a>,
+    contract_client: BoundlessContractClient<'a>,
+    project_id: String,
+    metadata_uri: String,
+}
+
+impl<'a> FundingTest<'a> {
+    fn setup() -> Self {
+        let env = Env::default();
+        env.mock_all_auths();
+
+        // Setup addresses
+        let admin = Address::generate(&env);
+        let creator = Address::generate(&env);
+        let funder = Address::generate(&env);
+        let project_id = String::from_str(&env, "test_project");
+        let metadata_uri = String::from_str(&env, "ipfs://example-metadata");
+        
+        // Initialize token contract and client
+        let (token_client, token_admin_client) = create_token_contract(&env, &admin);
+        let token_contract = token_client.address.clone();
+        
+        // Mint tokens to funder
+        token_admin_client.mint(&funder, &3000);
+        
+        // Initialize contract
+        let contract_id = env.register(BoundlessContract, ());
+        let contract_client = BoundlessContractClient::new(&env, &contract_id);
+        contract_client.initialize(&admin);
+        
+        // Create project
+        contract_client.create_project(&project_id, &creator, &metadata_uri, &1000, &2);
+
+        // Set up token permissions for the contract
+        token_admin_client.set_authorized(&contract_id, &true);
+
+        FundingTest {
+            env,
+            admin,
+            creator,
+            funder,
+            token_contract,
+            token_client,
+            token_admin_client,
+            contract_client,
+            project_id,
+            metadata_uri,
+        }
+    }
+}
+
+#[test]
+fn test_funding_operations() {
+    let test = FundingTest::setup();
+    
+    // Test initial funding
+    test.contract_client.fund_project(&test.project_id, &500, &test.funder, &test.token_contract);
+    
+    // Test get project funding
+    let (total_funded, target) = test.contract_client.get_project_funding(&test.project_id);
+    assert_eq!(total_funded, 500);
+    assert_eq!(target, 1000);
+
+    // Test get backer contribution
+    let contribution = test.contract_client.get_backer_contribution(&test.project_id, &test.funder);
+    assert_eq!(contribution, 500);
+
+    // // Test funding target reached
+    test.contract_client.fund_project(&test.project_id, &600, &test.funder, &test.token_contract);
+    let (total_funded, _) = test.contract_client.get_project_funding(&test.project_id);
+    assert_eq!(total_funded, 1000); // Should be capped at funding target
+
+}
+
+#[test]
+fn test_refund() {
+    let test = FundingTest::setup();
+    
+    // Fund project with some amount
+    test.contract_client.fund_project(&test.project_id, &500, &test.funder, &test.token_contract);
+    
+    // Fast forward past funding deadline
+    let before = test.env.ledger().timestamp();
+    let after = before + 31 * 17280; // 31 days in ledgers
+    test.env.ledger().set_timestamp(after);
+
+    // Test refund
+    test.contract_client.refund(&test.project_id, &test.token_contract);
+    
+    // Verify project state
+    let project = test.contract_client.get_project(&test.project_id);
+    assert!(project.refund_processed);
+    assert!(project.is_closed);
+    
+    // Verify funder received their tokens back
+    let funder_balance = test.token_client.balance(&test.funder);
+    assert_eq!(funder_balance, 3000); // Should have original balance back
+}
+
+#[test]
+#[should_panic(expected = "Error(Contract, #5)")]
+fn test_unauthorized_milestone_approval() {
+    let env = Env::default();
+    env.mock_all_auths();
+
+    let contract_id = env.register_contract(None, BoundlessContract);
+    let client = BoundlessContractClient::new(&env, &contract_id);
+    
+    let admin = Address::generate(&env);
+    let creator = Address::generate(&env);
+    let non_admin = Address::generate(&env);
+    let project_id = String::from_str(&env, "test_project");
+    let metadata_uri = String::from_str(&env, "ipfs://example-metadata");
+    
+    client.initialize(&admin);
+    client.create_project(&project_id, &creator, &metadata_uri, &1000, &2);
+
+    // Try to approve milestone with non-admin
+    client.approve_milestone(&project_id, &0, &non_admin);
+}
+
+#[test]
+#[should_panic(expected = "Error(Contract, #5)")]
+fn test_unauthorized_milestone_release() {
+    let env = Env::default();
+    env.mock_all_auths();
+
+    let contract_id = env.register_contract(None, BoundlessContract);
+    let client = BoundlessContractClient::new(&env, &contract_id);
+    
+    let admin = Address::generate(&env);
+    let creator = Address::generate(&env);
+    let non_admin = Address::generate(&env);
+    let project_id = String::from_str(&env, "test_project");
+    let metadata_uri = String::from_str(&env, "ipfs://example-metadata");
+    
+    client.initialize(&admin);
+    client.create_project(&project_id, &creator, &metadata_uri, &1000, &2);
+
+    // Try to release milestone with non-admin
+    client.release_milestone(&project_id, &0, &non_admin);
+} 
diff --git a/contracts/boundless_contract/src/tests/mod.rs b/contracts/boundless_contract/src/tests/mod.rs
index e21a7c91..182b7f3c 100644
--- a/contracts/boundless_contract/src/tests/mod.rs
+++ b/contracts/boundless_contract/src/tests/mod.rs
@@ -3,3 +3,4 @@ mod create_project_test;
 #[cfg(test)]
 mod vote_project_test;
 mod init_upgrade_test;
+mod milestone_funding_test;
diff --git a/contracts/boundless_contract/src/tests/vote_project_test.rs b/contracts/boundless_contract/src/tests/vote_project_test.rs
index 1bd68375..15591b34 100644
--- a/contracts/boundless_contract/src/tests/vote_project_test.rs
+++ b/contracts/boundless_contract/src/tests/vote_project_test.rs
@@ -16,6 +16,7 @@ fn test_voting() {
     let project_id = String::from_str(&env, "test_project");
     let metadata_uri = String::from_str(&env, "ipfs://example-metadata");
 
+    env.mock_all_auths();
     client.create_project(&project_id, &creator, &metadata_uri, &1000, &5);
 
     assert_eq!(client.has_voted(&project_id, &voter), false);

From 9f050310430a13e5c820c03f684ff94835cdd71f Mon Sep 17 00:00:00 2001
From: Collins Ikechukwu <collinschristroa@gmail.com>
Date: Mon, 24 Mar 2025 12:33:15 +0100
Subject: [PATCH 02/11] refactor: clean up comments and improve code
 readability in contract and test files

- Remove unnecessary comments in the BoundlessContract implementation to enhance clarity.
- Update test files to streamline initialization and project deadline checks.
- Adjust comments in milestone funding tests for better understanding of test cases.
---
 contracts/boundless_contract/src/contract.rs  | 25 -------------------
 .../src/tests/init_upgrade_test.rs            | 15 -----------
 .../src/tests/milestone_funding_test.rs       |  5 ++--
 3 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/contracts/boundless_contract/src/contract.rs b/contracts/boundless_contract/src/contract.rs
index c1d1e752..24120a3c 100644
--- a/contracts/boundless_contract/src/contract.rs
+++ b/contracts/boundless_contract/src/contract.rs
@@ -298,7 +298,6 @@ impl BoundlessContract {
         milestone_number: u32,
         admin: Address,
     ) -> Result<(), ProjectError> {
-        // Verify admin authorization
         admin.require_auth();
         if admin != get_admin(&env) {
             return Err(ProjectError::Unauthorized);
@@ -306,36 +305,29 @@ impl BoundlessContract {
 
         let mut project = read_project(&env, &project_id)?;
 
-        // Validate milestone number
         if milestone_number >= project.milestone_count {
             return Err(ProjectError::InvalidMilestoneNumber);
         }
 
-        // Check if milestone is already completed
         if project.milestone_releases.iter().any(|release| release.0 == milestone_number) {
             return Err(ProjectError::MilestoneAlreadyCompleted);
         }
 
-        // Check if milestone is approved
         if !project.milestone_approvals.iter().any(|approval| approval.0 == milestone_number && approval.1) {
             return Err(ProjectError::MilestoneNotApproved);
         }
 
-        // Calculate milestone release amount
         let milestone_amount = project.funding_target / project.milestone_count as u64;
 
-        // Update project state
         project.milestone_releases.push_back((milestone_number, milestone_amount));
         project.current_milestone = milestone_number + 1;
 
-        // If all milestones are completed, mark project as successful
         if project.current_milestone == project.milestone_count {
             project.is_successful = true;
         }
 
         update_project(&env, &project)?;
 
-        // Emit milestone release event
         env.events().publish(
             (symbol_short!("milestone"), symbol_short!("released")),
             (project_id, milestone_number, milestone_amount),
@@ -350,7 +342,6 @@ impl BoundlessContract {
         milestone_number: u32,
         admin: Address,
     ) -> Result<(), ProjectError> {
-        // Verify admin authorization
         admin.require_auth();
         if admin != get_admin(&env) {
             return Err(ProjectError::Unauthorized);
@@ -358,21 +349,17 @@ impl BoundlessContract {
 
         let mut project = read_project(&env, &project_id)?;
 
-        // Validate milestone number
         if milestone_number >= project.milestone_count {
             return Err(ProjectError::InvalidMilestoneNumber);
         }
 
-        // Check if milestone is already approved
         if project.milestone_approvals.iter().any(|approval| approval.0 == milestone_number) {
             return Err(ProjectError::MilestoneAlreadyCompleted);
         }
 
-        // Add milestone approval
         project.milestone_approvals.push_back((milestone_number, true));
         update_project(&env, &project)?;
 
-        // Emit milestone approval event
         env.events().publish(
             (symbol_short!("milestone"), symbol_short!("approved")),
             (project_id, milestone_number),
@@ -387,7 +374,6 @@ impl BoundlessContract {
         milestone_number: u32,
         admin: Address,
     ) -> Result<(), ProjectError> {
-        // Verify admin authorization
         admin.require_auth();
         if admin != get_admin(&env) {
             return Err(ProjectError::Unauthorized);
@@ -395,21 +381,17 @@ impl BoundlessContract {
 
         let mut project = read_project(&env, &project_id)?;
 
-        // Validate milestone number
         if milestone_number >= project.milestone_count {
             return Err(ProjectError::InvalidMilestoneNumber);
         }
 
-        // Check if milestone is already approved or rejected
         if project.milestone_approvals.iter().any(|approval| approval.0 == milestone_number) {
             return Err(ProjectError::MilestoneAlreadyCompleted);
         }
 
-        // Add milestone rejection
         project.milestone_approvals.push_back((milestone_number, false));
         update_project(&env, &project)?;
 
-        // Emit milestone rejection event
         env.events().publish(
             (symbol_short!("milestone"), symbol_short!("rejected")),
             (project_id, milestone_number),
@@ -454,7 +436,6 @@ impl BoundlessContract {
 
         // let token_client = token::StellarAssetClient::new(&env, &token_contract);
         
-        // For funding, we need to clawback from the funder and mint to the contract
         token::Client::new(&env, &token_contract).transfer(&funder, &env.current_contract_address(), &contribution);
         // token_client.clawback(&funder, &contribution);
         // token_client.mint(&env.current_contract_address(), &contribution);
@@ -474,35 +455,29 @@ impl BoundlessContract {
     pub fn refund(env: Env, project_id: String, token_contract: Address) -> Result<(), ProjectError> {
         let mut project = read_project(&env, &project_id)?;
 
-        // Check if project has failed (funding target not met by deadline)
         if project.total_funded >= project.funding_target || env.ledger().timestamp() < project.funding_deadline {
             return Err(ProjectError::ProjectNotFailed);
         }
 
-        // Check if refund has already been processed
         if project.refund_processed {
             return Err(ProjectError::RefundAlreadyProcessed);
         }
 
-        // Check if there are funds to refund
         if project.total_funded == 0 {
             return Err(ProjectError::NoFundsToRefund);
         }
 
         let token_client = token::Client::new(&env, &token_contract);
 
-        // Process refunds for all backers
         for (backer, amount) in project.backers.iter() {
             // For refunds, we need to transfer from the contract back to the backer
             token_client.transfer(&env.current_contract_address(), &backer, &(amount as i128));
         }
 
-        // Mark refund as processed
         project.refund_processed = true;
         project.is_closed = true;
         update_project(&env, &project)?;
 
-        // Emit refund event
         env.events().publish(
             (symbol_short!("project"), symbol_short!("refunded")),
             (project_id, project.total_funded),
diff --git a/contracts/boundless_contract/src/tests/init_upgrade_test.rs b/contracts/boundless_contract/src/tests/init_upgrade_test.rs
index 567a06a2..1ff59258 100644
--- a/contracts/boundless_contract/src/tests/init_upgrade_test.rs
+++ b/contracts/boundless_contract/src/tests/init_upgrade_test.rs
@@ -15,14 +15,11 @@ fn test_initialization() {
     let contract_id = env.register(BoundlessContract, ());
     let client = BoundlessContractClient::new(&env, &contract_id);
     
-    // Test initialization
     let admin = Address::generate(&env);
     client.initialize(&admin);
     
-    // Verify version is 1 after initialization
     assert_eq!(1, client.get_version());
     
-    // Verify admin is set correctly
     assert_eq!(admin, client.get_admin());
 }
 
@@ -35,14 +32,11 @@ fn test_cannot_reinitialize() {
     let contract_id = env.register(BoundlessContract, ());
     let client = BoundlessContractClient::new(&env, &contract_id);
     
-    // First initialization
     let admin = Address::generate(&env);
     client.initialize(&admin);
 
-    // Attempt second initialization
     let result = client.initialize(&admin);
     
-    // Verify the error is AlreadyInitialized
 }
 
 #[test]
@@ -53,27 +47,22 @@ fn test_project_deadlines() {
     let contract_id = env.register(BoundlessContract, ());
     let client = BoundlessContractClient::new(&env, &contract_id);
     
-    // Initialize contract
     let admin = Address::generate(&env);
     client.initialize(&admin);
 
-    // Create a project
     let creator = Address::generate(&env);
     let project_id = String::from_str(&env, "test_project");
     let metadata_uri = String::from_str(&env, "ipfs://example-metadata");
     
     client.create_project(&project_id, &creator, &metadata_uri, &1000, &5);
 
-    // Get project details
     let project = client.get_project(&project_id);
     
-    // Verify funding deadline is set correctly (30 days from creation)
     assert_eq!(
         project.funding_deadline,
         project.created_at + FUNDING_PERIOD_LEDGERS as u64
     );
     
-    // Verify voting deadline is set correctly (30 days after funding deadline)
     assert_eq!(
         project.voting_deadline,
         project.funding_deadline + VOTING_PERIOD_LEDGERS as u64
@@ -88,19 +77,15 @@ fn test_project_deadlines() {
 //     let contract_id = env.register_contract(None, BoundlessContract);
 //     let client = BoundlessContractClient::new(&env, &contract_id);
     
-//     // Initialize with admin
 //     let admin = Address::generate(&env);
 //     client.initialize(&admin);
 
-//     // Try to upgrade with non-admin address
 //     let non_admin = Address::generate(&env);
     
-//     // Switch to non-admin context
 //     env.as_contract(&non_admin, || {
 //         let result = client.upgrade(&[0u8; 32]); // Dummy WASM hash
 //         assert!(result.is_err());
         
-//         // Verify the error is Unauthorized
 //         let err: ProjectError = result.err().unwrap().try_into().unwrap();
 //         assert_eq!(err, ProjectError::Unauthorized);
 //     });
diff --git a/contracts/boundless_contract/src/tests/milestone_funding_test.rs b/contracts/boundless_contract/src/tests/milestone_funding_test.rs
index 06eebdfd..3d354d31 100644
--- a/contracts/boundless_contract/src/tests/milestone_funding_test.rs
+++ b/contracts/boundless_contract/src/tests/milestone_funding_test.rs
@@ -114,7 +114,6 @@ impl<'a> FundingTest<'a> {
 fn test_funding_operations() {
     let test = FundingTest::setup();
     
-    // Test initial funding
     test.contract_client.fund_project(&test.project_id, &500, &test.funder, &test.token_contract);
     
     // Test get project funding
@@ -164,7 +163,7 @@ fn test_unauthorized_milestone_approval() {
     let env = Env::default();
     env.mock_all_auths();
 
-    let contract_id = env.register_contract(None, BoundlessContract);
+    let contract_id = env.register(BoundlessContract, ());
     let client = BoundlessContractClient::new(&env, &contract_id);
     
     let admin = Address::generate(&env);
@@ -186,7 +185,7 @@ fn test_unauthorized_milestone_release() {
     let env = Env::default();
     env.mock_all_auths();
 
-    let contract_id = env.register_contract(None, BoundlessContract);
+    let contract_id = env.register(BoundlessContract, ());
     let client = BoundlessContractClient::new(&env, &contract_id);
     
     let admin = Address::generate(&env);

From a85fd4322de0bed97b94adb15223b5bd2b27cbf0 Mon Sep 17 00:00:00 2001
From: Collins Ikechukwu <collinschristroa@gmail.com>
Date: Wed, 26 Mar 2025 07:58:56 +0100
Subject: [PATCH 03/11] docs: add contract function documentation file

---
 docs/contract_fn.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docs/contract_fn.md

diff --git a/docs/contract_fn.md b/docs/contract_fn.md
new file mode 100644
index 00000000..e69de29b

From f99bb6efc0d580c137108f1d1fb595cf8a4a9c00 Mon Sep 17 00:00:00 2001
From: Collins Ikechukwu <collinschristroa@gmail.com>
Date: Fri, 28 Mar 2025 17:49:32 +0100
Subject: [PATCH 04/11] fix(tests): remove duplicate init_upgrade_test module
 import

feat(contracts): add util.ts with default RPC URL and network passphrase
---
 contracts/boundless_contract/src/tests/mod.rs | 1 -
 src/contracts/util.ts                         | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 src/contracts/util.ts

diff --git a/contracts/boundless_contract/src/tests/mod.rs b/contracts/boundless_contract/src/tests/mod.rs
index 7410bbc6..783055d6 100644
--- a/contracts/boundless_contract/src/tests/mod.rs
+++ b/contracts/boundless_contract/src/tests/mod.rs
@@ -3,5 +3,4 @@ mod create_project_test;
 mod init_upgrade_test;
 #[cfg(test)]
 mod vote_project_test;
-mod init_upgrade_test;
 mod milestone_funding_test;
diff --git a/src/contracts/util.ts b/src/contracts/util.ts
new file mode 100644
index 00000000..642466b0
--- /dev/null
+++ b/src/contracts/util.ts
@@ -0,0 +1,6 @@
+export const rpcUrl =
+	process.env.PUBLIC_STELLAR_RPC_URL ??
+	"https://soroban-testnet.stellar.org:443";
+export const networkPassphrase =
+	process.env.PUBLIC_STELLAR_NETWORK_PASSPHRASE ??
+	"Test SDF Network ; September 2015";

From 5b4ca42eca68c1257b5756b43f343cc88c25c254 Mon Sep 17 00:00:00 2001
From: Collins Ikechukwu <collinschristroa@gmail.com>
Date: Fri, 18 Apr 2025 17:09:23 +0100
Subject: [PATCH 05/11] modifed deploy

---
 .github/workflows/deploy.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 65c814c4..0085c0d4 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -36,6 +36,12 @@ jobs:
           PUBLIC_STELLAR_RPC_URL: https://soroban-testnet.stellar.org/
         run: |
           npm ci
+          STELLAR_NETWORK=$STELLAR_NETWORK \
+          STELLAR_ACCOUNT=$STELLAR_ACCOUNT \
+          STELLAR_SECRET_KEY=$STELLAR_SECRET_KEY \
+          SOROBAN_SECRET_KEY=$SOROBAN_SECRET_KEY \
+          PUBLIC_STELLAR_NETWORK_PASSPHRASE=$PUBLIC_STELLAR_NETWORK_PASSPHRASE \
+          PUBLIC_STELLAR_RPC_URL=$PUBLIC_STELLAR_RPC_URL \
           npm run init
 
       - name: Build Next.js app

From 1df38ce6b5e821b23dfb76ba3d2fef223bc86df4 Mon Sep 17 00:00:00 2001
From: Collins Ikechukwu <collinschristroa@gmail.com>
Date: Fri, 18 Apr 2025 17:36:49 +0100
Subject: [PATCH 06/11] feat: enhance project management with milestones and
 wallet connection features

- Added milestone management capabilities, including creation, updates, and attachments.
- Implemented wallet connection protection for project actions, ensuring users are prompted to connect their wallets when necessary.
- Updated user profile handling to include new fields and improved error handling in API routes.
- Refactored components for better organization and user experience, including profile display and edit forms.
- Introduced new UI components for wallet connection and project forms, enhancing the overall user interface.
- Updated dependencies and improved code readability across various files.
---
 app/(dashboard)/profile/page.tsx              | 150 +++-
 app/(dashboard)/projects/[id]/page.tsx        |   6 +-
 .../[id]/viewer/project-viewer-page.tsx       | 637 ++++++++--------
 .../projects/[id]/viewer/viewer-comments.tsx  | 398 +++++-----
 .../projects/[id]/viewer/viewer-funding.tsx   | 126 ++--
 .../[id]/viewer/viewer-milestones.tsx         | 343 +++++----
 .../[id]/viewer/viewer-project-status.tsx     |  94 +--
 .../[id]/viewer/viewer-team-preview.tsx       |  91 ++-
 .../projects/[id]/viewer/viewer-team.tsx      | 183 +++--
 .../projects/[id]/viewer/viewer-voting.tsx    | 244 +++---
 .../projects/edit/[id]/milestone-form.tsx     | 174 +++++
 .../projects/edit/[id]/milestone-tracker.tsx  | 181 +++--
 app/(dashboard)/projects/edit/[id]/page.tsx   |  56 +-
 app/(dashboard)/projects/new/page.tsx         |  11 +-
 app/api/auth/register/route.ts                |   1 +
 .../[milestoneId]/attachments/route.ts        | 155 ++++
 .../[id]/milestones/[milestoneId]/route.ts    | 229 ++++++
 app/api/projects/[id]/milestones/route.ts     | 124 ++++
 app/api/user/profile/route.ts                 |  25 +-
 app/api/user/settings/route.ts                | 108 +--
 app/connect-wallet/page.tsx                   |  95 +++
 components/connect-wallet.tsx                 |  12 +-
 .../dashboard/profile/ProfileDisplay.tsx      | 154 ++--
 .../dashboard/profile/ProfileEditForm.tsx     |  92 +--
 .../examples/wallet-protected-action.tsx      |  46 ++
 components/project-form-wrapper.tsx           |  16 +
 components/project-form.tsx                   | 374 ++++++----
 components/ui/calendar.tsx                    |  76 ++
 components/wallet-connection-modal.tsx        |  92 +++
 components/with-wallet-protection.tsx         |  79 ++
 hooks/useProjectAuth.ts                       | 178 +++--
 lib/actions/settings.ts                       |  38 +-
 lib/actions/user.ts                           |  88 +--
 lib/wallet-actions.ts                         |  70 ++
 lib/wallet-utils.ts                           |  48 ++
 package-lock.json                             | 701 ++++++++++++++++--
 package.json                                  |  13 +-
 .../migrations/20250408232837_n/migration.sql |  77 ++
 prisma/migrations/migration_lock.toml         |   2 +-
 prisma/schema.prisma                          |  34 +
 prisma/seed.ts                                |   6 +-
 store/useWalletStore.ts                       |   3 +
 store/userStore.ts                            | 137 ++--
 types/user.ts                                 |  12 +
 44 files changed, 4034 insertions(+), 1745 deletions(-)
 create mode 100644 app/(dashboard)/projects/edit/[id]/milestone-form.tsx
 create mode 100644 app/api/projects/[id]/milestones/[milestoneId]/attachments/route.ts
 create mode 100644 app/api/projects/[id]/milestones/[milestoneId]/route.ts
 create mode 100644 app/api/projects/[id]/milestones/route.ts
 create mode 100644 app/connect-wallet/page.tsx
 create mode 100644 components/examples/wallet-protected-action.tsx
 create mode 100644 components/project-form-wrapper.tsx
 create mode 100644 components/ui/calendar.tsx
 create mode 100644 components/wallet-connection-modal.tsx
 create mode 100644 components/with-wallet-protection.tsx
 create mode 100644 lib/wallet-actions.ts
 create mode 100644 lib/wallet-utils.ts
 create mode 100644 prisma/migrations/20250408232837_n/migration.sql
 create mode 100644 types/user.ts

diff --git a/app/(dashboard)/profile/page.tsx b/app/(dashboard)/profile/page.tsx
index cb45da15..e6c8010e 100644
--- a/app/(dashboard)/profile/page.tsx
+++ b/app/(dashboard)/profile/page.tsx
@@ -2,49 +2,157 @@
 
 import ProfileDisplay from "@/components/dashboard/profile/ProfileDisplay";
 import ProfileEditForm from "@/components/dashboard/profile/ProfileEditForm";
+import { Card } from "@/components/ui/card";
+import { Skeleton } from "@/components/ui/skeleton";
+import type { UserProfile } from "@/types/user";
 import axios from "axios";
 import React, { useState, useEffect } from "react";
 
 export default function ProfilePage() {
-	const [userData, setUserData] = useState<{
-		username: string;
-		displayName: string;
-		bio?: string;
-		twitter?: string;
-		linkedIn?: string;
-	} | null>(null);
+	const [userData, setUserData] = useState<UserProfile | null>(null);
 	const [isEditing, setIsEditing] = useState(false);
+	const [isLoading, setIsLoading] = useState(true);
+	const [error, setError] = useState<string | null>(null);
 
 	useEffect(() => {
 		async function fetchUserData() {
 			try {
+				setIsLoading(true);
+				setError(null);
 				const res = await axios.get("/api/user/profile");
 				setUserData(res.data);
 			} catch (error) {
 				console.error("Error fetching user data:", error);
+				setError("Failed to load profile data. Please try again later.");
+			} finally {
+				setIsLoading(false);
 			}
 		}
 		fetchUserData();
 	}, []);
 
+	if (isLoading) {
+		return (
+			<div className="container mx-auto max-w-4xl py-8 px-4">
+				<Card className="p-6">
+					<div className="space-y-6">
+						<div className="flex items-center space-x-4">
+							<Skeleton className="h-12 w-12 rounded-full" />
+							<div className="space-y-2">
+								<Skeleton className="h-4 w-[200px]" />
+								<Skeleton className="h-4 w-[150px]" />
+							</div>
+						</div>
+						<div className="space-y-2">
+							<Skeleton className="h-4 w-full" />
+							<Skeleton className="h-4 w-[80%]" />
+						</div>
+						<div className="space-y-2">
+							<Skeleton className="h-4 w-[60%]" />
+							<Skeleton className="h-4 w-[40%]" />
+						</div>
+					</div>
+				</Card>
+			</div>
+		);
+	}
+
+	if (error) {
+		return (
+			<div className="container mx-auto max-w-4xl py-8 px-4">
+				<Card className="p-6">
+					<div className="flex flex-col items-center justify-center space-y-4 text-center">
+						<div className="rounded-full bg-red-100 p-3">
+							<svg
+								className="h-6 w-6 text-red-600"
+								fill="none"
+								stroke="currentColor"
+								viewBox="0 0 24 24"
+							>
+								<title>Error Icon</title>
+								<path
+									strokeLinecap="round"
+									strokeLinejoin="round"
+									strokeWidth={2}
+									d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
+								/>
+							</svg>
+						</div>
+						<h2 className="text-xl font-semibold text-gray-900">
+							Error Loading Profile
+						</h2>
+						<p className="text-gray-600">{error}</p>
+						<button
+							type="button"
+							onClick={() => window.location.reload()}
+							className="rounded-md bg-blue-600 px-4 py-2 text-sm font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2"
+						>
+							Try Again
+						</button>
+					</div>
+				</Card>
+			</div>
+		);
+	}
+
 	if (!userData) {
-		return <div>Loading...</div>;
+		return (
+			<div className="container mx-auto max-w-4xl py-8 px-4">
+				<Card className="p-6">
+					<div className="flex flex-col items-center justify-center space-y-4 text-center">
+						<div className="rounded-full bg-gray-100 p-3">
+							<svg
+								className="h-6 w-6 text-gray-600"
+								fill="none"
+								stroke="currentColor"
+								viewBox="0 0 24 24"
+							>
+								<title>Profile Icon</title>
+								<path
+									strokeLinecap="round"
+									strokeLinejoin="round"
+									strokeWidth={2}
+									d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"
+								/>
+							</svg>
+						</div>
+						<h2 className="text-xl font-semibold text-gray-900">
+							No Profile Found
+						</h2>
+						<p className="text-gray-600">
+							We couldn&apos;t find your profile information.
+						</p>
+					</div>
+				</Card>
+			</div>
+		);
 	}
 
 	return (
-		<div className="p-4">
-			{isEditing ? (
-				<ProfileEditForm
-					initialData={userData}
-					onSuccess={(updatedData) => {
-						setUserData(updatedData);
-						setIsEditing(false);
-					}}
-					onCancel={() => setIsEditing(false)}
-				/>
-			) : (
-				<ProfileDisplay userData={userData} onEdit={() => setIsEditing(true)} />
-			)}
+		<div className="container mx-auto max-w-4xl py-8 px-4">
+			<div className="mb-8">
+				<h1 className="text-2xl font-bold text-gray-900">Profile</h1>
+				<p className="mt-2 text-sm text-gray-600">
+					Manage your profile information and preferences
+				</p>
+			</div>
+			<Card className="overflow-hidden">
+				{isEditing ? (
+					<ProfileEditForm
+						initialData={userData}
+						onSuccess={(updatedData) => {
+							setUserData(updatedData);
+							setIsEditing(false);
+						}}
+						onCancel={() => setIsEditing(false)}
+					/>
+				) : (
+					<ProfileDisplay
+						userData={userData}
+						onEdit={() => setIsEditing(true)}
+					/>
+				)}
+			</Card>
 		</div>
 	);
 }
diff --git a/app/(dashboard)/projects/[id]/page.tsx b/app/(dashboard)/projects/[id]/page.tsx
index c7214eca..dced248d 100644
--- a/app/(dashboard)/projects/[id]/page.tsx
+++ b/app/(dashboard)/projects/[id]/page.tsx
@@ -1,5 +1,5 @@
-import { ProjectViewerPage } from "./viewer/project-viewer-page"
+import { ProjectViewerPage } from "./viewer/project-viewer-page";
 
 export default function ProjectPage({ params }: { params: { id: string } }) {
-  return <ProjectViewerPage />
-}
\ No newline at end of file
+	return <ProjectViewerPage />;
+}
diff --git a/app/(dashboard)/projects/[id]/viewer/project-viewer-page.tsx b/app/(dashboard)/projects/[id]/viewer/project-viewer-page.tsx
index b6df963d..5e1ea066 100644
--- a/app/(dashboard)/projects/[id]/viewer/project-viewer-page.tsx
+++ b/app/(dashboard)/projects/[id]/viewer/project-viewer-page.tsx
@@ -1,338 +1,367 @@
-"use client"
+"use client";
 
-import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar"
-import { Badge } from "@/components/ui/badge"
-import { Button } from "@/components/ui/button"
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
-import type { Vote } from "@prisma/client"
-import { Calendar, FileText, Heart, Share2, Users, Wallet } from "lucide-react"
-import { useSession } from "next-auth/react"
-import Image from "next/image"
-import Link from "next/link"
-import { useParams, useRouter } from "next/navigation"
-import { useEffect, useState } from "react"
-import { ViewerComments } from "./viewer-comments"
-import { ViewerFundingHorizontal } from "./viewer-funding"
-import { ViewerMilestones } from "./viewer-milestones"
-import { ViewerProjectStatus } from "./viewer-project-status"
-import { ViewerTeam } from "./viewer-team"
-import { ViewerVoting } from "./viewer-voting"
+import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import type { Vote } from "@prisma/client";
+import { Calendar, FileText, Heart, Share2, Users, Wallet } from "lucide-react";
+import { useSession } from "next-auth/react";
+import Image from "next/image";
+import Link from "next/link";
+import { useParams, useRouter } from "next/navigation";
+import { useEffect, useState } from "react";
+import { ViewerComments } from "./viewer-comments";
+import { ViewerFundingHorizontal } from "./viewer-funding";
+import { ViewerMilestones } from "./viewer-milestones";
+import { ViewerProjectStatus } from "./viewer-project-status";
+import { ViewerTeam } from "./viewer-team";
+import { ViewerVoting } from "./viewer-voting";
 
-type ValidationStatus = "PENDING" | "REJECTED" | "VALIDATED"
+type ValidationStatus = "PENDING" | "REJECTED" | "VALIDATED";
 
 type Project = {
-  id: string
-  userId: string
-  title: string
-  description: string
-  fundingGoal: number
-  category: string
-  bannerUrl: string | null
-  profileUrl: string | null
-  blockchainTx: string | null
-  ideaValidation: ValidationStatus
-  createdAt: string
-  user: {
-    id: string
-    name: string | null
-    image: string | null
-  }
-  votes: Vote[]
-  teamMembers: {
-    id: string
-    fullName: string
-    role: string
-    bio: string | null
-    profileImage: string | null
-    github: string | null
-    twitter: string | null
-    discord: string | null
-    linkedin: string | null
-    userId: string | null
-  }[]
-  _count: {
-    votes: number
-    teamMembers: number
-  }
-}
+	id: string;
+	userId: string;
+	title: string;
+	description: string;
+	fundingGoal: number;
+	category: string;
+	bannerUrl: string | null;
+	profileUrl: string | null;
+	blockchainTx: string | null;
+	ideaValidation: ValidationStatus;
+	createdAt: string;
+	user: {
+		id: string;
+		name: string | null;
+		image: string | null;
+	};
+	votes: Vote[];
+	teamMembers: {
+		id: string;
+		fullName: string;
+		role: string;
+		bio: string | null;
+		profileImage: string | null;
+		github: string | null;
+		twitter: string | null;
+		discord: string | null;
+		linkedin: string | null;
+		userId: string | null;
+	}[];
+	_count: {
+		votes: number;
+		teamMembers: number;
+	};
+};
 
 export function ProjectViewerPage() {
-  const params = useParams()
-  const router = useRouter()
-  const { data: session } = useSession()
-  const [project, setProject] = useState<Project | null>(null)
-  const [loading, setLoading] = useState(true)
-  const [error, setError] = useState<string | null>(null)
+	const params = useParams();
+	const router = useRouter();
+	const { data: session } = useSession();
+	const [project, setProject] = useState<Project | null>(null);
+	const [loading, setLoading] = useState(true);
+	const [error, setError] = useState<string | null>(null);
 
-  useEffect(() => {
-    async function fetchProject() {
-      try {
-        const id = params?.id as string
-        if (!id) return
+	useEffect(() => {
+		async function fetchProject() {
+			try {
+				const id = params?.id as string;
+				if (!id) return;
 
-        const response = await fetch(`/api/projects/${id}`)
+				const response = await fetch(`/api/projects/${id}`);
 
-        if (response.status === 404) {
-          router.push("/projects")
-          return
-        }
+				if (response.status === 404) {
+					router.push("/projects");
+					return;
+				}
 
-        if (!response.ok) {
-          throw new Error("Failed to fetch project")
-        }
+				if (!response.ok) {
+					throw new Error("Failed to fetch project");
+				}
 
-        const data = await response.json()
-        setProject(data)
-      } catch (err) {
-        setError(err instanceof Error ? err.message : "An error occurred")
-        console.error(err)
-      } finally {
-        setLoading(false)
-      }
-    }
+				const data = await response.json();
+				setProject(data);
+			} catch (err) {
+				setError(err instanceof Error ? err.message : "An error occurred");
+				console.error(err);
+			} finally {
+				setLoading(false);
+			}
+		}
 
-    fetchProject()
-  }, [params, router])
+		fetchProject();
+	}, [params, router]);
 
-  if (loading) {
-    return (
-      <div className="container flex items-center justify-center min-h-[60vh]">
-        <div className="text-center space-y-4">
-          <div className="animate-spin h-8 w-8 border-4 border-primary border-t-transparent rounded-full mx-auto"></div>
-          <p className="text-muted-foreground">Loading project details...</p>
-        </div>
-      </div>
-    )
-  }
+	if (loading) {
+		return (
+			<div className="container flex items-center justify-center min-h-[60vh]">
+				<div className="text-center space-y-4">
+					<div className="animate-spin h-8 w-8 border-4 border-primary border-t-transparent rounded-full mx-auto" />
+					<p className="text-muted-foreground">Loading project details...</p>
+				</div>
+			</div>
+		);
+	}
 
-  if (error) {
-    return (
-      <div className="container py-12 px-4">
-        <Card className="border-destructive/50">
-          <CardHeader>
-            <CardTitle className="text-destructive">Error Loading Project</CardTitle>
-          </CardHeader>
-          <CardContent>
-            <p>{error}</p>
-            <Button variant="outline" className="mt-4" onClick={() => router.push("/projects")}>
-              Return to Projects
-            </Button>
-          </CardContent>
-        </Card>
-      </div>
-    )
-  }
+	if (error) {
+		return (
+			<div className="container py-12 px-4">
+				<Card className="border-destructive/50">
+					<CardHeader>
+						<CardTitle className="text-destructive">
+							Error Loading Project
+						</CardTitle>
+					</CardHeader>
+					<CardContent>
+						<p>{error}</p>
+						<Button
+							variant="outline"
+							className="mt-4"
+							onClick={() => router.push("/projects")}
+						>
+							Return to Projects
+						</Button>
+					</CardContent>
+				</Card>
+			</div>
+		);
+	}
 
-  if (!project) {
-    return (
-      <div className="container py-12 px-4">
-        <Card>
-          <CardHeader>
-            <CardTitle>Project Not Found</CardTitle>
-          </CardHeader>
-          <CardContent>
-            <Button variant="outline" onClick={() => router.push("/projects")}>
-              Browse Projects
-            </Button>
-          </CardContent>
-        </Card>
-      </div>
-    )
-  }
+	if (!project) {
+		return (
+			<div className="container py-12 px-4">
+				<Card>
+					<CardHeader>
+						<CardTitle>Project Not Found</CardTitle>
+					</CardHeader>
+					<CardContent>
+						<Button variant="outline" onClick={() => router.push("/projects")}>
+							Browse Projects
+						</Button>
+					</CardContent>
+				</Card>
+			</div>
+		);
+	}
 
-  // Format date
-  const formatDate = (dateString: string) => {
-    return new Date(dateString).toLocaleDateString("en-US", {
-      year: "numeric",
-      month: "long",
-      day: "numeric",
-    })
-  }
+	// Format date
+	const formatDate = (dateString: string) => {
+		return new Date(dateString).toLocaleDateString("en-US", {
+			year: "numeric",
+			month: "long",
+			day: "numeric",
+		});
+	};
 
-  return (
-    <div className="min-h-screen bg-background">
-      {/* Navigation breadcrumb */}
-      <div className="bg-background border-b">
-        <div className="container py-3 px-4">
-          <div className="flex items-center text-sm text-muted-foreground">
-            <Link href="/projects" className="hover:text-foreground transition-colors">
-              Projects
-            </Link>
-            <span className="mx-2">/</span>
-            <span className="font-medium text-foreground">{project.title}</span>
-          </div>
-        </div>
-      </div>
+	return (
+		<div className="min-h-screen bg-background">
+			{/* Navigation breadcrumb */}
+			<div className="bg-background border-b">
+				<div className="container py-3 px-4">
+					<div className="flex items-center text-sm text-muted-foreground">
+						<Link
+							href="/projects"
+							className="hover:text-foreground transition-colors"
+						>
+							Projects
+						</Link>
+						<span className="mx-2">/</span>
+						<span className="font-medium text-foreground">{project.title}</span>
+					</div>
+				</div>
+			</div>
 
-      {/* Project Header */}
-      <div className="bg-muted">
-        <div className="container px-4 py-8">
-          <div className="flex flex-col md:flex-row md:items-center gap-6">
-            <Avatar className="h-24 w-24 border-4 border-background">
-              <AvatarImage src={project.profileUrl || "/project.svg"} alt={project.title} />
-              <AvatarFallback>{project.title.substring(0, 2).toUpperCase()}</AvatarFallback>
-            </Avatar>
+			{/* Project Header */}
+			<div className="bg-muted">
+				<div className="container px-4 py-8">
+					<div className="flex flex-col md:flex-row md:items-center gap-6">
+						<Avatar className="h-24 w-24 border-4 border-background">
+							<AvatarImage
+								src={project.profileUrl || "/project.svg"}
+								alt={project.title}
+							/>
+							<AvatarFallback>
+								{project.title.substring(0, 2).toUpperCase()}
+							</AvatarFallback>
+						</Avatar>
 
-            <div className="flex-1">
-              <div className="flex flex-wrap gap-2 mb-2">
-                <Badge>{project.category}</Badge>
-                <Badge
-                  variant={
-                    project.ideaValidation === "VALIDATED"
-                      ? "default"
-                      : project.ideaValidation === "REJECTED"
-                        ? "destructive"
-                        : "secondary"
-                  }
-                >
-                  {project.ideaValidation}
-                </Badge>
-              </div>
+						<div className="flex-1">
+							<div className="flex flex-wrap gap-2 mb-2">
+								<Badge>{project.category}</Badge>
+								<Badge
+									variant={
+										project.ideaValidation === "VALIDATED"
+											? "default"
+											: project.ideaValidation === "REJECTED"
+												? "destructive"
+												: "secondary"
+									}
+								>
+									{project.ideaValidation}
+								</Badge>
+							</div>
 
-              <h1 className="text-3xl font-bold">{project.title}</h1>
+							<h1 className="text-3xl font-bold">{project.title}</h1>
 
-              <div className="flex flex-wrap items-center gap-x-6 gap-y-2 mt-2 text-sm text-muted-foreground">
-                <div className="flex items-center">
-                  <Calendar className="h-4 w-4 mr-1" />
-                  {formatDate(project.createdAt)}
-                </div>
-                <div className="flex items-center">
-                  <Users className="h-4 w-4 mr-1" />
-                  {project._count.votes} Supporters
-                </div>
-                <div className="flex items-center">
-                  <Wallet className="h-4 w-4 mr-1" />${project.fundingGoal.toLocaleString()} Goal
-                </div>
-              </div>
-            </div>
+							<div className="flex flex-wrap items-center gap-x-6 gap-y-2 mt-2 text-sm text-muted-foreground">
+								<div className="flex items-center">
+									<Calendar className="h-4 w-4 mr-1" />
+									{formatDate(project.createdAt)}
+								</div>
+								<div className="flex items-center">
+									<Users className="h-4 w-4 mr-1" />
+									{project._count.votes} Supporters
+								</div>
+								<div className="flex items-center">
+									<Wallet className="h-4 w-4 mr-1" />$
+									{project.fundingGoal.toLocaleString()} Goal
+								</div>
+							</div>
+						</div>
 
-            <div className="flex flex-col sm:flex-row gap-3 mt-4 md:mt-0">
-              <Button>
-                <Heart className="mr-2 h-4 w-4" /> Support
-              </Button>
-              <Button variant="outline">
-                <Share2 className="mr-2 h-4 w-4" /> Share
-              </Button>
-            </div>
-          </div>
-        </div>
-      </div>
+						<div className="flex flex-col sm:flex-row gap-3 mt-4 md:mt-0">
+							<Button>
+								<Heart className="mr-2 h-4 w-4" /> Support
+							</Button>
+							<Button variant="outline">
+								<Share2 className="mr-2 h-4 w-4" /> Share
+							</Button>
+						</div>
+					</div>
+				</div>
+			</div>
 
-      {/* Project Banner */}
-      <div className="w-full h-[300px] relative">
-        <Image
-          src={project.bannerUrl || "/banner.png"}
-          alt={`${project.title} Banner`}
-          fill
-          className="object-cover"
-          priority
-        />
-      </div>
+			{/* Project Banner */}
+			<div className="w-full h-[300px] relative">
+				<Image
+					src={project.bannerUrl || "/banner.png"}
+					alt={`${project.title} Banner`}
+					fill
+					className="object-cover"
+					priority
+				/>
+			</div>
 
-      {/* Project Status */}
-      <div className="container px-4 -mt-8 relative z-10">
-        <Card className="border-t-4 border-t-primary">
-          <CardContent className="p-6">
-            <ViewerProjectStatus project={project} />
-          </CardContent>
-        </Card>
-      </div>
+			{/* Project Status */}
+			<div className="container px-4 -mt-8 relative z-10">
+				<Card className="border-t-4 border-t-primary">
+					<CardContent className="p-6">
+						<ViewerProjectStatus project={project} />
+					</CardContent>
+				</Card>
+			</div>
 
-      {/* Funding Status - Horizontal */}
-      <div className="container px-4 mt-8">
-        <ViewerFundingHorizontal projectId={project.id} fundingGoal={project.fundingGoal} />
-      </div>
+			{/* Funding Status - Horizontal */}
+			<div className="container px-4 mt-8">
+				<ViewerFundingHorizontal
+					projectId={project.id}
+					fundingGoal={project.fundingGoal}
+				/>
+			</div>
 
-      {/* Main Content */}
-      <div className="container px-4 py-8">
-        <div className="grid grid-cols-1 lg:grid-cols-3 gap-8">
-          {/* Main Column */}
-          <div className="lg:col-span-2 space-y-8">
-            {/* About */}
-            <Card className="h-auto">
-              <CardHeader>
-                <CardTitle>About the Project</CardTitle>
-              </CardHeader>
-              <CardContent>
-                <div className="prose max-w-none dark:prose-invert max-h-[300px] overflow-y-auto">
-                  <p>{project.description}</p>
-                </div>
+			{/* Main Content */}
+			<div className="container px-4 py-8">
+				<div className="grid grid-cols-1 lg:grid-cols-3 gap-8">
+					{/* Main Column */}
+					<div className="lg:col-span-2 space-y-8">
+						{/* About */}
+						<Card className="h-auto">
+							<CardHeader>
+								<CardTitle>About the Project</CardTitle>
+							</CardHeader>
+							<CardContent>
+								<div className="prose max-w-none dark:prose-invert max-h-[300px] overflow-y-auto">
+									<p>{project.description}</p>
+								</div>
 
-                <div className="mt-6">
-                  <Button variant="outline" className="mr-4">
-                    <FileText className="mr-2 h-4 w-4" /> View Pitch Deck
-                  </Button>
-                  <Button variant="outline">
-                    <FileText className="mr-2 h-4 w-4" /> View Whitepaper
-                  </Button>
-                </div>
-              </CardContent>
-            </Card>
+								<div className="mt-6">
+									<Button variant="outline" className="mr-4">
+										<FileText className="mr-2 h-4 w-4" /> View Pitch Deck
+									</Button>
+									<Button variant="outline">
+										<FileText className="mr-2 h-4 w-4" /> View Whitepaper
+									</Button>
+								</div>
+							</CardContent>
+						</Card>
 
-            {/* Tabs */}
-            <Tabs defaultValue="milestones">
-              <TabsList className="w-full grid grid-cols-3">
-                <TabsTrigger value="milestones">Milestones</TabsTrigger>
-                <TabsTrigger value="team">Team</TabsTrigger>
-                <TabsTrigger value="discussion">Discussion</TabsTrigger>
-              </TabsList>
+						{/* Tabs */}
+						<Tabs defaultValue="milestones">
+							<TabsList className="w-full grid grid-cols-3">
+								<TabsTrigger value="milestones">Milestones</TabsTrigger>
+								<TabsTrigger value="team">Team</TabsTrigger>
+								<TabsTrigger value="discussion">Discussion</TabsTrigger>
+							</TabsList>
 
-              <TabsContent value="milestones" className="mt-6">
-                <ViewerMilestones projectId={project.id} />
-              </TabsContent>
+							<TabsContent value="milestones" className="mt-6">
+								<ViewerMilestones projectId={project.id} />
+							</TabsContent>
 
-              <TabsContent value="team" className="mt-6">
-                <ViewerTeam teamMembers={project.teamMembers} />
-              </TabsContent>
+							<TabsContent value="team" className="mt-6">
+								<ViewerTeam teamMembers={project.teamMembers} />
+							</TabsContent>
 
-              <TabsContent value="discussion" className="mt-6">
-                <ViewerComments projectId={project.id} />
-              </TabsContent>
-            </Tabs>
-          </div>
+							<TabsContent value="discussion" className="mt-6">
+								<ViewerComments projectId={project.id} />
+							</TabsContent>
+						</Tabs>
+					</div>
 
-          {/* Sidebar */}
-          <div className="space-y-8">
-            {/* Creator */}
-            <Card className="h-auto">
-              <CardHeader className="pb-3">
-                <CardTitle className="text-lg">Project Creator</CardTitle>
-              </CardHeader>
-              <CardContent>
-                <div className="flex items-center gap-4">
-                  <Avatar>
-                    <AvatarImage src={project.user.image || undefined} alt={project.user.name || "Creator"} />
-                    <AvatarFallback>
-                      {project.user.name ? project.user.name.substring(0, 2).toUpperCase() : "CR"}
-                    </AvatarFallback>
-                  </Avatar>
-                  <div>
-                    <p className="font-medium">{project.user.name || "Anonymous"}</p>
-                    <p className="text-sm text-muted-foreground">Project Creator</p>
-                  </div>
-                </div>
-              </CardContent>
-            </Card>
+					{/* Sidebar */}
+					<div className="space-y-8">
+						{/* Creator */}
+						<Card className="h-auto">
+							<CardHeader className="pb-3">
+								<CardTitle className="text-lg">Project Creator</CardTitle>
+							</CardHeader>
+							<CardContent>
+								<div className="flex items-center gap-4">
+									<Avatar>
+										<AvatarImage
+											src={project.user.image || undefined}
+											alt={project.user.name || "Creator"}
+										/>
+										<AvatarFallback>
+											{project.user.name
+												? project.user.name.substring(0, 2).toUpperCase()
+												: "CR"}
+										</AvatarFallback>
+									</Avatar>
+									<div>
+										<p className="font-medium">
+											{project.user.name || "Anonymous"}
+										</p>
+										<p className="text-sm text-muted-foreground">
+											Project Creator
+										</p>
+									</div>
+								</div>
+							</CardContent>
+						</Card>
 
-            {/* Voting */}
-            <Card className="h-auto">
-              <CardHeader className="pb-3">
-                <CardTitle className="text-lg">Community Voting</CardTitle>
-              </CardHeader>
-              <CardContent className="p-6">
-                <ViewerVoting
-                  projectId={project.id}
-                  voteCount={project._count.votes}
-                  userVoted={project.votes.some((vote) => vote.userId === session?.user?.id)}
-                  status={project.ideaValidation}
-                  // compact={true}
-                />
-              </CardContent>
-            </Card>
-          </div>
-        </div>
-      </div>
-    </div>
-  )
+						{/* Voting */}
+						<Card className="h-auto">
+							<CardHeader className="pb-3">
+								<CardTitle className="text-lg">Community Voting</CardTitle>
+							</CardHeader>
+							<CardContent className="p-6">
+								<ViewerVoting
+									projectId={project.id}
+									voteCount={project._count.votes}
+									userVoted={project.votes.some(
+										(vote) => vote.userId === session?.user?.id,
+									)}
+									status={project.ideaValidation}
+									// compact={true}
+								/>
+							</CardContent>
+						</Card>
+					</div>
+				</div>
+			</div>
+		</div>
+	);
 }
diff --git a/app/(dashboard)/projects/[id]/viewer/viewer-comments.tsx b/app/(dashboard)/projects/[id]/viewer/viewer-comments.tsx
index 080e3336..6f47d6a2 100644
--- a/app/(dashboard)/projects/[id]/viewer/viewer-comments.tsx
+++ b/app/(dashboard)/projects/[id]/viewer/viewer-comments.tsx
@@ -1,189 +1,223 @@
-"use client"
-
-import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar"
-import { Button } from "@/components/ui/button"
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
-import { Separator } from "@/components/ui/separator"
-import { Textarea } from "@/components/ui/textarea"
-import { ThumbsDown, ThumbsUp } from "lucide-react"
-import { useSession } from "next-auth/react"
-import { useState } from "react"
+"use client";
+
+import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
+import { Button } from "@/components/ui/button";
+import {
+	Card,
+	CardContent,
+	CardDescription,
+	CardHeader,
+	CardTitle,
+} from "@/components/ui/card";
+import { Separator } from "@/components/ui/separator";
+import { Textarea } from "@/components/ui/textarea";
+import { ThumbsDown, ThumbsUp } from "lucide-react";
+import { useSession } from "next-auth/react";
+import { useState } from "react";
 
 type Comment = {
-  id: string
-  userId: string
-  userName: string
-  userImage: string | null
-  content: string
-  createdAt: string
-  likes: number
-  dislikes: number
-}
+	id: string;
+	userId: string;
+	userName: string;
+	userImage: string | null;
+	content: string;
+	createdAt: string;
+	likes: number;
+	dislikes: number;
+};
 
 type ViewerCommentsProps = {
-  projectId: string
-}
+	projectId: string;
+};
 
 export function ViewerComments({ projectId }: ViewerCommentsProps) {
-  const { data: session } = useSession()
-  const [comment, setComment] = useState("")
-  const [isSubmitting, setIsSubmitting] = useState(false)
-
-  // In a real app, you would fetch comments from an API
-  const [comments, setComments] = useState<Comment[]>([
-    {
-      id: "1",
-      userId: "user1",
-      userName: "Alex Johnson",
-      userImage: null,
-      content:
-        "This project looks very promising! I especially like the focus on sustainability and community involvement.",
-      createdAt: "2024-03-15T14:23:00Z",
-      likes: 12,
-      dislikes: 1,
-    },
-    {
-      id: "2",
-      userId: "user2",
-      userName: "Sam Rivera",
-      userImage: null,
-      content:
-        "I have a few questions about the technical implementation. Will this be compatible with existing systems?",
-      createdAt: "2024-03-14T09:45:00Z",
-      likes: 5,
-      dislikes: 0,
-    },
-    {
-      id: "3",
-      userId: "user3",
-      userName: "Taylor Kim",
-      userImage: null,
-      content:
-        "I've been following similar projects in this space, and I think this one has a unique approach that could really work.",
-      createdAt: "2024-03-12T16:30:00Z",
-      likes: 8,
-      dislikes: 2,
-    },
-  ])
-
-  const handleSubmitComment = async () => {
-    if (!comment.trim() || !session?.user) return
-
-    setIsSubmitting(true)
-
-    try {
-      // In a real app, you would make an API call here
-      // const response = await fetch(`/api/projects/${projectId}/comments`, {
-      //   method: 'POST',
-      //   body: JSON.stringify({ content: comment }),
-      // })
-
-      // Simulate API call
-      await new Promise((resolve) => setTimeout(resolve, 500))
-
-      const newComment: Comment = {
-        id: `temp-${Date.now()}`,
-        userId: session.user.id || "unknown",
-        userName: session.user.name || "Anonymous",
-        userImage: session.user.image || null,
-        content: comment,
-        createdAt: new Date().toISOString(),
-        likes: 0,
-        dislikes: 0,
-      }
-
-      setComments((prev) => [newComment, ...prev])
-      setComment("")
-    } catch (error) {
-      console.error("Failed to post comment:", error)
-    } finally {
-      setIsSubmitting(false)
-    }
-  }
-
-  // Format date
-  const formatDate = (dateString: string) => {
-    const date = new Date(dateString)
-    const now = new Date()
-    const diffInSeconds = Math.floor((now.getTime() - date.getTime()) / 1000)
-
-    if (diffInSeconds < 60) return `${diffInSeconds} seconds ago`
-    if (diffInSeconds < 3600) return `${Math.floor(diffInSeconds / 60)} minutes ago`
-    if (diffInSeconds < 86400) return `${Math.floor(diffInSeconds / 3600)} hours ago`
-    if (diffInSeconds < 604800) return `${Math.floor(diffInSeconds / 86400)} days ago`
-
-    return date.toLocaleDateString("en-US", {
-      year: "numeric",
-      month: "short",
-      day: "numeric",
-    })
-  }
-
-  return (
-    <Card className="h-[320px]">
-      <CardHeader>
-        <CardTitle>Discussion</CardTitle>
-        <CardDescription>Join the conversation about this project</CardDescription>
-      </CardHeader>
-      <CardContent className="h-[calc(320px-85px)] overflow-y-auto">
-        {session ? (
-          <div className="space-y-4">
-            <Textarea
-              placeholder="Share your thoughts about this project..."
-              value={comment}
-              onChange={(e) => setComment(e.target.value)}
-              className="min-h-[80px]"
-            />
-            <div className="flex justify-end">
-              <Button onClick={handleSubmitComment} disabled={!comment.trim() || isSubmitting}>
-                {isSubmitting ? "Posting..." : "Post Comment"}
-              </Button>
-            </div>
-          </div>
-        ) : (
-          <div className="bg-muted p-4 rounded-lg text-center">
-            <p className="text-muted-foreground mb-2">Sign in to join the discussion</p>
-            <Button variant="outline">Sign In</Button>
-          </div>
-        )}
-
-        <Separator className="my-4" />
-
-        <div className="space-y-4">
-          {comments.length > 0 ? (
-            comments.map((comment) => (
-              <div key={comment.id} className="space-y-2">
-                <div className="flex items-start gap-3">
-                  <Avatar className="h-10 w-10">
-                    <AvatarImage src={comment.userImage || undefined} alt={comment.userName} />
-                    <AvatarFallback>{comment.userName.substring(0, 2).toUpperCase()}</AvatarFallback>
-                  </Avatar>
-                  <div className="flex-1">
-                    <div className="flex items-center justify-between">
-                      <h4 className="font-medium">{comment.userName}</h4>
-                      <span className="text-xs text-muted-foreground">{formatDate(comment.createdAt)}</span>
-                    </div>
-                    <p className="mt-1 text-sm">{comment.content}</p>
-                    <div className="flex items-center gap-4 mt-2">
-                      <button className="flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground">
-                        <ThumbsUp className="h-3 w-3" /> {comment.likes}
-                      </button>
-                      <button className="flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground">
-                        <ThumbsDown className="h-3 w-3" /> {comment.dislikes}
-                      </button>
-                      <button className="text-xs text-muted-foreground hover:text-foreground">Reply</button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            ))
-          ) : (
-            <div className="text-center py-4 text-muted-foreground">
-              <p>No comments yet. Be the first to start the discussion!</p>
-            </div>
-          )}
-        </div>
-      </CardContent>
-    </Card>
-  )
+	const { data: session } = useSession();
+	const [comment, setComment] = useState("");
+	const [isSubmitting, setIsSubmitting] = useState(false);
+
+	// In a real app, you would fetch comments from an API
+	const [comments, setComments] = useState<Comment[]>([
+		{
+			id: "1",
+			userId: "user1",
+			userName: "Alex Johnson",
+			userImage: null,
+			content:
+				"This project looks very promising! I especially like the focus on sustainability and community involvement.",
+			createdAt: "2024-03-15T14:23:00Z",
+			likes: 12,
+			dislikes: 1,
+		},
+		{
+			id: "2",
+			userId: "user2",
+			userName: "Sam Rivera",
+			userImage: null,
+			content:
+				"I have a few questions about the technical implementation. Will this be compatible with existing systems?",
+			createdAt: "2024-03-14T09:45:00Z",
+			likes: 5,
+			dislikes: 0,
+		},
+		{
+			id: "3",
+			userId: "user3",
+			userName: "Taylor Kim",
+			userImage: null,
+			content:
+				"I've been following similar projects in this space, and I think this one has a unique approach that could really work.",
+			createdAt: "2024-03-12T16:30:00Z",
+			likes: 8,
+			dislikes: 2,
+		},
+	]);
+
+	const handleSubmitComment = async () => {
+		if (!comment.trim() || !session?.user) return;
+
+		setIsSubmitting(true);
+
+		try {
+			// In a real app, you would make an API call here
+			// const response = await fetch(`/api/projects/${projectId}/comments`, {
+			//   method: 'POST',
+			//   body: JSON.stringify({ content: comment }),
+			// })
+
+			// Simulate API call
+			await new Promise((resolve) => setTimeout(resolve, 500));
+
+			const newComment: Comment = {
+				id: `temp-${Date.now()}`,
+				userId: session.user.id || "unknown",
+				userName: session.user.name || "Anonymous",
+				userImage: session.user.image || null,
+				content: comment,
+				createdAt: new Date().toISOString(),
+				likes: 0,
+				dislikes: 0,
+			};
+
+			setComments((prev) => [newComment, ...prev]);
+			setComment("");
+		} catch (error) {
+			console.error("Failed to post comment:", error);
+		} finally {
+			setIsSubmitting(false);
+		}
+	};
+
+	// Format date
+	const formatDate = (dateString: string) => {
+		const date = new Date(dateString);
+		const now = new Date();
+		const diffInSeconds = Math.floor((now.getTime() - date.getTime()) / 1000);
+
+		if (diffInSeconds < 60) return `${diffInSeconds} seconds ago`;
+		if (diffInSeconds < 3600)
+			return `${Math.floor(diffInSeconds / 60)} minutes ago`;
+		if (diffInSeconds < 86400)
+			return `${Math.floor(diffInSeconds / 3600)} hours ago`;
+		if (diffInSeconds < 604800)
+			return `${Math.floor(diffInSeconds / 86400)} days ago`;
+
+		return date.toLocaleDateString("en-US", {
+			year: "numeric",
+			month: "short",
+			day: "numeric",
+		});
+	};
+
+	return (
+		<Card className="h-[320px]">
+			<CardHeader>
+				<CardTitle>Discussion</CardTitle>
+				<CardDescription>
+					Join the conversation about this project
+				</CardDescription>
+			</CardHeader>
+			<CardContent className="h-[calc(320px-85px)] overflow-y-auto">
+				{session ? (
+					<div className="space-y-4">
+						<Textarea
+							placeholder="Share your thoughts about this project..."
+							value={comment}
+							onChange={(e) => setComment(e.target.value)}
+							className="min-h-[80px]"
+						/>
+						<div className="flex justify-end">
+							<Button
+								onClick={handleSubmitComment}
+								disabled={!comment.trim() || isSubmitting}
+							>
+								{isSubmitting ? "Posting..." : "Post Comment"}
+							</Button>
+						</div>
+					</div>
+				) : (
+					<div className="bg-muted p-4 rounded-lg text-center">
+						<p className="text-muted-foreground mb-2">
+							Sign in to join the discussion
+						</p>
+						<Button variant="outline">Sign In</Button>
+					</div>
+				)}
+
+				<Separator className="my-4" />
+
+				<div className="space-y-4">
+					{comments.length > 0 ? (
+						comments.map((comment) => (
+							<div key={comment.id} className="space-y-2">
+								<div className="flex items-start gap-3">
+									<Avatar className="h-10 w-10">
+										<AvatarImage
+											src={comment.userImage || undefined}
+											alt={comment.userName}
+										/>
+										<AvatarFallback>
+											{comment.userName.substring(0, 2).toUpperCase()}
+										</AvatarFallback>
+									</Avatar>
+									<div className="flex-1">
+										<div className="flex items-center justify-between">
+											<h4 className="font-medium">{comment.userName}</h4>
+											<span className="text-xs text-muted-foreground">
+												{formatDate(comment.createdAt)}
+											</span>
+										</div>
+										<p className="mt-1 text-sm">{comment.content}</p>
+										<div className="flex items-center gap-4 mt-2">
+											<button
+												type="button"
+												className="flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground"
+											>
+												<ThumbsUp className="h-3 w-3" /> {comment.likes}
+											</button>
+											<button
+												type="button"
+												className="flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground"
+											>
+												<ThumbsDown className="h-3 w-3" /> {comment.dislikes}
+											</button>
+											<button
+												type="button"
+												className="text-xs text-muted-foreground hover:text-foreground"
+											>
+												Reply
+											</button>
+										</div>
+									</div>
+								</div>
+							</div>
+						))
+					) : (
+						<div className="text-center py-4 text-muted-foreground">
+							<p>No comments yet. Be the first to start the discussion!</p>
+						</div>
+					)}
+				</div>
+			</CardContent>
+		</Card>
+	);
 }
diff --git a/app/(dashboard)/projects/[id]/viewer/viewer-funding.tsx b/app/(dashboard)/projects/[id]/viewer/viewer-funding.tsx
index 2d5edda8..2fa8f847 100644
--- a/app/(dashboard)/projects/[id]/viewer/viewer-funding.tsx
+++ b/app/(dashboard)/projects/[id]/viewer/viewer-funding.tsx
@@ -1,69 +1,77 @@
-"use client"
+"use client";
 
-import { Button } from "@/components/ui/button"
-import { Card, CardContent } from "@/components/ui/card"
-import { Progress } from "@/components/ui/progress"
-import { CreditCard, DollarSign, Users } from "lucide-react"
-import { useState } from "react"
+import { Button } from "@/components/ui/button";
+import { Card, CardContent } from "@/components/ui/card";
+import { Progress } from "@/components/ui/progress";
+import { CreditCard, DollarSign, Users } from "lucide-react";
+import { useState } from "react";
 
 type ViewerFundingHorizontalProps = {
-  projectId: string
-  fundingGoal: number
-}
+	projectId: string;
+	fundingGoal: number;
+};
 
-export function ViewerFundingHorizontal({ projectId, fundingGoal }: ViewerFundingHorizontalProps) {
-  // In a real app, you would fetch this data from an API
-  const [fundingData, setFundingData] = useState({
-    raised: Math.floor(fundingGoal * 0.65), // Example: 65% funded
-    backers: 48,
-    daysLeft: 14,
-  })
+export function ViewerFundingHorizontal({
+	projectId,
+	fundingGoal,
+}: ViewerFundingHorizontalProps) {
+	// In a real app, you would fetch this data from an API
+	const [fundingData, setFundingData] = useState({
+		raised: Math.floor(fundingGoal * 0.65), // Example: 65% funded
+		backers: 48,
+		daysLeft: 14,
+	});
 
-  const percentFunded = (fundingData.raised / fundingGoal) * 100
+	const percentFunded = (fundingData.raised / fundingGoal) * 100;
 
-  return (
-    <Card>
-      <CardContent className="p-6">
-        <div className="grid grid-cols-1 md:grid-cols-4 gap-6 items-center">
-          {/* Funding Progress */}
-          <div className="md:col-span-2 space-y-3">
-            <div className="flex items-baseline justify-between">
-              <span className="text-2xl font-bold">${fundingData.raised.toLocaleString()}</span>
-              <span className="text-muted-foreground">of ${fundingGoal.toLocaleString()} goal</span>
-            </div>
-            <Progress value={percentFunded} className="h-2" />
-            <div className="text-sm text-muted-foreground">
-              {Math.round(percentFunded)}% funded with {fundingData.daysLeft} days to go
-            </div>
-          </div>
+	return (
+		<Card>
+			<CardContent className="p-6">
+				<div className="grid grid-cols-1 md:grid-cols-4 gap-6 items-center">
+					{/* Funding Progress */}
+					<div className="md:col-span-2 space-y-3">
+						<div className="flex items-baseline justify-between">
+							<span className="text-2xl font-bold">
+								${fundingData.raised.toLocaleString()}
+							</span>
+							<span className="text-muted-foreground">
+								of ${fundingGoal.toLocaleString()} goal
+							</span>
+						</div>
+						<Progress value={percentFunded} className="h-2" />
+						<div className="text-sm text-muted-foreground">
+							{Math.round(percentFunded)}% funded with {fundingData.daysLeft}{" "}
+							days to go
+						</div>
+					</div>
 
-          {/* Stats */}
-          <div className="flex justify-between md:justify-around">
-            <div className="text-center">
-              <div className="flex justify-center mb-1">
-                <Users className="h-5 w-5 text-primary" />
-              </div>
-              <div className="text-xl font-medium">{fundingData.backers}</div>
-              <div className="text-xs text-muted-foreground">Backers</div>
-            </div>
+					{/* Stats */}
+					<div className="flex justify-between md:justify-around">
+						<div className="text-center">
+							<div className="flex justify-center mb-1">
+								<Users className="h-5 w-5 text-primary" />
+							</div>
+							<div className="text-xl font-medium">{fundingData.backers}</div>
+							<div className="text-xs text-muted-foreground">Backers</div>
+						</div>
 
-            <div className="text-center">
-              <div className="flex justify-center mb-1">
-                <CreditCard className="h-5 w-5 text-primary" />
-              </div>
-              <div className="text-xl font-medium">{fundingData.daysLeft}</div>
-              <div className="text-xs text-muted-foreground">Days Left</div>
-            </div>
-          </div>
+						<div className="text-center">
+							<div className="flex justify-center mb-1">
+								<CreditCard className="h-5 w-5 text-primary" />
+							</div>
+							<div className="text-xl font-medium">{fundingData.daysLeft}</div>
+							<div className="text-xs text-muted-foreground">Days Left</div>
+						</div>
+					</div>
 
-          {/* Action Button */}
-          <div className="flex justify-center">
-            <Button className="w-full md:w-auto">
-              <DollarSign className="mr-2 h-4 w-4" /> Back This Project
-            </Button>
-          </div>
-        </div>
-      </CardContent>
-    </Card>
-  )
+					{/* Action Button */}
+					<div className="flex justify-center">
+						<Button className="w-full md:w-auto">
+							<DollarSign className="mr-2 h-4 w-4" /> Back This Project
+						</Button>
+					</div>
+				</div>
+			</CardContent>
+		</Card>
+	);
 }
diff --git a/app/(dashboard)/projects/[id]/viewer/viewer-milestones.tsx b/app/(dashboard)/projects/[id]/viewer/viewer-milestones.tsx
index 661a1314..7e062cb3 100644
--- a/app/(dashboard)/projects/[id]/viewer/viewer-milestones.tsx
+++ b/app/(dashboard)/projects/[id]/viewer/viewer-milestones.tsx
@@ -1,178 +1,203 @@
-"use client"
+"use client";
 
-import { Badge } from "@/components/ui/badge"
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
-import { Progress } from "@/components/ui/progress"
-import { Separator } from "@/components/ui/separator"
-import { Calendar, CheckCircle2, Clock } from "lucide-react"
-import { useEffect, useState } from "react"
+import { Badge } from "@/components/ui/badge";
+import {
+	Card,
+	CardContent,
+	CardDescription,
+	CardHeader,
+	CardTitle,
+} from "@/components/ui/card";
+import { Progress } from "@/components/ui/progress";
+import { Separator } from "@/components/ui/separator";
+import { Calendar, CheckCircle2, Clock } from "lucide-react";
+import { useEffect, useState } from "react";
 
 type Milestone = {
-  id: string
-  title: string
-  description: string
-  dueDate: string
-  completedDate: string | null
-  status: "PENDING" | "IN_PROGRESS" | "COMPLETED" | "DELAYED"
-}
+	id: string;
+	title: string;
+	description: string;
+	dueDate: string;
+	completedDate: string | null;
+	status: "PENDING" | "IN_PROGRESS" | "COMPLETED" | "DELAYED";
+};
 
 type ViewerMilestonesProps = {
-  projectId: string
-}
+	projectId: string;
+};
 
 export function ViewerMilestones({ projectId }: ViewerMilestonesProps) {
-  const [milestones, setMilestones] = useState<Milestone[]>([])
-  const [loading, setLoading] = useState(true)
+	const [milestones, setMilestones] = useState<Milestone[]>([]);
+	const [loading, setLoading] = useState(true);
 
-  useEffect(() => {
-    // Mock data - in a real app, you would fetch from API
-    const mockMilestones: Milestone[] = [
-      {
-        id: "1",
-        title: "Project Validation",
-        description: "Gather community support and validate the project idea",
-        dueDate: "2023-12-01",
-        completedDate: "2023-11-28",
-        status: "COMPLETED",
-      },
-      {
-        id: "2",
-        title: "Initial Funding Round",
-        description: "Secure initial funding to begin development",
-        dueDate: "2024-01-15",
-        completedDate: "2024-01-10",
-        status: "COMPLETED",
-      },
-      {
-        id: "3",
-        title: "MVP Development",
-        description: "Develop the minimum viable product",
-        dueDate: "2024-04-30",
-        completedDate: null,
-        status: "IN_PROGRESS",
-      },
-      {
-        id: "4",
-        title: "Beta Testing",
-        description: "Release beta version for community testing",
-        dueDate: "2024-06-15",
-        completedDate: null,
-        status: "PENDING",
-      },
-      {
-        id: "5",
-        title: "Public Launch",
-        description: "Official public launch of the project",
-        dueDate: "2024-08-01",
-        completedDate: null,
-        status: "PENDING",
-      },
-    ]
+	useEffect(() => {
+		// Mock data - in a real app, you would fetch from API
+		const mockMilestones: Milestone[] = [
+			{
+				id: "1",
+				title: "Project Validation",
+				description: "Gather community support and validate the project idea",
+				dueDate: "2023-12-01",
+				completedDate: "2023-11-28",
+				status: "COMPLETED",
+			},
+			{
+				id: "2",
+				title: "Initial Funding Round",
+				description: "Secure initial funding to begin development",
+				dueDate: "2024-01-15",
+				completedDate: "2024-01-10",
+				status: "COMPLETED",
+			},
+			{
+				id: "3",
+				title: "MVP Development",
+				description: "Develop the minimum viable product",
+				dueDate: "2024-04-30",
+				completedDate: null,
+				status: "IN_PROGRESS",
+			},
+			{
+				id: "4",
+				title: "Beta Testing",
+				description: "Release beta version for community testing",
+				dueDate: "2024-06-15",
+				completedDate: null,
+				status: "PENDING",
+			},
+			{
+				id: "5",
+				title: "Public Launch",
+				description: "Official public launch of the project",
+				dueDate: "2024-08-01",
+				completedDate: null,
+				status: "PENDING",
+			},
+		];
 
-    // Simulate API fetch
-    setTimeout(() => {
-      setMilestones(mockMilestones)
-      setLoading(false)
-    }, 500)
-  }, [projectId])
+		// Simulate API fetch
+		setTimeout(() => {
+			setMilestones(mockMilestones);
+			setLoading(false);
+		}, 500);
+	}, [projectId]);
 
-  // Calculate overall progress
-  const completedMilestones = milestones.filter((m) => m.status === "COMPLETED").length
-  const progressPercentage = milestones.length > 0 ? (completedMilestones / milestones.length) * 100 : 0
+	// Calculate overall progress
+	const completedMilestones = milestones.filter(
+		(m) => m.status === "COMPLETED",
+	).length;
+	const progressPercentage =
+		milestones.length > 0 ? (completedMilestones / milestones.length) * 100 : 0;
 
-  // Format date
-  const formatDate = (dateString: string) => {
-    return new Date(dateString).toLocaleDateString("en-US", {
-      year: "numeric",
-      month: "short",
-      day: "numeric",
-    })
-  }
+	// Format date
+	const formatDate = (dateString: string) => {
+		return new Date(dateString).toLocaleDateString("en-US", {
+			year: "numeric",
+			month: "short",
+			day: "numeric",
+		});
+	};
 
-  // Get status badge
-  const getStatusBadge = (status: string) => {
-    switch (status) {
-      case "COMPLETED":
-        return <Badge className="bg-green-500 hover:bg-green-600">Completed</Badge>
-      case "IN_PROGRESS":
-        return <Badge className="bg-blue-500 hover:bg-blue-600">In Progress</Badge>
-      case "DELAYED":
-        return <Badge className="bg-amber-500 hover:bg-amber-600">Delayed</Badge>
-      default:
-        return <Badge variant="outline">Pending</Badge>
-    }
-  }
+	// Get status badge
+	const getStatusBadge = (status: string) => {
+		switch (status) {
+			case "COMPLETED":
+				return (
+					<Badge className="bg-green-500 hover:bg-green-600">Completed</Badge>
+				);
+			case "IN_PROGRESS":
+				return (
+					<Badge className="bg-blue-500 hover:bg-blue-600">In Progress</Badge>
+				);
+			case "DELAYED":
+				return (
+					<Badge className="bg-amber-500 hover:bg-amber-600">Delayed</Badge>
+				);
+			default:
+				return <Badge variant="outline">Pending</Badge>;
+		}
+	};
 
-  if (loading) {
-    return (
-      <Card className="h-[320px]">
-        <CardHeader>
-          <CardTitle>Project Milestones</CardTitle>
-          <CardDescription>Loading milestone data...</CardDescription>
-        </CardHeader>
-        <CardContent>
-          <div className="flex justify-center py-8">
-            <div className="animate-spin h-8 w-8 border-4 border-primary border-t-transparent rounded-full"></div>
-          </div>
-        </CardContent>
-      </Card>
-    )
-  }
+	if (loading) {
+		return (
+			<Card className="h-[320px]">
+				<CardHeader>
+					<CardTitle>Project Milestones</CardTitle>
+					<CardDescription>Loading milestone data...</CardDescription>
+				</CardHeader>
+				<CardContent>
+					<div className="flex justify-center py-8">
+						<div className="animate-spin h-8 w-8 border-4 border-primary border-t-transparent rounded-full" />
+					</div>
+				</CardContent>
+			</Card>
+		);
+	}
 
-  return (
-    <Card className="h-[320px] overflow-y-scroll">
-      <CardHeader>
-        <CardTitle>Project Milestones</CardTitle>
-        <CardDescription>Track the progress of this project through its key milestones</CardDescription>
-      </CardHeader>
-      <CardContent className="h-[calc(320px-85px)] overflow-y-auto">
-        <div className="space-y-4">
-          <div className="space-y-2">
-            <div className="flex justify-between items-center">
-              <span className="text-sm font-medium">Overall Progress</span>
-              <span className="text-sm">
-                {completedMilestones} of {milestones.length} completed
-              </span>
-            </div>
-            <Progress value={progressPercentage} className="h-2" />
-          </div>
+	return (
+		<Card className="h-[320px] overflow-y-scroll">
+			<CardHeader>
+				<CardTitle>Project Milestones</CardTitle>
+				<CardDescription>
+					Track the progress of this project through its key milestones
+				</CardDescription>
+			</CardHeader>
+			<CardContent className="h-[calc(320px-85px)] overflow-y-auto">
+				<div className="space-y-4">
+					<div className="space-y-2">
+						<div className="flex justify-between items-center">
+							<span className="text-sm font-medium">Overall Progress</span>
+							<span className="text-sm">
+								{completedMilestones} of {milestones.length} completed
+							</span>
+						</div>
+						<Progress value={progressPercentage} className="h-2" />
+					</div>
 
-          <div className="space-y-4 mt-4">
-            {milestones.map((milestone) => (
-              <div key={milestone.id} className="border rounded-lg p-4">
-                <div className="flex justify-between items-start">
-                  <div>
-                    <h3 className="font-medium">{milestone.title}</h3>
-                    <p className="text-sm text-muted-foreground mt-1">{milestone.description}</p>
-                  </div>
-                  {getStatusBadge(milestone.status)}
-                </div>
+					<div className="space-y-4 mt-4">
+						{milestones.map((milestone) => (
+							<div key={milestone.id} className="border rounded-lg p-4">
+								<div className="flex justify-between items-start">
+									<div>
+										<h3 className="font-medium">{milestone.title}</h3>
+										<p className="text-sm text-muted-foreground mt-1">
+											{milestone.description}
+										</p>
+									</div>
+									{getStatusBadge(milestone.status)}
+								</div>
 
-                <Separator className="my-3" />
+								<Separator className="my-3" />
 
-                <div className="flex items-center justify-between text-sm">
-                  <div className="flex items-center text-muted-foreground">
-                    <Calendar className="h-4 w-4 mr-1" />
-                    <span>Due: {formatDate(milestone.dueDate)}</span>
-                  </div>
+								<div className="flex items-center justify-between text-sm">
+									<div className="flex items-center text-muted-foreground">
+										<Calendar className="h-4 w-4 mr-1" />
+										<span>Due: {formatDate(milestone.dueDate)}</span>
+									</div>
 
-                  {milestone.status === "COMPLETED" ? (
-                    <div className="flex items-center text-green-500">
-                      <CheckCircle2 className="h-4 w-4 mr-1" />
-                      <span>Completed: {formatDate(milestone.completedDate!)}</span>
-                    </div>
-                  ) : (
-                    <div className="flex items-center text-muted-foreground">
-                      <Clock className="h-4 w-4 mr-1" />
-                      <span>{milestone.status === "IN_PROGRESS" ? "In progress" : "Not started"}</span>
-                    </div>
-                  )}
-                </div>
-              </div>
-            ))}
-          </div>
-        </div>
-      </CardContent>
-    </Card>
-  )
+									{milestone.status === "COMPLETED" ? (
+										<div className="flex items-center text-green-500">
+											<CheckCircle2 className="h-4 w-4 mr-1" />
+											<span>
+												Completed: {formatDate(milestone.completedDate || "")}
+											</span>
+										</div>
+									) : (
+										<div className="flex items-center text-muted-foreground">
+											<Clock className="h-4 w-4 mr-1" />
+											<span>
+												{milestone.status === "IN_PROGRESS"
+													? "In progress"
+													: "Not started"}
+											</span>
+										</div>
+									)}
+								</div>
+							</div>
+						))}
+					</div>
+				</div>
+			</CardContent>
+		</Card>
+	);
 }
diff --git a/app/(dashboard)/projects/[id]/viewer/viewer-project-status.tsx b/app/(dashboard)/projects/[id]/viewer/viewer-project-status.tsx
index 33d3de49..cbe8daf9 100644
--- a/app/(dashboard)/projects/[id]/viewer/viewer-project-status.tsx
+++ b/app/(dashboard)/projects/[id]/viewer/viewer-project-status.tsx
@@ -1,55 +1,55 @@
-import { Badge } from "@/components/ui/badge"
-import { Progress } from "@/components/ui/progress"
+import { Badge } from "@/components/ui/badge";
+import { Progress } from "@/components/ui/progress";
 
-type ValidationStatus = "PENDING" | "REJECTED" | "VALIDATED"
+type ValidationStatus = "PENDING" | "REJECTED" | "VALIDATED";
 
 type ProjectStatusProps = {
-  project: {
-    ideaValidation: ValidationStatus
-    _count: {
-      votes: number
-    }
-  }
-}
+	project: {
+		ideaValidation: ValidationStatus;
+		_count: {
+			votes: number;
+		};
+	};
+};
 
 export function ViewerProjectStatus({ project }: ProjectStatusProps) {
-  // Calculate validation progress
-  const validationProgress =
-    project.ideaValidation === "VALIDATED"
-      ? 100
-      : project.ideaValidation === "REJECTED"
-        ? 0
-        : Math.min(project._count.votes, 100)
+	// Calculate validation progress
+	const validationProgress =
+		project.ideaValidation === "VALIDATED"
+			? 100
+			: project.ideaValidation === "REJECTED"
+				? 0
+				: Math.min(project._count.votes, 100);
 
-  // Determine validation phase
-  const getValidationPhase = () => {
-    switch (project.ideaValidation) {
-      case "VALIDATED":
-        return "Phase 4 of 4"
-      case "REJECTED":
-        return "Rejected"
-      case "PENDING":
-        if (project._count.votes >= 75) return "Phase 3 of 4"
-        if (project._count.votes >= 50) return "Phase 2 of 4"
-        if (project._count.votes >= 25) return "Phase 1 of 4"
-        return "Initial Phase"
-    }
-  }
+	// Determine validation phase
+	const getValidationPhase = () => {
+		switch (project.ideaValidation) {
+			case "VALIDATED":
+				return "Phase 4 of 4";
+			case "REJECTED":
+				return "Rejected";
+			case "PENDING":
+				if (project._count.votes >= 75) return "Phase 3 of 4";
+				if (project._count.votes >= 50) return "Phase 2 of 4";
+				if (project._count.votes >= 25) return "Phase 1 of 4";
+				return "Initial Phase";
+		}
+	};
 
-  return (
-    <div className="space-y-4">
-      <div className="flex justify-between items-center text-sm">
-        <span className="font-medium">Project Validation Status</span>
-        <Badge variant="outline">{getValidationPhase()}</Badge>
-      </div>
-      <Progress value={validationProgress} className="h-2" />
-      <p className="text-sm text-muted-foreground">
-        {project.ideaValidation === "VALIDATED"
-          ? "Project has been validated and is now in funding stage"
-          : project.ideaValidation === "REJECTED"
-            ? "Project did not receive enough community support"
-            : "Currently in community validation phase"}
-      </p>
-    </div>
-  )
+	return (
+		<div className="space-y-4">
+			<div className="flex justify-between items-center text-sm">
+				<span className="font-medium">Project Validation Status</span>
+				<Badge variant="outline">{getValidationPhase()}</Badge>
+			</div>
+			<Progress value={validationProgress} className="h-2" />
+			<p className="text-sm text-muted-foreground">
+				{project.ideaValidation === "VALIDATED"
+					? "Project has been validated and is now in funding stage"
+					: project.ideaValidation === "REJECTED"
+						? "Project did not receive enough community support"
+						: "Currently in community validation phase"}
+			</p>
+		</div>
+	);
 }
diff --git a/app/(dashboard)/projects/[id]/viewer/viewer-team-preview.tsx b/app/(dashboard)/projects/[id]/viewer/viewer-team-preview.tsx
index f2fc1f91..1f9d9f82 100644
--- a/app/(dashboard)/projects/[id]/viewer/viewer-team-preview.tsx
+++ b/app/(dashboard)/projects/[id]/viewer/viewer-team-preview.tsx
@@ -1,46 +1,59 @@
-import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar"
-import { Button } from "@/components/ui/button"
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
+import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
+import { Button } from "@/components/ui/button";
+import {
+	Card,
+	CardContent,
+	CardDescription,
+	CardHeader,
+	CardTitle,
+} from "@/components/ui/card";
 
 type TeamMember = {
-  id: string
-  fullName: string
-  role: string
-  profileImage: string | null
-}
+	id: string;
+	fullName: string;
+	role: string;
+	profileImage: string | null;
+};
 
 type TeamPreviewProps = {
-  teamMembers: TeamMember[]
-}
+	teamMembers: TeamMember[];
+};
 
 export function ViewerTeamPreview({ teamMembers }: TeamPreviewProps) {
-  return (
-    <Card>
-      <CardHeader className="pb-3">
-        <CardTitle className="text-lg">Team Members</CardTitle>
-        <CardDescription>{teamMembers.length} people working on this project</CardDescription>
-      </CardHeader>
-      <CardContent className="p-0">
-        <div className="max-h-[300px] overflow-y-auto px-6 pb-6">
-          {teamMembers.slice(0, 3).map((member) => (
-            <div key={member.id} className="flex items-center space-x-3 py-3">
-              <Avatar className="h-10 w-10">
-                <AvatarImage src={member.profileImage || undefined} alt={member.fullName} />
-                <AvatarFallback>{member.fullName.substring(0, 2).toUpperCase()}</AvatarFallback>
-              </Avatar>
-              <div>
-                <p className="font-medium text-sm">{member.fullName}</p>
-                <p className="text-xs text-muted-foreground">{member.role}</p>
-              </div>
-            </div>
-          ))}
-          {teamMembers.length > 3 && (
-            <Button variant="ghost" size="sm" className="w-full mt-2">
-              View All Team Members
-            </Button>
-          )}
-        </div>
-      </CardContent>
-    </Card>
-  )
+	return (
+		<Card>
+			<CardHeader className="pb-3">
+				<CardTitle className="text-lg">Team Members</CardTitle>
+				<CardDescription>
+					{teamMembers.length} people working on this project
+				</CardDescription>
+			</CardHeader>
+			<CardContent className="p-0">
+				<div className="max-h-[300px] overflow-y-auto px-6 pb-6">
+					{teamMembers.slice(0, 3).map((member) => (
+						<div key={member.id} className="flex items-center space-x-3 py-3">
+							<Avatar className="h-10 w-10">
+								<AvatarImage
+									src={member.profileImage || undefined}
+									alt={member.fullName}
+								/>
+								<AvatarFallback>
+									{member.fullName.substring(0, 2).toUpperCase()}
+								</AvatarFallback>
+							</Avatar>
+							<div>
+								<p className="font-medium text-sm">{member.fullName}</p>
+								<p className="text-xs text-muted-foreground">{member.role}</p>
+							</div>
+						</div>
+					))}
+					{teamMembers.length > 3 && (
+						<Button variant="ghost" size="sm" className="w-full mt-2">
+							View All Team Members
+						</Button>
+					)}
+				</div>
+			</CardContent>
+		</Card>
+	);
 }
diff --git a/app/(dashboard)/projects/[id]/viewer/viewer-team.tsx b/app/(dashboard)/projects/[id]/viewer/viewer-team.tsx
index 5ddb621d..56a1ac69 100644
--- a/app/(dashboard)/projects/[id]/viewer/viewer-team.tsx
+++ b/app/(dashboard)/projects/[id]/viewer/viewer-team.tsx
@@ -1,85 +1,114 @@
-import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar"
-import { Button } from "@/components/ui/button"
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
-import { Github, Linkedin, MessageSquare, Twitter } from "lucide-react"
+import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
+import { Button } from "@/components/ui/button";
+import {
+	Card,
+	CardContent,
+	CardDescription,
+	CardHeader,
+	CardTitle,
+} from "@/components/ui/card";
+import { Github, Linkedin, MessageSquare, Twitter } from "lucide-react";
 
 type TeamMember = {
-  id: string
-  fullName: string
-  role: string
-  bio: string | null
-  profileImage: string | null
-  github: string | null
-  twitter: string | null
-  discord: string | null
-  linkedin: string | null
-}
+	id: string;
+	fullName: string;
+	role: string;
+	bio: string | null;
+	profileImage: string | null;
+	github: string | null;
+	twitter: string | null;
+	discord: string | null;
+	linkedin: string | null;
+};
 
 type ViewerTeamProps = {
-  teamMembers: TeamMember[]
-}
+	teamMembers: TeamMember[];
+};
 
 export function ViewerTeam({ teamMembers }: ViewerTeamProps) {
-  return (
-    <Card className="h-[320px]">
-      <CardHeader>
-        <CardTitle>Team Members</CardTitle>
-        <CardDescription>Meet the people behind this project</CardDescription>
-      </CardHeader>
-      <CardContent className="h-[calc(320px-85px)] overflow-y-auto">
-        <div className="grid gap-6 md:grid-cols-2">
-          {teamMembers.map((member) => (
-            <Card key={member.id} className="overflow-hidden">
-              <div className="bg-gradient-to-r from-primary/10 to-primary/5 p-6">
-                <div className="flex items-center gap-4">
-                  <Avatar className="h-16 w-16 border-2 border-background">
-                    <AvatarImage src={member.profileImage || undefined} alt={member.fullName} />
-                    <AvatarFallback>{member.fullName.substring(0, 2).toUpperCase()}</AvatarFallback>
-                  </Avatar>
-                  <div>
-                    <h3 className="font-medium">{member.fullName}</h3>
-                    <p className="text-sm text-muted-foreground">{member.role}</p>
-                  </div>
-                </div>
-              </div>
-              <CardContent className="p-6">
-                {member.bio && <p className="text-sm mb-4">{member.bio}</p>}
+	return (
+		<Card className="h-[320px]">
+			<CardHeader>
+				<CardTitle>Team Members</CardTitle>
+				<CardDescription>Meet the people behind this project</CardDescription>
+			</CardHeader>
+			<CardContent className="h-[calc(320px-85px)] overflow-y-auto">
+				<div className="grid gap-6 md:grid-cols-2">
+					{teamMembers.map((member) => (
+						<Card key={member.id} className="overflow-hidden">
+							<div className="bg-gradient-to-r from-primary/10 to-primary/5 p-6">
+								<div className="flex items-center gap-4">
+									<Avatar className="h-16 w-16 border-2 border-background">
+										<AvatarImage
+											src={member.profileImage || undefined}
+											alt={member.fullName}
+										/>
+										<AvatarFallback>
+											{member.fullName.substring(0, 2).toUpperCase()}
+										</AvatarFallback>
+									</Avatar>
+									<div>
+										<h3 className="font-medium">{member.fullName}</h3>
+										<p className="text-sm text-muted-foreground">
+											{member.role}
+										</p>
+									</div>
+								</div>
+							</div>
+							<CardContent className="p-6">
+								{member.bio && <p className="text-sm mb-4">{member.bio}</p>}
 
-                <div className="flex flex-wrap gap-2">
-                  {member.github && (
-                    <Button variant="outline" size="sm" asChild>
-                      <a href={member.github} target="_blank" rel="noopener noreferrer">
-                        <Github className="h-4 w-4 mr-1" /> GitHub
-                      </a>
-                    </Button>
-                  )}
-                  {member.twitter && (
-                    <Button variant="outline" size="sm" asChild>
-                      <a href={member.twitter} target="_blank" rel="noopener noreferrer">
-                        <Twitter className="h-4 w-4 mr-1" /> Twitter
-                      </a>
-                    </Button>
-                  )}
-                  {member.linkedin && (
-                    <Button variant="outline" size="sm" asChild>
-                      <a href={member.linkedin} target="_blank" rel="noopener noreferrer">
-                        <Linkedin className="h-4 w-4 mr-1" /> LinkedIn
-                      </a>
-                    </Button>
-                  )}
-                  {member.discord && (
-                    <Button variant="outline" size="sm" asChild>
-                      <a href={`https://discord.com/users/${member.discord}`} target="_blank" rel="noopener noreferrer">
-                        <MessageSquare className="h-4 w-4 mr-1" /> Discord
-                      </a>
-                    </Button>
-                  )}
-                </div>
-              </CardContent>
-            </Card>
-          ))}
-        </div>
-      </CardContent>
-    </Card>
-  )
+								<div className="flex flex-wrap gap-2">
+									{member.github && (
+										<Button variant="outline" size="sm" asChild>
+											<a
+												href={member.github}
+												target="_blank"
+												rel="noopener noreferrer"
+											>
+												<Github className="h-4 w-4 mr-1" /> GitHub
+											</a>
+										</Button>
+									)}
+									{member.twitter && (
+										<Button variant="outline" size="sm" asChild>
+											<a
+												href={member.twitter}
+												target="_blank"
+												rel="noopener noreferrer"
+											>
+												<Twitter className="h-4 w-4 mr-1" /> Twitter
+											</a>
+										</Button>
+									)}
+									{member.linkedin && (
+										<Button variant="outline" size="sm" asChild>
+											<a
+												href={member.linkedin}
+												target="_blank"
+												rel="noopener noreferrer"
+											>
+												<Linkedin className="h-4 w-4 mr-1" /> LinkedIn
+											</a>
+										</Button>
+									)}
+									{member.discord && (
+										<Button variant="outline" size="sm" asChild>
+											<a
+												href={`https://discord.com/users/${member.discord}`}
+												target="_blank"
+												rel="noopener noreferrer"
+											>
+												<MessageSquare className="h-4 w-4 mr-1" /> Discord
+											</a>
+										</Button>
+									)}
+								</div>
+							</CardContent>
+						</Card>
+					))}
+				</div>
+			</CardContent>
+		</Card>
+	);
 }
diff --git a/app/(dashboard)/projects/[id]/viewer/viewer-voting.tsx b/app/(dashboard)/projects/[id]/viewer/viewer-voting.tsx
index 36f13d53..7db1959a 100644
--- a/app/(dashboard)/projects/[id]/viewer/viewer-voting.tsx
+++ b/app/(dashboard)/projects/[id]/viewer/viewer-voting.tsx
@@ -1,120 +1,134 @@
-"use client"
+"use client";
 
-import { Button } from "@/components/ui/button"
-import { Progress } from "@/components/ui/progress"
-import { ThumbsUp, Users } from "lucide-react"
-import { useState } from "react"
+import { Button } from "@/components/ui/button";
+import { Progress } from "@/components/ui/progress";
+import { ThumbsUp, Users } from "lucide-react";
+import { useState } from "react";
 
-type ValidationStatus = "PENDING" | "REJECTED" | "VALIDATED"
+type ValidationStatus = "PENDING" | "REJECTED" | "VALIDATED";
 
 type ViewerVotingProps = {
-  projectId: string
-  voteCount: number
-  userVoted: boolean
-  status: ValidationStatus
-  compact?: boolean
-}
-
-export function ViewerVoting({ projectId, voteCount, userVoted, status, compact = false }: ViewerVotingProps) {
-  const [votes, setVotes] = useState(voteCount)
-  const [hasVoted, setHasVoted] = useState(userVoted)
-  const [isVoting, setIsVoting] = useState(false)
-
-  const handleVote = async () => {
-    if (hasVoted || status !== "PENDING") return
-
-    setIsVoting(true)
-
-    try {
-      // In a real app, you would make an API call here
-      // const response = await fetch(`/api/projects/${projectId}/vote`, {
-      //   method: 'POST',
-      // })
-
-      // Simulate API call
-      await new Promise((resolve) => setTimeout(resolve, 500))
-
-      setVotes((prev) => prev + 1)
-      setHasVoted(true)
-    } catch (error) {
-      console.error("Failed to vote:", error)
-    } finally {
-      setIsVoting(false)
-    }
-  }
-
-  // Calculate progress towards validation
-  const validationThreshold = 100 // Example threshold
-  const progressPercentage = Math.min((votes / validationThreshold) * 100, 100)
-
-  if (compact) {
-    return (
-      <div className="space-y-4">
-        <div className="flex items-center justify-between">
-          <div className="flex items-center">
-            <Users className="h-5 w-5 mr-2 text-muted-foreground" />
-            <span className="text-xl font-bold">{votes}</span>
-            <span className="ml-2 text-muted-foreground">votes</span>
-          </div>
-
-          <Button onClick={handleVote} disabled={hasVoted || status !== "PENDING" || isVoting} size="sm">
-            <ThumbsUp className="h-4 w-4 mr-2" />
-            {isVoting ? "Voting..." : hasVoted ? "Voted" : "Vote"}
-          </Button>
-        </div>
-
-        <div className="space-y-2">
-          <div className="flex justify-between text-sm">
-            <span>Progress towards validation</span>
-            <span>{Math.round(progressPercentage)}%</span>
-          </div>
-          <Progress value={progressPercentage} className="h-2" />
-        </div>
-      </div>
-    )
-  }
-
-  return (
-    <div className="space-y-6">
-      <div className="flex items-center justify-between">
-        <div className="flex items-center">
-          <Users className="h-5 w-5 mr-2 text-muted-foreground" />
-          <span className="text-2xl font-bold">{votes}</span>
-          <span className="ml-2 text-muted-foreground">community votes</span>
-        </div>
-
-        <Button onClick={handleVote} disabled={hasVoted || status !== "PENDING" || isVoting} className="gap-2">
-          <ThumbsUp className="h-4 w-4" />
-          {isVoting ? "Voting..." : hasVoted ? "Voted" : "Vote"}
-        </Button>
-      </div>
-
-      <div className="space-y-2">
-        <div className="flex justify-between text-sm">
-          <span>Progress towards validation</span>
-          <span>{Math.round(progressPercentage)}%</span>
-        </div>
-        <Progress value={progressPercentage} className="h-2" />
-        <p className="text-sm text-muted-foreground">
-          {status === "VALIDATED"
-            ? "This project has been validated by the community and is now in the funding stage."
-            : status === "REJECTED"
-              ? "This project did not receive enough community support and has been rejected."
-              : `This project needs ${validationThreshold - votes} more votes to reach validation.`}
-        </p>
-      </div>
-
-      {status === "PENDING" && !compact && (
-        <div className="bg-muted p-4 rounded-lg text-sm">
-          <p className="font-medium">Why vote for this project?</p>
-          <ul className="list-disc list-inside overflow-y-scroll mt-2 text-muted-foreground space-y-1">
-            <li>Voting helps validate promising projects</li>
-            <li>Validated projects move to the funding stage</li>
-            <li>Your vote directly influences which innovations get built</li>
-            <li>No cost to vote - just show your support</li>
-          </ul>
-        </div>
-      )}
-    </div>
-  )
+	projectId: string;
+	voteCount: number;
+	userVoted: boolean;
+	status: ValidationStatus;
+	compact?: boolean;
+};
+
+export function ViewerVoting({
+	projectId,
+	voteCount,
+	userVoted,
+	status,
+	compact = false,
+}: ViewerVotingProps) {
+	const [votes, setVotes] = useState(voteCount);
+	const [hasVoted, setHasVoted] = useState(userVoted);
+	const [isVoting, setIsVoting] = useState(false);
+
+	const handleVote = async () => {
+		if (hasVoted || status !== "PENDING") return;
+
+		setIsVoting(true);
+
+		try {
+			// In a real app, you would make an API call here
+			// const response = await fetch(`/api/projects/${projectId}/vote`, {
+			//   method: 'POST',
+			// })
+
+			// Simulate API call
+			await new Promise((resolve) => setTimeout(resolve, 500));
+
+			setVotes((prev) => prev + 1);
+			setHasVoted(true);
+		} catch (error) {
+			console.error("Failed to vote:", error);
+		} finally {
+			setIsVoting(false);
+		}
+	};
+
+	// Calculate progress towards validation
+	const validationThreshold = 100; // Example threshold
+	const progressPercentage = Math.min((votes / validationThreshold) * 100, 100);
+
+	if (compact) {
+		return (
+			<div className="space-y-4">
+				<div className="flex items-center justify-between">
+					<div className="flex items-center">
+						<Users className="h-5 w-5 mr-2 text-muted-foreground" />
+						<span className="text-xl font-bold">{votes}</span>
+						<span className="ml-2 text-muted-foreground">votes</span>
+					</div>
+
+					<Button
+						onClick={handleVote}
+						disabled={hasVoted || status !== "PENDING" || isVoting}
+						size="sm"
+					>
+						<ThumbsUp className="h-4 w-4 mr-2" />
+						{isVoting ? "Voting..." : hasVoted ? "Voted" : "Vote"}
+					</Button>
+				</div>
+
+				<div className="space-y-2">
+					<div className="flex justify-between text-sm">
+						<span>Progress towards validation</span>
+						<span>{Math.round(progressPercentage)}%</span>
+					</div>
+					<Progress value={progressPercentage} className="h-2" />
+				</div>
+			</div>
+		);
+	}
+
+	return (
+		<div className="space-y-6">
+			<div className="flex items-center justify-between">
+				<div className="flex items-center">
+					<Users className="h-5 w-5 mr-2 text-muted-foreground" />
+					<span className="text-2xl font-bold">{votes}</span>
+					<span className="ml-2 text-muted-foreground">community votes</span>
+				</div>
+
+				<Button
+					onClick={handleVote}
+					disabled={hasVoted || status !== "PENDING" || isVoting}
+					className="gap-2"
+				>
+					<ThumbsUp className="h-4 w-4" />
+					{isVoting ? "Voting..." : hasVoted ? "Voted" : "Vote"}
+				</Button>
+			</div>
+
+			<div className="space-y-2">
+				<div className="flex justify-between text-sm">
+					<span>Progress towards validation</span>
+					<span>{Math.round(progressPercentage)}%</span>
+				</div>
+				<Progress value={progressPercentage} className="h-2" />
+				<p className="text-sm text-muted-foreground">
+					{status === "VALIDATED"
+						? "This project has been validated by the community and is now in the funding stage."
+						: status === "REJECTED"
+							? "This project did not receive enough community support and has been rejected."
+							: `This project needs ${validationThreshold - votes} more votes to reach validation.`}
+				</p>
+			</div>
+
+			{status === "PENDING" && !compact && (
+				<div className="bg-muted p-4 rounded-lg text-sm">
+					<p className="font-medium">Why vote for this project?</p>
+					<ul className="list-disc list-inside overflow-y-scroll mt-2 text-muted-foreground space-y-1">
+						<li>Voting helps validate promising projects</li>
+						<li>Validated projects move to the funding stage</li>
+						<li>Your vote directly influences which innovations get built</li>
+						<li>No cost to vote - just show your support</li>
+					</ul>
+				</div>
+			)}
+		</div>
+	);
 }
diff --git a/app/(dashboard)/projects/edit/[id]/milestone-form.tsx b/app/(dashboard)/projects/edit/[id]/milestone-form.tsx
new file mode 100644
index 00000000..18f7778e
--- /dev/null
+++ b/app/(dashboard)/projects/edit/[id]/milestone-form.tsx
@@ -0,0 +1,174 @@
+"use client";
+
+import { Button } from "@/components/ui/button";
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogFooter,
+	DialogHeader,
+	DialogTitle,
+	DialogTrigger,
+} from "@/components/ui/dialog";
+import {
+	Form,
+	FormControl,
+	FormDescription,
+	FormField,
+	FormItem,
+	FormLabel,
+	FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Plus } from "lucide-react";
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import * as z from "zod";
+
+const milestoneFormSchema = z.object({
+	title: z.string().min(1, "Title is required"),
+	description: z.string().min(1, "Description is required"),
+	dueDate: z.string().optional(),
+	progress: z.number().min(0).max(100).optional(),
+});
+
+type MilestoneFormValues = z.infer<typeof milestoneFormSchema>;
+
+interface MilestoneFormProps {
+	projectId: string;
+	onSuccess?: () => void;
+}
+
+export function MilestoneForm({ projectId, onSuccess }: MilestoneFormProps) {
+	const [open, setOpen] = useState(false);
+
+	const form = useForm<MilestoneFormValues>({
+		resolver: zodResolver(milestoneFormSchema),
+		defaultValues: {
+			title: "",
+			description: "",
+			dueDate: "",
+			progress: 0,
+		},
+	});
+
+	async function onSubmit(data: MilestoneFormValues) {
+		try {
+			const response = await fetch(`/api/projects/${projectId}/milestones`, {
+				method: "POST",
+				headers: {
+					"Content-Type": "application/json",
+				},
+				body: JSON.stringify(data),
+			});
+
+			if (!response.ok) {
+				throw new Error("Failed to create milestone");
+			}
+
+			toast.success("Milestone created successfully");
+
+			form.reset();
+			setOpen(false);
+			onSuccess?.();
+		} catch (error) {
+			toast.error("Failed to create milestone");
+		}
+	}
+
+	return (
+		<Dialog open={open} onOpenChange={setOpen}>
+			<DialogTrigger asChild>
+				<Button size="sm">
+					<Plus className="mr-2 h-4 w-4" /> Add Milestone
+				</Button>
+			</DialogTrigger>
+			<DialogContent className="sm:max-w-[425px]">
+				<DialogHeader>
+					<DialogTitle>Add New Milestone</DialogTitle>
+					<DialogDescription>
+						Create a new milestone for your project. Fill in the details below.
+					</DialogDescription>
+				</DialogHeader>
+				<Form {...form}>
+					<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
+						<FormField
+							control={form.control}
+							name="title"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Title</FormLabel>
+									<FormControl>
+										<Input placeholder="Enter milestone title" {...field} />
+									</FormControl>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="description"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Description</FormLabel>
+									<FormControl>
+										<Textarea
+											placeholder="Enter milestone description"
+											className="min-h-[100px]"
+											{...field}
+										/>
+									</FormControl>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="dueDate"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Due Date</FormLabel>
+									<FormControl>
+										<Input type="date" {...field} />
+									</FormControl>
+									<FormDescription>
+										Optional: Set a target completion date
+									</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<FormField
+							control={form.control}
+							name="progress"
+							render={({ field }) => (
+								<FormItem>
+									<FormLabel>Progress</FormLabel>
+									<FormControl>
+										<Input
+											type="number"
+											min="0"
+											max="100"
+											{...field}
+											onChange={(e) => field.onChange(Number(e.target.value))}
+										/>
+									</FormControl>
+									<FormDescription>
+										Set the current progress (0-100%)
+									</FormDescription>
+									<FormMessage />
+								</FormItem>
+							)}
+						/>
+						<DialogFooter>
+							<Button type="submit">Create Milestone</Button>
+						</DialogFooter>
+					</form>
+				</Form>
+			</DialogContent>
+		</Dialog>
+	);
+}
diff --git a/app/(dashboard)/projects/edit/[id]/milestone-tracker.tsx b/app/(dashboard)/projects/edit/[id]/milestone-tracker.tsx
index e1cd63a4..8e034a55 100644
--- a/app/(dashboard)/projects/edit/[id]/milestone-tracker.tsx
+++ b/app/(dashboard)/projects/edit/[id]/milestone-tracker.tsx
@@ -1,81 +1,150 @@
 "use client";
 
 import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { AlertCircle, Check, Clock, Plus } from "lucide-react";
+import { AlertCircle, Check, Clock } from "lucide-react";
+import { useEffect, useState } from "react";
+import { MilestoneForm } from "./milestone-form";
+
+interface Milestone {
+	id: string;
+	title: string;
+	description: string;
+	dueDate: string | null;
+	progress: number;
+	status: "PENDING" | "IN_PROGRESS" | "COMPLETED";
+}
 
 interface MilestoneTrackerProps {
 	isTeamMember: boolean;
+	projectId: string;
 }
 
-export function MilestoneTracker({ isTeamMember }: MilestoneTrackerProps) {
+export function MilestoneTracker({
+	isTeamMember,
+	projectId,
+}: MilestoneTrackerProps) {
+	const [milestones, setMilestones] = useState<Milestone[]>([]);
+	const [loading, setLoading] = useState(true);
+
+	const fetchMilestones = async () => {
+		try {
+			const response = await fetch(`/api/projects/${projectId}/milestones`);
+			if (!response.ok) throw new Error("Failed to fetch milestones");
+			const data = await response.json();
+			setMilestones(data);
+		} catch (error) {
+			console.error("Error fetching milestones:", error);
+		} finally {
+			setLoading(false);
+		}
+	};
+
+	useEffect(() => {
+		fetchMilestones();
+	}, [projectId]);
+
+	const getStatusIcon = (status: Milestone["status"]) => {
+		switch (status) {
+			case "COMPLETED":
+				return (
+					<div className="flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-green-500">
+						<Check className="h-4 w-4 text-white" />
+					</div>
+				);
+			case "IN_PROGRESS":
+				return (
+					<div className="flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-blue-500">
+						<Clock className="h-4 w-4 text-white" />
+					</div>
+				);
+			default:
+				return (
+					<div className="flex h-6 w-6 shrink-0 items-center justify-center rounded-full border-2">
+						<AlertCircle className="h-4 w-4 text-muted-foreground" />
+					</div>
+				);
+		}
+	};
+
+	const getStatusBadge = (status: Milestone["status"]) => {
+		switch (status) {
+			case "COMPLETED":
+				return <Badge variant="secondary">Completed</Badge>;
+			case "IN_PROGRESS":
+				return <Badge>In Progress</Badge>;
+			default:
+				return <Badge variant="secondary">Pending</Badge>;
+		}
+	};
+
+	if (loading) {
+		return (
+			<Card>
+				<CardHeader>
+					<CardTitle>Project Milestones</CardTitle>
+				</CardHeader>
+				<CardContent>
+					<div className="text-center text-muted-foreground">
+						Loading milestones...
+					</div>
+				</CardContent>
+			</Card>
+		);
+	}
+
 	return (
 		<Card>
 			<CardHeader>
 				<div className="flex items-center justify-between">
 					<CardTitle>Project Milestones</CardTitle>
 					{isTeamMember && (
-						<Button size="sm">
-							<Plus className="mr-2 h-4 w-4" /> Add Milestone
-						</Button>
+						<MilestoneForm projectId={projectId} onSuccess={fetchMilestones} />
 					)}
 				</div>
 			</CardHeader>
 			<CardContent>
 				<div className="space-y-6">
-					{/* Completed Milestone */}
-					<div className="flex gap-4">
-						<div className="flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-green-500">
-							<Check className="h-4 w-4 text-white" />
+					{milestones.length === 0 ? (
+						<div className="text-center text-muted-foreground">
+							No milestones yet.{" "}
+							{isTeamMember && "Add your first milestone to get started!"}
 						</div>
-						<div className="flex-1 space-y-2">
-							<div className="flex items-center justify-between">
-								<h4 className="font-medium">Initial Planning</h4>
-								<Badge variant="secondary">Completed</Badge>
+					) : (
+						milestones.map((milestone) => (
+							<div key={milestone.id} className="flex gap-4">
+								{getStatusIcon(milestone.status)}
+								<div className="flex-1 space-y-2">
+									<div className="flex items-center justify-between">
+										<h4 className="font-medium">{milestone.title}</h4>
+										{getStatusBadge(milestone.status)}
+									</div>
+									<p className="text-sm text-muted-foreground">
+										{milestone.description}
+									</p>
+									{milestone.dueDate && (
+										<p className="text-xs text-muted-foreground">
+											Due: {new Date(milestone.dueDate).toLocaleDateString()}
+										</p>
+									)}
+									{milestone.progress > 0 && (
+										<div className="mt-2">
+											<div className="flex justify-between text-xs text-muted-foreground">
+												<span>Progress</span>
+												<span>{milestone.progress}%</span>
+											</div>
+											<div className="h-1.5 w-full overflow-hidden rounded-full bg-muted">
+												<div
+													className="h-full bg-primary transition-all"
+													style={{ width: `${milestone.progress}%` }}
+												/>
+											</div>
+										</div>
+									)}
+								</div>
 							</div>
-							<p className="text-sm text-muted-foreground">
-								Project scope and timeline defined
-							</p>
-						</div>
-					</div>
-
-					{/* Current Milestone */}
-					<div className="flex gap-4">
-						<div className="flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-blue-500">
-							<Clock className="h-4 w-4 text-white" />
-						</div>
-						<div className="flex-1 space-y-2">
-							<div className="flex items-center justify-between">
-								<h4 className="font-medium">Development Phase</h4>
-								<Badge>In Progress</Badge>
-							</div>
-							<p className="text-sm text-muted-foreground">
-								Core features implementation
-							</p>
-							{isTeamMember && (
-								<Button variant="outline" size="sm">
-									Submit for Review
-								</Button>
-							)}
-						</div>
-					</div>
-
-					{/* Upcoming Milestone */}
-					<div className="flex gap-4">
-						<div className="flex h-6 w-6 shrink-0 items-center justify-center rounded-full border-2">
-							<AlertCircle className="h-4 w-4 text-muted-foreground" />
-						</div>
-						<div className="flex-1 space-y-2">
-							<div className="flex items-center justify-between">
-								<h4 className="font-medium">Testing & Launch</h4>
-								<Badge variant="secondary">Upcoming</Badge>
-							</div>
-							<p className="text-sm text-muted-foreground">
-								Final testing and public launch
-							</p>
-						</div>
-					</div>
+						))
+					)}
 				</div>
 			</CardContent>
 		</Card>
diff --git a/app/(dashboard)/projects/edit/[id]/page.tsx b/app/(dashboard)/projects/edit/[id]/page.tsx
index ee40564a..37669efc 100644
--- a/app/(dashboard)/projects/edit/[id]/page.tsx
+++ b/app/(dashboard)/projects/edit/[id]/page.tsx
@@ -210,65 +210,37 @@ export default function ProjectPage() {
 					</div>
 				</div>
 
-				<Tabs defaultValue="description" className="mt-6">
-					<TabsList className="w-full justify-start overflow-x-auto">
-						<TabsTrigger value="description">Description</TabsTrigger>
+				<Tabs defaultValue="milestones" className="mt-6">
+					<TabsList className="grid w-full grid-cols-2 lg:grid-cols-5">
 						<TabsTrigger value="milestones">Milestones</TabsTrigger>
-						<TabsTrigger value="voting">Voting</TabsTrigger>
 						<TabsTrigger value="funding">Funding</TabsTrigger>
 						<TabsTrigger value="team">Team</TabsTrigger>
+						<TabsTrigger value="voting">Voting</TabsTrigger>
 						<TabsTrigger value="comments">Comments</TabsTrigger>
 					</TabsList>
 
-					<TabsContent value="description" className="mt-6 space-y-6">
-						<Card>
-							<CardContent className="pt-6">
-								<div className="prose max-w-none dark:prose-invert">
-									<h3 className="font-semibold">About the Project</h3>
-									<p>{project.description}</p>
-									<div className="not-prose grid gap-4 md:grid-cols-2 mt-4">
-										<Button variant="outline" className="w-full">
-											View Pitch Deck
-										</Button>
-										<Button variant="outline" className="w-full">
-											View Whitepaper
-										</Button>
-									</div>
-								</div>
-							</CardContent>
-						</Card>
+					<TabsContent value="funding">
+						<FundingSection project={project} />
 					</TabsContent>
 
-					<TabsContent value="milestones" className="mt-6">
-						<MilestoneTracker isTeamMember={!!isTeamMember} />
+					<TabsContent value="team">
+						<TeamSection project={project} />
 					</TabsContent>
 
-					<TabsContent value="voting" className="mt-6">
-						<VotingSection
-							projectId={project.id}
-							initialVoteCount={project._count.votes}
-							initialUserVoted={project.votes.some(
-								(vote) => vote.userId === session?.user?.id,
-							)}
-							ideaValidation={project.ideaValidation}
-						/>
+					<TabsContent value="voting">
+						<VotingSection project={project} />
 					</TabsContent>
 
-					<TabsContent value="funding" className="mt-6">
-						<FundingSection projectId={project.id} />
+					<TabsContent value="comments">
+						<CommentsSection project={project} />
 					</TabsContent>
 
-					<TabsContent value="team" className="mt-6">
-						<TeamSection
-							projectId={project.id}
-							teamMembers={project.teamMembers}
+					<TabsContent value="milestones">
+						<MilestoneTracker
 							isTeamMember={!!isTeamMember}
+							projectId={project.id}
 						/>
 					</TabsContent>
-
-					<TabsContent value="comments" className="mt-6">
-						<CommentsSection projectId={project.id} />
-					</TabsContent>
 				</Tabs>
 			</div>
 		</div>
diff --git a/app/(dashboard)/projects/new/page.tsx b/app/(dashboard)/projects/new/page.tsx
index e28aeb9a..f165f1a5 100644
--- a/app/(dashboard)/projects/new/page.tsx
+++ b/app/(dashboard)/projects/new/page.tsx
@@ -1,18 +1,19 @@
-import { ProjectForm } from "@/components/project-form";
+import { ProjectFormWrapper } from "@/components/project-form-wrapper";
 import { authOptions } from "@/lib/auth.config";
 import { getServerSession } from "next-auth/next";
-import React from "react";
 
 const Page = async () => {
 	const session = await getServerSession(authOptions);
 
 	return (
-		<div className="container max-w-2xl py-8">
+		<div className="container max-w-3sxl py-8">
 			<div className="mb-8">
 				<h1 className="text-3xl font-bold">Create a New Project</h1>
-				<p className="text-muted-foreground">Submit your project for funding</p>
+				<p className="text-muted-foreground">
+					Submit your project for funding on the Stellar blockchain
+				</p>
 			</div>
-			<ProjectForm userId={session?.user?.id} />
+			<ProjectFormWrapper userId={session?.user?.id} />
 		</div>
 	);
 };
diff --git a/app/api/auth/register/route.ts b/app/api/auth/register/route.ts
index 28908b74..67411088 100644
--- a/app/api/auth/register/route.ts
+++ b/app/api/auth/register/route.ts
@@ -70,6 +70,7 @@ export async function POST(req: Request) {
 				{ status: 400 },
 			);
 		}
+		console.error("Error during registration:", error);
 		return NextResponse.json(
 			{ message: "An error occurred during registration" },
 			{ status: 500 },
diff --git a/app/api/projects/[id]/milestones/[milestoneId]/attachments/route.ts b/app/api/projects/[id]/milestones/[milestoneId]/attachments/route.ts
new file mode 100644
index 00000000..6348b327
--- /dev/null
+++ b/app/api/projects/[id]/milestones/[milestoneId]/attachments/route.ts
@@ -0,0 +1,155 @@
+import { authOptions } from "@/lib/auth.config";
+import prisma from "@/lib/prisma";
+import { getServerSession } from "next-auth";
+import { type NextRequest, NextResponse } from "next/server";
+
+export async function POST(
+	request: NextRequest,
+	{ params }: { params: { id: string; milestoneId: string } },
+) {
+	try {
+		const session = await getServerSession(authOptions);
+		if (!session) {
+			return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+		}
+
+		const { id: projectId, milestoneId } = params;
+		if (!projectId || !milestoneId) {
+			return NextResponse.json(
+				{ error: "Project ID and Milestone ID are required" },
+				{ status: 400 },
+			);
+		}
+
+		// Check if project exists and user has permission
+		const project = await prisma.project.findUnique({
+			where: { id: projectId },
+			include: {
+				teamMembers: {
+					where: { userId: session.user.id },
+				},
+			},
+		});
+
+		if (!project) {
+			return NextResponse.json({ error: "Project not found" }, { status: 404 });
+		}
+
+		// Check if user is the project owner or a team member
+		const isTeamMember =
+			project.userId === session.user.id || project.teamMembers.length > 0;
+		if (!isTeamMember) {
+			return NextResponse.json(
+				{
+					error:
+						"You don't have permission to add attachments to this milestone",
+				},
+				{ status: 403 },
+			);
+		}
+
+		// Get the milestone
+		const milestone = await prisma.milestone.findUnique({
+			where: { id: milestoneId },
+		});
+
+		if (!milestone) {
+			return NextResponse.json(
+				{ error: "Milestone not found" },
+				{ status: 404 },
+			);
+		}
+
+		// Check if milestone belongs to the project
+		if (milestone.projectId !== projectId) {
+			return NextResponse.json(
+				{ error: "Milestone does not belong to this project" },
+				{ status: 400 },
+			);
+		}
+
+		const formData = await request.formData();
+		const file = formData.get("file") as File;
+
+		if (!file) {
+			return NextResponse.json({ error: "File is required" }, { status: 400 });
+		}
+
+		// In a real application, you would upload the file to a storage service
+		// For this example, we'll just create a placeholder URL
+		const fileUrl = `/uploads/${Date.now()}-${file.name}`;
+
+		// Create the attachment
+		const attachment = await prisma.milestoneAttachment.create({
+			data: {
+				fileName: file.name,
+				fileUrl,
+				fileType: file.type,
+				fileSize: file.size,
+				milestoneId,
+			},
+		});
+
+		return NextResponse.json(attachment, { status: 201 });
+	} catch (error) {
+		console.error("Error creating attachment:", error);
+		return NextResponse.json(
+			{ error: "Failed to create attachment" },
+			{ status: 500 },
+		);
+	}
+}
+
+export async function GET(
+	request: NextRequest,
+	{ params }: { params: { id: string; milestoneId: string } },
+) {
+	try {
+		const session = await getServerSession(authOptions);
+		if (!session) {
+			return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+		}
+
+		const { id: projectId, milestoneId } = params;
+		if (!projectId || !milestoneId) {
+			return NextResponse.json(
+				{ error: "Project ID and Milestone ID are required" },
+				{ status: 400 },
+			);
+		}
+
+		// Get the milestone
+		const milestone = await prisma.milestone.findUnique({
+			where: { id: milestoneId },
+		});
+
+		if (!milestone) {
+			return NextResponse.json(
+				{ error: "Milestone not found" },
+				{ status: 404 },
+			);
+		}
+
+		// Check if milestone belongs to the project
+		if (milestone.projectId !== projectId) {
+			return NextResponse.json(
+				{ error: "Milestone does not belong to this project" },
+				{ status: 400 },
+			);
+		}
+
+		// Get the attachments
+		const attachments = await prisma.milestoneAttachment.findMany({
+			where: { milestoneId },
+			orderBy: { createdAt: "desc" },
+		});
+
+		return NextResponse.json(attachments);
+	} catch (error) {
+		console.error("Error fetching attachments:", error);
+		return NextResponse.json(
+			{ error: "Failed to fetch attachments" },
+			{ status: 500 },
+		);
+	}
+}
diff --git a/app/api/projects/[id]/milestones/[milestoneId]/route.ts b/app/api/projects/[id]/milestones/[milestoneId]/route.ts
new file mode 100644
index 00000000..41a25ed9
--- /dev/null
+++ b/app/api/projects/[id]/milestones/[milestoneId]/route.ts
@@ -0,0 +1,229 @@
+import { authOptions } from "@/lib/auth.config";
+import prisma from "@/lib/prisma";
+import { getServerSession } from "next-auth";
+import { type NextRequest, NextResponse } from "next/server";
+
+export async function GET(
+	request: NextRequest,
+	{ params }: { params: { id: string; milestoneId: string } },
+) {
+	try {
+		const session = await getServerSession(authOptions);
+		if (!session) {
+			return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+		}
+
+		const { id: projectId, milestoneId } = params;
+		if (!projectId || !milestoneId) {
+			return NextResponse.json(
+				{ error: "Project ID and Milestone ID are required" },
+				{ status: 400 },
+			);
+		}
+
+		// Get the milestone
+		const milestone = await prisma.milestone.findUnique({
+			where: { id: milestoneId },
+			include: {
+				attachments: true,
+			},
+		});
+
+		if (!milestone) {
+			return NextResponse.json(
+				{ error: "Milestone not found" },
+				{ status: 404 },
+			);
+		}
+
+		// Check if milestone belongs to the project
+		if (milestone.projectId !== projectId) {
+			return NextResponse.json(
+				{ error: "Milestone does not belong to this project" },
+				{ status: 400 },
+			);
+		}
+
+		return NextResponse.json(milestone);
+	} catch (error) {
+		console.error("Error fetching milestone:", error);
+		return NextResponse.json(
+			{ error: "Failed to fetch milestone" },
+			{ status: 500 },
+		);
+	}
+}
+
+export async function PATCH(
+	request: NextRequest,
+	{ params }: { params: { id: string; milestoneId: string } },
+) {
+	try {
+		const session = await getServerSession(authOptions);
+		if (!session) {
+			return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+		}
+
+		const { id: projectId, milestoneId } = params;
+		if (!projectId || !milestoneId) {
+			return NextResponse.json(
+				{ error: "Project ID and Milestone ID are required" },
+				{ status: 400 },
+			);
+		}
+
+		// Check if project exists and user has permission
+		const project = await prisma.project.findUnique({
+			where: { id: projectId },
+			include: {
+				teamMembers: {
+					where: { userId: session.user.id },
+				},
+			},
+		});
+
+		if (!project) {
+			return NextResponse.json({ error: "Project not found" }, { status: 404 });
+		}
+
+		// Check if user is the project owner or a team member
+		const isTeamMember =
+			project.userId === session.user.id || project.teamMembers.length > 0;
+		if (!isTeamMember) {
+			return NextResponse.json(
+				{
+					error:
+						"You don't have permission to update milestones for this project",
+				},
+				{ status: 403 },
+			);
+		}
+
+		// Get the milestone
+		const milestone = await prisma.milestone.findUnique({
+			where: { id: milestoneId },
+		});
+
+		if (!milestone) {
+			return NextResponse.json(
+				{ error: "Milestone not found" },
+				{ status: 404 },
+			);
+		}
+
+		// Check if milestone belongs to the project
+		if (milestone.projectId !== projectId) {
+			return NextResponse.json(
+				{ error: "Milestone does not belong to this project" },
+				{ status: 400 },
+			);
+		}
+
+		const body = await request.json();
+		const { title, description, status, dueDate, progress } = body;
+
+		// Update the milestone
+		const updatedMilestone = await prisma.milestone.update({
+			where: { id: milestoneId },
+			data: {
+				title: title || milestone.title,
+				description:
+					description !== undefined ? description : milestone.description,
+				status: status || milestone.status,
+				dueDate: dueDate ? new Date(dueDate) : milestone.dueDate,
+				progress: progress !== undefined ? progress : milestone.progress,
+				completedAt:
+					status === "COMPLETED" ? new Date() : milestone.completedAt,
+				updatedBy: session.user.id,
+			},
+		});
+
+		return NextResponse.json(updatedMilestone);
+	} catch (error) {
+		console.error("Error updating milestone:", error);
+		return NextResponse.json(
+			{ error: "Failed to update milestone" },
+			{ status: 500 },
+		);
+	}
+}
+
+export async function DELETE(
+	request: NextRequest,
+	{ params }: { params: { id: string; milestoneId: string } },
+) {
+	try {
+		const session = await getServerSession(authOptions);
+		if (!session) {
+			return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+		}
+
+		const { id: projectId, milestoneId } = params;
+		if (!projectId || !milestoneId) {
+			return NextResponse.json(
+				{ error: "Project ID and Milestone ID are required" },
+				{ status: 400 },
+			);
+		}
+
+		// Check if project exists and user has permission
+		const project = await prisma.project.findUnique({
+			where: { id: projectId },
+			include: {
+				teamMembers: {
+					where: { userId: session.user.id },
+				},
+			},
+		});
+
+		if (!project) {
+			return NextResponse.json({ error: "Project not found" }, { status: 404 });
+		}
+
+		// Check if user is the project owner or a team member
+		const isTeamMember =
+			project.userId === session.user.id || project.teamMembers.length > 0;
+		if (!isTeamMember) {
+			return NextResponse.json(
+				{
+					error:
+						"You don't have permission to delete milestones for this project",
+				},
+				{ status: 403 },
+			);
+		}
+
+		// Get the milestone
+		const milestone = await prisma.milestone.findUnique({
+			where: { id: milestoneId },
+		});
+
+		if (!milestone) {
+			return NextResponse.json(
+				{ error: "Milestone not found" },
+				{ status: 404 },
+			);
+		}
+
+		// Check if milestone belongs to the project
+		if (milestone.projectId !== projectId) {
+			return NextResponse.json(
+				{ error: "Milestone does not belong to this project" },
+				{ status: 400 },
+			);
+		}
+
+		// Delete the milestone
+		await prisma.milestone.delete({
+			where: { id: milestoneId },
+		});
+
+		return NextResponse.json({ success: true });
+	} catch (error) {
+		console.error("Error deleting milestone:", error);
+		return NextResponse.json(
+			{ error: "Failed to delete milestone" },
+			{ status: 500 },
+		);
+	}
+}
diff --git a/app/api/projects/[id]/milestones/route.ts b/app/api/projects/[id]/milestones/route.ts
new file mode 100644
index 00000000..fe46f38a
--- /dev/null
+++ b/app/api/projects/[id]/milestones/route.ts
@@ -0,0 +1,124 @@
+import { authOptions } from "@/lib/auth.config";
+import prisma from "@/lib/prisma";
+import { getServerSession } from "next-auth";
+import { type NextRequest, NextResponse } from "next/server";
+
+export async function GET(
+	request: NextRequest,
+	{ params }: { params: { id: string } },
+) {
+	try {
+		const session = await getServerSession(authOptions);
+		if (!session) {
+			return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+		}
+
+		const projectId = params.id;
+		if (!projectId) {
+			return NextResponse.json(
+				{ error: "Project ID is required" },
+				{ status: 400 },
+			);
+		}
+
+		// Check if project exists
+		const project = await prisma.project.findUnique({
+			where: { id: projectId },
+		});
+
+		if (!project) {
+			return NextResponse.json({ error: "Project not found" }, { status: 404 });
+		}
+
+		// Get milestones for the project
+		const milestones = await prisma.milestone.findMany({
+			where: { projectId },
+			include: {
+				attachments: true,
+			},
+			orderBy: { createdAt: "desc" },
+		});
+
+		return NextResponse.json(milestones);
+	} catch (error) {
+		console.error("Error fetching milestones:", error);
+		return NextResponse.json(
+			{ error: "Failed to fetch milestones" },
+			{ status: 500 },
+		);
+	}
+}
+
+export async function POST(
+	request: NextRequest,
+	{ params }: { params: { id: string } },
+) {
+	try {
+		const session = await getServerSession(authOptions);
+		if (!session) {
+			return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+		}
+
+		const projectId = params.id;
+		if (!projectId) {
+			return NextResponse.json(
+				{ error: "Project ID is required" },
+				{ status: 400 },
+			);
+		}
+
+		// Check if project exists and user has permission
+		const project = await prisma.project.findUnique({
+			where: { id: projectId },
+			include: {
+				teamMembers: {
+					where: { userId: session.user.id },
+				},
+			},
+		});
+
+		if (!project) {
+			return NextResponse.json({ error: "Project not found" }, { status: 404 });
+		}
+
+		// Check if user is the project owner or a team member
+		const isTeamMember =
+			project.userId === session.user.id || project.teamMembers.length > 0;
+		if (!isTeamMember) {
+			return NextResponse.json(
+				{
+					error: "You don't have permission to add milestones to this project",
+				},
+				{ status: 403 },
+			);
+		}
+
+		const body = await request.json();
+		const { title, description, dueDate, progress } = body;
+
+		if (!title) {
+			return NextResponse.json({ error: "Title is required" }, { status: 400 });
+		}
+
+		// Create the milestone
+		const milestone = await prisma.milestone.create({
+			data: {
+				title,
+				description: description || "",
+				dueDate: dueDate ? new Date(dueDate) : null,
+				progress: progress || 0,
+				projectId,
+				createdAt: new Date(),
+				updatedAt: new Date(),
+			},
+		});
+
+		return NextResponse.json(milestone, { status: 201 });
+	} catch (error) {
+		console.error("Error creating milestone:", error);
+		return NextResponse.json(
+			{ error: "Failed to create milestone" },
+			{ status: 500 },
+		);
+	}
+}
diff --git a/app/api/user/profile/route.ts b/app/api/user/profile/route.ts
index 3ef16845..647626ae 100644
--- a/app/api/user/profile/route.ts
+++ b/app/api/user/profile/route.ts
@@ -25,11 +25,15 @@ export async function GET() {
 		}
 
 		const profile = await getUserProfile(session.user.id);
+		if (!profile) {
+			return NextResponse.json({ error: "Profile not found" }, { status: 404 });
+		}
+
 		return NextResponse.json(profile);
 	} catch (error) {
 		console.error("Error fetching profile:", error);
 		return NextResponse.json(
-			{ error: "Failed to fetch profile" },
+			{ error: "Internal server error" },
 			{ status: 500 },
 		);
 	}
@@ -43,25 +47,14 @@ export async function PUT(request: Request) {
 			return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
 		}
 
-		const body = await request.json();
-		const validatedData = profileSchema.parse(body);
+		const data = await request.json();
+		const profile = await updateUserProfile(session.user.id, data);
 
-		const updatedProfile = await updateUserProfile(
-			session.user.id,
-			validatedData,
-		);
-		return NextResponse.json(updatedProfile);
+		return NextResponse.json(profile);
 	} catch (error) {
-		if (error instanceof z.ZodError) {
-			return NextResponse.json(
-				{ error: "Invalid data", details: error.errors },
-				{ status: 400 },
-			);
-		}
-
 		console.error("Error updating profile:", error);
 		return NextResponse.json(
-			{ error: "Failed to update profile" },
+			{ error: "Internal server error" },
 			{ status: 500 },
 		);
 	}
diff --git a/app/api/user/settings/route.ts b/app/api/user/settings/route.ts
index f0ec3186..7d675bd6 100644
--- a/app/api/user/settings/route.ts
+++ b/app/api/user/settings/route.ts
@@ -1,60 +1,66 @@
-import { authOptions } from '@/lib/auth.config';
-import prisma from '@/lib/prisma';
-import { getServerSession } from 'next-auth';
-import { NextResponse } from 'next/server';
-import { z } from 'zod';
+import { authOptions } from "@/lib/auth.config";
+import prisma from "@/lib/prisma";
+import { getServerSession } from "next-auth";
+import { NextResponse } from "next/server";
+import { z } from "zod";
 
 const settingsSchema = z.object({
-  language: z.string().optional(),
-  notificationsEnabled: z.boolean().optional(),
+	language: z.string().optional(),
+	notificationsEnabled: z.boolean().optional(),
 });
 
 export async function GET() {
-  const session = await getServerSession(authOptions);
-
-  if (!session?.user?.id) {
-    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
-  }
-
-  const user = await prisma.user.findUnique({
-    where: { id: session.user.id },
-    select: {
-      theme: true,
-      language: true,
-      notificationsEnabled: true,
-    },
-  });
-
-  return NextResponse.json(user);
+	const session = await getServerSession(authOptions);
+
+	if (!session?.user?.id) {
+		return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+	}
+
+	const user = await prisma.user.findUnique({
+		where: { id: session.user.id },
+		select: {
+			theme: true,
+			language: true,
+			notificationsEnabled: true,
+		},
+	});
+
+	return NextResponse.json(user);
 }
 
 export async function PUT(request: Request) {
-  const session = await getServerSession(authOptions);
-
-  if (!session?.user?.id) {
-    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
-  }
-
-  try {
-    const body = await request.json();
-    const data = settingsSchema.parse(body);
-
-    const updated = await prisma.user.update({
-      where: { id: session.user.id },
-      data,
-      select: {
-        theme: true,
-        language: true,
-        notificationsEnabled: true,
-      },
-    });
-
-    return NextResponse.json(updated);
-  } catch (error) {
-    if (error instanceof z.ZodError) {
-      return NextResponse.json({ error: 'Invalid input', details: error.flatten() }, { status: 400 });
-    }
-
-    return NextResponse.json({ error: 'An unexpected error occurred' }, { status: 500 });
-  }
+	const session = await getServerSession(authOptions);
+
+	if (!session?.user?.id) {
+		return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+	}
+
+	try {
+		const body = await request.json();
+		const data = settingsSchema.parse(body);
+
+		const updated = await prisma.user.update({
+			where: { id: session.user.id },
+			data,
+			select: {
+				theme: true,
+				language: true,
+				notificationsEnabled: true,
+			},
+		});
+
+		return NextResponse.json(updated);
+	} catch (error) {
+		if (error instanceof z.ZodError) {
+			return NextResponse.json(
+				{ error: "Invalid input", details: error.flatten() },
+				{ status: 400 },
+			);
+		}
+
+		return NextResponse.json(
+			{ error: "An unexpected error occurred" },
+			{ status: 500 },
+		);
+	}
 }
diff --git a/app/connect-wallet/page.tsx b/app/connect-wallet/page.tsx
new file mode 100644
index 00000000..7de2d6b6
--- /dev/null
+++ b/app/connect-wallet/page.tsx
@@ -0,0 +1,95 @@
+"use client";
+
+import { Button } from "@/components/ui/button";
+import {
+	Card,
+	CardContent,
+	CardDescription,
+	CardFooter,
+	CardHeader,
+	CardTitle,
+} from "@/components/ui/card";
+import { useWalletStore } from "@/store/useWalletStore";
+import { Wallet } from "lucide-react";
+import { useRouter, useSearchParams } from "next/navigation";
+import { useState } from "react";
+
+export default function ConnectWalletPage() {
+	const router = useRouter();
+	const searchParams = useSearchParams();
+	const redirectPath = searchParams.get("redirect") || "/";
+
+	const { connect: connectWallet, publicKey, isConnected } = useWalletStore();
+	const [isConnecting, setIsConnecting] = useState(false);
+
+	const handleConnect = async () => {
+		try {
+			setIsConnecting(true);
+			await connectWallet();
+
+			if (publicKey) {
+				router.push(redirectPath);
+			}
+		} catch (error) {
+			console.error("Failed to connect wallet:", error);
+		} finally {
+			setIsConnecting(false);
+		}
+	};
+
+	const handleCancel = () => {
+		router.push("/");
+	};
+
+	if (isConnected && publicKey) {
+		router.push(redirectPath);
+		return null;
+	}
+
+	return (
+		<div className="container flex items-center justify-center min-h-[80vh] py-12">
+			<Card className="w-full max-w-md">
+				<CardHeader className="text-center">
+					<div className="flex justify-center mb-4">
+						<div className="bg-primary/10 p-3 rounded-full">
+							<Wallet className="h-8 w-8 text-primary" />
+						</div>
+					</div>
+					<CardTitle className="text-2xl">Connect Your Wallet</CardTitle>
+					<CardDescription>
+						You need to connect your wallet to access this feature
+					</CardDescription>
+				</CardHeader>
+				<CardContent className="space-y-4">
+					<p className="text-sm text-muted-foreground text-center">
+						Connecting your wallet allows you to interact with blockchain
+						features, sign transactions, and manage your digital assets.
+					</p>
+					<div className="bg-muted p-4 rounded-lg">
+						<p className="text-sm font-medium">Redirecting to:</p>
+						<p className="text-sm text-muted-foreground break-all">
+							{redirectPath}
+						</p>
+					</div>
+				</CardContent>
+				<CardFooter className="flex flex-col sm:flex-row gap-2">
+					<Button
+						variant="outline"
+						onClick={handleCancel}
+						className="w-full sm:w-auto"
+						disabled={isConnecting}
+					>
+						Cancel
+					</Button>
+					<Button
+						onClick={handleConnect}
+						className="w-full sm:w-auto"
+						disabled={isConnecting}
+					>
+						{isConnecting ? "Connecting..." : "Connect Wallet"}
+					</Button>
+				</CardFooter>
+			</Card>
+		</div>
+	);
+}
diff --git a/components/connect-wallet.tsx b/components/connect-wallet.tsx
index a5c89df3..d9eea09e 100644
--- a/components/connect-wallet.tsx
+++ b/components/connect-wallet.tsx
@@ -16,6 +16,7 @@ const ConnectWalletButton = ({ className = "" }) => {
 
 	const [isChecking, setIsChecking] = useState(true);
 	const [isCopied, setIsCopied] = useState(false);
+	const [isConnecting, setIsConnecting] = useState(false);
 
 	useEffect(() => {
 		const checkConnection = async () => {
@@ -35,8 +36,13 @@ const ConnectWalletButton = ({ className = "" }) => {
 		checkConnection();
 	}, [publicKey]);
 
+	useEffect(() => {
+		setIsConnecting(connecting);
+	}, [connecting]);
+
 	const handleConnectWallet = async () => {
 		try {
+			setIsConnecting(true);
 			await connectWallet();
 			if (publicKey) {
 				toast.success("Wallet Connected", {
@@ -48,6 +54,10 @@ const ConnectWalletButton = ({ className = "" }) => {
 			toast.error("Connection Failed", {
 				description: "Failed to connect to the wallet.",
 			});
+		} finally {
+			setTimeout(() => {
+				setIsConnecting(false);
+			}, 1000);
 		}
 	};
 
@@ -82,7 +92,7 @@ const ConnectWalletButton = ({ className = "" }) => {
 				<Button disabled className={className}>
 					<Loader2 className="mr-2 h-4 w-4 animate-spin" /> Checking...
 				</Button>
-			) : connecting ? (
+			) : isConnecting ? (
 				<Button disabled className={className}>
 					<Loader2 className="mr-2 h-4 w-4 animate-spin" /> Connecting...
 				</Button>
diff --git a/components/dashboard/profile/ProfileDisplay.tsx b/components/dashboard/profile/ProfileDisplay.tsx
index 9d58f3da..cfbec24f 100644
--- a/components/dashboard/profile/ProfileDisplay.tsx
+++ b/components/dashboard/profile/ProfileDisplay.tsx
@@ -2,6 +2,7 @@
 
 import { Button } from "@/components/ui/button";
 import { Card, CardContent } from "@/components/ui/card";
+import type { UserProfile } from "@/types/user";
 import {
 	Award,
 	Briefcase,
@@ -16,18 +17,7 @@ import React from "react";
 // import { cn } from "@/lib/utils";
 
 interface ProfileDisplayProps {
-	userData: {
-		username: string;
-		name: string;
-		bio?: string;
-		bannerImage?: string;
-		image?: string;
-		twitter?: string;
-		linkedin?: string;
-		totalContributions?: number;
-		votes?: number;
-		fundedProjects?: number;
-	};
+	userData: UserProfile;
 	onEdit: () => void;
 	isLoading?: boolean;
 }
@@ -59,66 +49,68 @@ export default function ProfileDisplay({
 	}
 
 	return (
-		<Card className="w-full bg-card">
-			{/* Banner Image */}
-			<div className="relative w-full h-40 bg-gradient-to-r from-primary/20 to-primary/30">
-				{bannerImage && (
-					<Image
-						src={bannerImage}
-						alt="Profile banner"
-						fill
-						className="object-cover"
-						priority
-					/>
+		<div className="space-y-6">
+			<div className="relative h-48 w-full overflow-hidden rounded-t-lg">
+				{bannerImage ? (
+					<Image src={bannerImage} alt="Banner" fill className="object-cover" />
+				) : (
+					<div className="h-full w-full bg-gray-200" />
 				)}
 			</div>
-
-			<CardContent className="relative pt-16 px-6">
-				{/* Profile Picture */}
-				<div className="absolute -top-12 left-6">
-					<div className="relative w-24 h-24 rounded-full overflow-hidden border-4 border-background bg-muted">
+			<div className="relative px-6">
+				<div className="absolute -top-16">
+					{image ? (
 						<Image
-							src={image || "/default-profile-pic.jpg"}
+							src={image}
 							alt={name}
-							fill
-							className="object-cover"
-							priority
+							width={128}
+							height={128}
+							className="rounded-full border-4 border-white"
 						/>
-					</div>
+					) : (
+						<div className="h-32 w-32 rounded-full border-4 border-white bg-gray-200" />
+					)}
 				</div>
-
-				{/* Edit Button */}
-				<div className="absolute top-4 right-6">
-					<Button
-						onClick={onEdit}
-						variant="outline"
-						size="sm"
-						className="bg-background/80 backdrop-blur supports-[backdrop-filter]:bg-background/60"
-					>
-						<Edit2 className="w-4 h-4 mr-2" />
-						Edit Profile
-					</Button>
-				</div>
-
-				{/* Profile Info */}
-				<div className="space-y-4">
-					<div>
-						<h1 className="text-2xl font-bold text-foreground">{name}</h1>
-						<p className="text-muted-foreground">@{username}</p>
+				<div className="mt-16">
+					<div className="flex items-center justify-between">
+						<div>
+							<h2 className="text-2xl font-bold">{name}</h2>
+							{bio && <p className="mt-2 text-gray-600">{bio}</p>}
+						</div>
+						<Button onClick={onEdit}>Edit Profile</Button>
 					</div>
-
-					{bio && <p className="text-foreground/80 max-w-2xl">{bio}</p>}
-
-					{/* Social Links */}
-					<div className="flex space-x-4">
+					<div className="mt-6 grid grid-cols-3 gap-4">
+						<div className="rounded-lg bg-gray-50 p-4">
+							<p className="text-sm text-gray-500">Total Contributions</p>
+							<p className="mt-1 text-2xl font-semibold">
+								{totalContributions}
+							</p>
+						</div>
+						<div className="rounded-lg bg-gray-50 p-4">
+							<p className="text-sm text-gray-500">Votes</p>
+							<p className="mt-1 text-2xl font-semibold">{votes}</p>
+						</div>
+						<div className="rounded-lg bg-gray-50 p-4">
+							<p className="text-sm text-gray-500">Funded Projects</p>
+							<p className="mt-1 text-2xl font-semibold">{fundedProjects}</p>
+						</div>
+					</div>
+					<div className="mt-6 flex space-x-4">
 						{twitter && (
 							<a
 								href={twitter}
 								target="_blank"
 								rel="noopener noreferrer"
-								className="text-muted-foreground hover:text-primary transition-colors"
+								className="text-gray-600 hover:text-gray-900"
 							>
-								<Twitter className="w-5 h-5" />
+								<svg
+									className="h-6 w-6"
+									fill="currentColor"
+									viewBox="0 0 24 24"
+								>
+									<title>Twitter Icon</title>
+									<path d="M8.29 20.251c7.547 0 11.675-6.253 11.675-11.675 0-.178 0-.355-.012-.53A8.348 8.348 0 0022 5.92a8.19 8.19 0 01-2.357.646 4.118 4.118 0 001.804-2.27 8.224 8.224 0 01-2.605.996 4.107 4.107 0 00-6.993 3.743 11.65 11.65 0 01-8.457-4.287 4.106 4.106 0 001.27 5.477A4.072 4.072 0 012.8 9.713v.052a4.105 4.105 0 003.292 4.022 4.095 4.095 0 01-1.853.07 4.108 4.108 0 003.834 2.85A8.233 8.233 0 012 18.407a11.616 11.616 0 006.29 1.84" />
+								</svg>
 							</a>
 						)}
 						{linkedin && (
@@ -126,43 +118,21 @@ export default function ProfileDisplay({
 								href={linkedin}
 								target="_blank"
 								rel="noopener noreferrer"
-								className="text-muted-foreground hover:text-primary transition-colors"
+								className="text-gray-600 hover:text-gray-900"
 							>
-								<Linkedin className="w-5 h-5" />
+								<svg
+									className="h-6 w-6"
+									fill="currentColor"
+									viewBox="0 0 24 24"
+								>
+									<title>LinkedIn Icon</title>
+									<path d="M19 0h-14c-2.761 0-5 2.239-5 5v14c0 2.761 2.239 5 5 5h14c2.762 0 5-2.239 5-5v-14c0-2.761-2.238-5-5-5zm-11 19h-3v-11h3v11zm-1.5-12.268c-.966 0-1.75-.79-1.75-1.764s.784-1.764 1.75-1.764 1.75.79 1.75 1.764-.783 1.764-1.75 1.764zm13.5 12.268h-3v-5.604c0-.88-.06-1.601-1-1.601-1 0-1.16.781-1.16 1.601v5.604h-3v-11h3v1.765c1.396-2.586 7-2.777 7 2.476v6.759z" />
+								</svg>
 							</a>
 						)}
 					</div>
-
-					{/* Stats */}
-					<div className="grid grid-cols-2 md:grid-cols-3 gap-4 pt-6">
-						<div className="flex items-center space-x-2 p-4 rounded-lg bg-muted/50">
-							<Award className="w-5 h-5 text-primary" />
-							<div>
-								<p className="text-sm text-muted-foreground">Contributions</p>
-								<p className="font-semibold text-foreground">
-									{totalContributions}
-								</p>
-							</div>
-						</div>
-						<div className="flex items-center space-x-2 p-4 rounded-lg bg-muted/50">
-							<ThumbsUp className="w-5 h-5 text-primary" />
-							<div>
-								<p className="text-sm text-muted-foreground">Votes</p>
-								<p className="font-semibold text-foreground">{votes}</p>
-							</div>
-						</div>
-						<div className="flex items-center space-x-2 p-4 rounded-lg bg-muted/50">
-							<Briefcase className="w-5 h-5 text-primary" />
-							<div>
-								<p className="text-sm text-muted-foreground">Funded Projects</p>
-								<p className="font-semibold text-foreground">
-									{fundedProjects}
-								</p>
-							</div>
-						</div>
-					</div>
 				</div>
-			</CardContent>
-		</Card>
+			</div>
+		</div>
 	);
 }
diff --git a/components/dashboard/profile/ProfileEditForm.tsx b/components/dashboard/profile/ProfileEditForm.tsx
index 8bbefb5f..e9a97dd9 100644
--- a/components/dashboard/profile/ProfileEditForm.tsx
+++ b/components/dashboard/profile/ProfileEditForm.tsx
@@ -7,34 +7,29 @@ import { ImageUpload } from "@/components/ui/image-upload";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { Textarea } from "@/components/ui/textarea";
+import type { UserProfile } from "@/types/user";
 import { zodResolver } from "@hookform/resolvers/zod";
 import axios from "axios";
 import { Loader2 } from "lucide-react";
 import React, { useState } from "react";
 import { useForm } from "react-hook-form";
+import { toast } from "react-hot-toast";
 import { z } from "zod";
 
 const profileSchema = z.object({
-	username: z
-		.string()
-		.min(3, "Username must be at least 3 characters")
-		.max(30, "Username must be less than 30 characters"),
-	name: z
-		.string()
-		.min(2, "Name must be at least 2 characters")
-		.max(50, "Name must be less than 50 characters"),
-	bio: z.string().max(500, "Bio must be less than 500 characters").optional(),
-	image: z.string().url("Invalid URL").optional(),
-	bannerImage: z.string().url("Invalid URL").optional(),
-	twitter: z.string().url("Invalid URL").optional().or(z.literal("")),
-	linkedin: z.string().url("Invalid URL").optional().or(z.literal("")),
+	name: z.string().min(1, "Name is required"),
+	bio: z.string().optional(),
+	twitter: z.string().optional(),
+	linkedin: z.string().optional(),
+	image: z.string().optional(),
+	bannerImage: z.string().optional(),
 });
 
 type ProfileFormData = z.infer<typeof profileSchema>;
 
 interface ProfileEditFormProps {
-	initialData: ProfileFormData;
-	onSuccess: (updatedData: ProfileFormData) => void;
+	initialData: UserProfile;
+	onSuccess: (data: UserProfile) => void;
 	onCancel: () => void;
 }
 
@@ -46,15 +41,9 @@ export default function ProfileEditForm({
 	const [isSubmitting, setIsSubmitting] = useState(false);
 	const [error, setError] = useState<string | null>(null);
 
-	const {
-		register,
-		handleSubmit,
-		setValue,
-		formState: { errors },
-	} = useForm<ProfileFormData>({
+	const form = useForm<ProfileFormData>({
 		resolver: zodResolver(profileSchema),
 		defaultValues: {
-			username: initialData.username,
 			name: initialData.name,
 			bio: initialData.bio,
 			twitter: initialData.twitter,
@@ -64,18 +53,15 @@ export default function ProfileEditForm({
 		},
 	});
 
-	const onSubmit = async (formData: ProfileFormData) => {
+	const onSubmit = async (data: ProfileFormData) => {
 		setIsSubmitting(true);
 		setError(null);
 		try {
-			const response = await axios.put("/api/user/profile", formData);
+			const response = await axios.put("/api/user/profile", data);
 			onSuccess(response.data);
 		} catch (error) {
-			if (axios.isAxiosError(error) && error.response?.data?.error) {
-				setError(error.response.data.error);
-			} else {
-				setError("An error occurred while updating your profile");
-			}
+			console.error("Error updating profile:", error);
+			toast.error("Failed to update profile");
 		} finally {
 			setIsSubmitting(false);
 		}
@@ -87,7 +73,7 @@ export default function ProfileEditForm({
 				<CardTitle>Edit Profile</CardTitle>
 			</CardHeader>
 			<CardContent>
-				<form onSubmit={handleSubmit(onSubmit)} className="space-y-6">
+				<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
 					{error && (
 						<Alert variant="destructive">
 							<AlertDescription>{error}</AlertDescription>
@@ -100,8 +86,8 @@ export default function ProfileEditForm({
 								<Label>Banner Image</Label>
 								<ImageUpload
 									value={initialData.bannerImage}
-									onChange={(url) => setValue("bannerImage", url)}
-									onRemove={() => setValue("bannerImage", "")}
+									onChange={(url) => form.setValue("bannerImage", url)}
+									onRemove={() => form.setValue("bannerImage", "")}
 									aspectRatio="21:9"
 								/>
 							</div>
@@ -110,38 +96,24 @@ export default function ProfileEditForm({
 								<Label>Profile Picture</Label>
 								<ImageUpload
 									value={initialData.image}
-									onChange={(url) => setValue("image", url)}
-									onRemove={() => setValue("image", "")}
+									onChange={(url) => form.setValue("image", url)}
+									onRemove={() => form.setValue("image", "")}
 									aspectRatio="1:1"
 								/>
 							</div>
 						</div>
 
 						<div className="grid gap-4">
-							<div className="space-y-2">
-								<Label htmlFor="username">Username</Label>
-								<Input
-									id="username"
-									{...register("username")}
-									className="bg-background max-w-md"
-								/>
-								{errors.username && (
-									<p className="text-sm text-destructive">
-										{errors.username.message}
-									</p>
-								)}
-							</div>
-
 							<div className="space-y-2">
 								<Label htmlFor="name">Display Name</Label>
 								<Input
 									id="name"
-									{...register("name")}
+									{...form.register("name")}
 									className="bg-background max-w-md"
 								/>
-								{errors.name && (
+								{form.formState.errors.name && (
 									<p className="text-sm text-destructive">
-										{errors.name.message}
+										{form.formState.errors.name.message}
 									</p>
 								)}
 							</div>
@@ -150,13 +122,13 @@ export default function ProfileEditForm({
 								<Label htmlFor="bio">Bio</Label>
 								<Textarea
 									id="bio"
-									{...register("bio")}
+									{...form.register("bio")}
 									rows={4}
 									className="bg-background resize-none"
 								/>
-								{errors.bio && (
+								{form.formState.errors.bio && (
 									<p className="text-sm text-destructive">
-										{errors.bio.message}
+										{form.formState.errors.bio.message}
 									</p>
 								)}
 							</div>
@@ -165,13 +137,13 @@ export default function ProfileEditForm({
 								<Label htmlFor="twitter">Twitter URL</Label>
 								<Input
 									id="twitter"
-									{...register("twitter")}
+									{...form.register("twitter")}
 									placeholder="https://twitter.com/yourusername"
 									className="bg-background max-w-md"
 								/>
-								{errors.twitter && (
+								{form.formState.errors.twitter && (
 									<p className="text-sm text-destructive">
-										{errors.twitter.message}
+										{form.formState.errors.twitter.message}
 									</p>
 								)}
 							</div>
@@ -180,13 +152,13 @@ export default function ProfileEditForm({
 								<Label htmlFor="linkedin">LinkedIn URL</Label>
 								<Input
 									id="linkedin"
-									{...register("linkedin")}
+									{...form.register("linkedin")}
 									placeholder="https://linkedin.com/in/yourusername"
 									className="bg-background max-w-md"
 								/>
-								{errors.linkedin && (
+								{form.formState.errors.linkedin && (
 									<p className="text-sm text-destructive">
-										{errors.linkedin.message}
+										{form.formState.errors.linkedin.message}
 									</p>
 								)}
 							</div>
diff --git a/components/examples/wallet-protected-action.tsx b/components/examples/wallet-protected-action.tsx
new file mode 100644
index 00000000..5d33a754
--- /dev/null
+++ b/components/examples/wallet-protected-action.tsx
@@ -0,0 +1,46 @@
+"use client";
+
+import { Button } from "@/components/ui/button";
+import { WalletConnectionModal } from "@/components/wallet-connection-modal";
+import { useWalletProtection } from "@/lib/wallet-actions";
+import { toast } from "sonner";
+
+/**
+ * Example component that demonstrates how to use the useWalletProtection hook
+ */
+export const WalletProtectedAction = () => {
+	// Define the action that requires wallet connection
+	const handleProtectedAction = async () => {
+		// This code will only run if a wallet is connected
+		toast.success("Protected action executed", {
+			description: "This action required a wallet connection.",
+		});
+
+		// Simulate an async operation
+		await new Promise((resolve) => setTimeout(resolve, 1000));
+
+		return "Action completed successfully";
+	};
+
+	// Use the hook to get the protected action and modal state
+	const { protectedAction, showModal, setShowModal } = useWalletProtection(
+		handleProtectedAction,
+	);
+
+	return (
+		<div className="space-y-4">
+			<h3 className="text-lg font-medium">Wallet Protected Action</h3>
+			<p className="text-sm text-muted-foreground">
+				This button will show a modal to connect your wallet if needed.
+			</p>
+			<Button onClick={protectedAction}>Execute Protected Action</Button>
+
+			{/* Render the wallet connection modal */}
+			<WalletConnectionModal
+				isOpen={showModal}
+				onClose={() => setShowModal(false)}
+				onSuccess={protectedAction}
+			/>
+		</div>
+	);
+};
diff --git a/components/project-form-wrapper.tsx b/components/project-form-wrapper.tsx
new file mode 100644
index 00000000..85752920
--- /dev/null
+++ b/components/project-form-wrapper.tsx
@@ -0,0 +1,16 @@
+"use client";
+
+import { ProjectForm } from "@/components/project-form";
+import { WithWalletProtection } from "@/components/with-wallet-protection";
+
+interface ProjectFormWrapperProps {
+	userId?: string;
+}
+
+export const ProjectFormWrapper = ({ userId }: ProjectFormWrapperProps) => {
+	return (
+		<WithWalletProtection redirectPath="/projects">
+			<ProjectForm userId={userId} />
+		</WithWalletProtection>
+	);
+};
diff --git a/components/project-form.tsx b/components/project-form.tsx
index 5c709c12..738b4752 100644
--- a/components/project-form.tsx
+++ b/components/project-form.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { Button } from "@/components/ui/button";
+import { Card, CardContent } from "@/components/ui/card";
 import {
 	Form,
 	FormControl,
@@ -11,6 +12,7 @@ import {
 	FormMessage,
 } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
+import { Progress } from "@/components/ui/progress";
 import {
 	Select,
 	SelectContent,
@@ -18,12 +20,14 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
+import { Separator } from "@/components/ui/separator";
 import { Textarea } from "@/components/ui/textarea";
 import { signTransaction } from "@/hooks/useStellarWallet";
 import { contractClient } from "@/src/contracts/boundless_contract";
 import { useWalletStore } from "@/store/useWalletStore";
 import { convertUSDToStroops, getXLMPrice } from "@/utils/price";
 import { zodResolver } from "@hookform/resolvers/zod";
+import { DollarSign, FileImage, Loader2, Upload } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
@@ -59,6 +63,7 @@ export function ProjectForm({ userId }: { userId?: string }) {
 	const router = useRouter();
 	const [isLoading, setIsLoading] = useState(false);
 	const [status, setStatus] = useState("");
+	const [progress, setProgress] = useState(0);
 	const [xlmPrice, setXlmPrice] = useState<number | null>(null);
 	const { publicKey } = useWalletStore();
 
@@ -98,6 +103,7 @@ export function ProjectForm({ userId }: { userId?: string }) {
 		data: ProjectFormValues,
 	): Promise<string> {
 		setStatus("Uploading metadata...");
+		setProgress(25);
 
 		const formData = new FormData();
 		formData.append("title", data.title);
@@ -127,6 +133,7 @@ export function ProjectForm({ userId }: { userId?: string }) {
 	async function onSubmit(data: ProjectFormValues) {
 		try {
 			setIsLoading(true);
+			setProgress(10);
 
 			if (!publicKey) {
 				throw new Error("Wallet is not connected");
@@ -141,6 +148,7 @@ export function ProjectForm({ userId }: { userId?: string }) {
 			const projectId = crypto.randomUUID();
 
 			setStatus("Building transaction...");
+			setProgress(50);
 			const tx = await contractClient.create_project({
 				project_id: projectId,
 				creator: publicKey,
@@ -150,11 +158,11 @@ export function ProjectForm({ userId }: { userId?: string }) {
 			});
 
 			setStatus("Signing transaction...");
+			setProgress(75);
 			const { getTransactionResponse } = await tx.signAndSend();
-			// const txHash = getTransactionResponse?.txHash;
 
-			// console.log({ result, getTransactionResponse });
 			setStatus("Sending signed transaction to server...");
+			setProgress(85);
 			const formData = new FormData();
 			formData.append("userId", userId || "");
 			formData.append("title", data.title);
@@ -190,6 +198,7 @@ export function ProjectForm({ userId }: { userId?: string }) {
 				throw new Error(error.message || "Failed to create project");
 			}
 
+			setProgress(100);
 			toast.success("Project created successfully!");
 			router.push("/projects");
 			router.refresh();
@@ -206,141 +215,236 @@ export function ProjectForm({ userId }: { userId?: string }) {
 	}
 
 	return (
-		<Form {...form}>
-			<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8">
-				{status && <p className="text-sm bg-blue-100 p-2 rounded">{status}</p>}
-				<FormField
-					control={form.control}
-					name="title"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Project Title</FormLabel>
-							<FormControl>
-								<Input placeholder="Enter your project title" {...field} />
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-				<FormField
-					control={form.control}
-					name="description"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Description</FormLabel>
-							<FormControl>
-								<Textarea
-									placeholder="Describe your project..."
-									className="min-h-[120px]"
-									{...field}
+		<Card className="shadow-md">
+			<CardContent className="pt-6">
+				<Form {...form}>
+					<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
+						{isLoading && (
+							<div className="mb-6 space-y-2">
+								<div className="flex items-center space-x-2">
+									<Loader2 className="h-4 w-4 animate-spin text-primary" />
+									<p className="text-sm font-medium text-primary">{status}</p>
+								</div>
+								<Progress value={progress} className="h-2" />
+							</div>
+						)}
+
+						<div className="space-y-6">
+							<div>
+								<h3 className="text-lg font-medium">Project Details</h3>
+								<p className="text-sm text-muted-foreground">
+									Basic information about your project
+								</p>
+								<Separator className="my-4" />
+							</div>
+
+							<FormField
+								control={form.control}
+								name="title"
+								render={({ field }) => (
+									<FormItem>
+										<FormLabel>Project Title</FormLabel>
+										<FormControl>
+											<Input
+												placeholder="Enter your project title"
+												{...field}
+											/>
+										</FormControl>
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
+
+							<FormField
+								control={form.control}
+								name="description"
+								render={({ field }) => (
+									<FormItem>
+										<FormLabel>Description</FormLabel>
+										<FormControl>
+											<Textarea
+												placeholder="Describe your project..."
+												className="min-h-[150px] resize-none"
+												{...field}
+											/>
+										</FormControl>
+										<FormDescription>
+											Provide a clear and compelling description of your project
+										</FormDescription>
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
+
+							<div className="grid gap-6 md:grid-cols-2">
+								<FormField
+									control={form.control}
+									name="fundingGoal"
+									render={({ field }) => (
+										<FormItem>
+											<FormLabel>Funding Goal</FormLabel>
+											<FormControl>
+												<div className="relative">
+													<DollarSign className="absolute left-3 top-2.5 h-4 w-4 text-muted-foreground" />
+													<Input
+														type="number"
+														placeholder="Amount in USD"
+														className="pl-9"
+														{...field}
+													/>
+												</div>
+											</FormControl>
+											<FormDescription>
+												{xlmPrice && field.value && (
+													<span className="text-sm text-muted-foreground">
+														≈ {(Number(field.value) / xlmPrice).toFixed(2)} XLM
+													</span>
+												)}
+											</FormDescription>
+											<FormMessage />
+										</FormItem>
+									)}
+								/>
+
+								<FormField
+									control={form.control}
+									name="category"
+									render={({ field }) => (
+										<FormItem>
+											<FormLabel>Category</FormLabel>
+											<Select
+												onValueChange={field.onChange}
+												defaultValue={field.value}
+											>
+												<FormControl>
+													<SelectTrigger>
+														<SelectValue placeholder="Select a category" />
+													</SelectTrigger>
+												</FormControl>
+												<SelectContent>
+													{categories.map((category) => (
+														<SelectItem key={category.id} value={category.id}>
+															{category.name}
+														</SelectItem>
+													))}
+												</SelectContent>
+											</Select>
+											<FormMessage />
+										</FormItem>
+									)}
+								/>
+							</div>
+						</div>
+
+						<div className="space-y-6 pt-4">
+							<div>
+								<h3 className="text-lg font-medium">Project Media</h3>
+								<p className="text-sm text-muted-foreground">
+									Upload images to showcase your project
+								</p>
+								<Separator className="my-4" />
+							</div>
+
+							<div className="grid gap-6 md:grid-cols-2">
+								<FormField
+									control={form.control}
+									name="bannerImage"
+									render={({ field }) => (
+										<FormItem>
+											<FormLabel>Banner Image</FormLabel>
+											<FormControl>
+												<div className="space-y-3">
+													<div className="flex items-center gap-2 rounded-md border border-dashed p-4">
+														<FileImage className="h-5 w-5 text-muted-foreground" />
+														<Input
+															type="file"
+															accept="image/*"
+															className="border-0 p-0 shadow-none"
+															onChange={(e) =>
+																field.onChange(e.target.files?.[0])
+															}
+														/>
+													</div>
+													<div className="relative">
+														<Input
+															type="url"
+															placeholder="Or enter image URL"
+															onChange={(e) => field.onChange(e.target.value)}
+														/>
+													</div>
+												</div>
+											</FormControl>
+											<FormDescription>
+												Banner image will be displayed at the top of your
+												project page
+											</FormDescription>
+											<FormMessage />
+										</FormItem>
+									)}
 								/>
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-				<FormField
-					control={form.control}
-					name="fundingGoal"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Funding Goal</FormLabel>
-							<FormControl>
-								<Input
-									type="number"
-									placeholder="Enter amount in USD"
-									{...field}
+
+								<FormField
+									control={form.control}
+									name="profileImage"
+									render={({ field }) => (
+										<FormItem>
+											<FormLabel>Profile Image</FormLabel>
+											<FormControl>
+												<div className="space-y-3">
+													<div className="flex items-center gap-2 rounded-md border border-dashed p-4">
+														<FileImage className="h-5 w-5 text-muted-foreground" />
+														<Input
+															type="file"
+															accept="image/*"
+															className="border-0 p-0 shadow-none"
+															onChange={(e) =>
+																field.onChange(e.target.files?.[0])
+															}
+														/>
+													</div>
+													<div className="relative">
+														<Input
+															type="url"
+															placeholder="Or enter image URL"
+															onChange={(e) => field.onChange(e.target.value)}
+														/>
+													</div>
+												</div>
+											</FormControl>
+											<FormDescription>
+												Profile image will be used as your project&apos;s
+												thumbnail
+											</FormDescription>
+											<FormMessage />
+										</FormItem>
+									)}
 								/>
-							</FormControl>
-							<FormDescription>
-								Enter the amount in USD
-								{xlmPrice && field.value && (
-									<span className="block mt-1 text-sm text-gray-500">
-										≈ {(Number(field.value) / xlmPrice).toFixed(2)} XLM
-									</span>
+							</div>
+						</div>
+
+						<div className="pt-4">
+							<Button
+								type="submit"
+								disabled={isLoading}
+								className="w-full md:w-auto"
+								size="lg"
+							>
+								{isLoading ? (
+									<>
+										<Loader2 className="mr-2 h-4 w-4 animate-spin" />
+										Creating Project...
+									</>
+								) : (
+									<>
+										<Upload className="mr-2 h-4 w-4" />
+										Create Project
+									</>
 								)}
-							</FormDescription>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-				<FormField
-					control={form.control}
-					name="category"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Category</FormLabel>
-							<Select onValueChange={field.onChange} defaultValue={field.value}>
-								<FormControl>
-									<SelectTrigger>
-										<SelectValue placeholder="Select a category" />
-									</SelectTrigger>
-								</FormControl>
-								<SelectContent>
-									{categories.map((category) => (
-										<SelectItem key={category.id} value={category.id}>
-											{category.name}
-										</SelectItem>
-									))}
-								</SelectContent>
-							</Select>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-				<FormField
-					control={form.control}
-					name="bannerImage"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Banner Image</FormLabel>
-							<FormControl>
-								<div className="space-y-2">
-									<Input
-										type="file"
-										accept="image/*"
-										onChange={(e) => field.onChange(e.target.files?.[0])}
-									/>
-									<Input
-										type="url"
-										placeholder="Or enter image URL"
-										onChange={(e) => field.onChange(e.target.value)}
-									/>
-								</div>
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-
-				<FormField
-					control={form.control}
-					name="profileImage"
-					render={({ field }) => (
-						<FormItem>
-							<FormLabel>Profile Image</FormLabel>
-							<FormControl>
-								<div className="space-y-2">
-									<Input
-										type="file"
-										accept="image/*"
-										onChange={(e) => field.onChange(e.target.files?.[0])}
-									/>
-									<Input
-										type="url"
-										placeholder="Or enter image URL"
-										onChange={(e) => field.onChange(e.target.value)}
-									/>
-								</div>
-							</FormControl>
-							<FormMessage />
-						</FormItem>
-					)}
-				/>
-				<Button type="submit" disabled={isLoading}>
-					{isLoading ? "Creating..." : "Create Project"}
-				</Button>
-			</form>
-		</Form>
+							</Button>
+						</div>
+					</form>
+				</Form>
+			</CardContent>
+		</Card>
 	);
 }
diff --git a/components/ui/calendar.tsx b/components/ui/calendar.tsx
new file mode 100644
index 00000000..50a6e868
--- /dev/null
+++ b/components/ui/calendar.tsx
@@ -0,0 +1,76 @@
+"use client";
+
+import { ChevronLeft, ChevronRight } from "lucide-react";
+import type * as React from "react";
+import { DayPicker } from "react-day-picker";
+
+import { buttonVariants } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
+
+export type CalendarProps = React.ComponentProps<typeof DayPicker>;
+
+function Calendar({
+	className,
+	classNames,
+	showOutsideDays = true,
+	...props
+}: CalendarProps) {
+	return (
+		<DayPicker
+			showOutsideDays={showOutsideDays}
+			className={cn("p-3", className)}
+			classNames={{
+				months: "flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0",
+				month: "space-y-4",
+				caption: "flex justify-center pt-1 relative items-center",
+				caption_label: "text-sm font-medium",
+				nav: "space-x-1 flex items-center",
+				nav_button: cn(
+					buttonVariants({ variant: "outline" }),
+					"h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100",
+				),
+				nav_button_previous: "absolute left-1",
+				nav_button_next: "absolute right-1",
+				table: "w-full border-collapse space-y-1",
+				head_row: "flex",
+				head_cell:
+					"text-muted-foreground rounded-md w-8 font-normal text-[0.8rem]",
+				row: "flex w-full mt-2",
+				cell: cn(
+					"relative p-0 text-center text-sm focus-within:relative focus-within:z-20 [&:has([aria-selected])]:bg-accent [&:has([aria-selected].day-outside)]:bg-accent/50 [&:has([aria-selected].day-range-end)]:rounded-r-md",
+					props.mode === "range"
+						? "[&:has(>.day-range-end)]:rounded-r-md [&:has(>.day-range-start)]:rounded-l-md first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md"
+						: "[&:has([aria-selected])]:rounded-md",
+				),
+				day: cn(
+					buttonVariants({ variant: "ghost" }),
+					"h-8 w-8 p-0 font-normal aria-selected:opacity-100",
+				),
+				day_range_start: "day-range-start",
+				day_range_end: "day-range-end",
+				day_selected:
+					"bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground focus:bg-primary focus:text-primary-foreground",
+				day_today: "bg-accent text-accent-foreground",
+				day_outside:
+					"day-outside text-muted-foreground aria-selected:bg-accent/50 aria-selected:text-muted-foreground",
+				day_disabled: "text-muted-foreground opacity-50",
+				day_range_middle:
+					"aria-selected:bg-accent aria-selected:text-accent-foreground",
+				day_hidden: "invisible",
+				...classNames,
+			}}
+			components={{
+				IconLeft: ({ className, ...props }) => (
+					<ChevronLeft className={cn("h-4 w-4", className)} {...props} />
+				),
+				IconRight: ({ className, ...props }) => (
+					<ChevronRight className={cn("h-4 w-4", className)} {...props} />
+				),
+			}}
+			{...props}
+		/>
+	);
+}
+Calendar.displayName = "Calendar";
+
+export { Calendar };
diff --git a/components/wallet-connection-modal.tsx b/components/wallet-connection-modal.tsx
new file mode 100644
index 00000000..15d63331
--- /dev/null
+++ b/components/wallet-connection-modal.tsx
@@ -0,0 +1,92 @@
+"use client";
+
+import { Button } from "@/components/ui/button";
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogFooter,
+	DialogHeader,
+	DialogTitle,
+} from "@/components/ui/dialog";
+import { useWalletStore } from "@/store/useWalletStore";
+import { Wallet } from "lucide-react";
+import { useState } from "react";
+
+interface WalletConnectionModalProps {
+	isOpen: boolean;
+	onClose: () => void;
+	onSuccess?: () => void;
+	redirectPath?: string;
+}
+
+/**
+ * Modal component that prompts users to connect their wallet
+ */
+export const WalletConnectionModal = ({
+	isOpen,
+	onClose,
+	onSuccess,
+	redirectPath,
+}: WalletConnectionModalProps) => {
+	const { connect: connectWallet, publicKey } = useWalletStore();
+	const [isConnecting, setIsConnecting] = useState(false);
+
+	const handleConnect = async () => {
+		try {
+			setIsConnecting(true);
+			await connectWallet();
+
+			if (publicKey) {
+				onSuccess?.();
+				onClose();
+			}
+		} catch (error) {
+			console.error("Failed to connect wallet:", error);
+		} finally {
+			setIsConnecting(false);
+		}
+	};
+
+	const handleContinue = () => {
+		if (redirectPath && typeof window !== "undefined") {
+			window.location.href = redirectPath;
+		} else {
+			onClose();
+		}
+	};
+
+	return (
+		<Dialog open={isOpen} onOpenChange={onClose}>
+			<DialogContent className="sm:max-w-md">
+				<DialogHeader>
+					<DialogTitle className="flex items-center gap-2">
+						<Wallet className="h-5 w-5" />
+						Connect Your Wallet
+					</DialogTitle>
+					<DialogDescription>
+						You need to connect your wallet to access this feature.
+					</DialogDescription>
+				</DialogHeader>
+				<div className="py-4">
+					<p className="text-sm text-muted-foreground">
+						Connecting your wallet allows you to interact with blockchain
+						features, sign transactions, and manage your digital assets.
+					</p>
+				</div>
+				<DialogFooter className="flex flex-col sm:flex-row gap-2">
+					<Button
+						variant="outline"
+						onClick={handleContinue}
+						disabled={isConnecting}
+					>
+						Cancel
+					</Button>
+					<Button onClick={handleConnect} disabled={isConnecting}>
+						{isConnecting ? "Connecting..." : "Connect Wallet"}
+					</Button>
+				</DialogFooter>
+			</DialogContent>
+		</Dialog>
+	);
+};
diff --git a/components/with-wallet-protection.tsx b/components/with-wallet-protection.tsx
new file mode 100644
index 00000000..6222fd12
--- /dev/null
+++ b/components/with-wallet-protection.tsx
@@ -0,0 +1,79 @@
+"use client";
+
+import { useWalletStore } from "@/store/useWalletStore";
+import { Loader2 } from "lucide-react";
+import { useEffect, useState } from "react";
+import { WalletConnectionModal } from "./wallet-connection-modal";
+
+interface WithWalletProtectionProps {
+	children: React.ReactNode;
+	redirectPath?: string;
+	showLoader?: boolean;
+	useModal?: boolean;
+}
+
+/**
+ * Higher-order component that ensures a wallet is connected before rendering children
+ * If no wallet is connected, it shows a modal or redirects to the connect wallet page
+ */
+export const WithWalletProtection = ({
+	children,
+	redirectPath = "/",
+	showLoader = true,
+	useModal = true,
+}: WithWalletProtectionProps) => {
+	const { isConnected, publicKey } = useWalletStore();
+	const [isChecking, setIsChecking] = useState(true);
+	const [showModal, setShowModal] = useState(false);
+	const [shouldRedirect, setShouldRedirect] = useState(false);
+
+	useEffect(() => {
+		if (!isConnected || !publicKey) {
+			if (useModal) {
+				setShowModal(true);
+			} else {
+				setShouldRedirect(true);
+			}
+		}
+
+		setIsChecking(false);
+	}, [isConnected, publicKey, useModal]);
+
+	useEffect(() => {
+		if (shouldRedirect && typeof window !== "undefined") {
+			const timer = setTimeout(() => {
+				const encodedRedirect = encodeURIComponent(redirectPath);
+				window.location.href = `/connect-wallet?redirect=${encodedRedirect}`;
+			}, 0);
+
+			return () => clearTimeout(timer);
+		}
+	}, [shouldRedirect, redirectPath]);
+
+	if (isChecking && showLoader) {
+		return (
+			<div className="flex items-center justify-center min-h-[200px]">
+				<Loader2 className="h-8 w-8 animate-spin text-primary" />
+			</div>
+		);
+	}
+
+	if ((!isConnected || !publicKey) && useModal) {
+		return (
+			<>
+				<WalletConnectionModal
+					isOpen={showModal}
+					onClose={() => setShowModal(false)}
+					redirectPath={redirectPath}
+				/>
+				<div className="opacity-50 pointer-events-none">{children}</div>
+			</>
+		);
+	}
+
+	if (!isConnected || !publicKey) {
+		return null;
+	}
+
+	return <>{children}</>;
+};
diff --git a/hooks/useProjectAuth.ts b/hooks/useProjectAuth.ts
index 10481cf7..ef85ed80 100644
--- a/hooks/useProjectAuth.ts
+++ b/hooks/useProjectAuth.ts
@@ -1,89 +1,109 @@
-import { useEffect, useState } from 'react';
-import { useRouter } from 'next/navigation';
-import { toast } from 'sonner';
-import { useUserStore } from '@/store/userStore';
+import { useUserStore } from "@/store/userStore";
+import { useRouter } from "next/navigation";
+import { useEffect, useState } from "react";
+import { toast } from "sonner";
 
 interface UseProjectAuthProps {
-  projectId: string;
-  projectUserId: string;
-  teamMembers: any[];
-  redirectTo?: string;
+	projectId: string;
+	projectUserId: string;
+	teamMembers: {
+		id: string;
+		fullName: string;
+		role: string;
+		bio: string | null;
+		profileImage: string | null;
+	}[];
+	redirectTo?: string;
 }
 
 export function useProjectAuth({
-  projectId,
-  projectUserId,
-  teamMembers,
-  redirectTo = '/auth/login',
+	projectId,
+	projectUserId,
+	teamMembers,
+	redirectTo = "/auth/login",
 }: UseProjectAuthProps) {
-  const router = useRouter();
-  const { user, fetchUserProfile, isProjectOwner, isProjectTeamMember, isLoading } = useUserStore();
-  const [isAuthorized, setIsAuthorized] = useState(false);
-  const [isOwner, setIsOwner] = useState(false);
-  const [isTeamMember, setIsTeamMember] = useState(false);
-  const [authChecked, setAuthChecked] = useState(false);
+	const router = useRouter();
+	const {
+		user,
+		fetchUserProfile,
+		isProjectOwner,
+		isProjectTeamMember,
+		isLoading,
+	} = useUserStore();
+	const [isAuthorized, setIsAuthorized] = useState(false);
+	const [isOwner, setIsOwner] = useState(false);
+	const [isTeamMember, setIsTeamMember] = useState(false);
+	const [authChecked, setAuthChecked] = useState(false);
 
-  useEffect(() => {
-    const checkAuth = async () => {
-      try {
-        if (!user) {
-          await fetchUserProfile();
-        }
-        
-        // After fetching, re-check if we have a user
-        const currentUser = useUserStore.getState().user;
-        
-        if (!currentUser) {
-          setIsAuthorized(false);
-          setIsOwner(false);
-          setIsTeamMember(false);
-          setAuthChecked(true);
-          return;
-        }
-        
-        // Check if user is owner or team member
-        const ownerStatus = isProjectOwner(projectUserId);
-        const teamMemberStatus = isProjectTeamMember(projectId, teamMembers);
-        
-        setIsOwner(ownerStatus);
-        setIsTeamMember(teamMemberStatus);
-        setIsAuthorized(ownerStatus || teamMemberStatus);
-        setAuthChecked(true);
-      } catch (error) {
-        console.error('Error checking auth:', error);
-        setIsAuthorized(false);
-        setAuthChecked(true);
-      }
-    };
+	useEffect(() => {
+		const checkAuth = async () => {
+			try {
+				if (!user) {
+					await fetchUserProfile();
+				}
 
-    checkAuth();
-  }, [projectId, projectUserId, teamMembers, fetchUserProfile, isProjectOwner, isProjectTeamMember, user]);
+				// After fetching, re-check if we have a user
+				const currentUser = useUserStore.getState().user;
 
-  const requireAuth = (callback?: () => void) => {
-    if (!user) {
-      // Store the current URL to redirect back after login
-      if (typeof window !== 'undefined') {
-        sessionStorage.setItem('redirectAfterLogin', window.location.pathname);
-      }
-      
-      toast.error('Please login to continue');
-      router.push(redirectTo);
-      return false;
-    }
-    
-    if (callback) {
-      callback();
-    }
-    
-    return true;
-  };
+				if (!currentUser) {
+					setIsAuthorized(false);
+					setIsOwner(false);
+					setIsTeamMember(false);
+					setAuthChecked(true);
+					return;
+				}
 
-  return {
-    isAuthorized,
-    isOwner,
-    isTeamMember, 
-    isLoading: isLoading || !authChecked,
-    requireAuth,
-    user
-  };
-}
\ No newline at end of file
+				// Check if user is owner or team member
+				const ownerStatus = isProjectOwner(projectUserId);
+				const teamMemberStatus = isProjectTeamMember(projectId, teamMembers);
+
+				setIsOwner(ownerStatus);
+				setIsTeamMember(teamMemberStatus);
+				setIsAuthorized(ownerStatus || teamMemberStatus);
+				setAuthChecked(true);
+			} catch (error) {
+				console.error("Error checking auth:", error);
+				setIsAuthorized(false);
+				setAuthChecked(true);
+			}
+		};
+
+		checkAuth();
+	}, [
+		projectId,
+		projectUserId,
+		teamMembers,
+		fetchUserProfile,
+		isProjectOwner,
+		isProjectTeamMember,
+		user,
+	]);
+
+	const requireAuth = (callback?: () => void) => {
+		if (!user) {
+			// Store the current URL to redirect back after login
+			if (typeof window !== "undefined") {
+				sessionStorage.setItem("redirectAfterLogin", window.location.pathname);
+			}
+
+			toast.error("Please login to continue");
+			router.push(redirectTo);
+			return false;
+		}
+
+		if (callback) {
+			callback();
+		}
+
+		return true;
+	};
+
+	return {
+		isAuthorized,
+		isOwner,
+		isTeamMember,
+		isLoading: isLoading || !authChecked,
+		requireAuth,
+		user,
+	};
+}
diff --git a/lib/actions/settings.ts b/lib/actions/settings.ts
index f28f37b8..bb051534 100644
--- a/lib/actions/settings.ts
+++ b/lib/actions/settings.ts
@@ -1,29 +1,31 @@
 type UserSettings = {
-  theme?: string;
-  language?: string;
-  notificationsEnabled?: boolean;
+	theme?: string;
+	language?: string;
+	notificationsEnabled?: boolean;
 };
 
 export async function getUserSettings(): Promise<UserSettings> {
-  const res = await fetch('/api/user/settings');
+	const res = await fetch("/api/user/settings");
 
-  if (!res.ok) {
-    throw new Error('Failed to fetch settings');
-  }
+	if (!res.ok) {
+		throw new Error("Failed to fetch settings");
+	}
 
-  return res.json();
+	return res.json();
 }
 
-export async function updateUserSettings(data: UserSettings): Promise<UserSettings> {
-  const res = await fetch('/api/user/settings', {
-    method: 'PUT',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify(data),
-  });
+export async function updateUserSettings(
+	data: UserSettings,
+): Promise<UserSettings> {
+	const res = await fetch("/api/user/settings", {
+		method: "PUT",
+		headers: { "Content-Type": "application/json" },
+		body: JSON.stringify(data),
+	});
 
-  if (!res.ok) {
-    throw new Error('Failed to update settings');
-  }
+	if (!res.ok) {
+		throw new Error("Failed to update settings");
+	}
 
-  return res.json();
+	return res.json();
 }
diff --git a/lib/actions/user.ts b/lib/actions/user.ts
index 33f331db..2e411b9d 100644
--- a/lib/actions/user.ts
+++ b/lib/actions/user.ts
@@ -1,44 +1,46 @@
+import type { UserProfile } from "@/store/userStore";
+
 export async function getUserProfile() {
-    try {
-      const response = await fetch('/api/user/profile', {
-        method: 'GET',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-      });
-  
-      if (!response.ok) {
-        const errorData = await response.json();
-        throw new Error(errorData.error || 'Failed to fetch user profile');
-      }
-  
-      const data = await response.json();
-      return data;
-    } catch (error) {
-      console.error('Error fetching user profile:', error);
-      throw error;
-    }
-  }
-  
-  export async function updateUserProfile(profileData: any) {
-    try {
-      const response = await fetch('/api/user/profile', {
-        method: 'PUT',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(profileData),
-      });
-  
-      if (!response.ok) {
-        const errorData = await response.json();
-        throw new Error(errorData.error || 'Failed to update user profile');
-      }
-  
-      const data = await response.json();
-      return data;
-    } catch (error) {
-      console.error('Error updating user profile:', error);
-      throw error;
-    }
-  }
\ No newline at end of file
+	try {
+		const response = await fetch("/api/user/profile", {
+			method: "GET",
+			headers: {
+				"Content-Type": "application/json",
+			},
+		});
+
+		if (!response.ok) {
+			const errorData = await response.json();
+			throw new Error(errorData.error || "Failed to fetch user profile");
+		}
+
+		const data = await response.json();
+		return data;
+	} catch (error) {
+		console.error("Error fetching user profile:", error);
+		throw error;
+	}
+}
+
+export async function updateUserProfile(profileData: UserProfile) {
+	try {
+		const response = await fetch("/api/user/profile", {
+			method: "PUT",
+			headers: {
+				"Content-Type": "application/json",
+			},
+			body: JSON.stringify(profileData),
+		});
+
+		if (!response.ok) {
+			const errorData = await response.json();
+			throw new Error(errorData.error || "Failed to update user profile");
+		}
+
+		const data = await response.json();
+		return data;
+	} catch (error) {
+		console.error("Error updating user profile:", error);
+		throw error;
+	}
+}
diff --git a/lib/wallet-actions.ts b/lib/wallet-actions.ts
new file mode 100644
index 00000000..946006c2
--- /dev/null
+++ b/lib/wallet-actions.ts
@@ -0,0 +1,70 @@
+"use client";
+
+import { useWalletStore } from "@/store/useWalletStore";
+import { useState } from "react";
+
+/**
+ * Higher-order function that ensures a wallet is connected before executing an action
+ * @param action The action to execute if wallet is connected
+ * @returns A function that checks wallet connection before executing the action
+ */
+export const withWalletProtection = <T extends (...args: unknown[]) => unknown>(
+	action: T,
+): ((...args: Parameters<T>) => void) => {
+	return (...args: Parameters<T>) => {
+		const { isConnected, publicKey } = useWalletStore();
+
+		if (!isConnected || !publicKey) {
+			return;
+		}
+
+		action(...args);
+	};
+};
+
+/**
+ * Hook that provides wallet protection with modal support
+ * @returns An object with the protected action and modal state
+ */
+export const useWalletProtection = <T extends (...args: unknown[]) => unknown>(
+	action: T,
+) => {
+	const { isConnected, publicKey } = useWalletStore();
+	const [showModal, setShowModal] = useState(false);
+
+	const protectedAction = (...args: Parameters<T>) => {
+		if (!isConnected || !publicKey) {
+			setShowModal(true);
+			return;
+		}
+
+		action(...args);
+	};
+
+	return {
+		protectedAction,
+		showModal,
+		setShowModal,
+		isWalletConnected: isConnected && !!publicKey,
+	};
+};
+
+/**
+ * Example usage:
+ *
+ * const { protectedAction, showModal, setShowModal } = useWalletProtection(async (data) => {
+ *   // This code will only run if a wallet is connected
+ *   await submitProject(data);
+ * });
+ *
+ * return (
+ *   <>
+ *     <Button onClick={protectedAction}>Submit Project</Button>
+ *     <WalletConnectionModal
+ *       isOpen={showModal}
+ *       onClose={() => setShowModal(false)}
+ *       onSuccess={() => protectedAction(data)}
+ *     />
+ *   </>
+ * );
+ */
diff --git a/lib/wallet-utils.ts b/lib/wallet-utils.ts
new file mode 100644
index 00000000..20d29fb6
--- /dev/null
+++ b/lib/wallet-utils.ts
@@ -0,0 +1,48 @@
+import { toast } from "sonner";
+
+/**
+ * Checks if a wallet is connected and shows an alert if not
+ * @returns boolean indicating if wallet is connected
+ */
+export const requireWalletConnection = (): boolean => {
+	if (typeof window === "undefined") return false;
+
+	const walletStorage = localStorage.getItem("wallet-storage");
+	if (!walletStorage) return false;
+
+	try {
+		const walletState = JSON.parse(walletStorage);
+		const isConnected = walletState.state?.isConnected || false;
+		const publicKey = walletState.state?.publicKey || null;
+
+		if (!isConnected || !publicKey) {
+			toast.error("Wallet Connection Required", {
+				description: "Please connect your wallet to continue.",
+			});
+			return false;
+		}
+
+		return true;
+	} catch (error) {
+		console.error("Error checking wallet connection:", error);
+		return false;
+	}
+};
+
+/**
+ * Redirects to a specific page if wallet is not connected
+ * @param redirectPath Path to redirect to if wallet is not connected
+ * @returns boolean indicating if wallet is connected
+ */
+export const redirectIfNoWallet = (redirectPath = "/"): boolean => {
+	const isConnected = requireWalletConnection();
+
+	if (!isConnected && typeof window !== "undefined") {
+		setTimeout(() => {
+			window.location.href = redirectPath;
+		}, 0);
+		return false;
+	}
+
+	return true;
+};
diff --git a/package-lock.json b/package-lock.json
index daf86964..65c5416a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,19 +14,20 @@
       "dependencies": {
         "@auth/prisma-adapter": "^2.7.4",
         "@creit.tech/stellar-wallets-kit": "^1.4.1",
+        "@heroicons/react": "^2.2.0",
         "@hookform/resolvers": "^4.1.0",
         "@next-auth/prisma-adapter": "^1.0.7",
         "@prisma/client": "^6.3.1",
         "@radix-ui/react-alert-dialog": "^1.1.6",
         "@radix-ui/react-avatar": "^1.1.2",
         "@radix-ui/react-collapsible": "^1.1.2",
-        "@radix-ui/react-dialog": "^1.1.5",
+        "@radix-ui/react-dialog": "^1.1.7",
         "@radix-ui/react-dropdown-menu": "^2.1.5",
-        "@radix-ui/react-label": "^2.1.2",
-        "@radix-ui/react-progress": "^1.1.2",
+        "@radix-ui/react-label": "^2.1.3",
+        "@radix-ui/react-progress": "^1.1.3",
         "@radix-ui/react-select": "^2.1.6",
         "@radix-ui/react-separator": "^1.1.1",
-        "@radix-ui/react-slot": "^1.1.2",
+        "@radix-ui/react-slot": "^1.2.0",
         "@radix-ui/react-tabs": "^1.1.3",
         "@radix-ui/react-tooltip": "^1.1.7",
         "@stellar/freighter-api": "^3.1.0",
@@ -39,7 +40,7 @@
         "cloudinary": "^2.5.1",
         "clsx": "^2.1.1",
         "cmdk": "^1.0.4",
-        "date-fns": "^4.1.0",
+        "date-fns": "^2.30.0",
         "dotenv": "^16.4.7",
         "framer-motion": "^12.4.2",
         "glob": "^11.0.1",
@@ -50,9 +51,11 @@
         "pg": "^8.13.1",
         "prettier": "^3.5.3",
         "react": "^18",
+        "react-day-picker": "^8.10.1",
         "react-dom": "^18",
         "react-dropzone": "^14.3.8",
         "react-hook-form": "^7.54.2",
+        "react-hot-toast": "^2.5.2",
         "recharts": "^2.15.1",
         "resend": "^4.1.2",
         "sonner": "^2.0.1",
@@ -1550,6 +1553,15 @@
       "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==",
       "license": "MIT"
     },
+    "node_modules/@heroicons/react": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@heroicons/react/-/react-2.2.0.tgz",
+      "integrity": "sha512-LMcepvRaS9LYHJGsF0zzmgKCUim/X3N/DQKc4jepAXJ7l8QxJ1PmxJzqplF2Z3FE4PqBAIGyJAQ/w4B5dsqbtQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": ">= 16 || ^19.0.0-rc"
+      }
+    },
     "node_modules/@hookform/resolvers": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-4.1.0.tgz",
@@ -2658,6 +2670,118 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-alert-dialog/node_modules/@radix-ui/react-dialog": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.6.tgz",
+      "integrity": "sha512-/IVhJV5AceX620DUJ4uYVMymzsipdKBzo3edo+omeskCKGm9FRHM0ebIdbPnlQVJqyuHbuBltQUOG2mOTq2IYw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.1",
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-dismissable-layer": "1.1.5",
+        "@radix-ui/react-focus-guards": "1.1.1",
+        "@radix-ui/react-focus-scope": "1.1.2",
+        "@radix-ui/react-id": "1.1.0",
+        "@radix-ui/react-portal": "1.1.4",
+        "@radix-ui/react-presence": "1.1.2",
+        "@radix-ui/react-primitive": "2.0.2",
+        "@radix-ui/react-slot": "1.1.2",
+        "@radix-ui/react-use-controllable-state": "1.1.0",
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.6.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-alert-dialog/node_modules/@radix-ui/react-dismissable-layer": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.5.tgz",
+      "integrity": "sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.1",
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-primitive": "2.0.2",
+        "@radix-ui/react-use-callback-ref": "1.1.0",
+        "@radix-ui/react-use-escape-keydown": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-alert-dialog/node_modules/@radix-ui/react-focus-scope": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.2.tgz",
+      "integrity": "sha512-zxwE80FCU7lcXUGWkdt6XpTTCKPitG1XKOwViTxHVKIJhZl9MvIl2dVHeZENCWD9+EdWv05wlaEkRXUykU27RA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-primitive": "2.0.2",
+        "@radix-ui/react-use-callback-ref": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-alert-dialog/node_modules/@radix-ui/react-portal": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.4.tgz",
+      "integrity": "sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.0.2",
+        "@radix-ui/react-use-layout-effect": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-alert-dialog/node_modules/@radix-ui/react-primitive": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.2.tgz",
@@ -2681,6 +2805,24 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-alert-dialog/node_modules/@radix-ui/react-slot": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.2.tgz",
+      "integrity": "sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-arrow": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.1.tgz",
@@ -2835,23 +2977,23 @@
       }
     },
     "node_modules/@radix-ui/react-dialog": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.6.tgz",
-      "integrity": "sha512-/IVhJV5AceX620DUJ4uYVMymzsipdKBzo3edo+omeskCKGm9FRHM0ebIdbPnlQVJqyuHbuBltQUOG2mOTq2IYw==",
-      "license": "MIT",
-      "dependencies": {
-        "@radix-ui/primitive": "1.1.1",
-        "@radix-ui/react-compose-refs": "1.1.1",
-        "@radix-ui/react-context": "1.1.1",
-        "@radix-ui/react-dismissable-layer": "1.1.5",
-        "@radix-ui/react-focus-guards": "1.1.1",
-        "@radix-ui/react-focus-scope": "1.1.2",
-        "@radix-ui/react-id": "1.1.0",
-        "@radix-ui/react-portal": "1.1.4",
-        "@radix-ui/react-presence": "1.1.2",
-        "@radix-ui/react-primitive": "2.0.2",
-        "@radix-ui/react-slot": "1.1.2",
-        "@radix-ui/react-use-controllable-state": "1.1.0",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.7.tgz",
+      "integrity": "sha512-EIdma8C0C/I6kL6sO02avaCRqi3fmWJpxH6mqbVScorW6nNktzKJT/le7VPho3o/7wCsyRg3z0+Q+Obr0Gy/VQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.2",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-dismissable-layer": "1.1.6",
+        "@radix-ui/react-focus-guards": "1.1.2",
+        "@radix-ui/react-focus-scope": "1.1.3",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-portal": "1.1.5",
+        "@radix-ui/react-presence": "1.1.3",
+        "@radix-ui/react-primitive": "2.0.3",
+        "@radix-ui/react-slot": "1.2.0",
+        "@radix-ui/react-use-controllable-state": "1.1.1",
         "aria-hidden": "^1.2.4",
         "react-remove-scroll": "^2.6.3"
       },
@@ -2870,17 +3012,53 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/primitive": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.2.tgz",
+      "integrity": "sha512-XnbHrrprsNqZKQhStrSwgRUQzoCI1glLzdw79xiZPoofhGICeZRSQ3dIxAKH1gb3OHfNf4d6f+vAv3kil2eggA==",
+      "license": "MIT"
+    },
+    "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-compose-refs": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz",
+      "integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-context": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.2.tgz",
+      "integrity": "sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-dismissable-layer": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.5.tgz",
-      "integrity": "sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.6.tgz",
+      "integrity": "sha512-7gpgMT2gyKym9Jz2ZhlRXSg2y6cNQIK8d/cqBZ0RBCaps8pFryCWXiUKI+uHGFrhMrbGUP7U6PWgiXzIxoyF3Q==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/primitive": "1.1.1",
-        "@radix-ui/react-compose-refs": "1.1.1",
-        "@radix-ui/react-primitive": "2.0.2",
-        "@radix-ui/react-use-callback-ref": "1.1.0",
-        "@radix-ui/react-use-escape-keydown": "1.1.0"
+        "@radix-ui/primitive": "1.1.2",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-primitive": "2.0.3",
+        "@radix-ui/react-use-callback-ref": "1.1.1",
+        "@radix-ui/react-use-escape-keydown": "1.1.1"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -2897,15 +3075,30 @@
         }
       }
     },
-    "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-focus-scope": {
+    "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-focus-guards": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.2.tgz",
-      "integrity": "sha512-zxwE80FCU7lcXUGWkdt6XpTTCKPitG1XKOwViTxHVKIJhZl9MvIl2dVHeZENCWD9+EdWv05wlaEkRXUykU27RA==",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.2.tgz",
+      "integrity": "sha512-fyjAACV62oPV925xFCrH8DR5xWhg9KYtJT4s3u54jxp+L/hbpTY2kIeEFFbFe+a/HCE94zGQMZLIpVTPVZDhaA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-focus-scope": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.3.tgz",
+      "integrity": "sha512-4XaDlq0bPt7oJwR+0k0clCiCO/7lO7NKZTAaJBYxDNQT/vj4ig0/UvctrRscZaFREpRvUTkpKR96ov1e6jptQg==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-compose-refs": "1.1.1",
-        "@radix-ui/react-primitive": "2.0.2",
-        "@radix-ui/react-use-callback-ref": "1.1.0"
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-primitive": "2.0.3",
+        "@radix-ui/react-use-callback-ref": "1.1.1"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -2922,14 +3115,56 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-id": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.1.tgz",
+      "integrity": "sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-portal": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.4.tgz",
-      "integrity": "sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.5.tgz",
+      "integrity": "sha512-ps/67ZqsFm+Mb6lSPJpfhRLrVL2i2fntgCmGMqqth4eaGUf+knAuuRtWVJrNjUhExgmdRqftSgzpf0DF0n6yXA==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-primitive": "2.0.2",
-        "@radix-ui/react-use-layout-effect": "1.1.0"
+        "@radix-ui/react-primitive": "2.0.3",
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-presence": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.3.tgz",
+      "integrity": "sha512-IrVLIhskYhH3nLvtcBLQFZr61tBG7wx7O3kEmdzcYwRGAEBmBicGGL7ATzNgruYJ3xBTbuzEEq9OXJM3PAX3tA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-use-layout-effect": "1.1.1"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -2947,12 +3182,12 @@
       }
     },
     "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-primitive": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.2.tgz",
-      "integrity": "sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.3.tgz",
+      "integrity": "sha512-Pf/t/GkndH7CQ8wE2hbkXA+WyZ83fhQQn5DDmwDiDo6AwN/fhaH8oqZ0jRjMrO2iaMhDi6P1HRx6AZwyMinY1g==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-slot": "1.1.2"
+        "@radix-ui/react-slot": "1.2.0"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -2969,6 +3204,72 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-use-callback-ref": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.1.tgz",
+      "integrity": "sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-use-controllable-state": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.1.tgz",
+      "integrity": "sha512-YnEXIy8/ga01Y1PN0VfaNH//MhA91JlEGVBDxDzROqwrAtG5Yr2QGEPz8A/rJA3C7ZAHryOYGaUv8fLSW2H/mg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-callback-ref": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-use-escape-keydown": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.1.tgz",
+      "integrity": "sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-callback-ref": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-use-layout-effect": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz",
+      "integrity": "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-direction": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.0.tgz",
@@ -3099,12 +3400,12 @@
       }
     },
     "node_modules/@radix-ui/react-label": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.2.tgz",
-      "integrity": "sha512-zo1uGMTaNlHehDyFQcDZXRJhUPDuukcnHz0/jnrup0JA6qL+AFpAnty+7VKa9esuU5xTblAZzTGYJKSKaBxBhw==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.3.tgz",
+      "integrity": "sha512-zwSQ1NzSKG95yA0tvBMgv6XPHoqapJCcg9nsUBaQQ66iRBhZNhlpaQG2ERYYX4O4stkYFK5rxj5NsWfO9CS+Hg==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-primitive": "2.0.2"
+        "@radix-ui/react-primitive": "2.0.3"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -3122,12 +3423,12 @@
       }
     },
     "node_modules/@radix-ui/react-label/node_modules/@radix-ui/react-primitive": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.2.tgz",
-      "integrity": "sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.3.tgz",
+      "integrity": "sha512-Pf/t/GkndH7CQ8wE2hbkXA+WyZ83fhQQn5DDmwDiDo6AwN/fhaH8oqZ0jRjMrO2iaMhDi6P1HRx6AZwyMinY1g==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-slot": "1.1.2"
+        "@radix-ui/react-slot": "1.2.0"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -3324,13 +3625,13 @@
       }
     },
     "node_modules/@radix-ui/react-progress": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-progress/-/react-progress-1.1.2.tgz",
-      "integrity": "sha512-u1IgJFQ4zNAUTjGdDL5dcl/U8ntOR6jsnhxKb5RKp5Ozwl88xKR9EqRZOe/Mk8tnx0x5tNUe2F+MzsyjqMg0MA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-progress/-/react-progress-1.1.3.tgz",
+      "integrity": "sha512-F56aZPGTPb4qJQ/vDjnAq63oTu/DRoIG/Asb5XKOWj8rpefNLtUllR969j5QDN2sRrTk9VXIqQDRj5VvAuquaw==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-context": "1.1.1",
-        "@radix-ui/react-primitive": "2.0.2"
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-primitive": "2.0.3"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -3347,13 +3648,28 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-progress/node_modules/@radix-ui/react-context": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.2.tgz",
+      "integrity": "sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-progress/node_modules/@radix-ui/react-primitive": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.2.tgz",
-      "integrity": "sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.3.tgz",
+      "integrity": "sha512-Pf/t/GkndH7CQ8wE2hbkXA+WyZ83fhQQn5DDmwDiDo6AwN/fhaH8oqZ0jRjMrO2iaMhDi6P1HRx6AZwyMinY1g==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-slot": "1.1.2"
+        "@radix-ui/react-slot": "1.2.0"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -3624,6 +3940,24 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-slot": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.2.tgz",
+      "integrity": "sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-visually-hidden": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.2.tgz",
@@ -3671,13 +4005,28 @@
       }
     },
     "node_modules/@radix-ui/react-slot": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.2.tgz",
-      "integrity": "sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.0.tgz",
+      "integrity": "sha512-ujc+V6r0HNDviYqIK3rW4ffgYiZ8g5DEHrGJVk4x7kTlLXRDILnKX9vAUYeIsLOoDpDJ0ujpqMkjH4w2ofuo6w==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-compose-refs": "1.1.1"
+        "@radix-ui/react-compose-refs": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
       },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-slot/node_modules/@radix-ui/react-compose-refs": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz",
+      "integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==",
+      "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
         "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
@@ -3798,6 +4147,24 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-tabs/node_modules/@radix-ui/react-slot": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.2.tgz",
+      "integrity": "sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-tooltip": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.1.7.tgz",
@@ -6762,6 +7129,80 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "license": "MIT"
     },
+    "node_modules/bare-addon-resolve": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/bare-addon-resolve/-/bare-addon-resolve-1.9.4.tgz",
+      "integrity": "sha512-unn6Vy/Yke6F99vg/7tcrvM2KUvIhTNniaSqDbam4AWkd4NhvDVSrQiRYVlNzUV2P7SPobkCK7JFVxrJk9btCg==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "dependencies": {
+        "bare-module-resolve": "^1.10.0",
+        "bare-semver": "^1.0.0"
+      },
+      "peerDependencies": {
+        "bare-url": "*"
+      },
+      "peerDependenciesMeta": {
+        "bare-url": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/bare-module-resolve": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/bare-module-resolve/-/bare-module-resolve-1.10.2.tgz",
+      "integrity": "sha512-C9COe/GhWfVXKytW3DElTkiBU+Gb2OXeaVkdGdRB/lp26TVLESHkTGS876iceAGdvtPgohfp9nX8vXHGvN3++Q==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "dependencies": {
+        "bare-semver": "^1.0.0"
+      },
+      "peerDependencies": {
+        "bare-url": "*"
+      },
+      "peerDependenciesMeta": {
+        "bare-url": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/bare-os": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.1.tgz",
+      "integrity": "sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "engines": {
+        "bare": ">=1.14.0"
+      }
+    },
+    "node_modules/bare-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz",
+      "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "dependencies": {
+        "bare-os": "^3.0.1"
+      }
+    },
+    "node_modules/bare-semver": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bare-semver/-/bare-semver-1.0.1.tgz",
+      "integrity": "sha512-UtggzHLiTrmFOC/ogQ+Hy7VfoKoIwrP1UFcYtTxoCUdLtsIErT8+SWtOC2DH/snT9h+xDrcBEPcwKei1mzemgg==",
+      "license": "Apache-2.0",
+      "optional": true
+    },
+    "node_modules/bare-url": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.1.4.tgz",
+      "integrity": "sha512-eKwiYS8m5utvqWFFDDAwvG53KE2fFlxmit1O1I1GLmRtMZr01ZQOw+GZ+Q1QVd0vZ/tKBulVPlV/cDw1tpahRw==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "dependencies": {
+        "bare-path": "^3.0.0"
+      }
+    },
     "node_modules/base-x": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/base-x/-/base-x-5.0.0.tgz",
@@ -6963,6 +7404,10 @@
       "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
       "license": "MIT"
     },
+    "node_modules/boundless_contract": {
+      "resolved": "packages/boundless_contract",
+      "link": true
+    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -7878,13 +8323,19 @@
       }
     },
     "node_modules/date-fns": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
-      "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
+      "version": "2.30.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
+      "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
       "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.21.0"
+      },
+      "engines": {
+        "node": ">=0.11"
+      },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/kossnocorp"
+        "type": "opencollective",
+        "url": "https://opencollective.com/date-fns"
       }
     },
     "node_modules/debug": {
@@ -9844,6 +10295,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/goober": {
+      "version": "2.1.16",
+      "resolved": "https://registry.npmjs.org/goober/-/goober-2.1.16.tgz",
+      "integrity": "sha512-erjk19y1U33+XAMe1VTvIONHYoSqE4iS7BYUZfHaqeohLmnC0FdxEh7rQU+6MZ4OajItzjZFSRtVANrQwNq6/g==",
+      "license": "MIT",
+      "peerDependencies": {
+        "csstype": "^3.0.10"
+      }
+    },
     "node_modules/gopd": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
@@ -13387,6 +13847,20 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/react-day-picker": {
+      "version": "8.10.1",
+      "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-8.10.1.tgz",
+      "integrity": "sha512-TMx7fNbhLk15eqcMt+7Z7S2KF7mfTId/XJDjKE8f+IUcFn0l08/kI4FiYTL/0yuOLmEcbR4Fwe3GJf/NiiMnPA==",
+      "license": "MIT",
+      "funding": {
+        "type": "individual",
+        "url": "https://github.com/sponsors/gpbl"
+      },
+      "peerDependencies": {
+        "date-fns": "^2.28.0 || ^3.0.0",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/react-dom": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
@@ -13433,6 +13907,23 @@
         "react": "^16.8.0 || ^17 || ^18 || ^19"
       }
     },
+    "node_modules/react-hot-toast": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/react-hot-toast/-/react-hot-toast-2.5.2.tgz",
+      "integrity": "sha512-Tun3BbCxzmXXM7C+NI4qiv6lT0uwGh4oAfeJyNOjYUejTsm35mK9iCaYLGv8cBz9L5YxZLx/2ii7zsIwPtPUdw==",
+      "license": "MIT",
+      "dependencies": {
+        "csstype": "^3.1.3",
+        "goober": "^2.1.16"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "react": ">=16",
+        "react-dom": ">=16"
+      }
+    },
     "node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
@@ -13692,6 +14183,20 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/require-addon": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/require-addon/-/require-addon-1.1.0.tgz",
+      "integrity": "sha512-KbXAD5q2+v1GJnkzd8zzbOxchTkStSyJZ9QwoCq3QwEXAaIlG3wDYRZGzVD357jmwaGY7hr5VaoEAL0BkF0Kvg==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "dependencies": {
+        "bare-addon-resolve": "^1.3.0",
+        "bare-url": "^2.1.0"
+      },
+      "engines": {
+        "bare": ">=1.10.0"
+      }
+    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -14456,13 +14961,13 @@
       }
     },
     "node_modules/sodium-native": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-4.3.2.tgz",
-      "integrity": "sha512-C/+lDL98iFA1nGo/um6FfLWYRE+Puw0vlSKr5bhWr1EqKjOFVfLLUQ9ccm2PL3RlF8krVWZusL4LTOlNlm2cJA==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-4.3.3.tgz",
+      "integrity": "sha512-OnxSlN3uyY8D0EsLHpmm2HOFmKddQVvEMmsakCrXUzSd8kjjbzL413t4ZNF3n0UxSwNgwTyUvkmZHTfuCeiYSw==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "node-gyp-build": "^4.8.0"
+        "require-addon": "^1.1.0"
       }
     },
     "node_modules/sonic-boom": {
@@ -16352,7 +16857,6 @@
     },
     "packages/boundless_contract": {
       "version": "0.0.0",
-      "extraneous": true,
       "dependencies": {
         "@stellar/stellar-sdk": "13.0.0",
         "buffer": "6.0.3"
@@ -16361,6 +16865,51 @@
         "typescript": "^5.6.2"
       }
     },
+    "packages/boundless_contract/node_modules/@stellar/stellar-base": {
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/@stellar/stellar-base/-/stellar-base-13.1.0.tgz",
+      "integrity": "sha512-90EArG+eCCEzDGj3OJNoCtwpWDwxjv+rs/RNPhvg4bulpjN/CSRj+Ys/SalRcfM4/WRC5/qAfjzmJBAuquWhkA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@stellar/js-xdr": "^3.1.2",
+        "base32.js": "^0.1.0",
+        "bignumber.js": "^9.1.2",
+        "buffer": "^6.0.3",
+        "sha.js": "^2.3.6",
+        "tweetnacl": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "optionalDependencies": {
+        "sodium-native": "^4.3.3"
+      }
+    },
+    "packages/boundless_contract/node_modules/@stellar/stellar-sdk": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@stellar/stellar-sdk/-/stellar-sdk-13.0.0.tgz",
+      "integrity": "sha512-+wvmKi+XWwu27nLYTM17EgBdpbKohEkOfCIK4XKfsI4WpMXAqvnqSm98i9h5dAblNB+w8BJqzGs1JY0PtTGm4A==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@stellar/stellar-base": "^13.0.1",
+        "axios": "^1.7.7",
+        "bignumber.js": "^9.1.2",
+        "eventsource": "^2.0.2",
+        "feaxios": "^0.0.20",
+        "randombytes": "^2.1.0",
+        "toml": "^3.0.0",
+        "urijs": "^1.19.1"
+      }
+    },
+    "packages/boundless_contract/node_modules/feaxios": {
+      "version": "0.0.20",
+      "resolved": "https://registry.npmjs.org/feaxios/-/feaxios-0.0.20.tgz",
+      "integrity": "sha512-g3hm2YDNffNxA3Re3Hd8ahbpmDee9Fv1Pb1C/NoWsjY7mtD8nyNeJytUzn+DK0Hyl9o6HppeWOrtnqgmhOYfWA==",
+      "license": "MIT",
+      "dependencies": {
+        "is-retry-allowed": "^3.0.0"
+      }
+    },
     "packages/project_contract": {
       "version": "0.0.0",
       "extraneous": true,
diff --git a/package.json b/package.json
index c0da6e20..93df9761 100644
--- a/package.json
+++ b/package.json
@@ -32,19 +32,20 @@
   "dependencies": {
     "@auth/prisma-adapter": "^2.7.4",
     "@creit.tech/stellar-wallets-kit": "^1.4.1",
+    "@heroicons/react": "^2.2.0",
     "@hookform/resolvers": "^4.1.0",
     "@next-auth/prisma-adapter": "^1.0.7",
     "@prisma/client": "^6.3.1",
     "@radix-ui/react-alert-dialog": "^1.1.6",
     "@radix-ui/react-avatar": "^1.1.2",
     "@radix-ui/react-collapsible": "^1.1.2",
-    "@radix-ui/react-dialog": "^1.1.5",
+    "@radix-ui/react-dialog": "^1.1.7",
     "@radix-ui/react-dropdown-menu": "^2.1.5",
-    "@radix-ui/react-label": "^2.1.2",
-    "@radix-ui/react-progress": "^1.1.2",
+    "@radix-ui/react-label": "^2.1.3",
+    "@radix-ui/react-progress": "^1.1.3",
     "@radix-ui/react-select": "^2.1.6",
     "@radix-ui/react-separator": "^1.1.1",
-    "@radix-ui/react-slot": "^1.1.2",
+    "@radix-ui/react-slot": "^1.2.0",
     "@radix-ui/react-tabs": "^1.1.3",
     "@radix-ui/react-tooltip": "^1.1.7",
     "@stellar/freighter-api": "^3.1.0",
@@ -57,7 +58,7 @@
     "cloudinary": "^2.5.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.0.4",
-    "date-fns": "^4.1.0",
+    "date-fns": "^2.30.0",
     "dotenv": "^16.4.7",
     "framer-motion": "^12.4.2",
     "glob": "^11.0.1",
@@ -68,9 +69,11 @@
     "pg": "^8.13.1",
     "prettier": "^3.5.3",
     "react": "^18",
+    "react-day-picker": "^8.10.1",
     "react-dom": "^18",
     "react-dropzone": "^14.3.8",
     "react-hook-form": "^7.54.2",
+    "react-hot-toast": "^2.5.2",
     "recharts": "^2.15.1",
     "resend": "^4.1.2",
     "sonner": "^2.0.1",
diff --git a/prisma/migrations/20250408232837_n/migration.sql b/prisma/migrations/20250408232837_n/migration.sql
new file mode 100644
index 00000000..e5e98b0d
--- /dev/null
+++ b/prisma/migrations/20250408232837_n/migration.sql
@@ -0,0 +1,77 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[username]` on the table `User` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- CreateEnum
+CREATE TYPE "MilestoneStatus" AS ENUM ('PENDING', 'IN_PROGRESS', 'COMPLETED', 'REJECTED');
+
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "bannerImage" TEXT,
+ADD COLUMN     "bio" TEXT,
+ADD COLUMN     "language" TEXT DEFAULT 'en',
+ADD COLUMN     "linkedin" TEXT,
+ADD COLUMN     "notificationsEnabled" BOOLEAN DEFAULT true,
+ADD COLUMN     "totalContributions" INTEGER NOT NULL DEFAULT 0,
+ADD COLUMN     "twitter" TEXT,
+ADD COLUMN     "username" TEXT;
+
+-- CreateTable
+CREATE TABLE "Notification" (
+    "id" TEXT NOT NULL,
+    "userId" TEXT NOT NULL,
+    "title" TEXT NOT NULL,
+    "description" TEXT NOT NULL,
+    "timestamp" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "isRead" BOOLEAN NOT NULL DEFAULT false,
+
+    CONSTRAINT "Notification_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "Milestone" (
+    "id" TEXT NOT NULL,
+    "title" TEXT NOT NULL,
+    "description" TEXT NOT NULL,
+    "status" "MilestoneStatus" NOT NULL DEFAULT 'PENDING',
+    "dueDate" TIMESTAMP(3),
+    "progress" INTEGER NOT NULL DEFAULT 0,
+    "projectId" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "Milestone_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "MilestoneAttachment" (
+    "id" TEXT NOT NULL,
+    "fileName" TEXT NOT NULL,
+    "fileUrl" TEXT NOT NULL,
+    "fileType" TEXT NOT NULL,
+    "fileSize" INTEGER NOT NULL,
+    "milestoneId" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "MilestoneAttachment_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "Notification_userId_idx" ON "Notification"("userId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_username_key" ON "User"("username");
+
+-- CreateIndex
+CREATE INDEX "User_username_idx" ON "User"("username");
+
+-- AddForeignKey
+ALTER TABLE "Notification" ADD CONSTRAINT "Notification_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Milestone" ADD CONSTRAINT "Milestone_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "MilestoneAttachment" ADD CONSTRAINT "MilestoneAttachment_milestoneId_fkey" FOREIGN KEY ("milestoneId") REFERENCES "Milestone"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/prisma/migrations/migration_lock.toml b/prisma/migrations/migration_lock.toml
index 648c57fd..044d57cd 100644
--- a/prisma/migrations/migration_lock.toml
+++ b/prisma/migrations/migration_lock.toml
@@ -1,3 +1,3 @@
 # Please do not edit this file manually
 # It should be added in your version-control system (e.g., Git)
-provider = "postgresql"
\ No newline at end of file
+provider = "postgresql"
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index d3692707..55896659 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -107,6 +107,7 @@ model Project {
   votes          Vote[]
   teamMembers    TeamMember[]
   comments       Comment[]
+  milestones     Milestone[]
 
   user User @relation(fields: [userId], references: [id], onDelete: Cascade)
 }
@@ -206,3 +207,36 @@ model Notification {
 
   @@index([userId])
 }
+
+enum MilestoneStatus {
+  PENDING
+  IN_PROGRESS
+  COMPLETED
+  REJECTED
+}
+
+model Milestone {
+  id          String   @id @default(cuid())
+  title       String
+  description String
+  status      MilestoneStatus @default(PENDING)
+  dueDate     DateTime?
+  progress    Int      @default(0)
+  projectId   String
+  project     Project  @relation(fields: [projectId], references: [id], onDelete: Cascade)
+  attachments MilestoneAttachment[]
+  createdAt   DateTime @default(now())
+  updatedAt   DateTime @updatedAt
+}
+
+model MilestoneAttachment {
+  id          String   @id @default(cuid())
+  fileName    String
+  fileUrl     String
+  fileType    String
+  fileSize    Int
+  milestoneId String
+  milestone   Milestone @relation(fields: [milestoneId], references: [id], onDelete: Cascade)
+  createdAt   DateTime @default(now())
+  updatedAt   DateTime @updatedAt
+}
diff --git a/prisma/seed.ts b/prisma/seed.ts
index ddcf88e0..aeeac6b9 100644
--- a/prisma/seed.ts
+++ b/prisma/seed.ts
@@ -36,7 +36,11 @@ const notificationTypes = [
 async function main() {
   try {
     // Get all users
-    const users = await prisma.user.findMany();
+    const users = await prisma.user.findMany({
+      select: {
+        id: true,
+      },
+    });
 
     if (users.length === 0) {
       console.log("No users found. Please seed users first.");
diff --git a/store/useWalletStore.ts b/store/useWalletStore.ts
index 3641557c..9ca3d26b 100644
--- a/store/useWalletStore.ts
+++ b/store/useWalletStore.ts
@@ -41,10 +41,13 @@ export const useWalletStore = create<WalletStore>()(
 						set({
 							isConnected: false,
 							publicKey: null,
+							connecting: false,
 						});
 					});
 				} catch (error) {
 					console.error("Failed to disconnect wallet:", error);
+					// Ensure state is reset even on disconnect failure
+					set({ connecting: false });
 				}
 			},
 
diff --git a/store/userStore.ts b/store/userStore.ts
index 2fb80a34..147a17b2 100644
--- a/store/userStore.ts
+++ b/store/userStore.ts
@@ -1,63 +1,84 @@
-import { create } from 'zustand';
-import { getUserProfile } from '@/lib/actions/user';
-
-interface UserProfile {
-  id: string;
-  name?: string;
-  email?: string;
-  username?: string;
-  bio?: string;
-  image?: string;
-  bannerImage?: string;
-  twitter?: string;
-  linkedin?: string;
-  totalContributions: number;
-  role: 'USER' | 'ADMIN';
+import { getUserProfile } from "@/lib/actions/user";
+import { create } from "zustand";
+
+export interface UserProfile {
+	id: string;
+	name?: string;
+	email?: string;
+	username?: string;
+	bio?: string;
+	image?: string;
+	bannerImage?: string;
+	twitter?: string;
+	linkedin?: string;
+	totalContributions: number;
+	role: "USER" | "ADMIN";
 }
 
-interface UserState {
-  user: UserProfile | null;
-  isLoading: boolean;
-  error: string | null;
-  fetchUserProfile: () => Promise<void>;
-  isProjectOwner: (projectUserId: string) => boolean;
-  isProjectTeamMember: (projectId: string, projectTeamMembers: any[]) => boolean;
-  reset: () => void;
+export interface UserState {
+	user: UserProfile | null;
+	isLoading: boolean;
+	error: string | null;
+	fetchUserProfile: () => Promise<void>;
+	isProjectOwner: (projectUserId: string) => boolean;
+	isProjectTeamMember: (
+		projectId: string,
+		projectTeamMembers: {
+			id: string;
+			fullName: string;
+			role: string;
+			bio: string | null;
+			profileImage: string | null;
+		}[],
+	) => boolean;
+	reset: () => void;
 }
 
 export const useUserStore = create<UserState>((set, get) => ({
-  user: null,
-  isLoading: false,
-  error: null,
-  
-  fetchUserProfile: async () => {
-    try {
-      set({ isLoading: true, error: null });
-      const userData = await getUserProfile();
-      set({ user: userData, isLoading: false });
-      return userData;
-    } catch (error) {
-      set({ 
-        error: error instanceof Error ? error.message : 'Failed to fetch user profile', 
-        isLoading: false 
-      });
-      return null;
-    }
-  },
-  
-  isProjectOwner: (projectUserId: string) => {
-    const { user } = get();
-    return user?.id === projectUserId;
-  },
-  
-  isProjectTeamMember: (projectId: string, projectTeamMembers: any[]) => {
-    const { user } = get();
-    if (!user) return false;
-    
-    return projectTeamMembers.some(member => member.userId === user.id);
-  },
-  
-  reset: () => {
-    set({ user: null, isLoading: false, error: null });
-  }
-}));
\ No newline at end of file
+	user: null,
+	isLoading: false,
+	error: null,
+
+	fetchUserProfile: async () => {
+		try {
+			set({ isLoading: true, error: null });
+			const userData = await getUserProfile();
+			set({ user: userData, isLoading: false });
+			return userData;
+		} catch (error) {
+			set({
+				error:
+					error instanceof Error
+						? error.message
+						: "Failed to fetch user profile",
+				isLoading: false,
+			});
+			return null;
+		}
+	},
+
+	isProjectOwner: (projectUserId: string) => {
+		const { user } = get();
+		return user?.id === projectUserId;
+	},
+
+	isProjectTeamMember: (
+		projectId: string,
+		projectTeamMembers: {
+			id: string;
+			fullName: string;
+			role: string;
+			bio: string | null;
+			profileImage: string | null;
+		}[],
+	) => {
+		const { user } = get();
+		if (!user) return false;
+
+		return projectTeamMembers.some((member) => member.id === user.id);
+	},
+
+	reset: () => {
+		set({ user: null, isLoading: false, error: null });
+	},
+}));
diff --git a/types/user.ts b/types/user.ts
new file mode 100644
index 00000000..70f73624
--- /dev/null
+++ b/types/user.ts
@@ -0,0 +1,12 @@
+export interface UserProfile {
+	id: string;
+	name: string;
+	image?: string;
+	bio?: string;
+	bannerImage?: string;
+	twitter?: string;
+	linkedin?: string;
+	totalContributions?: number;
+	votes?: number;
+	fundedProjects?: number;
+}

From e71814778500c86bb98a473c6c14cee72469d9fc Mon Sep 17 00:00:00 2001
From: Collins Ikechukwu <collinschristroa@gmail.com>
Date: Fri, 18 Apr 2025 18:25:46 +0100
Subject: [PATCH 07/11] refactor: remove unused parameter from ProjectPage
 component

- Updated ProjectPage component to eliminate the unused 'params' parameter, improving code clarity and adherence to linting rules.
---
 app/(dashboard)/projects/[id]/page.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/(dashboard)/projects/[id]/page.tsx b/app/(dashboard)/projects/[id]/page.tsx
index dced248d..5c0921a1 100644
--- a/app/(dashboard)/projects/[id]/page.tsx
+++ b/app/(dashboard)/projects/[id]/page.tsx
@@ -1,5 +1,6 @@
 import { ProjectViewerPage } from "./viewer/project-viewer-page";
 
-export default function ProjectPage({ params }: { params: { id: string } }) {
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export default function ProjectPage() {
 	return <ProjectViewerPage />;
 }

From a5e2a263a0aa88be92f0e054d06905179f4adc02 Mon Sep 17 00:00:00 2001
From: Collins Ikechukwu <collinschristroa@gmail.com>
Date: Fri, 18 Apr 2025 18:26:03 +0100
Subject: [PATCH 08/11] refactor: remove unused parameter from ProjectPage
 component

- Updated ProjectPage component to eliminate the unused 'params' parameter, improving code clarity and adherence to linting rules.
---
 .../projects/[id]/viewer/viewer-comments.tsx  |  1 +
 .../projects/[id]/viewer/viewer-funding.tsx   |  1 +
 .../projects/[id]/viewer/viewer-voting.tsx    |  1 +
 .../projects/edit/[id]/milestone-form.tsx     |  2 +-
 app/(dashboard)/projects/edit/[id]/page.tsx   | 21 +++++---
 .../settings/notification-settings.tsx        |  6 +--
 app/api/projects/[id]/comments/route.ts       | 38 ++++++--------
 .../[milestoneId]/attachments/route.ts        | 36 ++++++-------
 .../[id]/milestones/[milestoneId]/route.ts    | 52 +++++++------------
 app/api/projects/[id]/milestones/route.ts     | 30 ++++-------
 app/api/user/profile/route.ts                 | 20 +++----
 app/api/user/settings/route.ts                |  2 -
 components/dashboard/index.tsx                |  1 -
 .../dashboard/profile/ProfileDisplay.tsx      | 12 +----
 components/settings/components/toast.tsx      |  3 +-
 15 files changed, 96 insertions(+), 130 deletions(-)

diff --git a/app/(dashboard)/projects/[id]/viewer/viewer-comments.tsx b/app/(dashboard)/projects/[id]/viewer/viewer-comments.tsx
index 6f47d6a2..725b2cb2 100644
--- a/app/(dashboard)/projects/[id]/viewer/viewer-comments.tsx
+++ b/app/(dashboard)/projects/[id]/viewer/viewer-comments.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 "use client";
 
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
diff --git a/app/(dashboard)/projects/[id]/viewer/viewer-funding.tsx b/app/(dashboard)/projects/[id]/viewer/viewer-funding.tsx
index 2fa8f847..ac56e88c 100644
--- a/app/(dashboard)/projects/[id]/viewer/viewer-funding.tsx
+++ b/app/(dashboard)/projects/[id]/viewer/viewer-funding.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 "use client";
 
 import { Button } from "@/components/ui/button";
diff --git a/app/(dashboard)/projects/[id]/viewer/viewer-voting.tsx b/app/(dashboard)/projects/[id]/viewer/viewer-voting.tsx
index 7db1959a..f5ecb61e 100644
--- a/app/(dashboard)/projects/[id]/viewer/viewer-voting.tsx
+++ b/app/(dashboard)/projects/[id]/viewer/viewer-voting.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 "use client";
 
 import { Button } from "@/components/ui/button";
diff --git a/app/(dashboard)/projects/edit/[id]/milestone-form.tsx b/app/(dashboard)/projects/edit/[id]/milestone-form.tsx
index 18f7778e..7053151e 100644
--- a/app/(dashboard)/projects/edit/[id]/milestone-form.tsx
+++ b/app/(dashboard)/projects/edit/[id]/milestone-form.tsx
@@ -74,7 +74,7 @@ export function MilestoneForm({ projectId, onSuccess }: MilestoneFormProps) {
 			form.reset();
 			setOpen(false);
 			onSuccess?.();
-		} catch (error) {
+		} catch {
 			toast.error("Failed to create milestone");
 		}
 	}
diff --git a/app/(dashboard)/projects/edit/[id]/page.tsx b/app/(dashboard)/projects/edit/[id]/page.tsx
index 37669efc..381d8de7 100644
--- a/app/(dashboard)/projects/edit/[id]/page.tsx
+++ b/app/(dashboard)/projects/edit/[id]/page.tsx
@@ -2,8 +2,6 @@
 
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import { Card, CardContent } from "@/components/ui/card";
 import { Progress } from "@/components/ui/progress";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import type { Vote } from "@prisma/client";
@@ -220,19 +218,30 @@ export default function ProjectPage() {
 					</TabsList>
 
 					<TabsContent value="funding">
-						<FundingSection project={project} />
+						<FundingSection projectId={project.id} />
 					</TabsContent>
 
 					<TabsContent value="team">
-						<TeamSection project={project} />
+						<TeamSection
+							teamMembers={project.teamMembers}
+							isTeamMember={!!isTeamMember}
+							projectId={project.id}
+						/>
 					</TabsContent>
 
 					<TabsContent value="voting">
-						<VotingSection project={project} />
+						<VotingSection
+							projectId={project.id}
+							initialUserVoted={project.votes.some(
+								(vote) => vote.userId === session?.user?.id,
+							)}
+							ideaValidation={project.ideaValidation}
+							initialVoteCount={project._count.votes}
+						/>
 					</TabsContent>
 
 					<TabsContent value="comments">
-						<CommentsSection project={project} />
+						<CommentsSection projectId={project.id} />
 					</TabsContent>
 
 					<TabsContent value="milestones">
diff --git a/app/(dashboard)/settings/notification-settings.tsx b/app/(dashboard)/settings/notification-settings.tsx
index 98cbe26e..1c4dffc8 100644
--- a/app/(dashboard)/settings/notification-settings.tsx
+++ b/app/(dashboard)/settings/notification-settings.tsx
@@ -86,7 +86,7 @@ export function NotificationSettings() {
 							<div className="space-y-0.5">
 								<Label htmlFor="email-project-updates">Project Updates</Label>
 								<p className="text-sm text-gray-500">
-									Receive emails about updates to projects you're backing
+									Receive emails about updates to projects you&apos;re backing
 								</p>
 							</div>
 							<Switch
@@ -166,8 +166,8 @@ export function NotificationSettings() {
 							<div className="space-y-0.5">
 								<Label htmlFor="push-project-updates">Project Updates</Label>
 								<p className="text-sm text-gray-500">
-									Receive push notifications about updates to projects you're
-									backing
+									Receive push notifications about updates to projects
+									you&apos;re backing
 								</p>
 							</div>
 							<Switch
diff --git a/app/api/projects/[id]/comments/route.ts b/app/api/projects/[id]/comments/route.ts
index e0bdaf53..8b6973f1 100644
--- a/app/api/projects/[id]/comments/route.ts
+++ b/app/api/projects/[id]/comments/route.ts
@@ -1,18 +1,24 @@
-import { authOptions } from "@/lib/auth.config";
 import prisma from "@/lib/prisma";
-import { getServerSession } from "next-auth/next";
-import { NextResponse } from "next/server";
+import { type NextRequest, NextResponse } from "next/server";
 
-export async function GET(
-	request: Request,
-	{ params }: { params: { id: string } },
-) {
+export async function GET(request: NextRequest) {
 	try {
-		const { searchParams } = new URL(request.url);
+		const { searchParams, pathname } = request.nextUrl;
+
+		// Extract the ID from the pathname (e.g., /api/projects/123/comments)
+		const idMatch = pathname.match(/\/projects\/([^/]+)\/comments/);
+		const projectId = idMatch?.[1];
+
+		if (!projectId) {
+			return NextResponse.json(
+				{ error: "Project ID not provided or invalid" },
+				{ status: 400 },
+			);
+		}
+
 		const page = Number.parseInt(searchParams.get("page") || "1");
 		const limit = Number.parseInt(searchParams.get("limit") || "5");
 
-		// Validate parameters
 		if (Number.isNaN(page) || Number.isNaN(limit) || page < 1 || limit < 1) {
 			return NextResponse.json(
 				{ error: "Invalid pagination parameters" },
@@ -20,13 +26,6 @@ export async function GET(
 			);
 		}
 
-		const projectId = params.id;
-
-		// Get session but don't require it - guest users can read comments
-		const session = await getServerSession(authOptions);
-		const userId = session?.user?.id;
-
-		// Get total count of top-level comments (those without a parent)
 		const totalComments = await prisma.comment.count({
 			where: {
 				projectId,
@@ -34,10 +33,8 @@ export async function GET(
 			},
 		});
 
-		// Calculate total pages
 		const totalPages = Math.ceil(totalComments / limit);
 
-		// Get paginated top-level comments
 		const topLevelComments = await prisma.comment.findMany({
 			where: {
 				projectId,
@@ -47,7 +44,7 @@ export async function GET(
 				createdAt: "desc",
 			},
 			skip: (page - 1) * limit,
-			limit,
+			take: limit,
 			include: {
 				user: {
 					select: {
@@ -72,10 +69,8 @@ export async function GET(
 			},
 		});
 
-		// Get IDs of all top-level comments
 		const commentIds = topLevelComments.map((comment) => comment.id);
 
-		// Get all replies for these comments
 		const replies = await prisma.comment.findMany({
 			where: {
 				parentId: {
@@ -109,7 +104,6 @@ export async function GET(
 			},
 		});
 
-		// Combine top-level comments and replies
 		const allComments = [...topLevelComments, ...replies];
 
 		return NextResponse.json({
diff --git a/app/api/projects/[id]/milestones/[milestoneId]/attachments/route.ts b/app/api/projects/[id]/milestones/[milestoneId]/attachments/route.ts
index 6348b327..5d0d0b20 100644
--- a/app/api/projects/[id]/milestones/[milestoneId]/attachments/route.ts
+++ b/app/api/projects/[id]/milestones/[milestoneId]/attachments/route.ts
@@ -3,17 +3,25 @@ import prisma from "@/lib/prisma";
 import { getServerSession } from "next-auth";
 import { type NextRequest, NextResponse } from "next/server";
 
-export async function POST(
-	request: NextRequest,
-	{ params }: { params: { id: string; milestoneId: string } },
-) {
+// Helper to extract dynamic route parameters from the pathname
+const extractParams = (pathname: string) => {
+	const match = pathname.match(
+		/\/projects\/([^/]+)\/milestones\/([^/]+)\/attachments/,
+	);
+	if (!match) return { projectId: null, milestoneId: null };
+	const [, projectId, milestoneId] = match;
+	return { projectId, milestoneId };
+};
+
+export async function POST(request: NextRequest) {
 	try {
 		const session = await getServerSession(authOptions);
 		if (!session) {
 			return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
 		}
 
-		const { id: projectId, milestoneId } = params;
+		const { projectId, milestoneId } = extractParams(request.nextUrl.pathname);
+
 		if (!projectId || !milestoneId) {
 			return NextResponse.json(
 				{ error: "Project ID and Milestone ID are required" },
@@ -21,7 +29,6 @@ export async function POST(
 			);
 		}
 
-		// Check if project exists and user has permission
 		const project = await prisma.project.findUnique({
 			where: { id: projectId },
 			include: {
@@ -35,7 +42,6 @@ export async function POST(
 			return NextResponse.json({ error: "Project not found" }, { status: 404 });
 		}
 
-		// Check if user is the project owner or a team member
 		const isTeamMember =
 			project.userId === session.user.id || project.teamMembers.length > 0;
 		if (!isTeamMember) {
@@ -48,7 +54,6 @@ export async function POST(
 			);
 		}
 
-		// Get the milestone
 		const milestone = await prisma.milestone.findUnique({
 			where: { id: milestoneId },
 		});
@@ -60,7 +65,6 @@ export async function POST(
 			);
 		}
 
-		// Check if milestone belongs to the project
 		if (milestone.projectId !== projectId) {
 			return NextResponse.json(
 				{ error: "Milestone does not belong to this project" },
@@ -75,11 +79,8 @@ export async function POST(
 			return NextResponse.json({ error: "File is required" }, { status: 400 });
 		}
 
-		// In a real application, you would upload the file to a storage service
-		// For this example, we'll just create a placeholder URL
 		const fileUrl = `/uploads/${Date.now()}-${file.name}`;
 
-		// Create the attachment
 		const attachment = await prisma.milestoneAttachment.create({
 			data: {
 				fileName: file.name,
@@ -100,17 +101,15 @@ export async function POST(
 	}
 }
 
-export async function GET(
-	request: NextRequest,
-	{ params }: { params: { id: string; milestoneId: string } },
-) {
+export async function GET(request: NextRequest) {
 	try {
 		const session = await getServerSession(authOptions);
 		if (!session) {
 			return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
 		}
 
-		const { id: projectId, milestoneId } = params;
+		const { projectId, milestoneId } = extractParams(request.nextUrl.pathname);
+
 		if (!projectId || !milestoneId) {
 			return NextResponse.json(
 				{ error: "Project ID and Milestone ID are required" },
@@ -118,7 +117,6 @@ export async function GET(
 			);
 		}
 
-		// Get the milestone
 		const milestone = await prisma.milestone.findUnique({
 			where: { id: milestoneId },
 		});
@@ -130,7 +128,6 @@ export async function GET(
 			);
 		}
 
-		// Check if milestone belongs to the project
 		if (milestone.projectId !== projectId) {
 			return NextResponse.json(
 				{ error: "Milestone does not belong to this project" },
@@ -138,7 +135,6 @@ export async function GET(
 			);
 		}
 
-		// Get the attachments
 		const attachments = await prisma.milestoneAttachment.findMany({
 			where: { milestoneId },
 			orderBy: { createdAt: "desc" },
diff --git a/app/api/projects/[id]/milestones/[milestoneId]/route.ts b/app/api/projects/[id]/milestones/[milestoneId]/route.ts
index 41a25ed9..3e97fb38 100644
--- a/app/api/projects/[id]/milestones/[milestoneId]/route.ts
+++ b/app/api/projects/[id]/milestones/[milestoneId]/route.ts
@@ -3,17 +3,18 @@ import prisma from "@/lib/prisma";
 import { getServerSession } from "next-auth";
 import { type NextRequest, NextResponse } from "next/server";
 
-export async function GET(
-	request: NextRequest,
-	{ params }: { params: { id: string; milestoneId: string } },
-) {
+export async function GET(request: NextRequest) {
 	try {
 		const session = await getServerSession(authOptions);
 		if (!session) {
 			return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
 		}
 
-		const { id: projectId, milestoneId } = params;
+		const url = new URL(request.url);
+		const pathnameParts = url.pathname.split("/");
+		const projectId = pathnameParts[pathnameParts.indexOf("projects") + 1];
+		const milestoneId = pathnameParts[pathnameParts.indexOf("milestones") + 1];
+
 		if (!projectId || !milestoneId) {
 			return NextResponse.json(
 				{ error: "Project ID and Milestone ID are required" },
@@ -21,12 +22,9 @@ export async function GET(
 			);
 		}
 
-		// Get the milestone
 		const milestone = await prisma.milestone.findUnique({
 			where: { id: milestoneId },
-			include: {
-				attachments: true,
-			},
+			include: { attachments: true },
 		});
 
 		if (!milestone) {
@@ -36,7 +34,6 @@ export async function GET(
 			);
 		}
 
-		// Check if milestone belongs to the project
 		if (milestone.projectId !== projectId) {
 			return NextResponse.json(
 				{ error: "Milestone does not belong to this project" },
@@ -54,17 +51,18 @@ export async function GET(
 	}
 }
 
-export async function PATCH(
-	request: NextRequest,
-	{ params }: { params: { id: string; milestoneId: string } },
-) {
+export async function PATCH(request: NextRequest) {
 	try {
 		const session = await getServerSession(authOptions);
 		if (!session) {
 			return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
 		}
 
-		const { id: projectId, milestoneId } = params;
+		// Extract projectId and milestoneId from the URL
+		const pathnameParts = request.nextUrl.pathname.split("/");
+		const projectId = pathnameParts[pathnameParts.indexOf("projects") + 1];
+		const milestoneId = pathnameParts[pathnameParts.indexOf("milestones") + 1];
+
 		if (!projectId || !milestoneId) {
 			return NextResponse.json(
 				{ error: "Project ID and Milestone ID are required" },
@@ -72,7 +70,6 @@ export async function PATCH(
 			);
 		}
 
-		// Check if project exists and user has permission
 		const project = await prisma.project.findUnique({
 			where: { id: projectId },
 			include: {
@@ -86,7 +83,6 @@ export async function PATCH(
 			return NextResponse.json({ error: "Project not found" }, { status: 404 });
 		}
 
-		// Check if user is the project owner or a team member
 		const isTeamMember =
 			project.userId === session.user.id || project.teamMembers.length > 0;
 		if (!isTeamMember) {
@@ -99,7 +95,6 @@ export async function PATCH(
 			);
 		}
 
-		// Get the milestone
 		const milestone = await prisma.milestone.findUnique({
 			where: { id: milestoneId },
 		});
@@ -111,7 +106,6 @@ export async function PATCH(
 			);
 		}
 
-		// Check if milestone belongs to the project
 		if (milestone.projectId !== projectId) {
 			return NextResponse.json(
 				{ error: "Milestone does not belong to this project" },
@@ -122,7 +116,6 @@ export async function PATCH(
 		const body = await request.json();
 		const { title, description, status, dueDate, progress } = body;
 
-		// Update the milestone
 		const updatedMilestone = await prisma.milestone.update({
 			where: { id: milestoneId },
 			data: {
@@ -132,9 +125,6 @@ export async function PATCH(
 				status: status || milestone.status,
 				dueDate: dueDate ? new Date(dueDate) : milestone.dueDate,
 				progress: progress !== undefined ? progress : milestone.progress,
-				completedAt:
-					status === "COMPLETED" ? new Date() : milestone.completedAt,
-				updatedBy: session.user.id,
 			},
 		});
 
@@ -148,17 +138,18 @@ export async function PATCH(
 	}
 }
 
-export async function DELETE(
-	request: NextRequest,
-	{ params }: { params: { id: string; milestoneId: string } },
-) {
+export async function DELETE(request: NextRequest) {
 	try {
 		const session = await getServerSession(authOptions);
 		if (!session) {
 			return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
 		}
 
-		const { id: projectId, milestoneId } = params;
+		// Extract route params from the URL
+		const pathnameParts = request.nextUrl.pathname.split("/");
+		const projectId = pathnameParts[pathnameParts.indexOf("projects") + 1];
+		const milestoneId = pathnameParts[pathnameParts.indexOf("milestones") + 1];
+
 		if (!projectId || !milestoneId) {
 			return NextResponse.json(
 				{ error: "Project ID and Milestone ID are required" },
@@ -166,7 +157,6 @@ export async function DELETE(
 			);
 		}
 
-		// Check if project exists and user has permission
 		const project = await prisma.project.findUnique({
 			where: { id: projectId },
 			include: {
@@ -180,7 +170,6 @@ export async function DELETE(
 			return NextResponse.json({ error: "Project not found" }, { status: 404 });
 		}
 
-		// Check if user is the project owner or a team member
 		const isTeamMember =
 			project.userId === session.user.id || project.teamMembers.length > 0;
 		if (!isTeamMember) {
@@ -193,7 +182,6 @@ export async function DELETE(
 			);
 		}
 
-		// Get the milestone
 		const milestone = await prisma.milestone.findUnique({
 			where: { id: milestoneId },
 		});
@@ -205,7 +193,6 @@ export async function DELETE(
 			);
 		}
 
-		// Check if milestone belongs to the project
 		if (milestone.projectId !== projectId) {
 			return NextResponse.json(
 				{ error: "Milestone does not belong to this project" },
@@ -213,7 +200,6 @@ export async function DELETE(
 			);
 		}
 
-		// Delete the milestone
 		await prisma.milestone.delete({
 			where: { id: milestoneId },
 		});
diff --git a/app/api/projects/[id]/milestones/route.ts b/app/api/projects/[id]/milestones/route.ts
index fe46f38a..e3428eed 100644
--- a/app/api/projects/[id]/milestones/route.ts
+++ b/app/api/projects/[id]/milestones/route.ts
@@ -3,17 +3,20 @@ import prisma from "@/lib/prisma";
 import { getServerSession } from "next-auth";
 import { type NextRequest, NextResponse } from "next/server";
 
-export async function GET(
-	request: NextRequest,
-	{ params }: { params: { id: string } },
-) {
+// Helper to extract projectId from pathname
+function extractProjectId(pathname: string) {
+	const parts = pathname.split("/");
+	return parts[parts.indexOf("projects") + 1];
+}
+
+export async function GET(request: NextRequest) {
 	try {
 		const session = await getServerSession(authOptions);
 		if (!session) {
 			return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
 		}
 
-		const projectId = params.id;
+		const projectId = extractProjectId(request.nextUrl.pathname);
 		if (!projectId) {
 			return NextResponse.json(
 				{ error: "Project ID is required" },
@@ -21,21 +24,16 @@ export async function GET(
 			);
 		}
 
-		// Check if project exists
 		const project = await prisma.project.findUnique({
 			where: { id: projectId },
 		});
-
 		if (!project) {
 			return NextResponse.json({ error: "Project not found" }, { status: 404 });
 		}
 
-		// Get milestones for the project
 		const milestones = await prisma.milestone.findMany({
 			where: { projectId },
-			include: {
-				attachments: true,
-			},
+			include: { attachments: true },
 			orderBy: { createdAt: "desc" },
 		});
 
@@ -49,17 +47,14 @@ export async function GET(
 	}
 }
 
-export async function POST(
-	request: NextRequest,
-	{ params }: { params: { id: string } },
-) {
+export async function POST(request: NextRequest) {
 	try {
 		const session = await getServerSession(authOptions);
 		if (!session) {
 			return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
 		}
 
-		const projectId = params.id;
+		const projectId = extractProjectId(request.nextUrl.pathname);
 		if (!projectId) {
 			return NextResponse.json(
 				{ error: "Project ID is required" },
@@ -67,7 +62,6 @@ export async function POST(
 			);
 		}
 
-		// Check if project exists and user has permission
 		const project = await prisma.project.findUnique({
 			where: { id: projectId },
 			include: {
@@ -81,7 +75,6 @@ export async function POST(
 			return NextResponse.json({ error: "Project not found" }, { status: 404 });
 		}
 
-		// Check if user is the project owner or a team member
 		const isTeamMember =
 			project.userId === session.user.id || project.teamMembers.length > 0;
 		if (!isTeamMember) {
@@ -100,7 +93,6 @@ export async function POST(
 			return NextResponse.json({ error: "Title is required" }, { status: 400 });
 		}
 
-		// Create the milestone
 		const milestone = await prisma.milestone.create({
 			data: {
 				title,
diff --git a/app/api/user/profile/route.ts b/app/api/user/profile/route.ts
index 647626ae..6a51fe9b 100644
--- a/app/api/user/profile/route.ts
+++ b/app/api/user/profile/route.ts
@@ -3,18 +3,18 @@ import { getUserProfile, updateUserProfile } from "@/lib/db/profile";
 import { getServerSession } from "next-auth";
 // app/api/user/profile/route.ts
 import { NextResponse } from "next/server";
-import { z } from "zod";
+// import { z } from "zod";
 // import { authOptions } from '@/lib/auth';
 
-const profileSchema = z.object({
-	username: z.string().min(3).max(30).optional(),
-	name: z.string().min(2).max(50).optional(),
-	bio: z.string().max(500).optional(),
-	image: z.string().url().optional(),
-	bannerImage: z.string().url().optional(),
-	twitter: z.string().url().optional().or(z.literal("")),
-	linkedin: z.string().url().optional().or(z.literal("")),
-});
+// const profileSchema = z.object({
+// 	username: z.string().min(3).max(30).optional(),
+// 	name: z.string().min(2).max(50).optional(),
+// 	bio: z.string().max(500).optional(),
+// 	image: z.string().url().optional(),
+// 	bannerImage: z.string().url().optional(),
+// 	twitter: z.string().url().optional().or(z.literal("")),
+// 	linkedin: z.string().url().optional().or(z.literal("")),
+// });
 
 export async function GET() {
 	try {
diff --git a/app/api/user/settings/route.ts b/app/api/user/settings/route.ts
index 7d675bd6..a13da73f 100644
--- a/app/api/user/settings/route.ts
+++ b/app/api/user/settings/route.ts
@@ -19,7 +19,6 @@ export async function GET() {
 	const user = await prisma.user.findUnique({
 		where: { id: session.user.id },
 		select: {
-			theme: true,
 			language: true,
 			notificationsEnabled: true,
 		},
@@ -43,7 +42,6 @@ export async function PUT(request: Request) {
 			where: { id: session.user.id },
 			data,
 			select: {
-				theme: true,
 				language: true,
 				notificationsEnabled: true,
 			},
diff --git a/components/dashboard/index.tsx b/components/dashboard/index.tsx
index 25352195..2d4235fe 100644
--- a/components/dashboard/index.tsx
+++ b/components/dashboard/index.tsx
@@ -13,7 +13,6 @@ import {
 } from "@/data/mock-data";
 import type { CompletedSort, ExploreFilter } from "@/types/project";
 
-// import ConnectWalletButton from "../connect-wallet";
 import ActivityOverview from "./activity-overview";
 import StatsCards from "./stats-cards";
 import CompletedTab from "./tabs/completed-tab";
diff --git a/components/dashboard/profile/ProfileDisplay.tsx b/components/dashboard/profile/ProfileDisplay.tsx
index cfbec24f..cbd777b4 100644
--- a/components/dashboard/profile/ProfileDisplay.tsx
+++ b/components/dashboard/profile/ProfileDisplay.tsx
@@ -1,17 +1,8 @@
 "use client";
 
 import { Button } from "@/components/ui/button";
-import { Card, CardContent } from "@/components/ui/card";
 import type { UserProfile } from "@/types/user";
-import {
-	Award,
-	Briefcase,
-	Edit2,
-	Linkedin,
-	Loader2,
-	ThumbsUp,
-	Twitter,
-} from "lucide-react";
+import { Loader2 } from "lucide-react";
 import Image from "next/image";
 import React from "react";
 // import { cn } from "@/lib/utils";
@@ -28,7 +19,6 @@ export default function ProfileDisplay({
 	isLoading = false,
 }: ProfileDisplayProps) {
 	const {
-		username,
 		name,
 		bio,
 		bannerImage,
diff --git a/components/settings/components/toast.tsx b/components/settings/components/toast.tsx
index 56eb00fd..c4e294ba 100644
--- a/components/settings/components/toast.tsx
+++ b/components/settings/components/toast.tsx
@@ -46,7 +46,7 @@ export function useToast() {
 }
 
 function ToastContainer() {
-	const { toasts, toast: addToast } = useToast();
+	const { toasts } = useToast();
 
 	return (
 		<div className="fixed bottom-0 right-0 z-50 flex flex-col gap-2 p-4 max-w-md">
@@ -58,7 +58,6 @@ function ToastContainer() {
 }
 
 function ToastItem({ toast }: { toast: Toast }) {
-	const { toasts, toast: addToast } = useToast();
 	const [isVisible, setIsVisible] = useState(true);
 
 	useEffect(() => {

From e83d9987b1b0820ca615860b34cfdab6d8d0b01b Mon Sep 17 00:00:00 2001
From: Collins Ikechukwu <collinschristroa@gmail.com>
Date: Fri, 18 Apr 2025 18:33:46 +0100
Subject: [PATCH 09/11] refactor: improve code readability and organization in
 contract and test files

- Reordered imports and formatted code for better clarity in contract.rs.
- Enhanced readability by restructuring conditional statements and method calls.
- Cleaned up whitespace in test files to maintain consistency and improve overall code quality.
---
 contracts/boundless_contract/src/contract.rs  | 65 ++++++++++++++-----
 .../src/tests/create_project_test.rs          |  5 +-
 .../src/tests/init_upgrade_test.rs            | 23 ++++---
 .../src/tests/milestone_funding_test.rs       | 59 ++++++++++-------
 contracts/boundless_contract/src/tests/mod.rs |  2 +-
 5 files changed, 98 insertions(+), 56 deletions(-)

diff --git a/contracts/boundless_contract/src/contract.rs b/contracts/boundless_contract/src/contract.rs
index 24120a3c..386b3f8a 100644
--- a/contracts/boundless_contract/src/contract.rs
+++ b/contracts/boundless_contract/src/contract.rs
@@ -1,9 +1,10 @@
-use soroban_sdk::{contract, contractimpl, symbol_short, Address, BytesN, Env, String, Vec, token};
+use soroban_sdk::{contract, contractimpl, symbol_short, token, Address, BytesN, Env, String, Vec};
 
 use crate::{
     error::ProjectError,
     storage::{
-        get_admin, get_version, is_initialized, project_exists, read_project, set_admin, set_initialized, set_version, update_project, write_project, ContractDataKey, Project,
+        get_admin, get_version, is_initialized, project_exists, read_project, set_admin,
+        set_initialized, set_version, update_project, write_project, ContractDataKey, Project,
         FUNDING_PERIOD_LEDGERS, VOTING_PERIOD_LEDGERS,
     },
 };
@@ -309,17 +310,27 @@ impl BoundlessContract {
             return Err(ProjectError::InvalidMilestoneNumber);
         }
 
-        if project.milestone_releases.iter().any(|release| release.0 == milestone_number) {
+        if project
+            .milestone_releases
+            .iter()
+            .any(|release| release.0 == milestone_number)
+        {
             return Err(ProjectError::MilestoneAlreadyCompleted);
         }
 
-        if !project.milestone_approvals.iter().any(|approval| approval.0 == milestone_number && approval.1) {
+        if !project
+            .milestone_approvals
+            .iter()
+            .any(|approval| approval.0 == milestone_number && approval.1)
+        {
             return Err(ProjectError::MilestoneNotApproved);
         }
 
         let milestone_amount = project.funding_target / project.milestone_count as u64;
 
-        project.milestone_releases.push_back((milestone_number, milestone_amount));
+        project
+            .milestone_releases
+            .push_back((milestone_number, milestone_amount));
         project.current_milestone = milestone_number + 1;
 
         if project.current_milestone == project.milestone_count {
@@ -353,11 +364,17 @@ impl BoundlessContract {
             return Err(ProjectError::InvalidMilestoneNumber);
         }
 
-        if project.milestone_approvals.iter().any(|approval| approval.0 == milestone_number) {
+        if project
+            .milestone_approvals
+            .iter()
+            .any(|approval| approval.0 == milestone_number)
+        {
             return Err(ProjectError::MilestoneAlreadyCompleted);
         }
 
-        project.milestone_approvals.push_back((milestone_number, true));
+        project
+            .milestone_approvals
+            .push_back((milestone_number, true));
         update_project(&env, &project)?;
 
         env.events().publish(
@@ -385,11 +402,17 @@ impl BoundlessContract {
             return Err(ProjectError::InvalidMilestoneNumber);
         }
 
-        if project.milestone_approvals.iter().any(|approval| approval.0 == milestone_number) {
+        if project
+            .milestone_approvals
+            .iter()
+            .any(|approval| approval.0 == milestone_number)
+        {
             return Err(ProjectError::MilestoneAlreadyCompleted);
         }
 
-        project.milestone_approvals.push_back((milestone_number, false));
+        project
+            .milestone_approvals
+            .push_back((milestone_number, false));
         update_project(&env, &project)?;
 
         env.events().publish(
@@ -435,13 +458,19 @@ impl BoundlessContract {
         };
 
         // let token_client = token::StellarAssetClient::new(&env, &token_contract);
-        
-        token::Client::new(&env, &token_contract).transfer(&funder, &env.current_contract_address(), &contribution);
+
+        token::Client::new(&env, &token_contract).transfer(
+            &funder,
+            &env.current_contract_address(),
+            &contribution,
+        );
         // token_client.clawback(&funder, &contribution);
         // token_client.mint(&env.current_contract_address(), &contribution);
 
         project.total_funded += contribution as u64;
-        project.backers.push_back((funder.clone(), contribution as u64));
+        project
+            .backers
+            .push_back((funder.clone(), contribution as u64));
         update_project(&env, &project)?;
 
         env.events().publish(
@@ -452,10 +481,16 @@ impl BoundlessContract {
         Ok(())
     }
 
-    pub fn refund(env: Env, project_id: String, token_contract: Address) -> Result<(), ProjectError> {
+    pub fn refund(
+        env: Env,
+        project_id: String,
+        token_contract: Address,
+    ) -> Result<(), ProjectError> {
         let mut project = read_project(&env, &project_id)?;
 
-        if project.total_funded >= project.funding_target || env.ledger().timestamp() < project.funding_deadline {
+        if project.total_funded >= project.funding_target
+            || env.ledger().timestamp() < project.funding_deadline
+        {
             return Err(ProjectError::ProjectNotFailed);
         }
 
@@ -497,7 +532,7 @@ impl BoundlessContract {
         backer: Address,
     ) -> Result<u64, ProjectError> {
         let project = read_project(&env, &project_id)?;
-        
+
         for (addr, amount) in project.backers.iter() {
             if addr == backer {
                 return Ok(amount);
diff --git a/contracts/boundless_contract/src/tests/create_project_test.rs b/contracts/boundless_contract/src/tests/create_project_test.rs
index 8d26e0cc..ed78ce5e 100644
--- a/contracts/boundless_contract/src/tests/create_project_test.rs
+++ b/contracts/boundless_contract/src/tests/create_project_test.rs
@@ -21,7 +21,6 @@ fn test_create_project_success() {
         &metadata_uri,
         &funding_target,
         &milestone_count,
-
     );
 
     let project = client.get_project(&project_id);
@@ -68,12 +67,12 @@ fn test_update_project_metadata_success() {
     let env = Env::default();
     let contract_id = env.register(BoundlessContract, ());
     let client = BoundlessContractClient::new(&env, &contract_id);
-    
+
     let creator = Address::generate(&env);
     let project_id = String::from_str(&env, "test_project");
     let metadata_uri = String::from_str(&env, "ipfs://example-metadata");
     let new_metadata_uri = String::from_str(&env, "ipfs://new-metadata");
-    
+
     env.mock_all_auths();
     client.create_project(&project_id, &creator, &metadata_uri, &1000, &5);
     client.update_project_metadata(&project_id, &creator, &new_metadata_uri);
diff --git a/contracts/boundless_contract/src/tests/init_upgrade_test.rs b/contracts/boundless_contract/src/tests/init_upgrade_test.rs
index 02f3e921..e3446df7 100644
--- a/contracts/boundless_contract/src/tests/init_upgrade_test.rs
+++ b/contracts/boundless_contract/src/tests/init_upgrade_test.rs
@@ -14,12 +14,12 @@ fn test_initialization() {
 
     let contract_id = env.register(BoundlessContract, ());
     let client = BoundlessContractClient::new(&env, &contract_id);
-    
+
     let admin = Address::generate(&env);
     client.initialize(&admin);
-    
+
     assert_eq!(1, client.get_version());
-    
+
     assert_eq!(admin, client.get_admin());
 }
 
@@ -31,12 +31,11 @@ fn test_cannot_reinitialize() {
 
     let contract_id = env.register(BoundlessContract, ());
     let client = BoundlessContractClient::new(&env, &contract_id);
-    
+
     let admin = Address::generate(&env);
     client.initialize(&admin);
 
     let result = client.initialize(&admin);
-    
 }
 
 #[test]
@@ -46,23 +45,23 @@ fn test_project_deadlines() {
 
     let contract_id = env.register(BoundlessContract, ());
     let client = BoundlessContractClient::new(&env, &contract_id);
-    
+
     let admin = Address::generate(&env);
     client.initialize(&admin);
 
     let creator = Address::generate(&env);
     let project_id = String::from_str(&env, "test_project");
     let metadata_uri = String::from_str(&env, "ipfs://example-metadata");
-    
+
     client.create_project(&project_id, &creator, &metadata_uri, &1000, &5);
 
     let project = client.get_project(&project_id);
-    
+
     assert_eq!(
         project.funding_deadline,
         project.created_at + FUNDING_PERIOD_LEDGERS as u64
     );
-    
+
     assert_eq!(
         project.voting_deadline,
         project.funding_deadline + VOTING_PERIOD_LEDGERS as u64
@@ -76,16 +75,16 @@ fn test_project_deadlines() {
 
 //     let contract_id = env.register_contract(None, BoundlessContract);
 //     let client = BoundlessContractClient::new(&env, &contract_id);
-    
+
 //     let admin = Address::generate(&env);
 //     client.initialize(&admin);
 
 //     let non_admin = Address::generate(&env);
-    
+
 //     env.as_contract(&non_admin, || {
 //         let result = client.upgrade(&[0u8; 32]); // Dummy WASM hash
 //         assert!(result.is_err());
-        
+
 //         let err: ProjectError = result.err().unwrap().try_into().unwrap();
 //         assert_eq!(err, ProjectError::Unauthorized);
 //     });
diff --git a/contracts/boundless_contract/src/tests/milestone_funding_test.rs b/contracts/boundless_contract/src/tests/milestone_funding_test.rs
index 3d354d31..315d317a 100644
--- a/contracts/boundless_contract/src/tests/milestone_funding_test.rs
+++ b/contracts/boundless_contract/src/tests/milestone_funding_test.rs
@@ -4,7 +4,11 @@ use crate::{
     contract::{BoundlessContract, BoundlessContractClient},
     error::ProjectError,
 };
-use soroban_sdk::{testutils::{Address as _, Ledger}, token::{self, TokenClient}, Address, Env, String};
+use soroban_sdk::{
+    testutils::{Address as _, Ledger},
+    token::{self, TokenClient},
+    Address, Env, String,
+};
 use token::StellarAssetClient as TokenAdminClient;
 
 fn create_token_contract<'a>(e: &Env, admin: &Address) -> (TokenClient<'a>, TokenAdminClient<'a>) {
@@ -22,16 +26,16 @@ fn create_token_contract<'a>(e: &Env, admin: &Address) -> (TokenClient<'a>, Toke
 //     // Initialize contract
 //     let contract_id = env.register_contract(None, BoundlessContract);
 //     let client = BoundlessContractClient::new(&env, &contract_id);
-    
+
 //     // Setup addresses
 //     let admin = Address::generate(&env);
 //     let creator = Address::generate(&env);
 //     let project_id = String::from_str(&env, "test_project");
 //     let metadata_uri = String::from_str(&env, "ipfs://example-metadata");
-    
+
 //     // Initialize contract
 //     client.initialize(&admin);
-    
+
 //     // Create project
 //     client.create_project(&project_id, &creator, &metadata_uri, &1000, &2);
 
@@ -76,19 +80,19 @@ impl<'a> FundingTest<'a> {
         let funder = Address::generate(&env);
         let project_id = String::from_str(&env, "test_project");
         let metadata_uri = String::from_str(&env, "ipfs://example-metadata");
-        
+
         // Initialize token contract and client
         let (token_client, token_admin_client) = create_token_contract(&env, &admin);
         let token_contract = token_client.address.clone();
-        
+
         // Mint tokens to funder
         token_admin_client.mint(&funder, &3000);
-        
+
         // Initialize contract
         let contract_id = env.register(BoundlessContract, ());
         let contract_client = BoundlessContractClient::new(&env, &contract_id);
         contract_client.initialize(&admin);
-        
+
         // Create project
         contract_client.create_project(&project_id, &creator, &metadata_uri, &1000, &2);
 
@@ -113,45 +117,50 @@ impl<'a> FundingTest<'a> {
 #[test]
 fn test_funding_operations() {
     let test = FundingTest::setup();
-    
-    test.contract_client.fund_project(&test.project_id, &500, &test.funder, &test.token_contract);
-    
+
+    test.contract_client
+        .fund_project(&test.project_id, &500, &test.funder, &test.token_contract);
+
     // Test get project funding
     let (total_funded, target) = test.contract_client.get_project_funding(&test.project_id);
     assert_eq!(total_funded, 500);
     assert_eq!(target, 1000);
 
     // Test get backer contribution
-    let contribution = test.contract_client.get_backer_contribution(&test.project_id, &test.funder);
+    let contribution = test
+        .contract_client
+        .get_backer_contribution(&test.project_id, &test.funder);
     assert_eq!(contribution, 500);
 
     // // Test funding target reached
-    test.contract_client.fund_project(&test.project_id, &600, &test.funder, &test.token_contract);
+    test.contract_client
+        .fund_project(&test.project_id, &600, &test.funder, &test.token_contract);
     let (total_funded, _) = test.contract_client.get_project_funding(&test.project_id);
     assert_eq!(total_funded, 1000); // Should be capped at funding target
-
 }
 
 #[test]
 fn test_refund() {
     let test = FundingTest::setup();
-    
+
     // Fund project with some amount
-    test.contract_client.fund_project(&test.project_id, &500, &test.funder, &test.token_contract);
-    
+    test.contract_client
+        .fund_project(&test.project_id, &500, &test.funder, &test.token_contract);
+
     // Fast forward past funding deadline
     let before = test.env.ledger().timestamp();
     let after = before + 31 * 17280; // 31 days in ledgers
     test.env.ledger().set_timestamp(after);
 
     // Test refund
-    test.contract_client.refund(&test.project_id, &test.token_contract);
-    
+    test.contract_client
+        .refund(&test.project_id, &test.token_contract);
+
     // Verify project state
     let project = test.contract_client.get_project(&test.project_id);
     assert!(project.refund_processed);
     assert!(project.is_closed);
-    
+
     // Verify funder received their tokens back
     let funder_balance = test.token_client.balance(&test.funder);
     assert_eq!(funder_balance, 3000); // Should have original balance back
@@ -165,13 +174,13 @@ fn test_unauthorized_milestone_approval() {
 
     let contract_id = env.register(BoundlessContract, ());
     let client = BoundlessContractClient::new(&env, &contract_id);
-    
+
     let admin = Address::generate(&env);
     let creator = Address::generate(&env);
     let non_admin = Address::generate(&env);
     let project_id = String::from_str(&env, "test_project");
     let metadata_uri = String::from_str(&env, "ipfs://example-metadata");
-    
+
     client.initialize(&admin);
     client.create_project(&project_id, &creator, &metadata_uri, &1000, &2);
 
@@ -187,16 +196,16 @@ fn test_unauthorized_milestone_release() {
 
     let contract_id = env.register(BoundlessContract, ());
     let client = BoundlessContractClient::new(&env, &contract_id);
-    
+
     let admin = Address::generate(&env);
     let creator = Address::generate(&env);
     let non_admin = Address::generate(&env);
     let project_id = String::from_str(&env, "test_project");
     let metadata_uri = String::from_str(&env, "ipfs://example-metadata");
-    
+
     client.initialize(&admin);
     client.create_project(&project_id, &creator, &metadata_uri, &1000, &2);
 
     // Try to release milestone with non-admin
     client.release_milestone(&project_id, &0, &non_admin);
-} 
+}
diff --git a/contracts/boundless_contract/src/tests/mod.rs b/contracts/boundless_contract/src/tests/mod.rs
index 783055d6..6c17760e 100644
--- a/contracts/boundless_contract/src/tests/mod.rs
+++ b/contracts/boundless_contract/src/tests/mod.rs
@@ -1,6 +1,6 @@
 #[cfg(test)]
 mod create_project_test;
 mod init_upgrade_test;
+mod milestone_funding_test;
 #[cfg(test)]
 mod vote_project_test;
-mod milestone_funding_test;

From 78433fc9d1cd4108e7a99c094d0698c5fa7e8fc8 Mon Sep 17 00:00:00 2001
From: Collins Ikechukwu <collinschristroa@gmail.com>
Date: Fri, 18 Apr 2025 18:48:15 +0100
Subject: [PATCH 10/11] chore: remove contract pipeline workflow file

- Deleted the contract-pipeline.yml file from GitHub workflows, streamlining the CI/CD configuration.
---
 .github/workflows/contract-pipeline.yml | 74 -------------------------
 1 file changed, 74 deletions(-)
 delete mode 100644 .github/workflows/contract-pipeline.yml

diff --git a/.github/workflows/contract-pipeline.yml b/.github/workflows/contract-pipeline.yml
deleted file mode 100644
index 2e3f0ee6..00000000
--- a/.github/workflows/contract-pipeline.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-name: Contract Pipeline
-
-on:
-  push:
-    branches: [ main ]
-    paths:
-      - 'contracts/**'
-      - '.github/workflows/contract-pipeline.yml'
-      - 'Dockerfile'
-      - '.github/actions/**'
-  pull_request:
-    branches: [ main ]
-    paths:
-      - 'contracts/**'
-      - '.github/workflows/contract-pipeline.yml'
-      - 'Dockerfile'
-      - '.github/actions/**'
-
-jobs:
-  build-and-test:
-    runs-on: ubuntu-latest
-    
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Setup Rust and Stellar
-        uses: ./.github/actions/setup-rust-stellar
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and test contract
-        run: |
-          docker build -t boundless-contract .
-          docker run --rm boundless-contract /usr/local/bin/entrypoint.sh all
-
-      - name: Upload contract artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: boundless-contract
-          path: contracts/boundless_contract/target/wasm32-unknown-unknown/release/boundless_contract.wasm
-          retention-days: 7
-
-  deploy-testnet:
-    needs: build-and-test
-    if: github.ref == 'refs/heads/main'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Setup Rust and Stellar
-        uses: ./.github/actions/setup-rust-stellar
-
-      - name: Download contract artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: boundless-contract
-          path: contracts/boundless_contract/target/wasm32-unknown-unknown/release/
-
-      - name: Deploy to testnet
-        env:
-          STELLAR_ACCOUNT: ${{ secrets.STELLAR_ACCOUNT }}
-          STELLAR_NETWORK: testnet
-          STELLAR_NETWORK_PASSPHRASE: "Test SDF Network ; September 2015"
-          STELLAR_RPC_URL: "https://soroban-testnet.stellar.org:443"
-          SOROBAN_SECRET_KEY: ${{ secrets.SOROBAN_SECRET_KEY }}
-        run: |
-          soroban contract deploy \
-            --wasm contracts/boundless_contract/target/wasm32-unknown-unknown/release/boundless_contract.wasm \
-            --source ${{ secrets.SOROBAN_SECRET_KEY }} \
-            --rpc-url ${{ env.STELLAR_RPC_URL }} \
-            --network-passphrase "${{ env.STELLAR_NETWORK_PASSPHRASE }}"

From e8b9d04e122083978115f05dfd4feeb2fc49154e Mon Sep 17 00:00:00 2001
From: Collins Ikechukwu <collinschristroa@gmail.com>
Date: Sat, 19 Apr 2025 01:23:00 +0100
Subject: [PATCH 11/11] chore: update GitHub workflows to use
 pull_request_target event

- Changed the pull request trigger from 'pull_request' to 'pull_request_target' in both deploy.yml and verify-build.yml to enhance security and access control during CI/CD processes.
---
 .github/workflows/deploy.yml       | 2 +-
 .github/workflows/verify-build.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0085c0d4..b23a1847 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - main
-  pull_request:
+  pull_request_target:
     branches:
       - main
 
diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml
index a1d9d960..2a1d7404 100644
--- a/.github/workflows/verify-build.yml
+++ b/.github/workflows/verify-build.yml
@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - main
-  pull_request:
+  pull_request_target:
     branches:
       - main