diff --git a/client/src/components/DataBrowser.js b/client/src/components/DataBrowser.js
index 04a6e51..77fad8b 100755
--- a/client/src/components/DataBrowser.js
+++ b/client/src/components/DataBrowser.js
@@ -1118,4 +1118,4 @@ DataBrowser.propTypes = {
   onDatasetSelect: PropTypes.func,
 };
 
-export default DataBrowser;
+export default DataBrowser;
\ No newline at end of file
diff --git a/client/src/components/DataUpload.js b/client/src/components/DataUpload.js
index 09eec88..ce7b6d5 100755
--- a/client/src/components/DataUpload.js
+++ b/client/src/components/DataUpload.js
@@ -294,7 +294,7 @@ const DataUpload = ({ onUploadSuccess, onUploadError }) => {
                 htmlFor="category"
                 className="block text-sm font-medium text-gray-700 mb-1"
               >
-                Category
+                Category *
               </label>
               <select
                 id="category"
@@ -317,7 +317,7 @@ const DataUpload = ({ onUploadSuccess, onUploadError }) => {
                 htmlFor="description"
                 className="block text-sm font-medium text-gray-700 mb-1"
               >
-                Description
+                Description *
               </label>
               <textarea
                 id="description"
@@ -335,7 +335,7 @@ const DataUpload = ({ onUploadSuccess, onUploadError }) => {
                 htmlFor="price"
                 className="block text-sm font-medium text-gray-700 mb-1"
               >
-                Price (ETH)
+                Price (ETH) *
               </label>
               <input
                 id="price"
diff --git a/client/src/components/PaymentModal.js b/client/src/components/PaymentModal.js
new file mode 100644
index 0000000..8bb93b7
--- /dev/null
+++ b/client/src/components/PaymentModal.js
@@ -0,0 +1,566 @@
+// src/components/PaymentModal.js
+import React, { useState, useEffect, useRef, useCallback } from "react";
+import PropTypes from "prop-types";
+import { 
+  CreditCard, 
+  Lock, 
+  AlertCircle, 
+  Check, 
+  X,
+  ArrowRight,
+  Wallet,
+  Shield,
+  Info
+} from "lucide-react";
+import { useSelector } from "react-redux";
+import { LoadingSpinner } from "./ui";
+import hipaaComplianceService from "../services/hipaaComplianceService.js";
+import transactionService from "../services/transactionService.js";
+
+/**
+ * PaymentModal Component
+ * 
+ * A simulated payment interface for researchers to purchase health datasets
+ * Implements HIPAA-compliant transaction logging
+ */
+const PaymentModal = ({ 
+  isOpen, 
+  onClose, 
+  dataset, 
+  onPurchaseComplete, 
+  walletAddress 
+}) => {
+  // Get user wallet details
+  const userWalletAddress = useSelector(state => state.wallet.address) || walletAddress;
+  const userRole = useSelector(state => state.role.role);
+  
+  // Form state
+  const [paymentMethod, setPaymentMethod] = useState("wallet");
+  const [agreeToTerms, setAgreeToTerms] = useState(false);
+  const [processingPayment, setProcessingPayment] = useState(false);
+  const [transactionComplete, setTransactionComplete] = useState(false);
+  const [transactionHash, setTransactionHash] = useState(null);
+  const [error, setError] = useState(null);
+  const [currentStep, setCurrentStep] = useState(1);
+  const [paymentProgress, setPaymentProgress] = useState(0);
+  
+  // References for accessibility
+  const modalRef = useRef(null);
+  const closeButtonRef = useRef(null);
+  const initialFocusRef = useRef(null);
+
+  // Handle modal close with cleanup
+  const handleClose = useCallback(() => {
+    // Reset state if the modal is closed during transaction
+    if (!transactionComplete && processingPayment) {
+      setProcessingPayment(false);
+    }
+    
+    // If transaction was completed successfully, call the completion handler
+    if (transactionComplete && onPurchaseComplete) {
+      onPurchaseComplete({
+        datasetId: dataset?.id,
+        transactionHash,
+        timestamp: new Date().toISOString(),
+        price: dataset?.price,
+        paymentMethod
+      });
+    }
+    
+    // Reset state
+    setCurrentStep(1);
+    setAgreeToTerms(false);
+    setError(null);
+    setPaymentProgress(0);
+    setTransactionComplete(false);
+    setTransactionHash(null);
+    
+    // Close the modal
+    onClose();
+  }, [
+    transactionComplete, 
+    processingPayment, 
+    onPurchaseComplete, 
+    dataset, 
+    transactionHash, 
+    paymentMethod, 
+    onClose
+  ]);
+
+  // Trap focus within modal for accessibility
+  useEffect(() => {
+    if (!isOpen) return;
+    
+    // Focus the initial element when modal opens
+    if (initialFocusRef.current) {
+      initialFocusRef.current.focus();
+    }
+    
+    // Handle ESC key press
+    const handleKeyDown = (e) => {
+      if (e.key === 'Escape') {
+        handleClose();
+      }
+    };
+    
+    window.addEventListener('keydown', handleKeyDown);
+    return () => {
+      window.removeEventListener('keydown', handleKeyDown);
+    };
+  }, [isOpen, handleClose]);
+
+  // Process the payment
+  const processPayment = async () => {
+    if (processingPayment) return;
+    
+    try {
+      setError(null);
+      setProcessingPayment(true);
+      
+      // Log transaction initiation for HIPAA compliance
+      await hipaaComplianceService.createAuditLog("PAYMENT_INITIATED", {
+        datasetId: dataset?.id,
+        userRole,
+        userId: userWalletAddress,
+        paymentMethod,
+        price: dataset?.price,
+        timestamp: new Date().toISOString(),
+        action: "PAYMENT_START"
+      });
+      
+      // Perform the actual purchase using the transaction service
+      const result = await transactionService.purchaseDataset({
+        datasetId: dataset?.id,
+        buyerAddress: userWalletAddress,
+        price: dataset?.price,
+        onProgress: (progress) => {
+          setPaymentProgress(progress);
+        }
+      });
+      
+      if (!result.success) {
+        throw new Error(result.error || "Transaction failed");
+      }
+      
+      // Set the transaction hash from the successful transaction
+      setTransactionHash(result.transactionHash);
+      
+      // Log successful transaction for HIPAA compliance
+      await hipaaComplianceService.createAuditLog("PAYMENT_COMPLETE", {
+        datasetId: dataset?.id,
+        userRole,
+        userId: userWalletAddress,
+        paymentMethod,
+        price: dataset?.price,
+        transactionHash: result.transactionHash,
+        timestamp: new Date().toISOString(),
+        action: "PAYMENT_SUCCESS"
+      });
+      
+      // Mark transaction as complete
+      setTransactionComplete(true);
+      setCurrentStep(3);
+      
+    } catch (err) {
+      console.error("Payment processing error:", err);
+      setError(err.message || "Transaction failed. Please try again.");
+      
+      // Log failed transaction for HIPAA compliance
+      await hipaaComplianceService.createAuditLog("PAYMENT_FAILED", {
+        datasetId: dataset?.id,
+        userRole,
+        userId: userWalletAddress,
+        paymentMethod,
+        price: dataset?.price,
+        error: err.message || "Unknown error",
+        timestamp: new Date().toISOString(),
+        action: "PAYMENT_FAILURE"
+      });
+      
+    } finally {
+      setProcessingPayment(false);
+    }
+  };
+
+  // Proceed to payment confirmation step
+  const handleProceedToPayment = () => {
+    if (!agreeToTerms) {
+      setError("Please agree to the terms and conditions to proceed.");
+      return;
+    }
+    
+    setCurrentStep(2);
+    setError(null);
+  };
+
+  // Confirm and execute payment
+  const handleConfirmPayment = async () => {
+    await processPayment();
+  };
+
+  // If the modal is not open, don't render anything
+  if (!isOpen) return null;
+
+  return (
+    <div
+      className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50"
+      aria-modal="true"
+      aria-labelledby="payment-modal-title"
+      role="dialog"
+      onClick={(e) => {
+        // Close when clicking outside the modal content
+        if (modalRef.current && !modalRef.current.contains(e.target)) {
+          handleClose();
+        }
+      }}
+    >
+      <div 
+        ref={modalRef} 
+        className="bg-white rounded-xl shadow-xl max-w-2xl w-full m-4 overflow-hidden"
+      >
+        {/* Modal Header */}
+        <div className="p-6 border-b border-gray-200">
+          <div className="flex justify-between items-center">
+            <h2 id="payment-modal-title" className="text-2xl font-bold">
+              {currentStep === 3 
+                ? "Payment Complete" 
+                : `Purchase Dataset ${currentStep === 2 ? "- Confirm Payment" : ""}`}
+            </h2>
+            <button
+              ref={closeButtonRef}
+              onClick={handleClose}
+              className="text-gray-500 hover:text-gray-700 focus:outline-none focus:ring-2 focus:ring-gray-400 rounded-full p-1"
+              aria-label="Close dialog"
+            >
+              <X size={24} aria-hidden="true" />
+            </button>
+          </div>
+        </div>
+
+        <div className="p-6 overflow-y-auto max-h-[calc(90vh-120px)]">
+          {/* Step 1: Dataset Selection and Terms */}
+          {currentStep === 1 && (
+            <div className="space-y-6">
+              {/* Dataset Information */}
+              <div className="bg-blue-50 rounded-lg p-4 border border-blue-100">
+                <h3 className="font-semibold text-blue-800 mb-2">Dataset Information</h3>
+                <div className="grid grid-cols-2 gap-4">
+                  <div>
+                    <p className="text-sm text-gray-600">Title:</p>
+                    <p className="font-medium">{dataset?.title || "Selected Dataset"}</p>
+                  </div>
+                  <div>
+                    <p className="text-sm text-gray-600">Price:</p>
+                    <p className="font-medium text-blue-600">{dataset?.price || "0.00"} ETH</p>
+                  </div>
+                  <div>
+                    <p className="text-sm text-gray-600">Category:</p>
+                    <p className="font-medium">{dataset?.category || "Health Data"}</p>
+                  </div>
+                  <div>
+                    <p className="text-sm text-gray-600">Records:</p>
+                    <p className="font-medium">{dataset?.recordCount || "Unknown"}</p>
+                  </div>
+                </div>
+              </div>
+
+              {/* HIPAA Notice */}
+              <div className="bg-purple-50 border border-purple-100 rounded-lg p-4">
+                <div className="flex items-start gap-2">
+                  <Shield className="text-purple-500 flex-shrink-0 mt-1" size={20} />
+                  <div>
+                    <h3 className="font-medium text-purple-700">HIPAA Compliance Notice</h3>
+                    <p className="text-sm text-purple-600">
+                      This transaction will be logged for HIPAA compliance purposes. All data access 
+                      is tracked and secured according to HIPAA regulations.
+                    </p>
+                  </div>
+                </div>
+              </div>
+
+              {/* Payment Method Selection */}
+              <div>
+                <h3 className="font-medium text-gray-800 mb-3">Select Payment Method</h3>
+                <div className="space-y-3">
+                  <label className="flex items-center p-3 border border-gray-200 rounded-lg hover:bg-gray-50 cursor-pointer">
+                    <input
+                      type="radio"
+                      name="paymentMethod"
+                      value="wallet"
+                      checked={paymentMethod === "wallet"}
+                      onChange={() => setPaymentMethod("wallet")}
+                      className="h-4 w-4 text-blue-600"
+                      ref={initialFocusRef}
+                    />
+                    <Wallet className="ml-3 mr-2 h-5 w-5 text-blue-500" />
+                    <div className="ml-2">
+                      <p className="font-medium">Connected Wallet</p>
+                      <p className="text-sm text-gray-500">
+                        Pay using your currently connected wallet: 
+                        <span className="text-gray-700">
+                          {userWalletAddress 
+                            ? ` ${userWalletAddress.slice(0, 6)}...${userWalletAddress.slice(-4)}` 
+                            : " (No wallet connected)"}
+                        </span>
+                      </p>
+                    </div>
+                  </label>
+
+                  <label className="flex items-center p-3 border border-gray-200 rounded-lg hover:bg-gray-50 cursor-pointer">
+                    <input
+                      type="radio"
+                      name="paymentMethod"
+                      value="card"
+                      checked={paymentMethod === "card"}
+                      onChange={() => setPaymentMethod("card")}
+                      className="h-4 w-4 text-blue-600"
+                    />
+                    <CreditCard className="ml-3 mr-2 h-5 w-5 text-blue-500" />
+                    <div className="ml-2">
+                      <p className="font-medium">Credit Card</p>
+                      <p className="text-sm text-gray-500">Simulated credit card payment</p>
+                    </div>
+                  </label>
+                </div>
+              </div>
+
+              {/* Terms Agreement */}
+              <div className="mt-6">
+                <label className="flex items-start cursor-pointer">
+                  <input
+                    type="checkbox"
+                    checked={agreeToTerms}
+                    onChange={(e) => setAgreeToTerms(e.target.checked)}
+                    className="mt-1 h-4 w-4 text-blue-600 rounded"
+                  />
+                  <span className="ml-2 text-sm text-gray-700">
+                    I agree to the <button href="#" className="text-blue-600 hover:underline">Terms of Service</button>{" "}
+                    and acknowledge that this purchase grants me a license to access and use this 
+                    dataset for research purposes only, subject to all applicable HIPAA regulations.
+                  </span>
+                </label>
+              </div>
+              
+              {/* Error Message */}
+              {error && (
+                <div className="bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded-lg flex items-center gap-2">
+                  <AlertCircle size={20} className="text-red-500 flex-shrink-0" />
+                  <span>{error}</span>
+                </div>
+              )}
+            </div>
+          )}
+
+          {/* Step 2: Payment Confirmation */}
+          {currentStep === 2 && (
+            <div className="space-y-6">
+              <div className="bg-gray-50 rounded-lg p-6 border border-gray-200 text-center">
+                <h3 className="text-lg font-semibold mb-2">Please Confirm Your Purchase</h3>
+                <p className="mb-4">You're about to purchase:</p>
+                
+                <div className="mb-6">
+                  <span className="text-2xl font-bold text-blue-600">{dataset?.price || "0.00"} ETH</span>
+                </div>
+                
+                <div className="flex justify-center items-center gap-2 mb-4">
+                  <div className="text-gray-500">via</div>
+                  <div className="bg-blue-100 text-blue-800 px-3 py-1 rounded-full text-sm flex items-center">
+                    {paymentMethod === "wallet" ? (
+                      <>
+                        <Wallet size={14} className="mr-1" />
+                        <span>Connected Wallet</span>
+                      </>
+                    ) : (
+                      <>
+                        <CreditCard size={14} className="mr-1" />
+                        <span>Credit Card</span>
+                      </>
+                    )}
+                  </div>
+                </div>
+                
+                <p className="text-sm text-gray-600">
+                  This is a simulated transaction for demonstration purposes.
+                  No actual cryptocurrency will be transferred.
+                </p>
+              </div>
+
+              <div className="bg-yellow-50 border border-yellow-100 rounded-lg p-4">
+                <div className="flex items-start gap-2">
+                  <Info className="text-yellow-500 flex-shrink-0 mt-1" size={20} />
+                  <div>
+                    <p className="text-sm text-yellow-700">
+                      In a production environment, this would initiate an actual blockchain 
+                      transaction. For this demo, we'll simulate the payment process.
+                    </p>
+                  </div>
+                </div>
+              </div>
+              
+              {/* Processing Indicator */}
+              {processingPayment && (
+                <div className="text-center py-4">
+                  <LoadingSpinner size="medium" label="Processing payment..." showLabel={true} />
+                  <p className="text-sm text-gray-600 mt-2">
+                    Please wait while your transaction is being processed...
+                  </p>
+                  
+                  {/* Progress bar */}
+                  <div className="w-full mt-4 bg-gray-200 rounded-full h-2.5">
+                    <div 
+                      className="bg-blue-600 h-2.5 rounded-full transition-all duration-300"
+                      style={{ width: `${paymentProgress}%` }}
+                    ></div>
+                  </div>
+                  <p className="mt-2 text-xs text-gray-500">
+                    Transaction progress: {paymentProgress}%
+                  </p>
+                </div>
+              )}
+              
+              {/* Error Message */}
+              {error && (
+                <div className="bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded-lg flex items-center gap-2">
+                  <AlertCircle size={20} className="text-red-500 flex-shrink-0" />
+                  <span>{error}</span>
+                </div>
+              )}
+            </div>
+          )}
+
+          {/* Step 3: Transaction Complete */}
+          {currentStep === 3 && (
+            <div className="space-y-6 text-center">
+              <div className="flex justify-center my-6">
+                <div className="h-16 w-16 bg-green-100 rounded-full flex items-center justify-center">
+                  <Check size={32} className="text-green-600" />
+                </div>
+              </div>
+              
+              <h3 className="text-lg font-semibold text-green-700">
+                Transaction Complete!
+              </h3>
+              
+              <div className="bg-gray-50 rounded-lg p-6 border border-gray-200 text-left">
+                <div className="grid grid-cols-1 sm:grid-cols-2 gap-4 mb-4">
+                  <div>
+                    <p className="text-sm text-gray-500">Transaction ID:</p>
+                    <p className="font-mono text-sm break-all">{transactionHash}</p>
+                  </div>
+                  <div>
+                    <p className="text-sm text-gray-500">Amount:</p>
+                    <p className="font-medium">{dataset?.price || "0.00"} ETH</p>
+                  </div>
+                  <div>
+                    <p className="text-sm text-gray-500">Date:</p>
+                    <p className="font-medium">{new Date().toLocaleString()}</p>
+                  </div>
+                  <div>
+                    <p className="text-sm text-gray-500">Status:</p>
+                    <p className="font-medium text-green-600">Confirmed</p>
+                  </div>
+                </div>
+                
+                <div className="border-t border-gray-200 pt-4 mt-2">
+                  <p className="text-sm text-gray-700">
+                    Your payment has been processed successfully. You now have access to this dataset.
+                    You can view your purchased datasets in your research dashboard.
+                  </p>
+                </div>
+              </div>
+              
+              <div className="bg-blue-50 border border-blue-100 rounded-lg p-4 text-left">
+                <div className="flex items-start gap-2">
+                  <Info className="text-blue-500 flex-shrink-0 mt-1" size={20} />
+                  <div>
+                    <p className="text-sm text-blue-700">
+                      This was a simulated transaction for demonstration purposes.
+                      In a production environment, a real cryptocurrency transaction would have been executed.
+                    </p>
+                  </div>
+                </div>
+              </div>
+            </div>
+          )}
+        </div>
+
+        {/* Footer with Actions */}
+        <div className="p-6 border-t border-gray-200 bg-gray-50">
+          <div className="flex justify-end gap-3">
+            {currentStep === 1 && (
+              <>
+                <button
+                  onClick={handleClose}
+                  className="px-4 py-2 border border-gray-300 text-gray-700 font-medium rounded-lg hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-gray-400"
+                >
+                  Cancel
+                </button>
+                <button
+                  onClick={handleProceedToPayment}
+                  disabled={!agreeToTerms}
+                  className={`px-4 py-2 flex items-center gap-2 text-white font-medium rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-400 ${
+                    !agreeToTerms
+                      ? "bg-blue-300 cursor-not-allowed"
+                      : "bg-blue-500 hover:bg-blue-600"
+                  }`}
+                >
+                  <span>Continue</span>
+                  <ArrowRight size={16} />
+                </button>
+              </>
+            )}
+
+            {currentStep === 2 && (
+              <>
+                <button
+                  onClick={() => setCurrentStep(1)}
+                  disabled={processingPayment}
+                  className="px-4 py-2 border border-gray-300 text-gray-700 font-medium rounded-lg hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-gray-400 disabled:opacity-50 disabled:cursor-not-allowed"
+                >
+                  Back
+                </button>
+                <button
+                  onClick={handleConfirmPayment}
+                  disabled={processingPayment}
+                  className={`px-4 py-2 flex items-center gap-2 text-white font-medium rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-400 ${
+                    processingPayment
+                      ? "bg-blue-300 cursor-not-allowed"
+                      : "bg-blue-500 hover:bg-blue-600"
+                  }`}
+                >
+                  {processingPayment ? (
+                    <span>Processing...</span>
+                  ) : (
+                    <>
+                      <span>Confirm Purchase</span>
+                      <Lock size={16} />
+                    </>
+                  )}
+                </button>
+              </>
+            )}
+
+            {currentStep === 3 && (
+              <button
+                onClick={handleClose}
+                className="px-4 py-2 bg-blue-500 text-white font-medium rounded-lg hover:bg-blue-600 focus:outline-none focus:ring-2 focus:ring-blue-400"
+              >
+                Close
+              </button>
+            )}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+PaymentModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  onClose: PropTypes.func.isRequired,
+  dataset: PropTypes.object,
+  onPurchaseComplete: PropTypes.func,
+  walletAddress: PropTypes.string
+};
+
+export default PaymentModal;
\ No newline at end of file
diff --git a/client/src/components/dashboard/Dashboard.js b/client/src/components/dashboard/Dashboard.js
index 519b54d..767f042 100644
--- a/client/src/components/dashboard/Dashboard.js
+++ b/client/src/components/dashboard/Dashboard.js
@@ -1503,4 +1503,4 @@ Dashboard.propTypes = {
   onNavigate: PropTypes.func,
 };
 
-export default Dashboard;
+export default Dashboard;
\ No newline at end of file
diff --git a/client/src/components/dashboard/RoleSwitcher.js b/client/src/components/dashboard/RoleSwitcher.js
new file mode 100644
index 0000000..c55374e
--- /dev/null
+++ b/client/src/components/dashboard/RoleSwitcher.js
@@ -0,0 +1,149 @@
+// client/src/components/dashboard/RoleSwitcher.js
+import React, { useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { User, Microscope, Loader, AlertCircle } from "lucide-react";
+import { setRole } from "../../redux/slices/roleSlice.js";
+import { addNotification } from "../../redux/slices/notificationSlice.js";
+import { updateUserProfile } from "../../redux/slices/userSlice.js";
+import hipaaComplianceService from "../../services/hipaaComplianceService.js";
+import authService from "../../services/authService.js";
+import authUtils from "../../utils/authUtils.js";
+
+/**
+ * Role Switcher Component for the Dashboard
+ * Allows users to switch between patient and researcher roles
+ */
+const RoleSwitcher = () => {
+  const dispatch = useDispatch();
+  const currentRole = useSelector((state) => state.role.role);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(null);
+  const [selectedRole, setSelectedRole] = useState(null);
+
+  /**
+   * Handle role switch - reusing logic from the original RoleSelector
+   */
+  const handleRoleSwitch = async (role) => {
+    // If already selected or in process, do nothing
+    if (role === currentRole || loading) return;
+    
+    try {
+      setLoading(true);
+      setError(null);
+      setSelectedRole(role);
+      
+      console.log(`Switching role to: ${role}`);
+      
+      // Audit role selection for HIPAA compliance
+      await hipaaComplianceService.createAuditLog("ROLE_SWITCH", {
+        fromRole: currentRole,
+        toRole: role,
+        timestamp: new Date().toISOString(),
+        action: "SWITCH",
+      });
+
+      // Get current user data to merge with role
+      const userData = authService.getCurrentUser() || {};
+      const walletAddress = userData.address || localStorage.getItem("healthmint_wallet_address");
+
+      if (!walletAddress) {
+        throw new Error("Wallet address not found. Please reconnect your wallet.");
+      }
+
+      const updatedUserData = {
+        ...userData,
+        role,
+        address: walletAddress,
+        lastUpdated: new Date().toISOString(),
+      };
+
+      // Update user data in authService
+      authService.updateUserData?.(updatedUserData) || 
+        authUtils.forceRegistrationComplete?.(role, walletAddress, updatedUserData);
+
+      // Explicitly set in localStorage
+      localStorage.setItem("healthmint_user_role", role);
+
+      // Dispatch role selection action to Redux
+      dispatch(setRole(role));
+
+      // Update user profile with role information
+      dispatch(updateUserProfile(updatedUserData));
+
+      // Success notification
+      dispatch(
+        addNotification({
+          type: "success",
+          message: `Switched to ${role === "patient" ? "Patient" : "Researcher"} view`,
+          duration: 3000,
+        })
+      );
+
+    } catch (err) {
+      console.error("Role switch error:", err);
+      setError(err.message || "Failed to switch role. Please try again.");
+
+      dispatch(
+        addNotification({
+          type: "error",
+          message: err.message || "Failed to switch role. Please try again.",
+        })
+      );
+
+    } finally {
+      setLoading(false);
+      setSelectedRole(null);
+    }
+  };
+
+  return (
+    <div className="flex items-center space-x-2">
+      {error && (
+        <div className="fixed top-4 right-4 bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded-lg shadow-md flex items-center gap-2 z-50">
+          <AlertCircle size={20} className="flex-shrink-0 text-red-500" />
+          <span>{error}</span>
+        </div>
+      )}
+      
+      <span className="text-sm text-gray-500 mr-2">View as:</span>
+      
+      {/* Patient Role Button */}
+      <button
+        className={`flex items-center px-3 py-1.5 text-sm rounded-md transition-colors ${
+          currentRole === "patient"
+            ? "bg-blue-100 text-blue-700"
+            : "bg-gray-100 text-gray-700 hover:bg-gray-200"
+        }`}
+        onClick={() => !loading && handleRoleSwitch("patient")}
+        disabled={loading || currentRole === "patient"}
+        aria-label="Switch to Patient view"
+      >
+        <User className="w-4 h-4 mr-1.5" />
+        Patient
+        {loading && selectedRole === "patient" && (
+          <Loader className="w-3 h-3 ml-1.5 animate-spin" />
+        )}
+      </button>
+      
+      {/* Researcher Role Button */}
+      <button
+        className={`flex items-center px-3 py-1.5 text-sm rounded-md transition-colors ${
+          currentRole === "researcher"
+            ? "bg-purple-100 text-purple-700"
+            : "bg-gray-100 text-gray-700 hover:bg-gray-200"
+        }`}
+        onClick={() => !loading && handleRoleSwitch("researcher")}
+        disabled={loading || currentRole === "researcher"}
+        aria-label="Switch to Researcher view"
+      >
+        <Microscope className="w-4 h-4 mr-1.5" />
+        Researcher
+        {loading && selectedRole === "researcher" && (
+          <Loader className="w-3 h-3 ml-1.5 animate-spin" />
+        )}
+      </button>
+    </div>
+  );
+};
+
+export default RoleSwitcher;
\ No newline at end of file
diff --git a/client/src/components/providers/HipaaComplianceProvider.js b/client/src/components/providers/HipaaComplianceProvider.js
index a0b2ee4..fdbe282 100644
--- a/client/src/components/providers/HipaaComplianceProvider.js
+++ b/client/src/components/providers/HipaaComplianceProvider.js
@@ -1,6 +1,7 @@
 // src/components/providers/HipaaComplianceProvider.js
 import React, { createContext, useContext } from "react";
 import PropTypes from "prop-types";
+import hipaaComplianceService from "../../services/hipaaComplianceService.js";
 import useHipaaCompliance from "../../hooks/useHipaaCompliance.js";
 
 // Create context for HIPAA compliance
@@ -9,6 +10,13 @@ export const HipaaComplianceProvider = ({ children, options = {} }) => {
   // Use the hook to get all HIPAA functionality
   const hipaaCompliance = useHipaaCompliance(options);
 
+  // The error suggests that when importing hipaaComplianceService directly in other 
+  // components, the logDataAccess method might not be correctly attached to it
+  // Let's ensure the service itself has the method properly attached
+  if (!hipaaComplianceService.logDataAccess) {
+    hipaaComplianceService.logDataAccess = hipaaCompliance.logDataAccess;
+  }
+
   return (
     <HipaaComplianceContext.Provider value={hipaaCompliance}>
       {children}
@@ -37,4 +45,4 @@ export const useHipaaContext = () => {
   return context;
 };
 
-export default HipaaComplianceProvider;
+export default HipaaComplianceProvider;
\ No newline at end of file
diff --git a/client/src/components/roles/ForgotPassword.js b/client/src/components/roles/ForgotPassword.js
new file mode 100644
index 0000000..b80ab6d
--- /dev/null
+++ b/client/src/components/roles/ForgotPassword.js
@@ -0,0 +1,161 @@
+// client/src/components/auth/ForgotPassword.js
+import React, { useState, useCallback } from "react";
+import { Link, useNavigate } from "react-router-dom";
+import { useDispatch } from "react-redux";
+import { Loader, ArrowLeft, Mail, AlertCircle } from "lucide-react";
+import { addNotification } from "../../redux/slices/notificationSlice";
+
+const ForgotPassword = () => {
+  const dispatch = useDispatch();
+  const navigate = useNavigate();
+  
+  // Form state
+  const [email, setEmail] = useState("");
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(null);
+  const [resetEmailSent, setResetEmailSent] = useState(false);
+  
+  const handleSubmit = useCallback(async (e) => {
+    e.preventDefault();
+    
+    try {
+      setLoading(true);
+      setError(null);
+      
+      // Basic validation
+      if (!email) {
+        throw new Error("Please enter your email address");
+      }
+      
+      // Email format validation
+      const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+      if (!emailRegex.test(email)) {
+        throw new Error("Please enter a valid email address");
+      }
+      
+      // Simulate API call for password reset
+      await new Promise(resolve => setTimeout(resolve, 1500));
+      
+      // Mark as successful
+      setResetEmailSent(true);
+      
+      // Success notification
+      dispatch(
+        addNotification({
+          type: "success",
+          message: "Password reset email sent successfully!",
+        })
+      );
+      
+    } catch (err) {
+      console.error("Password reset error:", err);
+      setError(err.message || "Failed to send reset email. Please try again.");
+      
+      dispatch(
+        addNotification({
+          type: "error",
+          message: err.message || "Failed to send reset email. Please try again.",
+        })
+      );
+    } finally {
+      setLoading(false);
+    }
+  }, [dispatch, email]);
+  
+  return (
+    <div className="min-h-screen flex items-center justify-center bg-gray-50 p-6">
+      {error && (
+        <div className="fixed top-4 right-4 bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded-lg shadow-md flex items-center gap-2">
+          <AlertCircle size={20} className="flex-shrink-0 text-red-500" />
+          <span>{error}</span>
+        </div>
+      )}
+      
+      <div className="max-w-md w-full">
+        <div className="mb-8 text-center">
+          <h1 className="text-3xl font-bold mb-2">Reset Your Password</h1>
+          <p className="text-gray-600">
+            Enter your email to receive password reset instructions
+          </p>
+        </div>
+        
+        <div className="bg-white rounded-lg shadow-md p-8">
+          {resetEmailSent ? (
+            <div className="text-center">
+              <div className="w-16 h-16 bg-green-100 rounded-full flex items-center justify-center mx-auto mb-4">
+                <Mail size={32} className="text-green-500" />
+              </div>
+              <h2 className="text-xl font-semibold mb-2">Check your inbox</h2>
+              <p className="text-gray-600 mb-6">
+                We've sent a password reset link to <strong>{email}</strong>. 
+                Please check your email and follow the instructions to reset your password.
+              </p>
+              <p className="text-sm text-gray-500 mb-6">
+                Didn't receive the email? Check your spam folder or 
+                <button 
+                  className="text-blue-600 hover:text-blue-800 ml-1" 
+                  onClick={() => setResetEmailSent(false)}
+                >
+                  try again
+                </button>.
+              </p>
+              <Link
+                to="/login"
+                className="inline-flex items-center text-blue-600 hover:text-blue-800"
+              >
+                <ArrowLeft size={16} className="mr-1" /> Return to login
+              </Link>
+            </div>
+          ) : (
+            <form onSubmit={handleSubmit}>
+              <div className="mb-6">
+                <label 
+                  htmlFor="email" 
+                  className="block text-sm font-medium text-gray-700 mb-1"
+                >
+                  Email Address
+                </label>
+                <input
+                  id="email"
+                  type="email"
+                  value={email}
+                  onChange={(e) => setEmail(e.target.value)}
+                  className="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"
+                  placeholder="Enter your email"
+                  required
+                  disabled={loading}
+                />
+              </div>
+              
+              <button
+                type="submit"
+                className="w-full bg-blue-500 hover:bg-blue-600 text-white font-medium py-2.5 px-4 rounded-lg transition-colors flex items-center justify-center"
+                disabled={loading}
+              >
+                {loading ? (
+                  <>
+                    <Loader className="w-4 h-4 mr-2 animate-spin" />
+                    Sending...
+                  </>
+                ) : (
+                  "Send Reset Link"
+                )}
+              </button>
+              
+              <div className="mt-4 text-center">
+                <Link
+                  to="/login"
+                  className="inline-flex items-center text-blue-600 hover:text-blue-800"
+                >
+                  <ArrowLeft size={16} className="mr-1" /> Return to login
+                </Link>
+              </div>
+            </form>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default ForgotPassword;
\ No newline at end of file
diff --git a/client/src/components/roles/Register.js b/client/src/components/roles/Register.js
new file mode 100644
index 0000000..c0822b3
--- /dev/null
+++ b/client/src/components/roles/Register.js
@@ -0,0 +1,302 @@
+// client/src/components/roles/Register.js
+import React, { useState, useCallback } from "react";
+import { Link, useNavigate } from "react-router-dom";
+import { useDispatch } from "react-redux";
+import { Loader, ArrowLeft, AlertCircle, Users } from "lucide-react";
+import { addNotification } from "../../redux/slices/notificationSlice";
+import { updateUserProfile } from "../../redux/slices/userSlice";
+import { setRole } from "../../redux/slices/roleSlice";
+import authService from "/../services/authService";
+
+const Register = () => {
+  const dispatch = useDispatch();
+  const navigate = useNavigate();
+  
+  // Form state
+  const [formData, setFormData] = useState({
+    name: "",
+    email: "",
+    password: "",
+    confirmPassword: "",
+    agreeToTerms: false
+  });
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(null);
+  
+  const handleChange = (e) => {
+    const { name, value, type, checked } = e.target;
+    setFormData(prevData => ({
+      ...prevData,
+      [name]: type === 'checkbox' ? checked : value
+    }));
+  };
+  
+  const validateForm = () => {
+    if (!formData.name) {
+      throw new Error("Please enter your name");
+    }
+    
+    if (!formData.email) {
+      throw new Error("Please enter your email");
+    }
+    
+    // Email format validation
+    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    if (!emailRegex.test(formData.email)) {
+      throw new Error("Please enter a valid email address");
+    }
+    
+    if (!formData.password) {
+      throw new Error("Please enter a password");
+    }
+    
+    // Password strength validation
+    if (formData.password.length < 8) {
+      throw new Error("Password must be at least 8 characters long");
+    }
+    
+    if (formData.password !== formData.confirmPassword) {
+      throw new Error("Passwords do not match");
+    }
+    
+    if (!formData.agreeToTerms) {
+      throw new Error("You must agree to the Terms of Service and Privacy Policy");
+    }
+    
+    return true;
+  };
+  
+  const handleSubmit = useCallback(async (e) => {
+    e.preventDefault();
+    
+    try {
+      setLoading(true);
+      setError(null);
+      
+      // Validate form data
+      validateForm();
+      
+      // Get wallet address if available
+      const walletAddress = localStorage.getItem("healthmint_wallet_address") || "0x0000000";
+      
+      // Create user data
+      const userData = {
+        id: 'user-' + Math.random().toString(36).substring(2),
+        name: formData.name,
+        email: formData.email,
+        role: "patient", // Default role
+        address: walletAddress,
+        createdAt: new Date().toISOString()
+      };
+      
+      // Create a mock token
+      const token = 'token-' + Date.now();
+      
+      // Set all required localStorage items for your auth system
+      localStorage.setItem("healthmint_user", JSON.stringify(userData));
+      localStorage.setItem("healthmint_auth_token", token);
+      localStorage.setItem("healthmint_token_expiry", (Date.now() + 3600 * 1000).toString());
+      localStorage.setItem("healthmint_registration_status", "complete");
+      localStorage.setItem("healthmint_user_role", "patient");
+      localStorage.setItem("healthmint_is_new_user", "false");
+      localStorage.setItem("healthmint_wallet_connection", "true");
+      
+      // Mark registration as complete using your auth service
+      authService.completeRegistration({
+        ...userData,
+        token
+      });
+      
+      // Update Redux state
+      dispatch(setRole("patient"));
+      dispatch(updateUserProfile(userData));
+      
+      // Success notification
+      dispatch(
+        addNotification({
+          type: "success",
+          message: "Account created successfully! Welcome to Healthmint.",
+          duration: 5000,
+        })
+      );
+      
+      // Navigate to dashboard
+      navigate("/dashboard", {
+        replace: true,
+        state: { registrationCompleted: true }
+      });
+      
+    } catch (err) {
+      console.error("Registration error:", err);
+      setError(err.message || "Failed to create account. Please try again.");
+      
+      dispatch(
+        addNotification({
+          type: "error",
+          message: err.message || "Failed to create account. Please try again.",
+        })
+      );
+    } finally {
+      setLoading(false);
+    }
+  }, [dispatch, navigate, formData]);
+  
+  return (
+    <div className="min-h-screen flex items-center justify-center bg-gray-50 p-6">
+      {error && (
+        <div className="fixed top-4 right-4 bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded-lg shadow-md flex items-center gap-2">
+          <AlertCircle size={20} className="flex-shrink-0 text-red-500" />
+          <span>{error}</span>
+        </div>
+      )}
+      
+      <div className="max-w-md w-full">
+        <div className="mb-8 text-center">
+          <h1 className="text-3xl font-bold mb-2">Create an Account</h1>
+          <p className="text-gray-600">
+            Join Healthmint to securely manage and share your health data
+          </p>
+        </div>
+        
+        <div className="bg-white rounded-lg shadow-md p-8">
+          <form onSubmit={handleSubmit}>
+            <div className="mb-4">
+              <label 
+                htmlFor="name" 
+                className="block text-sm font-medium text-gray-700 mb-1"
+              >
+                Full Name
+              </label>
+              <input
+                id="name"
+                name="name"
+                type="text"
+                value={formData.name}
+                onChange={handleChange}
+                className="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"
+                placeholder="Enter your full name"
+                required
+                disabled={loading}
+              />
+            </div>
+            
+            <div className="mb-4">
+              <label 
+                htmlFor="email" 
+                className="block text-sm font-medium text-gray-700 mb-1"
+              >
+                Email Address
+              </label>
+              <input
+                id="email"
+                name="email"
+                type="email"
+                value={formData.email}
+                onChange={handleChange}
+                className="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"
+                placeholder="Enter your email"
+                required
+                disabled={loading}
+              />
+            </div>
+            
+            <div className="mb-4">
+              <label 
+                htmlFor="password" 
+                className="block text-sm font-medium text-gray-700 mb-1"
+              >
+                Password
+              </label>
+              <input
+                id="password"
+                name="password"
+                type="password"
+                value={formData.password}
+                onChange={handleChange}
+                className="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"
+                placeholder="Create a password"
+                required
+                disabled={loading}
+              />
+              <p className="mt-1 text-xs text-gray-500">
+                Password must be at least 8 characters long
+              </p>
+            </div>
+            
+            <div className="mb-6">
+              <label 
+                htmlFor="confirmPassword" 
+                className="block text-sm font-medium text-gray-700 mb-1"
+              >
+                Confirm Password
+              </label>
+              <input
+                id="confirmPassword"
+                name="confirmPassword"
+                type="password"
+                value={formData.confirmPassword}
+                onChange={handleChange}
+                className="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"
+                placeholder="Confirm your password"
+                required
+                disabled={loading}
+              />
+            </div>
+            
+            <div className="mb-6">
+              <label className="flex items-start cursor-pointer">
+                <input
+                  type="checkbox"
+                  name="agreeToTerms"
+                  checked={formData.agreeToTerms}
+                  onChange={handleChange}
+                  className="mt-1 h-4 w-4 text-blue-600 border-gray-300 rounded focus:ring-blue-500"
+                  disabled={loading}
+                />
+                <span className="ml-2 block text-sm text-gray-700">
+                  I agree to the 
+                  <a href="/terms" className="text-blue-600 hover:text-blue-800 mx-1">
+                    Terms of Service
+                  </a> 
+                  and 
+                  <a href="/privacy" className="text-blue-600 hover:text-blue-800 mx-1">
+                    Privacy Policy
+                  </a>
+                </span>
+              </label>
+            </div>
+            
+            <button
+              type="submit"
+              className="w-full bg-blue-500 hover:bg-blue-600 text-white font-medium py-2.5 px-4 rounded-lg transition-colors flex items-center justify-center"
+              disabled={loading}
+            >
+              {loading ? (
+                <>
+                  <Loader className="w-4 h-4 mr-2 animate-spin" />
+                  Creating Account...
+                </>
+              ) : (
+                <>
+                  <Users size={16} className="mr-2" />
+                  Create Account
+                </>
+              )}
+            </button>
+          </form>
+        </div>
+        
+        <div className="mt-6 text-center">
+          <p className="text-gray-600">
+            Already have an account? 
+            <Link to="/login" className="text-blue-600 hover:text-blue-800 ml-1">
+              Sign in
+            </Link>
+          </p>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default Register;
\ No newline at end of file
diff --git a/client/src/components/roles/RoleSelector.js b/client/src/components/roles/RoleSelector.js
index 7a713b4..9d254b9 100644
--- a/client/src/components/roles/RoleSelector.js
+++ b/client/src/components/roles/RoleSelector.js
@@ -277,4 +277,4 @@ const RoleSelector = () => {
   );
 };
 
-export default RoleSelector;
+export default RoleSelector;
\ No newline at end of file
diff --git a/client/src/services/hipaaComplianceService.js b/client/src/services/hipaaComplianceService.js
index 377d332..a78d686 100644
--- a/client/src/services/hipaaComplianceService.js
+++ b/client/src/services/hipaaComplianceService.js
@@ -344,4 +344,4 @@ class HipaaComplianceService {
 const hipaaComplianceService = new HipaaComplianceService();
 
 // Export the singleton
-export default hipaaComplianceService;
+export default hipaaComplianceService;
\ No newline at end of file
diff --git a/client/src/services/transactionService.js b/client/src/services/transactionService.js
new file mode 100644
index 0000000..57863dc
--- /dev/null
+++ b/client/src/services/transactionService.js
@@ -0,0 +1,281 @@
+// src/services/transactionService.js
+/**
+ * Transaction Service
+ * 
+ * Simulates blockchain transactions for health data purchases
+ * and maintains a transaction history
+ */
+
+// Store transaction history in localStorage
+const STORAGE_KEY = 'healthmint_transactions';
+
+/**
+ * Get all transactions from storage
+ * @returns {Array} Array of transaction objects
+ */
+const getTransactions = () => {
+  try {
+    const storedTransactions = localStorage.getItem(STORAGE_KEY);
+    return storedTransactions ? JSON.parse(storedTransactions) : [];
+  } catch (error) {
+    console.error('Error retrieving transactions:', error);
+    return [];
+  }
+};
+
+/**
+ * Save transactions to storage
+ * @param {Array} transactions - Array of transaction objects to save
+ */
+const saveTransactions = (transactions) => {
+  try {
+    localStorage.setItem(STORAGE_KEY, JSON.stringify(transactions));
+  } catch (error) {
+    console.error('Error saving transactions:', error);
+  }
+};
+
+/**
+ * Generate a mock Ethereum transaction hash
+ * @returns {string} A mock transaction hash
+ */
+const generateTransactionHash = () => {
+  const characters = '0123456789abcdef';
+  let hash = '0x';
+  for (let i = 0; i < 64; i++) {
+    hash += characters.charAt(Math.floor(Math.random() * characters.length));
+  }
+  return hash;
+};
+
+/**
+ * Simulate a blockchain transaction with configurable success rate
+ * @param {Object} options - Transaction options
+ * @param {string} options.from - Sender address
+ * @param {string} options.to - Recipient address
+ * @param {string|number} options.value - Amount to transfer
+ * @param {number} options.successRate - Probability of success (0-1)
+ * @param {function} options.onProgress - Progress callback function
+ * @returns {Promise<Object>} Transaction result
+ */
+const simulateTransaction = async (options = {}) => {
+  const {
+    from = '0x0000000000000000000000000000000000000000',
+    to = '0x0000000000000000000000000000000000000000',
+    value = '0',
+    successRate = 0.95,  // 95% success rate by default
+    delayMs = 2500,      // Simulate network delay
+    onProgress          // Optional progress callback
+  } = options;
+
+  // Simulate blockchain call
+  return new Promise((resolve, reject) => {
+    // Initial progress
+    if (onProgress) onProgress(0);
+    
+    setTimeout(() => {
+      // Middle progress
+      if (onProgress) onProgress(50);
+      
+      setTimeout(() => {
+        // Final progress
+        if (onProgress) onProgress(100);
+        
+        // Determine if transaction succeeds based on success rate
+        const isSuccessful = Math.random() < successRate;
+        
+        if (isSuccessful) {
+          const transactionHash = generateTransactionHash();
+          const timestamp = new Date().toISOString();
+          
+          // Create transaction record
+          const transaction = {
+            hash: transactionHash,
+            from,
+            to,
+            value,
+            timestamp,
+            status: 'confirmed',
+            blockNumber: Math.floor(Math.random() * 1000000) + 15000000,
+            gasUsed: Math.floor(Math.random() * 100000) + 50000,
+          };
+          
+          // Add to transaction history
+          const transactions = getTransactions();
+          transactions.push(transaction);
+          saveTransactions(transactions);
+          
+          resolve({
+            success: true,
+            transaction
+          });
+        } else {
+          // Simulate random failure reasons
+          const errorTypes = [
+            'Transaction underpriced',
+            'Insufficient funds for gas * price + value',
+            'User rejected transaction',
+            'Transaction timeout'
+          ];
+          
+          const errorMessage = errorTypes[Math.floor(Math.random() * errorTypes.length)];
+          
+          reject(new Error(errorMessage));
+        }
+      }, delayMs / 2);
+    }, delayMs / 2);
+  });
+};
+
+/**
+ * Create a purchase transaction for a health dataset
+ * @param {Object} purchaseData - Purchase details
+ * @param {string} purchaseData.datasetId - ID of the dataset being purchased
+ * @param {string} purchaseData.buyerAddress - Buyer's wallet address
+ * @param {string} purchaseData.sellerAddress - Seller's wallet address
+ * @param {string|number} purchaseData.price - Price in ETH
+ * @param {function} purchaseData.onProgress - Optional progress callback
+ * @returns {Promise<Object>} Transaction result
+ */
+const purchaseDataset = async (purchaseData) => {
+  const {
+    datasetId,
+    buyerAddress,
+    sellerAddress = '0x71C7656EC7ab88b098defB751B7401B5f6d8976F', // Default contract address
+    price,
+    onProgress
+  } = purchaseData;
+  
+  if (!datasetId || !buyerAddress || !price) {
+    throw new Error('Missing required purchase information');
+  }
+  
+  try {
+    // Simulate blockchain transaction
+    const result = await simulateTransaction({
+      from: buyerAddress,
+      to: sellerAddress,
+      value: price,
+      onProgress
+    });
+    
+    // Add dataset-specific metadata to the transaction
+    const transactions = getTransactions();
+    const transactionIndex = transactions.findIndex(tx => tx.hash === result.transaction.hash);
+    
+    if (transactionIndex >= 0) {
+      transactions[transactionIndex].metadata = {
+        type: 'DATASET_PURCHASE',
+        datasetId,
+        purchaseDate: new Date().toISOString()
+      };
+      
+      saveTransactions(transactions);
+    }
+    
+    return {
+      success: true,
+      transactionHash: result.transaction.hash,
+      timestamp: result.transaction.timestamp,
+      datasetId
+    };
+  } catch (error) {
+    console.error('Dataset purchase failed:', error);
+    return {
+      success: false,
+      error: error.message || 'Transaction failed'
+    };
+  }
+};
+
+/**
+ * Get transaction history for a specific wallet address
+ * @param {string} walletAddress - The wallet address to filter transactions for
+ * @returns {Array} Filtered transaction history
+ */
+const getTransactionHistory = (walletAddress) => {
+  if (!walletAddress) return [];
+  
+  const transactions = getTransactions();
+  return transactions.filter(tx => 
+    tx.from.toLowerCase() === walletAddress.toLowerCase() || 
+    tx.to.toLowerCase() === walletAddress.toLowerCase()
+  );
+};
+
+/**
+ * Get purchased datasets for a wallet address
+ * @param {string} walletAddress - The wallet address to check
+ * @returns {Array<string>} Array of purchased dataset IDs
+ */
+const getPurchasedDatasets = (walletAddress) => {
+  if (!walletAddress) return [];
+  
+  const transactions = getTransactions();
+  
+  // Filter successful purchases made by this wallet
+  const purchases = transactions.filter(tx => 
+    tx.from.toLowerCase() === walletAddress.toLowerCase() &&
+    tx.status === 'confirmed' &&
+    tx.metadata?.type === 'DATASET_PURCHASE'
+  );
+  
+  // Extract dataset IDs
+  return purchases.map(tx => tx.metadata.datasetId);
+};
+
+/**
+ * Check if a dataset has been purchased by a specific wallet
+ * @param {string} datasetId - The dataset ID to check
+ * @param {string} walletAddress - The wallet address to check
+ * @returns {boolean} True if the dataset has been purchased
+ */
+const isDatasetPurchased = (datasetId, walletAddress) => {
+  if (!datasetId || !walletAddress) return false;
+  
+  const purchasedDatasets = getPurchasedDatasets(walletAddress);
+  return purchasedDatasets.includes(datasetId);
+};
+
+/**
+ * Get receipt details for a specific transaction
+ * @param {string} transactionHash - The transaction hash to look up
+ * @returns {Object|null} Transaction receipt or null if not found
+ */
+const getTransactionReceipt = (transactionHash) => {
+  if (!transactionHash) return null;
+  
+  const transactions = getTransactions();
+  const transaction = transactions.find(tx => tx.hash === transactionHash);
+  
+  if (!transaction) return null;
+  
+  // Create a receipt-like object with additional information
+  return {
+    transactionHash: transaction.hash,
+    from: transaction.from,
+    to: transaction.to,
+    blockNumber: transaction.blockNumber,
+    status: transaction.status === 'confirmed' ? '0x1' : '0x0', // 0x1 = success, 0x0 = failure
+    gasUsed: transaction.gasUsed,
+    effectiveGasPrice: '0x' + (Math.floor(Math.random() * 100) + 20).toString(16) + '000000000',
+    logs: [],
+    contractAddress: null,
+    timestamp: transaction.timestamp,
+    value: transaction.value,
+    metadata: transaction.metadata || {}
+  };
+};
+
+// Create a named object before exporting it
+const transactionService = {
+  purchaseDataset,
+  getTransactions,
+  getTransactionHistory,
+  getPurchasedDatasets,
+  isDatasetPurchased,
+  getTransactionReceipt
+};
+
+// Export the named object as default
+export default transactionService;
\ No newline at end of file
diff --git a/client/src/utils/navigation.js b/client/src/utils/navigation.js
index af4bf81..cd86f4e 100644
--- a/client/src/utils/navigation.js
+++ b/client/src/utils/navigation.js
@@ -2,6 +2,8 @@
 export const ROUTES = {
   // Auth routes
   LOGIN: "/login",
+  FORGOT_PASSWORD: "/forgot-password",
+  REGISTER: "/register",
   ROLE_SELECT: "/select-role",
 
   // Dashboard routes